From 15cd5c07b0c1dd4aceee3870875c553ec588b847 Mon Sep 17 00:00:00 2001 From: su-fang Date: Wed, 15 Feb 2023 09:31:22 +0800 Subject: [PATCH] Apply patches on new upstream 2.74.5 --- ...1-timer-test-use-volatile-for-locals.patch | 38 - debian/patches/01_gettext-desktopfiles.patch | 168 - debian/patches/20210325-file-type.patch | 135 - ...26-fix-trash-issue-in-data-usershare.patch | 41 - .../02_gettext-desktopfiles-ubuntu.patch | 51 - ..._disble_glib_compile_schemas_warning.patch | 36 - .../06_thread_test_ignore_prctl_fail.patch | 33 - .../61_glib-compile-binaries-path.patch | 25 - ...-slow-architectures-which-keep-faili.patch | 70 - ...rms-some-unreliable-floating-point-c.patch | 32 - ...le-gdbus-threading-tests--by-default.patch | 48 - ...n-arm-unless-flaky-tests-are-allowed.patch | 37 - .../gmenumodel-test-Mark-as-flaky.patch | 30 - ...test-Don-t-run-at-build-time-on-mips.patch | 36 - ...op-looking-like-an-executable-script.patch | 24 - ...-Skip-if-we-are-avoiding-flaky-tests.patch | 106 - debian/patches/fix-localization-issue.patch | 23 - debian/patches/fix-trash-issue-in-data.patch | 23 - debian/patches/git_gsource_segfault.patch | 203 - ...-parallel-unless-invoked-with-m-slow.patch | 80 - debian/patches/user-directory-i18n.patch | 7505 ----------------- 21 files changed, 8744 deletions(-) delete mode 100644 debian/patches/0001-timer-test-use-volatile-for-locals.patch delete mode 100644 debian/patches/01_gettext-desktopfiles.patch delete mode 100644 debian/patches/20210325-file-type.patch delete mode 100644 debian/patches/20210726-fix-trash-issue-in-data-usershare.patch delete mode 100644 debian/patches/debian/02_gettext-desktopfiles-ubuntu.patch delete mode 100644 debian/patches/debian/03_disble_glib_compile_schemas_warning.patch delete mode 100644 debian/patches/debian/06_thread_test_ignore_prctl_fail.patch delete mode 100644 debian/patches/debian/61_glib-compile-binaries-path.patch delete mode 100644 debian/patches/debian/Disable-some-tests-on-slow-architectures-which-keep-faili.patch delete mode 100644 debian/patches/debian/Skip-test-which-performs-some-unreliable-floating-point-c.patch delete mode 100644 debian/patches/debian/Skip-unreliable-gdbus-threading-tests--by-default.patch delete mode 100644 debian/patches/debian/closures-test-Skip-on-arm-unless-flaky-tests-are-allowed.patch delete mode 100644 debian/patches/debian/gmenumodel-test-Mark-as-flaky.patch delete mode 100644 debian/patches/debian/gvariant-test-Don-t-run-at-build-time-on-mips.patch delete mode 100644 debian/patches/debian/taptestrunner-Stop-looking-like-an-executable-script.patch delete mode 100644 debian/patches/debian/testfilemonitor-Skip-if-we-are-avoiding-flaky-tests.patch delete mode 100644 debian/patches/fix-localization-issue.patch delete mode 100644 debian/patches/fix-trash-issue-in-data.patch delete mode 100644 debian/patches/git_gsource_segfault.patch delete mode 100644 debian/patches/gwakeuptest-Be-less-parallel-unless-invoked-with-m-slow.patch delete mode 100644 debian/patches/user-directory-i18n.patch diff --git a/debian/patches/0001-timer-test-use-volatile-for-locals.patch b/debian/patches/0001-timer-test-use-volatile-for-locals.patch deleted file mode 100644 index 60e2bc1..0000000 --- a/debian/patches/0001-timer-test-use-volatile-for-locals.patch +++ /dev/null @@ -1,38 +0,0 @@ -From: Ryan Lortie -Date: Tue, 4 Mar 2014 09:20:38 -0500 -Subject: timer test: use 'volatile' for locals - -GCC seems to be failing to follow the letter of the C spec by allowing extra -precision in floating point values to persist across assignments which are -optimised away. - -Force its hand by using 'volatile' on the locals in question. - -Bug: https://gitlab.gnome.org/GNOME/glib/issues/820 -Forwarded: yes ---- - glib/tests/timer.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/glib/tests/timer.c b/glib/tests/timer.c -index 149b3af..b7a90c2 100644 ---- a/glib/tests/timer.c -+++ b/glib/tests/timer.c -@@ -30,7 +30,7 @@ static void - test_timer_basic (void) - { - GTimer *timer; -- gdouble elapsed; -+ volatile gdouble elapsed; - gulong micros; - - timer = g_timer_new (); -@@ -47,7 +47,7 @@ static void - test_timer_stop (void) - { - GTimer *timer; -- gdouble elapsed, elapsed2; -+ volatile gdouble elapsed, elapsed2; - - timer = g_timer_new (); - diff --git a/debian/patches/01_gettext-desktopfiles.patch b/debian/patches/01_gettext-desktopfiles.patch deleted file mode 100644 index f42ff98..0000000 --- a/debian/patches/01_gettext-desktopfiles.patch +++ /dev/null @@ -1,168 +0,0 @@ -From: Philip Withnall -Date: Thu, 23 Nov 2017 18:48:58 +0000 -Subject: [PATCH] Call gettext if .desktop file does not have inline - translations - -Patch from OpenSUSE via Ubuntu, original author unknown. Martin Pitt and -Vincent Untz appear to be the main authors. - -Reworked slightly by Philip Withnall to avoid exposing new public API -for the non-standard keys. - -Bug: https://bugzilla.gnome.org/show_bug.cgi?id=569829 -Bug-Ubuntu: https://launchpad.net/bugs/3935 -Applied-upstream: no, rejected because "this will be solved soon" (in 2013) ---- - glib/gkeyfile.c | 83 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 83 insertions(+) - -diff --git a/glib/gkeyfile.c b/glib/gkeyfile.c -index dc80ce5..661c2ed 100644 ---- a/glib/gkeyfile.c -+++ b/glib/gkeyfile.c -@@ -488,6 +488,17 @@ - * Since: 2.14 - */ - -+/* Downstream Debian defines for calling gettext() if a .desktop file doesn’t -+ * contain translations. These are not standardised. -+ * -+ * See: https://launchpad.net/bugs/3935 -+ * See:http://bugzilla.gnome.org/show_bug.cgi?id=569829 -+ */ -+#define G_KEY_FILE_DESKTOP_ACTION_GROUP_PREFIX "Desktop Action" -+#define G_KEY_FILE_DESKTOP_KEY_GETTEXT_DOMAIN "X-GNOME-Gettext-Domain" -+#define G_KEY_FILE_DESKTOP_KEY_FULLNAME "X-GNOME-FullName" -+#define G_KEY_FILE_DESKTOP_KEY_KEYWORDS "Keywords" -+ - typedef struct _GKeyFileGroup GKeyFileGroup; - - /** -@@ -511,6 +522,7 @@ struct _GKeyFile - GKeyFileFlags flags; - - gchar **locales; -+ gchar *gettext_domain; - - volatile gint ref_count; - }; -@@ -636,6 +648,7 @@ g_key_file_init (GKeyFile *key_file) - key_file->list_separator = ';'; - key_file->flags = 0; - key_file->locales = g_strdupv ((gchar **)g_get_language_names ()); -+ key_file->gettext_domain = NULL; - } - - static void -@@ -655,6 +668,12 @@ g_key_file_clear (GKeyFile *key_file) - key_file->parse_buffer = NULL; - } - -+ if (key_file->gettext_domain) -+ { -+ g_free (key_file->gettext_domain); -+ key_file->gettext_domain = NULL; -+ } -+ - tmp = key_file->groups; - while (tmp != NULL) - { -@@ -874,6 +893,11 @@ g_key_file_load_from_fd (GKeyFile *key_file, - return FALSE; - } - -+ key_file->gettext_domain = g_key_file_get_string (key_file, -+ G_KEY_FILE_DESKTOP_GROUP, -+ G_KEY_FILE_DESKTOP_KEY_GETTEXT_DOMAIN, -+ NULL); -+ - return TRUE; - } - -@@ -986,6 +1010,11 @@ g_key_file_load_from_data (GKeyFile *key_file, - return FALSE; - } - -+ key_file->gettext_domain = g_key_file_get_string (key_file, -+ G_KEY_FILE_DESKTOP_GROUP, -+ G_KEY_FILE_DESKTOP_KEY_GETTEXT_DOMAIN, -+ NULL); -+ - return TRUE; - } - -@@ -2213,6 +2242,8 @@ g_key_file_get_locale_string (GKeyFile *key_file, - GError *key_file_error; - gchar **languages; - gboolean free_languages = FALSE; -+ gboolean try_gettext = FALSE; -+ const gchar *msg_locale; - gint i; - - g_return_val_if_fail (key_file != NULL, NULL); -@@ -2234,6 +2265,25 @@ g_key_file_get_locale_string (GKeyFile *key_file, - free_languages = FALSE; - } - -+ /* we're only interested in gettext translation if we don't have a -+ * translation in the .desktop file itself and if the key is one of the keys -+ * we know we want to translate: Name, GenericName, Comment, Keywords. -+ * Blindly doing this for all keys can give strange result for the icons, -+ * since the Icon is a locale string in the spec, eg. We also only get -+ * translation in the mo file if the requested locale is the LC_MESSAGES one. -+ * Ideally, we should do more and change LC_MESSAGES to use the requested -+ * locale, but there's no guarantee it's installed on the system and it might -+ * have some side-effects. Since this is a corner case, let's ignore it. */ -+ msg_locale = setlocale (LC_MESSAGES, NULL); -+ try_gettext = msg_locale && key_file->gettext_domain && -+ (strcmp (group_name, G_KEY_FILE_DESKTOP_GROUP) == 0 || -+ g_str_has_prefix (group_name, G_KEY_FILE_DESKTOP_ACTION_GROUP_PREFIX)) && -+ (strcmp (key, G_KEY_FILE_DESKTOP_KEY_NAME) == 0 || -+ strcmp (key, G_KEY_FILE_DESKTOP_KEY_FULLNAME) == 0 || -+ strcmp (key, G_KEY_FILE_DESKTOP_KEY_GENERIC_NAME) == 0 || -+ strcmp (key, G_KEY_FILE_DESKTOP_KEY_KEYWORDS) == 0 || -+ strcmp (key, G_KEY_FILE_DESKTOP_KEY_COMMENT) == 0); -+ - for (i = 0; languages[i]; i++) - { - candidate_key = g_strdup_printf ("%s[%s]", key, languages[i]); -@@ -2250,6 +2300,39 @@ g_key_file_get_locale_string (GKeyFile *key_file, - translated_value = NULL; - } - -+ /* Fallback to gettext */ -+ if (try_gettext && !translated_value) -+ { -+ gchar *orig_value = g_key_file_get_string (key_file, group_name, key, NULL); -+ -+ if (orig_value) -+ { -+ gboolean codeset_set; -+ const gchar *translated; -+ gboolean has_gettext; -+ -+ codeset_set = bind_textdomain_codeset (key_file->gettext_domain, "UTF-8") != NULL; -+ translated = NULL; -+ -+ translated = g_dgettext (key_file->gettext_domain, -+ orig_value); -+ has_gettext = translated != orig_value; -+ -+ g_free (orig_value); -+ -+ if (has_gettext) -+ { -+ if (codeset_set) -+ translated_value = g_strdup (translated); -+ else -+ translated_value = g_locale_to_utf8 (translated, -+ -1, NULL, NULL, NULL); -+ } -+ else -+ translated_value = NULL; -+ } -+ } -+ - /* Fallback to untranslated key - */ - if (!translated_value) diff --git a/debian/patches/20210325-file-type.patch b/debian/patches/20210325-file-type.patch deleted file mode 100644 index ee54ddc..0000000 --- a/debian/patches/20210325-file-type.patch +++ /dev/null @@ -1,135 +0,0 @@ -From: Debian GNOME Maintainers - -Date: Wed, 29 Jun 2022 08:02:49 +0000 -Subject: file-type - -=================================================================== ---- - gio/gfile.c | 70 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - po/zh_CN.po | 3 +++ - 2 files changed, 73 insertions(+) - -diff --git a/gio/gfile.c b/gio/gfile.c -index a2ded14..e37bc36 100644 ---- a/gio/gfile.c -+++ b/gio/gfile.c -@@ -39,6 +39,9 @@ - - #include - #include -+#include -+#include -+#include - - #include "gfile.h" - #include "glib/gstdio.h" -@@ -339,6 +342,29 @@ static gboolean g_file_real_measure_disk_usage_finish (GFile - guint64 *num_files, - GError **error); - -+static const char* get_fs_type (char* path) -+{ -+ const char* fs_type = NULL; -+ struct mntent* m = NULL; -+ FILE* f = NULL; -+ -+ f = setmntent ("/etc/mtab", "r"); -+ if (!f) { -+ syslog (LOG_ERR, "error:%s", strerror(errno)); -+ } -+ -+ while ((m = getmntent(f))) { -+ if (!path) continue; -+ if (!m->mnt_dir) continue; -+ if (!strcmp (path, m->mnt_dir)) { -+ fs_type = g_strdup_printf("%s", m->mnt_type); -+ } -+ } -+ endmntent (f); -+ -+ return fs_type; -+} -+ - typedef GFileIface GFileInterface; - G_DEFINE_INTERFACE (GFile, g_file, G_TYPE_OBJECT) - -@@ -3457,10 +3483,32 @@ g_file_copy (GFile *source, - GFileIface *iface; - GError *my_error; - gboolean res; -+ const char* fs_type; -+ GMount* destination_mount; -+ GFile* root; -+ struct stat s; - - g_return_val_if_fail (G_IS_FILE (source), FALSE); - g_return_val_if_fail (G_IS_FILE (destination), FALSE); - -+ destination_mount = g_file_find_enclosing_mount(g_file_get_parent(destination), NULL, NULL); -+ if ( destination_mount != NULL) { -+ root = g_mount_get_default_location (destination_mount); -+ fs_type = get_fs_type (g_file_get_path(root)); -+ if(fs_type != NULL) { -+ if(!strcmp(fs_type,"vfat") || !strcmp(fs_type,"fat32")) { -+ if (stat(g_file_get_path(source), &s) == 0) { -+ if(s.st_size > 4294967296) { -+ g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED, _("The file is too large, the fat format file system only supports files within 4G,can be imported in device after compression")); -+ return FALSE; -+ } -+ } -+ } -+ -+ g_free(fs_type); -+ } -+ } -+ - if (g_cancellable_set_error_if_cancelled (cancellable, error)) - return FALSE; - -@@ -3659,10 +3707,32 @@ g_file_move (GFile *source, - GFileIface *iface; - GError *my_error; - gboolean res; -+ const char* fs_type; -+ GMount* destination_mount; -+ GFile* root; -+ struct stat s; - - g_return_val_if_fail (G_IS_FILE (source), FALSE); - g_return_val_if_fail (G_IS_FILE (destination), FALSE); - -+ destination_mount = g_file_find_enclosing_mount(g_file_get_parent(destination), NULL, NULL); -+ if ( destination_mount != NULL) { -+ root = g_mount_get_default_location (destination_mount); -+ -+ fs_type = get_fs_type (g_file_get_path(root)); -+ if(fs_type != NULL) { -+ if(!strcmp(fs_type,"vfat") || !strcmp(fs_type,"fat32")) { -+ if (stat(g_file_get_path(source), &s) == 0) { -+ if(s.st_size > 4294967296) { -+ g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED, _("The file is too large, the fat format file system only supports files within 4G,can be moved in device after compression")); -+ return FALSE; -+ } -+ } -+ } -+ g_free(fs_type); -+ } -+ } -+ - if (g_cancellable_set_error_if_cancelled (cancellable, error)) - return FALSE; - -diff --git a/po/zh_CN.po b/po/zh_CN.po -index 4e4adb5..1a46756 100644 ---- a/po/zh_CN.po -+++ b/po/zh_CN.po -@@ -43,6 +43,9 @@ msgstr "GApplication 选项" - msgid "Show GApplication options" - msgstr "显示 GApplication 选项" - -+msgid "The file is too large, the fat format file system only supports files within 4G,can be imported in device after compression" -+msgstr "文件太大，fat格式文件系统只支持4G以内的文件，压缩后可以导入设备" -+ - #: ../gio/gapplication.c:538 - msgid "Enter GApplication service mode (use from D-Bus service files)" - msgstr "进入 GApplication 服务模式(从 D-Bus 服务文件中调用)" diff --git a/debian/patches/20210726-fix-trash-issue-in-data-usershare.patch b/debian/patches/20210726-fix-trash-issue-in-data-usershare.patch deleted file mode 100644 index 237ab7e..0000000 --- a/debian/patches/20210726-fix-trash-issue-in-data-usershare.patch +++ /dev/null @@ -1,41 +0,0 @@ -From: Debian GNOME Maintainers - -Date: Wed, 29 Jun 2022 08:02:49 +0000 -Subject: fix-trash-issue-in-data-usershare - -=================================================================== ---- - gio/glocalfile.c | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/gio/glocalfile.c b/gio/glocalfile.c -index 72ef947..bb7c863 100644 ---- a/gio/glocalfile.c -+++ b/gio/glocalfile.c -@@ -1951,6 +1951,7 @@ g_local_file_trash (GFile *file, - GVfsClass *class; - GVfs *vfs; - int errsv; -+ gboolean is_local_file_in_usershare = FALSE; - - if (glib_should_use_portal ()) - return g_trash_portal_trash_file (file, error); -@@ -1988,7 +1989,8 @@ g_local_file_trash (GFile *file, - g_free (path); - } - -- if (file_stat.st_dev == home_stat.st_dev) -+ is_local_file_in_usershare = g_str_has_prefix(local->filename, "/data/usershare"); -+ if (file_stat.st_dev == home_stat.st_dev && !is_local_file_in_usershare) - { - is_homedir_trash = TRUE; - errno = 0; -@@ -2028,7 +2030,7 @@ g_local_file_trash (GFile *file, - } - - mount = g_unix_mount_at (topdir, NULL); -- if (mount == NULL || g_unix_mount_is_system_internal (mount)) -+ if (mount == NULL || g_unix_mount_is_system_internal (mount) && !is_local_file_in_usershare) - { - g_set_error (error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED, - _("Trashing on system internal mounts is not supported")); diff --git a/debian/patches/debian/02_gettext-desktopfiles-ubuntu.patch b/debian/patches/debian/02_gettext-desktopfiles-ubuntu.patch deleted file mode 100644 index 02026f9..0000000 --- a/debian/patches/debian/02_gettext-desktopfiles-ubuntu.patch +++ /dev/null @@ -1,51 +0,0 @@ -From: Martin Pitt -Date: Tue, 24 Feb 2009 16:08:05 +0100 -Subject: Provide backwards compatibility for 01_gettext-desktopfiles.patch - for X-{Debian,Ubuntu}-Gettext-Domain - -Ubuntu-specific. 01_gettext-desktopfiles.patch was changed to use -X-GNOME-, so this is necessary until all our .desktop files are converted. - -Forwarded: no ---- - glib/gkeyfile.c | 20 ++++++++++++++++++++ - 1 file changed, 20 insertions(+) - -diff --git a/glib/gkeyfile.c b/glib/gkeyfile.c -index 661c2ed..749254e 100644 ---- a/glib/gkeyfile.c -+++ b/glib/gkeyfile.c -@@ -897,6 +897,16 @@ g_key_file_load_from_fd (GKeyFile *key_file, - G_KEY_FILE_DESKTOP_GROUP, - G_KEY_FILE_DESKTOP_KEY_GETTEXT_DOMAIN, - NULL); -+ if (!key_file->gettext_domain) -+ key_file->gettext_domain = g_key_file_get_string (key_file, -+ G_KEY_FILE_DESKTOP_GROUP, -+ "X-Ubuntu-Gettext-Domain", -+ NULL); -+ if (!key_file->gettext_domain) -+ key_file->gettext_domain = g_key_file_get_string (key_file, -+ G_KEY_FILE_DESKTOP_GROUP, -+ "X-Debian-Gettext-Domain", -+ NULL); - - return TRUE; - } -@@ -1014,6 +1024,16 @@ g_key_file_load_from_data (GKeyFile *key_file, - G_KEY_FILE_DESKTOP_GROUP, - G_KEY_FILE_DESKTOP_KEY_GETTEXT_DOMAIN, - NULL); -+ if (!key_file->gettext_domain) -+ key_file->gettext_domain = g_key_file_get_string (key_file, -+ G_KEY_FILE_DESKTOP_GROUP, -+ "X-Ubuntu-Gettext-Domain", -+ NULL); -+ if (!key_file->gettext_domain) -+ key_file->gettext_domain = g_key_file_get_string (key_file, -+ G_KEY_FILE_DESKTOP_GROUP, -+ "X-Debian-Gettext-Domain", -+ NULL); - - return TRUE; - } diff --git a/debian/patches/debian/03_disble_glib_compile_schemas_warning.patch b/debian/patches/debian/03_disble_glib_compile_schemas_warning.patch deleted file mode 100644 index 63c3caf..0000000 --- a/debian/patches/debian/03_disble_glib_compile_schemas_warning.patch +++ /dev/null @@ -1,36 +0,0 @@ -From: Iain Lane -Date: Mon, 10 Sep 2012 16:25:18 +0100 -Subject: Disable confusing (to users) warning about deprecated schema paths - -Disable a warning when compiling schemas which are installed -into 'deprecated' locations. Users see this very often due to -glib-compile-schemas being called from libglib2.0-0's trigger and it is -not very useful for them. - -Forwarded: not-needed ---- - gio/glib-compile-schemas.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/gio/glib-compile-schemas.c b/gio/glib-compile-schemas.c -index 7888120..4c4d22e 100644 ---- a/gio/glib-compile-schemas.c -+++ b/gio/glib-compile-schemas.c -@@ -1232,6 +1232,9 @@ parse_state_start_schema (ParseState *state, - return; - } - -+ // Disable this warning: it confuses users and there is unlikely to be much -+ // progress towards fixing -+ /* - if (path && (g_str_has_prefix (path, "/apps/") || - g_str_has_prefix (path, "/desktop/") || - g_str_has_prefix (path, "/system/"))) -@@ -1244,6 +1247,7 @@ parse_state_start_schema (ParseState *state, - g_printerr ("%s\n", message); - g_free (message); - } -+ */ - - state->schema_state = schema_state_new (path, gettext_domain, - extends, extends_name, list_of); diff --git a/debian/patches/debian/06_thread_test_ignore_prctl_fail.patch b/debian/patches/debian/06_thread_test_ignore_prctl_fail.patch deleted file mode 100644 index babcac8..0000000 --- a/debian/patches/debian/06_thread_test_ignore_prctl_fail.patch +++ /dev/null @@ -1,33 +0,0 @@ -From: Martin Pitt -Date: Tue, 26 Jun 2012 19:28:14 +0200 -Subject: Do not fail the /thread/thread4 test if prlimit() fails - -This happens on the Debian buildds. - -[smcv: Use g_test_skip()] - -Forwarded: no, Debian buildd specific ---- - glib/tests/thread.c | 9 ++++++++- - 1 file changed, 8 insertions(+), 1 deletion(-) - -diff --git a/glib/tests/thread.c b/glib/tests/thread.c -index 579ce1f..3f1959d 100644 ---- a/glib/tests/thread.c -+++ b/glib/tests/thread.c -@@ -142,7 +142,14 @@ test_thread4 (void) - nl.rlim_cur = 1; - - if ((ret = prlimit (getpid (), RLIMIT_NPROC, &nl, &ol)) != 0) -- g_error ("prlimit failed: %s", g_strerror (errno)); -+ { -+ gchar *message = g_strdup_printf ("setting PRLIMIT_NPROC to {cur=%d,max=%d} failed: %s", -+ (int) nl.rlim_cur, (int) nl.rlim_max, -+ g_strerror (errno)); -+ g_test_skip (message); -+ g_free (message); -+ return; -+ } - - error = NULL; - thread = g_thread_try_new ("a", thread1_func, NULL, &error); diff --git a/debian/patches/debian/61_glib-compile-binaries-path.patch b/debian/patches/debian/61_glib-compile-binaries-path.patch deleted file mode 100644 index 69778b5..0000000 --- a/debian/patches/debian/61_glib-compile-binaries-path.patch +++ /dev/null @@ -1,25 +0,0 @@ -From: =?utf-8?q?Sebastian_Dr=C3=B6ge?= -Date: Tue, 13 Jul 2010 14:06:28 +0200 -Subject: Adjust path to glib-compile-schemas in the pkg-config file - -This is because gio-querymodules and glib-compile-schemas have been put in -a private, versioned directory in libglib2.0-0 to avoid a dependency loop. - -Forwarded: not-needed, specific to Debian packaging ---- - gio/meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gio/meson.build b/gio/meson.build -index 2ef60ed..32b47df 100644 ---- a/gio/meson.build -+++ b/gio/meson.build -@@ -822,7 +822,7 @@ pkg.generate(libgio, - 'giomoduledir=' + pkgconfig_giomodulesdir, - 'gio=' + join_paths('${bindir}', 'gio'), - 'gio_querymodules=' + join_paths('${bindir}', 'gio-querymodules'), -- 'glib_compile_schemas=' + join_paths('${bindir}', 'glib-compile-schemas'), -+ 'glib_compile_schemas=' + join_paths('${libdir}', 'glib-2.0', 'glib-compile-schemas'), - 'glib_compile_resources=' + join_paths('${bindir}', 'glib-compile-resources'), - 'gdbus=' + join_paths('${bindir}', 'gdbus'), - 'gdbus_codegen=' + join_paths('${bindir}', 'gdbus-codegen'), diff --git a/debian/patches/debian/Disable-some-tests-on-slow-architectures-which-keep-faili.patch b/debian/patches/debian/Disable-some-tests-on-slow-architectures-which-keep-faili.patch deleted file mode 100644 index 670b070..0000000 --- a/debian/patches/debian/Disable-some-tests-on-slow-architectures-which-keep-faili.patch +++ /dev/null @@ -1,70 +0,0 @@ -From: Martin Pitt -Date: Thu, 27 Sep 2012 11:22:56 +0200 -Subject: Disable some tests on slow architectures which keep failing the - tests - -[smcv: Modified to use g_test_skip() instead of omitting those test cases -completely, and allow them to be re-enabled with a Debian-specific -environment variable] - -Co-authored-by: Simon McVittie -Forwarded: no ---- - glib/tests/mainloop.c | 16 ++++++++++++++++ - glib/tests/timeout.c | 9 +++++++++ - 2 files changed, 25 insertions(+) - -diff --git a/glib/tests/mainloop.c b/glib/tests/mainloop.c -index 1368e9b..2c11d34 100644 ---- a/glib/tests/mainloop.c -+++ b/glib/tests/mainloop.c -@@ -461,6 +461,14 @@ test_child_sources (void) - GMainLoop *loop; - GSource *parent, *child_b, *child_c, *end; - -+#if defined(__arm__) -+ if (g_getenv ("DEB_ALLOW_FLAKY_TESTS") == NULL) -+ { -+ g_test_skip ("Not reliable on older ARM hardware"); -+ return; -+ } -+#endif -+ - ctx = g_main_context_new (); - loop = g_main_loop_new (ctx, FALSE); - -@@ -539,6 +547,14 @@ test_recursive_child_sources (void) - GMainLoop *loop; - GSource *parent, *child_b, *child_c, *end; - -+#if defined(__arm__) -+ if (g_getenv ("DEB_ALLOW_FLAKY_TESTS") == NULL) -+ { -+ g_test_skip ("Not reliable on older ARM hardware"); -+ return; -+ } -+#endif -+ - ctx = g_main_context_new (); - loop = g_main_loop_new (ctx, FALSE); - -diff --git a/glib/tests/timeout.c b/glib/tests/timeout.c -index 47f00ba..d6fad36 100644 ---- a/glib/tests/timeout.c -+++ b/glib/tests/timeout.c -@@ -175,6 +175,15 @@ test_func (gpointer data) - static void - test_rounding (void) - { -+ -+#if defined(__arm__) -+ if (g_getenv ("DEB_ALLOW_FLAKY_TESTS") == NULL) -+ { -+ g_test_skip ("Not reliable on older ARM hardware"); -+ return; -+ } -+#endif -+ - loop = g_main_loop_new (NULL, FALSE); - - last_time = g_get_monotonic_time (); diff --git a/debian/patches/debian/Skip-test-which-performs-some-unreliable-floating-point-c.patch b/debian/patches/debian/Skip-test-which-performs-some-unreliable-floating-point-c.patch deleted file mode 100644 index 71d7bf1..0000000 --- a/debian/patches/debian/Skip-test-which-performs-some-unreliable-floating-point-c.patch +++ /dev/null @@ -1,32 +0,0 @@ -From: Iain Lane -Date: Tue, 18 Mar 2014 15:43:35 +0000 -Subject: Skip test which performs some unreliable floating point comparisons - -[smcv: Modified to use g_test_skip() instead of omitting those test cases -completely, and allow them to be re-enabled with a Debian-specific -environment variable] - -Co-authored-by: Simon McVittie -Bug: https://gitlab.gnome.org/GNOME/glib/issues/820 -Forwarded: no ---- - glib/tests/timer.c | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/glib/tests/timer.c b/glib/tests/timer.c -index b7a90c2..98e82da 100644 ---- a/glib/tests/timer.c -+++ b/glib/tests/timer.c -@@ -33,6 +33,12 @@ test_timer_basic (void) - volatile gdouble elapsed; - gulong micros; - -+ if (g_getenv ("DEB_ALLOW_FLAKY_TESTS") == NULL) -+ { -+ g_test_skip ("Not reliable due to floating-point rounding (glib#820)"); -+ return; -+ } -+ - timer = g_timer_new (); - - elapsed = g_timer_elapsed (timer, µs); diff --git a/debian/patches/debian/Skip-unreliable-gdbus-threading-tests--by-default.patch b/debian/patches/debian/Skip-unreliable-gdbus-threading-tests--by-default.patch deleted file mode 100644 index 6b202e1..0000000 --- a/debian/patches/debian/Skip-unreliable-gdbus-threading-tests--by-default.patch +++ /dev/null @@ -1,48 +0,0 @@ -From: Simon McVittie -Date: Fri, 4 Jan 2019 08:37:20 +0000 -Subject: Skip unreliable gdbus-threading tests by default - -test_threaded_singleton() test to reproduce a race condition between -last-unref of the global singleton GDBusConnection and g_bus_get_sync(). - -test_method_calls_in_thread() checks that multiple threads can all make -method calls to the same proxy. - -However, test setup intermittently times out with: - - # GLib-GIO-DEBUG: run 0: refcount is 2, sleeping - Bail out! GLib-GIO-FATAL-ERROR: connection had too many refs - -The current theory upstream is that this might be a reference leak in -test_delivery_in_thread(). - -Furthermore, test teardown is now often failing when destroying the test -bus. - -Demote these tests to be run as part of the "flaky" autopkgtests, but -not at build time or in the part of the autopkgtest run that gates -progress into testing. - -Bug: https://gitlab.gnome.org/GNOME/glib/issues/1515 -Forwarded: no ---- - gio/tests/gdbus-threading.c | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/gio/tests/gdbus-threading.c b/gio/tests/gdbus-threading.c -index 2b89fb0..2cc5757 100644 ---- a/gio/tests/gdbus-threading.c -+++ b/gio/tests/gdbus-threading.c -@@ -649,6 +649,12 @@ main (int argc, - - g_test_init (&argc, &argv, NULL); - -+ if (g_getenv ("DEB_ALLOW_FLAKY_TESTS") == NULL) -+ { -+ g_print("ok 1 # SKIP all gdbus-threading tests skipped because they are too unreliable (glib#1515)\n"); -+ return 77; -+ } -+ - session_bus_up (); - - /* this is safe; testserver will exit once the bus goes away */ diff --git a/debian/patches/debian/closures-test-Skip-on-arm-unless-flaky-tests-are-allowed.patch b/debian/patches/debian/closures-test-Skip-on-arm-unless-flaky-tests-are-allowed.patch deleted file mode 100644 index 54b67f8..0000000 --- a/debian/patches/debian/closures-test-Skip-on-arm-unless-flaky-tests-are-allowed.patch +++ /dev/null @@ -1,37 +0,0 @@ -From: Simon McVittie -Date: Thu, 3 Jan 2019 09:01:03 +0000 -Subject: closures test: Skip on arm* unless flaky tests are allowed - -Choosing the right number of iterations to avoid either taking literally -hours on some hardware, or getting spurious failures when one thread -starves another, seems to be too hard to get right in practice. -Make this test opt-in so that its failures aren't release-critical. -We can run it as a separate autopkgtest that is marked flaky. - -Signed-off-by: Simon McVittie -Bug-Debian: https://bugs.debian.org/880883 -Bug-Debian: https://bugs.debian.org/917983 -Forwarded: not-needed ---- - gobject/tests/closure-refcount.c | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/gobject/tests/closure-refcount.c b/gobject/tests/closure-refcount.c -index 5a92005..73185f0 100644 ---- a/gobject/tests/closure-refcount.c -+++ b/gobject/tests/closure-refcount.c -@@ -260,6 +260,14 @@ test_closure_refcount (void) - GTest *object; - guint i, n_iterations; - -+#if defined(__aarch64__) || defined(__arm__) -+ if (g_getenv ("DEB_ALLOW_FLAKY_TESTS") != NULL) -+ { -+ g_print ("SKIP: Test is known to be flaky on arm* (#880883, #917983)\n"); -+ return 0; -+ } -+#endif -+ - object = g_object_new (G_TYPE_TEST, NULL); - closure = g_cclosure_new (G_CALLBACK (test_signal_handler), &test_data, destroy_data); - diff --git a/debian/patches/debian/gmenumodel-test-Mark-as-flaky.patch b/debian/patches/debian/gmenumodel-test-Mark-as-flaky.patch deleted file mode 100644 index 1023f42..0000000 --- a/debian/patches/debian/gmenumodel-test-Mark-as-flaky.patch +++ /dev/null @@ -1,30 +0,0 @@ -From: Simon McVittie -Date: Fri, 26 Jul 2019 23:49:03 +0100 -Subject: gmenumodel test: Mark as flaky - -This test has not had a great history of reliability. - -Signed-off-by: Simon McVittie -Bug-Debian: https://bugs.debian.org/932678 -Forwarded: no ---- - gio/tests/gmenumodel.c | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/gio/tests/gmenumodel.c b/gio/tests/gmenumodel.c -index fc0fcea..5c54551 100644 ---- a/gio/tests/gmenumodel.c -+++ b/gio/tests/gmenumodel.c -@@ -1147,6 +1147,12 @@ test_dbus_peer_subscriptions (void) - { - PeerConnection peer; - -+ if (g_getenv ("DEB_ALLOW_FLAKY_TESTS") == NULL) -+ { -+ g_test_skip ("Not reliable? #932678"); -+ return; -+ } -+ - peer_connection_up (&peer); - do_subscriptions (peer.server_connection, peer.client_connection); - peer_connection_down (&peer); diff --git a/debian/patches/debian/gvariant-test-Don-t-run-at-build-time-on-mips.patch b/debian/patches/debian/gvariant-test-Don-t-run-at-build-time-on-mips.patch deleted file mode 100644 index de07306..0000000 --- a/debian/patches/debian/gvariant-test-Don-t-run-at-build-time-on-mips.patch +++ /dev/null @@ -1,36 +0,0 @@ -From: Simon McVittie -Date: Fri, 26 Jul 2019 23:51:39 +0100 -Subject: gvariant test: Don't run at build-time on mips - -DEB_ALLOW_FLAKY_TESTS is not quite right here, because we don't know -that the test would fail if left for long enough - the problem is that -it doesn't get there, because generating random floating-point numbers -is very slow on some of our mips hardware. However, it has the right -practical effect. - -Signed-off-by: Simon McVittie -Bug: https://bugs.debian.org/932678 -Forwarded: no ---- - glib/tests/gvariant.c | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/glib/tests/gvariant.c b/glib/tests/gvariant.c -index 3905e20..d418c75 100644 ---- a/glib/tests/gvariant.c -+++ b/glib/tests/gvariant.c -@@ -2405,6 +2405,14 @@ test_fuzzes (gpointer data) - gdouble fuzziness; - int i; - -+#ifdef __mips__ -+ if (g_getenv ("DEB_ALLOW_FLAKY_TESTS") == NULL) -+ { -+ g_test_skip ("Extremely slow on some mips CPUs: #932678"); -+ return; -+ } -+#endif -+ - fuzziness = GPOINTER_TO_INT (data) / 100.; - - for (i = 0; i < 200; i++) diff --git a/debian/patches/debian/taptestrunner-Stop-looking-like-an-executable-script.patch b/debian/patches/debian/taptestrunner-Stop-looking-like-an-executable-script.patch deleted file mode 100644 index 8b17a69..0000000 --- a/debian/patches/debian/taptestrunner-Stop-looking-like-an-executable-script.patch +++ /dev/null @@ -1,24 +0,0 @@ -From: Simon McVittie -Date: Wed, 30 Oct 2019 08:44:52 +0000 -Subject: taptestrunner: Stop looking like an executable script - -This file is installed as non-executable but starts with the #! that -indicates an executable script, causing warnings from Debian's Lintian -tool. In fact it is imported as a Python module rather than being run -as an executable, so there is no need for the #! line. - -Signed-off-by: Simon McVittie -Forwarded: no ---- - gobject/tests/taptestrunner.py | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/gobject/tests/taptestrunner.py b/gobject/tests/taptestrunner.py -index 2614961..7baceb5 100644 ---- a/gobject/tests/taptestrunner.py -+++ b/gobject/tests/taptestrunner.py -@@ -1,4 +1,3 @@ --#!/usr/bin/env python - # coding=utf-8 - - # Copyright (c) 2015 Remko Tronçon (https://el-tramo.be) diff --git a/debian/patches/debian/testfilemonitor-Skip-if-we-are-avoiding-flaky-tests.patch b/debian/patches/debian/testfilemonitor-Skip-if-we-are-avoiding-flaky-tests.patch deleted file mode 100644 index 8afa8cb..0000000 --- a/debian/patches/debian/testfilemonitor-Skip-if-we-are-avoiding-flaky-tests.patch +++ /dev/null @@ -1,106 +0,0 @@ -From: Simon McVittie -Date: Tue, 25 Feb 2020 10:45:07 +0000 -Subject: testfilemonitor: Skip if we are avoiding flaky tests - -See https://gitlab.gnome.org/GNOME/glib/issues/1634 - -Signed-off-by: Simon McVittie -Forwarded: no ---- - gio/tests/testfilemonitor.c | 34 +++++++++++++++++++++++++++++++++- - 1 file changed, 33 insertions(+), 1 deletion(-) - -diff --git a/gio/tests/testfilemonitor.c b/gio/tests/testfilemonitor.c -index b74dc2b..79b5776 100644 ---- a/gio/tests/testfilemonitor.c -+++ b/gio/tests/testfilemonitor.c -@@ -21,6 +21,12 @@ setup (Fixture *fixture, - gchar *path = NULL; - GError *local_error = NULL; - -+ if (g_getenv ("DEB_ALLOW_FLAKY_TESTS") == NULL) -+ { -+ g_test_skip ("https://gitlab.gnome.org/GNOME/glib/issues/1634"); -+ return; -+ } -+ - path = g_dir_make_tmp ("gio-test-testfilemonitor_XXXXXX", &local_error); - g_assert_no_error (local_error); - -@@ -37,7 +43,9 @@ teardown (Fixture *fixture, - { - GError *local_error = NULL; - -- g_file_delete (fixture->tmp_dir, NULL, &local_error); -+ if (fixture->tmp_dir != NULL) -+ g_file_delete (fixture->tmp_dir, NULL, &local_error); -+ - g_assert_no_error (local_error); - g_clear_object (&fixture->tmp_dir); - } -@@ -360,6 +368,10 @@ test_atomic_replace (Fixture *fixture, - GError *error = NULL; - TestData data; - -+ /* respect g_test_skip() during setup() */ -+ if (g_test_failed ()) -+ return; -+ - data.step = 0; - data.events = NULL; - -@@ -465,6 +477,10 @@ test_file_changes (Fixture *fixture, - GError *error = NULL; - TestData data; - -+ /* respect g_test_skip() during setup() */ -+ if (g_test_failed ()) -+ return; -+ - data.step = 0; - data.events = NULL; - -@@ -582,6 +598,10 @@ test_dir_monitor (Fixture *fixture, - GError *error = NULL; - TestData data; - -+ /* respect g_test_skip() during setup() */ -+ if (g_test_failed ()) -+ return; -+ - data.step = 0; - data.events = NULL; - -@@ -679,6 +699,10 @@ test_dir_non_existent (Fixture *fixture, - TestData data; - GError *error = NULL; - -+ /* respect g_test_skip() during setup() */ -+ if (g_test_failed ()) -+ return; -+ - data.step = 0; - data.events = NULL; - -@@ -788,6 +812,10 @@ test_cross_dir_moves (Fixture *fixture, - GError *error = NULL; - TestData data[2]; - -+ /* respect g_test_skip() during setup() */ -+ if (g_test_failed ()) -+ return; -+ - data[0].step = 0; - data[0].events = NULL; - -@@ -957,6 +985,10 @@ test_file_hard_links (Fixture *fixture, - GError *error = NULL; - TestData data; - -+ /* respect g_test_skip() during setup() */ -+ if (g_test_failed ()) -+ return; -+ - g_test_bug ("755721"); - - #ifdef HAVE_LINK diff --git a/debian/patches/fix-localization-issue.patch b/debian/patches/fix-localization-issue.patch deleted file mode 100644 index 251eaf4..0000000 --- a/debian/patches/fix-localization-issue.patch +++ /dev/null @@ -1,23 +0,0 @@ -From: Debian GNOME Maintainers - -Date: Wed, 29 Jun 2022 08:02:49 +0000 -Subject: fix-localization-issue - -=================================================================== ---- - po/zh_CN.po | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/po/zh_CN.po b/po/zh_CN.po -index 015feb1..b5a09aa 100644 ---- a/po/zh_CN.po -+++ b/po/zh_CN.po -@@ -3344,7 +3344,7 @@ msgstr "源流已经关闭" - - #: ../gio/gresolver.c:386 ../gio/gthreadedresolver.c:150 - #: ../gio/gthreadedresolver.c:168 --#, fuzzy, c-format -+#, c-format - msgid "Error resolving “%s”: %s" - msgstr "解析“%s”时出错：%s" - diff --git a/debian/patches/fix-trash-issue-in-data.patch b/debian/patches/fix-trash-issue-in-data.patch deleted file mode 100644 index b7bf51f..0000000 --- a/debian/patches/fix-trash-issue-in-data.patch +++ /dev/null @@ -1,23 +0,0 @@ -From: Debian GNOME Maintainers - -Date: Wed, 29 Jun 2022 08:02:49 +0000 -Subject: fix-trash-issue-in-data - -=================================================================== ---- - gio/glocalfile.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gio/glocalfile.c b/gio/glocalfile.c -index bb7c863..3992574 100644 ---- a/gio/glocalfile.c -+++ b/gio/glocalfile.c -@@ -1989,7 +1989,7 @@ g_local_file_trash (GFile *file, - g_free (path); - } - -- is_local_file_in_usershare = g_str_has_prefix(local->filename, "/data/usershare"); -+ is_local_file_in_usershare = g_str_has_prefix(local->filename, "/data") && g_file_test ("/data/usershare", G_FILE_TEST_EXISTS); - if (file_stat.st_dev == home_stat.st_dev && !is_local_file_in_usershare) - { - is_homedir_trash = TRUE; diff --git a/debian/patches/git_gsource_segfault.patch b/debian/patches/git_gsource_segfault.patch deleted file mode 100644 index 443341b..0000000 --- a/debian/patches/git_gsource_segfault.patch +++ /dev/null @@ -1,203 +0,0 @@ -From: Philip Withnall -Date: Fri, 28 Feb 2020 15:15:02 +0000 -Subject: [PATCH 1/2] tests: Use g_assert_*() in cancellable test rather than - g_assert() - -`g_assert()` is compiled out if `G_DISABLE_ASSERT` is defined, and -`g_assert_*()` gives more detailed failure messages. - -Signed-off-by: Philip Withnall ---- - gio/gcancellable.c | 43 ++++++++++++++++++++++++++ - gio/tests/cancellable.c | 81 +++++++++++++++++++++++++++++++++++++++++++++++-- - 2 files changed, 122 insertions(+), 2 deletions(-) - -diff --git a/gio/gcancellable.c b/gio/gcancellable.c -index d9e58b8..e687cca 100644 ---- a/gio/gcancellable.c -+++ b/gio/gcancellable.c -@@ -643,6 +643,8 @@ typedef struct { - - GCancellable *cancellable; - gulong cancelled_handler; -+ /* Protected by cancellable_mutex: */ -+ gboolean resurrected_during_cancellation; - } GCancellableSource; - - /* -@@ -661,8 +663,24 @@ cancellable_source_cancelled (GCancellable *cancellable, - gpointer user_data) - { - GSource *source = user_data; -+ GCancellableSource *cancellable_source = (GCancellableSource *) source; -+ -+ g_mutex_lock (&cancellable_mutex); -+ -+ /* Drop the reference added in cancellable_source_dispose(); see the comment there. -+ * The reference must be dropped after unlocking @cancellable_mutex since -+ * it could be the final reference, and the dispose function takes -+ * @cancellable_mutex. */ -+ if (cancellable_source->resurrected_during_cancellation) -+ { -+ cancellable_source->resurrected_during_cancellation = FALSE; -+ g_mutex_unlock (&cancellable_mutex); -+ g_source_unref (source); -+ return; -+ } - - g_source_ref (source); -+ g_mutex_unlock (&cancellable_mutex); - g_source_set_ready_time (source, 0); - g_source_unref (source); - } -@@ -684,12 +702,37 @@ cancellable_source_dispose (GSource *source) - { - GCancellableSource *cancellable_source = (GCancellableSource *)source; - -+ g_mutex_lock (&cancellable_mutex); -+ - if (cancellable_source->cancellable) - { -+ if (cancellable_source->cancellable->priv->cancelled_running) -+ { -+ /* There can be a race here: if thread A has called -+ * g_cancellable_cancel() and has got as far as committing to call -+ * cancellable_source_cancelled(), then thread B drops the final -+ * ref on the GCancellableSource before g_source_ref() is called in -+ * cancellable_source_cancelled(), then cancellable_source_dispose() -+ * will run through and the GCancellableSource will be finalised -+ * before cancellable_source_cancelled() gets to g_source_ref(). It -+ * will then be left in a state where it’s committed to using a -+ * dangling GCancellableSource pointer. -+ * -+ * Eliminate that race by resurrecting the #GSource temporarily, and -+ * then dropping that reference in cancellable_source_cancelled(), -+ * which should be guaranteed to fire because we’re inside a -+ * @cancelled_running block. -+ */ -+ g_source_ref (source); -+ cancellable_source->resurrected_during_cancellation = TRUE; -+ } -+ - g_clear_signal_handler (&cancellable_source->cancelled_handler, - cancellable_source->cancellable); - g_clear_object (&cancellable_source->cancellable); - } -+ -+ g_mutex_unlock (&cancellable_mutex); - } - - static gboolean -diff --git a/gio/tests/cancellable.c b/gio/tests/cancellable.c -index cd349a8..002bdcc 100644 ---- a/gio/tests/cancellable.c -+++ b/gio/tests/cancellable.c -@@ -138,7 +138,7 @@ mock_operation_finish (GAsyncResult *result, - MockOperationData *data; - GTask *task; - -- g_assert (g_task_is_valid (result, NULL)); -+ g_assert_true (g_task_is_valid (result, NULL)); - - /* This test expects the return value to be iterations_done even - * when an error is set. -@@ -212,7 +212,7 @@ test_cancel_multiple_concurrent (void) - if (g_test_verbose ()) - g_printerr ("CANCEL: %d operations\n", num_async_operations); - g_cancellable_cancel (cancellable); -- g_assert (g_cancellable_is_cancelled (cancellable)); -+ g_assert_true (g_cancellable_is_cancelled (cancellable)); - - /* Wait for all operations to be cancelled */ - g_main_loop_run (loop); -@@ -228,6 +228,82 @@ test_cancel_null (void) - g_cancellable_cancel (NULL); - } - -+typedef struct -+{ -+ GCond cond; -+ GMutex mutex; -+ GSource *cancellable_source; /* (owned) */ -+} ThreadedDisposeData; -+ -+static gboolean -+cancelled_cb (GCancellable *cancellable, -+ gpointer user_data) -+{ -+ /* Nothing needs to be done here. */ -+ return G_SOURCE_CONTINUE; -+} -+ -+static gpointer -+threaded_dispose_thread_cb (gpointer user_data) -+{ -+ ThreadedDisposeData *data = user_data; -+ -+ /* Synchronise with the main thread before trying to reproduce the race. */ -+ g_mutex_lock (&data->mutex); -+ g_cond_broadcast (&data->cond); -+ g_mutex_unlock (&data->mutex); -+ -+ /* Race with cancellation of the cancellable. */ -+ g_source_unref (data->cancellable_source); -+ -+ return NULL; -+} -+ -+static void -+test_cancellable_source_threaded_dispose (void) -+{ -+ guint i; -+ -+ g_test_summary ("Test a thread race between disposing of a GCancellableSource " -+ "(in one thread) and cancelling the GCancellable it refers " -+ "to (in another thread)"); -+ g_test_bug ("https://gitlab.gnome.org/GNOME/glib/issues/1841"); -+ -+ for (i = 0; i < 100000; i++) -+ { -+ GCancellable *cancellable = NULL; -+ GSource *cancellable_source = NULL; -+ ThreadedDisposeData data; -+ GThread *thread = NULL; -+ -+ /* Create a cancellable and a cancellable source for it. For this test, -+ * there’s no need to attach the source to a #GMainContext. */ -+ cancellable = g_cancellable_new (); -+ cancellable_source = g_cancellable_source_new (cancellable); -+ g_source_set_callback (cancellable_source, G_SOURCE_FUNC (cancelled_cb), NULL, NULL); -+ -+ /* Create a new thread and wait until it’s ready to execute before -+ * cancelling our cancellable. */ -+ g_cond_init (&data.cond); -+ g_mutex_init (&data.mutex); -+ data.cancellable_source = g_steal_pointer (&cancellable_source); -+ -+ g_mutex_lock (&data.mutex); -+ thread = g_thread_new ("/cancellable-source/threaded-dispose", -+ threaded_dispose_thread_cb, &data); -+ g_cond_wait (&data.cond, &data.mutex); -+ g_mutex_unlock (&data.mutex); -+ -+ /* Race with disposal of the cancellable source. */ -+ g_cancellable_cancel (cancellable); -+ -+ g_thread_join (g_steal_pointer (&thread)); -+ g_mutex_clear (&data.mutex); -+ g_cond_clear (&data.cond); -+ g_object_unref (cancellable); -+ } -+} -+ - int - main (int argc, char *argv[]) - { -@@ -235,6 +311,7 @@ main (int argc, char *argv[]) - - g_test_add_func ("/cancellable/multiple-concurrent", test_cancel_multiple_concurrent); - g_test_add_func ("/cancellable/null", test_cancel_null); -+ g_test_add_func ("/cancellable-source/threaded-dispose", test_cancellable_source_threaded_dispose); - - return g_test_run (); - } diff --git a/debian/patches/gwakeuptest-Be-less-parallel-unless-invoked-with-m-slow.patch b/debian/patches/gwakeuptest-Be-less-parallel-unless-invoked-with-m-slow.patch deleted file mode 100644 index 114567e..0000000 --- a/debian/patches/gwakeuptest-Be-less-parallel-unless-invoked-with-m-slow.patch +++ /dev/null @@ -1,80 +0,0 @@ -From: Simon McVittie -Date: Mon, 18 Dec 2017 18:06:05 +0000 -Subject: gwakeuptest: Be less parallel unless invoked with -m slow - -This is a workaround for test failures on the reproducible-builds -infrastructure, where a multi-threaded stress-test sometimes takes longer -to finish on x86_64 than it would have done on slow architectures like -arm and mips on the official Debian autobuilders. It is not clear why. - -This change will make this test more likely to pass, but less likely to -detect bugs. - -Signed-off-by: Simon McVittie -Bug-Debian: https://bugs.debian.org/884659 -Forwarded: no ---- - glib/tests/gwakeuptest.c | 17 +++++++++++++---- - 1 file changed, 13 insertions(+), 4 deletions(-) - -diff --git a/glib/tests/gwakeuptest.c b/glib/tests/gwakeuptest.c -index 461a7d3..2c3eccd 100644 ---- a/glib/tests/gwakeuptest.c -+++ b/glib/tests/gwakeuptest.c -@@ -89,6 +89,9 @@ struct context - #define NUM_TOKENS 5 - #define TOKEN_TTL 100000 - -+static gint num_threads = NUM_THREADS; -+static gint token_ttl = TOKEN_TTL; -+ - static struct context contexts[NUM_THREADS]; - static GThread *threads[NUM_THREADS]; - static GWakeup *last_token_wakeup; -@@ -158,7 +161,7 @@ dispatch_token (struct token *token) - struct context *ctx; - gint next_ctx; - -- next_ctx = g_test_rand_int_range (0, NUM_THREADS); -+ next_ctx = g_test_rand_int_range (0, num_threads); - ctx = &contexts[next_ctx]; - token->owner = ctx; - token->ttl--; -@@ -213,6 +216,12 @@ test_threaded (void) - { - gint i; - -+ if (!g_test_slow ()) -+ { -+ num_threads = NUM_THREADS / 10; -+ token_ttl = TOKEN_TTL / 10; -+ } -+ - /* make sure we don't block forever */ - alarm (60); - -@@ -230,7 +239,7 @@ test_threaded (void) - last_token_wakeup = g_wakeup_new (); - - /* create contexts, assign to threads */ -- for (i = 0; i < NUM_THREADS; i++) -+ for (i = 0; i < num_threads; i++) - { - context_init (&contexts[i]); - threads[i] = g_thread_new ("test", thread_func, &contexts[i]); -@@ -238,13 +247,13 @@ test_threaded (void) - - /* dispatch tokens */ - for (i = 0; i < NUM_TOKENS; i++) -- dispatch_token (token_new (TOKEN_TTL)); -+ dispatch_token (token_new (token_ttl)); - - /* wait until all tokens are gone */ - wait_for_signaled (last_token_wakeup); - - /* ask threads to quit, join them, cleanup */ -- for (i = 0; i < NUM_THREADS; i++) -+ for (i = 0; i < num_threads; i++) - { - context_quit (&contexts[i]); - g_thread_join (threads[i]); diff --git a/debian/patches/user-directory-i18n.patch b/debian/patches/user-directory-i18n.patch deleted file mode 100644 index 7b8ee44..0000000 --- a/debian/patches/user-directory-i18n.patch +++ /dev/null @@ -1,7505 +0,0 @@ -From: Debian GNOME Maintainers - -Date: Wed, 29 Jun 2022 08:02:49 +0000 -Subject: user-directory-i18n - -=================================================================== ---- - gio/glocalfileinfo.c | 33 +- - po/zh_CN.po | 4280 +++++++++++++++++++++++++++++--------------------- - 2 files changed, 2557 insertions(+), 1756 deletions(-) - -diff --git a/gio/glocalfileinfo.c b/gio/glocalfileinfo.c -index 5245567..4812c9a 100644 ---- a/gio/glocalfileinfo.c -+++ b/gio/glocalfileinfo.c -@@ -118,6 +118,9 @@ static GHashTable *gid_cache = NULL; - - #endif /* !G_OS_WIN32 */ - -+char* update_xdg_directory_display_name (const char *path, -+ char *display_name); -+ - char * - _g_local_file_info_create_etag (GLocalFileStat *statbuf) - { -@@ -1629,6 +1632,7 @@ _g_local_file_info_get_nostat (GFileInfo *info, - G_FILE_ATTRIBUTE_ID_STANDARD_DISPLAY_NAME)) - { - char *display_name = g_filename_display_basename (path); -+ char *xdg_display_name = NULL; - - /* look for U+FFFD REPLACEMENT CHARACTER */ - if (strstr (display_name, "\357\277\275") != NULL) -@@ -1637,7 +1641,9 @@ _g_local_file_info_get_nostat (GFileInfo *info, - display_name = g_strconcat (display_name, _(" (invalid encoding)"), NULL); - g_free (p); - } -- g_file_info_set_display_name (info, display_name); -+ xdg_display_name = update_xdg_directory_display_name (path, display_name); -+ g_file_info_set_display_name (info, xdg_display_name); -+ g_free (xdg_display_name); - g_free (display_name); - } - -@@ -1717,6 +1723,31 @@ get_icon_name (const char *path, - return name; - } - -+char *update_xdg_directory_display_name (const char *path, -+ char *display_name) -+{ -+ char *retval = g_strdup (display_name); -+ if (g_strcmp0 (path, g_get_user_special_dir (G_USER_DIRECTORY_DESKTOP)) == 0) -+ { -+ retval = g_strdup (_("Desktop")); -+ } else if (g_strcmp0 (path, g_get_user_special_dir (G_USER_DIRECTORY_DOCUMENTS)) == 0) { -+ retval = g_strdup (_("Documents")); -+ } else if (g_strcmp0 (path, g_get_user_special_dir (G_USER_DIRECTORY_DOWNLOAD)) == 0) { -+ retval = g_strdup (_("Download")); -+ } else if (g_strcmp0 (path, g_get_user_special_dir (G_USER_DIRECTORY_MUSIC)) == 0) { -+ retval = g_strdup (_("Music")); -+ } else if (g_strcmp0 (path, g_get_user_special_dir (G_USER_DIRECTORY_PICTURES)) == 0) { -+ retval = g_strdup (_("Pictures")); -+ } else if (g_strcmp0 (path, g_get_user_special_dir (G_USER_DIRECTORY_PUBLIC_SHARE)) == 0) { -+ retval = g_strdup (_("Public Share")); -+ } else if (g_strcmp0 (path, g_get_user_special_dir (G_USER_DIRECTORY_TEMPLATES)) == 0) { -+ retval = g_strdup (_("Templates")); -+ } else if (g_strcmp0 (path, g_get_user_special_dir (G_USER_DIRECTORY_VIDEOS)) == 0) { -+ retval = g_strdup (_("Videos")); -+ } -+ return retval; -+} -+ - static GIcon * - get_icon (const char *path, - const char *content_type, -diff --git a/po/zh_CN.po b/po/zh_CN.po -index 1a46756..015feb1 100644 ---- a/po/zh_CN.po -+++ b/po/zh_CN.po -@@ -22,10 +22,9 @@ - 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-12-07 20:45+0000\n" --"PO-Revision-Date: 2017-02-09 14:57+0800\n" -+"Report-Msgid-Bugs-To: \n" -+"POT-Creation-Date: 2021-11-10 17:44+0800\n" -+"PO-Revision-Date: 2021-11-10 17:49+0800\n" - "Last-Translator: Mandy Wang \n" - "Language-Team: Chinese (simplified) \n" - "Language: zh_CN\n" -@@ -33,43 +32,45 @@ msgstr "" - "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.11\n" -+"X-Generator: Poedit 2.3\n" - --#: ../gio/gapplication.c:493 -+#: ../gio/gapplication.c:500 - msgid "GApplication options" - msgstr "GApplication 选项" - --#: ../gio/gapplication.c:493 -+#: ../gio/gapplication.c:500 - msgid "Show GApplication options" - msgstr "显示 GApplication 选项" - --msgid "The file is too large, the fat format file system only supports files within 4G,can be imported in device after compression" --msgstr "文件太大，fat格式文件系统只支持4G以内的文件，压缩后可以导入设备" -- --#: ../gio/gapplication.c:538 -+#: ../gio/gapplication.c:545 - msgid "Enter GApplication service mode (use from D-Bus service files)" - msgstr "进入 GApplication 服务模式(从 D-Bus 服务文件中调用)" - --#: ../gio/gapplication.c:550 --msgid "Override the application's ID" -+#: ../gio/gapplication.c:557 -+#, fuzzy -+msgid "Override the application’s ID" - msgstr "覆盖应用程序 ID" - -+#: ../gio/gapplication.c:569 -+msgid "Replace the running instance" -+msgstr "" -+ - #: ../gio/gapplication-tool.c:45 ../gio/gapplication-tool.c:46 --#: ../gio/gio-tool.c:209 ../gio/gresource-tool.c:488 --#: ../gio/gsettings-tool.c:520 -+#: ../gio/gio-tool.c:227 ../gio/gresource-tool.c:493 -+#: ../gio/gsettings-tool.c:567 - msgid "Print help" - msgstr "打印帮助" - --#: ../gio/gapplication-tool.c:47 ../gio/gresource-tool.c:489 --#: ../gio/gresource-tool.c:557 -+#: ../gio/gapplication-tool.c:47 ../gio/gresource-tool.c:494 -+#: ../gio/gresource-tool.c:562 - msgid "[COMMAND]" - msgstr "[COMMAND]" - --#: ../gio/gapplication-tool.c:49 ../gio/gio-tool.c:210 -+#: ../gio/gapplication-tool.c:49 ../gio/gio-tool.c:228 - msgid "Print version" - msgstr "打印版本" - --#: ../gio/gapplication-tool.c:50 ../gio/gsettings-tool.c:526 -+#: ../gio/gapplication-tool.c:50 ../gio/gsettings-tool.c:573 - msgid "Print version information and exit" - msgstr "打印版本信息并退出" - -@@ -90,7 +91,8 @@ msgid "Launch the application (with optional files to open)" - msgstr "启动应用程序(可选打开文件)" - - #: ../gio/gapplication-tool.c:57 --msgid "APPID [FILE...]" -+#, fuzzy -+msgid "APPID [FILE…]" - msgstr "APPID [FILE...]" - - #: ../gio/gapplication-tool.c:59 -@@ -118,7 +120,7 @@ msgid "APPID" - msgstr "APPID" - - #: ../gio/gapplication-tool.c:70 ../gio/gapplication-tool.c:133 --#: ../gio/gdbus-tool.c:90 ../gio/gio-tool.c:206 -+#: ../gio/gdbus-tool.c:102 ../gio/gio-tool.c:224 - msgid "COMMAND" - msgstr "COMMAND" - -@@ -130,9 +132,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:622 --#: ../gio/glib-compile-resources.c:628 ../gio/glib-compile-resources.c:654 --#: ../gio/gresource-tool.c:495 ../gio/gresource-tool.c:561 -+#: ../gio/gapplication-tool.c:72 ../gio/glib-compile-resources.c:738 -+#: ../gio/glib-compile-resources.c:744 ../gio/glib-compile-resources.c:772 -+#: ../gio/gresource-tool.c:500 ../gio/gresource-tool.c:566 - msgid "FILE" - msgstr "FILE" - -@@ -156,8 +158,8 @@ msgstr "PARAMETER" - 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:612 -+#: ../gio/gapplication-tool.c:96 ../gio/gresource-tool.c:531 -+#: ../gio/gsettings-tool.c:659 - #, c-format - msgid "" - "Unknown command %s\n" -@@ -170,13 +172,14 @@ msgstr "" - msgid "Usage:\n" - msgstr "用法：\n" - --#: ../gio/gapplication-tool.c:114 ../gio/gresource-tool.c:551 --#: ../gio/gsettings-tool.c:647 -+#: ../gio/gapplication-tool.c:114 ../gio/gresource-tool.c:556 -+#: ../gio/gsettings-tool.c:694 - msgid "Arguments:\n" - msgstr "参数：\n" - --#: ../gio/gapplication-tool.c:133 ../gio/gio-tool.c:206 --msgid "[ARGS...]" -+#: ../gio/gapplication-tool.c:133 ../gio/gio-tool.c:224 -+#, fuzzy -+msgid "[ARGS…]" - msgstr "[ARGS...]" - - #: ../gio/gapplication-tool.c:134 -@@ -186,9 +189,9 @@ msgstr "命令：\n" - - #. Translators: do not translate 'help', but please translate 'COMMAND'. - #: ../gio/gapplication-tool.c:146 --#, c-format -+#, fuzzy, c-format - msgid "" --"Use '%s help COMMAND' to get detailed help.\n" -+"Use “%s help COMMAND” to get detailed help.\n" - "\n" - msgstr "" - "使用“%s help COMMAND”获取详细帮助\n" -@@ -204,15 +207,15 @@ msgstr "" - "\n" - - #: ../gio/gapplication-tool.c:171 --#, c-format --msgid "invalid application id: '%s'\n" -+#, fuzzy, c-format -+msgid "invalid application id: “%s”\n" - msgstr "无效的应用程序 ID：“%s”\n" - - #. Translators: %s is replaced with a command name like 'list-actions' - #: ../gio/gapplication-tool.c:182 --#, c-format -+#, fuzzy, c-format - msgid "" --"'%s' takes no arguments\n" -+"“%s” takes no arguments\n" - "\n" - msgstr "" - "“%s”无参数\n" -@@ -234,10 +237,10 @@ msgid "action name must be given after application id\n" - msgstr "动作名必须在应用程序 ID 后给出\n" - - #: ../gio/gapplication-tool.c:325 --#, c-format -+#, fuzzy, 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 "" - "非法动作名：“%s”\n" - "动作名只能由字母数字、'-' 和 '.' 组成。\n" -@@ -274,8 +277,8 @@ msgstr "" - #: ../gio/gbufferedinputstream.c:420 ../gio/gbufferedinputstream.c:498 - #: ../gio/ginputstream.c:179 ../gio/ginputstream.c:379 - #: ../gio/ginputstream.c:617 ../gio/ginputstream.c:1019 --#: ../gio/goutputstream.c:203 ../gio/goutputstream.c:834 --#: ../gio/gpollableinputstream.c:205 ../gio/gpollableoutputstream.c:206 -+#: ../gio/goutputstream.c:223 ../gio/goutputstream.c:1049 -+#: ../gio/gpollableinputstream.c:205 ../gio/gpollableoutputstream.c:277 - #, c-format - msgid "Too large count value passed to %s" - msgstr "传递给 %s 的计数值太大" -@@ -290,7 +293,7 @@ msgid "Cannot truncate GBufferedInputStream" - msgstr "无法截断 GBufferedInputStream" - - #: ../gio/gbufferedinputstream.c:982 ../gio/ginputstream.c:1208 --#: ../gio/giostream.c:300 ../gio/goutputstream.c:1660 -+#: ../gio/giostream.c:300 ../gio/goutputstream.c:2198 - msgid "Stream is already closed" - msgstr "流已经关闭" - -@@ -298,9 +301,9 @@ msgstr "流已经关闭" - msgid "Truncate not supported on base stream" - msgstr "基流(base stream)不支持截断" - --#: ../gio/gcancellable.c:317 ../gio/gdbusconnection.c:1849 --#: ../gio/gdbusprivate.c:1377 ../gio/gsimpleasyncresult.c:870 --#: ../gio/gsimpleasyncresult.c:896 -+#: ../gio/gcancellable.c:319 ../gio/gdbusconnection.c:1862 -+#: ../gio/gdbusprivate.c:1411 ../gio/gsimpleasyncresult.c:871 -+#: ../gio/gsimpleasyncresult.c:897 - #, c-format - msgid "Operation was cancelled" - msgstr "操作被取消" -@@ -318,60 +321,64 @@ msgid "Not enough space in destination" - msgstr "目标位置没有足够的空间" - - #: ../gio/gcharsetconverter.c:342 ../gio/gdatainputstream.c:848 --#: ../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:855 ../glib/gutf8.c:1308 -+#: ../gio/gdatainputstream.c:1261 ../glib/gconvert.c:447 ../glib/gconvert.c:877 -+#: ../glib/giochannel.c:1564 ../glib/giochannel.c:1606 -+#: ../glib/giochannel.c:2461 ../glib/gutf8.c:875 ../glib/gutf8.c:1328 - msgid "Invalid byte sequence in conversion input" - msgstr "转换输入中出现无效字符序列" - --#: ../gio/gcharsetconverter.c:347 ../glib/gconvert.c:446 ../glib/gconvert.c:770 --#: ../glib/giochannel.c:1563 ../glib/giochannel.c:2454 -+#: ../gio/gcharsetconverter.c:347 ../glib/gconvert.c:455 ../glib/gconvert.c:791 -+#: ../glib/giochannel.c:1571 ../glib/giochannel.c:2473 - #, c-format - msgid "Error during conversion: %s" - msgstr "转换过程中出错：%s" - --#: ../gio/gcharsetconverter.c:444 ../gio/gsocket.c:1078 -+#: ../gio/gcharsetconverter.c:445 ../gio/gsocket.c:1138 - msgid "Cancellable initialization not supported" - msgstr "不支持可撤销的初始化" - --#: ../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" -+#: ../gio/gcharsetconverter.c:456 ../glib/gconvert.c:320 -+#: ../glib/giochannel.c:1392 -+#, fuzzy, c-format -+msgid "Conversion from character set “%s” to “%s” is not supported" - msgstr "不支持从字符集“%s”到“%s”的转换" - --#: ../gio/gcharsetconverter.c:458 ../glib/gconvert.c:325 --#, c-format --msgid "Could not open converter from '%s' to '%s'" -+#: ../gio/gcharsetconverter.c:460 ../glib/gconvert.c:324 -+#, fuzzy, c-format -+msgid "Could not open converter from “%s” to “%s”" - msgstr "无法打开从“%s”到“%s”的转换器" - --#: ../gio/gcontenttype.c:335 -+#: ../gio/gcontenttype.c:452 - #, c-format - msgid "%s type" - msgstr "%s 类型" - --#: ../gio/gcontenttype-win32.c:160 -+#: ../gio/gcontenttype-win32.c:192 - msgid "Unknown type" - msgstr "未知类型" - --#: ../gio/gcontenttype-win32.c:162 -+#: ../gio/gcontenttype-win32.c:194 - #, c-format - msgid "%s filetype" - msgstr "%s 文件类型" - --#: ../gio/gcredentials.c:312 ../gio/gcredentials.c:571 -+#: ../gio/gcredentials.c:289 -+msgid "GCredentials contains invalid data" -+msgstr "" -+ -+#: ../gio/gcredentials.c:345 ../gio/gcredentials.c:609 - msgid "GCredentials is not implemented on this OS" - msgstr "此操作系统上没有实现 GCredentials" - --#: ../gio/gcredentials.c:467 -+#: ../gio/gcredentials.c:503 - msgid "There is no GCredentials support for your platform" - msgstr "您的系统尚不支持 GCredentials" - --#: ../gio/gcredentials.c:513 -+#: ../gio/gcredentials.c:552 - msgid "GCredentials does not contain a process ID on this OS" - msgstr "此操作系统上的 GCredentials 未包含一个进程 ID" - --#: ../gio/gcredentials.c:565 -+#: ../gio/gcredentials.c:603 - msgid "Credentials spoofing is not possible on this OS" - msgstr "此操作系统上无法进行证书欺骗" - -@@ -379,406 +386,407 @@ msgstr "此操作系统上无法进行证书欺骗" - msgid "Unexpected early end-of-stream" - msgstr "非预期的过早的流结束符" - --#: ../gio/gdbusaddress.c:153 ../gio/gdbusaddress.c:241 --#: ../gio/gdbusaddress.c:322 --#, c-format --msgid "Unsupported key '%s' in address entry '%s'" -+#: ../gio/gdbusaddress.c:158 ../gio/gdbusaddress.c:232 -+#: ../gio/gdbusaddress.c:321 -+#, fuzzy, c-format -+msgid "Unsupported key “%s” in address entry “%s”" - msgstr "地址条目“%2$s”中不支持的键“%1$s”" - -+#: ../gio/gdbusaddress.c:171 -+#, fuzzy, c-format -+msgid "Meaningless key/value pair combination in address entry “%s”" -+msgstr "地址条目“%s”中无意义的键/值对组合" -+ - #: ../gio/gdbusaddress.c:180 --#, c-format -+#, fuzzy, 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, dir, tmpdir, or abstract " -+"keys)" - msgstr "地址 %s 无效(需要指定的一个路径、临时目录或抽象键)" - --#: ../gio/gdbusaddress.c:193 --#, c-format --msgid "Meaningless key/value pair combination in address entry '%s'" --msgstr "地址条目“%s”中无意义的键/值对组合" -- --#: ../gio/gdbusaddress.c:256 ../gio/gdbusaddress.c:337 --#, c-format --msgid "Error in address '%s' - the port attribute is malformed" -+#: ../gio/gdbusaddress.c:247 ../gio/gdbusaddress.c:258 -+#: ../gio/gdbusaddress.c:273 ../gio/gdbusaddress.c:336 -+#: ../gio/gdbusaddress.c:347 -+#, fuzzy, c-format -+msgid "Error in address “%s” — the “%s” attribute is malformed" - msgstr "地址“%s”中有错误 - 端口属性格式错误" - --#: ../gio/gdbusaddress.c:267 ../gio/gdbusaddress.c:348 --#, c-format --msgid "Error in address '%s' - the family attribute is malformed" --msgstr "地址“%s”中有错误 - 协议族属性格式错误" -+#: ../gio/gdbusaddress.c:417 ../gio/gdbusaddress.c:681 -+#, fuzzy, c-format -+msgid "Unknown or unsupported transport “%s” for address “%s”" -+msgstr "对地址 %2$s 的未知或不支持的传输 %1$s" - --#: ../gio/gdbusaddress.c:457 --#, c-format --msgid "Address element '%s' does not contain a colon (:)" -+#: ../gio/gdbusaddress.c:461 -+#, fuzzy, c-format -+msgid "Address element “%s” does not contain a colon (:)" - msgstr "地址元素“%s”不包含冒号(:)" - --#: ../gio/gdbusaddress.c:478 -+#: ../gio/gdbusaddress.c:470 - #, c-format -+msgid "Transport name in address element “%s” must not be empty" -+msgstr "" -+ -+#: ../gio/gdbusaddress.c:491 -+#, fuzzy, 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 "地址元素“%3$s”中的第 %1$d 个键/值对 “%2$s”，不包含等号" - --#: ../gio/gdbusaddress.c:492 --#, c-format -+#: ../gio/gdbusaddress.c:502 -+#, fuzzy, c-format -+msgid "" -+"Key/Value pair %d, “%s”, in address element “%s” must not have an empty key" -+msgstr "地址元素“%3$s”中的第 %1$d 个键/值对 “%2$s”，不包含等号" -+ -+#: ../gio/gdbusaddress.c:516 -+#, fuzzy, 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 "在地址元素“%3$s”中，对键/值对 %1$d、“%2$s”取消转义键或值时出错" - --#: ../gio/gdbusaddress.c:570 --#, c-format -+#: ../gio/gdbusaddress.c:588 -+#, fuzzy, 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 "地址 %s 中有错误 - UNIX 传输需要“path”或“abstract”之一的键被设置。" - --#: ../gio/gdbusaddress.c:606 --#, c-format --msgid "Error in address '%s' - the host attribute is missing or malformed" -+#: ../gio/gdbusaddress.c:624 -+#, fuzzy, c-format -+msgid "Error in address “%s” — the host attribute is missing or malformed" - msgstr "地址“%s”中有错误 - 主机属性丢失或格式错误" - --#: ../gio/gdbusaddress.c:620 --#, c-format --msgid "Error in address '%s' - the port attribute is missing or malformed" -+#: ../gio/gdbusaddress.c:638 -+#, fuzzy, c-format -+msgid "Error in address “%s” — the port attribute is missing or malformed" - msgstr "地址“%s”中有错误 - 端口属性丢失或格式错误" - --#: ../gio/gdbusaddress.c:634 --#, c-format --msgid "Error in address '%s' - the noncefile attribute is missing or malformed" -+#: ../gio/gdbusaddress.c:652 -+#, fuzzy, c-format -+msgid "Error in address “%s” — the noncefile attribute is missing or malformed" - msgstr "地址“%s”中有错误 - 临时文件属性丢失或格式错误" - --#: ../gio/gdbusaddress.c:655 -+#: ../gio/gdbusaddress.c:673 - msgid "Error auto-launching: " - msgstr "自启动出错：" - --#: ../gio/gdbusaddress.c:663 --#, c-format --msgid "Unknown or unsupported transport '%s' for address '%s'" --msgstr "对地址 %2$s 的未知或不支持的传输 %1$s" -- --#: ../gio/gdbusaddress.c:699 --#, c-format --msgid "Error opening nonce file '%s': %s" --msgstr "打开临时文件“%s”时出错：%s" -+#: ../gio/gdbusaddress.c:726 -+#, fuzzy, c-format -+msgid "Error opening nonce file “%s”: %s" -+msgstr "打开文件“%s”出错：%s" - --#: ../gio/gdbusaddress.c:717 --#, c-format --msgid "Error reading from nonce file '%s': %s" -+#: ../gio/gdbusaddress.c:745 -+#, fuzzy, c-format -+msgid "Error reading from nonce file “%s”: %s" - msgstr "读取临时文件“%s”时出错：%s" - --#: ../gio/gdbusaddress.c:726 --#, c-format --msgid "Error reading from nonce file '%s', expected 16 bytes, got %d" -+#: ../gio/gdbusaddress.c:754 -+#, fuzzy, c-format -+msgid "Error reading from nonce file “%s”, expected 16 bytes, got %d" - msgstr "读取临时文件“%s”时出错，预计 16 个字节，得到 %d 个字节" - --#: ../gio/gdbusaddress.c:744 --#, c-format --msgid "Error writing contents of nonce file '%s' to stream:" -+#: ../gio/gdbusaddress.c:772 -+#, fuzzy, c-format -+msgid "Error writing contents of nonce file “%s” to stream:" - msgstr "写入临时文件 %s 的内容到流的过程中出错：" - --#: ../gio/gdbusaddress.c:951 -+#: ../gio/gdbusaddress.c:981 - msgid "The given address is empty" - msgstr "给出的地址为空" - --#: ../gio/gdbusaddress.c:1064 -+#: ../gio/gdbusaddress.c:1094 - #, c-format - msgid "Cannot spawn a message bus when setuid" - msgstr "无法在 setuid 时启动一条消息总线" - --#: ../gio/gdbusaddress.c:1071 -+#: ../gio/gdbusaddress.c:1101 - msgid "Cannot spawn a message bus without a machine-id: " - msgstr "无法在无机器 ID 时启动一条消息总线：" - --#: ../gio/gdbusaddress.c:1078 -+#: ../gio/gdbusaddress.c:1108 - #, 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': " -+#: ../gio/gdbusaddress.c:1150 -+#, fuzzy, c-format -+msgid "Error spawning command line “%s”: " - msgstr "生成并运行命令行 %s 时出错：" - --#: ../gio/gdbusaddress.c:1337 --#, c-format --msgid "(Type any character to close this window)\n" --msgstr "(按任意键关闭本窗口)\n" -- --#: ../gio/gdbusaddress.c:1489 --#, c-format --msgid "Session dbus not running, and autolaunch failed" --msgstr "dbus 会话未运行，自动启动失败" -- --#: ../gio/gdbusaddress.c:1500 -+#: ../gio/gdbusaddress.c:1219 - #, c-format - msgid "Cannot determine session bus address (not implemented for this OS)" - msgstr "无法确定会话总线地址(尚未在此操作系统上实现)" - --#: ../gio/gdbusaddress.c:1635 ../gio/gdbusconnection.c:7133 --#, c-format -+#: ../gio/gdbusaddress.c:1357 ../gio/gdbusconnection.c:7190 -+#, fuzzy, c-format - msgid "" - "Cannot determine bus address from DBUS_STARTER_BUS_TYPE environment variable " --"- unknown value '%s'" -+"— unknown value “%s”" - msgstr "无法从 DBUS_STARTER_BUS_TYPE 环境变量确定总线地址 - 未知的值“%s”" - --#: ../gio/gdbusaddress.c:1644 ../gio/gdbusconnection.c:7142 -+#: ../gio/gdbusaddress.c:1366 ../gio/gdbusconnection.c:7199 - msgid "" - "Cannot determine bus address because the DBUS_STARTER_BUS_TYPE environment " - "variable is not set" - msgstr "无法确定总线地址，因为环境变量 DBUS_STARTER_BUS_TYPE 未设置" - --#: ../gio/gdbusaddress.c:1654 -+#: ../gio/gdbusaddress.c:1376 - #, c-format - msgid "Unknown bus type %d" - msgstr "未知的总线类型 %d" - --#: ../gio/gdbusauth.c:293 -+#: ../gio/gdbusauth.c:294 - msgid "Unexpected lack of content trying to read a line" - msgstr "试图读取一行时，异常地缺失内容" - --#: ../gio/gdbusauth.c:337 -+#: ../gio/gdbusauth.c:338 - msgid "Unexpected lack of content trying to (safely) read a line" - msgstr "试图(安全地)读取一行时，异常地缺失内容" - --#: ../gio/gdbusauth.c:508 -+#: ../gio/gdbusauth.c:482 - #, c-format - msgid "" - "Exhausted all available authentication mechanisms (tried: %s) (available: %s)" - msgstr "用尽了所有可用的认证机制(已尝试：%s)(可用的：%s)" - --#: ../gio/gdbusauth.c:1173 -+#: ../gio/gdbusauth.c:1167 - msgid "Cancelled via GDBusAuthObserver::authorize-authenticated-peer" - msgstr "通过 GDBusAuthObserver::authorize-authenticated-peer 取消" - --#: ../gio/gdbusauthmechanismsha1.c:261 --#, c-format --msgid "Error when getting information for directory '%s': %s" -+#: ../gio/gdbusauthmechanismsha1.c:264 -+#, fuzzy, c-format -+msgid "Error when getting information for directory “%s”: %s" - msgstr "获取目录“%s”信息时发生错误：%s" - --#: ../gio/gdbusauthmechanismsha1.c:273 --#, c-format -+#: ../gio/gdbusauthmechanismsha1.c:276 -+#, fuzzy, 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 "目录“%s”权限错误。期望 0700，得到 0%o" - --#: ../gio/gdbusauthmechanismsha1.c:294 --#, c-format --msgid "Error creating directory '%s': %s" --msgstr "创建目录“%s”时出错：%s" -+#: ../gio/gdbusauthmechanismsha1.c:301 -+#, fuzzy, c-format -+msgid "Error creating directory “%s”: %s" -+msgstr "创建目录“%s”出错：%s" - --#: ../gio/gdbusauthmechanismsha1.c:377 --#, c-format --msgid "Error opening keyring '%s' for reading: " -+#: ../gio/gdbusauthmechanismsha1.c:348 -+#, fuzzy, c-format -+msgid "Error opening keyring “%s” for reading: " - 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" -+#: ../gio/gdbusauthmechanismsha1.c:371 ../gio/gdbusauthmechanismsha1.c:689 -+#, fuzzy, c-format -+msgid "Line %d of the keyring at “%s” with content “%s” is malformed" - msgstr "“%2$s”处的密钥环的 %1$d 行有不符合格式的内容“%3$s”" - --#: ../gio/gdbusauthmechanismsha1.c:415 ../gio/gdbusauthmechanismsha1.c:728 --#, c-format -+#: ../gio/gdbusauthmechanismsha1.c:385 ../gio/gdbusauthmechanismsha1.c:703 -+#, fuzzy, 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 "“%2$s”处的密钥环的 %1$d 行第一个令牌有不符合格式的内容“%3$s”" - --#: ../gio/gdbusauthmechanismsha1.c:430 ../gio/gdbusauthmechanismsha1.c:742 --#, c-format -+#: ../gio/gdbusauthmechanismsha1.c:399 ../gio/gdbusauthmechanismsha1.c:717 -+#, fuzzy, 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 "“%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'" -+#: ../gio/gdbusauthmechanismsha1.c:423 -+#, fuzzy, c-format -+msgid "Didn’t find cookie with id %d in the keyring at “%s”" - msgstr "未在“%2$s”处的密钥环中找到 ID 为 %1$d 的 cookie" - --#: ../gio/gdbusauthmechanismsha1.c:532 --#, c-format --msgid "Error deleting stale lock file '%s': %s" -+#: ../gio/gdbusauthmechanismsha1.c:505 -+#, fuzzy, c-format -+msgid "Error deleting stale lock file “%s”: %s" - msgstr "删除失效的锁文件“%s”时出错：%s" - --#: ../gio/gdbusauthmechanismsha1.c:564 --#, c-format --msgid "Error creating lock file '%s': %s" -+#: ../gio/gdbusauthmechanismsha1.c:537 -+#, fuzzy, c-format -+msgid "Error creating lock file “%s”: %s" - msgstr "创建锁文件“%s”时出错：%s" - --#: ../gio/gdbusauthmechanismsha1.c:594 --#, c-format --msgid "Error closing (unlinked) lock file '%s': %s" -+#: ../gio/gdbusauthmechanismsha1.c:568 -+#, fuzzy, c-format -+msgid "Error closing (unlinked) lock file “%s”: %s" - msgstr "关闭(已删除的)锁文件“%s”时出错：%s" - --#: ../gio/gdbusauthmechanismsha1.c:604 --#, c-format --msgid "Error unlinking lock file '%s': %s" -+#: ../gio/gdbusauthmechanismsha1.c:579 -+#, fuzzy, c-format -+msgid "Error unlinking lock file “%s”: %s" - msgstr "删除锁文件“%s”时出错：%s" - --#: ../gio/gdbusauthmechanismsha1.c:681 --#, c-format --msgid "Error opening keyring '%s' for writing: " -+#: ../gio/gdbusauthmechanismsha1.c:656 -+#, fuzzy, c-format -+msgid "Error opening keyring “%s” for writing: " - msgstr "打开钥匙环“%s”以写入时出错：" - --#: ../gio/gdbusauthmechanismsha1.c:878 --#, c-format --msgid "(Additionally, releasing the lock for '%s' also failed: %s) " -+#: ../gio/gdbusauthmechanismsha1.c:852 -+#, fuzzy, c-format -+msgid "(Additionally, releasing the lock for “%s” also failed: %s) " - msgstr "(此外，释放 %s 的锁失败：%s)" - --#: ../gio/gdbusconnection.c:612 ../gio/gdbusconnection.c:2377 -+#: ../gio/gdbusconnection.c:595 ../gio/gdbusconnection.c:2391 - msgid "The connection is closed" - msgstr "连接已关闭" - --#: ../gio/gdbusconnection.c:1879 -+#: ../gio/gdbusconnection.c:1892 - msgid "Timeout was reached" - msgstr "已到超时限制" - --#: ../gio/gdbusconnection.c:2499 -+#: ../gio/gdbusconnection.c:2513 - msgid "" - "Unsupported flags encountered when constructing a client-side connection" - msgstr "构建客户端连接时遇到不支持的标志" - --#: ../gio/gdbusconnection.c:4109 ../gio/gdbusconnection.c:4456 --#, c-format -+#: ../gio/gdbusconnection.c:4161 ../gio/gdbusconnection.c:4508 -+#, fuzzy, 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 "路径 %s 的对象上没有 org.freedesktop.DBus.Properties 接口" - --#: ../gio/gdbusconnection.c:4251 --#, c-format --msgid "No such property '%s'" -+#: ../gio/gdbusconnection.c:4303 -+#, fuzzy, c-format -+msgid "No such property “%s”" - msgstr "无此属性：%s" - --#: ../gio/gdbusconnection.c:4263 --#, c-format --msgid "Property '%s' is not readable" -+#: ../gio/gdbusconnection.c:4315 -+#, fuzzy, c-format -+msgid "Property “%s” is not readable" - msgstr "属性 %s 不可读" - --#: ../gio/gdbusconnection.c:4274 --#, c-format --msgid "Property '%s' is not writable" -+#: ../gio/gdbusconnection.c:4326 -+#, fuzzy, c-format -+msgid "Property “%s” is not writable" - msgstr "属性 %s 不可写" - --#: ../gio/gdbusconnection.c:4294 --#, c-format --msgid "Error setting property '%s': Expected type '%s' but got '%s'" -+#: ../gio/gdbusconnection.c:4346 -+#, fuzzy, c-format -+msgid "Error setting property “%s”: Expected type “%s” but got “%s”" - msgstr "设置属性 %s 出错：期望 %s 类型但得到 %s 类型" - --#: ../gio/gdbusconnection.c:4399 ../gio/gdbusconnection.c:6573 --#, c-format --msgid "No such interface '%s'" -+#: ../gio/gdbusconnection.c:4451 ../gio/gdbusconnection.c:4659 -+#: ../gio/gdbusconnection.c:6630 -+#, fuzzy, c-format -+msgid "No such interface “%s”" - msgstr "无此接口：%s" - --#: ../gio/gdbusconnection.c:4607 --msgid "No such interface" --msgstr "无此接口" -- --#: ../gio/gdbusconnection.c:4825 ../gio/gdbusconnection.c:7082 --#, c-format --msgid "No such interface '%s' on object at path %s" -+#: ../gio/gdbusconnection.c:4877 ../gio/gdbusconnection.c:7139 -+#, fuzzy, c-format -+msgid "No such interface “%s” on object at path %s" - msgstr "在路径 %s 的对象上没有 %s 接口" - --#: ../gio/gdbusconnection.c:4923 --#, c-format --msgid "No such method '%s'" -+#: ../gio/gdbusconnection.c:4975 -+#, fuzzy, c-format -+msgid "No such method “%s”" - msgstr "无此方法：%s" - --#: ../gio/gdbusconnection.c:4954 --#, c-format --msgid "Type of message, '%s', does not match expected type '%s'" -+#: ../gio/gdbusconnection.c:5006 -+#, fuzzy, c-format -+msgid "Type of message, “%s”, does not match expected type “%s”" - msgstr "消息的类型“%s”，与预期的类型“%s”不匹配" - --#: ../gio/gdbusconnection.c:5152 -+#: ../gio/gdbusconnection.c:5204 - #, c-format - msgid "An object is already exported for the interface %s at %s" - msgstr "%2$s 处的接口 %1$s 已经导出了一个对象" - --#: ../gio/gdbusconnection.c:5378 -+#: ../gio/gdbusconnection.c:5430 - #, c-format - msgid "Unable to retrieve property %s.%s" - msgstr "无法接收属性 %s：%s" - --#: ../gio/gdbusconnection.c:5434 -+#: ../gio/gdbusconnection.c:5486 - #, c-format - msgid "Unable to set property %s.%s" - msgstr "无法设置属性 %s：%s" - --#: ../gio/gdbusconnection.c:5610 --#, c-format --msgid "Method '%s' returned type '%s', but expected '%s'" -+#: ../gio/gdbusconnection.c:5664 -+#, fuzzy, c-format -+msgid "Method “%s” returned type “%s”, but expected “%s”" - msgstr "方法“%s”返回类型“%s”，但预期的是“%s”" - --#: ../gio/gdbusconnection.c:6684 --#, c-format --msgid "Method '%s' on interface '%s' with signature '%s' does not exist" -+#: ../gio/gdbusconnection.c:6741 -+#, fuzzy, c-format -+msgid "Method “%s” on interface “%s” with signature “%s” does not exist" - msgstr "带有 %3$s 签名的接口 %2$s 上不存在 %1$s 方法" - --#: ../gio/gdbusconnection.c:6805 -+#: ../gio/gdbusconnection.c:6862 - #, c-format - msgid "A subtree is already exported for %s" - msgstr "已经为 %s 导出一个子树" - --#: ../gio/gdbusmessage.c:1244 -+#: ../gio/gdbusmessage.c:1255 - msgid "type is INVALID" - msgstr "类型无效" - --#: ../gio/gdbusmessage.c:1255 -+#: ../gio/gdbusmessage.c:1266 - msgid "METHOD_CALL message: PATH or MEMBER header field is missing" - msgstr "METHOD_CALL 消息：PATH 或 MEMBER 头域缺失" - --#: ../gio/gdbusmessage.c:1266 -+#: ../gio/gdbusmessage.c:1277 - msgid "METHOD_RETURN message: REPLY_SERIAL header field is missing" - msgstr "METHOD_CALL 消息：REPLY_SERIAL 头域缺失" - --#: ../gio/gdbusmessage.c:1278 -+#: ../gio/gdbusmessage.c:1289 - msgid "ERROR message: REPLY_SERIAL or ERROR_NAME header field is missing" - msgstr "错误消息：REPLY_SERIAL 或 ERROR_NAME 头域缺失" - --#: ../gio/gdbusmessage.c:1291 -+#: ../gio/gdbusmessage.c:1302 - msgid "SIGNAL message: PATH, INTERFACE or MEMBER header field is missing" - msgstr "信号消息：PATH、INTERFACE 或 MEMBER 头域缺失" - --#: ../gio/gdbusmessage.c:1299 -+#: ../gio/gdbusmessage.c:1310 - msgid "" - "SIGNAL message: The PATH header field is using the reserved value /org/" - "freedesktop/DBus/Local" - msgstr "信号消息：PATH 头域正在使用保留值 /org/freedesktop/DBus/Local" - --#: ../gio/gdbusmessage.c:1307 -+#: ../gio/gdbusmessage.c:1318 - msgid "" - "SIGNAL message: The INTERFACE header field is using the reserved value org." - "freedesktop.DBus.Local" - msgstr "信号消息：INTERFACE 头域正在使用保留值 org.freedesktop.DBus.Local" - --#: ../gio/gdbusmessage.c:1355 ../gio/gdbusmessage.c:1415 -+#: ../gio/gdbusmessage.c:1366 ../gio/gdbusmessage.c:1426 - #, c-format - msgid "Wanted to read %lu byte but only got %lu" - msgid_plural "Wanted to read %lu bytes but only got %lu" - msgstr[0] "期望读取 %lu 个字节但只得到 %lu 个" - --#: ../gio/gdbusmessage.c:1369 --#, c-format --msgid "Expected NUL byte after the string '%s' but found byte %d" -+#: ../gio/gdbusmessage.c:1380 -+#, fuzzy, c-format -+msgid "Expected NUL byte after the string “%s” but found byte %d" - msgstr "期望“%s”后为 NUL 字节但得到字节 %d" - --#: ../gio/gdbusmessage.c:1388 --#, c-format -+#: ../gio/gdbusmessage.c:1399 -+#, fuzzy, 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 "" - "期望得到有效的 UTF-8 字符串，但在字节偏移 %d 处(字符串长度为 %d)得到了无效的" - "字节。该点的有效 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 对象路径" -+#: ../gio/gdbusmessage.c:1463 ../gio/gdbusmessage.c:1711 -+#: ../gio/gdbusmessage.c:1900 -+msgid "Value nested too deeply" -+msgstr "" - - #: ../gio/gdbusmessage.c:1609 --#, c-format --msgid "Parsed value '%s' is not a valid D-Bus signature" -+#, fuzzy, c-format -+msgid "Parsed value “%s” is not a valid D-Bus object path" -+msgstr "已解析的值“%s”不是有效的 D-Bus 对象路径" -+ -+#: ../gio/gdbusmessage.c:1631 -+#, fuzzy, c-format -+msgid "Parsed value “%s” is not a valid D-Bus signature" - msgstr "已解析的值“%s”不是有效的 D-Bus 签名" - --#: ../gio/gdbusmessage.c:1656 -+#: ../gio/gdbusmessage.c:1678 - #, c-format - msgid "" - "Encountered array of length %u byte. Maximum length is 2<<26 bytes (64 MiB)." -@@ -786,152 +794,167 @@ msgid_plural "" - "Encountered array of length %u bytes. Maximum length is 2<<26 bytes (64 MiB)." - msgstr[0] "得到长度为 %u 字节的数组，最大长度应为 2<<26 字节(64 MiB)。" - --#: ../gio/gdbusmessage.c:1676 --#, c-format -+#: ../gio/gdbusmessage.c:1698 -+#, fuzzy, 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 "" - "得到类型为“a%c”的数组，期望长度为 %u 字节的倍数，但是得到长度为 %u 字节。" - --#: ../gio/gdbusmessage.c:1843 --#, c-format --msgid "Parsed value '%s' for variant is not a valid D-Bus signature" -+#: ../gio/gdbusmessage.c:1884 -+#, fuzzy, c-format -+msgid "Parsed value “%s” for variant is not a valid D-Bus signature" - msgstr "已解析的衍生属性值“%s”不是有效的 D-Bus 签名" - --#: ../gio/gdbusmessage.c:1867 --#, c-format -+#: ../gio/gdbusmessage.c:1925 -+#, fuzzy, 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 "在以 D-Bus 线格式用类型字符串“%s”反序列化 GVariant 时发生错误" - --#: ../gio/gdbusmessage.c:2051 --#, c-format -+#: ../gio/gdbusmessage.c:2110 -+#, fuzzy, 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 "无效的字节序值。期望为 0x6c (“l”)或 0x42 (“B”)但得到值 0x%02x" - --#: ../gio/gdbusmessage.c:2064 -+#: ../gio/gdbusmessage.c:2123 - #, c-format - msgid "Invalid major protocol version. Expected 1 but found %d" - msgstr "无效的主协议版本。期望 1，但是找到了 %d" - --#: ../gio/gdbusmessage.c:2120 --#, c-format --msgid "Signature header with signature '%s' found but message body is empty" -+#: ../gio/gdbusmessage.c:2177 ../gio/gdbusmessage.c:2773 -+msgid "Signature header found but is not of type signature" -+msgstr "" -+ -+#: ../gio/gdbusmessage.c:2189 -+#, fuzzy, c-format -+msgid "Signature header with signature “%s” found but message body is empty" - msgstr "发现签名“%s”的签名头部，但邮件正文为空" - --#: ../gio/gdbusmessage.c:2134 --#, c-format --msgid "Parsed value '%s' is not a valid D-Bus signature (for body)" -+#: ../gio/gdbusmessage.c:2204 -+#, fuzzy, c-format -+msgid "Parsed value “%s” is not a valid D-Bus signature (for body)" - msgstr "已解析的值“%s”不是有效的 D-Bus 签名(针对消息主体)" - --#: ../gio/gdbusmessage.c:2164 -+#: ../gio/gdbusmessage.c:2236 - #, c-format - msgid "No signature header in message but the message body is %u byte" - msgid_plural "No signature header in message but the message body is %u bytes" - msgstr[0] "消息中没有签名的头部，但消息主体为 %u 字节" - --#: ../gio/gdbusmessage.c:2174 -+#: ../gio/gdbusmessage.c:2246 - msgid "Cannot deserialize message: " - msgstr "无法解串消息：" - --#: ../gio/gdbusmessage.c:2515 --#, c-format -+#: ../gio/gdbusmessage.c:2590 -+#, fuzzy, 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 "在以 D-Bus 线格式用类型字符串“%s”序列化 GVariant 时发生错误" - --#: ../gio/gdbusmessage.c:2652 -+#: ../gio/gdbusmessage.c:2727 - #, c-format - msgid "" --"Message has %d file descriptors but the header field indicates %d file " --"descriptors" --msgstr "消息拥有 %d 个文件描述符，但是头区域指出 %d 个文件描述符" -+"Number of file descriptors in message (%d) differs from header field (%d)" -+msgstr "" - --#: ../gio/gdbusmessage.c:2660 -+#: ../gio/gdbusmessage.c:2735 - msgid "Cannot serialize message: " - msgstr "无法串行消息：" - --#: ../gio/gdbusmessage.c:2704 --#, c-format --msgid "Message body has signature '%s' but there is no signature header" -+#: ../gio/gdbusmessage.c:2788 -+#, fuzzy, c-format -+msgid "Message body has signature “%s” but there is no signature header" - msgstr "消息主体有签名“%s”但是没有签名头部" - --#: ../gio/gdbusmessage.c:2714 --#, c-format -+#: ../gio/gdbusmessage.c:2798 -+#, fuzzy, 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 "消息主体有类型签名“%s”但头域的签名为“%s”" - --#: ../gio/gdbusmessage.c:2730 --#, c-format --msgid "Message body is empty but signature in the header field is '(%s)'" -+#: ../gio/gdbusmessage.c:2814 -+#, fuzzy, c-format -+msgid "Message body is empty but signature in the header field is “(%s)”" - msgstr "消息主体为空，但头域的签名为“(%s)”" - --#: ../gio/gdbusmessage.c:3283 --#, c-format --msgid "Error return with body of type '%s'" -+#: ../gio/gdbusmessage.c:3367 -+#, fuzzy, c-format -+msgid "Error return with body of type “%s”" - msgstr "返回主体类型“%s”出错" - --#: ../gio/gdbusmessage.c:3291 -+#: ../gio/gdbusmessage.c:3375 - msgid "Error return with empty body" - msgstr "返回空主体出错" - --#: ../gio/gdbusprivate.c:2038 -+#: ../gio/gdbusprivate.c:2242 -+#, c-format -+msgid "(Type any character to close this window)\n" -+msgstr "(按任意键关闭本窗口)\n" -+ -+#: ../gio/gdbusprivate.c:2416 -+#, c-format -+msgid "Session dbus not running, and autolaunch failed" -+msgstr "dbus 会话未运行，自动启动失败" -+ -+#: ../gio/gdbusprivate.c:2439 - #, c-format - msgid "Unable to get Hardware profile: %s" - msgstr "无法获得硬件测量信息：%s" - --#: ../gio/gdbusprivate.c:2083 -+#: ../gio/gdbusprivate.c:2484 - 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:1611 -+#: ../gio/gdbusproxy.c:1562 - #, c-format - msgid "Error calling StartServiceByName for %s: " - msgstr "为 %s 调用 StartServiceByName 出错：" - --#: ../gio/gdbusproxy.c:1634 -+#: ../gio/gdbusproxy.c:1585 - #, c-format - msgid "Unexpected reply %d from StartServiceByName(\"%s\") method" - msgstr "从 StartServiceByName(%2$s) 方式处获得意外回复 %1$d" - --#: ../gio/gdbusproxy.c:2713 ../gio/gdbusproxy.c:2847 -+#: ../gio/gdbusproxy.c:2685 ../gio/gdbusproxy.c:2820 -+#, fuzzy, c-format - 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" -+"Cannot invoke method; proxy is for the well-known name %s without an owner, " -+"and proxy was constructed with the G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START flag" - msgstr "" - "无法调用方法；代理名称为常见的无所有者的名称，而代理使用 " - "G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START 标记构建。" - --#: ../gio/gdbusserver.c:708 --msgid "Abstract name space not supported" -+#: ../gio/gdbusserver.c:755 -+#, fuzzy -+msgid "Abstract namespace not supported" - msgstr "不支持抽象命名空间" - --#: ../gio/gdbusserver.c:795 -+#: ../gio/gdbusserver.c:848 - msgid "Cannot specify nonce file when creating a server" - msgstr "创建服务器时无法指定临时文件" - --#: ../gio/gdbusserver.c:873 --#, c-format --msgid "Error writing nonce file at '%s': %s" -+#: ../gio/gdbusserver.c:930 -+#, fuzzy, c-format -+msgid "Error writing nonce file at “%s”: %s" - msgstr "写入“%s”处的临时文件时出错：%s" - --#: ../gio/gdbusserver.c:1044 --#, c-format --msgid "The string '%s' is not a valid D-Bus GUID" -+#: ../gio/gdbusserver.c:1103 -+#, fuzzy, c-format -+msgid "The string “%s” is not a valid D-Bus GUID" - msgstr "字符串“%s”不是有效 D-Bus GUID" - --#: ../gio/gdbusserver.c:1084 --#, c-format --msgid "Cannot listen on unsupported transport '%s'" -+#: ../gio/gdbusserver.c:1143 -+#, fuzzy, c-format -+msgid "Cannot listen on unsupported transport “%s”" - msgstr "无法监听不支持的传输“%s”" - --#: ../gio/gdbus-tool.c:95 --#, c-format -+#: ../gio/gdbus-tool.c:107 -+#, fuzzy, c-format - msgid "" - "Commands:\n" - " help Shows this information\n" -@@ -939,8 +962,9 @@ msgid "" - " monitor Monitor a remote object\n" - " call Invoke a method on a remote object\n" - " emit Emit a signal\n" -+" wait Wait for a bus name to appear\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 "" - "命令：\n" - " help 显示本信息\n" -@@ -951,292 +975,336 @@ msgstr "" - "\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:724 ../gio/gdbus-tool.c:1067 --#: ../gio/gdbus-tool.c:1509 ../gio/gio-tool-rename.c:84 -+#: ../gio/gdbus-tool.c:197 ../gio/gdbus-tool.c:264 ../gio/gdbus-tool.c:336 -+#: ../gio/gdbus-tool.c:360 ../gio/gdbus-tool.c:850 ../gio/gdbus-tool.c:1187 -+#: ../gio/gdbus-tool.c:1672 - #, c-format - msgid "Error: %s\n" - msgstr "错误：%s\n" - --#: ../gio/gdbus-tool.c:175 ../gio/gdbus-tool.c:239 ../gio/gdbus-tool.c:1525 -+#: ../gio/gdbus-tool.c:208 ../gio/gdbus-tool.c:277 ../gio/gdbus-tool.c:1688 - #, c-format - msgid "Error parsing introspection XML: %s\n" - msgstr "解析 Introspection XML 时出错：%s\n" - --#: ../gio/gdbus-tool.c:208 -+#: ../gio/gdbus-tool.c:246 - #, c-format - msgid "Error: %s is not a valid name\n" - msgstr "错误：%s 不是有效的名称。\n" - --#: ../gio/gdbus-tool.c:356 -+#: ../gio/gdbus-tool.c:394 - msgid "Connect to the system bus" - msgstr "连接到系统总线" - --#: ../gio/gdbus-tool.c:357 -+#: ../gio/gdbus-tool.c:395 - msgid "Connect to the session bus" - msgstr "连接到会话总线" - --#: ../gio/gdbus-tool.c:358 -+#: ../gio/gdbus-tool.c:396 - msgid "Connect to given D-Bus address" - msgstr "连接到给定的 D-Bus 地址" - --#: ../gio/gdbus-tool.c:368 -+#: ../gio/gdbus-tool.c:406 - msgid "Connection Endpoint Options:" - msgstr "连接端点选项：" - --#: ../gio/gdbus-tool.c:369 -+#: ../gio/gdbus-tool.c:407 - msgid "Options specifying the connection endpoint" - msgstr "指定连接端点的选项" - --#: ../gio/gdbus-tool.c:391 -+#: ../gio/gdbus-tool.c:430 - #, c-format - msgid "No connection endpoint specified" - msgstr "没有指定连接的端点" - --#: ../gio/gdbus-tool.c:401 -+#: ../gio/gdbus-tool.c:440 - #, c-format - msgid "Multiple connection endpoints specified" - msgstr "指定了多个连接端点" - --#: ../gio/gdbus-tool.c:471 --#, c-format -+#: ../gio/gdbus-tool.c:513 -+#, fuzzy, 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 "警告：根据 Introspection 数据，接口“%s”不存在\n" - --#: ../gio/gdbus-tool.c:480 --#, c-format -+#: ../gio/gdbus-tool.c:522 -+#, fuzzy, 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 "警告：根据 Introspection 数据，在接口“%2$s”中方法“%1$s”不存在\n" - --#: ../gio/gdbus-tool.c:542 -+#: ../gio/gdbus-tool.c:584 - msgid "Optional destination for signal (unique name)" - msgstr "信号的可选目标位置(唯一名称)" - --#: ../gio/gdbus-tool.c:543 -+#: ../gio/gdbus-tool.c:585 - msgid "Object path to emit signal on" - msgstr "要触发信号的对象路径" - --#: ../gio/gdbus-tool.c:544 -+#: ../gio/gdbus-tool.c:586 - msgid "Signal and interface name" - msgstr "信号和接口名称" - --#: ../gio/gdbus-tool.c:578 -+#: ../gio/gdbus-tool.c:619 - msgid "Emit a signal." - msgstr "发射信号。" - --#: ../gio/gdbus-tool.c:612 ../gio/gdbus-tool.c:857 ../gio/gdbus-tool.c:1615 --#: ../gio/gdbus-tool.c:1850 -+#: ../gio/gdbus-tool.c:674 ../gio/gdbus-tool.c:981 ../gio/gdbus-tool.c:1775 -+#: ../gio/gdbus-tool.c:2007 ../gio/gdbus-tool.c:2227 - #, c-format - msgid "Error connecting: %s\n" - msgstr "连接时出错：%s\n" - --#: ../gio/gdbus-tool.c:624 -+#: ../gio/gdbus-tool.c:694 - #, c-format --msgid "Error: object path not specified.\n" --msgstr "错误：没有指定对象路径。\n" -+msgid "Error: %s is not a valid unique bus name.\n" -+msgstr "错误：%s 不是有效的唯一总线名。\n" -+ -+#: ../gio/gdbus-tool.c:713 ../gio/gdbus-tool.c:1024 ../gio/gdbus-tool.c:1818 -+#, c-format -+msgid "Error: Object path is not specified\n" -+msgstr "错误：没有指定对象路径\n" - --#: ../gio/gdbus-tool.c:629 ../gio/gdbus-tool.c:924 ../gio/gdbus-tool.c:1680 --#: ../gio/gdbus-tool.c:1916 -+#: ../gio/gdbus-tool.c:736 ../gio/gdbus-tool.c:1044 ../gio/gdbus-tool.c:1838 -+#: ../gio/gdbus-tool.c:2078 - #, c-format - msgid "Error: %s is not a valid object path\n" - msgstr "错误：%s 不是有效的对象路径\n" - --#: ../gio/gdbus-tool.c:635 --#, c-format --msgid "Error: signal not specified.\n" --msgstr "错误：没有指定对象。\n" -+#: ../gio/gdbus-tool.c:756 -+#, fuzzy, c-format -+msgid "Error: Signal name is not specified\n" -+msgstr "错误：方法名没有指定\n" - --#: ../gio/gdbus-tool.c:642 --#, c-format --msgid "Error: signal must be the fully-qualified name.\n" --msgstr "错误：信号必须是完全限定名。\n" -+#: ../gio/gdbus-tool.c:770 -+#, fuzzy, c-format -+msgid "Error: Signal name “%s” is invalid\n" -+msgstr "错误：方法名“%s”无效\n" - --#: ../gio/gdbus-tool.c:650 -+#: ../gio/gdbus-tool.c:782 - #, c-format - msgid "Error: %s is not a valid interface name\n" - msgstr "错误：%s 不是有效的接口名称。\n" - --#: ../gio/gdbus-tool.c:656 -+#: ../gio/gdbus-tool.c:788 - #, c-format - msgid "Error: %s is not a valid member name\n" - msgstr "错误：%s 不是有效的成员名称。\n" - --#: ../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:699 ../gio/gdbus-tool.c:1036 -+#: ../gio/gdbus-tool.c:825 ../gio/gdbus-tool.c:1156 - #, c-format - msgid "Error parsing parameter %d: %s\n" - msgstr "解析第 %d 个选项出错：%s\n" - --#: ../gio/gdbus-tool.c:731 -+#: ../gio/gdbus-tool.c:857 - #, c-format - msgid "Error flushing connection: %s\n" - msgstr "清空连接接时出错：%s\n" - --#: ../gio/gdbus-tool.c:758 -+#: ../gio/gdbus-tool.c:884 - msgid "Destination name to invoke method on" - msgstr "调用方法的目标位置名称" - --#: ../gio/gdbus-tool.c:759 -+#: ../gio/gdbus-tool.c:885 - msgid "Object path to invoke method on" - msgstr "调用方法的对象路径" - --#: ../gio/gdbus-tool.c:760 -+#: ../gio/gdbus-tool.c:886 - msgid "Method and interface name" - msgstr "方法和接口名称" - --#: ../gio/gdbus-tool.c:761 -+#: ../gio/gdbus-tool.c:887 - msgid "Timeout in seconds" - msgstr "超时(以秒为单位)" - --#: ../gio/gdbus-tool.c:802 -+#: ../gio/gdbus-tool.c:926 - msgid "Invoke a method on a remote object." - msgstr "在远程对象上调用一个方法。" - --#: ../gio/gdbus-tool.c:877 ../gio/gdbus-tool.c:1634 ../gio/gdbus-tool.c:1869 -+#: ../gio/gdbus-tool.c:998 ../gio/gdbus-tool.c:1792 ../gio/gdbus-tool.c:2032 - #, c-format - msgid "Error: Destination is not specified\n" - msgstr "错误：没有指定目标位置名称\n" - --#: ../gio/gdbus-tool.c:889 ../gio/gdbus-tool.c:1651 ../gio/gdbus-tool.c:1881 -+#: ../gio/gdbus-tool.c:1009 ../gio/gdbus-tool.c:1809 ../gio/gdbus-tool.c:2043 - #, c-format - msgid "Error: %s is not a valid bus name\n" - msgstr "错误：%s 不是有效的总线名称。\n" - --#: ../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:939 -+#: ../gio/gdbus-tool.c:1059 - #, c-format - msgid "Error: Method name is not specified\n" - msgstr "错误：方法名没有指定\n" - --#: ../gio/gdbus-tool.c:950 --#, c-format --msgid "Error: Method name '%s' is invalid\n" -+#: ../gio/gdbus-tool.c:1070 -+#, fuzzy, c-format -+msgid "Error: Method name “%s” is invalid\n" - msgstr "错误：方法名“%s”无效\n" - --#: ../gio/gdbus-tool.c:1028 --#, c-format --msgid "Error parsing parameter %d of type '%s': %s\n" -+#: ../gio/gdbus-tool.c:1148 -+#, fuzzy, c-format -+msgid "Error parsing parameter %d of type “%s”: %s\n" - msgstr "解析\"%2$s\"类型的参数 %1$d 时发生错误：%3$s\n" - --#: ../gio/gdbus-tool.c:1472 -+#: ../gio/gdbus-tool.c:1634 - msgid "Destination name to introspect" - msgstr "要 Introspect 的目标位置名称" - --#: ../gio/gdbus-tool.c:1473 -+#: ../gio/gdbus-tool.c:1635 - msgid "Object path to introspect" - msgstr "要 Introspect 的对象路径" - --#: ../gio/gdbus-tool.c:1474 -+#: ../gio/gdbus-tool.c:1636 - msgid "Print XML" - msgstr "输出 XML" - --#: ../gio/gdbus-tool.c:1475 -+#: ../gio/gdbus-tool.c:1637 - msgid "Introspect children" - msgstr "Introspect 子对象" - --#: ../gio/gdbus-tool.c:1476 -+#: ../gio/gdbus-tool.c:1638 - msgid "Only print properties" - msgstr "只打印属性" - --#: ../gio/gdbus-tool.c:1567 -+#: ../gio/gdbus-tool.c:1727 - msgid "Introspect a remote object." - msgstr "Introspect 远程对象。" - --#: ../gio/gdbus-tool.c:1772 -+#: ../gio/gdbus-tool.c:1933 - msgid "Destination name to monitor" - msgstr "要监视的目标位置名称" - --#: ../gio/gdbus-tool.c:1773 -+#: ../gio/gdbus-tool.c:1934 - msgid "Object path to monitor" - msgstr "要监视的对象路径" - --#: ../gio/gdbus-tool.c:1802 -+#: ../gio/gdbus-tool.c:1959 - msgid "Monitor a remote object." - msgstr "监视一个远程对象。" - --#: ../gio/gdesktopappinfo.c:1994 ../gio/gdesktopappinfo.c:4501 -+#: ../gio/gdbus-tool.c:2017 -+#, c-format -+msgid "Error: can’t monitor a non-message-bus connection\n" -+msgstr "" -+ -+#: ../gio/gdbus-tool.c:2141 -+msgid "Service to activate before waiting for the other one (well-known name)" -+msgstr "" -+ -+#: ../gio/gdbus-tool.c:2144 -+msgid "" -+"Timeout to wait for before exiting with an error (seconds); 0 for no timeout " -+"(default)" -+msgstr "" -+ -+#: ../gio/gdbus-tool.c:2192 -+msgid "[OPTION…] BUS-NAME" -+msgstr "" -+ -+#: ../gio/gdbus-tool.c:2193 -+msgid "Wait for a bus name to appear." -+msgstr "" -+ -+#: ../gio/gdbus-tool.c:2269 -+#, fuzzy, c-format -+msgid "Error: A service to activate for must be specified.\n" -+msgstr "错误：没有指定对象路径。\n" -+ -+#: ../gio/gdbus-tool.c:2274 -+#, fuzzy, c-format -+msgid "Error: A service to wait for must be specified.\n" -+msgstr "错误：没有指定对象路径。\n" -+ -+#: ../gio/gdbus-tool.c:2279 -+#, fuzzy, c-format -+msgid "Error: Too many arguments.\n" -+msgstr "参数过多" -+ -+#: ../gio/gdbus-tool.c:2287 ../gio/gdbus-tool.c:2294 -+#, fuzzy, c-format -+msgid "Error: %s is not a valid well-known bus name.\n" -+msgstr "错误：%s 不是有效的总线名称。\n" -+ -+#: ../gio/gdesktopappinfo.c:2071 ../gio/gdesktopappinfo.c:4877 - msgid "Unnamed" - msgstr "未命名" - --#: ../gio/gdesktopappinfo.c:2404 --msgid "Desktop file didn't specify Exec field" -+#: ../gio/gdesktopappinfo.c:2481 -+#, fuzzy -+msgid "Desktop file didn’t specify Exec field" - msgstr "桌面文件未指定 Exec 区域" - --#: ../gio/gdesktopappinfo.c:2689 -+#: ../gio/gdesktopappinfo.c:2761 - msgid "Unable to find terminal required for application" - msgstr "无法找到应用程序需要的终端" - --#: ../gio/gdesktopappinfo.c:3097 --#, c-format --msgid "Can't create user application configuration folder %s: %s" -+#: ../gio/gdesktopappinfo.c:3413 -+#, fuzzy, c-format -+msgid "Can’t create user application configuration folder %s: %s" - msgstr "无法创建用户应用程序配置文件夹 %s：%s" - --#: ../gio/gdesktopappinfo.c:3101 --#, c-format --msgid "Can't create user MIME configuration folder %s: %s" -+#: ../gio/gdesktopappinfo.c:3417 -+#, fuzzy, c-format -+msgid "Can’t create user MIME configuration folder %s: %s" - msgstr "无法创建用户 MIME 配置文件夹 %s：%s" - --#: ../gio/gdesktopappinfo.c:3341 ../gio/gdesktopappinfo.c:3365 -+#: ../gio/gdesktopappinfo.c:3657 ../gio/gdesktopappinfo.c:3681 - msgid "Application information lacks an identifier" - msgstr "应用程序信息缺少标志符。" - --#: ../gio/gdesktopappinfo.c:3599 --#, c-format --msgid "Can't create user desktop file %s" -+#: ../gio/gdesktopappinfo.c:3915 -+#, fuzzy, c-format -+msgid "Can’t create user desktop file %s" - msgstr "无法创建用户桌面文件 %s" - --#: ../gio/gdesktopappinfo.c:3733 -+#: ../gio/gdesktopappinfo.c:4049 - #, c-format - msgid "Custom definition for %s" - msgstr "%s 的自定义定义" - - #: ../gio/gdrive.c:417 --msgid "drive doesn't implement eject" -+#, fuzzy -+msgid "drive doesn’t implement eject" - msgstr "驱动器未实现弹出" - - #. 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" -+#, fuzzy -+msgid "drive doesn’t implement eject or eject_with_operation" - msgstr "驱动器未实现弹出或 eject_with_operation" - - #: ../gio/gdrive.c:571 --msgid "drive doesn't implement polling for media" -+#, fuzzy -+msgid "drive doesn’t implement polling for media" - msgstr "驱动器未实现媒体轮询" - --#: ../gio/gdrive.c:776 --msgid "drive doesn't implement start" -+#: ../gio/gdrive.c:778 -+#, fuzzy -+msgid "drive doesn’t implement start" - msgstr "驱动器未实现启动" - --#: ../gio/gdrive.c:878 --msgid "drive doesn't implement stop" -+#: ../gio/gdrive.c:880 -+#, fuzzy -+msgid "drive doesn’t implement stop" - msgstr "驱动器未实现停止" - --#: ../gio/gdummytlsbackend.c:195 ../gio/gdummytlsbackend.c:317 --#: ../gio/gdummytlsbackend.c:509 -+#: ../gio/gdummytlsbackend.c:195 ../gio/gdummytlsbackend.c:321 -+#: ../gio/gdummytlsbackend.c:513 - msgid "TLS support is not available" - msgstr "TLS 支持不可用" - --#: ../gio/gdummytlsbackend.c:419 -+#: ../gio/gdummytlsbackend.c:423 - msgid "DTLS support is not available" - msgstr "DTLS 支持不可用" - - #: ../gio/gemblem.c:323 --#, c-format --msgid "Can't handle version %d of GEmblem encoding" -+#, fuzzy, c-format -+msgid "Can’t handle version %d of GEmblem encoding" - msgstr "无法处理 GEmblem 编码的版本 %d " - - #: ../gio/gemblem.c:333 -@@ -1245,8 +1313,8 @@ msgid "Malformed number of tokens (%d) in GEmblem encoding" - msgstr "GEmblem 编码中有不正确的符号数量(%d)" - - #: ../gio/gemblemedicon.c:362 --#, c-format --msgid "Can't handle version %d of GEmblemedIcon encoding" -+#, fuzzy, c-format -+msgid "Can’t handle version %d of GEmblemedIcon encoding" - msgstr "无法处理 GEmblemedIcon 编码的版本 %d" - - #: ../gio/gemblemedicon.c:372 -@@ -1258,15 +1326,14 @@ msgstr "GEmblemedIcon 编码中有不正确的符号数量(%d)" - msgid "Expected a GEmblem for GEmblemedIcon" - msgstr "GEmblemedIcon 中应为 GEmblem" - --#: ../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/win32/gwinhttpfile.c:437 -+#: ../gio/gfile.c:1070 ../gio/gfile.c:1308 ../gio/gfile.c:1446 -+#: ../gio/gfile.c:1684 ../gio/gfile.c:1739 ../gio/gfile.c:1797 -+#: ../gio/gfile.c:1881 ../gio/gfile.c:1938 ../gio/gfile.c:2002 -+#: ../gio/gfile.c:2057 ../gio/gfile.c:3792 ../gio/gfile.c:3847 -+#: ../gio/gfile.c:4125 ../gio/gfile.c:4593 ../gio/gfile.c:5004 -+#: ../gio/gfile.c:5089 ../gio/gfile.c:5179 ../gio/gfile.c:5276 -+#: ../gio/gfile.c:5363 ../gio/gfile.c:5464 ../gio/gfile.c:8174 -+#: ../gio/gfile.c:8264 ../gio/gfile.c:8348 ../gio/win32/gwinhttpfile.c:437 - msgid "Operation not supported" - msgstr "不支持该操作" - -@@ -1274,69 +1341,92 @@ msgstr "不支持该操作" - #. * trying to find the enclosing (user visible) - #. * mount of a file, but none exists. - #. --#: ../gio/gfile.c:1468 -+#: ../gio/gfile.c:1569 - msgid "Containing mount does not exist" - msgstr "包含的挂载不存在" - --#: ../gio/gfile.c:2515 ../gio/glocalfile.c:2374 --msgid "Can't copy over directory" -+#: ../gio/gfile.c:2616 ../gio/glocalfile.c:2430 -+#, fuzzy -+msgid "Can’t copy over directory" - msgstr "无法跨目录复制" - --#: ../gio/gfile.c:2575 --msgid "Can't copy directory over directory" -+#: ../gio/gfile.c:2676 -+#, fuzzy -+msgid "Can’t copy directory over directory" - msgstr "无法跨目录复制到目录" - --#: ../gio/gfile.c:2583 -+#: ../gio/gfile.c:2684 - msgid "Target file exists" - msgstr "目标文件已存在" - --#: ../gio/gfile.c:2602 --msgid "Can't recursively copy directory" -+#: ../gio/gfile.c:2703 -+#, fuzzy -+msgid "Can’t recursively copy directory" - msgstr "无法递归复制目录" - --#: ../gio/gfile.c:2884 -+#: ../gio/gfile.c:2978 - msgid "Splice not supported" - msgstr "不支持拼接" - --#: ../gio/gfile.c:2888 -+#: ../gio/gfile.c:2982 ../gio/gfile.c:3027 - #, c-format - msgid "Error splicing file: %s" - msgstr "拼接文件时出错：%s" - --#: ../gio/gfile.c:3019 -+#: ../gio/gfile.c:3143 - msgid "Copy (reflink/clone) between mounts is not supported" - msgstr "不支持在挂载之间复制(reflink/clone)" - --#: ../gio/gfile.c:3023 -+#: ../gio/gfile.c:3147 - msgid "Copy (reflink/clone) is not supported or invalid" - msgstr "不支持复制(reflink/clone)操作或操作非法" - --#: ../gio/gfile.c:3028 --msgid "Copy (reflink/clone) is not supported or didn't work" -+#: ../gio/gfile.c:3152 -+#, fuzzy -+msgid "Copy (reflink/clone) is not supported or didn’t work" - msgstr "不支持复制(reflink/clone)操作或者不工作" - --#: ../gio/gfile.c:3091 --msgid "Can't copy special file" -+#: ../gio/gfile.c:3216 -+#, fuzzy -+msgid "Can’t copy special file" - msgstr "无法复制特殊文件" - --#: ../gio/gfile.c:3885 -+#: ../gio/gfile.c:3502 -+msgid "" -+"The file is too large, the fat format file system only supports files within " -+"4G,can be imported in device after compression" -+msgstr "文件太大，fat格式文件系统只支持4G以内的文件，压缩后可以导入设备" -+ -+#: ../gio/gfile.c:3727 -+#, fuzzy -+msgid "" -+"The file is too large, the fat format file system only supports files within " -+"4G,can be moved in device after compression" -+msgstr "文件太大，fat格式文件系统只支持4G以内的文件，压缩后可以导入设备" -+ -+#: ../gio/gfile.c:4073 - msgid "Invalid symlink value given" - msgstr "给出的符号链接值无效" - --#: ../gio/gfile.c:4046 -+#: ../gio/gfile.c:4083 ../glib/gfileutils.c:2172 -+msgid "Symbolic links not supported" -+msgstr "不支持符号链接" -+ -+#: ../gio/gfile.c:4234 - msgid "Trash not supported" - msgstr "不支持回收站" - --#: ../gio/gfile.c:4158 --#, c-format --msgid "File names cannot contain '%c'" -+#: ../gio/gfile.c:4346 -+#, fuzzy, c-format -+msgid "File names cannot contain “%c”" - msgstr "文件名不能包含“%c”" - --#: ../gio/gfile.c:6604 ../gio/gvolume.c:363 --msgid "volume doesn't implement mount" -+#: ../gio/gfile.c:6827 ../gio/gvolume.c:364 -+#, fuzzy -+msgid "volume doesn’t implement mount" - msgstr "卷未实现挂载" - --#: ../gio/gfile.c:6713 -+#: ../gio/gfile.c:6941 ../gio/gfile.c:6989 - msgid "No application is registered as handling this file" - msgstr "没有为此类型文件注册相应的处理程序" - -@@ -1354,8 +1444,8 @@ msgid "File enumerator is already closed" - msgstr "文件枚举器已关闭" - - #: ../gio/gfileicon.c:236 --#, c-format --msgid "Can't handle version %d of GFileIcon encoding" -+#, fuzzy, c-format -+msgid "Can’t handle version %d of GFileIcon encoding" - msgstr "无法处理 GFileIcon 编码的版本 %d" - - #: ../gio/gfileicon.c:246 -@@ -1365,7 +1455,8 @@ msgstr "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" -+#, fuzzy -+msgid "Stream doesn’t support query_info" - msgstr "流不支持 query_info" - - #: ../gio/gfileinputstream.c:325 ../gio/gfileiostream.c:379 -@@ -1381,63 +1472,69 @@ msgstr "输入流不允许截断" - msgid "Truncate not supported on stream" - msgstr "流不支持截断" - --#: ../gio/ghttpproxy.c:136 -+#: ../gio/ghttpproxy.c:91 ../gio/gresolver.c:443 ../gio/gresolver.c:595 -+#: ../glib/gconvert.c:1777 -+msgid "Invalid hostname" -+msgstr "无效的主机名" -+ -+#: ../gio/ghttpproxy.c:143 - msgid "Bad HTTP proxy reply" - msgstr "非法的 HTTP 代理服务器回复" - --#: ../gio/ghttpproxy.c:152 -+#: ../gio/ghttpproxy.c:159 - msgid "HTTP proxy connection not allowed" - msgstr "不允许 HTTP 代理连接" - --#: ../gio/ghttpproxy.c:157 -+#: ../gio/ghttpproxy.c:164 - msgid "HTTP proxy authentication failed" - msgstr "HTTP 代理服务器认证失败" - --#: ../gio/ghttpproxy.c:160 -+#: ../gio/ghttpproxy.c:167 - msgid "HTTP proxy authentication required" - msgstr "HTTP 代理服务器需要认证" - --#: ../gio/ghttpproxy.c:164 -+#: ../gio/ghttpproxy.c:171 - #, c-format - msgid "HTTP proxy connection failed: %i" - msgstr "连接到 HTTP 代理失败: %i" - --#: ../gio/ghttpproxy.c:260 -+#: ../gio/ghttpproxy.c:269 - msgid "HTTP proxy server closed connection unexpectedly." - msgstr "HTTP 代理服务器意外关闭连接。" - --#: ../gio/gicon.c:290 -+#: ../gio/gicon.c:298 - #, c-format - msgid "Wrong number of tokens (%d)" - msgstr "错误的符号数量(%d)" - --#: ../gio/gicon.c:310 -+#: ../gio/gicon.c:318 - #, c-format - msgid "No type for class name %s" - msgstr "类名 %s 没有类型" - --#: ../gio/gicon.c:320 -+#: ../gio/gicon.c:328 - #, c-format - msgid "Type %s does not implement the GIcon interface" - msgstr "类型 %s 没有实现 GIcon 接口" - --#: ../gio/gicon.c:331 -+#: ../gio/gicon.c:339 - #, c-format - msgid "Type %s is not classed" - msgstr "类型 %s 不是类" - --#: ../gio/gicon.c:345 -+#: ../gio/gicon.c:353 - #, c-format - msgid "Malformed version number: %s" - msgstr "不正确的版本号：%s" - --#: ../gio/gicon.c:359 -+#: ../gio/gicon.c:367 - #, c-format - msgid "Type %s does not implement from_tokens() on the GIcon interface" - msgstr "类型 %s 没有实现 GIcon 接口的 from_tokens() 方法" - --#: ../gio/gicon.c:461 --msgid "Can't handle the supplied version of the icon encoding" -+#: ../gio/gicon.c:469 -+#, fuzzy -+msgid "Can’t handle the supplied version of the icon encoding" - msgstr "无法处理提供的图标编码版本" - - #: ../gio/ginetaddressmask.c:182 -@@ -1454,12 +1551,12 @@ msgid "Address has bits set beyond prefix length" - msgstr "地址位数设得超出了前缀长度" - - #: ../gio/ginetaddressmask.c:300 --#, c-format --msgid "Could not parse '%s' as IP address mask" -+#, fuzzy, c-format -+msgid "Could not parse “%s” as IP address mask" - msgstr "不能将“%s”解析为 IP 地址掩码" - - #: ../gio/ginetsocketaddress.c:203 ../gio/ginetsocketaddress.c:220 --#: ../gio/gnativesocketaddress.c:106 ../gio/gunixsocketaddress.c:216 -+#: ../gio/gnativesocketaddress.c:109 ../gio/gunixsocketaddress.c:220 - msgid "Not enough space for socket address" - msgstr "没有足够的空间套接字地址" - -@@ -1468,7 +1565,8 @@ msgid "Unsupported socket address" - msgstr "不支持的套接字地址" - - #: ../gio/ginputstream.c:188 --msgid "Input stream doesn't implement read" -+#, fuzzy -+msgid "Input stream doesn’t implement read" - msgstr "输入流未实现读取" - - #. Translators: This is an error you get if there is already an -@@ -1478,120 +1576,126 @@ msgstr "输入流未实现读取" - #. * already an operation running against this stream when - #. * you try to start one - #: ../gio/ginputstream.c:1218 ../gio/giostream.c:310 --#: ../gio/goutputstream.c:1670 -+#: ../gio/goutputstream.c:2208 - msgid "Stream has outstanding operation" - msgstr "流有异常操作" - --#: ../gio/gio-tool.c:142 -+#: ../gio/gio-tool.c:160 - msgid "Copy with file" - msgstr "复制文件时保留" - --#: ../gio/gio-tool.c:146 -+#: ../gio/gio-tool.c:164 - msgid "Keep with file when moved" - msgstr "移动时与文件一起" - --#: ../gio/gio-tool.c:187 --msgid "'version' takes no arguments" -+#: ../gio/gio-tool.c:205 -+#, fuzzy -+msgid "“version” takes no arguments" - msgstr "“version”不接受参数" - --#: ../gio/gio-tool.c:189 ../gio/gio-tool.c:205 ../glib/goption.c:857 -+#: ../gio/gio-tool.c:207 ../gio/gio-tool.c:223 ../glib/goption.c:864 - msgid "Usage:" - msgstr "用法：" - --#: ../gio/gio-tool.c:192 -+#: ../gio/gio-tool.c:210 - msgid "Print version information and exit." - msgstr "打印版本信息并退出。" - --#: ../gio/gio-tool.c:208 -+#: ../gio/gio-tool.c:226 - msgid "Commands:" - msgstr "命令：" - --#: ../gio/gio-tool.c:211 -+#: ../gio/gio-tool.c:229 - msgid "Concatenate files to standard output" - msgstr "串接文件，写到标准输出" - --#: ../gio/gio-tool.c:212 -+#: ../gio/gio-tool.c:230 - msgid "Copy one or more files" - msgstr "复制文件" - --#: ../gio/gio-tool.c:213 -+#: ../gio/gio-tool.c:231 - msgid "Show information about locations" - msgstr "显示关于位置的信息" - --#: ../gio/gio-tool.c:214 -+#: ../gio/gio-tool.c:232 - msgid "List the contents of locations" - msgstr "列出某位置的内容" - --#: ../gio/gio-tool.c:215 -+#: ../gio/gio-tool.c:233 - msgid "Get or set the handler for a mimetype" - msgstr "获取或设置某种 MIME 类型的处理程序" - --#: ../gio/gio-tool.c:216 -+#: ../gio/gio-tool.c:234 - msgid "Create directories" - msgstr "创建目录" - --#: ../gio/gio-tool.c:217 -+#: ../gio/gio-tool.c:235 - msgid "Monitor files and directories for changes" - msgstr "监视文件和目录更改" - --#: ../gio/gio-tool.c:218 -+#: ../gio/gio-tool.c:236 - msgid "Mount or unmount the locations" - msgstr "挂载或卸载位置" - --#: ../gio/gio-tool.c:219 -+#: ../gio/gio-tool.c:237 - msgid "Move one or more files" - msgstr "移动文件" - --#: ../gio/gio-tool.c:220 -+#: ../gio/gio-tool.c:238 - msgid "Open files with the default application" - msgstr "用默认应用打开文件" - --#: ../gio/gio-tool.c:221 -+#: ../gio/gio-tool.c:239 - msgid "Rename a file" - msgstr "重命名文件" - --#: ../gio/gio-tool.c:222 -+#: ../gio/gio-tool.c:240 - msgid "Delete one or more files" - msgstr "删除文件" - --#: ../gio/gio-tool.c:223 -+#: ../gio/gio-tool.c:241 - msgid "Read from standard input and save" - msgstr "从标准输入读取并保存" - --#: ../gio/gio-tool.c:224 -+#: ../gio/gio-tool.c:242 - msgid "Set a file attribute" - msgstr "设置文件属性" - --#: ../gio/gio-tool.c:225 -+#: ../gio/gio-tool.c:243 - msgid "Move files or directories to the trash" - msgstr "移动文件或目录到回收站" - --#: ../gio/gio-tool.c:226 -+#: ../gio/gio-tool.c:244 - msgid "Lists the contents of locations in a tree" - msgstr "在树中列出某位置的内容" - --#: ../gio/gio-tool.c:228 -+#: ../gio/gio-tool.c:246 - #, c-format - msgid "Use %s to get detailed help.\n" - msgstr "使用 %s 以获取详细帮助\n" - -+#: ../gio/gio-tool-cat.c:87 -+#, fuzzy -+msgid "Error writing to stdout" -+msgstr "写入文件出错：%s" -+ - #. 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-cat.c:133 ../gio/gio-tool-info.c:333 -+#: ../gio/gio-tool-list.c:172 ../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-monitor.c:203 ../gio/gio-tool-mount.c:1199 -+#: ../gio/gio-tool-open.c:70 ../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 -+#: ../gio/gio-tool-cat.c:138 - msgid "Concatenate files and print to standard output." - msgstr "串接文件，写到标准输出。" - --#: ../gio/gio-tool-cat.c:131 -+#: ../gio/gio-tool-cat.c:140 - 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" -@@ -1600,56 +1704,63 @@ 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-cat.c:162 ../gio/gio-tool-info.c:364 -+#: ../gio/gio-tool-mkdir.c:76 ../gio/gio-tool-monitor.c:228 -+#: ../gio/gio-tool-mount.c:1250 ../gio/gio-tool-open.c:96 -+#: ../gio/gio-tool-remove.c:72 ../gio/gio-tool-trash.c:136 -+msgid "No locations given" -+msgstr "未给出位置" - --#: ../gio/gio-tool-copy.c:42 ../gio/gio-tool-move.c:38 -+#: ../gio/gio-tool-copy.c:43 ../gio/gio-tool-move.c:38 - msgid "No target directory" - msgstr "无目标目录" - --#: ../gio/gio-tool-copy.c:43 ../gio/gio-tool-move.c:39 -+#: ../gio/gio-tool-copy.c:44 ../gio/gio-tool-move.c:39 - msgid "Show progress" - msgstr "显示进度" - --#: ../gio/gio-tool-copy.c:44 ../gio/gio-tool-move.c:40 -+#: ../gio/gio-tool-copy.c:45 ../gio/gio-tool-move.c:40 - msgid "Prompt before overwrite" - msgstr "覆盖前提示" - --#: ../gio/gio-tool-copy.c:45 -+#: ../gio/gio-tool-copy.c:46 - msgid "Preserve all attributes" - msgstr "保留所有属性" - --#: ../gio/gio-tool-copy.c:46 ../gio/gio-tool-move.c:41 -+#: ../gio/gio-tool-copy.c:47 ../gio/gio-tool-move.c:41 - #: ../gio/gio-tool-save.c:49 - msgid "Backup existing destination files" - msgstr "备份已存在的目标文件" - --#: ../gio/gio-tool-copy.c:47 -+#: ../gio/gio-tool-copy.c:48 - msgid "Never follow symbolic links" - msgstr "从不跟随符号链接" - --#: ../gio/gio-tool-copy.c:72 ../gio/gio-tool-move.c:67 -+#: ../gio/gio-tool-copy.c:49 -+msgid "Use default permissions for the destination" -+msgstr "" -+ -+#: ../gio/gio-tool-copy.c:74 ../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 -+#: ../gio/gio-tool-copy.c:100 ../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 -+#: ../gio/gio-tool-copy.c:100 ../gio/gio-tool-move.c:94 -+#: ../gio/gio-tool-save.c:160 - msgid "DESTINATION" - msgstr "目标" - --#: ../gio/gio-tool-copy.c:103 -+#: ../gio/gio-tool-copy.c:105 - msgid "Copy one or more files from SOURCE to DESTINATION." - msgstr "将一个或多个文件从源头复制到目标" - --#: ../gio/gio-tool-copy.c:105 -+#: ../gio/gio-tool-copy.c:107 - 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" -@@ -1658,131 +1769,139 @@ msgstr "" - "glib copy 如传统 cp 程序那样工作，但使用 GIO 位置而非本地文件：\n" - "例如，你可以指定 smb://server/resource/file.txt 之类的位置。" - --#: ../gio/gio-tool-copy.c:143 -+#: ../gio/gio-tool-copy.c:149 - #, 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'? " -+#: ../gio/gio-tool-copy.c:196 ../gio/gio-tool-move.c:186 -+#, fuzzy, c-format -+msgid "%s: overwrite “%s”? " - msgstr "%s：要覆盖“%s”吗？" - --#: ../gio/gio-tool-info.c:34 -+#: ../gio/gio-tool-info.c:37 - msgid "List writable attributes" - msgstr "列出可写属性" - --#: ../gio/gio-tool-info.c:35 -+#: ../gio/gio-tool-info.c:38 - msgid "Get file system info" - msgstr "读取文件系统信息" - --#: ../gio/gio-tool-info.c:36 ../gio/gio-tool-list.c:35 -+#: ../gio/gio-tool-info.c:39 ../gio/gio-tool-list.c:36 - msgid "The attributes to get" - msgstr "要获取的属性" - --#: ../gio/gio-tool-info.c:36 ../gio/gio-tool-list.c:35 -+#: ../gio/gio-tool-info.c:39 ../gio/gio-tool-list.c:36 - 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" -+#: ../gio/gio-tool-info.c:40 ../gio/gio-tool-list.c:39 ../gio/gio-tool-set.c:34 -+#, fuzzy -+msgid "Don’t follow symbolic links" - msgstr "不要跟随符号链接" - --#: ../gio/gio-tool-info.c:75 -+#: ../gio/gio-tool-info.c:78 - #, 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 -+#: ../gio/gio-tool-info.c:134 - #, 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 -+#: ../gio/gio-tool-info.c:139 - #, c-format - msgid "edit name: %s\n" - msgstr "编辑名称：%s\n" - --#: ../gio/gio-tool-info.c:138 -+#: ../gio/gio-tool-info.c:145 - #, c-format - msgid "name: %s\n" - msgstr "名称：%s\n" - --#: ../gio/gio-tool-info.c:145 -+#: ../gio/gio-tool-info.c:152 - #, c-format - msgid "type: %s\n" - msgstr "类型：%s\n" - --#: ../gio/gio-tool-info.c:151 -+#: ../gio/gio-tool-info.c:158 - #, c-format - msgid "size: " - msgstr "大小：" - --#: ../gio/gio-tool-info.c:156 -+#: ../gio/gio-tool-info.c:163 - #, c-format - msgid "hidden\n" - msgstr "隐藏\n" - --#: ../gio/gio-tool-info.c:159 -+#: ../gio/gio-tool-info.c:166 - #, c-format - msgid "uri: %s\n" - msgstr "uri：%s\n" - --#: ../gio/gio-tool-info.c:221 -+#: ../gio/gio-tool-info.c:172 -+#, c-format -+msgid "local path: %s\n" -+msgstr "" -+ -+#: ../gio/gio-tool-info.c:199 - #, c-format --msgid "Error getting writable attributes: %s\n" --msgstr "获取可写属性出错：%s\n" -+msgid "unix mount: %s%s %s %s %s\n" -+msgstr "" - --#: ../gio/gio-tool-info.c:226 -+#: ../gio/gio-tool-info.c:279 - #, c-format - msgid "Settable attributes:\n" - msgstr "可设置的属性：\n" - --#: ../gio/gio-tool-info.c:249 -+#: ../gio/gio-tool-info.c:303 - #, c-format - msgid "Writable attribute namespaces:\n" - msgstr "可写的属性命名空间：\n" - --#: ../gio/gio-tool-info.c:283 -+#: ../gio/gio-tool-info.c:338 - msgid "Show information about locations." - msgstr "显示位置信息。" - --#: ../gio/gio-tool-info.c:285 -+#: ../gio/gio-tool-info.c:340 -+#, fuzzy - 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" -+"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 -+#: ../gio/gio-tool-list.c:37 ../gio/gio-tool-tree.c:32 - msgid "Show hidden files" - msgstr "显示隐藏文件" - --#: ../gio/gio-tool-list.c:37 -+#: ../gio/gio-tool-list.c:38 - msgid "Use a long listing format" - msgstr "使用长列表格式" - --#: ../gio/gio-tool-list.c:39 -+#: ../gio/gio-tool-list.c:40 -+#, fuzzy -+msgid "Print display names" -+msgstr "显示名称：%s\n" -+ -+#: ../gio/gio-tool-list.c:41 - msgid "Print full URIs" - msgstr "显示完整 URI" - --#: ../gio/gio-tool-list.c:170 -+#: ../gio/gio-tool-list.c:177 - msgid "List the contents of the locations." - msgstr "列出位置中的内容。" - --#: ../gio/gio-tool-list.c:172 -+#: ../gio/gio-tool-list.c:179 - 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" -@@ -1816,48 +1935,48 @@ msgstr "" - "应用程序。如果已给定处理程序，它将被设为 MIME 类型的\n" - "默认应用程序。" - --#: ../gio/gio-tool-mime.c:98 -+#: ../gio/gio-tool-mime.c:100 - 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" -+#: ../gio/gio-tool-mime.c:116 -+#, fuzzy, 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" -+#: ../gio/gio-tool-mime.c:122 -+#, fuzzy, c-format -+msgid "Default application for “%s”: %s\n" - msgstr "用于“%s”的默认应用程序：%s\n" - --#: ../gio/gio-tool-mime.c:124 -+#: ../gio/gio-tool-mime.c:127 - #, c-format - msgid "Registered applications:\n" - msgstr "已注册的应用程序：\n" - --#: ../gio/gio-tool-mime.c:126 -+#: ../gio/gio-tool-mime.c:129 - #, c-format - msgid "No registered applications\n" - msgstr "无已注册的应用程序\n" - --#: ../gio/gio-tool-mime.c:137 -+#: ../gio/gio-tool-mime.c:140 - #, c-format - msgid "Recommended applications:\n" - msgstr "推荐的应用程序：\n" - --#: ../gio/gio-tool-mime.c:139 -+#: ../gio/gio-tool-mime.c:142 - #, 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" -+#: ../gio/gio-tool-mime.c:162 -+#, fuzzy, c-format -+msgid "Failed to load info for handler “%s”" - msgstr "读取处理程序“%s”的信息失败\n" - --#: ../gio/gio-tool-mime.c:165 --#, c-format --msgid "Failed to set '%s' as the default handler for '%s': %s\n" -+#: ../gio/gio-tool-mime.c:168 -+#, fuzzy, 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 -@@ -1890,7 +2009,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" -+#, fuzzy -+msgid "Monitors a file directly, but doesn’t report changes" - msgstr "直接监视文件，但不报告更改" - - #: ../gio/gio-tool-monitor.c:45 -@@ -1901,105 +2021,108 @@ msgstr "将移动和重命名报告为简单的删除/创建事件" - msgid "Watch for mount events" - msgstr "检测挂载事件" - --#: ../gio/gio-tool-monitor.c:207 -+#: ../gio/gio-tool-monitor.c:208 - msgid "Monitor files or directories for changes." - msgstr "监视文件和目录更改。" - --#: ../gio/gio-tool-mount.c:58 -+#: ../gio/gio-tool-mount.c:63 - msgid "Mount as mountable" - msgstr "挂载，作为可挂载设备" - --#: ../gio/gio-tool-mount.c:59 --msgid "Mount volume with device file" -+#: ../gio/gio-tool-mount.c:64 -+#, fuzzy -+msgid "Mount volume with device file, or other identifier" - msgstr "使用设备文件挂载卷" - --#: ../gio/gio-tool-mount.c:59 --msgid "DEVICE" --msgstr "设备" -+#: ../gio/gio-tool-mount.c:64 -+msgid "ID" -+msgstr "" - --#: ../gio/gio-tool-mount.c:60 -+#: ../gio/gio-tool-mount.c:65 - msgid "Unmount" - msgstr "卸载" - --#: ../gio/gio-tool-mount.c:61 -+#: ../gio/gio-tool-mount.c:66 - msgid "Eject" - msgstr "弹出" - --#: ../gio/gio-tool-mount.c:62 -+#: ../gio/gio-tool-mount.c:67 -+#, fuzzy -+msgid "Stop drive with device file" -+msgstr "使用设备文件挂载卷" -+ -+#: ../gio/gio-tool-mount.c:67 -+msgid "DEVICE" -+msgstr "设备" -+ -+#: ../gio/gio-tool-mount.c:68 - msgid "Unmount all mounts with the given scheme" - msgstr "卸载所有带有指定方案的挂载点" - --#: ../gio/gio-tool-mount.c:62 -+#: ../gio/gio-tool-mount.c:68 - msgid "SCHEME" - msgstr "方案" - --#: ../gio/gio-tool-mount.c:63 -+#: ../gio/gio-tool-mount.c:69 - msgid "Ignore outstanding file operations when unmounting or ejecting" - msgstr "卸载或弹出时忽略正在进行的文件操作" - --#: ../gio/gio-tool-mount.c:64 -+#: ../gio/gio-tool-mount.c:70 - 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 -+#: ../gio/gio-tool-mount.c:72 - msgid "List" - msgstr "列出" - --#: ../gio/gio-tool-mount.c:67 -+#: ../gio/gio-tool-mount.c:73 - msgid "Monitor events" - msgstr "监视事件" - --#: ../gio/gio-tool-mount.c:68 -+#: ../gio/gio-tool-mount.c:74 - 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:75 -+msgid "The numeric PIM when unlocking a VeraCrypt volume" -+msgstr "" - --#: ../gio/gio-tool-mount.c:341 --#, c-format --msgid "Error unmounting mount: %s\n" --msgstr "卸载挂载点出错：%s\n" -+#: ../gio/gio-tool-mount.c:75 -+#, fuzzy -+msgid "PIM" -+msgstr "下午" - --#: ../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:76 -+msgid "Mount a TCRYPT hidden volume" -+msgstr "" - --#: ../gio/gio-tool-mount.c:394 --#, c-format --msgid "Error ejecting mount: %s\n" --msgstr "弹出挂载出错：%s\n" -+#: ../gio/gio-tool-mount.c:77 -+msgid "Mount a TCRYPT system volume" -+msgstr "" - --#: ../gio/gio-tool-mount.c:875 --#, c-format --msgid "Error mounting %s: %s\n" --msgstr "挂载 %s 出错：%s\n" -+#: ../gio/gio-tool-mount.c:265 ../gio/gio-tool-mount.c:297 -+#, fuzzy -+msgid "Anonymous access denied" -+msgstr "挂载位置出错：匿名访问被拒绝\n" - --#: ../gio/gio-tool-mount.c:891 --#, c-format --msgid "Mounted %s at %s\n" --msgstr "已将 %s 挂载为 %s\n" -+#: ../gio/gio-tool-mount.c:522 -+#, fuzzy -+msgid "No drive for device file" -+msgstr "设备文件 %s 中无卷\n" - --#: ../gio/gio-tool-mount.c:941 --#, c-format --msgid "No volume for device file %s\n" -+#: ../gio/gio-tool-mount.c:1014 -+#, fuzzy -+msgid "No volume for given ID" - msgstr "设备文件 %s 中无卷\n" - --#: ../gio/gio-tool-mount.c:1136 -+#: ../gio/gio-tool-mount.c:1203 - msgid "Mount or unmount the locations." - msgstr "挂载或卸载位置。" - - #: ../gio/gio-tool-move.c:42 --msgid "Don't use copy and delete fallback" -+#, fuzzy -+msgid "Don’t use copy and delete fallback" - msgstr "不要使用复制和删除替代方案" - - #: ../gio/gio-tool-move.c:99 -@@ -2015,21 +2138,17 @@ msgstr "" - "glib mv 如传统 mv 程序那样工作，但使用 GIO 位置而非本地文件：\n" - "例如，你可以指定 smb://server/resource/file.txt 之类的位置。" - --#: ../gio/gio-tool-move.c:139 -+#: ../gio/gio-tool-move.c:143 - #, c-format - msgid "Target %s is not a directory" - msgstr "目标 %s 不是目录" - --#: ../gio/gio-tool-open.c:50 -+#: ../gio/gio-tool-open.c:75 - 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 "忽略不存在的文件，从不提示" -@@ -2038,10 +2157,6 @@ msgstr "忽略不存在的文件，从不提示" - 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 "名称" -@@ -2050,16 +2165,16 @@ msgstr "名称" - msgid "Rename a file." - msgstr "重命名文件。" - --#: ../gio/gio-tool-rename.c:68 -+#: ../gio/gio-tool-rename.c:70 - msgid "Missing argument" - msgstr "缺少参数" - --#: ../gio/gio-tool-rename.c:73 ../gio/gio-tool-save.c:192 --#: ../gio/gio-tool-set.c:134 -+#: ../gio/gio-tool-rename.c:76 ../gio/gio-tool-save.c:190 -+#: ../gio/gio-tool-set.c:137 - msgid "Too many arguments" - msgstr "参数过多" - --#: ../gio/gio-tool-rename.c:91 -+#: ../gio/gio-tool-rename.c:95 - #, c-format - msgid "Rename successful. New uri: %s\n" - msgstr "重命名成功。新 uri：%s\n" -@@ -2094,17 +2209,22 @@ msgstr "文件的 etag 被覆盖" - msgid "ETAG" - msgstr "ETAG" - -+#: ../gio/gio-tool-save.c:113 -+#, fuzzy -+msgid "Error reading from standard input" -+msgstr "读取句柄出错：%s" -+ - #. Translators: The "etag" is a token allowing to verify whether a file has been modified --#: ../gio/gio-tool-save.c:145 -+#: ../gio/gio-tool-save.c:139 - #, c-format - msgid "Etag not available\n" - msgstr "ETAG 不可用\n" - --#: ../gio/gio-tool-save.c:168 -+#: ../gio/gio-tool-save.c:163 - msgid "Read from standard input and save to DEST." - msgstr "读取标准输入并保存到目标。" - --#: ../gio/gio-tool-save.c:186 -+#: ../gio/gio-tool-save.c:183 - msgid "No destination given" - msgstr "未给出目标" - -@@ -2128,28 +2248,23 @@ msgstr "值" - msgid "Set a file attribute of LOCATION." - msgstr "设置位置的文件属性。" - --#: ../gio/gio-tool-set.c:111 -+#: ../gio/gio-tool-set.c:113 - msgid "Location not specified" - msgstr "未指定位置" - --#: ../gio/gio-tool-set.c:119 -+#: ../gio/gio-tool-set.c:120 - msgid "Attribute not specified" - msgstr "未指定属性" - --#: ../gio/gio-tool-set.c:128 -+#: ../gio/gio-tool-set.c:130 - msgid "Value not specified" - msgstr "未指定值" - --#: ../gio/gio-tool-set.c:176 --#, c-format --msgid "Invalid attribute type %s\n" -+#: ../gio/gio-tool-set.c:180 -+#, fuzzy, c-format -+msgid "Invalid attribute type “%s”" - 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 "清空回收站" -@@ -2166,109 +2281,130 @@ msgstr "跟踪符号链接、挂载和快捷方式" - msgid "List contents of directories in a tree-like format." - msgstr "使用树状格式列出目录内容。" - --#: ../gio/glib-compile-resources.c:142 ../gio/glib-compile-schemas.c:1491 -+#: ../gio/glib-compile-resources.c:140 ../gio/glib-compile-schemas.c:1518 - #, c-format - msgid "Element <%s> not allowed inside <%s>" - msgstr "在 <%2$s> 中不允许元素 <%1$s>" - --#: ../gio/glib-compile-resources.c:146 -+#: ../gio/glib-compile-resources.c:144 - #, c-format - msgid "Element <%s> not allowed at toplevel" - msgstr "顶层中不允许元素 <%s>" - --#: ../gio/glib-compile-resources.c:237 -+#: ../gio/glib-compile-resources.c:234 - #, c-format - msgid "File %s appears multiple times in the resource" - msgstr "文件 %s 在资源中出现了多次" - --#: ../gio/glib-compile-resources.c:248 --#, c-format --msgid "Failed to locate '%s' in any source directory" -+#: ../gio/glib-compile-resources.c:245 -+#, fuzzy, c-format -+msgid "Failed to locate “%s” in any source directory" - msgstr "在所有源目录中定位“%s”失败" - --#: ../gio/glib-compile-resources.c:259 --#, c-format --msgid "Failed to locate '%s' in current directory" -+#: ../gio/glib-compile-resources.c:256 -+#, fuzzy, c-format -+msgid "Failed to locate “%s” in current directory" - msgstr "在当前目录定位“%s”失败" - - #: ../gio/glib-compile-resources.c:290 --#, c-format --msgid "Unknown processing option \"%s\"" -+#, fuzzy, c-format -+msgid "Unknown processing option “%s”" - msgstr "未知的处理选项“%s”" - --#: ../gio/glib-compile-resources.c:308 ../gio/glib-compile-resources.c:354 -+#. Translators: the first %s is a gresource XML attribute, -+#. * the second %s is an environment variable, and the third -+#. * %s is a command line tool -+#. -+#: ../gio/glib-compile-resources.c:310 ../gio/glib-compile-resources.c:367 -+#: ../gio/glib-compile-resources.c:424 - #, c-format --msgid "Failed to create temp file: %s" --msgstr "创建临时文件失败：%s" -+msgid "%s preprocessing requested, but %s is not set, and %s is not in PATH" -+msgstr "" - --#: ../gio/glib-compile-resources.c:382 -+#: ../gio/glib-compile-resources.c:457 - #, c-format - msgid "Error reading file %s: %s" - msgstr "读取文件 %s 出错：%s" - --#: ../gio/glib-compile-resources.c:402 -+#: ../gio/glib-compile-resources.c:477 - #, c-format - msgid "Error compressing file %s" - msgstr "压缩文件时出错：%s" - --#: ../gio/glib-compile-resources.c:469 ../gio/glib-compile-schemas.c:1603 -+#: ../gio/glib-compile-resources.c:541 - #, c-format - msgid "text may not appear inside <%s>" - msgstr "<%s> 内不应出现文本" - --#: ../gio/glib-compile-resources.c:621 ../gio/glib-compile-schemas.c:2037 -+#: ../gio/glib-compile-resources.c:737 ../gio/glib-compile-schemas.c:2176 - msgid "Show program version and exit" - msgstr "显示程序版本并退出" - --#: ../gio/glib-compile-resources.c:622 --msgid "name of the output file" -+#: ../gio/glib-compile-resources.c:738 -+#, fuzzy -+msgid "Name of the output file" - msgstr "输出文件名" - --#: ../gio/glib-compile-resources.c:623 -+#: ../gio/glib-compile-resources.c:739 -+#, fuzzy - msgid "" --"The directories where files are to be read from (default to current " -+"The directories to load files referenced in FILE from (default: current " - "directory)" - msgstr "文件会被读出的目录(默认为当前目录)" - --#: ../gio/glib-compile-resources.c:623 ../gio/glib-compile-schemas.c:2038 --#: ../gio/glib-compile-schemas.c:2067 -+#: ../gio/glib-compile-resources.c:739 ../gio/glib-compile-schemas.c:2177 -+#: ../gio/glib-compile-schemas.c:2206 - msgid "DIRECTORY" - msgstr "DIRECTORY" - --#: ../gio/glib-compile-resources.c:624 -+#: ../gio/glib-compile-resources.c:740 - msgid "" - "Generate output in the format selected for by the target filename extension" - msgstr "以目标文件扩展名所选择的格式生成输出" - --#: ../gio/glib-compile-resources.c:625 -+#: ../gio/glib-compile-resources.c:741 - msgid "Generate source header" - msgstr "生成源码头文件" - --#: ../gio/glib-compile-resources.c:626 --msgid "Generate sourcecode used to link in the resource file into your code" -+#: ../gio/glib-compile-resources.c:742 -+#, fuzzy -+msgid "Generate source code used to link in the resource file into your code" - msgstr "生成用于将资源文件链接到您的代码的源代码" - --#: ../gio/glib-compile-resources.c:627 -+#: ../gio/glib-compile-resources.c:743 - msgid "Generate dependency list" - msgstr "生成依赖关系列表" - --#: ../gio/glib-compile-resources.c:628 --msgid "name of the dependency file to generate" -+#: ../gio/glib-compile-resources.c:744 -+#, fuzzy -+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:745 -+msgid "Include phony targets in the generated dependency file" -+msgstr "" -+ -+#: ../gio/glib-compile-resources.c:746 -+#, fuzzy -+msgid "Don’t automatically create and register resource" - msgstr "不要自动创建和注册资源" - --#: ../gio/glib-compile-resources.c:630 --msgid "Don't export functions; declare them G_GNUC_INTERNAL" -+#: ../gio/glib-compile-resources.c:747 -+#, fuzzy -+msgid "Don’t export functions; declare them G_GNUC_INTERNAL" - msgstr "不要导出函数；请将它们声明为 G_GNUC_INTERNAL" - --#: ../gio/glib-compile-resources.c:631 -+#: ../gio/glib-compile-resources.c:748 -+msgid "" -+"Don’t embed resource data in the C file; assume it's linked externally " -+"instead" -+msgstr "" -+ -+#: ../gio/glib-compile-resources.c:749 - msgid "C identifier name used for the generated source code" - msgstr "用于生成的源代码的 C 标识符名称" - --#: ../gio/glib-compile-resources.c:657 -+#: ../gio/glib-compile-resources.c:775 - msgid "" - "Compile a resource specification into a resource file.\n" - "Resource specification files have the extension .gresource.xml,\n" -@@ -2278,57 +2414,210 @@ msgstr "" - "资源规格文件以 .gresource.xml 为扩展名，\n" - "资源文件以 .gresource 为扩展名。" - --#: ../gio/glib-compile-resources.c:679 -+#: ../gio/glib-compile-resources.c:797 - #, c-format - msgid "You should give exactly one file name\n" - msgstr "您应该给出惟一的文件名\n" - --#: ../gio/glib-compile-schemas.c:784 --msgid "empty names are not permitted" --msgstr "不允许空名称" -+#: ../gio/glib-compile-schemas.c:92 -+#, c-format -+msgid "nick must be a minimum of 2 characters" -+msgstr "" -+ -+#: ../gio/glib-compile-schemas.c:103 -+#, fuzzy, c-format -+msgid "Invalid numeric value" -+msgstr "给出的符号链接值无效" -+ -+#: ../gio/glib-compile-schemas.c:111 -+#, fuzzy, c-format -+msgid " already specified" -+msgstr "<%s id='%s'> 已指定" -+ -+#: ../gio/glib-compile-schemas.c:119 -+#, fuzzy, c-format -+msgid "value='%s' already specified" -+msgstr " 已指定" - --#: ../gio/glib-compile-schemas.c:794 -+#: ../gio/glib-compile-schemas.c:133 - #, c-format --msgid "invalid name '%s': names must begin with a lowercase letter" --msgstr "无效名称 %s：名称必须以小写字母开始" -+msgid "flags values must have at most 1 bit set" -+msgstr "" -+ -+#: ../gio/glib-compile-schemas.c:158 -+#, c-format -+msgid "<%s> must contain at least one " -+msgstr "" -+ -+#: ../gio/glib-compile-schemas.c:314 -+#, fuzzy, c-format -+msgid "<%s> is not contained in the specified range" -+msgstr "没有指定连接的端点" -+ -+#: ../gio/glib-compile-schemas.c:326 -+#, c-format -+msgid "<%s> is not a valid member of the specified enumerated type" -+msgstr "" -+ -+#: ../gio/glib-compile-schemas.c:332 -+#, c-format -+msgid "<%s> contains string not in the specified flags type" -+msgstr "" -+ -+#: ../gio/glib-compile-schemas.c:338 -+#, c-format -+msgid "<%s> contains a string not in " -+msgstr "" -+ -+#: ../gio/glib-compile-schemas.c:372 -+#, fuzzy -+msgid " already specified for this key" -+msgstr " 已指定" -+ -+#: ../gio/glib-compile-schemas.c:390 -+#, c-format -+msgid " not allowed for keys of type “%s”" -+msgstr "" -+ -+#: ../gio/glib-compile-schemas.c:407 -+#, c-format -+msgid " specified minimum is greater than maximum" -+msgstr "" - --#: ../gio/glib-compile-schemas.c:806 -+#: ../gio/glib-compile-schemas.c:432 - #, c-format -+msgid "unsupported l10n category: %s" -+msgstr "" -+ -+#: ../gio/glib-compile-schemas.c:440 -+msgid "l10n requested, but no gettext domain given" -+msgstr "" -+ -+#: ../gio/glib-compile-schemas.c:452 -+msgid "translation context given for value without l10n enabled" -+msgstr "" -+ -+#: ../gio/glib-compile-schemas.c:474 -+#, fuzzy, c-format -+msgid "Failed to parse value of type “%s”: " -+msgstr "执行子进程“%s”失败(%s)" -+ -+#: ../gio/glib-compile-schemas.c:491 - msgid "" --"invalid name '%s': invalid character '%c'; only lowercase letters, numbers " --"and hyphen ('-') are permitted." --msgstr "无效名称 %s：无效的字符 %c，仅允许使用小写字母、数字和边字符(“-”)。" -+" cannot be specified for keys tagged as having an enumerated type" -+msgstr "" -+ -+#: ../gio/glib-compile-schemas.c:500 -+#, fuzzy -+msgid " already specified for this key" -+msgstr " 已指定" - --#: ../gio/glib-compile-schemas.c:815 -+#: ../gio/glib-compile-schemas.c:512 - #, c-format --msgid "invalid name '%s': two successive hyphens ('--') are not permitted." --msgstr "无效名称 %s：不允许使用连续的连字符(“--”)。" -+msgid " not allowed for keys of type “%s”" -+msgstr "" -+ -+#: ../gio/glib-compile-schemas.c:528 -+#, fuzzy, c-format -+msgid " already given" -+msgstr " 已指定" - --#: ../gio/glib-compile-schemas.c:824 -+#: ../gio/glib-compile-schemas.c:543 - #, c-format --msgid "invalid name '%s': the last character may not be a hyphen ('-')." --msgstr "无效名称 %s：最后一个字符串不应为连字符(“-”)。" -+msgid " must contain at least one " -+msgstr "" -+ -+#: ../gio/glib-compile-schemas.c:557 -+#, fuzzy -+msgid " already specified for this key" -+msgstr " 已指定" -+ -+#: ../gio/glib-compile-schemas.c:561 -+msgid "" -+" can only be specified for keys with enumerated or flags types or " -+"after " -+msgstr "" -+ -+#: ../gio/glib-compile-schemas.c:580 -+#, c-format -+msgid "" -+" given when “%s” is already a member of the enumerated " -+"type" -+msgstr "" -+ -+#: ../gio/glib-compile-schemas.c:586 -+#, c-format -+msgid " given when was already given" -+msgstr "" -+ -+#: ../gio/glib-compile-schemas.c:594 -+#, fuzzy, c-format -+msgid " already specified" -+msgstr "<%s id='%s'> 已指定" -+ -+#: ../gio/glib-compile-schemas.c:604 -+#, c-format -+msgid "alias target “%s” is not in enumerated type" -+msgstr "" - --#: ../gio/glib-compile-schemas.c:832 -+#: ../gio/glib-compile-schemas.c:605 - #, c-format --msgid "invalid name '%s': maximum length is 1024" -+msgid "alias target “%s” is not in " -+msgstr "" -+ -+#: ../gio/glib-compile-schemas.c:620 -+#, c-format -+msgid " must contain at least one " -+msgstr "" -+ -+#: ../gio/glib-compile-schemas.c:797 -+#, fuzzy -+msgid "Empty names are not permitted" -+msgstr "不允许空名称" -+ -+#: ../gio/glib-compile-schemas.c:807 -+#, fuzzy, c-format -+msgid "Invalid name “%s”: names must begin with a lowercase letter" -+msgstr "无效名称 %s：名称必须以小写字母开始" -+ -+#: ../gio/glib-compile-schemas.c:819 -+#, fuzzy, c-format -+msgid "" -+"Invalid name “%s”: invalid character “%c”; only lowercase letters, numbers " -+"and hyphen (“-”) are permitted" -+msgstr "无效名称 %s：无效的字符 %c，仅允许使用小写字母、数字和边字符(“-”)。" -+ -+#: ../gio/glib-compile-schemas.c:828 -+#, fuzzy, c-format -+msgid "Invalid name “%s”: two successive hyphens (“--”) are not permitted" -+msgstr "无效名称 %s：不允许使用连续的连字符(“--”)。" -+ -+#: ../gio/glib-compile-schemas.c:837 -+#, fuzzy, c-format -+msgid "Invalid name “%s”: the last character may not be a hyphen (“-”)" -+msgstr "无效名称 %s：最后一个字符串不应为连字符(“-”)。" -+ -+#: ../gio/glib-compile-schemas.c:845 -+#, fuzzy, c-format -+msgid "Invalid name “%s”: maximum length is 1024" - msgstr "无效名称 %s：最大长度为 1024" - --#: ../gio/glib-compile-schemas.c:901 -+#: ../gio/glib-compile-schemas.c:917 - #, c-format - msgid " already specified" - msgstr " 已指定" - --#: ../gio/glib-compile-schemas.c:927 --msgid "cannot add keys to a 'list-of' schema" -+#: ../gio/glib-compile-schemas.c:943 -+#, fuzzy -+msgid "Cannot add keys to a “list-of” schema" - msgstr "无法添加键到一个 list-of 方案" - --#: ../gio/glib-compile-schemas.c:938 -+#: ../gio/glib-compile-schemas.c:954 - #, c-format - msgid " already specified" - msgstr " 已指定" - --#: ../gio/glib-compile-schemas.c:956 -+#: ../gio/glib-compile-schemas.c:972 - #, c-format - msgid "" - " shadows in ; use " -@@ -2337,178 +2626,221 @@ msgstr "" - " 与 在 重合; 请使用 " - " 修改其值。" - --#: ../gio/glib-compile-schemas.c:967 --#, c-format -+#: ../gio/glib-compile-schemas.c:983 -+#, fuzzy, 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 " - msgstr "type、enum 或 flags 中必须有一个被指定为 的属性。" - --#: ../gio/glib-compile-schemas.c:986 -+#: ../gio/glib-compile-schemas.c:1002 - #, c-format - msgid "<%s id='%s'> not (yet) defined." - msgstr "<%s id='%s'> 尚未定义。" - --#: ../gio/glib-compile-schemas.c:1001 --#, c-format --msgid "invalid GVariant type string '%s'" -+#: ../gio/glib-compile-schemas.c:1017 -+#, fuzzy, c-format -+msgid "Invalid GVariant type string “%s”" - msgstr "无效的 GVariant 类型字符串 %s" - --#: ../gio/glib-compile-schemas.c:1031 --msgid " given but schema isn't extending anything" -+#: ../gio/glib-compile-schemas.c:1047 -+#, fuzzy -+msgid " given but schema isn’t extending anything" - msgstr "给出了 但方案并未扩展" - --#: ../gio/glib-compile-schemas.c:1044 --#, c-format --msgid "no to override" -+#: ../gio/glib-compile-schemas.c:1060 -+#, fuzzy, c-format -+msgid "No to override" - msgstr "无 可覆盖" - --#: ../gio/glib-compile-schemas.c:1052 -+#: ../gio/glib-compile-schemas.c:1068 - #, c-format - msgid " already specified" - msgstr " 已指定" - --#: ../gio/glib-compile-schemas.c:1125 -+#: ../gio/glib-compile-schemas.c:1141 - #, c-format - msgid " already specified" - msgstr " 已指定" - --#: ../gio/glib-compile-schemas.c:1137 --#, c-format --msgid " extends not yet existing schema '%s'" -+#: ../gio/glib-compile-schemas.c:1153 -+#, fuzzy, c-format -+msgid " extends not yet existing schema “%s”" - msgstr " 扩展了尚不存在的方案 %s" - --#: ../gio/glib-compile-schemas.c:1153 --#, c-format --msgid " is list of not yet existing schema '%s'" -+#: ../gio/glib-compile-schemas.c:1169 -+#, fuzzy, c-format -+msgid " is list of not yet existing schema “%s”" - msgstr " 是尚不存在的方案 %s 的列表" - --#: ../gio/glib-compile-schemas.c:1161 --#, c-format --msgid "Can not be a list of a schema with a path" -+#: ../gio/glib-compile-schemas.c:1177 -+#, fuzzy, c-format -+msgid "Cannot be a list of a schema with a path" - msgstr "不能是一系列带有路径的方案" - --#: ../gio/glib-compile-schemas.c:1171 --#, c-format --msgid "Can not extend a schema with a path" -+#: ../gio/glib-compile-schemas.c:1187 -+#, fuzzy, c-format -+msgid "Cannot extend a schema with a path" - msgstr "无法使用路径扩展方案" - --#: ../gio/glib-compile-schemas.c:1181 -+#: ../gio/glib-compile-schemas.c:1197 - #, c-format - msgid "" - " is a list, extending which is not a list" - msgstr " 是一个列表，扩展的 不是列表" - --#: ../gio/glib-compile-schemas.c:1191 --#, c-format -+#: ../gio/glib-compile-schemas.c:1207 -+#, fuzzy, c-format - msgid "" --" extends but '%s' " --"does not extend '%s'" -+" extends but “%s” " -+"does not extend “%s”" - msgstr "" - " 扩展 ，但“%s”不扩" - "展 %s" - --#: ../gio/glib-compile-schemas.c:1208 --#, c-format --msgid "a path, if given, must begin and end with a slash" -+#: ../gio/glib-compile-schemas.c:1224 -+#, fuzzy, c-format -+msgid "A path, if given, must begin and end with a slash" - msgstr "一个路径，如果给出则必须以斜线(/)开始和结束" - --#: ../gio/glib-compile-schemas.c:1215 --#, c-format --msgid "the path of a list must end with ':/'" -+#: ../gio/glib-compile-schemas.c:1231 -+#, fuzzy, c-format -+msgid "The path of a list must end with “:/”" - msgstr "一个列表的路径必须以 :/ 结束" - --#: ../gio/glib-compile-schemas.c:1247 -+#: ../gio/glib-compile-schemas.c:1274 - #, c-format - msgid "<%s id='%s'> already specified" - msgstr "<%s id='%s'> 已指定" - --#: ../gio/glib-compile-schemas.c:1397 ../gio/glib-compile-schemas.c:1413 -+#: ../gio/glib-compile-schemas.c:1424 ../gio/glib-compile-schemas.c:1440 - #, c-format - msgid "Only one <%s> element allowed inside <%s>" - msgstr "在 <%2$s> 中仅允许一个成员 <%1$s>" - --#: ../gio/glib-compile-schemas.c:1495 -+#: ../gio/glib-compile-schemas.c:1522 - #, c-format - msgid "Element <%s> not allowed at the top level" - msgstr "顶层中不允许元素 <%s>" - --#. Translators: Do not translate "--strict". --#: ../gio/glib-compile-schemas.c:1794 ../gio/glib-compile-schemas.c:1865 --#: ../gio/glib-compile-schemas.c:1941 -+#: ../gio/glib-compile-schemas.c:1540 -+msgid "Element is required in " -+msgstr "" -+ -+#: ../gio/glib-compile-schemas.c:1630 -+#, fuzzy, c-format -+msgid "Text may not appear inside <%s>" -+msgstr "<%s> 内不应出现文本" -+ -+#: ../gio/glib-compile-schemas.c:1698 - #, c-format --msgid "--strict was specified; exiting.\n" -+msgid "Warning: undefined reference to " -+msgstr "" -+ -+#. Translators: Do not translate "--strict". -+#: ../gio/glib-compile-schemas.c:1837 ../gio/glib-compile-schemas.c:1916 -+#, fuzzy -+msgid "--strict was specified; exiting." - msgstr "指定了 --strict；退出。\n" - --#: ../gio/glib-compile-schemas.c:1802 --#, c-format --msgid "This entire file has been ignored.\n" -+#: ../gio/glib-compile-schemas.c:1849 -+#, fuzzy -+msgid "This entire file has been ignored." - msgstr "整个文件被忽略。\n" - --#: ../gio/glib-compile-schemas.c:1861 --#, c-format --msgid "Ignoring this file.\n" -+#: ../gio/glib-compile-schemas.c:1912 -+#, fuzzy -+msgid "Ignoring this file." - msgstr "忽略此文件。\n" - --#: ../gio/glib-compile-schemas.c:1901 --#, c-format --msgid "No such key '%s' in schema '%s' as specified in override file '%s'" -+#: ../gio/glib-compile-schemas.c:1967 -+#, fuzzy, c-format -+msgid "" -+"No such key “%s” in schema “%s” as specified in override file “%s”; ignoring " -+"override for this key." - msgstr "覆盖文件 %3$s 中指定的方案 %2$s 中没有键 %1$s" - --#: ../gio/glib-compile-schemas.c:1907 ../gio/glib-compile-schemas.c:1965 --#: ../gio/glib-compile-schemas.c:1993 --#, c-format --msgid "; ignoring override for this key.\n" --msgstr "；忽略对此键的覆盖。\n" -+#: ../gio/glib-compile-schemas.c:1975 -+#, fuzzy, c-format -+msgid "" -+"No such key “%s” in schema “%s” as specified in override file “%s” and --" -+"strict was specified; exiting." -+msgstr "覆盖文件 %3$s 中指定的方案 %2$s 中没有键 %1$s" - --#: ../gio/glib-compile-schemas.c:1911 ../gio/glib-compile-schemas.c:1969 - #: ../gio/glib-compile-schemas.c:1997 - #, c-format --msgid " and --strict was specified; exiting.\n" --msgstr "并且指定了 --strict；退出。\n" -+msgid "" -+"Cannot provide per-desktop overrides for localized key “%s” in schema " -+"“%s” (override file “%s”); ignoring override for this key." -+msgstr "" - --#: ../gio/glib-compile-schemas.c:1927 -+#: ../gio/glib-compile-schemas.c:2006 - #, c-format - msgid "" --"error parsing key '%s' in schema '%s' as specified in override file '%s': %s." -+"Cannot provide per-desktop overrides for localized key “%s” in schema " -+"“%s” (override file “%s”) and --strict was specified; exiting." -+msgstr "" -+ -+#: ../gio/glib-compile-schemas.c:2030 -+#, fuzzy, c-format -+msgid "" -+"Error parsing key “%s” in schema “%s” as specified in override file “%s”: " -+"%s. Ignoring override for this key." - msgstr "解析覆盖文件 %3$s 中指定的方案 %2$s 中的键 %1$s 出错：%4$s。" - --#: ../gio/glib-compile-schemas.c:1937 --#, c-format --msgid "Ignoring override for this key.\n" --msgstr "忽略对此键的覆盖。\n" -+#: ../gio/glib-compile-schemas.c:2042 -+#, fuzzy, c-format -+msgid "" -+"Error parsing key “%s” in schema “%s” as specified in override file “%s”: " -+"%s. --strict was specified; exiting." -+msgstr "解析覆盖文件 %3$s 中指定的方案 %2$s 中的键 %1$s 出错：%4$s。" - --#: ../gio/glib-compile-schemas.c:1955 --#, c-format -+#: ../gio/glib-compile-schemas.c:2069 -+#, fuzzy, c-format - msgid "" --"override for key '%s' in schema '%s' in override file '%s' is outside the " --"range given in the schema" -+"Override for key “%s” in schema “%s” in override file “%s” is outside the " -+"range given in the schema; ignoring override for this key." - msgstr "覆盖文件 %3$s 中方案 %2$s 的键 %1$s 的覆盖超出了方案给出的范围" - --#: ../gio/glib-compile-schemas.c:1983 --#, c-format -+#: ../gio/glib-compile-schemas.c:2079 -+#, fuzzy, c-format -+msgid "" -+"Override for key “%s” in schema “%s” in override file “%s” is outside the " -+"range given in the schema and --strict was specified; exiting." -+msgstr "覆盖文件 %3$s 中方案 %2$s 的键 %1$s 的覆盖超出了方案给出的范围" -+ -+#: ../gio/glib-compile-schemas.c:2105 -+#, fuzzy, c-format -+msgid "" -+"Override for key “%s” in schema “%s” in override file “%s” is not in the " -+"list of valid choices; ignoring override for this key." -+msgstr "覆盖文件 %3$s 中方案 %2$s 的键 %1$s 的覆盖的值不在有效值列表内" -+ -+#: ../gio/glib-compile-schemas.c:2115 -+#, fuzzy, c-format - msgid "" --"override for key '%s' in schema '%s' in override file '%s' is not in the " --"list of valid choices" -+"Override for key “%s” in schema “%s” in override file “%s” is not in the " -+"list of valid choices and --strict was specified; exiting." - msgstr "覆盖文件 %3$s 中方案 %2$s 的键 %1$s 的覆盖的值不在有效值列表内" - --#: ../gio/glib-compile-schemas.c:2038 --msgid "where to store the gschemas.compiled file" -+#: ../gio/glib-compile-schemas.c:2177 -+#, fuzzy -+msgid "Where to store the gschemas.compiled file" - msgstr "gschemas.compiled 文件存储于何处" - --#: ../gio/glib-compile-schemas.c:2039 -+#: ../gio/glib-compile-schemas.c:2178 - msgid "Abort on any errors in schemas" - msgstr "在方案出现任何错误时中止" - --#: ../gio/glib-compile-schemas.c:2040 -+#: ../gio/glib-compile-schemas.c:2179 - msgid "Do not write the gschema.compiled file" - msgstr "不要对 gschema.compiled 进行写操作" - --#: ../gio/glib-compile-schemas.c:2041 -+#: ../gio/glib-compile-schemas.c:2180 - msgid "Do not enforce key name restrictions" - msgstr "不要强制键名的限制" - --#: ../gio/glib-compile-schemas.c:2070 -+#: ../gio/glib-compile-schemas.c:2209 - msgid "" - "Compile all GSettings schema files into a schema cache.\n" - "Schema files are required to have the extension .gschema.xml,\n" -@@ -2518,318 +2850,353 @@ msgstr "" - "要使用扩展 .gschema.xml，需要有方案文件，\n" - "缓存文件被称为 gschemas.compiled。" - --#: ../gio/glib-compile-schemas.c:2092 --#, c-format --msgid "You should give exactly one directory name\n" -+#: ../gio/glib-compile-schemas.c:2230 -+#, fuzzy -+msgid "You should give exactly one directory name" - msgstr "您应该给出且只能给出一个目录名\n" - --#: ../gio/glib-compile-schemas.c:2131 --#, c-format --msgid "No schema files found: " -+#: ../gio/glib-compile-schemas.c:2273 -+#, fuzzy -+msgid "No schema files found: doing nothing." - msgstr "没有找到方案文件：" - --#: ../gio/glib-compile-schemas.c:2134 --#, c-format --msgid "doing nothing.\n" --msgstr "什么都没做。\n" -- --#: ../gio/glib-compile-schemas.c:2137 --#, c-format --msgid "removed existing output file.\n" -+#: ../gio/glib-compile-schemas.c:2275 -+#, fuzzy -+msgid "No schema files found: removed existing output file." - msgstr "已删除存在的输出文件。\n" - --#: ../gio/glocalfile.c:642 ../gio/win32/gwinhttpfile.c:420 -+#: ../gio/glocalfile.c:546 ../gio/win32/gwinhttpfile.c:420 - #, c-format - msgid "Invalid filename %s" - msgstr "无效的文件名 %s" - --#: ../gio/glocalfile.c:1036 -+#: ../gio/glocalfile.c:1013 - #, c-format - msgid "Error getting filesystem info for %s: %s" - msgstr "读取 %s 文件系统信息时出错：%s" - --#: ../gio/glocalfile.c:1175 -+#. Translators: This is an error message when trying to find -+#. * the enclosing (user visible) mount of a file, but none -+#. * exists. -+#. -+#: ../gio/glocalfile.c:1152 - #, c-format - msgid "Containing mount for file %s not found" - msgstr "找不到文件 %s 包含的挂载" - --#: ../gio/glocalfile.c:1198 --msgid "Can't rename root directory" -+#: ../gio/glocalfile.c:1175 -+#, fuzzy -+msgid "Can’t rename root directory" - msgstr "无法重命名根目录" - --#: ../gio/glocalfile.c:1216 ../gio/glocalfile.c:1239 -+#: ../gio/glocalfile.c:1193 ../gio/glocalfile.c:1216 - #, c-format - msgid "Error renaming file %s: %s" - msgstr "重命名文件 %s 时出错：%s" - --#: ../gio/glocalfile.c:1223 --msgid "Can't rename file, filename already exists" -+#: ../gio/glocalfile.c:1200 -+#, fuzzy -+msgid "Can’t rename file, filename already exists" - msgstr "无法重命名文件，该文件名已存在" - --#: ../gio/glocalfile.c:1236 ../gio/glocalfile.c:2250 ../gio/glocalfile.c:2278 --#: ../gio/glocalfile.c:2435 ../gio/glocalfileoutputstream.c:549 -+#: ../gio/glocalfile.c:1213 ../gio/glocalfile.c:2324 ../gio/glocalfile.c:2352 -+#: ../gio/glocalfile.c:2491 ../gio/glocalfileoutputstream.c:647 - msgid "Invalid filename" - msgstr "无效的文件名" - --#: ../gio/glocalfile.c:1403 ../gio/glocalfile.c:1418 -+#: ../gio/glocalfile.c:1381 ../gio/glocalfile.c:1396 - #, c-format - msgid "Error opening file %s: %s" - msgstr "打开文件 %s 时出错：%s" - --#: ../gio/glocalfile.c:1543 -+#: ../gio/glocalfile.c:1521 - #, c-format - msgid "Error removing file %s: %s" - msgstr "删除文件 %s 时出错：%s" - --#: ../gio/glocalfile.c:1926 -+#: ../gio/glocalfile.c:1964 - #, c-format - msgid "Error trashing file %s: %s" - msgstr "将文件 %s 放到回收站时出错：%s" - --#: ../gio/glocalfile.c:1949 -+#: ../gio/glocalfile.c:2006 - #, c-format - msgid "Unable to create trash dir %s: %s" - msgstr "无法创建回收站目录 %s：%s" - --#: ../gio/glocalfile.c:1969 -+#: ../gio/glocalfile.c:2027 - #, c-format - msgid "Unable to find toplevel directory to trash %s" - msgstr "找不到回收站 %s 的顶级目录" - --#: ../gio/glocalfile.c:2048 ../gio/glocalfile.c:2068 -+#: ../gio/glocalfile.c:2036 -+#, fuzzy, c-format -+msgid "Trashing on system internal mounts is not supported" -+msgstr "不支持在挂载之间复制(reflink/clone)" -+ -+#: ../gio/glocalfile.c:2120 ../gio/glocalfile.c:2140 - #, c-format - msgid "Unable to find or create trash directory for %s" - msgstr "无法为 %s 找到或创建回收站目录" - --#: ../gio/glocalfile.c:2102 -+#: ../gio/glocalfile.c:2175 - #, c-format - msgid "Unable to create trashing info file for %s: %s" - msgstr "为 %s 创建回收站信息文件失败：%s" - --#: ../gio/glocalfile.c:2161 -+#: ../gio/glocalfile.c:2235 - #, c-format - msgid "Unable to trash file %s across filesystem boundaries" - msgstr "无法跨越文件系统边界将文件 %s 移动到回收站" - --#: ../gio/glocalfile.c:2165 ../gio/glocalfile.c:2221 -+#: ../gio/glocalfile.c:2239 ../gio/glocalfile.c:2295 - #, c-format - msgid "Unable to trash file %s: %s" - msgstr "无法将文件 %s 移动到回收站：%s" - --#: ../gio/glocalfile.c:2227 -+#: ../gio/glocalfile.c:2301 - #, c-format - msgid "Unable to trash file %s" - msgstr "无法将文件 %s 移动到回收站" - --#: ../gio/glocalfile.c:2253 -+#: ../gio/glocalfile.c:2327 - #, c-format - msgid "Error creating directory %s: %s" - msgstr "创建目录 %s 时出错：%s" - --#: ../gio/glocalfile.c:2282 -+#: ../gio/glocalfile.c:2356 - #, c-format - msgid "Filesystem does not support symbolic links" - msgstr "文件系统不支持符号链接" - --#: ../gio/glocalfile.c:2285 -+#: ../gio/glocalfile.c:2359 - #, c-format - 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:2346 ../gio/glocalfile.c:2381 ../gio/glocalfile.c:2438 -+#: ../gio/glocalfile.c:2402 ../gio/glocalfile.c:2437 ../gio/glocalfile.c:2494 - #, c-format - msgid "Error moving file %s: %s" - msgstr "移动文件 %s 时出错：%s" - --#: ../gio/glocalfile.c:2369 --msgid "Can't move directory over directory" -+#: ../gio/glocalfile.c:2425 -+#, fuzzy -+msgid "Can’t move directory over directory" - msgstr "无法将目录移动到目录" - --#: ../gio/glocalfile.c:2395 ../gio/glocalfileoutputstream.c:925 --#: ../gio/glocalfileoutputstream.c:939 ../gio/glocalfileoutputstream.c:954 --#: ../gio/glocalfileoutputstream.c:971 ../gio/glocalfileoutputstream.c:985 -+#: ../gio/glocalfile.c:2451 ../gio/glocalfileoutputstream.c:1031 -+#: ../gio/glocalfileoutputstream.c:1045 ../gio/glocalfileoutputstream.c:1060 -+#: ../gio/glocalfileoutputstream.c:1077 ../gio/glocalfileoutputstream.c:1091 - msgid "Backup file creation failed" - msgstr "备份文件创建失败" - --#: ../gio/glocalfile.c:2414 -+#: ../gio/glocalfile.c:2470 - #, c-format - msgid "Error removing target file: %s" - msgstr "移除目标文件出错：%s" - --#: ../gio/glocalfile.c:2428 -+#: ../gio/glocalfile.c:2484 - msgid "Move between mounts not supported" - msgstr "不支持在挂载之间移动" - --#: ../gio/glocalfile.c:2619 -+#: ../gio/glocalfile.c:2675 - #, c-format - msgid "Could not determine the disk usage of %s: %s" - msgstr "无法确定 %s 的磁盘使用情况：%s" - --#: ../gio/glocalfileinfo.c:721 -+#: ../gio/glocalfileinfo.c:758 - msgid "Attribute value must be non-NULL" - msgstr "属性值必须为非空" - --#: ../gio/glocalfileinfo.c:728 -+#: ../gio/glocalfileinfo.c:765 - msgid "Invalid attribute type (string expected)" - msgstr "无效的属性类型(应为 string)" - --#: ../gio/glocalfileinfo.c:735 -+#: ../gio/glocalfileinfo.c:772 - msgid "Invalid extended attribute name" - msgstr "无效的扩展属性名" - --#: ../gio/glocalfileinfo.c:775 --#, c-format --msgid "Error setting extended attribute '%s': %s" -+#: ../gio/glocalfileinfo.c:812 -+#, fuzzy, c-format -+msgid "Error setting extended attribute “%s”: %s" - msgstr "设置扩展属性“%s”时出错：%s" - --#: ../gio/glocalfileinfo.c:1575 -+#: ../gio/glocalfileinfo.c:1641 - msgid " (invalid encoding)" - msgstr " (无效的编码)" - --#: ../gio/glocalfileinfo.c:1766 ../gio/glocalfileoutputstream.c:803 --#, c-format --msgid "Error when getting information for file '%s': %s" -+#: ../gio/glocalfileinfo.c:1732 -+msgid "Desktop" -+msgstr "桌面" -+ -+#: ../gio/glocalfileinfo.c:1734 -+msgid "Documents" -+msgstr "文档" -+ -+#: ../gio/glocalfileinfo.c:1736 -+msgid "Download" -+msgstr "下载" -+ -+#: ../gio/glocalfileinfo.c:1738 -+msgid "Music" -+msgstr "音乐" -+ -+#: ../gio/glocalfileinfo.c:1740 -+msgid "Pictures" -+msgstr "图片" -+ -+#: ../gio/glocalfileinfo.c:1742 -+msgid "Public Share" -+msgstr "公共的" -+ -+#: ../gio/glocalfileinfo.c:1744 -+msgid "Templates" -+msgstr "模板" -+ -+#: ../gio/glocalfileinfo.c:1746 -+msgid "Videos" -+msgstr "视频" -+ -+#: ../gio/glocalfileinfo.c:1832 ../gio/glocalfileoutputstream.c:909 -+#, fuzzy, c-format -+msgid "Error when getting information for file “%s”: %s" - msgstr "获取文件“%s”的信息时出错：%s" - --#: ../gio/glocalfileinfo.c:2017 -+#: ../gio/glocalfileinfo.c:2102 - #, c-format - msgid "Error when getting information for file descriptor: %s" - msgstr "获取文件描述符的信息时出错：%s" - --#: ../gio/glocalfileinfo.c:2062 -+#: ../gio/glocalfileinfo.c:2147 - msgid "Invalid attribute type (uint32 expected)" - msgstr "无效的属性类型(应为 uint32)" - --#: ../gio/glocalfileinfo.c:2080 -+#: ../gio/glocalfileinfo.c:2165 - msgid "Invalid attribute type (uint64 expected)" - msgstr "无效的属性类型(应为 uint64)" - --#: ../gio/glocalfileinfo.c:2099 ../gio/glocalfileinfo.c:2118 -+#: ../gio/glocalfileinfo.c:2184 ../gio/glocalfileinfo.c:2203 - msgid "Invalid attribute type (byte string expected)" - msgstr "无效的属性类型(应为 byte string)" - --#: ../gio/glocalfileinfo.c:2153 -+#: ../gio/glocalfileinfo.c:2250 - msgid "Cannot set permissions on symlinks" - msgstr "无法为符号链设置权限" - --#: ../gio/glocalfileinfo.c:2169 -+#: ../gio/glocalfileinfo.c:2266 - #, c-format - msgid "Error setting permissions: %s" - msgstr "设置访问权限出错：%s" - --#: ../gio/glocalfileinfo.c:2220 -+#: ../gio/glocalfileinfo.c:2317 - #, c-format - msgid "Error setting owner: %s" - msgstr "设置所有者出错：%s" - --#: ../gio/glocalfileinfo.c:2243 -+#: ../gio/glocalfileinfo.c:2340 - msgid "symlink must be non-NULL" - msgstr "符号链接必须是非空" - --#: ../gio/glocalfileinfo.c:2253 ../gio/glocalfileinfo.c:2272 --#: ../gio/glocalfileinfo.c:2283 -+#: ../gio/glocalfileinfo.c:2350 ../gio/glocalfileinfo.c:2369 -+#: ../gio/glocalfileinfo.c:2380 - #, c-format - msgid "Error setting symlink: %s" - msgstr "设置符号链接出错：%s" - --#: ../gio/glocalfileinfo.c:2262 -+#: ../gio/glocalfileinfo.c:2359 - msgid "Error setting symlink: file is not a symlink" - msgstr "设定符号链接出错：文件不是符号链接" - --#: ../gio/glocalfileinfo.c:2388 -+#: ../gio/glocalfileinfo.c:2485 - #, c-format - msgid "Error setting modification or access time: %s" - msgstr "错误设置修改或访问时间：%s" - --#: ../gio/glocalfileinfo.c:2411 -+#: ../gio/glocalfileinfo.c:2508 - msgid "SELinux context must be non-NULL" - msgstr "SELinux 上下文必须是非空" - --#: ../gio/glocalfileinfo.c:2426 -+#: ../gio/glocalfileinfo.c:2523 - #, c-format - msgid "Error setting SELinux context: %s" - msgstr "设置 SELinux 上下文出错：%s" - --#: ../gio/glocalfileinfo.c:2433 -+#: ../gio/glocalfileinfo.c:2530 - msgid "SELinux is not enabled on this system" - msgstr "此系统尚未启用 SELinux" - --#: ../gio/glocalfileinfo.c:2525 -+#: ../gio/glocalfileinfo.c:2622 - #, c-format - msgid "Setting attribute %s not supported" - msgstr "不支持设置属性 %s" - --#: ../gio/glocalfileinputstream.c:168 ../gio/glocalfileoutputstream.c:694 -+#: ../gio/glocalfileinputstream.c:168 ../gio/glocalfileoutputstream.c:792 - #, c-format - msgid "Error reading from file: %s" - 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:1003 -+#: ../gio/glocalfileoutputstream.c:554 ../gio/glocalfileoutputstream.c:1109 - #, c-format - msgid "Error seeking in file: %s" - msgstr "在文件中定位时出错：%s" - --#: ../gio/glocalfileinputstream.c:255 ../gio/glocalfileoutputstream.c:246 --#: ../gio/glocalfileoutputstream.c:340 -+#: ../gio/glocalfileinputstream.c:255 ../gio/glocalfileoutputstream.c:344 -+#: ../gio/glocalfileoutputstream.c:438 - #, c-format - msgid "Error closing file: %s" - msgstr "关闭文件出错：%s" - --#: ../gio/glocalfilemonitor.c:840 -+#: ../gio/glocalfilemonitor.c:865 - msgid "Unable to find default local file monitor type" - msgstr "无法找到默认的本地文件监视器类型" - --#: ../gio/glocalfileoutputstream.c:194 ../gio/glocalfileoutputstream.c:226 --#: ../gio/glocalfileoutputstream.c:715 -+#: ../gio/glocalfileoutputstream.c:209 ../gio/glocalfileoutputstream.c:287 -+#: ../gio/glocalfileoutputstream.c:324 ../gio/glocalfileoutputstream.c:813 - #, c-format - msgid "Error writing to file: %s" - msgstr "写入文件出错：%s" - --#: ../gio/glocalfileoutputstream.c:273 -+#: ../gio/glocalfileoutputstream.c:371 - #, c-format - msgid "Error removing old backup link: %s" - msgstr "移除旧的备份链接出错：%s" - --#: ../gio/glocalfileoutputstream.c:287 ../gio/glocalfileoutputstream.c:300 -+#: ../gio/glocalfileoutputstream.c:385 ../gio/glocalfileoutputstream.c:398 - #, c-format - msgid "Error creating backup copy: %s" - msgstr "创建备份拷贝：%s" - --#: ../gio/glocalfileoutputstream.c:318 -+#: ../gio/glocalfileoutputstream.c:416 - #, c-format - msgid "Error renaming temporary file: %s" - msgstr "重命名临时文件出错：%s" - --#: ../gio/glocalfileoutputstream.c:502 ../gio/glocalfileoutputstream.c:1054 -+#: ../gio/glocalfileoutputstream.c:600 ../gio/glocalfileoutputstream.c:1160 - #, c-format - msgid "Error truncating file: %s" - msgstr "截断文件出错：%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 "打开文件“%s”时出错：%s" -+#: ../gio/glocalfileoutputstream.c:653 ../gio/glocalfileoutputstream.c:891 -+#: ../gio/glocalfileoutputstream.c:1141 ../gio/gsubprocess.c:380 -+#, fuzzy, c-format -+msgid "Error opening file “%s”: %s" -+msgstr "打开文件“%s”出错：%s" - --#: ../gio/glocalfileoutputstream.c:816 -+#: ../gio/glocalfileoutputstream.c:922 - msgid "Target file is a directory" - msgstr "目标文件是目录" - --#: ../gio/glocalfileoutputstream.c:821 -+#: ../gio/glocalfileoutputstream.c:927 - msgid "Target file is not a regular file" - msgstr "目标文件不是普通文件" - --#: ../gio/glocalfileoutputstream.c:833 -+#: ../gio/glocalfileoutputstream.c:939 - msgid "The file was externally modified" - msgstr "文件已经被其他程序修改" - --#: ../gio/glocalfileoutputstream.c:1019 -+#: ../gio/glocalfileoutputstream.c:1125 - #, c-format - msgid "Error removing old file: %s" - msgstr "移除旧文件出错：%s" -@@ -2871,125 +3238,155 @@ msgstr "请求的定位值在流的结束之后" - #. Translators: This is an error - #. * message for mount objects that - #. * don't implement unmount. --#: ../gio/gmount.c:393 --msgid "mount doesn't implement \"unmount\"" -+#: ../gio/gmount.c:399 -+#, fuzzy -+msgid "mount doesn’t implement “unmount”" - msgstr "挂载未实现“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\"" -+#: ../gio/gmount.c:475 -+#, fuzzy -+msgid "mount doesn’t implement “eject”" - msgstr "挂载未实现“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 "挂载未实现“unmount”或“unmount_with_operation”" -+#: ../gio/gmount.c:553 -+#, fuzzy -+msgid "mount doesn’t implement “unmount” or “unmount_with_operation”" -+msgstr "挂载未执行“eject”或“eject_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 "挂载未实现“eject”或“eject_with_operation”" -+#: ../gio/gmount.c:638 -+#, fuzzy -+msgid "mount doesn’t implement “eject” or “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\"" -+#: ../gio/gmount.c:726 -+#, fuzzy -+msgid "mount doesn’t implement “remount”" - msgstr "挂载未实现“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" -+#: ../gio/gmount.c:808 -+#, fuzzy -+msgid "mount doesn’t implement content type guessing" - msgstr "挂载未实现内容类型猜测" - - #. 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" -+#: ../gio/gmount.c:895 -+#, fuzzy -+msgid "mount doesn’t implement synchronous content type guessing" - msgstr "挂载未实现同步内容类型猜测" - --#: ../gio/gnetworkaddress.c:378 --#, c-format --msgid "Hostname '%s' contains '[' but not ']'" -+#: ../gio/gnetworkaddress.c:415 -+#, fuzzy, c-format -+msgid "Hostname “%s” contains “[” but not “]”" - msgstr "主机名“%s”包含“[”但是缺少“]”" - --#: ../gio/gnetworkmonitorbase.c:206 ../gio/gnetworkmonitorbase.c:310 -+#: ../gio/gnetworkmonitorbase.c:219 ../gio/gnetworkmonitorbase.c:323 - msgid "Network unreachable" - msgstr "网络不可达" - --#: ../gio/gnetworkmonitorbase.c:244 ../gio/gnetworkmonitorbase.c:274 -+#: ../gio/gnetworkmonitorbase.c:257 ../gio/gnetworkmonitorbase.c:287 - msgid "Host unreachable" - msgstr "主机不可达" - --#: ../gio/gnetworkmonitornetlink.c:96 ../gio/gnetworkmonitornetlink.c:108 --#: ../gio/gnetworkmonitornetlink.c:127 -+#: ../gio/gnetworkmonitornetlink.c:99 ../gio/gnetworkmonitornetlink.c:111 -+#: ../gio/gnetworkmonitornetlink.c:130 - #, c-format - msgid "Could not create network monitor: %s" - msgstr "不能创建网络监视器：%s" - --#: ../gio/gnetworkmonitornetlink.c:117 -+#: ../gio/gnetworkmonitornetlink.c:120 - msgid "Could not create network monitor: " - msgstr "不能创建网络监视器：" - --#: ../gio/gnetworkmonitornetlink.c:175 -+#: ../gio/gnetworkmonitornetlink.c:183 - msgid "Could not get network status: " - msgstr "不能获取网络状态： %s" - --#: ../gio/gnetworkmonitornm.c:326 -+#: ../gio/gnetworkmonitornm.c:348 -+#, fuzzy, c-format -+msgid "NetworkManager not running" -+msgstr "NetworkManager 版本太老" -+ -+#: ../gio/gnetworkmonitornm.c:359 - #, c-format - msgid "NetworkManager version too old" - msgstr "NetworkManager 版本太老" - --#: ../gio/goutputstream.c:212 ../gio/goutputstream.c:560 --msgid "Output stream doesn't implement write" -+#: ../gio/goutputstream.c:232 ../gio/goutputstream.c:775 -+#, fuzzy -+msgid "Output stream doesn’t implement write" - msgstr "输出流未实现写入" - --#: ../gio/goutputstream.c:521 ../gio/goutputstream.c:1224 -+#: ../gio/goutputstream.c:472 ../gio/goutputstream.c:1533 -+#, c-format -+msgid "Sum of vectors passed to %s too large" -+msgstr "" -+ -+#: ../gio/goutputstream.c:736 ../gio/goutputstream.c:1761 - msgid "Source stream is already closed" - msgstr "源流已经关闭" - --#: ../gio/gresolver.c:333 ../gio/gthreadedresolver.c:116 --#: ../gio/gthreadedresolver.c:126 --#, c-format --msgid "Error resolving '%s': %s" -+#: ../gio/gresolver.c:386 ../gio/gthreadedresolver.c:150 -+#: ../gio/gthreadedresolver.c:168 -+#, fuzzy, c-format -+msgid "Error resolving “%s”: %s" - msgstr "解析“%s”时出错：%s" - --#: ../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" -+#. Translators: The placeholder is for a function name. -+#: ../gio/gresolver.c:455 ../gio/gresolver.c:613 -+#, fuzzy, c-format -+msgid "%s not implemented" -+msgstr "输入流未实现读取" -+ -+#: ../gio/gresolver.c:981 ../gio/gresolver.c:1033 -+#, fuzzy -+msgid "Invalid domain" -+msgstr "无效的文件名" -+ -+#: ../gio/gresource.c:665 ../gio/gresource.c:924 ../gio/gresource.c:963 -+#: ../gio/gresource.c:1087 ../gio/gresource.c:1159 ../gio/gresource.c:1232 -+#: ../gio/gresource.c:1313 ../gio/gresourcefile.c:476 -+#: ../gio/gresourcefile.c:599 ../gio/gresourcefile.c:736 -+#, fuzzy, c-format -+msgid "The resource at “%s” does not exist" - msgstr "位于“%s”的资源不存在" - --#: ../gio/gresource.c:760 --#, c-format --msgid "The resource at '%s' failed to decompress" -+#: ../gio/gresource.c:830 -+#, fuzzy, c-format -+msgid "The resource at “%s” failed to decompress" - msgstr "解压位于“%s”的资源失败" - --#: ../gio/gresourcefile.c:709 --#, c-format --msgid "The resource at '%s' is not a directory" -+#: ../gio/gresourcefile.c:732 -+#, fuzzy, c-format -+msgid "The resource at “%s” is not a directory" - msgstr "“%s”处的资源不是一个目录" - --#: ../gio/gresourcefile.c:917 --msgid "Input stream doesn't implement seek" -+#: ../gio/gresourcefile.c:940 -+#, fuzzy -+msgid "Input stream doesn’t implement seek" - msgstr "输入流未实现定位" - --#: ../gio/gresource-tool.c:494 -+#: ../gio/gresource-tool.c:499 - msgid "List sections containing resources in an elf FILE" - msgstr "列出 ELF 文件 FILE 中包含资源的段" - --#: ../gio/gresource-tool.c:500 -+#: ../gio/gresource-tool.c:505 - msgid "" - "List resources\n" - "If SECTION is given, only list resources in this section\n" -@@ -2999,16 +3396,16 @@ msgstr "" - "如果指定了 SECTION，则仅在此段中列出资源\n" - "如果指定了 PATH，则仅列出匹配的资源" - --#: ../gio/gresource-tool.c:503 ../gio/gresource-tool.c:513 -+#: ../gio/gresource-tool.c:508 ../gio/gresource-tool.c:518 - msgid "FILE [PATH]" - msgstr "FILE [PATH]" - --#: ../gio/gresource-tool.c:504 ../gio/gresource-tool.c:514 --#: ../gio/gresource-tool.c:521 -+#: ../gio/gresource-tool.c:509 ../gio/gresource-tool.c:519 -+#: ../gio/gresource-tool.c:526 - msgid "SECTION" - msgstr "SECTION" - --#: ../gio/gresource-tool.c:509 -+#: ../gio/gresource-tool.c:514 - msgid "" - "List resources with details\n" - "If SECTION is given, only list resources in this section\n" -@@ -3020,18 +3417,19 @@ msgstr "" - "如果指定了 PATH，则仅列出匹配的资源\n" - "详细信息包括段、大小和压缩情况" - --#: ../gio/gresource-tool.c:519 -+#: ../gio/gresource-tool.c:524 - msgid "Extract a resource file to stdout" - msgstr "提取一个资源文件到标准输出" - --#: ../gio/gresource-tool.c:520 -+#: ../gio/gresource-tool.c:525 - msgid "FILE PATH" - msgstr "FILE PATH" - --#: ../gio/gresource-tool.c:534 -+#: ../gio/gresource-tool.c:539 -+#, fuzzy - msgid "" - "Usage:\n" --" gresource [--section SECTION] COMMAND [ARGS...]\n" -+" gresource [--section SECTION] COMMAND [ARGS…]\n" - "\n" - "Commands:\n" - " help Show this information\n" -@@ -3040,7 +3438,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 "" - "用法：\n" -@@ -3056,7 +3454,7 @@ msgstr "" - "使用“gresoure help COMMAND”获取详细帮助。\n" - "\n" - --#: ../gio/gresource-tool.c:548 -+#: ../gio/gresource-tool.c:553 - #, c-format - msgid "" - "Usage:\n" -@@ -3071,19 +3469,19 @@ msgstr "" - "%s\n" - "\n" - --#: ../gio/gresource-tool.c:555 -+#: ../gio/gresource-tool.c:560 - msgid " SECTION An (optional) elf section name\n" - msgstr " SECTION ELF 段名(可选)\n" - --#: ../gio/gresource-tool.c:559 ../gio/gsettings-tool.c:654 -+#: ../gio/gresource-tool.c:564 ../gio/gsettings-tool.c:701 - msgid " COMMAND The (optional) command to explain\n" - msgstr " COMMAND 要解释的命令(可选)\n" - --#: ../gio/gresource-tool.c:565 -+#: ../gio/gresource-tool.c:570 - msgid " FILE An elf file (a binary or a shared library)\n" - msgstr " FILE ELF 文件(可执行文件或共享库)\n" - --#: ../gio/gresource-tool.c:568 -+#: ../gio/gresource-tool.c:573 - msgid "" - " FILE An elf file (a binary or a shared library)\n" - " or a compiled resource file\n" -@@ -3091,90 +3489,90 @@ msgstr "" - " FILE ELF 文件(可执行文件或共享库)\n" - " 或已编译的资源文件\n" - --#: ../gio/gresource-tool.c:572 -+#: ../gio/gresource-tool.c:577 - msgid "[PATH]" - msgstr "[PATH]" - --#: ../gio/gresource-tool.c:574 -+#: ../gio/gresource-tool.c:579 - msgid " PATH An (optional) resource path (may be partial)\n" - msgstr " PATH (部分)资源路径(可选)\n" - --#: ../gio/gresource-tool.c:575 -+#: ../gio/gresource-tool.c:580 - msgid "PATH" - msgstr "PATH" - --#: ../gio/gresource-tool.c:577 -+#: ../gio/gresource-tool.c:582 - msgid " PATH A resource path\n" - msgstr " PATH 资源路径\n" - --#: ../gio/gsettings-tool.c:51 ../gio/gsettings-tool.c:72 --#: ../gio/gsettings-tool.c:851 --#, c-format --msgid "No such schema '%s'\n" -+#: ../gio/gsettings-tool.c:49 ../gio/gsettings-tool.c:70 -+#: ../gio/gsettings-tool.c:906 -+#, fuzzy, c-format -+msgid "No such schema “%s”\n" - msgstr "没有“%s”这个方案\n" - --#: ../gio/gsettings-tool.c:57 --#, c-format --msgid "Schema '%s' is not relocatable (path must not be specified)\n" -+#: ../gio/gsettings-tool.c:55 -+#, fuzzy, c-format -+msgid "Schema “%s” is not relocatable (path must not be specified)\n" - msgstr "“%s”方案不可重定向(必须指定路径)\n" - --#: ../gio/gsettings-tool.c:78 --#, c-format --msgid "Schema '%s' is relocatable (path must be specified)\n" -+#: ../gio/gsettings-tool.c:76 -+#, fuzzy, c-format -+msgid "Schema “%s” is relocatable (path must be specified)\n" - msgstr "“%s”方案可重定向(必须指定路径)\n" - --#: ../gio/gsettings-tool.c:92 -+#: ../gio/gsettings-tool.c:90 - #, c-format - msgid "Empty path given.\n" - msgstr "指定的路径为空。\n" - --#: ../gio/gsettings-tool.c:98 -+#: ../gio/gsettings-tool.c:96 - #, c-format - msgid "Path must begin with a slash (/)\n" - msgstr "路径必须以斜杠开头(/)\n" - --#: ../gio/gsettings-tool.c:104 -+#: ../gio/gsettings-tool.c:102 - #, c-format - msgid "Path must end with a slash (/)\n" - msgstr "路径必须以斜杠结束(/)\n" - --#: ../gio/gsettings-tool.c:110 -+#: ../gio/gsettings-tool.c:108 - #, c-format - msgid "Path must not contain two adjacent slashes (//)\n" - msgstr "路径中不能包含连续两个斜杠(//)\n" - --#: ../gio/gsettings-tool.c:489 -+#: ../gio/gsettings-tool.c:536 - #, c-format - msgid "The provided value is outside of the valid range\n" - msgstr "提供的值不在有效范围内\n" - --#: ../gio/gsettings-tool.c:496 -+#: ../gio/gsettings-tool.c:543 - #, c-format - msgid "The key is not writable\n" - msgstr "键不可写\n" - --#: ../gio/gsettings-tool.c:532 -+#: ../gio/gsettings-tool.c:579 - msgid "List the installed (non-relocatable) schemas" - msgstr "列出已安装的(不可重分配的)方案" - --#: ../gio/gsettings-tool.c:538 -+#: ../gio/gsettings-tool.c:585 - msgid "List the installed relocatable schemas" - msgstr "列出安装的可重分配的方案" - --#: ../gio/gsettings-tool.c:544 -+#: ../gio/gsettings-tool.c:591 - msgid "List the keys in SCHEMA" - msgstr "列出 SCHEMA 中的键" - --#: ../gio/gsettings-tool.c:545 ../gio/gsettings-tool.c:551 --#: ../gio/gsettings-tool.c:594 -+#: ../gio/gsettings-tool.c:592 ../gio/gsettings-tool.c:598 -+#: ../gio/gsettings-tool.c:641 - msgid "SCHEMA[:PATH]" - msgstr "SCHEMA[:PATH]" - --#: ../gio/gsettings-tool.c:550 -+#: ../gio/gsettings-tool.c:597 - msgid "List the children of SCHEMA" - msgstr "列出 SCHEMA 的子对象" - --#: ../gio/gsettings-tool.c:556 -+#: ../gio/gsettings-tool.c:603 - msgid "" - "List keys and values, recursively\n" - "If no SCHEMA is given, list all keys\n" -@@ -3182,49 +3580,49 @@ msgstr "" - "递归列出键和值\n" - "如果没有给出 SCHEMA，列出所有键\n" - --#: ../gio/gsettings-tool.c:558 -+#: ../gio/gsettings-tool.c:605 - msgid "[SCHEMA[:PATH]]" - msgstr "SCHEMA[:PATH]" - --#: ../gio/gsettings-tool.c:563 -+#: ../gio/gsettings-tool.c:610 - msgid "Get the value of KEY" - msgstr "获取 KEY 的值" - --#: ../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 -+#: ../gio/gsettings-tool.c:611 ../gio/gsettings-tool.c:617 -+#: ../gio/gsettings-tool.c:623 ../gio/gsettings-tool.c:635 -+#: ../gio/gsettings-tool.c:647 - msgid "SCHEMA[:PATH] KEY" - msgstr "SCHEMA[:PATH] KEY" - --#: ../gio/gsettings-tool.c:569 -+#: ../gio/gsettings-tool.c:616 - msgid "Query the range of valid values for KEY" - msgstr "查询 KEY 的有效值范围" - --#: ../gio/gsettings-tool.c:575 -+#: ../gio/gsettings-tool.c:622 - msgid "Query the description for KEY" - msgstr "查询 KEY 的描述" - --#: ../gio/gsettings-tool.c:581 -+#: ../gio/gsettings-tool.c:628 - msgid "Set the value of KEY to VALUE" - msgstr "将 KEY 的值设为 VALUE" - --#: ../gio/gsettings-tool.c:582 -+#: ../gio/gsettings-tool.c:629 - msgid "SCHEMA[:PATH] KEY VALUE" - msgstr "SCHEMA[:PATH] KEY VALUE" - --#: ../gio/gsettings-tool.c:587 -+#: ../gio/gsettings-tool.c:634 - msgid "Reset KEY to its default value" - msgstr "将 KEY 重设为默认值" - --#: ../gio/gsettings-tool.c:593 -+#: ../gio/gsettings-tool.c:640 - msgid "Reset all keys in SCHEMA to their defaults" - msgstr "重置 SCHEMA 中所有键为默认值" - --#: ../gio/gsettings-tool.c:599 -+#: ../gio/gsettings-tool.c:646 - msgid "Check if KEY is writable" - msgstr "查看 KEY 是否可写" - --#: ../gio/gsettings-tool.c:605 -+#: ../gio/gsettings-tool.c:652 - msgid "" - "Monitor KEY for changes.\n" - "If no KEY is specified, monitor all keys in SCHEMA.\n" -@@ -3234,15 +3632,16 @@ msgstr "" - "如果没有指定 KEY，则监视 SCHEMA 中的所有键。\n" - "使用 ^C 停止监视。\n" - --#: ../gio/gsettings-tool.c:608 -+#: ../gio/gsettings-tool.c:655 - msgid "SCHEMA[:PATH] [KEY]" - msgstr "SCHEMA[:PATH] [KEY]" - --#: ../gio/gsettings-tool.c:620 -+#: ../gio/gsettings-tool.c:667 -+#, 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" -@@ -3260,7 +3659,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 "" - "用法：\n" -@@ -3286,7 +3685,7 @@ msgstr "" - "使用 'gsettings help 命令' 查看详细的帮助。\n" - "\n" - --#: ../gio/gsettings-tool.c:644 -+#: ../gio/gsettings-tool.c:691 - #, c-format - msgid "" - "Usage:\n" -@@ -3301,11 +3700,11 @@ msgstr "" - "%s\n" - "\n" - --#: ../gio/gsettings-tool.c:650 -+#: ../gio/gsettings-tool.c:697 - msgid " SCHEMADIR A directory to search for additional schemas\n" - msgstr " SCHEMADIR 一个用于搜索附加方案的目录\n" - --#: ../gio/gsettings-tool.c:658 -+#: ../gio/gsettings-tool.c:705 - msgid "" - " SCHEMA The name of the schema\n" - " PATH The path, for relocatable schemas\n" -@@ -3313,217 +3712,252 @@ msgstr "" - " SCHEMA 方案的名称\n" - " PATH 可重定向方案的路径\n" - --#: ../gio/gsettings-tool.c:663 -+#: ../gio/gsettings-tool.c:710 - msgid " KEY The (optional) key within the schema\n" - msgstr " KEY 方案中(可选)的键\n" - --#: ../gio/gsettings-tool.c:667 -+#: ../gio/gsettings-tool.c:714 - msgid " KEY The key within the schema\n" - msgstr " KEY 方案中的键\n" - --#: ../gio/gsettings-tool.c:671 -+#: ../gio/gsettings-tool.c:718 - msgid " VALUE The value to set\n" - msgstr " VALUE 要设的值\n" - --#: ../gio/gsettings-tool.c:726 -+#: ../gio/gsettings-tool.c:773 - #, c-format - msgid "Could not load schemas from %s: %s\n" - msgstr "无法从 %s 加载方案：%s\n" - --#: ../gio/gsettings-tool.c:738 -+#: ../gio/gsettings-tool.c:785 - #, c-format - msgid "No schemas installed\n" - msgstr "没有安装方案文件\n" - --#: ../gio/gsettings-tool.c:809 -+#: ../gio/gsettings-tool.c:864 - #, c-format - msgid "Empty schema name given\n" - msgstr "给出了空的大纲名称\n" - --#: ../gio/gsettings-tool.c:864 --#, c-format --msgid "No such key '%s'\n" -+#: ../gio/gsettings-tool.c:919 -+#, fuzzy, c-format -+msgid "No such key “%s”\n" - msgstr "没有“%s”这个键\n" - --#: ../gio/gsocket.c:364 -+#: ../gio/gsocket.c:418 - msgid "Invalid socket, not initialized" - msgstr "无效的套接字，尚未初始化" - --#: ../gio/gsocket.c:371 -+#: ../gio/gsocket.c:425 - #, c-format - msgid "Invalid socket, initialization failed due to: %s" - msgstr "无效的套接字，初始化失败的原因是：%s" - --#: ../gio/gsocket.c:379 -+#: ../gio/gsocket.c:433 - msgid "Socket is already closed" - msgstr "套接字已经关闭" - --#: ../gio/gsocket.c:394 ../gio/gsocket.c:2751 ../gio/gsocket.c:3897 --#: ../gio/gsocket.c:3952 -+#: ../gio/gsocket.c:448 ../gio/gsocket.c:3182 ../gio/gsocket.c:4399 -+#: ../gio/gsocket.c:4457 - msgid "Socket I/O timed out" - msgstr "套接字 I/O 超时" - --#: ../gio/gsocket.c:526 -+#: ../gio/gsocket.c:583 - #, c-format - msgid "creating GSocket from fd: %s" - msgstr "从文件描述符创建 GSocket：%s" - --#: ../gio/gsocket.c:554 ../gio/gsocket.c:608 ../gio/gsocket.c:615 -+#: ../gio/gsocket.c:612 ../gio/gsocket.c:666 ../gio/gsocket.c:673 - #, c-format - msgid "Unable to create socket: %s" - msgstr "无法创建套接字：%s" - --#: ../gio/gsocket.c:608 -+#: ../gio/gsocket.c:666 - msgid "Unknown family was specified" - msgstr "指定了未知协议族" - --#: ../gio/gsocket.c:615 -+#: ../gio/gsocket.c:673 - msgid "Unknown protocol was specified" - msgstr "指定了未知协议" - --#: ../gio/gsocket.c:1104 -+#: ../gio/gsocket.c:1164 - #, c-format - msgid "Cannot use datagram operations on a non-datagram socket." - msgstr "无法在非数据报套接字上使用数据报操作。" - --#: ../gio/gsocket.c:1121 -+#: ../gio/gsocket.c:1181 - #, c-format - msgid "Cannot use datagram operations on a socket with a timeout set." - msgstr "无法在已设置超时的套接字上使用数据报操作。" - --#: ../gio/gsocket.c:1925 -+#: ../gio/gsocket.c:1988 - #, c-format - msgid "could not get local address: %s" - msgstr "不能获取本地地址：%s" - --#: ../gio/gsocket.c:1968 -+#: ../gio/gsocket.c:2034 - #, c-format - msgid "could not get remote address: %s" - msgstr "不能获取远程地址： %s" - --#: ../gio/gsocket.c:2034 -+#: ../gio/gsocket.c:2100 - #, c-format - msgid "could not listen: %s" - msgstr "无法监听：%s" - --#: ../gio/gsocket.c:2133 --#, c-format --msgid "Error binding to address: %s" -+#: ../gio/gsocket.c:2204 -+#, fuzzy, c-format -+msgid "Error binding to address %s: %s" - msgstr "错误绑定地址：%s" - --#: ../gio/gsocket.c:2248 ../gio/gsocket.c:2285 -+#: ../gio/gsocket.c:2380 ../gio/gsocket.c:2417 ../gio/gsocket.c:2527 -+#: ../gio/gsocket.c:2552 ../gio/gsocket.c:2615 ../gio/gsocket.c:2673 -+#: ../gio/gsocket.c:2691 - #, c-format - msgid "Error joining multicast group: %s" - msgstr "加入多播组出错：%s" - --#: ../gio/gsocket.c:2249 ../gio/gsocket.c:2286 -+#: ../gio/gsocket.c:2381 ../gio/gsocket.c:2418 ../gio/gsocket.c:2528 -+#: ../gio/gsocket.c:2553 ../gio/gsocket.c:2616 ../gio/gsocket.c:2674 -+#: ../gio/gsocket.c:2692 - #, c-format - msgid "Error leaving multicast group: %s" - msgstr "退出多播组出错：%s" - --#: ../gio/gsocket.c:2250 -+#: ../gio/gsocket.c:2382 - msgid "No support for source-specific multicast" - msgstr "不支持指定源的多播" - --#: ../gio/gsocket.c:2470 -+#: ../gio/gsocket.c:2529 -+#, fuzzy -+msgid "Unsupported socket family" -+msgstr "不支持的套接字地址" -+ -+#: ../gio/gsocket.c:2554 -+msgid "source-specific not an IPv4 address" -+msgstr "" -+ -+#: ../gio/gsocket.c:2578 -+#, c-format -+msgid "Interface name too long" -+msgstr "" -+ -+#: ../gio/gsocket.c:2591 ../gio/gsocket.c:2641 -+#, c-format -+msgid "Interface not found: %s" -+msgstr "" -+ -+#: ../gio/gsocket.c:2617 -+#, fuzzy -+msgid "No support for IPv4 source-specific multicast" -+msgstr "不支持指定源的多播" -+ -+#: ../gio/gsocket.c:2675 -+#, fuzzy -+msgid "No support for IPv6 source-specific multicast" -+msgstr "不支持指定源的多播" -+ -+#: ../gio/gsocket.c:2884 - #, c-format - msgid "Error accepting connection: %s" - msgstr "接受连接时出错：%s" - --#: ../gio/gsocket.c:2593 -+#: ../gio/gsocket.c:3010 - msgid "Connection in progress" - msgstr "正在连接" - --#: ../gio/gsocket.c:2644 -+#: ../gio/gsocket.c:3061 - msgid "Unable to get pending error: " - msgstr "无法获取未决的错误：" - --#: ../gio/gsocket.c:2816 -+#: ../gio/gsocket.c:3247 - #, c-format - msgid "Error receiving data: %s" - msgstr "接收数据出错：%s" - --#: ../gio/gsocket.c:3013 -+#: ../gio/gsocket.c:3444 - #, c-format - msgid "Error sending data: %s" - msgstr "发送数据出错：%s" - --#: ../gio/gsocket.c:3200 -+#: ../gio/gsocket.c:3631 - #, c-format - msgid "Unable to shutdown socket: %s" - msgstr "无法关闭套接字：%s" - --#: ../gio/gsocket.c:3281 -+#: ../gio/gsocket.c:3712 - #, c-format - msgid "Error closing socket: %s" - msgstr "关闭套接字出错：%s" - --#: ../gio/gsocket.c:3890 -+#: ../gio/gsocket.c:4392 - #, c-format - msgid "Waiting for socket condition: %s" - msgstr "等待套接字状态：%s" - --#: ../gio/gsocket.c:4362 ../gio/gsocket.c:4442 ../gio/gsocket.c:4620 -+#: ../gio/gsocket.c:4770 ../gio/gsocket.c:4772 ../gio/gsocket.c:4919 -+#: ../gio/gsocket.c:5004 ../gio/gsocket.c:5182 ../gio/gsocket.c:5222 -+#: ../gio/gsocket.c:5224 - #, c-format - msgid "Error sending message: %s" - msgstr "发送信息出错：%s" - --#: ../gio/gsocket.c:4386 -+#: ../gio/gsocket.c:4946 - msgid "GSocketControlMessage not supported on Windows" - msgstr "Windows 不支持 GSocketControlMessage" - --#: ../gio/gsocket.c:4839 ../gio/gsocket.c:4912 ../gio/gsocket.c:5139 -+#: ../gio/gsocket.c:5415 ../gio/gsocket.c:5488 ../gio/gsocket.c:5714 - #, c-format - msgid "Error receiving message: %s" - msgstr "接受信息出错：%s" - --#: ../gio/gsocket.c:5411 -+#: ../gio/gsocket.c:5995 - #, c-format - msgid "Unable to read socket credentials: %s" - msgstr "无法读取套接字认证信息：%s" - --#: ../gio/gsocket.c:5420 -+#: ../gio/gsocket.c:6004 - msgid "g_socket_get_credentials not implemented for this OS" - msgstr "此操作系统上没有实现 g_socket_get_credentials" - --#: ../gio/gsocketclient.c:176 -+#: ../gio/gsocketclient.c:182 - #, c-format - msgid "Could not connect to proxy server %s: " - msgstr "不能连接到代理服务器 %s：" - --#: ../gio/gsocketclient.c:190 -+#: ../gio/gsocketclient.c:196 - #, c-format - msgid "Could not connect to %s: " - msgstr "无法连接到 %s：" - --#: ../gio/gsocketclient.c:192 -+#: ../gio/gsocketclient.c:198 - msgid "Could not connect: " - msgstr "无法连接：" - --#: ../gio/gsocketclient.c:1027 ../gio/gsocketclient.c:1599 -+#: ../gio/gsocketclient.c:1037 ../gio/gsocketclient.c:1866 - msgid "Unknown error on connect" - msgstr "连接时出现未知错误" - --#: ../gio/gsocketclient.c:1081 ../gio/gsocketclient.c:1535 -+#: ../gio/gsocketclient.c:1091 ../gio/gsocketclient.c:1668 - msgid "Proxying over a non-TCP connection is not supported." - msgstr "不支持通过非 TCP 连接的代理。" - --#: ../gio/gsocketclient.c:1110 ../gio/gsocketclient.c:1561 --#, c-format --msgid "Proxy protocol '%s' is not supported." -+#: ../gio/gsocketclient.c:1120 ../gio/gsocketclient.c:1698 -+#, fuzzy, c-format -+msgid "Proxy protocol “%s” is not supported." - msgstr "不支持代理协议“%s”。" - --#: ../gio/gsocketlistener.c:218 -+#: ../gio/gsocketlistener.c:230 - msgid "Listener is already closed" - msgstr "监听器已关闭" - --#: ../gio/gsocketlistener.c:264 -+#: ../gio/gsocketlistener.c:276 - msgid "Added socket is closed" - msgstr "新增套接字已关闭" - - #: ../gio/gsocks4aproxy.c:118 --#, c-format --msgid "SOCKSv4 does not support IPv6 address '%s'" -+#, fuzzy, c-format -+msgid "SOCKSv4 does not support IPv6 address “%s”" - msgstr "SOCKSv4 不支持 IPv6 地址“%s”" - - #: ../gio/gsocks4aproxy.c:136 -@@ -3531,8 +3965,8 @@ msgid "Username is too long for SOCKSv4 protocol" - msgstr "用户名对于 SOCKSv4 协议太长。" - - #: ../gio/gsocks4aproxy.c:153 --#, c-format --msgid "Hostname '%s' is too long for SOCKSv4 protocol" -+#, fuzzy, c-format -+msgid "Hostname “%s” is too long for SOCKSv4 protocol" - msgstr "主机名“%s”对于 SOCKSv4 协议过长" - - #: ../gio/gsocks4aproxy.c:179 -@@ -3543,117 +3977,119 @@ msgstr "此服务器不是 SOCKSv4 代理服务器。" - msgid "Connection through SOCKSv4 server was rejected" - msgstr "通过 SOCKSv4 服务器连接被拒绝" - --#: ../gio/gsocks5proxy.c:153 ../gio/gsocks5proxy.c:324 --#: ../gio/gsocks5proxy.c:334 -+#: ../gio/gsocks5proxy.c:153 ../gio/gsocks5proxy.c:338 -+#: ../gio/gsocks5proxy.c:348 - msgid "The server is not a SOCKSv5 proxy server." - msgstr "此服务器不是 SOCKSv5 代理服务器。" - --#: ../gio/gsocks5proxy.c:167 -+#: ../gio/gsocks5proxy.c:167 ../gio/gsocks5proxy.c:184 - msgid "The SOCKSv5 proxy requires authentication." - msgstr "SOCKSv5 代理服务器需要认证。" - --#: ../gio/gsocks5proxy.c:177 -+#: ../gio/gsocks5proxy.c:191 - msgid "" - "The SOCKSv5 proxy requires an authentication method that is not supported by " - "GLib." - msgstr "此 SOCKSv5 连接需要一种 GLib 不支持的认证方法。" - --#: ../gio/gsocks5proxy.c:206 -+#: ../gio/gsocks5proxy.c:220 - msgid "Username or password is too long for SOCKSv5 protocol." - msgstr "用户名或密码对于 SOCKSv5 协议太长。" - --#: ../gio/gsocks5proxy.c:236 -+#: ../gio/gsocks5proxy.c:250 - msgid "SOCKSv5 authentication failed due to wrong username or password." - msgstr "SOCKSv5 认证失败：用户名或密码错误。" - --#: ../gio/gsocks5proxy.c:286 --#, c-format --msgid "Hostname '%s' is too long for SOCKSv5 protocol" -+#: ../gio/gsocks5proxy.c:300 -+#, fuzzy, c-format -+msgid "Hostname “%s” is too long for SOCKSv5 protocol" - msgstr "主机名“%s”对于 SOCKSv5 协议过长" - --#: ../gio/gsocks5proxy.c:348 -+#: ../gio/gsocks5proxy.c:362 - msgid "The SOCKSv5 proxy server uses unknown address type." - msgstr "SOCKSv5 代理服务器使用未知地址类型。" - --#: ../gio/gsocks5proxy.c:355 -+#: ../gio/gsocks5proxy.c:369 - msgid "Internal SOCKSv5 proxy server error." - msgstr "SOCKSv5 代理服务器内部错误。" - --#: ../gio/gsocks5proxy.c:361 -+#: ../gio/gsocks5proxy.c:375 - msgid "SOCKSv5 connection not allowed by ruleset." - msgstr "规则不允许 SOCKSv5 连接。" - --#: ../gio/gsocks5proxy.c:368 -+#: ../gio/gsocks5proxy.c:382 - msgid "Host unreachable through SOCKSv5 server." - msgstr "通过 SOCKSv5 服务器主机不可达。" - --#: ../gio/gsocks5proxy.c:374 -+#: ../gio/gsocks5proxy.c:388 - msgid "Network unreachable through SOCKSv5 proxy." - msgstr "通过 SOCKSv5 代理网络不可达。" - --#: ../gio/gsocks5proxy.c:380 -+#: ../gio/gsocks5proxy.c:394 - msgid "Connection refused through SOCKSv5 proxy." - msgstr "通过 SOCKSv5 代理连接被拒绝。" - --#: ../gio/gsocks5proxy.c:386 --msgid "SOCKSv5 proxy does not support 'connect' command." -+#: ../gio/gsocks5proxy.c:400 -+#, fuzzy -+msgid "SOCKSv5 proxy does not support “connect” command." - msgstr "SOCKSv5 代理不支持“connect”命令。" - --#: ../gio/gsocks5proxy.c:392 -+#: ../gio/gsocks5proxy.c:406 - msgid "SOCKSv5 proxy does not support provided address type." - msgstr "SOCKSv5 代理不支持提供的地址类型。" - --#: ../gio/gsocks5proxy.c:398 -+#: ../gio/gsocks5proxy.c:412 - msgid "Unknown SOCKSv5 proxy error." - msgstr "未知 SOCKSv5 代理错误。" - --#: ../gio/gthemedicon.c:518 --#, c-format --msgid "Can't handle version %d of GThemedIcon encoding" -+#: ../gio/gthemedicon.c:595 -+#, fuzzy, c-format -+msgid "Can’t handle version %d of GThemedIcon encoding" - msgstr "无法处理 GThemedIcon 编码的版本 %d" - --#: ../gio/gthreadedresolver.c:118 -+#: ../gio/gthreadedresolver.c:152 - msgid "No valid addresses were found" - msgstr "找不到合法的地址" - --#: ../gio/gthreadedresolver.c:213 --#, c-format --msgid "Error reverse-resolving '%s': %s" -+#: ../gio/gthreadedresolver.c:334 -+#, fuzzy, c-format -+msgid "Error reverse-resolving “%s”: %s" - msgstr "反向解析“%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'" -+#: ../gio/gthreadedresolver.c:671 ../gio/gthreadedresolver.c:750 -+#: ../gio/gthreadedresolver.c:848 ../gio/gthreadedresolver.c:898 -+#, fuzzy, c-format -+msgid "No DNS record of the requested type for “%s”" - msgstr "没有“%s”所请求类型的 DNS 记录" - --#: ../gio/gthreadedresolver.c:555 ../gio/gthreadedresolver.c:733 --#, c-format --msgid "Temporarily unable to resolve '%s'" -+#: ../gio/gthreadedresolver.c:676 ../gio/gthreadedresolver.c:853 -+#, fuzzy, c-format -+msgid "Temporarily unable to resolve “%s”" - msgstr "暂时无法解析“%s”" - --#: ../gio/gthreadedresolver.c:560 ../gio/gthreadedresolver.c:738 --#, c-format --msgid "Error resolving '%s'" -+#: ../gio/gthreadedresolver.c:681 ../gio/gthreadedresolver.c:858 -+#: ../gio/gthreadedresolver.c:968 -+#, fuzzy, c-format -+msgid "Error resolving “%s”" - msgstr "解析“%s”时出错" - --#: ../gio/gtlscertificate.c:250 --msgid "Cannot decrypt PEM-encoded private key" --msgstr "无法解密 PEM 加密的私钥" -- --#: ../gio/gtlscertificate.c:255 -+#: ../gio/gtlscertificate.c:243 - msgid "No PEM-encoded private key found" - msgstr "未找到 PEM 加密的私钥" - --#: ../gio/gtlscertificate.c:265 -+#: ../gio/gtlscertificate.c:253 -+msgid "Cannot decrypt PEM-encoded private key" -+msgstr "无法解密 PEM 加密的私钥" -+ -+#: ../gio/gtlscertificate.c:264 - msgid "Could not parse PEM-encoded private key" - msgstr "无法解析 PEM 加密的私钥" - --#: ../gio/gtlscertificate.c:290 -+#: ../gio/gtlscertificate.c:291 - msgid "No PEM-encoded certificate found" - msgstr "未找到 PEM 加密的证书" - --#: ../gio/gtlscertificate.c:299 -+#: ../gio/gtlscertificate.c:300 - msgid "Could not parse PEM-encoded certificate" - msgstr "无法解析 PEM 加密的证书" - -@@ -3663,23 +4099,26 @@ msgid "" - "is locked out." - msgstr "这是您的访问被锁定前最后一次机会输入正确的密码。" - --#: ../gio/gtlspassword.c:113 -+#. Translators: This is not the 'This is the last chance' string. It is -+#. * displayed when more than one attempt is allowed. -+#: ../gio/gtlspassword.c:115 -+#, fuzzy - msgid "" --"Several password entered have been incorrect, and your access will be locked " --"out after further failures." -+"Several passwords entered have been incorrect, and your access will be " -+"locked out after further failures." - msgstr "密码多次输入错误，您的访问将在下一次错误输入后锁定。" - --#: ../gio/gtlspassword.c:115 -+#: ../gio/gtlspassword.c:117 - msgid "The password entered is incorrect." - msgstr "输入的密码不正确。" - --#: ../gio/gunixconnection.c:166 ../gio/gunixconnection.c:561 -+#: ../gio/gunixconnection.c:166 ../gio/gunixconnection.c:579 - #, c-format - msgid "Expecting 1 control message, got %d" - msgid_plural "Expecting 1 control message, got %d" - msgstr[0] "应为 1 个控件消息，却得到 %d 个" - --#: ../gio/gunixconnection.c:182 ../gio/gunixconnection.c:573 -+#: ../gio/gunixconnection.c:182 ../gio/gunixconnection.c:591 - msgid "Unexpected type of ancillary data" - msgstr "非预期的辅助数据类型" - -@@ -3693,68 +4132,72 @@ msgstr[0] "应为 1 个文件描述符，却得到 %d 个\n" - msgid "Received invalid fd" - msgstr "收到无效文件描述符" - --#: ../gio/gunixconnection.c:355 -+#: ../gio/gunixconnection.c:363 - msgid "Error sending credentials: " - msgstr "发送证书出错：" - --#: ../gio/gunixconnection.c:503 -+#: ../gio/gunixconnection.c:520 - #, c-format - msgid "Error checking if SO_PASSCRED is enabled for socket: %s" - msgstr "检查套接字是否启用 SO_PASSCRED 出错：%s" - --#: ../gio/gunixconnection.c:518 -+#: ../gio/gunixconnection.c:536 - #, c-format - msgid "Error enabling SO_PASSCRED: %s" - msgstr "启用 SO_PASSCRED 出错：%s" - --#: ../gio/gunixconnection.c:547 -+#: ../gio/gunixconnection.c:565 - msgid "" - "Expecting to read a single byte for receiving credentials but read zero bytes" - msgstr "期望为接收证书读到单个字节但是只读到了 0 字节" - --#: ../gio/gunixconnection.c:587 -+#: ../gio/gunixconnection.c:605 - #, c-format - msgid "Not expecting control message, but got %d" - msgstr "未期望控制信息，却得到 %d 个" - --#: ../gio/gunixconnection.c:611 -+#: ../gio/gunixconnection.c:630 - #, c-format - msgid "Error while disabling SO_PASSCRED: %s" - msgstr "禁用 SO_PASSCRED 时出错：%s" - --#: ../gio/gunixinputstream.c:369 ../gio/gunixinputstream.c:390 -+#: ../gio/gunixinputstream.c:372 ../gio/gunixinputstream.c:393 - #, c-format - msgid "Error reading from file descriptor: %s" - msgstr "从文件描述符读取出错：%s" - --#: ../gio/gunixinputstream.c:423 ../gio/gunixoutputstream.c:409 -+#: ../gio/gunixinputstream.c:426 ../gio/gunixoutputstream.c:535 - #: ../gio/gwin32inputstream.c:217 ../gio/gwin32outputstream.c:204 - #, c-format - msgid "Error closing file descriptor: %s" - msgstr "关闭文件描述符出错：%s" - --#: ../gio/gunixmounts.c:2329 ../gio/gunixmounts.c:2382 -+#: ../gio/gunixmounts.c:2709 ../gio/gunixmounts.c:2762 - msgid "Filesystem root" - msgstr "文件系统根目录" - --#: ../gio/gunixoutputstream.c:355 ../gio/gunixoutputstream.c:376 -+#: ../gio/gunixoutputstream.c:372 ../gio/gunixoutputstream.c:392 -+#: ../gio/gunixoutputstream.c:479 ../gio/gunixoutputstream.c:499 -+#: ../gio/gunixoutputstream.c:676 - #, c-format - msgid "Error writing to file descriptor: %s" - msgstr "写入文件描述符出错：%s" - --#: ../gio/gunixsocketaddress.c:239 -+#: ../gio/gunixsocketaddress.c:243 - msgid "Abstract UNIX domain socket addresses not supported on this system" - msgstr "本系统不支持抽象 Unix 域套接字地址" - --#: ../gio/gvolume.c:437 --msgid "volume doesn't implement eject" -+#: ../gio/gvolume.c:438 -+#, fuzzy -+msgid "volume doesn’t implement eject" - msgstr "卷未实现弹出" - - #. 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" -+#: ../gio/gvolume.c:515 -+#, fuzzy -+msgid "volume doesn’t implement eject or eject_with_operation" - msgstr "卷未实现弹出或 eject_with_operation" - - #: ../gio/gwin32inputstream.c:185 -@@ -3814,549 +4257,754 @@ msgstr "运行一个 dbus 服务" - msgid "Wrong args\n" - msgstr "参数错误\n" - --#: ../glib/gbookmarkfile.c:755 --#, c-format --msgid "Unexpected attribute '%s' for element '%s'" -+#: ../glib/gbookmarkfile.c:756 -+#, fuzzy, c-format -+msgid "Unexpected attribute “%s” for element “%s”" - msgstr "元素“%2$s”的意外属性“%1$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" -+#: ../glib/gbookmarkfile.c:767 ../glib/gbookmarkfile.c:847 -+#: ../glib/gbookmarkfile.c:857 ../glib/gbookmarkfile.c:969 -+#, fuzzy, c-format -+msgid "Attribute “%s” of element “%s” not found" - msgstr "元素“%2$s”的属性“%1$s”未找到" - --#: ../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" -+#: ../glib/gbookmarkfile.c:1178 ../glib/gbookmarkfile.c:1243 -+#: ../glib/gbookmarkfile.c:1307 ../glib/gbookmarkfile.c:1317 -+#, fuzzy, c-format -+msgid "Unexpected tag “%s”, tag “%s” expected" - msgstr "意外标签“%s”，需要标签“%s”" - --#: ../glib/gbookmarkfile.c:1149 ../glib/gbookmarkfile.c:1163 --#: ../glib/gbookmarkfile.c:1231 --#, c-format --msgid "Unexpected tag '%s' inside '%s'" -+#: ../glib/gbookmarkfile.c:1203 ../glib/gbookmarkfile.c:1217 -+#: ../glib/gbookmarkfile.c:1285 ../glib/gbookmarkfile.c:1331 -+#, fuzzy, c-format -+msgid "Unexpected tag “%s” inside “%s”" - msgstr "“%2$s”中的意外标签“%1$s”" - --#: ../glib/gbookmarkfile.c:1757 -+#: ../glib/gbookmarkfile.c:1625 -+#, c-format -+msgid "Invalid date/time ‘%s’ in bookmark file" -+msgstr "" -+ -+#: ../glib/gbookmarkfile.c:1831 - msgid "No valid bookmark file found in data dirs" - msgstr "数据目录中没有找到有效的书签文件" - --#: ../glib/gbookmarkfile.c:1958 --#, c-format --msgid "A bookmark for URI '%s' already exists" -+#: ../glib/gbookmarkfile.c:2032 -+#, fuzzy, c-format -+msgid "A bookmark for URI “%s” already exists" - msgstr "URI“%s”的书签已经存在" - --#: ../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:2078 ../glib/gbookmarkfile.c:2236 -+#: ../glib/gbookmarkfile.c:2321 ../glib/gbookmarkfile.c:2401 -+#: ../glib/gbookmarkfile.c:2486 ../glib/gbookmarkfile.c:2569 -+#: ../glib/gbookmarkfile.c:2647 ../glib/gbookmarkfile.c:2726 -+#: ../glib/gbookmarkfile.c:2768 ../glib/gbookmarkfile.c:2865 -+#: ../glib/gbookmarkfile.c:2986 ../glib/gbookmarkfile.c:3176 -+#: ../glib/gbookmarkfile.c:3252 ../glib/gbookmarkfile.c:3420 -+#: ../glib/gbookmarkfile.c:3509 ../glib/gbookmarkfile.c:3598 -+#: ../glib/gbookmarkfile.c:3717 -+#, fuzzy, c-format -+msgid "No bookmark found for URI “%s”" - msgstr "未找到 URI“%s”的书签" - --#: ../glib/gbookmarkfile.c:2336 --#, c-format --msgid "No MIME type defined in the bookmark for URI '%s'" -+#: ../glib/gbookmarkfile.c:2410 -+#, fuzzy, c-format -+msgid "No MIME type defined in the bookmark for URI “%s”" - msgstr "URI“%s”的书签未定义 MIME 类型" - --#: ../glib/gbookmarkfile.c:2421 --#, c-format --msgid "No private flag has been defined in bookmark for URI '%s'" -+#: ../glib/gbookmarkfile.c:2495 -+#, fuzzy, c-format -+msgid "No private flag has been defined in bookmark for URI “%s”" - msgstr "URI“%s”的书签未定义私有标志" - --#: ../glib/gbookmarkfile.c:2800 --#, c-format --msgid "No groups set in bookmark for URI '%s'" -+#: ../glib/gbookmarkfile.c:2874 -+#, fuzzy, c-format -+msgid "No groups set in bookmark for URI “%s”" - msgstr "URI“%s”的书签未设定组" - --#: ../glib/gbookmarkfile.c:3198 ../glib/gbookmarkfile.c:3355 --#, c-format --msgid "No application with name '%s' registered a bookmark for '%s'" -+#: ../glib/gbookmarkfile.c:3273 ../glib/gbookmarkfile.c:3430 -+#, fuzzy, c-format -+msgid "No application with name “%s” registered a bookmark for “%s”" - msgstr "没有名为“%s”的应用程序为“%s”注册书签" - --#: ../glib/gbookmarkfile.c:3378 --#, c-format --msgid "Failed to expand exec line '%s' with URI '%s'" -+#: ../glib/gbookmarkfile.c:3453 -+#, fuzzy, 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:851 ../glib/gutf8.c:1063 --#: ../glib/gutf8.c:1200 ../glib/gutf8.c:1304 -+#: ../glib/gconvert.c:466 -+#, fuzzy -+msgid "Unrepresentable character in conversion input" -+msgstr "转换输入中出现无效序列" -+ -+#: ../glib/gconvert.c:493 ../glib/gutf8.c:871 ../glib/gutf8.c:1083 -+#: ../glib/gutf8.c:1220 ../glib/gutf8.c:1324 - msgid "Partial character sequence at end of input" - msgstr "输入末尾出现未尽字符序列" - --#: ../glib/gconvert.c:742 --#, c-format --msgid "Cannot convert fallback '%s' to codeset '%s'" -+#: ../glib/gconvert.c:762 -+#, fuzzy, c-format -+msgid "Cannot convert fallback “%s” to codeset “%s”" - msgstr "无法转换后备字符集“%s”到字符集“%s”" - --#: ../glib/gconvert.c:1567 --#, c-format --msgid "The URI '%s' is not an absolute URI using the \"file\" scheme" -+#: ../glib/gconvert.c:934 -+#, fuzzy -+msgid "Embedded NUL byte in conversion input" -+msgstr "转换输入中出现无效字符序列" -+ -+#: ../glib/gconvert.c:955 -+#, fuzzy -+msgid "Embedded NUL byte in conversion output" -+msgstr "转换输入中出现无效字符序列" -+ -+#: ../glib/gconvert.c:1640 -+#, fuzzy, c-format -+msgid "The URI “%s” is not an absolute URI using the “file” scheme" - msgstr "URI“%s”不是使用“file”方案的绝对 URI" - --#: ../glib/gconvert.c:1577 --#, c-format --msgid "The local file URI '%s' may not include a '#'" -+#: ../glib/gconvert.c:1650 -+#, fuzzy, c-format -+msgid "The local file URI “%s” may not include a “#”" - msgstr "本地文件 URI“%s”不能包含“#”" - --#: ../glib/gconvert.c:1594 --#, c-format --msgid "The URI '%s' is invalid" -+#: ../glib/gconvert.c:1667 -+#, fuzzy, c-format -+msgid "The URI “%s” is invalid" - msgstr "URI“%s”无效" - --#: ../glib/gconvert.c:1606 --#, c-format --msgid "The hostname of the URI '%s' is invalid" -+#: ../glib/gconvert.c:1679 -+#, fuzzy, c-format -+msgid "The hostname of the URI “%s” is invalid" - msgstr "URI“%s”中的主机名无效" - --#: ../glib/gconvert.c:1622 --#, c-format --msgid "The URI '%s' contains invalidly escaped characters" -+#: ../glib/gconvert.c:1695 -+#, fuzzy, c-format -+msgid "The URI “%s” contains invalidly escaped characters" - msgstr "URI“%s”中包含无效的转义字符" - --#: ../glib/gconvert.c:1717 --#, c-format --msgid "The pathname '%s' is not an absolute path" -+#: ../glib/gconvert.c:1767 -+#, fuzzy, c-format -+msgid "The pathname “%s” is not an absolute path" - msgstr "路径名“%s”不是绝对路径" - --#: ../glib/gconvert.c:1727 --msgid "Invalid hostname" --msgstr "无效的主机名" -- --#. Translators: 'before midday' indicator --#: ../glib/gdatetime.c:201 --msgctxt "GDateTime" --msgid "AM" --msgstr "上午" -- --#. Translators: 'after midday' indicator --#: ../glib/gdatetime.c:203 --msgctxt "GDateTime" --msgid "PM" --msgstr "下午" -- - #. Translators: this is the preferred format for expressing the date and the time --#: ../glib/gdatetime.c:206 -+#: ../glib/gdatetime.c:220 - msgctxt "GDateTime" - msgid "%a %b %e %H:%M:%S %Y" - msgstr "%Y年%m月%d日 %A %H时%M分%S秒" - - #. Translators: this is the preferred format for expressing the date --#: ../glib/gdatetime.c:209 -+#: ../glib/gdatetime.c:223 - msgctxt "GDateTime" - msgid "%m/%d/%y" - msgstr "%m/%d/%y" - - #. Translators: this is the preferred format for expressing the time --#: ../glib/gdatetime.c:212 -+#: ../glib/gdatetime.c:226 - 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:229 - msgctxt "GDateTime" - msgid "%I:%M:%S %p" - msgstr "%p %I时%M分%S秒" - --#: ../glib/gdatetime.c:228 -+#. Translators: Some languages (Baltic, Slavic, Greek, and some more) -+#. * need different grammatical forms of month names depending on whether -+#. * they are standalone or in a complete date context, with the day -+#. * number. Some other languages may prefer starting with uppercase when -+#. * they are standalone and with lowercase when they are in a complete -+#. * date context. Here are full month names in a form appropriate when -+#. * they are used standalone. If your system is Linux with the glibc -+#. * version 2.27 (released Feb 1, 2018) or newer or if it is from the BSD -+#. * family (which includes OS X) then you can refer to the date command -+#. * line utility and see what the command `date +%OB' produces. Also in -+#. * the latest Linux the command `locale alt_mon' in your native locale -+#. * produces a complete list of month names almost ready to copy and -+#. * paste here. Note that in most of the languages (western European, -+#. * non-European) there is no difference between the standalone and -+#. * complete date form. -+#. -+#: ../glib/gdatetime.c:268 - msgctxt "full month name" - msgid "January" - msgstr "一月" - --#: ../glib/gdatetime.c:230 -+#: ../glib/gdatetime.c:270 - msgctxt "full month name" - msgid "February" - msgstr "二月" - --#: ../glib/gdatetime.c:232 -+#: ../glib/gdatetime.c:272 - msgctxt "full month name" - msgid "March" - msgstr "三月" - --#: ../glib/gdatetime.c:234 -+#: ../glib/gdatetime.c:274 - msgctxt "full month name" - msgid "April" - msgstr "四月" - --#: ../glib/gdatetime.c:236 -+#: ../glib/gdatetime.c:276 - msgctxt "full month name" - msgid "May" - msgstr "五月" - --#: ../glib/gdatetime.c:238 -+#: ../glib/gdatetime.c:278 - msgctxt "full month name" - msgid "June" - msgstr "六月" - --#: ../glib/gdatetime.c:240 -+#: ../glib/gdatetime.c:280 - msgctxt "full month name" - msgid "July" - msgstr "七月" - --#: ../glib/gdatetime.c:242 -+#: ../glib/gdatetime.c:282 - msgctxt "full month name" - msgid "August" - msgstr "八月" - --#: ../glib/gdatetime.c:244 -+#: ../glib/gdatetime.c:284 - msgctxt "full month name" - msgid "September" - msgstr "九月" - --#: ../glib/gdatetime.c:246 -+#: ../glib/gdatetime.c:286 - msgctxt "full month name" - msgid "October" - msgstr "十月" - --#: ../glib/gdatetime.c:248 -+#: ../glib/gdatetime.c:288 - msgctxt "full month name" - msgid "November" - msgstr "十一月" - --#: ../glib/gdatetime.c:250 -+#: ../glib/gdatetime.c:290 - msgctxt "full month name" - msgid "December" - msgstr "十二月" - --#: ../glib/gdatetime.c:265 -+#. Translators: Some languages need different grammatical forms of -+#. * month names depending on whether they are standalone or in a complete -+#. * date context, with the day number. Some may prefer starting with -+#. * uppercase when they are standalone and with lowercase when they are -+#. * in a full date context. However, as these names are abbreviated -+#. * the grammatical difference is visible probably only in Belarusian -+#. * and Russian. In other languages there is no difference between -+#. * the standalone and complete date form when they are abbreviated. -+#. * If your system is Linux with the glibc version 2.27 (released -+#. * Feb 1, 2018) or newer then you can refer to the date command line -+#. * utility and see what the command `date +%Ob' produces. Also in -+#. * the latest Linux the command `locale ab_alt_mon' in your native -+#. * locale produces a complete list of month names almost ready to copy -+#. * and paste here. Note that this feature is not yet supported by any -+#. * other platform. Here are abbreviated month names in a form -+#. * appropriate when they are used standalone. -+#. -+#: ../glib/gdatetime.c:322 - msgctxt "abbreviated month name" - msgid "Jan" - msgstr "01月" - --#: ../glib/gdatetime.c:267 -+#: ../glib/gdatetime.c:324 - msgctxt "abbreviated month name" - msgid "Feb" - msgstr "02月" - --#: ../glib/gdatetime.c:269 -+#: ../glib/gdatetime.c:326 - msgctxt "abbreviated month name" - msgid "Mar" - msgstr "03月" - --#: ../glib/gdatetime.c:271 -+#: ../glib/gdatetime.c:328 - msgctxt "abbreviated month name" - msgid "Apr" - msgstr "04月" - --#: ../glib/gdatetime.c:273 -+#: ../glib/gdatetime.c:330 - msgctxt "abbreviated month name" - msgid "May" - msgstr "05月" - --#: ../glib/gdatetime.c:275 -+#: ../glib/gdatetime.c:332 - msgctxt "abbreviated month name" - msgid "Jun" - msgstr "06月" - --#: ../glib/gdatetime.c:277 -+#: ../glib/gdatetime.c:334 - msgctxt "abbreviated month name" - msgid "Jul" - msgstr "07月" - --#: ../glib/gdatetime.c:279 -+#: ../glib/gdatetime.c:336 - msgctxt "abbreviated month name" - msgid "Aug" - msgstr "08月" - --#: ../glib/gdatetime.c:281 -+#: ../glib/gdatetime.c:338 - msgctxt "abbreviated month name" - msgid "Sep" - msgstr "09月" - --#: ../glib/gdatetime.c:283 -+#: ../glib/gdatetime.c:340 - msgctxt "abbreviated month name" - msgid "Oct" - msgstr "10月" - --#: ../glib/gdatetime.c:285 -+#: ../glib/gdatetime.c:342 - msgctxt "abbreviated month name" - msgid "Nov" - msgstr "11月" - --#: ../glib/gdatetime.c:287 -+#: ../glib/gdatetime.c:344 - msgctxt "abbreviated month name" - msgid "Dec" - msgstr "12月" - --#: ../glib/gdatetime.c:302 -+#: ../glib/gdatetime.c:359 - msgctxt "full weekday name" - msgid "Monday" - msgstr "星期一" - --#: ../glib/gdatetime.c:304 -+#: ../glib/gdatetime.c:361 - msgctxt "full weekday name" - msgid "Tuesday" - msgstr "星期二" - --#: ../glib/gdatetime.c:306 -+#: ../glib/gdatetime.c:363 - msgctxt "full weekday name" - msgid "Wednesday" - msgstr "星期三" - --#: ../glib/gdatetime.c:308 -+#: ../glib/gdatetime.c:365 - msgctxt "full weekday name" - msgid "Thursday" - msgstr "星期四" - --#: ../glib/gdatetime.c:310 -+#: ../glib/gdatetime.c:367 - msgctxt "full weekday name" - msgid "Friday" - msgstr "星期五" - --#: ../glib/gdatetime.c:312 -+#: ../glib/gdatetime.c:369 - msgctxt "full weekday name" - msgid "Saturday" - msgstr "星期六" - --#: ../glib/gdatetime.c:314 -+#: ../glib/gdatetime.c:371 - msgctxt "full weekday name" - msgid "Sunday" - msgstr "星期日" - --#: ../glib/gdatetime.c:329 -+#: ../glib/gdatetime.c:386 - msgctxt "abbreviated weekday name" - msgid "Mon" - msgstr "一" - --#: ../glib/gdatetime.c:331 -+#: ../glib/gdatetime.c:388 - msgctxt "abbreviated weekday name" - msgid "Tue" - msgstr "二" - --#: ../glib/gdatetime.c:333 -+#: ../glib/gdatetime.c:390 - msgctxt "abbreviated weekday name" - msgid "Wed" - msgstr "三" - --#: ../glib/gdatetime.c:335 -+#: ../glib/gdatetime.c:392 - msgctxt "abbreviated weekday name" - msgid "Thu" - msgstr "四" - --#: ../glib/gdatetime.c:337 -+#: ../glib/gdatetime.c:394 - msgctxt "abbreviated weekday name" - msgid "Fri" - msgstr "五" - --#: ../glib/gdatetime.c:339 -+#: ../glib/gdatetime.c:396 - msgctxt "abbreviated weekday name" - msgid "Sat" - msgstr "六" - --#: ../glib/gdatetime.c:341 -+#: ../glib/gdatetime.c:398 - msgctxt "abbreviated weekday name" - msgid "Sun" - msgstr "日" - --#: ../glib/gdir.c:155 --#, c-format --msgid "Error opening directory '%s': %s" --msgstr "打开目录“%s”时发生错误：%s" -+#. Translators: Some languages need different grammatical forms of -+#. * month names depending on whether they are standalone or in a full -+#. * date context, with the day number. Some may prefer starting with -+#. * uppercase when they are standalone and with lowercase when they are -+#. * in a full date context. Here are full month names in a form -+#. * appropriate when they are used in a full date context, with the -+#. * day number. If your system is Linux with the glibc version 2.27 -+#. * (released Feb 1, 2018) or newer or if it is from the BSD family -+#. * (which includes OS X) then you can refer to the date command line -+#. * utility and see what the command `date +%B' produces. Also in -+#. * the latest Linux the command `locale mon' in your native locale -+#. * produces a complete list of month names almost ready to copy and -+#. * paste here. In older Linux systems due to a bug the result is -+#. * incorrect in some languages. Note that in most of the languages -+#. * (western European, non-European) there is no difference between the -+#. * standalone and complete date form. -+#. -+#: ../glib/gdatetime.c:462 -+msgctxt "full month name with day" -+msgid "January" -+msgstr "一月" - --#: ../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\"" -+#: ../glib/gdatetime.c:464 -+msgctxt "full month name with day" -+msgid "February" -+msgstr "二月" -+ -+#: ../glib/gdatetime.c:466 -+msgctxt "full month name with day" -+msgid "March" -+msgstr "三月" -+ -+#: ../glib/gdatetime.c:468 -+msgctxt "full month name with day" -+msgid "April" -+msgstr "四月" -+ -+#: ../glib/gdatetime.c:470 -+msgctxt "full month name with day" -+msgid "May" -+msgstr "五月" -+ -+#: ../glib/gdatetime.c:472 -+msgctxt "full month name with day" -+msgid "June" -+msgstr "六月" -+ -+#: ../glib/gdatetime.c:474 -+msgctxt "full month name with day" -+msgid "July" -+msgstr "七月" -+ -+#: ../glib/gdatetime.c:476 -+msgctxt "full month name with day" -+msgid "August" -+msgstr "八月" -+ -+#: ../glib/gdatetime.c:478 -+msgctxt "full month name with day" -+msgid "September" -+msgstr "九月" -+ -+#: ../glib/gdatetime.c:480 -+msgctxt "full month name with day" -+msgid "October" -+msgstr "十月" -+ -+#: ../glib/gdatetime.c:482 -+msgctxt "full month name with day" -+msgid "November" -+msgstr "十一月" -+ -+#: ../glib/gdatetime.c:484 -+msgctxt "full month name with day" -+msgid "December" -+msgstr "十二月" -+ -+#. Translators: Some languages need different grammatical forms of -+#. * month names depending on whether they are standalone or in a full -+#. * date context, with the day number. Some may prefer starting with -+#. * uppercase when they are standalone and with lowercase when they are -+#. * in a full date context. Here are abbreviated month names in a form -+#. * appropriate when they are used in a full date context, with the -+#. * day number. However, as these names are abbreviated the grammatical -+#. * difference is visible probably only in Belarusian and Russian. -+#. * In other languages there is no difference between the standalone -+#. * and complete date form when they are abbreviated. If your system -+#. * is Linux with the glibc version 2.27 (released Feb 1, 2018) or newer -+#. * then you can refer to the date command line utility and see what the -+#. * command `date +%b' produces. Also in the latest Linux the command -+#. * `locale abmon' in your native locale produces a complete list of -+#. * month names almost ready to copy and paste here. In other systems -+#. * due to a bug the result is incorrect in some languages. -+#. -+#: ../glib/gdatetime.c:549 -+msgctxt "abbreviated month name with day" -+msgid "Jan" -+msgstr "01月" -+ -+#: ../glib/gdatetime.c:551 -+msgctxt "abbreviated month name with day" -+msgid "Feb" -+msgstr "02月" -+ -+#: ../glib/gdatetime.c:553 -+msgctxt "abbreviated month name with day" -+msgid "Mar" -+msgstr "03月" -+ -+#: ../glib/gdatetime.c:555 -+msgctxt "abbreviated month name with day" -+msgid "Apr" -+msgstr "04月" -+ -+#: ../glib/gdatetime.c:557 -+msgctxt "abbreviated month name with day" -+msgid "May" -+msgstr "05月" -+ -+#: ../glib/gdatetime.c:559 -+msgctxt "abbreviated month name with day" -+msgid "Jun" -+msgstr "06月" -+ -+#: ../glib/gdatetime.c:561 -+msgctxt "abbreviated month name with day" -+msgid "Jul" -+msgstr "07月" -+ -+#: ../glib/gdatetime.c:563 -+msgctxt "abbreviated month name with day" -+msgid "Aug" -+msgstr "08月" -+ -+#: ../glib/gdatetime.c:565 -+msgctxt "abbreviated month name with day" -+msgid "Sep" -+msgstr "09月" -+ -+#: ../glib/gdatetime.c:567 -+msgctxt "abbreviated month name with day" -+msgid "Oct" -+msgstr "10月" -+ -+#: ../glib/gdatetime.c:569 -+msgctxt "abbreviated month name with day" -+msgid "Nov" -+msgstr "11月" -+ -+#: ../glib/gdatetime.c:571 -+msgctxt "abbreviated month name with day" -+msgid "Dec" -+msgstr "12月" -+ -+#. Translators: 'before midday' indicator -+#: ../glib/gdatetime.c:588 -+msgctxt "GDateTime" -+msgid "AM" -+msgstr "上午" -+ -+#. Translators: 'after midday' indicator -+#: ../glib/gdatetime.c:591 -+msgctxt "GDateTime" -+msgid "PM" -+msgstr "下午" -+ -+#: ../glib/gdir.c:154 -+#, fuzzy, c-format -+msgid "Error opening directory “%s”: %s" -+msgstr "创建目录“%s”出错：%s" -+ -+#: ../glib/gfileutils.c:733 ../glib/gfileutils.c:825 -+#, fuzzy, 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:718 --#, c-format --msgid "Error reading file '%s': %s" --msgstr "读取文件“%s”出错：%s" -+#: ../glib/gfileutils.c:750 -+#, fuzzy, c-format -+msgid "Error reading file “%s”: %s" -+msgstr "读取文件 %s 出错：%s" - --#: ../glib/gfileutils.c:754 --#, c-format --msgid "File \"%s\" is too large" -+#: ../glib/gfileutils.c:786 -+#, fuzzy, c-format -+msgid "File “%s” is too large" - msgstr "文件“%s”过大" - --#: ../glib/gfileutils.c:818 --#, c-format --msgid "Failed to read from file '%s': %s" -+#: ../glib/gfileutils.c:850 -+#, fuzzy, c-format -+msgid "Failed to read from file “%s”: %s" - msgstr "读取文件“%s”失败：%s" - --#: ../glib/gfileutils.c:866 ../glib/gfileutils.c:938 --#, c-format --msgid "Failed to open file '%s': %s" -+#: ../glib/gfileutils.c:898 ../glib/gfileutils.c:970 -+#, fuzzy, c-format -+msgid "Failed to open file “%s”: %s" - msgstr "打开文件“%s”失败：%s" - --#: ../glib/gfileutils.c:878 --#, c-format --msgid "Failed to get attributes of file '%s': fstat() failed: %s" -+#: ../glib/gfileutils.c:910 -+#, fuzzy, c-format -+msgid "Failed to get attributes of file “%s”: fstat() failed: %s" - msgstr "获得文件“%s”的属性失败：fstat() 失败：%s" - --#: ../glib/gfileutils.c:908 --#, c-format --msgid "Failed to open file '%s': fdopen() failed: %s" -+#: ../glib/gfileutils.c:940 -+#, fuzzy, c-format -+msgid "Failed to open file “%s”: fdopen() failed: %s" - msgstr "打开文件“%s”失败：fdopen() 失败：%s" - --#: ../glib/gfileutils.c:1007 --#, c-format --msgid "Failed to rename file '%s' to '%s': g_rename() failed: %s" -+#: ../glib/gfileutils.c:1039 -+#, fuzzy, c-format -+msgid "Failed to rename file “%s” to “%s”: g_rename() failed: %s" - msgstr "将文件“%s”重命名为“%s”失败：g_rename() 失败：%s" - --#: ../glib/gfileutils.c:1042 ../glib/gfileutils.c:1541 --#, c-format --msgid "Failed to create file '%s': %s" -+#: ../glib/gfileutils.c:1074 ../glib/gfileutils.c:1592 -+#, fuzzy, c-format -+msgid "Failed to create file “%s”: %s" - msgstr "创建文件“%s”失败：%s" - --#: ../glib/gfileutils.c:1069 --#, c-format --msgid "Failed to write file '%s': write() failed: %s" -+#: ../glib/gfileutils.c:1101 -+#, fuzzy, c-format -+msgid "Failed to write file “%s”: write() failed: %s" - msgstr "写入文件“%s”失败：write() 失败：%s" - --#: ../glib/gfileutils.c:1112 --#, c-format --msgid "Failed to write file '%s': fsync() failed: %s" -+#: ../glib/gfileutils.c:1144 -+#, fuzzy, c-format -+msgid "Failed to write file “%s”: fsync() failed: %s" - msgstr "写入文件“%s”失败：fsync() 失败：%s" - --#: ../glib/gfileutils.c:1236 --#, c-format --msgid "Existing file '%s' could not be removed: g_unlink() failed: %s" -+#: ../glib/gfileutils.c:1279 -+#, fuzzy, c-format -+msgid "Existing file “%s” could not be removed: g_unlink() failed: %s" - msgstr "无法删除已有文件“%s”：g_unlink() 失败：%s" - --#: ../glib/gfileutils.c:1507 --#, c-format --msgid "Template '%s' invalid, should not contain a '%s'" -+#: ../glib/gfileutils.c:1558 -+#, fuzzy, c-format -+msgid "Template “%s” invalid, should not contain a “%s”" - msgstr "模板“%s”无效，不应该包含“%s”" - --#: ../glib/gfileutils.c:1520 --#, c-format --msgid "Template '%s' doesn't contain XXXXXX" -+#: ../glib/gfileutils.c:1571 -+#, fuzzy, c-format -+msgid "Template “%s” doesn’t contain XXXXXX" - msgstr "模板“%s”不包含 XXXXXX" - --#: ../glib/gfileutils.c:2045 --#, c-format --msgid "Failed to read the symbolic link '%s': %s" -+#: ../glib/gfileutils.c:2129 ../glib/gfileutils.c:2157 -+#, fuzzy, c-format -+msgid "Failed to read the symbolic link “%s”: %s" - msgstr "读取符号链接“%s”失败：%s" - --#: ../glib/giochannel.c:1388 --#, c-format --msgid "Could not open converter from '%s' to '%s': %s" -+#: ../glib/giochannel.c:1396 -+#, fuzzy, c-format -+msgid "Could not open converter from “%s” to “%s”: %s" - msgstr "无法打开从“%s”到“%s”的转换器：%s" - --#: ../glib/giochannel.c:1733 --msgid "Can't do a raw read in g_io_channel_read_line_string" -+#: ../glib/giochannel.c:1749 -+#, fuzzy -+msgid "Can’t do a raw read in g_io_channel_read_line_string" - msgstr "g_io_channel_read_line_string 函数无法进行原始读取" - --#: ../glib/giochannel.c:1780 ../glib/giochannel.c:2038 --#: ../glib/giochannel.c:2125 -+#: ../glib/giochannel.c:1796 ../glib/giochannel.c:2054 -+#: ../glib/giochannel.c:2141 - msgid "Leftover unconverted data in read buffer" - msgstr "在读缓冲里留有未转换数据" - --#: ../glib/giochannel.c:1861 ../glib/giochannel.c:1938 -+#: ../glib/giochannel.c:1877 ../glib/giochannel.c:1954 - msgid "Channel terminates in a partial character" - msgstr "通道终止于未尽字符" - --#: ../glib/giochannel.c:1924 --msgid "Can't do a raw read in g_io_channel_read_to_end" -+#: ../glib/giochannel.c:1940 -+#, fuzzy -+msgid "Can’t do a raw read in g_io_channel_read_to_end" - msgstr "g_io_channel_read_to_end 函数无法进行原始读取" - --#: ../glib/gkeyfile.c:737 -+#: ../glib/gkeyfile.c:808 - msgid "Valid key file could not be found in search dirs" - msgstr "在搜索目录中无法找到有效的键文件" - --#: ../glib/gkeyfile.c:773 -+#: ../glib/gkeyfile.c:845 - msgid "Not a regular file" - msgstr "不是普通文件" - --#: ../glib/gkeyfile.c:1204 --#, c-format -+#: ../glib/gkeyfile.c:1324 -+#, fuzzy, 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”" - --#: ../glib/gkeyfile.c:1261 -+#: ../glib/gkeyfile.c:1381 - #, c-format - msgid "Invalid group name: %s" - msgstr "无效的组名：%s" - --#: ../glib/gkeyfile.c:1283 -+#: ../glib/gkeyfile.c:1403 - msgid "Key file does not start with a group" - msgstr "键文件不以组开始" - --#: ../glib/gkeyfile.c:1309 -+#: ../glib/gkeyfile.c:1429 - #, c-format - msgid "Invalid key name: %s" - msgstr "无效的键名：%s" - --#: ../glib/gkeyfile.c:1336 --#, c-format --msgid "Key file contains unsupported encoding '%s'" -+#: ../glib/gkeyfile.c:1456 -+#, fuzzy, c-format -+msgid "Key file contains unsupported encoding “%s”" - msgstr "键文件包含不支持的编码“%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'" -+#: ../glib/gkeyfile.c:1699 ../glib/gkeyfile.c:1872 ../glib/gkeyfile.c:3379 -+#: ../glib/gkeyfile.c:3443 ../glib/gkeyfile.c:3573 ../glib/gkeyfile.c:3705 -+#: ../glib/gkeyfile.c:3851 ../glib/gkeyfile.c:4080 ../glib/gkeyfile.c:4147 -+#, fuzzy, c-format -+msgid "Key file does not have group “%s”" - msgstr "键文件没有组“%s”" - --#: ../glib/gkeyfile.c:1707 --#, c-format --msgid "Key file does not have key '%s' in group '%s'" -+#: ../glib/gkeyfile.c:1827 -+#, fuzzy, c-format -+msgid "Key file does not have key “%s” in group “%s”" - msgstr "键文件在组“%2$s”中没有键“%1$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" -+#: ../glib/gkeyfile.c:1989 ../glib/gkeyfile.c:2105 -+#, fuzzy, c-format -+msgid "Key file contains key “%s” with value “%s” which is not UTF-8" - msgstr "键文件包含键“%s”，其值“%s”不是 UTF-8" - --#: ../glib/gkeyfile.c:1889 ../glib/gkeyfile.c:2005 ../glib/gkeyfile.c:2374 --#, c-format -+#: ../glib/gkeyfile.c:2009 ../glib/gkeyfile.c:2125 ../glib/gkeyfile.c:2621 -+#, fuzzy, 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”，其值无法解释。" - --#: ../glib/gkeyfile.c:2591 ../glib/gkeyfile.c:2959 --#, c-format -+#: ../glib/gkeyfile.c:2839 ../glib/gkeyfile.c:3208 -+#, fuzzy, 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 "键文件包含组“%2$s”中的键“%1$s”，其值无法解释。" - --#: ../glib/gkeyfile.c:2669 ../glib/gkeyfile.c:2746 --#, c-format --msgid "Key '%s' in group '%s' has value '%s' where %s was expected" -+#: ../glib/gkeyfile.c:2917 ../glib/gkeyfile.c:2994 -+#, fuzzy, c-format -+msgid "Key “%s” in group “%s” has value “%s” where %s was expected" - msgstr "组“%2$s”中的键“%1$s”的值为“%3$s”，应为 %4$s" - --#: ../glib/gkeyfile.c:4133 -+#: ../glib/gkeyfile.c:4387 - msgid "Key file contains escape character at end of line" - msgstr "键文件在行尾含有转义字符" - --#: ../glib/gkeyfile.c:4155 --#, c-format --msgid "Key file contains invalid escape sequence '%s'" -+#: ../glib/gkeyfile.c:4409 -+#, fuzzy, c-format -+msgid "Key file contains invalid escape sequence “%s”" - msgstr "键文件中包含无效的转义序列“%s”" - --#: ../glib/gkeyfile.c:4297 --#, c-format --msgid "Value '%s' cannot be interpreted as a number." -+#: ../glib/gkeyfile.c:4553 -+#, fuzzy, c-format -+msgid "Value “%s” cannot be interpreted as a number." - msgstr "无法将值“%s”解释为数值。" - --#: ../glib/gkeyfile.c:4311 --#, c-format --msgid "Integer value '%s' out of range" -+#: ../glib/gkeyfile.c:4567 -+#, fuzzy, c-format -+msgid "Integer value “%s” out of range" - msgstr "整数值“%s”超出范围" - --#: ../glib/gkeyfile.c:4344 --#, c-format --msgid "Value '%s' cannot be interpreted as a float number." -+#: ../glib/gkeyfile.c:4600 -+#, fuzzy, c-format -+msgid "Value “%s” cannot be interpreted as a float number." - msgstr "无法将值“%s”解释为浮点数。" - --#: ../glib/gkeyfile.c:4383 --#, c-format --msgid "Value '%s' cannot be interpreted as a boolean." -+#: ../glib/gkeyfile.c:4639 -+#, fuzzy, c-format -+msgid "Value “%s” cannot be interpreted as a boolean." - msgstr "无法将值“%s”解释为布尔值。" - - #: ../glib/gmappedfile.c:129 --#, c-format --msgid "Failed to get attributes of file '%s%s%s%s': fstat() failed: %s" -+#, fuzzy, c-format -+msgid "Failed to get attributes of file “%s%s%s%s”: fstat() failed: %s" - msgstr "获取文件“%s%s%s%s”的属性失败 : fstat() 失败：%s" - - #: ../glib/gmappedfile.c:195 -@@ -4365,8 +5013,8 @@ msgid "Failed to map %s%s%s%s: mmap() failed: %s" - msgstr "映射 %s%s%s%s 失败：mmap() 失败：%s" - - #: ../glib/gmappedfile.c:262 --#, c-format --msgid "Failed to open file '%s': open() failed: %s" -+#, fuzzy, c-format -+msgid "Failed to open file “%s”: open() failed: %s" - msgstr "打开文件“%s”失败：open() 失败：%s" - - #: ../glib/gmarkup.c:398 ../glib/gmarkup.c:440 -@@ -4375,736 +5023,760 @@ msgid "Error on line %d char %d: " - msgstr "第 %d 行第 %d 个字符出错：" - - #: ../glib/gmarkup.c:462 ../glib/gmarkup.c:545 --#, c-format --msgid "Invalid UTF-8 encoded text in name - not valid '%s'" -+#, fuzzy, c-format -+msgid "Invalid UTF-8 encoded text in name — not valid “%s”" - msgstr "无效的 UTF-8 编码的文本名称 -“%s”无效" - - #: ../glib/gmarkup.c:473 --#, c-format --msgid "'%s' is not a valid name" -+#, fuzzy, c-format -+msgid "“%s” is not a valid name" - msgstr "“%s”不是有效的名称" - - #: ../glib/gmarkup.c:489 --#, c-format --msgid "'%s' is not a valid name: '%c'" -+#, fuzzy, c-format -+msgid "“%s” is not a valid name: “%c”" - msgstr "“%s”不是有效的名称：“%c”" - --#: ../glib/gmarkup.c:599 -+#: ../glib/gmarkup.c:613 - #, c-format - msgid "Error on line %d: %s" - msgstr "第 %d 行出错：%s" - --#: ../glib/gmarkup.c:676 --#, c-format -+#: ../glib/gmarkup.c:690 -+#, fuzzy, c-format - msgid "" --"Failed to parse '%-.*s', which should have been a digit inside a character " --"reference (ê for example) - perhaps the digit is too large" -+"Failed to parse “%-.*s”, which should have been a digit inside a character " -+"reference (ê for example) — perhaps the digit is too large" - msgstr "" - "解析“%-.*s”失败。它应该是字符引用中的数字(如 ê) - 可能该数字太大了" - --#: ../glib/gmarkup.c:688 -+#: ../glib/gmarkup.c:702 -+#, fuzzy - 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 &" - msgstr "" - "字符引用没有以分号结束。很可能您使用了 & 字符而又不是一个实体 - 将这个 & 变" - "为 &" - --#: ../glib/gmarkup.c:714 --#, c-format --msgid "Character reference '%-.*s' does not encode a permitted character" -+#: ../glib/gmarkup.c:728 -+#, fuzzy, c-format -+msgid "Character reference “%-.*s” does not encode a permitted character" - msgstr "字符引用“%-.*s”不是编码一个被允许的字符" - --#: ../glib/gmarkup.c:752 -+#: ../glib/gmarkup.c:766 -+#, fuzzy - msgid "" --"Empty entity '&;' seen; valid entities are: & " < > '" -+"Empty entity “&;” seen; valid entities are: & " < > '" - msgstr "发现空的实体“&;”。有效的实体为：& " < > '" - --#: ../glib/gmarkup.c:760 --#, c-format --msgid "Entity name '%-.*s' is not known" -+#: ../glib/gmarkup.c:774 -+#, fuzzy, c-format -+msgid "Entity name “%-.*s” is not known" - msgstr "未知的实体名“%-.*s”" - --#: ../glib/gmarkup.c:765 -+#: ../glib/gmarkup.c:779 -+#, fuzzy - msgid "" - "Entity did not end with a semicolon; most likely you used an ampersand " --"character without intending to start an entity - escape ampersand as &" -+"character without intending to start an entity — escape ampersand as &" - msgstr "" - "实体没有以分号结束。很可能您使用了 & 字符而又不是一个实体 - 将这个 & 变为 " - "&" - --#: ../glib/gmarkup.c:1171 -+#: ../glib/gmarkup.c:1193 - msgid "Document must begin with an element (e.g. )" - msgstr "文档必须以一个元素开始(例如 )" - --#: ../glib/gmarkup.c:1211 --#, c-format -+#: ../glib/gmarkup.c:1233 -+#, fuzzy, 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”出现在字符“<”后是无效字符；它不能作为元素名的开头" - --#: ../glib/gmarkup.c:1253 --#, c-format -+#: ../glib/gmarkup.c:1276 -+#, fuzzy, 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 "字符“%s”无效，应该以字符“>”来结束空元素标记“%s”" - --#: ../glib/gmarkup.c:1334 -+#: ../glib/gmarkup.c:1346 - #, c-format -+msgid "Too many attributes in element “%s”" -+msgstr "" -+ -+#: ../glib/gmarkup.c:1366 -+#, fuzzy, 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 "字符“%s”无效，在属性名“%s”(元素“%s”)的后应该是字符“=”" - --#: ../glib/gmarkup.c:1375 --#, c-format -+#: ../glib/gmarkup.c:1408 -+#, fuzzy, 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 "" - "字符“%s”无效，应该以“>”或“/”结束元素“%s”的起始标记，或紧跟该元素的属性；可能" - "您在属性名中使用了无效字符" - --#: ../glib/gmarkup.c:1419 --#, c-format -+#: ../glib/gmarkup.c:1453 -+#, fuzzy, 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 "字符“%s”无效，在给属性“%s”(元素“%s”)赋值时，在等号后应该是引号" - --#: ../glib/gmarkup.c:1552 --#, c-format -+#: ../glib/gmarkup.c:1587 -+#, fuzzy, c-format - msgid "" --"'%s' is not a valid character following the characters ''" -+"“%s” is not a valid character following the close element name “%s”; the " -+"allowed character is “>”" - msgstr "“%s”出现在结束的元素名“%s”后无效；允许的字符是“>”" - --#: ../glib/gmarkup.c:1599 --#, c-format --msgid "Element '%s' was closed, no element is currently open" -+#: ../glib/gmarkup.c:1637 -+#, fuzzy, c-format -+msgid "Element “%s” was closed, no element is currently open" - msgstr "元素“%s”已经结束，没有未结束的元素" - --#: ../glib/gmarkup.c:1608 --#, c-format --msgid "Element '%s' was closed, but the currently open element is '%s'" -+#: ../glib/gmarkup.c:1646 -+#, fuzzy, c-format -+msgid "Element “%s” was closed, but the currently open element is “%s”" - msgstr "元素“%s”已经结束，当前未结束的元素是“%s”" - --#: ../glib/gmarkup.c:1761 -+#: ../glib/gmarkup.c:1799 - msgid "Document was empty or contained only whitespace" - msgstr "文档为空或仅含空白字符" - --#: ../glib/gmarkup.c:1775 --msgid "Document ended unexpectedly just after an open angle bracket '<'" -+#: ../glib/gmarkup.c:1813 -+#, fuzzy -+msgid "Document ended unexpectedly just after an open angle bracket “<”" - msgstr "文档在一个打开的尖括号“<”后意外结束" - --#: ../glib/gmarkup.c:1783 ../glib/gmarkup.c:1828 --#, c-format -+#: ../glib/gmarkup.c:1821 ../glib/gmarkup.c:1866 -+#, fuzzy, 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 "文档在还存在未结束元素时意外结束 - 最后的未结束元素是“%s”" - --#: ../glib/gmarkup.c:1791 -+#: ../glib/gmarkup.c:1829 - #, c-format - msgid "" - "Document ended unexpectedly, expected to see a close angle bracket ending " - "the tag <%s/>" - msgstr "文档意外结束，应该以右尖括号“>”来结束标记 <%s/>" - --#: ../glib/gmarkup.c:1797 -+#: ../glib/gmarkup.c:1835 - msgid "Document ended unexpectedly inside an element name" - msgstr "文档在元素名中意外结束" - --#: ../glib/gmarkup.c:1803 -+#: ../glib/gmarkup.c:1841 - msgid "Document ended unexpectedly inside an attribute name" - msgstr "文档在属性名中意外结束" - --#: ../glib/gmarkup.c:1808 -+#: ../glib/gmarkup.c:1846 - msgid "Document ended unexpectedly inside an element-opening tag." - msgstr "文档在元素起始标记中意外结束" - --#: ../glib/gmarkup.c:1814 -+#: ../glib/gmarkup.c:1852 - msgid "" - "Document ended unexpectedly after the equals sign following an attribute " - "name; no attribute value" - msgstr "文档在跟在属性名后的等号后意外结束；没有属性值" - --#: ../glib/gmarkup.c:1821 -+#: ../glib/gmarkup.c:1859 - msgid "Document ended unexpectedly while inside an attribute value" - msgstr "文档在属性值中意外结束" - --#: ../glib/gmarkup.c:1837 --#, c-format --msgid "Document ended unexpectedly inside the close tag for element '%s'" -+#: ../glib/gmarkup.c:1876 -+#, fuzzy, c-format -+msgid "Document ended unexpectedly inside the close tag for element “%s”" -+msgstr "文档在元素“%s”结束标记中意外结束" -+ -+#: ../glib/gmarkup.c:1880 -+#, fuzzy -+msgid "" -+"Document ended unexpectedly inside the close tag for an unopened element" - msgstr "文档在元素“%s”结束标记中意外结束" - --#: ../glib/gmarkup.c:1843 -+#: ../glib/gmarkup.c:1886 - msgid "Document ended unexpectedly inside a comment or processing instruction" - msgstr "文档在注释或处理指令中意外结束" - --#: ../glib/goption.c:861 --msgid "[OPTION...]" -+#: ../glib/goption.c:868 -+#, fuzzy -+msgid "[OPTION…]" - msgstr "[选项…]" - --#: ../glib/goption.c:977 -+#: ../glib/goption.c:984 - msgid "Help Options:" - msgstr "帮助选项：" - --#: ../glib/goption.c:978 -+#: ../glib/goption.c:985 - msgid "Show help options" - msgstr "显示帮助选项" - --#: ../glib/goption.c:984 -+#: ../glib/goption.c:991 - msgid "Show all help options" - msgstr "显示全部帮助选项" - --#: ../glib/goption.c:1047 -+#: ../glib/goption.c:1054 - msgid "Application Options:" - msgstr "应用程序选项：" - --#: ../glib/goption.c:1049 -+#: ../glib/goption.c:1056 - msgid "Options:" - msgstr "选项：" - --#: ../glib/goption.c:1113 ../glib/goption.c:1183 --#, c-format --msgid "Cannot parse integer value '%s' for %s" -+#: ../glib/goption.c:1120 ../glib/goption.c:1190 -+#, fuzzy, c-format -+msgid "Cannot parse integer value “%s” for %s" - msgstr "无法解析 %2$s 的整数值“%1$s”" - --#: ../glib/goption.c:1123 ../glib/goption.c:1191 --#, c-format --msgid "Integer value '%s' for %s out of range" -+#: ../glib/goption.c:1130 ../glib/goption.c:1198 -+#, fuzzy, c-format -+msgid "Integer value “%s” for %s out of range" - msgstr "%2$s 所用的整数值“%1$s”超出范围" - --#: ../glib/goption.c:1148 --#, c-format --msgid "Cannot parse double value '%s' for %s" -+#: ../glib/goption.c:1155 -+#, fuzzy, c-format -+msgid "Cannot parse double value “%s” for %s" - msgstr "无法解析 %2$s 的双精度值“%1$s”" - --#: ../glib/goption.c:1156 --#, c-format --msgid "Double value '%s' for %s out of range" -+#: ../glib/goption.c:1163 -+#, fuzzy, c-format -+msgid "Double value “%s” for %s out of range" - msgstr "“%2$s”所用的双精度值“%1$s”超出范围" - --#: ../glib/goption.c:1448 ../glib/goption.c:1527 -+#: ../glib/goption.c:1455 ../glib/goption.c:1534 - #, c-format - msgid "Error parsing option %s" - msgstr "解析选项 %s 时出错" - --#: ../glib/goption.c:1558 ../glib/goption.c:1671 -+#: ../glib/goption.c:1565 ../glib/goption.c:1678 - #, c-format - msgid "Missing argument for %s" - msgstr "缺少 %s 的参数" - --#: ../glib/goption.c:2132 -+#: ../glib/goption.c:2189 - #, c-format - msgid "Unknown option %s" - msgstr "未知选项 %s" - --#: ../glib/gregex.c:258 -+#: ../glib/gregex.c:257 - msgid "corrupted object" - msgstr "无效对象" - --#: ../glib/gregex.c:260 -+#: ../glib/gregex.c:259 - msgid "internal error or corrupted object" - msgstr "内部错误或者无效对象" - --#: ../glib/gregex.c:262 -+#: ../glib/gregex.c:261 - msgid "out of memory" - msgstr "内存不足" - --#: ../glib/gregex.c:267 -+#: ../glib/gregex.c:266 - msgid "backtracking limit reached" - msgstr "达到回溯上限" - --#: ../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 "表达式包含不被部分匹配支持的项" - --#: ../glib/gregex.c:281 -+#: ../glib/gregex.c:280 - msgid "internal error" - msgstr "内部错误" - --#: ../glib/gregex.c:289 -+#: ../glib/gregex.c:288 - msgid "back references as conditions are not supported for partial matching" - msgstr "不完全匹配时作为条件的后向引用不被支持." - --#: ../glib/gregex.c:298 -+#: ../glib/gregex.c:297 - msgid "recursion limit reached" - msgstr "达到递归上限" - --#: ../glib/gregex.c:300 -+#: ../glib/gregex.c:299 - msgid "invalid combination of newline flags" - msgstr "无效的新行标志组合." - --#: ../glib/gregex.c:302 -+#: ../glib/gregex.c:301 - msgid "bad offset" - msgstr "错误的偏移值" - --#: ../glib/gregex.c:304 -+#: ../glib/gregex.c:303 - msgid "short utf8" - msgstr "UTF-8 短编码" - --#: ../glib/gregex.c:306 -+#: ../glib/gregex.c:305 - msgid "recursion loop" - msgstr "递归循环" - --#: ../glib/gregex.c:310 -+#: ../glib/gregex.c:309 - msgid "unknown error" - msgstr "未知错误" - --#: ../glib/gregex.c:330 -+#: ../glib/gregex.c:329 - msgid "\\ at end of pattern" - msgstr "表达式末尾的 \\" - --#: ../glib/gregex.c:333 -+#: ../glib/gregex.c:332 - msgid "\\c at end of pattern" - msgstr "表达式末尾的 \\c" - --#: ../glib/gregex.c:336 -+#: ../glib/gregex.c:335 - msgid "unrecognized character following \\" - msgstr "无法识别 \\ 后的字符" - --#: ../glib/gregex.c:339 -+#: ../glib/gregex.c:338 - msgid "numbers out of order in {} quantifier" - msgstr "{} 里的数字次序颠倒了" - --#: ../glib/gregex.c:342 -+#: ../glib/gregex.c:341 - msgid "number too big in {} quantifier" - msgstr "{} 里的数字太大了" - --#: ../glib/gregex.c:345 -+#: ../glib/gregex.c:344 - msgid "missing terminating ] for character class" - msgstr "字符类缺少终结的 ]" - --#: ../glib/gregex.c:348 -+#: ../glib/gregex.c:347 - msgid "invalid escape sequence in character class" - msgstr "字符类包含无效的转义序列" - --#: ../glib/gregex.c:351 -+#: ../glib/gregex.c:350 - msgid "range out of order in character class" - msgstr "字符类的范围次序颠倒" - --#: ../glib/gregex.c:354 -+#: ../glib/gregex.c:353 - msgid "nothing to repeat" - msgstr "没有可以重复的内容" - --#: ../glib/gregex.c:358 -+#: ../glib/gregex.c:357 - msgid "unexpected repeat" - msgstr "非预期的重复" - --#: ../glib/gregex.c:361 -+#: ../glib/gregex.c:360 - msgid "unrecognized character after (? or (?-" - msgstr "(? 或 (?- 后有无法识别的字符" - --#: ../glib/gregex.c:364 -+#: ../glib/gregex.c:363 - msgid "POSIX named classes are supported only within a class" - msgstr "只有类里支持 POSIX 命名的类" - --#: ../glib/gregex.c:367 -+#: ../glib/gregex.c:366 - msgid "missing terminating )" - msgstr "缺少结束的 )" - --#: ../glib/gregex.c:370 -+#: ../glib/gregex.c:369 - msgid "reference to non-existent subpattern" - msgstr "引用了不存在的子表达式" - --#: ../glib/gregex.c:373 -+#: ../glib/gregex.c:372 - msgid "missing ) after comment" - msgstr "注释后缺少 )" - --#: ../glib/gregex.c:376 -+#: ../glib/gregex.c:375 - msgid "regular expression is too large" - msgstr "正则表达式过长" - --#: ../glib/gregex.c:379 -+#: ../glib/gregex.c:378 - msgid "failed to get memory" - msgstr "获取内存失败" - --#: ../glib/gregex.c:383 -+#: ../glib/gregex.c:382 - msgid ") without opening (" - msgstr ") 没有开始的 (" - --#: ../glib/gregex.c:387 -+#: ../glib/gregex.c:386 - msgid "code overflow" - msgstr "代码溢出" - --#: ../glib/gregex.c:391 -+#: ../glib/gregex.c:390 - msgid "unrecognized character after (?<" - msgstr "(?< 后有无法识别的字符" - --#: ../glib/gregex.c:394 -+#: ../glib/gregex.c:393 - msgid "lookbehind assertion is not fixed length" - msgstr "lookbehind 断言不是定长的" - --#: ../glib/gregex.c:397 -+#: ../glib/gregex.c:396 - msgid "malformed number or name after (?(" - msgstr "(?( 后有形式不正确的数字或名称" - --#: ../glib/gregex.c:400 -+#: ../glib/gregex.c:399 - msgid "conditional group contains more than two branches" - msgstr "条件组包含了超过两个分支" - --#: ../glib/gregex.c:403 -+#: ../glib/gregex.c:402 - msgid "assertion expected after (?(" - msgstr "(?( 后应该有断言" - - #. 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 "(?R 或 (?[+-]数字 必须跟着 )" - --#: ../glib/gregex.c:413 -+#: ../glib/gregex.c:412 - msgid "unknown POSIX class name" - msgstr "未知的 POSIX 类名" - --#: ../glib/gregex.c:416 -+#: ../glib/gregex.c:415 - msgid "POSIX collating elements are not supported" - msgstr "不支持 POSIX 整理元素" - --#: ../glib/gregex.c:419 -+#: ../glib/gregex.c:418 - msgid "character value in \\x{...} sequence is too large" - msgstr "\\x{...} 序列里的字符值太大了" - --#: ../glib/gregex.c:422 -+#: ../glib/gregex.c:421 - msgid "invalid condition (?(0)" - msgstr "无效的条件 (?(0)" - --#: ../glib/gregex.c:425 -+#: ../glib/gregex.c:424 - msgid "\\C not allowed in lookbehind assertion" - msgstr "lookbehind 断言里不允许使用 \\C" - --#: ../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, \\u 进行转义" - --#: ../glib/gregex.c:435 -+#: ../glib/gregex.c:434 - msgid "recursive call could loop indefinitely" - msgstr "递归调用可能导致无限循环" - --#: ../glib/gregex.c:439 -+#: ../glib/gregex.c:438 - msgid "unrecognized character after (?P" - msgstr "(?P 有无法识别的字符" - --#: ../glib/gregex.c:442 -+#: ../glib/gregex.c:441 - msgid "missing terminator in subpattern name" - msgstr "子表达式名里缺少终结符" - --#: ../glib/gregex.c:445 -+#: ../glib/gregex.c:444 - msgid "two named subpatterns have the same name" - msgstr "两个有名子表达式有相同的名称" - --#: ../glib/gregex.c:448 -+#: ../glib/gregex.c:447 - msgid "malformed \\P or \\p sequence" - msgstr "形式不正确的 \\P 或 \\p 序列" - --#: ../glib/gregex.c:451 -+#: ../glib/gregex.c:450 - msgid "unknown property name after \\P or \\p" - msgstr "\\P 或 \\p 后有未知的属性名" - --#: ../glib/gregex.c:454 -+#: ../glib/gregex.c:453 - msgid "subpattern name is too long (maximum 32 characters)" - msgstr "子表达式名太长了(最多32个字符)" - --#: ../glib/gregex.c:457 -+#: ../glib/gregex.c:456 - msgid "too many named subpatterns (maximum 10,000)" - msgstr "有名子表达式太多了(最多10,000个)" - --#: ../glib/gregex.c:460 -+#: ../glib/gregex.c:459 - msgid "octal value is greater than \\377" - msgstr "八进制值大于 \\377" - --#: ../glib/gregex.c:464 -+#: ../glib/gregex.c:463 - msgid "overran compiling workspace" - msgstr "编译工作区超出正常范围" - --#: ../glib/gregex.c:468 -+#: ../glib/gregex.c:467 - msgid "previously-checked referenced subpattern not found" - msgstr "未找到之前检查过的引用过的子表达式" - --#: ../glib/gregex.c:471 -+#: ../glib/gregex.c:470 - msgid "DEFINE group contains more than one branch" - msgstr "DEFINE 组包含多于一个分支" - --#: ../glib/gregex.c:474 -+#: ../glib/gregex.c:473 - msgid "inconsistent NEWLINE options" - msgstr "不一致的 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" - msgstr "\\g 后没有花括号、尖括号或引号括起来的名称或数字，或纯数字" - --#: ../glib/gregex.c:481 -+#: ../glib/gregex.c:480 - msgid "a numbered reference must not be zero" - msgstr "编号引用不能为0" - --#: ../glib/gregex.c:484 -+#: ../glib/gregex.c:483 - msgid "an argument is not allowed for (*ACCEPT), (*FAIL), or (*COMMIT)" - msgstr "(*ACCEPT), (*FAIL) 和 (*COMMIT) 不允许带参数" - --#: ../glib/gregex.c:487 -+#: ../glib/gregex.c:486 - msgid "(*VERB) not recognized" - msgstr "无法识别 (*VERB)" - --#: ../glib/gregex.c:490 -+#: ../glib/gregex.c:489 - msgid "number is too big" - msgstr "数字太大" - --#: ../glib/gregex.c:493 -+#: ../glib/gregex.c:492 - msgid "missing subpattern name after (?&" - msgstr "(?& 后缺少子表达式名" - --#: ../glib/gregex.c:496 -+#: ../glib/gregex.c:495 - msgid "digit expected after (?+" - msgstr "(?+ 后应为数字" - --#: ../glib/gregex.c:499 -+#: ../glib/gregex.c:498 - msgid "] is an invalid data character in JavaScript compatibility mode" - msgstr "Javascript 兼容模式中，] 是非法数据字符" - --#: ../glib/gregex.c:502 -+#: ../glib/gregex.c:501 - msgid "different names for subpatterns of the same number are not allowed" - msgstr "不允许两个号码相同的子表达式有不同的名称" - --#: ../glib/gregex.c:505 -+#: ../glib/gregex.c:504 - msgid "(*MARK) must have an argument" - msgstr "(*MARK) 必须有一个参数" - --#: ../glib/gregex.c:508 -+#: ../glib/gregex.c:507 - msgid "\\c must be followed by an ASCII character" - msgstr "\\c 后面必须跟一个 ASCII 字符" - --#: ../glib/gregex.c:511 -+#: ../glib/gregex.c:510 - msgid "\\k is not followed by a braced, angle-bracketed, or quoted name" - msgstr "\\k 后没有用花括号、尖括号或引号括起来的名称" - --#: ../glib/gregex.c:514 -+#: ../glib/gregex.c:513 - msgid "\\N is not supported in a class" - msgstr "类中不支持 \\N" - --#: ../glib/gregex.c:517 -+#: ../glib/gregex.c:516 - msgid "too many forward references" - msgstr "太多前向引用" - --#: ../glib/gregex.c:520 -+#: ../glib/gregex.c:519 - msgid "name is too long in (*MARK), (*PRUNE), (*SKIP), or (*THEN)" - msgstr "在 (*MARK), (*PRUNE), (*SKIP) 或者 (*THEN) 中名称太长" - --#: ../glib/gregex.c:523 -+#: ../glib/gregex.c:522 - msgid "character value in \\u.... sequence is too large" - msgstr "\\u.... 序列里的字符值太大了" - --#: ../glib/gregex.c:746 ../glib/gregex.c:1977 -+#: ../glib/gregex.c:745 ../glib/gregex.c:1983 - #, c-format - msgid "Error while matching regular expression %s: %s" - msgstr "匹配正则表达式 %s 出现错误：%s" - --#: ../glib/gregex.c:1317 -+#: ../glib/gregex.c:1316 - msgid "PCRE library is compiled without UTF8 support" - msgstr "PCRE 库编译时未包含 UTF8 支持" - --#: ../glib/gregex.c:1321 -+#: ../glib/gregex.c:1320 - msgid "PCRE library is compiled without UTF8 properties support" - msgstr "PCRE 库编译时未包含 UTF8 属性支持" - --#: ../glib/gregex.c:1329 -+#: ../glib/gregex.c:1328 - msgid "PCRE library is compiled with incompatible options" - msgstr "PCRE 库编译时使用了不兼容的选项" - --#: ../glib/gregex.c:1358 -+#: ../glib/gregex.c:1357 - #, c-format - msgid "Error while optimizing regular expression %s: %s" - msgstr "优化正则表达式 %s 时出错：%s" - --#: ../glib/gregex.c:1438 -+#: ../glib/gregex.c:1437 - #, c-format - msgid "Error while compiling regular expression %s at char %d: %s" - msgstr "编译正则表达式 %s (于字符 %d 处)时出错：%s" - --#: ../glib/gregex.c:2413 --msgid "hexadecimal digit or '}' expected" -+#: ../glib/gregex.c:2419 -+#, fuzzy -+msgid "hexadecimal digit or “}” expected" - msgstr "期望十六进制数或“}”" - --#: ../glib/gregex.c:2429 -+#: ../glib/gregex.c:2435 - msgid "hexadecimal digit expected" - msgstr "期望十六进制数" - --#: ../glib/gregex.c:2469 --msgid "missing '<' in symbolic reference" -+#: ../glib/gregex.c:2475 -+#, fuzzy -+msgid "missing “<” in symbolic reference" - msgstr "在符号引用中缺少“<”" - --#: ../glib/gregex.c:2478 -+#: ../glib/gregex.c:2484 - msgid "unfinished symbolic reference" - msgstr "未完成的符号引用" - --#: ../glib/gregex.c:2485 -+#: ../glib/gregex.c:2491 - msgid "zero-length symbolic reference" - msgstr "零长符号引用" - --#: ../glib/gregex.c:2496 -+#: ../glib/gregex.c:2502 - msgid "digit expected" - msgstr "期望数字" - --#: ../glib/gregex.c:2514 -+#: ../glib/gregex.c:2520 - msgid "illegal symbolic reference" - msgstr "非法的符号引用" - --#: ../glib/gregex.c:2576 --msgid "stray final '\\'" -+#: ../glib/gregex.c:2583 -+#, fuzzy -+msgid "stray final “\\”" - msgstr "丢失了最后的“\\”" - --#: ../glib/gregex.c:2580 -+#: ../glib/gregex.c:2587 - msgid "unknown escape sequence" - msgstr "未知的转义序列" - --#: ../glib/gregex.c:2590 --#, c-format --msgid "Error while parsing replacement text \"%s\" at char %lu: %s" -+#: ../glib/gregex.c:2597 -+#, fuzzy, c-format -+msgid "Error while parsing replacement text “%s” at char %lu: %s" - msgstr "解析替换文本“%s”时在字符 %lu 处发生错误：%s" - --#: ../glib/gshell.c:96 --msgid "Quoted text doesn't begin with a quotation mark" -+#: ../glib/gshell.c:94 -+#, fuzzy -+msgid "Quoted text doesn’t begin with a quotation mark" - msgstr "引用的文本不以引号开头" - --#: ../glib/gshell.c:186 -+#: ../glib/gshell.c:184 - msgid "Unmatched quotation mark in command line or other shell-quoted text" - msgstr "命令行或其他 shell 引用文本中出现不匹配的引号" - --#: ../glib/gshell.c:582 --#, c-format --msgid "Text ended just after a '\\' character. (The text was '%s')" -+#: ../glib/gshell.c:580 -+#, fuzzy, c-format -+msgid "Text ended just after a “\\” character. (The text was “%s”)" - msgstr "文本在一个“\\”字符后结束。(文本为“%s”)" - --#: ../glib/gshell.c:589 --#, c-format --msgid "Text ended before matching quote was found for %c. (The text was '%s')" -+#: ../glib/gshell.c:587 -+#, fuzzy, c-format -+msgid "Text ended before matching quote was found for %c. (The text was “%s”)" - msgstr "在找到为 %c 匹配的引用之前，文本已结束。(文本为“%s”)" - --#: ../glib/gshell.c:601 -+#: ../glib/gshell.c:599 - msgid "Text was empty (or contained only whitespace)" - msgstr "文本为空(或仅含空白字符)" - --#: ../glib/gspawn.c:209 -+#: ../glib/gspawn.c:315 - #, c-format - msgid "Failed to read data from child process (%s)" - msgstr "从子进程中读取数据失败(%s)" - --#: ../glib/gspawn.c:353 --#, c-format --msgid "Unexpected error in select() reading data from a child process (%s)" -+#: ../glib/gspawn.c:460 -+#, fuzzy, c-format -+msgid "Unexpected error in reading data from a child process (%s)" - msgstr "select() 在从子进程中读取数据时出现异常错误 (%s)" - --#: ../glib/gspawn.c:438 -+#: ../glib/gspawn.c:545 - #, c-format - msgid "Unexpected error in waitpid() (%s)" - msgstr "waitpid() 出现异常错误 (%s)" - --#: ../glib/gspawn.c:844 ../glib/gspawn-win32.c:1233 -+#: ../glib/gspawn.c:1053 ../glib/gspawn-win32.c:1329 - #, c-format - msgid "Child process exited with code %ld" - msgstr "子进程退出，代码 %ld" - --#: ../glib/gspawn.c:852 -+#: ../glib/gspawn.c:1061 - #, c-format - msgid "Child process killed by signal %ld" - msgstr "子进程已由信号 %ld 杀死" - --#: ../glib/gspawn.c:859 -+#: ../glib/gspawn.c:1068 - #, c-format - msgid "Child process stopped by signal %ld" - msgstr "子进程已由信号 %ld 停止" - --#: ../glib/gspawn.c:866 -+#: ../glib/gspawn.c:1075 - #, c-format - msgid "Child process exited abnormally" - msgstr "子进程异常中止" - --#: ../glib/gspawn.c:1271 ../glib/gspawn-win32.c:339 ../glib/gspawn-win32.c:347 -+#: ../glib/gspawn.c:1475 ../glib/gspawn-win32.c:350 ../glib/gspawn-win32.c:358 - #, c-format - msgid "Failed to read from child pipe (%s)" - msgstr "从子管道中读取失败(%s)" - --#: ../glib/gspawn.c:1341 -+#: ../glib/gspawn.c:1723 -+#, fuzzy, c-format -+msgid "Failed to spawn child process “%s” (%s)" -+msgstr "执行子进程“%s”失败(%s)" -+ -+#: ../glib/gspawn.c:1762 - #, c-format - msgid "Failed to fork (%s)" - msgstr "fork 失败(%s)" - --#: ../glib/gspawn.c:1490 ../glib/gspawn-win32.c:370 --#, c-format --msgid "Failed to change to directory '%s' (%s)" -+#: ../glib/gspawn.c:1911 ../glib/gspawn-win32.c:381 -+#, fuzzy, c-format -+msgid "Failed to change to directory “%s” (%s)" - msgstr "更改到目录“%s”失败(%s)" - --#: ../glib/gspawn.c:1500 --#, c-format --msgid "Failed to execute child process \"%s\" (%s)" --msgstr "执行子进程“%s\"失败(%s)" -+#: ../glib/gspawn.c:1921 -+#, fuzzy, c-format -+msgid "Failed to execute child process “%s” (%s)" -+msgstr "执行子进程“%s”失败(%s)" - --#: ../glib/gspawn.c:1510 -+#: ../glib/gspawn.c:1931 - #, c-format - msgid "Failed to redirect output or input of child process (%s)" - msgstr "重定向子进程(%s)的输入或输出失败" - --#: ../glib/gspawn.c:1519 -+#: ../glib/gspawn.c:1940 - #, c-format - msgid "Failed to fork child process (%s)" - msgstr "fork 子进程失败 (%s)" - --#: ../glib/gspawn.c:1527 --#, c-format --msgid "Unknown error executing child process \"%s\"" -+#: ../glib/gspawn.c:1948 -+#, fuzzy, c-format -+msgid "Unknown error executing child process “%s”" - msgstr "执行子进程“%s”时出现未知错误" - --#: ../glib/gspawn.c:1551 -+#: ../glib/gspawn.c:1972 - #, c-format - msgid "Failed to read enough data from child pid pipe (%s)" - msgstr "从子进程管道中读取足够的数据失败(%s)" - --#: ../glib/gspawn-win32.c:283 -+#: ../glib/gspawn-win32.c:294 - msgid "Failed to read data from child process" - msgstr "从子进程中读取数据失败" - --#: ../glib/gspawn-win32.c:300 -+#: ../glib/gspawn-win32.c:311 - #, c-format - msgid "Failed to create pipe for communicating with child process (%s)" - msgstr "创建与子进程通讯的管道失败(%s)" - --#: ../glib/gspawn-win32.c:376 ../glib/gspawn-win32.c:495 -+#: ../glib/gspawn-win32.c:387 ../glib/gspawn-win32.c:392 -+#: ../glib/gspawn-win32.c:511 - #, c-format - msgid "Failed to execute child process (%s)" - msgstr "执行子进程失败(%s)" - --#: ../glib/gspawn-win32.c:445 -+#: ../glib/gspawn-win32.c:461 - #, c-format - msgid "Invalid program name: %s" - msgstr "无效的程序名：%s" - --#: ../glib/gspawn-win32.c:455 ../glib/gspawn-win32.c:722 --#: ../glib/gspawn-win32.c:1297 -+#: ../glib/gspawn-win32.c:471 ../glib/gspawn-win32.c:725 - #, c-format - msgid "Invalid string in argument vector at %d: %s" - msgstr "%d 处的参数中有无效的字符串：%s" - --#: ../glib/gspawn-win32.c:466 ../glib/gspawn-win32.c:737 --#: ../glib/gspawn-win32.c:1330 -+#: ../glib/gspawn-win32.c:482 ../glib/gspawn-win32.c:740 - #, c-format - msgid "Invalid string in environment: %s" - msgstr "环境中有无效的字符串：%s" - --#: ../glib/gspawn-win32.c:718 ../glib/gspawn-win32.c:1278 -+#: ../glib/gspawn-win32.c:721 - #, c-format - msgid "Invalid working directory: %s" - msgstr "无效的工作目录：%s" -@@ -5114,258 +5786,356 @@ msgstr "无效的工作目录：%s" - msgid "Failed to execute helper program (%s)" - msgstr "执行助手程序(%s)失败" - --#: ../glib/gspawn-win32.c:997 -+#: ../glib/gspawn-win32.c:1056 - msgid "" - "Unexpected error in g_io_channel_win32_poll() reading data from a child " - "process" - msgstr "g_io_channel_win32_poll() 从子进程中读取数据时出现异常错误" - --#: ../glib/gutf8.c:797 -+#: ../glib/gstrfuncs.c:3309 ../glib/gstrfuncs.c:3411 -+msgid "Empty string is not a number" -+msgstr "" -+ -+#: ../glib/gstrfuncs.c:3333 -+#, fuzzy, c-format -+msgid "“%s” is not a signed number" -+msgstr "“%s”不是有效的名称" -+ -+#: ../glib/gstrfuncs.c:3343 ../glib/gstrfuncs.c:3447 -+#, c-format -+msgid "Number “%s” is out of bounds [%s, %s]" -+msgstr "" -+ -+#: ../glib/gstrfuncs.c:3437 -+#, fuzzy, c-format -+msgid "“%s” is not an unsigned number" -+msgstr "“%s”不是有效的名称" -+ -+#: ../glib/gutf8.c:817 - msgid "Failed to allocate memory" - msgstr "分配内存失败" - --#: ../glib/gutf8.c:930 -+#: ../glib/gutf8.c:950 - msgid "Character out of range for UTF-8" - msgstr "字符超出 UTF-8 范围" - --#: ../glib/gutf8.c:1031 ../glib/gutf8.c:1040 ../glib/gutf8.c:1170 --#: ../glib/gutf8.c:1179 ../glib/gutf8.c:1318 ../glib/gutf8.c:1415 -+#: ../glib/gutf8.c:1051 ../glib/gutf8.c:1060 ../glib/gutf8.c:1190 -+#: ../glib/gutf8.c:1199 ../glib/gutf8.c:1338 ../glib/gutf8.c:1435 - msgid "Invalid sequence in conversion input" - msgstr "转换输入中出现无效序列" - --#: ../glib/gutf8.c:1329 ../glib/gutf8.c:1426 -+#: ../glib/gutf8.c:1349 ../glib/gutf8.c:1446 - msgid "Character out of range for UTF-16" - msgstr "字符超出 UTF-16 范围" - --#: ../glib/gutils.c:2139 ../glib/gutils.c:2166 ../glib/gutils.c:2272 --#, c-format --msgid "%u byte" --msgid_plural "%u bytes" --msgstr[0] "%u 字节" -+#. Translators: Keep the no-break space between %.1f and the unit symbol -+#: ../glib/gutils.c:2756 -+#, fuzzy, c-format -+msgid "%.1f kB" -+msgstr "%.1f KB" - --#: ../glib/gutils.c:2145 --#, c-format --msgid "%.1f KiB" -+#. Translators: Keep the no-break space between %.1f and the unit symbol -+#: ../glib/gutils.c:2758 -+#, fuzzy, c-format -+msgid "%.1f MB" -+msgstr "%.1f MB" -+ -+#. Translators: Keep the no-break space between %.1f and the unit symbol -+#: ../glib/gutils.c:2760 -+#, fuzzy, c-format -+msgid "%.1f GB" -+msgstr "%.1f GB" -+ -+#. Translators: Keep the no-break space between %.1f and the unit symbol -+#: ../glib/gutils.c:2762 -+#, fuzzy, c-format -+msgid "%.1f TB" -+msgstr "%.1f TB" -+ -+#. Translators: Keep the no-break space between %.1f and the unit symbol -+#: ../glib/gutils.c:2764 -+#, fuzzy, c-format -+msgid "%.1f PB" -+msgstr "%.1f PB" -+ -+#. Translators: Keep the no-break space between %.1f and the unit symbol -+#: ../glib/gutils.c:2766 -+#, fuzzy, c-format -+msgid "%.1f EB" -+msgstr "%.1f EB" -+ -+#. Translators: Keep the no-break space between %.1f and the unit symbol -+#: ../glib/gutils.c:2770 -+#, fuzzy, c-format -+msgid "%.1f KiB" - msgstr "%.1f KiB" - --#: ../glib/gutils.c:2147 --#, c-format --msgid "%.1f MiB" -+#. Translators: Keep the no-break space between %.1f and the unit symbol -+#: ../glib/gutils.c:2772 -+#, fuzzy, c-format -+msgid "%.1f MiB" - msgstr "%.1f MiB" - --#: ../glib/gutils.c:2150 --#, c-format --msgid "%.1f GiB" -+#. Translators: Keep the no-break space between %.1f and the unit symbol -+#: ../glib/gutils.c:2774 -+#, fuzzy, c-format -+msgid "%.1f GiB" - msgstr "%.1f GiB" - --#: ../glib/gutils.c:2153 --#, c-format --msgid "%.1f TiB" -+#. Translators: Keep the no-break space between %.1f and the unit symbol -+#: ../glib/gutils.c:2776 -+#, fuzzy, c-format -+msgid "%.1f TiB" - msgstr "%.1f TiB" - --#: ../glib/gutils.c:2156 --#, c-format --msgid "%.1f PiB" -+#. Translators: Keep the no-break space between %.1f and the unit symbol -+#: ../glib/gutils.c:2778 -+#, fuzzy, c-format -+msgid "%.1f PiB" - msgstr "%.1f PiB" - --#: ../glib/gutils.c:2159 --#, c-format --msgid "%.1f EiB" -+#. Translators: Keep the no-break space between %.1f and the unit symbol -+#: ../glib/gutils.c:2780 -+#, fuzzy, c-format -+msgid "%.1f EiB" - msgstr "%.1f EiB" - --#: ../glib/gutils.c:2172 --#, c-format --msgid "%.1f kB" -+#. Translators: Keep the no-break space between %.1f and the unit symbol -+#: ../glib/gutils.c:2784 -+#, fuzzy, c-format -+msgid "%.1f kb" - msgstr "%.1f KB" - --#: ../glib/gutils.c:2175 ../glib/gutils.c:2290 --#, c-format --msgid "%.1f MB" -+#. Translators: Keep the no-break space between %.1f and the unit symbol -+#: ../glib/gutils.c:2786 -+#, fuzzy, c-format -+msgid "%.1f Mb" - msgstr "%.1f MB" - --#: ../glib/gutils.c:2178 ../glib/gutils.c:2295 --#, c-format --msgid "%.1f GB" -+#. Translators: Keep the no-break space between %.1f and the unit symbol -+#: ../glib/gutils.c:2788 -+#, fuzzy, c-format -+msgid "%.1f Gb" - msgstr "%.1f GB" - --#: ../glib/gutils.c:2180 ../glib/gutils.c:2300 --#, c-format --msgid "%.1f TB" -+#. Translators: Keep the no-break space between %.1f and the unit symbol -+#: ../glib/gutils.c:2790 -+#, fuzzy, c-format -+msgid "%.1f Tb" - msgstr "%.1f TB" - --#: ../glib/gutils.c:2183 ../glib/gutils.c:2305 --#, c-format --msgid "%.1f PB" -+#. Translators: Keep the no-break space between %.1f and the unit symbol -+#: ../glib/gutils.c:2792 -+#, fuzzy, c-format -+msgid "%.1f Pb" - msgstr "%.1f PB" - --#: ../glib/gutils.c:2186 ../glib/gutils.c:2310 --#, c-format --msgid "%.1f EB" -+#. Translators: Keep the no-break space between %.1f and the unit symbol -+#: ../glib/gutils.c:2794 -+#, fuzzy, c-format -+msgid "%.1f Eb" - msgstr "%.1f EB" - -+#. Translators: Keep the no-break space between %.1f and the unit symbol -+#: ../glib/gutils.c:2798 -+#, fuzzy, c-format -+msgid "%.1f Kib" -+msgstr "%.1f KiB" -+ -+#. Translators: Keep the no-break space between %.1f and the unit symbol -+#: ../glib/gutils.c:2800 -+#, fuzzy, c-format -+msgid "%.1f Mib" -+msgstr "%.1f MiB" -+ -+#. Translators: Keep the no-break space between %.1f and the unit symbol -+#: ../glib/gutils.c:2802 -+#, fuzzy, c-format -+msgid "%.1f Gib" -+msgstr "%.1f GiB" -+ -+#. Translators: Keep the no-break space between %.1f and the unit symbol -+#: ../glib/gutils.c:2804 -+#, fuzzy, c-format -+msgid "%.1f Tib" -+msgstr "%.1f TiB" -+ -+#. Translators: Keep the no-break space between %.1f and the unit symbol -+#: ../glib/gutils.c:2806 -+#, fuzzy, c-format -+msgid "%.1f Pib" -+msgstr "%.1f PiB" -+ -+#. Translators: Keep the no-break space between %.1f and the unit symbol -+#: ../glib/gutils.c:2808 -+#, fuzzy, c-format -+msgid "%.1f Eib" -+msgstr "%.1f EiB" -+ -+#: ../glib/gutils.c:2842 ../glib/gutils.c:2959 -+#, c-format -+msgid "%u byte" -+msgid_plural "%u bytes" -+msgstr[0] "%u 字节" -+ -+#: ../glib/gutils.c:2846 -+#, fuzzy, c-format -+msgid "%u bit" -+msgid_plural "%u bits" -+msgstr[0] "%u 字节" -+ - #. Translators: the %s in "%s bytes" will always be replaced by a number. --#: ../glib/gutils.c:2223 -+#: ../glib/gutils.c:2913 - #, c-format - msgid "%s byte" - msgid_plural "%s bytes" - msgstr[0] "%s 字节" - -+#. Translators: the %s in "%s bits" will always be replaced by a number. -+#: ../glib/gutils.c:2918 -+#, fuzzy, c-format -+msgid "%s bit" -+msgid_plural "%s bits" -+msgstr[0] "%s 字节" -+ - #. Translators: this is from the deprecated function g_format_size_for_display() which uses 'KB' to - #. * mean 1024 bytes. I am aware that 'KB' is not correct, but it has been preserved for reasons of - #. * compatibility. Users will not see this string unless a program is using this deprecated function. - #. * Please translate as literally as possible. - #. --#: ../glib/gutils.c:2285 -+#: ../glib/gutils.c:2972 - #, c-format - msgid "%.1f KB" - msgstr "%.1f KB" - --msgctxt "full month name with day" --msgid "January" --msgstr "一月" -+#: ../glib/gutils.c:2977 -+#, c-format -+msgid "%.1f MB" -+msgstr "%.1f MB" - --msgctxt "full month name with day" --msgid "February" --msgstr "二月" -+#: ../glib/gutils.c:2982 -+#, c-format -+msgid "%.1f GB" -+msgstr "%.1f GB" - --msgctxt "full month name with day" --msgid "March" --msgstr "三月" -+#: ../glib/gutils.c:2987 -+#, c-format -+msgid "%.1f TB" -+msgstr "%.1f TB" - --msgctxt "full month name with day" --msgid "April" --msgstr "四月" -+#: ../glib/gutils.c:2992 -+#, c-format -+msgid "%.1f PB" -+msgstr "%.1f PB" - --msgctxt "full month name with day" --msgid "May" --msgstr "五月" -+#: ../glib/gutils.c:2997 -+#, c-format -+msgid "%.1f EB" -+msgstr "%.1f EB" - --msgctxt "full month name with day" --msgid "June" --msgstr "六月" -+#~ msgid "[ARGS...]" -+#~ msgstr "[ARGS...]" - --msgctxt "full month name with day" --msgid "July" --msgstr "七月" -+#~ msgid "Error in address '%s' - the family attribute is malformed" -+#~ msgstr "地址“%s”中有错误 - 协议族属性格式错误" - --msgctxt "full month name with day" --msgid "August" --msgstr "八月" -+#~ msgid "Error opening nonce file '%s': %s" -+#~ msgstr "打开临时文件“%s”时出错：%s" - --msgctxt "full month name with day" --msgid "September" --msgstr "九月" -+#~ msgid "" -+#~ "Cannot determine bus address from DBUS_STARTER_BUS_TYPE environment " -+#~ "variable - unknown value '%s'" -+#~ msgstr "无法从 DBUS_STARTER_BUS_TYPE 环境变量确定总线地址 - 未知的值“%s”" - --msgctxt "full month name with day" --msgid "October" --msgstr "十月" -+#~ msgid "Error creating directory '%s': %s" -+#~ msgstr "创建目录“%s”时出错：%s" - --msgctxt "full month name with day" --msgid "November" --msgstr "十一月" -+#~ msgid "No such interface" -+#~ msgstr "无此接口" - --msgctxt "full month name with day" --msgid "December" --msgstr "十二月" -+#~ msgid "" -+#~ "Message has %d file descriptors but the header field indicates %d file " -+#~ "descriptors" -+#~ msgstr "消息拥有 %d 个文件描述符，但是头区域指出 %d 个文件描述符" - --msgctxt "abbreviated month name with day" --msgid "Jan" --msgstr "01月" -+#~ msgid "Error: signal not specified.\n" -+#~ msgstr "错误：没有指定对象。\n" - --msgctxt "abbreviated month name with day" --msgid "Feb" --msgstr "02月" -+#~ msgid "Error: signal must be the fully-qualified name.\n" -+#~ msgstr "错误：信号必须是完全限定名。\n" - --msgctxt "abbreviated month name with day" --msgid "Mar" --msgstr "03月" -+#~ msgid "No files given" -+#~ msgstr "未给出文件" - --msgctxt "abbreviated month name with day" --msgid "Apr" --msgstr "04月" -+#~ msgid "Error getting writable attributes: %s\n" -+#~ msgstr "获取可写属性出错：%s\n" - --msgctxt "abbreviated month name with day" --msgid "May" --msgstr "05月" -+#~ msgid "Error mounting location: %s\n" -+#~ msgstr "挂载位置出错：%s\n" - --msgctxt "abbreviated month name with day" --msgid "Jun" --msgstr "06月" -+#~ msgid "Error unmounting mount: %s\n" -+#~ msgstr "卸载挂载点出错：%s\n" - --msgctxt "abbreviated month name with day" --msgid "Jul" --msgstr "07月" -+#~ msgid "Error finding enclosing mount: %s\n" -+#~ msgstr "寻找闭合挂载出错：%s\n" - --msgctxt "abbreviated month name with day" --msgid "Aug" --msgstr "08月" -+#~ msgid "Error ejecting mount: %s\n" -+#~ msgstr "弹出挂载出错：%s\n" - --msgctxt "abbreviated month name with day" --msgid "Sep" --msgstr "09月" -+#~ msgid "Error mounting %s: %s\n" -+#~ msgstr "挂载 %s 出错：%s\n" - --msgctxt "abbreviated month name with day" --msgid "Oct" --msgstr "10月" -+#~ msgid "Mounted %s at %s\n" -+#~ msgstr "已将 %s 挂载为 %s\n" - --msgctxt "abbreviated month name with day" --msgid "Nov" --msgstr "11月" -+#~ msgid "No files to open" -+#~ msgstr "没有要打开的文件" - --msgctxt "abbreviated month name with day" --msgid "Dec" --msgstr "12月" -+#~ msgid "No files to delete" -+#~ msgstr "没有要删除的文件" - --#, fuzzy --#~| msgid "[ARGS...]" --#~ msgid "[ARGS…]" --#~ msgstr "[ARGS...]" -+#~ msgid "Error setting attribute: %s\n" -+#~ msgstr "设置属性出错：%s\n" - --#, 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”" -+#~ msgid "Failed to create temp file: %s" -+#~ msgstr "创建临时文件失败：%s" - --#, fuzzy --#~| msgid "Error creating directory '%s': %s" --#~ msgid "Error creating directory “%s”: %s" --#~ msgstr "创建目录“%s”出错：%s" -+#~ msgid "; ignoring override for this key.\n" -+#~ msgstr "；忽略对此键的覆盖。\n" - --#, fuzzy --#~| msgid "Error opening file '%s': %s" --#~ msgid "Error opening file “%s”: %s" --#~ msgstr "打开文件“%s”出错：%s" -+#~ msgid " and --strict was specified; exiting.\n" -+#~ msgstr "并且指定了 --strict；退出。\n" - --#, 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”" -+#~ msgid "Ignoring override for this key.\n" -+#~ msgstr "忽略对此键的覆盖。\n" - --#, fuzzy --#~| msgid "Error reading file %s: %s" --#~ msgid "Error reading file “%s”: %s" --#~ msgstr "读取文件 %s 出错：%s" -+#~ msgid "doing nothing.\n" -+#~ msgstr "什么都没做。\n" - --#, fuzzy --#~| msgid "Failed to write file '%s': fsync() failed: %s" --#~ msgid "Failed to write file “%s”: fsync() failed: %s" -+#~ msgid "Error opening file '%s': %s" -+#~ msgstr "打开文件“%s”时出错：%s" -+ -+#~ msgid "mount doesn't implement \"unmount\" or \"unmount_with_operation\"" -+#~ msgstr "挂载未实现“unmount”或“unmount_with_operation”" -+ -+#~ msgid "mount doesn't implement \"eject\" or \"eject_with_operation\"" -+#~ msgstr "挂载未实现“eject”或“eject_with_operation”" -+ -+#~ msgid "Error opening directory '%s': %s" -+#~ msgstr "打开目录“%s”时发生错误：%s" -+ -+#~ msgid "Error reading file '%s': %s" -+#~ msgstr "读取文件“%s”出错：%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." -+#~ "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 "Failed to execute child process \"%s\" (%s)" -+#~ msgstr "执行子进程“%s\"失败(%s)" - - #~ msgid "Error renaming file: %s" - #~ msgstr "重命名文件时出错：%s"