Imported Upstream version 2.51.2

Change-Id: I134d2267df41e44bec49ca802fe31ad39a8874b2
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>

32 files changed, 3524 insertions, 2535 deletions

diff --git a/NEWS b/NEWS
index 310576f3e..d2b586c4d 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,31 @@
+Overview of changes in GLib 2.51.2
+==================================
+
+* Minimal support for UUIDs has been added
+
+* A new file attribute, G_FILE_ATTRIBUTE_RECENT_MODIFIED has been added
+  to improve sorting of recent files
+
+* Bugs fixed:
+ 639078 UUID support feature request
+ 777135 gkeyfile: Be more specific about error codes in documentation
+ 777307 race condition between gdbus signal callback and g_bus_unwatch_name...
+ 777481 goutputstream: docs: fix typos
+ 777493 g_mkdtemp() not introspectable
+ 777507 Recent view sorting incorrectly
+ 777592 Add minor examples to GDBus and GVariant documentation
+ 778002 race in gdbusprivate.c detected by the ThreadSanitizer
+ 778096 race in gdbusconnection reported by TSan
+
+* Translation updates:
+ Norwegian bokmål
+ Polish
+ Simplified Chinese
+ Slovak
+ Spanish
+ Swedish
+
+
 Overview of changes in GLib 2.51.1
 ==================================
 
diff --git a/configure.ac b/configure.ac
index 5607a6323..14c913dc5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -31,7 +31,7 @@ m4_define(glib_configure_ac)
 
 m4_define([glib_major_version], [2])
 m4_define([glib_minor_version], [51])
-m4_define([glib_micro_version], [1])
+m4_define([glib_micro_version], [2])
 m4_define([glib_interface_age], [0])
 m4_define([glib_binary_age],
           [m4_eval(100 * glib_minor_version + glib_micro_version)])
diff --git a/docs/reference/gio/gio-docs.xml b/docs/reference/gio/gio-docs.xml
index cd7c056f2..bc23bf946 100644
--- a/docs/reference/gio/gio-docs.xml
+++ b/docs/reference/gio/gio-docs.xml
@@ -353,6 +353,10 @@
     <title>Index of new symbols in 2.50</title>
     <xi:include href="xml/api-index-2.50.xml"><xi:fallback /></xi:include>
   </index>
+  <index id="api-index-2-52" role="2.52">
+    <title>Index of new symbols in 2.52</title>
+    <xi:include href="xml/api-index-2.52.xml"><xi:fallback /></xi:include>
+  </index>
 
   <xi:include href="xml/annotation-glossary.xml"><xi:fallback /></xi:include>
 
diff --git a/docs/reference/gio/gio-sections.txt b/docs/reference/gio/gio-sections.txt
index 85fd2b92e..1257fd245 100644
--- a/docs/reference/gio/gio-sections.txt
+++ b/docs/reference/gio/gio-sections.txt
@@ -264,6 +264,7 @@ G_FILE_ATTRIBUTE_STANDARD_NAME
 G_FILE_ATTRIBUTE_STANDARD_DISPLAY_NAME
 G_FILE_ATTRIBUTE_STANDARD_EDIT_NAME
 G_FILE_ATTRIBUTE_STANDARD_COPY_NAME
+G_FILE_ATTRIBUTE_STANDARD_DESCRIPTION
 G_FILE_ATTRIBUTE_STANDARD_ICON
 G_FILE_ATTRIBUTE_STANDARD_SYMBOLIC_ICON
 G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE
@@ -288,12 +289,12 @@ G_FILE_ATTRIBUTE_MOUNTABLE_CAN_EJECT
 G_FILE_ATTRIBUTE_MOUNTABLE_UNIX_DEVICE
 G_FILE_ATTRIBUTE_MOUNTABLE_UNIX_DEVICE_FILE
 G_FILE_ATTRIBUTE_MOUNTABLE_HAL_UDI
-G_FILE_ATTRIBUTE_MOUNTABLE_CAN_POLL
-G_FILE_ATTRIBUTE_MOUNTABLE_IS_MEDIA_CHECK_AUTOMATIC
 G_FILE_ATTRIBUTE_MOUNTABLE_CAN_START
 G_FILE_ATTRIBUTE_MOUNTABLE_CAN_START_DEGRADED
 G_FILE_ATTRIBUTE_MOUNTABLE_CAN_STOP
 G_FILE_ATTRIBUTE_MOUNTABLE_START_STOP_TYPE
+G_FILE_ATTRIBUTE_MOUNTABLE_CAN_POLL
+G_FILE_ATTRIBUTE_MOUNTABLE_IS_MEDIA_CHECK_AUTOMATIC
 G_FILE_ATTRIBUTE_TIME_MODIFIED
 G_FILE_ATTRIBUTE_TIME_MODIFIED_USEC
 G_FILE_ATTRIBUTE_TIME_ACCESS
@@ -326,14 +327,14 @@ G_FILE_ATTRIBUTE_FILESYSTEM_FREE
 G_FILE_ATTRIBUTE_FILESYSTEM_USED
 G_FILE_ATTRIBUTE_FILESYSTEM_TYPE
 G_FILE_ATTRIBUTE_FILESYSTEM_READONLY
+G_FILE_ATTRIBUTE_FILESYSTEM_USE_PREVIEW
 G_FILE_ATTRIBUTE_FILESYSTEM_REMOTE
 G_FILE_ATTRIBUTE_GVFS_BACKEND
 G_FILE_ATTRIBUTE_SELINUX_CONTEXT
 G_FILE_ATTRIBUTE_TRASH_ITEM_COUNT
-G_FILE_ATTRIBUTE_TRASH_DELETION_DATE
 G_FILE_ATTRIBUTE_TRASH_ORIG_PATH
-G_FILE_ATTRIBUTE_FILESYSTEM_USE_PREVIEW
-G_FILE_ATTRIBUTE_STANDARD_DESCRIPTION
+G_FILE_ATTRIBUTE_TRASH_DELETION_DATE
+G_FILE_ATTRIBUTE_RECENT_MODIFIED
 g_file_info_new
 g_file_info_dup
 g_file_info_copy_into
diff --git a/docs/reference/glib/glib-docs.xml b/docs/reference/glib/glib-docs.xml
index 16cb08acd..4f6795a75 100644
--- a/docs/reference/glib/glib-docs.xml
+++ b/docs/reference/glib/glib-docs.xml
@@ -94,6 +94,7 @@
     <xi:include href="xml/testing.xml" />
     <xi:include href="xml/gunix.xml" />
     <xi:include href="xml/windows.xml" />
+    <xi:include href="xml/uuid.xml" />
   </chapter>
 
   <chapter id="glib-data-types">
@@ -243,6 +244,10 @@
     <title>Index of new symbols in 2.50</title>
     <xi:include href="xml/api-index-2.50.xml"><xi:fallback /></xi:include>
   </index>
+  <index id="api-index-2-52" role="2.52">
+    <title>Index of new symbols in 2.52</title>
+    <xi:include href="xml/api-index-2.52.xml"><xi:fallback /></xi:include>
+  </index>
 
   <xi:include href="xml/annotation-glossary.xml"><xi:fallback /></xi:include>
 
diff --git a/docs/reference/glib/glib-sections.txt b/docs/reference/glib/glib-sections.txt
index 4745446d0..924d58f09 100644
--- a/docs/reference/glib/glib-sections.txt
+++ b/docs/reference/glib/glib-sections.txt
@@ -3403,3 +3403,10 @@ g_hostname_is_ascii_encoded
 <SUBSECTION>
 g_hostname_is_ip_address
 </SECTION>
+
+<SECTION>
+<FILE>uuid</FILE>
+<TITLE>GUuid</TITLE>
+g_uuid_string_is_valid
+g_uuid_string_random
+</SECTION>
diff --git a/gio/gdbusaddress.c b/gio/gdbusaddress.c
index 26fbec4c5..9b3619cb1 100644
--- a/gio/gdbusaddress.c
+++ b/gio/gdbusaddress.c
@@ -63,8 +63,9 @@
  * @include: gio/gio.h
  *
  * Routines for working with D-Bus addresses. A D-Bus address is a string
- * like "unix:tmpdir=/tmp/my-app-name". The exact format of addresses
- * is explained in detail in the [D-Bus specification](http://dbus.freedesktop.org/doc/dbus-specification.html\#addresses).
+ * like `unix:tmpdir=/tmp/my-app-name`. The exact format of addresses
+ * is explained in detail in the
+ * [D-Bus specification](http://dbus.freedesktop.org/doc/dbus-specification.html#addresses).
  */
 
 static gchar *get_session_address_platform_specific (GError **error);
@@ -76,7 +77,8 @@ static gchar *get_session_address_dbus_launch       (GError **error);
  * g_dbus_is_address:
  * @string: A string.
  *
- * Checks if @string is a D-Bus address.
+ * Checks if @string is a
+ * [D-Bus address](https://dbus.freedesktop.org/doc/dbus-specification.html#addresses).
  *
  * This doesn't check if @string is actually supported by #GDBusServer
  * or #GDBusConnection - use g_dbus_is_supported_address() to do more
@@ -368,9 +370,10 @@ is_valid_tcp (const gchar  *address_entry,
  * @string: A string.
  * @error: Return location for error or %NULL.
  *
- * Like g_dbus_is_address() but also checks if the library suppors the
+ * Like g_dbus_is_address() but also checks if the library supports the
  * transports in @string and that key/value pairs for each transport
- * are valid.
+ * are valid. See the specification of the
+ * [D-Bus address format](https://dbus.freedesktop.org/doc/dbus-specification.html#addresses).
  *
  * Returns: %TRUE if @string is a valid D-Bus address that is
  * supported by this library, %FALSE if @error is set.
@@ -839,7 +842,8 @@ get_stream_thread_func (GTask         *task,
  *
  * Asynchronously connects to an endpoint specified by @address and
  * sets up the connection so it is in a state to run the client-side
- * of the D-Bus authentication conversation.
+ * of the D-Bus authentication conversation. @address must be in the
+ * [D-Bus address format](https://dbus.freedesktop.org/doc/dbus-specification.html#addresses).
  *
  * When the operation is finished, @callback will be invoked. You can
  * then call g_dbus_address_get_stream_finish() to get the result of
@@ -917,7 +921,8 @@ g_dbus_address_get_stream_finish (GAsyncResult        *res,
  *
  * Synchronously connects to an endpoint specified by @address and
  * sets up the connection so it is in a state to run the client-side
- * of the D-Bus authentication conversation.
+ * of the D-Bus authentication conversation. @address must be in the
+ * [D-Bus address format](https://dbus.freedesktop.org/doc/dbus-specification.html#addresses).
  *
  * This is a synchronous failable function. See
  * g_dbus_address_get_stream() for the asynchronous version.
@@ -1549,6 +1554,9 @@ get_session_address_platform_specific (GError **error)
  * bus instance specified by @bus_type. This may involve using various
  * platform specific mechanisms.
  *
+ * The returned address will be in the
+ * [D-Bus address format](https://dbus.freedesktop.org/doc/dbus-specification.html#addresses).
+ *
  * Returns: a valid D-Bus address string for @bus_type or %NULL if
  *     @error is set
  *
diff --git a/gio/gdbusconnection.c b/gio/gdbusconnection.c
index 8400a6403..96a40acaf 100644
--- a/gio/gdbusconnection.c
+++ b/gio/gdbusconnection.c
@@ -2798,7 +2798,8 @@ g_dbus_connection_new_sync (GIOStream             *stream,
  *
  * Asynchronously connects and sets up a D-Bus client connection for
  * exchanging D-Bus messages with an endpoint specified by @address
- * which must be in the D-Bus address format.
+ * which must be in the
+ * [D-Bus address format](https://dbus.freedesktop.org/doc/dbus-specification.html#addresses).
  *
  * This constructor can only be used to initiate client-side
  * connections - use g_dbus_connection_new() if you need to act as the
@@ -2884,7 +2885,8 @@ g_dbus_connection_new_for_address_finish (GAsyncResult  *res,
  *
  * Synchronously connects and sets up a D-Bus client connection for
  * exchanging D-Bus messages with an endpoint specified by @address
- * which must be in the D-Bus address format.
+ * which must be in the
+ * [D-Bus address format](https://dbus.freedesktop.org/doc/dbus-specification.html#addresses).
  *
  * This constructor can only be used to initiate client-side
  * connections - use g_dbus_connection_new_sync() if you need to act
@@ -3057,7 +3059,7 @@ g_dbus_connection_get_peer_credentials (GDBusConnection *connection)
 
 /* ---------------------------------------------------------------------------------------------------- */
 
-static guint _global_filter_id = 1;
+static volatile guint _global_filter_id = 1;
 
 /**
  * g_dbus_connection_add_filter:
@@ -3114,7 +3116,7 @@ g_dbus_connection_add_filter (GDBusConnection            *connection,
 
   CONNECTION_LOCK (connection);
   data = g_new0 (FilterData, 1);
-  data->id = _global_filter_id++; /* TODO: overflow etc. */
+  data->id = g_atomic_int_add (&_global_filter_id, 1); /* TODO: overflow etc. */
   data->ref_count = 1;
   data->filter_function = filter_function;
   data->user_data = user_data;
@@ -3272,9 +3274,9 @@ args_to_rule (const gchar      *sender,
   return g_string_free (rule, FALSE);
 }
 
-static guint _global_subscriber_id = 1;
-static guint _global_registration_id = 1;
-static guint _global_subtree_registration_id = 1;
+static volatile guint _global_subscriber_id = 1;
+static volatile guint _global_registration_id = 1;
+static volatile guint _global_subtree_registration_id = 1;
 
 /* ---------------------------------------------------------------------------------------------------- */
 
@@ -3466,7 +3468,7 @@ g_dbus_connection_signal_subscribe (GDBusConnection     *connection,
   subscriber.callback = callback;
   subscriber.user_data = user_data;
   subscriber.user_data_free_func = user_data_free_func;
-  subscriber.id = _global_subscriber_id++; /* TODO: overflow etc. */
+  subscriber.id = g_atomic_int_add (&_global_subscriber_id, 1); /* TODO: overflow etc. */
   subscriber.context = g_main_context_ref_thread_default ();
 
   /* see if we've already have this rule */
@@ -5156,7 +5158,7 @@ g_dbus_connection_register_object (GDBusConnection             *connection,
     }
 
   ei = g_new0 (ExportedInterface, 1);
-  ei->id = _global_registration_id++; /* TODO: overflow etc. */
+  ei->id = g_atomic_int_add (&_global_registration_id, 1); /* TODO: overflow etc. */
   ei->eo = eo;
   ei->user_data = user_data;
   ei->user_data_free_func = user_data_free_func;
@@ -6813,7 +6815,7 @@ g_dbus_connection_register_subtree (GDBusConnection           *connection,
 
   es->vtable = _g_dbus_subtree_vtable_copy (vtable);
   es->flags = flags;
-  es->id = _global_subtree_registration_id++; /* TODO: overflow etc. */
+  es->id = g_atomic_int_add (&_global_subtree_registration_id, 1); /* TODO: overflow etc. */
   es->user_data = user_data;
   es->user_data_free_func = user_data_free_func;
   es->context = g_main_context_ref_thread_default ();
diff --git a/gio/gdbusmethodinvocation.c b/gio/gdbusmethodinvocation.c
index d111394dc..30a8f54b4 100644
--- a/gio/gdbusmethodinvocation.c
+++ b/gio/gdbusmethodinvocation.c
@@ -534,7 +534,26 @@ g_dbus_method_invocation_return_value_internal (GDBusMethodInvocation *invocatio
  * Finishes handling a D-Bus method call by returning @parameters.
  * If the @parameters GVariant is floating, it is consumed.
  *
- * It is an error if @parameters is not of the right format.
+ * It is an error if @parameters is not of the right format: it must be a tuple
+ * containing the out-parameters of the D-Bus method. Even if the method has a
+ * single out-parameter, it must be contained in a tuple. If the method has no
+ * out-parameters, @parameters may be %NULL or an empty tuple.
+ *
+ * |[<!-- language="C" -->
+ * GDBusMethodInvocation *invocation = some_invocation;
+ * g_autofree gchar *result_string = NULL;
+ * g_autoptr (GError) error = NULL;
+ *
+ * result_string = calculate_result (&error);
+ *
+ * if (error != NULL)
+ *   g_dbus_method_invocation_return_gerror (invocation, error);
+ * else
+ *   g_dbus_method_invocation_return_value (invocation,
+ *                                          g_variant_new ("(s)", result_string));
+ *
+ * /<!-- -->* Do not free @invocation here; returning a value does that *<!-- -->/
+ * ]|
  *
  * This method will take ownership of @invocation. See
  * #GDBusInterfaceVTable for more information about the ownership of
diff --git a/gio/gdbusnamewatching.c b/gio/gdbusnamewatching.c
index 01ab4ce24..14603c5e4 100644
--- a/gio/gdbusnamewatching.c
+++ b/gio/gdbusnamewatching.c
@@ -77,7 +77,10 @@ typedef struct
   gboolean                  initialized;
 } Client;
 
-static guint next_global_id = 1;
+/* Must be accessed atomically. */
+static volatile guint next_global_id = 1;
+
+/* Must be accessed with @lock held. */
 static GHashTable *map_id_to_client = NULL;
 
 static Client *
@@ -562,7 +565,7 @@ g_bus_watch_name (GBusType                  bus_type,
 
   client = g_new0 (Client, 1);
   client->ref_count = 1;
-  client->id = next_global_id++; /* TODO: uh oh, handle overflow */
+  client->id = g_atomic_int_add (&next_global_id, 1); /* TODO: uh oh, handle overflow */
   client->name = g_strdup (name);
   client->flags = flags;
   client->name_appeared_handler = name_appeared_handler;
@@ -624,7 +627,7 @@ guint g_bus_watch_name_on_connection (GDBusConnection          *connection,
 
   client = g_new0 (Client, 1);
   client->ref_count = 1;
-  client->id = next_global_id++; /* TODO: uh oh, handle overflow */
+  client->id = g_atomic_int_add (&next_global_id, 1); /* TODO: uh oh, handle overflow */
   client->name = g_strdup (name);
   client->flags = flags;
   client->name_appeared_handler = name_appeared_handler;
diff --git a/gio/gdbusprivate.c b/gio/gdbusprivate.c
index c7b126ead..ea05dcd3d 100644
--- a/gio/gdbusprivate.c
+++ b/gio/gdbusprivate.c
@@ -1571,10 +1571,10 @@ schedule_writing_unlocked (GDBusWorker        *worker,
 static void
 schedule_pending_close (GDBusWorker *worker)
 {
-  if (!worker->pending_close_attempts)
-    return;
-
-  schedule_writing_unlocked (worker, NULL, NULL, NULL);
+  g_mutex_lock (&worker->write_lock);
+  if (worker->pending_close_attempts)
+    schedule_writing_unlocked (worker, NULL, NULL, NULL);
+  g_mutex_unlock (&worker->write_lock);
 }
 
 /* ---------------------------------------------------------------------------------------------------- */
diff --git a/gio/gdbusserver.c b/gio/gdbusserver.c
index 6a84e7523..a50b958f2 100644
--- a/gio/gdbusserver.c
+++ b/gio/gdbusserver.c
@@ -504,8 +504,9 @@ g_dbus_server_new_sync (const gchar        *address,
  * g_dbus_server_get_client_address:
  * @server: A #GDBusServer.
  *
- * Gets a D-Bus address string that can be used by clients to connect
- * to @server.
+ * Gets a
+ * [D-Bus address](https://dbus.freedesktop.org/doc/dbus-specification.html#addresses)
+ * string that can be used by clients to connect to @server.
  *
  * Returns: A D-Bus address string. Do not free, the string is owned
  * by @server.
diff --git a/gio/gfileinfo.h b/gio/gfileinfo.h
index c4bafb00d..10832db00 100644
--- a/gio/gfileinfo.h
+++ b/gio/gfileinfo.h
@@ -473,15 +473,15 @@ typedef struct _GFileInfoClass   GFileInfoClass;
  *
  * A key in the "time" namespace for getting the time the file was last
  * modified. Corresponding #GFileAttributeType is
- * %G_FILE_ATTRIBUTE_TYPE_UINT64, and contains the UNIX time since the
- * file was modified.
+ * %G_FILE_ATTRIBUTE_TYPE_UINT64, and contains the time since the
+ * file was modified, in seconds since the UNIX epoch.
  **/
 #define G_FILE_ATTRIBUTE_TIME_MODIFIED "time::modified"           /* uint64 */
 
 /**
  * G_FILE_ATTRIBUTE_TIME_MODIFIED_USEC:
  *
- * A key in the "time" namespace for getting the miliseconds of the time
+ * A key in the "time" namespace for getting the microseconds of the time
  * the file was last modified. This should be used in conjunction with
  * #G_FILE_ATTRIBUTE_TIME_MODIFIED. Corresponding #GFileAttributeType is
  * %G_FILE_ATTRIBUTE_TYPE_UINT32.
@@ -493,8 +493,8 @@ typedef struct _GFileInfoClass   GFileInfoClass;
  *
  * A key in the "time" namespace for getting the time the file was last
  * accessed. Corresponding #GFileAttributeType is
- * %G_FILE_ATTRIBUTE_TYPE_UINT64, and contains the UNIX time since the
- * file was last accessed.
+ * %G_FILE_ATTRIBUTE_TYPE_UINT64, and contains the time since the
+ * file was last accessed, in seconds since the UNIX epoch.
  **/
 #define G_FILE_ATTRIBUTE_TIME_ACCESS "time::access"               /* uint64 */
 
@@ -513,7 +513,8 @@ typedef struct _GFileInfoClass   GFileInfoClass;
  *
  * A key in the "time" namespace for getting the time the file was last
  * changed. Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_UINT64,
- * and contains the UNIX time since the file was last changed.
+ * and contains the time since the file was last changed, in seconds since the
+ * UNIX epoch.
  *
  * This corresponds to the traditional UNIX ctime.
  **/
@@ -534,7 +535,8 @@ typedef struct _GFileInfoClass   GFileInfoClass;
  *
  * A key in the "time" namespace for getting the time the file was created.
  * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_UINT64,
- * and contains the UNIX time since the file was created.
+ * and contains the time since the file was created, in seconds since the UNIX
+ * epoch.
  *
  * This corresponds to the NTFS ctime.
  **/
@@ -836,7 +838,7 @@ typedef struct _GFileInfoClass   GFileInfoClass;
  * G_FILE_ATTRIBUTE_TRASH_ITEM_COUNT:
  *
  * A key in the "trash" namespace.  When requested against
- * "trash:///" returns the number of (toplevel) items in the trash folder.
+ * `trash:///` returns the number of (toplevel) items in the trash folder.
  * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_UINT32.
  **/
 #define G_FILE_ATTRIBUTE_TRASH_ITEM_COUNT "trash::item-count"     /* uint32 */
@@ -845,7 +847,7 @@ typedef struct _GFileInfoClass   GFileInfoClass;
  * G_FILE_ATTRIBUTE_TRASH_ORIG_PATH:
  *
  * A key in the "trash" namespace.  When requested against
- * items in "trash:///", will return the original path to the file before it
+ * items in `trash:///`, will return the original path to the file before it
  * was trashed. Corresponding #GFileAttributeType is
  * %G_FILE_ATTRIBUTE_TYPE_BYTE_STRING.
  *
@@ -857,7 +859,7 @@ typedef struct _GFileInfoClass   GFileInfoClass;
  * G_FILE_ATTRIBUTE_TRASH_DELETION_DATE:
  *
  * A key in the "trash" namespace.  When requested against
- * items in "trash:///", will return the date and time when the file
+ * items in `trash:///`, will return the date and time when the file
  * was trashed. The format of the returned string is YYYY-MM-DDThh:mm:ss.
  * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_STRING.
  *
@@ -865,6 +867,17 @@ typedef struct _GFileInfoClass   GFileInfoClass;
  **/
 #define G_FILE_ATTRIBUTE_TRASH_DELETION_DATE "trash::deletion-date"  /* string */
 
+/**
+ * G_FILE_ATTRIBUTE_RECENT_MODIFIED:
+ *
+ * A key in the "recent" namespace for getting time, when the metadata for the
+ * file in `recent:///` was last changed. Corresponding #GFileAttributeType is
+ * %G_FILE_ATTRIBUTE_TYPE_INT64.
+ *
+ * Since: 2.52
+ **/
+#define G_FILE_ATTRIBUTE_RECENT_MODIFIED "recent::modified"          /* int64 (time_t) */
+
 GLIB_AVAILABLE_IN_ALL
 GType              g_file_info_get_type                  (void) G_GNUC_CONST;
 
diff --git a/gio/glocalfile.c b/gio/glocalfile.c
index 8f64777e6..64c5b6898 100644
--- a/gio/glocalfile.c
+++ b/gio/glocalfile.c
@@ -1168,11 +1168,11 @@ g_local_file_find_enclosing_mount (GFile         *file,
     return mount;
 
 error:
-  /* Translators: This is an error message when trying to find
-   * the enclosing (user visible) mount of a file, but none
-   * exists.
-   */
   g_set_io_error (error,
+		  /* Translators: This is an error message when trying to find
+		   * the enclosing (user visible) mount of a file, but none
+		   * exists.
+		   */
 		  _("Containing mount for file %s not found"),
                   file, 0);
 
diff --git a/gio/goutputstream.c b/gio/goutputstream.c
index 3d4fa9851..354c006b2 100644
--- a/gio/goutputstream.c
+++ b/gio/goutputstream.c
@@ -789,7 +789,7 @@ async_ready_write_callback_wrapper (GObject      *source_object,
  * value) will be executed before an outstanding request with lower 
  * priority. Default priority is %G_PRIORITY_DEFAULT.
  *
- * The asyncronous methods have a default fallback that uses threads 
+ * The asynchronous methods have a default fallback that uses threads
  * to implement asynchronicity, so they are optional for inheriting 
  * classes. However, if you override one you must override all.
  *
@@ -1469,7 +1469,7 @@ real_close_async_cb (GObject      *source_object,
  *
  * For behaviour details see g_output_stream_close().
  *
- * The asyncronous methods have a default fallback that uses threads 
+ * The asynchronous methods have a default fallback that uses threads
  * to implement asynchronicity, so they are optional for inheriting 
  * classes. However, if you override one you must override all.
  **/
@@ -1624,7 +1624,7 @@ g_output_stream_is_closing (GOutputStream *stream)
  * g_output_stream_has_pending:
  * @stream: a #GOutputStream.
  * 
- * Checks if an ouput stream has pending actions.
+ * Checks if an output stream has pending actions.
  * 
  * Returns: %TRUE if @stream has pending actions. 
  **/
@@ -1693,7 +1693,7 @@ g_output_stream_clear_pending (GOutputStream *stream)
  * g_output_stream_async_write_is_via_threads:
  * @stream: a #GOutputStream.
  *
- * Checks if an ouput stream's write_async function uses threads.
+ * Checks if an output stream's write_async function uses threads.
  *
  * Returns: %TRUE if @stream's write_async function uses threads.
  **/
diff --git a/glib/Makefile.am b/glib/Makefile.am
index 2aeaddd1b..87cca42f4 100644
--- a/glib/Makefile.am
+++ b/glib/Makefile.am
@@ -188,6 +188,7 @@ libglib_2_0_la_SOURCES = 	\
 	gunicodeprivate.h	\
 	gurifuncs.c 		\
 	gutils.c		\
+	guuid.c			\
 	gvariant.h		\
 	gvariant.c		\
 	gvariant-core.h		\
@@ -309,6 +310,7 @@ glibsubinclude_HEADERS = \
 	gunicode.h	\
 	gurifuncs.h 	\
 	gutils.h	\
+	guuid.h		\
 	gvarianttype.h	\
 	gvariant.h	\
 	gversion.h	\
diff --git a/glib/gfileutils.c b/glib/gfileutils.c
index 2e9655f0f..daac6edff 100644
--- a/glib/gfileutils.c
+++ b/glib/gfileutils.c
@@ -1349,7 +1349,7 @@ wrap_g_open (const gchar *filename,
 }
 
 /**
- * g_mkdtemp_full:
+ * g_mkdtemp_full: (skip)
  * @tmpl: (type filename): template directory name
  * @mode: permissions to create the temporary directory with
  *
@@ -1358,13 +1358,17 @@ wrap_g_open (const gchar *filename,
  *
  * The parameter is a string that should follow the rules for
  * mkdtemp() templates, i.e. contain the string "XXXXXX".
- * g_mkdtemp() is slightly more flexible than mkdtemp() in that the
+ * g_mkdtemp_full() is slightly more flexible than mkdtemp() in that the
  * sequence does not have to occur at the very end of the template
  * and you can pass a @mode. The X string will be modified to form
  * the name of a directory that didn't exist. The string should be
  * in the GLib file name encoding. Most importantly, on Windows it
  * should be in UTF-8.
  *
+ * If you are going to be creating a temporary directory inside the
+ * directory returned by g_get_tmp_dir(), you might want to use
+ * g_dir_make_tmp() instead.
+ *
  * Returns: (nullable) (type filename): A pointer to @tmpl, which has been
  *     modified to hold the directory name. In case of errors, %NULL is
  *     returned, and %errno will be set.
@@ -1382,7 +1386,7 @@ g_mkdtemp_full (gchar *tmpl,
 }
 
 /**
- * g_mkdtemp:
+ * g_mkdtemp: (skip)
  * @tmpl: (type filename): template directory name
  *
  * Creates a temporary directory. See the mkdtemp() documentation
@@ -1391,12 +1395,16 @@ g_mkdtemp_full (gchar *tmpl,
  * The parameter is a string that should follow the rules for
  * mkdtemp() templates, i.e. contain the string "XXXXXX".
  * g_mkdtemp() is slightly more flexible than mkdtemp() in that the
- * sequence does not have to occur at the very end of the template
- * and you can pass a @mode and additional @flags. The X string will
- * be modified to form the name of a directory that didn't exist.
+ * sequence does not have to occur at the very end of the template.
+ * The X string will be modified to form the name of a directory that
+ * didn't exist.
  * The string should be in the GLib file name encoding. Most importantly,
  * on Windows it should be in UTF-8.
  *
+ * If you are going to be creating a temporary directory inside the
+ * directory returned by g_get_tmp_dir(), you might want to use
+ * g_dir_make_tmp() instead.
+ *
  * Returns: (nullable) (type filename): A pointer to @tmpl, which has been
  *     modified to hold the directory name.  In case of errors, %NULL is
  *     returned and %errno will be set.
@@ -1410,7 +1418,7 @@ g_mkdtemp (gchar *tmpl)
 }
 
 /**
- * g_mkstemp_full:
+ * g_mkstemp_full: (skip)
  * @tmpl: (type filename): template filename
  * @flags: flags to pass to an open() call in addition to O_EXCL
  *     and O_CREAT, which are passed automatically
@@ -1446,7 +1454,7 @@ g_mkstemp_full (gchar *tmpl,
 }
 
 /**
- * g_mkstemp:
+ * g_mkstemp: (skip)
  * @tmpl: (type filename): template filename
  *
  * Opens a temporary file. See the mkstemp() documentation
diff --git a/glib/gkeyfile.c b/glib/gkeyfile.c
index 87f2b9109..b8a84db7b 100644
--- a/glib/gkeyfile.c
+++ b/glib/gkeyfile.c
@@ -828,8 +828,13 @@ g_key_file_load_from_fd (GKeyFile       *key_file,
  * @error: return location for a #GError, or %NULL
  *
  * Loads a key file into an empty #GKeyFile structure.
- * If the file could not be loaded then @error is set to
- * either a #GFileError or #GKeyFileError.
+ *
+ * If the OS returns an error when opening or reading the file, a
+ * %G_FILE_ERROR is returned. If there is a problem parsing the file, a
+ * %G_KEY_FILE_ERROR is returned.
+ *
+ * This function will never return a %G_KEY_FILE_ERROR_NOT_FOUND error. If the
+ * @file is not found, %G_FILE_ERROR_NOENT is returned.
  *
  * Returns: %TRUE if a key file could be loaded, %FALSE otherwise
  *
@@ -967,9 +972,13 @@ g_key_file_load_from_bytes (GKeyFile       *key_file,
  *
  * This function looks for a key file named @file in the paths
  * specified in @search_dirs, loads the file into @key_file and
- * returns the file's full path in @full_path.  If the file could not
- * be loaded then an %error is set to either a #GFileError or
- * #GKeyFileError.
+ * returns the file's full path in @full_path.
+ *
+ * If the file could not be found in any of the @search_dirs,
+ * %G_KEY_FILE_ERROR_NOT_FOUND is returned. If
+ * the file is found but the OS returns an error when opening or reading the
+ * file, a %G_FILE_ERROR is returned. If there is a problem parsing the file, a
+ * %G_KEY_FILE_ERROR is returned.
  *
  * Returns: %TRUE if a key file could be loaded, %FALSE otherwise
  *
@@ -2543,7 +2552,8 @@ g_key_file_set_boolean_list (GKeyFile    *key_file,
  *
  * If @key cannot be found then 0 is returned and @error is set to
  * #G_KEY_FILE_ERROR_KEY_NOT_FOUND. Likewise, if the value associated
- * with @key cannot be interpreted as an integer then 0 is returned
+ * with @key cannot be interpreted as an integer, or is out of range
+ * for a #gint, then 0 is returned
  * and @error is set to #G_KEY_FILE_ERROR_INVALID_VALUE.
  *
  * Returns: the value associated with the key as an integer, or
@@ -2793,7 +2803,8 @@ g_key_file_set_uint64 (GKeyFile    *key_file,
  *
  * If @key cannot be found then %NULL is returned and @error is set to
  * #G_KEY_FILE_ERROR_KEY_NOT_FOUND. Likewise, if the values associated
- * with @key cannot be interpreted as integers then %NULL is returned
+ * with @key cannot be interpreted as integers, or are out of range for
+ * #gint, then %NULL is returned
  * and @error is set to #G_KEY_FILE_ERROR_INVALID_VALUE.
  *
  * Returns: (array length=length) (element-type gint) (transfer container):
diff --git a/glib/glib.h b/glib/glib.h
index 1212d139f..9fd22298a 100644
--- a/glib/glib.h
+++ b/glib/glib.h
@@ -90,6 +90,7 @@
 #include <glib/gunicode.h>
 #include <glib/gurifuncs.h>
 #include <glib/gutils.h>
+#include <glib/guuid.h>
 #include <glib/gvarianttype.h>
 #include <glib/gvariant.h>
 #include <glib/gversion.h>
diff --git a/glib/guuid.c b/glib/guuid.c
new file mode 100644
index 000000000..1adc6c82e
--- /dev/null
+++ b/glib/guuid.c
@@ -0,0 +1,210 @@
+/* guuid.c - UUID functions
+ *
+ * Copyright (C) 2013-2015, 2017 Red Hat, Inc.
+ *
+ * This library is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of the
+ * licence, or (at your option) any later version.
+ *
+ * This is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301
+ * USA.
+ *
+ * Authors: Marc-André Lureau <marcandre.lureau@redhat.com>
+ */
+
+#include "config.h"
+#include <string.h>
+
+#include "gi18n.h"
+#include "gstrfuncs.h"
+#include "grand.h"
+#include "gmessages.h"
+#include "gchecksum.h"
+
+#include "guuid.h"
+
+typedef struct {
+  guint8 bytes[16];
+} GUuid;
+
+/**
+ * SECTION:uuid
+ * @title: GUuid
+ * @short_description: a universally unique identifier
+ *
+ * A UUID, or Universally unique identifier, is intended to uniquely
+ * identify information in a distributed environment. For the
+ * definition of UUID, see [RFC 4122](https://tools.ietf.org/html/rfc4122.html).
+ *
+ * The creation of UUIDs does not require a centralized authority.
+ *
+ * UUIDs are of relatively small size (128 bits, or 16 bytes). The
+ * common string representation (ex:
+ * 1d6c0810-2bd6-45f3-9890-0268422a6f14) needs 37 bytes.
+ *
+ * The UUID specification defines 5 versions, and calling
+ * g_uuid_string_random() will generate a unique (or rather random)
+ * UUID of the most common version, version 4.
+ *
+ * Since: 2.52
+ */
+
+/*
+ * g_uuid_to_string:
+ * @uuid: a #GUuid
+ *
+ * Creates a string representation of @uuid, of the form
+ * 06e023d5-86d8-420e-8103-383e4566087a (no braces nor urn:uuid:
+ * prefix).
+ *
+ * Returns: (transfer full): A string that should be freed with g_free().
+ * Since: STATIC
+ */
+static gchar *
+g_uuid_to_string (const GUuid *uuid)
+{
+  const guint8 *bytes;
+
+  g_return_val_if_fail (uuid != NULL, NULL);
+
+  bytes = uuid->bytes;
+
+  return g_strdup_printf ("%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x"
+                          "-%02x%02x%02x%02x%02x%02x",
+                          bytes[0], bytes[1], bytes[2], bytes[3],
+                          bytes[4], bytes[5], bytes[6], bytes[7],
+                          bytes[8], bytes[9], bytes[10], bytes[11],
+                          bytes[12], bytes[13], bytes[14], bytes[15]);
+}
+
+static gboolean
+uuid_parse_string (const gchar *str,
+                   GUuid       *uuid)
+{
+  GUuid tmp;
+  guint8 *bytes = tmp.bytes;
+  gint i, j, hi, lo;
+  guint expected_len = 36;
+
+  if (strlen (str) != expected_len)
+    return FALSE;
+
+  for (i = 0, j = 0; i < 16;)
+    {
+      if (j == 8 || j == 13 || j == 18 || j == 23)
+        {
+          if (str[j++] != '-')
+            return FALSE;
+
+          continue;
+        }
+
+      hi = g_ascii_xdigit_value (str[j++]);
+      lo = g_ascii_xdigit_value (str[j++]);
+
+      if (hi == -1 || lo == -1)
+        return FALSE;
+
+      bytes[i++] = hi << 8 | lo;
+    }
+
+  if (uuid != NULL)
+    *uuid = tmp;
+
+  return TRUE;
+}
+
+/**
+ * g_uuid_string_is_valid:
+ * @str: a string representing a UUID
+ *
+ * Parses the string @str and verify if it is a UUID.
+ *
+ * The function accepts the following syntax:
+ *
+ * - simple forms (e.g. `f81d4fae-7dec-11d0-a765-00a0c91e6bf6`)
+ *
+ * Note that hyphens are required within the UUID string itself,
+ * as per the aforementioned RFC.
+ *
+ * Returns: %TRUE if @str is a valid UUID, %FALSE otherwise.
+ * Since: 2.52
+ */
+gboolean
+g_uuid_string_is_valid (const gchar *str)
+{
+  g_return_val_if_fail (str != NULL, FALSE);
+
+  return uuid_parse_string (str, NULL);
+}
+
+static void
+uuid_set_version (GUuid *uuid, guint version)
+{
+  guint8 *bytes = uuid->bytes;
+
+  /*
+   * Set the four most significant bits (bits 12 through 15) of the
+   * time_hi_and_version field to the 4-bit version number from
+   * Section 4.1.3.
+   */
+  bytes[6] &= 0x0f;
+  bytes[6] |= version << 4;
+  /*
+   * Set the two most significant bits (bits 6 and 7) of the
+   * clock_seq_hi_and_reserved to zero and one, respectively.
+   */
+  bytes[8] &= 0x3f;
+  bytes[8] |= 0x80;
+}
+
+/*
+ * g_uuid_generate_v4:
+ * @uuid: a #GUuid
+ *
+ * Generates a random UUID (RFC 4122 version 4).
+ * Since: STATIC
+ */
+static void
+g_uuid_generate_v4 (GUuid *uuid)
+{
+  int i;
+  guint8 *bytes;
+  guint32 *ints;
+
+  g_return_if_fail (uuid != NULL);
+
+  bytes = uuid->bytes;
+  ints = (guint32 *) bytes;
+  for (i = 0; i < 4; i++)
+    ints[i] = g_random_int ();
+
+  uuid_set_version (uuid, 4);
+}
+
+/**
+ * g_uuid_string_random:
+ *
+ * Generates a random UUID (RFC 4122 version 4) as a string.
+ *
+ * Returns: (transfer full): A string that should be freed with g_free().
+ * Since: 2.52
+ */
+gchar *
+g_uuid_string_random (void)
+{
+  GUuid uuid;
+
+  g_uuid_generate_v4 (&uuid);
+
+  return g_uuid_to_string (&uuid);
+}
+
diff --git a/glib/guuid.h b/glib/guuid.h
new file mode 100644
index 000000000..c653188a0
--- /dev/null
+++ b/glib/guuid.h
@@ -0,0 +1,42 @@
+/* guuid.h - UUID functions
+ *
+ * Copyright (C) 2013-2015, 2017 Red Hat, Inc.
+ *
+ * This library is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of the
+ * licence, or (at your option) any later version.
+ *
+ * This is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301
+ * USA.
+ *
+ * Authors: Marc-André Lureau <marcandre.lureau@redhat.com>
+ */
+
+#ifndef __G_UUID_H__
+#define __G_UUID_H__
+
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#error "Only <glib.h> can be included directly."
+#endif
+
+#include <glib/gtypes.h>
+
+G_BEGIN_DECLS
+
+GLIB_AVAILABLE_IN_2_52
+gboolean      g_uuid_string_is_valid       (const gchar   *str);
+
+GLIB_AVAILABLE_IN_2_52
+gchar *       g_uuid_string_random         (void);
+
+G_END_DECLS
+
+#endif  /* __G_UUID_H__ */
diff --git a/glib/gvariant.c b/glib/gvariant.c
index ea6e76a5e..a57b2fb69 100644
--- a/glib/gvariant.c
+++ b/glib/gvariant.c
@@ -3513,15 +3513,45 @@ g_variant_builder_add_value (GVariantBuilder *builder,
 /**
  * g_variant_builder_open:
  * @builder: a #GVariantBuilder
- * @type: a #GVariantType
+ * @type: the #GVariantType of the container
  *
  * Opens a subcontainer inside the given @builder.  When done adding
- * items to the subcontainer, g_variant_builder_close() must be called.
+ * items to the subcontainer, g_variant_builder_close() must be called. @type
+ * is the type of the container: so to build a tuple of several values, @type
+ * must include the tuple itself.
  *
  * It is an error to call this function in any way that would cause an
  * inconsistent value to be constructed (ie: adding too many values or
  * a value of an incorrect type).
  *
+ * Example of building a nested variant:
+ * |[<!-- language="C" -->
+ * GVariantBuilder builder;
+ * guint32 some_number = get_number ();
+ * g_autoptr (GHashTable) some_dict = get_dict ();
+ * GHashTableIter iter;
+ * const gchar *key;
+ * const GVariant *value;
+ * g_autoptr (GVariant) output = NULL;
+ *
+ * g_variant_builder_init (&builder, G_VARIANT_TYPE ("(ua{sv})"));
+ * g_variant_builder_add (&builder, "u", some_number);
+ * g_variant_builder_open (&builder, G_VARIANT_TYPE ("a{sv}"));
+ *
+ * g_hash_table_iter_init (&iter, some_dict);
+ * while (g_hash_table_iter_next (&iter, (gpointer *) &key, (gpointer *) &value))
+ *   {
+ *     g_variant_builder_open (&builder, G_VARIANT_TYPE ("{sv}"));
+ *     g_variant_builder_add (&builder, "s", key);
+ *     g_variant_builder_add (&builder, "v", value);
+ *     g_variant_builder_close (&builder);
+ *   }
+ *
+ * g_variant_builder_close (&builder);
+ *
+ * output = g_variant_builder_end (&builder);
+ * ]|
+ *
  * Since: 2.24
  **/
 void
diff --git a/glib/tests/.gitignore b/glib/tests/.gitignore
index 03aee70d7..9e4c147d3 100644
--- a/glib/tests/.gitignore
+++ b/glib/tests/.gitignore
@@ -22,6 +22,7 @@ environment
 error
 fileutils
 gdatetime
+guuid
 gvariant
 gwakeup
 gwakeup-fallback
diff --git a/glib/tests/Makefile.am b/glib/tests/Makefile.am
index a6bcef0e9..43b11f05d 100644
--- a/glib/tests/Makefile.am
+++ b/glib/tests/Makefile.am
@@ -59,6 +59,7 @@ test_programs = \
 	error				\
 	fileutils			\
 	gdatetime			\
+	guuid				\
 	gvariant			\
 	hash				\
 	hmac				\
diff --git a/glib/tests/guuid.c b/glib/tests/guuid.c
new file mode 100644
index 000000000..41e2c81e9
--- /dev/null
+++ b/glib/tests/guuid.c
@@ -0,0 +1,71 @@
+/* guuid.c
+ *
+ * Copyright (C) 2013-2015, 2017 Red Hat, Inc.
+ *
+ * This is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#include "config.h"
+
+#undef G_DISABLE_ASSERT
+
+#include <glib.h>
+#include <string.h>
+
+static void
+test_guuid_string (void)
+{
+  g_assert_false (g_uuid_string_is_valid ("00010203-0405-0607-0809"));
+  g_assert_false (g_uuid_string_is_valid ("zzzzzzzz-zzzz-zzzz-zzzz-zzzzzzzzzzzz"));
+  g_assert_false (g_uuid_string_is_valid ("000102030405060708090a0b0c0d0e0f"));
+  g_assert_false (g_uuid_string_is_valid ("{urn:uuid:f81d4fae-7dec-11d0-a765-00a0c91e6bf6}"));
+  g_assert_false (g_uuid_string_is_valid ("urn:uuid:f81d4fae-7dec-11d0-a765-00a0c91e6bf6"));
+
+  g_assert_true (g_uuid_string_is_valid ("00010203-0405-0607-0809-0a0b0c0d0e0f"));
+  g_assert_true (g_uuid_string_is_valid ("7d444840-9dc0-11d1-b245-5ffdce74fad2"));
+  g_assert_true (g_uuid_string_is_valid ("e902893a-9d22-3c7e-a7b8-d6e313b71d9f"));
+  g_assert_true (g_uuid_string_is_valid ("6ba7b810-9dad-11d1-80b4-00c04fd430c8"));
+}
+
+static void
+test_guuid_random (void)
+{
+  gchar *str1, *str2;
+
+  str1 = g_uuid_string_random ();
+  g_assert_cmpuint (strlen (str1), ==, 36);
+  g_assert_true (g_uuid_string_is_valid (str1));
+
+  str2 = g_uuid_string_random ();
+  g_assert_cmpuint (strlen (str2), ==, 36);
+  g_assert_true (g_uuid_string_is_valid (str2));
+  g_assert_cmpstr (str1, !=, str2);
+
+  g_free (str1);
+  g_free (str2);
+}
+
+int
+main (int argc, char **argv)
+{
+  g_test_init (&argc, &argv, NULL);
+  g_test_bug_base ("http://bugzilla.gnome.org/");
+
+  /* GUuid Tests */
+  g_test_add_func ("/uuid/string", test_guuid_string);
+  g_test_add_func ("/uuid/random", test_guuid_random);
+
+  return g_test_run ();
+}
diff --git a/po/POTFILES.in b/po/POTFILES.in
index a549f0546..4cb4150c5 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -195,4 +195,5 @@ glib/gspawn.c
 glib/gspawn-win32.c
 glib/gutf8.c
 glib/gutils.c
+glib/guuid.c
 gobject/gbinding.c
diff --git a/po/es.po b/po/es.po
index 51c7e01be..375d4c5ad 100644
--- a/po/es.po
+++ b/po/es.po
@@ -8,15 +8,15 @@
 #
 #
 # Jorge González <jorgegonz@svn.gnome.org>, 2007, 2008, 2009, 2010, 2011, 2012.
-# Daniel Mustieles <daniel.mustieles@gmail.com>, 2010, 2011, 2012, 2013, 2014, 2015, 2016.
+# Daniel Mustieles <daniel.mustieles@gmail.com>, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: glib.master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=glib&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2016-10-24 14:43+0000\n"
-"PO-Revision-Date: 2016-10-25 17:19+0200\n"
+"POT-Creation-Date: 2016-12-08 10:06+0000\n"
+"PO-Revision-Date: 2017-01-11 09:33+0100\n"
 "Last-Translator: Daniel Mustieles <daniel.mustieles@gmail.com>\n"
 "Language-Team: es <gnome-es-list@gnome.org>\n"
 "Language: es\n"
@@ -41,7 +41,6 @@ msgstr ""
 "de D-Bus)"
 
 #: ../gio/gapplication.c:550
-#| msgid "Override the application's ID"
 msgid "Override the application’s ID"
 msgstr "Omitir el ID de la aplicación"
 
@@ -82,7 +81,6 @@ msgid "Launch the application (with optional files to open)"
 msgstr "Lanzar la aplicación (con archivos opcionales que abrir)"
 
 #: ../gio/gapplication-tool.c:57
-#| msgid "APPID [FILE...]"
 msgid "APPID [FILE…]"
 msgstr "APPID [ARCHIVO...]"
 
@@ -125,8 +123,8 @@ msgid "Application identifier in D-Bus format (eg: org.example.viewer)"
 msgstr ""
 "Identificador de la aplicación en formato D-Bus (ej. org.example.viewer)"
 
-#: ../gio/gapplication-tool.c:72 ../gio/glib-compile-resources.c:622
-#: ../gio/glib-compile-resources.c:628 ../gio/glib-compile-resources.c:654
+#: ../gio/gapplication-tool.c:72 ../gio/glib-compile-resources.c:665
+#: ../gio/glib-compile-resources.c:671 ../gio/glib-compile-resources.c:698
 #: ../gio/gresource-tool.c:495 ../gio/gresource-tool.c:561
 msgid "FILE"
 msgstr "ARCHIVO"
@@ -172,7 +170,6 @@ msgid "Arguments:\n"
 msgstr "Argumentos:\n"
 
 #: ../gio/gapplication-tool.c:133
-#| msgid "[ARGS...]"
 msgid "[ARGS…]"
 msgstr "[ARGS…]"
 
@@ -184,9 +181,6 @@ msgstr "Comandos:\n"
 #. Translators: do not translate 'help', but please translate 'COMMAND'.
 #: ../gio/gapplication-tool.c:146
 #, c-format
-#| msgid ""
-#| "Use '%s help COMMAND' to get detailed help.\n"
-#| "\n"
 msgid ""
 "Use “%s help COMMAND” to get detailed help.\n"
 "\n"
@@ -205,16 +199,12 @@ msgstr ""
 
 #: ../gio/gapplication-tool.c:171
 #, c-format
-#| msgid "invalid application id: '%s'\n"
 msgid "invalid application id: “%s”\n"
 msgstr "ID de aplicación no válido: «%s»\n"
 
 #. Translators: %s is replaced with a command name like 'list-actions'
 #: ../gio/gapplication-tool.c:182
 #, c-format
-#| msgid ""
-#| "'%s' takes no arguments\n"
-#| "\n"
 msgid ""
 "“%s” takes no arguments\n"
 "\n"
@@ -240,9 +230,6 @@ msgstr ""
 
 #: ../gio/gapplication-tool.c:325
 #, c-format
-#| msgid ""
-#| "invalid action name: '%s'\n"
-#| "action names must consist of only alphanumerics, '-' and '.'\n"
 msgid ""
 "invalid action name: “%s”\n"
 "action names must consist of only alphanumerics, “-” and “.”\n"
@@ -339,21 +326,19 @@ msgstr "Hay una secuencia de bytes no válida en la entrada de conversión"
 msgid "Error during conversion: %s"
 msgstr "Falló durante la conversión: %s"
 
-#: ../gio/gcharsetconverter.c:444 ../gio/gsocket.c:1078
+#: ../gio/gcharsetconverter.c:444 ../gio/gsocket.c:1085
 msgid "Cancellable initialization not supported"
 msgstr "La inicialización cancelable no eestá soportada"
 
 #: ../gio/gcharsetconverter.c:454 ../glib/gconvert.c:321
 #: ../glib/giochannel.c:1384
 #, c-format
-#| msgid "Conversion from character set '%s' to '%s' is not supported"
 msgid "Conversion from character set “%s” to “%s” is not supported"
 msgstr ""
 "La conversión desde el conjunto de caracteres «%s» a «%s» no está soportada"
 
 #: ../gio/gcharsetconverter.c:458 ../glib/gconvert.c:325
 #, c-format
-#| msgid "Could not open converter from '%s' to '%s'"
 msgid "Could not open converter from “%s” to “%s”"
 msgstr "No se pudo abrir el conversor de «%s» a «%s»"
 
@@ -394,15 +379,11 @@ msgstr "Final de flujo inesperadamente prematuro"
 #: ../gio/gdbusaddress.c:153 ../gio/gdbusaddress.c:241
 #: ../gio/gdbusaddress.c:322
 #, c-format
-#| msgid "Unsupported key '%s' in address entry '%s'"
 msgid "Unsupported key “%s” in address entry “%s”"
 msgstr "Clave «%s» no soportada en la entrada de dirección «%s»"
 
 #: ../gio/gdbusaddress.c:180
 #, c-format
-#| msgid ""
-#| "Address '%s' is invalid (need exactly one of path, tmpdir or abstract "
-#| "keys)"
 msgid ""
 "Address “%s” is invalid (need exactly one of path, tmpdir or abstract keys)"
 msgstr ""
@@ -411,34 +392,27 @@ msgstr ""
 
 #: ../gio/gdbusaddress.c:193
 #, c-format
-#| msgid "Meaningless key/value pair combination in address entry '%s'"
 msgid "Meaningless key/value pair combination in address entry “%s”"
 msgstr ""
 "Combinación del par clave/valor sin sentido en la entrada de dirección «%s»"
 
 #: ../gio/gdbusaddress.c:256 ../gio/gdbusaddress.c:337
 #, c-format
-#| msgid "Error in address '%s' - the port attribute is malformed"
 msgid "Error in address “%s” — the port attribute is malformed"
 msgstr "Error en la dirección «%s»; el atributo de puerto está mal formado"
 
 #: ../gio/gdbusaddress.c:267 ../gio/gdbusaddress.c:348
 #, c-format
-#| msgid "Error in address '%s' - the family attribute is malformed"
 msgid "Error in address “%s” — the family attribute is malformed"
 msgstr "Error en la dirección «%s»; el atributo de familia está mal formado"
 
 #: ../gio/gdbusaddress.c:457
 #, c-format
-#| msgid "Address element '%s' does not contain a colon (:)"
 msgid "Address element “%s” does not contain a colon (:)"
 msgstr "El elemento de dirección «%s» no contiene dos puntos (:)"
 
 #: ../gio/gdbusaddress.c:478
 #, c-format
-#| msgid ""
-#| "Key/Value pair %d, '%s', in address element '%s' does not contain an "
-#| "equal sign"
 msgid ""
 "Key/Value pair %d, “%s”, in address element “%s” does not contain an equal "
 "sign"
@@ -448,9 +422,6 @@ msgstr ""
 
 #: ../gio/gdbusaddress.c:492
 #, c-format
-#| msgid ""
-#| "Error unescaping key or value in Key/Value pair %d, '%s', in address "
-#| "element '%s'"
 msgid ""
 "Error unescaping key or value in Key/Value pair %d, “%s”, in address element "
 "“%s”"
@@ -460,9 +431,6 @@ msgstr ""
 
 #: ../gio/gdbusaddress.c:570
 #, c-format
-#| msgid ""
-#| "Error in address '%s' - the unix transport requires exactly one of the "
-#| "keys 'path' or 'abstract' to be set"
 msgid ""
 "Error in address “%s” — the unix transport requires exactly one of the keys "
 "“path” or “abstract” to be set"
@@ -472,7 +440,6 @@ msgstr ""
 
 #: ../gio/gdbusaddress.c:606
 #, c-format
-#| msgid "Error in address '%s' - the host attribute is missing or malformed"
 msgid "Error in address “%s” — the host attribute is missing or malformed"
 msgstr ""
 "Error en la dirección «%s»: falta o está mal formado el atributo para el "
@@ -480,7 +447,6 @@ msgstr ""
 
 #: ../gio/gdbusaddress.c:620
 #, c-format
-#| msgid "Error in address '%s' - the port attribute is missing or malformed"
 msgid "Error in address “%s” — the port attribute is missing or malformed"
 msgstr ""
 "Error en la dirección «%s»: falta o está mal formado el atributo para el "
@@ -488,8 +454,6 @@ msgstr ""
 
 #: ../gio/gdbusaddress.c:634
 #, c-format
-#| msgid ""
-#| "Error in address '%s' - the noncefile attribute is missing or malformed"
 msgid "Error in address “%s” — the noncefile attribute is missing or malformed"
 msgstr ""
 "Error en la dirección «%s»: falta o está mal formado el atributo para el "
@@ -501,25 +465,21 @@ msgstr "Error al autolanzar: "
 
 #: ../gio/gdbusaddress.c:663
 #, c-format
-#| msgid "Unknown or unsupported transport '%s' for address '%s'"
 msgid "Unknown or unsupported transport “%s” for address “%s”"
 msgstr "Transporte «%s» desconocido o no soportado para la dirección «%s»"
 
 #: ../gio/gdbusaddress.c:699
 #, c-format
-#| msgid "Error opening nonce file '%s': %s"
 msgid "Error opening nonce file “%s”: %s"
 msgstr "Error al abrir el archivo de número usado una sola vez «%s»: %s"
 
 #: ../gio/gdbusaddress.c:717
 #, c-format
-#| msgid "Error reading from nonce file '%s': %s"
 msgid "Error reading from nonce file “%s”: %s"
 msgstr "Error al leer el archivo de número usado una sola vez «%s»: %s"
 
 #: ../gio/gdbusaddress.c:726
 #, c-format
-#| msgid "Error reading from nonce file '%s', expected 16 bytes, got %d"
 msgid "Error reading from nonce file “%s”, expected 16 bytes, got %d"
 msgstr ""
 "Error al leer el archivo de número usado una sola vez «%s», se esperaban 16 "
@@ -527,7 +487,6 @@ msgstr ""
 
 #: ../gio/gdbusaddress.c:744
 #, c-format
-#| msgid "Error writing contents of nonce file '%s' to stream:"
 msgid "Error writing contents of nonce file “%s” to stream:"
 msgstr ""
 "Error al escribir el contenido del archivo de número usado una sola vez «%s» "
@@ -553,7 +512,6 @@ msgstr "No se puede lanzar D-Bus automáticamente sin X11 $DISPLAY"
 
 #: ../gio/gdbusaddress.c:1120
 #, c-format
-#| msgid "Error spawning command line '%s': "
 msgid "Error spawning command line “%s”: "
 msgstr "Error al lanzar («spawn») el comando «%s»: "
 
@@ -562,24 +520,21 @@ msgstr "Error al lanzar («spawn») el comando «%s»: "
 msgid "(Type any character to close this window)\n"
 msgstr "(Escriba un carácter cualquiera para cerrar esta ventana)\n"
 
-#: ../gio/gdbusaddress.c:1489
+#: ../gio/gdbusaddress.c:1491
 #, c-format
 msgid "Session dbus not running, and autolaunch failed"
 msgstr ""
 "La sesión de dbus no está en ejecución, y falló el lanzamiento automático"
 
-#: ../gio/gdbusaddress.c:1500
+#: ../gio/gdbusaddress.c:1502
 #, c-format
 msgid "Cannot determine session bus address (not implemented for this OS)"
 msgstr ""
 "No se puede determinar la dirección del bus de sesión (no implementado para "
 "este SO)"
 
-#: ../gio/gdbusaddress.c:1635
+#: ../gio/gdbusaddress.c:1637
 #, c-format
-#| msgid ""
-#| "Cannot determine bus address from DBUS_STARTER_BUS_TYPE environment "
-#| "variable - unknown value '%s'"
 msgid ""
 "Cannot determine bus address from DBUS_STARTER_BUS_TYPE environment variable "
 "— unknown value “%s”"
@@ -587,7 +542,7 @@ msgstr ""
 "No se puede determinar la dirección del bus desde la variable de entorno "
 "DBUS_STARTER_BUS_TYPE; variable «%s» desconocida"
 
-#: ../gio/gdbusaddress.c:1644 ../gio/gdbusconnection.c:7142
+#: ../gio/gdbusaddress.c:1646 ../gio/gdbusconnection.c:7142
 msgid ""
 "Cannot determine bus address because the DBUS_STARTER_BUS_TYPE environment "
 "variable is not set"
@@ -595,7 +550,7 @@ msgstr ""
 "No se puede determinar la dirección del bus porque la variable de entorno "
 "DBUS_STARTER_BUS_TYPE no está establecida"
 
-#: ../gio/gdbusaddress.c:1654
+#: ../gio/gdbusaddress.c:1656
 #, c-format
 msgid "Unknown bus type %d"
 msgstr "Tipo de bus %d desconocido"
@@ -623,14 +578,11 @@ msgstr "Cancelado a través de GDBusAuthObserver::authorize-authenticated-peer"
 
 #: ../gio/gdbusauthmechanismsha1.c:261
 #, c-format
-#| msgid "Error when getting information for directory '%s': %s"
 msgid "Error when getting information for directory “%s”: %s"
 msgstr "Error al obtener la información de la carpeta «%s»: %s"
 
 #: ../gio/gdbusauthmechanismsha1.c:273
 #, c-format
-#| msgid ""
-#| "Permissions on directory '%s' are malformed. Expected mode 0700, got 0%o"
 msgid ""
 "Permissions on directory “%s” are malformed. Expected mode 0700, got 0%o"
 msgstr ""
@@ -639,19 +591,16 @@ msgstr ""
 
 #: ../gio/gdbusauthmechanismsha1.c:294
 #, c-format
-#| msgid "Error creating directory %s: %s"
 msgid "Error creating directory “%s”: %s"
 msgstr "Error al crear la carpeta %s: %s"
 
 #: ../gio/gdbusauthmechanismsha1.c:377
 #, c-format
-#| msgid "Error opening keyring '%s' for reading: "
 msgid "Error opening keyring “%s” for reading: "
 msgstr "Error al abrir el depósito de claves «%s» para su lectura: "
 
 #: ../gio/gdbusauthmechanismsha1.c:401 ../gio/gdbusauthmechanismsha1.c:714
 #, c-format
-#| msgid "Line %d of the keyring at '%s' with content '%s' is malformed"
 msgid "Line %d of the keyring at “%s” with content “%s” is malformed"
 msgstr ""
 "La línea %d del depósito de claves en «%s» con contenido «%s» está mal "
@@ -659,9 +608,6 @@ msgstr ""
 
 #: ../gio/gdbusauthmechanismsha1.c:415 ../gio/gdbusauthmechanismsha1.c:728
 #, c-format
-#| msgid ""
-#| "First token of line %d of the keyring at '%s' with content '%s' is "
-#| "malformed"
 msgid ""
 "First token of line %d of the keyring at “%s” with content “%s” is malformed"
 msgstr ""
@@ -670,9 +616,6 @@ msgstr ""
 
 #: ../gio/gdbusauthmechanismsha1.c:430 ../gio/gdbusauthmechanismsha1.c:742
 #, c-format
-#| msgid ""
-#| "Second token of line %d of the keyring at '%s' with content '%s' is "
-#| "malformed"
 msgid ""
 "Second token of line %d of the keyring at “%s” with content “%s” is malformed"
 msgstr ""
@@ -681,43 +624,36 @@ msgstr ""
 
 #: ../gio/gdbusauthmechanismsha1.c:454
 #, c-format
-#| msgid "Didn't find cookie with id %d in the keyring at '%s'"
 msgid "Didn’t find cookie with id %d in the keyring at “%s”"
 msgstr "No se encontró la «cookie» con ID %d en el depósito de claves en «%s»"
 
 #: ../gio/gdbusauthmechanismsha1.c:532
 #, c-format
-#| msgid "Error deleting stale lock file '%s': %s"
 msgid "Error deleting stale lock file “%s”: %s"
 msgstr "Error al eliminar el archivo de bloqueo antiguo «%s»: %s"
 
 #: ../gio/gdbusauthmechanismsha1.c:564
 #, c-format
-#| msgid "Error creating lock file '%s': %s"
 msgid "Error creating lock file “%s”: %s"
 msgstr "Error al crear el archivo de bloqueo «%s»: %s"
 
 #: ../gio/gdbusauthmechanismsha1.c:594
 #, c-format
-#| msgid "Error closing (unlinked) lock file '%s': %s"
 msgid "Error closing (unlinked) lock file “%s”: %s"
 msgstr "Error al cerrar (desenlazar) el archivo de bloqueo «%s»: %s"
 
 #: ../gio/gdbusauthmechanismsha1.c:604
 #, c-format
-#| msgid "Error unlinking lock file '%s': %s"
 msgid "Error unlinking lock file “%s”: %s"
 msgstr "Error al desenlazar el archivo de bloqueo «%s»: %s"
 
 #: ../gio/gdbusauthmechanismsha1.c:681
 #, c-format
-#| msgid "Error opening keyring '%s' for writing: "
 msgid "Error opening keyring “%s” for writing: "
 msgstr "Error al abrir el depósito de claves «%s» para su escritura:"
 
 #: ../gio/gdbusauthmechanismsha1.c:878
 #, c-format
-#| msgid "(Additionally, releasing the lock for '%s' also failed: %s) "
 msgid "(Additionally, releasing the lock for “%s” also failed: %s) "
 msgstr ""
 "(Adicionalmente, también falló la liberación del bloqueo para «%s»: %s)"
@@ -876,7 +812,6 @@ msgstr[1] "Se querían leer %lu bytes pero sólo se obtuvo %lu"
 
 #: ../gio/gdbusmessage.c:1369
 #, c-format
-#| msgid "Expected NUL byte after the string '%s' but found byte %d"
 msgid "Expected NUL byte after the string “%s” but found byte %d"
 msgstr ""
 "Se esperaba el byte NULL después de la cadena «%s» pero se encontró el byte "
@@ -884,10 +819,6 @@ msgstr ""
 
 #: ../gio/gdbusmessage.c:1388
 #, c-format
-#| msgid ""
-#| "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'"
 msgid ""
 "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”"
@@ -898,13 +829,11 @@ msgstr ""
 
 #: ../gio/gdbusmessage.c:1587
 #, c-format
-#| msgid "Parsed value '%s' is not a valid D-Bus object path"
 msgid "Parsed value “%s” is not a valid D-Bus object path"
 msgstr "El valor analizado «%s» no es un objeto de ruta D-Bus válido"
 
 #: ../gio/gdbusmessage.c:1609
 #, c-format
-#| msgid "Parsed value '%s' is not a valid D-Bus signature"
 msgid "Parsed value “%s” is not a valid D-Bus signature"
 msgstr "El valor analizado «%s» no es una firma de D-Bus válida"
 
@@ -923,9 +852,6 @@ msgstr[1] ""
 
 #: ../gio/gdbusmessage.c:1676
 #, c-format
-#| msgid ""
-#| "Encountered array of type 'a%c', expected to have a length a multiple of "
-#| "%u bytes, but found to be %u bytes in length"
 msgid ""
 "Encountered array of type “a%c”, expected to have a length a multiple of %u "
 "bytes, but found to be %u bytes in length"
@@ -935,16 +861,12 @@ msgstr ""
 
 #: ../gio/gdbusmessage.c:1843
 #, c-format
-#| msgid "Parsed value '%s' for variant is not a valid D-Bus signature"
 msgid "Parsed value “%s” for variant is not a valid D-Bus signature"
 msgstr ""
 "El valor analizado «%s» para la variante no es una firma de D-Bus válida"
 
 #: ../gio/gdbusmessage.c:1867
 #, c-format
-#| msgid ""
-#| "Error deserializing GVariant with type string '%s' from the D-Bus wire "
-#| "format"
 msgid ""
 "Error deserializing GVariant with type string “%s” from the D-Bus wire format"
 msgstr ""
@@ -953,9 +875,6 @@ msgstr ""
 
 #: ../gio/gdbusmessage.c:2051
 #, c-format
-#| msgid ""
-#| "Invalid endianness value. Expected 0x6c ('l') or 0x42 ('B') but found "
-#| "value 0x%02x"
 msgid ""
 "Invalid endianness value. Expected 0x6c (“l”) or 0x42 (“B”) but found value "
 "0x%02x"
@@ -972,7 +891,6 @@ msgstr ""
 
 #: ../gio/gdbusmessage.c:2120
 #, c-format
-#| msgid "Signature header with signature '%s' found but message body is empty"
 msgid "Signature header with signature “%s” found but message body is empty"
 msgstr ""
 "Se encontró la cabecera de firma con firma «%s» pero el cuerpo del mensaje "
@@ -980,7 +898,6 @@ msgstr ""
 
 #: ../gio/gdbusmessage.c:2134
 #, c-format
-#| msgid "Parsed value '%s' is not a valid D-Bus signature (for body)"
 msgid "Parsed value “%s” is not a valid D-Bus signature (for body)"
 msgstr ""
 "El valor analizado «%s» no es una firma de D-Bus válida (para el cuerpo)"
@@ -1002,8 +919,6 @@ msgstr "No se puede deserializar el mensaje: "
 
 #: ../gio/gdbusmessage.c:2515
 #, c-format
-#| msgid ""
-#| "Error serializing GVariant with type string '%s' to the D-Bus wire format"
 msgid ""
 "Error serializing GVariant with type string “%s” to the D-Bus wire format"
 msgstr ""
@@ -1025,16 +940,12 @@ msgstr "No se puede serializar el mensaje: "
 
 #: ../gio/gdbusmessage.c:2704
 #, c-format
-#| msgid "Message body has signature '%s' but there is no signature header"
 msgid "Message body has signature “%s” but there is no signature header"
 msgstr ""
 "El cuerpo del mensaje tiene la firma «%s» pero no existe la cabecera de firma"
 
 #: ../gio/gdbusmessage.c:2714
 #, c-format
-#| msgid ""
-#| "Message body has type signature '%s' but signature in the header field is "
-#| "'%s'"
 msgid ""
 "Message body has type signature “%s” but signature in the header field is "
 "“%s”"
@@ -1044,7 +955,6 @@ msgstr ""
 
 #: ../gio/gdbusmessage.c:2730
 #, c-format
-#| msgid "Message body is empty but signature in the header field is '(%s)'"
 msgid "Message body is empty but signature in the header field is “(%s)”"
 msgstr ""
 "El cuerpo del mensaje está vacío pero la firma en el campo de cabecera es "
@@ -1052,7 +962,6 @@ msgstr ""
 
 #: ../gio/gdbusmessage.c:3283
 #, c-format
-#| msgid "Error return with body of type '%s'"
 msgid "Error return with body of type “%s”"
 msgstr "Error al devolver el cuerpo de tipo «%s»"
 
@@ -1100,33 +1009,21 @@ msgstr ""
 
 #: ../gio/gdbusserver.c:873
 #, c-format
-#| msgid "Error writing nonce file at '%s': %s"
 msgid "Error writing nonce file at “%s”: %s"
 msgstr "Error al escribir el archivo de número usado una sola vez en «%s»: %s"
 
 #: ../gio/gdbusserver.c:1044
 #, c-format
-#| msgid "The string '%s' is not a valid D-Bus GUID"
 msgid "The string “%s” is not a valid D-Bus GUID"
 msgstr "La cadena «%s» no es un GUID válido de D-Bus"
 
 #: ../gio/gdbusserver.c:1084
 #, c-format
-#| msgid "Cannot listen on unsupported transport '%s'"
 msgid "Cannot listen on unsupported transport “%s”"
 msgstr "No se puede escuchar en un transporte no soportado «%s»"
 
 #: ../gio/gdbus-tool.c:95
 #, c-format
-#| msgid ""
-#| "Commands:\n"
-#| "  help         Shows this information\n"
-#| "  introspect   Introspect a remote object\n"
-#| "  monitor      Monitor a remote object\n"
-#| "  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"
 msgid ""
 "Commands:\n"
 "  help         Shows this information\n"
@@ -1195,8 +1092,6 @@ msgstr "Se especificaron varios puntos de conexión extremos"
 
 #: ../gio/gdbus-tool.c:471
 #, c-format
-#| msgid ""
-#| "Warning: According to introspection data, interface '%s' does not exist\n"
 msgid ""
 "Warning: According to introspection data, interface “%s” does not exist\n"
 msgstr ""
@@ -1205,9 +1100,6 @@ msgstr ""
 
 #: ../gio/gdbus-tool.c:480
 #, c-format
-#| msgid ""
-#| "Warning: According to introspection data, method '%s' does not exist on "
-#| "interface '%s'\n"
 msgid ""
 "Warning: According to introspection data, method “%s” does not exist on "
 "interface “%s”\n"
@@ -1326,13 +1218,11 @@ msgstr "Error: no se especificó el nombre del método\n"
 
 #: ../gio/gdbus-tool.c:950
 #, c-format
-#| msgid "Error: Method name '%s' is invalid\n"
 msgid "Error: Method name “%s” is invalid\n"
 msgstr "Error: el nombre del método «%s» no es válido\n"
 
 #: ../gio/gdbus-tool.c:1028
 #, c-format
-#| msgid "Error parsing parameter %d of type '%s': %s\n"
 msgid "Error parsing parameter %d of type “%s”: %s\n"
 msgstr "Error al analizar el parámetro %d del tipo «%s»: %s\n"
 
@@ -1372,50 +1262,45 @@ msgstr "Ruta objeto para monitorizar"
 msgid "Monitor a remote object."
 msgstr "Monitorizar un objeto remoto."
 
-#: ../gio/gdesktopappinfo.c:1994 ../gio/gdesktopappinfo.c:4501
+#: ../gio/gdesktopappinfo.c:1997 ../gio/gdesktopappinfo.c:4504
 msgid "Unnamed"
 msgstr "Sin nombre"
 
-#: ../gio/gdesktopappinfo.c:2404
-#| msgid "Desktop file didn't specify Exec field"
+#: ../gio/gdesktopappinfo.c:2407
 msgid "Desktop file didn’t specify Exec field"
 msgstr "El archivo de escritorio no especificó el campo Exec"
 
-#: ../gio/gdesktopappinfo.c:2689
+#: ../gio/gdesktopappinfo.c:2692
 msgid "Unable to find terminal required for application"
 msgstr "Imposible encontrar el terminal requerido por la aplicación"
 
-#: ../gio/gdesktopappinfo.c:3097
+#: ../gio/gdesktopappinfo.c:3100
 #, c-format
-#| msgid "Can't create user application configuration folder %s: %s"
 msgid "Can’t create user application configuration folder %s: %s"
 msgstr ""
 "No se puede crear la carpeta de configuración de la aplicación %s del "
 "usuario: %s"
 
-#: ../gio/gdesktopappinfo.c:3101
+#: ../gio/gdesktopappinfo.c:3104
 #, c-format
-#| msgid "Can't create user MIME configuration folder %s: %s"
 msgid "Can’t create user MIME configuration folder %s: %s"
 msgstr "No se puede crear la carpeta de configuración MIME %s del usuario: %s"
 
-#: ../gio/gdesktopappinfo.c:3341 ../gio/gdesktopappinfo.c:3365
+#: ../gio/gdesktopappinfo.c:3344 ../gio/gdesktopappinfo.c:3368
 msgid "Application information lacks an identifier"
 msgstr "La información de la aplicación carece de un identificador"
 
-#: ../gio/gdesktopappinfo.c:3599
+#: ../gio/gdesktopappinfo.c:3602
 #, c-format
-#| msgid "Can't create user desktop file %s"
 msgid "Can’t create user desktop file %s"
 msgstr "No se puede crear el archivo de escritorio %s del usuario"
 
-#: ../gio/gdesktopappinfo.c:3733
+#: ../gio/gdesktopappinfo.c:3736
 #, c-format
 msgid "Custom definition for %s"
 msgstr "Definición personalizada para %s"
 
 #: ../gio/gdrive.c:417
-#| msgid "drive doesn't implement eject"
 msgid "drive doesn’t implement eject"
 msgstr "la unidad no implementa la expulsión"
 
@@ -1423,22 +1308,18 @@ msgstr "la unidad no implementa la expulsión"
 #. * message for drive objects that
 #. * don't implement any of eject or eject_with_operation.
 #: ../gio/gdrive.c:495
-#| msgid "drive doesn't implement eject or eject_with_operation"
 msgid "drive doesn’t implement eject or eject_with_operation"
 msgstr "la unidad no implementa la expulsión o expulsión con operación"
 
 #: ../gio/gdrive.c:571
-#| msgid "drive doesn't implement polling for media"
 msgid "drive doesn’t implement polling for media"
 msgstr "la unidad no implementa el sondeo para medios"
 
 #: ../gio/gdrive.c:776
-#| msgid "drive doesn't implement start"
 msgid "drive doesn’t implement start"
 msgstr "la unidad no implementa reproducir"
 
 #: ../gio/gdrive.c:878
-#| msgid "drive doesn't implement stop"
 msgid "drive doesn’t implement stop"
 msgstr "la unidad no implementa detener"
 
@@ -1453,7 +1334,6 @@ msgstr "Soporte de DTSL no disponible"
 
 #: ../gio/gemblem.c:323
 #, c-format
-#| msgid "Can't handle version %d of GEmblem encoding"
 msgid "Can’t handle version %d of GEmblem encoding"
 msgstr "No se puede manejar la versión %d de la codificación GEmblem"
 
@@ -1464,7 +1344,6 @@ msgstr "Número de tokens (%d) mal formados en la codificación GEmblem"
 
 #: ../gio/gemblemedicon.c:362
 #, c-format
-#| msgid "Can't handle version %d of GEmblemedIcon encoding"
 msgid "Can’t handle version %d of GEmblemedIcon encoding"
 msgstr "No se puede manejar la versión %d de la codificación GEmblemedIcon"
 
@@ -1498,12 +1377,10 @@ msgid "Containing mount does not exist"
 msgstr "El punto de montaje contenido no existe"
 
 #: ../gio/gfile.c:2515 ../gio/glocalfile.c:2375
-#| msgid "Can't copy over directory"
 msgid "Can’t copy over directory"
 msgstr "No se puede copiar sobre la carpeta"
 
 #: ../gio/gfile.c:2575
-#| msgid "Can't copy directory over directory"
 msgid "Can’t copy directory over directory"
 msgstr "No se puede copiar una carpeta sobre otra"
 
@@ -1512,7 +1389,6 @@ msgid "Target file exists"
 msgstr "El archivo destino ya existe"
 
 #: ../gio/gfile.c:2602
-#| msgid "Can't recursively copy directory"
 msgid "Can’t recursively copy directory"
 msgstr "No se puede copiar la carpeta recursivamente"
 
@@ -1534,12 +1410,10 @@ msgid "Copy (reflink/clone) is not supported or invalid"
 msgstr "Copiar (reflink/clone) no está soportado o no es válido"
 
 #: ../gio/gfile.c:3028
-#| msgid "Copy (reflink/clone) is not supported or didn't work"
 msgid "Copy (reflink/clone) is not supported or didn’t work"
 msgstr "Copiar (reflink/clone) no está soportado o no ha funcionado"
 
 #: ../gio/gfile.c:3091
-#| msgid "Can't copy special file"
 msgid "Can’t copy special file"
 msgstr "No se puede copiar el archivo especial"
 
@@ -1553,12 +1427,10 @@ msgstr "No se soporta mover a la papelera"
 
 #: ../gio/gfile.c:4158
 #, c-format
-#| msgid "File names cannot contain '%c'"
 msgid "File names cannot contain “%c”"
 msgstr "Los nombres de archivo no pueden contener «%c»"
 
 #: ../gio/gfile.c:6604 ../gio/gvolume.c:363
-#| msgid "volume doesn't implement mount"
 msgid "volume doesn’t implement mount"
 msgstr "el volumen no implementa el montaje"
 
@@ -1581,7 +1453,6 @@ msgstr "El enumerador del archivo ya está cerrado"
 
 #: ../gio/gfileicon.c:236
 #, c-format
-#| msgid "Can't handle version %d of GFileIcon encoding"
 msgid "Can’t handle version %d of GFileIcon encoding"
 msgstr "No se puede manejar la versión %d de la codificación GFileIcon"
 
@@ -1592,7 +1463,6 @@ msgstr "Datos de entrada mal formados para GFileIcon"
 #: ../gio/gfileinputstream.c:149 ../gio/gfileinputstream.c:394
 #: ../gio/gfileiostream.c:167 ../gio/gfileoutputstream.c:164
 #: ../gio/gfileoutputstream.c:497
-#| msgid "Stream doesn't support query_info"
 msgid "Stream doesn’t support query_info"
 msgstr "El flujo no soporta query_info"
 
@@ -1665,7 +1535,6 @@ msgid "Type %s does not implement from_tokens() on the GIcon interface"
 msgstr "El tipo %s no implementa from_tokens() en la interfaz GIcon"
 
 #: ../gio/gicon.c:461
-#| msgid "Can't handle the supplied version of the icon encoding"
 msgid "Can’t handle the supplied version of the icon encoding"
 msgstr ""
 "No se puede manejar la versión proporcionada de la codificación de icono"
@@ -1685,12 +1554,11 @@ msgstr "La dirección tiene bits más allá de la longitud del prefijo"
 
 #: ../gio/ginetaddressmask.c:300
 #, c-format
-#| msgid "Could not parse '%s' as IP address mask"
 msgid "Could not parse “%s” as IP address mask"
 msgstr "No se pudo analizar «%s» como una máscara de una dirección IP"
 
 #: ../gio/ginetsocketaddress.c:203 ../gio/ginetsocketaddress.c:220
-#: ../gio/gnativesocketaddress.c:106 ../gio/gunixsocketaddress.c:216
+#: ../gio/gnativesocketaddress.c:106 ../gio/gunixsocketaddress.c:218
 msgid "Not enough space for socket address"
 msgstr "No hay suficiente espacio para la dirección del socket"
 
@@ -1699,7 +1567,6 @@ msgid "Unsupported socket address"
 msgstr "Dirección del socket no soportada"
 
 #: ../gio/ginputstream.c:188
-#| msgid "Input stream doesn't implement read"
 msgid "Input stream doesn’t implement read"
 msgstr "El flujo de entrada no implementa la lectura"
 
@@ -1723,7 +1590,6 @@ msgid "Keep with file when moved"
 msgstr "Mantener con archivo cuando se mueva"
 
 #: ../gio/gio-tool.c:187
-#| msgid "'version' takes no arguments"
 msgid "“version” takes no arguments"
 msgstr "«version» no lleva ningún argumento"
 
@@ -1906,7 +1772,6 @@ msgstr "El destino %s no es una carpeta"
 
 #: ../gio/gio-tool-copy.c:187 ../gio/gio-tool-move.c:181
 #, c-format
-#| msgid "%s: overwrite '%s'? "
 msgid "%s: overwrite “%s”? "
 msgstr "%s: ¿sobrescribir «%s» ? "
 
@@ -1928,7 +1793,6 @@ msgstr "ATRIBUTOS"
 
 #: ../gio/gio-tool-info.c:37 ../gio/gio-tool-list.c:38
 #: ../gio/gio-tool-set.c:34
-#| msgid "Don't follow symbolic links"
 msgid "Don’t follow symbolic links"
 msgstr "No seguir enlaces simbólicos"
 
@@ -1994,12 +1858,6 @@ msgid "Show information about locations."
 msgstr "Mostrar información sobre las ubicaciones."
 
 #: ../gio/gio-tool-info.c:285
-#| msgid ""
-#| "gio info is similar to the traditional ls utility, but using GIO\n"
-#| "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"
 msgid ""
 "gio info is similar to the traditional ls utility, but using GIO\n"
 "locations instead of local files: for example, you can use something\n"
@@ -2078,13 +1936,11 @@ msgstr "Debe especificar un único tipo MIME, y tal vez un manejador"
 
 #: ../gio/gio-tool-mime.c:113
 #, c-format
-#| msgid "No default applications for '%s'\n"
 msgid "No default applications for “%s”\n"
 msgstr "No hay aplicación predeterminada para «%s»\n"
 
 #: ../gio/gio-tool-mime.c:119
 #, c-format
-#| msgid "Default application for '%s': %s\n"
 msgid "Default application for “%s”: %s\n"
 msgstr "Aplicación predeterminada para «%s»: %s\n"
 
@@ -2110,13 +1966,11 @@ msgstr "No hay aplicaciones recomendadas\n"
 
 #: ../gio/gio-tool-mime.c:159
 #, c-format
-#| msgid "Failed to load info for handler '%s'\n"
 msgid "Failed to load info for handler “%s”\n"
 msgstr "Falló al cargar la información para el manejador «%s»\n"
 
 #: ../gio/gio-tool-mime.c:165
 #, c-format
-#| msgid "Failed to set '%s' as the default handler for '%s': %s\n"
 msgid "Failed to set “%s” as the default handler for “%s”: %s\n"
 msgstr ""
 "Falló al establecer el manejador «%s» como predeterminado para «%s»: %s\n"
@@ -2154,7 +2008,6 @@ msgstr ""
 "enlaces duros)"
 
 #: ../gio/gio-tool-monitor.c:43
-#| msgid "Monitors a file directly, but doesn't report changes"
 msgid "Monitors a file directly, but doesn’t report changes"
 msgstr "Monitoriza un archivo directamente, pero no informa de los cambios"
 
@@ -2266,7 +2119,6 @@ msgid "Mount or unmount the locations."
 msgstr "Montar o desmontar las ubicaciones."
 
 #: ../gio/gio-tool-move.c:42
-#| msgid "Don't use copy and delete fallback"
 msgid "Don’t use copy and delete fallback"
 msgstr "No usar copia y eliminación de reserva"
 
@@ -2454,19 +2306,16 @@ msgstr "El archivo %s aparece varias veces en el recurso"
 
 #: ../gio/glib-compile-resources.c:248
 #, c-format
-#| msgid "Failed to locate '%s' in any source directory"
 msgid "Failed to locate “%s” in any source directory"
 msgstr "Falló al buscar «%s» en cualquier carpeta fuente"
 
 #: ../gio/glib-compile-resources.c:259
 #, c-format
-#| msgid "Failed to locate '%s' in current directory"
 msgid "Failed to locate “%s” in current directory"
 msgstr "Falló al buscar «%s» en la carpeta actual"
 
 #: ../gio/glib-compile-resources.c:290
 #, c-format
-#| msgid "Unknown processing option \"%s\""
 msgid "Unknown processing option “%s”"
 msgstr "Opción de procesado desconocida «%s»"
 
@@ -2490,15 +2339,15 @@ msgstr "Error al comprimir el archivo %s"
 msgid "text may not appear inside <%s>"
 msgstr "El texto no debe aparecer dentro de <%s>"
 
-#: ../gio/glib-compile-resources.c:621 ../gio/glib-compile-schemas.c:2037
+#: ../gio/glib-compile-resources.c:664 ../gio/glib-compile-schemas.c:2037
 msgid "Show program version and exit"
 msgstr "Mostrar la versión del programa y salir"
 
-#: ../gio/glib-compile-resources.c:622
+#: ../gio/glib-compile-resources.c:665
 msgid "name of the output file"
 msgstr "nombre del archivo de salida"
 
-#: ../gio/glib-compile-resources.c:623
+#: ../gio/glib-compile-resources.c:666
 msgid ""
 "The directories where files are to be read from (default to current "
 "directory)"
@@ -2506,51 +2355,53 @@ msgstr ""
 "La carpeta de la que se tienen que leer los archivos (la predeterminada es "
 "la carpeta actual)"
 
-#: ../gio/glib-compile-resources.c:623 ../gio/glib-compile-schemas.c:2038
+#: ../gio/glib-compile-resources.c:666 ../gio/glib-compile-schemas.c:2038
 #: ../gio/glib-compile-schemas.c:2067
 msgid "DIRECTORY"
 msgstr "CARPETA"
 
-#: ../gio/glib-compile-resources.c:624
+#: ../gio/glib-compile-resources.c:667
 msgid ""
 "Generate output in the format selected for by the target filename extension"
 msgstr ""
 "Generar salida en el formato seleccionado por la extensión del nombre del "
 "archivo objetivo"
 
-#: ../gio/glib-compile-resources.c:625
+#: ../gio/glib-compile-resources.c:668
 msgid "Generate source header"
 msgstr "Generar cabecera fuente"
 
-#: ../gio/glib-compile-resources.c:626
+#: ../gio/glib-compile-resources.c:669
 msgid "Generate sourcecode used to link in the resource file into your code"
 msgstr ""
 "Generar el código fuente usado para enlazar el archivo del recurso en su "
 "código fuente"
 
-#: ../gio/glib-compile-resources.c:627
+#: ../gio/glib-compile-resources.c:670
 msgid "Generate dependency list"
 msgstr "Generar lista de dependencias"
 
-#: ../gio/glib-compile-resources.c:628
+#: ../gio/glib-compile-resources.c:671
 msgid "name of the dependency file to generate"
 msgstr "nombre del archivo de dependencias que generar"
 
-#: ../gio/glib-compile-resources.c:629
-#| msgid "Don't automatically create and register resource"
+#: ../gio/glib-compile-resources.c:672
+msgid "Include phony targets in the generated dependency file"
+msgstr "Incluir objetivos falsos en el archivo de dependencias generado"
+
+#: ../gio/glib-compile-resources.c:673
 msgid "Don’t automatically create and register resource"
 msgstr "No crear y registrar automáticamente un recurso"
 
-#: ../gio/glib-compile-resources.c:630
-#| msgid "Don't export functions; declare them G_GNUC_INTERNAL"
+#: ../gio/glib-compile-resources.c:674
 msgid "Don’t export functions; declare them G_GNUC_INTERNAL"
 msgstr "No exportar funciones; declararlas como G_GNUC_INTERNAL"
 
-#: ../gio/glib-compile-resources.c:631
+#: ../gio/glib-compile-resources.c:675
 msgid "C identifier name used for the generated source code"
 msgstr "Nombre del identificador C usado para el código fuente generado"
 
-#: ../gio/glib-compile-resources.c:657
+#: ../gio/glib-compile-resources.c:701
 msgid ""
 "Compile a resource specification into a resource file.\n"
 "Resource specification files have the extension .gresource.xml,\n"
@@ -2561,7 +2412,7 @@ msgstr ""
 "gresource.xml,\n"
 "y el archivo del recurso debe tener la extensión se llama .gresource."
 
-#: ../gio/glib-compile-resources.c:679
+#: ../gio/glib-compile-resources.c:723
 #, c-format
 msgid "You should give exactly one file name\n"
 msgstr "Deberá proporcionar exactamente un nombre de archivo\n"
@@ -2853,7 +2704,6 @@ msgid "Containing mount for file %s not found"
 msgstr "No se ha encontrado el punto de montaje para el archivo %s"
 
 #: ../gio/glocalfile.c:1199
-#| msgid "Can't rename root directory"
 msgid "Can’t rename root directory"
 msgstr "No se puede renombrar la carpeta raíz"
 
@@ -2863,7 +2713,6 @@ msgid "Error renaming file %s: %s"
 msgstr "Error al leer el archivo %s: %s"
 
 #: ../gio/glocalfile.c:1224
-#| msgid "Can't rename file, filename already exists"
 msgid "Can’t rename file, filename already exists"
 msgstr "No se puede renombrar el archivo, el nombre de archivo ya existe"
 
@@ -2948,7 +2797,6 @@ msgid "Error moving file %s: %s"
 msgstr "Error al mover el archivo %s: %s"
 
 #: ../gio/glocalfile.c:2370
-#| msgid "Can't move directory over directory"
 msgid "Can’t move directory over directory"
 msgstr "No se puede mover una carpeta sobre una carpeta"
 
@@ -2986,7 +2834,6 @@ msgstr "Nombre extendido del atributo no válido"
 
 #: ../gio/glocalfileinfo.c:775
 #, c-format
-#| msgid "Error setting extended attribute '%s': %s"
 msgid "Error setting extended attribute “%s”: %s"
 msgstr "Error al establecer el atributo extendido «%s»: %s"
 
@@ -2996,7 +2843,6 @@ msgstr " (codificación no válida)"
 
 #: ../gio/glocalfileinfo.c:1766 ../gio/glocalfileoutputstream.c:803
 #, c-format
-#| msgid "Error when getting information for file '%s': %s"
 msgid "Error when getting information for file “%s”: %s"
 msgstr "Error al obtener la información del archivo «%s»: %s"
 
@@ -3122,7 +2968,6 @@ msgstr "Error al truncar el archivo: %s"
 #: ../gio/glocalfileoutputstream.c:555 ../gio/glocalfileoutputstream.c:785
 #: ../gio/glocalfileoutputstream.c:1035 ../gio/gsubprocess.c:360
 #, c-format
-#| msgid "Error opening file %s: %s"
 msgid "Error opening file “%s”: %s"
 msgstr "Error al abrir el archivo %s: %s"
 
@@ -3183,7 +3028,6 @@ msgstr "La búsqueda solicitada después del final del flujo"
 #. * message for mount objects that
 #. * don't implement unmount.
 #: ../gio/gmount.c:393
-#| msgid "mount doesn't implement \"unmount\""
 msgid "mount doesn’t implement “unmount”"
 msgstr "el punto de montaje no implementa el desmontado («unmount»)"
 
@@ -3191,7 +3035,6 @@ msgstr "el punto de montaje no implementa el desmontado («unmount»)"
 #. * message for mount objects that
 #. * don't implement eject.
 #: ../gio/gmount.c:469
-#| msgid "mount doesn't implement \"eject\""
 msgid "mount doesn’t implement “eject”"
 msgstr "el punto de montaje no implementa la expulsión («eject»)"
 
@@ -3199,7 +3042,6 @@ msgstr "el punto de montaje no implementa la expulsión («eject»)"
 #. * message for mount objects that
 #. * don't implement any of unmount or unmount_with_operation.
 #: ../gio/gmount.c:547
-#| msgid "mount doesn't implement \"unmount\" or \"unmount_with_operation\""
 msgid "mount doesn’t implement “unmount” or “unmount_with_operation”"
 msgstr ""
 "el punto de montaje no implementa desmontado («umount») o desmontado con "
@@ -3209,7 +3051,6 @@ msgstr ""
 #. * message for mount objects that
 #. * don't implement any of eject or eject_with_operation.
 #: ../gio/gmount.c:632
-#| msgid "mount doesn't implement \"eject\" or \"eject_with_operation\""
 msgid "mount doesn’t implement “eject” or “eject_with_operation”"
 msgstr ""
 "el punto de montaje no implementa la expulsión («eject») o expulsión con "
@@ -3219,7 +3060,6 @@ msgstr ""
 #. * message for mount objects that
 #. * don't implement remount.
 #: ../gio/gmount.c:720
-#| msgid "mount doesn't implement \"remount\""
 msgid "mount doesn’t implement “remount”"
 msgstr "el punto de montaje no implementa el remontado («remount»)"
 
@@ -3227,7 +3067,6 @@ msgstr "el punto de montaje no implementa el remontado («remount»)"
 #. * message for mount objects that
 #. * don't implement content type guessing.
 #: ../gio/gmount.c:802
-#| msgid "mount doesn't implement content type guessing"
 msgid "mount doesn’t implement content type guessing"
 msgstr "el punto de montaje no implementa averiguación del tipo de contenido"
 
@@ -3235,14 +3074,12 @@ msgstr "el punto de montaje no implementa averiguación del tipo de contenido"
 #. * message for mount objects that
 #. * don't implement content type guessing.
 #: ../gio/gmount.c:889
-#| msgid "mount doesn't implement synchronous content type guessing"
 msgid "mount doesn’t implement synchronous content type guessing"
 msgstr ""
 "el punto de montaje no implementa averiguación síncrona del tipo de contenido"
 
 #: ../gio/gnetworkaddress.c:378
 #, c-format
-#| msgid "Hostname '%s' contains '[' but not ']'"
 msgid "Hostname “%s” contains “[” but not “]”"
 msgstr "El nombre del equipo «%s» contiene «[» pero no «]»"
 
@@ -3274,7 +3111,6 @@ msgid "NetworkManager version too old"
 msgstr "Versión de NetworkManager demasiado antigua"
 
 #: ../gio/goutputstream.c:212 ../gio/goutputstream.c:560
-#| msgid "Output stream doesn't implement write"
 msgid "Output stream doesn’t implement write"
 msgstr "El flujo de salida no implementa la escritura"
 
@@ -3285,7 +3121,6 @@ msgstr "El flujo de origen ya está cerrado"
 #: ../gio/gresolver.c:341 ../gio/gthreadedresolver.c:116
 #: ../gio/gthreadedresolver.c:126
 #, c-format
-#| msgid "Error resolving '%s': %s"
 msgid "Error resolving “%s”: %s"
 msgstr "Error al resolver «%s»: %s"
 
@@ -3294,24 +3129,20 @@ msgstr "Error al resolver «%s»: %s"
 #: ../gio/gresource.c:1202 ../gio/gresourcefile.c:453
 #: ../gio/gresourcefile.c:576 ../gio/gresourcefile.c:713
 #, c-format
-#| msgid "The resource at '%s' does not exist"
 msgid "The resource at “%s” does not exist"
 msgstr "El recurso en «%s» no existe"
 
 #: ../gio/gresource.c:760
 #, c-format
-#| msgid "The resource at '%s' failed to decompress"
 msgid "The resource at “%s” failed to decompress"
 msgstr "El recurso en «%s» falló al descomprimir"
 
 #: ../gio/gresourcefile.c:709
 #, c-format
-#| msgid "The resource at '%s' is not a directory"
 msgid "The resource at “%s” is not a directory"
 msgstr "El recurso en «%s» no es una carpeta"
 
 #: ../gio/gresourcefile.c:917
-#| msgid "Input stream doesn't implement seek"
 msgid "Input stream doesn’t implement seek"
 msgstr "El flujo de entrada no implementa la búsqueda"
 
@@ -3359,19 +3190,6 @@ msgid "FILE PATH"
 msgstr "ARCHIVO RUTA"
 
 #: ../gio/gresource-tool.c:534
-#| msgid ""
-#| "Usage:\n"
-#| "  gresource [--section SECTION] COMMAND [ARGS...]\n"
-#| "\n"
-#| "Commands:\n"
-#| "  help                      Show this information\n"
-#| "  sections                  List resource sections\n"
-#| "  list                      List resources\n"
-#| "  details                   List resources with details\n"
-#| "  extract                   Extract a resource\n"
-#| "\n"
-#| "Use 'gresource help COMMAND' to get detailed help.\n"
-#| "\n"
 msgid ""
 "Usage:\n"
 "  gresource [--section SECTION] COMMAND [ARGS…]\n"
@@ -3454,19 +3272,16 @@ msgstr "  RUTA      La ruta de un recurso\n"
 #: ../gio/gsettings-tool.c:51 ../gio/gsettings-tool.c:72
 #: ../gio/gsettings-tool.c:851
 #, c-format
-#| msgid "No such schema '%s'\n"
 msgid "No such schema “%s”\n"
 msgstr "No existe el esquema «%s»\n"
 
 #: ../gio/gsettings-tool.c:57
 #, c-format
-#| msgid "Schema '%s' is not relocatable (path must not be specified)\n"
 msgid "Schema “%s” is not relocatable (path must not be specified)\n"
 msgstr "El esquema «%s» no es reubicable (no se debe especificar la ruta)\n"
 
 #: ../gio/gsettings-tool.c:78
 #, c-format
-#| msgid "Schema '%s' is relocatable (path must be specified)\n"
 msgid "Schema “%s” is relocatable (path must be specified)\n"
 msgstr "El esquema «%s» es reubicable (se debe especificar la ruta)\n"
 
@@ -3587,29 +3402,6 @@ msgid "SCHEMA[:PATH] [KEY]"
 msgstr "ESQUEMA[:RUTA] [CLAVE]"
 
 #: ../gio/gsettings-tool.c:620
-#| msgid ""
-#| "Usage:\n"
-#| "  gsettings --version\n"
-#| "  gsettings [--schemadir SCHEMADIR] COMMAND [ARGS...]\n"
-#| "\n"
-#| "Commands:\n"
-#| "  help                      Show this information\n"
-#| "  list-schemas              List installed schemas\n"
-#| "  list-relocatable-schemas  List relocatable schemas\n"
-#| "  list-keys                 List keys in a schema\n"
-#| "  list-children             List children of a schema\n"
-#| "  list-recursively          List keys and values, recursively\n"
-#| "  range                     Queries the range of a key\n"
-#| "  describe                  Queries the description of a key\n"
-#| "  get                       Get the value of a key\n"
-#| "  set                       Set the value of a key\n"
-#| "  reset                     Reset the value of a key\n"
-#| "  reset-recursively         Reset all values in a given schema\n"
-#| "  writable                  Check if a key is writable\n"
-#| "  monitor                   Watch for changes\n"
-#| "\n"
-#| "Use 'gsettings help COMMAND' to get detailed help.\n"
-#| "\n"
 msgid ""
 "Usage:\n"
 "  gsettings --version\n"
@@ -3714,152 +3506,151 @@ msgstr "Se proporcionó un nombre de esquema vacío\n"
 
 #: ../gio/gsettings-tool.c:864
 #, c-format
-#| msgid "No such key '%s'\n"
 msgid "No such key “%s”\n"
 msgstr "No existe la clave «%s»\n"
 
-#: ../gio/gsocket.c:364
+#: ../gio/gsocket.c:369
 msgid "Invalid socket, not initialized"
 msgstr "Socket no válido, no inicializado"
 
-#: ../gio/gsocket.c:371
+#: ../gio/gsocket.c:376
 #, c-format
 msgid "Invalid socket, initialization failed due to: %s"
 msgstr "Socket no válido, falló la instalación debido a: %s"
 
-#: ../gio/gsocket.c:379
+#: ../gio/gsocket.c:384
 msgid "Socket is already closed"
 msgstr "El socket ya está cerrado"
 
-#: ../gio/gsocket.c:394 ../gio/gsocket.c:2751 ../gio/gsocket.c:3897
-#: ../gio/gsocket.c:3952
+#: ../gio/gsocket.c:399 ../gio/gsocket.c:2754 ../gio/gsocket.c:3939
+#: ../gio/gsocket.c:3995
 msgid "Socket I/O timed out"
 msgstr "Expiró la E/S del socket"
 
-#: ../gio/gsocket.c:526
+#: ../gio/gsocket.c:531
 #, c-format
 msgid "creating GSocket from fd: %s"
 msgstr "creando el GSocket desde fd: %s"
 
-#: ../gio/gsocket.c:554 ../gio/gsocket.c:608 ../gio/gsocket.c:615
+#: ../gio/gsocket.c:559 ../gio/gsocket.c:613 ../gio/gsocket.c:620
 #, c-format
 msgid "Unable to create socket: %s"
 msgstr "No se pudo crear el socket: %s"
 
-#: ../gio/gsocket.c:608
+#: ../gio/gsocket.c:613
 msgid "Unknown family was specified"
 msgstr "Se especificó una familia desconocida"
 
-#: ../gio/gsocket.c:615
+#: ../gio/gsocket.c:620
 msgid "Unknown protocol was specified"
 msgstr "Se especificó un protocolo desconocido"
 
-#: ../gio/gsocket.c:1104
+#: ../gio/gsocket.c:1111
 #, c-format
 msgid "Cannot use datagram operations on a non-datagram socket."
 msgstr ""
 "No se pueden usar operaciones de datagrama en un zócalo que no es de "
 "datagrama."
 
-#: ../gio/gsocket.c:1121
+#: ../gio/gsocket.c:1128
 #, c-format
 msgid "Cannot use datagram operations on a socket with a timeout set."
 msgstr ""
 "No se pueden usar operaciones de datagrama en un zócalo sin un tiempo de "
 "expiración establecido."
 
-#: ../gio/gsocket.c:1925
+#: ../gio/gsocket.c:1932
 #, c-format
 msgid "could not get local address: %s"
 msgstr "no se pudo obtener la dirección local: %s"
 
-#: ../gio/gsocket.c:1968
+#: ../gio/gsocket.c:1975
 #, c-format
 msgid "could not get remote address: %s"
 msgstr "no se pudo obtener la dirección remota: %s"
 
-#: ../gio/gsocket.c:2034
+#: ../gio/gsocket.c:2041
 #, c-format
 msgid "could not listen: %s"
 msgstr "no se pudo escuchar: %s"
 
-#: ../gio/gsocket.c:2133
+#: ../gio/gsocket.c:2140
 #, c-format
 msgid "Error binding to address: %s"
 msgstr "Error al vincular con la dirección: %s"
 
-#: ../gio/gsocket.c:2248 ../gio/gsocket.c:2285
+#: ../gio/gsocket.c:2255 ../gio/gsocket.c:2292
 #, c-format
 msgid "Error joining multicast group: %s"
 msgstr "Error al unirse al grupo de multicast: %s"
 
-#: ../gio/gsocket.c:2249 ../gio/gsocket.c:2286
+#: ../gio/gsocket.c:2256 ../gio/gsocket.c:2293
 #, c-format
 msgid "Error leaving multicast group: %s"
 msgstr "Error al abandonar al grupo de multicast: %s"
 
-#: ../gio/gsocket.c:2250
+#: ../gio/gsocket.c:2257
 msgid "No support for source-specific multicast"
 msgstr "No se soporta el multicast específico de la fuente"
 
-#: ../gio/gsocket.c:2470
+#: ../gio/gsocket.c:2477
 #, c-format
 msgid "Error accepting connection: %s"
 msgstr "Error al aceptar la conexión: %s"
 
-#: ../gio/gsocket.c:2593
+#: ../gio/gsocket.c:2598
 msgid "Connection in progress"
 msgstr "Conexión en progreso"
 
-#: ../gio/gsocket.c:2644
+#: ../gio/gsocket.c:2647
 msgid "Unable to get pending error: "
 msgstr "No se pudo obtener el error pendiente: "
 
-#: ../gio/gsocket.c:2816
+#: ../gio/gsocket.c:2817
 #, c-format
 msgid "Error receiving data: %s"
 msgstr "Error al recibir los datos: %s"
 
-#: ../gio/gsocket.c:3013
+#: ../gio/gsocket.c:3012
 #, c-format
 msgid "Error sending data: %s"
 msgstr "Error al enviar los datos: %s"
 
-#: ../gio/gsocket.c:3200
+#: ../gio/gsocket.c:3199
 #, c-format
 msgid "Unable to shutdown socket: %s"
 msgstr "No se pudo desconectar el socket: %s"
 
-#: ../gio/gsocket.c:3281
+#: ../gio/gsocket.c:3280
 #, c-format
 msgid "Error closing socket: %s"
 msgstr "Error al cerrar el socket: %s"
 
-#: ../gio/gsocket.c:3890
+#: ../gio/gsocket.c:3932
 #, c-format
 msgid "Waiting for socket condition: %s"
 msgstr "Esperando la condición del socket: %s"
 
-#: ../gio/gsocket.c:4362 ../gio/gsocket.c:4442 ../gio/gsocket.c:4620
+#: ../gio/gsocket.c:4404 ../gio/gsocket.c:4484 ../gio/gsocket.c:4662
 #, c-format
 msgid "Error sending message: %s"
 msgstr "Error al enviar el mensaje: %s"
 
-#: ../gio/gsocket.c:4386
+#: ../gio/gsocket.c:4428
 msgid "GSocketControlMessage not supported on Windows"
 msgstr "GSocketControlMessage no está soportado en Windows"
 
-#: ../gio/gsocket.c:4839 ../gio/gsocket.c:4912 ../gio/gsocket.c:5139
+#: ../gio/gsocket.c:4881 ../gio/gsocket.c:4954 ../gio/gsocket.c:5180
 #, c-format
 msgid "Error receiving message: %s"
 msgstr "Error al recibir el mensaje: %s"
 
-#: ../gio/gsocket.c:5411
+#: ../gio/gsocket.c:5452
 #, c-format
 msgid "Unable to read socket credentials: %s"
 msgstr "No se pudieron leer las credenciales del socket: %s"
 
-#: ../gio/gsocket.c:5420
+#: ../gio/gsocket.c:5461
 msgid "g_socket_get_credentials not implemented for this OS"
 msgstr "g_socket_get_credentials no está implementado en este SO"
 
@@ -3888,7 +3679,6 @@ msgstr ""
 
 #: ../gio/gsocketclient.c:1110 ../gio/gsocketclient.c:1561
 #, c-format
-#| msgid "Proxy protocol '%s' is not supported."
 msgid "Proxy protocol “%s” is not supported."
 msgstr "El protocolo del proxy «%s» no está soportado."
 
@@ -3902,7 +3692,6 @@ msgstr "El socket añadido está cerrado"
 
 #: ../gio/gsocks4aproxy.c:118
 #, c-format
-#| msgid "SOCKSv4 does not support IPv6 address '%s'"
 msgid "SOCKSv4 does not support IPv6 address “%s”"
 msgstr "SOCKSv4 no soporta la dirección de IPv6 «%s»"
 
@@ -3912,7 +3701,6 @@ msgstr "El nombre de usuario es demasiado largo para el protocolo SOCKSv4"
 
 #: ../gio/gsocks4aproxy.c:153
 #, c-format
-#| msgid "Hostname '%s' is too long for SOCKSv4 protocol"
 msgid "Hostname “%s” is too long for SOCKSv4 protocol"
 msgstr ""
 "El nombre de equipo «%s» es demasiado largo para el protocolo SOCKSv4\t"
@@ -3955,7 +3743,6 @@ msgstr ""
 
 #: ../gio/gsocks5proxy.c:286
 #, c-format
-#| msgid "Hostname '%s' is too long for SOCKSv5 protocol"
 msgid "Hostname “%s” is too long for SOCKSv5 protocol"
 msgstr "El nombre de equipo «%s» es demasiado largo para el protocolo SOCKSv5"
 
@@ -3984,7 +3771,6 @@ msgid "Connection refused through SOCKSv5 proxy."
 msgstr "Se rechazó la conexión a través del proxy SOCKSv5."
 
 #: ../gio/gsocks5proxy.c:386
-#| msgid "SOCKSv5 proxy does not support 'connect' command."
 msgid "SOCKSv5 proxy does not support “connect” command."
 msgstr "El proxy SOCKSv5 no soporta el comando «connect»."
 
@@ -3998,7 +3784,6 @@ msgstr "Error desconocido del proxy SOCKSv5."
 
 #: ../gio/gthemedicon.c:518
 #, c-format
-#| msgid "Can't handle version %d of GThemedIcon encoding"
 msgid "Can’t handle version %d of GThemedIcon encoding"
 msgstr "No se puede manejar la versión %d de la codificación GThemedIcon"
 
@@ -4008,26 +3793,22 @@ msgstr "No se han encontrado direcciones válidas"
 
 #: ../gio/gthreadedresolver.c:213
 #, c-format
-#| msgid "Error reverse-resolving '%s': %s"
 msgid "Error reverse-resolving “%s”: %s"
 msgstr "Error al resolver «%s» de forma inversa: %s"
 
 #: ../gio/gthreadedresolver.c:550 ../gio/gthreadedresolver.c:630
 #: ../gio/gthreadedresolver.c:728 ../gio/gthreadedresolver.c:778
 #, c-format
-#| msgid "No DNS record of the requested type for '%s'"
 msgid "No DNS record of the requested type for “%s”"
 msgstr "No hay un registro de DNS del tipo solicitado para «%s»"
 
 #: ../gio/gthreadedresolver.c:555 ../gio/gthreadedresolver.c:733
 #, c-format
-#| msgid "Temporarily unable to resolve '%s'"
 msgid "Temporarily unable to resolve “%s”"
 msgstr "No se puede resolver «%s» temporalmente"
 
 #: ../gio/gthreadedresolver.c:560 ../gio/gthreadedresolver.c:738
 #, c-format
-#| msgid "Error resolving '%s'"
 msgid "Error resolving “%s”"
 msgstr "Error al resolver «%s»"
 
@@ -4135,7 +3916,7 @@ msgstr "Error al leer del descriptor del archivo: %s"
 msgid "Error closing file descriptor: %s"
 msgstr "Error al cerrar el descriptor del archivo: %s"
 
-#: ../gio/gunixmounts.c:2364 ../gio/gunixmounts.c:2417
+#: ../gio/gunixmounts.c:2367 ../gio/gunixmounts.c:2420
 msgid "Filesystem root"
 msgstr "Sistema de archivos raíz"
 
@@ -4144,13 +3925,12 @@ msgstr "Sistema de archivos raíz"
 msgid "Error writing to file descriptor: %s"
 msgstr "Error al escribir en el descriptor del archivo: %s"
 
-#: ../gio/gunixsocketaddress.c:239
+#: ../gio/gunixsocketaddress.c:241
 msgid "Abstract UNIX domain socket addresses not supported on this system"
 msgstr ""
 "Este sistema no soporta direcciones de socket de dominio UNIX abstracto"
 
 #: ../gio/gvolume.c:437
-#| msgid "volume doesn't implement eject"
 msgid "volume doesn’t implement eject"
 msgstr "el volumen no implementa la expulsión"
 
@@ -4158,7 +3938,6 @@ msgstr "el volumen no implementa la expulsión"
 #. * message for volume objects that
 #. * don't implement any of eject or eject_with_operation.
 #: ../gio/gvolume.c:514
-#| msgid "volume doesn't implement eject or eject_with_operation"
 msgid "volume doesn’t implement eject or eject_with_operation"
 msgstr "el volumen no implementa la expulsión o expulsión con operación"
 
@@ -4221,28 +4000,24 @@ msgstr "Argumentos incorrectos\n"
 
 #: ../glib/gbookmarkfile.c:755
 #, c-format
-#| msgid "Unexpected attribute '%s' for element '%s'"
 msgid "Unexpected attribute “%s” for element “%s”"
 msgstr "Atributo inesperado «%s» para el elemento «%s»"
 
 #: ../glib/gbookmarkfile.c:766 ../glib/gbookmarkfile.c:837
 #: ../glib/gbookmarkfile.c:847 ../glib/gbookmarkfile.c:954
 #, c-format
-#| msgid "Attribute '%s' of element '%s' not found"
 msgid "Attribute “%s” of element “%s” not found"
 msgstr "El atributo «%s» del elemento «%s» no se ha encontrado"
 
 #: ../glib/gbookmarkfile.c:1124 ../glib/gbookmarkfile.c:1189
 #: ../glib/gbookmarkfile.c:1253 ../glib/gbookmarkfile.c:1263
 #, c-format
-#| msgid "Unexpected tag '%s', tag '%s' expected"
 msgid "Unexpected tag “%s”, tag “%s” expected"
 msgstr "Etiqueta «%s» inesperada, se esperaba la etiqueta «%s»"
 
 #: ../glib/gbookmarkfile.c:1149 ../glib/gbookmarkfile.c:1163
 #: ../glib/gbookmarkfile.c:1231
 #, c-format
-#| msgid "Unexpected tag '%s' inside '%s'"
 msgid "Unexpected tag “%s” inside “%s”"
 msgstr "Etiqueta «%s» inesperada dentro de «%s»"
 
@@ -4254,7 +4029,6 @@ msgstr ""
 
 #: ../glib/gbookmarkfile.c:1958
 #, c-format
-#| msgid "A bookmark for URI '%s' already exists"
 msgid "A bookmark for URI “%s” already exists"
 msgstr "Ya existe un marcador para el URI «%s»"
 
@@ -4268,37 +4042,31 @@ msgstr "Ya existe un marcador para el URI «%s»"
 #: ../glib/gbookmarkfile.c:3434 ../glib/gbookmarkfile.c:3523
 #: ../glib/gbookmarkfile.c:3639
 #, c-format
-#| msgid "No bookmark found for URI '%s'"
 msgid "No bookmark found for URI “%s”"
 msgstr "No se encontró un marcador para el URI «%s»"
 
 #: ../glib/gbookmarkfile.c:2336
 #, c-format
-#| msgid "No MIME type defined in the bookmark for URI '%s'"
 msgid "No MIME type defined in the bookmark for URI “%s”"
 msgstr "Ningún tipo MIME definido en el marcador para la URI «%s»"
 
 #: ../glib/gbookmarkfile.c:2421
 #, c-format
-#| msgid "No private flag has been defined in bookmark for URI '%s'"
 msgid "No private flag has been defined in bookmark for URI “%s”"
 msgstr "No se ha definido ningún flag privado en el marcador para el URI «%s»"
 
 #: ../glib/gbookmarkfile.c:2800
 #, c-format
-#| msgid "No groups set in bookmark for URI '%s'"
 msgid "No groups set in bookmark for URI “%s”"
 msgstr "No se ha establecido ningún grupo en el marcador para el URI «%s»"
 
 #: ../glib/gbookmarkfile.c:3198 ../glib/gbookmarkfile.c:3355
 #, c-format
-#| msgid "No application with name '%s' registered a bookmark for '%s'"
 msgid "No application with name “%s” registered a bookmark for “%s”"
 msgstr "Ninguna aplicación con nombre «%s» registró un marcador para «%s»"
 
 #: ../glib/gbookmarkfile.c:3378
 #, c-format
-#| msgid "Failed to expand exec line '%s' with URI '%s'"
 msgid "Failed to expand exec line “%s” with URI “%s”"
 msgstr "Falló la expansión de lalinea ejecutable «%s» con el URI «%s»"
 
@@ -4309,47 +4077,40 @@ msgstr "Hay una secuencia parcial de caracteres en el final de la entrada"
 
 #: ../glib/gconvert.c:742
 #, c-format
-#| msgid "Cannot convert fallback '%s' to codeset '%s'"
 msgid "Cannot convert fallback “%s” to codeset “%s”"
 msgstr "No se puede convertir el fallback «%s» al conjunto de códigos «%s»"
 
-#: ../glib/gconvert.c:1567
+#: ../glib/gconvert.c:1566
 #, c-format
-#| msgid "The URI '%s' is not an absolute URI using the \"file\" scheme"
 msgid "The URI “%s” is not an absolute URI using the “file” scheme"
 msgstr "El URI «%s» no es una URI absoluta utilizando el esquema «file»"
 
-#: ../glib/gconvert.c:1577
+#: ../glib/gconvert.c:1576
 #, c-format
-#| msgid "The local file URI '%s' may not include a '#'"
 msgid "The local file URI “%s” may not include a “#”"
 msgstr "El archivo local en la URI «%s» no debe incluir un «#»"
 
-#: ../glib/gconvert.c:1594
+#: ../glib/gconvert.c:1593
 #, c-format
-#| msgid "The URI '%s' is invalid"
 msgid "The URI “%s” is invalid"
 msgstr "El URI «%s» no es válido"
 
-#: ../glib/gconvert.c:1606
+#: ../glib/gconvert.c:1605
 #, c-format
-#| msgid "The hostname of the URI '%s' is invalid"
 msgid "The hostname of the URI “%s” is invalid"
 msgstr "El nombre del host de la URI «%s» no es válido"
 
-#: ../glib/gconvert.c:1622
+#: ../glib/gconvert.c:1621
 #, c-format
-#| msgid "The URI '%s' contains invalidly escaped characters"
 msgid "The URI “%s” contains invalidly escaped characters"
 msgstr "El URI «%s» contiene caracteres de escape no válidos"
 
-#: ../glib/gconvert.c:1717
+#: ../glib/gconvert.c:1716
 #, c-format
-#| msgid "The pathname '%s' is not an absolute path"
 msgid "The pathname “%s” is not an absolute path"
 msgstr "El nombre de la ruta «%s» no es una ruta absoluta"
 
-#: ../glib/gconvert.c:1727
+#: ../glib/gconvert.c:1726
 msgid "Invalid hostname"
 msgstr "El nombre del host no es válido"
 
@@ -4581,14 +4342,11 @@ msgstr "Dom"
 
 #: ../glib/gdir.c:155
 #, c-format
-#| msgid "Error opening directory '%s': %s"
 msgid "Error opening directory “%s”: %s"
 msgstr "Falló al abrir la carpeta «%s»: %s"
 
 #: ../glib/gfileutils.c:701 ../glib/gfileutils.c:793
 #, c-format
-#| msgid "Could not allocate %lu byte to read file \"%s\""
-#| msgid_plural "Could not allocate %lu bytes to read file \"%s\""
 msgid "Could not allocate %lu byte to read file “%s”"
 msgid_plural "Could not allocate %lu bytes to read file “%s”"
 msgstr[0] "No se pudo asignar %lu byte para leer el archivo «%s»"
@@ -4596,96 +4354,80 @@ msgstr[1] "No se pudieron asignar %lu bytes para leer el archivo «%s»"
 
 #: ../glib/gfileutils.c:718
 #, c-format
-#| msgid "Error reading file %s: %s"
 msgid "Error reading file “%s”: %s"
 msgstr "Error al leer el archivo %s: %s"
 
 #: ../glib/gfileutils.c:754
 #, c-format
-#| msgid "File \"%s\" is too large"
 msgid "File “%s” is too large"
 msgstr "El archivo «%s» es demasiado grande"
 
 #: ../glib/gfileutils.c:818
 #, c-format
-#| msgid "Failed to read from file '%s': %s"
 msgid "Failed to read from file “%s”: %s"
 msgstr "Falló al leer del archivo «%s»: %s"
 
 #: ../glib/gfileutils.c:866 ../glib/gfileutils.c:938
 #, c-format
-#| msgid "Failed to open file '%s': %s"
 msgid "Failed to open file “%s”: %s"
 msgstr "Falló al abrir el archivo «%s»: %s"
 
 #: ../glib/gfileutils.c:878
 #, c-format
-#| msgid "Failed to get attributes of file '%s': fstat() failed: %s"
 msgid "Failed to get attributes of file “%s”: fstat() failed: %s"
 msgstr "Falló al obtener los atributos del archivo «%s»: fstat() falló: %s"
 
 #: ../glib/gfileutils.c:908
 #, c-format
-#| msgid "Failed to open file '%s': fdopen() failed: %s"
 msgid "Failed to open file “%s”: fdopen() failed: %s"
 msgstr "Falló al abrir el archivo «%s»: fdopen() falló: %s"
 
 #: ../glib/gfileutils.c:1007
 #, c-format
-#| msgid "Failed to rename file '%s' to '%s': g_rename() failed: %s"
 msgid "Failed to rename file “%s” to “%s”: g_rename() failed: %s"
 msgstr "Falló al renombrar el archivo «%s» a «%s»: g_rename() falló: %s"
 
 #: ../glib/gfileutils.c:1042 ../glib/gfileutils.c:1541
 #, c-format
-#| msgid "Failed to create file '%s': %s"
 msgid "Failed to create file “%s”: %s"
 msgstr "Falló al crear el archivo «%s»: %s"
 
 #: ../glib/gfileutils.c:1069
 #, c-format
-#| msgid "Failed to write file '%s': write() failed: %s"
 msgid "Failed to write file “%s”: write() failed: %s"
 msgstr "Falló al escribir el archivo «%s»: falló write(): %s"
 
 #: ../glib/gfileutils.c:1112
 #, c-format
-#| msgid "Failed to write file '%s': fsync() failed: %s"
 msgid "Failed to write file “%s”: fsync() failed: %s"
 msgstr "Falló al escribir el archivo «%s»: falló fsync(): %s"
 
 #: ../glib/gfileutils.c:1236
 #, c-format
-#| msgid "Existing file '%s' could not be removed: g_unlink() failed: %s"
 msgid "Existing file “%s” could not be removed: g_unlink() failed: %s"
 msgstr "El archivo existente «%s» no se pudo eliminar: g_unlink() falló: %s"
 
 #: ../glib/gfileutils.c:1507
 #, c-format
-#| msgid "Template '%s' invalid, should not contain a '%s'"
 msgid "Template “%s” invalid, should not contain a “%s”"
 msgstr "La plantilla «%s» no es válida, no debería contener un «%s»"
 
 #: ../glib/gfileutils.c:1520
 #, c-format
-#| msgid "Template '%s' doesn't contain XXXXXX"
 msgid "Template “%s” doesn’t contain XXXXXX"
 msgstr "La plantilla «%s» no contiene XXXXXX"
 
 #: ../glib/gfileutils.c:2045
 #, c-format
-#| msgid "Failed to read the symbolic link '%s': %s"
 msgid "Failed to read the symbolic link “%s”: %s"
 msgstr "Falló al leer el enlace simbólico «%s»: %s"
 
 #: ../glib/giochannel.c:1388
 #, c-format
-#| msgid "Could not open converter from '%s' to '%s': %s"
 msgid "Could not open converter from “%s” to “%s”: %s"
 msgstr "No se pudo abrir el conversor de «%s» a «%s»: %s"
 
 #: ../glib/giochannel.c:1733
-#| msgid "Can't do a raw read in g_io_channel_read_line_string"
 msgid "Can’t do a raw read in g_io_channel_read_line_string"
 msgstr ""
 "No se puede hacer una lectura en bruto (raw) en g_io_channel_read_line_string"
@@ -4700,7 +4442,6 @@ msgid "Channel terminates in a partial character"
 msgstr "El canal termina en un carácter parcial"
 
 #: ../glib/giochannel.c:1924
-#| msgid "Can't do a raw read in g_io_channel_read_to_end"
 msgid "Can’t do a raw read in g_io_channel_read_to_end"
 msgstr ""
 "No se puede hacer una lectura en bruto (raw) en g_io_channel_read_to_end"
@@ -4716,9 +4457,6 @@ msgstr "No es un archivo regular"
 
 #: ../glib/gkeyfile.c:1204
 #, c-format
-#| msgid ""
-#| "Key file contains line '%s' which is not a key-value pair, group, or "
-#| "comment"
 msgid ""
 "Key file contains line “%s” which is not a key-value pair, group, or comment"
 msgstr ""
@@ -4741,7 +4479,6 @@ msgstr "Nombre de clave no válida: %s"
 
 #: ../glib/gkeyfile.c:1336
 #, c-format
-#| msgid "Key file contains unsupported encoding '%s'"
 msgid "Key file contains unsupported encoding “%s”"
 msgstr "El archivo de claves contiene una codificación «%s» no soportada"
 
@@ -4749,19 +4486,16 @@ msgstr "El archivo de claves contiene una codificación «%s» no soportada"
 #: ../glib/gkeyfile.c:3193 ../glib/gkeyfile.c:3323 ../glib/gkeyfile.c:3453
 #: ../glib/gkeyfile.c:3597 ../glib/gkeyfile.c:3826 ../glib/gkeyfile.c:3893
 #, c-format
-#| msgid "Key file does not have group '%s'"
 msgid "Key file does not have group “%s”"
 msgstr "El archivo de claves no tiene el grupo «%s»"
 
 #: ../glib/gkeyfile.c:1707
 #, c-format
-#| msgid "Key file does not have key '%s' in group '%s'"
 msgid "Key file does not have key “%s” in group “%s”"
 msgstr "El archivo de claves no tiene la clave «%s» en el grupo «%s»"
 
 #: ../glib/gkeyfile.c:1869 ../glib/gkeyfile.c:1985
 #, c-format
-#| msgid "Key file contains key '%s' with value '%s' which is not UTF-8"
 msgid "Key file contains key “%s” with value “%s” which is not UTF-8"
 msgstr ""
 "El archivo de claves contiene la clave  «%s» con el valor «%s» el cual no es "
@@ -4769,8 +4503,6 @@ msgstr ""
 
 #: ../glib/gkeyfile.c:1889 ../glib/gkeyfile.c:2005 ../glib/gkeyfile.c:2374
 #, c-format
-#| msgid ""
-#| "Key file contains key '%s' which has a value that cannot be interpreted."
 msgid ""
 "Key file contains key “%s” which has a value that cannot be interpreted."
 msgstr ""
@@ -4779,9 +4511,6 @@ msgstr ""
 
 #: ../glib/gkeyfile.c:2591 ../glib/gkeyfile.c:2959
 #, c-format
-#| msgid ""
-#| "Key file contains key '%s' in group '%s' which has a value that cannot be "
-#| "interpreted."
 msgid ""
 "Key file contains key “%s” in group “%s” which has a value that cannot be "
 "interpreted."
@@ -4791,7 +4520,6 @@ msgstr ""
 
 #: ../glib/gkeyfile.c:2669 ../glib/gkeyfile.c:2746
 #, c-format
-#| msgid "Key '%s' in group '%s' has value '%s' where %s was expected"
 msgid "Key “%s” in group “%s” has value “%s” where %s was expected"
 msgstr ""
 "La clave «%s» en el grupo «%s» tiene el valor «%s», pero se esperaba %s"
@@ -4803,37 +4531,31 @@ msgstr ""
 
 #: ../glib/gkeyfile.c:4155
 #, c-format
-#| msgid "Key file contains invalid escape sequence '%s'"
 msgid "Key file contains invalid escape sequence “%s”"
 msgstr "El archivo de claves contiene la secuencia de escape no válida «%s»"
 
 #: ../glib/gkeyfile.c:4297
 #, c-format
-#| msgid "Value '%s' cannot be interpreted as a number."
 msgid "Value “%s” cannot be interpreted as a number."
 msgstr "El valor «%s» no puede interpretarse como un número."
 
 #: ../glib/gkeyfile.c:4311
 #, c-format
-#| msgid "Integer value '%s' out of range"
 msgid "Integer value “%s” out of range"
 msgstr "El valor entero «%s» está fuera de rango"
 
 #: ../glib/gkeyfile.c:4344
 #, c-format
-#| msgid "Value '%s' cannot be interpreted as a float number."
 msgid "Value “%s” cannot be interpreted as a float number."
 msgstr "El valor «%s» no puede interpretarse como un número de coma flotante."
 
 #: ../glib/gkeyfile.c:4383
 #, c-format
-#| msgid "Value '%s' cannot be interpreted as a boolean."
 msgid "Value “%s” cannot be interpreted as a boolean."
 msgstr "El valor «%s» no puede interpretarse como un booleano."
 
 #: ../glib/gmappedfile.c:129
 #, c-format
-#| msgid "Failed to get attributes of file '%s%s%s%s': fstat() failed: %s"
 msgid "Failed to get attributes of file “%s%s%s%s”: fstat() failed: %s"
 msgstr ""
 "Falló al obtener los atributos del archivo «%s%s%s%s»: fstat() falló: %s"
@@ -4845,7 +4567,6 @@ msgstr "Falló al mapear el archivo «%s%s%s%s»: mmap() falló: %s"
 
 #: ../glib/gmappedfile.c:262
 #, c-format
-#| msgid "Failed to open file '%s': open() failed: %s"
 msgid "Failed to open file “%s”: open() failed: %s"
 msgstr "Falló al abrir el archivo «%s»: open() falló: %s"
 
@@ -5066,7 +4787,6 @@ msgstr ""
 "de proceso"
 
 #: ../glib/goption.c:861
-#| msgid "[OPTION...]"
 msgid "[OPTION…]"
 msgstr "[OPCIÓN…]"
 
@@ -5092,25 +4812,21 @@ msgstr "Opciones:"
 
 #: ../glib/goption.c:1113 ../glib/goption.c:1183
 #, c-format
-#| msgid "Cannot parse integer value '%s' for %s"
 msgid "Cannot parse integer value “%s” for %s"
 msgstr "No se puede analizar el valor entero «%s» para %s"
 
 #: ../glib/goption.c:1123 ../glib/goption.c:1191
 #, c-format
-#| msgid "Integer value '%s' for %s out of range"
 msgid "Integer value “%s” for %s out of range"
 msgstr "El valor entero «%s» para %s está fuera de rango"
 
 #: ../glib/goption.c:1148
 #, c-format
-#| msgid "Cannot parse double value '%s' for %s"
 msgid "Cannot parse double value “%s” for %s"
 msgstr "No se puede analizar el valor doble «%s» para %s"
 
 #: ../glib/goption.c:1156
 #, c-format
-#| msgid "Double value '%s' for %s out of range"
 msgid "Double value “%s” for %s out of range"
 msgstr "El valor doble «%s» para %s está fuera de rango"
 
@@ -5466,7 +5182,6 @@ msgid "Error while compiling regular expression %s at char %d: %s"
 msgstr "Error al compilar la expresión regular %s en el carácter %d: %s"
 
 #: ../glib/gregex.c:2413
-#| msgid "hexadecimal digit or '}' expected"
 msgid "hexadecimal digit or “}” expected"
 msgstr "se esperaba un dígito hexadecimal o «}»"
 
@@ -5475,7 +5190,6 @@ msgid "hexadecimal digit expected"
 msgstr "se esperaba un dígito hexadecimal"
 
 #: ../glib/gregex.c:2469
-#| msgid "missing '<' in symbolic reference"
 msgid "missing “<” in symbolic reference"
 msgstr "falta «<» en la referencia simbólica"
 
@@ -5496,7 +5210,6 @@ msgid "illegal symbolic reference"
 msgstr "referencia simbólica ilegal"
 
 #: ../glib/gregex.c:2576
-#| msgid "stray final '\\'"
 msgid "stray final “\\”"
 msgstr "«\\» al final de la cadena"
 
@@ -5506,12 +5219,10 @@ msgstr "secuencia de escape desconocida"
 
 #: ../glib/gregex.c:2590
 #, c-format
-#| msgid "Error while parsing replacement text \"%s\" at char %lu: %s"
 msgid "Error while parsing replacement text “%s” at char %lu: %s"
 msgstr "Error al analizar el texto de reemplazo «%s» en el carácter %lu: %s"
 
 #: ../glib/gshell.c:96
-#| msgid "Quoted text doesn't begin with a quotation mark"
 msgid "Quoted text doesn’t begin with a quotation mark"
 msgstr "El texto entrecomillado no empieza por un signo de comilla"
 
@@ -5523,15 +5234,12 @@ msgstr ""
 
 #: ../glib/gshell.c:582
 #, c-format
-#| msgid "Text ended just after a '\\' character. (The text was '%s')"
 msgid "Text ended just after a “\\” character. (The text was “%s”)"
 msgstr ""
 "El texto termina justo después de un carácter '\\'. (El texto era «%s»)"
 
 #: ../glib/gshell.c:589
 #, c-format
-#| msgid ""
-#| "Text ended before matching quote was found for %c. (The text was '%s')"
 msgid "Text ended before matching quote was found for %c. (The text was “%s”)"
 msgstr ""
 "El texto terminó antes de que se encontrase la comilla correspondiente con "
@@ -5588,13 +5296,11 @@ msgstr "Falló al bifurcar (fork) (%s)"
 
 #: ../glib/gspawn.c:1490 ../glib/gspawn-win32.c:370
 #, c-format
-#| msgid "Failed to change to directory '%s' (%s)"
 msgid "Failed to change to directory “%s” (%s)"
 msgstr "Falló al cambiar a la carpeta «%s» (%s)"
 
 #: ../glib/gspawn.c:1500
 #, c-format
-#| msgid "Failed to execute child process \"%s\" (%s)"
 msgid "Failed to execute child process “%s” (%s)"
 msgstr "Falló al ejecutar el proceso hijo «%s» (%s)"
 
@@ -5610,7 +5316,6 @@ msgstr "Falló al bifurcar el proceso hijo (%s)"
 
 #: ../glib/gspawn.c:1527
 #, c-format
-#| msgid "Unknown error executing child process \"%s\""
 msgid "Unknown error executing child process “%s”"
 msgstr "Error desconocido al ejecutar el proceso hijo «%s»"
 
diff --git a/po/nb.po b/po/nb.po
index 3ee969d6c..63b7835df 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -1,15 +1,16 @@
 # Norwegian bokmål translation of glib.
 # Copyright (C) 2001-2003, 2005 Free Software Foundation, Inc.
-# Kjartan Maraas <kmaraas@gnome.org>, 2001-2016.
+# Kjartan Maraas <kmaraas@gnome.org>, 2001-2017.
 # Terance Edward Sola <terance@lyse.net>, 2005.
 # Torstein Adolf Winterseth <kvikende@fsfe.org>, 2010.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: glib 2.50.x\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-10-16 19:11+0200\n"
-"PO-Revision-Date: 2016-10-16 19:37+0200\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=glib&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2016-11-20 18:36+0000\n"
+"PO-Revision-Date: 2017-02-12 15:47+0100\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian bokmål <i18n-nb@lister.ping.uio.no>\n"
 "Language: nb\n"
@@ -31,7 +32,7 @@ msgid "Enter GApplication service mode (use from D-Bus service files)"
 msgstr "Oppgi tjenestemodus for GApplication (bruk fra D-Bus tjenestefiler)"
 
 #: ../gio/gapplication.c:550
-msgid "Override the application's ID"
+msgid "Override the application’s ID"
 msgstr "Overstyr programmets ID"
 
 #: ../gio/gapplication-tool.c:45 ../gio/gapplication-tool.c:46
@@ -71,7 +72,7 @@ msgid "Launch the application (with optional files to open)"
 msgstr "Start programmet (med valgfrie filer som skal åpnes)"
 
 #: ../gio/gapplication-tool.c:57
-msgid "APPID [FILE...]"
+msgid "APPID [FILE…]"
 msgstr "PROGID [FIL …]"
 
 #: ../gio/gapplication-tool.c:59
@@ -111,8 +112,8 @@ msgstr "Vis detaljert hjelp for denne kommandoen"
 msgid "Application identifier in D-Bus format (eg: org.example.viewer)"
 msgstr "Programidentifikator i D-Bus-format (f.eks. org.example.viewer)"
 
-#: ../gio/gapplication-tool.c:72 ../gio/glib-compile-resources.c:622
-#: ../gio/glib-compile-resources.c:628 ../gio/glib-compile-resources.c:654
+#: ../gio/gapplication-tool.c:72 ../gio/glib-compile-resources.c:665
+#: ../gio/glib-compile-resources.c:671 ../gio/glib-compile-resources.c:698
 #: ../gio/gresource-tool.c:495 ../gio/gresource-tool.c:561
 msgid "FILE"
 msgstr "FIL"
@@ -156,8 +157,8 @@ msgstr "Bruk:\n"
 msgid "Arguments:\n"
 msgstr "Argumenter:\n"
 
-#: ../gio/gapplication-tool.c:133 ../gio/gio-tool.c:206
-msgid "[ARGS...]"
+#: ../gio/gapplication-tool.c:133
+msgid "[ARGS…]"
 msgstr "[ARGUMENTER …]"
 
 #: ../gio/gapplication-tool.c:134
@@ -169,7 +170,7 @@ msgstr "Kommandoer:\n"
 #: ../gio/gapplication-tool.c:146
 #, c-format
 msgid ""
-"Use '%s help COMMAND' to get detailed help.\n"
+"Use “%s help COMMAND” to get detailed help.\n"
 "\n"
 msgstr ""
 "Bruk «%s help KOMMANDO» for å  få detaljert hjelp.\n"
@@ -184,14 +185,14 @@ msgstr "%s-kommandoen krever en program-ID etter kommandoen\n"
 
 #: ../gio/gapplication-tool.c:171
 #, c-format
-msgid "invalid application id: '%s'\n"
+msgid "invalid application id: “%s”\n"
 msgstr "ugyldig program-ID: «%s»\n"
 
 #. Translators: %s is replaced with a command name like 'list-actions'
 #: ../gio/gapplication-tool.c:182
 #, c-format
 msgid ""
-"'%s' takes no arguments\n"
+"“%s” takes no arguments\n"
 "\n"
 msgstr ""
 "«%s» tar ingen argumenter\n"
@@ -215,8 +216,8 @@ msgstr "navn på handling må oppgis etter program-ID\n"
 #: ../gio/gapplication-tool.c:325
 #, c-format
 msgid ""
-"invalid action name: '%s'\n"
-"action names must consist of only alphanumerics, '-' and '.'\n"
+"invalid action name: “%s”\n"
+"action names must consist of only alphanumerics, “-” and “.”\n"
 msgstr ""
 "ugyldig navvn på handling: «%s»\n"
 "navn på handlinger må kun bestå av tall og bokstaver, «-» og «.»\n"
@@ -316,12 +317,12 @@ msgstr "Avbrytbar initiering er ikke støttet"
 #: ../gio/gcharsetconverter.c:454 ../glib/gconvert.c:321
 #: ../glib/giochannel.c:1384
 #, c-format
-msgid "Conversion from character set '%s' to '%s' is not supported"
+msgid "Conversion from character set “%s” to “%s” is not supported"
 msgstr "Konvertering fra tegnsett «%s» til «%s» er ikke støttet"
 
 #: ../gio/gcharsetconverter.c:458 ../glib/gconvert.c:325
 #, c-format
-msgid "Could not open converter from '%s' to '%s'"
+msgid "Could not open converter from “%s” to “%s”"
 msgstr "Kunne ikke åpne program for å konvertere fra «%s» til «%s»"
 
 #: ../gio/gcontenttype.c:335
@@ -361,41 +362,41 @@ msgstr "Uventet tidlig slutt på strøm"
 #: ../gio/gdbusaddress.c:153 ../gio/gdbusaddress.c:241
 #: ../gio/gdbusaddress.c:322
 #, c-format
-msgid "Unsupported key '%s' in address entry '%s'"
+msgid "Unsupported key “%s” in address entry “%s”"
 msgstr "Ikke støttet nøkkel «%s» i adresseoppføring «%s»"
 
 #: ../gio/gdbusaddress.c:180
 #, c-format
 msgid ""
-"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)"
 msgstr ""
 "Adressen «%s» er ugyldig (trenger eksakt en av følgende: sti, tmpdir eller "
 "abstrakte nøkler)"
 
 #: ../gio/gdbusaddress.c:193
 #, c-format
-msgid "Meaningless key/value pair combination in address entry '%s'"
+msgid "Meaningless key/value pair combination in address entry “%s”"
 msgstr "Meningsløst nøkkel-/verdi-par i adresseoppføring «%s»"
 
 #: ../gio/gdbusaddress.c:256 ../gio/gdbusaddress.c:337
 #, c-format
-msgid "Error in address '%s' - the port attribute is malformed"
-msgstr "Feil i adresse «%s» - portattributten er feilutformet"
+msgid "Error in address “%s” — the port attribute is malformed"
+msgstr "Feil i adresse «%s» – portattributten er feilutformet"
 
 #: ../gio/gdbusaddress.c:267 ../gio/gdbusaddress.c:348
 #, c-format
-msgid "Error in address '%s' - the family attribute is malformed"
-msgstr "Feil i adresse «%s» - familieattributten er feilutformet"
+msgid "Error in address “%s” — the family attribute is malformed"
+msgstr "Feil i adresse «%s» – familieattributten er feilutformet"
 
 #: ../gio/gdbusaddress.c:457
 #, c-format
-msgid "Address element '%s' does not contain a colon (:)"
+msgid "Address element “%s” does not contain a colon (:)"
 msgstr "Adresseelement «%s» inneholder ikke et kolon (:)"
 
 #: ../gio/gdbusaddress.c:478
 #, c-format
 msgid ""
-"Key/Value pair %d, '%s', in address element '%s' does not contain an equal "
+"Key/Value pair %d, “%s”, in address element “%s” does not contain an equal "
 "sign"
 msgstr ""
 "Nøkkel/verdi-par %d, «%s», i adresseelement «%s» inneholder ikke et "
@@ -404,8 +405,8 @@ msgstr ""
 #: ../gio/gdbusaddress.c:492
 #, c-format
 msgid ""
-"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”"
 msgstr ""
 "Feil ved unescaping av nøkkel eller verdi i nøkkel/verdi par %d, «%s», i "
 "adresseelement «%s»"
@@ -413,26 +414,24 @@ msgstr ""
 #: ../gio/gdbusaddress.c:570
 #, c-format
 msgid ""
-"Error in address '%s' - the unix transport requires exactly one of the keys "
-"'path' or 'abstract' to be set"
-msgstr ""
-"Feil i adresse «%s» - unix-transport krever at eksakt en av nøklene «path» "
-"eller «abstract» er satt"
+"Error in address “%s” — the unix transport requires exactly one of the keys "
+"“path” or “abstract” to be set"
+msgstr "Feil i adresse «%s» – unix-transport krever at eksakt en av nøklene «path» eller «abstract» er satt"
 
 #: ../gio/gdbusaddress.c:606
 #, c-format
-msgid "Error in address '%s' - the host attribute is missing or malformed"
-msgstr "Feil i adresse «%s» - vertsattributt mangler eller er feilutformet"
+msgid "Error in address “%s” — the host attribute is missing or malformed"
+msgstr "Feil i adresse «%s» – vertsattributt mangler eller er feilutformet"
 
 #: ../gio/gdbusaddress.c:620
 #, c-format
-msgid "Error in address '%s' - the port attribute is missing or malformed"
-msgstr "Feil i adresse «%s» - portattributt mangler eller er feilutformet"
+msgid "Error in address “%s” — the port attribute is missing or malformed"
+msgstr "Feil i adresse «%s» – portattributt mangler eller er feilutformet"
 
 #: ../gio/gdbusaddress.c:634
 #, c-format
-msgid "Error in address '%s' - the noncefile attribute is missing or malformed"
-msgstr "Feil i adresse «%s» - noncefil-attributt mangler eller er feilutformet"
+msgid "Error in address “%s” — the noncefile attribute is missing or malformed"
+msgstr "Feil i adresse «%s» – noncefil-attributt mangler eller er feilutformet"
 
 #: ../gio/gdbusaddress.c:655
 msgid "Error auto-launching: "
@@ -440,27 +439,27 @@ msgstr "Feil under automatisk oppstart: "
 
 #: ../gio/gdbusaddress.c:663
 #, c-format
-msgid "Unknown or unsupported transport '%s' for address '%s'"
+msgid "Unknown or unsupported transport “%s” for address “%s”"
 msgstr "Ukjent eller ikke støttet transport «%s» for adresse «%s»"
 
 #: ../gio/gdbusaddress.c:699
 #, c-format
-msgid "Error opening nonce file '%s': %s"
+msgid "Error opening nonce file “%s”: %s"
 msgstr "Feil under åpning av nonce-fil «%s»: %s"
 
 #: ../gio/gdbusaddress.c:717
 #, c-format
-msgid "Error reading from nonce file '%s': %s"
+msgid "Error reading from nonce file “%s”: %s"
 msgstr "Feil under lesing fra nonce-fil «%s»: %s"
 
 #: ../gio/gdbusaddress.c:726
 #, c-format
-msgid "Error reading from nonce file '%s', expected 16 bytes, got %d"
+msgid "Error reading from nonce file “%s”, expected 16 bytes, got %d"
 msgstr "Feil under lesing fra nonce-fil «%s», forventet 16 bytes, fikk %d"
 
 #: ../gio/gdbusaddress.c:744
 #, c-format
-msgid "Error writing contents of nonce file '%s' to stream:"
+msgid "Error writing contents of nonce file “%s” to stream:"
 msgstr "Feil under skriving av innhold i nonce-fil «%s» til strøm:"
 
 #: ../gio/gdbusaddress.c:951
@@ -483,7 +482,7 @@ msgstr ""
 
 #: ../gio/gdbusaddress.c:1120
 #, c-format
-msgid "Error spawning command line '%s': "
+msgid "Error spawning command line “%s”: "
 msgstr "Feil under start av kommandolinje «%s»: "
 
 #: ../gio/gdbusaddress.c:1337
@@ -502,14 +501,12 @@ msgid "Cannot determine session bus address (not implemented for this OS)"
 msgstr ""
 "Kan ikke bestemme adresse til øktbussen (ikke implementert på dette OSet)"
 
-#: ../gio/gdbusaddress.c:1635 ../gio/gdbusconnection.c:7133
+#: ../gio/gdbusaddress.c:1635
 #, c-format
 msgid ""
 "Cannot determine bus address from DBUS_STARTER_BUS_TYPE environment variable "
-"- unknown value '%s'"
-msgstr ""
-"Kan ikke bestemme adresse for buss fra miljøvariabelen DBUS_STARTER_BUS_TYPE "
-"- ukjent verdi «%s»"
+"— unknown value “%s”"
+msgstr "Kan ikke bestemme adresse for buss fra miljøvariabelen DBUS_STARTER_BUS_TYPE – ukjent verdi «%s»"
 
 #: ../gio/gdbusaddress.c:1644 ../gio/gdbusconnection.c:7142
 msgid ""
@@ -546,35 +543,35 @@ msgstr "Avbrutt via GDBusAuthObserver::authorize-authenticated-peer"
 
 #: ../gio/gdbusauthmechanismsha1.c:261
 #, c-format
-msgid "Error when getting information for directory '%s': %s"
+msgid "Error when getting information for directory “%s”: %s"
 msgstr "Feil under henting av informasjon for katalog «%s»: %s"
 
 #: ../gio/gdbusauthmechanismsha1.c:273
 #, c-format
 msgid ""
-"Permissions on directory '%s' are malformed. Expected mode 0700, got 0%o"
+"Permissions on directory “%s” are malformed. Expected mode 0700, got 0%o"
 msgstr ""
 "Rettigheter for katalog «%s» er feilutformet. Forventet modus 0700, fikk 0%o"
 
 #: ../gio/gdbusauthmechanismsha1.c:294
 #, c-format
-msgid "Error creating directory '%s': %s"
+msgid "Error creating directory “%s”: %s"
 msgstr "Feil under oppretting av katalog «%s»: %s"
 
 #: ../gio/gdbusauthmechanismsha1.c:377
 #, c-format
-msgid "Error opening keyring '%s' for reading: "
+msgid "Error opening keyring “%s” for reading: "
 msgstr "Feil under åpning av nøkkelring «%s» for lesing: "
 
 #: ../gio/gdbusauthmechanismsha1.c:401 ../gio/gdbusauthmechanismsha1.c:714
 #, c-format
-msgid "Line %d of the keyring at '%s' with content '%s' is malformed"
+msgid "Line %d of the keyring at “%s” with content “%s” is malformed"
 msgstr "Linje %d av nøkkelring ved «%s» med innhold «%s» er feilutformet"
 
 #: ../gio/gdbusauthmechanismsha1.c:415 ../gio/gdbusauthmechanismsha1.c:728
 #, c-format
 msgid ""
-"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"
 msgstr ""
 "Første symbol på linje %d av nøkkelring ved «%s» med innhold «%s» er "
 "feilutformet"
@@ -582,44 +579,44 @@ msgstr ""
 #: ../gio/gdbusauthmechanismsha1.c:430 ../gio/gdbusauthmechanismsha1.c:742
 #, c-format
 msgid ""
-"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"
 msgstr ""
 "Andre symbol av linje %d i nøkkelring ved «%s» med innhold «%s» er "
 "feilutformet"
 
 #: ../gio/gdbusauthmechanismsha1.c:454
 #, c-format
-msgid "Didn't find cookie with id %d in the keyring at '%s'"
+msgid "Didn’t find cookie with id %d in the keyring at “%s”"
 msgstr "Fant ingen informasjonskapsel med id %d i nøkkelring ved «%s»"
 
 #: ../gio/gdbusauthmechanismsha1.c:532
 #, c-format
-msgid "Error deleting stale lock file '%s': %s"
+msgid "Error deleting stale lock file “%s”: %s"
 msgstr "Feil under sletting av gammel låsfil «%s»: %s"
 
 #: ../gio/gdbusauthmechanismsha1.c:564
 #, c-format
-msgid "Error creating lock file '%s': %s"
+msgid "Error creating lock file “%s”: %s"
 msgstr "Feil under oppretting av låsfil «%s»: %s"
 
 #: ../gio/gdbusauthmechanismsha1.c:594
 #, c-format
-msgid "Error closing (unlinked) lock file '%s': %s"
+msgid "Error closing (unlinked) lock file “%s”: %s"
 msgstr "Feil under lukking av (unlink()et) låsfil «%s»: %s"
 
 #: ../gio/gdbusauthmechanismsha1.c:604
 #, c-format
-msgid "Error unlinking lock file '%s': %s"
+msgid "Error unlinking lock file “%s”: %s"
 msgstr "Feil under unlink()ing av låsfil «%s»: %s"
 
 #: ../gio/gdbusauthmechanismsha1.c:681
 #, c-format
-msgid "Error opening keyring '%s' for writing: "
+msgid "Error opening keyring “%s” for writing: "
 msgstr "Feil under åpning av nøkkelring «%s» for skriving: "
 
 #: ../gio/gdbusauthmechanismsha1.c:878
 #, c-format
-msgid "(Additionally, releasing the lock for '%s' also failed: %s) "
+msgid "(Additionally, releasing the lock for “%s” also failed: %s) "
 msgstr "(I tillegg feilet frislipp av lås for «%s» også: %s) "
 
 #: ../gio/gdbusconnection.c:612 ../gio/gdbusconnection.c:2377
@@ -716,6 +713,15 @@ msgstr "Metode «%s» på grensesnitt «%s» med signatur «%s» eksisterer ikke
 msgid "A subtree is already exported for %s"
 msgstr "Et undertre er allerede eksportert for %s"
 
+#: ../gio/gdbusconnection.c:7133
+#, c-format
+msgid ""
+"Cannot determine bus address from DBUS_STARTER_BUS_TYPE environment variable "
+"- unknown value '%s'"
+msgstr ""
+"Kan ikke bestemme adresse for buss fra miljøvariabelen DBUS_STARTER_BUS_TYPE "
+"- ukjent verdi «%s»"
+
 #: ../gio/gdbusmessage.c:1244
 msgid "type is INVALID"
 msgstr "UGYLDIG type"
@@ -761,14 +767,14 @@ msgstr[1] "Ønsket å lese %lu bytes men fikk bare %lu"
 
 #: ../gio/gdbusmessage.c:1369
 #, c-format
-msgid "Expected NUL byte after the string '%s' but found byte %d"
+msgid "Expected NUL byte after the string “%s” but found byte %d"
 msgstr "Forventet NUL-byte etter strengen «%s», men fant byte %d"
 
 #: ../gio/gdbusmessage.c:1388
 #, c-format
 msgid ""
 "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'"
+"(length of string is %d). The valid UTF-8 string up until that point was “%s”"
 msgstr ""
 "Forventet en gyldig UTF-8 streng, men fant ugyldige bytes ved byteavstand %d "
 "(lengden av strengen er %d). Gydldig UTF-8 streng opp til det punktet var "
@@ -776,12 +782,12 @@ msgstr ""
 
 #: ../gio/gdbusmessage.c:1587
 #, c-format
-msgid "Parsed value '%s' is not a valid D-Bus object path"
+msgid "Parsed value “%s” is not a valid D-Bus object path"
 msgstr "Lest verdi «%s» er ikke en gyldig objektsti for D-Bus"
 
 #: ../gio/gdbusmessage.c:1609
 #, c-format
-msgid "Parsed value '%s' is not a valid D-Bus signature"
+msgid "Parsed value “%s” is not a valid D-Bus signature"
 msgstr "Tolket verdi «%s» er ikke en gyldig D-Bus-signatur"
 
 #: ../gio/gdbusmessage.c:1656
@@ -798,7 +804,7 @@ msgstr[1] ""
 #: ../gio/gdbusmessage.c:1676
 #, c-format
 msgid ""
-"Encountered array of type 'a%c', expected to have a length a multiple of %u "
+"Encountered array of type “a%c”, expected to have a length a multiple of %u "
 "bytes, but found to be %u bytes in length"
 msgstr ""
 "Fant en matrise av type «a%c» som var forventet å ha en lengde som er en "
@@ -806,20 +812,20 @@ msgstr ""
 
 #: ../gio/gdbusmessage.c:1843
 #, c-format
-msgid "Parsed value '%s' for variant is not a valid D-Bus signature"
+msgid "Parsed value “%s” for variant is not a valid D-Bus signature"
 msgstr "Lest verdi «%s» for variant er ikke en gyldig D-Bus-signatur"
 
 #: ../gio/gdbusmessage.c:1867
 #, c-format
 msgid ""
-"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"
 msgstr ""
 "Feil ved deserialisering av GVariant med strengtype «%s» fra D-Bus-format"
 
 #: ../gio/gdbusmessage.c:2051
 #, c-format
 msgid ""
-"Invalid endianness value. Expected 0x6c ('l') or 0x42 ('B') but found value "
+"Invalid endianness value. Expected 0x6c (“l”) or 0x42 (“B”) but found value "
 "0x%02x"
 msgstr ""
 "Ugyldig verdi for endianness. Forventet 0x6c ('l') eller 0x42 ('B'), men "
@@ -832,12 +838,12 @@ msgstr "Ugyldig hovedversjon for protokoll. Forventet en men fikk %d"
 
 #: ../gio/gdbusmessage.c:2120
 #, c-format
-msgid "Signature header with signature '%s' found but message body is empty"
+msgid "Signature header with signature “%s” found but message body is empty"
 msgstr "Signaturtopptekst med signatur «%s» funnet, men meldingskroppen er tom"
 
 #: ../gio/gdbusmessage.c:2134
 #, c-format
-msgid "Parsed value '%s' is not a valid D-Bus signature (for body)"
+msgid "Parsed value “%s” is not a valid D-Bus signature (for body)"
 msgstr "Lest verdi «%s» er ikke en gyldig D-Bus-signatur (for kropp)"
 
 #: ../gio/gdbusmessage.c:2164
@@ -855,7 +861,7 @@ msgstr "Kan ikke deserialisere melding: "
 #: ../gio/gdbusmessage.c:2515
 #, c-format
 msgid ""
-"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"
 msgstr ""
 "Feil ved serialisering av GVariant med strengtype «%s» til D-Bus-format"
 
@@ -874,27 +880,27 @@ msgstr "Kan ikke serialisere melding: "
 
 #: ../gio/gdbusmessage.c:2704
 #, c-format
-msgid "Message body has signature '%s' but there is no signature header"
+msgid "Message body has signature “%s” but there is no signature header"
 msgstr ""
 "Meldingskroppen har signatur «%s» men det finnes ingen signaturtopptekst"
 
 #: ../gio/gdbusmessage.c:2714
 #, c-format
 msgid ""
-"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”"
 msgstr ""
 "Meldingskroppen har signaturtype «%s», men signaturen i topptekstfeltet et "
 "«%s»"
 
 #: ../gio/gdbusmessage.c:2730
 #, c-format
-msgid "Message body is empty but signature in the header field is '(%s)'"
+msgid "Message body is empty but signature in the header field is “(%s)”"
 msgstr "Meldingskroppen er tom men signatur i topptekstfeltet er «(%s)»"
 
 #: ../gio/gdbusmessage.c:3283
 #, c-format
-msgid "Error return with body of type '%s'"
+msgid "Error return with body of type “%s”"
 msgstr "Feil retur med kropp av type «%s»"
 
 #: ../gio/gdbusmessage.c:3291
@@ -938,18 +944,18 @@ msgstr "Kan ikke oppgi nonce-fil når en tjener opprettes"
 
 #: ../gio/gdbusserver.c:873
 #, c-format
-msgid "Error writing nonce file at '%s': %s"
+msgid "Error writing nonce file at “%s”: %s"
 msgstr "Feil under skriving av nonce-fil i «%s»: %s"
 
 #: ../gio/gdbusserver.c:1044
 #, c-format
-msgid "The string '%s' is not a valid D-Bus GUID"
+msgid "The string “%s” is not a valid D-Bus GUID"
 msgstr "Strengen «%s» er ikke en gyldig D-Bus-GUID"
 
 #: ../gio/gdbusserver.c:1084
 #, c-format
-msgid "Cannot listen on unsupported transport '%s'"
-msgstr "Kan ikke lytte på ikke-støttet transport «%s»"
+msgid "Cannot listen on unsupported transport “%s”"
+msgstr "Kan ikke lytte på en transport «%s» som ikke er støttet"
 
 #: ../gio/gdbus-tool.c:95
 #, c-format
@@ -961,7 +967,7 @@ msgid ""
 "  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"
 msgstr ""
 "Kommandoer:\n"
 "  help         Viser denne informasjonen\n"
@@ -1022,15 +1028,15 @@ msgstr "Flere sluttpunkt oppgitt for tilkobling"
 #: ../gio/gdbus-tool.c:471
 #, c-format
 msgid ""
-"Warning: According to introspection data, interface '%s' does not exist\n"
+"Warning: According to introspection data, interface “%s” does not exist\n"
 msgstr ""
 "Advarsel: I følge introspeksjonsdata eksisterer ikke grensesnitt «%s»\n"
 
 #: ../gio/gdbus-tool.c:480
 #, c-format
 msgid ""
-"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"
 msgstr ""
 "Advarsel: I følge introspeksjonsdata eksisterer ikke metode «%s» på "
 "grensesnitt «%s»\n"
@@ -1146,12 +1152,12 @@ msgstr "Feil: metodenavn er ikke oppgitt\n"
 
 #: ../gio/gdbus-tool.c:950
 #, c-format
-msgid "Error: Method name '%s' is invalid\n"
+msgid "Error: Method name “%s” is invalid\n"
 msgstr "Feil: metodenavn «%s» er ugyldig\n"
 
 #: ../gio/gdbus-tool.c:1028
 #, c-format
-msgid "Error parsing parameter %d of type '%s': %s\n"
+msgid "Error parsing parameter %d of type “%s”: %s\n"
 msgstr "Feil under tolking av parameter %d av type «%s»: %s\n"
 
 #: ../gio/gdbus-tool.c:1472
@@ -1195,7 +1201,7 @@ msgid "Unnamed"
 msgstr "Uten navn"
 
 #: ../gio/gdesktopappinfo.c:2404
-msgid "Desktop file didn't specify Exec field"
+msgid "Desktop file didn’t specify Exec field"
 msgstr "Desktop-filen hadde ingen verdi i Exec-feltet"
 
 #: ../gio/gdesktopappinfo.c:2689
@@ -1204,12 +1210,12 @@ msgstr "Kan ikke finne terminalen som kreves for programmet"
 
 #: ../gio/gdesktopappinfo.c:3097
 #, c-format
-msgid "Can't create user application configuration folder %s: %s"
+msgid "Can’t create user application configuration folder %s: %s"
 msgstr "Kan ikke opprette konfigurasjonsmappe %s for brukers program: %s"
 
 #: ../gio/gdesktopappinfo.c:3101
 #, c-format
-msgid "Can't create user MIME configuration folder %s: %s"
+msgid "Can’t create user MIME configuration folder %s: %s"
 msgstr "Kan ikke opprette brukers konfigurasjonsmappe %s for MIME: %s"
 
 #: ../gio/gdesktopappinfo.c:3341 ../gio/gdesktopappinfo.c:3365
@@ -1218,7 +1224,7 @@ msgstr "Programinformasjonen mangler en identifikator"
 
 #: ../gio/gdesktopappinfo.c:3599
 #, c-format
-msgid "Can't create user desktop file %s"
+msgid "Can’t create user desktop file %s"
 msgstr "Kan ikke opprette brukers desktop-fil %s"
 
 #: ../gio/gdesktopappinfo.c:3733
@@ -1227,27 +1233,27 @@ msgid "Custom definition for %s"
 msgstr "Egendefinert definisjon for %s"
 
 #: ../gio/gdrive.c:417
-msgid "drive doesn't implement eject"
+msgid "drive doesn’t implement eject"
 msgstr "stasjonen implementerer ikke utløsing"
 
 #. Translators: This is an error
 #. * message for drive objects that
 #. * don't implement any of eject or eject_with_operation.
 #: ../gio/gdrive.c:495
-msgid "drive doesn't implement eject or eject_with_operation"
+msgid "drive doesn’t implement eject or eject_with_operation"
 msgstr "stasjonen implementerer ikke eject eller eject_with_operation"
 
 #: ../gio/gdrive.c:571
-msgid "drive doesn't implement polling for media"
+msgid "drive doesn’t implement polling for media"
 msgstr "stasjonen implementerer ikke sjekk om medie er satt inn"
 
 #: ../gio/gdrive.c:776
-msgid "drive doesn't implement start"
+msgid "drive doesn’t implement start"
 msgstr "stasjonen implementerer ikke start"
 
 #: ../gio/gdrive.c:878
-msgid "drive doesn't implement stop"
-msgstr "stasjonen implementerer ikke stop"
+msgid "drive doesn’t implement stop"
+msgstr "stasjonen implementerer ikke stopp"
 
 #: ../gio/gdummytlsbackend.c:195 ../gio/gdummytlsbackend.c:317
 #: ../gio/gdummytlsbackend.c:509
@@ -1260,7 +1266,7 @@ msgstr "DTLS-støtte er ikke tilgjengelig"
 
 #: ../gio/gemblem.c:323
 #, c-format
-msgid "Can't handle version %d of GEmblem encoding"
+msgid "Can’t handle version %d of GEmblem encoding"
 msgstr "Kan ikke håndtere versjon %d av GEmblem-koding"
 
 #: ../gio/gemblem.c:333
@@ -1270,7 +1276,7 @@ msgstr "Feil antall tegn (%d) i GEmblem-koding"
 
 #: ../gio/gemblemedicon.c:362
 #, c-format
-msgid "Can't handle version %d of GEmblemedIcon encoding"
+msgid "Can’t handle version %d of GEmblemedIcon encoding"
 msgstr "Kan ikke håndtere versjon %d av GEmblemedIcon-koding"
 
 #: ../gio/gemblemedicon.c:372
@@ -1302,12 +1308,12 @@ msgstr "Operasjonen er ikke støttet"
 msgid "Containing mount does not exist"
 msgstr "Omsluttende monteringspunkt finnes ikke"
 
-#: ../gio/gfile.c:2515 ../gio/glocalfile.c:2374
-msgid "Can't copy over directory"
+#: ../gio/gfile.c:2515 ../gio/glocalfile.c:2375
+msgid "Can’t copy over directory"
 msgstr "Kan ikke kopiere over katalog"
 
 #: ../gio/gfile.c:2575
-msgid "Can't copy directory over directory"
+msgid "Can’t copy directory over directory"
 msgstr "Kan ikke kopiere katalog over katalog"
 
 #: ../gio/gfile.c:2583
@@ -1315,7 +1321,7 @@ msgid "Target file exists"
 msgstr "Målfilen eksisterer"
 
 #: ../gio/gfile.c:2602
-msgid "Can't recursively copy directory"
+msgid "Can’t recursively copy directory"
 msgstr "Kan ikke kopiere katalog rekursivt"
 
 #: ../gio/gfile.c:2884
@@ -1336,11 +1342,11 @@ msgid "Copy (reflink/clone) is not supported or invalid"
 msgstr "Kopiering (reflink/clone) er ikke støttet eller ugyldig"
 
 #: ../gio/gfile.c:3028
-msgid "Copy (reflink/clone) is not supported or didn't work"
+msgid "Copy (reflink/clone) is not supported or didn’t work"
 msgstr "Kopiering (reflink/clone) er ikke støttet eller virket ikke"
 
 #: ../gio/gfile.c:3091
-msgid "Can't copy special file"
+msgid "Can’t copy special file"
 msgstr "Kan ikke kopiere spesiell fil"
 
 #: ../gio/gfile.c:3885
@@ -1353,11 +1359,11 @@ msgstr "Papirkurv er ikke støttet"
 
 #: ../gio/gfile.c:4158
 #, c-format
-msgid "File names cannot contain '%c'"
+msgid "File names cannot contain “%c”"
 msgstr "Filnavn kan ikke inneholde «%c»"
 
 #: ../gio/gfile.c:6604 ../gio/gvolume.c:363
-msgid "volume doesn't implement mount"
+msgid "volume doesn’t implement mount"
 msgstr "volumet implementerer ikke montering"
 
 #: ../gio/gfile.c:6713
@@ -1379,7 +1385,7 @@ msgstr "Filenumerator er allerede lukket"
 
 #: ../gio/gfileicon.c:236
 #, c-format
-msgid "Can't handle version %d of GFileIcon encoding"
+msgid "Can’t handle version %d of GFileIcon encoding"
 msgstr "Kan ikke håndtere versjon %d av GFileIcon-koding"
 
 #: ../gio/gfileicon.c:246
@@ -1389,7 +1395,7 @@ msgstr "Feil inndata for GFileIcon"
 #: ../gio/gfileinputstream.c:149 ../gio/gfileinputstream.c:394
 #: ../gio/gfileiostream.c:167 ../gio/gfileoutputstream.c:164
 #: ../gio/gfileoutputstream.c:497
-msgid "Stream doesn't support query_info"
+msgid "Stream doesn’t support query_info"
 msgstr "Strømmen støtter ikke query_info"
 
 #: ../gio/gfileinputstream.c:325 ../gio/gfileiostream.c:379
@@ -1461,7 +1467,7 @@ msgid "Type %s does not implement from_tokens() on the GIcon interface"
 msgstr "Type %s implementerer ikke from_tokens() på GIcon-grensesnittet"
 
 #: ../gio/gicon.c:461
-msgid "Can't handle the supplied version of the icon encoding"
+msgid "Can’t handle the supplied version of the icon encoding"
 msgstr "Kan ikke håndtere oppgitt versjon i ikon-koding"
 
 #: ../gio/ginetaddressmask.c:182
@@ -1479,7 +1485,7 @@ msgstr "Adressen har biter satt forbi lengde på prefiks"
 
 #: ../gio/ginetaddressmask.c:300
 #, c-format
-msgid "Could not parse '%s' as IP address mask"
+msgid "Could not parse “%s” as IP address mask"
 msgstr "Kunne ikke lese «%s» som IP-adressemaske"
 
 #: ../gio/ginetsocketaddress.c:203 ../gio/ginetsocketaddress.c:220
@@ -1492,7 +1498,7 @@ msgid "Unsupported socket address"
 msgstr "Adresse for plugg er ikke støttet"
 
 #: ../gio/ginputstream.c:188
-msgid "Input stream doesn't implement read"
+msgid "Input stream doesn’t implement read"
 msgstr "Inndatastrøm implementerer ikke lesing"
 
 #. Translators: This is an error you get if there is already an
@@ -1508,14 +1514,14 @@ msgstr "Strømmen har utestående operasjoner"
 
 #: ../gio/gio-tool.c:142
 msgid "Copy with file"
-msgstr ""
+msgstr "Kopier med fil"
 
 #: ../gio/gio-tool.c:146
 msgid "Keep with file when moved"
-msgstr ""
+msgstr "Behold med fil når den flyttes"
 
 #: ../gio/gio-tool.c:187
-msgid "'version' takes no arguments"
+msgid "“version” takes no arguments"
 msgstr "«version» tar ingen argumenter"
 
 #: ../gio/gio-tool.c:189 ../gio/gio-tool.c:205 ../glib/goption.c:857
@@ -1526,6 +1532,10 @@ msgstr "Bruk:"
 msgid "Print version information and exit."
 msgstr "Skriv versjonsinformasjon og avslutt."
 
+#: ../gio/gio-tool.c:206
+msgid "[ARGS...]"
+msgstr "[ARGUMENTER …]"
+
 #: ../gio/gio-tool.c:208
 msgid "Commands:"
 msgstr "Kommandoer:"
@@ -1568,7 +1578,7 @@ msgstr "Flytt en eller flere filer"
 
 #: ../gio/gio-tool.c:220
 msgid "Open files with the default application"
-msgstr ""
+msgstr "Åpne filer med forvalgt program"
 
 #: ../gio/gio-tool.c:221
 msgid "Rename a file"
@@ -1644,9 +1654,8 @@ msgstr "Behold alle attributter"
 
 #: ../gio/gio-tool-copy.c:46 ../gio/gio-tool-move.c:41
 #: ../gio/gio-tool-save.c:49
-#, fuzzy
 msgid "Backup existing destination files"
-msgstr "Oppretting av sikkerhetskopi feilet"
+msgstr "Ta sikkerhetskopi av eksisterende målfiler"
 
 #: ../gio/gio-tool-copy.c:47
 msgid "Never follow symbolic links"
@@ -1655,7 +1664,7 @@ msgstr "Aldri følg symbolske lenker"
 #: ../gio/gio-tool-copy.c:72 ../gio/gio-tool-move.c:67
 #, c-format
 msgid "Transferred %s out of %s (%s/s)"
-msgstr ""
+msgstr "%s av %s er overført (%s/s)"
 
 #. Translators: commandline placeholder
 #: ../gio/gio-tool-copy.c:98 ../gio/gio-tool-move.c:94
@@ -1680,36 +1689,34 @@ msgid ""
 msgstr ""
 
 #: ../gio/gio-tool-copy.c:143
-#, fuzzy, c-format
+#, c-format
 msgid "Destination %s is not a directory"
-msgstr "Ressurs ved «%s» er ikke en katalog"
+msgstr "Mål %s er ikke en katalog"
 
 #: ../gio/gio-tool-copy.c:187 ../gio/gio-tool-move.c:181
 #, c-format
-msgid "%s: overwrite '%s'? "
-msgstr "%s: overskriv «%s» "
+msgid "%s: overwrite “%s”? "
+msgstr "%s: overskriv «%s»? "
 
 #: ../gio/gio-tool-info.c:34
-#, fuzzy
 msgid "List writable attributes"
-msgstr "Vis tilgjengelige handlinger"
+msgstr "Vis skrivbare attributter"
 
 #: ../gio/gio-tool-info.c:35
-#, fuzzy
 msgid "Get file system info"
-msgstr "Feil under lesing av informasjon om filsystem: %s"
+msgstr "Hent informasjon om filsystem"
 
 #: ../gio/gio-tool-info.c:36 ../gio/gio-tool-list.c:35
 msgid "The attributes to get"
-msgstr ""
+msgstr "Attributter som skal hentes"
 
 #: ../gio/gio-tool-info.c:36 ../gio/gio-tool-list.c:35
 msgid "ATTRIBUTES"
 msgstr "ATTRIBUTTER"
 
 #: ../gio/gio-tool-info.c:37 ../gio/gio-tool-list.c:38 ../gio/gio-tool-set.c:34
-msgid "Don't follow symbolic links"
-msgstr ""
+msgid "Don’t follow symbolic links"
+msgstr "Aldri følg symbolske lenker"
 
 #: ../gio/gio-tool-info.c:75
 #, c-format
@@ -1720,7 +1727,7 @@ msgstr "attributter:\n"
 #: ../gio/gio-tool-info.c:127
 #, c-format
 msgid "display name: %s\n"
-msgstr ""
+msgstr "vis navn: %s\n"
 
 #. Translators: This is a noun and represents and attribute of a file
 #: ../gio/gio-tool-info.c:132
@@ -1754,24 +1761,23 @@ msgid "uri: %s\n"
 msgstr "uri: %s\n"
 
 #: ../gio/gio-tool-info.c:221
-#, fuzzy, c-format
+#, c-format
 msgid "Error getting writable attributes: %s\n"
-msgstr "Feil under setting av utvidet attributt «%s»: %s"
+msgstr "Feil under henting av skrivbare attributter: %s\n"
 
 #: ../gio/gio-tool-info.c:226
 #, c-format
 msgid "Settable attributes:\n"
-msgstr ""
+msgstr "Attributter som kan settes:\n"
 
 #: ../gio/gio-tool-info.c:249
 #, c-format
 msgid "Writable attribute namespaces:\n"
-msgstr ""
+msgstr "Navneområder for skrivbar attributt:\n"
 
 #: ../gio/gio-tool-info.c:283
-#, fuzzy
 msgid "Show information about locations."
-msgstr "Vis flagg for GApplication"
+msgstr "Vis informasjon om lokasjoner."
 
 #: ../gio/gio-tool-info.c:285
 msgid ""
@@ -1779,12 +1785,12 @@ msgid ""
 "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"
 msgstr ""
 
 #: ../gio/gio-tool-info.c:307 ../gio/gio-tool-mkdir.c:74
 msgid "No locations given"
-msgstr ""
+msgstr "Ingen lokasjoner oppgitt"
 
 #: ../gio/gio-tool-list.c:36 ../gio/gio-tool-tree.c:32
 msgid "Show hidden files"
@@ -1796,11 +1802,11 @@ msgstr ""
 
 #: ../gio/gio-tool-list.c:39
 msgid "Print full URIs"
-msgstr ""
+msgstr "Skriv ut fulle URIer"
 
 #: ../gio/gio-tool-list.c:170
 msgid "List the contents of the locations."
-msgstr ""
+msgstr "Vis innhold fra lokasjonene."
 
 #: ../gio/gio-tool-list.c:172
 msgid ""
@@ -1835,24 +1841,24 @@ msgid "Must specify a single mimetype, and maybe a handler"
 msgstr ""
 
 #: ../gio/gio-tool-mime.c:113
-#, fuzzy, c-format
-msgid "No default applications for '%s'\n"
-msgstr "ugyldig program-ID: «%s»\n"
+#, c-format
+msgid "No default applications for “%s”\n"
+msgstr "Ingen forvalgte programmer for «%s»\n"
 
 #: ../gio/gio-tool-mime.c:119
-#, fuzzy, c-format
-msgid "Default application for '%s': %s\n"
-msgstr "ugyldig program-ID: «%s»\n"
+#, c-format
+msgid "Default application for “%s”: %s\n"
+msgstr "Forvalgt program for «%s»: %s\n"
 
 #: ../gio/gio-tool-mime.c:124
-#, fuzzy, c-format
+#, c-format
 msgid "Registered applications:\n"
-msgstr "Vis programmer"
+msgstr "Registrerte programmer:\n"
 
 #: ../gio/gio-tool-mime.c:126
-#, fuzzy, c-format
+#, c-format
 msgid "No registered applications\n"
-msgstr "Vis programmer"
+msgstr "Ingen registrerte programmer\n"
 
 #: ../gio/gio-tool-mime.c:137
 #, c-format
@@ -1865,19 +1871,18 @@ msgid "No recommended applications\n"
 msgstr "Ingen anbefalte programmer\n"
 
 #: ../gio/gio-tool-mime.c:159
-#, fuzzy, c-format
-msgid "Failed to load info for handler '%s'\n"
-msgstr "Feil under lesing fra fil «%s»: %s"
+#, c-format
+msgid "Failed to load info for handler “%s”\n"
+msgstr "Klarte ikke å laste info for håndterer «%s»\n"
 
 #: ../gio/gio-tool-mime.c:165
-#, fuzzy, c-format
-msgid "Failed to set '%s' as the default handler for '%s': %s\n"
-msgstr "Feil under oppretting av fil «%s»: %s"
+#, c-format
+msgid "Failed to set “%s” as the default handler for “%s”: %s\n"
+msgstr "Klarte ikke å sette «%s» som forvalgt håndterer for «%s»: %s\n"
 
 #: ../gio/gio-tool-mkdir.c:31
-#, fuzzy
 msgid "Create parent directories"
-msgstr "Kan ikke åpne mappe"
+msgstr "Lag opphavsmapper"
 
 #: ../gio/gio-tool-mkdir.c:52
 msgid "Create directories."
@@ -1903,8 +1908,8 @@ msgid "Monitor a file directly (notices changes made via hardlinks)"
 msgstr ""
 
 #: ../gio/gio-tool-monitor.c:43
-msgid "Monitors a file directly, but doesn't report changes"
-msgstr ""
+msgid "Monitors a file directly, but doesn’t report changes"
+msgstr "Overvåker en fil direkte, men rapporterer ikke endringer"
 
 #: ../gio/gio-tool-monitor.c:45
 msgid "Report moves and renames as simple deleted/created events"
@@ -1920,7 +1925,7 @@ msgstr ""
 
 #: ../gio/gio-tool-mount.c:58
 msgid "Mount as mountable"
-msgstr ""
+msgstr "Monter som monterbar"
 
 #: ../gio/gio-tool-mount.c:59
 msgid "Mount volume with device file"
@@ -1939,8 +1944,9 @@ msgid "Eject"
 msgstr "Løs ut"
 
 #: ../gio/gio-tool-mount.c:62
+#, fuzzy
 msgid "Unmount all mounts with the given scheme"
-msgstr ""
+msgstr "Avmonter alle monteringspunkter med oppgitt..."
 
 #: ../gio/gio-tool-mount.c:62
 msgid "SCHEME"
@@ -1968,29 +1974,29 @@ msgid "Show extra information"
 msgstr "Vis ekstra informasjon"
 
 #: ../gio/gio-tool-mount.c:246 ../gio/gio-tool-mount.c:276
-#, fuzzy, c-format
+#, c-format
 msgid "Error mounting location: Anonymous access denied\n"
-msgstr "Feil ved setting av endrings- eller aksesstid: %s"
+msgstr "Feil ved montering av lokasjon: Anonym tilgang nektet\n"
 
 #: ../gio/gio-tool-mount.c:248 ../gio/gio-tool-mount.c:278
-#, fuzzy, c-format
+#, c-format
 msgid "Error mounting location: %s\n"
-msgstr "Feil ved nullstilling av tilkobling: %s\n"
+msgstr "Feil ved montering av lokasjon: %s\n"
 
 #: ../gio/gio-tool-mount.c:341
-#, fuzzy, c-format
+#, c-format
 msgid "Error unmounting mount: %s\n"
-msgstr "Feil under tilkobling: %s\n"
+msgstr "Feil ved avmontering av monteringspunkt: %s\n"
 
 #: ../gio/gio-tool-mount.c:366 ../gio/gio-tool-mount.c:419
-#, fuzzy, c-format
+#, c-format, fuzzy
 msgid "Error finding enclosing mount: %s\n"
 msgstr "Feil ved lukking av plugg: %s"
 
 #: ../gio/gio-tool-mount.c:394
-#, fuzzy, c-format
+#, c-format
 msgid "Error ejecting mount: %s\n"
-msgstr "Feil ved setting av eier: %s"
+msgstr "Feil ved utløsing av monteringspunkt: %s\n"
 
 #: ../gio/gio-tool-mount.c:875
 #, c-format
@@ -2012,12 +2018,12 @@ msgid "Mount or unmount the locations."
 msgstr "M<onter eller avmonter lokasjonene."
 
 #: ../gio/gio-tool-move.c:42
-msgid "Don't use copy and delete fallback"
+msgid "Don’t use copy and delete fallback"
 msgstr ""
 
 #: ../gio/gio-tool-move.c:99
 msgid "Move one or more files from SOURCE to DEST."
-msgstr ""
+msgstr "Flytt en eller flere filer fra KILDE til MÅL."
 
 #: ../gio/gio-tool-move.c:101
 msgid ""
@@ -2107,9 +2113,9 @@ msgstr ""
 
 #. Translators: The "etag" is a token allowing to verify whether a file has been modified
 #: ../gio/gio-tool-save.c:145
-#, fuzzy, c-format
+#, c-format
 msgid "Etag not available\n"
-msgstr "TLS-støtte er ikke tilgjengelig"
+msgstr "Etag er ikke tilgjengelig\n"
 
 #: ../gio/gio-tool-save.c:168
 msgid "Read from standard input and save to DEST."
@@ -2117,52 +2123,49 @@ msgstr ""
 
 #: ../gio/gio-tool-save.c:186
 msgid "No destination given"
-msgstr ""
+msgstr "Ingen mål oppgitt"
 
 #: ../gio/gio-tool-set.c:33
 msgid "Type of the attribute"
-msgstr ""
+msgstr "Type attributt"
 
 #: ../gio/gio-tool-set.c:33
 msgid "TYPE"
-msgstr ""
+msgstr "TYPE"
 
 #: ../gio/gio-tool-set.c:89
 msgid "ATTRIBUTE"
-msgstr ""
+msgstr "ATTRIBUTT"
 
 #: ../gio/gio-tool-set.c:89
 msgid "VALUE"
-msgstr ""
+msgstr "VERDI"
 
 #: ../gio/gio-tool-set.c:93
 msgid "Set a file attribute of LOCATION."
 msgstr ""
 
 #: ../gio/gio-tool-set.c:111
-#, fuzzy
 msgid "Location not specified"
-msgstr "Sluttpunkt for tilkobling ikke oppgitt"
+msgstr "Lokasjon er ikke oppgitt"
 
 #: ../gio/gio-tool-set.c:119
-#, fuzzy
 msgid "Attribute not specified"
-msgstr "Feil: signal er ikke oppgitt.\n"
+msgstr "Attributt er ikke oppgitt"
 
 #: ../gio/gio-tool-set.c:128
-#, fuzzy
 msgid "Value not specified"
-msgstr "Feil: signal er ikke oppgitt.\n"
+msgstr "Verdi er ikke oppgitt"
 
 #: ../gio/gio-tool-set.c:176
-#, fuzzy, c-format
+#, c-format
 msgid "Invalid attribute type %s\n"
-msgstr "Ugyldig type attributt (streng forventet)"
+msgstr "Ugyldig type attributt %s\n"
 
 #: ../gio/gio-tool-set.c:189
-#, fuzzy, c-format
+#, c-format
 msgid "Error setting attribute: %s\n"
-msgstr "Feil under setting av utvidet attributt «%s»: %s"
+msgstr "Feil under setting av attributt: %s\n"
 
 #: ../gio/gio-tool-trash.c:32
 msgid "Empty the trash"
@@ -2197,17 +2200,17 @@ msgstr "Filen %s finnes flere ganger i ressursen"
 
 #: ../gio/glib-compile-resources.c:248
 #, c-format
-msgid "Failed to locate '%s' in any source directory"
+msgid "Failed to locate “%s” in any source directory"
 msgstr "Klarte ikke å finne «%s» i noen kildekatalog"
 
 #: ../gio/glib-compile-resources.c:259
 #, c-format
-msgid "Failed to locate '%s' in current directory"
+msgid "Failed to locate “%s” in current directory"
 msgstr "Klarte ikke å finne «%s» i aktiv katalog"
 
 #: ../gio/glib-compile-resources.c:290
 #, c-format
-msgid "Unknown processing option \"%s\""
+msgid "Unknown processing option “%s”"
 msgstr "Ukjente flagg for preprosessering «%s»"
 
 #: ../gio/glib-compile-resources.c:308 ../gio/glib-compile-resources.c:354
@@ -2230,59 +2233,63 @@ msgstr "Feil ved komprimering av fil %s"
 msgid "text may not appear inside <%s>"
 msgstr "tekst kan ikke forekomme inne i <%s>"
 
-#: ../gio/glib-compile-resources.c:621 ../gio/glib-compile-schemas.c:2037
+#: ../gio/glib-compile-resources.c:664 ../gio/glib-compile-schemas.c:2037
 msgid "Show program version and exit"
-msgstr ""
+msgstr "Vis programmets versjon og avslutt"
 
-#: ../gio/glib-compile-resources.c:622
+#: ../gio/glib-compile-resources.c:665
 msgid "name of the output file"
 msgstr "navn på utdatafil"
 
-#: ../gio/glib-compile-resources.c:623
+#: ../gio/glib-compile-resources.c:666
 msgid ""
 "The directories where files are to be read from (default to current "
 "directory)"
 msgstr "Kataloger filene skal leses fra (aktiv katalog er forvalgt)"
 
-#: ../gio/glib-compile-resources.c:623 ../gio/glib-compile-schemas.c:2038
+#: ../gio/glib-compile-resources.c:666 ../gio/glib-compile-schemas.c:2038
 #: ../gio/glib-compile-schemas.c:2067
 msgid "DIRECTORY"
 msgstr "KATALOG"
 
-#: ../gio/glib-compile-resources.c:624
+#: ../gio/glib-compile-resources.c:667
 msgid ""
 "Generate output in the format selected for by the target filename extension"
 msgstr "Lag utdata i formatet som er valgt for målets filtype"
 
-#: ../gio/glib-compile-resources.c:625
+#: ../gio/glib-compile-resources.c:668
 msgid "Generate source header"
 msgstr "Lag hode for kildekode"
 
-#: ../gio/glib-compile-resources.c:626
+#: ../gio/glib-compile-resources.c:669
 msgid "Generate sourcecode used to link in the resource file into your code"
 msgstr "Lag kildekode som skal brukes til å lenke inn ressursfilen i din kode"
 
-#: ../gio/glib-compile-resources.c:627
+#: ../gio/glib-compile-resources.c:670
 msgid "Generate dependency list"
 msgstr "Lag listet med avhengigheter"
 
-#: ../gio/glib-compile-resources.c:628
+#: ../gio/glib-compile-resources.c:671
 msgid "name of the dependency file to generate"
 msgstr ""
 
-#: ../gio/glib-compile-resources.c:629
-msgid "Don't automatically create and register resource"
+#: ../gio/glib-compile-resources.c:672
+msgid "Include phony targets in the generated dependency file"
+msgstr ""
+
+#: ../gio/glib-compile-resources.c:673
+msgid "Don’t automatically create and register resource"
 msgstr "Ikke lag og registrer ressursen automatisk"
 
-#: ../gio/glib-compile-resources.c:630
-msgid "Don't export functions; declare them G_GNUC_INTERNAL"
+#: ../gio/glib-compile-resources.c:674
+msgid "Don’t export functions; declare them G_GNUC_INTERNAL"
 msgstr "Ikke ekporter funksjoner. Deklarer dem som G_GNUC_INTERNAL"
 
-#: ../gio/glib-compile-resources.c:631
+#: ../gio/glib-compile-resources.c:675
 msgid "C identifier name used for the generated source code"
 msgstr "Navn på C-identifikator som brukes for generert kildekode"
 
-#: ../gio/glib-compile-resources.c:657
+#: ../gio/glib-compile-resources.c:701
 msgid ""
 "Compile a resource specification into a resource file.\n"
 "Resource specification files have the extension .gresource.xml,\n"
@@ -2292,7 +2299,7 @@ msgstr ""
 "Ressursspesifikasjonsfiler har type .gresource.xml,\n"
 "og ressufsfilen har etternavn .gresource."
 
-#: ../gio/glib-compile-resources.c:679
+#: ../gio/glib-compile-resources.c:723
 #, c-format
 msgid "You should give exactly one file name\n"
 msgstr "Du må kun oppgi ett filnavn\n"
@@ -2565,133 +2572,133 @@ msgstr "gjør ingenting.\n"
 msgid "removed existing output file.\n"
 msgstr "fjernet eksisterende utdatafil.\n"
 
-#: ../gio/glocalfile.c:642 ../gio/win32/gwinhttpfile.c:420
+#: ../gio/glocalfile.c:643 ../gio/win32/gwinhttpfile.c:420
 #, c-format
 msgid "Invalid filename %s"
 msgstr "Ugyldig filnavn %s"
 
-#: ../gio/glocalfile.c:1036
-#, fuzzy, c-format
+#: ../gio/glocalfile.c:1037
+#, c-format
 msgid "Error getting filesystem info for %s: %s"
-msgstr "Feil under lesing av informasjon om filsystem: %s"
+msgstr "Feil under lesing av informasjon om filsystem %s: %s"
 
-#: ../gio/glocalfile.c:1175
-#, fuzzy, c-format
+#: ../gio/glocalfile.c:1176
+#, c-format
 msgid "Containing mount for file %s not found"
-msgstr "Omsluttende monteringspunkt finnes ikke"
+msgstr "Fant ikke omsluttende monteringspunkt for fil %s"
 
-#: ../gio/glocalfile.c:1198
-msgid "Can't rename root directory"
+#: ../gio/glocalfile.c:1199
+msgid "Can’t rename root directory"
 msgstr "Kan ikke endre navn på rotkatalogen"
 
-#: ../gio/glocalfile.c:1216 ../gio/glocalfile.c:1239
-#, fuzzy, c-format
+#: ../gio/glocalfile.c:1217 ../gio/glocalfile.c:1240
+#, c-format
 msgid "Error renaming file %s: %s"
-msgstr "Feil ved lesing av fil %s: %s"
+msgstr "Feil ved endring av navn på fil %s: %s"
 
-#: ../gio/glocalfile.c:1223
-msgid "Can't rename file, filename already exists"
+#: ../gio/glocalfile.c:1224
+msgid "Can’t rename file, filename already exists"
 msgstr "Kan ikke endre navn på filen. Filnavnet eksisterer allerede"
 
-#: ../gio/glocalfile.c:1236 ../gio/glocalfile.c:2250 ../gio/glocalfile.c:2278
-#: ../gio/glocalfile.c:2435 ../gio/glocalfileoutputstream.c:549
+#: ../gio/glocalfile.c:1237 ../gio/glocalfile.c:2251 ../gio/glocalfile.c:2279
+#: ../gio/glocalfile.c:2436 ../gio/glocalfileoutputstream.c:549
 msgid "Invalid filename"
 msgstr "Ugyldig filnavn"
 
-#: ../gio/glocalfile.c:1403 ../gio/glocalfile.c:1418
+#: ../gio/glocalfile.c:1404 ../gio/glocalfile.c:1419
 #, c-format
 msgid "Error opening file %s: %s"
 msgstr "Feil under åpning av fil %s: %s"
 
-#: ../gio/glocalfile.c:1543
+#: ../gio/glocalfile.c:1544
 #, c-format
 msgid "Error removing file %s: %s"
 msgstr "Feil ved fjerning av fil %s: %s"
 
-#: ../gio/glocalfile.c:1926
+#: ../gio/glocalfile.c:1927
 #, c-format
 msgid "Error trashing file %s: %s"
 msgstr "Feil ved plassering av fil %s i papirkurv : %s"
 
-#: ../gio/glocalfile.c:1949
+#: ../gio/glocalfile.c:1950
 #, c-format
 msgid "Unable to create trash dir %s: %s"
 msgstr "Kan ikke legge katalog %s i papirkurven: %s"
 
-#: ../gio/glocalfile.c:1969
-#, fuzzy, c-format
+#: ../gio/glocalfile.c:1970
+#, c-format, fuzzy
 msgid "Unable to find toplevel directory to trash %s"
 msgstr "Kan ikke finne toppnivå for papirkurv"
 
-#: ../gio/glocalfile.c:2048 ../gio/glocalfile.c:2068
-#, fuzzy, c-format
+#: ../gio/glocalfile.c:2049 ../gio/glocalfile.c:2069
+#, c-format
 msgid "Unable to find or create trash directory for %s"
-msgstr "Kan ikke finne eller opprette mappe for papirkurv"
+msgstr "Kan ikke finne eller opprette mappe for papirkurv for %s"
 
-#: ../gio/glocalfile.c:2102
-#, fuzzy, c-format
+#: ../gio/glocalfile.c:2103
+#, c-format
 msgid "Unable to create trashing info file for %s: %s"
-msgstr "Kan ikke opprette informasjonsfil for papirkurv: %s"
+msgstr "Kan ikke opprette informasjonsfil for papirkurv for %s: %s"
 
-#: ../gio/glocalfile.c:2161
+#: ../gio/glocalfile.c:2162
 #, fuzzy, c-format
 msgid "Unable to trash file %s across filesystem boundaries"
 msgstr "Kan ikke legge fil i papirkurven: %s"
 
-#: ../gio/glocalfile.c:2165 ../gio/glocalfile.c:2221
-#, fuzzy, c-format
+#: ../gio/glocalfile.c:2166 ../gio/glocalfile.c:2222
+#, c-format
 msgid "Unable to trash file %s: %s"
-msgstr "Kan ikke legge fil i papirkurven: %s"
+msgstr "Kan ikke legge fil %s i papirkurven: %s"
 
-#: ../gio/glocalfile.c:2227
-#, fuzzy, c-format
+#: ../gio/glocalfile.c:2228
+#, c-format
 msgid "Unable to trash file %s"
-msgstr "Kan ikke legge fil i papirkurven: %s"
+msgstr "Kan ikke legge fil %s i papirkurven"
 
-#: ../gio/glocalfile.c:2253
-#, fuzzy, c-format
+#: ../gio/glocalfile.c:2254
+#, c-format
 msgid "Error creating directory %s: %s"
-msgstr "Feil under oppretting av katalog «%s»: %s"
+msgstr "Feil under oppretting av katalog %s: %s"
 
-#: ../gio/glocalfile.c:2282
+#: ../gio/glocalfile.c:2283
 #, c-format
 msgid "Filesystem does not support symbolic links"
 msgstr "Filsystemet støtter ikke symbolske lenker"
 
-#: ../gio/glocalfile.c:2285
-#, fuzzy, c-format
+#: ../gio/glocalfile.c:2286
+#, c-format
 msgid "Error making symbolic link %s: %s"
-msgstr "Feil ved oppretting av symbolsk lenke: %s"
+msgstr "Feil ved oppretting av symbolsk lenke %s: %s"
 
-#: ../gio/glocalfile.c:2291 ../glib/gfileutils.c:2064
+#: ../gio/glocalfile.c:2292 ../glib/gfileutils.c:2064
 msgid "Symbolic links not supported"
 msgstr "Symbolske lenker er ikke støttet"
 
-#: ../gio/glocalfile.c:2346 ../gio/glocalfile.c:2381 ../gio/glocalfile.c:2438
-#, fuzzy, c-format
+#: ../gio/glocalfile.c:2347 ../gio/glocalfile.c:2382 ../gio/glocalfile.c:2439
+#, c-format
 msgid "Error moving file %s: %s"
-msgstr "Feil under flytting av fil: %s"
+msgstr "Feil under flytting av fil %s: %s"
 
-#: ../gio/glocalfile.c:2369
-msgid "Can't move directory over directory"
+#: ../gio/glocalfile.c:2370
+msgid "Can’t move directory over directory"
 msgstr "Kan ikke flytte katalog over katalog"
 
-#: ../gio/glocalfile.c:2395 ../gio/glocalfileoutputstream.c:925
+#: ../gio/glocalfile.c:2396 ../gio/glocalfileoutputstream.c:925
 #: ../gio/glocalfileoutputstream.c:939 ../gio/glocalfileoutputstream.c:954
 #: ../gio/glocalfileoutputstream.c:971 ../gio/glocalfileoutputstream.c:985
 msgid "Backup file creation failed"
 msgstr "Oppretting av sikkerhetskopi feilet"
 
-#: ../gio/glocalfile.c:2414
+#: ../gio/glocalfile.c:2415
 #, c-format
 msgid "Error removing target file: %s"
 msgstr "Feil under fjerning av målfil: %s"
 
-#: ../gio/glocalfile.c:2428
+#: ../gio/glocalfile.c:2429
 msgid "Move between mounts not supported"
 msgstr "Flytting mellom monteringspunkter er ikke støttet"
 
-#: ../gio/glocalfile.c:2619
+#: ../gio/glocalfile.c:2620
 #, c-format
 msgid "Could not determine the disk usage of %s: %s"
 msgstr "Kunne ikke bestemme diskbruk for %s: %s"
@@ -2710,7 +2717,7 @@ msgstr "Ugyldig navn på utvidet attributt"
 
 #: ../gio/glocalfileinfo.c:775
 #, c-format
-msgid "Error setting extended attribute '%s': %s"
+msgid "Error setting extended attribute “%s”: %s"
 msgstr "Feil under setting av utvidet attributt «%s»: %s"
 
 #: ../gio/glocalfileinfo.c:1575
@@ -2719,7 +2726,7 @@ msgstr " (ugyldig koding)"
 
 #: ../gio/glocalfileinfo.c:1766 ../gio/glocalfileoutputstream.c:803
 #, c-format
-msgid "Error when getting information for file '%s': %s"
+msgid "Error when getting information for file “%s”: %s"
 msgstr "Feil ved henting av informasjon for fil «%s»: %s"
 
 #: ../gio/glocalfileinfo.c:2017
@@ -2836,12 +2843,12 @@ msgstr "Feil ved endring av navn på midlertidig fil: %s"
 #: ../gio/glocalfileoutputstream.c:502 ../gio/glocalfileoutputstream.c:1054
 #, c-format
 msgid "Error truncating file: %s"
-msgstr "Feil under avkorting av fil: «%s»"
+msgstr "Feil under avkorting av fil: %s"
 
 #: ../gio/glocalfileoutputstream.c:555 ../gio/glocalfileoutputstream.c:785
 #: ../gio/glocalfileoutputstream.c:1035 ../gio/gsubprocess.c:360
 #, c-format
-msgid "Error opening file '%s': %s"
+msgid "Error opening file “%s”: %s"
 msgstr "Feil under åpning av fil «%s»: %s"
 
 #: ../gio/glocalfileoutputstream.c:816
@@ -2901,54 +2908,54 @@ msgstr "Forespurt søk forbi slutten på strømmen"
 #. * message for mount objects that
 #. * don't implement unmount.
 #: ../gio/gmount.c:393
-msgid "mount doesn't implement \"unmount\""
-msgstr "mount implementerer ikke «unmount»"
+msgid "mount doesn’t implement “unmount”"
+msgstr "monteringspunkt implementerer ikke «unmount»"
 
 #. Translators: This is an error
 #. * message for mount objects that
 #. * don't implement eject.
 #: ../gio/gmount.c:469
-msgid "mount doesn't implement \"eject\""
-msgstr "mount implementerer ikke «eject»"
+msgid "mount doesn’t implement “eject”"
+msgstr "monteringspunkt implementerer ikke «eject»"
 
 #. Translators: This is an error
 #. * message for mount objects that
 #. * don't implement any of unmount or unmount_with_operation.
 #: ../gio/gmount.c:547
-msgid "mount doesn't implement \"unmount\" or \"unmount_with_operation\""
-msgstr "mount implementerer ikke «unmount» eller «unmount_with_operation»"
+msgid "mount doesn’t implement “unmount” or “unmount_with_operation”"
+msgstr "monteringspunkt implementerer ikke «unmount» eller «unmount_with_operation»"
 
 #. Translators: This is an error
 #. * message for mount objects that
 #. * don't implement any of eject or eject_with_operation.
 #: ../gio/gmount.c:632
-msgid "mount doesn't implement \"eject\" or \"eject_with_operation\""
-msgstr "mount implementerer ikke «eject» eller «eject_with_operation»"
+msgid "mount doesn’t implement “eject” or “eject_with_operation”"
+msgstr "monteringspunkt implementerer ikke «eject» eller «eject_with_operation»"
 
 #. Translators: This is an error
 #. * message for mount objects that
 #. * don't implement remount.
 #: ../gio/gmount.c:720
-msgid "mount doesn't implement \"remount\""
-msgstr "mount implementerer ikke «remount»"
+msgid "mount doesn’t implement “remount”"
+msgstr "monteringspunkt implementerer ikke «remount»"
 
 #. Translators: This is an error
 #. * message for mount objects that
 #. * don't implement content type guessing.
 #: ../gio/gmount.c:802
-msgid "mount doesn't implement content type guessing"
-msgstr "mount implementerer ikke gjetting av innholdstype"
+msgid "mount doesn’t implement content type guessing"
+msgstr "monteringspunkt implementerer ikke gjetting av innholdstype"
 
 #. Translators: This is an error
 #. * message for mount objects that
 #. * don't implement content type guessing.
 #: ../gio/gmount.c:889
-msgid "mount doesn't implement synchronous content type guessing"
-msgstr "mount implementerer ikke synkron gjetting av innholdstype"
+msgid "mount doesn’t implement synchronous content type guessing"
+msgstr "monteringspunkt implementerer ikke synkron gjetting av innholdstype"
 
 #: ../gio/gnetworkaddress.c:378
 #, c-format
-msgid "Hostname '%s' contains '[' but not ']'"
+msgid "Hostname “%s” contains “[” but not “]”"
 msgstr "Vertsnavn «%s» inneholder «[» men ikke «]»"
 
 #: ../gio/gnetworkmonitorbase.c:206 ../gio/gnetworkmonitorbase.c:310
@@ -2979,17 +2986,17 @@ msgid "NetworkManager version too old"
 msgstr "For gammel versjon av NetworkManager"
 
 #: ../gio/goutputstream.c:212 ../gio/goutputstream.c:560
-msgid "Output stream doesn't implement write"
-msgstr "Ut-strømmen implementerer ikke skriving"
+msgid "Output stream doesn’t implement write"
+msgstr "Utdatastrømmen implementerer ikke skriving"
 
 #: ../gio/goutputstream.c:521 ../gio/goutputstream.c:1224
 msgid "Source stream is already closed"
 msgstr "Kildestrømmen er allerede lukket"
 
-#: ../gio/gresolver.c:333 ../gio/gthreadedresolver.c:116
+#: ../gio/gresolver.c:341 ../gio/gthreadedresolver.c:116
 #: ../gio/gthreadedresolver.c:126
 #, c-format
-msgid "Error resolving '%s': %s"
+msgid "Error resolving “%s”: %s"
 msgstr "Feil under oppslag av «%s»: %s"
 
 #: ../gio/gresource.c:595 ../gio/gresource.c:846 ../gio/gresource.c:863
@@ -2997,21 +3004,21 @@ msgstr "Feil under oppslag av «%s»: %s"
 #: ../gio/gresource.c:1202 ../gio/gresourcefile.c:453
 #: ../gio/gresourcefile.c:576 ../gio/gresourcefile.c:713
 #, c-format
-msgid "The resource at '%s' does not exist"
+msgid "The resource at “%s” does not exist"
 msgstr "Ressurs ved «%s» eksisterer ikke"
 
 #: ../gio/gresource.c:760
 #, c-format
-msgid "The resource at '%s' failed to decompress"
+msgid "The resource at “%s” failed to decompress"
 msgstr "Ressursen ved «%s» kunne ikke dekomprimeres"
 
 #: ../gio/gresourcefile.c:709
 #, c-format
-msgid "The resource at '%s' is not a directory"
+msgid "The resource at “%s” is not a directory"
 msgstr "Ressurs ved «%s» er ikke en katalog"
 
 #: ../gio/gresourcefile.c:917
-msgid "Input stream doesn't implement seek"
+msgid "Input stream doesn’t implement seek"
 msgstr "Inndatastrøm implementerer ikke søk"
 
 #: ../gio/gresource-tool.c:494
@@ -3060,7 +3067,7 @@ msgstr "STI TIL FIL"
 #: ../gio/gresource-tool.c:534
 msgid ""
 "Usage:\n"
-"  gresource [--section SECTION] COMMAND [ARGS...]\n"
+"  gresource [--section SECTION] COMMAND [ARGS…]\n"
 "\n"
 "Commands:\n"
 "  help                      Show this information\n"
@@ -3069,7 +3076,7 @@ msgid ""
 "  details                   List resources with details\n"
 "  extract                   Extract a resource\n"
 "\n"
-"Use 'gresource help COMMAND' to get detailed help.\n"
+"Use “gresource help COMMAND” to get detailed help.\n"
 "\n"
 msgstr ""
 "Bruk:\n"
@@ -3139,17 +3146,17 @@ msgstr "  STI      En ressurssti\n"
 #: ../gio/gsettings-tool.c:51 ../gio/gsettings-tool.c:72
 #: ../gio/gsettings-tool.c:851
 #, c-format
-msgid "No such schema '%s'\n"
+msgid "No such schema “%s”\n"
 msgstr "Skjema «%s» finnes ikke\n"
 
 #: ../gio/gsettings-tool.c:57
 #, c-format
-msgid "Schema '%s' is not relocatable (path must not be specified)\n"
+msgid "Schema “%s” is not relocatable (path must not be specified)\n"
 msgstr "Skjema «%s» er ikke omplasserbar (stien må ikke oppgis)\n"
 
 #: ../gio/gsettings-tool.c:78
 #, c-format
-msgid "Schema '%s' is relocatable (path must be specified)\n"
+msgid "Schema “%s” is relocatable (path must be specified)\n"
 msgstr "Skjema «%s» er omplasserbart (sti må oppgis)\n"
 
 #: ../gio/gsettings-tool.c:92
@@ -3230,9 +3237,8 @@ msgid "Query the range of valid values for KEY"
 msgstr "Spør på gyldig verdiområde for NØKKEL"
 
 #: ../gio/gsettings-tool.c:575
-#, fuzzy
 msgid "Query the description for KEY"
-msgstr "Spør på gyldig verdiområde for NØKKEL"
+msgstr "Spør på beskrivelse for NØKKEL"
 
 #: ../gio/gsettings-tool.c:581
 msgid "Set the value of KEY to VALUE"
@@ -3269,11 +3275,10 @@ msgid "SCHEMA[:PATH] [KEY]"
 msgstr "SCHEMA[:STI] [NØKKEL]"
 
 #: ../gio/gsettings-tool.c:620
-#, fuzzy
 msgid ""
 "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"
@@ -3291,7 +3296,7 @@ msgid ""
 "  writable                  Check if a key is writable\n"
 "  monitor                   Watch for changes\n"
 "\n"
-"Use 'gsettings help COMMAND' to get detailed help.\n"
+"Use “gsettings help COMMAND” to get detailed help.\n"
 "\n"
 msgstr ""
 "Bruk:\n"
@@ -3306,6 +3311,7 @@ msgstr ""
 "  list-children            Vis liste med barn i et skjema\n"
 "  list-recursively         Vis liste med nøkler og verdier rekursivt\n"
 "  range                    Spør etter område for en nøkkel\n"
+"  describe                 Spør på beskrivelse for nøkkel\n"
 "  get                      Hent verdi for en nøkkel\n"
 "  set                      Sett verdi for en nøkkel\n"
 "  reset                    Nullstill verdi for en nøkkel\n"
@@ -3362,9 +3368,9 @@ msgid "Could not load schemas from %s: %s\n"
 msgstr "Kunne ikke laste skjema fra %s: %s\n"
 
 #: ../gio/gsettings-tool.c:738
-#, fuzzy, c-format
+#, c-format
 msgid "No schemas installed\n"
-msgstr "Ingen schema-filer funnet: "
+msgstr "Ingen schema-filer installert\n"
 
 #: ../gio/gsettings-tool.c:809
 #, c-format
@@ -3373,7 +3379,7 @@ msgstr "Tomt navn på schema oppgitt\n"
 
 #: ../gio/gsettings-tool.c:864
 #, c-format
-msgid "No such key '%s'\n"
+msgid "No such key “%s”\n"
 msgstr "Nøkkel «%s» finnes ikke\n"
 
 #: ../gio/gsocket.c:364
@@ -3495,26 +3501,26 @@ msgstr "Feil ved lukking av plugg: %s"
 msgid "Waiting for socket condition: %s"
 msgstr "Venter på tilstand for plugg: %s"
 
-#: ../gio/gsocket.c:4362 ../gio/gsocket.c:4442 ../gio/gsocket.c:4620
+#: ../gio/gsocket.c:4361 ../gio/gsocket.c:4441 ../gio/gsocket.c:4619
 #, c-format
 msgid "Error sending message: %s"
 msgstr "Feil ved sending av melding: %s"
 
-#: ../gio/gsocket.c:4386
+#: ../gio/gsocket.c:4385
 msgid "GSocketControlMessage not supported on Windows"
 msgstr "GSocketControlMessage er ikke støttet på Windows"
 
-#: ../gio/gsocket.c:4839 ../gio/gsocket.c:4912 ../gio/gsocket.c:5139
+#: ../gio/gsocket.c:4838 ../gio/gsocket.c:4911 ../gio/gsocket.c:5138
 #, c-format
 msgid "Error receiving message: %s"
 msgstr "Feil ved mottak av melding: %s"
 
-#: ../gio/gsocket.c:5411
+#: ../gio/gsocket.c:5410
 #, c-format
 msgid "Unable to read socket credentials: %s"
 msgstr "Kunne ikke lese autentiseringsinformasjon for plugg: %s"
 
-#: ../gio/gsocket.c:5420
+#: ../gio/gsocket.c:5419
 msgid "g_socket_get_credentials not implemented for this OS"
 msgstr "g_socket_get_credentials ikke implementert for dette OSet"
 
@@ -3542,8 +3548,8 @@ msgstr "Proxy over annet enn TCP-forbindelser er ikke støttet."
 
 #: ../gio/gsocketclient.c:1110 ../gio/gsocketclient.c:1561
 #, c-format
-msgid "Proxy protocol '%s' is not supported."
-msgstr "Protokoll «%s» er er ikke støttet"
+msgid "Proxy protocol “%s” is not supported."
+msgstr "Mellomtjenerprotokoll «%s» er er ikke støttet."
 
 #: ../gio/gsocketlistener.c:218
 msgid "Listener is already closed"
@@ -3555,7 +3561,7 @@ msgstr "Tillagt plugg er lukket"
 
 #: ../gio/gsocks4aproxy.c:118
 #, c-format
-msgid "SOCKSv4 does not support IPv6 address '%s'"
+msgid "SOCKSv4 does not support IPv6 address “%s”"
 msgstr "SOCKSv4 støtter ikke IPv6-adresse «%s»"
 
 #: ../gio/gsocks4aproxy.c:136
@@ -3564,7 +3570,7 @@ msgstr "Brukernavn er for langt for SOCKSv4-protokollen"
 
 #: ../gio/gsocks4aproxy.c:153
 #, c-format
-msgid "Hostname '%s' is too long for SOCKSv4 protocol"
+msgid "Hostname “%s” is too long for SOCKSv4 protocol"
 msgstr "Vertsnavn «%s» er for langt for SOCKSv4-protokollen"
 
 #: ../gio/gsocks4aproxy.c:179
@@ -3601,7 +3607,7 @@ msgstr ""
 
 #: ../gio/gsocks5proxy.c:286
 #, c-format
-msgid "Hostname '%s' is too long for SOCKSv5 protocol"
+msgid "Hostname “%s” is too long for SOCKSv5 protocol"
 msgstr "Vertsnavn «%s» er for langt for SOCKSv5-protokollen"
 
 #: ../gio/gsocks5proxy.c:348
@@ -3629,7 +3635,7 @@ msgid "Connection refused through SOCKSv5 proxy."
 msgstr "Tilkobling nektet via SOCKSv5-proxy."
 
 #: ../gio/gsocks5proxy.c:386
-msgid "SOCKSv5 proxy does not support 'connect' command."
+msgid "SOCKSv5 proxy does not support “connect” command."
 msgstr "SOCKSv5-proxy støtter ikke «connect»-kommando."
 
 #: ../gio/gsocks5proxy.c:392
@@ -3642,7 +3648,7 @@ msgstr "Ukjent feil i SOCKSv5-proxy."
 
 #: ../gio/gthemedicon.c:518
 #, c-format
-msgid "Can't handle version %d of GThemedIcon encoding"
+msgid "Can’t handle version %d of GThemedIcon encoding"
 msgstr "Kan ikke håndtere versjon %d av GThemedIcon-koding"
 
 #: ../gio/gthreadedresolver.c:118
@@ -3651,23 +3657,23 @@ msgstr "Ingen gyldige adresser ble funnet"
 
 #: ../gio/gthreadedresolver.c:213
 #, c-format
-msgid "Error reverse-resolving '%s': %s"
+msgid "Error reverse-resolving “%s”: %s"
 msgstr "Feil under omvendt oppslag av «%s»: %s"
 
 #: ../gio/gthreadedresolver.c:550 ../gio/gthreadedresolver.c:630
 #: ../gio/gthreadedresolver.c:728 ../gio/gthreadedresolver.c:778
 #, c-format
-msgid "No DNS record of the requested type for '%s'"
+msgid "No DNS record of the requested type for “%s”"
 msgstr "Ingen DNS-oppføring av forespurt type for «%s»"
 
 #: ../gio/gthreadedresolver.c:555 ../gio/gthreadedresolver.c:733
 #, c-format
-msgid "Temporarily unable to resolve '%s'"
+msgid "Temporarily unable to resolve “%s”"
 msgstr "Midlertidig ute av stand til å slå opp «%s»"
 
 #: ../gio/gthreadedresolver.c:560 ../gio/gthreadedresolver.c:738
 #, c-format
-msgid "Error resolving '%s'"
+msgid "Error resolving “%s”"
 msgstr "Feil ved oppslag av «%s»"
 
 #: ../gio/gtlscertificate.c:250
@@ -3773,7 +3779,7 @@ msgstr "Feil under lesing fra fildeskriptor: %s"
 msgid "Error closing file descriptor: %s"
 msgstr "Feil under lukking av fildeskriptor: %s"
 
-#: ../gio/gunixmounts.c:2329 ../gio/gunixmounts.c:2382
+#: ../gio/gunixmounts.c:2364 ../gio/gunixmounts.c:2417
 msgid "Filesystem root"
 msgstr "Filsystemrot"
 
@@ -3787,14 +3793,14 @@ msgid "Abstract UNIX domain socket addresses not supported on this system"
 msgstr "Abstrakte UNIX domenepluggadresser er ikke støttet på dette systemet"
 
 #: ../gio/gvolume.c:437
-msgid "volume doesn't implement eject"
+msgid "volume doesn’t implement eject"
 msgstr "volumet implementerer ikke utløsing"
 
 #. Translators: This is an error
 #. * message for volume objects that
 #. * don't implement any of eject or eject_with_operation.
 #: ../gio/gvolume.c:514
-msgid "volume doesn't implement eject or eject_with_operation"
+msgid "volume doesn’t implement eject or eject_with_operation"
 msgstr "volumet implementerer ikke eject eller eject_with_operation"
 
 #: ../gio/gwin32inputstream.c:185
@@ -3856,26 +3862,26 @@ msgstr "Feil argument\n"
 
 #: ../glib/gbookmarkfile.c:755
 #, c-format
-msgid "Unexpected attribute '%s' for element '%s'"
+msgid "Unexpected attribute “%s” for element “%s”"
 msgstr "Uventet attributt «%s» for element «%s»"
 
 #: ../glib/gbookmarkfile.c:766 ../glib/gbookmarkfile.c:837
 #: ../glib/gbookmarkfile.c:847 ../glib/gbookmarkfile.c:954
 #, c-format
-msgid "Attribute '%s' of element '%s' not found"
+msgid "Attribute “%s” of element “%s” not found"
 msgstr "Attributt «%s» i element «%s» ble ikke funnet"
 
 #: ../glib/gbookmarkfile.c:1124 ../glib/gbookmarkfile.c:1189
 #: ../glib/gbookmarkfile.c:1253 ../glib/gbookmarkfile.c:1263
 #, c-format
-msgid "Unexpected tag '%s', tag '%s' expected"
-msgstr "Uventet tagg «%s», tagg «%s» forventet"
+msgid "Unexpected tag “%s”, tag “%s” expected"
+msgstr "Uventet etikett «%s», etikett «%s» forventet"
 
 #: ../glib/gbookmarkfile.c:1149 ../glib/gbookmarkfile.c:1163
 #: ../glib/gbookmarkfile.c:1231
 #, c-format
-msgid "Unexpected tag '%s' inside '%s'"
-msgstr "Uventet tagg «%s» i «%s»"
+msgid "Unexpected tag “%s” inside “%s”"
+msgstr "Uventet etikett «%s» i «%s»"
 
 #: ../glib/gbookmarkfile.c:1757
 msgid "No valid bookmark file found in data dirs"
@@ -3883,7 +3889,7 @@ msgstr "Ingen gyldig bokmerkefil ble funnet i datakatalogene"
 
 #: ../glib/gbookmarkfile.c:1958
 #, c-format
-msgid "A bookmark for URI '%s' already exists"
+msgid "A bookmark for URI “%s” already exists"
 msgstr "Et bokmerke eksisterer allerede for URI «%s»"
 
 #: ../glib/gbookmarkfile.c:2004 ../glib/gbookmarkfile.c:2162
@@ -3896,32 +3902,32 @@ msgstr "Et bokmerke eksisterer allerede for URI «%s»"
 #: ../glib/gbookmarkfile.c:3434 ../glib/gbookmarkfile.c:3523
 #: ../glib/gbookmarkfile.c:3639
 #, c-format
-msgid "No bookmark found for URI '%s'"
+msgid "No bookmark found for URI “%s”"
 msgstr "Ingen bokmerker funnet for URI «%s»"
 
 #: ../glib/gbookmarkfile.c:2336
 #, c-format
-msgid "No MIME type defined in the bookmark for URI '%s'"
+msgid "No MIME type defined in the bookmark for URI “%s”"
 msgstr "Ingen MIME-type definert i bokmerke for URI «%s»"
 
 #: ../glib/gbookmarkfile.c:2421
 #, c-format
-msgid "No private flag has been defined in bookmark for URI '%s'"
+msgid "No private flag has been defined in bookmark for URI “%s”"
 msgstr "Ingen private flagg er definert i bokmerke for URI «%s»"
 
 #: ../glib/gbookmarkfile.c:2800
 #, c-format
-msgid "No groups set in bookmark for URI '%s'"
+msgid "No groups set in bookmark for URI “%s”"
 msgstr "Ingen grupper satt i bokmerke for URI «%s»"
 
 #: ../glib/gbookmarkfile.c:3198 ../glib/gbookmarkfile.c:3355
 #, c-format
-msgid "No application with name '%s' registered a bookmark for '%s'"
-msgstr "Ingen program med navn «%s» har registrert et bokmerke for «%s»"
+msgid "No application with name “%s” registered a bookmark for “%s”"
+msgstr "Ingen programmer med navn «%s» har registrert et bokmerke for «%s»"
 
 #: ../glib/gbookmarkfile.c:3378
 #, c-format
-msgid "Failed to expand exec line '%s' with URI '%s'"
+msgid "Failed to expand exec line “%s” with URI “%s”"
 msgstr "Feil under utvidelse av exec-linje «%s» med URI «%s»"
 
 #: ../glib/gconvert.c:477 ../glib/gutf8.c:851 ../glib/gutf8.c:1063
@@ -3931,37 +3937,37 @@ msgstr "Ufullstendig tegnsekvens ved slutten på inndata"
 
 #: ../glib/gconvert.c:742
 #, c-format
-msgid "Cannot convert fallback '%s' to codeset '%s'"
+msgid "Cannot convert fallback “%s” to codeset “%s”"
 msgstr "Kan ikke konvertere \"fallback\" «%s» til tegnsett «%s»"
 
 #: ../glib/gconvert.c:1567
 #, c-format
-msgid "The URI '%s' is not an absolute URI using the \"file\" scheme"
+msgid "The URI “%s” is not an absolute URI using the “file” scheme"
 msgstr "URI «%s» er ikke en absolutt URI som bruker skjema for filer"
 
 #: ../glib/gconvert.c:1577
 #, c-format
-msgid "The local file URI '%s' may not include a '#'"
+msgid "The local file URI “%s” may not include a “#”"
 msgstr "Lokal fil-URI «%s» kan ikke inneholde en «#»"
 
 #: ../glib/gconvert.c:1594
 #, c-format
-msgid "The URI '%s' is invalid"
+msgid "The URI “%s” is invalid"
 msgstr "URI «%s» er ugyldig"
 
 #: ../glib/gconvert.c:1606
 #, c-format
-msgid "The hostname of the URI '%s' is invalid"
+msgid "The hostname of the URI “%s” is invalid"
 msgstr "Vertsnavnet for URI «%s» er ugyldig"
 
 #: ../glib/gconvert.c:1622
 #, c-format
-msgid "The URI '%s' contains invalidly escaped characters"
+msgid "The URI “%s” contains invalidly escaped characters"
 msgstr "Vertsnavnet for URI «%s» inneholder ugyldige escape-tegn"
 
 #: ../glib/gconvert.c:1717
 #, c-format
-msgid "The pathname '%s' is not an absolute path"
+msgid "The pathname “%s” is not an absolute path"
 msgstr "Stinavnet «%s» er ikke en absolutt sti"
 
 #: ../glib/gconvert.c:1727
@@ -4196,94 +4202,93 @@ msgstr "Søn"
 
 #: ../glib/gdir.c:155
 #, c-format
-msgid "Error opening directory '%s': %s"
+msgid "Error opening directory “%s”: %s"
 msgstr "Feil under åpning av katalog «%s»: %s"
 
 #: ../glib/gfileutils.c:701 ../glib/gfileutils.c:793
 #, c-format
-msgid "Could not allocate %lu byte to read file \"%s\""
-msgid_plural "Could not allocate %lu bytes to read file \"%s\""
+msgid "Could not allocate %lu byte to read file “%s”"
+msgid_plural "Could not allocate %lu bytes to read file “%s”"
 msgstr[0] "Kunne ikke allokere %lu byte til lest fil «%s»"
 msgstr[1] "Kunne ikke allokere %lu bytes til lest fil «%s»"
 
 #: ../glib/gfileutils.c:718
 #, c-format
-msgid "Error reading file '%s': %s"
-msgstr "Feil under lesing av fil «%s»: %s"
+msgid "Error reading file “%s”: %s"
+msgstr "Feil ved lesing av fil «%s»: %s"
 
 #: ../glib/gfileutils.c:754
 #, c-format
-msgid "File \"%s\" is too large"
+msgid "File “%s” is too large"
 msgstr "Fil «%s» er for stor"
 
 #: ../glib/gfileutils.c:818
 #, c-format
-msgid "Failed to read from file '%s': %s"
-msgstr "Feil under lesing fra fil «%s»: %s"
+msgid "Failed to read from file “%s”: %s"
+msgstr "Klarte ikke å lese fra fil «%s»: %s"
 
 #: ../glib/gfileutils.c:866 ../glib/gfileutils.c:938
 #, c-format
-msgid "Failed to open file '%s': %s"
-msgstr "Feil under åpning av fil «%s»: %s"
+msgid "Failed to open file “%s”: %s"
+msgstr "Klarte ikke å åpne fil «%s»: %s"
 
 #: ../glib/gfileutils.c:878
 #, c-format
-msgid "Failed to get attributes of file '%s': fstat() failed: %s"
-msgstr "Feil ved uthenting av attributter for fil «%s»: fstat() feilet: %s"
+msgid "Failed to get attributes of file “%s”: fstat() failed: %s"
+msgstr "Klarte ikke å hente attributter for fil «%s»: fstat() feilet: %s"
 
 #: ../glib/gfileutils.c:908
 #, c-format
-msgid "Failed to open file '%s': fdopen() failed: %s"
-msgstr "Feil under åpning av fil «%s»: fdopen() feilet: %s"
+msgid "Failed to open file “%s”: fdopen() failed: %s"
+msgstr "Klarte ikke å åpne fil «%s»: fdopen() feilet: %s"
 
 #: ../glib/gfileutils.c:1007
 #, c-format
-msgid "Failed to rename file '%s' to '%s': g_rename() failed: %s"
-msgstr ""
-"Feil under endring av navn på filen «%s» til «%s»: g_rename() feilet: %s"
+msgid "Failed to rename file “%s” to “%s”: g_rename() failed: %s"
+msgstr "Klarte ikke å endre navn på fil «%s» til «%s»: g_rename() feilet: %s"
 
 #: ../glib/gfileutils.c:1042 ../glib/gfileutils.c:1541
 #, c-format
-msgid "Failed to create file '%s': %s"
-msgstr "Feil under oppretting av fil «%s»: %s"
+msgid "Failed to create file “%s”: %s"
+msgstr "Klarte ikke å opprette fil «%s»: %s"
 
 #: ../glib/gfileutils.c:1069
 #, c-format
-msgid "Failed to write file '%s': write() failed: %s"
-msgstr "Kunne ikke skrive fil «%s»: write() feilet: %s"
+msgid "Failed to write file “%s”: write() failed: %s"
+msgstr "Klarte ikke å skrive fil «%s»: write() feilet: %s"
 
 #: ../glib/gfileutils.c:1112
 #, c-format
-msgid "Failed to write file '%s': fsync() failed: %s"
-msgstr "Kunne ikke skrive fil «%s»: fsync() feilet: %s"
+msgid "Failed to write file “%s”: fsync() failed: %s"
+msgstr "Klarte ikke å skrive fil «%s»: fsync() feilet: %s"
 
 #: ../glib/gfileutils.c:1236
 #, c-format
-msgid "Existing file '%s' could not be removed: g_unlink() failed: %s"
-msgstr "Eksisterende fil «%s» kunne ikke bli fjernet: g_unlink() feilet: %s"
+msgid "Existing file “%s” could not be removed: g_unlink() failed: %s"
+msgstr "Eksisterende fil «%s» kunne ikke fjernes: g_unlink() feilet: %s"
 
 #: ../glib/gfileutils.c:1507
 #, c-format
-msgid "Template '%s' invalid, should not contain a '%s'"
+msgid "Template “%s” invalid, should not contain a “%s”"
 msgstr "Mal «%s» er ugyldig, må ikke inneholde «%s»"
 
 #: ../glib/gfileutils.c:1520
 #, c-format
-msgid "Template '%s' doesn't contain XXXXXX"
+msgid "Template “%s” doesn’t contain XXXXXX"
 msgstr "Mal «%s» inneholder ikke XXXXXX"
 
 #: ../glib/gfileutils.c:2045
 #, c-format
-msgid "Failed to read the symbolic link '%s': %s"
-msgstr "Feil under lesing av symbolsk lenke «%s»: %s"
+msgid "Failed to read the symbolic link “%s”: %s"
+msgstr "Klarte ikke å lese symbolsk lenke «%s»: %s"
 
 #: ../glib/giochannel.c:1388
 #, c-format
-msgid "Could not open converter from '%s' to '%s': %s"
+msgid "Could not open converter from “%s” to “%s”: %s"
 msgstr "Kunne ikke åpne konverterer fra «%s» til «%s»: %s"
 
 #: ../glib/giochannel.c:1733
-msgid "Can't do a raw read in g_io_channel_read_line_string"
+msgid "Can’t do a raw read in g_io_channel_read_line_string"
 msgstr "Kan ikke utføre rå avlesing i g_io_channel_read_line_string"
 
 #: ../glib/giochannel.c:1780 ../glib/giochannel.c:2038
@@ -4296,7 +4301,7 @@ msgid "Channel terminates in a partial character"
 msgstr "Kanalen terminerer i et oppdelt tegn"
 
 #: ../glib/giochannel.c:1924
-msgid "Can't do a raw read in g_io_channel_read_to_end"
+msgid "Can’t do a raw read in g_io_channel_read_to_end"
 msgstr "Kan ikke utføre rå avlesing i g_io_channel_read_to_end"
 
 #: ../glib/gkeyfile.c:737
@@ -4310,7 +4315,7 @@ msgstr "Ikke en vanlig fil"
 #: ../glib/gkeyfile.c:1204
 #, c-format
 msgid ""
-"Key file contains line '%s' which is not a key-value pair, group, or comment"
+"Key file contains line “%s” which is not a key-value pair, group, or comment"
 msgstr ""
 "Nøkkelfil inneholder linjen «%s» som ikke er et par med nøkkelverdier, "
 "gruppe eller kommentar"
@@ -4331,46 +4336,42 @@ msgstr "Ugyldig navn på nøkkel: %s"
 
 #: ../glib/gkeyfile.c:1336
 #, c-format
-msgid "Key file contains unsupported encoding '%s'"
+msgid "Key file contains unsupported encoding “%s”"
 msgstr "Nøkkelfil inneholder ustøttet tegnkoding «%s»"
 
 #: ../glib/gkeyfile.c:1579 ../glib/gkeyfile.c:1752 ../glib/gkeyfile.c:3130
 #: ../glib/gkeyfile.c:3193 ../glib/gkeyfile.c:3323 ../glib/gkeyfile.c:3453
 #: ../glib/gkeyfile.c:3597 ../glib/gkeyfile.c:3826 ../glib/gkeyfile.c:3893
 #, c-format
-msgid "Key file does not have group '%s'"
+msgid "Key file does not have group “%s”"
 msgstr "Nøkkelfil har ikke gruppe «%s»"
 
 #: ../glib/gkeyfile.c:1707
 #, c-format
-msgid "Key file does not have key '%s' in group '%s'"
-msgstr "Nøkkelfilen har ikke nøkkelen i «%s» i gruppen «%s»"
+msgid "Key file does not have key “%s” in group “%s”"
+msgstr "Nøkkelfilen har ikke nøkkel «%s» i gruppe «%s»"
 
 #: ../glib/gkeyfile.c:1869 ../glib/gkeyfile.c:1985
 #, c-format
-msgid "Key file contains key '%s' with value '%s' which is not UTF-8"
-msgstr "Nøkkelfilen inneholder nøkkelen «%s» med verdi «%s» som ikke er UTF-8"
+msgid "Key file contains key “%s” with value “%s” which is not UTF-8"
+msgstr "Nøkkelfilen inneholder nøkkel «%s» med verdi «%s» som ikke er UTF-8"
 
 #: ../glib/gkeyfile.c:1889 ../glib/gkeyfile.c:2005 ../glib/gkeyfile.c:2374
 #, c-format
 msgid ""
-"Key file contains key '%s' which has a value that cannot be interpreted."
-msgstr ""
-"Nøkkelfilen inneholder nøkkelen «%s» som har en verdi som ikke kan bli "
-"tolket."
+"Key file contains key “%s” which has a value that cannot be interpreted."
+msgstr "Nøkkelfilen inneholder nøkkel «%s» som har en verdi som ikke kan bli tolket."
 
 #: ../glib/gkeyfile.c:2591 ../glib/gkeyfile.c:2959
 #, c-format
 msgid ""
-"Key file contains key '%s' in group '%s' which has a value that cannot be "
+"Key file contains key “%s” in group “%s” which has a value that cannot be "
 "interpreted."
-msgstr ""
-"Nøkkelfilen inneholder nøkkelen «%s» i gruppen «%s» som har en verdi som "
-"ikke kan bli tolket."
+msgstr "Nøkkelfilen inneholder nøkkel «%s» i gruppe «%s» som har en verdi som ikke kan bli tolket."
 
 #: ../glib/gkeyfile.c:2669 ../glib/gkeyfile.c:2746
 #, c-format
-msgid "Key '%s' in group '%s' has value '%s' where %s was expected"
+msgid "Key “%s” in group “%s” has value “%s” where %s was expected"
 msgstr "Nøkkel «%s» i gruppe «%s» har en verdi «%s» hvor %s var forventet"
 
 #: ../glib/gkeyfile.c:4133
@@ -4379,32 +4380,32 @@ msgstr "Nøkkelfilen inneholder skiftetegn ved linjeslutt"
 
 #: ../glib/gkeyfile.c:4155
 #, c-format
-msgid "Key file contains invalid escape sequence '%s'"
+msgid "Key file contains invalid escape sequence “%s”"
 msgstr "Nøkkelfil inneholder ugyldig skiftesekvens «%s»"
 
 #: ../glib/gkeyfile.c:4297
 #, c-format
-msgid "Value '%s' cannot be interpreted as a number."
-msgstr "Vedien «%s» kan ikke bli tolket som et tall."
+msgid "Value “%s” cannot be interpreted as a number."
+msgstr "Vedi «%s» kan ikke tolkes som et tall."
 
 #: ../glib/gkeyfile.c:4311
 #, c-format
-msgid "Integer value '%s' out of range"
+msgid "Integer value “%s” out of range"
 msgstr "Heltallsverdi «%s» er utenfor gyldig område"
 
 #: ../glib/gkeyfile.c:4344
 #, c-format
-msgid "Value '%s' cannot be interpreted as a float number."
+msgid "Value “%s” cannot be interpreted as a float number."
 msgstr "Verdi «%s» kan ikke tolkes som et flyttall."
 
 #: ../glib/gkeyfile.c:4383
 #, c-format
-msgid "Value '%s' cannot be interpreted as a boolean."
+msgid "Value “%s” cannot be interpreted as a boolean."
 msgstr "Verdi «%s» kan ikke tolkes som en bolsk verdi."
 
 #: ../glib/gmappedfile.c:129
 #, c-format
-msgid "Failed to get attributes of file '%s%s%s%s': fstat() failed: %s"
+msgid "Failed to get attributes of file “%s%s%s%s”: fstat() failed: %s"
 msgstr "Klarte ikke å hente attributter for fil «%s%s%s%s»: fstat() feilet: %s"
 
 #: ../glib/gmappedfile.c:195
@@ -4414,8 +4415,8 @@ msgstr "Kunne ikke lese fil «%s%s%s%s» inn i minnet: mmap() feilet: %s"
 
 #: ../glib/gmappedfile.c:262
 #, c-format
-msgid "Failed to open file '%s': open() failed: %s"
-msgstr "Kunne ikke åpne fil «%s»: open() feilet: %s"
+msgid "Failed to open file “%s”: open() failed: %s"
+msgstr "Klarte ikke å åpne fil «%s»: open() feilet: %s"
 
 #: ../glib/gmarkup.c:398 ../glib/gmarkup.c:440
 #, c-format
@@ -4623,7 +4624,7 @@ msgstr ""
 "Dokumentet sluttet uventet inni en kommentar eller prosesseringsinstruksjon"
 
 #: ../glib/goption.c:861
-msgid "[OPTION...]"
+msgid "[OPTION…]"
 msgstr "[FLAGG …]"
 
 #: ../glib/goption.c:977
@@ -4648,22 +4649,22 @@ msgstr "Flagg:"
 
 #: ../glib/goption.c:1113 ../glib/goption.c:1183
 #, c-format
-msgid "Cannot parse integer value '%s' for %s"
+msgid "Cannot parse integer value “%s” for %s"
 msgstr "Kan ikke lese heltallsverdi «%s» for %s"
 
 #: ../glib/goption.c:1123 ../glib/goption.c:1191
 #, c-format
-msgid "Integer value '%s' for %s out of range"
+msgid "Integer value “%s” for %s out of range"
 msgstr "Heltallsverdi «%s» for %s er utenfor gyldig område"
 
 #: ../glib/goption.c:1148
 #, c-format
-msgid "Cannot parse double value '%s' for %s"
+msgid "Cannot parse double value “%s” for %s"
 msgstr "Kan ikke lese verdi for double «%s» for %s"
 
 #: ../glib/goption.c:1156
 #, c-format
-msgid "Double value '%s' for %s out of range"
+msgid "Double value “%s” for %s out of range"
 msgstr "Double-verdi «%s» for %s er utenfor gyldig område"
 
 #: ../glib/goption.c:1448 ../glib/goption.c:1527
@@ -5010,7 +5011,7 @@ msgid "Error while compiling regular expression %s at char %d: %s"
 msgstr "Feil under sammensetting av regulært utrykk %s ved tegn %d: %s"
 
 #: ../glib/gregex.c:2413
-msgid "hexadecimal digit or '}' expected"
+msgid "hexadecimal digit or “}” expected"
 msgstr "heksadesimalt tall eller «}» forventet"
 
 #: ../glib/gregex.c:2429
@@ -5018,7 +5019,7 @@ msgid "hexadecimal digit expected"
 msgstr "heksadesimalt tall forventet"
 
 #: ../glib/gregex.c:2469
-msgid "missing '<' in symbolic reference"
+msgid "missing “<” in symbolic reference"
 msgstr "mangler «<» i symbolsk referanse"
 
 #: ../glib/gregex.c:2478
@@ -5038,7 +5039,7 @@ msgid "illegal symbolic reference"
 msgstr "ugyldig symbolsk referanse"
 
 #: ../glib/gregex.c:2576
-msgid "stray final '\\'"
+msgid "stray final “\\”"
 msgstr "feilplassert siste «\\\\»"
 
 #: ../glib/gregex.c:2580
@@ -5047,11 +5048,11 @@ msgstr "ukjent escapesekvens"
 
 #: ../glib/gregex.c:2590
 #, c-format
-msgid "Error while parsing replacement text \"%s\" at char %lu: %s"
+msgid "Error while parsing replacement text “%s” at char %lu: %s"
 msgstr "Feil under tolking av erstatningstekst «%s» ved tegn %lu: %s"
 
 #: ../glib/gshell.c:96
-msgid "Quoted text doesn't begin with a quotation mark"
+msgid "Quoted text doesn’t begin with a quotation mark"
 msgstr "Sitert tekst begynner ikke med sitattegn"
 
 #: ../glib/gshell.c:186
@@ -5060,12 +5061,12 @@ msgstr "Ubalansert sitattegn i kommandolinje eller annen skall-sitert tekst"
 
 #: ../glib/gshell.c:582
 #, c-format
-msgid "Text ended just after a '\\' character. (The text was '%s')"
-msgstr "Tekst sluttet rett etter et «\\» tegn. (Teksten var «%s»)"
+msgid "Text ended just after a “\\” character. (The text was “%s”)"
+msgstr "Teksten sluttet rett etter et «\\» tegn. (Teksten var «%s»)"
 
 #: ../glib/gshell.c:589
 #, c-format
-msgid "Text ended before matching quote was found for %c. (The text was '%s')"
+msgid "Text ended before matching quote was found for %c. (The text was “%s”)"
 msgstr ""
 "Teksten sluttet før likt sitattegn ble funnet for %c. (Teksten var «%s»)"
 
@@ -5120,13 +5121,13 @@ msgstr "Feil under kjøring av fork (%s)"
 
 #: ../glib/gspawn.c:1490 ../glib/gspawn-win32.c:370
 #, c-format
-msgid "Failed to change to directory '%s' (%s)"
-msgstr "Feil ved skifte til katalog «%s» (%s)"
+msgid "Failed to change to directory “%s” (%s)"
+msgstr "Klarte ikke å skifte til katalog «%s» (%s)"
 
 #: ../glib/gspawn.c:1500
 #, c-format
-msgid "Failed to execute child process \"%s\" (%s)"
-msgstr "Feil under kjøring av underprosess «%s» (%s)"
+msgid "Failed to execute child process “%s” (%s)"
+msgstr "Klarte ikke å kjøre underprosess «%s» (%s)"
 
 #: ../glib/gspawn.c:1510
 #, c-format
@@ -5140,7 +5141,7 @@ msgstr "Feil under kjøring av fork() for underprosess (%s)"
 
 #: ../glib/gspawn.c:1527
 #, c-format
-msgid "Unknown error executing child process \"%s\""
+msgid "Unknown error executing child process “%s”"
 msgstr "Ukjent feil under kjøring av underprosess «%s»"
 
 #: ../glib/gspawn.c:1551
diff --git a/po/pl.po b/po/pl.po
index d6168400c..ec798ab20 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -1,20 +1,20 @@
 # Polish translation for glib.
-# Copyright © 2002-2016 the glib authors.
+# Copyright © 2002-2017 the glib authors.
 # This file is distributed under the same license as the glib package.
 # Zbigniew Chyla <chyla@alice.ci.pwr.wroc.pl>, 2002-2003.
 # Artur Flinta <aflinta@at.kernel.pl>, 2003-2006.
 # Tomasz Kłoczko <kloczek@rudy.mif.pg.gda.pl>, 2005.
 # Wadim Dziedzic <wdziedzic@aviary.pl>, 2007-2009.
 # Tomasz Dominikowski <dominikowski@gmail.com>, 2008-2009.
-# Piotr Drąg <piotrdrag@gmail.com>, 2009-2016.
-# Aviary.pl <community-poland@mozilla.org>, 2007-2016.
+# Piotr Drąg <piotrdrag@gmail.com>, 2009-2017.
+# Aviary.pl <community-poland@mozilla.org>, 2007-2017.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: glib\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-10-18 22:35+0200\n"
-"PO-Revision-Date: 2016-10-18 22:37+0200\n"
+"POT-Creation-Date: 2017-01-20 23:20+0100\n"
+"PO-Revision-Date: 2017-01-20 23:21+0100\n"
 "Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
 "Language-Team: Polish <community-poland@mozilla.org>\n"
 "Language: pl\n"
@@ -99,7 +99,7 @@ msgstr "Wyświetla listę dostępnych działań"
 
 #: ../gio/gapplication-tool.c:64
 msgid "List static actions for an application (from .desktop file)"
-msgstr "Wyświetla listę statycznych działań dla programu (z pliku .desktop)"
+msgstr "Wyświetla listę statycznych działań dla programu (z pliku .desktop)"
 
 #: ../gio/gapplication-tool.c:65 ../gio/gapplication-tool.c:71
 msgid "APPID"
@@ -120,8 +120,8 @@ msgstr ""
 "Identyfikator programu w formacie usługi D-Bus (np. org.przykład."
 "przeglądarka)"
 
-#: ../gio/gapplication-tool.c:72 ../gio/glib-compile-resources.c:622
-#: ../gio/glib-compile-resources.c:628 ../gio/glib-compile-resources.c:654
+#: ../gio/gapplication-tool.c:72 ../gio/glib-compile-resources.c:665
+#: ../gio/glib-compile-resources.c:671 ../gio/glib-compile-resources.c:698
 #: ../gio/gresource-tool.c:495 ../gio/gresource-tool.c:561
 msgid "FILE"
 msgstr "PLIK"
@@ -321,7 +321,7 @@ msgstr "Nieprawidłowa sekwencja bajtów na wejściu konwersji"
 msgid "Error during conversion: %s"
 msgstr "Błąd podczas konwersji: %s"
 
-#: ../gio/gcharsetconverter.c:444 ../gio/gsocket.c:1078
+#: ../gio/gcharsetconverter.c:444 ../gio/gsocket.c:1085
 msgid "Cancellable initialization not supported"
 msgstr "Zainicjowanie, które można anulować nie jest obsługiwane"
 
@@ -514,21 +514,21 @@ msgstr "Błąd podczas wywoływania wiersza poleceń „%s”: "
 msgid "(Type any character to close this window)\n"
 msgstr "(Wpisanie dowolnego znaku zamknie to okno)\n"
 
-#: ../gio/gdbusaddress.c:1489
+#: ../gio/gdbusaddress.c:1491
 #, c-format
 msgid "Session dbus not running, and autolaunch failed"
 msgstr ""
 "Magistrala D-Bus sesji nie jest uruchomiona, i automatyczne uruchomienie się "
 "nie powiodło"
 
-#: ../gio/gdbusaddress.c:1500
+#: ../gio/gdbusaddress.c:1502
 #, c-format
 msgid "Cannot determine session bus address (not implemented for this OS)"
 msgstr ""
 "Nie można ustalić adresu magistrali sesji (nie jest zaimplementowane dla "
 "tego systemu operacyjnego)"
 
-#: ../gio/gdbusaddress.c:1635 ../gio/gdbusconnection.c:7133
+#: ../gio/gdbusaddress.c:1637
 #, c-format
 msgid ""
 "Cannot determine bus address from DBUS_STARTER_BUS_TYPE environment variable "
@@ -537,7 +537,7 @@ msgstr ""
 "Nie można ustalić adresu magistrali ze zmiennej środowiskowej "
 "DBUS_STARTER_BUS_TYPE — nieznana wartość „%s”"
 
-#: ../gio/gdbusaddress.c:1644 ../gio/gdbusconnection.c:7142
+#: ../gio/gdbusaddress.c:1646 ../gio/gdbusconnection.c:7142
 msgid ""
 "Cannot determine bus address because the DBUS_STARTER_BUS_TYPE environment "
 "variable is not set"
@@ -545,7 +545,7 @@ msgstr ""
 "Nie można ustalić adresu magistrali, ponieważ nie ustawiono zmiennej "
 "środowiskowej DBUS_STARTER_BUS_TYPE"
 
-#: ../gio/gdbusaddress.c:1654
+#: ../gio/gdbusaddress.c:1656
 #, c-format
 msgid "Unknown bus type %d"
 msgstr "Nieznany typ magistrali %d"
@@ -668,35 +668,35 @@ msgstr ""
 #: ../gio/gdbusconnection.c:4109 ../gio/gdbusconnection.c:4456
 #, c-format
 msgid ""
-"No such interface “org.freedesktop.DBus.Properties” on object at path %s"
+"No such interface 'org.freedesktop.DBus.Properties' on object at path %s"
 msgstr ""
 "Brak interfejsu „org.freedesktop.DBus.Properties” w obiekcie w ścieżce %s"
 
 #: ../gio/gdbusconnection.c:4251
 #, c-format
-msgid "No such property “%s”"
+msgid "No such property '%s'"
 msgstr "Brak własności „%s”"
 
 #: ../gio/gdbusconnection.c:4263
 #, c-format
-msgid "Property “%s” is not readable"
+msgid "Property '%s' is not readable"
 msgstr "Właściwość „%s” nie jest odczytywalna"
 
 #: ../gio/gdbusconnection.c:4274
 #, c-format
-msgid "Property “%s” is not writable"
+msgid "Property '%s' is not writable"
 msgstr "Właściwość „%s” nie jest zapisywalna"
 
 #: ../gio/gdbusconnection.c:4294
 #, c-format
-msgid "Error setting property “%s”: Expected type “%s” but got “%s”"
+msgid "Error setting property '%s': Expected type '%s' but got '%s'"
 msgstr ""
 "Błąd podczas ustawiania własności „%s”: oczekiwano typ „%s”, ale otrzymano "
 "„%s”"
 
 #: ../gio/gdbusconnection.c:4399 ../gio/gdbusconnection.c:6573
 #, c-format
-msgid "No such interface “%s”"
+msgid "No such interface '%s'"
 msgstr "Brak interfejsu „%s”"
 
 #: ../gio/gdbusconnection.c:4607
@@ -705,17 +705,17 @@ msgstr "Brak interfejsu"
 
 #: ../gio/gdbusconnection.c:4825 ../gio/gdbusconnection.c:7082
 #, c-format
-msgid "No such interface “%s” on object at path %s"
+msgid "No such interface '%s' on object at path %s"
 msgstr "Brak interfejsu „%s” w obiekcie w ścieżce %s"
 
 #: ../gio/gdbusconnection.c:4923
 #, c-format
-msgid "No such method “%s”"
+msgid "No such method '%s'"
 msgstr "Brak metody „%s”"
 
 #: ../gio/gdbusconnection.c:4954
 #, c-format
-msgid "Type of message, “%s”, does not match expected type “%s”"
+msgid "Type of message, '%s', does not match expected type '%s'"
 msgstr "Typ komunikatu, „%s”, nie pasuje do oczekiwanego typu „%s”"
 
 #: ../gio/gdbusconnection.c:5152
@@ -735,12 +735,12 @@ msgstr "Nie można ustawić właściwości %s.%s"
 
 #: ../gio/gdbusconnection.c:5610
 #, c-format
-msgid "Method “%s” returned type “%s”, but expected “%s”"
+msgid "Method '%s' returned type '%s', but expected '%s'"
 msgstr "Metoda „%s” zwróciła typ „%s”, ale oczekiwano „%s”"
 
 #: ../gio/gdbusconnection.c:6684
 #, c-format
-msgid "Method “%s” on interface “%s” with signature “%s” does not exist"
+msgid "Method '%s' on interface '%s' with signature '%s' does not exist"
 msgstr "Metoda „%s” w interfejsie „%s” z podpisem „%s” nie istnieje"
 
 #: ../gio/gdbusconnection.c:6805
@@ -748,6 +748,15 @@ msgstr "Metoda „%s” w interfejsie „%s” z podpisem „%s” nie istniej
 msgid "A subtree is already exported for %s"
 msgstr "Poddrzewo zostało już wyeksportowane dla %s"
 
+#: ../gio/gdbusconnection.c:7133
+#, c-format
+msgid ""
+"Cannot determine bus address from DBUS_STARTER_BUS_TYPE environment variable "
+"- unknown value '%s'"
+msgstr ""
+"Nie można ustalić adresu magistrali ze zmiennej środowiskowej "
+"DBUS_STARTER_BUS_TYPE — nieznana wartość „%s”"
+
 #: ../gio/gdbusmessage.c:1244
 msgid "type is INVALID"
 msgstr "typ jest NIEPRAWIDŁOWY"
@@ -1237,39 +1246,39 @@ msgstr "Ścieżka do obiektu do monitorowania"
 msgid "Monitor a remote object."
 msgstr "Monitoruje zdalny obiekt."
 
-#: ../gio/gdesktopappinfo.c:1994 ../gio/gdesktopappinfo.c:4501
+#: ../gio/gdesktopappinfo.c:1997 ../gio/gdesktopappinfo.c:4504
 msgid "Unnamed"
 msgstr "Bez nazwy"
 
-#: ../gio/gdesktopappinfo.c:2404
+#: ../gio/gdesktopappinfo.c:2407
 msgid "Desktop file didn’t specify Exec field"
 msgstr "Plik .desktop nie określa pola Exec"
 
-#: ../gio/gdesktopappinfo.c:2689
+#: ../gio/gdesktopappinfo.c:2692
 msgid "Unable to find terminal required for application"
 msgstr "Nie można odnaleźć terminala wymaganego przez program"
 
-#: ../gio/gdesktopappinfo.c:3097
+#: ../gio/gdesktopappinfo.c:3100
 #, c-format
 msgid "Can’t create user application configuration folder %s: %s"
 msgstr ""
 "Nie można utworzyć katalogu użytkownika dla konfiguracji programu %s: %s"
 
-#: ../gio/gdesktopappinfo.c:3101
+#: ../gio/gdesktopappinfo.c:3104
 #, c-format
 msgid "Can’t create user MIME configuration folder %s: %s"
 msgstr "Nie można utworzyć katalogu użytkownika dla konfiguracji MIME %s: %s"
 
-#: ../gio/gdesktopappinfo.c:3341 ../gio/gdesktopappinfo.c:3365
+#: ../gio/gdesktopappinfo.c:3344 ../gio/gdesktopappinfo.c:3368
 msgid "Application information lacks an identifier"
 msgstr "Brak identyfikatora w informacjach o programie"
 
-#: ../gio/gdesktopappinfo.c:3599
+#: ../gio/gdesktopappinfo.c:3602
 #, c-format
 msgid "Can’t create user desktop file %s"
 msgstr "Nie można utworzyć pliku .desktop dla użytkownika %s"
 
-#: ../gio/gdesktopappinfo.c:3733
+#: ../gio/gdesktopappinfo.c:3736
 #, c-format
 msgid "Custom definition for %s"
 msgstr "Własna definicja dla %s"
@@ -1333,11 +1342,11 @@ msgstr "Oczekiwano obiektu GEmblem dla GEmblemedIcon"
 #: ../gio/gfile.c:969 ../gio/gfile.c:1207 ../gio/gfile.c:1345
 #: ../gio/gfile.c:1583 ../gio/gfile.c:1638 ../gio/gfile.c:1696
 #: ../gio/gfile.c:1780 ../gio/gfile.c:1837 ../gio/gfile.c:1901
-#: ../gio/gfile.c:1956 ../gio/gfile.c:3604 ../gio/gfile.c:3659
-#: ../gio/gfile.c:3895 ../gio/gfile.c:3937 ../gio/gfile.c:4405
-#: ../gio/gfile.c:4816 ../gio/gfile.c:4901 ../gio/gfile.c:4991
-#: ../gio/gfile.c:5088 ../gio/gfile.c:5175 ../gio/gfile.c:5276
-#: ../gio/gfile.c:7817 ../gio/gfile.c:7907 ../gio/gfile.c:7991
+#: ../gio/gfile.c:1956 ../gio/gfile.c:3609 ../gio/gfile.c:3664
+#: ../gio/gfile.c:3900 ../gio/gfile.c:3942 ../gio/gfile.c:4410
+#: ../gio/gfile.c:4821 ../gio/gfile.c:4906 ../gio/gfile.c:4996
+#: ../gio/gfile.c:5093 ../gio/gfile.c:5180 ../gio/gfile.c:5281
+#: ../gio/gfile.c:7822 ../gio/gfile.c:7912 ../gio/gfile.c:7996
 #: ../gio/win32/gwinhttpfile.c:437
 msgid "Operation not supported"
 msgstr "Działanie nie jest obsługiwane"
@@ -1366,50 +1375,50 @@ msgstr "Plik docelowy istnieje"
 msgid "Can’t recursively copy directory"
 msgstr "Nie można skopiować katalogu rekurencyjnie"
 
-#: ../gio/gfile.c:2884
+#: ../gio/gfile.c:2889
 msgid "Splice not supported"
 msgstr "Wywołanie „splice” nie jest obsługiwane"
 
-#: ../gio/gfile.c:2888
+#: ../gio/gfile.c:2893
 #, c-format
 msgid "Error splicing file: %s"
 msgstr "Błąd podczas dzielenia pliku: %s"
 
-#: ../gio/gfile.c:3019
+#: ../gio/gfile.c:3024
 msgid "Copy (reflink/clone) between mounts is not supported"
 msgstr ""
 "Kopiowanie (reflink/clone) między punktami montowania nie jest obsługiwane"
 
-#: ../gio/gfile.c:3023
+#: ../gio/gfile.c:3028
 msgid "Copy (reflink/clone) is not supported or invalid"
 msgstr "Kopiowanie (reflink/clone) nie jest obsługiwane lub jest nieprawidłowe"
 
-#: ../gio/gfile.c:3028
+#: ../gio/gfile.c:3033
 msgid "Copy (reflink/clone) is not supported or didn’t work"
 msgstr "Kopiowanie (reflink/clone) nie jest obsługiwane lub nie zadziałało"
 
-#: ../gio/gfile.c:3091
+#: ../gio/gfile.c:3096
 msgid "Can’t copy special file"
 msgstr "Nie można skopiować pliku specjalnego"
 
-#: ../gio/gfile.c:3885
+#: ../gio/gfile.c:3890
 msgid "Invalid symlink value given"
 msgstr "Wprowadzono nieprawidłową wartość dowiązania symbolicznego"
 
-#: ../gio/gfile.c:4046
+#: ../gio/gfile.c:4051
 msgid "Trash not supported"
 msgstr "Kosz nie jest obsługiwany"
 
-#: ../gio/gfile.c:4158
+#: ../gio/gfile.c:4163
 #, c-format
 msgid "File names cannot contain “%c”"
 msgstr "Nazwy plików nie mogą zawierać „%c”"
 
-#: ../gio/gfile.c:6604 ../gio/gvolume.c:363
+#: ../gio/gfile.c:6609 ../gio/gvolume.c:363
 msgid "volume doesn’t implement mount"
 msgstr "wolumin nie obsługuje montowania"
 
-#: ../gio/gfile.c:6713
+#: ../gio/gfile.c:6718
 msgid "No application is registered as handling this file"
 msgstr "Żaden program nie jest zarejestrowany do obsługi tego pliku"
 
@@ -1454,28 +1463,33 @@ msgstr "Skracanie nie jest dozwolone na potoku wejściowym"
 msgid "Truncate not supported on stream"
 msgstr "Skracanie nie jest dozwolone na potoku"
 
-#: ../gio/ghttpproxy.c:136
+#: ../gio/ghttpproxy.c:91 ../gio/gresolver.c:410 ../gio/gresolver.c:476
+#: ../glib/gconvert.c:1726
+msgid "Invalid hostname"
+msgstr "Nieprawidłowa nazwa komputera"
+
+#: ../gio/ghttpproxy.c:143
 msgid "Bad HTTP proxy reply"
 msgstr "Błędna odpowiedź pośrednika HTTP"
 
-#: ../gio/ghttpproxy.c:152
+#: ../gio/ghttpproxy.c:159
 msgid "HTTP proxy connection not allowed"
 msgstr "Połączenie pośrednika HTTP nie jest dozwolone"
 
-#: ../gio/ghttpproxy.c:157
+#: ../gio/ghttpproxy.c:164
 msgid "HTTP proxy authentication failed"
 msgstr "Uwierzytelnienie pośrednika HTTP się nie powiodło"
 
-#: ../gio/ghttpproxy.c:160
+#: ../gio/ghttpproxy.c:167
 msgid "HTTP proxy authentication required"
 msgstr "Wymagane jest uwierzytelnienie pośrednika HTTP"
 
-#: ../gio/ghttpproxy.c:164
+#: ../gio/ghttpproxy.c:171
 #, c-format
 msgid "HTTP proxy connection failed: %i"
 msgstr "Połączenie pośrednika HTTP się nie powiodło: %i"
 
-#: ../gio/ghttpproxy.c:260
+#: ../gio/ghttpproxy.c:269
 msgid "HTTP proxy server closed connection unexpectedly."
 msgstr "Serwer pośrednika HTTP nieoczekiwanie zamknął połączenie."
 
@@ -1532,7 +1546,7 @@ msgid "Could not parse “%s” as IP address mask"
 msgstr "Nie można przetworzyć „%s” jako maskę adresu IP"
 
 #: ../gio/ginetsocketaddress.c:203 ../gio/ginetsocketaddress.c:220
-#: ../gio/gnativesocketaddress.c:106 ../gio/gunixsocketaddress.c:216
+#: ../gio/gnativesocketaddress.c:106 ../gio/gunixsocketaddress.c:218
 msgid "Not enough space for socket address"
 msgstr "Brak wystarczającej ilości miejsca dla adresu gniazda"
 
@@ -2311,59 +2325,63 @@ msgstr "Błąd podczas kompresowania pliku %s"
 msgid "text may not appear inside <%s>"
 msgstr "tekst nie może znajdować się wewnątrz <%s>"
 
-#: ../gio/glib-compile-resources.c:621 ../gio/glib-compile-schemas.c:2037
+#: ../gio/glib-compile-resources.c:664 ../gio/glib-compile-schemas.c:2037
 msgid "Show program version and exit"
 msgstr "Wyświetla wersję programu i kończy działanie"
 
-#: ../gio/glib-compile-resources.c:622
+#: ../gio/glib-compile-resources.c:665
 msgid "name of the output file"
 msgstr "nazwa pliku wyjściowego"
 
-#: ../gio/glib-compile-resources.c:623
+#: ../gio/glib-compile-resources.c:666
 msgid ""
 "The directories where files are to be read from (default to current "
 "directory)"
 msgstr "Katalog, z którego odczytywać pliki (domyślnie bieżący katalog)"
 
-#: ../gio/glib-compile-resources.c:623 ../gio/glib-compile-schemas.c:2038
+#: ../gio/glib-compile-resources.c:666 ../gio/glib-compile-schemas.c:2038
 #: ../gio/glib-compile-schemas.c:2067
 msgid "DIRECTORY"
 msgstr "KATALOG"
 
-#: ../gio/glib-compile-resources.c:624
+#: ../gio/glib-compile-resources.c:667
 msgid ""
 "Generate output in the format selected for by the target filename extension"
 msgstr "Tworzy wyjście w formacie wybranym przez rozszerzenie pliku docelowego"
 
-#: ../gio/glib-compile-resources.c:625
+#: ../gio/glib-compile-resources.c:668
 msgid "Generate source header"
 msgstr "Tworzy nagłówek źródła"
 
-#: ../gio/glib-compile-resources.c:626
+#: ../gio/glib-compile-resources.c:669
 msgid "Generate sourcecode used to link in the resource file into your code"
 msgstr "Tworzy kod źródłowy używany do dowiązania pliku zasobu do kodu"
 
-#: ../gio/glib-compile-resources.c:627
+#: ../gio/glib-compile-resources.c:670
 msgid "Generate dependency list"
 msgstr "Tworzy listę zależności"
 
-#: ../gio/glib-compile-resources.c:628
+#: ../gio/glib-compile-resources.c:671
 msgid "name of the dependency file to generate"
 msgstr "nazwa pliku zależności do utworzenia"
 
-#: ../gio/glib-compile-resources.c:629
+#: ../gio/glib-compile-resources.c:672
+msgid "Include phony targets in the generated dependency file"
+msgstr "Dołącza fałszywe cele w utworzonym pliku zależności"
+
+#: ../gio/glib-compile-resources.c:673
 msgid "Don’t automatically create and register resource"
 msgstr "Bez automatycznego tworzenia i rejestrowania zasobu"
 
-#: ../gio/glib-compile-resources.c:630
+#: ../gio/glib-compile-resources.c:674
 msgid "Don’t export functions; declare them G_GNUC_INTERNAL"
 msgstr "Bez eksportowania funkcji; deklaruje je jako G_GNUC_INTERNAL"
 
-#: ../gio/glib-compile-resources.c:631
+#: ../gio/glib-compile-resources.c:675
 msgid "C identifier name used for the generated source code"
 msgstr "Nazwa identyfikatora języka C używana dla utworzonego kodu źródłowego"
 
-#: ../gio/glib-compile-resources.c:657
+#: ../gio/glib-compile-resources.c:701
 msgid ""
 "Compile a resource specification into a resource file.\n"
 "Resource specification files have the extension .gresource.xml,\n"
@@ -2373,7 +2391,7 @@ msgstr ""
 "zasobów mają rozszerzenie .gresource.xml, a pliki\n"
 "zasobów mają rozszerzenie .gresource."
 
-#: ../gio/glib-compile-resources.c:679
+#: ../gio/glib-compile-resources.c:723
 #, c-format
 msgid "You should give exactly one file name\n"
 msgstr "Należy podać dokładnie jedną nazwę pliku\n"
@@ -2384,31 +2402,31 @@ msgstr "puste nazwy nie są dozwolone"
 
 #: ../gio/glib-compile-schemas.c:794
 #, c-format
-msgid "invalid name “%s”: names must begin with a lowercase letter"
+msgid "invalid name '%s': names must begin with a lowercase letter"
 msgstr "nieprawidłowa nazwa „%s”: nazwy muszą rozpoczynać się od małej litery"
 
 #: ../gio/glib-compile-schemas.c:806
 #, c-format
 msgid ""
-"invalid name “%s”: invalid character “%c”; only lowercase letters, numbers "
-"and hyphen (“-”) are permitted."
+"invalid name '%s': invalid character '%c'; only lowercase letters, numbers "
+"and hyphen ('-') are permitted."
 msgstr ""
 "nieprawidłowa nazwa „%s”: niedozwolony znak „%c”. Dozwolone są tylko małe "
 "litery, liczby i myślniki („-”)."
 
 #: ../gio/glib-compile-schemas.c:815
 #, c-format
-msgid "invalid name “%s”: two successive hyphens (“--”) are not permitted."
+msgid "invalid name '%s': two successive hyphens ('--') are not permitted."
 msgstr "nieprawidłowa nazwa „%s”: dwa myślniki („--”) nie są dozwolone."
 
 #: ../gio/glib-compile-schemas.c:824
 #, c-format
-msgid "invalid name “%s”: the last character may not be a hyphen (“-”)."
+msgid "invalid name '%s': the last character may not be a hyphen ('-')."
 msgstr "nieprawidłowa nazwa „%s”: ostatni znak nie może być myślnikiem („-”)."
 
 #: ../gio/glib-compile-schemas.c:832
 #, c-format
-msgid "invalid name “%s”: maximum length is 1024"
+msgid "invalid name '%s': maximum length is 1024"
 msgstr "nieprawidłowa nazwa „%s”: maksymalna długość to 1024"
 
 #: ../gio/glib-compile-schemas.c:901
@@ -2417,7 +2435,7 @@ msgid "<child name='%s'> already specified"
 msgstr "<child name='%s'> zostało już określone"
 
 #: ../gio/glib-compile-schemas.c:927
-msgid "cannot add keys to a “list-of” schema"
+msgid "cannot add keys to a 'list-of' schema"
 msgstr "nie można dodać kluczy do schematu „list-of”"
 
 #: ../gio/glib-compile-schemas.c:938
@@ -2437,7 +2455,7 @@ msgstr ""
 #: ../gio/glib-compile-schemas.c:967
 #, c-format
 msgid ""
-"exactly one of “type”, “enum” or “flags” must be specified as an attribute "
+"exactly one of 'type', 'enum' or 'flags' must be specified as an attribute "
 "to <key>"
 msgstr ""
 "dokładnie jedna z wartości „type”, „enum” lub „flags” musi zostać określona "
@@ -2450,11 +2468,11 @@ msgstr "<%s id='%s'> nie zostało (jeszcze) określone."
 
 #: ../gio/glib-compile-schemas.c:1001
 #, c-format
-msgid "invalid GVariant type string “%s”"
+msgid "invalid GVariant type string '%s'"
 msgstr "nieprawidłowy typ GVariant ciągu „%s”"
 
 #: ../gio/glib-compile-schemas.c:1031
-msgid "<override> given but schema isn’t extending anything"
+msgid "<override> given but schema isn't extending anything"
 msgstr "podano znacznik <override>, ale schemat nic nie rozszerza"
 
 #: ../gio/glib-compile-schemas.c:1044
@@ -2474,12 +2492,12 @@ msgstr "<schema id='%s'> zostało już określone"
 
 #: ../gio/glib-compile-schemas.c:1137
 #, c-format
-msgid "<schema id='%s'> extends not yet existing schema “%s”"
+msgid "<schema id='%s'> extends not yet existing schema '%s'"
 msgstr "<schema id='%s'> rozszerza jeszcze nieistniejący schemat „%s”"
 
 #: ../gio/glib-compile-schemas.c:1153
 #, c-format
-msgid "<schema id='%s'> is list of not yet existing schema “%s”"
+msgid "<schema id='%s'> is list of not yet existing schema '%s'"
 msgstr "<schema id='%s'> jest listą jeszcze nieistniejącego schematu „%s”"
 
 #: ../gio/glib-compile-schemas.c:1161
@@ -2503,8 +2521,8 @@ msgstr ""
 #: ../gio/glib-compile-schemas.c:1191
 #, c-format
 msgid ""
-"<schema id='%s' list-of='%s'> extends <schema id='%s' list-of='%s'> but “%s” "
-"does not extend “%s”"
+"<schema id='%s' list-of='%s'> extends <schema id='%s' list-of='%s'> but '%s' "
+"does not extend '%s'"
 msgstr ""
 "<schema id='%s' list-of='%s'> rozszerza znacznik <schema id='%s' list-"
 "of='%s'>, ale „%s” nie rozszerza „%s”"
@@ -2517,7 +2535,7 @@ msgstr ""
 
 #: ../gio/glib-compile-schemas.c:1215
 #, c-format
-msgid "the path of a list must end with “:/”"
+msgid "the path of a list must end with ':/'"
 msgstr "ścieżka do listy musi kończyć się „:/”"
 
 #: ../gio/glib-compile-schemas.c:1247
@@ -2554,7 +2572,7 @@ msgstr "Ignorowanie tego pliku.\n"
 
 #: ../gio/glib-compile-schemas.c:1901
 #, c-format
-msgid "No such key “%s” in schema “%s” as specified in override file “%s”"
+msgid "No such key '%s' in schema '%s' as specified in override file '%s'"
 msgstr ""
 "Brak klucza „%s” w schemacie „%s”, jak określono w pliku zastąpienia „%s”"
 
@@ -2573,7 +2591,7 @@ msgstr " oraz podano opcję --strict; kończenie działania.\n"
 #: ../gio/glib-compile-schemas.c:1927
 #, c-format
 msgid ""
-"error parsing key “%s” in schema “%s” as specified in override file “%s”: %s."
+"error parsing key '%s' in schema '%s' as specified in override file '%s': %s."
 msgstr ""
 "błąd podczas przetwarzania klucza „%s” w schemacie „%s”, jak określono "
 "w pliku zastąpienia „%s”: %s."
@@ -2586,7 +2604,7 @@ msgstr "Ignorowanie zastąpienia dla tego klucza.\n"
 #: ../gio/glib-compile-schemas.c:1955
 #, c-format
 msgid ""
-"override for key “%s” in schema “%s” in override file “%s” is outside the "
+"override for key '%s' in schema '%s' in override file '%s' is outside the "
 "range given in the schema"
 msgstr ""
 "zastąpienie dla klucza „%s” w schemacie „%s” w pliku zastąpienia „%s” jest "
@@ -2595,7 +2613,7 @@ msgstr ""
 #: ../gio/glib-compile-schemas.c:1983
 #, c-format
 msgid ""
-"override for key “%s” in schema “%s” in override file “%s” is not in the "
+"override for key '%s' in schema '%s' in override file '%s' is not in the "
 "list of valid choices"
 msgstr ""
 "zastąpienie dla klucza „%s” w schemacie „%s” w pliku zastąpienia „%s” nie "
@@ -2746,7 +2764,7 @@ msgstr "System plików nie obsługuje dowiązań symbolicznych"
 msgid "Error making symbolic link %s: %s"
 msgstr "Błąd podczas tworzenia dowiązania symbolicznego %s: %s"
 
-#: ../gio/glocalfile.c:2292 ../glib/gfileutils.c:2064
+#: ../gio/glocalfile.c:2292 ../glib/gfileutils.c:2063
 msgid "Symbolic links not supported"
 msgstr "Dowiązania symboliczne nie są obsługiwane"
 
@@ -3073,7 +3091,7 @@ msgstr "Potok wyjściowy nie obsługuje zapisu"
 msgid "Source stream is already closed"
 msgstr "Potok źródłowy jest już zamknięty"
 
-#: ../gio/gresolver.c:333 ../gio/gthreadedresolver.c:116
+#: ../gio/gresolver.c:342 ../gio/gthreadedresolver.c:116
 #: ../gio/gthreadedresolver.c:126
 #, c-format
 msgid "Error resolving “%s”: %s"
@@ -3466,146 +3484,146 @@ msgstr "Podano pustą nazwę schematu\n"
 msgid "No such key “%s”\n"
 msgstr "Brak klucza „%s”\n"
 
-#: ../gio/gsocket.c:364
+#: ../gio/gsocket.c:369
 msgid "Invalid socket, not initialized"
 msgstr "Nieprawidłowe gniazdo, nie zainicjowano"
 
-#: ../gio/gsocket.c:371
+#: ../gio/gsocket.c:376
 #, c-format
 msgid "Invalid socket, initialization failed due to: %s"
 msgstr "Nieprawidłowe gniazdo, zainicjowanie się nie powiodło z powodu: %s"
 
-#: ../gio/gsocket.c:379
+#: ../gio/gsocket.c:384
 msgid "Socket is already closed"
 msgstr "Gniazdo jest już zamknięte"
 
-#: ../gio/gsocket.c:394 ../gio/gsocket.c:2751 ../gio/gsocket.c:3897
-#: ../gio/gsocket.c:3952
+#: ../gio/gsocket.c:399 ../gio/gsocket.c:2754 ../gio/gsocket.c:3939
+#: ../gio/gsocket.c:3995
 msgid "Socket I/O timed out"
 msgstr "Przekroczono czas oczekiwania wejścia/wyjścia gniazda"
 
-#: ../gio/gsocket.c:526
+#: ../gio/gsocket.c:531
 #, c-format
 msgid "creating GSocket from fd: %s"
 msgstr "tworzenie GSocket z fd: %s"
 
-#: ../gio/gsocket.c:554 ../gio/gsocket.c:608 ../gio/gsocket.c:615
+#: ../gio/gsocket.c:559 ../gio/gsocket.c:613 ../gio/gsocket.c:620
 #, c-format
 msgid "Unable to create socket: %s"
 msgstr "Nie można utworzyć gniazda: %s"
 
-#: ../gio/gsocket.c:608
+#: ../gio/gsocket.c:613
 msgid "Unknown family was specified"
 msgstr "Określono nieznaną rodzinę"
 
-#: ../gio/gsocket.c:615
+#: ../gio/gsocket.c:620
 msgid "Unknown protocol was specified"
 msgstr "Określono nieznany protokół"
 
-#: ../gio/gsocket.c:1104
+#: ../gio/gsocket.c:1111
 #, c-format
 msgid "Cannot use datagram operations on a non-datagram socket."
 msgstr "Nie można używać działań datagramowych na niedatagramowych gniazdach."
 
-#: ../gio/gsocket.c:1121
+#: ../gio/gsocket.c:1128
 #, c-format
 msgid "Cannot use datagram operations on a socket with a timeout set."
 msgstr ""
 "Nie można używać działań datagramowych na gniazdach z ustawionym czasem "
 "oczekiwania."
 
-#: ../gio/gsocket.c:1925
+#: ../gio/gsocket.c:1932
 #, c-format
 msgid "could not get local address: %s"
 msgstr "nie można uzyskać lokalnego adresu: %s"
 
-#: ../gio/gsocket.c:1968
+#: ../gio/gsocket.c:1975
 #, c-format
 msgid "could not get remote address: %s"
 msgstr "nie można uzyskać zdalnego adresu: %s"
 
-#: ../gio/gsocket.c:2034
+#: ../gio/gsocket.c:2041
 #, c-format
 msgid "could not listen: %s"
 msgstr "nie można nasłuchiwać: %s"
 
-#: ../gio/gsocket.c:2133
+#: ../gio/gsocket.c:2140
 #, c-format
 msgid "Error binding to address: %s"
 msgstr "Błąd podczas dowiązywania do adresu: %s"
 
-#: ../gio/gsocket.c:2248 ../gio/gsocket.c:2285
+#: ../gio/gsocket.c:2255 ../gio/gsocket.c:2292
 #, c-format
 msgid "Error joining multicast group: %s"
 msgstr "Błąd podczas dołączania do grupy multicast: %s"
 
-#: ../gio/gsocket.c:2249 ../gio/gsocket.c:2286
+#: ../gio/gsocket.c:2256 ../gio/gsocket.c:2293
 #, c-format
 msgid "Error leaving multicast group: %s"
 msgstr "Błąd podczas opuszczania grupy multicast: %s"
 
-#: ../gio/gsocket.c:2250
+#: ../gio/gsocket.c:2257
 msgid "No support for source-specific multicast"
 msgstr "Brak obsługi multicastu dla konkretnych źródeł"
 
-#: ../gio/gsocket.c:2470
+#: ../gio/gsocket.c:2477
 #, c-format
 msgid "Error accepting connection: %s"
 msgstr "Błąd podczas akceptowania połączenia: %s"
 
-#: ../gio/gsocket.c:2593
+#: ../gio/gsocket.c:2598
 msgid "Connection in progress"
 msgstr "Trwa połączenie"
 
-#: ../gio/gsocket.c:2644
+#: ../gio/gsocket.c:2647
 msgid "Unable to get pending error: "
 msgstr "Nie można uzyskać oczekującego błędu: "
 
-#: ../gio/gsocket.c:2816
+#: ../gio/gsocket.c:2817
 #, c-format
 msgid "Error receiving data: %s"
 msgstr "Błąd podczas pobierania danych: %s"
 
-#: ../gio/gsocket.c:3013
+#: ../gio/gsocket.c:3012
 #, c-format
 msgid "Error sending data: %s"
 msgstr "Błąd podczas wysyłania danych: %s"
 
-#: ../gio/gsocket.c:3200
+#: ../gio/gsocket.c:3199
 #, c-format
 msgid "Unable to shutdown socket: %s"
 msgstr "Nie można zamknąć gniazda: %s"
 
-#: ../gio/gsocket.c:3281
+#: ../gio/gsocket.c:3280
 #, c-format
 msgid "Error closing socket: %s"
 msgstr "Błąd podczas zamykania gniazda: %s"
 
-#: ../gio/gsocket.c:3890
+#: ../gio/gsocket.c:3932
 #, c-format
 msgid "Waiting for socket condition: %s"
 msgstr "Oczekiwanie na warunek gniazda: %s"
 
-#: ../gio/gsocket.c:4362 ../gio/gsocket.c:4442 ../gio/gsocket.c:4620
+#: ../gio/gsocket.c:4404 ../gio/gsocket.c:4484 ../gio/gsocket.c:4662
 #, c-format
 msgid "Error sending message: %s"
 msgstr "Błąd podczas wysyłania komunikatu: %s"
 
-#: ../gio/gsocket.c:4386
+#: ../gio/gsocket.c:4428
 msgid "GSocketControlMessage not supported on Windows"
 msgstr "GSocketControlMessage nie jest obsługiwane w systemie Windows"
 
-#: ../gio/gsocket.c:4839 ../gio/gsocket.c:4912 ../gio/gsocket.c:5139
+#: ../gio/gsocket.c:4881 ../gio/gsocket.c:4954 ../gio/gsocket.c:5180
 #, c-format
 msgid "Error receiving message: %s"
 msgstr "Błąd podczas pobierania komunikatu: %s"
 
-#: ../gio/gsocket.c:5411
+#: ../gio/gsocket.c:5452
 #, c-format
 msgid "Unable to read socket credentials: %s"
 msgstr "Nie można odczytać danych uwierzytelniających gniazda: %s"
 
-#: ../gio/gsocket.c:5420
+#: ../gio/gsocket.c:5461
 msgid "g_socket_get_credentials not implemented for this OS"
 msgstr ""
 "g_socket_get_credentials nie jest zaimplementowane dla tego systemu "
@@ -3873,7 +3891,7 @@ msgstr "Błąd podczas odczytywania z deskryptora pliku: %s"
 msgid "Error closing file descriptor: %s"
 msgstr "Błąd podczas zamykania deskryptora pliku: %s"
 
-#: ../gio/gunixmounts.c:2364 ../gio/gunixmounts.c:2417
+#: ../gio/gunixmounts.c:2367 ../gio/gunixmounts.c:2420
 msgid "Filesystem root"
 msgstr "Katalog główny systemu plików"
 
@@ -3882,7 +3900,7 @@ msgstr "Katalog główny systemu plików"
 msgid "Error writing to file descriptor: %s"
 msgstr "Błąd podczas zapisywania do deskryptora pliku: %s"
 
-#: ../gio/gunixsocketaddress.c:239
+#: ../gio/gunixsocketaddress.c:241
 msgid "Abstract UNIX domain socket addresses not supported on this system"
 msgstr ""
 "Abstrakcyjne adresy gniazd domen systemu UNIX nie są obsługiwane w tym "
@@ -3956,72 +3974,72 @@ msgstr "Uruchamia usługę D-Bus"
 msgid "Wrong args\n"
 msgstr "Błędne parametry\n"
 
-#: ../glib/gbookmarkfile.c:755
+#: ../glib/gbookmarkfile.c:754
 #, c-format
 msgid "Unexpected attribute “%s” for element “%s”"
 msgstr "Nieoczekiwany atrybut „%s” dla elementu „%s”"
 
-#: ../glib/gbookmarkfile.c:766 ../glib/gbookmarkfile.c:837
-#: ../glib/gbookmarkfile.c:847 ../glib/gbookmarkfile.c:954
+#: ../glib/gbookmarkfile.c:765 ../glib/gbookmarkfile.c:836
+#: ../glib/gbookmarkfile.c:846 ../glib/gbookmarkfile.c:953
 #, c-format
 msgid "Attribute “%s” of element “%s” not found"
 msgstr "Nie odnaleziono atrybutu „%s” dla elementu „%s”"
 
-#: ../glib/gbookmarkfile.c:1124 ../glib/gbookmarkfile.c:1189
-#: ../glib/gbookmarkfile.c:1253 ../glib/gbookmarkfile.c:1263
+#: ../glib/gbookmarkfile.c:1123 ../glib/gbookmarkfile.c:1188
+#: ../glib/gbookmarkfile.c:1252 ../glib/gbookmarkfile.c:1262
 #, c-format
 msgid "Unexpected tag “%s”, tag “%s” expected"
 msgstr "Nieoczekiwany znacznik „%s”, oczekiwano znacznika „%s”"
 
-#: ../glib/gbookmarkfile.c:1149 ../glib/gbookmarkfile.c:1163
-#: ../glib/gbookmarkfile.c:1231
+#: ../glib/gbookmarkfile.c:1148 ../glib/gbookmarkfile.c:1162
+#: ../glib/gbookmarkfile.c:1230
 #, c-format
 msgid "Unexpected tag “%s” inside “%s”"
 msgstr "Nieoczekiwany znacznik „%s” wewnątrz „%s”"
 
-#: ../glib/gbookmarkfile.c:1757
+#: ../glib/gbookmarkfile.c:1756
 msgid "No valid bookmark file found in data dirs"
 msgstr "Nie można odnaleźć prawidłowego pliku zakładek w katalogach danych"
 
-#: ../glib/gbookmarkfile.c:1958
+#: ../glib/gbookmarkfile.c:1957
 #, c-format
 msgid "A bookmark for URI “%s” already exists"
 msgstr "Zakładka dla adresu URI „%s” już istnieje"
 
-#: ../glib/gbookmarkfile.c:2004 ../glib/gbookmarkfile.c:2162
-#: ../glib/gbookmarkfile.c:2247 ../glib/gbookmarkfile.c:2327
-#: ../glib/gbookmarkfile.c:2412 ../glib/gbookmarkfile.c:2495
-#: ../glib/gbookmarkfile.c:2573 ../glib/gbookmarkfile.c:2652
-#: ../glib/gbookmarkfile.c:2694 ../glib/gbookmarkfile.c:2791
-#: ../glib/gbookmarkfile.c:2911 ../glib/gbookmarkfile.c:3101
-#: ../glib/gbookmarkfile.c:3177 ../glib/gbookmarkfile.c:3345
-#: ../glib/gbookmarkfile.c:3434 ../glib/gbookmarkfile.c:3523
-#: ../glib/gbookmarkfile.c:3639
+#: ../glib/gbookmarkfile.c:2003 ../glib/gbookmarkfile.c:2161
+#: ../glib/gbookmarkfile.c:2246 ../glib/gbookmarkfile.c:2326
+#: ../glib/gbookmarkfile.c:2411 ../glib/gbookmarkfile.c:2494
+#: ../glib/gbookmarkfile.c:2572 ../glib/gbookmarkfile.c:2651
+#: ../glib/gbookmarkfile.c:2693 ../glib/gbookmarkfile.c:2790
+#: ../glib/gbookmarkfile.c:2910 ../glib/gbookmarkfile.c:3100
+#: ../glib/gbookmarkfile.c:3176 ../glib/gbookmarkfile.c:3344
+#: ../glib/gbookmarkfile.c:3433 ../glib/gbookmarkfile.c:3522
+#: ../glib/gbookmarkfile.c:3638
 #, c-format
 msgid "No bookmark found for URI “%s”"
 msgstr "Nie odnaleziono zakładki dla adresu URI „%s”"
 
-#: ../glib/gbookmarkfile.c:2336
+#: ../glib/gbookmarkfile.c:2335
 #, c-format
 msgid "No MIME type defined in the bookmark for URI “%s”"
 msgstr "Nie zdefiniowano typu MIME w zakładce dla adresu URI „%s”"
 
-#: ../glib/gbookmarkfile.c:2421
+#: ../glib/gbookmarkfile.c:2420
 #, c-format
 msgid "No private flag has been defined in bookmark for URI “%s”"
 msgstr "Nie zdefiniowano prywatnej flagi w zakładce dla adresu URI „%s”"
 
-#: ../glib/gbookmarkfile.c:2800
+#: ../glib/gbookmarkfile.c:2799
 #, c-format
 msgid "No groups set in bookmark for URI “%s”"
 msgstr "Nie ustawiono grup w zakładce dla adresu URI „%s”"
 
-#: ../glib/gbookmarkfile.c:3198 ../glib/gbookmarkfile.c:3355
+#: ../glib/gbookmarkfile.c:3197 ../glib/gbookmarkfile.c:3354
 #, c-format
 msgid "No application with name “%s” registered a bookmark for “%s”"
 msgstr "Żaden program o nazwie „%s” nie zarejestrował zakładki dla „%s”"
 
-#: ../glib/gbookmarkfile.c:3378
+#: ../glib/gbookmarkfile.c:3377
 #, c-format
 msgid "Failed to expand exec line “%s” with URI “%s”"
 msgstr "Rozwinięcie wiersza exec „%s” z adresem URI „%s” się nie powiodło"
@@ -4036,263 +4054,259 @@ msgstr "Na końcu wejścia występuje sekwencja odpowiadająca części znaku"
 msgid "Cannot convert fallback “%s” to codeset “%s”"
 msgstr "Nie można skonwertować napisu zastępczego „%s” na zestaw znaków „%s”"
 
-#: ../glib/gconvert.c:1567
+#: ../glib/gconvert.c:1566
 #, c-format
 msgid "The URI “%s” is not an absolute URI using the “file” scheme"
 msgstr ""
 "Adres URI „%s” nie jest bezwzględnym adresem URI, używającym schematu „file”"
 
-#: ../glib/gconvert.c:1577
+#: ../glib/gconvert.c:1576
 #, c-format
 msgid "The local file URI “%s” may not include a “#”"
 msgstr "Adres URI lokalnego pliku „%s” nie może zawierać znaku „#”"
 
-#: ../glib/gconvert.c:1594
+#: ../glib/gconvert.c:1593
 #, c-format
 msgid "The URI “%s” is invalid"
 msgstr "Adres URI „%s” jest nieprawidłowy"
 
-#: ../glib/gconvert.c:1606
+#: ../glib/gconvert.c:1605
 #, c-format
 msgid "The hostname of the URI “%s” is invalid"
 msgstr "Nazwa komputera w adresie URI „%s” jest nieprawidłowa"
 
-#: ../glib/gconvert.c:1622
+#: ../glib/gconvert.c:1621
 #, c-format
 msgid "The URI “%s” contains invalidly escaped characters"
 msgstr "Adres URI „%s” zawiera nieprawidłowe znaki sterujące"
 
-#: ../glib/gconvert.c:1717
+#: ../glib/gconvert.c:1716
 #, c-format
 msgid "The pathname “%s” is not an absolute path"
 msgstr "Ścieżka „%s” nie jest ścieżką bezwzględną"
 
-#: ../glib/gconvert.c:1727
-msgid "Invalid hostname"
-msgstr "Nieprawidłowa nazwa komputera"
-
 #. Translators: 'before midday' indicator
-#: ../glib/gdatetime.c:201
+#: ../glib/gdatetime.c:199
 msgctxt "GDateTime"
 msgid "AM"
 msgstr "AM"
 
 #. Translators: 'after midday' indicator
-#: ../glib/gdatetime.c:203
+#: ../glib/gdatetime.c:201
 msgctxt "GDateTime"
 msgid "PM"
 msgstr "PM"
 
 #. Translators: this is the preferred format for expressing the date and the time
-#: ../glib/gdatetime.c:206
+#: ../glib/gdatetime.c:204
 msgctxt "GDateTime"
 msgid "%a %b %e %H:%M:%S %Y"
 msgstr "%a %e %b %Y, %H∶%M∶%S"
 
 #. Translators: this is the preferred format for expressing the date
-#: ../glib/gdatetime.c:209
+#: ../glib/gdatetime.c:207
 msgctxt "GDateTime"
 msgid "%m/%d/%y"
 msgstr "%e %b %Y"
 
 #. Translators: this is the preferred format for expressing the time
-#: ../glib/gdatetime.c:212
+#: ../glib/gdatetime.c:210
 msgctxt "GDateTime"
 msgid "%H:%M:%S"
 msgstr "%H∶%M∶%S"
 
 #. Translators: this is the preferred format for expressing 12 hour time
-#: ../glib/gdatetime.c:215
+#: ../glib/gdatetime.c:213
 msgctxt "GDateTime"
 msgid "%I:%M:%S %p"
 msgstr "%I∶%M∶%S %p"
 
-#: ../glib/gdatetime.c:228
+#: ../glib/gdatetime.c:226
 msgctxt "full month name"
 msgid "January"
 msgstr "styczeń"
 
-#: ../glib/gdatetime.c:230
+#: ../glib/gdatetime.c:228
 msgctxt "full month name"
 msgid "February"
 msgstr "luty"
 
-#: ../glib/gdatetime.c:232
+#: ../glib/gdatetime.c:230
 msgctxt "full month name"
 msgid "March"
 msgstr "marzec"
 
-#: ../glib/gdatetime.c:234
+#: ../glib/gdatetime.c:232
 msgctxt "full month name"
 msgid "April"
 msgstr "kwiecień"
 
-#: ../glib/gdatetime.c:236
+#: ../glib/gdatetime.c:234
 msgctxt "full month name"
 msgid "May"
 msgstr "maj"
 
-#: ../glib/gdatetime.c:238
+#: ../glib/gdatetime.c:236
 msgctxt "full month name"
 msgid "June"
 msgstr "czerwiec"
 
-#: ../glib/gdatetime.c:240
+#: ../glib/gdatetime.c:238
 msgctxt "full month name"
 msgid "July"
 msgstr "lipiec"
 
-#: ../glib/gdatetime.c:242
+#: ../glib/gdatetime.c:240
 msgctxt "full month name"
 msgid "August"
 msgstr "sierpień"
 
-#: ../glib/gdatetime.c:244
+#: ../glib/gdatetime.c:242
 msgctxt "full month name"
 msgid "September"
 msgstr "wrzesień"
 
-#: ../glib/gdatetime.c:246
+#: ../glib/gdatetime.c:244
 msgctxt "full month name"
 msgid "October"
 msgstr "październik"
 
-#: ../glib/gdatetime.c:248
+#: ../glib/gdatetime.c:246
 msgctxt "full month name"
 msgid "November"
 msgstr "listopad"
 
-#: ../glib/gdatetime.c:250
+#: ../glib/gdatetime.c:248
 msgctxt "full month name"
 msgid "December"
 msgstr "grudzień"
 
-#: ../glib/gdatetime.c:265
+#: ../glib/gdatetime.c:263
 msgctxt "abbreviated month name"
 msgid "Jan"
 msgstr "sty"
 
-#: ../glib/gdatetime.c:267
+#: ../glib/gdatetime.c:265
 msgctxt "abbreviated month name"
 msgid "Feb"
 msgstr "lut"
 
-#: ../glib/gdatetime.c:269
+#: ../glib/gdatetime.c:267
 msgctxt "abbreviated month name"
 msgid "Mar"
 msgstr "mar"
 
-#: ../glib/gdatetime.c:271
+#: ../glib/gdatetime.c:269
 msgctxt "abbreviated month name"
 msgid "Apr"
 msgstr "kwi"
 
-#: ../glib/gdatetime.c:273
+#: ../glib/gdatetime.c:271
 msgctxt "abbreviated month name"
 msgid "May"
 msgstr "maj"
 
-#: ../glib/gdatetime.c:275
+#: ../glib/gdatetime.c:273
 msgctxt "abbreviated month name"
 msgid "Jun"
 msgstr "cze"
 
-#: ../glib/gdatetime.c:277
+#: ../glib/gdatetime.c:275
 msgctxt "abbreviated month name"
 msgid "Jul"
 msgstr "lip"
 
-#: ../glib/gdatetime.c:279
+#: ../glib/gdatetime.c:277
 msgctxt "abbreviated month name"
 msgid "Aug"
 msgstr "sie"
 
-#: ../glib/gdatetime.c:281
+#: ../glib/gdatetime.c:279
 msgctxt "abbreviated month name"
 msgid "Sep"
 msgstr "wrz"
 
-#: ../glib/gdatetime.c:283
+#: ../glib/gdatetime.c:281
 msgctxt "abbreviated month name"
 msgid "Oct"
 msgstr "paź"
 
-#: ../glib/gdatetime.c:285
+#: ../glib/gdatetime.c:283
 msgctxt "abbreviated month name"
 msgid "Nov"
 msgstr "lis"
 
-#: ../glib/gdatetime.c:287
+#: ../glib/gdatetime.c:285
 msgctxt "abbreviated month name"
 msgid "Dec"
 msgstr "gru"
 
-#: ../glib/gdatetime.c:302
+#: ../glib/gdatetime.c:300
 msgctxt "full weekday name"
 msgid "Monday"
 msgstr "poniedziałek"
 
-#: ../glib/gdatetime.c:304
+#: ../glib/gdatetime.c:302
 msgctxt "full weekday name"
 msgid "Tuesday"
 msgstr "wtorek"
 
-#: ../glib/gdatetime.c:306
+#: ../glib/gdatetime.c:304
 msgctxt "full weekday name"
 msgid "Wednesday"
 msgstr "środa"
 
-#: ../glib/gdatetime.c:308
+#: ../glib/gdatetime.c:306
 msgctxt "full weekday name"
 msgid "Thursday"
 msgstr "czwartek"
 
-#: ../glib/gdatetime.c:310
+#: ../glib/gdatetime.c:308
 msgctxt "full weekday name"
 msgid "Friday"
 msgstr "piątek"
 
-#: ../glib/gdatetime.c:312
+#: ../glib/gdatetime.c:310
 msgctxt "full weekday name"
 msgid "Saturday"
 msgstr "sobota"
 
-#: ../glib/gdatetime.c:314
+#: ../glib/gdatetime.c:312
 msgctxt "full weekday name"
 msgid "Sunday"
 msgstr "niedziela"
 
-#: ../glib/gdatetime.c:329
+#: ../glib/gdatetime.c:327
 msgctxt "abbreviated weekday name"
 msgid "Mon"
 msgstr "pon"
 
-#: ../glib/gdatetime.c:331
+#: ../glib/gdatetime.c:329
 msgctxt "abbreviated weekday name"
 msgid "Tue"
 msgstr "wto"
 
-#: ../glib/gdatetime.c:333
+#: ../glib/gdatetime.c:331
 msgctxt "abbreviated weekday name"
 msgid "Wed"
 msgstr "śro"
 
-#: ../glib/gdatetime.c:335
+#: ../glib/gdatetime.c:333
 msgctxt "abbreviated weekday name"
 msgid "Thu"
 msgstr "czw"
 
-#: ../glib/gdatetime.c:337
+#: ../glib/gdatetime.c:335
 msgctxt "abbreviated weekday name"
 msgid "Fri"
 msgstr "pią"
 
-#: ../glib/gdatetime.c:339
+#: ../glib/gdatetime.c:337
 msgctxt "abbreviated weekday name"
 msgid "Sat"
 msgstr "sob"
 
-#: ../glib/gdatetime.c:341
+#: ../glib/gdatetime.c:339
 msgctxt "abbreviated weekday name"
 msgid "Sun"
 msgstr "nie"
@@ -4302,7 +4316,7 @@ msgstr "nie"
 msgid "Error opening directory “%s”: %s"
 msgstr "Błąd podczas otwierania katalogu „%s”: %s"
 
-#: ../glib/gfileutils.c:701 ../glib/gfileutils.c:793
+#: ../glib/gfileutils.c:700 ../glib/gfileutils.c:792
 #, c-format
 msgid "Could not allocate %lu byte to read file “%s”"
 msgid_plural "Could not allocate %lu bytes to read file “%s”"
@@ -4310,81 +4324,81 @@ msgstr[0] "Nie można przydzielić %lu bajtu do odczytu pliku „%s”"
 msgstr[1] "Nie można przydzielić %lu bajtów do odczytu pliku „%s”"
 msgstr[2] "Nie można przydzielić %lu bajtów do odczytu pliku „%s”"
 
-#: ../glib/gfileutils.c:718
+#: ../glib/gfileutils.c:717
 #, c-format
 msgid "Error reading file “%s”: %s"
 msgstr "Błąd podczas odczytywania pliku „%s”: %s"
 
-#: ../glib/gfileutils.c:754
+#: ../glib/gfileutils.c:753
 #, c-format
 msgid "File “%s” is too large"
 msgstr "Plik „%s” jest za duży"
 
-#: ../glib/gfileutils.c:818
+#: ../glib/gfileutils.c:817
 #, c-format
 msgid "Failed to read from file “%s”: %s"
 msgstr "Odczytanie z pliku „%s” się nie powiodło: %s"
 
-#: ../glib/gfileutils.c:866 ../glib/gfileutils.c:938
+#: ../glib/gfileutils.c:865 ../glib/gfileutils.c:937
 #, c-format
 msgid "Failed to open file “%s”: %s"
 msgstr "Otwarcie pliku „%s” się nie powiodło: %s"
 
-#: ../glib/gfileutils.c:878
+#: ../glib/gfileutils.c:877
 #, c-format
 msgid "Failed to get attributes of file “%s”: fstat() failed: %s"
 msgstr ""
 "Uzyskanie atrybutów pliku „%s” się nie powiodło: funkcja fstat() zwróciła "
 "błąd: %s"
 
-#: ../glib/gfileutils.c:908
+#: ../glib/gfileutils.c:907
 #, c-format
 msgid "Failed to open file “%s”: fdopen() failed: %s"
 msgstr ""
 "Otwarcie pliku „%s” się nie powiodło: funkcja fdopen() zwróciła błąd: %s"
 
-#: ../glib/gfileutils.c:1007
+#: ../glib/gfileutils.c:1006
 #, c-format
 msgid "Failed to rename file “%s” to “%s”: g_rename() failed: %s"
 msgstr ""
 "Zmiana nazwy pliku „%s” na „%s” się nie powiodła: funkcja g_rename() "
 "zwróciła błąd: %s"
 
-#: ../glib/gfileutils.c:1042 ../glib/gfileutils.c:1541
+#: ../glib/gfileutils.c:1041 ../glib/gfileutils.c:1540
 #, c-format
 msgid "Failed to create file “%s”: %s"
 msgstr "Utworzenie pliku „%s” się nie powiodło: %s"
 
-#: ../glib/gfileutils.c:1069
+#: ../glib/gfileutils.c:1068
 #, c-format
 msgid "Failed to write file “%s”: write() failed: %s"
 msgstr ""
 "Zapisanie pliku „%s” się nie powiodło: funkcja write() zwróciła błąd: %s"
 
-#: ../glib/gfileutils.c:1112
+#: ../glib/gfileutils.c:1111
 #, c-format
 msgid "Failed to write file “%s”: fsync() failed: %s"
 msgstr ""
 "Zapisanie pliku „%s” się nie powiodło: funkcja fsync() zwróciła błąd: %s"
 
-#: ../glib/gfileutils.c:1236
+#: ../glib/gfileutils.c:1235
 #, c-format
 msgid "Existing file “%s” could not be removed: g_unlink() failed: %s"
 msgstr ""
 "Nie można usunąć istniejącego pliku „%s”: funkcja g_unlink() zwróciła błąd: "
 "%s"
 
-#: ../glib/gfileutils.c:1507
+#: ../glib/gfileutils.c:1506
 #, c-format
 msgid "Template “%s” invalid, should not contain a “%s”"
 msgstr "Szablon „%s” jest nieprawidłowy, nie powinien on zawierać „%s”"
 
-#: ../glib/gfileutils.c:1520
+#: ../glib/gfileutils.c:1519
 #, c-format
 msgid "Template “%s” doesn’t contain XXXXXX"
 msgstr "Szablon „%s” nie zawiera XXXXXX"
 
-#: ../glib/gfileutils.c:2045
+#: ../glib/gfileutils.c:2044
 #, c-format
 msgid "Failed to read the symbolic link “%s”: %s"
 msgstr "Odczytanie dowiązania symbolicznego „%s” się nie powiodło: %s"
@@ -4412,16 +4426,16 @@ msgstr "Na końcu kanału występuje sekwencja odpowiadająca części znaku"
 msgid "Can’t do a raw read in g_io_channel_read_to_end"
 msgstr "Nie można wykonać surowego odczytu w zmiennej g_io_channel_read_to_end"
 
-#: ../glib/gkeyfile.c:737
+#: ../glib/gkeyfile.c:736
 msgid "Valid key file could not be found in search dirs"
 msgstr ""
 "Nie można odnaleźć prawidłowego pliku klucza w przeszukiwanych katalogach"
 
-#: ../glib/gkeyfile.c:773
+#: ../glib/gkeyfile.c:772
 msgid "Not a regular file"
 msgstr "To nie jest zwykły plik"
 
-#: ../glib/gkeyfile.c:1204
+#: ../glib/gkeyfile.c:1203
 #, c-format
 msgid ""
 "Key file contains line “%s” which is not a key-value pair, group, or comment"
@@ -4429,45 +4443,45 @@ msgstr ""
 "Plik klucza zawiera wiersz „%s”, który nie jest parą klucz-wartość, grupą "
 "lub komentarzem"
 
-#: ../glib/gkeyfile.c:1261
+#: ../glib/gkeyfile.c:1260
 #, c-format
 msgid "Invalid group name: %s"
 msgstr "Nieprawidłowa nazwa grupy: %s"
 
-#: ../glib/gkeyfile.c:1283
+#: ../glib/gkeyfile.c:1282
 msgid "Key file does not start with a group"
 msgstr "Plik klucza nie rozpoczyna się od grupy"
 
-#: ../glib/gkeyfile.c:1309
+#: ../glib/gkeyfile.c:1308
 #, c-format
 msgid "Invalid key name: %s"
 msgstr "Nieprawidłowa nazwa klucza: %s"
 
-#: ../glib/gkeyfile.c:1336
+#: ../glib/gkeyfile.c:1335
 #, c-format
 msgid "Key file contains unsupported encoding “%s”"
 msgstr "Plik klucza zawiera nieobsługiwane kodowanie „%s”"
 
-#: ../glib/gkeyfile.c:1579 ../glib/gkeyfile.c:1752 ../glib/gkeyfile.c:3130
-#: ../glib/gkeyfile.c:3193 ../glib/gkeyfile.c:3323 ../glib/gkeyfile.c:3453
-#: ../glib/gkeyfile.c:3597 ../glib/gkeyfile.c:3826 ../glib/gkeyfile.c:3893
+#: ../glib/gkeyfile.c:1578 ../glib/gkeyfile.c:1751 ../glib/gkeyfile.c:3129
+#: ../glib/gkeyfile.c:3192 ../glib/gkeyfile.c:3322 ../glib/gkeyfile.c:3452
+#: ../glib/gkeyfile.c:3596 ../glib/gkeyfile.c:3825 ../glib/gkeyfile.c:3892
 #, c-format
 msgid "Key file does not have group “%s”"
 msgstr "Plik klucza nie zawiera grupy „%s”"
 
-#: ../glib/gkeyfile.c:1707
+#: ../glib/gkeyfile.c:1706
 #, c-format
 msgid "Key file does not have key “%s” in group “%s”"
 msgstr "Plik klucza nie zawiera klucza „%s” w grupie „%s”"
 
-#: ../glib/gkeyfile.c:1869 ../glib/gkeyfile.c:1985
+#: ../glib/gkeyfile.c:1868 ../glib/gkeyfile.c:1984
 #, c-format
 msgid "Key file contains key “%s” with value “%s” which is not UTF-8"
 msgstr ""
 "Plik klucza zawiera klucz „%s” o wartości „%s”, która nie jest zapisana "
 "w UTF-8"
 
-#: ../glib/gkeyfile.c:1889 ../glib/gkeyfile.c:2005 ../glib/gkeyfile.c:2374
+#: ../glib/gkeyfile.c:1888 ../glib/gkeyfile.c:2004 ../glib/gkeyfile.c:2373
 #, c-format
 msgid ""
 "Key file contains key “%s” which has a value that cannot be interpreted."
@@ -4475,7 +4489,7 @@ msgstr ""
 "Plik klucza zawiera klucz „%s”, który ma wartość niemożliwą do "
 "zinterpretowania."
 
-#: ../glib/gkeyfile.c:2591 ../glib/gkeyfile.c:2959
+#: ../glib/gkeyfile.c:2590 ../glib/gkeyfile.c:2958
 #, c-format
 msgid ""
 "Key file contains key “%s” in group “%s” which has a value that cannot be "
@@ -4484,36 +4498,36 @@ msgstr ""
 "Plik klucza zawiera klucz „%s” w grupie „%s”, która ma wartość niemożliwą do "
 "zinterpretowania."
 
-#: ../glib/gkeyfile.c:2669 ../glib/gkeyfile.c:2746
+#: ../glib/gkeyfile.c:2668 ../glib/gkeyfile.c:2745
 #, c-format
 msgid "Key “%s” in group “%s” has value “%s” where %s was expected"
 msgstr "Klucz „%s” w grupie „%s” ma wartość „%s”, podczas gdy oczekiwano %s"
 
-#: ../glib/gkeyfile.c:4133
+#: ../glib/gkeyfile.c:4132
 msgid "Key file contains escape character at end of line"
 msgstr "Plik klucza zawiera znak sterujący na końcu linii"
 
-#: ../glib/gkeyfile.c:4155
+#: ../glib/gkeyfile.c:4154
 #, c-format
 msgid "Key file contains invalid escape sequence “%s”"
 msgstr "Plik klucza zawiera nieprawidłową sekwencję sterującą „%s”"
 
-#: ../glib/gkeyfile.c:4297
+#: ../glib/gkeyfile.c:4296
 #, c-format
 msgid "Value “%s” cannot be interpreted as a number."
 msgstr "Nie można zinterpretować „%s” jako liczby."
 
-#: ../glib/gkeyfile.c:4311
+#: ../glib/gkeyfile.c:4310
 #, c-format
 msgid "Integer value “%s” out of range"
 msgstr "Wartość całkowita „%s” jest spoza dopuszczalnego zakresu"
 
-#: ../glib/gkeyfile.c:4344
+#: ../glib/gkeyfile.c:4343
 #, c-format
 msgid "Value “%s” cannot be interpreted as a float number."
 msgstr "Nie można zinterpretować „%s” jako liczby zmiennoprzecinkowej."
 
-#: ../glib/gkeyfile.c:4383
+#: ../glib/gkeyfile.c:4382
 #, c-format
 msgid "Value “%s” cannot be interpreted as a boolean."
 msgstr "Nie można zinterpretować „%s” jako wartości logicznej."
@@ -4536,175 +4550,175 @@ msgstr ""
 msgid "Failed to open file “%s”: open() failed: %s"
 msgstr "Otwarcie pliku „%s” się nie powiodło: funkcja open() zwróciła błąd: %s"
 
-#: ../glib/gmarkup.c:398 ../glib/gmarkup.c:440
+#: ../glib/gmarkup.c:397 ../glib/gmarkup.c:439
 #, c-format
 msgid "Error on line %d char %d: "
 msgstr "Błąd w %d. wierszu przy %d. znaku: "
 
-#: ../glib/gmarkup.c:462 ../glib/gmarkup.c:545
+#: ../glib/gmarkup.c:461 ../glib/gmarkup.c:544
 #, c-format
-msgid "Invalid UTF-8 encoded text in name — not valid “%s”"
+msgid "Invalid UTF-8 encoded text in name - not valid '%s'"
 msgstr ""
 "Nazwa zawiera nieprawidłowy tekst zakodowany za pomocą UTF-8 — nieprawidłowe "
 "„%s”"
 
-#: ../glib/gmarkup.c:473
+#: ../glib/gmarkup.c:472
 #, c-format
-msgid "“%s” is not a valid name"
+msgid "'%s' is not a valid name"
 msgstr "„%s” nie jest prawidłową nazwą"
 
-#: ../glib/gmarkup.c:489
+#: ../glib/gmarkup.c:488
 #, c-format
-msgid "“%s” is not a valid name: “%c”"
+msgid "'%s' is not a valid name: '%c'"
 msgstr "„%s” nie jest prawidłową nazwą: „%c”"
 
-#: ../glib/gmarkup.c:599
+#: ../glib/gmarkup.c:598
 #, c-format
 msgid "Error on line %d: %s"
 msgstr "Błąd w %d. wierszu: %s"
 
-#: ../glib/gmarkup.c:676
+#: ../glib/gmarkup.c:675
 #, c-format
 msgid ""
-"Failed to parse “%-.*s”, which should have been a digit inside a character "
-"reference (&#234; for example) — perhaps the digit is too large"
+"Failed to parse '%-.*s', which should have been a digit inside a character "
+"reference (&#234; for example) - perhaps the digit is too large"
 msgstr ""
 "Nie można przetworzyć znaku „%-.*s”, w którego miejscu powinna wystąpić "
 "liczba, będąca częścią odniesienia do znaku (np. &#234;) — być może liczba "
 "jest za duża"
 
-#: ../glib/gmarkup.c:688
+#: ../glib/gmarkup.c:687
 msgid ""
 "Character reference did not end with a semicolon; most likely you used an "
-"ampersand character without intending to start an entity — escape ampersand "
+"ampersand character without intending to start an entity - escape ampersand "
 "as &amp;"
 msgstr ""
 "Odniesienie do znaku nie jest zakończone średnikiem; najprawdopodobniej "
 "został użyty znak &, który nie miał oznaczać jednostki — należy go zapisać "
 "jako &amp;"
 
-#: ../glib/gmarkup.c:714
+#: ../glib/gmarkup.c:713
 #, c-format
-msgid "Character reference “%-.*s” does not encode a permitted character"
+msgid "Character reference '%-.*s' does not encode a permitted character"
 msgstr "Odniesienie do znaku „%-.*s” nie jest zapisem dozwolonego znaku"
 
-#: ../glib/gmarkup.c:752
+#: ../glib/gmarkup.c:751
 msgid ""
-"Empty entity “&;” seen; valid entities are: &amp; &quot; &lt; &gt; &apos;"
+"Empty entity '&;' seen; valid entities are: &amp; &quot; &lt; &gt; &apos;"
 msgstr ""
 "Napotkano pustą jednostkę „&;”; poprawnymi jednostkami są: &amp; &quot; &lt; "
 "&gt; &apos;"
 
-#: ../glib/gmarkup.c:760
+#: ../glib/gmarkup.c:759
 #, c-format
-msgid "Entity name “%-.*s” is not known"
+msgid "Entity name '%-.*s' is not known"
 msgstr "Nazwa jednostki „%-.*s” nie jest znana"
 
-#: ../glib/gmarkup.c:765
+#: ../glib/gmarkup.c:764
 msgid ""
 "Entity did not end with a semicolon; most likely you used an ampersand "
-"character without intending to start an entity — escape ampersand as &amp;"
+"character without intending to start an entity - escape ampersand as &amp;"
 msgstr ""
 "Jednostka nie jest zakończona średnikiem; najprawdopodobniej został użyty "
 "znak &, który nie miał oznaczać jednostki — należy go zapisać jako &amp;"
 
-#: ../glib/gmarkup.c:1171
+#: ../glib/gmarkup.c:1170
 msgid "Document must begin with an element (e.g. <book>)"
 msgstr "Dokument musi rozpoczynać się jakimś elementem (np. <book>)"
 
-#: ../glib/gmarkup.c:1211
+#: ../glib/gmarkup.c:1210
 #, c-format
 msgid ""
-"“%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"
 msgstr ""
 "Znak „%s” nie powinien występować po znaku „<”; nie może on rozpoczynać "
 "nazwy elementu"
 
-#: ../glib/gmarkup.c:1253
+#: ../glib/gmarkup.c:1252
 #, c-format
 msgid ""
-"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'"
 msgstr ""
 "Nieoczekiwany znak „%s”, oczekiwano znaku „>”, by zakończyć znacznik „%s” "
 "pustego elementu"
 
-#: ../glib/gmarkup.c:1334
+#: ../glib/gmarkup.c:1333
 #, c-format
 msgid ""
-"Odd character “%s”, expected a “=” after attribute name “%s” of element “%s”"
+"Odd character '%s', expected a '=' after attribute name '%s' of element '%s'"
 msgstr ""
 "Nieoczekiwany znak „%s”; po nazwie atrybutu „%s” elementu „%s” oczekiwano "
 "znaku „=”"
 
-#: ../glib/gmarkup.c:1375
+#: ../glib/gmarkup.c:1374
 #, c-format
 msgid ""
-"Odd character “%s”, expected a “>” or “/” character to end the start tag of "
-"element “%s”, or optionally an attribute; perhaps you used an invalid "
+"Odd character '%s', expected a '>' or '/' character to end the start tag of "
+"element '%s', or optionally an attribute; perhaps you used an invalid "
 "character in an attribute name"
 msgstr ""
 "Nieoczekiwany znak „%s”; oczekiwano znaku „>” lub „/”, kończącego znacznik "
 "początkowy elementu „%s” lub opcjonalnie atrybutu; być może w nazwie "
 "atrybutu został użyty nieprawidłowy znak"
 
-#: ../glib/gmarkup.c:1419
+#: ../glib/gmarkup.c:1418
 #, c-format
 msgid ""
-"Odd character “%s”, expected an open quote mark after the equals sign when "
-"giving value for attribute “%s” of element “%s”"
+"Odd character '%s', expected an open quote mark after the equals sign when "
+"giving value for attribute '%s' of element '%s'"
 msgstr ""
 "Nieoczekiwany znak „%s”; oczekiwano otwierającego znaku cudzysłowu po znaku "
 "równości podczas podawania wartości atrybutu „%s” elementu „%s”"
 
-#: ../glib/gmarkup.c:1552
+#: ../glib/gmarkup.c:1551
 #, c-format
 msgid ""
-"“%s” is not a valid character following the characters “</”; “%s” may not "
+"'%s' is not a valid character following the characters '</'; '%s' may not "
 "begin an element name"
 msgstr ""
 "Znak „%s” nie jest znakiem, który może pojawić się po sekwencji „</”; „%s” "
 "nie może rozpoczynać nazwy elementu"
 
-#: ../glib/gmarkup.c:1588
+#: ../glib/gmarkup.c:1587
 #, c-format
 msgid ""
-"“%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 '>'"
 msgstr ""
 "Znak „%s” nie jest znakiem, który może wystąpić po domykającej nazwie "
 "elementu „%s”; dopuszczalnym znakiem jest „>”"
 
-#: ../glib/gmarkup.c:1599
+#: ../glib/gmarkup.c:1598
 #, c-format
-msgid "Element “%s” was closed, no element is currently open"
-msgstr "Element „%s” został zamknięty, lecz brak aktualnie otwartego elementu"
+msgid "Element '%s' was closed, no element is currently open"
+msgstr "Element „%s” został zamknięty, ale brak obecnie otwartego elementu"
 
-#: ../glib/gmarkup.c:1608
+#: ../glib/gmarkup.c:1607
 #, c-format
-msgid "Element “%s” was closed, but the currently open element is “%s”"
+msgid "Element '%s' was closed, but the currently open element is '%s'"
 msgstr ""
-"Element „%s” został zamknięty, lecz aktualnie otwartym elementem jest „%s”"
+"Element „%s” został zamknięty, ale obecnie otwartym elementem jest „%s”"
 
-#: ../glib/gmarkup.c:1761
+#: ../glib/gmarkup.c:1760
 msgid "Document was empty or contained only whitespace"
 msgstr "Dokument jest pusty lub zawiera tylko spacje"
 
-#: ../glib/gmarkup.c:1775
-msgid "Document ended unexpectedly just after an open angle bracket “<”"
+#: ../glib/gmarkup.c:1774
+msgid "Document ended unexpectedly just after an open angle bracket '<'"
 msgstr "Zaraz po znaku „<” nastąpił nieoczekiwany koniec dokumentu"
 
-#: ../glib/gmarkup.c:1783 ../glib/gmarkup.c:1828
+#: ../glib/gmarkup.c:1782 ../glib/gmarkup.c:1827
 #, c-format
 msgid ""
-"Document ended unexpectedly with elements still open — “%s” was the last "
+"Document ended unexpectedly with elements still open - '%s' was the last "
 "element opened"
 msgstr ""
 "Nastąpił nieoczekiwany koniec dokumentu, gdy pewne elementy są wciąż otwarte "
 "— „%s” był ostatnim otwartym elementem"
 
-#: ../glib/gmarkup.c:1791
+#: ../glib/gmarkup.c:1790
 #, c-format
 msgid ""
 "Document ended unexpectedly, expected to see a close angle bracket ending "
@@ -4713,21 +4727,21 @@ msgstr ""
 "Nastąpił nieoczekiwany koniec dokumentu; oczekiwano znaku „>”, kończącego "
 "znacznik <%s/>"
 
-#: ../glib/gmarkup.c:1797
+#: ../glib/gmarkup.c:1796
 msgid "Document ended unexpectedly inside an element name"
 msgstr "Nastąpił nieoczekiwany koniec dokumentu wewnątrz nazwy elementu"
 
-#: ../glib/gmarkup.c:1803
+#: ../glib/gmarkup.c:1802
 msgid "Document ended unexpectedly inside an attribute name"
 msgstr "Nastąpił nieoczekiwany koniec dokumentu wewnątrz nazwy atrybutu"
 
-#: ../glib/gmarkup.c:1808
+#: ../glib/gmarkup.c:1807
 msgid "Document ended unexpectedly inside an element-opening tag."
 msgstr ""
 "Nastąpił nieoczekiwany koniec dokumentu wewnątrz znacznika otwierającego "
 "element."
 
-#: ../glib/gmarkup.c:1814
+#: ../glib/gmarkup.c:1813
 msgid ""
 "Document ended unexpectedly after the equals sign following an attribute "
 "name; no attribute value"
@@ -4735,18 +4749,18 @@ msgstr ""
 "Nastąpił nieoczekiwany koniec dokumentu po znaku równości występującym po "
 "nazwie atrybutu; brak wartości atrybutu"
 
-#: ../glib/gmarkup.c:1821
+#: ../glib/gmarkup.c:1820
 msgid "Document ended unexpectedly while inside an attribute value"
 msgstr "Nastąpił nieoczekiwany koniec dokumentu wewnątrz wartości atrybutu"
 
-#: ../glib/gmarkup.c:1837
+#: ../glib/gmarkup.c:1836
 #, c-format
-msgid "Document ended unexpectedly inside the close tag for element “%s”"
+msgid "Document ended unexpectedly inside the close tag for element '%s'"
 msgstr ""
 "Nastąpił nieoczekiwany koniec dokumentu wewnątrz znacznika domykającego "
 "elementu „%s”"
 
-#: ../glib/gmarkup.c:1843
+#: ../glib/gmarkup.c:1842
 msgid "Document ended unexpectedly inside a comment or processing instruction"
 msgstr ""
 "Nastąpił nieoczekiwany koniec dokumentu wewnątrz komentarza lub instrukcji "
@@ -4812,239 +4826,239 @@ msgstr "Brak parametru dla %s"
 msgid "Unknown option %s"
 msgstr "Nieznana opcja %s"
 
-#: ../glib/gregex.c:258
+#: ../glib/gregex.c:257
 msgid "corrupted object"
 msgstr "uszkodzony obiekt"
 
-#: ../glib/gregex.c:260
+#: ../glib/gregex.c:259
 msgid "internal error or corrupted object"
 msgstr "błąd wewnętrzny lub uszkodzony obiekt"
 
-#: ../glib/gregex.c:262
+#: ../glib/gregex.c:261
 msgid "out of memory"
 msgstr "brak pamięci"
 
-#: ../glib/gregex.c:267
+#: ../glib/gregex.c:266
 msgid "backtracking limit reached"
 msgstr "osiągnięto limit wyjątku"
 
-#: ../glib/gregex.c:279 ../glib/gregex.c:287
+#: ../glib/gregex.c:278 ../glib/gregex.c:286
 msgid "the pattern contains items not supported for partial matching"
 msgstr "wzorzec zawiera elementy nieobsługiwane w dopasowywaniu częściowym"
 
-#: ../glib/gregex.c:281
+#: ../glib/gregex.c:280
 msgid "internal error"
 msgstr "błąd wewnętrzny"
 
-#: ../glib/gregex.c:289
+#: ../glib/gregex.c:288
 msgid "back references as conditions are not supported for partial matching"
 msgstr ""
 "referencje wstecz jako warunki nie są obsługiwane w dopasowywaniu częściowym"
 
-#: ../glib/gregex.c:298
+#: ../glib/gregex.c:297
 msgid "recursion limit reached"
 msgstr "osiągnięto limit rekurencji"
 
-#: ../glib/gregex.c:300
+#: ../glib/gregex.c:299
 msgid "invalid combination of newline flags"
 msgstr "nieprawidłowa kombinacja flag nowych linii"
 
-#: ../glib/gregex.c:302
+#: ../glib/gregex.c:301
 msgid "bad offset"
 msgstr "błędne wyrównanie"
 
-#: ../glib/gregex.c:304
+#: ../glib/gregex.c:303
 msgid "short utf8"
 msgstr "krótki UTF-8"
 
-#: ../glib/gregex.c:306
+#: ../glib/gregex.c:305
 msgid "recursion loop"
 msgstr "pętla rekurencji"
 
-#: ../glib/gregex.c:310
+#: ../glib/gregex.c:309
 msgid "unknown error"
 msgstr "nieznany błąd"
 
-#: ../glib/gregex.c:330
+#: ../glib/gregex.c:329
 msgid "\\ at end of pattern"
 msgstr "\\ na końcu wzoru"
 
-#: ../glib/gregex.c:333
+#: ../glib/gregex.c:332
 msgid "\\c at end of pattern"
 msgstr "\\c na końcu wzoru"
 
-#: ../glib/gregex.c:336
+#: ../glib/gregex.c:335
 msgid "unrecognized character following \\"
 msgstr "nierozpoznany znak po \\"
 
-#: ../glib/gregex.c:339
+#: ../glib/gregex.c:338
 msgid "numbers out of order in {} quantifier"
 msgstr "liczby w operatorze {} nie są w kolejności"
 
-#: ../glib/gregex.c:342
+#: ../glib/gregex.c:341
 msgid "number too big in {} quantifier"
 msgstr "liczba za duża w kwantyfikatorze {}"
 
-#: ../glib/gregex.c:345
+#: ../glib/gregex.c:344
 msgid "missing terminating ] for character class"
 msgstr "brak kończącego znaku „]” dla klasy znaku"
 
-#: ../glib/gregex.c:348
+#: ../glib/gregex.c:347
 msgid "invalid escape sequence in character class"
 msgstr "nieprawidłowa sekwencja sterująca w klasie znaku"
 
-#: ../glib/gregex.c:351
+#: ../glib/gregex.c:350
 msgid "range out of order in character class"
 msgstr "zakres klasy znaków nie jest w kolejności"
 
-#: ../glib/gregex.c:354
+#: ../glib/gregex.c:353
 msgid "nothing to repeat"
 msgstr "nic do powtórzenia"
 
-#: ../glib/gregex.c:358
+#: ../glib/gregex.c:357
 msgid "unexpected repeat"
 msgstr "nieoczekiwane powtórzenie"
 
-#: ../glib/gregex.c:361
+#: ../glib/gregex.c:360
 msgid "unrecognized character after (? or (?-"
 msgstr "nierozpoznany znak po (? lub (?-"
 
-#: ../glib/gregex.c:364
+#: ../glib/gregex.c:363
 msgid "POSIX named classes are supported only within a class"
 msgstr "Klasy nazwane z użyciem POSIX są obsługiwane tylko wewnątrz klasy"
 
-#: ../glib/gregex.c:367
+#: ../glib/gregex.c:366
 msgid "missing terminating )"
 msgstr "brak znaku kończącego )"
 
-#: ../glib/gregex.c:370
+#: ../glib/gregex.c:369
 msgid "reference to non-existent subpattern"
 msgstr "nawiązanie do nieistniejącego podwzoru"
 
-#: ../glib/gregex.c:373
+#: ../glib/gregex.c:372
 msgid "missing ) after comment"
 msgstr "brakujący znak „)” po komentarzu"
 
-#: ../glib/gregex.c:376
+#: ../glib/gregex.c:375
 msgid "regular expression is too large"
 msgstr "wyrażenie regularne jest za duże"
 
-#: ../glib/gregex.c:379
+#: ../glib/gregex.c:378
 msgid "failed to get memory"
 msgstr "uzyskanie pamięci się nie powiodło"
 
-#: ../glib/gregex.c:383
+#: ../glib/gregex.c:382
 msgid ") without opening ("
 msgstr "znak ) bez znaku otwierającego ("
 
-#: ../glib/gregex.c:387
+#: ../glib/gregex.c:386
 msgid "code overflow"
 msgstr "przepełnienie kodu"
 
-#: ../glib/gregex.c:391
+#: ../glib/gregex.c:390
 msgid "unrecognized character after (?<"
 msgstr "nierozpoznany znak po (?<"
 
-#: ../glib/gregex.c:394
+#: ../glib/gregex.c:393
 msgid "lookbehind assertion is not fixed length"
 msgstr "asercja „lookbehind” nie ma stałej długości"
 
-#: ../glib/gregex.c:397
+#: ../glib/gregex.c:396
 msgid "malformed number or name after (?("
 msgstr "błędna liczba lub nazwa za (?("
 
-#: ../glib/gregex.c:400
+#: ../glib/gregex.c:399
 msgid "conditional group contains more than two branches"
 msgstr "zależna grupa zawiera więcej niż dwie gałęzie"
 
-#: ../glib/gregex.c:403
+#: ../glib/gregex.c:402
 msgid "assertion expected after (?("
 msgstr "za (?( oczekiwano asercji"
 
 #. translators: '(?R' and '(?[+-]digits' are both meant as (groups of)
 #. * sequences here, '(?-54' would be an example for the second group.
 #.
-#: ../glib/gregex.c:410
+#: ../glib/gregex.c:409
 msgid "(?R or (?[+-]digits must be followed by )"
 msgstr "po (?R lub (?[+-]cyfry musi następować znak )"
 
-#: ../glib/gregex.c:413
+#: ../glib/gregex.c:412
 msgid "unknown POSIX class name"
 msgstr "nieznana nazwa klasy POSIX"
 
-#: ../glib/gregex.c:416
+#: ../glib/gregex.c:415
 msgid "POSIX collating elements are not supported"
 msgstr "elementy porównujące POSIX nie są obsługiwane"
 
-#: ../glib/gregex.c:419
+#: ../glib/gregex.c:418
 msgid "character value in \\x{...} sequence is too large"
 msgstr "wartość znaku w sekwencji \\x{...} jest za duża"
 
-#: ../glib/gregex.c:422
+#: ../glib/gregex.c:421
 msgid "invalid condition (?(0)"
 msgstr "nieprawidłowy warunek (?(0)"
 
-#: ../glib/gregex.c:425
+#: ../glib/gregex.c:424
 msgid "\\C not allowed in lookbehind assertion"
 msgstr "znak \\C nie jest dozwolony w asercji „lookbehind”"
 
-#: ../glib/gregex.c:432
+#: ../glib/gregex.c:431
 msgid "escapes \\L, \\l, \\N{name}, \\U, and \\u are not supported"
 msgstr "znaki sterujące \\L, \\l, \\N{nazwa}, \\U i \\u nie są obsługiwane"
 
-#: ../glib/gregex.c:435
+#: ../glib/gregex.c:434
 msgid "recursive call could loop indefinitely"
 msgstr "wywołanie rekurencyjne mogło prowadzić do pętli nieskończonej"
 
-#: ../glib/gregex.c:439
+#: ../glib/gregex.c:438
 msgid "unrecognized character after (?P"
 msgstr "nierozpoznany znak po (?P"
 
-#: ../glib/gregex.c:442
+#: ../glib/gregex.c:441
 msgid "missing terminator in subpattern name"
 msgstr "brak terminatora w nazwie podwzoru"
 
-#: ../glib/gregex.c:445
+#: ../glib/gregex.c:444
 msgid "two named subpatterns have the same name"
 msgstr "dwa podwzory mają tę samą nazwę"
 
-#: ../glib/gregex.c:448
+#: ../glib/gregex.c:447
 msgid "malformed \\P or \\p sequence"
 msgstr "błędna sekwencja \\P lub \\p"
 
-#: ../glib/gregex.c:451
+#: ../glib/gregex.c:450
 msgid "unknown property name after \\P or \\p"
 msgstr "nieznana nazwa właściwości za \\P lub \\p"
 
-#: ../glib/gregex.c:454
+#: ../glib/gregex.c:453
 msgid "subpattern name is too long (maximum 32 characters)"
 msgstr "nazwa podwzoru jest za długa (maksymalnie 32 znaki)"
 
-#: ../glib/gregex.c:457
+#: ../glib/gregex.c:456
 msgid "too many named subpatterns (maximum 10,000)"
 msgstr "za dużo nazwanych podwzorów (maksymalnie 10000)"
 
-#: ../glib/gregex.c:460
+#: ../glib/gregex.c:459
 msgid "octal value is greater than \\377"
 msgstr "wartość ósemkowa jest większa niż \\377"
 
-#: ../glib/gregex.c:464
+#: ../glib/gregex.c:463
 msgid "overran compiling workspace"
 msgstr "przekroczono przestrzeń roboczą kompilacji"
 
-#: ../glib/gregex.c:468
+#: ../glib/gregex.c:467
 msgid "previously-checked referenced subpattern not found"
 msgstr "nie znaleziono wcześniej sprawdzonego podwzoru"
 
-#: ../glib/gregex.c:471
+#: ../glib/gregex.c:470
 msgid "DEFINE group contains more than one branch"
 msgstr "grupa DEFINE zawiera więcej niż jedną gałąź"
 
-#: ../glib/gregex.c:474
+#: ../glib/gregex.c:473
 msgid "inconsistent NEWLINE options"
 msgstr "niespójne opcje NEWLINE"
 
-#: ../glib/gregex.c:477
+#: ../glib/gregex.c:476
 msgid ""
 "\\g is not followed by a braced, angle-bracketed, or quoted name or number, "
 "or by a plain number"
@@ -5052,91 +5066,91 @@ msgstr ""
 "po \\g nie następuje nazwa lub liczba w nawiasach, nawiasach ostrych, "
 "cytowana, ani zwykła liczba"
 
-#: ../glib/gregex.c:481
+#: ../glib/gregex.c:480
 msgid "a numbered reference must not be zero"
 msgstr "liczbowe odniesienie nie może wynosić zero"
 
-#: ../glib/gregex.c:484
+#: ../glib/gregex.c:483
 msgid "an argument is not allowed for (*ACCEPT), (*FAIL), or (*COMMIT)"
 msgstr "parametr nie jest dozwolony dla (*ACCEPT), (*FAIL) lub (*COMMIT)"
 
-#: ../glib/gregex.c:487
+#: ../glib/gregex.c:486
 msgid "(*VERB) not recognized"
 msgstr "nie rozpoznano (*VERB)"
 
-#: ../glib/gregex.c:490
+#: ../glib/gregex.c:489
 msgid "number is too big"
 msgstr "liczba jest za duża"
 
-#: ../glib/gregex.c:493
+#: ../glib/gregex.c:492
 msgid "missing subpattern name after (?&"
 msgstr "brak nazwy podwzoru po (?&"
 
-#: ../glib/gregex.c:496
+#: ../glib/gregex.c:495
 msgid "digit expected after (?+"
 msgstr "oczekiwano cyfry po (?+"
 
-#: ../glib/gregex.c:499
+#: ../glib/gregex.c:498
 msgid "] is an invalid data character in JavaScript compatibility mode"
 msgstr ""
 "] jest nieprawidłowym znakiem danych w trybie zgodności z językiem JavaScript"
 
-#: ../glib/gregex.c:502
+#: ../glib/gregex.c:501
 msgid "different names for subpatterns of the same number are not allowed"
 msgstr "różne nazwy dla podwzorów tej samej liczby nie są dozwolone"
 
-#: ../glib/gregex.c:505
+#: ../glib/gregex.c:504
 msgid "(*MARK) must have an argument"
 msgstr "(*MARK) musi mieć parametr"
 
-#: ../glib/gregex.c:508
+#: ../glib/gregex.c:507
 msgid "\\c must be followed by an ASCII character"
 msgstr "po \\c musi być znak ASCII"
 
-#: ../glib/gregex.c:511
+#: ../glib/gregex.c:510
 msgid "\\k is not followed by a braced, angle-bracketed, or quoted name"
 msgstr ""
 "po \\k nie następuje nazwa w nawiasach, nawiasach ostrych, ani cytowana"
 
-#: ../glib/gregex.c:514
+#: ../glib/gregex.c:513
 msgid "\\N is not supported in a class"
 msgstr "\\N nie jest obsługiwane w klasie"
 
-#: ../glib/gregex.c:517
+#: ../glib/gregex.c:516
 msgid "too many forward references"
 msgstr "za dużo odniesień naprzód"
 
-#: ../glib/gregex.c:520
+#: ../glib/gregex.c:519
 msgid "name is too long in (*MARK), (*PRUNE), (*SKIP), or (*THEN)"
 msgstr "nazwa jest za długa w (*MARK), (*PRUNE), (*SKIP) lub (*THEN)"
 
-#: ../glib/gregex.c:523
+#: ../glib/gregex.c:522
 msgid "character value in \\u.... sequence is too large"
 msgstr "wartość znaku w sekwencji \\u.... jest za duża"
 
-#: ../glib/gregex.c:746 ../glib/gregex.c:1977
+#: ../glib/gregex.c:745 ../glib/gregex.c:1977
 #, c-format
 msgid "Error while matching regular expression %s: %s"
 msgstr "Błąd podczas dopasowywania wyrażenia regularnego %s: %s"
 
-#: ../glib/gregex.c:1317
+#: ../glib/gregex.c:1316
 msgid "PCRE library is compiled without UTF8 support"
 msgstr "Biblioteka PCRE została skompilowana bez obsługi UTF-8"
 
-#: ../glib/gregex.c:1321
+#: ../glib/gregex.c:1320
 msgid "PCRE library is compiled without UTF8 properties support"
 msgstr "Biblioteka PCRE została skompilowana bez obsługi własności UTF-8"
 
-#: ../glib/gregex.c:1329
+#: ../glib/gregex.c:1328
 msgid "PCRE library is compiled with incompatible options"
 msgstr "Biblioteka PCRE została skompilowana za pomocą niezgodnych opcji"
 
-#: ../glib/gregex.c:1358
+#: ../glib/gregex.c:1357
 #, c-format
 msgid "Error while optimizing regular expression %s: %s"
 msgstr "Błąd podczas optymalizowania wyrażenia regularnego %s: %s"
 
-#: ../glib/gregex.c:1438
+#: ../glib/gregex.c:1437
 #, c-format
 msgid "Error while compiling regular expression %s at char %d: %s"
 msgstr "Błąd kompilacji wyrażenia regularnego %s przy znaku %d: %s"
@@ -5182,158 +5196,158 @@ msgstr "nieznana sekwencja sterująca"
 msgid "Error while parsing replacement text “%s” at char %lu: %s"
 msgstr "Błąd podczas przetwarzania tekstu zastępczego „%s” przy znaku %lu: %s"
 
-#: ../glib/gshell.c:96
+#: ../glib/gshell.c:94
 msgid "Quoted text doesn’t begin with a quotation mark"
 msgstr "Cytowany znak nie rozpoczyna się znakiem cytowania"
 
-#: ../glib/gshell.c:186
+#: ../glib/gshell.c:184
 msgid "Unmatched quotation mark in command line or other shell-quoted text"
 msgstr ""
 "W wierszu poleceń lub innym napisie cytowanym jak w powłoce wystąpił "
 "niesparowany znak cytowania"
 
-#: ../glib/gshell.c:582
+#: ../glib/gshell.c:580
 #, c-format
 msgid "Text ended just after a “\\” character. (The text was “%s”)"
 msgstr ""
 "Tekst zakończył się bezpośrednio po znaku „\\” (wartością tekstu było „%s”)."
 
-#: ../glib/gshell.c:589
+#: ../glib/gshell.c:587
 #, c-format
 msgid "Text ended before matching quote was found for %c. (The text was “%s”)"
 msgstr ""
 "Tekst zakończył się przed odnalezieniem domykającego znaku cytowania dla %c "
 "(tekstem jest „%s”)"
 
-#: ../glib/gshell.c:601
+#: ../glib/gshell.c:599
 msgid "Text was empty (or contained only whitespace)"
 msgstr "Tekst jest pusty (lub zawiera tylko spacje)"
 
-#: ../glib/gspawn.c:209
+#: ../glib/gspawn.c:207
 #, c-format
 msgid "Failed to read data from child process (%s)"
 msgstr "Odczytanie danych z procesu potomnego (%s) się nie powiodło"
 
-#: ../glib/gspawn.c:353
+#: ../glib/gspawn.c:351
 #, c-format
 msgid "Unexpected error in select() reading data from a child process (%s)"
 msgstr ""
 "Nieoczekiwany błąd w funkcji select() podczas odczytywania danych z procesu "
 "potomnego (%s)"
 
-#: ../glib/gspawn.c:438
+#: ../glib/gspawn.c:436
 #, c-format
 msgid "Unexpected error in waitpid() (%s)"
 msgstr "Nieoczekiwany błąd w waitpid() (%s)"
 
-#: ../glib/gspawn.c:844 ../glib/gspawn-win32.c:1233
+#: ../glib/gspawn.c:842 ../glib/gspawn-win32.c:1231
 #, c-format
 msgid "Child process exited with code %ld"
 msgstr "Proces potomny został zakończony z kodem %ld"
 
-#: ../glib/gspawn.c:852
+#: ../glib/gspawn.c:850
 #, c-format
 msgid "Child process killed by signal %ld"
 msgstr "Proces potomny został zakończony sygnałem %ld"
 
-#: ../glib/gspawn.c:859
+#: ../glib/gspawn.c:857
 #, c-format
 msgid "Child process stopped by signal %ld"
 msgstr "Proces potomny został zatrzymany sygnałem %ld"
 
-#: ../glib/gspawn.c:866
+#: ../glib/gspawn.c:864
 #, c-format
 msgid "Child process exited abnormally"
 msgstr "Proces potomny został nieprawidłowo zakończony"
 
-#: ../glib/gspawn.c:1271 ../glib/gspawn-win32.c:339 ../glib/gspawn-win32.c:347
+#: ../glib/gspawn.c:1269 ../glib/gspawn-win32.c:337 ../glib/gspawn-win32.c:345
 #, c-format
 msgid "Failed to read from child pipe (%s)"
 msgstr ""
 "Odczytanie danych z potoku łączącego z procesem potomnym (%s) się nie "
 "powiodło"
 
-#: ../glib/gspawn.c:1341
+#: ../glib/gspawn.c:1339
 #, c-format
 msgid "Failed to fork (%s)"
 msgstr "Rozdzielenie procesu (%s) się nie powiodło"
 
-#: ../glib/gspawn.c:1490 ../glib/gspawn-win32.c:370
+#: ../glib/gspawn.c:1488 ../glib/gspawn-win32.c:368
 #, c-format
 msgid "Failed to change to directory “%s” (%s)"
 msgstr "Zmiana katalogu na „%s” (%s) się nie powiodła"
 
-#: ../glib/gspawn.c:1500
+#: ../glib/gspawn.c:1498
 #, c-format
 msgid "Failed to execute child process “%s” (%s)"
 msgstr "Wykonanie procesu potomnego „%s” (%s) się nie powiodło"
 
-#: ../glib/gspawn.c:1510
+#: ../glib/gspawn.c:1508
 #, c-format
 msgid "Failed to redirect output or input of child process (%s)"
 msgstr ""
 "Przekierowanie wejścia lub wyjścia procesu potomnego (%s) się nie powiodło"
 
-#: ../glib/gspawn.c:1519
+#: ../glib/gspawn.c:1517
 #, c-format
 msgid "Failed to fork child process (%s)"
 msgstr "Rozdzielenie procesu potomnego (%s) się nie powiodło"
 
-#: ../glib/gspawn.c:1527
+#: ../glib/gspawn.c:1525
 #, c-format
 msgid "Unknown error executing child process “%s”"
 msgstr "Podczas wykonywania procesu potomnego „%s” wystąpił nieznany błąd"
 
-#: ../glib/gspawn.c:1551
+#: ../glib/gspawn.c:1549
 #, c-format
 msgid "Failed to read enough data from child pid pipe (%s)"
 msgstr ""
 "Odczytanie odpowiedniej liczby danych z potoku procesu potomnego (%s) się "
 "nie powiodło"
 
-#: ../glib/gspawn-win32.c:283
+#: ../glib/gspawn-win32.c:281
 msgid "Failed to read data from child process"
 msgstr "Odczytanie danych z procesu potomnego się nie powiodło"
 
-#: ../glib/gspawn-win32.c:300
+#: ../glib/gspawn-win32.c:298
 #, c-format
 msgid "Failed to create pipe for communicating with child process (%s)"
 msgstr ""
 "Utworzenie potoku do komunikacji z procesem potomnym (%s) się nie powiodło"
 
-#: ../glib/gspawn-win32.c:376 ../glib/gspawn-win32.c:495
+#: ../glib/gspawn-win32.c:374 ../glib/gspawn-win32.c:493
 #, c-format
 msgid "Failed to execute child process (%s)"
 msgstr "Wykonanie procesu potomnego (%s) się nie powiodło"
 
-#: ../glib/gspawn-win32.c:445
+#: ../glib/gspawn-win32.c:443
 #, c-format
 msgid "Invalid program name: %s"
 msgstr "Nieprawidłowa nazwa programu: %s"
 
-#: ../glib/gspawn-win32.c:455 ../glib/gspawn-win32.c:722
-#: ../glib/gspawn-win32.c:1297
+#: ../glib/gspawn-win32.c:453 ../glib/gspawn-win32.c:720
+#: ../glib/gspawn-win32.c:1295
 #, c-format
 msgid "Invalid string in argument vector at %d: %s"
 msgstr "Nieprawidłowy ciąg w wektorze parametrów w %d: %s"
 
-#: ../glib/gspawn-win32.c:466 ../glib/gspawn-win32.c:737
-#: ../glib/gspawn-win32.c:1330
+#: ../glib/gspawn-win32.c:464 ../glib/gspawn-win32.c:735
+#: ../glib/gspawn-win32.c:1328
 #, c-format
 msgid "Invalid string in environment: %s"
 msgstr "Nieprawidłowa sekwencja w środowisku: %s"
 
-#: ../glib/gspawn-win32.c:718 ../glib/gspawn-win32.c:1278
+#: ../glib/gspawn-win32.c:716 ../glib/gspawn-win32.c:1276
 #, c-format
 msgid "Invalid working directory: %s"
 msgstr "Nieprawidłowy katalog roboczy: %s"
 
-#: ../glib/gspawn-win32.c:783
+#: ../glib/gspawn-win32.c:781
 #, c-format
 msgid "Failed to execute helper program (%s)"
 msgstr "Wykonanie programu pomocniczego (%s) się nie powiodło"
 
-#: ../glib/gspawn-win32.c:997
+#: ../glib/gspawn-win32.c:995
 msgid ""
 "Unexpected error in g_io_channel_win32_poll() reading data from a child "
 "process"
diff --git a/po/sk.po b/po/sk.po
index 1c6a7b013..cd8d49529 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -13,8 +13,8 @@ msgstr ""
 "Project-Id-Version: glib\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=glib&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2016-10-12 15:48+0000\n"
-"PO-Revision-Date: 2016-10-12 20:02+0200\n"
+"POT-Creation-Date: 2017-01-22 21:46+0000\n"
+"PO-Revision-Date: 2017-01-29 10:48+0100\n"
 "Last-Translator: Dušan Kazik <prescott66@gmail.com>\n"
 "Language-Team: Slovak <gnome-sk-list@gnome.org>\n"
 "Language: sk\n"
@@ -22,7 +22,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n"
-"X-Generator: Poedit 1.8.9\n"
+"X-Generator: Poedit 1.8.11\n"
 
 #: ../gio/gapplication.c:493
 msgid "GApplication options"
@@ -39,7 +39,7 @@ msgstr ""
 "Bus)"
 
 #: ../gio/gapplication.c:550
-msgid "Override the application's ID"
+msgid "Override the application’s ID"
 msgstr "Preváži ID aplikácie"
 
 #: ../gio/gapplication-tool.c:45 ../gio/gapplication-tool.c:46
@@ -82,8 +82,8 @@ msgid "Launch the application (with optional files to open)"
 msgstr "Spustí aplikáciu (s voliteľnými súbormi na otvorenie)"
 
 #: ../gio/gapplication-tool.c:57
-msgid "APPID [FILE...]"
-msgstr "IDAPLIKÁCIE [SÚBOR...]"
+msgid "APPID [FILE…]"
+msgstr "IDAPLIKÁCIE [SÚBOR…]"
 
 #: ../gio/gapplication-tool.c:59
 msgid "Activate an action"
@@ -123,8 +123,8 @@ msgid "Application identifier in D-Bus format (eg: org.example.viewer)"
 msgstr ""
 "Identifikátor aplikácie vo formáte zbernice D-Bus (napr.: org.príklad.viewer)"
 
-#: ../gio/gapplication-tool.c:72 ../gio/glib-compile-resources.c:622
-#: ../gio/glib-compile-resources.c:628 ../gio/glib-compile-resources.c:654
+#: ../gio/gapplication-tool.c:72 ../gio/glib-compile-resources.c:665
+#: ../gio/glib-compile-resources.c:671 ../gio/glib-compile-resources.c:698
 #: ../gio/gresource-tool.c:495 ../gio/gresource-tool.c:561
 msgid "FILE"
 msgstr "SÚBOR"
@@ -169,9 +169,9 @@ msgstr "Použitie:\n"
 msgid "Arguments:\n"
 msgstr "Parametre:\n"
 
-#: ../gio/gapplication-tool.c:133 ../gio/gio-tool.c:206
-msgid "[ARGS...]"
-msgstr "[PARAMETRE...]"
+#: ../gio/gapplication-tool.c:133
+msgid "[ARGS…]"
+msgstr "[PARAMETRE…]"
 
 #: ../gio/gapplication-tool.c:134
 #, c-format
@@ -182,7 +182,7 @@ msgstr "Príkazy:\n"
 #: ../gio/gapplication-tool.c:146
 #, c-format
 msgid ""
-"Use '%s help COMMAND' to get detailed help.\n"
+"Use “%s help COMMAND” to get detailed help.\n"
 "\n"
 msgstr ""
 "Na získanie podrobnejšieho pomocníka, použite „%s help PRÍKAZ“.\n"
@@ -199,14 +199,14 @@ msgstr ""
 
 #: ../gio/gapplication-tool.c:171
 #, c-format
-msgid "invalid application id: '%s'\n"
+msgid "invalid application id: “%s”\n"
 msgstr "neplatný identifikátor aplikácie: „%s“\n"
 
 #. Translators: %s is replaced with a command name like 'list-actions'
 #: ../gio/gapplication-tool.c:182
 #, c-format
 msgid ""
-"'%s' takes no arguments\n"
+"“%s” takes no arguments\n"
 "\n"
 msgstr ""
 "Príkaz „%s“ sa nedá použiť so žiadnymi parametrami\n"
@@ -230,8 +230,8 @@ msgstr "názov akcie musí byť zadaný po identifikátore aplikácie\n"
 #: ../gio/gapplication-tool.c:325
 #, c-format
 msgid ""
-"invalid action name: '%s'\n"
-"action names must consist of only alphanumerics, '-' and '.'\n"
+"invalid action name: “%s”\n"
+"action names must consist of only alphanumerics, “-” and “.”\n"
 msgstr ""
 "neplatný názov akcie: „%s“\n"
 "názvy akcií musia pozostávať iba zo znakov, číslic, „-“ a „.“\n"
@@ -324,19 +324,19 @@ msgstr "Neplatná sekvencia bajtov na vstupe prevodu"
 msgid "Error during conversion: %s"
 msgstr "Chyba počas prevodu: %s"
 
-#: ../gio/gcharsetconverter.c:444 ../gio/gsocket.c:1078
+#: ../gio/gcharsetconverter.c:444 ../gio/gsocket.c:1085
 msgid "Cancellable initialization not supported"
 msgstr "Zrušiteľná inicializácia nie je podporovaná"
 
 #: ../gio/gcharsetconverter.c:454 ../glib/gconvert.c:321
 #: ../glib/giochannel.c:1384
 #, c-format
-msgid "Conversion from character set '%s' to '%s' is not supported"
+msgid "Conversion from character set “%s” to “%s” is not supported"
 msgstr "Prevod zo znakovej sady „%s“ do „%s“ nie je podporovaný"
 
 #: ../gio/gcharsetconverter.c:458 ../glib/gconvert.c:325
 #, c-format
-msgid "Could not open converter from '%s' to '%s'"
+msgid "Could not open converter from “%s” to “%s”"
 msgstr "Nepodarilo sa otvoriť program na prevod z „%s“ do „%s“"
 
 #: ../gio/gcontenttype.c:335
@@ -377,49 +377,49 @@ msgstr "Neočakávane skorý koniec prúdu"
 #: ../gio/gdbusaddress.c:153 ../gio/gdbusaddress.c:241
 #: ../gio/gdbusaddress.c:322
 #, c-format
-msgid "Unsupported key '%s' in address entry '%s'"
+msgid "Unsupported key “%s” in address entry “%s”"
 msgstr "Nepodporovaný kľúč „%s“ v položke adresy „%s“"
 
 #: ../gio/gdbusaddress.c:180
 #, c-format
 msgid ""
-"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)"
 msgstr ""
 "Adresa „%s“ je neplatná (je potrebný práve jeden kľúč path, tmpdir alebo "
 "abstract)"
 
 #: ../gio/gdbusaddress.c:193
 #, c-format
-msgid "Meaningless key/value pair combination in address entry '%s'"
+msgid "Meaningless key/value pair combination in address entry “%s”"
 msgstr "Nezmyselná kombinácia kľúč/hodnota v položke adresy „%s“"
 
 #: ../gio/gdbusaddress.c:256 ../gio/gdbusaddress.c:337
 #, c-format
-msgid "Error in address '%s' - the port attribute is malformed"
-msgstr "Chyba v adrese „%s“ – atribút portu má zlý formát"
+msgid "Error in address “%s” — the port attribute is malformed"
+msgstr "Chyba v adrese „%s“ — atribút portu má zlý formát"
 
 #: ../gio/gdbusaddress.c:267 ../gio/gdbusaddress.c:348
 #, c-format
-msgid "Error in address '%s' - the family attribute is malformed"
-msgstr "Chyba v adrese „%s“ – atribút rodiny má zlý formát"
+msgid "Error in address “%s” — the family attribute is malformed"
+msgstr "Chyba v adrese „%s“ — atribút rodiny má zlý formát"
 
 #: ../gio/gdbusaddress.c:457
 #, c-format
-msgid "Address element '%s' does not contain a colon (:)"
+msgid "Address element “%s” does not contain a colon (:)"
 msgstr "Prvok adresy „%s“ neobsahuje dvojbodku (:)"
 
 #: ../gio/gdbusaddress.c:478
 #, c-format
 msgid ""
-"Key/Value pair %d, '%s', in address element '%s' does not contain an equal "
+"Key/Value pair %d, “%s”, in address element “%s” does not contain an equal "
 "sign"
 msgstr "Pár kľúč/hodnota %d, „%s“ v prvku adresy „%s“ neobsahuje znak rovnosti"
 
 #: ../gio/gdbusaddress.c:492
 #, c-format
 msgid ""
-"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”"
 msgstr ""
 "Chyba kľúča alebo hodnoty s nahradenými špeciálne uvedenými sekvenciami v "
 "páre kľúč/hodnota %d, „%s“ v prvku adresy „%s“"
@@ -427,26 +427,26 @@ msgstr ""
 #: ../gio/gdbusaddress.c:570
 #, c-format
 msgid ""
-"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"
 msgstr ""
-"Chyba v adrese „%s“ – transport typu unix vyžaduje nastavenie práve jedného "
+"Chyba v adrese „%s“ — transport typu unix vyžaduje nastavenie práve jedného "
 "z kľúčov „path“ alebo „abstract“"
 
 #: ../gio/gdbusaddress.c:606
 #, c-format
-msgid "Error in address '%s' - the host attribute is missing or malformed"
-msgstr "Chyba v adrese „%s“ – atribút hostiteľa chýba alebo má zlý formát"
+msgid "Error in address “%s” — the host attribute is missing or malformed"
+msgstr "Chyba v adrese „%s“ — atribút hostiteľa chýba alebo má zlý formát"
 
 #: ../gio/gdbusaddress.c:620
 #, c-format
-msgid "Error in address '%s' - the port attribute is missing or malformed"
-msgstr "Chyba v adrese „%s“ – atribút portu chýba alebo má zlý formát"
+msgid "Error in address “%s” — the port attribute is missing or malformed"
+msgstr "Chyba v adrese „%s“ — atribút portu chýba alebo má zlý formát"
 
 #: ../gio/gdbusaddress.c:634
 #, c-format
-msgid "Error in address '%s' - the noncefile attribute is missing or malformed"
-msgstr "Chyba v adrese „%s“ – atribút noncefile chýba alebo má zlý formát"
+msgid "Error in address “%s” — the noncefile attribute is missing or malformed"
+msgstr "Chyba v adrese „%s“ — atribút noncefile chýba alebo má zlý formát"
 
 #: ../gio/gdbusaddress.c:655
 msgid "Error auto-launching: "
@@ -455,28 +455,28 @@ msgstr "Chyba pri automatickom spustení: "
 # first is transport name
 #: ../gio/gdbusaddress.c:663
 #, c-format
-msgid "Unknown or unsupported transport '%s' for address '%s'"
+msgid "Unknown or unsupported transport “%s” for address “%s”"
 msgstr "Neznámy alebo nepodporovaný transport typu „%s“ pre adresu „%s“"
 
 #: ../gio/gdbusaddress.c:699
 #, c-format
-msgid "Error opening nonce file '%s': %s"
+msgid "Error opening nonce file “%s”: %s"
 msgstr "Chyba pri otváraní nonce súboru „%s“: %s"
 
 #: ../gio/gdbusaddress.c:717
 #, c-format
-msgid "Error reading from nonce file '%s': %s"
+msgid "Error reading from nonce file “%s”: %s"
 msgstr "Chyba pri čítaní z nonce súboru „%s“: %s"
 
 #: ../gio/gdbusaddress.c:726
 #, c-format
-msgid "Error reading from nonce file '%s', expected 16 bytes, got %d"
+msgid "Error reading from nonce file “%s”, expected 16 bytes, got %d"
 msgstr ""
 "Chyba pri čítaní z nonce súboru „%s“, očakávaných 16 bajtov, získaných %d"
 
 #: ../gio/gdbusaddress.c:744
 #, c-format
-msgid "Error writing contents of nonce file '%s' to stream:"
+msgid "Error writing contents of nonce file “%s” to stream:"
 msgstr "Chyba pri zápise obsahu nounce súboru „%s“ do prúdu:"
 
 #: ../gio/gdbusaddress.c:951
@@ -504,7 +504,7 @@ msgstr "Zbernica D-Bus sa nedá spustiť automaticky bez X11 $DISPLAY"
 # MČ: v tomto prípade „spawn“ znamená: Spustí a posiela dáta, cez stdin a očakáva dáta cez stdout, takže by som skôr dal spustiť.
 #: ../gio/gdbusaddress.c:1120
 #, c-format
-msgid "Error spawning command line '%s': "
+msgid "Error spawning command line “%s”: "
 msgstr "Chyba pri spúšťaní príkazového riadka „%s“: "
 
 # PM: podľa mňa ked ide o zadanie treba na konci stlačiť enter, nie som si istý či je to tento prípad
@@ -513,29 +513,29 @@ msgstr "Chyba pri spúšťaní príkazového riadka „%s“: "
 msgid "(Type any character to close this window)\n"
 msgstr "(Toto okno zatvoríte zadaním ľubovolného znaku)\n"
 
-#: ../gio/gdbusaddress.c:1489
+#: ../gio/gdbusaddress.c:1491
 #, c-format
 msgid "Session dbus not running, and autolaunch failed"
 msgstr "Relácia dbus nebeží a automatické spustenie zlyhalo"
 
 # funkcia na určenie adresy relačnej zbernice
-#: ../gio/gdbusaddress.c:1500
+#: ../gio/gdbusaddress.c:1502
 #, c-format
 msgid "Cannot determine session bus address (not implemented for this OS)"
 msgstr ""
 "Nedá sa určiť adresa relačnej zbernice (nie je implementovaná pre tento "
 "operačný systém)"
 
-#: ../gio/gdbusaddress.c:1635 ../gio/gdbusconnection.c:7133
+#: ../gio/gdbusaddress.c:1637
 #, c-format
 msgid ""
 "Cannot determine bus address from DBUS_STARTER_BUS_TYPE environment variable "
-"- unknown value '%s'"
+"— unknown value “%s”"
 msgstr ""
-"Nedá sa určiť adresa zbernice z premennej prostredia DBUS_STARTER_BUS_TYPE – "
+"Nedá sa určiť adresa zbernice z premennej prostredia DBUS_STARTER_BUS_TYPE — "
 "neznáma hodnota „%s“"
 
-#: ../gio/gdbusaddress.c:1644 ../gio/gdbusconnection.c:7142
+#: ../gio/gdbusaddress.c:1646 ../gio/gdbusconnection.c:7142
 msgid ""
 "Cannot determine bus address because the DBUS_STARTER_BUS_TYPE environment "
 "variable is not set"
@@ -543,7 +543,7 @@ msgstr ""
 "Nedá sa určiť adresa zbernice, pretože premenná prostredia "
 "DBUS_STARTER_BUS_TYPE nie je nastavená"
 
-#: ../gio/gdbusaddress.c:1654
+#: ../gio/gdbusaddress.c:1656
 #, c-format
 msgid "Unknown bus type %d"
 msgstr "Neznámy typ zbernice %d"
@@ -570,30 +570,30 @@ msgstr "Zrušené cez GDBusAuthObserver::authorize-authenticated-peer"
 
 #: ../gio/gdbusauthmechanismsha1.c:261
 #, c-format
-msgid "Error when getting information for directory '%s': %s"
+msgid "Error when getting information for directory “%s”: %s"
 msgstr "Chyba pri získavaní informácií pre adresár „%s“: %s"
 
 #: ../gio/gdbusauthmechanismsha1.c:273
 #, c-format
 msgid ""
-"Permissions on directory '%s' are malformed. Expected mode 0700, got 0%o"
+"Permissions on directory “%s” are malformed. Expected mode 0700, got 0%o"
 msgstr ""
 "Oprávnenia k adresáru „%s“ sú zle formátované. Očakávaný režim 0700, získaný "
 "0%o"
 
 #: ../gio/gdbusauthmechanismsha1.c:294
 #, c-format
-msgid "Error creating directory '%s': %s"
-msgstr "Chyba pri vytváraní adresára „%s“: %s"
+msgid "Error creating directory “%s”: %s"
+msgstr "Chyba pri vytváraní adresára %s: %s"
 
 #: ../gio/gdbusauthmechanismsha1.c:377
 #, c-format
-msgid "Error opening keyring '%s' for reading: "
+msgid "Error opening keyring “%s” for reading: "
 msgstr "Chyba pri otváraní zväzku kľúčov „%s“ na čítanie: "
 
 #: ../gio/gdbusauthmechanismsha1.c:401 ../gio/gdbusauthmechanismsha1.c:714
 #, c-format
-msgid "Line %d of the keyring at '%s' with content '%s' is malformed"
+msgid "Line %d of the keyring at “%s” with content “%s” is malformed"
 msgstr "Riadok č. %d zväzku kľúčov na „%s“ s obsahom „%s“ je zle formátovaný"
 
 # PK: token nie je nejaky znak? viacX
@@ -602,7 +602,7 @@ msgstr "Riadok č. %d zväzku kľúčov na „%s“ s obsahom „%s“ je zle fo
 #: ../gio/gdbusauthmechanismsha1.c:415 ../gio/gdbusauthmechanismsha1.c:728
 #, c-format
 msgid ""
-"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"
 msgstr ""
 "Prvý token riadka č. %d zväzku kľúčov na „%s“ s obsahom „%s“ je zle "
 "formátovaný"
@@ -610,45 +610,45 @@ msgstr ""
 #: ../gio/gdbusauthmechanismsha1.c:430 ../gio/gdbusauthmechanismsha1.c:742
 #, c-format
 msgid ""
-"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"
 msgstr ""
 "Druhý token riadka č. %d zväzku kľúčov na „%s“ s obsahom „%s“ je zle "
 "formátovaný"
 
 #: ../gio/gdbusauthmechanismsha1.c:454
 #, c-format
-msgid "Didn't find cookie with id %d in the keyring at '%s'"
+msgid "Didn’t find cookie with id %d in the keyring at “%s”"
 msgstr "Nenašlo sa cookie s identifikátorom %d vo zväzku kľúčov na „%s“"
 
 #: ../gio/gdbusauthmechanismsha1.c:532
 #, c-format
-msgid "Error deleting stale lock file '%s': %s"
+msgid "Error deleting stale lock file “%s”: %s"
 msgstr "Chyba pri odstraňovaní starého súboru uzamknutia „%s“: %s"
 
 #: ../gio/gdbusauthmechanismsha1.c:564
 #, c-format
-msgid "Error creating lock file '%s': %s"
+msgid "Error creating lock file “%s”: %s"
 msgstr "Chyba pri vytváraní súboru uzamknutia „%s“: %s"
 
 # PM: Je to súbor určený na vymazanie ale vymaže sa až vtedy, keď ho zatvorí posledný, kto ho má otvorený
 #: ../gio/gdbusauthmechanismsha1.c:594
 #, c-format
-msgid "Error closing (unlinked) lock file '%s': %s"
+msgid "Error closing (unlinked) lock file “%s”: %s"
 msgstr "Chyba pri zatváraní (vymazávaného) súboru uzamknutia „%s“: %s"
 
 #: ../gio/gdbusauthmechanismsha1.c:604
 #, c-format
-msgid "Error unlinking lock file '%s': %s"
+msgid "Error unlinking lock file “%s”: %s"
 msgstr "Chyba pri mazaní súboru uzamknutia „%s“: %s"
 
 #: ../gio/gdbusauthmechanismsha1.c:681
 #, c-format
-msgid "Error opening keyring '%s' for writing: "
+msgid "Error opening keyring “%s” for writing: "
 msgstr "Chyba pri otváraní zväzku kľúčov „%s“ na zápis: "
 
 #: ../gio/gdbusauthmechanismsha1.c:878
 #, c-format
-msgid "(Additionally, releasing the lock for '%s' also failed: %s) "
+msgid "(Additionally, releasing the lock for “%s” also failed: %s) "
 msgstr "(Okrem toho zlyhalo aj uvoľnenie zámky pre „%s“: %s)"
 
 #: ../gio/gdbusconnection.c:612 ../gio/gdbusconnection.c:2377
@@ -751,6 +751,15 @@ msgstr "Metóda „%s“ z rozhrania „%s“ s označením „%s“ neexistuje"
 msgid "A subtree is already exported for %s"
 msgstr "Podstrom je už exportovaný do %s"
 
+#: ../gio/gdbusconnection.c:7133
+#, c-format
+msgid ""
+"Cannot determine bus address from DBUS_STARTER_BUS_TYPE environment variable "
+"- unknown value '%s'"
+msgstr ""
+"Nedá sa určiť adresa zbernice z premennej prostredia DBUS_STARTER_BUS_TYPE – "
+"neznáma hodnota „%s“"
+
 #: ../gio/gdbusmessage.c:1244
 msgid "type is INVALID"
 msgstr "typ je INVALID"
@@ -801,27 +810,27 @@ msgstr[2] "Potrebné %lu bajty na čítanie, no získaných iba %lu"
 # PM: tu je to hodnota znaku nie smerníka
 #: ../gio/gdbusmessage.c:1369
 #, c-format
-msgid "Expected NUL byte after the string '%s' but found byte %d"
+msgid "Expected NUL byte after the string “%s” but found byte %d"
 msgstr "Očakávaný znak NUL za reťazcom „%s“, no nájdený bajt %d"
 
 #: ../gio/gdbusmessage.c:1388
 #, c-format
 msgid ""
 "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'"
+"(length of string is %d). The valid UTF-8 string up until that point was “%s”"
 msgstr ""
 "Očakávaný platný UTF-8 reťazec, no nájdené neplatné bajty na pozícii %d "
 "(dĺžka reťazca je %d). Platný UTF-8 reťazec do toho miesta bol „%s“"
 
 #: ../gio/gdbusmessage.c:1587
 #, c-format
-msgid "Parsed value '%s' is not a valid D-Bus object path"
+msgid "Parsed value “%s” is not a valid D-Bus object path"
 msgstr ""
 "Analyzovaná hodnota „%s“ nie je platnou cestou k objektu zbernice D-Bus"
 
 #: ../gio/gdbusmessage.c:1609
 #, c-format
-msgid "Parsed value '%s' is not a valid D-Bus signature"
+msgid "Parsed value “%s” is not a valid D-Bus signature"
 msgstr "Analyzovaná hodnota „%s“ nie je platným označením zbernice D-Bus"
 
 #: ../gio/gdbusmessage.c:1656
@@ -840,7 +849,7 @@ msgstr[2] ""
 #: ../gio/gdbusmessage.c:1676
 #, c-format
 msgid ""
-"Encountered array of type 'a%c', expected to have a length a multiple of %u "
+"Encountered array of type “a%c”, expected to have a length a multiple of %u "
 "bytes, but found to be %u bytes in length"
 msgstr ""
 "Zistené pole typu „a%c“, ktoré by malo mať dĺžku v násobkoch %u bajtov, ale "
@@ -848,14 +857,14 @@ msgstr ""
 
 #: ../gio/gdbusmessage.c:1843
 #, c-format
-msgid "Parsed value '%s' for variant is not a valid D-Bus signature"
+msgid "Parsed value “%s” for variant is not a valid D-Bus signature"
 msgstr ""
 "Analyzovaná hodnota „%s“ pre variant nie je platným označením zbernice D-Bus"
 
 #: ../gio/gdbusmessage.c:1867
 #, c-format
 msgid ""
-"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"
 msgstr ""
 "Chyba pri deserializovaní GVariantu pomocou reťazca typu „%s“ z prenosového "
 "formátu zbernice D-Bus"
@@ -864,7 +873,7 @@ msgstr ""
 #: ../gio/gdbusmessage.c:2051
 #, c-format
 msgid ""
-"Invalid endianness value. Expected 0x6c ('l') or 0x42 ('B') but found value "
+"Invalid endianness value. Expected 0x6c (“l”) or 0x42 (“B”) but found value "
 "0x%02x"
 msgstr ""
 "Neplatná hodnota poradia bytov. Očakávané 0x6c ('l') alebo 0x42 ('B'), no "
@@ -878,14 +887,14 @@ msgstr "Neplatná hlavná verzia protokolu. Očakávaná 1, no nájdená %d"
 
 #: ../gio/gdbusmessage.c:2120
 #, c-format
-msgid "Signature header with signature '%s' found but message body is empty"
+msgid "Signature header with signature “%s” found but message body is empty"
 msgstr ""
 "Nájdená hlavička označenia s označením „%s“, no nájdené telo správy je "
 "prázdne"
 
 #: ../gio/gdbusmessage.c:2134
 #, c-format
-msgid "Parsed value '%s' is not a valid D-Bus signature (for body)"
+msgid "Parsed value “%s” is not a valid D-Bus signature (for body)"
 msgstr ""
 "Analyzovaná hodnota „%s“ nie je platným označením zbernice D-Bus (pre telo)"
 
@@ -907,7 +916,7 @@ msgstr "Nedá sa deserializovať správa: "
 #: ../gio/gdbusmessage.c:2515
 #, c-format
 msgid ""
-"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"
 msgstr ""
 "Chyba pri serializovaní Gvariant pomocou reťazca typu „%s“ z prenosového "
 "formátu zbernice D-Bus"
@@ -928,25 +937,25 @@ msgstr "Nedá sa serializovať správa: "
 
 #: ../gio/gdbusmessage.c:2704
 #, c-format
-msgid "Message body has signature '%s' but there is no signature header"
+msgid "Message body has signature “%s” but there is no signature header"
 msgstr "Telo správy má označenie „%s“, no neexistuje žiadna hlavička označenia"
 
 #: ../gio/gdbusmessage.c:2714
 #, c-format
 msgid ""
-"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”"
 msgstr ""
 "Telo správy má označenie typu „%s“, no označenie v poli hlavičky je „%s“"
 
 #: ../gio/gdbusmessage.c:2730
 #, c-format
-msgid "Message body is empty but signature in the header field is '(%s)'"
+msgid "Message body is empty but signature in the header field is “(%s)”"
 msgstr "Telo správy je prázdne, no označenie v poli hlavičky je „(%s)“"
 
 #: ../gio/gdbusmessage.c:3283
 #, c-format
-msgid "Error return with body of type '%s'"
+msgid "Error return with body of type “%s”"
 msgstr "Chyba pri návrate s telom typu „%s“"
 
 #: ../gio/gdbusmessage.c:3291
@@ -990,17 +999,17 @@ msgstr "Pri vytváraní servera sa nedá zadať nonce súbor"
 
 #: ../gio/gdbusserver.c:873
 #, c-format
-msgid "Error writing nonce file at '%s': %s"
+msgid "Error writing nonce file at “%s”: %s"
 msgstr "Chyba pri zápise do nonce súboru na „%s“: %s"
 
 #: ../gio/gdbusserver.c:1044
 #, c-format
-msgid "The string '%s' is not a valid D-Bus GUID"
+msgid "The string “%s” is not a valid D-Bus GUID"
 msgstr "Reťazec „%s“ nie je platný D-Bus GUID"
 
 #: ../gio/gdbusserver.c:1084
 #, c-format
-msgid "Cannot listen on unsupported transport '%s'"
+msgid "Cannot listen on unsupported transport “%s”"
 msgstr "Nedá sa počúvať na nepodporovanom transporte „%s“"
 
 #: ../gio/gdbus-tool.c:95
@@ -1013,7 +1022,7 @@ msgid ""
 "  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"
 msgstr ""
 "Príkazy:\n"
 "  help         Zobrazí tieto informácie\n"
@@ -1074,15 +1083,15 @@ msgstr "Určených viacero koncových bodov pripojenia"
 #: ../gio/gdbus-tool.c:471
 #, c-format
 msgid ""
-"Warning: According to introspection data, interface '%s' does not exist\n"
+"Warning: According to introspection data, interface “%s” does not exist\n"
 msgstr ""
 "Upozornenie: Podľa údajov vnútorného preskúmania rozhranie „%s“ neexistuje\n"
 
 #: ../gio/gdbus-tool.c:480
 #, c-format
 msgid ""
-"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"
 msgstr ""
 "Upozornenie: Podľa údajov vnútorného preskúmania metóda „%s“ neexistuje na "
 "rozhraní „%s“\n"
@@ -1201,12 +1210,12 @@ msgstr "Chyba: Názov metódy nie je určený\n"
 
 #: ../gio/gdbus-tool.c:950
 #, c-format
-msgid "Error: Method name '%s' is invalid\n"
+msgid "Error: Method name “%s” is invalid\n"
 msgstr "Chyba: Názov metódy „%s“ nie je platný\n"
 
 #: ../gio/gdbus-tool.c:1028
 #, c-format
-msgid "Error parsing parameter %d of type '%s': %s\n"
+msgid "Error parsing parameter %d of type “%s”: %s\n"
 msgstr "Chyba pri spracovaní parametra %d typu „%s“: %s\n"
 
 #: ../gio/gdbus-tool.c:1472
@@ -1245,65 +1254,65 @@ msgstr "Cesta objektu na sledovanie"
 msgid "Monitor a remote object."
 msgstr "Sledovať vzdialený objekt."
 
-#: ../gio/gdesktopappinfo.c:1994 ../gio/gdesktopappinfo.c:4501
+#: ../gio/gdesktopappinfo.c:1997 ../gio/gdesktopappinfo.c:4504
 msgid "Unnamed"
 msgstr "Bez názvu"
 
-#: ../gio/gdesktopappinfo.c:2404
-msgid "Desktop file didn't specify Exec field"
+#: ../gio/gdesktopappinfo.c:2407
+msgid "Desktop file didn’t specify Exec field"
 msgstr "V súbore desktop nie je určené pole Exec"
 
-#: ../gio/gdesktopappinfo.c:2689
+#: ../gio/gdesktopappinfo.c:2692
 msgid "Unable to find terminal required for application"
 msgstr "Nepodarilo sa nájsť terminál vyžadovaný pre aplikáciu"
 
-#: ../gio/gdesktopappinfo.c:3097
+#: ../gio/gdesktopappinfo.c:3100
 #, c-format
-msgid "Can't create user application configuration folder %s: %s"
+msgid "Can’t create user application configuration folder %s: %s"
 msgstr "Nedá sa vytvoriť používateľský konfiguračný priečinok aplikácie %s: %s"
 
-#: ../gio/gdesktopappinfo.c:3101
+#: ../gio/gdesktopappinfo.c:3104
 #, c-format
-msgid "Can't create user MIME configuration folder %s: %s"
+msgid "Can’t create user MIME configuration folder %s: %s"
 msgstr "Nedá sa vytvoriť používateľský konfiguračný priečinok MIME %s: %s"
 
-#: ../gio/gdesktopappinfo.c:3341 ../gio/gdesktopappinfo.c:3365
+#: ../gio/gdesktopappinfo.c:3344 ../gio/gdesktopappinfo.c:3368
 msgid "Application information lacks an identifier"
 msgstr "V informáciách o aplikácii chýba identifikátor"
 
-#: ../gio/gdesktopappinfo.c:3599
+#: ../gio/gdesktopappinfo.c:3602
 #, c-format
-msgid "Can't create user desktop file %s"
+msgid "Can’t create user desktop file %s"
 msgstr "Nedá sa vytvoriť používateľský desktop súbor %s"
 
-#: ../gio/gdesktopappinfo.c:3733
+#: ../gio/gdesktopappinfo.c:3736
 #, c-format
 msgid "Custom definition for %s"
 msgstr "Vlastná definícia pre %s"
 
 #: ../gio/gdrive.c:417
-msgid "drive doesn't implement eject"
+msgid "drive doesn’t implement eject"
 msgstr "mechanika neimplementuje vysúvanie"
 
 #. Translators: This is an error
 #. * message for drive objects that
 #. * don't implement any of eject or eject_with_operation.
 #: ../gio/gdrive.c:495
-msgid "drive doesn't implement eject or eject_with_operation"
+msgid "drive doesn’t implement eject or eject_with_operation"
 msgstr ""
 "mechanika neimplementuje eject (vysunutie) ani eject_with_operation "
 "(vysunutie s operáciou)"
 
 #: ../gio/gdrive.c:571
-msgid "drive doesn't implement polling for media"
+msgid "drive doesn’t implement polling for media"
 msgstr "mechanika neimplementuje dotazovanie na vložené médium"
 
 #: ../gio/gdrive.c:776
-msgid "drive doesn't implement start"
+msgid "drive doesn’t implement start"
 msgstr "mechanika neimplementuje spustenie"
 
 #: ../gio/gdrive.c:878
-msgid "drive doesn't implement stop"
+msgid "drive doesn’t implement stop"
 msgstr "mechanika neimplementuje zastavenie"
 
 #: ../gio/gdummytlsbackend.c:195 ../gio/gdummytlsbackend.c:317
@@ -1317,7 +1326,7 @@ msgstr "Podpora DTLS nie je dostupná"
 
 #: ../gio/gemblem.c:323
 #, c-format
-msgid "Can't handle version %d of GEmblem encoding"
+msgid "Can’t handle version %d of GEmblem encoding"
 msgstr "Nedá sa spracovať kódovanie GEmblem verzie %d"
 
 #: ../gio/gemblem.c:333
@@ -1327,7 +1336,7 @@ msgstr "Chybný počet tokenov (%d) v kódovaní GEmblem"
 
 #: ../gio/gemblemedicon.c:362
 #, c-format
-msgid "Can't handle version %d of GEmblemedIcon encoding"
+msgid "Can’t handle version %d of GEmblemedIcon encoding"
 msgstr "Nedá sa spracovať kódovanie GEmblemedIcon verzie %d"
 
 #: ../gio/gemblemedicon.c:372
@@ -1342,11 +1351,11 @@ msgstr "Očakávaný GEmblem pre GEmblemedIcon"
 #: ../gio/gfile.c:969 ../gio/gfile.c:1207 ../gio/gfile.c:1345
 #: ../gio/gfile.c:1583 ../gio/gfile.c:1638 ../gio/gfile.c:1696
 #: ../gio/gfile.c:1780 ../gio/gfile.c:1837 ../gio/gfile.c:1901
-#: ../gio/gfile.c:1956 ../gio/gfile.c:3604 ../gio/gfile.c:3659
-#: ../gio/gfile.c:3895 ../gio/gfile.c:3937 ../gio/gfile.c:4405
-#: ../gio/gfile.c:4816 ../gio/gfile.c:4901 ../gio/gfile.c:4991
-#: ../gio/gfile.c:5088 ../gio/gfile.c:5175 ../gio/gfile.c:5276
-#: ../gio/gfile.c:7817 ../gio/gfile.c:7907 ../gio/gfile.c:7991
+#: ../gio/gfile.c:1956 ../gio/gfile.c:3609 ../gio/gfile.c:3664
+#: ../gio/gfile.c:3900 ../gio/gfile.c:3942 ../gio/gfile.c:4410
+#: ../gio/gfile.c:4821 ../gio/gfile.c:4906 ../gio/gfile.c:4996
+#: ../gio/gfile.c:5093 ../gio/gfile.c:5180 ../gio/gfile.c:5281
+#: ../gio/gfile.c:7822 ../gio/gfile.c:7912 ../gio/gfile.c:7996
 #: ../gio/win32/gwinhttpfile.c:437
 msgid "Operation not supported"
 msgstr "Nepodporovaná operácia"
@@ -1359,12 +1368,12 @@ msgstr "Nepodporovaná operácia"
 msgid "Containing mount does not exist"
 msgstr "Obklopujúce pripojenie neexistuje"
 
-#: ../gio/gfile.c:2515 ../gio/glocalfile.c:2374
-msgid "Can't copy over directory"
+#: ../gio/gfile.c:2515 ../gio/glocalfile.c:2375
+msgid "Can’t copy over directory"
 msgstr "Nedá sa prepísať adresár pri kopírovaní"
 
 #: ../gio/gfile.c:2575
-msgid "Can't copy directory over directory"
+msgid "Can’t copy directory over directory"
 msgstr "Nedá sa prepísať adresár adresárom pri kopírovaní"
 
 #: ../gio/gfile.c:2583
@@ -1372,58 +1381,58 @@ msgid "Target file exists"
 msgstr "Cieľový súbor existuje"
 
 #: ../gio/gfile.c:2602
-msgid "Can't recursively copy directory"
+msgid "Can’t recursively copy directory"
 msgstr "Adresár sa nedá kopírovať rekurzívne"
 
-#: ../gio/gfile.c:2884
+#: ../gio/gfile.c:2889
 msgid "Splice not supported"
 msgstr "Operácia zreťazovania vstupu s výstupom nie je podporovaná"
 
 # http://developer.gnome.org/gio/2.32/GOutputStream.html#g-output-stream-splice
-#: ../gio/gfile.c:2888
+#: ../gio/gfile.c:2893
 #, c-format
 msgid "Error splicing file: %s"
 msgstr "Chyba pri zreťazovaní súboru: %s"
 
-#: ../gio/gfile.c:3019
+#: ../gio/gfile.c:3024
 msgid "Copy (reflink/clone) between mounts is not supported"
 msgstr "Kopírovanie (odkaz/klon) medzi pripojeniami nie je podporované"
 
-#: ../gio/gfile.c:3023
+#: ../gio/gfile.c:3028
 msgid "Copy (reflink/clone) is not supported or invalid"
 msgstr ""
 "Kopírovanie (odkaz/klon) medzi pripojeniami nie je podporované alebo je "
 "neplatné"
 
-#: ../gio/gfile.c:3028
-msgid "Copy (reflink/clone) is not supported or didn't work"
+#: ../gio/gfile.c:3033
+msgid "Copy (reflink/clone) is not supported or didn’t work"
 msgstr ""
 "Kopírovanie (odkaz/klon) medzi pripojeniami nie je podporované alebo "
 "nefunguje"
 
-#: ../gio/gfile.c:3091
-msgid "Can't copy special file"
+#: ../gio/gfile.c:3096
+msgid "Can’t copy special file"
 msgstr "Špeciálny súbor sa nedá kopírovať"
 
-#: ../gio/gfile.c:3885
+#: ../gio/gfile.c:3890
 msgid "Invalid symlink value given"
 msgstr "Neplatný daný symbolický odkaz"
 
-#: ../gio/gfile.c:4046
+#: ../gio/gfile.c:4051
 msgid "Trash not supported"
 msgstr "Zahodenie do Koša nie je podporované"
 
 # literal character
-#: ../gio/gfile.c:4158
+#: ../gio/gfile.c:4163
 #, c-format
-msgid "File names cannot contain '%c'"
+msgid "File names cannot contain “%c”"
 msgstr "Názvy súborov nemôžu obsahovať „%c“"
 
-#: ../gio/gfile.c:6604 ../gio/gvolume.c:363
-msgid "volume doesn't implement mount"
+#: ../gio/gfile.c:6609 ../gio/gvolume.c:363
+msgid "volume doesn’t implement mount"
 msgstr "zväzok neimplementuje pripojenie"
 
-#: ../gio/gfile.c:6713
+#: ../gio/gfile.c:6718
 msgid "No application is registered as handling this file"
 msgstr "Žiadna aplikácia nie je zaregistrovaná na spracovanie tohto súboru"
 
@@ -1444,7 +1453,7 @@ msgstr "Enumerátor súborov je už uzatvorený"
 
 #: ../gio/gfileicon.c:236
 #, c-format
-msgid "Can't handle version %d of GFileIcon encoding"
+msgid "Can’t handle version %d of GFileIcon encoding"
 msgstr "Nedá sa spracovať kódovanie GFileIcon verzie %d"
 
 #: ../gio/gfileicon.c:246
@@ -1454,7 +1463,7 @@ msgstr "Zle formátované vstupné údaje pre GFileIcon"
 #: ../gio/gfileinputstream.c:149 ../gio/gfileinputstream.c:394
 #: ../gio/gfileiostream.c:167 ../gio/gfileoutputstream.c:164
 #: ../gio/gfileoutputstream.c:497
-msgid "Stream doesn't support query_info"
+msgid "Stream doesn’t support query_info"
 msgstr "Prúd nepodporuje query_info"
 
 #: ../gio/gfileinputstream.c:325 ../gio/gfileiostream.c:379
@@ -1470,28 +1479,33 @@ msgstr "Skrátenie vo vstupnom prúde nie je podporované"
 msgid "Truncate not supported on stream"
 msgstr "Skrátenie nie je v prúde podporované"
 
-#: ../gio/ghttpproxy.c:136
+#: ../gio/ghttpproxy.c:91 ../gio/gresolver.c:410 ../gio/gresolver.c:476
+#: ../glib/gconvert.c:1726
+msgid "Invalid hostname"
+msgstr "Neplatný názov hostiteľa"
+
+#: ../gio/ghttpproxy.c:143
 msgid "Bad HTTP proxy reply"
 msgstr "Nesprávna odpoveď sprostredkovateľa HTTP"
 
-#: ../gio/ghttpproxy.c:152
+#: ../gio/ghttpproxy.c:159
 msgid "HTTP proxy connection not allowed"
 msgstr "Pripojenie k sprostredkovateľovi HTTP nie je umožnené"
 
-#: ../gio/ghttpproxy.c:157
+#: ../gio/ghttpproxy.c:164
 msgid "HTTP proxy authentication failed"
 msgstr "Zlyhalo overenie totožnosti sprostredkovateľa HTTP"
 
-#: ../gio/ghttpproxy.c:160
+#: ../gio/ghttpproxy.c:167
 msgid "HTTP proxy authentication required"
 msgstr "Vyžaduje sa overenie totožnosti sprostredkovateľa HTTP"
 
-#: ../gio/ghttpproxy.c:164
+#: ../gio/ghttpproxy.c:171
 #, c-format
 msgid "HTTP proxy connection failed: %i"
 msgstr "Pripojenie k sprostredkovateľovi HTTP zlyhalo: %i"
 
-#: ../gio/ghttpproxy.c:260
+#: ../gio/ghttpproxy.c:269
 msgid "HTTP proxy server closed connection unexpectedly."
 msgstr "Server sprostredkovateľa HTTP neočakávane prerušil pripojenie."
 
@@ -1526,7 +1540,7 @@ msgid "Type %s does not implement from_tokens() on the GIcon interface"
 msgstr "Typ %s neimplementuje from_tokens() na rozhraní GIcon"
 
 #: ../gio/gicon.c:461
-msgid "Can't handle the supplied version of the icon encoding"
+msgid "Can’t handle the supplied version of the icon encoding"
 msgstr "Nedá sa spracovať poskytnutá verzia kódovania ikon"
 
 #: ../gio/ginetaddressmask.c:182
@@ -1549,11 +1563,11 @@ msgstr "Adresa má bity nastavené za dĺžkou predpony"
 
 #: ../gio/ginetaddressmask.c:300
 #, c-format
-msgid "Could not parse '%s' as IP address mask"
+msgid "Could not parse “%s” as IP address mask"
 msgstr "Nepodarilo sa analyzovať „%s“ ako masku adresy IP"
 
 #: ../gio/ginetsocketaddress.c:203 ../gio/ginetsocketaddress.c:220
-#: ../gio/gnativesocketaddress.c:106 ../gio/gunixsocketaddress.c:216
+#: ../gio/gnativesocketaddress.c:106 ../gio/gunixsocketaddress.c:218
 msgid "Not enough space for socket address"
 msgstr "Nie je dostatok miesta pre adresu soketu"
 
@@ -1562,7 +1576,7 @@ msgid "Unsupported socket address"
 msgstr "Nepodporovaná adresa soketu"
 
 #: ../gio/ginputstream.c:188
-msgid "Input stream doesn't implement read"
+msgid "Input stream doesn’t implement read"
 msgstr "Vstupný prúd neimplementuje čítanie"
 
 #. Translators: This is an error you get if there is already an
@@ -1585,7 +1599,7 @@ msgid "Keep with file when moved"
 msgstr "Ponechá so súborom pri presunutí"
 
 #: ../gio/gio-tool.c:187
-msgid "'version' takes no arguments"
+msgid "“version” takes no arguments"
 msgstr "Voľba „version“ neprijíma žiadne parametre"
 
 #: ../gio/gio-tool.c:189 ../gio/gio-tool.c:205 ../glib/goption.c:857
@@ -1597,6 +1611,10 @@ msgstr "Použitie:"
 msgid "Print version information and exit."
 msgstr "Vypíše informácie o verzii a skončí."
 
+#: ../gio/gio-tool.c:206
+msgid "[ARGS...]"
+msgstr "[PARAMETRE...]"
+
 #: ../gio/gio-tool.c:208
 msgid "Commands:"
 msgstr "Príkazy:"
@@ -1765,7 +1783,7 @@ msgstr "Cieľ %s nie je adresárom"
 
 #: ../gio/gio-tool-copy.c:187 ../gio/gio-tool-move.c:181
 #, c-format
-msgid "%s: overwrite '%s'? "
+msgid "%s: overwrite “%s”? "
 msgstr "%s: prepísať „%s“? "
 
 #: ../gio/gio-tool-info.c:34
@@ -1785,7 +1803,7 @@ msgid "ATTRIBUTES"
 msgstr "ATRIBÚTY"
 
 #: ../gio/gio-tool-info.c:37 ../gio/gio-tool-list.c:38 ../gio/gio-tool-set.c:34
-msgid "Don't follow symbolic links"
+msgid "Don’t follow symbolic links"
 msgstr "Nenasleduje symbolické odkazy"
 
 #: ../gio/gio-tool-info.c:75
@@ -1855,7 +1873,7 @@ msgid ""
 "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"
 msgstr ""
 "gio info pracuje podobne ako tradičná utilita ls, iba že \n"
 "s použitím umiestnení GIO namiesto lokálnych súborov: napríklad môžete "
@@ -1930,12 +1948,12 @@ msgstr "Je potrebné zadať jeden typ mime a možno tiež obslužný program"
 
 #: ../gio/gio-tool-mime.c:113
 #, c-format
-msgid "No default applications for '%s'\n"
+msgid "No default applications for “%s”\n"
 msgstr "Žiadne predvolené aplikácie pre „%s“\n"
 
 #: ../gio/gio-tool-mime.c:119
 #, c-format
-msgid "Default application for '%s': %s\n"
+msgid "Default application for “%s”: %s\n"
 msgstr "Predvolená aplikácia pre „%s“: %s\n"
 
 #: ../gio/gio-tool-mime.c:124
@@ -1960,12 +1978,12 @@ msgstr "Žiadne odporúčané aplikácie\n"
 
 #: ../gio/gio-tool-mime.c:159
 #, c-format
-msgid "Failed to load info for handler '%s'\n"
+msgid "Failed to load info for handler “%s”\n"
 msgstr "Zlyhalo načítanie informácii pre obslužný program „%s“\n"
 
 #: ../gio/gio-tool-mime.c:165
 #, c-format
-msgid "Failed to set '%s' as the default handler for '%s': %s\n"
+msgid "Failed to set “%s” as the default handler for “%s”: %s\n"
 msgstr ""
 "Zlyhalo nastavenie „%s“ ako predvoleného obslužného programu pre „%s“: %s\n"
 
@@ -2001,7 +2019,7 @@ msgid "Monitor a file directly (notices changes made via hardlinks)"
 msgstr "Sledovať súbor priamo (zaznamenáva tiež zmeny cez hardlink)"
 
 #: ../gio/gio-tool-monitor.c:43
-msgid "Monitors a file directly, but doesn't report changes"
+msgid "Monitors a file directly, but doesn’t report changes"
 msgstr "Sleduje súbor priamo, ale oznamuje zmeny"
 
 #: ../gio/gio-tool-monitor.c:45
@@ -2112,7 +2130,7 @@ msgid "Mount or unmount the locations."
 msgstr "Pripojí alebo odpojí umiestnenia."
 
 #: ../gio/gio-tool-move.c:42
-msgid "Don't use copy and delete fallback"
+msgid "Don’t use copy and delete fallback"
 msgstr "Nepoužije sa záložný režim pri kopírovaní a odstraňovaní"
 
 #: ../gio/gio-tool-move.c:99
@@ -2300,17 +2318,17 @@ msgstr "Súbor %s sa v zdroji objavil viackrát"
 
 #: ../gio/glib-compile-resources.c:248
 #, c-format
-msgid "Failed to locate '%s' in any source directory"
+msgid "Failed to locate “%s” in any source directory"
 msgstr "Nepodarilo sa nájsť „%s“ v žiadnom zdrojovom adresári"
 
 #: ../gio/glib-compile-resources.c:259
 #, c-format
-msgid "Failed to locate '%s' in current directory"
+msgid "Failed to locate “%s” in current directory"
 msgstr "Zlyhalo hľadanie „%s“ v aktuálnom adresári"
 
 #: ../gio/glib-compile-resources.c:290
 #, c-format
-msgid "Unknown processing option \"%s\""
+msgid "Unknown processing option “%s”"
 msgstr "Neznáma voľba spracovania „%s“"
 
 #: ../gio/glib-compile-resources.c:308 ../gio/glib-compile-resources.c:354
@@ -2333,71 +2351,75 @@ msgstr "Chyba pri komprimovaní súboru %s"
 msgid "text may not appear inside <%s>"
 msgstr "text sa nemôže nachádzať vo vnútri <%s>"
 
-#: ../gio/glib-compile-resources.c:621 ../gio/glib-compile-schemas.c:2037
+#: ../gio/glib-compile-resources.c:664 ../gio/glib-compile-schemas.c:2037
 msgid "Show program version and exit"
 msgstr "Zobrazí verziu programu a skončí"
 
 # cmd desc
-#: ../gio/glib-compile-resources.c:622
+#: ../gio/glib-compile-resources.c:665
 msgid "name of the output file"
 msgstr "názov výstupného súboru"
 
 # cmd desc
-#: ../gio/glib-compile-resources.c:623
+#: ../gio/glib-compile-resources.c:666
 msgid ""
 "The directories where files are to be read from (default to current "
 "directory)"
 msgstr ""
 "Adresáre, z ktorých sa majú čítať súbory (predvolený je aktuálny adresár)"
 
-#: ../gio/glib-compile-resources.c:623 ../gio/glib-compile-schemas.c:2038
+#: ../gio/glib-compile-resources.c:666 ../gio/glib-compile-schemas.c:2038
 #: ../gio/glib-compile-schemas.c:2067
 msgid "DIRECTORY"
 msgstr "ADRESÁR"
 
 # cmd desc
-#: ../gio/glib-compile-resources.c:624
+#: ../gio/glib-compile-resources.c:667
 msgid ""
 "Generate output in the format selected for by the target filename extension"
 msgstr "Vygeneruje výstup vo formáte stanovenom podľa prípony cielového súboru"
 
 #  cmd desc
-#: ../gio/glib-compile-resources.c:625
+#: ../gio/glib-compile-resources.c:668
 msgid "Generate source header"
 msgstr "Vygeneruje zdrojové hlavičky"
 
 # cmd desc
-#: ../gio/glib-compile-resources.c:626
+#: ../gio/glib-compile-resources.c:669
 msgid "Generate sourcecode used to link in the resource file into your code"
 msgstr ""
 "Vygeneruje zdrojový kód použitý na prepojenie súboru zdrojov s vaším kódom"
 
 # cmd desc
-#: ../gio/glib-compile-resources.c:627
+#: ../gio/glib-compile-resources.c:670
 msgid "Generate dependency list"
 msgstr "Vygeneruje zoznam závislostí"
 
-#: ../gio/glib-compile-resources.c:628
+#: ../gio/glib-compile-resources.c:671
 msgid "name of the dependency file to generate"
 msgstr "Názov súboru závislostí na vygenerovanie"
 
+#: ../gio/glib-compile-resources.c:672
+msgid "Include phony targets in the generated dependency file"
+msgstr "zahrnúť fiktívne ciele do vygenerovaného súboru závislosti"
+
 # cmd desc
-#: ../gio/glib-compile-resources.c:629
-msgid "Don't automatically create and register resource"
+#: ../gio/glib-compile-resources.c:673
+msgid "Don’t automatically create and register resource"
 msgstr "Nebude vytvárať a registrovať zdroj automaticky"
 
 # cmd desc
-#: ../gio/glib-compile-resources.c:630
-msgid "Don't export functions; declare them G_GNUC_INTERNAL"
+#: ../gio/glib-compile-resources.c:674
+msgid "Don’t export functions; declare them G_GNUC_INTERNAL"
 msgstr "Nebude exportovať funkcie; deklaruje ich pomocou G_GNUC_INTERNAL"
 
 # cmd desc
-#: ../gio/glib-compile-resources.c:631
+#: ../gio/glib-compile-resources.c:675
 msgid "C identifier name used for the generated source code"
 msgstr "Identifikačný názov v jazyku C použitý pre generovaný zdrojový kód"
 
 # cmd program desc
-#: ../gio/glib-compile-resources.c:657
+#: ../gio/glib-compile-resources.c:701
 msgid ""
 "Compile a resource specification into a resource file.\n"
 "Resource specification files have the extension .gresource.xml,\n"
@@ -2407,7 +2429,7 @@ msgstr ""
 "Súbory špecifikácie zdrojov majú príponu .gresource.xml,\n"
 "a súbor zdrojov má príponu s názvom .gresource."
 
-#: ../gio/glib-compile-resources.c:679
+#: ../gio/glib-compile-resources.c:723
 #, c-format
 msgid "You should give exactly one file name\n"
 msgstr "Mali by ste zadať práve jeden názov súboru\n"
@@ -2687,135 +2709,135 @@ msgstr "neurobí sa nič.\n"
 msgid "removed existing output file.\n"
 msgstr "odstránený existujúci výstupný súbor.\n"
 
-#: ../gio/glocalfile.c:642 ../gio/win32/gwinhttpfile.c:420
+#: ../gio/glocalfile.c:643 ../gio/win32/gwinhttpfile.c:420
 #, c-format
 msgid "Invalid filename %s"
 msgstr "Neplatný názov súboru %s"
 
-#: ../gio/glocalfile.c:1036
+#: ../gio/glocalfile.c:1037
 #, c-format
 msgid "Error getting filesystem info for %s: %s"
 msgstr "Chyba pri získavaní informácií o súborovom systéme pre %s: %s"
 
-#: ../gio/glocalfile.c:1175
+#: ../gio/glocalfile.c:1176
 #, c-format
 msgid "Containing mount for file %s not found"
 msgstr "Obklopujúce pripojenie pre súbor %s sa nepodarilo nájsť"
 
-#: ../gio/glocalfile.c:1198
-msgid "Can't rename root directory"
+#: ../gio/glocalfile.c:1199
+msgid "Can’t rename root directory"
 msgstr "Koreňový adresár sa nedá premenovať"
 
-#: ../gio/glocalfile.c:1216 ../gio/glocalfile.c:1239
+#: ../gio/glocalfile.c:1217 ../gio/glocalfile.c:1240
 #, c-format
 msgid "Error renaming file %s: %s"
 msgstr "Chyba pri premenovaní súboru %s: %s"
 
-#: ../gio/glocalfile.c:1223
-msgid "Can't rename file, filename already exists"
+#: ../gio/glocalfile.c:1224
+msgid "Can’t rename file, filename already exists"
 msgstr "Nedá sa premenovať súbor, názov súboru už existuje"
 
-#: ../gio/glocalfile.c:1236 ../gio/glocalfile.c:2250 ../gio/glocalfile.c:2278
-#: ../gio/glocalfile.c:2435 ../gio/glocalfileoutputstream.c:549
+#: ../gio/glocalfile.c:1237 ../gio/glocalfile.c:2251 ../gio/glocalfile.c:2279
+#: ../gio/glocalfile.c:2436 ../gio/glocalfileoutputstream.c:549
 msgid "Invalid filename"
 msgstr "Neplatný názov súboru"
 
-#: ../gio/glocalfile.c:1403 ../gio/glocalfile.c:1418
+#: ../gio/glocalfile.c:1404 ../gio/glocalfile.c:1419
 #, c-format
 msgid "Error opening file %s: %s"
 msgstr "Chyba pri otváraní súboru %s: %s"
 
-#: ../gio/glocalfile.c:1543
+#: ../gio/glocalfile.c:1544
 #, c-format
 msgid "Error removing file %s: %s"
 msgstr "Chyba pri odstraňovaní súboru %s: %s"
 
-#: ../gio/glocalfile.c:1926
+#: ../gio/glocalfile.c:1927
 #, c-format
 msgid "Error trashing file %s: %s"
 msgstr "Chyba pri zahadzovaní súboru %s do Koša: %s"
 
-#: ../gio/glocalfile.c:1949
+#: ../gio/glocalfile.c:1950
 #, c-format
 msgid "Unable to create trash dir %s: %s"
 msgstr "Nepodarilo sa vytvoriť adresár Kôš %s: %s"
 
-#: ../gio/glocalfile.c:1969
+#: ../gio/glocalfile.c:1970
 #, c-format
 msgid "Unable to find toplevel directory to trash %s"
 msgstr "Nepodarilo sa nájsť adresár najvyššej úrovne pre Kôš %s"
 
-#: ../gio/glocalfile.c:2048 ../gio/glocalfile.c:2068
+#: ../gio/glocalfile.c:2049 ../gio/glocalfile.c:2069
 #, c-format
 msgid "Unable to find or create trash directory for %s"
 msgstr "Nepodarilo sa nájsť ani vytvoriť adresár Kôš pre %s"
 
-#: ../gio/glocalfile.c:2102
+#: ../gio/glocalfile.c:2103
 #, c-format
 msgid "Unable to create trashing info file for %s: %s"
 msgstr ""
 "Nepodarilo sa vytvoriť informačný súbor o zahadzovaní do Koša pre %s: %s"
 
-#: ../gio/glocalfile.c:2161
+#: ../gio/glocalfile.c:2162
 #, c-format
 msgid "Unable to trash file %s across filesystem boundaries"
 msgstr ""
 "Nepodarilo sa zahodiť súbor do Koša cez hranice súborových systémov: %s"
 
-#: ../gio/glocalfile.c:2165 ../gio/glocalfile.c:2221
+#: ../gio/glocalfile.c:2166 ../gio/glocalfile.c:2222
 #, c-format
 msgid "Unable to trash file %s: %s"
 msgstr "Nepodarilo sa zahodiť súbor %s do Koša: %s"
 
-#: ../gio/glocalfile.c:2227
+#: ../gio/glocalfile.c:2228
 #, c-format
 msgid "Unable to trash file %s"
 msgstr "Nepodarilo sa zahodiť súbor %s do Koša"
 
-#: ../gio/glocalfile.c:2253
+#: ../gio/glocalfile.c:2254
 #, c-format
 msgid "Error creating directory %s: %s"
 msgstr "Chyba pri vytváraní adresára %s: %s"
 
-#: ../gio/glocalfile.c:2282
+#: ../gio/glocalfile.c:2283
 #, c-format
 msgid "Filesystem does not support symbolic links"
 msgstr "Súborový systém nepodporuje symbolické odkazy"
 
-#: ../gio/glocalfile.c:2285
+#: ../gio/glocalfile.c:2286
 #, c-format
 msgid "Error making symbolic link %s: %s"
 msgstr "Chyba pri vytváraní symbolického odkazu %s: %s"
 
-#: ../gio/glocalfile.c:2291 ../glib/gfileutils.c:2064
+#: ../gio/glocalfile.c:2292 ../glib/gfileutils.c:2063
 msgid "Symbolic links not supported"
 msgstr "Symbolické odkazy nie sú podporované"
 
-#: ../gio/glocalfile.c:2346 ../gio/glocalfile.c:2381 ../gio/glocalfile.c:2438
+#: ../gio/glocalfile.c:2347 ../gio/glocalfile.c:2382 ../gio/glocalfile.c:2439
 #, c-format
 msgid "Error moving file %s: %s"
 msgstr "Chyba pri presúvaní súboru %s: %s"
 
-#: ../gio/glocalfile.c:2369
-msgid "Can't move directory over directory"
+#: ../gio/glocalfile.c:2370
+msgid "Can’t move directory over directory"
 msgstr "Nedá sa prepísať adresár adresárom počas presúvania"
 
-#: ../gio/glocalfile.c:2395 ../gio/glocalfileoutputstream.c:925
+#: ../gio/glocalfile.c:2396 ../gio/glocalfileoutputstream.c:925
 #: ../gio/glocalfileoutputstream.c:939 ../gio/glocalfileoutputstream.c:954
 #: ../gio/glocalfileoutputstream.c:971 ../gio/glocalfileoutputstream.c:985
 msgid "Backup file creation failed"
 msgstr "Vytvorenie súboru zálohy zlyhalo"
 
-#: ../gio/glocalfile.c:2414
+#: ../gio/glocalfile.c:2415
 #, c-format
 msgid "Error removing target file: %s"
 msgstr "Chyba pri odstraňovaní cieľového súboru: %s"
 
-#: ../gio/glocalfile.c:2428
+#: ../gio/glocalfile.c:2429
 msgid "Move between mounts not supported"
 msgstr "Presun medzi pripojeniami nie je podporovaný"
 
-#: ../gio/glocalfile.c:2619
+#: ../gio/glocalfile.c:2620
 #, c-format
 msgid "Could not determine the disk usage of %s: %s"
 msgstr "Nepodarilo sa určiť využitie disku %s: %s"
@@ -2834,7 +2856,7 @@ msgstr "Neplatný názov rozšíreného atribútu"
 
 #: ../gio/glocalfileinfo.c:775
 #, c-format
-msgid "Error setting extended attribute '%s': %s"
+msgid "Error setting extended attribute “%s”: %s"
 msgstr "Chyba pri nastavovaní rozšíreného atribútu „%s“: %s"
 
 #: ../gio/glocalfileinfo.c:1575
@@ -2843,7 +2865,7 @@ msgstr " (neplatné kódovanie)"
 
 #: ../gio/glocalfileinfo.c:1766 ../gio/glocalfileoutputstream.c:803
 #, c-format
-msgid "Error when getting information for file '%s': %s"
+msgid "Error when getting information for file “%s”: %s"
 msgstr "Chyba pri získavaní informácií pre súbor „%s“: %s"
 
 #: ../gio/glocalfileinfo.c:2017
@@ -2966,8 +2988,8 @@ msgstr "Chyba pri skracovaní súboru: %s"
 #: ../gio/glocalfileoutputstream.c:555 ../gio/glocalfileoutputstream.c:785
 #: ../gio/glocalfileoutputstream.c:1035 ../gio/gsubprocess.c:360
 #, c-format
-msgid "Error opening file '%s': %s"
-msgstr "Chyba pri otváraní súboru „%s“: %s"
+msgid "Error opening file “%s”: %s"
+msgstr "Chyba pri otváraní súboru %s: %s"
 
 #: ../gio/glocalfileoutputstream.c:816
 msgid "Target file is a directory"
@@ -3026,21 +3048,21 @@ msgstr "Požadovaný presun za koniec prúdu"
 #. * message for mount objects that
 #. * don't implement unmount.
 #: ../gio/gmount.c:393
-msgid "mount doesn't implement \"unmount\""
+msgid "mount doesn’t implement “unmount”"
 msgstr "pripojenie neimplementuje „unmount“ (odpojenie)"
 
 #. Translators: This is an error
 #. * message for mount objects that
 #. * don't implement eject.
 #: ../gio/gmount.c:469
-msgid "mount doesn't implement \"eject\""
+msgid "mount doesn’t implement “eject”"
 msgstr "pripojenie neimplementuje „eject“ (vysunutie)"
 
 #. Translators: This is an error
 #. * message for mount objects that
 #. * don't implement any of unmount or unmount_with_operation.
 #: ../gio/gmount.c:547
-msgid "mount doesn't implement \"unmount\" or \"unmount_with_operation\""
+msgid "mount doesn’t implement “unmount” or “unmount_with_operation”"
 msgstr ""
 "pripojenie neimplementuje „unmount“ (odpojenie) ani "
 "„unmount_with_operation“ (odpojenie s operáciou)"
@@ -3049,7 +3071,7 @@ msgstr ""
 #. * message for mount objects that
 #. * don't implement any of eject or eject_with_operation.
 #: ../gio/gmount.c:632
-msgid "mount doesn't implement \"eject\" or \"eject_with_operation\""
+msgid "mount doesn’t implement “eject” or “eject_with_operation”"
 msgstr ""
 "pripojenie neimplementuje „eject“ (vysunutie) ani "
 "„eject_with_operation“ (vysunutie s operáciou)"
@@ -3058,26 +3080,26 @@ msgstr ""
 #. * message for mount objects that
 #. * don't implement remount.
 #: ../gio/gmount.c:720
-msgid "mount doesn't implement \"remount\""
+msgid "mount doesn’t implement “remount”"
 msgstr "pripojenie neimplementuje „remount“ (opätovné pripojenie)"
 
 #. Translators: This is an error
 #. * message for mount objects that
 #. * don't implement content type guessing.
 #: ../gio/gmount.c:802
-msgid "mount doesn't implement content type guessing"
+msgid "mount doesn’t implement content type guessing"
 msgstr "pripojenie neimplementuje odhad typu obsahu"
 
 #. Translators: This is an error
 #. * message for mount objects that
 #. * don't implement content type guessing.
 #: ../gio/gmount.c:889
-msgid "mount doesn't implement synchronous content type guessing"
+msgid "mount doesn’t implement synchronous content type guessing"
 msgstr "pripojenie neimplementuje synchrónny odhad typu obsahu"
 
 #: ../gio/gnetworkaddress.c:378
 #, c-format
-msgid "Hostname '%s' contains '[' but not ']'"
+msgid "Hostname “%s” contains “[” but not “]”"
 msgstr "Názov hostiteľa „%s“ obsahuje „[“, ale neobsahuje „]“"
 
 #: ../gio/gnetworkmonitorbase.c:206 ../gio/gnetworkmonitorbase.c:310
@@ -3108,17 +3130,17 @@ msgid "NetworkManager version too old"
 msgstr "Verzia programu NetworkManager je príliš stará"
 
 #: ../gio/goutputstream.c:212 ../gio/goutputstream.c:560
-msgid "Output stream doesn't implement write"
+msgid "Output stream doesn’t implement write"
 msgstr "Výstupný prúd neimplementuje zápis"
 
 #: ../gio/goutputstream.c:521 ../gio/goutputstream.c:1224
 msgid "Source stream is already closed"
 msgstr "Zdrojový prúd je už zatvorený"
 
-#: ../gio/gresolver.c:333 ../gio/gthreadedresolver.c:116
+#: ../gio/gresolver.c:342 ../gio/gthreadedresolver.c:116
 #: ../gio/gthreadedresolver.c:126
 #, c-format
-msgid "Error resolving '%s': %s"
+msgid "Error resolving “%s”: %s"
 msgstr "Chyba pri preklade adresy „%s“: %s"
 
 # %s je cesta
@@ -3127,26 +3149,26 @@ msgstr "Chyba pri preklade adresy „%s“: %s"
 #: ../gio/gresource.c:1202 ../gio/gresourcefile.c:453
 #: ../gio/gresourcefile.c:576 ../gio/gresourcefile.c:713
 #, c-format
-msgid "The resource at '%s' does not exist"
+msgid "The resource at “%s” does not exist"
 msgstr "Zdroj v „%s“ neexistuje"
 
 # %s je cesta
 #: ../gio/gresource.c:760
 #, c-format
-msgid "The resource at '%s' failed to decompress"
+msgid "The resource at “%s” failed to decompress"
 msgstr "Zdroj v „%s“ sa nepodarilo rozbaliť"
 
 # %s je cesta
 #: ../gio/gresourcefile.c:709
 #, c-format
-msgid "The resource at '%s' is not a directory"
+msgid "The resource at “%s” is not a directory"
 msgstr "Zdroj v „%s“ nie je adresár"
 
 # MČ: všimol som si to na viacerých miestach, ale nepasuje mi to. Nemalo by byť skôr „posúvanie“?
 # PM: presúvaš sa na iné miesto posúvanie mi tiez nevadí, ak dalsí kontrolór uzná ze by to malo byt posúvanie môže zmeniť.
 # PK: necham presuvanie, lebo presuva sa kurzor, posuvanie mi evokuje ze sa data posuvaju
 #: ../gio/gresourcefile.c:917
-msgid "Input stream doesn't implement seek"
+msgid "Input stream doesn’t implement seek"
 msgstr "Vstupný prúd neimplementuje presúvanie"
 
 #: ../gio/gresource-tool.c:494
@@ -3195,7 +3217,7 @@ msgstr "CESTA SÚBORU"
 #: ../gio/gresource-tool.c:534
 msgid ""
 "Usage:\n"
-"  gresource [--section SECTION] COMMAND [ARGS...]\n"
+"  gresource [--section SECTION] COMMAND [ARGS…]\n"
 "\n"
 "Commands:\n"
 "  help                      Show this information\n"
@@ -3204,7 +3226,7 @@ msgid ""
 "  details                   List resources with details\n"
 "  extract                   Extract a resource\n"
 "\n"
-"Use 'gresource help COMMAND' to get detailed help.\n"
+"Use “gresource help COMMAND” to get detailed help.\n"
 "\n"
 msgstr ""
 "Použitie:\n"
@@ -3272,17 +3294,17 @@ msgstr "  CESTA     Cesta k súboru zdrojov\n"
 #: ../gio/gsettings-tool.c:51 ../gio/gsettings-tool.c:72
 #: ../gio/gsettings-tool.c:851
 #, c-format
-msgid "No such schema '%s'\n"
+msgid "No such schema “%s”\n"
 msgstr "Neexistuje schéma „%s“\n"
 
 #: ../gio/gsettings-tool.c:57
 #, c-format
-msgid "Schema '%s' is not relocatable (path must not be specified)\n"
+msgid "Schema “%s” is not relocatable (path must not be specified)\n"
 msgstr "Schéma „%s“ nie je premiestniteľná (cesta nesmie byť určená)\n"
 
 #: ../gio/gsettings-tool.c:78
 #, c-format
-msgid "Schema '%s' is relocatable (path must be specified)\n"
+msgid "Schema “%s” is relocatable (path must be specified)\n"
 msgstr "Schéma „%s“ je premiestniteľná (cesta musí byť určená)\n"
 
 #: ../gio/gsettings-tool.c:92
@@ -3404,7 +3426,7 @@ msgstr "SCHÉMA[:CESTA] [KĽÚČ]"
 msgid ""
 "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"
@@ -3422,7 +3444,7 @@ msgid ""
 "  writable                  Check if a key is writable\n"
 "  monitor                   Watch for changes\n"
 "\n"
-"Use 'gsettings help COMMAND' to get detailed help.\n"
+"Use “gsettings help COMMAND” to get detailed help.\n"
 "\n"
 msgstr ""
 "Použitie:\n"
@@ -3504,152 +3526,152 @@ msgstr "Poskytnutý prázdny názov schémy\n"
 
 #: ../gio/gsettings-tool.c:864
 #, c-format
-msgid "No such key '%s'\n"
+msgid "No such key “%s”\n"
 msgstr "Neexistuje kľúč „%s“\n"
 
-#: ../gio/gsocket.c:364
+#: ../gio/gsocket.c:369
 msgid "Invalid socket, not initialized"
 msgstr "Neplatný soket, neinicializované"
 
-#: ../gio/gsocket.c:371
+#: ../gio/gsocket.c:376
 #, c-format
 msgid "Invalid socket, initialization failed due to: %s"
 msgstr "Neplatný soket, inicializácia zlyhala kvôli: %s"
 
-#: ../gio/gsocket.c:379
+#: ../gio/gsocket.c:384
 msgid "Socket is already closed"
 msgstr "Soket je už zatvorený"
 
-#: ../gio/gsocket.c:394 ../gio/gsocket.c:2751 ../gio/gsocket.c:3897
-#: ../gio/gsocket.c:3952
+#: ../gio/gsocket.c:399 ../gio/gsocket.c:2754 ../gio/gsocket.c:3939
+#: ../gio/gsocket.c:3995
 msgid "Socket I/O timed out"
 msgstr "Vypršal časový limit V/V soketu"
 
-#: ../gio/gsocket.c:526
+#: ../gio/gsocket.c:531
 #, c-format
 msgid "creating GSocket from fd: %s"
 msgstr "vytvára sa GSocket z popisovanča súboru: %s"
 
-#: ../gio/gsocket.c:554 ../gio/gsocket.c:608 ../gio/gsocket.c:615
+#: ../gio/gsocket.c:559 ../gio/gsocket.c:613 ../gio/gsocket.c:620
 #, c-format
 msgid "Unable to create socket: %s"
 msgstr "Nepodarilo sa vytvoriť soket: %s"
 
-#: ../gio/gsocket.c:608
+#: ../gio/gsocket.c:613
 msgid "Unknown family was specified"
 msgstr "Bola zadaná neznáma rodina protokolov"
 
-#: ../gio/gsocket.c:615
+#: ../gio/gsocket.c:620
 msgid "Unknown protocol was specified"
 msgstr "Bol zadaný neznámy protokol"
 
-#: ../gio/gsocket.c:1104
+#: ../gio/gsocket.c:1111
 #, c-format
 msgid "Cannot use datagram operations on a non-datagram socket."
 msgstr ""
 "Nedajú sa použiť operácie soketu datagram na sokete nepodporujúcom datagram."
 
-#: ../gio/gsocket.c:1121
+#: ../gio/gsocket.c:1128
 #, c-format
 msgid "Cannot use datagram operations on a socket with a timeout set."
 msgstr ""
 "Nedajú sa použiť operácie soketu datagram na sokete s nastavením vypršaním "
 "času."
 
-#: ../gio/gsocket.c:1925
+#: ../gio/gsocket.c:1932
 #, c-format
 msgid "could not get local address: %s"
 msgstr "nepodarilo sa získať lokálnu adresu: %s"
 
-#: ../gio/gsocket.c:1968
+#: ../gio/gsocket.c:1975
 #, c-format
 msgid "could not get remote address: %s"
 msgstr "nepodarilo sa získať vzdialenú adresu: %s"
 
-#: ../gio/gsocket.c:2034
+#: ../gio/gsocket.c:2041
 #, c-format
 msgid "could not listen: %s"
 msgstr "nepodarilo sa počúvať: %s"
 
-#: ../gio/gsocket.c:2133
+#: ../gio/gsocket.c:2140
 #, c-format
 msgid "Error binding to address: %s"
 msgstr "Chyba pri viazaní sa na adresu: %s"
 
-#: ../gio/gsocket.c:2248 ../gio/gsocket.c:2285
+#: ../gio/gsocket.c:2255 ../gio/gsocket.c:2292
 #, c-format
 msgid "Error joining multicast group: %s"
 msgstr "Chyba pri pripájaní sa k multicast skupine: %s"
 
-#: ../gio/gsocket.c:2249 ../gio/gsocket.c:2286
+#: ../gio/gsocket.c:2256 ../gio/gsocket.c:2293
 #, c-format
 msgid "Error leaving multicast group: %s"
 msgstr "Chyba pri odpájaní sa od multicast skupiny: %s"
 
 # PM: SSM je termín neprekladal som to
 # http://en.wikipedia.org/wiki/Source-specific_multicast
-#: ../gio/gsocket.c:2250
+#: ../gio/gsocket.c:2257
 msgid "No support for source-specific multicast"
 msgstr "Nie je podpora pre source-specific multicast"
 
-#: ../gio/gsocket.c:2470
+#: ../gio/gsocket.c:2477
 #, c-format
 msgid "Error accepting connection: %s"
 msgstr "Chyba pri prijímaní pripojenia: %s"
 
-#: ../gio/gsocket.c:2593
+#: ../gio/gsocket.c:2598
 msgid "Connection in progress"
 msgstr "Prebieha pripájanie"
 
-#: ../gio/gsocket.c:2644
+#: ../gio/gsocket.c:2647
 msgid "Unable to get pending error: "
 msgstr "Nepodarilo sa získať chybu určenú na spracovanie: %s"
 
-#: ../gio/gsocket.c:2816
+#: ../gio/gsocket.c:2817
 #, c-format
 msgid "Error receiving data: %s"
 msgstr "Chyba pri prijímaní údajov: %s"
 
-#: ../gio/gsocket.c:3013
+#: ../gio/gsocket.c:3012
 #, c-format
 msgid "Error sending data: %s"
 msgstr "Chyba pri odosielaní údajov: %s"
 
-#: ../gio/gsocket.c:3200
+#: ../gio/gsocket.c:3199
 #, c-format
 msgid "Unable to shutdown socket: %s"
 msgstr "Nepodarilo sa vypnúť soket: %s"
 
-#: ../gio/gsocket.c:3281
+#: ../gio/gsocket.c:3280
 #, c-format
 msgid "Error closing socket: %s"
 msgstr "Chyba pri zatváraní soketu: %s"
 
-#: ../gio/gsocket.c:3890
+#: ../gio/gsocket.c:3932
 #, c-format
 msgid "Waiting for socket condition: %s"
 msgstr "Čaká sa na stav soketu: %s"
 
-#: ../gio/gsocket.c:4362 ../gio/gsocket.c:4442 ../gio/gsocket.c:4620
+#: ../gio/gsocket.c:4404 ../gio/gsocket.c:4484 ../gio/gsocket.c:4662
 #, c-format
 msgid "Error sending message: %s"
 msgstr "Chyba pri odosielaní správy: %s"
 
-#: ../gio/gsocket.c:4386
+#: ../gio/gsocket.c:4428
 msgid "GSocketControlMessage not supported on Windows"
 msgstr "GSocketControlMessage nie je podporovaný vo Windows"
 
-#: ../gio/gsocket.c:4839 ../gio/gsocket.c:4912 ../gio/gsocket.c:5139
+#: ../gio/gsocket.c:4881 ../gio/gsocket.c:4954 ../gio/gsocket.c:5180
 #, c-format
 msgid "Error receiving message: %s"
 msgstr "Chyba pri prijímaní správy: %s"
 
-#: ../gio/gsocket.c:5411
+#: ../gio/gsocket.c:5452
 #, c-format
 msgid "Unable to read socket credentials: %s"
 msgstr "Nepodarilo sa prečítať poverenia soketu: %s"
 
-#: ../gio/gsocket.c:5420
+#: ../gio/gsocket.c:5461
 msgid "g_socket_get_credentials not implemented for this OS"
 msgstr ""
 "g_socket_get_credentials nie je pre tento operačný systém implementovaný"
@@ -3678,7 +3700,7 @@ msgstr "Pripojenie cez proxy nepoužívajúce TCP nie je podporované."
 
 #: ../gio/gsocketclient.c:1110 ../gio/gsocketclient.c:1561
 #, c-format
-msgid "Proxy protocol '%s' is not supported."
+msgid "Proxy protocol “%s” is not supported."
 msgstr "Protokol proxy „%s“ nie je podporovaný."
 
 #: ../gio/gsocketlistener.c:218
@@ -3691,7 +3713,7 @@ msgstr "Pridaný soket je zatvorený"
 
 #: ../gio/gsocks4aproxy.c:118
 #, c-format
-msgid "SOCKSv4 does not support IPv6 address '%s'"
+msgid "SOCKSv4 does not support IPv6 address “%s”"
 msgstr "SOCKSv4 nepodporuje adresu IPv6 „%s“"
 
 #: ../gio/gsocks4aproxy.c:136
@@ -3700,7 +3722,7 @@ msgstr "Používateľské meno je príliš dlhé pre protokol SOCKSv4"
 
 #: ../gio/gsocks4aproxy.c:153
 #, c-format
-msgid "Hostname '%s' is too long for SOCKSv4 protocol"
+msgid "Hostname “%s” is too long for SOCKSv4 protocol"
 msgstr "Názov hostiteľa „%s“ je pre protokol SOCKSv4 príliš dlhý"
 
 #: ../gio/gsocks4aproxy.c:179
@@ -3739,7 +3761,7 @@ msgstr ""
 
 #: ../gio/gsocks5proxy.c:286
 #, c-format
-msgid "Hostname '%s' is too long for SOCKSv5 protocol"
+msgid "Hostname “%s” is too long for SOCKSv5 protocol"
 msgstr "Názov hostiteľa „%s“ je pre protokol SOCKSv5 príliš dlhý"
 
 #: ../gio/gsocks5proxy.c:348
@@ -3767,7 +3789,7 @@ msgid "Connection refused through SOCKSv5 proxy."
 msgstr "Pripojenie cez proxy SOCKSv5 je odmietnuté."
 
 #: ../gio/gsocks5proxy.c:386
-msgid "SOCKSv5 proxy does not support 'connect' command."
+msgid "SOCKSv5 proxy does not support “connect” command."
 msgstr "Proxy SOCKSv5 nepodporuje príkaz „connect“."
 
 #: ../gio/gsocks5proxy.c:392
@@ -3780,7 +3802,7 @@ msgstr "Neznáma chyba proxy SOCKSv5."
 
 #: ../gio/gthemedicon.c:518
 #, c-format
-msgid "Can't handle version %d of GThemedIcon encoding"
+msgid "Can’t handle version %d of GThemedIcon encoding"
 msgstr "Nedá sa spracovať kódovanie GThemedIcon verzie %d"
 
 #: ../gio/gthreadedresolver.c:118
@@ -3789,24 +3811,24 @@ msgstr "Nenašli sa žiadne platné adresy"
 
 #: ../gio/gthreadedresolver.c:213
 #, c-format
-msgid "Error reverse-resolving '%s': %s"
+msgid "Error reverse-resolving “%s”: %s"
 msgstr "Chyba pri pri spätnom preklade adresy „%s“: %s"
 
 #: ../gio/gthreadedresolver.c:550 ../gio/gthreadedresolver.c:630
 #: ../gio/gthreadedresolver.c:728 ../gio/gthreadedresolver.c:778
 #, c-format
-msgid "No DNS record of the requested type for '%s'"
+msgid "No DNS record of the requested type for “%s”"
 msgstr "Neexistuje DNS záznam požadovaného typu pre „%s“"
 
 # DNS
 #: ../gio/gthreadedresolver.c:555 ../gio/gthreadedresolver.c:733
 #, c-format
-msgid "Temporarily unable to resolve '%s'"
+msgid "Temporarily unable to resolve “%s”"
 msgstr "Služba nie je dočasne schopná preložiť adresu „%s“"
 
 #: ../gio/gthreadedresolver.c:560 ../gio/gthreadedresolver.c:738
 #, c-format
-msgid "Error resolving '%s'"
+msgid "Error resolving “%s”"
 msgstr "Chyba pri preklade adresy „%s“"
 
 #: ../gio/gtlscertificate.c:250
@@ -3921,7 +3943,7 @@ msgstr "Chyba pri čítaní z popisovača súboru: %s"
 msgid "Error closing file descriptor: %s"
 msgstr "Chyba pri zatváraní popisovača súboru: %s"
 
-#: ../gio/gunixmounts.c:2329 ../gio/gunixmounts.c:2382
+#: ../gio/gunixmounts.c:2367 ../gio/gunixmounts.c:2420
 msgid "Filesystem root"
 msgstr "Koreň súborového systému"
 
@@ -3930,20 +3952,20 @@ msgstr "Koreň súborového systému"
 msgid "Error writing to file descriptor: %s"
 msgstr "Chyba pri zápise do popisovača súboru: %s"
 
-#: ../gio/gunixsocketaddress.c:239
+#: ../gio/gunixsocketaddress.c:241
 msgid "Abstract UNIX domain socket addresses not supported on this system"
 msgstr ""
 "V tomto systéme nie sú podporované abstraktné adresy soketov unixových domén"
 
 #: ../gio/gvolume.c:437
-msgid "volume doesn't implement eject"
+msgid "volume doesn’t implement eject"
 msgstr "zväzok neimplementuje vysunutie"
 
 #. Translators: This is an error
 #. * message for volume objects that
 #. * don't implement any of eject or eject_with_operation.
 #: ../gio/gvolume.c:514
-msgid "volume doesn't implement eject or eject_with_operation"
+msgid "volume doesn’t implement eject or eject_with_operation"
 msgstr ""
 "zväzok neimplementuje eject (vysunutie) ani eject_with_operation (vysunutie "
 "s operáciou)"
@@ -4008,75 +4030,75 @@ msgstr "Spustí službu dbus"
 msgid "Wrong args\n"
 msgstr "Chybné parametre\n"
 
-#: ../glib/gbookmarkfile.c:755
+#: ../glib/gbookmarkfile.c:754
 #, c-format
-msgid "Unexpected attribute '%s' for element '%s'"
+msgid "Unexpected attribute “%s” for element “%s”"
 msgstr "Neočakávaný atribút „%s“ prvku „%s“"
 
-#: ../glib/gbookmarkfile.c:766 ../glib/gbookmarkfile.c:837
-#: ../glib/gbookmarkfile.c:847 ../glib/gbookmarkfile.c:954
+#: ../glib/gbookmarkfile.c:765 ../glib/gbookmarkfile.c:836
+#: ../glib/gbookmarkfile.c:846 ../glib/gbookmarkfile.c:953
 #, c-format
-msgid "Attribute '%s' of element '%s' not found"
+msgid "Attribute “%s” of element “%s” not found"
 msgstr "Atribút „%s“ prvku „%s“ nenájdený"
 
-#: ../glib/gbookmarkfile.c:1124 ../glib/gbookmarkfile.c:1189
-#: ../glib/gbookmarkfile.c:1253 ../glib/gbookmarkfile.c:1263
+#: ../glib/gbookmarkfile.c:1123 ../glib/gbookmarkfile.c:1188
+#: ../glib/gbookmarkfile.c:1252 ../glib/gbookmarkfile.c:1262
 #, c-format
-msgid "Unexpected tag '%s', tag '%s' expected"
+msgid "Unexpected tag “%s”, tag “%s” expected"
 msgstr "Neočakávaná značka „%s“, bola očakávaná značka „%s“"
 
-#: ../glib/gbookmarkfile.c:1149 ../glib/gbookmarkfile.c:1163
-#: ../glib/gbookmarkfile.c:1231
+#: ../glib/gbookmarkfile.c:1148 ../glib/gbookmarkfile.c:1162
+#: ../glib/gbookmarkfile.c:1230
 #, c-format
-msgid "Unexpected tag '%s' inside '%s'"
+msgid "Unexpected tag “%s” inside “%s”"
 msgstr "Neočakávaná značka „%s“ vo vnútri „%s“"
 
-#: ../glib/gbookmarkfile.c:1757
+#: ../glib/gbookmarkfile.c:1756
 msgid "No valid bookmark file found in data dirs"
 msgstr "V dátových adresároch nebol nájdený žiadny platný súbor záložiek"
 
-#: ../glib/gbookmarkfile.c:1958
+#: ../glib/gbookmarkfile.c:1957
 #, c-format
-msgid "A bookmark for URI '%s' already exists"
+msgid "A bookmark for URI “%s” already exists"
 msgstr "Záložka pre identifikátor URI „%s“ už existuje"
 
-#: ../glib/gbookmarkfile.c:2004 ../glib/gbookmarkfile.c:2162
-#: ../glib/gbookmarkfile.c:2247 ../glib/gbookmarkfile.c:2327
-#: ../glib/gbookmarkfile.c:2412 ../glib/gbookmarkfile.c:2495
-#: ../glib/gbookmarkfile.c:2573 ../glib/gbookmarkfile.c:2652
-#: ../glib/gbookmarkfile.c:2694 ../glib/gbookmarkfile.c:2791
-#: ../glib/gbookmarkfile.c:2911 ../glib/gbookmarkfile.c:3101
-#: ../glib/gbookmarkfile.c:3177 ../glib/gbookmarkfile.c:3345
-#: ../glib/gbookmarkfile.c:3434 ../glib/gbookmarkfile.c:3523
-#: ../glib/gbookmarkfile.c:3639
-#, c-format
-msgid "No bookmark found for URI '%s'"
+#: ../glib/gbookmarkfile.c:2003 ../glib/gbookmarkfile.c:2161
+#: ../glib/gbookmarkfile.c:2246 ../glib/gbookmarkfile.c:2326
+#: ../glib/gbookmarkfile.c:2411 ../glib/gbookmarkfile.c:2494
+#: ../glib/gbookmarkfile.c:2572 ../glib/gbookmarkfile.c:2651
+#: ../glib/gbookmarkfile.c:2693 ../glib/gbookmarkfile.c:2790
+#: ../glib/gbookmarkfile.c:2910 ../glib/gbookmarkfile.c:3100
+#: ../glib/gbookmarkfile.c:3176 ../glib/gbookmarkfile.c:3344
+#: ../glib/gbookmarkfile.c:3433 ../glib/gbookmarkfile.c:3522
+#: ../glib/gbookmarkfile.c:3638
+#, c-format
+msgid "No bookmark found for URI “%s”"
 msgstr "Nebola nájedená záložka pre identifikátor URI „%s“"
 
-#: ../glib/gbookmarkfile.c:2336
+#: ../glib/gbookmarkfile.c:2335
 #, c-format
-msgid "No MIME type defined in the bookmark for URI '%s'"
+msgid "No MIME type defined in the bookmark for URI “%s”"
 msgstr "V záložke pre identifikátor URI „%s“ nie je definovaný žiadny typ MIME"
 
-#: ../glib/gbookmarkfile.c:2421
+#: ../glib/gbookmarkfile.c:2420
 #, c-format
-msgid "No private flag has been defined in bookmark for URI '%s'"
+msgid "No private flag has been defined in bookmark for URI “%s”"
 msgstr ""
 "V záložke pre identifikátor URI „%s“ nebol definovaný žiadny súkromný príznak"
 
-#: ../glib/gbookmarkfile.c:2800
+#: ../glib/gbookmarkfile.c:2799
 #, c-format
-msgid "No groups set in bookmark for URI '%s'"
+msgid "No groups set in bookmark for URI “%s”"
 msgstr "V záložke pre identifikátor URI „%s“ neboli nastavené žiadne skupiny"
 
-#: ../glib/gbookmarkfile.c:3198 ../glib/gbookmarkfile.c:3355
+#: ../glib/gbookmarkfile.c:3197 ../glib/gbookmarkfile.c:3354
 #, c-format
-msgid "No application with name '%s' registered a bookmark for '%s'"
+msgid "No application with name “%s” registered a bookmark for “%s”"
 msgstr "Žiadna aplikácia s názvom „%s“ nezaregistrovala záložku pre „%s“"
 
-#: ../glib/gbookmarkfile.c:3378
+#: ../glib/gbookmarkfile.c:3377
 #, c-format
-msgid "Failed to expand exec line '%s' with URI '%s'"
+msgid "Failed to expand exec line “%s” with URI “%s”"
 msgstr "Zlyhalo rozvinutie spustiteľného riadka „%s“ o identifikátor URI „%s“"
 
 #: ../glib/gconvert.c:477 ../glib/gutf8.c:851 ../glib/gutf8.c:1063
@@ -4086,362 +4108,358 @@ msgstr "Čiastočná sekvencia znakov na konci vstupu"
 
 #: ../glib/gconvert.c:742
 #, c-format
-msgid "Cannot convert fallback '%s' to codeset '%s'"
+msgid "Cannot convert fallback “%s” to codeset “%s”"
 msgstr "Nedá sa previesť náhradné „%s“ do kódovej stránky „%s“"
 
-#: ../glib/gconvert.c:1567
+#: ../glib/gconvert.c:1566
 #, c-format
-msgid "The URI '%s' is not an absolute URI using the \"file\" scheme"
+msgid "The URI “%s” is not an absolute URI using the “file” scheme"
 msgstr ""
 "Identifikátor URI „%s“ nie je absolútny identifikátor URI používajúci schému "
 "„file“"
 
-#: ../glib/gconvert.c:1577
+#: ../glib/gconvert.c:1576
 #, c-format
-msgid "The local file URI '%s' may not include a '#'"
+msgid "The local file URI “%s” may not include a “#”"
 msgstr "Identifikátor URI lokálneho súboru „%s“ nesmie obsahovať „#“"
 
-#: ../glib/gconvert.c:1594
+#: ../glib/gconvert.c:1593
 #, c-format
-msgid "The URI '%s' is invalid"
+msgid "The URI “%s” is invalid"
 msgstr "Identifikátor URI „%s“ je neplatný"
 
-#: ../glib/gconvert.c:1606
+#: ../glib/gconvert.c:1605
 #, c-format
-msgid "The hostname of the URI '%s' is invalid"
+msgid "The hostname of the URI “%s” is invalid"
 msgstr "Názov hostiteľa URI „%s“ je neplatný"
 
-#: ../glib/gconvert.c:1622
+#: ../glib/gconvert.c:1621
 #, c-format
-msgid "The URI '%s' contains invalidly escaped characters"
+msgid "The URI “%s” contains invalidly escaped characters"
 msgstr "Identifikátor URI „%s“ obsahuje neplatné špeciálne uvedené znaky"
 
-#: ../glib/gconvert.c:1717
+#: ../glib/gconvert.c:1716
 #, c-format
-msgid "The pathname '%s' is not an absolute path"
+msgid "The pathname “%s” is not an absolute path"
 msgstr "Cesta „%s“ nie je absolútna"
 
-#: ../glib/gconvert.c:1727
-msgid "Invalid hostname"
-msgstr "Neplatný názov hostiteľa"
-
 # PM: ale myslím si ze by to malo byť preložené, lebo ak si niekto v hodinách prepne na 12 hodinový formát tak si potom nebude vedieť nastaviť správny čas
 #. Translators: 'before midday' indicator
-#: ../glib/gdatetime.c:201
+#: ../glib/gdatetime.c:199
 msgctxt "GDateTime"
 msgid "AM"
 msgstr "Doobeda"
 
 #. Translators: 'after midday' indicator
-#: ../glib/gdatetime.c:203
+#: ../glib/gdatetime.c:201
 msgctxt "GDateTime"
 msgid "PM"
 msgstr "Poobede"
 
 #. Translators: this is the preferred format for expressing the date and the time
-#: ../glib/gdatetime.c:206
+#: ../glib/gdatetime.c:204
 msgctxt "GDateTime"
 msgid "%a %b %e %H:%M:%S %Y"
 msgstr "%a %-d. %B %Y, %H:%M:%S %Z"
 
 #. Translators: this is the preferred format for expressing the date
-#: ../glib/gdatetime.c:209
+#: ../glib/gdatetime.c:207
 msgctxt "GDateTime"
 msgid "%m/%d/%y"
 msgstr "%d.%m.%Y"
 
 #. Translators: this is the preferred format for expressing the time
-#: ../glib/gdatetime.c:212
+#: ../glib/gdatetime.c:210
 msgctxt "GDateTime"
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
 #. Translators: this is the preferred format for expressing 12 hour time
-#: ../glib/gdatetime.c:215
+#: ../glib/gdatetime.c:213
 msgctxt "GDateTime"
 msgid "%I:%M:%S %p"
 msgstr "%H:%M:%S"
 
-#: ../glib/gdatetime.c:228
+#: ../glib/gdatetime.c:226
 msgctxt "full month name"
 msgid "January"
 msgstr "január"
 
-#: ../glib/gdatetime.c:230
+#: ../glib/gdatetime.c:228
 msgctxt "full month name"
 msgid "February"
 msgstr "február"
 
-#: ../glib/gdatetime.c:232
+#: ../glib/gdatetime.c:230
 msgctxt "full month name"
 msgid "March"
 msgstr "marec"
 
-#: ../glib/gdatetime.c:234
+#: ../glib/gdatetime.c:232
 msgctxt "full month name"
 msgid "April"
 msgstr "apríl"
 
-#: ../glib/gdatetime.c:236
+#: ../glib/gdatetime.c:234
 msgctxt "full month name"
 msgid "May"
 msgstr "máj"
 
-#: ../glib/gdatetime.c:238
+#: ../glib/gdatetime.c:236
 msgctxt "full month name"
 msgid "June"
 msgstr "jún"
 
-#: ../glib/gdatetime.c:240
+#: ../glib/gdatetime.c:238
 msgctxt "full month name"
 msgid "July"
 msgstr "júl"
 
-#: ../glib/gdatetime.c:242
+#: ../glib/gdatetime.c:240
 msgctxt "full month name"
 msgid "August"
 msgstr "august"
 
-#: ../glib/gdatetime.c:244
+#: ../glib/gdatetime.c:242
 msgctxt "full month name"
 msgid "September"
 msgstr "september"
 
-#: ../glib/gdatetime.c:246
+#: ../glib/gdatetime.c:244
 msgctxt "full month name"
 msgid "October"
 msgstr "október"
 
-#: ../glib/gdatetime.c:248
+#: ../glib/gdatetime.c:246
 msgctxt "full month name"
 msgid "November"
 msgstr "november"
 
-#: ../glib/gdatetime.c:250
+#: ../glib/gdatetime.c:248
 msgctxt "full month name"
 msgid "December"
 msgstr "december"
 
-#: ../glib/gdatetime.c:265
+#: ../glib/gdatetime.c:263
 msgctxt "abbreviated month name"
 msgid "Jan"
 msgstr "jan"
 
-#: ../glib/gdatetime.c:267
+#: ../glib/gdatetime.c:265
 msgctxt "abbreviated month name"
 msgid "Feb"
 msgstr "feb"
 
-#: ../glib/gdatetime.c:269
+#: ../glib/gdatetime.c:267
 msgctxt "abbreviated month name"
 msgid "Mar"
 msgstr "mar"
 
-#: ../glib/gdatetime.c:271
+#: ../glib/gdatetime.c:269
 msgctxt "abbreviated month name"
 msgid "Apr"
 msgstr "apr"
 
-#: ../glib/gdatetime.c:273
+#: ../glib/gdatetime.c:271
 msgctxt "abbreviated month name"
 msgid "May"
 msgstr "máj"
 
-#: ../glib/gdatetime.c:275
+#: ../glib/gdatetime.c:273
 msgctxt "abbreviated month name"
 msgid "Jun"
 msgstr "jún"
 
-#: ../glib/gdatetime.c:277
+#: ../glib/gdatetime.c:275
 msgctxt "abbreviated month name"
 msgid "Jul"
 msgstr "júl"
 
-#: ../glib/gdatetime.c:279
+#: ../glib/gdatetime.c:277
 msgctxt "abbreviated month name"
 msgid "Aug"
 msgstr "aug"
 
-#: ../glib/gdatetime.c:281
+#: ../glib/gdatetime.c:279
 msgctxt "abbreviated month name"
 msgid "Sep"
 msgstr "sep"
 
-#: ../glib/gdatetime.c:283
+#: ../glib/gdatetime.c:281
 msgctxt "abbreviated month name"
 msgid "Oct"
 msgstr "okt"
 
-#: ../glib/gdatetime.c:285
+#: ../glib/gdatetime.c:283
 msgctxt "abbreviated month name"
 msgid "Nov"
 msgstr "nov"
 
-#: ../glib/gdatetime.c:287
+#: ../glib/gdatetime.c:285
 msgctxt "abbreviated month name"
 msgid "Dec"
 msgstr "dec"
 
-#: ../glib/gdatetime.c:302
+#: ../glib/gdatetime.c:300
 msgctxt "full weekday name"
 msgid "Monday"
 msgstr "pondelok"
 
-#: ../glib/gdatetime.c:304
+#: ../glib/gdatetime.c:302
 msgctxt "full weekday name"
 msgid "Tuesday"
 msgstr "utorok"
 
-#: ../glib/gdatetime.c:306
+#: ../glib/gdatetime.c:304
 msgctxt "full weekday name"
 msgid "Wednesday"
 msgstr "streda"
 
-#: ../glib/gdatetime.c:308
+#: ../glib/gdatetime.c:306
 msgctxt "full weekday name"
 msgid "Thursday"
 msgstr "štvrtok"
 
-#: ../glib/gdatetime.c:310
+#: ../glib/gdatetime.c:308
 msgctxt "full weekday name"
 msgid "Friday"
 msgstr "piatok"
 
-#: ../glib/gdatetime.c:312
+#: ../glib/gdatetime.c:310
 msgctxt "full weekday name"
 msgid "Saturday"
 msgstr "sobota"
 
-#: ../glib/gdatetime.c:314
+#: ../glib/gdatetime.c:312
 msgctxt "full weekday name"
 msgid "Sunday"
 msgstr "nedela"
 
-#: ../glib/gdatetime.c:329
+#: ../glib/gdatetime.c:327
 msgctxt "abbreviated weekday name"
 msgid "Mon"
 msgstr "po"
 
-#: ../glib/gdatetime.c:331
+#: ../glib/gdatetime.c:329
 msgctxt "abbreviated weekday name"
 msgid "Tue"
 msgstr "ut"
 
-#: ../glib/gdatetime.c:333
+#: ../glib/gdatetime.c:331
 msgctxt "abbreviated weekday name"
 msgid "Wed"
 msgstr "st"
 
-#: ../glib/gdatetime.c:335
+#: ../glib/gdatetime.c:333
 msgctxt "abbreviated weekday name"
 msgid "Thu"
 msgstr "št"
 
-#: ../glib/gdatetime.c:337
+#: ../glib/gdatetime.c:335
 msgctxt "abbreviated weekday name"
 msgid "Fri"
 msgstr "pi"
 
-#: ../glib/gdatetime.c:339
+#: ../glib/gdatetime.c:337
 msgctxt "abbreviated weekday name"
 msgid "Sat"
 msgstr "so"
 
-#: ../glib/gdatetime.c:341
+#: ../glib/gdatetime.c:339
 msgctxt "abbreviated weekday name"
 msgid "Sun"
 msgstr "ne"
 
 #: ../glib/gdir.c:155
 #, c-format
-msgid "Error opening directory '%s': %s"
+msgid "Error opening directory “%s”: %s"
 msgstr "Chyba pri otváraní adresára „%s“: %s"
 
-#: ../glib/gfileutils.c:701 ../glib/gfileutils.c:793
+#: ../glib/gfileutils.c:700 ../glib/gfileutils.c:792
 #, c-format
-msgid "Could not allocate %lu byte to read file \"%s\""
-msgid_plural "Could not allocate %lu bytes to read file \"%s\""
+msgid "Could not allocate %lu byte to read file “%s”"
+msgid_plural "Could not allocate %lu bytes to read file “%s”"
 msgstr[0] "Nepodarilo sa alokovať %lu bajtov na čítanie súboru „%s“"
 msgstr[1] "Nepodarilo sa alokovať %lu bajt na čítanie súboru „%s“"
 msgstr[2] "Nepodarilo sa alokovať %lu bajty na čítanie súboru „%s“"
 
-#: ../glib/gfileutils.c:718
+#: ../glib/gfileutils.c:717
 #, c-format
-msgid "Error reading file '%s': %s"
-msgstr "Chyba pri čítaní súboru „%s“: %s"
+msgid "Error reading file “%s”: %s"
+msgstr "Chyba pri čítaní súboru %s: %s"
 
-#: ../glib/gfileutils.c:754
+#: ../glib/gfileutils.c:753
 #, c-format
-msgid "File \"%s\" is too large"
+msgid "File “%s” is too large"
 msgstr "Súbor „%s“ je príliš veľký"
 
-#: ../glib/gfileutils.c:818
+#: ../glib/gfileutils.c:817
 #, c-format
-msgid "Failed to read from file '%s': %s"
+msgid "Failed to read from file “%s”: %s"
 msgstr "Zlyhalo čítanie zo súboru „%s“: %s"
 
-#: ../glib/gfileutils.c:866 ../glib/gfileutils.c:938
+#: ../glib/gfileutils.c:865 ../glib/gfileutils.c:937
 #, c-format
-msgid "Failed to open file '%s': %s"
+msgid "Failed to open file “%s”: %s"
 msgstr "Zlyhalo otvorenie súboru „%s“: %s"
 
-#: ../glib/gfileutils.c:878
+#: ../glib/gfileutils.c:877
 #, c-format
-msgid "Failed to get attributes of file '%s': fstat() failed: %s"
+msgid "Failed to get attributes of file “%s”: fstat() failed: %s"
 msgstr "Zlyhalo získanie atribútov súboru „%s“: fstat() zlyhalo: %s"
 
-#: ../glib/gfileutils.c:908
+#: ../glib/gfileutils.c:907
 #, c-format
-msgid "Failed to open file '%s': fdopen() failed: %s"
+msgid "Failed to open file “%s”: fdopen() failed: %s"
 msgstr "Zlyhalo otvorenie súboru „%s“: fdopen() zlyhalo: %s"
 
-#: ../glib/gfileutils.c:1007
+#: ../glib/gfileutils.c:1006
 #, c-format
-msgid "Failed to rename file '%s' to '%s': g_rename() failed: %s"
+msgid "Failed to rename file “%s” to “%s”: g_rename() failed: %s"
 msgstr "Zlyhalo premenovanie súboru „%s“ na „%s“: g_rename() zlyhalo: %s"
 
-#: ../glib/gfileutils.c:1042 ../glib/gfileutils.c:1541
+#: ../glib/gfileutils.c:1041 ../glib/gfileutils.c:1540
 #, c-format
-msgid "Failed to create file '%s': %s"
+msgid "Failed to create file “%s”: %s"
 msgstr "Zlyhalo vytvorenie súboru „%s“: %s"
 
-#: ../glib/gfileutils.c:1069
+#: ../glib/gfileutils.c:1068
 #, c-format
-msgid "Failed to write file '%s': write() failed: %s"
+msgid "Failed to write file “%s”: write() failed: %s"
 msgstr "Zlyhal zápis súboru „%s“: write() zlyhalo: %s"
 
-#: ../glib/gfileutils.c:1112
+#: ../glib/gfileutils.c:1111
 #, c-format
-msgid "Failed to write file '%s': fsync() failed: %s"
+msgid "Failed to write file “%s”: fsync() failed: %s"
 msgstr "Zlyhal zápis súboru „%s“: fsync() zlyhalo: %s"
 
-#: ../glib/gfileutils.c:1236
+#: ../glib/gfileutils.c:1235
 #, c-format
-msgid "Existing file '%s' could not be removed: g_unlink() failed: %s"
+msgid "Existing file “%s” could not be removed: g_unlink() failed: %s"
 msgstr "Existujúci súbor „%s“ nemohol byť odstránený: g_unlink() zlyhalo: %s"
 
-#: ../glib/gfileutils.c:1507
+#: ../glib/gfileutils.c:1506
 #, c-format
-msgid "Template '%s' invalid, should not contain a '%s'"
+msgid "Template “%s” invalid, should not contain a “%s”"
 msgstr "Šablóna „%s“ je neplatná, nesmie obsahovať „%s“"
 
-#: ../glib/gfileutils.c:1520
+#: ../glib/gfileutils.c:1519
 #, c-format
-msgid "Template '%s' doesn't contain XXXXXX"
+msgid "Template “%s” doesn’t contain XXXXXX"
 msgstr "Šablóna „%s“ neobsahuje XXXXXX"
 
-#: ../glib/gfileutils.c:2045
+#: ../glib/gfileutils.c:2044
 #, c-format
-msgid "Failed to read the symbolic link '%s': %s"
+msgid "Failed to read the symbolic link “%s”: %s"
 msgstr "Zlyhalo načítanie symbolického odkazu „%s“: %s"
 
 #: ../glib/giochannel.c:1388
 #, c-format
-msgid "Could not open converter from '%s' to '%s': %s"
+msgid "Could not open converter from “%s” to “%s”: %s"
 msgstr "Nepodarilo sa otvoriť program na prevod z „%s“ do „%s“: %s"
 
 #: ../glib/giochannel.c:1733
-msgid "Can't do a raw read in g_io_channel_read_line_string"
+msgid "Can’t do a raw read in g_io_channel_read_line_string"
 msgstr "Nedá sa urobiť priame čítanie v g_io_channel_read_line_string"
 
 #: ../glib/giochannel.c:1780 ../glib/giochannel.c:2038
@@ -4454,113 +4472,113 @@ msgid "Channel terminates in a partial character"
 msgstr "Kanál skončil s neúplným znakom"
 
 #: ../glib/giochannel.c:1924
-msgid "Can't do a raw read in g_io_channel_read_to_end"
+msgid "Can’t do a raw read in g_io_channel_read_to_end"
 msgstr "Nedá sa urobiť priame čítanie v g_io_channel_read_to_end"
 
-#: ../glib/gkeyfile.c:737
+#: ../glib/gkeyfile.c:736
 msgid "Valid key file could not be found in search dirs"
 msgstr "Nepodarilo sa nájsť platný súbor kľúčov vo vyhľadávacích adresároch"
 
-#: ../glib/gkeyfile.c:773
+#: ../glib/gkeyfile.c:772
 msgid "Not a regular file"
 msgstr "Nie je bežný súbor"
 
-#: ../glib/gkeyfile.c:1204
+#: ../glib/gkeyfile.c:1203
 #, c-format
 msgid ""
-"Key file contains line '%s' which is not a key-value pair, group, or comment"
+"Key file contains line “%s” which is not a key-value pair, group, or comment"
 msgstr ""
 "Súbor kľúčov obsahuje riadok „%s“, ktorý nie je párom kľúč-hodnota, "
 "skupinou, ani komentárom"
 
-#: ../glib/gkeyfile.c:1261
+#: ../glib/gkeyfile.c:1260
 #, c-format
 msgid "Invalid group name: %s"
 msgstr "Neplatný názov skupiny: %s"
 
-#: ../glib/gkeyfile.c:1283
+#: ../glib/gkeyfile.c:1282
 msgid "Key file does not start with a group"
 msgstr "Súbor kľúčov nezačína skupinou"
 
-#: ../glib/gkeyfile.c:1309
+#: ../glib/gkeyfile.c:1308
 #, c-format
 msgid "Invalid key name: %s"
 msgstr "Neplatný názov kľúča: %s"
 
-#: ../glib/gkeyfile.c:1336
+#: ../glib/gkeyfile.c:1335
 #, c-format
-msgid "Key file contains unsupported encoding '%s'"
+msgid "Key file contains unsupported encoding “%s”"
 msgstr "Súbor kľúčov obsahuje nepodporované kódovane „%s“"
 
-#: ../glib/gkeyfile.c:1579 ../glib/gkeyfile.c:1752 ../glib/gkeyfile.c:3130
-#: ../glib/gkeyfile.c:3193 ../glib/gkeyfile.c:3323 ../glib/gkeyfile.c:3453
-#: ../glib/gkeyfile.c:3597 ../glib/gkeyfile.c:3826 ../glib/gkeyfile.c:3893
+#: ../glib/gkeyfile.c:1578 ../glib/gkeyfile.c:1751 ../glib/gkeyfile.c:3129
+#: ../glib/gkeyfile.c:3192 ../glib/gkeyfile.c:3322 ../glib/gkeyfile.c:3452
+#: ../glib/gkeyfile.c:3596 ../glib/gkeyfile.c:3825 ../glib/gkeyfile.c:3892
 #, c-format
-msgid "Key file does not have group '%s'"
+msgid "Key file does not have group “%s”"
 msgstr "Súbor kľúčov nemá skupinu „%s“"
 
-#: ../glib/gkeyfile.c:1707
+#: ../glib/gkeyfile.c:1706
 #, c-format
-msgid "Key file does not have key '%s' in group '%s'"
+msgid "Key file does not have key “%s” in group “%s”"
 msgstr "Súbor kľúčov nemá kľúč „%s“ v skupine „%s“"
 
-#: ../glib/gkeyfile.c:1869 ../glib/gkeyfile.c:1985
+#: ../glib/gkeyfile.c:1868 ../glib/gkeyfile.c:1984
 #, c-format
-msgid "Key file contains key '%s' with value '%s' which is not UTF-8"
+msgid "Key file contains key “%s” with value “%s” which is not UTF-8"
 msgstr "Súbor kľúčov obsahuje kľúč „%s“ s hodnotou „%s“, ktorá nie je UTF-8"
 
-#: ../glib/gkeyfile.c:1889 ../glib/gkeyfile.c:2005 ../glib/gkeyfile.c:2374
+#: ../glib/gkeyfile.c:1888 ../glib/gkeyfile.c:2004 ../glib/gkeyfile.c:2373
 #, c-format
 msgid ""
-"Key file contains key '%s' which has a value that cannot be interpreted."
+"Key file contains key “%s” which has a value that cannot be interpreted."
 msgstr "Súbor kľúčov obsahuje kľúč „%s“, ktorý má neinterpretovateľnú hodnotu."
 
-#: ../glib/gkeyfile.c:2591 ../glib/gkeyfile.c:2959
+#: ../glib/gkeyfile.c:2590 ../glib/gkeyfile.c:2958
 #, c-format
 msgid ""
-"Key file contains key '%s' in group '%s' which has a value that cannot be "
+"Key file contains key “%s” in group “%s” which has a value that cannot be "
 "interpreted."
 msgstr ""
 "Súbor kľúčov obsahuje kľúč „%s“ v skupine „%s“, ktorý má neinterpretovateľnú "
 "hodnotu."
 
-#: ../glib/gkeyfile.c:2669 ../glib/gkeyfile.c:2746
+#: ../glib/gkeyfile.c:2668 ../glib/gkeyfile.c:2745
 #, c-format
-msgid "Key '%s' in group '%s' has value '%s' where %s was expected"
+msgid "Key “%s” in group “%s” has value “%s” where %s was expected"
 msgstr "Kľúč „%s“ v skupine „%s“ má hodnotu „%s“, pričom bola očakávaná %s"
 
-#: ../glib/gkeyfile.c:4133
+#: ../glib/gkeyfile.c:4132
 msgid "Key file contains escape character at end of line"
 msgstr "Súbor kľúčov obsahuje znak escape na konci riadku"
 
-#: ../glib/gkeyfile.c:4155
+#: ../glib/gkeyfile.c:4154
 #, c-format
-msgid "Key file contains invalid escape sequence '%s'"
+msgid "Key file contains invalid escape sequence “%s”"
 msgstr "Súbor kľúčov obsahuje neplatnú špeciálnu (escape) sekvenciu „%s“"
 
-#: ../glib/gkeyfile.c:4297
+#: ../glib/gkeyfile.c:4296
 #, c-format
-msgid "Value '%s' cannot be interpreted as a number."
+msgid "Value “%s” cannot be interpreted as a number."
 msgstr "Hodnota „%s“ nemôže byť interpretovaná ako číslo."
 
-#: ../glib/gkeyfile.c:4311
+#: ../glib/gkeyfile.c:4310
 #, c-format
-msgid "Integer value '%s' out of range"
+msgid "Integer value “%s” out of range"
 msgstr "Celočíselná hodnota „%s“ je mimo rozsah"
 
-#: ../glib/gkeyfile.c:4344
+#: ../glib/gkeyfile.c:4343
 #, c-format
-msgid "Value '%s' cannot be interpreted as a float number."
+msgid "Value “%s” cannot be interpreted as a float number."
 msgstr "Hodnota „%s“ nemôže byť interpretovaná ako reálne číslo."
 
-#: ../glib/gkeyfile.c:4383
+#: ../glib/gkeyfile.c:4382
 #, c-format
-msgid "Value '%s' cannot be interpreted as a boolean."
+msgid "Value “%s” cannot be interpreted as a boolean."
 msgstr "Hodnota „%s“ nemôže byť interpretovaná ako logická hodnota."
 
 #: ../glib/gmappedfile.c:129
 #, c-format
-msgid "Failed to get attributes of file '%s%s%s%s': fstat() failed: %s"
+msgid "Failed to get attributes of file “%s%s%s%s”: fstat() failed: %s"
 msgstr "Zlyhalo získanie atribútov súboru „%s%s%s%s“: fstat() zlyhalo: %s"
 
 #: ../glib/gmappedfile.c:195
@@ -4570,35 +4588,35 @@ msgstr "Zlyhalo mapovanie %s%s%s%s: mmap() zlyhalo: %s"
 
 #: ../glib/gmappedfile.c:262
 #, c-format
-msgid "Failed to open file '%s': open() failed: %s"
+msgid "Failed to open file “%s”: open() failed: %s"
 msgstr "Zlyhalo otvorenie súboru „%s“: open() zlyhalo: %s"
 
-#: ../glib/gmarkup.c:398 ../glib/gmarkup.c:440
+#: ../glib/gmarkup.c:397 ../glib/gmarkup.c:439
 #, c-format
 msgid "Error on line %d char %d: "
 msgstr "Chyba na riadku %d znak %d: "
 
-#: ../glib/gmarkup.c:462 ../glib/gmarkup.c:545
+#: ../glib/gmarkup.c:461 ../glib/gmarkup.c:544
 #, c-format
 msgid "Invalid UTF-8 encoded text in name - not valid '%s'"
 msgstr "V názve je neplatný text v kódovaní UTF-8 – neplatné reťazec „%s“"
 
-#: ../glib/gmarkup.c:473
+#: ../glib/gmarkup.c:472
 #, c-format
 msgid "'%s' is not a valid name"
 msgstr "„%s“ nie je platný názov"
 
-#: ../glib/gmarkup.c:489
+#: ../glib/gmarkup.c:488
 #, c-format
 msgid "'%s' is not a valid name: '%c'"
 msgstr "„%s“ nie je platným názvom: „%c“"
 
-#: ../glib/gmarkup.c:599
+#: ../glib/gmarkup.c:598
 #, c-format
 msgid "Error on line %d: %s"
 msgstr "Chyba na riadku č. %d: %s"
 
-#: ../glib/gmarkup.c:676
+#: ../glib/gmarkup.c:675
 #, c-format
 msgid ""
 "Failed to parse '%-.*s', which should have been a digit inside a character "
@@ -4607,7 +4625,7 @@ msgstr ""
 "Zlyhalo analyzovanie „%-.*s“, čo by mala byť číslica z číselného kódu znaku "
 "(napríklad &#234;) – možno je číslica príliš veľká"
 
-#: ../glib/gmarkup.c:688
+#: ../glib/gmarkup.c:687
 msgid ""
 "Character reference did not end with a semicolon; most likely you used an "
 "ampersand character without intending to start an entity - escape ampersand "
@@ -4616,23 +4634,23 @@ msgstr ""
 "Kód znaku neskončil bodkočiarkou. Asi ste použili & bez úmyslu napísať kód "
 "znaku – zapíšte ho ako entitu &amp;"
 
-#: ../glib/gmarkup.c:714
+#: ../glib/gmarkup.c:713
 #, c-format
 msgid "Character reference '%-.*s' does not encode a permitted character"
 msgstr "Kód znaku „%-.*s“ nie je kódom povoleného znaku"
 
-#: ../glib/gmarkup.c:752
+#: ../glib/gmarkup.c:751
 msgid ""
 "Empty entity '&;' seen; valid entities are: &amp; &quot; &lt; &gt; &apos;"
 msgstr ""
 "Nájdená prázdna entita „&;“, platné entity sú: &amp; &quot; &lt; &gt; &apos;"
 
-#: ../glib/gmarkup.c:760
+#: ../glib/gmarkup.c:759
 #, c-format
 msgid "Entity name '%-.*s' is not known"
 msgstr "Názov entity „%-.*s“ nie je známy"
 
-#: ../glib/gmarkup.c:765
+#: ../glib/gmarkup.c:764
 msgid ""
 "Entity did not end with a semicolon; most likely you used an ampersand "
 "character without intending to start an entity - escape ampersand as &amp;"
@@ -4640,11 +4658,11 @@ msgstr ""
 "Entita neskončila bodkočiarkou. Asi ste použili & bez úmyslu napísať kód "
 "znaku – zapíšte ho ako entitu &amp;"
 
-#: ../glib/gmarkup.c:1171
+#: ../glib/gmarkup.c:1170
 msgid "Document must begin with an element (e.g. <book>)"
 msgstr "Dokument musí začínať prvkom (napr. <book>)"
 
-#: ../glib/gmarkup.c:1211
+#: ../glib/gmarkup.c:1210
 #, c-format
 msgid ""
 "'%s' is not a valid character following a '<' character; it may not begin an "
@@ -4652,7 +4670,7 @@ msgid ""
 msgstr ""
 "„%s“ nie je platným znakom za znakom „<“, nesmie ním začínať názov prvku"
 
-#: ../glib/gmarkup.c:1253
+#: ../glib/gmarkup.c:1252
 #, c-format
 msgid ""
 "Odd character '%s', expected a '>' character to end the empty-element tag "
@@ -4661,7 +4679,7 @@ msgstr ""
 "Prebytočný znak „%s“. Bol očakávaný znak „>“ ukončujúci značku prázdneho "
 "prvku „%s“"
 
-#: ../glib/gmarkup.c:1334
+#: ../glib/gmarkup.c:1333
 #, c-format
 msgid ""
 "Odd character '%s', expected a '=' after attribute name '%s' of element '%s'"
@@ -4669,7 +4687,7 @@ msgstr ""
 "Prebytočný znak „%s“. Bol očakávaný znak „=“ za názvom atribútu „%s“ v prvku "
 "„%s“"
 
-#: ../glib/gmarkup.c:1375
+#: ../glib/gmarkup.c:1374
 #, c-format
 msgid ""
 "Odd character '%s', expected a '>' or '/' character to end the start tag of "
@@ -4680,7 +4698,7 @@ msgstr ""
 "„/“ ukončujúci začiatočnú značku prvku „%s“. Možno ste použili neplatný znak "
 "v názve atribútu"
 
-#: ../glib/gmarkup.c:1419
+#: ../glib/gmarkup.c:1418
 #, c-format
 msgid ""
 "Odd character '%s', expected an open quote mark after the equals sign when "
@@ -4689,7 +4707,7 @@ msgstr ""
 "Prebytočný znak „%s“. Bola očakávaná úvodzovka za znakom „=“ uvádzajúca "
 "hodnotu atribútu „%s“ prvku „%s“"
 
-#: ../glib/gmarkup.c:1552
+#: ../glib/gmarkup.c:1551
 #, c-format
 msgid ""
 "'%s' is not a valid character following the characters '</'; '%s' may not "
@@ -4698,7 +4716,7 @@ msgstr ""
 "„%s“ nie je platným znakom po znakoch „</“. Znakom „%s“ nesmie začínať názov "
 "prvku"
 
-#: ../glib/gmarkup.c:1588
+#: ../glib/gmarkup.c:1587
 #, c-format
 msgid ""
 "'%s' is not a valid character following the close element name '%s'; the "
@@ -4706,25 +4724,25 @@ msgid ""
 msgstr ""
 "„%s“ nie je platným znakom po koncovom názve prvku „%s“. Povolený znak je „>“"
 
-#: ../glib/gmarkup.c:1599
+#: ../glib/gmarkup.c:1598
 #, c-format
 msgid "Element '%s' was closed, no element is currently open"
 msgstr "Prvok „%s“ bol ukončený, momentálne nie je otvorený žiadny prvok"
 
-#: ../glib/gmarkup.c:1608
+#: ../glib/gmarkup.c:1607
 #, c-format
 msgid "Element '%s' was closed, but the currently open element is '%s'"
 msgstr "Prvok „%s“ bol ukončený, ale momentálne otvorený prvok je „%s“"
 
-#: ../glib/gmarkup.c:1761
+#: ../glib/gmarkup.c:1760
 msgid "Document was empty or contained only whitespace"
 msgstr "Dokument je prázdny alebo obsahuje iba netlačiteľné znaky"
 
-#: ../glib/gmarkup.c:1775
+#: ../glib/gmarkup.c:1774
 msgid "Document ended unexpectedly just after an open angle bracket '<'"
 msgstr "Dokument neočakávane skončil hneď po začiatočnej lomenej zátvorke „<“"
 
-#: ../glib/gmarkup.c:1783 ../glib/gmarkup.c:1828
+#: ../glib/gmarkup.c:1782 ../glib/gmarkup.c:1827
 #, c-format
 msgid ""
 "Document ended unexpectedly with elements still open - '%s' was the last "
@@ -4733,7 +4751,7 @@ msgstr ""
 "Dokument neočakávane skončil s otvorenými prvkami – „%s“ bol posledný "
 "otvorený prvok."
 
-#: ../glib/gmarkup.c:1791
+#: ../glib/gmarkup.c:1790
 #, c-format
 msgid ""
 "Document ended unexpectedly, expected to see a close angle bracket ending "
@@ -4741,19 +4759,19 @@ msgid ""
 msgstr ""
 "Dokument neočakávane skončil, očakával sa znak „>“ pre ukončenie značky <%s/>"
 
-#: ../glib/gmarkup.c:1797
+#: ../glib/gmarkup.c:1796
 msgid "Document ended unexpectedly inside an element name"
 msgstr "Dokument neočakávane skončil v názve prvku"
 
-#: ../glib/gmarkup.c:1803
+#: ../glib/gmarkup.c:1802
 msgid "Document ended unexpectedly inside an attribute name"
 msgstr "Dokument neočakávane skončil v názve atribútu"
 
-#: ../glib/gmarkup.c:1808
+#: ../glib/gmarkup.c:1807
 msgid "Document ended unexpectedly inside an element-opening tag."
 msgstr "Dokument neočakávane skončil v začiatočnej značke prvku."
 
-#: ../glib/gmarkup.c:1814
+#: ../glib/gmarkup.c:1813
 msgid ""
 "Document ended unexpectedly after the equals sign following an attribute "
 "name; no attribute value"
@@ -4761,23 +4779,23 @@ msgstr ""
 "Dokument neočakávane skončil po „=“ za názvom atribútu, chýba hodnota "
 "atribútu"
 
-#: ../glib/gmarkup.c:1821
+#: ../glib/gmarkup.c:1820
 msgid "Document ended unexpectedly while inside an attribute value"
 msgstr "Dokument neočakávane skončil v hodnote atribútu"
 
-#: ../glib/gmarkup.c:1837
+#: ../glib/gmarkup.c:1836
 #, c-format
 msgid "Document ended unexpectedly inside the close tag for element '%s'"
 msgstr "Dokument neočakávane skončil v koncovej značke pre prvok „%s“"
 
-#: ../glib/gmarkup.c:1843
+#: ../glib/gmarkup.c:1842
 msgid "Document ended unexpectedly inside a comment or processing instruction"
 msgstr ""
 "Dokument neočakávane skončil v komentári alebo inštrukcii pre spracovanie"
 
 #: ../glib/goption.c:861
-msgid "[OPTION...]"
-msgstr "[VOĽBA...]"
+msgid "[OPTION…]"
+msgstr "[VOĽBA…]"
 
 #: ../glib/goption.c:977
 msgid "Help Options:"
@@ -4801,23 +4819,23 @@ msgstr "Voľby:"
 
 #: ../glib/goption.c:1113 ../glib/goption.c:1183
 #, c-format
-msgid "Cannot parse integer value '%s' for %s"
+msgid "Cannot parse integer value “%s” for %s"
 msgstr "Nedá sa analyzovať celočíselná hodnota „%s“ pre %s"
 
 #: ../glib/goption.c:1123 ../glib/goption.c:1191
 #, c-format
-msgid "Integer value '%s' for %s out of range"
+msgid "Integer value “%s” for %s out of range"
 msgstr "Celočíselná hodnota „%s“ pre %s je mimo rozsah"
 
 # PŠ: double je dvojitá presnosť (čísla s desatinnou čiarkou)
 #: ../glib/goption.c:1148
 #, c-format
-msgid "Cannot parse double value '%s' for %s"
+msgid "Cannot parse double value “%s” for %s"
 msgstr "Nedá sa analyzovať hodnota double „%s“ pre %s"
 
 #: ../glib/goption.c:1156
 #, c-format
-msgid "Double value '%s' for %s out of range"
+msgid "Double value “%s” for %s out of range"
 msgstr "Hodnota double „%s“ pre %s je mimo rozsah"
 
 #: ../glib/goption.c:1448 ../glib/goption.c:1527
@@ -4835,241 +4853,241 @@ msgstr "Chýbajúci parameter pre %s"
 msgid "Unknown option %s"
 msgstr "Neznáma voľba %s"
 
-#: ../glib/gregex.c:258
+#: ../glib/gregex.c:257
 msgid "corrupted object"
 msgstr "poškodený objekt"
 
-#: ../glib/gregex.c:260
+#: ../glib/gregex.c:259
 msgid "internal error or corrupted object"
 msgstr "vnútorná chyba alebo poškodený objekt"
 
-#: ../glib/gregex.c:262
+#: ../glib/gregex.c:261
 msgid "out of memory"
 msgstr "nedostatok pamäte"
 
-#: ../glib/gregex.c:267
+#: ../glib/gregex.c:266
 msgid "backtracking limit reached"
 msgstr "dosiahnutý limit spätného hľadania"
 
-#: ../glib/gregex.c:279 ../glib/gregex.c:287
+#: ../glib/gregex.c:278 ../glib/gregex.c:286
 msgid "the pattern contains items not supported for partial matching"
 msgstr "vzor obsahuje položky nepodporované pri čiastočnom porovnávaní"
 
-#: ../glib/gregex.c:281
+#: ../glib/gregex.c:280
 msgid "internal error"
 msgstr "vnútorná chyba"
 
-#: ../glib/gregex.c:289
+#: ../glib/gregex.c:288
 msgid "back references as conditions are not supported for partial matching"
 msgstr ""
 "spätné odkazy použité ako podmienky nie sú podporované pri čiastočnom "
 "porovnávaní"
 
-#: ../glib/gregex.c:298
+#: ../glib/gregex.c:297
 msgid "recursion limit reached"
 msgstr "dosiahnutý limit rekurzie"
 
-#: ../glib/gregex.c:300
+#: ../glib/gregex.c:299
 msgid "invalid combination of newline flags"
 msgstr "neplatná kombinácia príznakov nového riadka"
 
-#: ../glib/gregex.c:302
+#: ../glib/gregex.c:301
 msgid "bad offset"
 msgstr "zlý ofset"
 
-#: ../glib/gregex.c:304
+#: ../glib/gregex.c:303
 msgid "short utf8"
 msgstr "krátke utf8"
 
 # Ide o omyl programátora: case PCRE_ERROR_RECURSELOOP: return _("recursion loop");
-#: ../glib/gregex.c:306
+#: ../glib/gregex.c:305
 msgid "recursion loop"
 msgstr "rekurzívna slučka"
 
-#: ../glib/gregex.c:310
+#: ../glib/gregex.c:309
 msgid "unknown error"
 msgstr "neznáma chyba"
 
-#: ../glib/gregex.c:330
+#: ../glib/gregex.c:329
 msgid "\\ at end of pattern"
 msgstr "\\ na konci vzoru"
 
-#: ../glib/gregex.c:333
+#: ../glib/gregex.c:332
 msgid "\\c at end of pattern"
 msgstr "\\c na konci vzoru"
 
-#: ../glib/gregex.c:336
+#: ../glib/gregex.c:335
 msgid "unrecognized character following \\"
 msgstr "nerozpoznaný znak nasledujúci za \\"
 
-#: ../glib/gregex.c:339
+#: ../glib/gregex.c:338
 msgid "numbers out of order in {} quantifier"
 msgstr "nesprávne poradie čísel v kvantifikátore {}"
 
-#: ../glib/gregex.c:342
+#: ../glib/gregex.c:341
 msgid "number too big in {} quantifier"
 msgstr "príliš veľké číslo v kvantifikátore {}"
 
-#: ../glib/gregex.c:345
+#: ../glib/gregex.c:344
 msgid "missing terminating ] for character class"
 msgstr "chýbajúca koncová ] pre triedu znakov"
 
-#: ../glib/gregex.c:348
+#: ../glib/gregex.c:347
 msgid "invalid escape sequence in character class"
 msgstr "neplatná špeciálna (escape) sekvencia v triede znakov"
 
-#: ../glib/gregex.c:351
+#: ../glib/gregex.c:350
 msgid "range out of order in character class"
 msgstr "nesprávne poradie rozsahu v triede znakov"
 
-#: ../glib/gregex.c:354
+#: ../glib/gregex.c:353
 msgid "nothing to repeat"
 msgstr "nie je čo opakovať"
 
-#: ../glib/gregex.c:358
+#: ../glib/gregex.c:357
 msgid "unexpected repeat"
 msgstr "neočakávané opakovanie"
 
-#: ../glib/gregex.c:361
+#: ../glib/gregex.c:360
 msgid "unrecognized character after (? or (?-"
 msgstr "nerozpoznaný znak za (? alebo (?-"
 
-#: ../glib/gregex.c:364
+#: ../glib/gregex.c:363
 msgid "POSIX named classes are supported only within a class"
 msgstr "triedy s názvami POSIX sú podporované iba v triedach"
 
-#: ../glib/gregex.c:367
+#: ../glib/gregex.c:366
 msgid "missing terminating )"
 msgstr "chýbajúca koncová )"
 
-#: ../glib/gregex.c:370
+#: ../glib/gregex.c:369
 msgid "reference to non-existent subpattern"
 msgstr "odkaz na neexistujúci podvzor"
 
-#: ../glib/gregex.c:373
+#: ../glib/gregex.c:372
 msgid "missing ) after comment"
 msgstr "chýbajúca ) po komentári"
 
-#: ../glib/gregex.c:376
+#: ../glib/gregex.c:375
 msgid "regular expression is too large"
 msgstr "regulárny výraz je príliš veľký"
 
-#: ../glib/gregex.c:379
+#: ../glib/gregex.c:378
 msgid "failed to get memory"
 msgstr "nepodarilo sa získať pamäť"
 
-#: ../glib/gregex.c:383
+#: ../glib/gregex.c:382
 msgid ") without opening ("
 msgstr ") bez otváracej ("
 
-#: ../glib/gregex.c:387
+#: ../glib/gregex.c:386
 msgid "code overflow"
 msgstr "pretečenie kódu"
 
-#: ../glib/gregex.c:391
+#: ../glib/gregex.c:390
 msgid "unrecognized character after (?<"
 msgstr "nerozpoznaný znak za (?<"
 
-#: ../glib/gregex.c:394
+#: ../glib/gregex.c:393
 msgid "lookbehind assertion is not fixed length"
 msgstr "spätné tvrdenie nemá pevnú dĺžku"
 
-#: ../glib/gregex.c:397
+#: ../glib/gregex.c:396
 msgid "malformed number or name after (?("
 msgstr "zle formátované číslo alebo názov za (?("
 
-#: ../glib/gregex.c:400
+#: ../glib/gregex.c:399
 msgid "conditional group contains more than two branches"
 msgstr "podmienková skupina obsahuje viac ako dve zátvorky"
 
-#: ../glib/gregex.c:403
+#: ../glib/gregex.c:402
 msgid "assertion expected after (?("
 msgstr "tvrdenie očakávané za (?("
 
 #. translators: '(?R' and '(?[+-]digits' are both meant as (groups of)
 #. * sequences here, '(?-54' would be an example for the second group.
 #.
-#: ../glib/gregex.c:410
+#: ../glib/gregex.c:409
 msgid "(?R or (?[+-]digits must be followed by )"
 msgstr "za (?R alebo (?[+-]číslice musí nasledovať )"
 
-#: ../glib/gregex.c:413
+#: ../glib/gregex.c:412
 msgid "unknown POSIX class name"
 msgstr "neznámy POSIX názov triedy"
 
-#: ../glib/gregex.c:416
+#: ../glib/gregex.c:415
 msgid "POSIX collating elements are not supported"
 msgstr "porovnávacie POSIX prvky nie sú podporované"
 
-#: ../glib/gregex.c:419
+#: ../glib/gregex.c:418
 msgid "character value in \\x{...} sequence is too large"
 msgstr "hodnota znaku v postupnosti \\x{...} je príliš veľká"
 
-#: ../glib/gregex.c:422
+#: ../glib/gregex.c:421
 msgid "invalid condition (?(0)"
 msgstr "neplatná podmienka (?(0)"
 
-#: ../glib/gregex.c:425
+#: ../glib/gregex.c:424
 msgid "\\C not allowed in lookbehind assertion"
 msgstr "\\C nie je povolené v spätnom tvrdení"
 
-#: ../glib/gregex.c:432
+#: ../glib/gregex.c:431
 msgid "escapes \\L, \\l, \\N{name}, \\U, and \\u are not supported"
 msgstr "\\L, \\l, \\N{name}, \\U, a \\u nie sú podporované"
 
-#: ../glib/gregex.c:435
+#: ../glib/gregex.c:434
 msgid "recursive call could loop indefinitely"
 msgstr "rekurzívne volanie by sa mohlo donekonečna opakovať"
 
-#: ../glib/gregex.c:439
+#: ../glib/gregex.c:438
 msgid "unrecognized character after (?P"
 msgstr "nerozpoznaný znak za (?P"
 
-#: ../glib/gregex.c:442
+#: ../glib/gregex.c:441
 msgid "missing terminator in subpattern name"
 msgstr "chýba ukončovací člen v názve podvzoru"
 
-#: ../glib/gregex.c:445
+#: ../glib/gregex.c:444
 msgid "two named subpatterns have the same name"
 msgstr "dva pomenované podvzory majú rovnaký názov"
 
-#: ../glib/gregex.c:448
+#: ../glib/gregex.c:447
 msgid "malformed \\P or \\p sequence"
 msgstr "zle formátovaná postupnosť \\P alebo \\p"
 
-#: ../glib/gregex.c:451
+#: ../glib/gregex.c:450
 msgid "unknown property name after \\P or \\p"
 msgstr "neznámy názov vlastnosti za \\P alebo \\p"
 
-#: ../glib/gregex.c:454
+#: ../glib/gregex.c:453
 msgid "subpattern name is too long (maximum 32 characters)"
 msgstr "názov podvzoru je príliš dlhý (maximum je 32 znakov)"
 
-#: ../glib/gregex.c:457
+#: ../glib/gregex.c:456
 msgid "too many named subpatterns (maximum 10,000)"
 msgstr "príliš mnoho pomenovaných podvzorov (maximum je 10 000)"
 
-#: ../glib/gregex.c:460
+#: ../glib/gregex.c:459
 msgid "octal value is greater than \\377"
 msgstr "osmičková hodnota je väčšia ako \\377"
 
-#: ../glib/gregex.c:464
+#: ../glib/gregex.c:463
 msgid "overran compiling workspace"
 msgstr "pretečený priestor pre preklad"
 
-#: ../glib/gregex.c:468
+#: ../glib/gregex.c:467
 msgid "previously-checked referenced subpattern not found"
 msgstr "predtým kontrolovaný odkazovaný podvzor nenájdený"
 
-#: ../glib/gregex.c:471
+#: ../glib/gregex.c:470
 msgid "DEFINE group contains more than one branch"
 msgstr "skupina DEFINE obsahuje viac ako jednu vetvu"
 
-#: ../glib/gregex.c:474
+#: ../glib/gregex.c:473
 msgid "inconsistent NEWLINE options"
 msgstr "nekonzistentné voľby NEWLINE"
 
-#: ../glib/gregex.c:477
+#: ../glib/gregex.c:476
 msgid ""
 "\\g is not followed by a braced, angle-bracketed, or quoted name or number, "
 "or by a plain number"
@@ -5077,99 +5095,99 @@ msgstr ""
 "za \\g nenasleduje názov v guľatých ani lomených zátvorkách, názov alebo "
 "číslo v úvodzovkách ani nekódované číslo"
 
-#: ../glib/gregex.c:481
+#: ../glib/gregex.c:480
 msgid "a numbered reference must not be zero"
 msgstr "očíslovaný odkaz nesmie byť nula"
 
-#: ../glib/gregex.c:484
+#: ../glib/gregex.c:483
 msgid "an argument is not allowed for (*ACCEPT), (*FAIL), or (*COMMIT)"
 msgstr "parameter nie je pre (*ACCEPT), (*FAIL) a (*COMMIT) dovolený"
 
-#: ../glib/gregex.c:487
+#: ../glib/gregex.c:486
 msgid "(*VERB) not recognized"
 msgstr "(*VERB) nebolo rozpoznané"
 
-#: ../glib/gregex.c:490
+#: ../glib/gregex.c:489
 msgid "number is too big"
 msgstr "číslo je príliš veľké"
 
-#: ../glib/gregex.c:493
+#: ../glib/gregex.c:492
 msgid "missing subpattern name after (?&"
 msgstr "za (?& chýba názov podvzoru"
 
-#: ../glib/gregex.c:496
+#: ../glib/gregex.c:495
 msgid "digit expected after (?+"
 msgstr "za (?+ sa očakáva číslica"
 
-#: ../glib/gregex.c:499
+#: ../glib/gregex.c:498
 msgid "] is an invalid data character in JavaScript compatibility mode"
 msgstr ""
 "] nie je platný dátový znak v režime kompatibility s jazykom JavaScript"
 
-#: ../glib/gregex.c:502
+#: ../glib/gregex.c:501
 msgid "different names for subpatterns of the same number are not allowed"
 msgstr "rôzne názvy pre podvzory s rovnakým číslom nie sú povolené"
 
-#: ../glib/gregex.c:505
+#: ../glib/gregex.c:504
 msgid "(*MARK) must have an argument"
 msgstr "(*MARK) musí mať parameter"
 
-#: ../glib/gregex.c:508
+#: ../glib/gregex.c:507
 msgid "\\c must be followed by an ASCII character"
 msgstr "za \\c musí nasledovať znak ASCII"
 
-#: ../glib/gregex.c:511
+#: ../glib/gregex.c:510
 msgid "\\k is not followed by a braced, angle-bracketed, or quoted name"
 msgstr ""
 "za \\k nenasleduje názov v zátvorkách, lomených zátvorkách alebo úvodzovkách"
 
-#: ../glib/gregex.c:514
+#: ../glib/gregex.c:513
 msgid "\\N is not supported in a class"
 msgstr "\\N nie je v triede podporované"
 
 # PM:nie som si istý
 # MČ: Hmm. Musel som pozrieť zdrojáky pcre, aby som sa trošku ztoho vymotal. Pri doprednom vyhľadávaní (lookahead) si stroj regulárneho výrazu odkladá odkazy na už asociované (zjednodušene nájdené) časti textu k regulárnemu výrazu. Ak je ich priveľa, nezmestia sa do pamäte, malloc zlyhá, vráti túto chybovú hlášku. Myslím, že preklad aj originál mi povedali rovnako veľa informácií.
-#: ../glib/gregex.c:517
+#: ../glib/gregex.c:516
 msgid "too many forward references"
 msgstr "príliš mnoho dopredných odkazov"
 
-#: ../glib/gregex.c:520
+#: ../glib/gregex.c:519
 msgid "name is too long in (*MARK), (*PRUNE), (*SKIP), or (*THEN)"
 msgstr "názov v (*MARK), (*PRUNE), (*SKIP) alebo (*THEN) je príliš dlhý"
 
-#: ../glib/gregex.c:523
+#: ../glib/gregex.c:522
 msgid "character value in \\u.... sequence is too large"
 msgstr "hodnota znaku v postupnosti \\u.... je príliš veľká"
 
-#: ../glib/gregex.c:746 ../glib/gregex.c:1977
+#: ../glib/gregex.c:745 ../glib/gregex.c:1977
 #, c-format
 msgid "Error while matching regular expression %s: %s"
 msgstr "Chyba počas porovnávania regulárneho výrazu %s: %s"
 
-#: ../glib/gregex.c:1317
+#: ../glib/gregex.c:1316
 msgid "PCRE library is compiled without UTF8 support"
 msgstr "Knižnica PCRE je preložená bez podpory UTF8"
 
-#: ../glib/gregex.c:1321
+#: ../glib/gregex.c:1320
 msgid "PCRE library is compiled without UTF8 properties support"
 msgstr "Knižnica PCRE je preložená bez podpory vlastností UTF8"
 
-#: ../glib/gregex.c:1329
+#: ../glib/gregex.c:1328
 msgid "PCRE library is compiled with incompatible options"
 msgstr "Knižnica PCRE je preložená s nekompatibilnými voľbami"
 
-#: ../glib/gregex.c:1358
+#: ../glib/gregex.c:1357
 #, c-format
 msgid "Error while optimizing regular expression %s: %s"
 msgstr "Chyba počas optimalizovania regulárneho výrazu %s: %s"
 
-#: ../glib/gregex.c:1438
+#: ../glib/gregex.c:1437
 #, c-format
 msgid "Error while compiling regular expression %s at char %d: %s"
 msgstr "Chyba počas prekladu regulárneho výrazu %s pri znaku %d: %s"
 
 #: ../glib/gregex.c:2413
-msgid "hexadecimal digit or '}' expected"
+msgid "hexadecimal digit or “}” expected"
 msgstr "očakávaná šestnástková číslica alebo „}“"
 
 #: ../glib/gregex.c:2429
@@ -5177,7 +5195,7 @@ msgid "hexadecimal digit expected"
 msgstr "očakávaná šestnástková číslica"
 
 #: ../glib/gregex.c:2469
-msgid "missing '<' in symbolic reference"
+msgid "missing “<” in symbolic reference"
 msgstr "chýba „<“ v symbolickom odkaze"
 
 #: ../glib/gregex.c:2478
@@ -5197,7 +5215,7 @@ msgid "illegal symbolic reference"
 msgstr "neplatný symbolický odkaz"
 
 #: ../glib/gregex.c:2576
-msgid "stray final '\\'"
+msgid "stray final “\\”"
 msgstr "zabudnuté koncové „\\“"
 
 #: ../glib/gregex.c:2580
@@ -5206,154 +5224,154 @@ msgstr "neznáma špeciálna (escape) sekvencia"
 
 #: ../glib/gregex.c:2590
 #, c-format
-msgid "Error while parsing replacement text \"%s\" at char %lu: %s"
+msgid "Error while parsing replacement text “%s” at char %lu: %s"
 msgstr "Chyba počas analyzovania nahrádzajúceho textu „%s“ pri znaku %lu: %s"
 
-#: ../glib/gshell.c:96
-msgid "Quoted text doesn't begin with a quotation mark"
+#: ../glib/gshell.c:94
+msgid "Quoted text doesn’t begin with a quotation mark"
 msgstr "Citovaný text nezačína úvodzovkami"
 
-#: ../glib/gshell.c:186
+#: ../glib/gshell.c:184
 msgid "Unmatched quotation mark in command line or other shell-quoted text"
 msgstr ""
 "Prebytočné úvodzovky v príkazovom riadku alebo v inom texte shellu v "
 "úvodzovkách"
 
-#: ../glib/gshell.c:582
+#: ../glib/gshell.c:580
 #, c-format
-msgid "Text ended just after a '\\' character. (The text was '%s')"
+msgid "Text ended just after a “\\” character. (The text was “%s”)"
 msgstr "Text skončil hneď po znaku „\\“. (Text bol „%s“)"
 
-#: ../glib/gshell.c:589
+#: ../glib/gshell.c:587
 #, c-format
-msgid "Text ended before matching quote was found for %c. (The text was '%s')"
+msgid "Text ended before matching quote was found for %c. (The text was “%s”)"
 msgstr ""
 "Text skončil pred nájdením zodpovedajúcej úvodzovky znakom %c. (Text bol "
 "„%s“)"
 
-#: ../glib/gshell.c:601
+#: ../glib/gshell.c:599
 msgid "Text was empty (or contained only whitespace)"
 msgstr "Text bol prázdny (alebo obsahoval iba medzery)"
 
-#: ../glib/gspawn.c:209
+#: ../glib/gspawn.c:207
 #, c-format
 msgid "Failed to read data from child process (%s)"
 msgstr "Zlyhalo čítanie údajov z dcérskeho procesu (%s)"
 
-#: ../glib/gspawn.c:353
+#: ../glib/gspawn.c:351
 #, c-format
 msgid "Unexpected error in select() reading data from a child process (%s)"
 msgstr ""
 "Neočakávaná chyba v select() pri čítaní údajov z dcérskeho procesu (%s)"
 
-#: ../glib/gspawn.c:438
+#: ../glib/gspawn.c:436
 #, c-format
 msgid "Unexpected error in waitpid() (%s)"
 msgstr "Neočakávaná chyba vo waitpid() (%s)"
 
-#: ../glib/gspawn.c:844 ../glib/gspawn-win32.c:1233
+#: ../glib/gspawn.c:842 ../glib/gspawn-win32.c:1231
 #, c-format
 msgid "Child process exited with code %ld"
 msgstr "Dcérsky proces skončil s kódom %ld"
 
-#: ../glib/gspawn.c:852
+#: ../glib/gspawn.c:850
 #, c-format
 msgid "Child process killed by signal %ld"
 msgstr "Dcérsky proces bol zabitý signálom %ld"
 
-#: ../glib/gspawn.c:859
+#: ../glib/gspawn.c:857
 #, c-format
 msgid "Child process stopped by signal %ld"
 msgstr "Dcérsky proces bol zastavený signálom %ld"
 
-#: ../glib/gspawn.c:866
+#: ../glib/gspawn.c:864
 #, c-format
 msgid "Child process exited abnormally"
 msgstr "Dcérsky proces skončil neobvykle"
 
-#: ../glib/gspawn.c:1271 ../glib/gspawn-win32.c:339 ../glib/gspawn-win32.c:347
+#: ../glib/gspawn.c:1269 ../glib/gspawn-win32.c:337 ../glib/gspawn-win32.c:345
 #, c-format
 msgid "Failed to read from child pipe (%s)"
 msgstr "Zlyhalo čítanie zo zreťazenia s potomkom (%s)"
 
-#: ../glib/gspawn.c:1341
+#: ../glib/gspawn.c:1339
 #, c-format
 msgid "Failed to fork (%s)"
 msgstr "Zlyhalo vytvorenie vetvy (%s)"
 
-#: ../glib/gspawn.c:1490 ../glib/gspawn-win32.c:370
+#: ../glib/gspawn.c:1488 ../glib/gspawn-win32.c:368
 #, c-format
-msgid "Failed to change to directory '%s' (%s)"
+msgid "Failed to change to directory “%s” (%s)"
 msgstr "Zlyhala zmena adresára na „%s“ (%s)"
 
-#: ../glib/gspawn.c:1500
+#: ../glib/gspawn.c:1498
 #, c-format
-msgid "Failed to execute child process \"%s\" (%s)"
+msgid "Failed to execute child process “%s” (%s)"
 msgstr "Zlyhalo spustenie dcérskeho procesu „%s“ (%s)"
 
-#: ../glib/gspawn.c:1510
+#: ../glib/gspawn.c:1508
 #, c-format
 msgid "Failed to redirect output or input of child process (%s)"
 msgstr "Zlyhalo presmerovanie vstupu alebo výstupu dcérskeho procesu (%s)"
 
-#: ../glib/gspawn.c:1519
+#: ../glib/gspawn.c:1517
 #, c-format
 msgid "Failed to fork child process (%s)"
 msgstr "Zlyhalo vytvorenie vetvy dcérskeho procesu (%s)"
 
-#: ../glib/gspawn.c:1527
+#: ../glib/gspawn.c:1525
 #, c-format
-msgid "Unknown error executing child process \"%s\""
+msgid "Unknown error executing child process “%s”"
 msgstr "Neznáma chyba pri spúšťaní dcérskeho procesu „%s“"
 
-#: ../glib/gspawn.c:1551
+#: ../glib/gspawn.c:1549
 #, c-format
 msgid "Failed to read enough data from child pid pipe (%s)"
 msgstr ""
 "Nepodarilo sa prečítať dostatok údajov zo zreťazenia s dcérskym procesom (%s)"
 
-#: ../glib/gspawn-win32.c:283
+#: ../glib/gspawn-win32.c:281
 msgid "Failed to read data from child process"
 msgstr "Zlyhalo čítanie údajov z dcérskeho procesu"
 
-#: ../glib/gspawn-win32.c:300
+#: ../glib/gspawn-win32.c:298
 #, c-format
 msgid "Failed to create pipe for communicating with child process (%s)"
 msgstr "Zlyhalo vytvorenie zreťazenia pre komunikáciu s dcérskym procesom (%s)"
 
-#: ../glib/gspawn-win32.c:376 ../glib/gspawn-win32.c:495
+#: ../glib/gspawn-win32.c:374 ../glib/gspawn-win32.c:493
 #, c-format
 msgid "Failed to execute child process (%s)"
 msgstr "Zlyhalo spustenie dcérskeho procesu (%s)"
 
-#: ../glib/gspawn-win32.c:445
+#: ../glib/gspawn-win32.c:443
 #, c-format
 msgid "Invalid program name: %s"
 msgstr "Neplatný názov programu: %s"
 
-#: ../glib/gspawn-win32.c:455 ../glib/gspawn-win32.c:722
-#: ../glib/gspawn-win32.c:1297
+#: ../glib/gspawn-win32.c:453 ../glib/gspawn-win32.c:720
+#: ../glib/gspawn-win32.c:1295
 #, c-format
 msgid "Invalid string in argument vector at %d: %s"
 msgstr "Neplatný reťazec vo vektore parametra na %d: %s"
 
-#: ../glib/gspawn-win32.c:466 ../glib/gspawn-win32.c:737
-#: ../glib/gspawn-win32.c:1330
+#: ../glib/gspawn-win32.c:464 ../glib/gspawn-win32.c:735
+#: ../glib/gspawn-win32.c:1328
 #, c-format
 msgid "Invalid string in environment: %s"
 msgstr "Neplatný reťazec v prostredí: %s"
 
-#: ../glib/gspawn-win32.c:718 ../glib/gspawn-win32.c:1278
+#: ../glib/gspawn-win32.c:716 ../glib/gspawn-win32.c:1276
 #, c-format
 msgid "Invalid working directory: %s"
 msgstr "Neplatný pracovný adresár: %s"
 
-#: ../glib/gspawn-win32.c:783
+#: ../glib/gspawn-win32.c:781
 #, c-format
 msgid "Failed to execute helper program (%s)"
 msgstr "Zlyhalo spustenie pomocného programu (%s)"
 
-#: ../glib/gspawn-win32.c:997
+#: ../glib/gspawn-win32.c:995
 msgid ""
 "Unexpected error in g_io_channel_win32_poll() reading data from a child "
 "process"
@@ -5465,6 +5483,15 @@ msgstr[2] "%s bajty"
 msgid "%.1f KB"
 msgstr "%.1f kB"
 
+#~ msgid "Error creating directory '%s': %s"
+#~ msgstr "Chyba pri vytváraní adresára „%s“: %s"
+
+#~ msgid "Error opening file '%s': %s"
+#~ msgstr "Chyba pri otváraní súboru „%s“: %s"
+
+#~ msgid "Error reading file '%s': %s"
+#~ msgstr "Chyba pri čítaní súboru „%s“: %s"
+
 #~ msgid "No locations gives"
 #~ msgstr "Neposkytnuté žiadne umiestnenia"
 
diff --git a/po/sv.po b/po/sv.po
index bfc8b2c27..fb1c5ae6a 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,17 +1,17 @@
 # Swedish messages for glib.
-# Copyright © 2001-2016 Free Software Foundation, Inc.
+# Copyright © 2001-2017 Free Software Foundation, Inc.
 # Christian Rose <menthos@menthos.com>, 2001-2005.
 # Daniel Nylander <po@danielnylander.se>, 2006-2012.
 # Sebastian Rasmussen <sebras@gmail.com>, 2014, 2015.
-# Anders Jonsson <anders.jonsson@norsjovallen.se>, 2015, 2016.
+# Anders Jonsson <anders.jonsson@norsjovallen.se>, 2015, 2016, 2017.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: glib\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=glib&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2016-10-12 19:31+0000\n"
-"PO-Revision-Date: 2016-10-24 17:54+0200\n"
+"POT-Creation-Date: 2016-12-08 10:06+0000\n"
+"PO-Revision-Date: 2017-02-03 11:37+0100\n"
 "Last-Translator: Anders Jonsson <anders.jonsson@norsjovallen.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"
@@ -19,7 +19,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.8.9\n"
+"X-Generator: Poedit 1.8.11\n"
 
 #: ../gio/gapplication.c:493
 msgid "GApplication options"
@@ -114,8 +114,8 @@ msgstr "Kommandot att skriva ut detaljerad hjälp för"
 msgid "Application identifier in D-Bus format (eg: org.example.viewer)"
 msgstr "Programidentifierare i D-Bus-format (t.ex: org.example.viewer)"
 
-#: ../gio/gapplication-tool.c:72 ../gio/glib-compile-resources.c:622
-#: ../gio/glib-compile-resources.c:628 ../gio/glib-compile-resources.c:654
+#: ../gio/gapplication-tool.c:72 ../gio/glib-compile-resources.c:665
+#: ../gio/glib-compile-resources.c:671 ../gio/glib-compile-resources.c:698
 #: ../gio/gresource-tool.c:495 ../gio/gresource-tool.c:561
 msgid "FILE"
 msgstr "FIL"
@@ -314,7 +314,7 @@ msgstr "Ogiltig bytesekvens i konverteringsindata"
 msgid "Error during conversion: %s"
 msgstr "Fel vid konvertering: %s"
 
-#: ../gio/gcharsetconverter.c:444 ../gio/gsocket.c:1078
+#: ../gio/gcharsetconverter.c:444 ../gio/gsocket.c:1085
 msgid "Cancellable initialization not supported"
 msgstr "Avbrytningsbar initiering stöds inte"
 
@@ -497,19 +497,19 @@ msgstr "Fel vid körning av kommandoraden ”%s”: "
 msgid "(Type any character to close this window)\n"
 msgstr "(Skriv vilket tecken som helst för att stänga detta fönster)\n"
 
-#: ../gio/gdbusaddress.c:1489
+#: ../gio/gdbusaddress.c:1491
 #, c-format
 msgid "Session dbus not running, and autolaunch failed"
 msgstr "Sessions-dbus kör inte, och autostart misslyckades"
 
-#: ../gio/gdbusaddress.c:1500
+#: ../gio/gdbusaddress.c:1502
 #, c-format
 msgid "Cannot determine session bus address (not implemented for this OS)"
 msgstr ""
 "Kan inte fastställa adress för sessionsbuss (inte implementerat för detta "
 "operativsystem)"
 
-#: ../gio/gdbusaddress.c:1635 ../gio/gdbusconnection.c:7133
+#: ../gio/gdbusaddress.c:1637
 #, c-format
 msgid ""
 "Cannot determine bus address from DBUS_STARTER_BUS_TYPE environment variable "
@@ -518,7 +518,7 @@ msgstr ""
 "Kan inte fastställa bussadressen från miljövariabeln DBUS_STARTER_BUS_TYPE — "
 "okänt värde ”%s”"
 
-#: ../gio/gdbusaddress.c:1644 ../gio/gdbusconnection.c:7142
+#: ../gio/gdbusaddress.c:1646 ../gio/gdbusconnection.c:7142
 msgid ""
 "Cannot determine bus address because the DBUS_STARTER_BUS_TYPE environment "
 "variable is not set"
@@ -526,7 +526,7 @@ msgstr ""
 "Kan inte fastställa bussadress därför att miljövariabeln "
 "DBUS_STARTER_BUS_TYPE inte är inställd"
 
-#: ../gio/gdbusaddress.c:1654
+#: ../gio/gdbusaddress.c:1656
 #, c-format
 msgid "Unknown bus type %d"
 msgstr "Okänd busstyp %d"
@@ -648,36 +648,36 @@ msgstr ""
 #: ../gio/gdbusconnection.c:4109 ../gio/gdbusconnection.c:4456
 #, c-format
 msgid ""
-"No such interface “org.freedesktop.DBus.Properties” on object at path %s"
+"No such interface 'org.freedesktop.DBus.Properties' on object at path %s"
 msgstr ""
-"Inget sådant gränssnitt ”org.freedesktop.DBus.Properties” på objekt med "
+"Inget sådant gränssnitt 'org.freedesktop.DBus.Properties' på objekt med "
 "sökvägen %s"
 
 #: ../gio/gdbusconnection.c:4251
 #, c-format
-msgid "No such property “%s”"
-msgstr "Ingen sådan egenskap ”%s”"
+msgid "No such property '%s'"
+msgstr "Ingen sådan egenskap '%s'"
 
 #: ../gio/gdbusconnection.c:4263
 #, c-format
-msgid "Property “%s” is not readable"
-msgstr "Egenskapen ”%s” är inte läsbar"
+msgid "Property '%s' is not readable"
+msgstr "Egenskapen '%s' är inte läsbar"
 
 #: ../gio/gdbusconnection.c:4274
 #, c-format
-msgid "Property “%s” is not writable"
-msgstr "Egenskapen ”%s” är inte skrivbar"
+msgid "Property '%s' is not writable"
+msgstr "Egenskapen '%s' är inte skrivbar"
 
 #: ../gio/gdbusconnection.c:4294
 #, c-format
-msgid "Error setting property “%s”: Expected type “%s” but got “%s”"
+msgid "Error setting property '%s': Expected type '%s' but got '%s'"
 msgstr ""
-"Fel vid inställning av egenskapen ”%s”: Förväntade typen ”%s” men fick ”%s”"
+"Fel vid inställning av egenskapen '%s': Förväntade typen '%s' men fick '%s'"
 
 #: ../gio/gdbusconnection.c:4399 ../gio/gdbusconnection.c:6573
 #, c-format
-msgid "No such interface “%s”"
-msgstr "Inget sådan gränssnitt ”%s”"
+msgid "No such interface '%s'"
+msgstr "Inget sådant gränssnitt '%s'"
 
 #: ../gio/gdbusconnection.c:4607
 msgid "No such interface"
@@ -685,18 +685,18 @@ msgstr "Inget sådant gränssnitt"
 
 #: ../gio/gdbusconnection.c:4825 ../gio/gdbusconnection.c:7082
 #, c-format
-msgid "No such interface “%s” on object at path %s"
-msgstr "Inget sådant gränssnitt ”%s” på objekt med sökvägen %s"
+msgid "No such interface '%s' on object at path %s"
+msgstr "Inget sådant gränssnitt '%s' på objekt med sökvägen %s"
 
 #: ../gio/gdbusconnection.c:4923
 #, c-format
-msgid "No such method “%s”"
-msgstr "Ingen sådan metod ”%s”"
+msgid "No such method '%s'"
+msgstr "Ingen sådan metod '%s'"
 
 #: ../gio/gdbusconnection.c:4954
 #, c-format
-msgid "Type of message, “%s”, does not match expected type “%s”"
-msgstr "Typ av meddelande, ”%s”, matchar inte förväntade typen ”%s”"
+msgid "Type of message, '%s', does not match expected type '%s'"
+msgstr "Typ av meddelande, '%s', matchar inte förväntade typen '%s'"
 
 #: ../gio/gdbusconnection.c:5152
 #, c-format
@@ -715,19 +715,28 @@ msgstr "Kunde inte sätta egenskap %s.%s"
 
 #: ../gio/gdbusconnection.c:5610
 #, c-format
-msgid "Method “%s” returned type “%s”, but expected “%s”"
-msgstr "Metoden ”%s” returnerade typen ”%s”, men förväntade ”%s”"
+msgid "Method '%s' returned type '%s', but expected '%s'"
+msgstr "Metoden '%s' returnerade typen '%s', men förväntade '%s'"
 
 #: ../gio/gdbusconnection.c:6684
 #, c-format
-msgid "Method “%s” on interface “%s” with signature “%s” does not exist"
-msgstr "Metoden ”%s” på gränssnittet ”%s” med signaturen ”%s” finns inte"
+msgid "Method '%s' on interface '%s' with signature '%s' does not exist"
+msgstr "Metoden '%s' på gränssnittet '%s' med signaturen '%s' finns inte"
 
 #: ../gio/gdbusconnection.c:6805
 #, c-format
 msgid "A subtree is already exported for %s"
 msgstr "Ett underträd har redan exporterats för %s"
 
+#: ../gio/gdbusconnection.c:7133
+#, c-format
+msgid ""
+"Cannot determine bus address from DBUS_STARTER_BUS_TYPE environment variable "
+"- unknown value '%s'"
+msgstr ""
+"Kan inte fastställa bussadressen från miljövariabeln DBUS_STARTER_BUS_TYPE - "
+"okänt värde '%s'"
+
 #: ../gio/gdbusmessage.c:1244
 msgid "type is INVALID"
 msgstr "typ är OGILTIG"
@@ -1201,38 +1210,38 @@ msgstr "Objektsökväg att övervaka"
 msgid "Monitor a remote object."
 msgstr "Övervaka ett fjärrobjekt."
 
-#: ../gio/gdesktopappinfo.c:1994 ../gio/gdesktopappinfo.c:4501
+#: ../gio/gdesktopappinfo.c:1997 ../gio/gdesktopappinfo.c:4504
 msgid "Unnamed"
 msgstr "Namnlös"
 
-#: ../gio/gdesktopappinfo.c:2404
+#: ../gio/gdesktopappinfo.c:2407
 msgid "Desktop file didn’t specify Exec field"
 msgstr "Skrivbordsfilen angav inget Exec-fält"
 
-#: ../gio/gdesktopappinfo.c:2689
+#: ../gio/gdesktopappinfo.c:2692
 msgid "Unable to find terminal required for application"
 msgstr "Kunde inte hitta terminal som krävs för programmet"
 
-#: ../gio/gdesktopappinfo.c:3097
+#: ../gio/gdesktopappinfo.c:3100
 #, c-format
 msgid "Can’t create user application configuration folder %s: %s"
 msgstr "Kan inte skapa programkonfigurationsmapp för användare %s: %s"
 
-#: ../gio/gdesktopappinfo.c:3101
+#: ../gio/gdesktopappinfo.c:3104
 #, c-format
 msgid "Can’t create user MIME configuration folder %s: %s"
 msgstr "Kan inte skapa MIME-konfigurationsmapp för användare %s: %s"
 
-#: ../gio/gdesktopappinfo.c:3341 ../gio/gdesktopappinfo.c:3365
+#: ../gio/gdesktopappinfo.c:3344 ../gio/gdesktopappinfo.c:3368
 msgid "Application information lacks an identifier"
 msgstr "Programinformation saknar en identifierare"
 
-#: ../gio/gdesktopappinfo.c:3599
+#: ../gio/gdesktopappinfo.c:3602
 #, c-format
 msgid "Can’t create user desktop file %s"
 msgstr "Kan inte skapa skrivbordsfil för användare %s"
 
-#: ../gio/gdesktopappinfo.c:3733
+#: ../gio/gdesktopappinfo.c:3736
 #, c-format
 msgid "Custom definition for %s"
 msgstr "Anpassad definition för %s"
@@ -1494,7 +1503,7 @@ msgid "Could not parse “%s” as IP address mask"
 msgstr "Kunde inte tolka ”%s” som IP-adressmask"
 
 #: ../gio/ginetsocketaddress.c:203 ../gio/ginetsocketaddress.c:220
-#: ../gio/gnativesocketaddress.c:106 ../gio/gunixsocketaddress.c:216
+#: ../gio/gnativesocketaddress.c:106 ../gio/gunixsocketaddress.c:218
 msgid "Not enough space for socket address"
 msgstr "Inte tillräckligt med utrymme för uttagsadress"
 
@@ -2265,59 +2274,63 @@ msgstr "Fel vid komprimering av filen %s"
 msgid "text may not appear inside <%s>"
 msgstr "text får inte vara inuti <%s>"
 
-#: ../gio/glib-compile-resources.c:621 ../gio/glib-compile-schemas.c:2037
+#: ../gio/glib-compile-resources.c:664 ../gio/glib-compile-schemas.c:2037
 msgid "Show program version and exit"
 msgstr "Visa programversion och avsluta"
 
-#: ../gio/glib-compile-resources.c:622
+#: ../gio/glib-compile-resources.c:665
 msgid "name of the output file"
 msgstr "namn på utmatningsfilen"
 
-#: ../gio/glib-compile-resources.c:623
+#: ../gio/glib-compile-resources.c:666
 msgid ""
 "The directories where files are to be read from (default to current "
 "directory)"
 msgstr "Katalogerna där filer ska läsas från (standard är aktuell katalog)"
 
-#: ../gio/glib-compile-resources.c:623 ../gio/glib-compile-schemas.c:2038
+#: ../gio/glib-compile-resources.c:666 ../gio/glib-compile-schemas.c:2038
 #: ../gio/glib-compile-schemas.c:2067
 msgid "DIRECTORY"
 msgstr "KATALOG"
 
-#: ../gio/glib-compile-resources.c:624
+#: ../gio/glib-compile-resources.c:667
 msgid ""
 "Generate output in the format selected for by the target filename extension"
 msgstr "Generera utmatning i formatet valt av målfilnamnets filändelse"
 
-#: ../gio/glib-compile-resources.c:625
+#: ../gio/glib-compile-resources.c:668
 msgid "Generate source header"
 msgstr "Generera källkods-header"
 
-#: ../gio/glib-compile-resources.c:626
+#: ../gio/glib-compile-resources.c:669
 msgid "Generate sourcecode used to link in the resource file into your code"
 msgstr "Generera källkod som används för att länka in resursfilen i din kod"
 
-#: ../gio/glib-compile-resources.c:627
+#: ../gio/glib-compile-resources.c:670
 msgid "Generate dependency list"
 msgstr "Generera beroendelista"
 
-#: ../gio/glib-compile-resources.c:628
+#: ../gio/glib-compile-resources.c:671
 msgid "name of the dependency file to generate"
 msgstr "namn på beroendefilen att generera"
 
-#: ../gio/glib-compile-resources.c:629
+#: ../gio/glib-compile-resources.c:672
+msgid "Include phony targets in the generated dependency file"
+msgstr "Inkludera phony-mål i den genererade beroendefilen"
+
+#: ../gio/glib-compile-resources.c:673
 msgid "Don’t automatically create and register resource"
 msgstr "Skapa och registrera inte resursen automatiskt"
 
-#: ../gio/glib-compile-resources.c:630
+#: ../gio/glib-compile-resources.c:674
 msgid "Don’t export functions; declare them G_GNUC_INTERNAL"
 msgstr "Exportera inte funktioner; deklarera dem som G_GNUC_INTERNAL"
 
-#: ../gio/glib-compile-resources.c:631
+#: ../gio/glib-compile-resources.c:675
 msgid "C identifier name used for the generated source code"
 msgstr "C-identifierarnamn som används för den genererade källkoden"
 
-#: ../gio/glib-compile-resources.c:657
+#: ../gio/glib-compile-resources.c:701
 msgid ""
 "Compile a resource specification into a resource file.\n"
 "Resource specification files have the extension .gresource.xml,\n"
@@ -2327,7 +2340,7 @@ msgstr ""
 "Resursspecifikationsfiler har filändelsen .gresource.xml,\n"
 "och resursfilen har filändelsen .gresource."
 
-#: ../gio/glib-compile-resources.c:679
+#: ../gio/glib-compile-resources.c:723
 #, c-format
 msgid "You should give exactly one file name\n"
 msgstr "Du bör ange exakt ett filnamn\n"
@@ -2338,32 +2351,32 @@ msgstr "tomma namn tillåts inte"
 
 #: ../gio/glib-compile-schemas.c:794
 #, c-format
-msgid "invalid name “%s”: names must begin with a lowercase letter"
-msgstr "ogiltigt namn ”%s”: namn måste börja med en liten bokstav"
+msgid "invalid name '%s': names must begin with a lowercase letter"
+msgstr "ogiltigt namn '%s': namn måste börja med en liten bokstav"
 
 #: ../gio/glib-compile-schemas.c:806
 #, c-format
 msgid ""
-"invalid name “%s”: invalid character “%c”; only lowercase letters, numbers "
-"and hyphen (“-”) are permitted."
+"invalid name '%s': invalid character '%c'; only lowercase letters, numbers "
+"and hyphen ('-') are permitted."
 msgstr ""
-"ogiltigt namn ”%s”: ogiltigt tecken ”%c”; endast gemena bokstäver, siffror "
-"och bindestreck (”-”) tillåts."
+"ogiltigt namn '%s': ogiltigt tecken '%c'; endast gemena bokstäver, siffror "
+"och bindestreck ('-') tillåts."
 
 #: ../gio/glib-compile-schemas.c:815
 #, c-format
-msgid "invalid name “%s”: two successive hyphens (“--”) are not permitted."
-msgstr "ogiltigt namn ”%s”: två efterföljande bindestreck (”--”) tillåts inte."
+msgid "invalid name '%s': two successive hyphens ('--') are not permitted."
+msgstr "ogiltigt namn '%s': två efterföljande bindestreck ('--') tillåts inte."
 
 #: ../gio/glib-compile-schemas.c:824
 #, c-format
-msgid "invalid name “%s”: the last character may not be a hyphen (“-”)."
-msgstr "ogiltigt namn ”%s”: sista tecknet får inte vara ett bindestreck (”-”)."
+msgid "invalid name '%s': the last character may not be a hyphen ('-')."
+msgstr "ogiltigt namn '%s': sista tecknet får inte vara ett bindestreck ('-')."
 
 #: ../gio/glib-compile-schemas.c:832
 #, c-format
-msgid "invalid name “%s”: maximum length is 1024"
-msgstr "ogiltigt namn ”%s”: maximal längd är 1024"
+msgid "invalid name '%s': maximum length is 1024"
+msgstr "ogiltigt namn '%s': maximal längd är 1024"
 
 #: ../gio/glib-compile-schemas.c:901
 #, c-format
@@ -2371,8 +2384,8 @@ msgid "<child name='%s'> already specified"
 msgstr "<child name='%s'> redan angiven"
 
 #: ../gio/glib-compile-schemas.c:927
-msgid "cannot add keys to a “list-of” schema"
-msgstr "kan inte lägga till nycklar till ett ”list-of”-schema"
+msgid "cannot add keys to a 'list-of' schema"
+msgstr "kan inte lägga till nycklar till ett 'list-of'-schema"
 
 #: ../gio/glib-compile-schemas.c:938
 #, c-format
@@ -2391,10 +2404,10 @@ msgstr ""
 #: ../gio/glib-compile-schemas.c:967
 #, c-format
 msgid ""
-"exactly one of “type”, “enum” or “flags” must be specified as an attribute "
+"exactly one of 'type', 'enum' or 'flags' must be specified as an attribute "
 "to <key>"
 msgstr ""
-"exakt en av ”type”, ”enum” eller ”flags” måste anges som ett attribut till "
+"exakt en av 'type', 'enum' eller 'flags' måste anges som ett attribut till "
 "<key>"
 
 #: ../gio/glib-compile-schemas.c:986
@@ -2404,11 +2417,11 @@ msgstr "<%s id='%s'> inte (ännu) angiven."
 
 #: ../gio/glib-compile-schemas.c:1001
 #, c-format
-msgid "invalid GVariant type string “%s”"
-msgstr "ogiltig GVariant-typsträng ”%s”"
+msgid "invalid GVariant type string '%s'"
+msgstr "ogiltig GVariant-typsträng '%s'"
 
 #: ../gio/glib-compile-schemas.c:1031
-msgid "<override> given but schema isn’t extending anything"
+msgid "<override> given but schema isn't extending anything"
 msgstr "<override> angavs men schemat utökar inte någonting"
 
 #: ../gio/glib-compile-schemas.c:1044
@@ -2428,13 +2441,13 @@ msgstr "<schema id='%s'> redan angiven"
 
 #: ../gio/glib-compile-schemas.c:1137
 #, c-format
-msgid "<schema id='%s'> extends not yet existing schema “%s”"
-msgstr "<schema id='%s'> utökar ännu inte befintliga schemat ”%s”"
+msgid "<schema id='%s'> extends not yet existing schema '%s'"
+msgstr "<schema id='%s'> utökar ännu inte befintliga schemat '%s'"
 
 #: ../gio/glib-compile-schemas.c:1153
 #, c-format
-msgid "<schema id='%s'> is list of not yet existing schema “%s”"
-msgstr "<schema id='%s'> är listad av ännu inte befintliga schemat ”%s”"
+msgid "<schema id='%s'> is list of not yet existing schema '%s'"
+msgstr "<schema id='%s'> är lista av ännu inte befintliga schemat '%s'"
 
 #: ../gio/glib-compile-schemas.c:1161
 #, c-format
@@ -2457,11 +2470,11 @@ msgstr ""
 #: ../gio/glib-compile-schemas.c:1191
 #, c-format
 msgid ""
-"<schema id='%s' list-of='%s'> extends <schema id='%s' list-of='%s'> but “%s” "
-"does not extend “%s”"
+"<schema id='%s' list-of='%s'> extends <schema id='%s' list-of='%s'> but '%s' "
+"does not extend '%s'"
 msgstr ""
-"<schema id='%s' list-of='%s'> utökar <schema id='%s' list-of='%s'> men ”%s” "
-"utökar inte ”%s”"
+"<schema id='%s' list-of='%s'> utökar <schema id='%s' list-of='%s'> men '%s' "
+"utökar inte '%s'"
 
 #: ../gio/glib-compile-schemas.c:1208
 #, c-format
@@ -2470,8 +2483,8 @@ msgstr "en sökväg, om angiven, måste börja och sluta med ett snedstreck"
 
 #: ../gio/glib-compile-schemas.c:1215
 #, c-format
-msgid "the path of a list must end with “:/”"
-msgstr "sökvägen för en lista måste sluta med ”:/”"
+msgid "the path of a list must end with ':/'"
+msgstr "sökvägen för en lista måste sluta med ':/'"
 
 #: ../gio/glib-compile-schemas.c:1247
 #, c-format
@@ -2507,9 +2520,9 @@ msgstr "Ignorerar denna fil.\n"
 
 #: ../gio/glib-compile-schemas.c:1901
 #, c-format
-msgid "No such key “%s” in schema “%s” as specified in override file “%s”"
+msgid "No such key '%s' in schema '%s' as specified in override file '%s'"
 msgstr ""
-"Ingen sådan nyckel ”%s” i schemat ”%s” som angetts i åsidosättningsfilen ”%s”"
+"Ingen sådan nyckel '%s' i schemat '%s' som angetts i åsidosättningsfilen '%s'"
 
 #: ../gio/glib-compile-schemas.c:1907 ../gio/glib-compile-schemas.c:1965
 #: ../gio/glib-compile-schemas.c:1993
@@ -2526,10 +2539,10 @@ msgstr " och --strict angavs; avslutar.\n"
 #: ../gio/glib-compile-schemas.c:1927
 #, c-format
 msgid ""
-"error parsing key “%s” in schema “%s” as specified in override file “%s”: %s."
+"error parsing key '%s' in schema '%s' as specified in override file '%s': %s."
 msgstr ""
-"fel vid tolkning av nyckeln ”%s” i schemat ”%s” som angetts i "
-"åsidosättningsfilen ”%s”: %s."
+"fel vid tolkning av nyckeln '%s' i schemat '%s' som angetts i "
+"åsidosättningsfilen '%s': %s."
 
 #: ../gio/glib-compile-schemas.c:1937
 #, c-format
@@ -2539,19 +2552,19 @@ msgstr "Ignorerar åsidosättning för denna nyckel.\n"
 #: ../gio/glib-compile-schemas.c:1955
 #, c-format
 msgid ""
-"override for key “%s” in schema “%s” in override file “%s” is outside the "
+"override for key '%s' in schema '%s' in override file '%s' is outside the "
 "range given in the schema"
 msgstr ""
-"åsidosättning för nyckeln ”%s” i schemat ”%s” i åsidosättningsfilen ”%s” är "
+"åsidosättning för nyckeln '%s' i schemat '%s' i åsidosättningsfilen '%s' är "
 "utanför intervallet som anges i schemat"
 
 #: ../gio/glib-compile-schemas.c:1983
 #, c-format
 msgid ""
-"override for key “%s” in schema “%s” in override file “%s” is not in the "
+"override for key '%s' in schema '%s' in override file '%s' is not in the "
 "list of valid choices"
 msgstr ""
-"åsidosättning för nyckeln ”%s” i schemat ”%s” i åsidosättningsfilen ”%s” "
+"åsidosättning för nyckeln '%s' i schemat '%s' i åsidosättningsfilen '%s' "
 "finns inte i listan över giltiga val"
 
 #: ../gio/glib-compile-schemas.c:2038
@@ -3021,7 +3034,7 @@ msgstr "Utmatningsström har inte implementerat skrivning"
 msgid "Source stream is already closed"
 msgstr "Källströmmen är redan stängd"
 
-#: ../gio/gresolver.c:333 ../gio/gthreadedresolver.c:116
+#: ../gio/gresolver.c:341 ../gio/gthreadedresolver.c:116
 #: ../gio/gthreadedresolver.c:126
 #, c-format
 msgid "Error resolving “%s”: %s"
@@ -3409,144 +3422,144 @@ msgstr "Tomt schemanamn angavs\n"
 msgid "No such key “%s”\n"
 msgstr "Ingen sådan nyckel ”%s”\n"
 
-#: ../gio/gsocket.c:364
+#: ../gio/gsocket.c:369
 msgid "Invalid socket, not initialized"
 msgstr "Ogiltigt uttag, inte initierat"
 
-#: ../gio/gsocket.c:371
+#: ../gio/gsocket.c:376
 #, c-format
 msgid "Invalid socket, initialization failed due to: %s"
 msgstr "Ogiltigt uttag, initiering misslyckades på grund av: %s"
 
-#: ../gio/gsocket.c:379
+#: ../gio/gsocket.c:384
 msgid "Socket is already closed"
 msgstr "Uttaget är redan stängt"
 
-#: ../gio/gsocket.c:394 ../gio/gsocket.c:2751 ../gio/gsocket.c:3897
-#: ../gio/gsocket.c:3952
+#: ../gio/gsocket.c:399 ../gio/gsocket.c:2754 ../gio/gsocket.c:3939
+#: ../gio/gsocket.c:3995
 msgid "Socket I/O timed out"
 msgstr "Tidsgräns för in/ut på uttaget överstegs"
 
-#: ../gio/gsocket.c:526
+#: ../gio/gsocket.c:531
 #, c-format
 msgid "creating GSocket from fd: %s"
 msgstr "skapar GSocket från fd: %s"
 
-#: ../gio/gsocket.c:554 ../gio/gsocket.c:608 ../gio/gsocket.c:615
+#: ../gio/gsocket.c:559 ../gio/gsocket.c:613 ../gio/gsocket.c:620
 #, c-format
 msgid "Unable to create socket: %s"
 msgstr "Kunde inte skapa uttag: %s"
 
-#: ../gio/gsocket.c:608
+#: ../gio/gsocket.c:613
 msgid "Unknown family was specified"
 msgstr "Okänd familj angavs"
 
-#: ../gio/gsocket.c:615
+#: ../gio/gsocket.c:620
 msgid "Unknown protocol was specified"
 msgstr "Okänt protokoll angavs"
 
-#: ../gio/gsocket.c:1104
+#: ../gio/gsocket.c:1111
 #, c-format
 msgid "Cannot use datagram operations on a non-datagram socket."
 msgstr "Kan inte använda datagramåtgärder på ett icke-datagram-uttag."
 
-#: ../gio/gsocket.c:1121
+#: ../gio/gsocket.c:1128
 #, c-format
 msgid "Cannot use datagram operations on a socket with a timeout set."
 msgstr "Kan inte använda datagramåtgärder på ett uttag med en satt tidsgräns."
 
-#: ../gio/gsocket.c:1925
+#: ../gio/gsocket.c:1932
 #, c-format
 msgid "could not get local address: %s"
 msgstr "kunde inte få lokal adress: %s"
 
-#: ../gio/gsocket.c:1968
+#: ../gio/gsocket.c:1975
 #, c-format
 msgid "could not get remote address: %s"
 msgstr "kunde inte få fjärradress: %s"
 
-#: ../gio/gsocket.c:2034
+#: ../gio/gsocket.c:2041
 #, c-format
 msgid "could not listen: %s"
 msgstr "kunde inte lyssna: %s"
 
-#: ../gio/gsocket.c:2133
+#: ../gio/gsocket.c:2140
 #, c-format
 msgid "Error binding to address: %s"
 msgstr "Fel vid bindning till adress: %s"
 
-#: ../gio/gsocket.c:2248 ../gio/gsocket.c:2285
+#: ../gio/gsocket.c:2255 ../gio/gsocket.c:2292
 #, c-format
 msgid "Error joining multicast group: %s"
 msgstr "Fel vid medlemskap i multicast-grupp: %s"
 
-#: ../gio/gsocket.c:2249 ../gio/gsocket.c:2286
+#: ../gio/gsocket.c:2256 ../gio/gsocket.c:2293
 #, c-format
 msgid "Error leaving multicast group: %s"
 msgstr "Fel vid lämnande av multicast-grupp: %s"
 
-#: ../gio/gsocket.c:2250
+#: ../gio/gsocket.c:2257
 msgid "No support for source-specific multicast"
 msgstr "Inget stöd för källspecifik multicast"
 
-#: ../gio/gsocket.c:2470
+#: ../gio/gsocket.c:2477
 #, c-format
 msgid "Error accepting connection: %s"
 msgstr "Fel vid godkännande av anslutning: %s"
 
-#: ../gio/gsocket.c:2593
+#: ../gio/gsocket.c:2598
 msgid "Connection in progress"
 msgstr "Anslutningsförsök pågår"
 
-#: ../gio/gsocket.c:2644
+#: ../gio/gsocket.c:2647
 msgid "Unable to get pending error: "
 msgstr "Kunde inte få tag på väntande fel: "
 
-#: ../gio/gsocket.c:2816
+#: ../gio/gsocket.c:2817
 #, c-format
 msgid "Error receiving data: %s"
 msgstr "Fel vid mottagning av data: %s"
 
-#: ../gio/gsocket.c:3013
+#: ../gio/gsocket.c:3012
 #, c-format
 msgid "Error sending data: %s"
 msgstr "Fel vid sändning av data: %s"
 
-#: ../gio/gsocket.c:3200
+#: ../gio/gsocket.c:3199
 #, c-format
 msgid "Unable to shutdown socket: %s"
 msgstr "Kunde inte stänga ner uttag: %s"
 
-#: ../gio/gsocket.c:3281
+#: ../gio/gsocket.c:3280
 #, c-format
 msgid "Error closing socket: %s"
 msgstr "Fel vid stängning av uttag: %s"
 
-#: ../gio/gsocket.c:3890
+#: ../gio/gsocket.c:3932
 #, c-format
 msgid "Waiting for socket condition: %s"
 msgstr "Väntar på uttagstillstånd: %s"
 
-#: ../gio/gsocket.c:4362 ../gio/gsocket.c:4442 ../gio/gsocket.c:4620
+#: ../gio/gsocket.c:4404 ../gio/gsocket.c:4484 ../gio/gsocket.c:4662
 #, c-format
 msgid "Error sending message: %s"
 msgstr "Fel vid sändning av meddelande: %s"
 
-#: ../gio/gsocket.c:4386
+#: ../gio/gsocket.c:4428
 msgid "GSocketControlMessage not supported on Windows"
 msgstr "GSocketControlMessage stöds inte på Windows"
 
-#: ../gio/gsocket.c:4839 ../gio/gsocket.c:4912 ../gio/gsocket.c:5139
+#: ../gio/gsocket.c:4881 ../gio/gsocket.c:4954 ../gio/gsocket.c:5180
 #, c-format
 msgid "Error receiving message: %s"
 msgstr "Fel vid mottagning av meddelande: %s"
 
-#: ../gio/gsocket.c:5411
+#: ../gio/gsocket.c:5452
 #, c-format
 msgid "Unable to read socket credentials: %s"
 msgstr "Kunde inte läsa uttagets inloggningsuppgifter: %s"
 
-#: ../gio/gsocket.c:5420
+#: ../gio/gsocket.c:5461
 msgid "g_socket_get_credentials not implemented for this OS"
 msgstr ""
 "g_socket_get_credentials har inte implementerats för detta operativsystem"
@@ -3808,7 +3821,7 @@ msgstr "Fel vid läsning från filhandtag: %s"
 msgid "Error closing file descriptor: %s"
 msgstr "Fel vid stängning av filhandtag: %s"
 
-#: ../gio/gunixmounts.c:2364 ../gio/gunixmounts.c:2417
+#: ../gio/gunixmounts.c:2367 ../gio/gunixmounts.c:2420
 msgid "Filesystem root"
 msgstr "Filsystemsrot"
 
@@ -3817,7 +3830,7 @@ msgstr "Filsystemsrot"
 msgid "Error writing to file descriptor: %s"
 msgstr "Fel vid skrivning till filhandtag: %s"
 
-#: ../gio/gunixsocketaddress.c:239
+#: ../gio/gunixsocketaddress.c:241
 msgid "Abstract UNIX domain socket addresses not supported on this system"
 msgstr "Abstrakta UNIX-domänuttagsadresser stöds inte på detta system"
 
@@ -3970,37 +3983,37 @@ msgstr "Ofullständig teckensekvens vid slutet av indata"
 msgid "Cannot convert fallback “%s” to codeset “%s”"
 msgstr "Kan inte konvertera reservsträngen ”%s” till kodningen ”%s”"
 
-#: ../glib/gconvert.c:1567
+#: ../glib/gconvert.c:1566
 #, c-format
 msgid "The URI “%s” is not an absolute URI using the “file” scheme"
 msgstr "URI:n ”%s” är ingen absolut URI som använder ”file”-schemat"
 
-#: ../glib/gconvert.c:1577
+#: ../glib/gconvert.c:1576
 #, c-format
 msgid "The local file URI “%s” may not include a “#”"
 msgstr "Lokala fil-URI:n ”%s” får inte innehålla en ”#”"
 
-#: ../glib/gconvert.c:1594
+#: ../glib/gconvert.c:1593
 #, c-format
 msgid "The URI “%s” is invalid"
 msgstr "URI:n ”%s” är ogiltig"
 
-#: ../glib/gconvert.c:1606
+#: ../glib/gconvert.c:1605
 #, c-format
 msgid "The hostname of the URI “%s” is invalid"
 msgstr "Värdnamnet i URI:n ”%s” är ogiltigt"
 
-#: ../glib/gconvert.c:1622
+#: ../glib/gconvert.c:1621
 #, c-format
 msgid "The URI “%s” contains invalidly escaped characters"
 msgstr "URI:n ”%s” innehåller ogiltigt kodade tecken"
 
-#: ../glib/gconvert.c:1717
+#: ../glib/gconvert.c:1716
 #, c-format
 msgid "The pathname “%s” is not an absolute path"
 msgstr "Sökvägen ”%s” är ingen absolut sökväg"
 
-#: ../glib/gconvert.c:1727
+#: ../glib/gconvert.c:1726
 msgid "Invalid hostname"
 msgstr "Ogiltigt värdnamn"
 
@@ -4465,18 +4478,18 @@ msgstr "Fel på rad %d tecken %d: "
 
 #: ../glib/gmarkup.c:462 ../glib/gmarkup.c:545
 #, c-format
-msgid "Invalid UTF-8 encoded text in name — not valid “%s”"
-msgstr "Ogiltig UTF-8-kodad text i namnet — inte giltig ”%s”"
+msgid "Invalid UTF-8 encoded text in name - not valid '%s'"
+msgstr "Ogiltig UTF-8-kodad text i namnet - inte giltig '%s'"
 
 #: ../glib/gmarkup.c:473
 #, c-format
-msgid "“%s” is not a valid name"
-msgstr "”%s” är inte ett giltigt namn"
+msgid "'%s' is not a valid name"
+msgstr "'%s' är inte ett giltigt namn"
 
 #: ../glib/gmarkup.c:489
 #, c-format
-msgid "“%s” is not a valid name: “%c”"
-msgstr "”%s” är inte ett giltigt namn: ”%c”"
+msgid "'%s' is not a valid name: '%c'"
+msgstr "'%s' är inte ett giltigt namn: '%c'"
 
 #: ../glib/gmarkup.c:599
 #, c-format
@@ -4486,16 +4499,16 @@ msgstr "Fel på rad %d: %s"
 #: ../glib/gmarkup.c:676
 #, c-format
 msgid ""
-"Failed to parse “%-.*s”, which should have been a digit inside a character "
-"reference (&#234; for example) — perhaps the digit is too large"
+"Failed to parse '%-.*s', which should have been a digit inside a character "
+"reference (&#234; for example) - perhaps the digit is too large"
 msgstr ""
-"Misslyckades med att tolka ”%-.*s”, som skulle ha varit en siffra inuti en "
+"Misslyckades med att tolka '%-.*s', som skulle ha varit en siffra inuti en "
 "teckenreferens (&#234; till exempel). Siffran är kanske för stor"
 
 #: ../glib/gmarkup.c:688
 msgid ""
 "Character reference did not end with a semicolon; most likely you used an "
-"ampersand character without intending to start an entity — escape ampersand "
+"ampersand character without intending to start an entity - escape ampersand "
 "as &amp;"
 msgstr ""
 "Teckenreferensen slutade inte med ett semikolon. Troligtvis använde du ett &-"
@@ -4503,25 +4516,25 @@ msgstr ""
 
 #: ../glib/gmarkup.c:714
 #, c-format
-msgid "Character reference “%-.*s” does not encode a permitted character"
-msgstr "Teckenreferensen ”%-.*s” kodar inte ett tillåtet tecken"
+msgid "Character reference '%-.*s' does not encode a permitted character"
+msgstr "Teckenreferensen '%-.*s' kodar inte ett tillåtet tecken"
 
 #: ../glib/gmarkup.c:752
 msgid ""
-"Empty entity “&;” seen; valid entities are: &amp; &quot; &lt; &gt; &apos;"
+"Empty entity '&;' seen; valid entities are: &amp; &quot; &lt; &gt; &apos;"
 msgstr ""
-"Tom entitet ”&;” hittades, giltiga entiteter är: &amp; &quot; &lt; &gt; "
+"Tom entitet '&;' hittades, giltiga entiteter är: &amp; &quot; &lt; &gt; "
 "&apos;"
 
 #: ../glib/gmarkup.c:760
 #, c-format
-msgid "Entity name “%-.*s” is not known"
-msgstr "Entitetsnamnet ”%-.*s” är okänt"
+msgid "Entity name '%-.*s' is not known"
+msgstr "Entitetsnamnet '%-.*s' är okänt"
 
 #: ../glib/gmarkup.c:765
 msgid ""
 "Entity did not end with a semicolon; most likely you used an ampersand "
-"character without intending to start an entity — escape ampersand as &amp;"
+"character without intending to start an entity - escape ampersand as &amp;"
 msgstr ""
 "Entiteten slutade inte med ett semikolon. Troligtvis använde du ett &-tecken "
 "utan att avse att starta en entitet. Skriv om &-tecknet som &amp;"
@@ -4533,93 +4546,93 @@ msgstr "Dokumentet måste börja med ett element (exempelvis <book>)"
 #: ../glib/gmarkup.c:1211
 #, c-format
 msgid ""
-"“%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"
 msgstr ""
-"”%s” är inte ett giltigt tecken efter ett ”<”-tecken. Det får inte inleda "
+"'%s' är inte ett giltigt tecken efter ett '<'-tecken. Det får inte inleda "
 "ett elementnamn"
 
 #: ../glib/gmarkup.c:1253
 #, c-format
 msgid ""
-"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'"
 msgstr ""
-"Konstigt tecken ”%s”, ett ”>”-tecken förväntades för att avsluta tomma "
-"elementtaggen ”%s”"
+"Konstigt tecken '%s', ett '>'-tecken förväntades för att avsluta tomma "
+"elementtaggen '%s'"
 
 #: ../glib/gmarkup.c:1334
 #, c-format
 msgid ""
-"Odd character “%s”, expected a “=” after attribute name “%s” of element “%s”"
+"Odd character '%s', expected a '=' after attribute name '%s' of element '%s'"
 msgstr ""
-"Konstigt tecken ”%s”, ett ”=” förväntades efter attributnamnet ”%s” till "
-"elementet ”%s”"
+"Konstigt tecken '%s', ett '=' förväntades efter attributnamnet '%s' till "
+"elementet '%s'"
 
 #: ../glib/gmarkup.c:1375
 #, c-format
 msgid ""
-"Odd character “%s”, expected a “>” or “/” character to end the start tag of "
-"element “%s”, or optionally an attribute; perhaps you used an invalid "
+"Odd character '%s', expected a '>' or '/' character to end the start tag of "
+"element '%s', or optionally an attribute; perhaps you used an invalid "
 "character in an attribute name"
 msgstr ""
-"Konstigt tecken ”%s”, ett ”>”- eller ”/”-tecken förväntades för att avsluta "
-"starttaggen för elementet ”%s”, eller möjligtvis ett attribut. Du kanske "
+"Konstigt tecken '%s', ett '>'- eller '/'-tecken förväntades för att avsluta "
+"starttaggen för elementet '%s', eller möjligtvis ett attribut. Du kanske "
 "använde ett ogiltigt tecken i ett attributnamn"
 
 #: ../glib/gmarkup.c:1419
 #, c-format
 msgid ""
-"Odd character “%s”, expected an open quote mark after the equals sign when "
-"giving value for attribute “%s” of element “%s”"
+"Odd character '%s', expected an open quote mark after the equals sign when "
+"giving value for attribute '%s' of element '%s'"
 msgstr ""
-"Konstigt tecken ”%s”, ett startcitationstecken förväntades efter "
-"likhetstecknet när värdet av attributet ”%s” till elementet ”%s” tilldelades"
+"Konstigt tecken '%s', ett startcitationstecken förväntades efter "
+"likhetstecknet när värdet av attributet '%s' till elementet '%s' tilldelades"
 
 #: ../glib/gmarkup.c:1552
 #, c-format
 msgid ""
-"“%s” is not a valid character following the characters “</”; “%s” may not "
+"'%s' is not a valid character following the characters '</'; '%s' may not "
 "begin an element name"
 msgstr ""
-"”%s” är inte ett giltigt tecken efter tecknen ”</”. ”%s” får inte inleda ett "
+"'%s' är inte ett giltigt tecken efter tecknen '</'. '%s' får inte inleda ett "
 "elementnamn"
 
 #: ../glib/gmarkup.c:1588
 #, c-format
 msgid ""
-"“%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 '>'"
 msgstr ""
-"”%s” är inte ett giltigt tecken efter stängelementnamnet ”%s”. Det tillåtna "
-"tecknet är ”>”"
+"'%s' är inte ett giltigt tecken efter stängelementnamnet '%s'. Det tillåtna "
+"tecknet är '>'"
 
 #: ../glib/gmarkup.c:1599
 #, c-format
-msgid "Element “%s” was closed, no element is currently open"
-msgstr "Elementet ”%s” stängdes, inget element är öppet för tillfället"
+msgid "Element '%s' was closed, no element is currently open"
+msgstr "Elementet '%s' stängdes, inget element är öppet för tillfället"
 
 #: ../glib/gmarkup.c:1608
 #, c-format
-msgid "Element “%s” was closed, but the currently open element is “%s”"
+msgid "Element '%s' was closed, but the currently open element is '%s'"
 msgstr ""
-"Elementet ”%s” stängdes, men det element som är öppet för tillfället är ”%s”"
+"Elementet '%s' stängdes, men det element som är öppet för tillfället är '%s'"
 
 #: ../glib/gmarkup.c:1761
 msgid "Document was empty or contained only whitespace"
 msgstr "Dokumentet var tomt eller innehöll endast tomrum"
 
 #: ../glib/gmarkup.c:1775
-msgid "Document ended unexpectedly just after an open angle bracket “<”"
-msgstr "Dokumentet tog oväntat slut efter ett öppningsklammer ”<”"
+msgid "Document ended unexpectedly just after an open angle bracket '<'"
+msgstr "Dokumentet tog oväntat slut efter ett öppningsklammer '<'"
 
 #: ../glib/gmarkup.c:1783 ../glib/gmarkup.c:1828
 #, c-format
 msgid ""
-"Document ended unexpectedly with elements still open — “%s” was the last "
+"Document ended unexpectedly with elements still open - '%s' was the last "
 "element opened"
 msgstr ""
-"Dokumentet tog oväntat slut då element fortfarande var öppna. ”%s” var det "
+"Dokumentet tog oväntat slut då element fortfarande var öppna. '%s' var det "
 "senast öppnade elementet"
 
 #: ../glib/gmarkup.c:1791
@@ -4657,8 +4670,8 @@ msgstr "Dokumentet tog oväntat slut inuti ett attributvärde"
 
 #: ../glib/gmarkup.c:1837
 #, c-format
-msgid "Document ended unexpectedly inside the close tag for element “%s”"
-msgstr "Dokumentet tog oväntat slut inuti stängningstaggen för elementet ”%s”"
+msgid "Document ended unexpectedly inside the close tag for element '%s'"
+msgstr "Dokumentet tog oväntat slut inuti stängningstaggen för elementet '%s'"
 
 #: ../glib/gmarkup.c:1843
 msgid "Document ended unexpectedly inside a comment or processing instruction"
@@ -5346,6 +5359,9 @@ msgstr[1] "%s byte"
 msgid "%.1f KB"
 msgstr "%.1f KB"
 
+#~ msgid "No such interface “%s”"
+#~ msgstr "Inget sådan gränssnitt ”%s”"
+
 #~ msgid "Error creating directory '%s': %s"
 #~ msgstr "Fel vid skapandet av katalogen ”%s”: %s"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 45df89916..8bc2d3718 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -14,24 +14,26 @@
 # Mike Manilone <crtmike@gmail.com>, 2012.
 # keyring <keyrings@163.com>, 2013.
 # Tong Hui <tonghuix@gmail.com>, 2014.
+# Mingye Wang <arthur2e5@aosc.xyz>, 2015, 2016.
+# Jeff Bai <jeffbai@aosc.xyz>, 2015, 2016.
 #
-#     Note:"fd" is abbr. of "File Descriptor", 文件描述符
+#     Note: "fd" is abbr. of "File Descriptor", 文件描述符
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: glib master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=glib&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2016-03-25 19:54+0000\n"
-"PO-Revision-Date: 2016-03-26 15:31+0800\n"
-"Last-Translator: Jeff Bai <jeffbai@aosc.xyz>\n"
+"POT-Creation-Date: 2016-12-07 20:45+0000\n"
+"PO-Revision-Date: 2017-02-09 14:57+0800\n"
+"Last-Translator: Mandy Wang <wangmychn@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 1.8.7\n"
+"X-Generator: Poedit 1.8.11\n"
 
 #: ../gio/gapplication.c:493
 msgid "GApplication options"
@@ -50,7 +52,8 @@ msgid "Override the application's ID"
 msgstr "覆盖应用程序 ID"
 
 #: ../gio/gapplication-tool.c:45 ../gio/gapplication-tool.c:46
-#: ../gio/gresource-tool.c:488 ../gio/gsettings-tool.c:512
+#: ../gio/gio-tool.c:209 ../gio/gresource-tool.c:488
+#: ../gio/gsettings-tool.c:520
 msgid "Print help"
 msgstr "打印帮助"
 
@@ -59,11 +62,11 @@ msgstr "打印帮助"
 msgid "[COMMAND]"
 msgstr "[COMMAND]"
 
-#: ../gio/gapplication-tool.c:49
+#: ../gio/gapplication-tool.c:49 ../gio/gio-tool.c:210
 msgid "Print version"
 msgstr "打印版本"
 
-#: ../gio/gapplication-tool.c:50 ../gio/gsettings-tool.c:518
+#: ../gio/gapplication-tool.c:50 ../gio/gsettings-tool.c:526
 msgid "Print version information and exit"
 msgstr "打印版本信息并退出"
 
@@ -112,7 +115,7 @@ msgid "APPID"
 msgstr "APPID"
 
 #: ../gio/gapplication-tool.c:70 ../gio/gapplication-tool.c:133
-#: ../gio/gdbus-tool.c:90
+#: ../gio/gdbus-tool.c:90 ../gio/gio-tool.c:206
 msgid "COMMAND"
 msgstr "COMMAND"
 
@@ -124,9 +127,9 @@ msgstr "要打印其详细帮助的命令"
 msgid "Application identifier in D-Bus format (eg: org.example.viewer)"
 msgstr "D-Bus 格式的应用标识符(比如：org.example.viewer)"
 
-#: ../gio/gapplication-tool.c:72 ../gio/glib-compile-resources.c:592
-#: ../gio/glib-compile-resources.c:623 ../gio/gresource-tool.c:495
-#: ../gio/gresource-tool.c:561
+#: ../gio/gapplication-tool.c:72 ../gio/glib-compile-resources.c:622
+#: ../gio/glib-compile-resources.c:628 ../gio/glib-compile-resources.c:654
+#: ../gio/gresource-tool.c:495 ../gio/gresource-tool.c:561
 msgid "FILE"
 msgstr "FILE"
 
@@ -151,7 +154,7 @@ msgid "Optional parameter to the action invocation, in GVariant format"
 msgstr "可选的动作调用参数，GVariant 格式"
 
 #: ../gio/gapplication-tool.c:96 ../gio/gresource-tool.c:526
-#: ../gio/gsettings-tool.c:598
+#: ../gio/gsettings-tool.c:612
 #, c-format
 msgid ""
 "Unknown command %s\n"
@@ -165,11 +168,11 @@ msgid "Usage:\n"
 msgstr "用法：\n"
 
 #: ../gio/gapplication-tool.c:114 ../gio/gresource-tool.c:551
-#: ../gio/gsettings-tool.c:632
+#: ../gio/gsettings-tool.c:647
 msgid "Arguments:\n"
 msgstr "参数：\n"
 
-#: ../gio/gapplication-tool.c:133
+#: ../gio/gapplication-tool.c:133 ../gio/gio-tool.c:206
 msgid "[ARGS...]"
 msgstr "[ARGS...]"
 
@@ -267,7 +270,7 @@ msgstr ""
 
 #: ../gio/gbufferedinputstream.c:420 ../gio/gbufferedinputstream.c:498
 #: ../gio/ginputstream.c:179 ../gio/ginputstream.c:379
-#: ../gio/ginputstream.c:617 ../gio/ginputstream.c:1016
+#: ../gio/ginputstream.c:617 ../gio/ginputstream.c:1019
 #: ../gio/goutputstream.c:203 ../gio/goutputstream.c:834
 #: ../gio/gpollableinputstream.c:205 ../gio/gpollableoutputstream.c:206
 #, c-format
@@ -277,14 +280,14 @@ msgstr "传递给 %s 的计数值太大"
 #: ../gio/gbufferedinputstream.c:891 ../gio/gbufferedoutputstream.c:575
 #: ../gio/gdataoutputstream.c:562
 msgid "Seek not supported on base stream"
-msgstr "基流(base stream)不支持定位(seek)"
+msgstr "基流不支持定位"
 
 #: ../gio/gbufferedinputstream.c:937
 msgid "Cannot truncate GBufferedInputStream"
 msgstr "无法截断 GBufferedInputStream"
 
-#: ../gio/gbufferedinputstream.c:982 ../gio/ginputstream.c:1205
-#: ../gio/giostream.c:300 ../gio/goutputstream.c:1658
+#: ../gio/gbufferedinputstream.c:982 ../gio/ginputstream.c:1208
+#: ../gio/giostream.c:300 ../gio/goutputstream.c:1660
 msgid "Stream is already closed"
 msgstr "流已经关闭"
 
@@ -292,9 +295,9 @@ msgstr "流已经关闭"
 msgid "Truncate not supported on base stream"
 msgstr "基流(base stream)不支持截断"
 
-#: ../gio/gcancellable.c:317 ../gio/gdbusconnection.c:1847
-#: ../gio/gdbusprivate.c:1375 ../gio/glocalfile.c:2220
-#: ../gio/gsimpleasyncresult.c:870 ../gio/gsimpleasyncresult.c:896
+#: ../gio/gcancellable.c:317 ../gio/gdbusconnection.c:1849
+#: ../gio/gdbusprivate.c:1377 ../gio/gsimpleasyncresult.c:870
+#: ../gio/gsimpleasyncresult.c:896
 #, c-format
 msgid "Operation was cancelled"
 msgstr "操作被取消"
@@ -312,9 +315,9 @@ msgid "Not enough space in destination"
 msgstr "目标位置没有足够的空间"
 
 #: ../gio/gcharsetconverter.c:342 ../gio/gdatainputstream.c:848
-#: ../gio/gdatainputstream.c:1256 ../glib/gconvert.c:438 ../glib/gconvert.c:845
+#: ../gio/gdatainputstream.c:1257 ../glib/gconvert.c:438 ../glib/gconvert.c:845
 #: ../glib/giochannel.c:1556 ../glib/giochannel.c:1598
-#: ../glib/giochannel.c:2442 ../glib/gutf8.c:853 ../glib/gutf8.c:1306
+#: ../glib/giochannel.c:2442 ../glib/gutf8.c:855 ../glib/gutf8.c:1308
 msgid "Invalid byte sequence in conversion input"
 msgstr "转换输入中出现无效字符序列"
 
@@ -388,7 +391,7 @@ msgstr "地址 %s 无效(需要指定的一个路径、临时目录或抽象键)
 #: ../gio/gdbusaddress.c:193
 #, c-format
 msgid "Meaningless key/value pair combination in address entry '%s'"
-msgstr "地址条目“%s”中无意义的键值对组合"
+msgstr "地址条目“%s”中无意义的键/值对组合"
 
 #: ../gio/gdbusaddress.c:256 ../gio/gdbusaddress.c:337
 #, c-format
@@ -398,7 +401,7 @@ msgstr "地址“%s”中有错误 - 端口属性格式错误"
 #: ../gio/gdbusaddress.c:267 ../gio/gdbusaddress.c:348
 #, c-format
 msgid "Error in address '%s' - the family attribute is malformed"
-msgstr "地址“%s”中有错误 - 类别 (family) 属性格式错误"
+msgstr "地址“%s”中有错误 - 协议族属性格式错误"
 
 #: ../gio/gdbusaddress.c:457
 #, c-format
@@ -410,21 +413,21 @@ msgstr "地址元素“%s”不包含冒号(:)"
 msgid ""
 "Key/Value pair %d, '%s', in address element '%s' does not contain an equal "
 "sign"
-msgstr "地址元素“%3$s”中的第 %1$d 个键值对 “%2$s”，不包含等号"
+msgstr "地址元素“%3$s”中的第 %1$d 个键/值对 “%2$s”，不包含等号"
 
 #: ../gio/gdbusaddress.c:492
 #, c-format
 msgid ""
 "Error unescaping key or value in Key/Value pair %d, '%s', in address element "
 "'%s'"
-msgstr "在键/值对 %d ，“%s”在地址元素“%s”，中去转义发生错误"
+msgstr "在地址元素“%3$s”中，对键/值对 %1$d、“%2$s”取消转义键或值时出错"
 
 #: ../gio/gdbusaddress.c:570
 #, c-format
 msgid ""
 "Error in address '%s' - the unix transport requires exactly one of the keys "
 "'path' or 'abstract' to be set"
-msgstr "地址 %s 有错误 - UNIX 传输需要“path”或“abstract”之一的键被设置。"
+msgstr "地址 %s 中有错误 - UNIX 传输需要“path”或“abstract”之一的键被设置。"
 
 #: ../gio/gdbusaddress.c:606
 #, c-format
@@ -439,7 +442,7 @@ msgstr "地址“%s”中有错误 - 端口属性丢失或格式错误"
 #: ../gio/gdbusaddress.c:634
 #, c-format
 msgid "Error in address '%s' - the noncefile attribute is missing or malformed"
-msgstr "地址“%s”中有错误 - noncefile 属性丢失或格式错误"
+msgstr "地址“%s”中有错误 - 临时文件属性丢失或格式错误"
 
 #: ../gio/gdbusaddress.c:655
 msgid "Error auto-launching: "
@@ -453,70 +456,75 @@ msgstr "对地址 %2$s 的未知或不支持的传输 %1$s"
 #: ../gio/gdbusaddress.c:699
 #, c-format
 msgid "Error opening nonce file '%s': %s"
-msgstr "打开临时文件“%s”出错：%s"
+msgstr "打开临时文件“%s”时出错：%s"
 
 #: ../gio/gdbusaddress.c:717
 #, c-format
 msgid "Error reading from nonce file '%s': %s"
-msgstr "读取临时文件“%s”出错：%s"
+msgstr "读取临时文件“%s”时出错：%s"
 
 #: ../gio/gdbusaddress.c:726
 #, c-format
 msgid "Error reading from nonce file '%s', expected 16 bytes, got %d"
-msgstr "读取临时文件“%s”出错，预期 16 个字节，得到了 %d 个字节"
+msgstr "读取临时文件“%s”时出错，预计 16 个字节，得到 %d 个字节"
 
 #: ../gio/gdbusaddress.c:744
 #, c-format
 msgid "Error writing contents of nonce file '%s' to stream:"
 msgstr "写入临时文件 %s 的内容到流的过程中出错："
 
-#: ../gio/gdbusaddress.c:950
+#: ../gio/gdbusaddress.c:951
 msgid "The given address is empty"
 msgstr "给出的地址为空"
 
-#: ../gio/gdbusaddress.c:1063
+#: ../gio/gdbusaddress.c:1064
 #, c-format
 msgid "Cannot spawn a message bus when setuid"
 msgstr "无法在 setuid 时启动一条消息总线"
 
-#: ../gio/gdbusaddress.c:1070
+#: ../gio/gdbusaddress.c:1071
 msgid "Cannot spawn a message bus without a machine-id: "
 msgstr "无法在无机器 ID 时启动一条消息总线："
 
-#: ../gio/gdbusaddress.c:1112
+#: ../gio/gdbusaddress.c:1078
+#, c-format
+msgid "Cannot autolaunch D-Bus without X11 $DISPLAY"
+msgstr "无法在没有 X11 $DISPLAY 的情况下自动启动 D-Bus"
+
+#: ../gio/gdbusaddress.c:1120
 #, c-format
 msgid "Error spawning command line '%s': "
-msgstr "启动命令 %s 出错："
+msgstr "生成并运行命令行 %s 时出错："
 
-#: ../gio/gdbusaddress.c:1329
+#: ../gio/gdbusaddress.c:1337
 #, c-format
 msgid "(Type any character to close this window)\n"
 msgstr "(按任意键关闭本窗口)\n"
 
-#: ../gio/gdbusaddress.c:1481
+#: ../gio/gdbusaddress.c:1489
 #, c-format
 msgid "Session dbus not running, and autolaunch failed"
 msgstr "dbus 会话未运行，自动启动失败"
 
-#: ../gio/gdbusaddress.c:1492
+#: ../gio/gdbusaddress.c:1500
 #, c-format
 msgid "Cannot determine session bus address (not implemented for this OS)"
 msgstr "无法确定会话总线地址(尚未在此操作系统上实现)"
 
-#: ../gio/gdbusaddress.c:1627 ../gio/gdbusconnection.c:7128
+#: ../gio/gdbusaddress.c:1635 ../gio/gdbusconnection.c:7133
 #, c-format
 msgid ""
 "Cannot determine bus address from DBUS_STARTER_BUS_TYPE environment variable "
 "- unknown value '%s'"
 msgstr "无法从 DBUS_STARTER_BUS_TYPE 环境变量确定总线地址 - 未知的值“%s”"
 
-#: ../gio/gdbusaddress.c:1636 ../gio/gdbusconnection.c:7137
+#: ../gio/gdbusaddress.c:1644 ../gio/gdbusconnection.c:7142
 msgid ""
 "Cannot determine bus address because the DBUS_STARTER_BUS_TYPE environment "
 "variable is not set"
 msgstr "无法确定总线地址，因为环境变量 DBUS_STARTER_BUS_TYPE 未设置"
 
-#: ../gio/gdbusaddress.c:1646
+#: ../gio/gdbusaddress.c:1654
 #, c-format
 msgid "Unknown bus type %d"
 msgstr "未知的总线类型 %d"
@@ -535,7 +543,7 @@ msgid ""
 "Exhausted all available authentication mechanisms (tried: %s) (available: %s)"
 msgstr "用尽了所有可用的认证机制(已尝试：%s)(可用的：%s)"
 
-#: ../gio/gdbusauth.c:1170
+#: ../gio/gdbusauth.c:1173
 msgid "Cancelled via GDBusAuthObserver::authorize-authenticated-peer"
 msgstr "通过 GDBusAuthObserver::authorize-authenticated-peer 取消"
 
@@ -548,12 +556,12 @@ msgstr "获取目录“%s”信息时发生错误：%s"
 #, c-format
 msgid ""
 "Permissions on directory '%s' are malformed. Expected mode 0700, got 0%o"
-msgstr "目录“%s”权限错误。期望 0700，却得到了 0%o"
+msgstr "目录“%s”权限错误。期望 0700，得到 0%o"
 
 #: ../gio/gdbusauthmechanismsha1.c:294
 #, c-format
 msgid "Error creating directory '%s': %s"
-msgstr "创建目录“%s”出错：%s"
+msgstr "创建目录“%s”时出错：%s"
 
 #: ../gio/gdbusauthmechanismsha1.c:377
 #, c-format
@@ -563,144 +571,144 @@ msgstr "打开密钥环“%s”读取时出错："
 #: ../gio/gdbusauthmechanismsha1.c:401 ../gio/gdbusauthmechanismsha1.c:714
 #, c-format
 msgid "Line %d of the keyring at '%s' with content '%s' is malformed"
-msgstr "%2$s 处的密钥环的 %1$d 行有不符合格式的内容 %3$s"
+msgstr "“%2$s”处的密钥环的 %1$d 行有不符合格式的内容“%3$s”"
 
 #: ../gio/gdbusauthmechanismsha1.c:415 ../gio/gdbusauthmechanismsha1.c:728
 #, c-format
 msgid ""
 "First token of line %d of the keyring at '%s' with content '%s' is malformed"
-msgstr "%2$s 处的密钥环的 %1$d 行第一个令牌有不符合格式的内容 %3$s"
+msgstr "“%2$s”处的密钥环的 %1$d 行第一个令牌有不符合格式的内容“%3$s”"
 
 #: ../gio/gdbusauthmechanismsha1.c:430 ../gio/gdbusauthmechanismsha1.c:742
 #, c-format
 msgid ""
 "Second token of line %d of the keyring at '%s' with content '%s' is malformed"
-msgstr "%2$s 处的密钥环的 %1$d 行第二个令牌有不符合格式的内容 %3$s"
+msgstr "“%2$s”处的密钥环的 %1$d 行第二个令牌有不符合格式的内容“%3$s”"
 
 #: ../gio/gdbusauthmechanismsha1.c:454
 #, c-format
 msgid "Didn't find cookie with id %d in the keyring at '%s'"
-msgstr "未在 %2$s 处的密钥环中找到 ID 为 %1$d 的 cookie"
+msgstr "未在“%2$s”处的密钥环中找到 ID 为 %1$d 的 cookie"
 
 #: ../gio/gdbusauthmechanismsha1.c:532
 #, c-format
 msgid "Error deleting stale lock file '%s': %s"
-msgstr "删除失效的锁文件“%s”出错：%s"
+msgstr "删除失效的锁文件“%s”时出错：%s"
 
 #: ../gio/gdbusauthmechanismsha1.c:564
 #, c-format
 msgid "Error creating lock file '%s': %s"
-msgstr "创建锁文件“%s”出错：%s"
+msgstr "创建锁文件“%s”时出错：%s"
 
 #: ../gio/gdbusauthmechanismsha1.c:594
 #, c-format
 msgid "Error closing (unlinked) lock file '%s': %s"
-msgstr "关闭(删除)锁文件“%s”出错：%s"
+msgstr "关闭(已删除的)锁文件“%s”时出错：%s"
 
 #: ../gio/gdbusauthmechanismsha1.c:604
 #, c-format
 msgid "Error unlinking lock file '%s': %s"
-msgstr "删除锁文件“%s”出错：%s"
+msgstr "删除锁文件“%s”时出错：%s"
 
 #: ../gio/gdbusauthmechanismsha1.c:681
 #, c-format
 msgid "Error opening keyring '%s' for writing: "
-msgstr "打开钥匙环“%s”以写入出错："
+msgstr "打开钥匙环“%s”以写入时出错："
 
 #: ../gio/gdbusauthmechanismsha1.c:878
 #, c-format
 msgid "(Additionally, releasing the lock for '%s' also failed: %s) "
 msgstr "(此外，释放 %s 的锁失败：%s)"
 
-#: ../gio/gdbusconnection.c:612 ../gio/gdbusconnection.c:2373
+#: ../gio/gdbusconnection.c:612 ../gio/gdbusconnection.c:2377
 msgid "The connection is closed"
 msgstr "连接已关闭"
 
-#: ../gio/gdbusconnection.c:1877
+#: ../gio/gdbusconnection.c:1879
 msgid "Timeout was reached"
 msgstr "已到超时限制"
 
-#: ../gio/gdbusconnection.c:2495
+#: ../gio/gdbusconnection.c:2499
 msgid ""
 "Unsupported flags encountered when constructing a client-side connection"
 msgstr "构建客户端连接时遇到不支持的标志"
 
-#: ../gio/gdbusconnection.c:4105 ../gio/gdbusconnection.c:4452
+#: ../gio/gdbusconnection.c:4109 ../gio/gdbusconnection.c:4456
 #, c-format
 msgid ""
 "No such interface 'org.freedesktop.DBus.Properties' on object at path %s"
 msgstr "路径 %s 的对象上没有 org.freedesktop.DBus.Properties 接口"
 
-#: ../gio/gdbusconnection.c:4247
+#: ../gio/gdbusconnection.c:4251
 #, c-format
 msgid "No such property '%s'"
 msgstr "无此属性：%s"
 
-#: ../gio/gdbusconnection.c:4259
+#: ../gio/gdbusconnection.c:4263
 #, c-format
 msgid "Property '%s' is not readable"
 msgstr "属性 %s 不可读"
 
-#: ../gio/gdbusconnection.c:4270
+#: ../gio/gdbusconnection.c:4274
 #, c-format
 msgid "Property '%s' is not writable"
 msgstr "属性 %s 不可写"
 
-#: ../gio/gdbusconnection.c:4290
+#: ../gio/gdbusconnection.c:4294
 #, c-format
 msgid "Error setting property '%s': Expected type '%s' but got '%s'"
 msgstr "设置属性 %s 出错：期望 %s 类型但得到 %s 类型"
 
-#: ../gio/gdbusconnection.c:4395 ../gio/gdbusconnection.c:6568
+#: ../gio/gdbusconnection.c:4399 ../gio/gdbusconnection.c:6573
 #, c-format
 msgid "No such interface '%s'"
 msgstr "无此接口：%s"
 
-#: ../gio/gdbusconnection.c:4603
+#: ../gio/gdbusconnection.c:4607
 msgid "No such interface"
 msgstr "无此接口"
 
-#: ../gio/gdbusconnection.c:4821 ../gio/gdbusconnection.c:7077
+#: ../gio/gdbusconnection.c:4825 ../gio/gdbusconnection.c:7082
 #, c-format
 msgid "No such interface '%s' on object at path %s"
 msgstr "在路径 %s 的对象上没有 %s 接口"
 
-#: ../gio/gdbusconnection.c:4919
+#: ../gio/gdbusconnection.c:4923
 #, c-format
 msgid "No such method '%s'"
 msgstr "无此方法：%s"
 
-#: ../gio/gdbusconnection.c:4950
+#: ../gio/gdbusconnection.c:4954
 #, c-format
 msgid "Type of message, '%s', does not match expected type '%s'"
 msgstr "消息的类型“%s”，与预期的类型“%s”不匹配"
 
-#: ../gio/gdbusconnection.c:5148
+#: ../gio/gdbusconnection.c:5152
 #, c-format
 msgid "An object is already exported for the interface %s at %s"
 msgstr "%2$s 处的接口 %1$s 已经导出了一个对象"
 
-#: ../gio/gdbusconnection.c:5374
+#: ../gio/gdbusconnection.c:5378
 #, c-format
 msgid "Unable to retrieve property %s.%s"
 msgstr "无法接收属性 %s：%s"
 
-#: ../gio/gdbusconnection.c:5430
+#: ../gio/gdbusconnection.c:5434
 #, c-format
 msgid "Unable to set property %s.%s"
 msgstr "无法设置属性 %s：%s"
 
-#: ../gio/gdbusconnection.c:5606
+#: ../gio/gdbusconnection.c:5610
 #, c-format
 msgid "Method '%s' returned type '%s', but expected '%s'"
 msgstr "方法“%s”返回类型“%s”，但预期的是“%s”"
 
-#: ../gio/gdbusconnection.c:6679
+#: ../gio/gdbusconnection.c:6684
 #, c-format
 msgid "Method '%s' on interface '%s' with signature '%s' does not exist"
 msgstr "带有 %3$s 签名的接口 %2$s 上不存在 %1$s 方法"
 
-#: ../gio/gdbusconnection.c:6800
+#: ../gio/gdbusconnection.c:6805
 #, c-format
 msgid "A subtree is already exported for %s"
 msgstr "已经为 %s 导出一个子树"
@@ -746,7 +754,7 @@ msgstr[0] "期望读取 %lu 个字节但只得到 %lu 个"
 #: ../gio/gdbusmessage.c:1369
 #, c-format
 msgid "Expected NUL byte after the string '%s' but found byte %d"
-msgstr "期望 %s 后为 NUL 字节但得到字节 %d"
+msgstr "期望“%s”后为 NUL 字节但得到字节 %d"
 
 #: ../gio/gdbusmessage.c:1388
 #, c-format
@@ -755,17 +763,17 @@ msgid ""
 "(length of string is %d). The valid UTF-8 string up until that point was '%s'"
 msgstr ""
 "期望得到有效的 UTF-8 字符串，但在字节偏移 %d 处(字符串长度为 %d)得到了无效的"
-"字节。该点的有效 UTF-8 字符串曾是 %s。"
+"字节。该点的有效 UTF-8 字符串曾是“%s”。"
 
 #: ../gio/gdbusmessage.c:1587
 #, c-format
 msgid "Parsed value '%s' is not a valid D-Bus object path"
-msgstr "已解析的值 %s 不是有效的 D-Bus 对象路径"
+msgstr "已解析的值“%s”不是有效的 D-Bus 对象路径"
 
 #: ../gio/gdbusmessage.c:1609
 #, c-format
 msgid "Parsed value '%s' is not a valid D-Bus signature"
-msgstr "已解析的值 %s 不是有效的 D-Bus 签名"
+msgstr "已解析的值“%s”不是有效的 D-Bus 签名"
 
 #: ../gio/gdbusmessage.c:1656
 #, c-format
@@ -780,12 +788,13 @@ msgstr[0] "得到长度为 %u 字节的数组，最大长度应为 2<<26 字节(
 msgid ""
 "Encountered array of type 'a%c', expected to have a length a multiple of %u "
 "bytes, but found to be %u bytes in length"
-msgstr "得到类型为 a%c 的数组，长度需要是 %u 的倍数，但是现在长度为 %u"
+msgstr ""
+"得到类型为“a%c”的数组，期望长度为 %u 字节的倍数，但是得到长度为 %u 字节。"
 
 #: ../gio/gdbusmessage.c:1843
 #, c-format
 msgid "Parsed value '%s' for variant is not a valid D-Bus signature"
-msgstr "已解析的衍生属性值 %s 不是有效的 D-Bus 签名"
+msgstr "已解析的衍生属性值“%s”不是有效的 D-Bus 签名"
 
 #: ../gio/gdbusmessage.c:1867
 #, c-format
@@ -798,7 +807,7 @@ msgstr "在以 D-Bus 线格式用类型字符串“%s”反序列化 GVariant �
 msgid ""
 "Invalid endianness value. Expected 0x6c ('l') or 0x42 ('B') but found value "
 "0x%02x"
-msgstr "无效的字节序值。期望为 0x6c (“l”)或 0x42 (“B”)但是发现了值 0x%02x"
+msgstr "无效的字节序值。期望为 0x6c (“l”)或 0x42 (“B”)但得到值 0x%02x"
 
 #: ../gio/gdbusmessage.c:2064
 #, c-format
@@ -808,12 +817,12 @@ msgstr "无效的主协议版本。期望 1，但是找到了 %d"
 #: ../gio/gdbusmessage.c:2120
 #, c-format
 msgid "Signature header with signature '%s' found but message body is empty"
-msgstr "头部带有 %s 签名但消息主体为空"
+msgstr "发现签名“%s”的签名头部，但邮件正文为空"
 
 #: ../gio/gdbusmessage.c:2134
 #, c-format
 msgid "Parsed value '%s' is not a valid D-Bus signature (for body)"
-msgstr "已解析的值 %s 不是有效的 D-Bus 签名(针对消息主体)"
+msgstr "已解析的值“%s”不是有效的 D-Bus 签名(针对消息主体)"
 
 #: ../gio/gdbusmessage.c:2164
 #, c-format
@@ -845,49 +854,49 @@ msgstr "无法串行消息："
 #: ../gio/gdbusmessage.c:2704
 #, c-format
 msgid "Message body has signature '%s' but there is no signature header"
-msgstr "消息主体有签名 %s 但头部没有签名"
+msgstr "消息主体有签名“%s”但是没有签名头部"
 
 #: ../gio/gdbusmessage.c:2714
 #, c-format
 msgid ""
 "Message body has type signature '%s' but signature in the header field is "
 "'%s'"
-msgstr "消息主体有类型签名 %s 但头部的签名为 %s"
+msgstr "消息主体有类型签名“%s”但头域的签名为“%s”"
 
 #: ../gio/gdbusmessage.c:2730
 #, c-format
 msgid "Message body is empty but signature in the header field is '(%s)'"
-msgstr "消息主体为空，但头部有签名 %s"
+msgstr "消息主体为空，但头域的签名为“(%s)”"
 
 #: ../gio/gdbusmessage.c:3283
 #, c-format
 msgid "Error return with body of type '%s'"
-msgstr "返回主体类型 %s 出错"
+msgstr "返回主体类型“%s”出错"
 
 #: ../gio/gdbusmessage.c:3291
 msgid "Error return with empty body"
 msgstr "返回空主体出错"
 
-#: ../gio/gdbusprivate.c:2036
+#: ../gio/gdbusprivate.c:2038
 #, c-format
 msgid "Unable to get Hardware profile: %s"
 msgstr "无法获得硬件测量信息：%s"
 
-#: ../gio/gdbusprivate.c:2081
+#: ../gio/gdbusprivate.c:2083
 msgid "Unable to load /var/lib/dbus/machine-id or /etc/machine-id: "
 msgstr "无法加载 /var/lib/dbus/machine-id 和 /etc/machine-id："
 
-#: ../gio/gdbusproxy.c:1610
+#: ../gio/gdbusproxy.c:1611
 #, c-format
 msgid "Error calling StartServiceByName for %s: "
 msgstr "为 %s 调用 StartServiceByName 出错："
 
-#: ../gio/gdbusproxy.c:1633
+#: ../gio/gdbusproxy.c:1634
 #, c-format
 msgid "Unexpected reply %d from StartServiceByName(\"%s\") method"
 msgstr "从 StartServiceByName(%2$s) 方式处获得意外回复 %1$d"
 
-#: ../gio/gdbusproxy.c:2709 ../gio/gdbusproxy.c:2843
+#: ../gio/gdbusproxy.c:2713 ../gio/gdbusproxy.c:2847
 msgid ""
 "Cannot invoke method; proxy is for a well-known name without an owner and "
 "proxy was constructed with the G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START flag"
@@ -906,7 +915,7 @@ msgstr "创建服务器时无法指定临时文件"
 #: ../gio/gdbusserver.c:873
 #, c-format
 msgid "Error writing nonce file at '%s': %s"
-msgstr "写入“%s”处的临时文件出错：%s"
+msgstr "写入“%s”处的临时文件时出错：%s"
 
 #: ../gio/gdbusserver.c:1044
 #, c-format
@@ -916,7 +925,7 @@ msgstr "字符串“%s”不是有效 D-Bus GUID"
 #: ../gio/gdbusserver.c:1084
 #, c-format
 msgid "Cannot listen on unsupported transport '%s'"
-msgstr "无法监听不支持的传输 %s"
+msgstr "无法监听不支持的传输“%s”"
 
 #: ../gio/gdbus-tool.c:95
 #, c-format
@@ -932,20 +941,21 @@ msgid ""
 msgstr ""
 "命令：\n"
 "  help         显示本信息\n"
-"  introspect   Introspect 一个远程对象\n"
+"  introspect   内省一个远程对象\n"
 "  monitor      监视一个远程对象\n"
 "  call         调用远程对象的一个方法\n"
+"  emit        发出一个信号\n"
 "\n"
 "使用“%s COMMAND --help”以获得每一个命令的帮助。\n"
 
 #: ../gio/gdbus-tool.c:164 ../gio/gdbus-tool.c:226 ../gio/gdbus-tool.c:298
-#: ../gio/gdbus-tool.c:322 ../gio/gdbus-tool.c:711 ../gio/gdbus-tool.c:1043
-#: ../gio/gdbus-tool.c:1477
+#: ../gio/gdbus-tool.c:322 ../gio/gdbus-tool.c:724 ../gio/gdbus-tool.c:1067
+#: ../gio/gdbus-tool.c:1509 ../gio/gio-tool-rename.c:84
 #, c-format
 msgid "Error: %s\n"
 msgstr "错误：%s\n"
 
-#: ../gio/gdbus-tool.c:175 ../gio/gdbus-tool.c:239 ../gio/gdbus-tool.c:1493
+#: ../gio/gdbus-tool.c:175 ../gio/gdbus-tool.c:239 ../gio/gdbus-tool.c:1525
 #, c-format
 msgid "Error parsing introspection XML: %s\n"
 msgstr "解析 Introspection XML 时出错：%s\n"
@@ -996,7 +1006,7 @@ msgstr "警告：根据 Introspection 数据，接口“%s”不存在\n"
 msgid ""
 "Warning: According to introspection data, method '%s' does not exist on "
 "interface '%s'\n"
-msgstr "警告：根据 Introspection 数据，在接口“%s”中方法“%s”不存在\n"
+msgstr "警告：根据 Introspection 数据，在接口“%2$s”中方法“%1$s”不存在\n"
 
 #: ../gio/gdbus-tool.c:542
 msgid "Optional destination for signal (unique name)"
@@ -1010,207 +1020,207 @@ msgstr "要触发信号的对象路径"
 msgid "Signal and interface name"
 msgstr "信号和接口名称"
 
-#: ../gio/gdbus-tool.c:576
+#: ../gio/gdbus-tool.c:578
 msgid "Emit a signal."
 msgstr "发射信号。"
 
-#: ../gio/gdbus-tool.c:610 ../gio/gdbus-tool.c:842 ../gio/gdbus-tool.c:1583
-#: ../gio/gdbus-tool.c:1818
+#: ../gio/gdbus-tool.c:612 ../gio/gdbus-tool.c:857 ../gio/gdbus-tool.c:1615
+#: ../gio/gdbus-tool.c:1850
 #, c-format
 msgid "Error connecting: %s\n"
 msgstr "连接时出错：%s\n"
 
-#: ../gio/gdbus-tool.c:622
+#: ../gio/gdbus-tool.c:624
 #, c-format
 msgid "Error: object path not specified.\n"
 msgstr "错误：没有指定对象路径。\n"
 
-#: ../gio/gdbus-tool.c:627 ../gio/gdbus-tool.c:909 ../gio/gdbus-tool.c:1648
-#: ../gio/gdbus-tool.c:1884
+#: ../gio/gdbus-tool.c:629 ../gio/gdbus-tool.c:924 ../gio/gdbus-tool.c:1680
+#: ../gio/gdbus-tool.c:1916
 #, c-format
 msgid "Error: %s is not a valid object path\n"
 msgstr "错误：%s 不是有效的对象路径\n"
 
-#: ../gio/gdbus-tool.c:633
+#: ../gio/gdbus-tool.c:635
 #, c-format
 msgid "Error: signal not specified.\n"
 msgstr "错误：没有指定对象。\n"
 
-#: ../gio/gdbus-tool.c:640
+#: ../gio/gdbus-tool.c:642
 #, c-format
 msgid "Error: signal must be the fully-qualified name.\n"
 msgstr "错误：信号必须是完全限定名。\n"
 
-#: ../gio/gdbus-tool.c:648
+#: ../gio/gdbus-tool.c:650
 #, c-format
 msgid "Error: %s is not a valid interface name\n"
 msgstr "错误：%s 不是有效的接口名称。\n"
 
-#: ../gio/gdbus-tool.c:654
+#: ../gio/gdbus-tool.c:656
 #, c-format
 msgid "Error: %s is not a valid member name\n"
 msgstr "错误：%s 不是有效的成员名称。\n"
 
-#: ../gio/gdbus-tool.c:660
+#: ../gio/gdbus-tool.c:662
 #, c-format
 msgid "Error: %s is not a valid unique bus name.\n"
 msgstr "错误：%s 不是有效的唯一总线名。\n"
 
 #. Use the original non-"parse-me-harder" error
-#: ../gio/gdbus-tool.c:687 ../gio/gdbus-tool.c:1011
+#: ../gio/gdbus-tool.c:699 ../gio/gdbus-tool.c:1036
 #, c-format
 msgid "Error parsing parameter %d: %s\n"
 msgstr "解析第 %d 个选项出错：%s\n"
 
-#: ../gio/gdbus-tool.c:718
+#: ../gio/gdbus-tool.c:731
 #, c-format
 msgid "Error flushing connection: %s\n"
 msgstr "清空连接接时出错：%s\n"
 
-#: ../gio/gdbus-tool.c:745
+#: ../gio/gdbus-tool.c:758
 msgid "Destination name to invoke method on"
 msgstr "调用方法的目标位置名称"
 
-#: ../gio/gdbus-tool.c:746
+#: ../gio/gdbus-tool.c:759
 msgid "Object path to invoke method on"
 msgstr "调用方法的对象路径"
 
-#: ../gio/gdbus-tool.c:747
+#: ../gio/gdbus-tool.c:760
 msgid "Method and interface name"
 msgstr "方法和接口名称"
 
-#: ../gio/gdbus-tool.c:748
+#: ../gio/gdbus-tool.c:761
 msgid "Timeout in seconds"
 msgstr "超时(以秒为单位)"
 
-#: ../gio/gdbus-tool.c:787
+#: ../gio/gdbus-tool.c:802
 msgid "Invoke a method on a remote object."
 msgstr "在远程对象上调用一个方法。"
 
-#: ../gio/gdbus-tool.c:862 ../gio/gdbus-tool.c:1602 ../gio/gdbus-tool.c:1837
+#: ../gio/gdbus-tool.c:877 ../gio/gdbus-tool.c:1634 ../gio/gdbus-tool.c:1869
 #, c-format
 msgid "Error: Destination is not specified\n"
 msgstr "错误：没有指定目标位置名称\n"
 
-#: ../gio/gdbus-tool.c:874 ../gio/gdbus-tool.c:1619 ../gio/gdbus-tool.c:1849
+#: ../gio/gdbus-tool.c:889 ../gio/gdbus-tool.c:1651 ../gio/gdbus-tool.c:1881
 #, c-format
 msgid "Error: %s is not a valid bus name\n"
 msgstr "错误：%s 不是有效的总线名称。\n"
 
-#: ../gio/gdbus-tool.c:889 ../gio/gdbus-tool.c:1628
+#: ../gio/gdbus-tool.c:904 ../gio/gdbus-tool.c:1660
 #, c-format
 msgid "Error: Object path is not specified\n"
 msgstr "错误：没有指定对象路径\n"
 
-#: ../gio/gdbus-tool.c:924
+#: ../gio/gdbus-tool.c:939
 #, c-format
 msgid "Error: Method name is not specified\n"
 msgstr "错误：方法名没有指定\n"
 
-#: ../gio/gdbus-tool.c:935
+#: ../gio/gdbus-tool.c:950
 #, c-format
 msgid "Error: Method name '%s' is invalid\n"
 msgstr "错误：方法名“%s”无效\n"
 
-#: ../gio/gdbus-tool.c:1003
+#: ../gio/gdbus-tool.c:1028
 #, c-format
 msgid "Error parsing parameter %d of type '%s': %s\n"
-msgstr "解析 %2$s 类型的参数 %1$d 时发生错误：%3$s\n"
+msgstr "解析\"%2$s\"类型的参数 %1$d 时发生错误：%3$s\n"
 
-#: ../gio/gdbus-tool.c:1440
+#: ../gio/gdbus-tool.c:1472
 msgid "Destination name to introspect"
 msgstr "要 Introspect 的目标位置名称"
 
-#: ../gio/gdbus-tool.c:1441
+#: ../gio/gdbus-tool.c:1473
 msgid "Object path to introspect"
 msgstr "要 Introspect 的对象路径"
 
-#: ../gio/gdbus-tool.c:1442
+#: ../gio/gdbus-tool.c:1474
 msgid "Print XML"
 msgstr "输出 XML"
 
-#: ../gio/gdbus-tool.c:1443
+#: ../gio/gdbus-tool.c:1475
 msgid "Introspect children"
 msgstr "Introspect 子对象"
 
-#: ../gio/gdbus-tool.c:1444
+#: ../gio/gdbus-tool.c:1476
 msgid "Only print properties"
 msgstr "只打印属性"
 
-#: ../gio/gdbus-tool.c:1535
+#: ../gio/gdbus-tool.c:1567
 msgid "Introspect a remote object."
 msgstr "Introspect 远程对象。"
 
-#: ../gio/gdbus-tool.c:1740
+#: ../gio/gdbus-tool.c:1772
 msgid "Destination name to monitor"
 msgstr "要监视的目标位置名称"
 
-#: ../gio/gdbus-tool.c:1741
+#: ../gio/gdbus-tool.c:1773
 msgid "Object path to monitor"
 msgstr "要监视的对象路径"
 
-#: ../gio/gdbus-tool.c:1770
+#: ../gio/gdbus-tool.c:1802
 msgid "Monitor a remote object."
 msgstr "监视一个远程对象。"
 
-#: ../gio/gdesktopappinfo.c:1993 ../gio/gdesktopappinfo.c:4503
+#: ../gio/gdesktopappinfo.c:1994 ../gio/gdesktopappinfo.c:4501
 msgid "Unnamed"
 msgstr "未命名"
 
-#: ../gio/gdesktopappinfo.c:2402
+#: ../gio/gdesktopappinfo.c:2404
 msgid "Desktop file didn't specify Exec field"
 msgstr "桌面文件未指定 Exec 区域"
 
-#: ../gio/gdesktopappinfo.c:2687
+#: ../gio/gdesktopappinfo.c:2689
 msgid "Unable to find terminal required for application"
 msgstr "无法找到应用程序需要的终端"
 
-#: ../gio/gdesktopappinfo.c:3099
+#: ../gio/gdesktopappinfo.c:3097
 #, c-format
 msgid "Can't create user application configuration folder %s: %s"
 msgstr "无法创建用户应用程序配置文件夹 %s：%s"
 
-#: ../gio/gdesktopappinfo.c:3103
+#: ../gio/gdesktopappinfo.c:3101
 #, c-format
 msgid "Can't create user MIME configuration folder %s: %s"
 msgstr "无法创建用户 MIME 配置文件夹 %s：%s"
 
-#: ../gio/gdesktopappinfo.c:3343 ../gio/gdesktopappinfo.c:3367
+#: ../gio/gdesktopappinfo.c:3341 ../gio/gdesktopappinfo.c:3365
 msgid "Application information lacks an identifier"
 msgstr "应用程序信息缺少标志符。"
 
-#: ../gio/gdesktopappinfo.c:3601
+#: ../gio/gdesktopappinfo.c:3599
 #, c-format
 msgid "Can't create user desktop file %s"
 msgstr "无法创建用户桌面文件 %s"
 
-#: ../gio/gdesktopappinfo.c:3735
+#: ../gio/gdesktopappinfo.c:3733
 #, c-format
 msgid "Custom definition for %s"
 msgstr "%s 的自定义定义"
 
-#: ../gio/gdrive.c:392
+#: ../gio/gdrive.c:417
 msgid "drive doesn't implement eject"
-msgstr "驱动器未实现弹出操作"
+msgstr "驱动器未实现弹出"
 
 #. Translators: This is an error
 #. * message for drive objects that
 #. * don't implement any of eject or eject_with_operation.
-#: ../gio/gdrive.c:470
+#: ../gio/gdrive.c:495
 msgid "drive doesn't implement eject or eject_with_operation"
-msgstr "驱动器未实现 eject 或 eject_with_operation"
+msgstr "驱动器未实现弹出或 eject_with_operation"
 
-#: ../gio/gdrive.c:546
+#: ../gio/gdrive.c:571
 msgid "drive doesn't implement polling for media"
 msgstr "驱动器未实现媒体轮询"
 
-#: ../gio/gdrive.c:751
+#: ../gio/gdrive.c:776
 msgid "drive doesn't implement start"
-msgstr "驱动器未实现 start"
+msgstr "驱动器未实现启动"
 
-#: ../gio/gdrive.c:853
+#: ../gio/gdrive.c:878
 msgid "drive doesn't implement stop"
-msgstr "驱动器未实现 stop"
+msgstr "驱动器未实现停止"
 
 #: ../gio/gdummytlsbackend.c:195 ../gio/gdummytlsbackend.c:317
 #: ../gio/gdummytlsbackend.c:509
@@ -1249,10 +1259,10 @@ msgstr "GEmblemedIcon 中应为 GEmblem"
 #: ../gio/gfile.c:1583 ../gio/gfile.c:1638 ../gio/gfile.c:1696
 #: ../gio/gfile.c:1780 ../gio/gfile.c:1837 ../gio/gfile.c:1901
 #: ../gio/gfile.c:1956 ../gio/gfile.c:3604 ../gio/gfile.c:3659
-#: ../gio/gfile.c:3894 ../gio/gfile.c:3936 ../gio/gfile.c:4404
-#: ../gio/gfile.c:4815 ../gio/gfile.c:4900 ../gio/gfile.c:4990
-#: ../gio/gfile.c:5087 ../gio/gfile.c:5174 ../gio/gfile.c:5275
-#: ../gio/gfile.c:7796 ../gio/gfile.c:7886 ../gio/gfile.c:7970
+#: ../gio/gfile.c:3895 ../gio/gfile.c:3937 ../gio/gfile.c:4405
+#: ../gio/gfile.c:4816 ../gio/gfile.c:4901 ../gio/gfile.c:4991
+#: ../gio/gfile.c:5088 ../gio/gfile.c:5175 ../gio/gfile.c:5276
+#: ../gio/gfile.c:7817 ../gio/gfile.c:7907 ../gio/gfile.c:7991
 #: ../gio/win32/gwinhttpfile.c:437
 msgid "Operation not supported"
 msgstr "不支持该操作"
@@ -1261,18 +1271,11 @@ msgstr "不支持该操作"
 #. * trying to find the enclosing (user visible)
 #. * mount of a file, but none exists.
 #.
-#. Translators: This is an error message when trying to
-#. * find the enclosing (user visible) mount of a file, but
-#. * none exists.
-#. Translators: This is an error message when trying to find
-#. * the enclosing (user visible) mount of a file, but none
-#. * exists.
-#: ../gio/gfile.c:1468 ../gio/glocalfile.c:1134 ../gio/glocalfile.c:1145
-#: ../gio/glocalfile.c:1158
+#: ../gio/gfile.c:1468
 msgid "Containing mount does not exist"
 msgstr "包含的挂载不存在"
 
-#: ../gio/gfile.c:2515 ../gio/glocalfile.c:2376
+#: ../gio/gfile.c:2515 ../gio/glocalfile.c:2374
 msgid "Can't copy over directory"
 msgstr "无法跨目录复制"
 
@@ -1280,7 +1283,7 @@ msgstr "无法跨目录复制"
 msgid "Can't copy directory over directory"
 msgstr "无法跨目录复制到目录"
 
-#: ../gio/gfile.c:2583 ../gio/glocalfile.c:2385
+#: ../gio/gfile.c:2583
 msgid "Target file exists"
 msgstr "目标文件已存在"
 
@@ -1295,42 +1298,42 @@ msgstr "不支持拼接"
 #: ../gio/gfile.c:2888
 #, c-format
 msgid "Error splicing file: %s"
-msgstr "拼接文件出错：%s"
+msgstr "拼接文件时出错：%s"
 
 #: ../gio/gfile.c:3019
 msgid "Copy (reflink/clone) between mounts is not supported"
-msgstr "不支持在挂载之间复制(链接/克隆)"
+msgstr "不支持在挂载之间复制(reflink/clone)"
 
 #: ../gio/gfile.c:3023
 msgid "Copy (reflink/clone) is not supported or invalid"
-msgstr "不支持复制(链接/克隆)操作或操作非法"
+msgstr "不支持复制(reflink/clone)操作或操作非法"
 
 #: ../gio/gfile.c:3028
 msgid "Copy (reflink/clone) is not supported or didn't work"
-msgstr "不支持复制(链接/克隆)操作或者不工作"
+msgstr "不支持复制(reflink/clone)操作或者不工作"
 
 #: ../gio/gfile.c:3091
 msgid "Can't copy special file"
 msgstr "无法复制特殊文件"
 
-#: ../gio/gfile.c:3884
+#: ../gio/gfile.c:3885
 msgid "Invalid symlink value given"
 msgstr "给出的符号链接值无效"
 
-#: ../gio/gfile.c:4045
+#: ../gio/gfile.c:4046
 msgid "Trash not supported"
 msgstr "不支持回收站"
 
-#: ../gio/gfile.c:4157
+#: ../gio/gfile.c:4158
 #, c-format
 msgid "File names cannot contain '%c'"
 msgstr "文件名不能包含“%c”"
 
-#: ../gio/gfile.c:6586 ../gio/gvolume.c:363
+#: ../gio/gfile.c:6604 ../gio/gvolume.c:363
 msgid "volume doesn't implement mount"
 msgstr "卷未实现挂载"
 
-#: ../gio/gfile.c:6695
+#: ../gio/gfile.c:6713
 msgid "No application is registered as handling this file"
 msgstr "没有为此类型文件注册相应的处理程序"
 
@@ -1365,7 +1368,7 @@ msgstr "流不支持 query_info"
 #: ../gio/gfileinputstream.c:325 ../gio/gfileiostream.c:379
 #: ../gio/gfileoutputstream.c:371
 msgid "Seek not supported on stream"
-msgstr "流不支持定位(seek)"
+msgstr "流不支持定位"
 
 #: ../gio/gfileinputstream.c:369
 msgid "Truncate not allowed on input stream"
@@ -1471,11 +1474,695 @@ msgstr "输入流未实现读取"
 #. Translators: This is an error you get if there is
 #. * already an operation running against this stream when
 #. * you try to start one
-#: ../gio/ginputstream.c:1215 ../gio/giostream.c:310
-#: ../gio/goutputstream.c:1668
+#: ../gio/ginputstream.c:1218 ../gio/giostream.c:310
+#: ../gio/goutputstream.c:1670
 msgid "Stream has outstanding operation"
 msgstr "流有异常操作"
 
+#: ../gio/gio-tool.c:142
+msgid "Copy with file"
+msgstr "复制文件时保留"
+
+#: ../gio/gio-tool.c:146
+msgid "Keep with file when moved"
+msgstr "移动时与文件一起"
+
+#: ../gio/gio-tool.c:187
+msgid "'version' takes no arguments"
+msgstr "“version”不接受参数"
+
+#: ../gio/gio-tool.c:189 ../gio/gio-tool.c:205 ../glib/goption.c:857
+msgid "Usage:"
+msgstr "用法："
+
+#: ../gio/gio-tool.c:192
+msgid "Print version information and exit."
+msgstr "打印版本信息并退出。"
+
+#: ../gio/gio-tool.c:208
+msgid "Commands:"
+msgstr "命令："
+
+#: ../gio/gio-tool.c:211
+msgid "Concatenate files to standard output"
+msgstr "串接文件，写到标准输出"
+
+#: ../gio/gio-tool.c:212
+msgid "Copy one or more files"
+msgstr "复制文件"
+
+#: ../gio/gio-tool.c:213
+msgid "Show information about locations"
+msgstr "显示关于位置的信息"
+
+#: ../gio/gio-tool.c:214
+msgid "List the contents of locations"
+msgstr "列出某位置的内容"
+
+#: ../gio/gio-tool.c:215
+msgid "Get or set the handler for a mimetype"
+msgstr "获取或设置某种 MIME 类型的处理程序"
+
+#: ../gio/gio-tool.c:216
+msgid "Create directories"
+msgstr "创建目录"
+
+#: ../gio/gio-tool.c:217
+msgid "Monitor files and directories for changes"
+msgstr "监视文件和目录更改"
+
+#: ../gio/gio-tool.c:218
+msgid "Mount or unmount the locations"
+msgstr "挂载或卸载位置"
+
+#: ../gio/gio-tool.c:219
+msgid "Move one or more files"
+msgstr "移动文件"
+
+#: ../gio/gio-tool.c:220
+msgid "Open files with the default application"
+msgstr "用默认应用打开文件"
+
+#: ../gio/gio-tool.c:221
+msgid "Rename a file"
+msgstr "重命名文件"
+
+#: ../gio/gio-tool.c:222
+msgid "Delete one or more files"
+msgstr "删除文件"
+
+#: ../gio/gio-tool.c:223
+msgid "Read from standard input and save"
+msgstr "从标准输入读取并保存"
+
+#: ../gio/gio-tool.c:224
+msgid "Set a file attribute"
+msgstr "设置文件属性"
+
+#: ../gio/gio-tool.c:225
+msgid "Move files or directories to the trash"
+msgstr "移动文件或目录到回收站"
+
+#: ../gio/gio-tool.c:226
+msgid "Lists the contents of locations in a tree"
+msgstr "在树中列出某位置的内容"
+
+#: ../gio/gio-tool.c:228
+#, c-format
+msgid "Use %s to get detailed help.\n"
+msgstr "使用 %s 以获取详细帮助\n"
+
+#. Translators: commandline placeholder
+#: ../gio/gio-tool-cat.c:124 ../gio/gio-tool-info.c:278
+#: ../gio/gio-tool-list.c:165 ../gio/gio-tool-mkdir.c:48
+#: ../gio/gio-tool-monitor.c:37 ../gio/gio-tool-monitor.c:39
+#: ../gio/gio-tool-monitor.c:41 ../gio/gio-tool-monitor.c:43
+#: ../gio/gio-tool-monitor.c:202 ../gio/gio-tool-mount.c:1132
+#: ../gio/gio-tool-open.c:45 ../gio/gio-tool-remove.c:48
+#: ../gio/gio-tool-rename.c:45 ../gio/gio-tool-set.c:89
+#: ../gio/gio-tool-trash.c:81 ../gio/gio-tool-tree.c:239
+msgid "LOCATION"
+msgstr "位置"
+
+#: ../gio/gio-tool-cat.c:129
+msgid "Concatenate files and print to standard output."
+msgstr "串接文件，写到标准输出。"
+
+#: ../gio/gio-tool-cat.c:131
+msgid ""
+"gio cat works just like the traditional cat utility, but using GIO\n"
+"locations instead of local files: for example, you can use something\n"
+"like smb://server/resource/file.txt as location."
+msgstr ""
+"glib cat 如传统 cat 程序那样工作，但使用 GIO 位置而非本地文件：\n"
+"例如，你可以指定 smb://server/resource/file.txt 之类的位置。"
+
+#: ../gio/gio-tool-cat.c:151
+msgid "No files given"
+msgstr "未给出文件"
+
+#: ../gio/gio-tool-copy.c:42 ../gio/gio-tool-move.c:38
+msgid "No target directory"
+msgstr "无目标目录"
+
+#: ../gio/gio-tool-copy.c:43 ../gio/gio-tool-move.c:39
+msgid "Show progress"
+msgstr "显示进度"
+
+#: ../gio/gio-tool-copy.c:44 ../gio/gio-tool-move.c:40
+msgid "Prompt before overwrite"
+msgstr "覆盖前提示"
+
+#: ../gio/gio-tool-copy.c:45
+msgid "Preserve all attributes"
+msgstr "保留所有属性"
+
+#: ../gio/gio-tool-copy.c:46 ../gio/gio-tool-move.c:41
+#: ../gio/gio-tool-save.c:49
+msgid "Backup existing destination files"
+msgstr "备份已存在的目标文件"
+
+#: ../gio/gio-tool-copy.c:47
+msgid "Never follow symbolic links"
+msgstr "从不跟随符号链接"
+
+#: ../gio/gio-tool-copy.c:72 ../gio/gio-tool-move.c:67
+#, c-format
+msgid "Transferred %s out of %s (%s/s)"
+msgstr "已复制 %2$s 中的 %1$s(%3$s/秒)"
+
+#. Translators: commandline placeholder
+#: ../gio/gio-tool-copy.c:98 ../gio/gio-tool-move.c:94
+msgid "SOURCE"
+msgstr "源头"
+
+#. Translators: commandline placeholder
+#: ../gio/gio-tool-copy.c:98 ../gio/gio-tool-move.c:94
+#: ../gio/gio-tool-save.c:165
+msgid "DESTINATION"
+msgstr "目标"
+
+#: ../gio/gio-tool-copy.c:103
+msgid "Copy one or more files from SOURCE to DESTINATION."
+msgstr "将一个或多个文件从源头复制到目标"
+
+#: ../gio/gio-tool-copy.c:105
+msgid ""
+"gio copy is similar to the traditional cp utility, but using GIO\n"
+"locations instead of local files: for example, you can use something\n"
+"like smb://server/resource/file.txt as location."
+msgstr ""
+"glib copy 如传统 cp 程序那样工作，但使用 GIO 位置而非本地文件：\n"
+"例如，你可以指定 smb://server/resource/file.txt 之类的位置。"
+
+#: ../gio/gio-tool-copy.c:143
+#, c-format
+msgid "Destination %s is not a directory"
+msgstr "目标“%s”不是目录"
+
+#: ../gio/gio-tool-copy.c:187 ../gio/gio-tool-move.c:181
+#, c-format
+msgid "%s: overwrite '%s'? "
+msgstr "%s：要覆盖“%s”吗？"
+
+#: ../gio/gio-tool-info.c:34
+msgid "List writable attributes"
+msgstr "列出可写属性"
+
+#: ../gio/gio-tool-info.c:35
+msgid "Get file system info"
+msgstr "读取文件系统信息"
+
+#: ../gio/gio-tool-info.c:36 ../gio/gio-tool-list.c:35
+msgid "The attributes to get"
+msgstr "要获取的属性"
+
+#: ../gio/gio-tool-info.c:36 ../gio/gio-tool-list.c:35
+msgid "ATTRIBUTES"
+msgstr "属性"
+
+#: ../gio/gio-tool-info.c:37 ../gio/gio-tool-list.c:38 ../gio/gio-tool-set.c:34
+msgid "Don't follow symbolic links"
+msgstr "不要跟随符号链接"
+
+#: ../gio/gio-tool-info.c:75
+#, c-format
+msgid "attributes:\n"
+msgstr "属性：\n"
+
+#. Translators: This is a noun and represents and attribute of a file
+#: ../gio/gio-tool-info.c:127
+#, c-format
+msgid "display name: %s\n"
+msgstr "显示名称：%s\n"
+
+#. Translators: This is a noun and represents and attribute of a file
+#: ../gio/gio-tool-info.c:132
+#, c-format
+msgid "edit name: %s\n"
+msgstr "编辑名称：%s\n"
+
+#: ../gio/gio-tool-info.c:138
+#, c-format
+msgid "name: %s\n"
+msgstr "名称：%s\n"
+
+#: ../gio/gio-tool-info.c:145
+#, c-format
+msgid "type: %s\n"
+msgstr "类型：%s\n"
+
+#: ../gio/gio-tool-info.c:151
+#, c-format
+msgid "size: "
+msgstr "大小："
+
+#: ../gio/gio-tool-info.c:156
+#, c-format
+msgid "hidden\n"
+msgstr "隐藏\n"
+
+#: ../gio/gio-tool-info.c:159
+#, c-format
+msgid "uri: %s\n"
+msgstr "uri：%s\n"
+
+#: ../gio/gio-tool-info.c:221
+#, c-format
+msgid "Error getting writable attributes: %s\n"
+msgstr "获取可写属性出错：%s\n"
+
+#: ../gio/gio-tool-info.c:226
+#, c-format
+msgid "Settable attributes:\n"
+msgstr "可设置的属性：\n"
+
+#: ../gio/gio-tool-info.c:249
+#, c-format
+msgid "Writable attribute namespaces:\n"
+msgstr "可写的属性命名空间：\n"
+
+#: ../gio/gio-tool-info.c:283
+msgid "Show information about locations."
+msgstr "显示位置信息。"
+
+#: ../gio/gio-tool-info.c:285
+msgid ""
+"gio info is similar to the traditional ls utility, but using GIO\n"
+"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"
+msgstr ""
+"glib info 如传统 ls 程序那样工作，但使用 GIO 位置而非本地文件：\n"
+"例如，你可以指定 smb://server/resource/file.txt 之类的位置。要指定\n"
+"文件属性，可使用其 GIO 名字(如 standard::icon)，也可以使用命名\n"
+"空间(如 unix)，也可使用“*”匹配全部。"
+
+#: ../gio/gio-tool-info.c:307 ../gio/gio-tool-mkdir.c:74
+msgid "No locations given"
+msgstr "未给出位置"
+
+#: ../gio/gio-tool-list.c:36 ../gio/gio-tool-tree.c:32
+msgid "Show hidden files"
+msgstr "显示隐藏文件"
+
+#: ../gio/gio-tool-list.c:37
+msgid "Use a long listing format"
+msgstr "使用长列表格式"
+
+#: ../gio/gio-tool-list.c:39
+msgid "Print full URIs"
+msgstr "显示完整 URI"
+
+#: ../gio/gio-tool-list.c:170
+msgid "List the contents of the locations."
+msgstr "列出位置中的内容。"
+
+#: ../gio/gio-tool-list.c:172
+msgid ""
+"gio list is similar to the traditional ls utility, but using GIO\n"
+"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"
+msgstr ""
+"glib list 如传统 ls 程序那样工作，但使用 GIO 位置而非本地文件：\n"
+"例如，你可以指定 smb://server/resource/file.txt 之类的位置。要指定\n"
+"文件属性，可使用其 GIO 名字(如 standard::icon)。"
+
+#. Translators: commandline placeholder
+#: ../gio/gio-tool-mime.c:71
+msgid "MIMETYPE"
+msgstr "MIME 类型"
+
+#: ../gio/gio-tool-mime.c:71
+msgid "HANDLER"
+msgstr "处理程序"
+
+#: ../gio/gio-tool-mime.c:76
+msgid "Get or set the handler for a mimetype."
+msgstr "获取或设置某一 MIME 类型的处理程序。"
+
+#: ../gio/gio-tool-mime.c:78
+msgid ""
+"If no handler is given, lists registered and recommended applications\n"
+"for the mimetype. If a handler is given, it is set as the default\n"
+"handler for the mimetype."
+msgstr ""
+"如果没有给定的处理程序，列出 MIME 类型已注册和推荐的\n"
+"应用程序。如果已给定处理程序，它将被设为 MIME 类型的\n"
+"默认应用程序。"
+
+#: ../gio/gio-tool-mime.c:98
+msgid "Must specify a single mimetype, and maybe a handler"
+msgstr "必须指定一个 MIME 类型，也可同时指定处理程序"
+
+#: ../gio/gio-tool-mime.c:113
+#, c-format
+msgid "No default applications for '%s'\n"
+msgstr "“%s”未设置默认应用程序\n"
+
+#: ../gio/gio-tool-mime.c:119
+#, c-format
+msgid "Default application for '%s': %s\n"
+msgstr "用于“%s”的默认应用程序：%s\n"
+
+#: ../gio/gio-tool-mime.c:124
+#, c-format
+msgid "Registered applications:\n"
+msgstr "已注册的应用程序：\n"
+
+#: ../gio/gio-tool-mime.c:126
+#, c-format
+msgid "No registered applications\n"
+msgstr "无已注册的应用程序\n"
+
+#: ../gio/gio-tool-mime.c:137
+#, c-format
+msgid "Recommended applications:\n"
+msgstr "推荐的应用程序：\n"
+
+#: ../gio/gio-tool-mime.c:139
+#, c-format
+msgid "No recommended applications\n"
+msgstr "无推荐的应用程序\n"
+
+#: ../gio/gio-tool-mime.c:159
+#, c-format
+msgid "Failed to load info for handler '%s'\n"
+msgstr "读取处理程序“%s”的信息失败\n"
+
+#: ../gio/gio-tool-mime.c:165
+#, c-format
+msgid "Failed to set '%s' as the default handler for '%s': %s\n"
+msgstr "将“%s”设置为“%s”的默认处理程序失败：%s\n"
+
+#: ../gio/gio-tool-mkdir.c:31
+msgid "Create parent directories"
+msgstr "创建父级目录"
+
+#: ../gio/gio-tool-mkdir.c:52
+msgid "Create directories."
+msgstr "创建目录。"
+
+#: ../gio/gio-tool-mkdir.c:54
+msgid ""
+"gio mkdir is similar to the traditional mkdir utility, but using GIO\n"
+"locations instead of local files: for example, you can use something\n"
+"like smb://server/resource/mydir as location."
+msgstr ""
+"glib mkdir 如传统 mkdir 程序那样工作，但使用 GIO 位置而非本地文件：\n"
+"例如，你可以指定 smb://server/resource/mydir 之类的位置。"
+
+#: ../gio/gio-tool-monitor.c:37
+msgid "Monitor a directory (default: depends on type)"
+msgstr "监视目录(默认：取决于类型)"
+
+#: ../gio/gio-tool-monitor.c:39
+msgid "Monitor a file (default: depends on type)"
+msgstr "监视文件(默认：取决于类型)"
+
+#: ../gio/gio-tool-monitor.c:41
+msgid "Monitor a file directly (notices changes made via hardlinks)"
+msgstr "直接监视文件(通过硬链接通知更改)"
+
+#: ../gio/gio-tool-monitor.c:43
+msgid "Monitors a file directly, but doesn't report changes"
+msgstr "直接监视文件，但不报告更改"
+
+#: ../gio/gio-tool-monitor.c:45
+msgid "Report moves and renames as simple deleted/created events"
+msgstr "将移动和重命名报告为简单的删除/创建事件"
+
+#: ../gio/gio-tool-monitor.c:47
+msgid "Watch for mount events"
+msgstr "检测挂载事件"
+
+#: ../gio/gio-tool-monitor.c:207
+msgid "Monitor files or directories for changes."
+msgstr "监视文件和目录更改。"
+
+#: ../gio/gio-tool-mount.c:58
+msgid "Mount as mountable"
+msgstr "挂载，作为可挂载设备"
+
+#: ../gio/gio-tool-mount.c:59
+msgid "Mount volume with device file"
+msgstr "使用设备文件挂载卷"
+
+#: ../gio/gio-tool-mount.c:59
+msgid "DEVICE"
+msgstr "设备"
+
+#: ../gio/gio-tool-mount.c:60
+msgid "Unmount"
+msgstr "卸载"
+
+#: ../gio/gio-tool-mount.c:61
+msgid "Eject"
+msgstr "弹出"
+
+#: ../gio/gio-tool-mount.c:62
+msgid "Unmount all mounts with the given scheme"
+msgstr "卸载所有带有指定方案的挂载点"
+
+#: ../gio/gio-tool-mount.c:62
+msgid "SCHEME"
+msgstr "方案"
+
+#: ../gio/gio-tool-mount.c:63
+msgid "Ignore outstanding file operations when unmounting or ejecting"
+msgstr "卸载或弹出时忽略正在进行的文件操作"
+
+#: ../gio/gio-tool-mount.c:64
+msgid "Use an anonymous user when authenticating"
+msgstr "认证时使用匿名用户"
+
+#. Translator: List here is a verb as in 'List all mounts'
+#: ../gio/gio-tool-mount.c:66
+msgid "List"
+msgstr "列出"
+
+#: ../gio/gio-tool-mount.c:67
+msgid "Monitor events"
+msgstr "监视事件"
+
+#: ../gio/gio-tool-mount.c:68
+msgid "Show extra information"
+msgstr "显示附加选项"
+
+#: ../gio/gio-tool-mount.c:246 ../gio/gio-tool-mount.c:276
+#, c-format
+msgid "Error mounting location: Anonymous access denied\n"
+msgstr "挂载位置出错：匿名访问被拒绝\n"
+
+#: ../gio/gio-tool-mount.c:248 ../gio/gio-tool-mount.c:278
+#, c-format
+msgid "Error mounting location: %s\n"
+msgstr "挂载位置出错：%s\n"
+
+#: ../gio/gio-tool-mount.c:341
+#, c-format
+msgid "Error unmounting mount: %s\n"
+msgstr "卸载挂载点出错：%s\n"
+
+#: ../gio/gio-tool-mount.c:366 ../gio/gio-tool-mount.c:419
+#, c-format
+msgid "Error finding enclosing mount: %s\n"
+msgstr "寻找闭合挂载出错：%s\n"
+
+#: ../gio/gio-tool-mount.c:394
+#, c-format
+msgid "Error ejecting mount: %s\n"
+msgstr "弹出挂载出错：%s\n"
+
+#: ../gio/gio-tool-mount.c:875
+#, c-format
+msgid "Error mounting %s: %s\n"
+msgstr "挂载 %s 出错：%s\n"
+
+#: ../gio/gio-tool-mount.c:891
+#, c-format
+msgid "Mounted %s at %s\n"
+msgstr "已将 %s 挂载为 %s\n"
+
+#: ../gio/gio-tool-mount.c:941
+#, c-format
+msgid "No volume for device file %s\n"
+msgstr "设备文件 %s 中无卷\n"
+
+#: ../gio/gio-tool-mount.c:1136
+msgid "Mount or unmount the locations."
+msgstr "挂载或卸载位置。"
+
+#: ../gio/gio-tool-move.c:42
+msgid "Don't use copy and delete fallback"
+msgstr "不要使用复制和删除替代方案"
+
+#: ../gio/gio-tool-move.c:99
+msgid "Move one or more files from SOURCE to DEST."
+msgstr "将一个或多个文件从源头复制到目标。"
+
+#: ../gio/gio-tool-move.c:101
+msgid ""
+"gio move is similar to the traditional mv utility, but using GIO\n"
+"locations instead of local files: for example, you can use something\n"
+"like smb://server/resource/file.txt as location"
+msgstr ""
+"glib mv 如传统 mv 程序那样工作，但使用 GIO 位置而非本地文件：\n"
+"例如，你可以指定 smb://server/resource/file.txt 之类的位置。"
+
+#: ../gio/gio-tool-move.c:139
+#, c-format
+msgid "Target %s is not a directory"
+msgstr "目标 %s 不是目录"
+
+#: ../gio/gio-tool-open.c:50
+msgid ""
+"Open files with the default application that\n"
+"is registered to handle files of this type."
+msgstr "使用处理此类文件的默认应用程序打开文件。"
+
+#: ../gio/gio-tool-open.c:69
+msgid "No files to open"
+msgstr "没有要打开的文件"
+
+#: ../gio/gio-tool-remove.c:31 ../gio/gio-tool-trash.c:31
+msgid "Ignore nonexistent files, never prompt"
+msgstr "忽略不存在的文件，从不提示"
+
+#: ../gio/gio-tool-remove.c:52
+msgid "Delete the given files."
+msgstr "删除指定文件。"
+
+#: ../gio/gio-tool-remove.c:70
+msgid "No files to delete"
+msgstr "没有要删除的文件"
+
+#: ../gio/gio-tool-rename.c:45
+msgid "NAME"
+msgstr "名称"
+
+#: ../gio/gio-tool-rename.c:50
+msgid "Rename a file."
+msgstr "重命名文件。"
+
+#: ../gio/gio-tool-rename.c:68
+msgid "Missing argument"
+msgstr "缺少参数"
+
+#: ../gio/gio-tool-rename.c:73 ../gio/gio-tool-save.c:192
+#: ../gio/gio-tool-set.c:134
+msgid "Too many arguments"
+msgstr "参数过多"
+
+#: ../gio/gio-tool-rename.c:91
+#, c-format
+msgid "Rename successful. New uri: %s\n"
+msgstr "重命名成功。新 uri：%s\n"
+
+#: ../gio/gio-tool-save.c:50
+msgid "Only create if not existing"
+msgstr "仅不存在时创建"
+
+#: ../gio/gio-tool-save.c:51
+msgid "Append to end of file"
+msgstr "追加到文件末尾"
+
+#: ../gio/gio-tool-save.c:52
+msgid "When creating, restrict access to the current user"
+msgstr "创建时限制当前用户的访问"
+
+#: ../gio/gio-tool-save.c:53
+msgid "When replacing, replace as if the destination did not exist"
+msgstr "替换时假定目标不存在"
+
+#. Translators: The "etag" is a token allowing to verify whether a file has been modified
+#: ../gio/gio-tool-save.c:55
+msgid "Print new etag at end"
+msgstr "在末尾打印新 etag"
+
+#. Translators: The "etag" is a token allowing to verify whether a file has been modified
+#: ../gio/gio-tool-save.c:57
+msgid "The etag of the file being overwritten"
+msgstr "文件的 etag 被覆盖"
+
+#: ../gio/gio-tool-save.c:57
+msgid "ETAG"
+msgstr "ETAG"
+
+#. Translators: The "etag" is a token allowing to verify whether a file has been modified
+#: ../gio/gio-tool-save.c:145
+#, c-format
+msgid "Etag not available\n"
+msgstr "ETAG 不可用\n"
+
+#: ../gio/gio-tool-save.c:168
+msgid "Read from standard input and save to DEST."
+msgstr "读取标准输入并保存到目标。"
+
+#: ../gio/gio-tool-save.c:186
+msgid "No destination given"
+msgstr "未给出目标"
+
+#: ../gio/gio-tool-set.c:33
+msgid "Type of the attribute"
+msgstr "属性类型"
+
+#: ../gio/gio-tool-set.c:33
+msgid "TYPE"
+msgstr "类型"
+
+#: ../gio/gio-tool-set.c:89
+msgid "ATTRIBUTE"
+msgstr "属性"
+
+#: ../gio/gio-tool-set.c:89
+msgid "VALUE"
+msgstr "值"
+
+#: ../gio/gio-tool-set.c:93
+msgid "Set a file attribute of LOCATION."
+msgstr "设置位置的文件属性。"
+
+#: ../gio/gio-tool-set.c:111
+msgid "Location not specified"
+msgstr "未指定位置"
+
+#: ../gio/gio-tool-set.c:119
+msgid "Attribute not specified"
+msgstr "未指定属性"
+
+#: ../gio/gio-tool-set.c:128
+msgid "Value not specified"
+msgstr "未指定值"
+
+#: ../gio/gio-tool-set.c:176
+#, c-format
+msgid "Invalid attribute type %s\n"
+msgstr "无效的属性类型 %s\n"
+
+#: ../gio/gio-tool-set.c:189
+#, c-format
+msgid "Error setting attribute: %s\n"
+msgstr "设置属性出错：%s\n"
+
+#: ../gio/gio-tool-trash.c:32
+msgid "Empty the trash"
+msgstr "清空回收站"
+
+#: ../gio/gio-tool-trash.c:86
+msgid "Move files or directories to the trash."
+msgstr "将文件或目录移动到回收站。"
+
+#: ../gio/gio-tool-tree.c:33
+msgid "Follow symbolic links, mounts and shortcuts"
+msgstr "跟踪符号链接、挂载和快捷方式"
+
+#: ../gio/gio-tool-tree.c:244
+msgid "List contents of directories in a tree-like format."
+msgstr "使用树状格式列出目录内容。"
+
 #: ../gio/glib-compile-resources.c:142 ../gio/glib-compile-schemas.c:1491
 #, c-format
 msgid "Element <%s> not allowed inside <%s>"
@@ -1486,91 +2173,99 @@ msgstr "在 <%2$s> 中不允许元素 <%1$s>"
 msgid "Element <%s> not allowed at toplevel"
 msgstr "顶层中不允许元素 <%s>"
 
-#: ../gio/glib-compile-resources.c:236
+#: ../gio/glib-compile-resources.c:237
 #, c-format
 msgid "File %s appears multiple times in the resource"
 msgstr "文件 %s 在资源中出现了多次"
 
-#: ../gio/glib-compile-resources.c:247
+#: ../gio/glib-compile-resources.c:248
 #, c-format
 msgid "Failed to locate '%s' in any source directory"
 msgstr "在所有源目录中定位“%s”失败"
 
-#: ../gio/glib-compile-resources.c:258
+#: ../gio/glib-compile-resources.c:259
 #, c-format
 msgid "Failed to locate '%s' in current directory"
 msgstr "在当前目录定位“%s”失败"
 
-#: ../gio/glib-compile-resources.c:287
+#: ../gio/glib-compile-resources.c:290
 #, c-format
 msgid "Unknown processing option \"%s\""
 msgstr "未知的处理选项“%s”"
 
-#: ../gio/glib-compile-resources.c:305 ../gio/glib-compile-resources.c:351
+#: ../gio/glib-compile-resources.c:308 ../gio/glib-compile-resources.c:354
 #, c-format
 msgid "Failed to create temp file: %s"
 msgstr "创建临时文件失败：%s"
 
-#: ../gio/glib-compile-resources.c:379
+#: ../gio/glib-compile-resources.c:382
 #, c-format
 msgid "Error reading file %s: %s"
 msgstr "读取文件 %s 出错：%s"
 
-#: ../gio/glib-compile-resources.c:399
+#: ../gio/glib-compile-resources.c:402
 #, c-format
 msgid "Error compressing file %s"
 msgstr "压缩文件时出错：%s"
 
-#: ../gio/glib-compile-resources.c:467 ../gio/glib-compile-schemas.c:1603
+#: ../gio/glib-compile-resources.c:469 ../gio/glib-compile-schemas.c:1603
 #, c-format
 msgid "text may not appear inside <%s>"
 msgstr "<%s> 内不应出现文本"
 
-#: ../gio/glib-compile-resources.c:592
+#: ../gio/glib-compile-resources.c:621 ../gio/glib-compile-schemas.c:2037
+msgid "Show program version and exit"
+msgstr "显示程序版本并退出"
+
+#: ../gio/glib-compile-resources.c:622
 msgid "name of the output file"
 msgstr "输出文件名"
 
-#: ../gio/glib-compile-resources.c:593
+#: ../gio/glib-compile-resources.c:623
 msgid ""
 "The directories where files are to be read from (default to current "
 "directory)"
 msgstr "文件会被读出的目录(默认为当前目录)"
 
-#: ../gio/glib-compile-resources.c:593 ../gio/glib-compile-schemas.c:2036
-#: ../gio/glib-compile-schemas.c:2065
+#: ../gio/glib-compile-resources.c:623 ../gio/glib-compile-schemas.c:2038
+#: ../gio/glib-compile-schemas.c:2067
 msgid "DIRECTORY"
 msgstr "DIRECTORY"
 
-#: ../gio/glib-compile-resources.c:594
+#: ../gio/glib-compile-resources.c:624
 msgid ""
 "Generate output in the format selected for by the target filename extension"
 msgstr "以目标文件扩展名所选择的格式生成输出"
 
-#: ../gio/glib-compile-resources.c:595
+#: ../gio/glib-compile-resources.c:625
 msgid "Generate source header"
 msgstr "生成源码头文件"
 
-#: ../gio/glib-compile-resources.c:596
+#: ../gio/glib-compile-resources.c:626
 msgid "Generate sourcecode used to link in the resource file into your code"
 msgstr "生成用于将资源文件链接到您的代码的源代码"
 
-#: ../gio/glib-compile-resources.c:597
+#: ../gio/glib-compile-resources.c:627
 msgid "Generate dependency list"
 msgstr "生成依赖关系列表"
 
-#: ../gio/glib-compile-resources.c:598
+#: ../gio/glib-compile-resources.c:628
+msgid "name of the dependency file to generate"
+msgstr "要生成的依赖文件名称"
+
+#: ../gio/glib-compile-resources.c:629
 msgid "Don't automatically create and register resource"
 msgstr "不要自动创建和注册资源"
 
-#: ../gio/glib-compile-resources.c:599
+#: ../gio/glib-compile-resources.c:630
 msgid "Don't export functions; declare them G_GNUC_INTERNAL"
 msgstr "不要导出函数；请将它们声明为 G_GNUC_INTERNAL"
 
-#: ../gio/glib-compile-resources.c:600
+#: ../gio/glib-compile-resources.c:631
 msgid "C identifier name used for the generated source code"
 msgstr "用于生成的源代码的 C 标识符名称"
 
-#: ../gio/glib-compile-resources.c:626
+#: ../gio/glib-compile-resources.c:657
 msgid ""
 "Compile a resource specification into a resource file.\n"
 "Resource specification files have the extension .gresource.xml,\n"
@@ -1580,7 +2275,7 @@ msgstr ""
 "资源规格文件以 .gresource.xml 为扩展名，\n"
 "资源文件以 .gresource 为扩展名。"
 
-#: ../gio/glib-compile-resources.c:642
+#: ../gio/glib-compile-resources.c:679
 #, c-format
 msgid "You should give exactly one file name\n"
 msgstr "您应该给出惟一的文件名\n"
@@ -1794,23 +2489,23 @@ msgid ""
 "list of valid choices"
 msgstr "覆盖文件 %3$s 中方案 %2$s 的键 %1$s 的覆盖的值不在有效值列表内"
 
-#: ../gio/glib-compile-schemas.c:2036
+#: ../gio/glib-compile-schemas.c:2038
 msgid "where to store the gschemas.compiled file"
 msgstr "gschemas.compiled 文件存储于何处"
 
-#: ../gio/glib-compile-schemas.c:2037
+#: ../gio/glib-compile-schemas.c:2039
 msgid "Abort on any errors in schemas"
 msgstr "在方案出现任何错误时中止"
 
-#: ../gio/glib-compile-schemas.c:2038
+#: ../gio/glib-compile-schemas.c:2040
 msgid "Do not write the gschema.compiled file"
 msgstr "不要对 gschema.compiled 进行写操作"
 
-#: ../gio/glib-compile-schemas.c:2039
+#: ../gio/glib-compile-schemas.c:2041
 msgid "Do not enforce key name restrictions"
 msgstr "不要强制键名的限制"
 
-#: ../gio/glib-compile-schemas.c:2068
+#: ../gio/glib-compile-schemas.c:2070
 msgid ""
 "Compile all GSettings schema files into a schema cache.\n"
 "Schema files are required to have the extension .gschema.xml,\n"
@@ -1820,141 +2515,153 @@ msgstr ""
 "要使用扩展 .gschema.xml，需要有方案文件，\n"
 "缓存文件被称为 gschemas.compiled。"
 
-#: ../gio/glib-compile-schemas.c:2084
+#: ../gio/glib-compile-schemas.c:2092
 #, c-format
 msgid "You should give exactly one directory name\n"
 msgstr "您应该给出且只能给出一个目录名\n"
 
-#: ../gio/glib-compile-schemas.c:2123
+#: ../gio/glib-compile-schemas.c:2131
 #, c-format
 msgid "No schema files found: "
 msgstr "没有找到方案文件："
 
-#: ../gio/glib-compile-schemas.c:2126
+#: ../gio/glib-compile-schemas.c:2134
 #, c-format
 msgid "doing nothing.\n"
 msgstr "什么都没做。\n"
 
-#: ../gio/glib-compile-schemas.c:2129
+#: ../gio/glib-compile-schemas.c:2137
 #, c-format
 msgid "removed existing output file.\n"
 msgstr "已删除存在的输出文件。\n"
 
-#: ../gio/glocalfile.c:635 ../gio/win32/gwinhttpfile.c:420
+#: ../gio/glocalfile.c:642 ../gio/win32/gwinhttpfile.c:420
 #, c-format
 msgid "Invalid filename %s"
 msgstr "无效的文件名 %s"
 
-#: ../gio/glocalfile.c:1012
+#: ../gio/glocalfile.c:1036
 #, c-format
-msgid "Error getting filesystem info: %s"
-msgstr "读取文件系统信息时出错：%s"
+msgid "Error getting filesystem info for %s: %s"
+msgstr "读取 %s 文件系统信息时出错：%s"
 
-#: ../gio/glocalfile.c:1180
+#: ../gio/glocalfile.c:1175
+#, c-format
+msgid "Containing mount for file %s not found"
+msgstr "找不到文件 %s 包含的挂载"
+
+#: ../gio/glocalfile.c:1198
 msgid "Can't rename root directory"
 msgstr "无法重命名根目录"
 
-#: ../gio/glocalfile.c:1200 ../gio/glocalfile.c:1226
+#: ../gio/glocalfile.c:1216 ../gio/glocalfile.c:1239
 #, c-format
-msgid "Error renaming file: %s"
-msgstr "重命名文件时出错：%s"
+msgid "Error renaming file %s: %s"
+msgstr "重命名文件 %s 时出错：%s"
 
-#: ../gio/glocalfile.c:1209
+#: ../gio/glocalfile.c:1223
 msgid "Can't rename file, filename already exists"
 msgstr "无法重命名文件，该文件名已存在"
 
-#: ../gio/glocalfile.c:1222 ../gio/glocalfile.c:2249 ../gio/glocalfile.c:2278
-#: ../gio/glocalfile.c:2438 ../gio/glocalfileoutputstream.c:549
+#: ../gio/glocalfile.c:1236 ../gio/glocalfile.c:2250 ../gio/glocalfile.c:2278
+#: ../gio/glocalfile.c:2435 ../gio/glocalfileoutputstream.c:549
 msgid "Invalid filename"
 msgstr "无效的文件名"
 
-#: ../gio/glocalfile.c:1389 ../gio/glocalfile.c:1413
-msgid "Can't open directory"
-msgstr "无法打开目录"
-
-#: ../gio/glocalfile.c:1397
+#: ../gio/glocalfile.c:1403 ../gio/glocalfile.c:1418
 #, c-format
-msgid "Error opening file: %s"
-msgstr "打开文件时出错：%s"
+msgid "Error opening file %s: %s"
+msgstr "打开文件 %s 时出错：%s"
 
-#: ../gio/glocalfile.c:1538
+#: ../gio/glocalfile.c:1543
 #, c-format
-msgid "Error removing file: %s"
-msgstr "删除文件时出错：%s"
+msgid "Error removing file %s: %s"
+msgstr "删除文件 %s 时出错：%s"
 
-#: ../gio/glocalfile.c:1922
+#: ../gio/glocalfile.c:1926
 #, c-format
-msgid "Error trashing file: %s"
-msgstr "将文件放到回收站时出错：%s"
+msgid "Error trashing file %s: %s"
+msgstr "将文件 %s 放到回收站时出错：%s"
 
-#: ../gio/glocalfile.c:1945
+#: ../gio/glocalfile.c:1949
 #, c-format
 msgid "Unable to create trash dir %s: %s"
 msgstr "无法创建回收站目录 %s：%s"
 
-#: ../gio/glocalfile.c:1966
-msgid "Unable to find toplevel directory for trash"
-msgstr "找不到回收站的顶级目录"
+#: ../gio/glocalfile.c:1969
+#, c-format
+msgid "Unable to find toplevel directory to trash %s"
+msgstr "找不到回收站 %s 的顶级目录"
 
-#: ../gio/glocalfile.c:2045 ../gio/glocalfile.c:2065
-msgid "Unable to find or create trash directory"
-msgstr "无法找到或创建回收站目录"
+#: ../gio/glocalfile.c:2048 ../gio/glocalfile.c:2068
+#, c-format
+msgid "Unable to find or create trash directory for %s"
+msgstr "无法为 %s 找到或创建回收站目录"
 
-#: ../gio/glocalfile.c:2099
+#: ../gio/glocalfile.c:2102
 #, c-format
-msgid "Unable to create trashing info file: %s"
-msgstr "创建回收站信息文件失败：%s"
+msgid "Unable to create trashing info file for %s: %s"
+msgstr "为 %s 创建回收站信息文件失败：%s"
 
-#: ../gio/glocalfile.c:2157 ../gio/glocalfile.c:2162 ../gio/glocalfile.c:2219
-#: ../gio/glocalfile.c:2226
+#: ../gio/glocalfile.c:2161
 #, c-format
-msgid "Unable to trash file: %s"
-msgstr "无法将文件移动到回收站：%s"
+msgid "Unable to trash file %s across filesystem boundaries"
+msgstr "无法跨越文件系统边界将文件 %s 移动到回收站"
 
-#: ../gio/glocalfile.c:2227 ../glib/gregex.c:281
-msgid "internal error"
-msgstr "内部错误"
+#: ../gio/glocalfile.c:2165 ../gio/glocalfile.c:2221
+#, c-format
+msgid "Unable to trash file %s: %s"
+msgstr "无法将文件 %s 移动到回收站：%s"
+
+#: ../gio/glocalfile.c:2227
+#, c-format
+msgid "Unable to trash file %s"
+msgstr "无法将文件 %s 移动到回收站"
 
 #: ../gio/glocalfile.c:2253
 #, c-format
-msgid "Error creating directory: %s"
-msgstr "创建目录时出错：%s"
+msgid "Error creating directory %s: %s"
+msgstr "创建目录 %s 时出错：%s"
 
 #: ../gio/glocalfile.c:2282
 #, c-format
 msgid "Filesystem does not support symbolic links"
 msgstr "文件系统不支持符号链接"
 
-#: ../gio/glocalfile.c:2286
+#: ../gio/glocalfile.c:2285
 #, c-format
-msgid "Error making symbolic link: %s"
-msgstr "创建符号链接时出错：%s"
+msgid "Error making symbolic link %s: %s"
+msgstr "创建符号链接 %s 时出错：%s"
+
+#: ../gio/glocalfile.c:2291 ../glib/gfileutils.c:2064
+msgid "Symbolic links not supported"
+msgstr "不支持符号链接"
 
-#: ../gio/glocalfile.c:2348 ../gio/glocalfile.c:2442
+#: ../gio/glocalfile.c:2346 ../gio/glocalfile.c:2381 ../gio/glocalfile.c:2438
 #, c-format
-msgid "Error moving file: %s"
-msgstr "移动文件时出错：%s"
+msgid "Error moving file %s: %s"
+msgstr "移动文件 %s 时出错：%s"
 
-#: ../gio/glocalfile.c:2371
+#: ../gio/glocalfile.c:2369
 msgid "Can't move directory over directory"
 msgstr "无法将目录移动到目录"
 
-#: ../gio/glocalfile.c:2398 ../gio/glocalfileoutputstream.c:925
+#: ../gio/glocalfile.c:2395 ../gio/glocalfileoutputstream.c:925
 #: ../gio/glocalfileoutputstream.c:939 ../gio/glocalfileoutputstream.c:954
-#: ../gio/glocalfileoutputstream.c:970 ../gio/glocalfileoutputstream.c:984
+#: ../gio/glocalfileoutputstream.c:971 ../gio/glocalfileoutputstream.c:985
 msgid "Backup file creation failed"
 msgstr "备份文件创建失败"
 
-#: ../gio/glocalfile.c:2417
+#: ../gio/glocalfile.c:2414
 #, c-format
 msgid "Error removing target file: %s"
 msgstr "移除目标文件出错：%s"
 
-#: ../gio/glocalfile.c:2431
+#: ../gio/glocalfile.c:2428
 msgid "Move between mounts not supported"
 msgstr "不支持在挂载之间移动"
 
-#: ../gio/glocalfile.c:2623
+#: ../gio/glocalfile.c:2619
 #, c-format
 msgid "Could not determine the disk usage of %s: %s"
 msgstr "无法确定 %s 的磁盘使用情况：%s"
@@ -1974,7 +2681,7 @@ msgstr "无效的扩展属性名"
 #: ../gio/glocalfileinfo.c:775
 #, c-format
 msgid "Error setting extended attribute '%s': %s"
-msgstr "设置扩展属性“%s”出错：%s"
+msgstr "设置扩展属性“%s”时出错：%s"
 
 #: ../gio/glocalfileinfo.c:1575
 msgid " (invalid encoding)"
@@ -1983,7 +2690,7 @@ msgstr " (无效的编码)"
 #: ../gio/glocalfileinfo.c:1766 ../gio/glocalfileoutputstream.c:803
 #, c-format
 msgid "Error when getting information for file '%s': %s"
-msgstr "获取文件“%s”的信息出错：%s"
+msgstr "获取文件“%s”的信息时出错：%s"
 
 #: ../gio/glocalfileinfo.c:2017
 #, c-format
@@ -2060,7 +2767,7 @@ msgstr "读取文件出错：%s"
 
 #: ../gio/glocalfileinputstream.c:199 ../gio/glocalfileinputstream.c:211
 #: ../gio/glocalfileinputstream.c:225 ../gio/glocalfileinputstream.c:333
-#: ../gio/glocalfileoutputstream.c:456 ../gio/glocalfileoutputstream.c:1002
+#: ../gio/glocalfileoutputstream.c:456 ../gio/glocalfileoutputstream.c:1003
 #, c-format
 msgid "Error seeking in file: %s"
 msgstr "在文件中定位时出错：%s"
@@ -2096,16 +2803,16 @@ msgstr "创建备份拷贝：%s"
 msgid "Error renaming temporary file: %s"
 msgstr "重命名临时文件出错：%s"
 
-#: ../gio/glocalfileoutputstream.c:502 ../gio/glocalfileoutputstream.c:1053
+#: ../gio/glocalfileoutputstream.c:502 ../gio/glocalfileoutputstream.c:1054
 #, c-format
 msgid "Error truncating file: %s"
 msgstr "截断文件出错：%s"
 
 #: ../gio/glocalfileoutputstream.c:555 ../gio/glocalfileoutputstream.c:785
-#: ../gio/glocalfileoutputstream.c:1034 ../gio/gsubprocess.c:360
+#: ../gio/glocalfileoutputstream.c:1035 ../gio/gsubprocess.c:360
 #, c-format
 msgid "Error opening file '%s': %s"
-msgstr "打开文件“%s”出错：%s"
+msgstr "打开文件“%s”时出错：%s"
 
 #: ../gio/glocalfileoutputstream.c:816
 msgid "Target file is a directory"
@@ -2119,20 +2826,20 @@ msgstr "目标文件不是普通文件"
 msgid "The file was externally modified"
 msgstr "文件已经被其他程序修改"
 
-#: ../gio/glocalfileoutputstream.c:1018
+#: ../gio/glocalfileoutputstream.c:1019
 #, c-format
 msgid "Error removing old file: %s"
 msgstr "移除旧文件出错：%s"
 
-#: ../gio/gmemoryinputstream.c:471 ../gio/gmemoryoutputstream.c:771
+#: ../gio/gmemoryinputstream.c:474 ../gio/gmemoryoutputstream.c:772
 msgid "Invalid GSeekType supplied"
 msgstr "提供的 GSeekType 无效"
 
-#: ../gio/gmemoryinputstream.c:481
+#: ../gio/gmemoryinputstream.c:484
 msgid "Invalid seek request"
 msgstr "无效的搜寻请求"
 
-#: ../gio/gmemoryinputstream.c:505
+#: ../gio/gmemoryinputstream.c:508
 msgid "Cannot truncate GMemoryInputStream"
 msgstr "无法截断 GMemoryInputStream"
 
@@ -2150,11 +2857,11 @@ msgid ""
 "address space"
 msgstr "处理写入所需要的内存超过了可用的空间"
 
-#: ../gio/gmemoryoutputstream.c:781
+#: ../gio/gmemoryoutputstream.c:782
 msgid "Requested seek before the beginning of the stream"
 msgstr "请求的定位值在流的开始之前"
 
-#: ../gio/gmemoryoutputstream.c:796
+#: ../gio/gmemoryoutputstream.c:797
 msgid "Requested seek beyond the end of the stream"
 msgstr "请求的定位值在流的结束之后"
 
@@ -2184,14 +2891,14 @@ msgstr "挂载未实现“unmount”或“unmount_with_operation”"
 #. * don't implement any of eject or eject_with_operation.
 #: ../gio/gmount.c:632
 msgid "mount doesn't implement \"eject\" or \"eject_with_operation\""
-msgstr "挂载未执行“eject”或“eject_with_operation”"
+msgstr "挂载未实现“eject”或“eject_with_operation”"
 
 #. Translators: This is an error
 #. * message for mount objects that
 #. * don't implement remount.
 #: ../gio/gmount.c:720
 msgid "mount doesn't implement \"remount\""
-msgstr "挂载没有实现“remount”"
+msgstr "挂载未实现“remount”"
 
 #. Translators: This is an error
 #. * message for mount objects that
@@ -2212,7 +2919,7 @@ msgstr "挂载未实现同步内容类型猜测"
 msgid "Hostname '%s' contains '[' but not ']'"
 msgstr "主机名“%s”包含“[”但是缺少“]”"
 
-#: ../gio/gnetworkmonitorbase.c:206 ../gio/gnetworkmonitorbase.c:309
+#: ../gio/gnetworkmonitorbase.c:206 ../gio/gnetworkmonitorbase.c:310
 msgid "Network unreachable"
 msgstr "网络不可达"
 
@@ -2241,27 +2948,27 @@ msgstr "NetworkManager 版本太老"
 
 #: ../gio/goutputstream.c:212 ../gio/goutputstream.c:560
 msgid "Output stream doesn't implement write"
-msgstr "输出流未实现写入(write)"
+msgstr "输出流未实现写入"
 
-#: ../gio/goutputstream.c:521 ../gio/goutputstream.c:1222
+#: ../gio/goutputstream.c:521 ../gio/goutputstream.c:1224
 msgid "Source stream is already closed"
 msgstr "源流已经关闭"
 
-#: ../gio/gresolver.c:330 ../gio/gthreadedresolver.c:116
+#: ../gio/gresolver.c:333 ../gio/gthreadedresolver.c:116
 #: ../gio/gthreadedresolver.c:126
 #, c-format
 msgid "Error resolving '%s': %s"
-msgstr "解析“%s”出错：%s"
+msgstr "解析“%s”时出错：%s"
 
-#: ../gio/gresource.c:304 ../gio/gresource.c:555 ../gio/gresource.c:572
-#: ../gio/gresource.c:693 ../gio/gresource.c:762 ../gio/gresource.c:823
-#: ../gio/gresource.c:903 ../gio/gresourcefile.c:453 ../gio/gresourcefile.c:576
-#: ../gio/gresourcefile.c:713
+#: ../gio/gresource.c:595 ../gio/gresource.c:846 ../gio/gresource.c:863
+#: ../gio/gresource.c:987 ../gio/gresource.c:1059 ../gio/gresource.c:1132
+#: ../gio/gresource.c:1202 ../gio/gresourcefile.c:453
+#: ../gio/gresourcefile.c:576 ../gio/gresourcefile.c:713
 #, c-format
 msgid "The resource at '%s' does not exist"
-msgstr "位于 “%s”的资源不存在"
+msgstr "位于“%s”的资源不存在"
 
-#: ../gio/gresource.c:469
+#: ../gio/gresource.c:760
 #, c-format
 msgid "The resource at '%s' failed to decompress"
 msgstr "解压位于“%s”的资源失败"
@@ -2269,11 +2976,11 @@ msgstr "解压位于“%s”的资源失败"
 #: ../gio/gresourcefile.c:709
 #, c-format
 msgid "The resource at '%s' is not a directory"
-msgstr "“%s” 处的资源并非目录"
+msgstr "“%s”处的资源不是一个目录"
 
 #: ../gio/gresourcefile.c:917
 msgid "Input stream doesn't implement seek"
-msgstr "输入流未实现定位(seek)"
+msgstr "输入流未实现定位"
 
 #: ../gio/gresource-tool.c:494
 msgid "List sections containing resources in an elf FILE"
@@ -2365,7 +3072,7 @@ msgstr ""
 msgid "  SECTION   An (optional) elf section name\n"
 msgstr "  SECTION   ELF 段名(可选)\n"
 
-#: ../gio/gresource-tool.c:559 ../gio/gsettings-tool.c:639
+#: ../gio/gresource-tool.c:559 ../gio/gsettings-tool.c:654
 msgid "  COMMAND   The (optional) command to explain\n"
 msgstr "  COMMAND   要解释的命令(可选)\n"
 
@@ -2398,7 +3105,7 @@ msgid "  PATH      A resource path\n"
 msgstr "  PATH      资源路径\n"
 
 #: ../gio/gsettings-tool.c:51 ../gio/gsettings-tool.c:72
-#: ../gio/gsettings-tool.c:830
+#: ../gio/gsettings-tool.c:851
 #, c-format
 msgid "No such schema '%s'\n"
 msgstr "没有“%s”这个方案\n"
@@ -2433,38 +3140,38 @@ msgstr "路径必须以斜杠结束(/)\n"
 msgid "Path must not contain two adjacent slashes (//)\n"
 msgstr "路径中不能包含连续两个斜杠(//)\n"
 
-#: ../gio/gsettings-tool.c:481
+#: ../gio/gsettings-tool.c:489
 #, c-format
 msgid "The provided value is outside of the valid range\n"
 msgstr "提供的值不在有效范围内\n"
 
-#: ../gio/gsettings-tool.c:488
+#: ../gio/gsettings-tool.c:496
 #, c-format
 msgid "The key is not writable\n"
 msgstr "键不可写\n"
 
-#: ../gio/gsettings-tool.c:524
+#: ../gio/gsettings-tool.c:532
 msgid "List the installed (non-relocatable) schemas"
 msgstr "列出已安装的(不可重分配的)方案"
 
-#: ../gio/gsettings-tool.c:530
+#: ../gio/gsettings-tool.c:538
 msgid "List the installed relocatable schemas"
 msgstr "列出安装的可重分配的方案"
 
-#: ../gio/gsettings-tool.c:536
+#: ../gio/gsettings-tool.c:544
 msgid "List the keys in SCHEMA"
 msgstr "列出 SCHEMA 中的键"
 
-#: ../gio/gsettings-tool.c:537 ../gio/gsettings-tool.c:543
-#: ../gio/gsettings-tool.c:580
+#: ../gio/gsettings-tool.c:545 ../gio/gsettings-tool.c:551
+#: ../gio/gsettings-tool.c:594
 msgid "SCHEMA[:PATH]"
 msgstr "SCHEMA[:PATH]"
 
-#: ../gio/gsettings-tool.c:542
+#: ../gio/gsettings-tool.c:550
 msgid "List the children of SCHEMA"
 msgstr "列出 SCHEMA 的子对象"
 
-#: ../gio/gsettings-tool.c:548
+#: ../gio/gsettings-tool.c:556
 msgid ""
 "List keys and values, recursively\n"
 "If no SCHEMA is given, list all keys\n"
@@ -2472,44 +3179,49 @@ msgstr ""
 "递归列出键和值\n"
 "如果没有给出 SCHEMA，列出所有键\n"
 
-#: ../gio/gsettings-tool.c:550
+#: ../gio/gsettings-tool.c:558
 msgid "[SCHEMA[:PATH]]"
 msgstr "SCHEMA[:PATH]"
 
-#: ../gio/gsettings-tool.c:555
+#: ../gio/gsettings-tool.c:563
 msgid "Get the value of KEY"
 msgstr "获取 KEY 的值"
 
-#: ../gio/gsettings-tool.c:556 ../gio/gsettings-tool.c:562
-#: ../gio/gsettings-tool.c:574 ../gio/gsettings-tool.c:586
+#: ../gio/gsettings-tool.c:564 ../gio/gsettings-tool.c:570
+#: ../gio/gsettings-tool.c:576 ../gio/gsettings-tool.c:588
+#: ../gio/gsettings-tool.c:600
 msgid "SCHEMA[:PATH] KEY"
 msgstr "SCHEMA[:PATH] KEY"
 
-#: ../gio/gsettings-tool.c:561
+#: ../gio/gsettings-tool.c:569
 msgid "Query the range of valid values for KEY"
 msgstr "查询 KEY 的有效值范围"
 
-#: ../gio/gsettings-tool.c:567
+#: ../gio/gsettings-tool.c:575
+msgid "Query the description for KEY"
+msgstr "查询 KEY 的描述"
+
+#: ../gio/gsettings-tool.c:581
 msgid "Set the value of KEY to VALUE"
 msgstr "将 KEY 的值设为 VALUE"
 
-#: ../gio/gsettings-tool.c:568
+#: ../gio/gsettings-tool.c:582
 msgid "SCHEMA[:PATH] KEY VALUE"
 msgstr "SCHEMA[:PATH] KEY VALUE"
 
-#: ../gio/gsettings-tool.c:573
+#: ../gio/gsettings-tool.c:587
 msgid "Reset KEY to its default value"
 msgstr "将 KEY 重设为默认值"
 
-#: ../gio/gsettings-tool.c:579
+#: ../gio/gsettings-tool.c:593
 msgid "Reset all keys in SCHEMA to their defaults"
 msgstr "重置 SCHEMA 中所有键为默认值"
 
-#: ../gio/gsettings-tool.c:585
+#: ../gio/gsettings-tool.c:599
 msgid "Check if KEY is writable"
 msgstr "查看 KEY 是否可写"
 
-#: ../gio/gsettings-tool.c:591
+#: ../gio/gsettings-tool.c:605
 msgid ""
 "Monitor KEY for changes.\n"
 "If no KEY is specified, monitor all keys in SCHEMA.\n"
@@ -2519,11 +3231,11 @@ msgstr ""
 "如果没有指定 KEY，则监视 SCHEMA 中的所有键。\n"
 "使用 ^C 停止监视。\n"
 
-#: ../gio/gsettings-tool.c:594
+#: ../gio/gsettings-tool.c:608
 msgid "SCHEMA[:PATH] [KEY]"
 msgstr "SCHEMA[:PATH] [KEY]"
 
-#: ../gio/gsettings-tool.c:606
+#: ../gio/gsettings-tool.c:620
 msgid ""
 "Usage:\n"
 "  gsettings --version\n"
@@ -2537,6 +3249,7 @@ msgid ""
 "  list-children             List children of a schema\n"
 "  list-recursively          List keys and values, recursively\n"
 "  range                     Queries the range of a key\n"
+"  describe                  Queries the description of a key\n"
 "  get                       Get the value of a key\n"
 "  set                       Set the value of a key\n"
 "  reset                     Reset the value of a key\n"
@@ -2559,6 +3272,7 @@ msgstr ""
 "  list-children             列出某个方案的子对象\n"
 "  list-recursively          递归地列出键和值\n"
 "  range                     查询某个键的范围\n"
+"  describe                  查询某个键的描述\n"
 "  get                       获取某个键值\n"
 "  set                       设置某个键值\n"
 "  reset                     重设某个键值\n"
@@ -2569,7 +3283,7 @@ msgstr ""
 "使用 'gsettings help 命令' 查看详细的帮助。\n"
 "\n"
 
-#: ../gio/gsettings-tool.c:629
+#: ../gio/gsettings-tool.c:644
 #, c-format
 msgid ""
 "Usage:\n"
@@ -2584,11 +3298,11 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: ../gio/gsettings-tool.c:635
+#: ../gio/gsettings-tool.c:650
 msgid "  SCHEMADIR A directory to search for additional schemas\n"
 msgstr "  SCHEMADIR 一个用于搜索附加方案的目录\n"
 
-#: ../gio/gsettings-tool.c:643
+#: ../gio/gsettings-tool.c:658
 msgid ""
 "  SCHEMA    The name of the schema\n"
 "  PATH      The path, for relocatable schemas\n"
@@ -2596,34 +3310,34 @@ msgstr ""
 "  SCHEMA    方案的名称\n"
 "  PATH      可重定向方案的路径\n"
 
-#: ../gio/gsettings-tool.c:648
+#: ../gio/gsettings-tool.c:663
 msgid "  KEY       The (optional) key within the schema\n"
 msgstr "  KEY       方案中(可选)的键\n"
 
-#: ../gio/gsettings-tool.c:652
+#: ../gio/gsettings-tool.c:667
 msgid "  KEY       The key within the schema\n"
 msgstr "  KEY       方案中的键\n"
 
-#: ../gio/gsettings-tool.c:656
+#: ../gio/gsettings-tool.c:671
 msgid "  VALUE     The value to set\n"
 msgstr "  VALUE     要设的值\n"
 
-#: ../gio/gsettings-tool.c:711
+#: ../gio/gsettings-tool.c:726
 #, c-format
 msgid "Could not load schemas from %s: %s\n"
 msgstr "无法从 %s 加载方案：%s\n"
 
-#: ../gio/gsettings-tool.c:723
+#: ../gio/gsettings-tool.c:738
 #, c-format
 msgid "No schemas installed\n"
 msgstr "没有安装方案文件\n"
 
-#: ../gio/gsettings-tool.c:788
+#: ../gio/gsettings-tool.c:809
 #, c-format
 msgid "Empty schema name given\n"
 msgstr "给出了空的大纲名称\n"
 
-#: ../gio/gsettings-tool.c:843
+#: ../gio/gsettings-tool.c:864
 #, c-format
 msgid "No such key '%s'\n"
 msgstr "没有“%s”这个键\n"
@@ -2641,8 +3355,8 @@ msgstr "无效的套接字，初始化失败的原因是：%s"
 msgid "Socket is already closed"
 msgstr "套接字已经关闭"
 
-#: ../gio/gsocket.c:394 ../gio/gsocket.c:2751 ../gio/gsocket.c:3896
-#: ../gio/gsocket.c:3951
+#: ../gio/gsocket.c:394 ../gio/gsocket.c:2751 ../gio/gsocket.c:3897
+#: ../gio/gsocket.c:3952
 msgid "Socket I/O timed out"
 msgstr "套接字 I/O 超时"
 
@@ -2741,31 +3455,31 @@ msgstr "无法关闭套接字：%s"
 msgid "Error closing socket: %s"
 msgstr "关闭套接字出错：%s"
 
-#: ../gio/gsocket.c:3889
+#: ../gio/gsocket.c:3890
 #, c-format
 msgid "Waiting for socket condition: %s"
 msgstr "等待套接字状态：%s"
 
-#: ../gio/gsocket.c:4361 ../gio/gsocket.c:4441 ../gio/gsocket.c:4619
+#: ../gio/gsocket.c:4362 ../gio/gsocket.c:4442 ../gio/gsocket.c:4620
 #, c-format
 msgid "Error sending message: %s"
 msgstr "发送信息出错：%s"
 
-#: ../gio/gsocket.c:4385
+#: ../gio/gsocket.c:4386
 msgid "GSocketControlMessage not supported on Windows"
 msgstr "Windows 不支持 GSocketControlMessage"
 
-#: ../gio/gsocket.c:4840 ../gio/gsocket.c:4913 ../gio/gsocket.c:5140
+#: ../gio/gsocket.c:4839 ../gio/gsocket.c:4912 ../gio/gsocket.c:5139
 #, c-format
 msgid "Error receiving message: %s"
 msgstr "接受信息出错：%s"
 
-#: ../gio/gsocket.c:5412
+#: ../gio/gsocket.c:5411
 #, c-format
 msgid "Unable to read socket credentials: %s"
 msgstr "无法读取套接字认证信息：%s"
 
-#: ../gio/gsocket.c:5421
+#: ../gio/gsocket.c:5420
 msgid "g_socket_get_credentials not implemented for this OS"
 msgstr "此操作系统上没有实现 g_socket_get_credentials"
 
@@ -2794,7 +3508,7 @@ msgstr "不支持通过非 TCP 连接的代理。"
 #: ../gio/gsocketclient.c:1110 ../gio/gsocketclient.c:1561
 #, c-format
 msgid "Proxy protocol '%s' is not supported."
-msgstr "不支持 %s 代理协议。"
+msgstr "不支持代理协议“%s”。"
 
 #: ../gio/gsocketlistener.c:218
 msgid "Listener is already closed"
@@ -2807,7 +3521,7 @@ msgstr "新增套接字已关闭"
 #: ../gio/gsocks4aproxy.c:118
 #, c-format
 msgid "SOCKSv4 does not support IPv6 address '%s'"
-msgstr "SOCKSv4 不支持 IPv6 地址 %s"
+msgstr "SOCKSv4 不支持 IPv6 地址“%s”"
 
 #: ../gio/gsocks4aproxy.c:136
 msgid "Username is too long for SOCKSv4 protocol"
@@ -2816,7 +3530,7 @@ msgstr "用户名对于 SOCKSv4 协议太长。"
 #: ../gio/gsocks4aproxy.c:153
 #, c-format
 msgid "Hostname '%s' is too long for SOCKSv4 protocol"
-msgstr "主机名 %s 对于 SOCKSv4 协议太长"
+msgstr "主机名“%s”对于 SOCKSv4 协议过长"
 
 #: ../gio/gsocks4aproxy.c:179
 msgid "The server is not a SOCKSv4 proxy server."
@@ -2852,7 +3566,7 @@ msgstr "SOCKSv5 认证失败：用户名或密码错误。"
 #: ../gio/gsocks5proxy.c:286
 #, c-format
 msgid "Hostname '%s' is too long for SOCKSv5 protocol"
-msgstr "主机名 %s 对于 SOCKSv5 协议太长。"
+msgstr "主机名“%s”对于 SOCKSv5 协议过长"
 
 #: ../gio/gsocks5proxy.c:348
 msgid "The SOCKSv5 proxy server uses unknown address type."
@@ -2880,7 +3594,7 @@ msgstr "通过 SOCKSv5 代理连接被拒绝。"
 
 #: ../gio/gsocks5proxy.c:386
 msgid "SOCKSv5 proxy does not support 'connect' command."
-msgstr "SOCKSv5 代理不支持 connect 命令。"
+msgstr "SOCKSv5 代理不支持“connect”命令。"
 
 #: ../gio/gsocks5proxy.c:392
 msgid "SOCKSv5 proxy does not support provided address type."
@@ -2899,26 +3613,26 @@ msgstr "无法处理 GThemedIcon 编码的版本 %d"
 msgid "No valid addresses were found"
 msgstr "找不到合法的地址"
 
-#: ../gio/gthreadedresolver.c:211
+#: ../gio/gthreadedresolver.c:213
 #, c-format
 msgid "Error reverse-resolving '%s': %s"
-msgstr "反向解析“%s”出错：%s"
+msgstr "反向解析“%s”时出错：%s"
 
-#: ../gio/gthreadedresolver.c:546 ../gio/gthreadedresolver.c:626
-#: ../gio/gthreadedresolver.c:724 ../gio/gthreadedresolver.c:774
+#: ../gio/gthreadedresolver.c:550 ../gio/gthreadedresolver.c:630
+#: ../gio/gthreadedresolver.c:728 ../gio/gthreadedresolver.c:778
 #, c-format
 msgid "No DNS record of the requested type for '%s'"
-msgstr "“%s”：没有所请求类型的 DNS 记录"
+msgstr "没有“%s”所请求类型的 DNS 记录"
 
-#: ../gio/gthreadedresolver.c:551 ../gio/gthreadedresolver.c:729
+#: ../gio/gthreadedresolver.c:555 ../gio/gthreadedresolver.c:733
 #, c-format
 msgid "Temporarily unable to resolve '%s'"
 msgstr "暂时无法解析“%s”"
 
-#: ../gio/gthreadedresolver.c:556 ../gio/gthreadedresolver.c:734
+#: ../gio/gthreadedresolver.c:560 ../gio/gthreadedresolver.c:738
 #, c-format
 msgid "Error resolving '%s'"
-msgstr "解析“%s”出错"
+msgstr "解析“%s”时出错"
 
 #: ../gio/gtlscertificate.c:250
 msgid "Cannot decrypt PEM-encoded private key"
@@ -3016,7 +3730,7 @@ msgstr "从文件描述符读取出错：%s"
 msgid "Error closing file descriptor: %s"
 msgstr "关闭文件描述符出错：%s"
 
-#: ../gio/gunixmounts.c:2099 ../gio/gunixmounts.c:2152
+#: ../gio/gunixmounts.c:2329 ../gio/gunixmounts.c:2382
 msgid "Filesystem root"
 msgstr "文件系统根目录"
 
@@ -3038,7 +3752,7 @@ msgstr "卷未实现弹出"
 #. * don't implement any of eject or eject_with_operation.
 #: ../gio/gvolume.c:514
 msgid "volume doesn't implement eject or eject_with_operation"
-msgstr "卷未执行 eject 或  eject_with_operation"
+msgstr "卷未实现弹出或  eject_with_operation"
 
 #: ../gio/gwin32inputstream.c:185
 #, c-format
@@ -3120,55 +3834,55 @@ msgstr "意外标签“%s”，需要标签“%s”"
 msgid "Unexpected tag '%s' inside '%s'"
 msgstr "“%2$s”中的意外标签“%1$s”"
 
-#: ../glib/gbookmarkfile.c:1756
+#: ../glib/gbookmarkfile.c:1757
 msgid "No valid bookmark file found in data dirs"
 msgstr "数据目录中没有找到有效的书签文件"
 
-#: ../glib/gbookmarkfile.c:1957
+#: ../glib/gbookmarkfile.c:1958
 #, c-format
 msgid "A bookmark for URI '%s' already exists"
 msgstr "URI“%s”的书签已经存在"
 
-#: ../glib/gbookmarkfile.c:2003 ../glib/gbookmarkfile.c:2161
-#: ../glib/gbookmarkfile.c:2246 ../glib/gbookmarkfile.c:2326
-#: ../glib/gbookmarkfile.c:2411 ../glib/gbookmarkfile.c:2494
-#: ../glib/gbookmarkfile.c:2572 ../glib/gbookmarkfile.c:2651
-#: ../glib/gbookmarkfile.c:2693 ../glib/gbookmarkfile.c:2790
-#: ../glib/gbookmarkfile.c:2910 ../glib/gbookmarkfile.c:3100
-#: ../glib/gbookmarkfile.c:3176 ../glib/gbookmarkfile.c:3344
-#: ../glib/gbookmarkfile.c:3433 ../glib/gbookmarkfile.c:3522
-#: ../glib/gbookmarkfile.c:3638
+#: ../glib/gbookmarkfile.c:2004 ../glib/gbookmarkfile.c:2162
+#: ../glib/gbookmarkfile.c:2247 ../glib/gbookmarkfile.c:2327
+#: ../glib/gbookmarkfile.c:2412 ../glib/gbookmarkfile.c:2495
+#: ../glib/gbookmarkfile.c:2573 ../glib/gbookmarkfile.c:2652
+#: ../glib/gbookmarkfile.c:2694 ../glib/gbookmarkfile.c:2791
+#: ../glib/gbookmarkfile.c:2911 ../glib/gbookmarkfile.c:3101
+#: ../glib/gbookmarkfile.c:3177 ../glib/gbookmarkfile.c:3345
+#: ../glib/gbookmarkfile.c:3434 ../glib/gbookmarkfile.c:3523
+#: ../glib/gbookmarkfile.c:3639
 #, c-format
 msgid "No bookmark found for URI '%s'"
 msgstr "未找到 URI“%s”的书签"
 
-#: ../glib/gbookmarkfile.c:2335
+#: ../glib/gbookmarkfile.c:2336
 #, c-format
 msgid "No MIME type defined in the bookmark for URI '%s'"
 msgstr "URI“%s”的书签未定义 MIME 类型"
 
-#: ../glib/gbookmarkfile.c:2420
+#: ../glib/gbookmarkfile.c:2421
 #, c-format
 msgid "No private flag has been defined in bookmark for URI '%s'"
 msgstr "URI“%s”的书签未定义私有标志"
 
-#: ../glib/gbookmarkfile.c:2799
+#: ../glib/gbookmarkfile.c:2800
 #, c-format
 msgid "No groups set in bookmark for URI '%s'"
 msgstr "URI“%s”的书签未设定组"
 
-#: ../glib/gbookmarkfile.c:3197 ../glib/gbookmarkfile.c:3354
+#: ../glib/gbookmarkfile.c:3198 ../glib/gbookmarkfile.c:3355
 #, c-format
 msgid "No application with name '%s' registered a bookmark for '%s'"
 msgstr "没有名为“%s”的应用程序为“%s”注册书签"
 
-#: ../glib/gbookmarkfile.c:3377
+#: ../glib/gbookmarkfile.c:3378
 #, c-format
 msgid "Failed to expand exec line '%s' with URI '%s'"
 msgstr "用 URI“%2$s”展开 exec 行“%1$s”失败"
 
-#: ../glib/gconvert.c:477 ../glib/gutf8.c:849 ../glib/gutf8.c:1061
-#: ../glib/gutf8.c:1198 ../glib/gutf8.c:1302
+#: ../glib/gconvert.c:477 ../glib/gutf8.c:851 ../glib/gutf8.c:1063
+#: ../glib/gutf8.c:1200 ../glib/gutf8.c:1304
 msgid "Partial character sequence at end of input"
 msgstr "输入末尾出现未尽字符序列"
 
@@ -3180,7 +3894,7 @@ msgstr "无法转换后备字符集“%s”到字符集“%s”"
 #: ../glib/gconvert.c:1567
 #, c-format
 msgid "The URI '%s' is not an absolute URI using the \"file\" scheme"
-msgstr "URI“%s”不是“file”格式的绝对 URI"
+msgstr "URI“%s”不是使用“file”方案的绝对 URI"
 
 #: ../glib/gconvert.c:1577
 #, c-format
@@ -3195,7 +3909,7 @@ msgstr "URI“%s”无效"
 #: ../glib/gconvert.c:1606
 #, c-format
 msgid "The hostname of the URI '%s' is invalid"
-msgstr "URI中的主机名“%s”无效"
+msgstr "URI“%s”中的主机名无效"
 
 #: ../glib/gconvert.c:1622
 #, c-format
@@ -3442,86 +4156,82 @@ msgstr "日"
 msgid "Error opening directory '%s': %s"
 msgstr "打开目录“%s”时发生错误：%s"
 
-#: ../glib/gfileutils.c:700 ../glib/gfileutils.c:792
+#: ../glib/gfileutils.c:701 ../glib/gfileutils.c:793
 #, c-format
 msgid "Could not allocate %lu byte to read file \"%s\""
 msgid_plural "Could not allocate %lu bytes to read file \"%s\""
 msgstr[0] "无法分配 %lu 字节以读取文件“%s”"
 
-#: ../glib/gfileutils.c:717
+#: ../glib/gfileutils.c:718
 #, c-format
 msgid "Error reading file '%s': %s"
 msgstr "读取文件“%s”出错：%s"
 
-#: ../glib/gfileutils.c:753
+#: ../glib/gfileutils.c:754
 #, c-format
 msgid "File \"%s\" is too large"
-msgstr "文件“%s”太大"
+msgstr "文件“%s”过大"
 
-#: ../glib/gfileutils.c:817
+#: ../glib/gfileutils.c:818
 #, c-format
 msgid "Failed to read from file '%s': %s"
 msgstr "读取文件“%s”失败：%s"
 
-#: ../glib/gfileutils.c:865 ../glib/gfileutils.c:937
+#: ../glib/gfileutils.c:866 ../glib/gfileutils.c:938
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "打开文件“%s”失败：%s"
 
-#: ../glib/gfileutils.c:877
+#: ../glib/gfileutils.c:878
 #, c-format
 msgid "Failed to get attributes of file '%s': fstat() failed: %s"
 msgstr "获得文件“%s”的属性失败：fstat() 失败：%s"
 
-#: ../glib/gfileutils.c:907
+#: ../glib/gfileutils.c:908
 #, c-format
 msgid "Failed to open file '%s': fdopen() failed: %s"
 msgstr "打开文件“%s”失败：fdopen() 失败：%s"
 
-#: ../glib/gfileutils.c:1006
+#: ../glib/gfileutils.c:1007
 #, c-format
 msgid "Failed to rename file '%s' to '%s': g_rename() failed: %s"
 msgstr "将文件“%s”重命名为“%s”失败：g_rename() 失败：%s"
 
-#: ../glib/gfileutils.c:1041 ../glib/gfileutils.c:1540
+#: ../glib/gfileutils.c:1042 ../glib/gfileutils.c:1541
 #, c-format
 msgid "Failed to create file '%s': %s"
 msgstr "创建文件“%s”失败：%s"
 
-#: ../glib/gfileutils.c:1068
+#: ../glib/gfileutils.c:1069
 #, c-format
 msgid "Failed to write file '%s': write() failed: %s"
 msgstr "写入文件“%s”失败：write() 失败：%s"
 
-#: ../glib/gfileutils.c:1111
+#: ../glib/gfileutils.c:1112
 #, c-format
 msgid "Failed to write file '%s': fsync() failed: %s"
 msgstr "写入文件“%s”失败：fsync() 失败：%s"
 
-#: ../glib/gfileutils.c:1235
+#: ../glib/gfileutils.c:1236
 #, c-format
 msgid "Existing file '%s' could not be removed: g_unlink() failed: %s"
 msgstr "无法删除已有文件“%s”：g_unlink() 失败：%s"
 
-#: ../glib/gfileutils.c:1506
+#: ../glib/gfileutils.c:1507
 #, c-format
 msgid "Template '%s' invalid, should not contain a '%s'"
 msgstr "模板“%s”无效，不应该包含“%s”"
 
-#: ../glib/gfileutils.c:1519
+#: ../glib/gfileutils.c:1520
 #, c-format
 msgid "Template '%s' doesn't contain XXXXXX"
 msgstr "模板“%s”不包含 XXXXXX"
 
-#: ../glib/gfileutils.c:2038
+#: ../glib/gfileutils.c:2045
 #, c-format
 msgid "Failed to read the symbolic link '%s': %s"
 msgstr "读取符号链接“%s”失败：%s"
 
-#: ../glib/gfileutils.c:2057
-msgid "Symbolic links not supported"
-msgstr "不支持符号链接"
-
 #: ../glib/giochannel.c:1388
 #, c-format
 msgid "Could not open converter from '%s' to '%s': %s"
@@ -3552,91 +4262,91 @@ msgstr "在搜索目录中无法找到有效的键文件"
 msgid "Not a regular file"
 msgstr "不是普通文件"
 
-#: ../glib/gkeyfile.c:1174
+#: ../glib/gkeyfile.c:1204
 #, c-format
 msgid ""
 "Key file contains line '%s' which is not a key-value pair, group, or comment"
-msgstr "键文件中的行“%s”不是键-值对、组或注释"
+msgstr "键文件包含不是键-值对、组或注释的行“%s”"
 
-#: ../glib/gkeyfile.c:1231
+#: ../glib/gkeyfile.c:1261
 #, c-format
 msgid "Invalid group name: %s"
 msgstr "无效的组名：%s"
 
-#: ../glib/gkeyfile.c:1253
+#: ../glib/gkeyfile.c:1283
 msgid "Key file does not start with a group"
 msgstr "键文件不以组开始"
 
-#: ../glib/gkeyfile.c:1279
+#: ../glib/gkeyfile.c:1309
 #, c-format
 msgid "Invalid key name: %s"
 msgstr "无效的键名：%s"
 
-#: ../glib/gkeyfile.c:1306
+#: ../glib/gkeyfile.c:1336
 #, c-format
 msgid "Key file contains unsupported encoding '%s'"
 msgstr "键文件包含不支持的编码“%s”"
 
-#: ../glib/gkeyfile.c:1549 ../glib/gkeyfile.c:1722 ../glib/gkeyfile.c:3100
-#: ../glib/gkeyfile.c:3163 ../glib/gkeyfile.c:3293 ../glib/gkeyfile.c:3423
-#: ../glib/gkeyfile.c:3567 ../glib/gkeyfile.c:3796 ../glib/gkeyfile.c:3863
+#: ../glib/gkeyfile.c:1579 ../glib/gkeyfile.c:1752 ../glib/gkeyfile.c:3130
+#: ../glib/gkeyfile.c:3193 ../glib/gkeyfile.c:3323 ../glib/gkeyfile.c:3453
+#: ../glib/gkeyfile.c:3597 ../glib/gkeyfile.c:3826 ../glib/gkeyfile.c:3893
 #, c-format
 msgid "Key file does not have group '%s'"
 msgstr "键文件没有组“%s”"
 
-#: ../glib/gkeyfile.c:1677
+#: ../glib/gkeyfile.c:1707
 #, c-format
 msgid "Key file does not have key '%s' in group '%s'"
-msgstr "键文件的组“%2$s”中不包含键“%1$s”"
+msgstr "键文件在组“%2$s”中没有键“%1$s”"
 
-#: ../glib/gkeyfile.c:1839 ../glib/gkeyfile.c:1955
+#: ../glib/gkeyfile.c:1869 ../glib/gkeyfile.c:1985
 #, c-format
 msgid "Key file contains key '%s' with value '%s' which is not UTF-8"
-msgstr "键文件包含“%s”，其值“%s”不是 UTF-8"
+msgstr "键文件包含键“%s”，其值“%s”不是 UTF-8"
 
-#: ../glib/gkeyfile.c:1859 ../glib/gkeyfile.c:1975 ../glib/gkeyfile.c:2344
+#: ../glib/gkeyfile.c:1889 ../glib/gkeyfile.c:2005 ../glib/gkeyfile.c:2374
 #, c-format
 msgid ""
 "Key file contains key '%s' which has a value that cannot be interpreted."
 msgstr "键文件包含键“%s”，其值无法解释。"
 
-#: ../glib/gkeyfile.c:2561 ../glib/gkeyfile.c:2929
+#: ../glib/gkeyfile.c:2591 ../glib/gkeyfile.c:2959
 #, c-format
 msgid ""
 "Key file contains key '%s' in group '%s' which has a value that cannot be "
 "interpreted."
-msgstr "键文件中组“%2$s”的键“%1$s”有一个无法解释的值。"
+msgstr "键文件包含组“%2$s”中的键“%1$s”，其值无法解释。"
 
-#: ../glib/gkeyfile.c:2639 ../glib/gkeyfile.c:2716
+#: ../glib/gkeyfile.c:2669 ../glib/gkeyfile.c:2746
 #, c-format
 msgid "Key '%s' in group '%s' has value '%s' where %s was expected"
-msgstr "组“%2$s”中的键“%1$s”的值为“%3$s”，应为 %4$s。"
+msgstr "组“%2$s”中的键“%1$s”的值为“%3$s”，应为 %4$s"
 
-#: ../glib/gkeyfile.c:4103
+#: ../glib/gkeyfile.c:4133
 msgid "Key file contains escape character at end of line"
 msgstr "键文件在行尾含有转义字符"
 
-#: ../glib/gkeyfile.c:4125
+#: ../glib/gkeyfile.c:4155
 #, c-format
 msgid "Key file contains invalid escape sequence '%s'"
 msgstr "键文件中包含无效的转义序列“%s”"
 
-#: ../glib/gkeyfile.c:4267
+#: ../glib/gkeyfile.c:4297
 #, c-format
 msgid "Value '%s' cannot be interpreted as a number."
 msgstr "无法将值“%s”解释为数值。"
 
-#: ../glib/gkeyfile.c:4281
+#: ../glib/gkeyfile.c:4311
 #, c-format
 msgid "Integer value '%s' out of range"
 msgstr "整数值“%s”超出范围"
 
-#: ../glib/gkeyfile.c:4314
+#: ../glib/gkeyfile.c:4344
 #, c-format
 msgid "Value '%s' cannot be interpreted as a float number."
 msgstr "无法将值“%s”解释为浮点数。"
 
-#: ../glib/gkeyfile.c:4351
+#: ../glib/gkeyfile.c:4383
 #, c-format
 msgid "Value '%s' cannot be interpreted as a boolean."
 msgstr "无法将值“%s”解释为布尔值。"
@@ -3651,7 +4361,7 @@ msgstr "获取文件“%s%s%s%s”的属性失败 : fstat() 失败：%s"
 msgid "Failed to map %s%s%s%s: mmap() failed: %s"
 msgstr "映射 %s%s%s%s 失败：mmap() 失败：%s"
 
-#: ../glib/gmappedfile.c:261
+#: ../glib/gmappedfile.c:262
 #, c-format
 msgid "Failed to open file '%s': open() failed: %s"
 msgstr "打开文件“%s”失败：open() 失败：%s"
@@ -3839,13 +4549,9 @@ msgstr "文档在元素“%s”结束标记中意外结束"
 msgid "Document ended unexpectedly inside a comment or processing instruction"
 msgstr "文档在注释或处理指令中意外结束"
 
-#: ../glib/goption.c:857
-msgid "Usage:"
-msgstr "用法："
-
 #: ../glib/goption.c:861
 msgid "[OPTION...]"
-msgstr "[选项...]"
+msgstr "[选项…]"
 
 #: ../glib/goption.c:977
 msgid "Help Options:"
@@ -3870,7 +4576,7 @@ msgstr "选项："
 #: ../glib/goption.c:1113 ../glib/goption.c:1183
 #, c-format
 msgid "Cannot parse integer value '%s' for %s"
-msgstr "无法处理 %2$s 所用的整数值“%1$s”"
+msgstr "无法解析 %2$s 的整数值“%1$s”"
 
 #: ../glib/goption.c:1123 ../glib/goption.c:1191
 #, c-format
@@ -3880,24 +4586,24 @@ msgstr "%2$s 所用的整数值“%1$s”超出范围"
 #: ../glib/goption.c:1148
 #, c-format
 msgid "Cannot parse double value '%s' for %s"
-msgstr "无法处理 %2$s 所用的双精度值“%1$s”"
+msgstr "无法解析 %2$s 的双精度值“%1$s”"
 
 #: ../glib/goption.c:1156
 #, c-format
 msgid "Double value '%s' for %s out of range"
-msgstr "%2$s 所用的双精度值“%1$s”超出范围"
+msgstr "“%2$s”所用的双精度值“%1$s”超出范围"
 
-#: ../glib/goption.c:1442 ../glib/goption.c:1521
+#: ../glib/goption.c:1448 ../glib/goption.c:1527
 #, c-format
 msgid "Error parsing option %s"
 msgstr "解析选项 %s 时出错"
 
-#: ../glib/goption.c:1552 ../glib/goption.c:1665
+#: ../glib/goption.c:1558 ../glib/goption.c:1671
 #, c-format
 msgid "Missing argument for %s"
 msgstr "缺少 %s 的参数"
 
-#: ../glib/goption.c:2126
+#: ../glib/goption.c:2132
 #, c-format
 msgid "Unknown option %s"
 msgstr "未知选项 %s"
@@ -3922,6 +4628,10 @@ msgstr "达到回溯上限"
 msgid "the pattern contains items not supported for partial matching"
 msgstr "表达式包含不被部分匹配支持的项"
 
+#: ../glib/gregex.c:281
+msgid "internal error"
+msgstr "内部错误"
+
 #: ../glib/gregex.c:289
 msgid "back references as conditions are not supported for partial matching"
 msgstr "不完全匹配时作为条件的后向引用不被支持."
@@ -4195,7 +4905,7 @@ msgstr "在 (*MARK), (*PRUNE), (*SKIP) 或者 (*THEN) 中名称太长"
 msgid "character value in \\u.... sequence is too large"
 msgstr "\\u.... 序列里的字符值太大了"
 
-#: ../glib/gregex.c:746 ../glib/gregex.c:1973
+#: ../glib/gregex.c:746 ../glib/gregex.c:1977
 #, c-format
 msgid "Error while matching regular expression %s: %s"
 msgstr "匹配正则表达式 %s 出现错误：%s"
@@ -4222,50 +4932,50 @@ msgstr "优化正则表达式 %s 时出错：%s"
 msgid "Error while compiling regular expression %s at char %d: %s"
 msgstr "编译正则表达式 %s (于字符 %d 处)时出错：%s"
 
-#: ../glib/gregex.c:2409
+#: ../glib/gregex.c:2413
 msgid "hexadecimal digit or '}' expected"
-msgstr "期望十六进制数或 '}'"
+msgstr "期望十六进制数或“}”"
 
-#: ../glib/gregex.c:2425
+#: ../glib/gregex.c:2429
 msgid "hexadecimal digit expected"
 msgstr "期望十六进制数"
 
-#: ../glib/gregex.c:2465
+#: ../glib/gregex.c:2469
 msgid "missing '<' in symbolic reference"
 msgstr "在符号引用中缺少“<”"
 
-#: ../glib/gregex.c:2474
+#: ../glib/gregex.c:2478
 msgid "unfinished symbolic reference"
 msgstr "未完成的符号引用"
 
-#: ../glib/gregex.c:2481
+#: ../glib/gregex.c:2485
 msgid "zero-length symbolic reference"
 msgstr "零长符号引用"
 
-#: ../glib/gregex.c:2492
+#: ../glib/gregex.c:2496
 msgid "digit expected"
 msgstr "期望数字"
 
-#: ../glib/gregex.c:2510
+#: ../glib/gregex.c:2514
 msgid "illegal symbolic reference"
 msgstr "非法的符号引用"
 
-#: ../glib/gregex.c:2572
+#: ../glib/gregex.c:2576
 msgid "stray final '\\'"
 msgstr "丢失了最后的“\\”"
 
-#: ../glib/gregex.c:2576
+#: ../glib/gregex.c:2580
 msgid "unknown escape sequence"
 msgstr "未知的转义序列"
 
-#: ../glib/gregex.c:2586
+#: ../glib/gregex.c:2590
 #, c-format
 msgid "Error while parsing replacement text \"%s\" at char %lu: %s"
-msgstr "分析替换文本\"%s\" 时在字符 %lu 处发生错误：%s"
+msgstr "解析替换文本“%s”时在字符 %lu 处发生错误：%s"
 
 #: ../glib/gshell.c:96
 msgid "Quoted text doesn't begin with a quotation mark"
-msgstr "引用的文本没有以引号开头"
+msgstr "引用的文本不以引号开头"
 
 #: ../glib/gshell.c:186
 msgid "Unmatched quotation mark in command line or other shell-quoted text"
@@ -4279,7 +4989,7 @@ msgstr "文本在一个“\\”字符后结束。(文本为“%s”)"
 #: ../glib/gshell.c:589
 #, c-format
 msgid "Text ended before matching quote was found for %c. (The text was '%s')"
-msgstr "文本在找到与 %c 匹配的引号之前结束。(文本为“%s”)"
+msgstr "在找到为 %c 匹配的引用之前，文本已结束。(文本为“%s”)"
 
 #: ../glib/gshell.c:601
 msgid "Text was empty (or contained only whitespace)"
@@ -4338,7 +5048,7 @@ msgstr "更改到目录“%s”失败(%s)"
 #: ../glib/gspawn.c:1500
 #, c-format
 msgid "Failed to execute child process \"%s\" (%s)"
-msgstr "执行子进程“%s”失败(%s)"
+msgstr "执行子进程“%s\"失败(%s)"
 
 #: ../glib/gspawn.c:1510
 #, c-format
@@ -4407,91 +5117,91 @@ msgid ""
 "process"
 msgstr "g_io_channel_win32_poll() 从子进程中读取数据时出现异常错误"
 
-#: ../glib/gutf8.c:795
+#: ../glib/gutf8.c:797
 msgid "Failed to allocate memory"
 msgstr "分配内存失败"
 
-#: ../glib/gutf8.c:928
+#: ../glib/gutf8.c:930
 msgid "Character out of range for UTF-8"
 msgstr "字符超出 UTF-8 范围"
 
-#: ../glib/gutf8.c:1029 ../glib/gutf8.c:1038 ../glib/gutf8.c:1168
-#: ../glib/gutf8.c:1177 ../glib/gutf8.c:1316 ../glib/gutf8.c:1413
+#: ../glib/gutf8.c:1031 ../glib/gutf8.c:1040 ../glib/gutf8.c:1170
+#: ../glib/gutf8.c:1179 ../glib/gutf8.c:1318 ../glib/gutf8.c:1415
 msgid "Invalid sequence in conversion input"
 msgstr "转换输入中出现无效序列"
 
-#: ../glib/gutf8.c:1327 ../glib/gutf8.c:1424
+#: ../glib/gutf8.c:1329 ../glib/gutf8.c:1426
 msgid "Character out of range for UTF-16"
 msgstr "字符超出 UTF-16 范围"
 
-#: ../glib/gutils.c:2133 ../glib/gutils.c:2160 ../glib/gutils.c:2266
+#: ../glib/gutils.c:2139 ../glib/gutils.c:2166 ../glib/gutils.c:2272
 #, c-format
 msgid "%u byte"
 msgid_plural "%u bytes"
 msgstr[0] "%u 字节"
 
-#: ../glib/gutils.c:2139
+#: ../glib/gutils.c:2145
 #, c-format
 msgid "%.1f KiB"
 msgstr "%.1f KiB"
 
-#: ../glib/gutils.c:2141
+#: ../glib/gutils.c:2147
 #, c-format
 msgid "%.1f MiB"
 msgstr "%.1f MiB"
 
-#: ../glib/gutils.c:2144
+#: ../glib/gutils.c:2150
 #, c-format
 msgid "%.1f GiB"
 msgstr "%.1f GiB"
 
-#: ../glib/gutils.c:2147
+#: ../glib/gutils.c:2153
 #, c-format
 msgid "%.1f TiB"
 msgstr "%.1f TiB"
 
-#: ../glib/gutils.c:2150
+#: ../glib/gutils.c:2156
 #, c-format
 msgid "%.1f PiB"
 msgstr "%.1f PiB"
 
-#: ../glib/gutils.c:2153
+#: ../glib/gutils.c:2159
 #, c-format
 msgid "%.1f EiB"
 msgstr "%.1f EiB"
 
-#: ../glib/gutils.c:2166
+#: ../glib/gutils.c:2172
 #, c-format
 msgid "%.1f kB"
 msgstr "%.1f KB"
 
-#: ../glib/gutils.c:2169 ../glib/gutils.c:2284
+#: ../glib/gutils.c:2175 ../glib/gutils.c:2290
 #, c-format
 msgid "%.1f MB"
 msgstr "%.1f MB"
 
-#: ../glib/gutils.c:2172 ../glib/gutils.c:2289
+#: ../glib/gutils.c:2178 ../glib/gutils.c:2295
 #, c-format
 msgid "%.1f GB"
 msgstr "%.1f GB"
 
-#: ../glib/gutils.c:2174 ../glib/gutils.c:2294
+#: ../glib/gutils.c:2180 ../glib/gutils.c:2300
 #, c-format
 msgid "%.1f TB"
 msgstr "%.1f TB"
 
-#: ../glib/gutils.c:2177 ../glib/gutils.c:2299
+#: ../glib/gutils.c:2183 ../glib/gutils.c:2305
 #, c-format
 msgid "%.1f PB"
 msgstr "%.1f PB"
 
-#: ../glib/gutils.c:2180 ../glib/gutils.c:2304
+#: ../glib/gutils.c:2186 ../glib/gutils.c:2310
 #, c-format
 msgid "%.1f EB"
 msgstr "%.1f EB"
 
 #. Translators: the %s in "%s bytes" will always be replaced by a number.
-#: ../glib/gutils.c:2217
+#: ../glib/gutils.c:2223
 #, c-format
 msgid "%s byte"
 msgid_plural "%s bytes"
@@ -4502,19 +5212,76 @@ msgstr[0] "%s 字节"
 #. * compatibility.  Users will not see this string unless a program is using this deprecated function.
 #. * Please translate as literally as possible.
 #.
-#: ../glib/gutils.c:2279
+#: ../glib/gutils.c:2285
 #, c-format
 msgid "%.1f KB"
 msgstr "%.1f KB"
 
-#~ msgid "Unable to find default local directory monitor type"
-#~ msgstr "无法找到默认的本地目录监视器类型"
+#, fuzzy
+#~| msgid "[ARGS...]"
+#~ msgid "[ARGS…]"
+#~ msgstr "[ARGS...]"
+
+#, fuzzy
+#~| msgid ""
+#~| "Cannot determine bus address from DBUS_STARTER_BUS_TYPE environment "
+#~| "variable - unknown value '%s'"
+#~ msgid ""
+#~ "Cannot determine bus address from DBUS_STARTER_BUS_TYPE environment "
+#~ "variable — unknown value “%s”"
+#~ msgstr "无法从 DBUS_STARTER_BUS_TYPE 环境变量确定总线地址 - 未知的值“%s”"
+
+#, fuzzy
+#~| msgid "Error creating directory '%s': %s"
+#~ msgid "Error creating directory “%s”: %s"
+#~ msgstr "创建目录“%s”出错：%s"
+
+#, fuzzy
+#~| msgid "Error opening file '%s': %s"
+#~ msgid "Error opening file “%s”: %s"
+#~ msgstr "打开文件“%s”出错：%s"
+
+#, fuzzy
+#~| msgid "mount doesn't implement \"eject\" or \"eject_with_operation\""
+#~ msgid "mount doesn’t implement “eject” or “eject_with_operation”"
+#~ msgstr "挂载未执行“eject”或“eject_with_operation”"
+
+#, fuzzy
+#~| msgid "Error reading file %s: %s"
+#~ msgid "Error reading file “%s”: %s"
+#~ msgstr "读取文件 %s 出错：%s"
+
+#, fuzzy
+#~| msgid "Failed to write file '%s': fsync() failed: %s"
+#~ msgid "Failed to write file “%s”: fsync() failed: %s"
+#~ msgstr "写入文件“%s”失败：fsync() 失败：%s"
+
+#, fuzzy
+#~| msgid ""
+#~| "Key file contains key '%s' which has a value that cannot be interpreted."
+#~ msgid ""
+#~ "Key file contains key “%s” which has a value that cannot be interpreted."
+#~ msgstr "键文件包含键“%s”，其值无法解释。"
+
+#, fuzzy
+#~| msgid "Failed to execute child process \"%s\" (%s)"
+#~ msgid "Failed to execute child process “%s” (%s)"
+#~ msgstr "执行子进程“%s”失败(%s)"
+
+#~ msgid "Error renaming file: %s"
+#~ msgstr "重命名文件时出错：%s"
+
+#~ msgid "Can't open directory"
+#~ msgstr "无法打开目录"
 
-#~ msgid "Can't find application"
-#~ msgstr "无法找到应用程序"
+#~ msgid "Error opening file: %s"
+#~ msgstr "打开文件时出错：%s"
 
-#~ msgid "Error launching application: %s"
-#~ msgstr "启动应用程序出错：%s"
+#~ msgid "Error creating directory: %s"
+#~ msgstr "创建目录时出错：%s"
+
+#~ msgid "Unable to find default local directory monitor type"
+#~ msgstr "无法找到默认的本地目录监视器类型"
 
 #~ msgid "URIs not supported"
 #~ msgstr "不支持 URI"
@@ -4548,9 +5315,6 @@ msgstr "%.1f KB"
 #~ msgid "Failed to open file '%s' for writing: fdopen() failed: %s"
 #~ msgstr "打开文件“%s”写入失败：fdopen() 失败：%s"
 
-#~ msgid "Failed to write file '%s': fflush() failed: %s"
-#~ msgstr "写入文件“%s”失败：fflush() 失败：%s"
-
 #~ msgid "Failed to close file '%s': fclose() failed: %s"
 #~ msgstr "关闭文件“%s”失败：fclose() 失败：%s"
 
@@ -4581,10 +5345,6 @@ msgstr "%.1f KB"
 #~ msgid "File is empty"
 #~ msgstr "文件为空"
 
-#~ msgid ""
-#~ "Key file contains key '%s' which has value that cannot be interpreted."
-#~ msgstr "键文件包含键“%s”，其值无法解释。"
-
 #~ msgid "This option will be removed soon."
 #~ msgstr "此选项将在不久删除。"
 
@@ -4606,9 +5366,6 @@ msgstr "%.1f KB"
 #~ msgid "Error reading from unix: %s"
 #~ msgstr "读取 unix 出错：%s"
 
-#~ msgid "Error closing unix: %s"
-#~ msgstr "关闭 unix 出错：%s"
-
 #~ msgid "Error writing to unix: %s"
 #~ msgstr "写入 unix 出错：%s"