Projects
openEuler:Mainline
glib2
Sign Up
Log In
Username
Password
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
Expand all
Collapse all
Changes of Revision 14
View file
_service:tar_scm:glib2.spec
Changed
@@ -1,13 +1,12 @@ Name: glib2 -Version: 2.74.4 -Release: 3 +Version: 2.76.4 +Release: 1 Summary: The core library that forms the basis for projects such as GTK+ and GNOME License: LGPLv2+ URL: https://www.gtk.org -Source0: https://download.gnome.org/sources/glib/2.74/glib-%{version}.tar.xz +Source0: https://download.gnome.org/sources/glib/2.76/glib-%{version}.tar.xz -patch6001: backport-gdbusinterfaceskeleton-Fix-a-use-after-free-of-a-GDBusMethodInvocation.patch -patch6002: backport-Align-G_FILE_MEASURE_APPARENT_SIZE-behaviour-with-du-from-GNU-coreutils.patch +Patch1: gspawn-eperm.patch BuildRequires: chrpath gcc gcc-c++ gettext perl-interpreter BUildRequires: glibc-devel libattr-devel libselinux-devel meson @@ -99,9 +98,6 @@ %meson_build find . -name *.dtrace-temp.c -exec rm -f {} \; -%check -%meson_test - %install %meson_install %global py_reproducible_pyc_path %{buildroot}%{_datadir} @@ -204,6 +200,9 @@ %endif %changelog +* Mon Jul 24 2023 dillon chen <dillon.chen@gmail.com> - 2.76.4-1 +- Update to 2.76.4 + * Sat Jul 15 2023 hanhuihui <hanhuihui5@huawei.com> - 2.74.4-3 - Align G_FILE_MEASURE_APPARENT_SIZE behaviour with du from GNU coreutils
View file
_service:tar_scm:backport-Align-G_FILE_MEASURE_APPARENT_SIZE-behaviour-with-du-from-GNU-coreutils.patch
Deleted
@@ -1,258 +0,0 @@ -From 011fe5ebb2516f0673819e6076d4d58d2618c2ea Mon Sep 17 00:00:00 2001 -From: Joan Bruguera <joanbrugueram@gmail.com> -Date: Thu, 23 Mar 2023 02:24:30 +0000 -Subject: PATCH 1/2 glocalfile: Sum apparent size only for files and symlinks - -Since GNU Coreutils 9.2 (commit 110bcd28386b1f47a4cd876098acb708fdcbbb25), -`du --apparent-size` (including `du --bytes`) no longer counts all kinds of -files (directories, FIFOs, etc.), but only those for which `st_size` in -`struct stat` is defined by POSIX, namely regular files and symlinks -(and also rarely supported memory objects). - -This aligns the behaviour of GLib's `G_FILE_MEASURE_APPARENT_SIZE` flag -with the new GNU Coreutils `du` and correct POSIX use. - -Note that this may be a breaking change for some uses. - -Link: https://lists.gnu.org/archive/html/bug-coreutils/2023-03/msg00007.html -Fixes: https://gitlab.gnome.org/GNOME/glib/-/issues/2965 ---- - gio/gioenums.h | 3 +++ - gio/glocalfile.c | 37 +++++++++++++++++++++++++++++++++++++ - 2 files changed, 40 insertions(+) - -diff --git a/gio/gioenums.h b/gio/gioenums.h -index 7fd74a43ea..c820cd36d4 100644 ---- a/gio/gioenums.h -+++ b/gio/gioenums.h -@@ -224,6 +224,9 @@ typedef enum { - * sizes. Normally, the block-size is used, if available, as this is a - * more accurate representation of disk space used. - * Compare with `du --apparent-size`. -+ * Since GLib 2.78. and similarly to `du` since GNU Coreutils 9.2, this will -+ * ignore the sizes of file types other than regular files and links, as the -+ * sizes of other file types are not specified in a standard way. - * @G_FILE_MEASURE_NO_XDEV: Do not cross mount point boundaries. - * Compare with `du -x`. - * -diff --git a/gio/glocalfile.c b/gio/glocalfile.c -index 67d4b99fb7..dbb56902d5 100644 ---- a/gio/glocalfile.c -+++ b/gio/glocalfile.c -@@ -86,6 +86,9 @@ - #define FILE_READ_ONLY_VOLUME 0x00080000 - #endif - -+#ifndef S_ISREG -+#define S_ISREG(m) (((m) & _S_IFMT) == _S_IFREG) -+#endif - #ifndef S_ISDIR - #define S_ISDIR(m) (((m) & _S_IFMT) == _S_IFDIR) - #endif -@@ -2777,6 +2780,39 @@ g_local_file_measure_size_of_contents (gint fd, - MeasureState *state, - GError **error); - -+/* -+ * _g_stat_is_size_usable: -+ * @buf: a #GLocalFileStat. -+ * -+ * Checks if the file type is such that the `st_size` field of `struct stat` is -+ * well-defined by POSIX. -+ * (see https://pubs.opengroup.org/onlinepubs/009696799/basedefs/sys/stat.h.html) -+ * -+ * This behaviour is aligned with `du` from GNU Coreutils 9.2+ -+ * (see https://lists.gnu.org/archive/html/bug-coreutils/2023-03/msg00007.html) -+ * and makes apparent size sums well-defined; formerly, they depended on the -+ * implementation, and could differ across filesystems. -+ * -+ * Returns: %TRUE if the size field is well-defined, %FALSE otherwise. -+ **/ -+inline static gboolean -+_g_stat_is_size_usable (const GLocalFileStat *buf) -+{ -+#ifndef HAVE_STATX -+ /* Memory objects are defined by POSIX, but are not supported by statx nor Windows */ -+#ifdef S_TYPEISSHM -+ if (S_TYPEISSHM (buf)) -+ return TRUE; -+#endif -+#ifdef S_TYPEISTMO -+ if (S_TYPEISTMO (buf)) -+ return TRUE; -+#endif -+#endif -+ -+ return S_ISREG (_g_stat_mode (buf)) || S_ISLNK (_g_stat_mode (buf)); -+} -+ - static gboolean - g_local_file_measure_size_of_file (gint parent_fd, - GSList *name, -@@ -2836,6 +2872,7 @@ g_local_file_measure_size_of_file (gint parent_fd, - state->disk_usage += _g_stat_blocks (&buf) * G_GUINT64_CONSTANT (512); - else - #endif -+ if (_g_stat_is_size_usable (&buf)) - state->disk_usage += _g_stat_size (&buf); - - if (S_ISDIR (_g_stat_mode (&buf))) --- -GitLab - - -From d901b551288156e8dff2e6c7a4ecabbd76394710 Mon Sep 17 00:00:00 2001 -From: Joan Bruguera <joanbrugueram@gmail.com> -Date: Thu, 23 Mar 2023 02:19:03 +0000 -Subject: PATCH 2/2 tests/file: Do not rely on du --bytes behaviour - -As explained in the previous commit, GNU Coreutils 9.2 changes the behaviour -of `du --bytes` to only count regular files and symlinks. - -The previous commit makes the test pass with GNU Coreutils >=9.2, but the -machine running the tests may have an older version, or perhaps even a -reimplementation such as uutils. So we can't rely on the size returned by `du` -to be the consistent across systems any more. - -However, the plus side of the new behaviour is that the size reported by `du` -/ `G_FILE_MEASURE_APPARENT_SIZE` is now well-defined across filesystems -(as the sum of the sizes of regular files & symlinks), so we can hardcode it. - -Fixes: https://gitlab.gnome.org/GNOME/glib/-/issues/2965 ---- - gio/tests/file.c | 85 ++---------------------------------------------- - 1 file changed, 3 insertions(+), 82 deletions(-) - -diff --git a/gio/tests/file.c b/gio/tests/file.c -index d16eda5c0b..ad2f945f93 100644 ---- a/gio/tests/file.c -+++ b/gio/tests/file.c -@@ -2515,75 +2515,10 @@ test_copy_preserve_mode (void) - #endif - } - --static gchar * --splice_to_string (GInputStream *stream, -- GError **error) --{ -- GMemoryOutputStream *buffer = NULL; -- char *ret = NULL; -- -- buffer = (GMemoryOutputStream*)g_memory_output_stream_new (NULL, 0, g_realloc, g_free); -- if (g_output_stream_splice ((GOutputStream*)buffer, stream, 0, NULL, error) < 0) -- goto out; -- -- if (!g_output_stream_write ((GOutputStream*)buffer, "\0", 1, NULL, error)) -- goto out; -- -- if (!g_output_stream_close ((GOutputStream*)buffer, NULL, error)) -- goto out; -- -- ret = g_memory_output_stream_steal_data (buffer); -- out: -- g_clear_object (&buffer); -- return ret; --} -- --static gboolean --get_size_from_du (const gchar *path, guint64 *size) --{ -- GSubprocess *du; -- gboolean ok; -- gchar *result; -- gchar *endptr; -- GError *error = NULL; -- gchar *du_path = NULL; -- --#ifndef HAVE_COCOA -- du_path = g_find_program_in_path ("du"); --#endif -- -- /* If we can’t find du, don’t try and run the test. */ -- if (du_path == NULL) -- return FALSE; -- -- g_free (du_path); -- -- du = g_subprocess_new (G_SUBPROCESS_FLAGS_STDOUT_PIPE, -- &error, -- "du", "--bytes", "-s", path, NULL); -- g_assert_no_error (error); -- -- result = splice_to_string (g_subprocess_get_stdout_pipe (du), &error); -- g_assert_no_error (error); -- -- *size = g_ascii_strtoll (result, &endptr, 10); -- -- g_subprocess_wait (du, NULL, &error); -- g_assert_no_error (error); -- -- ok = g_subprocess_get_successful (du); -- -- g_object_unref (du); -- g_free (result); -- -- return ok; --} -- - static void - test_measure (void) - { - GFile *file; -- guint64 size; - guint64 num_bytes; - guint64 num_dirs; - guint64 num_files; -@@ -2594,12 +2529,6 @@ test_measure (void) - path = g_test_build_filename (G_TEST_DIST, "desktop-files", NULL); - file = g_file_new_for_path (path); - -- if (!get_size_from_du (path, &size)) -- { -- g_test_message ("du not found or fail to run, skipping byte measurement"); -- size = 0; -- } -- - ok = g_file_measure_disk_usage (file, - G_FILE_MEASURE_APPARENT_SIZE, - NULL, -@@ -2612,8 +2541,7 @@ test_measure (void) - g_assert_true (ok); - g_assert_no_error (error); - -- if (size > 0) -- g_assert_cmpuint (num_bytes, ==, size); -+ g_assert_cmpuint (num_bytes, ==, 74478); - g_assert_cmpuint (num_dirs, ==, 6); - g_assert_cmpuint (num_files, ==, 32); - -@@ -2665,8 +2593,7 @@ measure_done (GObject *source, - g_assert_true (ok); - g_assert_no_error (error); - -- if (data->expected_bytes > 0) -- g_assert_cmpuint (data->expected_bytes, ==, num_bytes); -+ g_assert_cmpuint (data->expected_bytes, ==, num_bytes); - g_assert_cmpuint (data->expected_dirs, ==, num_dirs); - g_assert_cmpuint (data->expected_files, ==, num_files); - -@@ -2695,15 +2622,9 @@ test_measure_async (void) - - path = g_test_build_filename (G_TEST_DIST, "desktop-files", NULL); - file = g_file_new_for_path (path); -- -- if (!get_size_from_du (path, &data->expected_bytes)) -- { -- g_test_message ("du not found or fail to run, skipping byte measurement"); -- data->expected_bytes = 0; -- } -- - g_free (path); - -+ data->expected_bytes = 74478; - data->expected_dirs = 6; - data->expected_files = 32; - --- -GitLab -
View file
_service:tar_scm:backport-gdbusinterfaceskeleton-Fix-a-use-after-free-of-a-GDBusMethodInvocation.patch
Deleted
@@ -1,182 +0,0 @@ -From 1f86923766a3d1d319fe54ad24fcf6e2d75aca0d Mon Sep 17 00:00:00 2001 -From: Philip Withnall <pwithnall@endlessos.org> -Date: Wed, 22 Feb 2023 12:40:49 +0000 -Subject: PATCH 1/3 gdbusinterfaceskeleton: Remove an unnecessary helper - struct member -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The `GDBusInterfaceSkeleton` is already stored as the source object of -the `GTask` here, with a strong reference. - -Storing it again in the task’s data struct is redundant, and makes it -look like the `GDBusInterfaceSkeleton` is being used without holding a -strong reference. (There’s not actually a bug there though: the strong -reference from the `GTask` outlives the data struct, so is sufficient.) - -Remove the unnecessary helper struct member to clarify the code a bit. - -Signed-off-by: Philip Withnall <pwithnall@endlessos.org> - -Helps: #2924 ---- - gio/gdbusinterfaceskeleton.c | 15 +++++++-------- - 1 file changed, 7 insertions(+), 8 deletions(-) - -diff --git a/gio/gdbusinterfaceskeleton.c b/gio/gdbusinterfaceskeleton.c -index 3f07d4d0b2..d28282fea3 100644 ---- a/gio/gdbusinterfaceskeleton.c -+++ b/gio/gdbusinterfaceskeleton.c -@@ -461,7 +461,6 @@ dbus_interface_interface_init (GDBusInterfaceIface *iface) - typedef struct - { - gint ref_count; /* (atomic) */ -- GDBusInterfaceSkeleton *interface; - GDBusInterfaceMethodCallFunc method_call_func; - GDBusMethodInvocation *invocation; - } DispatchData; -@@ -502,16 +501,17 @@ dispatch_in_thread_func (GTask *task, - GCancellable *cancellable) - { - DispatchData *data = task_data; -+ GDBusInterfaceSkeleton *interface = g_task_get_source_object (task); - GDBusInterfaceSkeletonFlags flags; - GDBusObject *object; - gboolean authorized; - -- g_mutex_lock (&data->interface->priv->lock); -- flags = data->interface->priv->flags; -- object = data->interface->priv->object; -+ g_mutex_lock (&interface->priv->lock); -+ flags = interface->priv->flags; -+ object = interface->priv->object; - if (object != NULL) - g_object_ref (object); -- g_mutex_unlock (&data->interface->priv->lock); -+ g_mutex_unlock (&interface->priv->lock); - - /* first check on the enclosing object (if any), then the interface */ - authorized = TRUE; -@@ -519,13 +519,13 @@ dispatch_in_thread_func (GTask *task, - { - g_signal_emit_by_name (object, - "authorize-method", -- data->interface, -+ interface, - data->invocation, - &authorized); - } - if (authorized) - { -- g_signal_emit (data->interface, -+ g_signal_emit (interface, - signalsG_AUTHORIZE_METHOD_SIGNAL, - 0, - data->invocation, -@@ -627,7 +627,6 @@ g_dbus_interface_method_dispatch_helper (GDBusInterfaceSkeleton *interface - DispatchData *data; - - data = g_slice_new0 (DispatchData); -- data->interface = interface; - data->method_call_func = method_call_func; - data->invocation = invocation; - data->ref_count = 1; --- -GitLab - - -From d5710deb9d621bcf0cec0ff2db0708f361490752 Mon Sep 17 00:00:00 2001 -From: Philip Withnall <pwithnall@endlessos.org> -Date: Wed, 22 Feb 2023 12:47:36 +0000 -Subject: PATCH 2/3 gdbusinterfaceskeleton: Fix a use-after-free of a - GDBusMethodInvocation -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This `GDBusMethodInvocation` may be shared across threads, with no -guarantee on the strong ref in one thread outlasting any refs in other -threads — so it needs a ref in this helper struct. - -This should fix a use-after-free where the `GDBusMethodInvocation` is -freed from `g_value_unset()` after `g_signal_emit()` returns in -`dispatch_in_thread_func()` in one thread; but then dereferenced again -in `g_source_destroy_internal()` from another thread. - -Signed-off-by: Philip Withnall <pwithnall@endlessos.org> - -Fixes: #2924 ---- - gio/gdbusinterfaceskeleton.c | 9 ++++++--- - 1 file changed, 6 insertions(+), 3 deletions(-) - -diff --git a/gio/gdbusinterfaceskeleton.c b/gio/gdbusinterfaceskeleton.c -index d28282fea3..a2a79fe3d8 100644 ---- a/gio/gdbusinterfaceskeleton.c -+++ b/gio/gdbusinterfaceskeleton.c -@@ -462,14 +462,17 @@ typedef struct - { - gint ref_count; /* (atomic) */ - GDBusInterfaceMethodCallFunc method_call_func; -- GDBusMethodInvocation *invocation; -+ GDBusMethodInvocation *invocation; /* (owned) */ - } DispatchData; - - static void - dispatch_data_unref (DispatchData *data) - { - if (g_atomic_int_dec_and_test (&data->ref_count)) -- g_slice_free (DispatchData, data); -+ { -+ g_clear_object (&data->invocation); -+ g_slice_free (DispatchData, data); -+ } - } - - static DispatchData * -@@ -628,7 +631,7 @@ g_dbus_interface_method_dispatch_helper (GDBusInterfaceSkeleton *interface - - data = g_slice_new0 (DispatchData); - data->method_call_func = method_call_func; -- data->invocation = invocation; -+ data->invocation = g_object_ref (invocation); - data->ref_count = 1; - - task = g_task_new (interface, NULL, NULL, NULL); --- -GitLab - - -From 7b101588e924f3783a0f5075f06b3e1d698be936 Mon Sep 17 00:00:00 2001 -From: Philip Withnall <pwithnall@endlessos.org> -Date: Wed, 22 Feb 2023 12:50:10 +0000 -Subject: PATCH 3/3 gdbusconnection: Make GDBusMethodInvocation transfer a - bit clearer - -Add a missing steal call in `schedule_method_call()`. This introduces no -functional changes, but documents the ownership transfer more clearly. - -Signed-off-by: Philip Withnall <pwithnall@endlessos.org> - -Helps: #2924 ---- - gio/gdbusconnection.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gio/gdbusconnection.c b/gio/gdbusconnection.c -index d938f71b99..da6b66f2ec 100644 ---- a/gio/gdbusconnection.c -+++ b/gio/gdbusconnection.c -@@ -5043,7 +5043,7 @@ schedule_method_call (GDBusConnection *connection, - g_source_set_priority (idle_source, G_PRIORITY_DEFAULT); - g_source_set_callback (idle_source, - call_in_idle_cb, -- invocation, -+ g_steal_pointer (&invocation), - g_object_unref); - g_source_set_static_name (idle_source, "gio, " __FILE__ " call_in_idle_cb"); - g_source_attach (idle_source, main_context); --- -GitLab -
View file
_service:tar_scm:gspawn-eperm.patch
Added
@@ -0,0 +1,43 @@ +diff --git a/glib/gspawn.c b/glib/gspawn.c +index 67be6a6af..aaefd5b0d 100644 +--- a/glib/gspawn.c ++++ b/glib/gspawn.c +@@ -1598,9 +1598,18 @@ safe_fdwalk_set_cloexec (int lowfd) + * + * Handle ENOSYS in case it’s supported in libc but not the kernel; if so, + * fall back to safe_fdwalk(). Handle EINVAL in case `CLOSE_RANGE_CLOEXEC` +- * is not supported. */ ++ * is not supported. ++ * ++ * Also handle EPERM for the cases where GLib is running under broken versions ++ * of Docker+libseccomp which don’t recognise `close_range()` so block calls ++ * to it under a default security policy which returns EPERM rather than (the ++ * correct) ENOSYS. This workaround should be carried in distributions until ++ * they have versions of libseccomp and Docker which contain: ++ * - https://salsa.debian.org/debian/libseccomp/-/blob/debian/bullseye/debian/patches/syscalls_add_close_range_syscall.patch ++ * - https://github.com/opencontainers/runc/issues/2151 ++ */ + ret = close_range (lowfd, G_MAXUINT, CLOSE_RANGE_CLOEXEC); +- if (ret == 0 || !(errno == ENOSYS || errno == EINVAL)) ++ if (ret == 0 || !(errno == ENOSYS || errno == EINVAL || errno == EPERM)) + return ret; + #endif /* HAVE_CLOSE_RANGE */ + +@@ -1624,9 +1633,15 @@ safe_closefrom (int lowfd) + * situations: https://bugs.python.org/issue38061 + * + * Handle ENOSYS in case it’s supported in libc but not the kernel; if so, +- * fall back to safe_fdwalk(). */ ++ * fall back to safe_fdwalk(). ++ * ++ * Also handle EPERM for the cases where GLib is running under broken versions ++ * of Docker+libseccomp which don’t recognise `close_range()` so block calls ++ * to it under a default security policy which returns EPERM rather than (the ++ * correct) ENOSYS. ++ */ + ret = close_range (lowfd, G_MAXUINT, 0); +- if (ret == 0 || errno != ENOSYS) ++ if (ret == 0 || !(errno == ENOSYS || errno == EPERM)) + return ret; + #endif /* HAVE_CLOSE_RANGE */ +
View file
_service:tar_scm:glib-2.74.4.tar.xz/HACKING
Deleted
@@ -1,17 +0,0 @@ -If you want to hack on the GLib project, you'll need to have the -following packages installed: - - - Meson 0.48.0 - - GNU gettext 0.10.40 - - pkg-config 0.16 - - gtk-doc - - libffi 3.0.0 - -To compile a Git version of glib on your system, you will need to take -several steps to setup the tree for compilation. You can do all these -steps at once by running: - - checkout/glib# meson _build - -For information about submitting patches see the CONTRIBUTING.md file. For -information about major design decisions, see the docs/README.rationale file.
View file
_service:tar_scm:glib-2.74.4.tar.xz/docs/reference/glib/glib-sections.txt
Deleted
@@ -1,4043 +0,0 @@ -<INCLUDE>glib.h</INCLUDE> - -<SECTION> -<TITLE>Basic Types</TITLE> -<FILE>types</FILE> -gboolean -gpointer -gconstpointer -gchar -guchar - -<SUBSECTION> -gint -G_MININT -G_MAXINT -guint -G_MAXUINT -gshort -G_MINSHORT -G_MAXSHORT -gushort -G_MAXUSHORT -glong -G_MINLONG -G_MAXLONG -gulong -G_MAXULONG - -<SUBSECTION> -gint8 -G_MININT8 -G_MAXINT8 -guint8 -G_MAXUINT8 -gint16 -G_MININT16 -G_MAXINT16 -G_GINT16_MODIFIER -G_GINT16_FORMAT -guint16 -G_MAXUINT16 -G_GUINT16_FORMAT -gint32 -G_MININT32 -G_MAXINT32 -G_GINT32_MODIFIER -G_GINT32_FORMAT -guint32 -G_MAXUINT32 -G_GUINT32_FORMAT -gint64 -G_MININT64 -G_MAXINT64 -G_GINT64_MODIFIER -G_GINT64_FORMAT -G_GINT64_CONSTANT -guint64 -G_MAXUINT64 -G_GUINT64_FORMAT -G_GUINT64_CONSTANT - -<SUBSECTION> -gfloat -G_MINFLOAT -G_MAXFLOAT -gdouble -G_MINDOUBLE -G_MAXDOUBLE - -<SUBSECTION> -gsize -G_MAXSIZE -G_GSIZE_MODIFIER -G_GSIZE_FORMAT -gssize -G_MINSSIZE -G_MAXSSIZE -G_GSSIZE_MODIFIER -G_GSSIZE_FORMAT -goffset -G_MINOFFSET -G_MAXOFFSET -G_GOFFSET_MODIFIER -G_GOFFSET_FORMAT -G_GOFFSET_CONSTANT - -<SUBSECTION> -gintptr -G_GINTPTR_MODIFIER -G_GINTPTR_FORMAT -guintptr -G_GUINTPTR_FORMAT - -<SUBSECTION Private> -GLIB_SIZEOF_SSIZE_T -GLIB_SIZEOF_VOID_P -GLIB_SIZEOF_LONG -GLIB_SIZEOF_SIZE_T -G_HAVE_GINT64 -</SECTION> - -<SECTION> -<TITLE>Version Information</TITLE> -<FILE>version</FILE> -glib_major_version -glib_minor_version -glib_micro_version -glib_binary_age -glib_interface_age -glib_check_version - -<SUBSECTION> -GLIB_MAJOR_VERSION -GLIB_MINOR_VERSION -GLIB_MICRO_VERSION -GLIB_CHECK_VERSION - -<SUBSECTION> -GLIB_VERSION_2_26 -GLIB_VERSION_2_28 -GLIB_VERSION_2_30 -GLIB_VERSION_2_32 -GLIB_VERSION_2_34 -GLIB_VERSION_2_36 -GLIB_VERSION_2_38 -GLIB_VERSION_2_40 -GLIB_VERSION_2_42 -GLIB_VERSION_2_44 -GLIB_VERSION_2_46 -GLIB_VERSION_2_48 -GLIB_VERSION_2_50 -GLIB_VERSION_2_52 -GLIB_VERSION_2_54 -GLIB_VERSION_2_56 -GLIB_VERSION_2_58 -GLIB_VERSION_2_60 -GLIB_VERSION_2_62 -GLIB_VERSION_2_64 -GLIB_VERSION_2_66 -GLIB_VERSION_2_68 -GLIB_VERSION_2_70 -GLIB_VERSION_2_72 -GLIB_VERSION_2_74 -GLIB_VERSION_CUR_STABLE -GLIB_VERSION_PREV_STABLE -GLIB_VERSION_MIN_REQUIRED -GLIB_VERSION_MAX_ALLOWED -GLIB_DISABLE_DEPRECATION_WARNINGS - -<SUBSECTION Private> -G_ENCODE_VERSION -GLIB_AVAILABLE_ENUMERATOR_IN_2_26 -GLIB_AVAILABLE_ENUMERATOR_IN_2_28 -GLIB_AVAILABLE_ENUMERATOR_IN_2_30 -GLIB_AVAILABLE_ENUMERATOR_IN_2_32 -GLIB_AVAILABLE_ENUMERATOR_IN_2_34 -GLIB_AVAILABLE_ENUMERATOR_IN_2_36 -GLIB_AVAILABLE_ENUMERATOR_IN_2_38 -GLIB_AVAILABLE_ENUMERATOR_IN_2_40 -GLIB_AVAILABLE_ENUMERATOR_IN_2_42 -GLIB_AVAILABLE_ENUMERATOR_IN_2_44 -GLIB_AVAILABLE_ENUMERATOR_IN_2_46 -GLIB_AVAILABLE_ENUMERATOR_IN_2_48 -GLIB_AVAILABLE_ENUMERATOR_IN_2_50 -GLIB_AVAILABLE_ENUMERATOR_IN_2_52 -GLIB_AVAILABLE_ENUMERATOR_IN_2_54 -GLIB_AVAILABLE_ENUMERATOR_IN_2_56 -GLIB_AVAILABLE_ENUMERATOR_IN_2_58 -GLIB_AVAILABLE_ENUMERATOR_IN_2_60 -GLIB_AVAILABLE_ENUMERATOR_IN_2_62 -GLIB_AVAILABLE_ENUMERATOR_IN_2_64 -GLIB_AVAILABLE_ENUMERATOR_IN_2_66 -GLIB_AVAILABLE_ENUMERATOR_IN_2_68 -GLIB_AVAILABLE_ENUMERATOR_IN_2_70 -GLIB_AVAILABLE_ENUMERATOR_IN_2_72 -GLIB_AVAILABLE_ENUMERATOR_IN_2_74 -GLIB_AVAILABLE_IN_ALL -GLIB_AVAILABLE_IN_2_26 -GLIB_AVAILABLE_IN_2_28 -GLIB_AVAILABLE_IN_2_30 -GLIB_AVAILABLE_IN_2_32 -GLIB_AVAILABLE_IN_2_34 -GLIB_AVAILABLE_IN_2_36 -GLIB_AVAILABLE_IN_2_38 -GLIB_AVAILABLE_IN_2_40 -GLIB_AVAILABLE_IN_2_42 -GLIB_AVAILABLE_IN_2_44 -GLIB_AVAILABLE_IN_2_46 -GLIB_AVAILABLE_IN_2_48 -GLIB_AVAILABLE_IN_2_50 -GLIB_AVAILABLE_IN_2_52 -GLIB_AVAILABLE_IN_2_54 -GLIB_AVAILABLE_IN_2_56 -GLIB_AVAILABLE_IN_2_58 -GLIB_AVAILABLE_IN_2_60 -GLIB_AVAILABLE_IN_2_62 -GLIB_AVAILABLE_IN_2_64 -GLIB_AVAILABLE_IN_2_66 -GLIB_AVAILABLE_IN_2_68 -GLIB_AVAILABLE_IN_2_70 -GLIB_AVAILABLE_IN_2_72 -GLIB_AVAILABLE_IN_2_74 -GLIB_AVAILABLE_MACRO_IN_2_26 -GLIB_AVAILABLE_MACRO_IN_2_28 -GLIB_AVAILABLE_MACRO_IN_2_30 -GLIB_AVAILABLE_MACRO_IN_2_32 -GLIB_AVAILABLE_MACRO_IN_2_34 -GLIB_AVAILABLE_MACRO_IN_2_36 -GLIB_AVAILABLE_MACRO_IN_2_38 -GLIB_AVAILABLE_MACRO_IN_2_40 -GLIB_AVAILABLE_MACRO_IN_2_42 -GLIB_AVAILABLE_MACRO_IN_2_44 -GLIB_AVAILABLE_MACRO_IN_2_46 -GLIB_AVAILABLE_MACRO_IN_2_48 -GLIB_AVAILABLE_MACRO_IN_2_50 -GLIB_AVAILABLE_MACRO_IN_2_52 -GLIB_AVAILABLE_MACRO_IN_2_54 -GLIB_AVAILABLE_MACRO_IN_2_56 -GLIB_AVAILABLE_MACRO_IN_2_58 -GLIB_AVAILABLE_MACRO_IN_2_60 -GLIB_AVAILABLE_MACRO_IN_2_62 -GLIB_AVAILABLE_MACRO_IN_2_64 -GLIB_AVAILABLE_MACRO_IN_2_66 -GLIB_AVAILABLE_MACRO_IN_2_68 -GLIB_AVAILABLE_MACRO_IN_2_70 -GLIB_AVAILABLE_MACRO_IN_2_72 -GLIB_AVAILABLE_MACRO_IN_2_74 -GLIB_AVAILABLE_STATIC_INLINE_IN_2_44 -GLIB_AVAILABLE_STATIC_INLINE_IN_2_60 -GLIB_AVAILABLE_STATIC_INLINE_IN_2_62 -GLIB_AVAILABLE_STATIC_INLINE_IN_2_64 -GLIB_AVAILABLE_STATIC_INLINE_IN_2_66 -GLIB_AVAILABLE_STATIC_INLINE_IN_2_68 -GLIB_AVAILABLE_STATIC_INLINE_IN_2_70 -GLIB_AVAILABLE_STATIC_INLINE_IN_2_72 -GLIB_AVAILABLE_STATIC_INLINE_IN_2_74 -GLIB_AVAILABLE_TYPE_IN_2_26 -GLIB_AVAILABLE_TYPE_IN_2_28 -GLIB_AVAILABLE_TYPE_IN_2_30 -GLIB_AVAILABLE_TYPE_IN_2_32 -GLIB_AVAILABLE_TYPE_IN_2_34 -GLIB_AVAILABLE_TYPE_IN_2_36 -GLIB_AVAILABLE_TYPE_IN_2_38 -GLIB_AVAILABLE_TYPE_IN_2_40 -GLIB_AVAILABLE_TYPE_IN_2_42 -GLIB_AVAILABLE_TYPE_IN_2_44 -GLIB_AVAILABLE_TYPE_IN_2_46 -GLIB_AVAILABLE_TYPE_IN_2_48 -GLIB_AVAILABLE_TYPE_IN_2_50 -GLIB_AVAILABLE_TYPE_IN_2_52 -GLIB_AVAILABLE_TYPE_IN_2_54 -GLIB_AVAILABLE_TYPE_IN_2_56 -GLIB_AVAILABLE_TYPE_IN_2_58 -GLIB_AVAILABLE_TYPE_IN_2_60 -GLIB_AVAILABLE_TYPE_IN_2_62 -GLIB_AVAILABLE_TYPE_IN_2_64 -GLIB_AVAILABLE_TYPE_IN_2_66 -GLIB_AVAILABLE_TYPE_IN_2_68 -GLIB_AVAILABLE_TYPE_IN_2_70 -GLIB_AVAILABLE_TYPE_IN_2_72 -GLIB_AVAILABLE_TYPE_IN_2_74 -GLIB_DEPRECATED_ENUMERATOR -GLIB_DEPRECATED_ENUMERATOR_FOR -GLIB_DEPRECATED_ENUMERATOR_IN_2_26 -GLIB_DEPRECATED_ENUMERATOR_IN_2_26_FOR -GLIB_DEPRECATED_ENUMERATOR_IN_2_28 -GLIB_DEPRECATED_ENUMERATOR_IN_2_28_FOR -GLIB_DEPRECATED_ENUMERATOR_IN_2_30 -GLIB_DEPRECATED_ENUMERATOR_IN_2_30_FOR -GLIB_DEPRECATED_ENUMERATOR_IN_2_32 -GLIB_DEPRECATED_ENUMERATOR_IN_2_32_FOR -GLIB_DEPRECATED_ENUMERATOR_IN_2_34 -GLIB_DEPRECATED_ENUMERATOR_IN_2_34_FOR -GLIB_DEPRECATED_ENUMERATOR_IN_2_36 -GLIB_DEPRECATED_ENUMERATOR_IN_2_36_FOR -GLIB_DEPRECATED_ENUMERATOR_IN_2_38 -GLIB_DEPRECATED_ENUMERATOR_IN_2_38_FOR -GLIB_DEPRECATED_ENUMERATOR_IN_2_40 -GLIB_DEPRECATED_ENUMERATOR_IN_2_40_FOR -GLIB_DEPRECATED_ENUMERATOR_IN_2_42 -GLIB_DEPRECATED_ENUMERATOR_IN_2_42_FOR -GLIB_DEPRECATED_ENUMERATOR_IN_2_44 -GLIB_DEPRECATED_ENUMERATOR_IN_2_44_FOR -GLIB_DEPRECATED_ENUMERATOR_IN_2_46 -GLIB_DEPRECATED_ENUMERATOR_IN_2_46_FOR -GLIB_DEPRECATED_ENUMERATOR_IN_2_48 -GLIB_DEPRECATED_ENUMERATOR_IN_2_48_FOR -GLIB_DEPRECATED_ENUMERATOR_IN_2_50 -GLIB_DEPRECATED_ENUMERATOR_IN_2_50_FOR -GLIB_DEPRECATED_ENUMERATOR_IN_2_52 -GLIB_DEPRECATED_ENUMERATOR_IN_2_52_FOR -GLIB_DEPRECATED_ENUMERATOR_IN_2_54 -GLIB_DEPRECATED_ENUMERATOR_IN_2_54_FOR -GLIB_DEPRECATED_ENUMERATOR_IN_2_56 -GLIB_DEPRECATED_ENUMERATOR_IN_2_56_FOR -GLIB_DEPRECATED_ENUMERATOR_IN_2_58 -GLIB_DEPRECATED_ENUMERATOR_IN_2_58_FOR -GLIB_DEPRECATED_ENUMERATOR_IN_2_60 -GLIB_DEPRECATED_ENUMERATOR_IN_2_60_FOR -GLIB_DEPRECATED_ENUMERATOR_IN_2_62 -GLIB_DEPRECATED_ENUMERATOR_IN_2_62_FOR -GLIB_DEPRECATED_ENUMERATOR_IN_2_64 -GLIB_DEPRECATED_ENUMERATOR_IN_2_64_FOR -GLIB_DEPRECATED_ENUMERATOR_IN_2_66 -GLIB_DEPRECATED_ENUMERATOR_IN_2_66_FOR -GLIB_DEPRECATED_ENUMERATOR_IN_2_68 -GLIB_DEPRECATED_ENUMERATOR_IN_2_68_FOR -GLIB_DEPRECATED_ENUMERATOR_IN_2_70 -GLIB_DEPRECATED_ENUMERATOR_IN_2_70_FOR -GLIB_DEPRECATED_ENUMERATOR_IN_2_72 -GLIB_DEPRECATED_ENUMERATOR_IN_2_72_FOR -GLIB_DEPRECATED_ENUMERATOR_IN_2_74 -GLIB_DEPRECATED_ENUMERATOR_IN_2_74_FOR -GLIB_DEPRECATED_IN_2_26 -GLIB_DEPRECATED_IN_2_26_FOR -GLIB_DEPRECATED_IN_2_28 -GLIB_DEPRECATED_IN_2_28_FOR -GLIB_DEPRECATED_IN_2_30 -GLIB_DEPRECATED_IN_2_30_FOR -GLIB_DEPRECATED_IN_2_32 -GLIB_DEPRECATED_IN_2_32_FOR -GLIB_DEPRECATED_IN_2_34 -GLIB_DEPRECATED_IN_2_34_FOR -GLIB_DEPRECATED_IN_2_36 -GLIB_DEPRECATED_IN_2_36_FOR -GLIB_DEPRECATED_IN_2_38 -GLIB_DEPRECATED_IN_2_38_FOR -GLIB_DEPRECATED_IN_2_40 -GLIB_DEPRECATED_IN_2_40_FOR -GLIB_DEPRECATED_IN_2_42 -GLIB_DEPRECATED_IN_2_42_FOR -GLIB_DEPRECATED_IN_2_44 -GLIB_DEPRECATED_IN_2_44_FOR -GLIB_DEPRECATED_IN_2_46 -GLIB_DEPRECATED_IN_2_46_FOR -GLIB_DEPRECATED_IN_2_48 -GLIB_DEPRECATED_IN_2_48_FOR -GLIB_DEPRECATED_IN_2_50 -GLIB_DEPRECATED_IN_2_50_FOR -GLIB_DEPRECATED_IN_2_52 -GLIB_DEPRECATED_IN_2_52_FOR -GLIB_DEPRECATED_IN_2_54 -GLIB_DEPRECATED_IN_2_54_FOR -GLIB_DEPRECATED_IN_2_56 -GLIB_DEPRECATED_IN_2_56_FOR -GLIB_DEPRECATED_IN_2_58 -GLIB_DEPRECATED_IN_2_58_FOR -GLIB_DEPRECATED_IN_2_60 -GLIB_DEPRECATED_IN_2_60_FOR -GLIB_DEPRECATED_IN_2_62 -GLIB_DEPRECATED_IN_2_62_FOR -GLIB_DEPRECATED_IN_2_64 -GLIB_DEPRECATED_IN_2_64_FOR -GLIB_DEPRECATED_IN_2_66 -GLIB_DEPRECATED_IN_2_66_FOR -GLIB_DEPRECATED_IN_2_68 -GLIB_DEPRECATED_IN_2_68_FOR -GLIB_DEPRECATED_IN_2_70 -GLIB_DEPRECATED_IN_2_70_FOR -GLIB_DEPRECATED_IN_2_72 -GLIB_DEPRECATED_IN_2_72_FOR -GLIB_DEPRECATED_IN_2_74 -GLIB_DEPRECATED_IN_2_74_FOR -GLIB_DEPRECATED_MACRO -GLIB_DEPRECATED_MACRO_FOR -GLIB_DEPRECATED_MACRO_IN_2_26 -GLIB_DEPRECATED_MACRO_IN_2_26_FOR -GLIB_DEPRECATED_MACRO_IN_2_28 -GLIB_DEPRECATED_MACRO_IN_2_28_FOR -GLIB_DEPRECATED_MACRO_IN_2_30 -GLIB_DEPRECATED_MACRO_IN_2_30_FOR -GLIB_DEPRECATED_MACRO_IN_2_32 -GLIB_DEPRECATED_MACRO_IN_2_32_FOR -GLIB_DEPRECATED_MACRO_IN_2_34 -GLIB_DEPRECATED_MACRO_IN_2_34_FOR -GLIB_DEPRECATED_MACRO_IN_2_36 -GLIB_DEPRECATED_MACRO_IN_2_36_FOR -GLIB_DEPRECATED_MACRO_IN_2_38 -GLIB_DEPRECATED_MACRO_IN_2_38_FOR -GLIB_DEPRECATED_MACRO_IN_2_40 -GLIB_DEPRECATED_MACRO_IN_2_40_FOR -GLIB_DEPRECATED_MACRO_IN_2_42 -GLIB_DEPRECATED_MACRO_IN_2_42_FOR -GLIB_DEPRECATED_MACRO_IN_2_44 -GLIB_DEPRECATED_MACRO_IN_2_44_FOR -GLIB_DEPRECATED_MACRO_IN_2_46 -GLIB_DEPRECATED_MACRO_IN_2_46_FOR -GLIB_DEPRECATED_MACRO_IN_2_48 -GLIB_DEPRECATED_MACRO_IN_2_48_FOR -GLIB_DEPRECATED_MACRO_IN_2_50 -GLIB_DEPRECATED_MACRO_IN_2_50_FOR -GLIB_DEPRECATED_MACRO_IN_2_52 -GLIB_DEPRECATED_MACRO_IN_2_52_FOR -GLIB_DEPRECATED_MACRO_IN_2_54 -GLIB_DEPRECATED_MACRO_IN_2_54_FOR -GLIB_DEPRECATED_MACRO_IN_2_56 -GLIB_DEPRECATED_MACRO_IN_2_56_FOR -GLIB_DEPRECATED_MACRO_IN_2_58 -GLIB_DEPRECATED_MACRO_IN_2_58_FOR -GLIB_DEPRECATED_MACRO_IN_2_60 -GLIB_DEPRECATED_MACRO_IN_2_60_FOR -GLIB_DEPRECATED_MACRO_IN_2_62 -GLIB_DEPRECATED_MACRO_IN_2_62_FOR -GLIB_DEPRECATED_MACRO_IN_2_64 -GLIB_DEPRECATED_MACRO_IN_2_64_FOR -GLIB_DEPRECATED_MACRO_IN_2_66 -GLIB_DEPRECATED_MACRO_IN_2_66_FOR -GLIB_DEPRECATED_MACRO_IN_2_68 -GLIB_DEPRECATED_MACRO_IN_2_68_FOR -GLIB_DEPRECATED_MACRO_IN_2_70 -GLIB_DEPRECATED_MACRO_IN_2_70_FOR -GLIB_DEPRECATED_MACRO_IN_2_72 -GLIB_DEPRECATED_MACRO_IN_2_72_FOR -GLIB_DEPRECATED_MACRO_IN_2_74 -GLIB_DEPRECATED_MACRO_IN_2_74_FOR -GLIB_DEPRECATED_TYPE -GLIB_DEPRECATED_TYPE_FOR -GLIB_DEPRECATED_TYPE_IN_2_26 -GLIB_DEPRECATED_TYPE_IN_2_26_FOR -GLIB_DEPRECATED_TYPE_IN_2_28 -GLIB_DEPRECATED_TYPE_IN_2_28_FOR -GLIB_DEPRECATED_TYPE_IN_2_30 -GLIB_DEPRECATED_TYPE_IN_2_30_FOR -GLIB_DEPRECATED_TYPE_IN_2_32 -GLIB_DEPRECATED_TYPE_IN_2_32_FOR -GLIB_DEPRECATED_TYPE_IN_2_34 -GLIB_DEPRECATED_TYPE_IN_2_34_FOR -GLIB_DEPRECATED_TYPE_IN_2_36 -GLIB_DEPRECATED_TYPE_IN_2_36_FOR -GLIB_DEPRECATED_TYPE_IN_2_38 -GLIB_DEPRECATED_TYPE_IN_2_38_FOR -GLIB_DEPRECATED_TYPE_IN_2_40 -GLIB_DEPRECATED_TYPE_IN_2_40_FOR -GLIB_DEPRECATED_TYPE_IN_2_42 -GLIB_DEPRECATED_TYPE_IN_2_42_FOR -GLIB_DEPRECATED_TYPE_IN_2_44 -GLIB_DEPRECATED_TYPE_IN_2_44_FOR -GLIB_DEPRECATED_TYPE_IN_2_46 -GLIB_DEPRECATED_TYPE_IN_2_46_FOR -GLIB_DEPRECATED_TYPE_IN_2_48 -GLIB_DEPRECATED_TYPE_IN_2_48_FOR -GLIB_DEPRECATED_TYPE_IN_2_50 -GLIB_DEPRECATED_TYPE_IN_2_50_FOR -GLIB_DEPRECATED_TYPE_IN_2_52 -GLIB_DEPRECATED_TYPE_IN_2_52_FOR -GLIB_DEPRECATED_TYPE_IN_2_54 -GLIB_DEPRECATED_TYPE_IN_2_54_FOR -GLIB_DEPRECATED_TYPE_IN_2_56 -GLIB_DEPRECATED_TYPE_IN_2_56_FOR -GLIB_DEPRECATED_TYPE_IN_2_58 -GLIB_DEPRECATED_TYPE_IN_2_58_FOR -GLIB_DEPRECATED_TYPE_IN_2_60 -GLIB_DEPRECATED_TYPE_IN_2_60_FOR -GLIB_DEPRECATED_TYPE_IN_2_62 -GLIB_DEPRECATED_TYPE_IN_2_62_FOR -GLIB_DEPRECATED_TYPE_IN_2_64 -GLIB_DEPRECATED_TYPE_IN_2_64_FOR -GLIB_DEPRECATED_TYPE_IN_2_66 -GLIB_DEPRECATED_TYPE_IN_2_66_FOR -GLIB_DEPRECATED_TYPE_IN_2_68 -GLIB_DEPRECATED_TYPE_IN_2_68_FOR -GLIB_DEPRECATED_TYPE_IN_2_70 -GLIB_DEPRECATED_TYPE_IN_2_70_FOR -GLIB_DEPRECATED_TYPE_IN_2_72 -GLIB_DEPRECATED_TYPE_IN_2_72_FOR -GLIB_DEPRECATED_TYPE_IN_2_74 -GLIB_DEPRECATED_TYPE_IN_2_74_FOR -GLIB_VERSION_CUR_STABLE -GLIB_VERSION_PREV_STABLE -</SECTION> - -<SECTION> -<TITLE>Standard Macros</TITLE> -<FILE>macros</FILE> -<SUBSECTION> -G_OS_WIN32 -G_OS_UNIX - -<SUBSECTION> -G_DIR_SEPARATOR -G_DIR_SEPARATOR_S -G_IS_DIR_SEPARATOR -G_SEARCHPATH_SEPARATOR -G_SEARCHPATH_SEPARATOR_S - -<SUBSECTION> -TRUE -FALSE - -<SUBSECTION> -NULL - -<SUBSECTION> -MIN -MAX - -<SUBSECTION> -ABS -CLAMP -G_APPROX_VALUE - -<SUBSECTION> -G_SIZEOF_MEMBER -G_STRUCT_MEMBER -G_STRUCT_MEMBER_P -G_STRUCT_OFFSET - -<SUBSECTION> -G_MEM_ALIGN - -<SUBSECTION> -G_ALIGNOF - -<SUBSECTION> -G_CONST_RETURN -G_NORETURN -G_NORETURN_FUNCPTR - -<SUBSECTION> -G_ALWAYS_INLINE -G_NO_INLINE - -<SUBSECTION> -G_N_ELEMENTS -</SECTION> - -<SECTION> -<TITLE>Type Conversion Macros</TITLE> -<FILE>type_conversion</FILE> -GINT_TO_POINTER -GPOINTER_TO_INT - -<SUBSECTION> -GUINT_TO_POINTER -GPOINTER_TO_UINT -GSIZE_TO_POINTER -GPOINTER_TO_SIZE -</SECTION> - -<SECTION> -<TITLE>Byte Order Macros</TITLE> -<FILE>byte_order</FILE> -G_BYTE_ORDER -G_LITTLE_ENDIAN -G_BIG_ENDIAN -G_PDP_ENDIAN - -<SUBSECTION> -g_htonl -g_htons -g_ntohl -g_ntohs - -<SUBSECTION> -GINT_FROM_BE -GINT_FROM_LE -GINT_TO_BE -GINT_TO_LE - -<SUBSECTION> -GUINT_FROM_BE -GUINT_FROM_LE -GUINT_TO_BE -GUINT_TO_LE - -<SUBSECTION> -GLONG_FROM_BE -GLONG_FROM_LE -GLONG_TO_BE -GLONG_TO_LE - -<SUBSECTION> -GULONG_FROM_BE -GULONG_FROM_LE -GULONG_TO_BE -GULONG_TO_LE - -<SUBSECTION> -GSIZE_FROM_BE -GSIZE_FROM_LE -GSIZE_TO_BE -GSIZE_TO_LE - -<SUBSECTION> -GSSIZE_FROM_BE -GSSIZE_FROM_LE -GSSIZE_TO_BE -GSSIZE_TO_LE - -<SUBSECTION> -GINT16_FROM_BE -GINT16_FROM_LE -GINT16_TO_BE -GINT16_TO_LE - -<SUBSECTION> -GUINT16_FROM_BE -GUINT16_FROM_LE -GUINT16_TO_BE -GUINT16_TO_LE - -<SUBSECTION> -GINT32_FROM_BE -GINT32_FROM_LE -GINT32_TO_BE -GINT32_TO_LE - -<SUBSECTION> -GUINT32_FROM_BE -GUINT32_FROM_LE -GUINT32_TO_BE -GUINT32_TO_LE - -<SUBSECTION> -GINT64_FROM_BE -GINT64_FROM_LE -GINT64_TO_BE -GINT64_TO_LE - -<SUBSECTION> -GUINT64_FROM_BE -GUINT64_FROM_LE -GUINT64_TO_BE -GUINT64_TO_LE - -<SUBSECTION> -GUINT16_SWAP_BE_PDP -GUINT16_SWAP_LE_BE -GUINT16_SWAP_LE_PDP - -<SUBSECTION> -GUINT32_SWAP_BE_PDP -GUINT32_SWAP_LE_BE -GUINT32_SWAP_LE_PDP - -<SUBSECTION> -GUINT64_SWAP_LE_BE - -<SUBSECTION Private> -GUINT16_SWAP_LE_BE_CONSTANT -GUINT32_SWAP_LE_BE_CONSTANT -GUINT64_SWAP_LE_BE_CONSTANT -GUINT16_SWAP_LE_BE_IA32 -GUINT32_SWAP_LE_BE_IA32 -GUINT64_SWAP_LE_BE_IA32 -GUINT16_SWAP_LE_BE_IA64 -GUINT32_SWAP_LE_BE_IA64 -GUINT64_SWAP_LE_BE_IA64 -GUINT32_SWAP_LE_BE_X86_64 -GUINT64_SWAP_LE_BE_X86_64 - -</SECTION> - -<SECTION> -<TITLE>Bounds-checked integer arithmetic</TITLE> -<FILE>checkedmath</FILE> -g_uint_checked_add -g_uint_checked_mul -g_uint64_checked_add -g_uint64_checked_mul -g_size_checked_add -g_size_checked_mul -</SECTION> - -<SECTION> -<TITLE>Numerical Definitions</TITLE> -<FILE>numerical</FILE> -G_IEEE754_FLOAT_BIAS -G_IEEE754_DOUBLE_BIAS -GFloatIEEE754 -GDoubleIEEE754 - -<SUBSECTION> -G_E -G_LN2 -G_LN10 -G_PI -G_PI_2 -G_PI_4 -G_SQRT2 -G_LOG_2_BASE_10 -</SECTION> - -<SECTION> -<TITLE>Miscellaneous Macros</TITLE> -<FILE>macros_misc</FILE> -G_INLINE_FUNC - -<SUBSECTION> -g_auto -g_autoptr -g_autofree -g_autolist -g_autoslist -g_autoqueue -G_DEFINE_AUTOPTR_CLEANUP_FUNC -G_DEFINE_AUTO_CLEANUP_CLEAR_FUNC -G_DEFINE_AUTO_CLEANUP_FREE_FUNC - -<SUBSECTION> -G_STMT_START -G_STMT_END - -<SUBSECTION> -G_BEGIN_DECLS -G_END_DECLS - -<SUBSECTION> -G_VA_COPY - -<SUBSECTION> -G_STRINGIFY -G_PASTE -G_STATIC_ASSERT -G_STATIC_ASSERT_EXPR - -<SUBSECTION> -G_GNUC_CHECK_VERSION -G_GNUC_EXTENSION -G_GNUC_CONST -G_GNUC_PURE -G_GNUC_MALLOC -G_GNUC_ALLOC_SIZE -G_GNUC_ALLOC_SIZE2 -G_GNUC_DEPRECATED -G_GNUC_DEPRECATED_FOR -G_GNUC_BEGIN_IGNORE_DEPRECATIONS -G_GNUC_END_IGNORE_DEPRECATIONS -G_GNUC_NORETURN -G_GNUC_FALLTHROUGH -G_GNUC_UNUSED -G_GNUC_PRINTF -G_GNUC_SCANF -G_GNUC_STRFTIME -G_GNUC_FORMAT -G_GNUC_NULL_TERMINATED -G_GNUC_WARN_UNUSED_RESULT -G_GNUC_FUNCTION -G_GNUC_PRETTY_FUNCTION -G_GNUC_NO_INLINE -G_GNUC_NO_INSTRUMENT -G_HAVE_GNUC_VISIBILITY -G_GNUC_INTERNAL -G_GNUC_MAY_ALIAS - -<SUBSECTION> -G_DEPRECATED -G_DEPRECATED_FOR -G_UNAVAILABLE - -<SUBSECTION> -G_LIKELY -G_UNLIKELY - -<SUBSECTION> -G_STRLOC -G_STRFUNC - -<SUBSECTION Private> -GLIB_VAR -G_STRINGIFY_ARG -G_PASTE_ARGS -G_HAVE_INLINE -G_CAN_INLINE -inline -G_HAVE___INLINE -G_HAVE___INLINE__ -G_INLINE_DEFINE_NEEDED -G_HAVE_GNUC_VARARGS -G_HAVE_ISO_VARARGS -G_HAVE_GROWING_STACK -G_VA_COPY_AS_ARRAY -GLIB_CANNOT_IGNORE_DEPRECATIONS -GLIB_DEPRECATED -GLIB_DEPRECATED_FOR -GLIB_UNAVAILABLE -GLIB_UNAVAILABLE_ENUMERATOR -GLIB_UNAVAILABLE_MACRO -GLIB_UNAVAILABLE_STATIC_INLINE -GLIB_UNAVAILABLE_TYPE -G_ANALYZER_ANALYZING -G_ANALYZER_NORETURN -g_autoptr_cleanup_generic_gfree -glib_typeof -g_macro__has_attribute -g_macro__has_builtin -g_macro__has_feature -g_macro__has_extension -g_macro__has_attribute___always_inline__ -g_macro__has_attribute___alloc_size__ -g_macro__has_attribute___const__ -g_macro__has_attribute___deprecated__ -g_macro__has_attribute___format__ -g_macro__has_attribute___format_arg__ -g_macro__has_attribute___malloc__ -g_macro__has_attribute___no_instrument_function__ -g_macro__has_attribute___noreturn__ -g_macro__has_attribute___pure__ -g_macro__has_attribute___sentinel__ -g_macro__has_attribute___unused__ -g_macro__has_attribute_fallthrough -g_macro__has_attribute_may_alias -g_macro__has_attribute___noinline__ -g_macro__has_attribute_warn_unused_result -g_macro__has_attribute_cleanup -</SECTION> - -<SECTION> -<TITLE>Error Reporting</TITLE> -<FILE>error_reporting</FILE> -GError -g_error_new -g_error_new_literal -g_error_new_valist -g_error_free -g_error_copy -g_error_matches -g_set_error -g_set_error_literal -g_propagate_error -g_clear_error -g_prefix_error -g_prefix_error_literal -g_propagate_prefixed_error -<SUBSECTION> -GErrorInitFunc -GErrorCopyFunc -GErrorClearFunc -G_DEFINE_EXTENDED_ERROR -g_error_domain_register_static -g_error_domain_register -</SECTION> - -<SECTION> -<TITLE>The Main Event Loop</TITLE> -<FILE>main</FILE> -GMainLoop -g_main_loop_new -g_main_loop_ref -g_main_loop_unref -g_main_loop_run -g_main_loop_quit -g_main_loop_is_running -g_main_loop_get_context -g_main_new -g_main_destroy -g_main_run -g_main_quit -g_main_is_running - -<SUBSECTION> -G_PRIORITY_HIGH -G_PRIORITY_DEFAULT -G_PRIORITY_HIGH_IDLE -G_PRIORITY_DEFAULT_IDLE -G_PRIORITY_LOW - -<SUBSECTION> -G_SOURCE_CONTINUE -G_SOURCE_REMOVE - -<SUBSECTION> -GMainContext -GMainContextFlags -g_main_context_new -g_main_context_new_with_flags -g_main_context_ref -g_main_context_unref -g_main_context_default -g_main_context_iteration -g_main_iteration -g_main_context_pending -g_main_pending -g_main_context_find_source_by_id -g_main_context_find_source_by_user_data -g_main_context_find_source_by_funcs_user_data -g_main_context_wakeup -g_main_context_acquire -g_main_context_release -g_main_context_is_owner -g_main_context_wait -g_main_context_prepare -g_main_context_query -g_main_context_check -g_main_context_dispatch -g_main_context_set_poll_func -g_main_context_get_poll_func -GPollFunc -g_main_context_add_poll -g_main_context_remove_poll -g_main_depth -g_main_current_source -g_main_set_poll_func -g_main_context_invoke -g_main_context_invoke_full - -<SUBSECTION> -GMainContextPusher -g_main_context_pusher_new -g_main_context_pusher_free - -<SUBSECTION> -g_main_context_get_thread_default -g_main_context_ref_thread_default -g_main_context_push_thread_default -g_main_context_pop_thread_default - -<SUBSECTION> -g_timeout_source_new -g_timeout_source_new_seconds -g_timeout_add -g_timeout_add_once -g_timeout_add_full -g_timeout_add_seconds -g_timeout_add_seconds_full - -<SUBSECTION> -g_idle_source_new -g_idle_add -g_idle_add_once -g_idle_add_full -g_idle_remove_by_data - -<SUBSECTION> -GPid -G_PID_FORMAT -GChildWatchFunc -g_child_watch_source_new -g_child_watch_add -g_child_watch_add_full - -<SUBSECTION> -GPollFD -g_poll -G_POLLFD_FORMAT - -<SUBSECTION> -GSource -GSourceDummyMarshal -GSourceFuncs -GSourceDisposeFunc -GSourceCallbackFuncs -g_source_new -g_source_ref -g_source_unref -g_source_set_funcs -g_source_set_dispose_function -g_source_attach -g_source_destroy -g_source_is_destroyed -g_source_set_priority -g_source_get_priority -g_source_set_can_recurse -g_source_get_can_recurse -g_source_get_id -g_source_get_name -g_source_set_name -g_source_set_static_name -g_source_set_name_by_id -g_source_get_context -g_source_set_callback -GSourceFunc -G_SOURCE_FUNC -GSourceOnceFunc -g_source_set_callback_indirect -g_source_set_ready_time -g_source_get_ready_time -g_source_add_unix_fd -g_source_remove_unix_fd -g_source_modify_unix_fd -g_source_query_unix_fd -g_source_add_poll -g_source_remove_poll -g_source_add_child_source -g_source_remove_child_source -g_source_get_time -g_source_get_current_time -g_source_remove -g_source_remove_by_funcs_user_data -g_source_remove_by_user_data -GClearHandleFunc -g_clear_handle_id - -<SUBSECTION> -g_steal_fd - -<SUBSECTION Private> -GLIB_HAVE_ALLOCA_H -alloca -GLIB_USING_SYSTEM_PRINTF -GLIB_SYSDEF_POLLERR -GLIB_SYSDEF_POLLHUP -GLIB_SYSDEF_POLLIN -GLIB_SYSDEF_POLLNVAL -GLIB_SYSDEF_POLLOUT -GLIB_SYSDEF_POLLPRI -GLIB_SYSDEF_AF_INET -GLIB_SYSDEF_AF_INET6 -GLIB_SYSDEF_AF_UNIX -GLIB_SYSDEF_MSG_DONTROUTE -GLIB_SYSDEF_MSG_OOB -GLIB_SYSDEF_MSG_PEEK -G_WIN32_MSG_HANDLE -g_idle_funcs -g_timeout_funcs -g_child_watch_funcs -g_unix_signal_funcs -g_unix_fd_source_funcs -GSourcePrivate -</SECTION> - - -<SECTION> -<TITLE>Threads</TITLE> -<FILE>threads</FILE> -<SUBSECTION> -G_THREAD_ERROR -GThreadError - -<SUBSECTION> -GThread -GThreadFunc -g_thread_new -g_thread_try_new -g_thread_ref -g_thread_unref -g_thread_join -g_thread_yield -g_thread_exit -g_thread_self - -<SUBSECTION> -GMutex -g_mutex_init -g_mutex_clear -g_mutex_lock -g_mutex_trylock -g_mutex_unlock - -<SUBSECTION> -GMutexLocker -g_mutex_locker_new -g_mutex_locker_free - -<SUBSECTION> -G_LOCK_DEFINE -G_LOCK_DEFINE_STATIC -G_LOCK_EXTERN -G_LOCK -G_TRYLOCK -G_UNLOCK - -<SUBSECTION> -GRecMutex -g_rec_mutex_init -g_rec_mutex_clear -g_rec_mutex_lock -g_rec_mutex_trylock -g_rec_mutex_unlock - -<SUBSECTION> -GRecMutexLocker -g_rec_mutex_locker_new -g_rec_mutex_locker_free - -<SUBSECTION> -GRWLockWriterLocker -g_rw_lock_writer_locker_new -g_rw_lock_writer_locker_free - -<SUBSECTION> -GRWLockReaderLocker -g_rw_lock_reader_locker_new -g_rw_lock_reader_locker_free - -<SUBSECTION> -GRWLock -g_rw_lock_init -g_rw_lock_clear -g_rw_lock_writer_lock -g_rw_lock_writer_trylock -g_rw_lock_writer_unlock -g_rw_lock_reader_lock -g_rw_lock_reader_trylock -g_rw_lock_reader_unlock - -<SUBSECTION> -GCond -g_cond_init -g_cond_clear -g_cond_wait -g_cond_timed_wait -g_cond_wait_until -g_cond_signal -g_cond_broadcast - -<SUBSECTION> -GPrivate -G_PRIVATE_INIT -g_private_get -g_private_set -g_private_replace - -<SUBSECTION> -GOnce -GOnceStatus -G_ONCE_INIT -g_once -g_once_init_enter -g_once_init_leave - -<SUBSECTION> -g_bit_lock -g_bit_trylock -g_bit_unlock -g_pointer_bit_lock -g_pointer_bit_trylock -g_pointer_bit_unlock - -<SUBSECTION> -g_get_num_processors - -<SUBSECTION Private> -G_LOCK_NAME -atexit -g_thread_error_quark -g_once_impl -</SECTION> - -<SECTION> -<TITLE>Deprecated Thread APIs</TITLE> -<FILE>threads-deprecated</FILE> - -<SUBSECTION> -G_THREADS_IMPL_POSIX -G_THREADS_IMPL_WIN32 - -<SUBSECTION> -g_thread_init -g_thread_supported -g_thread_get_initialized - -<SUBSECTION> -g_thread_create -g_thread_create_full -GThreadPriority -g_thread_set_priority -g_thread_foreach - -<SUBSECTION> -g_mutex_new -g_mutex_free -g_cond_new -g_cond_free -g_private_new - -<SUBSECTION> -GStaticMutex -G_STATIC_MUTEX_INIT -g_static_mutex_init -g_static_mutex_lock -g_static_mutex_trylock -g_static_mutex_unlock -g_static_mutex_get_mutex -g_static_mutex_free - -<SUBSECTION> -GStaticRecMutex -G_STATIC_REC_MUTEX_INIT -g_static_rec_mutex_init -g_static_rec_mutex_lock -g_static_rec_mutex_trylock -g_static_rec_mutex_unlock -g_static_rec_mutex_lock_full -g_static_rec_mutex_unlock_full -g_static_rec_mutex_free - -<SUBSECTION> -GStaticRWLock -G_STATIC_RW_LOCK_INIT -g_static_rw_lock_init -g_static_rw_lock_reader_lock -g_static_rw_lock_reader_trylock -g_static_rw_lock_reader_unlock -g_static_rw_lock_writer_lock -g_static_rw_lock_writer_trylock -g_static_rw_lock_writer_unlock -g_static_rw_lock_free - -<SUBSECTION> -GStaticPrivate -G_STATIC_PRIVATE_INIT -g_static_private_init -g_static_private_get -g_static_private_set -g_static_private_free - -<SUBSECTION Private> -GThreadFunctions -g_thread_init_with_errorcheck_mutexes -G_THREADS_ENABLED -g_static_mutex_get_mutex_impl -g_thread_use_default_impl -g_threads_got_initialized -g_thread_functions_for_glib_use -g_thread_gettime -g_once_init_enter_impl -</SECTION> - -<SECTION> -<TITLE>Thread Pools</TITLE> -<FILE>thread_pools</FILE> -GThreadPool -g_thread_pool_new -g_thread_pool_new_full -g_thread_pool_push -g_thread_pool_set_max_threads -g_thread_pool_get_max_threads -g_thread_pool_get_num_threads -g_thread_pool_unprocessed -g_thread_pool_free -g_thread_pool_set_max_unused_threads -g_thread_pool_get_max_unused_threads -g_thread_pool_get_num_unused_threads -g_thread_pool_stop_unused_threads -g_thread_pool_set_sort_function -g_thread_pool_set_max_idle_time -g_thread_pool_get_max_idle_time -g_thread_pool_move_to_front -</SECTION> - -<SECTION> -<TITLE>Asynchronous Queues</TITLE> -<FILE>async_queues</FILE> -GAsyncQueue -g_async_queue_new -g_async_queue_new_full -g_async_queue_ref -g_async_queue_unref -g_async_queue_push -g_async_queue_push_sorted -g_async_queue_push_front -g_async_queue_remove -g_async_queue_pop -g_async_queue_try_pop -g_async_queue_timeout_pop -g_async_queue_length -g_async_queue_sort - -<SUBSECTION> -g_async_queue_lock -g_async_queue_unlock -g_async_queue_ref_unlocked -g_async_queue_unref_and_unlock -g_async_queue_push_unlocked -g_async_queue_push_sorted_unlocked -g_async_queue_push_front_unlocked -g_async_queue_remove_unlocked -g_async_queue_pop_unlocked -g_async_queue_try_pop_unlocked -g_async_queue_timeout_pop_unlocked -g_async_queue_length_unlocked -g_async_queue_sort_unlocked - -<SUBSECTION> -g_async_queue_timed_pop -g_async_queue_timed_pop_unlocked -</SECTION> - -<SECTION> -<TITLE>Atomic Operations</TITLE> -<FILE>atomic_operations</FILE> -G_ATOMIC_LOCK_FREE - -<SUBSECTION> -g_atomic_int_get -g_atomic_int_set -g_atomic_int_inc -g_atomic_int_dec_and_test -g_atomic_int_compare_and_exchange -g_atomic_int_compare_and_exchange_full -g_atomic_int_exchange -g_atomic_int_add -g_atomic_int_and -g_atomic_int_or -g_atomic_int_xor - -<SUBSECTION> -g_atomic_pointer_get -g_atomic_pointer_set -g_atomic_pointer_compare_and_exchange -g_atomic_pointer_compare_and_exchange_full -g_atomic_pointer_exchange -g_atomic_pointer_add -g_atomic_pointer_and -g_atomic_pointer_or -g_atomic_pointer_xor - -<SUBSECTION> -g_atomic_int_exchange_and_add -</SECTION> - -<SECTION> -<TITLE>IO Channels</TITLE> -<FILE>iochannels</FILE> -GIOChannel - -<SUBSECTION> -g_io_channel_unix_new -g_io_channel_unix_get_fd -g_io_channel_win32_new_fd -g_io_channel_win32_new_socket -g_io_channel_win32_new_messages - -<SUBSECTION> -g_io_channel_init - -<SUBSECTION> -g_io_channel_new_file -g_io_channel_read_chars -g_io_channel_read_unichar -g_io_channel_read_line -g_io_channel_read_line_string -g_io_channel_read_to_end -g_io_channel_write_chars -g_io_channel_write_unichar -g_io_channel_flush -g_io_channel_seek_position -GSeekType -g_io_channel_shutdown - -<SUBSECTION> -GIOStatus -GIOChannelError -G_IO_CHANNEL_ERROR -g_io_channel_error_from_errno - -<SUBSECTION> -g_io_channel_ref -g_io_channel_unref - -<SUBSECTION> -g_io_create_watch -g_io_add_watch -g_io_add_watch_full -GIOCondition -GIOFunc - -<SUBSECTION> -GIOFuncs - -<SUBSECTION> -g_io_channel_get_buffer_size -g_io_channel_set_buffer_size -g_io_channel_get_buffer_condition -g_io_channel_get_flags -g_io_channel_set_flags -GIOFlags -g_io_channel_get_line_term -g_io_channel_set_line_term -g_io_channel_get_buffered -g_io_channel_set_buffered -g_io_channel_get_encoding -g_io_channel_set_encoding -g_io_channel_get_close_on_unref -g_io_channel_set_close_on_unref - -<SUBSECTION> -g_io_channel_read -GIOError -g_io_channel_write -g_io_channel_seek -g_io_channel_close - -<SUBSECTION Private> -g_io_channel_win32_poll -g_io_channel_win32_make_pollfd -g_io_channel_win32_get_fd -g_io_channel_win32_new_stream_socket -g_io_channel_win32_set_debug -g_io_channel_error_quark -g_io_watch_funcs -G_IO_FLAG_IS_WRITEABLE -</SECTION> - -<SECTION> -<TITLE>Memory Allocation</TITLE> -<FILE>memory</FILE> -g_new -g_new0 -g_renew -g_try_new -g_try_new0 -g_try_renew - -<SUBSECTION> -g_malloc -g_malloc0 -g_realloc -g_try_malloc -g_try_malloc0 -g_try_realloc -g_malloc_n -g_malloc0_n -g_realloc_n -g_try_malloc_n -g_try_malloc0_n -g_try_realloc_n - -<SUBSECTION> -g_free -g_clear_pointer -g_steal_pointer -g_mem_gc_friendly - -<SUBSECTION> -g_alloca -g_alloca0 -g_newa -g_newa0 - -<SUBSECTION> -g_aligned_alloc -g_aligned_alloc0 -g_aligned_free - -<SUBSECTION> -g_memmove -g_memdup -g_memdup2 - -<SUBSECTION> -GMemVTable -g_mem_set_vtable -g_mem_is_system_malloc - -<SUBSECTION> -glib_mem_profiler_table -g_mem_profile -</SECTION> - -<SECTION> -<TITLE>Warnings and Assertions</TITLE> -<FILE>warnings</FILE> -g_print -g_set_print_handler -GPrintFunc - -<SUBSECTION> -g_printerr -g_set_printerr_handler - -<SUBSECTION> -g_return_if_fail -g_return_val_if_fail -g_return_if_reached -g_return_val_if_reached -g_warn_if_fail -g_warn_if_reached - -<SUBSECTION> -g_on_error_query -g_on_error_stack_trace - -<SUBSECTION> -G_BREAKPOINT - -<SUBSECTION Private> -g_return_if_fail_warning -g_assert_warning -g_warn_message -</SECTION> - -<SECTION> -<TITLE>Glob-style pattern matching</TITLE> -<FILE>patterns</FILE> -GPatternSpec -g_pattern_spec_new -g_pattern_spec_free -g_pattern_spec_equal -g_pattern_spec_copy -g_pattern_spec_match -g_pattern_spec_match_string -g_pattern_match -g_pattern_match_string -g_pattern_match_simple -</SECTION> - -<SECTION> -<TITLE>Perl-compatible regular expressions</TITLE> -<FILE>gregex</FILE> -GRegexError -G_REGEX_ERROR -GRegexCompileFlags -GRegexMatchFlags -GRegex -GRegexEvalCallback -g_regex_new -g_regex_ref -g_regex_unref -g_regex_get_pattern -g_regex_get_max_backref -g_regex_get_capture_count -g_regex_get_has_cr_or_lf -g_regex_get_max_lookbehind -g_regex_get_string_number -g_regex_get_compile_flags -g_regex_get_match_flags -g_regex_escape_string -g_regex_escape_nul -g_regex_match_simple -g_regex_match -g_regex_match_full -g_regex_match_all -g_regex_match_all_full -g_regex_split_simple -g_regex_split -g_regex_split_full -g_regex_replace -g_regex_replace_literal -g_regex_replace_eval -g_regex_check_replacement -GMatchInfo -g_match_info_get_regex -g_match_info_get_string -g_match_info_ref -g_match_info_unref -g_match_info_free -g_match_info_matches -g_match_info_next -g_match_info_get_match_count -g_match_info_is_partial_match -g_match_info_expand_references -g_match_info_fetch -g_match_info_fetch_pos -g_match_info_fetch_named -g_match_info_fetch_named_pos -g_match_info_fetch_all -<SUBSECTION Private> -g_regex_error_quark -</SECTION> - -<SECTION> -<TITLE>Message Logging</TITLE> -<FILE>messages</FILE> -G_LOG_DOMAIN -G_LOG_FATAL_MASK -G_LOG_LEVEL_USER_SHIFT -GLogFunc -GLogLevelFlags - -<SUBSECTION> -g_log -g_logv -g_message -g_warning -g_warning_once -g_critical -g_error -g_info -g_debug - -<SUBSECTION> -g_log_set_handler -g_log_set_handler_full -g_log_remove_handler -g_log_set_always_fatal -g_log_set_fatal_mask -g_log_default_handler -g_log_set_default_handler -g_log_get_debug_enabled -g_log_set_debug_enabled - -<SUBSECTION> -g_log_structured -g_log_variant -GLogField -g_log_structured_array -G_DEBUG_HERE - -<SUBSECTION> -GLogWriterOutput -GLogWriterFunc -g_log_set_writer_func -g_log_writer_supports_color -g_log_writer_is_journald -g_log_writer_format_fields -g_log_writer_journald -g_log_writer_standard_streams -g_log_writer_default -g_log_writer_default_set_use_stderr -g_log_writer_default_would_drop - -<SUBSECTION Private> -g_log_structured_standard -</SECTION> - -<SECTION> -<TITLE>Timers</TITLE> -<FILE>timers</FILE> -GTimer -g_timer_new -g_timer_start -g_timer_stop -g_timer_continue -g_timer_elapsed -g_timer_reset -g_timer_destroy -g_timer_is_active -</SECTION> - -<SECTION> -<TITLE>Spawning Processes</TITLE> -<FILE>spawn</FILE> -GSpawnError -G_SPAWN_ERROR -GSpawnFlags -GSpawnChildSetupFunc -g_spawn_async_with_fds -g_spawn_async_with_pipes -g_spawn_async_with_pipes_and_fds -g_spawn_async -g_spawn_sync -G_SPAWN_EXIT_ERROR -g_spawn_check_wait_status -g_spawn_check_exit_status -g_spawn_command_line_async -g_spawn_command_line_sync -g_spawn_close_pid -<SUBSECTION Private> -g_spawn_error_quark -g_spawn_exit_error_quark -</SECTION> - -<SECTION> -<TITLE>Simple XML Subset Parser</TITLE> -<FILE>markup</FILE> -GMarkupError -G_MARKUP_ERROR -GMarkupParseFlags -GMarkupParseContext -GMarkupParser -g_markup_escape_text -g_markup_printf_escaped -g_markup_vprintf_escaped -g_markup_parse_context_new -g_markup_parse_context_parse -g_markup_parse_context_end_parse -g_markup_parse_context_free -g_markup_parse_context_get_position -g_markup_parse_context_get_element -g_markup_parse_context_get_element_stack -g_markup_parse_context_get_user_data -g_markup_parse_context_push -g_markup_parse_context_pop -g_markup_parse_context_ref -g_markup_parse_context_unref -<SUBSECTION> -GMarkupCollectType -g_markup_collect_attributes -<SUBSECTION Private> -g_markup_error_quark -</SECTION> - - -<SECTION> -<TITLE>Shell-related Utilities</TITLE> -<FILE>shell</FILE> -GShellError -G_SHELL_ERROR -g_shell_parse_argv -g_shell_quote -g_shell_unquote -<SUBSECTION Private> -g_shell_error_quark -</SECTION> - - -<SECTION> -<TITLE>Commandline option parser</TITLE> -<FILE>option</FILE> -GOptionError -G_OPTION_ERROR -GOptionArgFunc -GOptionContext -g_option_context_new -g_option_context_set_summary -g_option_context_get_summary -g_option_context_set_description -g_option_context_get_description -GTranslateFunc -g_option_context_set_translate_func -g_option_context_set_translation_domain -g_option_context_free -g_option_context_parse -g_option_context_parse_strv -g_option_context_set_help_enabled -g_option_context_get_help_enabled -g_option_context_set_ignore_unknown_options -g_option_context_get_ignore_unknown_options -g_option_context_get_help -g_option_context_get_strict_posix -g_option_context_set_strict_posix -GOptionArg -GOptionFlags -G_OPTION_REMAINING -GOptionEntry -G_OPTION_ENTRY_NULL -g_option_context_add_main_entries -GOptionGroup -g_option_context_add_group -g_option_context_set_main_group -g_option_context_get_main_group -g_option_group_new -g_option_group_ref -g_option_group_unref -g_option_group_free -g_option_group_add_entries -GOptionParseFunc -g_option_group_set_parse_hooks -GOptionErrorFunc -g_option_group_set_error_hook -g_option_group_set_translate_func -g_option_group_set_translation_domain -<SUBSECTION Private> -g_option_error_quark -</SECTION> - - -<SECTION> -<TITLE>File Utilities</TITLE> -<FILE>fileutils</FILE> -<INCLUDE>glib.h,glib/gstdio.h,fcntl.h,sys/types.h,sys/stat.h</INCLUDE> -GFileError -G_FILE_ERROR -GFileTest -g_file_error_from_errno -g_file_get_contents -GFileSetContentsFlags -g_file_set_contents -g_file_set_contents_full -g_file_test -g_mkstemp -g_mkstemp_full -g_file_open_tmp -g_file_read_link -g_mkdir_with_parents -g_mkdtemp -g_mkdtemp_full -g_dir_make_tmp - -<SUBSECTION> -GDir -g_dir_open -g_dir_read_name -g_dir_rewind -g_dir_close - -<SUBSECTION> -GMappedFile -g_mapped_file_new -g_mapped_file_new_from_fd -g_mapped_file_ref -g_mapped_file_unref -g_mapped_file_free -g_mapped_file_get_length -g_mapped_file_get_contents -g_mapped_file_get_bytes - -<SUBSECTION> -g_open -g_rename -g_mkdir -GStatBuf -g_stat -g_lstat -g_unlink -g_remove -g_rmdir -g_fopen -g_freopen -g_fsync -g_chmod -g_access -g_creat -g_chdir -g_utime -g_close - -<SUBSECTION Private> -g_file_error_quark -utimbuf -</SECTION> - - -<SECTION> -<TITLE>String Utility Functions</TITLE> -<FILE>string_utils</FILE> -<INCLUDE>glib.h,glib/gprintf.h</INCLUDE> -g_strdup -g_strndup -g_strdupv -g_strnfill -g_stpcpy -g_strstr_len -g_strrstr -g_strrstr_len -g_str_has_prefix -g_str_has_suffix -g_strcmp0 -g_str_to_ascii -g_str_tokenize_and_fold -g_str_match_string - -<SUBSECTION> -g_strlcpy -g_strlcat - -<SUBSECTION> -g_strdup_printf -g_strdup_vprintf -g_printf -g_vprintf -g_fprintf -g_vfprintf -g_sprintf -g_vsprintf -g_snprintf -g_vsnprintf -g_vasprintf -g_printf_string_upper_bound - -<SUBSECTION> -g_str_is_ascii -g_ascii_isalnum -g_ascii_isalpha -g_ascii_iscntrl -g_ascii_isdigit -g_ascii_isgraph -g_ascii_islower -g_ascii_isprint -g_ascii_ispunct -g_ascii_isspace -g_ascii_isupper -g_ascii_isxdigit - -<SUBSECTION> -g_ascii_digit_value -g_ascii_xdigit_value - -<SUBSECTION> -g_ascii_strcasecmp -g_ascii_strncasecmp - -<SUBSECTION> -g_ascii_strup -g_ascii_strdown - -<SUBSECTION> -g_ascii_tolower -g_ascii_toupper - -<SUBSECTION> -g_string_ascii_up -g_string_ascii_down - -<SUBSECTION> -g_strup -g_strdown - -<SUBSECTION> -g_strcasecmp -g_strncasecmp - -<SUBSECTION> -g_strreverse - -<SUBSECTION> -g_ascii_strtoll -g_ascii_strtoull -G_ASCII_DTOSTR_BUF_SIZE -g_ascii_strtod -g_ascii_dtostr -g_ascii_formatd -g_strtod - -<SUBSECTION> -GNumberParserError -G_NUMBER_PARSER_ERROR -g_ascii_string_to_signed -g_ascii_string_to_unsigned - -<SUBSECTION Private> -g_number_parser_error_quark - -<SUBSECTION> -g_strchug -g_strchomp -g_strstrip - -<SUBSECTION> -g_strdelimit -G_STR_DELIMITERS -g_strescape -g_strcompress -g_strcanon -g_strsplit -g_strsplit_set -g_strfreev -g_strconcat -g_strjoin -g_strjoinv - -<SUBSECTION> -GStrv -GStrvBuilder -g_strv_length -g_strv_contains -g_strv_equal -g_strv_builder_new -g_strv_builder_ref -g_strv_builder_unref -g_strv_builder_add -g_strv_builder_addv -g_strv_builder_add_many -g_strv_builder_end - -<SUBSECTION> -g_strerror -g_strsignal - -<SUBSECTION Private> -GAsciiType -g_ascii_table -</SECTION> - -<SECTION> -<TITLE>Date and Time Functions</TITLE> -<FILE>date</FILE> -G_USEC_PER_SEC -GTimeVal -g_get_current_time -g_usleep -g_time_val_add -g_time_val_from_iso8601 -g_time_val_to_iso8601 - -<SUBSECTION> -g_get_monotonic_time -g_get_real_time - -<SUBSECTION> -GDate -GTime -GDateDMY -GDateDay -GDateMonth -GDateYear -GDateWeekday - -<SUBSECTION> -G_DATE_BAD_DAY -G_DATE_BAD_JULIAN -G_DATE_BAD_YEAR - -<SUBSECTION> -g_date_new -g_date_new_dmy -g_date_new_julian -g_date_clear -g_date_free -g_date_copy - -<SUBSECTION> -g_date_set_day -g_date_set_month -g_date_set_year -g_date_set_dmy -g_date_set_julian -g_date_set_time -g_date_set_time_t -g_date_set_time_val -g_date_set_parse - -<SUBSECTION> -g_date_add_days -g_date_subtract_days -g_date_add_months -g_date_subtract_months -g_date_add_years -g_date_subtract_years -g_date_days_between -g_date_compare -g_date_clamp -g_date_order - -<SUBSECTION> -g_date_get_day -g_date_get_month -g_date_get_year -g_date_get_julian -g_date_get_weekday -g_date_get_day_of_year - -<SUBSECTION> -g_date_get_days_in_month -g_date_is_first_of_month -g_date_is_last_of_month -g_date_is_leap_year -g_date_get_monday_week_of_year -g_date_get_monday_weeks_in_year -g_date_get_sunday_week_of_year -g_date_get_sunday_weeks_in_year -g_date_get_iso8601_week_of_year - -<SUBSECTION> -g_date_strftime -g_date_to_struct_tm - -<SUBSECTION> -g_date_valid -g_date_valid_day -g_date_valid_month -g_date_valid_year -g_date_valid_dmy -g_date_valid_julian -g_date_valid_weekday - -<SUBSECTION Private> -g_date_weekday -g_date_month -g_date_year -g_date_day -g_date_julian -g_date_day_of_year -g_date_monday_week_of_year -g_date_sunday_week_of_year -g_date_days_in_month -g_date_monday_weeks_in_year -g_date_sunday_weeks_in_year -</SECTION> - -<SECTION> -<FILE>timezone</FILE> -<SUBSECTION> -GTimeZone -g_time_zone_unref -g_time_zone_ref -<SUBSECTION> -g_time_zone_new -g_time_zone_new_identifier -g_time_zone_new_local -g_time_zone_new_utc -g_time_zone_new_offset -<SUBSECTION> -GTimeType -g_time_zone_find_interval -g_time_zone_adjust_time -<SUBSECTION> -g_time_zone_get_identifier -g_time_zone_get_abbreviation -g_time_zone_get_offset -g_time_zone_is_dst -</SECTION> - -<SECTION> -<FILE>date-time</FILE> -GTimeSpan -G_TIME_SPAN_DAY -G_TIME_SPAN_HOUR -G_TIME_SPAN_MINUTE -G_TIME_SPAN_SECOND -G_TIME_SPAN_MILLISECOND - -<SUBSECTION> -GDateTime -g_date_time_unref -g_date_time_ref - -<SUBSECTION> -g_date_time_new_now -g_date_time_new_now_local -g_date_time_new_now_utc - -<SUBSECTION> -g_date_time_new_from_unix_local -g_date_time_new_from_unix_utc - -<SUBSECTION> -g_date_time_new_from_timeval_local -g_date_time_new_from_timeval_utc -g_date_time_new_from_iso8601 - -<SUBSECTION> -g_date_time_new -g_date_time_new_local -g_date_time_new_utc - -<SUBSECTION> -g_date_time_add - -<SUBSECTION> -g_date_time_add_years -g_date_time_add_months -g_date_time_add_weeks -g_date_time_add_days - -<SUBSECTION> -g_date_time_add_hours -g_date_time_add_minutes -g_date_time_add_seconds - -<SUBSECTION> -g_date_time_add_full - -<SUBSECTION> -g_date_time_compare -g_date_time_difference -g_date_time_hash -g_date_time_equal - -<SUBSECTION> -g_date_time_get_ymd - -<SUBSECTION> -g_date_time_get_year -g_date_time_get_month -g_date_time_get_day_of_month - -<SUBSECTION> -g_date_time_get_week_numbering_year -g_date_time_get_week_of_year -g_date_time_get_day_of_week - -<SUBSECTION> -g_date_time_get_day_of_year - -<SUBSECTION> -g_date_time_get_hour -g_date_time_get_minute -g_date_time_get_second -g_date_time_get_microsecond -g_date_time_get_seconds - -<SUBSECTION> -g_date_time_to_unix -g_date_time_to_timeval - -<SUBSECTION> -g_date_time_get_utc_offset -g_date_time_get_timezone -g_date_time_get_timezone_abbreviation -g_date_time_is_daylight_savings - -<SUBSECTION> -g_date_time_to_timezone -g_date_time_to_local -g_date_time_to_utc - -<SUBSECTION> -g_date_time_format -g_date_time_format_iso8601 -</SECTION> - -<SECTION> -<TITLE>Hook Functions</TITLE> -<FILE>hooks</FILE> -GHookList -GHookFinalizeFunc -GHook -GHookFunc -GHookCheckFunc - -<SUBSECTION> -g_hook_list_init -g_hook_list_invoke -g_hook_list_invoke_check -g_hook_list_marshal -GHookMarshaller -g_hook_list_marshal_check -GHookCheckMarshaller -g_hook_list_clear - -<SUBSECTION> -g_hook_alloc -g_hook_append -g_hook_prepend -g_hook_insert_before -g_hook_insert_sorted -GHookCompareFunc -g_hook_compare_ids - -<SUBSECTION> -g_hook_get -g_hook_find -GHookFindFunc -g_hook_find_data -g_hook_find_func -g_hook_find_func_data - -<SUBSECTION> -g_hook_first_valid -g_hook_next_valid - -GHookFlagMask -G_HOOK_FLAGS -G_HOOK_FLAG_USER_SHIFT - -<SUBSECTION> -G_HOOK -G_HOOK_IS_VALID -G_HOOK_ACTIVE -G_HOOK_IN_CALL -G_HOOK_IS_UNLINKED - -<SUBSECTION> -g_hook_ref -g_hook_unref - -g_hook_free -g_hook_destroy -g_hook_destroy_link -</SECTION> - -<SECTION> -<TITLE>Miscellaneous Utility Functions</TITLE> -<FILE>misc_utils</FILE> -g_get_application_name -g_set_application_name -g_get_prgname -g_set_prgname -g_get_environ -g_environ_getenv -g_environ_setenv -g_environ_unsetenv -g_getenv -g_setenv -g_unsetenv -g_listenv -g_get_user_name -g_get_real_name -g_get_user_cache_dir -g_get_user_data_dir -g_get_user_config_dir -g_get_user_state_dir -g_get_user_runtime_dir -GUserDirectory -g_get_user_special_dir -g_get_system_data_dirs -g_get_system_config_dirs -g_reload_user_special_dirs_cache -g_get_os_info - -<SUBSECTION> -G_OS_INFO_KEY_NAME -G_OS_INFO_KEY_PRETTY_NAME -G_OS_INFO_KEY_VERSION -G_OS_INFO_KEY_VERSION_CODENAME -G_OS_INFO_KEY_VERSION_ID -G_OS_INFO_KEY_ID -G_OS_INFO_KEY_HOME_URL -G_OS_INFO_KEY_DOCUMENTATION_URL -G_OS_INFO_KEY_SUPPORT_URL -G_OS_INFO_KEY_BUG_REPORT_URL -G_OS_INFO_KEY_PRIVACY_POLICY_URL - -<SUBSECTION> -g_get_host_name -g_get_home_dir -g_get_tmp_dir -g_get_current_dir -g_basename -g_dirname -g_canonicalize_filename -g_path_is_absolute -g_path_skip_root -g_path_get_basename -g_path_get_dirname -g_build_filename -g_build_filenamev -g_build_filename_valist -g_build_path -g_build_pathv - -<SUBSECTION> -g_format_size -GFormatSizeFlags -g_format_size_full -g_format_size_for_display - -<SUBSECTION> -g_find_program_in_path - -<SUBSECTION> -g_bit_nth_lsf -g_bit_nth_msf -g_bit_storage - -<SUBSECTION> -g_spaced_primes_closest - -<SUBSECTION> -g_atexit -g_abort - -<SUBSECTION> -g_parse_debug_string -GDebugKey - -<SUBSECTION> -GVoidFunc -GFreeFunc - -<SUBSECTION> -g_qsort_with_data - -<SUBSECTION> -g_nullify_pointer - -<SUBSECTION Private> -G_NATIVE_ATEXIT -g_ATEXIT -g_win32_get_system_data_dirs_for_module -ATEXIT -g_bit_nth_lsf_impl -g_bit_nth_msf_impl -g_bit_storage_impl - -</SECTION> - -<SECTION> -<TITLE>Lexical Scanner</TITLE> -<FILE>scanner</FILE> -GScanner -GScannerConfig -g_scanner_new -g_scanner_destroy - -<SUBSECTION> -g_scanner_input_file -g_scanner_sync_file_offset -g_scanner_input_text -g_scanner_peek_next_token -g_scanner_get_next_token -g_scanner_eof - -<SUBSECTION> -g_scanner_cur_line -g_scanner_cur_position -g_scanner_cur_token -g_scanner_cur_value - -<SUBSECTION> -g_scanner_set_scope -g_scanner_scope_add_symbol -g_scanner_scope_foreach_symbol -g_scanner_scope_lookup_symbol -g_scanner_scope_remove_symbol -g_scanner_add_symbol -g_scanner_remove_symbol -g_scanner_foreach_symbol - -<SUBSECTION> -g_scanner_freeze_symbol_table -g_scanner_thaw_symbol_table -g_scanner_lookup_symbol - -<SUBSECTION> -g_scanner_warn -g_scanner_error -g_scanner_unexp_token -GScannerMsgFunc - -<SUBSECTION> -G_CSET_a_2_z -G_CSET_A_2_Z -G_CSET_DIGITS -G_CSET_LATINC -G_CSET_LATINS -GTokenType -GTokenValue -GErrorType - -</SECTION> - -<SECTION> -<TITLE>Key-value file parser</TITLE> -<FILE>keyfile</FILE> -GKeyFile -G_KEY_FILE_ERROR -GKeyFileError -GKeyFileFlags - -<SUBSECTION> -g_key_file_new -g_key_file_free -g_key_file_ref -g_key_file_unref -g_key_file_set_list_separator -g_key_file_load_from_file -g_key_file_load_from_data -g_key_file_load_from_bytes -g_key_file_load_from_data_dirs -g_key_file_load_from_dirs -g_key_file_to_data -g_key_file_save_to_file -g_key_file_get_start_group -g_key_file_get_groups -g_key_file_get_keys -g_key_file_has_group -g_key_file_has_key - -<SUBSECTION> -g_key_file_get_value -g_key_file_get_string -g_key_file_get_locale_string -g_key_file_get_locale_for_key -g_key_file_get_boolean -g_key_file_get_integer -g_key_file_get_int64 -g_key_file_get_uint64 -g_key_file_get_double -g_key_file_get_string_list -g_key_file_get_locale_string_list -g_key_file_get_boolean_list -g_key_file_get_integer_list -g_key_file_get_double_list -g_key_file_get_comment - -<SUBSECTION> -g_key_file_set_value -g_key_file_set_string -g_key_file_set_locale_string -g_key_file_set_boolean -g_key_file_set_integer -g_key_file_set_int64 -g_key_file_set_uint64 -g_key_file_set_double -g_key_file_set_string_list -g_key_file_set_locale_string_list -g_key_file_set_boolean_list -g_key_file_set_integer_list -g_key_file_set_double_list -g_key_file_set_comment -g_key_file_remove_group -g_key_file_remove_key -g_key_file_remove_comment - -<SUBSECTION> -G_KEY_FILE_DESKTOP_GROUP -G_KEY_FILE_DESKTOP_KEY_TYPE -G_KEY_FILE_DESKTOP_KEY_VERSION -G_KEY_FILE_DESKTOP_KEY_NAME -G_KEY_FILE_DESKTOP_KEY_GENERIC_NAME -G_KEY_FILE_DESKTOP_KEY_NO_DISPLAY -G_KEY_FILE_DESKTOP_KEY_COMMENT -G_KEY_FILE_DESKTOP_KEY_ICON -G_KEY_FILE_DESKTOP_KEY_HIDDEN -G_KEY_FILE_DESKTOP_KEY_ONLY_SHOW_IN -G_KEY_FILE_DESKTOP_KEY_NOT_SHOW_IN -G_KEY_FILE_DESKTOP_KEY_TRY_EXEC -G_KEY_FILE_DESKTOP_KEY_EXEC -G_KEY_FILE_DESKTOP_KEY_PATH -G_KEY_FILE_DESKTOP_KEY_TERMINAL -G_KEY_FILE_DESKTOP_KEY_MIME_TYPE -G_KEY_FILE_DESKTOP_KEY_CATEGORIES -G_KEY_FILE_DESKTOP_KEY_STARTUP_NOTIFY -G_KEY_FILE_DESKTOP_KEY_STARTUP_WM_CLASS -G_KEY_FILE_DESKTOP_KEY_URL -G_KEY_FILE_DESKTOP_KEY_ACTIONS -G_KEY_FILE_DESKTOP_KEY_DBUS_ACTIVATABLE -G_KEY_FILE_DESKTOP_TYPE_APPLICATION -G_KEY_FILE_DESKTOP_TYPE_LINK -G_KEY_FILE_DESKTOP_TYPE_DIRECTORY - -<SUBSECTION Private> -g_key_file_error_quark -g_key_file_get_type -</SECTION> - -<SECTION> -<TITLE>Bookmark file parser</TITLE> -<FILE>bookmarkfile</FILE> -GBookmarkFile -G_BOOKMARK_FILE_ERROR -GBookmarkFileError -g_bookmark_file_new -g_bookmark_file_free -g_bookmark_file_load_from_file -g_bookmark_file_load_from_data -g_bookmark_file_load_from_data_dirs -g_bookmark_file_to_data -g_bookmark_file_to_file -g_bookmark_file_has_item -g_bookmark_file_has_group -g_bookmark_file_has_application -g_bookmark_file_get_size -g_bookmark_file_get_uris G_GNUC_MALLOC - -<SUBSECTION> -g_bookmark_file_get_title -g_bookmark_file_get_description -g_bookmark_file_get_mime_type -g_bookmark_file_get_is_private -g_bookmark_file_get_icon -g_bookmark_file_get_added -g_bookmark_file_get_added_date_time -g_bookmark_file_get_modified -g_bookmark_file_get_modified_date_time -g_bookmark_file_get_visited -g_bookmark_file_get_visited_date_time -g_bookmark_file_get_groups -g_bookmark_file_get_applications -g_bookmark_file_get_app_info -g_bookmark_file_get_application_info - -<SUBSECTION> -g_bookmark_file_set_title -g_bookmark_file_set_description -g_bookmark_file_set_mime_type -g_bookmark_file_set_is_private -g_bookmark_file_set_icon -g_bookmark_file_set_added -g_bookmark_file_set_added_date_time -g_bookmark_file_set_groups -g_bookmark_file_set_modified -g_bookmark_file_set_modified_date_time -g_bookmark_file_set_visited -g_bookmark_file_set_visited_date_time -g_bookmark_file_set_app_info -g_bookmark_file_set_application_info -g_bookmark_file_add_group -g_bookmark_file_add_application -g_bookmark_file_remove_group -g_bookmark_file_remove_application -g_bookmark_file_remove_item -g_bookmark_file_move_item - -<SUBSECTION Private> -g_bookmark_file_error_quark -</SECTION> - -<SECTION> -<TITLE>Dynamic Loading of Modules</TITLE> -<FILE>modules</FILE> -<INCLUDE>gmodule.h</INCLUDE> -GModule -GModuleError -G_MODULE_ERROR -g_module_supported -g_module_build_path -g_module_open -g_module_open_full -GModuleFlags -g_module_symbol -g_module_name -g_module_make_resident -g_module_close -g_module_error -<SUBSECTION> -GModuleCheckInit -GModuleUnload -G_MODULE_SUFFIX -G_MODULE_EXPORT -G_MODULE_IMPORT -<SUBSECTION Private> -g_module_error_quark -</SECTION> - -<SECTION> -<TITLE>Automatic String Completion</TITLE> -<FILE>completion</FILE> -GCompletion -g_completion_new -GCompletionFunc -g_completion_add_items -g_completion_remove_items -g_completion_clear_items -g_completion_complete -g_completion_complete_utf8 -g_completion_set_compare -GCompletionStrncmpFunc -g_completion_free -</SECTION> - -<SECTION> -<TITLE>Windows Compatibility Functions</TITLE> -<FILE>windows</FILE> -MAXPATHLEN -GWin32OSType - -g_win32_check_windows_version -g_win32_get_command_line -g_win32_error_message -g_win32_getlocale -g_win32_get_package_installation_directory -g_win32_get_package_installation_directory_of_module -g_win32_get_package_installation_subdirectory -g_win32_get_windows_version -g_win32_locale_filename_from_utf8 -G_WIN32_DLLMAIN_FOR_DLL_NAME -G_WIN32_HAVE_WIDECHAR_API -G_WIN32_IS_NT_BASED - -<SUBSECTION Private> -g_win32_ftruncate - -</SECTION> - -<SECTION> -<TITLE>UNIX-specific utilities and integration</TITLE> -<FILE>gunix</FILE> -G_UNIX_ERROR -g_unix_open_pipe -g_unix_set_fd_nonblocking - -<SUBSECTION> -g_unix_signal_add -g_unix_signal_add_full -g_unix_signal_source_new - -<SUBSECTION> -GUnixFDSourceFunc -g_unix_fd_add -g_unix_fd_add_full -g_unix_fd_source_new - -<SUBSECTION> -g_unix_get_passwd_entry - -<SUBSECTION Private> -g_unix_error_quark -</SECTION> - -# Data Structures - -<SECTION> -<TITLE>Memory Slices</TITLE> -<FILE>memory_slices</FILE> -g_slice_alloc -g_slice_alloc0 -g_slice_copy -g_slice_free1 -g_slice_free_chain_with_offset - -<SUBSECTION> -g_slice_new -g_slice_new0 -g_slice_dup -g_slice_free -g_slice_free_chain - -<SUBSECTION Private> -GSliceConfig -g_slice_set_config -g_slice_get_config -g_slice_get_config_state -g_slice_debug_tree_statistics -</SECTION> - -<SECTION> -<TITLE>Doubly-Linked Lists</TITLE> -<FILE>linked_lists_double</FILE> -GList - -<SUBSECTION> -g_list_append -g_list_prepend -g_list_insert -g_list_insert_before -g_list_insert_before_link -g_list_insert_sorted -g_list_remove -g_list_remove_link -g_list_delete_link -g_list_remove_all -g_list_free -g_list_free_full -g_clear_list - -<SUBSECTION> -g_list_alloc -g_list_free_1 -g_list_free1 - -<SUBSECTION> -g_list_length -g_list_copy -g_list_copy_deep -g_list_reverse -g_list_sort -GCompareFunc -g_list_insert_sorted_with_data -g_list_sort_with_data -GCompareDataFunc -g_list_concat -g_list_foreach -GFunc - -<SUBSECTION> -g_list_first -g_list_last -g_list_previous -g_list_next -g_list_nth -g_list_nth_data -g_list_nth_prev - -<SUBSECTION> -g_list_find -g_list_find_custom -g_list_position -g_list_index -</SECTION> - -<SECTION> -<TITLE>Singly-Linked Lists</TITLE> -<FILE>linked_lists_single</FILE> -GSList - -<SUBSECTION> -g_slist_alloc -g_slist_append -g_slist_prepend -g_slist_insert -g_slist_insert_before -g_slist_insert_sorted -g_slist_remove -g_slist_remove_link -g_slist_delete_link -g_slist_remove_all -g_slist_free -g_slist_free_full -g_slist_free_1 -g_slist_free1 -g_clear_slist - -<SUBSECTION> -g_slist_length -g_slist_copy -g_slist_copy_deep -g_slist_reverse -g_slist_insert_sorted_with_data -g_slist_sort -g_slist_sort_with_data -g_slist_concat -g_slist_foreach - -<SUBSECTION> -g_slist_last -g_slist_next -g_slist_nth -g_slist_nth_data - -<SUBSECTION> -g_slist_find -g_slist_find_custom -g_slist_position -g_slist_index -</SECTION> - -<SECTION> -<TITLE>Double-ended Queues</TITLE> -<FILE>queue</FILE> - -GQueue -g_queue_new -g_queue_free -g_queue_free_full -G_QUEUE_INIT -g_queue_init -g_queue_clear -g_queue_clear_full -g_queue_is_empty -g_queue_get_length -g_queue_reverse -g_queue_copy -g_queue_foreach -g_queue_find -g_queue_find_custom -g_queue_sort -g_queue_push_head -g_queue_push_tail -g_queue_push_nth -g_queue_pop_head -g_queue_pop_tail -g_queue_pop_nth -g_queue_peek_head -g_queue_peek_tail -g_queue_peek_nth -g_queue_index -g_queue_remove -g_queue_remove_all -g_queue_insert_before -g_queue_insert_before_link -g_queue_insert_after -g_queue_insert_after_link -g_queue_insert_sorted -g_queue_push_head_link -g_queue_push_tail_link -g_queue_push_nth_link -g_queue_pop_head_link -g_queue_pop_tail_link -g_queue_pop_nth_link -g_queue_peek_head_link -g_queue_peek_tail_link -g_queue_peek_nth_link -g_queue_link_index -g_queue_unlink -g_queue_delete_link -</SECTION> - -<SECTION> -<TITLE>Sequences</TITLE> -<FILE>sequence</FILE> - -GSequence -GSequenceIter -GSequenceIterCompareFunc - -<SUBSECTION> -g_sequence_new -g_sequence_free -g_sequence_get_length -g_sequence_is_empty -g_sequence_foreach -g_sequence_foreach_range -g_sequence_sort -g_sequence_sort_iter - -<SUBSECTION> -g_sequence_get_begin_iter -g_sequence_get_end_iter -g_sequence_get_iter_at_pos -g_sequence_append -g_sequence_prepend -g_sequence_insert_before -g_sequence_move -g_sequence_swap -g_sequence_insert_sorted -g_sequence_insert_sorted_iter -g_sequence_sort_changed -g_sequence_sort_changed_iter -g_sequence_remove -g_sequence_remove_range -g_sequence_move_range -g_sequence_search -g_sequence_search_iter -g_sequence_lookup -g_sequence_lookup_iter - -<SUBSECTION> -g_sequence_get -g_sequence_set - -<SUBSECTION> -g_sequence_iter_is_begin -g_sequence_iter_is_end -g_sequence_iter_next -g_sequence_iter_prev -g_sequence_iter_get_position -g_sequence_iter_move -g_sequence_iter_get_sequence - -<SUBSECTION> -g_sequence_iter_compare -g_sequence_range_get_midpoint -</SECTION> - -<SECTION> -<TITLE>Trash Stacks</TITLE> -<FILE>trash_stack</FILE> -GTrashStack - -g_trash_stack_push -g_trash_stack_pop -g_trash_stack_peek -g_trash_stack_height -</SECTION> - -<SECTION> -<TITLE>Hash Tables</TITLE> -<FILE>hash_tables</FILE> -GHashTable -g_hash_table_new -g_hash_table_new_full -g_hash_table_new_similar -GHashFunc -GEqualFunc -GEqualFuncFull -g_hash_table_insert -g_hash_table_replace -g_hash_table_add -g_hash_table_contains -g_hash_table_size -g_hash_table_lookup -g_hash_table_lookup_extended -g_hash_table_foreach -g_hash_table_find -GHFunc -g_hash_table_remove -g_hash_table_steal -g_hash_table_steal_extended -g_hash_table_foreach_remove -g_hash_table_foreach_steal -g_hash_table_remove_all -g_hash_table_steal_all -g_hash_table_get_keys -g_hash_table_get_values -g_hash_table_get_keys_as_array -GHRFunc -g_hash_table_freeze -g_hash_table_thaw -g_hash_table_destroy -g_hash_table_ref -g_hash_table_unref -GHashTableIter -g_hash_table_iter_init -g_hash_table_iter_next -g_hash_table_iter_get_hash_table -g_hash_table_iter_replace -g_hash_table_iter_remove -g_hash_table_iter_steal - -<SUBSECTION> -g_direct_equal -g_direct_hash -g_int_equal -g_int_hash -g_int64_equal -g_int64_hash -g_double_equal -g_double_hash -g_str_equal -g_str_hash - -</SECTION> - -<SECTION> -<TITLE>Strings</TITLE> -<FILE>strings</FILE> -GString -g_string_new -g_string_new_len -g_string_sized_new -g_string_assign -g_string_sprintf -g_string_sprintfa -g_string_vprintf -g_string_append_vprintf -g_string_printf -g_string_append_printf -g_string_append -g_string_append_c -g_string_append_unichar -g_string_append_len -g_string_append_uri_escaped -g_string_prepend -g_string_prepend_c -g_string_prepend_unichar -g_string_prepend_len -g_string_insert -g_string_insert_c -g_string_insert_unichar -g_string_insert_len -g_string_overwrite -g_string_overwrite_len -g_string_replace -g_string_erase -g_string_truncate -g_string_set_size -g_string_free -g_string_free_to_bytes - -<SUBSECTION> -g_string_up -g_string_down - -<SUBSECTION> -g_string_hash -g_string_equal - -<SUBSECTION Private> -g_string_append_c_inline -g_autoptr_cleanup_gstring_free -</SECTION> - -<SECTION> -<TITLE>String Chunks</TITLE> -<FILE>string_chunks</FILE> -GStringChunk -g_string_chunk_new -g_string_chunk_insert -g_string_chunk_insert_const -g_string_chunk_insert_len -g_string_chunk_clear -g_string_chunk_free - -</SECTION> - -<SECTION> -<TITLE>Arrays</TITLE> -<FILE>arrays</FILE> -GArray -g_array_new -g_array_steal -g_array_sized_new -g_array_copy -g_array_ref -g_array_unref -g_array_get_element_size -g_array_append_val -g_array_append_vals -g_array_prepend_val -g_array_prepend_vals -g_array_insert_val -g_array_insert_vals -g_array_remove_index -g_array_remove_index_fast -g_array_remove_range -g_array_sort -g_array_sort_with_data -g_array_binary_search -g_array_index -g_array_set_size -g_array_set_clear_func -g_array_free -</SECTION> - -<SECTION> -<TITLE>Pointer Arrays</TITLE> -<FILE>arrays_pointer</FILE> -GPtrArray -g_ptr_array_new -g_ptr_array_steal -g_ptr_array_sized_new -g_ptr_array_new_with_free_func -g_ptr_array_copy -g_ptr_array_new_full -g_ptr_array_new_null_terminated -g_ptr_array_set_free_func -g_ptr_array_is_null_terminated -g_ptr_array_ref -g_ptr_array_unref -g_ptr_array_add -g_ptr_array_extend -g_ptr_array_extend_and_steal -g_ptr_array_insert -g_ptr_array_remove -g_ptr_array_remove_index -g_ptr_array_remove_fast -g_ptr_array_remove_index_fast -g_ptr_array_remove_range -g_ptr_array_steal_index -g_ptr_array_steal_index_fast -g_ptr_array_sort -g_ptr_array_sort_with_data -g_ptr_array_set_size -g_ptr_array_index -g_ptr_array_free -g_ptr_array_foreach -g_ptr_array_find -g_ptr_array_find_with_equal_func - -</SECTION> - -<SECTION> -<TITLE>Byte Arrays</TITLE> -<FILE>arrays_byte</FILE> -<SUBSECTION> -GByteArray -g_byte_array_new -g_byte_array_steal -g_byte_array_new_take -g_byte_array_sized_new -g_byte_array_ref -g_byte_array_unref -g_byte_array_append -g_byte_array_prepend -g_byte_array_remove_index -g_byte_array_remove_index_fast -g_byte_array_remove_range -g_byte_array_sort -g_byte_array_sort_with_data -g_byte_array_set_size -g_byte_array_free -g_byte_array_free_to_bytes - -<SUBSECTION> -GBytes -g_bytes_new -g_bytes_new_take -g_bytes_new_static -g_bytes_new_with_free_func -g_bytes_new_from_bytes -g_bytes_get_data -g_bytes_get_region -g_bytes_get_size -g_bytes_hash -g_bytes_equal -g_bytes_compare -g_bytes_ref -g_bytes_unref -g_bytes_unref_to_data -g_bytes_unref_to_array - -<SUBSECTION Private> -g_bytes_get_type -</SECTION> - -<SECTION> -<TITLE>Balanced Binary Trees</TITLE> -<FILE>trees-binary</FILE> -GTree -GTreeNode -g_tree_new -g_tree_ref -g_tree_unref -g_tree_new_with_data -g_tree_new_full -g_tree_node_first -g_tree_node_last -g_tree_node_previous -g_tree_node_next -g_tree_insert_node -g_tree_insert -g_tree_replace_node -g_tree_replace -g_tree_node_key -g_tree_node_value -g_tree_nnodes -g_tree_height -g_tree_lookup_node -g_tree_lookup -g_tree_lookup_extended -g_tree_foreach_node -g_tree_foreach -g_tree_traverse -GTraverseFunc -GTraverseNodeFunc -g_tree_search_node -g_tree_search -g_tree_lower_bound -g_tree_upper_bound -g_tree_remove -g_tree_steal -g_tree_remove_all -g_tree_destroy -</SECTION> - -<SECTION> -<TITLE>N-ary Trees</TITLE> -<FILE>trees-nary</FILE> -GNode -g_node_new -g_node_copy -GCopyFunc -g_node_copy_deep - -<SUBSECTION> -g_node_insert -g_node_insert_before -g_node_insert_after -g_node_append -g_node_prepend - -<SUBSECTION> -g_node_insert_data -g_node_insert_data_after -g_node_insert_data_before -g_node_append_data -g_node_prepend_data - -<SUBSECTION> -g_node_reverse_children -g_node_traverse -GTraverseType -GTraverseFlags -GNodeTraverseFunc -g_node_children_foreach -GNodeForeachFunc - -<SUBSECTION> -g_node_get_root -g_node_find -g_node_find_child -g_node_child_index -g_node_child_position -g_node_first_child -g_node_last_child -g_node_nth_child -g_node_first_sibling -g_node_next_sibling -g_node_prev_sibling -g_node_last_sibling - -<SUBSECTION> -G_NODE_IS_LEAF -G_NODE_IS_ROOT -g_node_depth -g_node_n_nodes -g_node_n_children -g_node_is_ancestor -g_node_max_height - -<SUBSECTION> -g_node_unlink -g_node_destroy -</SECTION> - - -<SECTION> -<TITLE>Quarks</TITLE> -<FILE>quarks</FILE> -GQuark -G_DEFINE_QUARK -g_quark_from_string -g_quark_from_static_string -g_quark_to_string -g_quark_try_string -g_intern_string -g_intern_static_string -</SECTION> - -<SECTION> -<TITLE>Keyed Data Lists</TITLE> -<FILE>datalist</FILE> -GData -g_datalist_init - -<SUBSECTION> -g_datalist_id_set_data -g_datalist_id_set_data_full -g_datalist_id_get_data -g_datalist_id_remove_data -g_datalist_id_remove_no_notify -g_datalist_id_remove_multiple -GDuplicateFunc -g_datalist_id_dup_data -g_datalist_id_replace_data - -<SUBSECTION> -g_datalist_set_data -g_datalist_set_data_full -g_datalist_get_data -g_datalist_remove_data -g_datalist_remove_no_notify - -<SUBSECTION> -g_datalist_foreach -g_datalist_clear -g_datalist_set_flags -g_datalist_unset_flags -g_datalist_get_flags -G_DATALIST_FLAGS_MASK -</SECTION> - - -<SECTION> -<TITLE>Datasets</TITLE> -<FILE>datasets</FILE> -g_dataset_id_set_data -g_dataset_id_set_data_full -GDestroyNotify -g_dataset_id_get_data -g_dataset_id_remove_data -g_dataset_id_remove_no_notify - -<SUBSECTION> -g_dataset_set_data -g_dataset_set_data_full -g_dataset_get_data -g_dataset_remove_data -g_dataset_remove_no_notify - -<SUBSECTION> -g_dataset_foreach -GDataForeachFunc -g_dataset_destroy - -</SECTION> - -<SECTION> -<TITLE>Relations and Tuples</TITLE> -<FILE>relations</FILE> -GRelation -g_relation_new -g_relation_index -g_relation_insert -g_relation_exists -g_relation_count -g_relation_select -g_relation_delete -g_relation_destroy - -<SUBSECTION> -g_relation_print - -<SUBSECTION> -GTuples -g_tuples_destroy -g_tuples_index -</SECTION> - -<SECTION> -<TITLE>Caches</TITLE> -<FILE>caches</FILE> -GCache -g_cache_new -g_cache_insert -g_cache_remove -g_cache_destroy - -<SUBSECTION> -g_cache_key_foreach -g_cache_value_foreach - -<SUBSECTION> -GCacheDestroyFunc -GCacheDupFunc -GCacheNewFunc -</SECTION> - -<SECTION> -<TITLE>Random Numbers</TITLE> -<FILE>random_numbers</FILE> -GRand -g_rand_new_with_seed -g_rand_new_with_seed_array -g_rand_new -g_rand_copy -g_rand_free -g_rand_set_seed -g_rand_set_seed_array -g_rand_boolean -g_rand_int -g_rand_int_range -g_rand_double -g_rand_double_range -g_random_set_seed -g_random_boolean -g_random_int -g_random_int_range -g_random_double -g_random_double_range -</SECTION> - -<SECTION> -<TITLE>Character Set Conversion</TITLE> -<FILE>conversions</FILE> -g_convert -g_convert_with_fallback -GIConv -g_convert_with_iconv -G_CONVERT_ERROR -g_iconv_open -g_iconv -g_iconv_close -g_locale_to_utf8 -g_filename_to_utf8 -g_filename_from_utf8 -g_get_filename_charsets -g_filename_display_name -g_filename_display_basename -g_locale_from_utf8 -GConvertError - -<SUBSECTION> -g_get_charset -g_get_codeset -g_get_console_charset - -<SUBSECTION Private> -g_convert_error_quark -</SECTION> - -<SECTION> -<TITLE>Unicode Manipulation</TITLE> -<FILE>unicode</FILE> -gunichar -gunichar2 - -<SUBSECTION> -g_unichar_validate -g_unichar_isalnum -g_unichar_isalpha -g_unichar_iscntrl -g_unichar_isdefined -g_unichar_isdigit -g_unichar_isgraph -g_unichar_islower -g_unichar_ismark -g_unichar_isprint -g_unichar_ispunct -g_unichar_isspace -g_unichar_istitle -g_unichar_isupper -g_unichar_isxdigit -g_unichar_iswide -g_unichar_iswide_cjk -g_unichar_iszerowidth -g_unichar_toupper -g_unichar_tolower -g_unichar_totitle -g_unichar_digit_value -g_unichar_xdigit_value -g_unichar_compose -g_unichar_decompose -g_unichar_fully_decompose -G_UNICHAR_MAX_DECOMPOSITION_LENGTH -GUnicodeType -G_UNICODE_COMBINING_MARK -g_unichar_type -GUnicodeBreakType -g_unichar_break_type -g_unichar_combining_class -g_unicode_canonical_ordering -g_unicode_canonical_decomposition -g_unichar_get_mirror_char -GUnicodeScript -g_unichar_get_script -g_unicode_script_from_iso15924 -g_unicode_script_to_iso15924 - -<SUBSECTION> -g_utf8_next_char -g_utf8_get_char -g_utf8_get_char_validated -g_utf8_offset_to_pointer -g_utf8_pointer_to_offset -g_utf8_prev_char -g_utf8_find_next_char -g_utf8_find_prev_char -g_utf8_strlen -g_utf8_strncpy -g_utf8_strchr -g_utf8_strrchr -g_utf8_strreverse -g_utf8_substring -g_utf8_validate -g_utf8_validate_len -g_utf8_make_valid - -<SUBSECTION> -g_utf8_strup -g_utf8_strdown -g_utf8_casefold -g_utf8_normalize -GNormalizeMode -g_utf8_collate -g_utf8_collate_key -g_utf8_collate_key_for_filename - -<SUBSECTION> -g_utf8_to_utf16 -g_utf8_to_ucs4 -g_utf8_to_ucs4_fast -g_utf16_to_ucs4 -g_utf16_to_utf8 -g_ucs4_to_utf16 -g_ucs4_to_utf8 -g_unichar_to_utf8 - -<SUBSECTION Private> -g_utf8_skip -</SECTION> - -<SECTION> -<TITLE>I18N</TITLE> -<FILE>i18n</FILE> -<INCLUDE>glib.h,glib/gi18n.h</INCLUDE> -_ -Q_ -C_ -N_ -NC_ -g_dgettext -g_dcgettext -g_dngettext -g_dpgettext -g_dpgettext2 -g_strip_context -<SUBSECTION> -g_get_language_names -g_get_locale_variants -</SECTION> - -<SECTION> -<TITLE>Base64 Encoding</TITLE> -<FILE>base64</FILE> -g_base64_encode_step -g_base64_encode_close -g_base64_encode -g_base64_decode_step -g_base64_decode -g_base64_decode_inplace -</SECTION> - -<SECTION> -<TITLE>URI Functions</TITLE> -<FILE>guri</FILE> -GUri -g_uri_ref -g_uri_unref -<SUBSECTION> -GUriFlags -g_uri_split -g_uri_split_with_user -g_uri_split_network -g_uri_is_valid -g_uri_join -g_uri_join_with_user -g_uri_parse -g_uri_parse_relative -g_uri_resolve_relative -g_uri_build -g_uri_build_with_user -g_uri_peek_scheme -g_uri_parse_scheme -<SUBSECTION> -GUriHideFlags -g_uri_to_string -g_uri_to_string_partial -<SUBSECTION> -g_uri_get_scheme -g_uri_get_userinfo -g_uri_get_user -g_uri_get_password -g_uri_get_auth_params -g_uri_get_host -g_uri_get_port -g_uri_get_path -g_uri_get_query -g_uri_get_fragment -g_uri_get_flags -<SUBSECTION> -GUriParamsIter -GUriParamsFlags -g_uri_params_iter_init -g_uri_params_iter_next -g_uri_parse_params -<SUBSECTION> -G_URI_RESERVED_CHARS_ALLOWED_IN_PATH -G_URI_RESERVED_CHARS_ALLOWED_IN_PATH_ELEMENT -G_URI_RESERVED_CHARS_ALLOWED_IN_USERINFO -G_URI_RESERVED_CHARS_GENERIC_DELIMITERS -G_URI_RESERVED_CHARS_SUBCOMPONENT_DELIMITERS -g_uri_escape_string -g_uri_unescape_string -g_uri_escape_bytes -g_uri_unescape_bytes -g_uri_unescape_segment -<SUBSECTION> -g_uri_list_extract_uris -g_filename_from_uri -g_filename_to_uri -<SUBSECTION> -G_URI_ERROR -GUriError -<SUBSECTION Private> -g_uri_error_quark -</SECTION> - -<SECTION> -<TITLE>Data Checksums</TITLE> -<FILE>checksum</FILE> -GChecksumType -g_checksum_type_get_length -GChecksum -g_checksum_new -g_checksum_copy -g_checksum_free -g_checksum_reset -g_checksum_update -g_checksum_get_string -g_checksum_get_digest -<SUBSECTION> -g_compute_checksum_for_data -g_compute_checksum_for_string -g_compute_checksum_for_bytes -</SECTION> - -<SECTION> -<TITLE>Data HMACs</TITLE> -<FILE>hmac</FILE> -GHmac -g_hmac_new -g_hmac_copy -g_hmac_ref -g_hmac_unref -g_hmac_update -g_hmac_get_string -g_hmac_get_digest -<SUBSECTION> -g_compute_hmac_for_data -g_compute_hmac_for_string -g_compute_hmac_for_bytes -</SECTION> - -<SECTION> -<TITLE>Testing</TITLE> -<FILE>testing</FILE> -G_TEST_OPTION_ISOLATE_DIRS -g_test_minimized_result -g_test_maximized_result -g_test_init -g_test_initialized -g_test_quick -g_test_slow -g_test_thorough -g_test_perf -g_test_verbose -g_test_undefined -g_test_quiet -g_test_subprocess -g_test_run -GTestFunc -g_test_add_func -GTestDataFunc -g_test_add_data_func -g_test_add_data_func_full -g_test_add -g_test_get_path - -GTestFileType -g_test_build_filename -g_test_get_filename -g_test_get_dir - -g_test_fail -g_test_fail_printf -g_test_skip -g_test_skip_printf -g_test_incomplete -g_test_incomplete_printf -g_test_failed -g_test_message -g_test_bug_base -g_test_bug -g_test_summary -GTestLogFatalFunc -g_test_log_set_fatal_handler - -g_test_timer_start -g_test_timer_elapsed -g_test_timer_last - -g_test_queue_free -g_test_queue_destroy -g_test_queue_unref - -g_test_expect_message -g_test_assert_expected_messages - -GTestTrapFlags -GTestSubprocessFlags -g_test_trap_subprocess -g_test_trap_has_passed -g_test_trap_reached_timeout -g_test_trap_assert_passed -g_test_trap_assert_failed -g_test_trap_assert_stdout -g_test_trap_assert_stdout_unmatched -g_test_trap_assert_stderr -g_test_trap_assert_stderr_unmatched -g_test_trap_fork - -g_test_rand_bit -g_test_rand_int -g_test_rand_int_range -g_test_rand_double -g_test_rand_double_range - -g_assert -g_assert_not_reached - -g_assert_cmpstr -g_assert_cmpstrv -g_assert_cmpint -g_assert_cmpuint -g_assert_cmphex -g_assert_cmpfloat -g_assert_cmpfloat_with_epsilon -g_assert_cmpmem -g_assert_cmpvariant -g_assert_no_error -g_assert_error -g_assert_true -g_assert_false -g_assert_null -g_assert_nonnull -g_assert_no_errno -g_test_set_nonfatal_assertions - -GTestCase -GTestSuite -GTestFixtureFunc -g_test_create_case -g_test_create_suite -g_test_get_root -g_test_suite_add -g_test_suite_add_suite -g_test_run_suite -g_test_case_free -g_test_suite_free - -<SUBSECTION Private> -g_test_trap_assertions -g_assertion_message -g_assertion_message_expr -g_assertion_message_cmpstr -g_assertion_message_cmpnum -g_assertion_message_error -g_test_assert_expected_messages_internal - -g_test_config_vars - -g_test_add_vtable -GTestConfig -GTestLogType -GTestLogMsg -GTestLogBuffer -GTestResult - -g_test_log_type_name -g_test_log_buffer_new -g_test_log_buffer_free -g_test_log_buffer_push -g_test_log_buffer_pop -g_test_log_msg_free -</SECTION> - -<SECTION> -<TITLE>GVariantType</TITLE> -<FILE>gvarianttype</FILE> -GVariantType -G_VARIANT_TYPE_BOOLEAN -G_VARIANT_TYPE_BYTE -G_VARIANT_TYPE_INT16 -G_VARIANT_TYPE_UINT16 -G_VARIANT_TYPE_INT32 -G_VARIANT_TYPE_UINT32 -G_VARIANT_TYPE_INT64 -G_VARIANT_TYPE_UINT64 -G_VARIANT_TYPE_HANDLE -G_VARIANT_TYPE_DOUBLE -G_VARIANT_TYPE_STRING -G_VARIANT_TYPE_OBJECT_PATH -G_VARIANT_TYPE_SIGNATURE -G_VARIANT_TYPE_VARIANT -G_VARIANT_TYPE_ANY -G_VARIANT_TYPE_BASIC -G_VARIANT_TYPE_MAYBE -G_VARIANT_TYPE_ARRAY -G_VARIANT_TYPE_TUPLE -G_VARIANT_TYPE_UNIT -G_VARIANT_TYPE_DICT_ENTRY -G_VARIANT_TYPE_DICTIONARY -G_VARIANT_TYPE_STRING_ARRAY -G_VARIANT_TYPE_OBJECT_PATH_ARRAY -G_VARIANT_TYPE_BYTESTRING -G_VARIANT_TYPE_BYTESTRING_ARRAY -G_VARIANT_TYPE_VARDICT - -<SUBSECTION> -G_VARIANT_TYPE -g_variant_type_free -g_variant_type_copy -g_variant_type_new - -<SUBSECTION> -g_variant_type_string_is_valid -g_variant_type_string_scan -g_variant_type_get_string_length -g_variant_type_peek_string -g_variant_type_dup_string - -<SUBSECTION> -g_variant_type_is_definite -g_variant_type_is_container -g_variant_type_is_basic -g_variant_type_is_maybe -g_variant_type_is_array -g_variant_type_is_tuple -g_variant_type_is_dict_entry -g_variant_type_is_variant - -<SUBSECTION> -g_variant_type_hash -g_variant_type_equal -g_variant_type_is_subtype_of - -<SUBSECTION> -g_variant_type_new_maybe -g_variant_type_new_array -g_variant_type_new_tuple -g_variant_type_new_dict_entry - -<SUBSECTION> -g_variant_type_element -g_variant_type_n_items -g_variant_type_first -g_variant_type_next -g_variant_type_key -g_variant_type_value -</SECTION> - -<SECTION> -<TITLE>GVariant</TITLE> -<FILE>gvariant</FILE> -GVariant -g_variant_unref -g_variant_ref -g_variant_ref_sink -g_variant_is_floating -g_variant_take_ref -g_variant_get_type -g_variant_get_type_string -g_variant_is_of_type -g_variant_is_container -g_variant_compare - -<SUBSECTION> -g_variant_classify -GVariantClass - -<SUBSECTION> -g_variant_check_format_string -g_variant_get -g_variant_get_va -g_variant_new -g_variant_new_va - -<SUBSECTION> -g_variant_new_boolean -g_variant_new_byte -g_variant_new_int16 -g_variant_new_uint16 -g_variant_new_int32 -g_variant_new_uint32 -g_variant_new_int64 -g_variant_new_uint64 -g_variant_new_handle -g_variant_new_double -g_variant_new_string -g_variant_new_take_string -g_variant_new_printf -g_variant_new_object_path -g_variant_is_object_path -g_variant_new_signature -g_variant_is_signature -g_variant_new_variant -g_variant_new_strv -g_variant_new_objv -g_variant_new_bytestring -g_variant_new_bytestring_array - -<SUBSECTION> -g_variant_get_boolean -g_variant_get_byte -g_variant_get_int16 -g_variant_get_uint16 -g_variant_get_int32 -g_variant_get_uint32 -g_variant_get_int64 -g_variant_get_uint64 -g_variant_get_handle -g_variant_get_double -g_variant_get_string -g_variant_dup_string -g_variant_get_variant -g_variant_get_strv -g_variant_dup_strv -g_variant_get_objv -g_variant_dup_objv -g_variant_get_bytestring -g_variant_dup_bytestring -g_variant_get_bytestring_array -g_variant_dup_bytestring_array - -<SUBSECTION> -g_variant_new_maybe -g_variant_new_array -g_variant_new_tuple -g_variant_new_dict_entry -g_variant_new_fixed_array - -<SUBSECTION> -g_variant_get_maybe -g_variant_n_children -g_variant_get_child_value -g_variant_get_child -g_variant_lookup_value -g_variant_lookup -g_variant_get_fixed_array - -<SUBSECTION> -g_variant_get_size -g_variant_get_data -g_variant_get_data_as_bytes -g_variant_store -g_variant_new_from_data -g_variant_new_from_bytes -g_variant_byteswap -g_variant_get_normal_form -g_variant_is_normal_form - -<SUBSECTION> -g_variant_hash -g_variant_equal - -<SUBSECTION> -g_variant_print -g_variant_print_string - -<SUBSECTION> -GVariantIter -g_variant_iter_copy -g_variant_iter_free -g_variant_iter_init -g_variant_iter_n_children -g_variant_iter_new -g_variant_iter_next_value -g_variant_iter_next -g_variant_iter_loop - -<SUBSECTION> -G_VARIANT_BUILDER_INIT -GVariantBuilder -g_variant_builder_unref -g_variant_builder_ref -g_variant_builder_new -g_variant_builder_init -g_variant_builder_clear -g_variant_builder_add_value -g_variant_builder_add -g_variant_builder_add_parsed -g_variant_builder_end -g_variant_builder_open -g_variant_builder_close - -<SUBSECTION> -G_VARIANT_DICT_INIT -GVariantDict -g_variant_dict_unref -g_variant_dict_ref -g_variant_dict_new -g_variant_dict_init -g_variant_dict_clear -g_variant_dict_contains -g_variant_dict_lookup -g_variant_dict_lookup_value -g_variant_dict_insert -g_variant_dict_insert_value -g_variant_dict_remove -g_variant_dict_end - -<SUBSECTION> -GVariantParseError -G_VARIANT_PARSE_ERROR -g_variant_parse -g_variant_new_parsed_va -g_variant_new_parsed -g_variant_parse_error_print_context - -<SUBSECTION Private> -g_variant_parse_error_quark -g_variant_parser_get_error_quark -g_variant_type_checked_ -g_variant_type_string_get_depth_ -</SECTION> - - -<SECTION> -<FILE>ghostutils</FILE> -<TITLE>Hostname Utilities</TITLE> -g_hostname_to_ascii -g_hostname_to_unicode -<SUBSECTION> -g_hostname_is_non_ascii -g_hostname_is_ascii_encoded -<SUBSECTION> -g_hostname_is_ip_address -</SECTION> - -<SECTION> -<FILE>uuid</FILE> -<TITLE>GUuid</TITLE> -g_uuid_string_is_valid -g_uuid_string_random -</SECTION> - -<SECTION> -<FILE>refcount</FILE> -grefcount -g_ref_count_init -g_ref_count_inc -g_ref_count_dec -g_ref_count_compare -<SUBSECTION> -gatomicrefcount -g_atomic_ref_count_init -g_atomic_ref_count_inc -g_atomic_ref_count_dec -g_atomic_ref_count_compare -</SECTION> - -<SECTION> -<FILE>rcbox</FILE> -g_rc_box_alloc -g_rc_box_alloc0 -g_rc_box_new -g_rc_box_new0 -g_rc_box_dup -g_rc_box_acquire -g_rc_box_release -g_rc_box_release_full -g_rc_box_get_size -</SECTION> - -<SECTION> -<FILE>arcbox</FILE> -g_atomic_rc_box_alloc -g_atomic_rc_box_alloc0 -g_atomic_rc_box_new -g_atomic_rc_box_new0 -g_atomic_rc_box_dup -g_atomic_rc_box_acquire -g_atomic_rc_box_release -g_atomic_rc_box_release_full -g_atomic_rc_box_get_size -</SECTION> - -<SECTION> -<FILE>refstring</FILE> -GRefString -g_ref_string_new -g_ref_string_new_intern -g_ref_string_new_len -g_ref_string_acquire -g_ref_string_release -g_ref_string_length -</SECTION>
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/tests/.gitignore
Deleted
@@ -1,146 +0,0 @@ -actions -appinfo -appinfo-test -appmonitor -apps -async-close-output-stream -async-splice-output-stream -autoptr -basic-application -buffered-input-stream -buffered-output-stream -cancellable -connectable -contenttype -contexts -converter-stream -credentials -data-input-stream -data-output-stream -dbus-appinfo -dbus-launch -de/ -defaultvalue -desktop-app-info -echo-server -file -fileattributematcher -filter-cat -filter-streams -gapplication -gapplication-example-actions -gapplication-example-cmdline -gapplication-example-cmdline2 -gapplication-example-cmdline3 -gapplication-example-dbushooks -gapplication-example-menu -gapplication-example-open -gdbus-addresses -gdbus-auth -gdbus-bz627724 -gdbus-close-pending -gdbus-connection -gdbus-connection-flush -gdbus-connection-flush-helper -gdbus-connection-loss -gdbus-connection-slow -gdbus-daemon -gdbus-error -gdbus-example-export -gdbus-example-objectmanager-client -gdbus-example-objectmanager-server -gdbus-example-own-name -gdbus-example-peer -gdbus-example-proxy-subclass -gdbus-example-server -gdbus-example-subtree -gdbus-example-unix-fd-client -gdbus-example-watch-name -gdbus-example-watch-proxy -gdbus-exit-on-close -gdbus-export -gdbus-introspection -gdbus-message -gdbus-names -gdbus-non-socket -gdbus-overflow -gdbus-peer -gdbus-peer-object-manager -gdbus-proxy -gdbus-proxy-threads -gdbus-proxy-well-known-name -gdbus-serialization -gdbus-test-codegen -gdbus-test-codegen-generated* -gdbus-test-codegen-old -gdbus-test-fixture -gdbus-testserver -gdbus-threading -gdbus-address-get-session -glistmodel -gio-du -giomodule -giotypefuncs.inc -gnotification -gsubprocess -gsubprocess-testprog -g-file -g-file-info -g-icon -gmenumodel -gschemas.compiled -gsettings -gsettings.store -httpd -icons -inet-address -io-stream -live-g-file -memory-input-stream -memory-output-stream -mimeapps -monitor -network-address -network-monitor -org.gtk.test.enums.xml -org.gtk.test.gschema.xml -permission -pollable -plugin_resources.c -proxy -proxy-test -readwrite -resolver -resources -send-data -services/org.gtk.GDBus.Examples.ObjectManager.service -simple-async-result -simple-proxy -sleepy-stream -stream-rw_all -socket -socket-address -socket-client -socket-listener -socket-service -socket-server -srvtarget -task -test-generated.txt -test.gresource -test.mo -test_resources.c -test_resources2.c -test_resources2.h -testfilemonitor -thumbnail-verification -tls-certificate -tls-database -tls-interaction -unix-fd -unix-streams -vfs -volumemonitor -xgen-gio -xgen-giosrc.c -gresource-big-test.txt
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/gversionmacros.h
Deleted
@@ -1,1213 +0,0 @@ -/* GLIB - Library of useful routines for C programming - * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald - * - * SPDX-License-Identifier: LGPL-2.1-or-later - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, see <http://www.gnu.org/licenses/>. - */ - -/* - * Modified by the GLib Team and others 1997-2000. See the AUTHORS - * file for a list of people on the GLib Team. See the ChangeLog - * files for a list of changes. These files are distributed with - * GLib at ftp://ftp.gtk.org/pub/gtk/. - */ - -#ifndef __G_VERSION_MACROS_H__ -#define __G_VERSION_MACROS_H__ - -#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION) -#error "Only <glib.h> can be included directly." -#endif - -/* Version boundaries checks */ - -#define G_ENCODE_VERSION(major,minor) ((major) << 16 | (minor) << 8) - -/* XXX: Every new stable minor release bump should add a macro here */ - -/** - * GLIB_VERSION_2_26: - * - * A macro that evaluates to the 2.26 version of GLib, in a format - * that can be used by the C pre-processor. - * - * Since: 2.32 - */ -#define GLIB_VERSION_2_26 (G_ENCODE_VERSION (2, 26)) - -/** - * GLIB_VERSION_2_28: - * - * A macro that evaluates to the 2.28 version of GLib, in a format - * that can be used by the C pre-processor. - * - * Since: 2.32 - */ -#define GLIB_VERSION_2_28 (G_ENCODE_VERSION (2, 28)) - -/** - * GLIB_VERSION_2_30: - * - * A macro that evaluates to the 2.30 version of GLib, in a format - * that can be used by the C pre-processor. - * - * Since: 2.32 - */ -#define GLIB_VERSION_2_30 (G_ENCODE_VERSION (2, 30)) - -/** - * GLIB_VERSION_2_32: - * - * A macro that evaluates to the 2.32 version of GLib, in a format - * that can be used by the C pre-processor. - * - * Since: 2.32 - */ -#define GLIB_VERSION_2_32 (G_ENCODE_VERSION (2, 32)) - -/** - * GLIB_VERSION_2_34: - * - * A macro that evaluates to the 2.34 version of GLib, in a format - * that can be used by the C pre-processor. - * - * Since: 2.34 - */ -#define GLIB_VERSION_2_34 (G_ENCODE_VERSION (2, 34)) - -/** - * GLIB_VERSION_2_36: - * - * A macro that evaluates to the 2.36 version of GLib, in a format - * that can be used by the C pre-processor. - * - * Since: 2.36 - */ -#define GLIB_VERSION_2_36 (G_ENCODE_VERSION (2, 36)) - -/** - * GLIB_VERSION_2_38: - * - * A macro that evaluates to the 2.38 version of GLib, in a format - * that can be used by the C pre-processor. - * - * Since: 2.38 - */ -#define GLIB_VERSION_2_38 (G_ENCODE_VERSION (2, 38)) - -/** - * GLIB_VERSION_2_40: - * - * A macro that evaluates to the 2.40 version of GLib, in a format - * that can be used by the C pre-processor. - * - * Since: 2.40 - */ -#define GLIB_VERSION_2_40 (G_ENCODE_VERSION (2, 40)) - -/** - * GLIB_VERSION_2_42: - * - * A macro that evaluates to the 2.42 version of GLib, in a format - * that can be used by the C pre-processor. - * - * Since: 2.42 - */ -#define GLIB_VERSION_2_42 (G_ENCODE_VERSION (2, 42)) - -/** - * GLIB_VERSION_2_44: - * - * A macro that evaluates to the 2.44 version of GLib, in a format - * that can be used by the C pre-processor. - * - * Since: 2.44 - */ -#define GLIB_VERSION_2_44 (G_ENCODE_VERSION (2, 44)) - -/** - * GLIB_VERSION_2_46: - * - * A macro that evaluates to the 2.46 version of GLib, in a format - * that can be used by the C pre-processor. - * - * Since: 2.46 - */ -#define GLIB_VERSION_2_46 (G_ENCODE_VERSION (2, 46)) - -/** - * GLIB_VERSION_2_48: - * - * A macro that evaluates to the 2.48 version of GLib, in a format - * that can be used by the C pre-processor. - * - * Since: 2.48 - */ -#define GLIB_VERSION_2_48 (G_ENCODE_VERSION (2, 48)) - -/** - * GLIB_VERSION_2_50: - * - * A macro that evaluates to the 2.50 version of GLib, in a format - * that can be used by the C pre-processor. - * - * Since: 2.50 - */ -#define GLIB_VERSION_2_50 (G_ENCODE_VERSION (2, 50)) - -/** - * GLIB_VERSION_2_52: - * - * A macro that evaluates to the 2.52 version of GLib, in a format - * that can be used by the C pre-processor. - * - * Since: 2.52 - */ -#define GLIB_VERSION_2_52 (G_ENCODE_VERSION (2, 52)) - -/** - * GLIB_VERSION_2_54: - * - * A macro that evaluates to the 2.54 version of GLib, in a format - * that can be used by the C pre-processor. - * - * Since: 2.54 - */ -#define GLIB_VERSION_2_54 (G_ENCODE_VERSION (2, 54)) - -/** - * GLIB_VERSION_2_56: - * - * A macro that evaluates to the 2.56 version of GLib, in a format - * that can be used by the C pre-processor. - * - * Since: 2.56 - */ -#define GLIB_VERSION_2_56 (G_ENCODE_VERSION (2, 56)) - -/** - * GLIB_VERSION_2_58: - * - * A macro that evaluates to the 2.58 version of GLib, in a format - * that can be used by the C pre-processor. - * - * Since: 2.58 - */ -#define GLIB_VERSION_2_58 (G_ENCODE_VERSION (2, 58)) - -/** - * GLIB_VERSION_2_60: - * - * A macro that evaluates to the 2.60 version of GLib, in a format - * that can be used by the C pre-processor. - * - * Since: 2.60 - */ -#define GLIB_VERSION_2_60 (G_ENCODE_VERSION (2, 60)) - -/** - * GLIB_VERSION_2_62: - * - * A macro that evaluates to the 2.62 version of GLib, in a format - * that can be used by the C pre-processor. - * - * Since: 2.62 - */ -#define GLIB_VERSION_2_62 (G_ENCODE_VERSION (2, 62)) - -/** - * GLIB_VERSION_2_64: - * - * A macro that evaluates to the 2.64 version of GLib, in a format - * that can be used by the C pre-processor. - * - * Since: 2.64 - */ -#define GLIB_VERSION_2_64 (G_ENCODE_VERSION (2, 64)) - -/** - * GLIB_VERSION_2_66: - * - * A macro that evaluates to the 2.66 version of GLib, in a format - * that can be used by the C pre-processor. - * - * Since: 2.66 - */ -#define GLIB_VERSION_2_66 (G_ENCODE_VERSION (2, 66)) - -/** - * GLIB_VERSION_2_68: - * - * A macro that evaluates to the 2.68 version of GLib, in a format - * that can be used by the C pre-processor. - * - * Since: 2.68 - */ -#define GLIB_VERSION_2_68 (G_ENCODE_VERSION (2, 68)) - -/** - * GLIB_VERSION_2_70: - * - * A macro that evaluates to the 2.70 version of GLib, in a format - * that can be used by the C pre-processor. - * - * Since: 2.70 - */ -#define GLIB_VERSION_2_70 (G_ENCODE_VERSION (2, 70)) - -/** - * GLIB_VERSION_2_72: - * - * A macro that evaluates to the 2.72 version of GLib, in a format - * that can be used by the C pre-processor. - * - * Since: 2.72 - */ -#define GLIB_VERSION_2_72 (G_ENCODE_VERSION (2, 72)) - -/** - * GLIB_VERSION_2_74: - * - * A macro that evaluates to the 2.74 version of GLib, in a format - * that can be used by the C pre-processor. - * - * Since: 2.74 - */ -#define GLIB_VERSION_2_74 (G_ENCODE_VERSION (2, 74)) - -/** - * GLIB_VERSION_CUR_STABLE: - * - * A macro that evaluates to the current stable version of GLib, in a format - * that can be used by the C pre-processor. - * - * During an unstable development cycle, this evaluates to the next stable - * (unreleased) version which will be the result of the development cycle. - * - * Since: 2.32 - */ -#if (GLIB_MINOR_VERSION % 2) -#define GLIB_VERSION_CUR_STABLE (G_ENCODE_VERSION (GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION + 1)) -#else -#define GLIB_VERSION_CUR_STABLE (G_ENCODE_VERSION (GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION)) -#endif - -/** - * GLIB_VERSION_PREV_STABLE: - * - * A macro that evaluates to the previous stable version of GLib, in a format - * that can be used by the C pre-processor. - * - * During an unstable development cycle, this evaluates to the most recent - * released stable release, which preceded this development cycle. - * - * Since: 2.32 - */ -#if (GLIB_MINOR_VERSION % 2) -#define GLIB_VERSION_PREV_STABLE (G_ENCODE_VERSION (GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION - 1)) -#else -#define GLIB_VERSION_PREV_STABLE (G_ENCODE_VERSION (GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION - 2)) -#endif - -/** - * GLIB_VERSION_MIN_REQUIRED: - * - * A macro that should be defined by the user prior to including - * the glib.h header. - * The definition should be one of the predefined GLib version - * macros: %GLIB_VERSION_2_26, %GLIB_VERSION_2_28,... - * - * This macro defines the earliest version of GLib that the package is - * required to be able to compile against. - * - * If the compiler is configured to warn about the use of deprecated - * functions, then using functions that were deprecated in version - * %GLIB_VERSION_MIN_REQUIRED or earlier will cause warnings (but - * using functions deprecated in later releases will not). - * - * Since: 2.32 - */ -/* If the package sets GLIB_VERSION_MIN_REQUIRED to some future - * GLIB_VERSION_X_Y value that we don't know about, it will compare as - * 0 in preprocessor tests. - */ -#ifndef GLIB_VERSION_MIN_REQUIRED -# define GLIB_VERSION_MIN_REQUIRED (GLIB_VERSION_CUR_STABLE) -#elif GLIB_VERSION_MIN_REQUIRED == 0 -# undef GLIB_VERSION_MIN_REQUIRED -# define GLIB_VERSION_MIN_REQUIRED (GLIB_VERSION_CUR_STABLE + 2) -#endif - -/** - * GLIB_VERSION_MAX_ALLOWED: - * - * A macro that should be defined by the user prior to including - * the glib.h header. - * The definition should be one of the predefined GLib version - * macros: %GLIB_VERSION_2_26, %GLIB_VERSION_2_28,... - * - * This macro defines the latest version of the GLib API that the - * package is allowed to make use of. - * - * If the compiler is configured to warn about the use of deprecated - * functions, then using functions added after version - * %GLIB_VERSION_MAX_ALLOWED will cause warnings. - * - * Unless you are using GLIB_CHECK_VERSION() or the like to compile - * different code depending on the GLib version, then this should be - * set to the same value as %GLIB_VERSION_MIN_REQUIRED. - * - * Since: 2.32 - */ -#if !defined (GLIB_VERSION_MAX_ALLOWED) || (GLIB_VERSION_MAX_ALLOWED == 0) -# undef GLIB_VERSION_MAX_ALLOWED -# define GLIB_VERSION_MAX_ALLOWED (GLIB_VERSION_CUR_STABLE) -#endif - -/* sanity checks */ -#if GLIB_VERSION_MIN_REQUIRED > GLIB_VERSION_CUR_STABLE -#error "GLIB_VERSION_MIN_REQUIRED must be <= GLIB_VERSION_CUR_STABLE" -#endif -#if GLIB_VERSION_MAX_ALLOWED < GLIB_VERSION_MIN_REQUIRED -#error "GLIB_VERSION_MAX_ALLOWED must be >= GLIB_VERSION_MIN_REQUIRED" -#endif -#if GLIB_VERSION_MIN_REQUIRED < GLIB_VERSION_2_26 -#error "GLIB_VERSION_MIN_REQUIRED must be >= GLIB_VERSION_2_26" -#endif - -/* These macros are used to mark deprecated functions in GLib headers, - * and thus have to be exposed in installed headers. But please - * do *not* use them in other projects. Instead, use G_DEPRECATED - * or define your own wrappers around it. - */ -#define GLIB_AVAILABLE_IN_ALL _GLIB_EXTERN - -/* XXX: Every new stable minor release should add a set of macros here */ - -#if GLIB_VERSION_MIN_REQUIRED >= GLIB_VERSION_2_26 -# define GLIB_DEPRECATED_IN_2_26 GLIB_DEPRECATED -# define GLIB_DEPRECATED_IN_2_26_FOR(f) GLIB_DEPRECATED_FOR(f) -# define GLIB_DEPRECATED_MACRO_IN_2_26 GLIB_DEPRECATED_MACRO -# define GLIB_DEPRECATED_MACRO_IN_2_26_FOR(f) GLIB_DEPRECATED_MACRO_FOR(f) -# define GLIB_DEPRECATED_ENUMERATOR_IN_2_26 GLIB_DEPRECATED_ENUMERATOR -# define GLIB_DEPRECATED_ENUMERATOR_IN_2_26_FOR(f) GLIB_DEPRECATED_ENUMERATOR_FOR(f) -# define GLIB_DEPRECATED_TYPE_IN_2_26 GLIB_DEPRECATED_TYPE -# define GLIB_DEPRECATED_TYPE_IN_2_26_FOR(f) GLIB_DEPRECATED_TYPE_FOR(f) -#else -# define GLIB_DEPRECATED_IN_2_26 _GLIB_EXTERN -# define GLIB_DEPRECATED_IN_2_26_FOR(f) _GLIB_EXTERN -# define GLIB_DEPRECATED_MACRO_IN_2_26 -# define GLIB_DEPRECATED_MACRO_IN_2_26_FOR(f) -# define GLIB_DEPRECATED_ENUMERATOR_IN_2_26 -# define GLIB_DEPRECATED_ENUMERATOR_IN_2_26_FOR(f) -# define GLIB_DEPRECATED_TYPE_IN_2_26 -# define GLIB_DEPRECATED_TYPE_IN_2_26_FOR(f) -#endif - -#if GLIB_VERSION_MAX_ALLOWED < GLIB_VERSION_2_26 -# define GLIB_AVAILABLE_IN_2_26 GLIB_UNAVAILABLE(2, 26) -# define GLIB_AVAILABLE_MACRO_IN_2_26 GLIB_UNAVAILABLE_MACRO(2, 26) -# define GLIB_AVAILABLE_ENUMERATOR_IN_2_26 GLIB_UNAVAILABLE_ENUMERATOR(2, 26) -# define GLIB_AVAILABLE_TYPE_IN_2_26 GLIB_UNAVAILABLE_TYPE(2, 26) -#else -# define GLIB_AVAILABLE_IN_2_26 _GLIB_EXTERN -# define GLIB_AVAILABLE_MACRO_IN_2_26 -# define GLIB_AVAILABLE_ENUMERATOR_IN_2_26 -# define GLIB_AVAILABLE_TYPE_IN_2_26 -#endif - -#if GLIB_VERSION_MIN_REQUIRED >= GLIB_VERSION_2_28 -# define GLIB_DEPRECATED_IN_2_28 GLIB_DEPRECATED -# define GLIB_DEPRECATED_IN_2_28_FOR(f) GLIB_DEPRECATED_FOR(f) -# define GLIB_DEPRECATED_MACRO_IN_2_28 GLIB_DEPRECATED_MACRO -# define GLIB_DEPRECATED_MACRO_IN_2_28_FOR(f) GLIB_DEPRECATED_MACRO_FOR(f) -# define GLIB_DEPRECATED_ENUMERATOR_IN_2_28 GLIB_DEPRECATED_ENUMERATOR -# define GLIB_DEPRECATED_ENUMERATOR_IN_2_28_FOR(f) GLIB_DEPRECATED_ENUMERATOR_FOR(f) -# define GLIB_DEPRECATED_TYPE_IN_2_28 GLIB_DEPRECATED_TYPE -# define GLIB_DEPRECATED_TYPE_IN_2_28_FOR(f) GLIB_DEPRECATED_TYPE_FOR(f) -#else -# define GLIB_DEPRECATED_IN_2_28 _GLIB_EXTERN -# define GLIB_DEPRECATED_IN_2_28_FOR(f) _GLIB_EXTERN -# define GLIB_DEPRECATED_MACRO_IN_2_28 -# define GLIB_DEPRECATED_MACRO_IN_2_28_FOR(f) -# define GLIB_DEPRECATED_ENUMERATOR_IN_2_28 -# define GLIB_DEPRECATED_ENUMERATOR_IN_2_28_FOR(f) -# define GLIB_DEPRECATED_TYPE_IN_2_28 -# define GLIB_DEPRECATED_TYPE_IN_2_28_FOR(f) -#endif - -#if GLIB_VERSION_MAX_ALLOWED < GLIB_VERSION_2_28 -# define GLIB_AVAILABLE_IN_2_28 GLIB_UNAVAILABLE(2, 28) -# define GLIB_AVAILABLE_MACRO_IN_2_28 GLIB_UNAVAILABLE_MACRO(2, 28) -# define GLIB_AVAILABLE_ENUMERATOR_IN_2_28 GLIB_UNAVAILABLE_ENUMERATOR(2, 28) -# define GLIB_AVAILABLE_TYPE_IN_2_28 GLIB_UNAVAILABLE_TYPE(2, 28) -#else -# define GLIB_AVAILABLE_IN_2_28 _GLIB_EXTERN -# define GLIB_AVAILABLE_MACRO_IN_2_28 -# define GLIB_AVAILABLE_ENUMERATOR_IN_2_28 -# define GLIB_AVAILABLE_TYPE_IN_2_28 -#endif - -#if GLIB_VERSION_MIN_REQUIRED >= GLIB_VERSION_2_30 -# define GLIB_DEPRECATED_IN_2_30 GLIB_DEPRECATED -# define GLIB_DEPRECATED_IN_2_30_FOR(f) GLIB_DEPRECATED_FOR(f) -# define GLIB_DEPRECATED_MACRO_IN_2_30 GLIB_DEPRECATED_MACRO -# define GLIB_DEPRECATED_MACRO_IN_2_30_FOR(f) GLIB_DEPRECATED_MACRO_FOR(f) -# define GLIB_DEPRECATED_ENUMERATOR_IN_2_30 GLIB_DEPRECATED_ENUMERATOR -# define GLIB_DEPRECATED_ENUMERATOR_IN_2_30_FOR(f) GLIB_DEPRECATED_ENUMERATOR_FOR(f) -# define GLIB_DEPRECATED_TYPE_IN_2_30 GLIB_DEPRECATED_TYPE -# define GLIB_DEPRECATED_TYPE_IN_2_30_FOR(f) GLIB_DEPRECATED_TYPE_FOR(f) -#else -# define GLIB_DEPRECATED_IN_2_30 _GLIB_EXTERN -# define GLIB_DEPRECATED_IN_2_30_FOR(f) _GLIB_EXTERN -# define GLIB_DEPRECATED_MACRO_IN_2_30 -# define GLIB_DEPRECATED_MACRO_IN_2_30_FOR(f) -# define GLIB_DEPRECATED_ENUMERATOR_IN_2_30 -# define GLIB_DEPRECATED_ENUMERATOR_IN_2_30_FOR(f) -# define GLIB_DEPRECATED_TYPE_IN_2_30 -# define GLIB_DEPRECATED_TYPE_IN_2_30_FOR(f) -#endif - -#if GLIB_VERSION_MAX_ALLOWED < GLIB_VERSION_2_30 -# define GLIB_AVAILABLE_IN_2_30 GLIB_UNAVAILABLE(2, 30) -# define GLIB_AVAILABLE_MACRO_IN_2_30 GLIB_UNAVAILABLE_MACRO(2, 30) -# define GLIB_AVAILABLE_ENUMERATOR_IN_2_30 GLIB_UNAVAILABLE_ENUMERATOR(2, 30) -# define GLIB_AVAILABLE_TYPE_IN_2_30 GLIB_UNAVAILABLE_TYPE(2, 30) -#else -# define GLIB_AVAILABLE_IN_2_30 _GLIB_EXTERN -# define GLIB_AVAILABLE_MACRO_IN_2_30 -# define GLIB_AVAILABLE_ENUMERATOR_IN_2_30 -# define GLIB_AVAILABLE_TYPE_IN_2_30 -#endif - -#if GLIB_VERSION_MIN_REQUIRED >= GLIB_VERSION_2_32 -# define GLIB_DEPRECATED_IN_2_32 GLIB_DEPRECATED -# define GLIB_DEPRECATED_IN_2_32_FOR(f) GLIB_DEPRECATED_FOR(f) -# define GLIB_DEPRECATED_MACRO_IN_2_32 GLIB_DEPRECATED_MACRO -# define GLIB_DEPRECATED_MACRO_IN_2_32_FOR(f) GLIB_DEPRECATED_MACRO_FOR(f) -# define GLIB_DEPRECATED_ENUMERATOR_IN_2_32 GLIB_DEPRECATED_ENUMERATOR -# define GLIB_DEPRECATED_ENUMERATOR_IN_2_32_FOR(f) GLIB_DEPRECATED_ENUMERATOR_FOR(f) -# define GLIB_DEPRECATED_TYPE_IN_2_32 GLIB_DEPRECATED_TYPE -# define GLIB_DEPRECATED_TYPE_IN_2_32_FOR(f) GLIB_DEPRECATED_TYPE_FOR(f) -#else -# define GLIB_DEPRECATED_IN_2_32 _GLIB_EXTERN -# define GLIB_DEPRECATED_IN_2_32_FOR(f) _GLIB_EXTERN -# define GLIB_DEPRECATED_MACRO_IN_2_32 -# define GLIB_DEPRECATED_MACRO_IN_2_32_FOR(f) -# define GLIB_DEPRECATED_ENUMERATOR_IN_2_32 -# define GLIB_DEPRECATED_ENUMERATOR_IN_2_32_FOR(f) -# define GLIB_DEPRECATED_TYPE_IN_2_32 -# define GLIB_DEPRECATED_TYPE_IN_2_32_FOR(f) -# define GLIB_DEPRECATED_ENUMERATOR_IN_2_32 -# define GLIB_DEPRECATED_ENUMERATOR_IN_2_32_FOR(f) -# define GLIB_DEPRECATED_TYPE_IN_2_32 -# define GLIB_DEPRECATED_TYPE_IN_2_32_FOR(f) -#endif - -#if GLIB_VERSION_MAX_ALLOWED < GLIB_VERSION_2_32 -# define GLIB_AVAILABLE_IN_2_32 GLIB_UNAVAILABLE(2, 32) -# define GLIB_AVAILABLE_MACRO_IN_2_32 GLIB_UNAVAILABLE_MACRO(2, 32) -# define GLIB_AVAILABLE_ENUMERATOR_IN_2_32 GLIB_UNAVAILABLE_ENUMERATOR(2, 32) -# define GLIB_AVAILABLE_TYPE_IN_2_32 GLIB_UNAVAILABLE_TYPE(2, 32) -#else -# define GLIB_AVAILABLE_IN_2_32 _GLIB_EXTERN -# define GLIB_AVAILABLE_MACRO_IN_2_32 -# define GLIB_AVAILABLE_ENUMERATOR_IN_2_32 -# define GLIB_AVAILABLE_TYPE_IN_2_32 -#endif - -#if GLIB_VERSION_MIN_REQUIRED >= GLIB_VERSION_2_34 -# define GLIB_DEPRECATED_IN_2_34 GLIB_DEPRECATED -# define GLIB_DEPRECATED_IN_2_34_FOR(f) GLIB_DEPRECATED_FOR(f) -# define GLIB_DEPRECATED_MACRO_IN_2_34 GLIB_DEPRECATED_MACRO -# define GLIB_DEPRECATED_MACRO_IN_2_34_FOR(f) GLIB_DEPRECATED_MACRO_FOR(f) -# define GLIB_DEPRECATED_ENUMERATOR_IN_2_34 GLIB_DEPRECATED_ENUMERATOR -# define GLIB_DEPRECATED_ENUMERATOR_IN_2_34_FOR(f) GLIB_DEPRECATED_ENUMERATOR_FOR(f) -# define GLIB_DEPRECATED_TYPE_IN_2_34 GLIB_DEPRECATED_TYPE -# define GLIB_DEPRECATED_TYPE_IN_2_34_FOR(f) GLIB_DEPRECATED_TYPE_FOR(f) -#else -# define GLIB_DEPRECATED_IN_2_34 _GLIB_EXTERN -# define GLIB_DEPRECATED_IN_2_34_FOR(f) _GLIB_EXTERN -# define GLIB_DEPRECATED_MACRO_IN_2_34 -# define GLIB_DEPRECATED_MACRO_IN_2_34_FOR(f) -# define GLIB_DEPRECATED_ENUMERATOR_IN_2_34 -# define GLIB_DEPRECATED_ENUMERATOR_IN_2_34_FOR(f) -# define GLIB_DEPRECATED_TYPE_IN_2_34 -# define GLIB_DEPRECATED_TYPE_IN_2_34_FOR(f) -#endif - -#if GLIB_VERSION_MAX_ALLOWED < GLIB_VERSION_2_34 -# define GLIB_AVAILABLE_IN_2_34 GLIB_UNAVAILABLE(2, 34) -# define GLIB_AVAILABLE_MACRO_IN_2_34 GLIB_UNAVAILABLE_MACRO(2, 34) -# define GLIB_AVAILABLE_ENUMERATOR_IN_2_34 GLIB_UNAVAILABLE_ENUMERATOR(2, 34) -# define GLIB_AVAILABLE_TYPE_IN_2_34 GLIB_UNAVAILABLE_TYPE(2, 34) -#else -# define GLIB_AVAILABLE_IN_2_34 _GLIB_EXTERN -# define GLIB_AVAILABLE_MACRO_IN_2_34 -# define GLIB_AVAILABLE_ENUMERATOR_IN_2_34 -# define GLIB_AVAILABLE_TYPE_IN_2_34 -#endif - -#if GLIB_VERSION_MIN_REQUIRED >= GLIB_VERSION_2_36 -# define GLIB_DEPRECATED_IN_2_36 GLIB_DEPRECATED -# define GLIB_DEPRECATED_IN_2_36_FOR(f) GLIB_DEPRECATED_FOR(f) -# define GLIB_DEPRECATED_MACRO_IN_2_36 GLIB_DEPRECATED_MACRO -# define GLIB_DEPRECATED_MACRO_IN_2_36_FOR(f) GLIB_DEPRECATED_MACRO_FOR(f) -# define GLIB_DEPRECATED_ENUMERATOR_IN_2_36 GLIB_DEPRECATED_ENUMERATOR -# define GLIB_DEPRECATED_ENUMERATOR_IN_2_36_FOR(f) GLIB_DEPRECATED_ENUMERATOR_FOR(f) -# define GLIB_DEPRECATED_TYPE_IN_2_36 GLIB_DEPRECATED_TYPE -# define GLIB_DEPRECATED_TYPE_IN_2_36_FOR(f) GLIB_DEPRECATED_TYPE_FOR(f) -#else -# define GLIB_DEPRECATED_IN_2_36 _GLIB_EXTERN -# define GLIB_DEPRECATED_IN_2_36_FOR(f) _GLIB_EXTERN -# define GLIB_DEPRECATED_MACRO_IN_2_36 -# define GLIB_DEPRECATED_MACRO_IN_2_36_FOR(f) -# define GLIB_DEPRECATED_ENUMERATOR_IN_2_36 -# define GLIB_DEPRECATED_ENUMERATOR_IN_2_36_FOR(f) -# define GLIB_DEPRECATED_TYPE_IN_2_36 -# define GLIB_DEPRECATED_TYPE_IN_2_36_FOR(f) -#endif - -#if GLIB_VERSION_MAX_ALLOWED < GLIB_VERSION_2_36 -# define GLIB_AVAILABLE_IN_2_36 GLIB_UNAVAILABLE(2, 36) -# define GLIB_AVAILABLE_MACRO_IN_2_36 GLIB_UNAVAILABLE_MACRO(2, 36) -# define GLIB_AVAILABLE_ENUMERATOR_IN_2_36 GLIB_UNAVAILABLE_ENUMERATOR(2, 36) -# define GLIB_AVAILABLE_TYPE_IN_2_36 GLIB_UNAVAILABLE_TYPE(2, 36) -#else -# define GLIB_AVAILABLE_IN_2_36 _GLIB_EXTERN -# define GLIB_AVAILABLE_MACRO_IN_2_36 -# define GLIB_AVAILABLE_ENUMERATOR_IN_2_36 -# define GLIB_AVAILABLE_TYPE_IN_2_36 -#endif - -#if GLIB_VERSION_MIN_REQUIRED >= GLIB_VERSION_2_38 -# define GLIB_DEPRECATED_IN_2_38 GLIB_DEPRECATED -# define GLIB_DEPRECATED_IN_2_38_FOR(f) GLIB_DEPRECATED_FOR(f) -# define GLIB_DEPRECATED_MACRO_IN_2_38 GLIB_DEPRECATED_MACRO -# define GLIB_DEPRECATED_MACRO_IN_2_38_FOR(f) GLIB_DEPRECATED_MACRO_FOR(f) -# define GLIB_DEPRECATED_ENUMERATOR_IN_2_38 GLIB_DEPRECATED_ENUMERATOR -# define GLIB_DEPRECATED_ENUMERATOR_IN_2_38_FOR(f) GLIB_DEPRECATED_ENUMERATOR_FOR(f) -# define GLIB_DEPRECATED_TYPE_IN_2_38 GLIB_DEPRECATED_TYPE -# define GLIB_DEPRECATED_TYPE_IN_2_38_FOR(f) GLIB_DEPRECATED_TYPE_FOR(f) -#else -# define GLIB_DEPRECATED_IN_2_38 _GLIB_EXTERN -# define GLIB_DEPRECATED_IN_2_38_FOR(f) _GLIB_EXTERN -# define GLIB_DEPRECATED_MACRO_IN_2_38 -# define GLIB_DEPRECATED_MACRO_IN_2_38_FOR(f) -# define GLIB_DEPRECATED_ENUMERATOR_IN_2_38 -# define GLIB_DEPRECATED_ENUMERATOR_IN_2_38_FOR(f) -# define GLIB_DEPRECATED_TYPE_IN_2_38 -# define GLIB_DEPRECATED_TYPE_IN_2_38_FOR(f) -#endif - -#if GLIB_VERSION_MAX_ALLOWED < GLIB_VERSION_2_38 -# define GLIB_AVAILABLE_IN_2_38 GLIB_UNAVAILABLE(2, 38) -# define GLIB_AVAILABLE_MACRO_IN_2_38 GLIB_UNAVAILABLE_MACRO(2, 38) -# define GLIB_AVAILABLE_ENUMERATOR_IN_2_38 GLIB_UNAVAILABLE_ENUMERATOR(2, 38) -# define GLIB_AVAILABLE_TYPE_IN_2_38 GLIB_UNAVAILABLE_TYPE(2, 38) -#else -# define GLIB_AVAILABLE_IN_2_38 _GLIB_EXTERN -# define GLIB_AVAILABLE_MACRO_IN_2_38 -# define GLIB_AVAILABLE_ENUMERATOR_IN_2_38 -# define GLIB_AVAILABLE_TYPE_IN_2_38 -#endif - -#if GLIB_VERSION_MIN_REQUIRED >= GLIB_VERSION_2_40 -# define GLIB_DEPRECATED_IN_2_40 GLIB_DEPRECATED -# define GLIB_DEPRECATED_IN_2_40_FOR(f) GLIB_DEPRECATED_FOR(f) -# define GLIB_DEPRECATED_MACRO_IN_2_40 GLIB_DEPRECATED_MACRO -# define GLIB_DEPRECATED_MACRO_IN_2_40_FOR(f) GLIB_DEPRECATED_MACRO_FOR(f) -# define GLIB_DEPRECATED_ENUMERATOR_IN_2_40 GLIB_DEPRECATED_ENUMERATOR -# define GLIB_DEPRECATED_ENUMERATOR_IN_2_40_FOR(f) GLIB_DEPRECATED_ENUMERATOR_FOR(f) -# define GLIB_DEPRECATED_TYPE_IN_2_40 GLIB_DEPRECATED_TYPE -# define GLIB_DEPRECATED_TYPE_IN_2_40_FOR(f) GLIB_DEPRECATED_TYPE_FOR(f) -#else -# define GLIB_DEPRECATED_IN_2_40 _GLIB_EXTERN -# define GLIB_DEPRECATED_IN_2_40_FOR(f) _GLIB_EXTERN -# define GLIB_DEPRECATED_MACRO_IN_2_40 -# define GLIB_DEPRECATED_MACRO_IN_2_40_FOR(f) -# define GLIB_DEPRECATED_ENUMERATOR_IN_2_40 -# define GLIB_DEPRECATED_ENUMERATOR_IN_2_40_FOR(f) -# define GLIB_DEPRECATED_TYPE_IN_2_40 -# define GLIB_DEPRECATED_TYPE_IN_2_40_FOR(f) -#endif - -#if GLIB_VERSION_MAX_ALLOWED < GLIB_VERSION_2_40 -# define GLIB_AVAILABLE_IN_2_40 GLIB_UNAVAILABLE(2, 40) -# define GLIB_AVAILABLE_MACRO_IN_2_40 GLIB_UNAVAILABLE_MACRO(2, 40) -# define GLIB_AVAILABLE_ENUMERATOR_IN_2_40 GLIB_UNAVAILABLE_ENUMERATOR(2, 40) -# define GLIB_AVAILABLE_TYPE_IN_2_40 GLIB_UNAVAILABLE_TYPE(2, 40) -#else -# define GLIB_AVAILABLE_IN_2_40 _GLIB_EXTERN -# define GLIB_AVAILABLE_MACRO_IN_2_40 -# define GLIB_AVAILABLE_ENUMERATOR_IN_2_40 -# define GLIB_AVAILABLE_TYPE_IN_2_40 -#endif - -#if GLIB_VERSION_MIN_REQUIRED >= GLIB_VERSION_2_42 -# define GLIB_DEPRECATED_IN_2_42 GLIB_DEPRECATED -# define GLIB_DEPRECATED_IN_2_42_FOR(f) GLIB_DEPRECATED_FOR(f) -# define GLIB_DEPRECATED_MACRO_IN_2_42 GLIB_DEPRECATED_MACRO -# define GLIB_DEPRECATED_MACRO_IN_2_42_FOR(f) GLIB_DEPRECATED_MACRO_FOR(f) -#else -# define GLIB_DEPRECATED_IN_2_42 _GLIB_EXTERN -# define GLIB_DEPRECATED_IN_2_42_FOR(f) _GLIB_EXTERN -# define GLIB_DEPRECATED_MACRO_IN_2_42 -# define GLIB_DEPRECATED_MACRO_IN_2_42_FOR(f) -# define GLIB_DEPRECATED_ENUMERATOR_IN_2_42 -# define GLIB_DEPRECATED_ENUMERATOR_IN_2_42_FOR(f) -# define GLIB_DEPRECATED_TYPE_IN_2_42 -# define GLIB_DEPRECATED_TYPE_IN_2_42_FOR(f) -#endif - -#if GLIB_VERSION_MAX_ALLOWED < GLIB_VERSION_2_42 -# define GLIB_AVAILABLE_IN_2_42 GLIB_UNAVAILABLE(2, 42) -# define GLIB_AVAILABLE_MACRO_IN_2_42 GLIB_UNAVAILABLE_MACRO(2, 42) -# define GLIB_AVAILABLE_ENUMERATOR_IN_2_42 GLIB_UNAVAILABLE_ENUMERATOR(2, 42) -# define GLIB_AVAILABLE_TYPE_IN_2_42 GLIB_UNAVAILABLE_TYPE(2, 42) -#else -# define GLIB_AVAILABLE_IN_2_42 _GLIB_EXTERN -# define GLIB_AVAILABLE_MACRO_IN_2_42 -# define GLIB_AVAILABLE_ENUMERATOR_IN_2_42 -# define GLIB_AVAILABLE_TYPE_IN_2_42 -#endif - -#if GLIB_VERSION_MIN_REQUIRED >= GLIB_VERSION_2_44 -# define GLIB_DEPRECATED_IN_2_44 GLIB_DEPRECATED -# define GLIB_DEPRECATED_IN_2_44_FOR(f) GLIB_DEPRECATED_FOR(f) -# define GLIB_DEPRECATED_MACRO_IN_2_44 GLIB_DEPRECATED_MACRO -# define GLIB_DEPRECATED_MACRO_IN_2_44_FOR(f) GLIB_DEPRECATED_MACRO_FOR(f) -# define GLIB_DEPRECATED_ENUMERATOR_IN_2_44 GLIB_DEPRECATED_ENUMERATOR -# define GLIB_DEPRECATED_ENUMERATOR_IN_2_44_FOR(f) GLIB_DEPRECATED_ENUMERATOR_FOR(f) -# define GLIB_DEPRECATED_TYPE_IN_2_44 GLIB_DEPRECATED_TYPE -# define GLIB_DEPRECATED_TYPE_IN_2_44_FOR(f) GLIB_DEPRECATED_TYPE_FOR(f) -#else -# define GLIB_DEPRECATED_IN_2_44 _GLIB_EXTERN -# define GLIB_DEPRECATED_IN_2_44_FOR(f) _GLIB_EXTERN -# define GLIB_DEPRECATED_MACRO_IN_2_44 -# define GLIB_DEPRECATED_MACRO_IN_2_44_FOR(f) -# define GLIB_DEPRECATED_ENUMERATOR_IN_2_44 -# define GLIB_DEPRECATED_ENUMERATOR_IN_2_44_FOR(f) -# define GLIB_DEPRECATED_TYPE_IN_2_44 -# define GLIB_DEPRECATED_TYPE_IN_2_44_FOR(f) -#endif - -#if GLIB_VERSION_MAX_ALLOWED < GLIB_VERSION_2_44 -# define GLIB_AVAILABLE_IN_2_44 GLIB_UNAVAILABLE(2, 44) -# define GLIB_AVAILABLE_STATIC_INLINE_IN_2_44 GLIB_UNAVAILABLE_STATIC_INLINE(2, 44) -# define GLIB_AVAILABLE_MACRO_IN_2_44 GLIB_UNAVAILABLE_MACRO(2, 44) -# define GLIB_AVAILABLE_ENUMERATOR_IN_2_44 GLIB_UNAVAILABLE_ENUMERATOR(2, 44) -# define GLIB_AVAILABLE_TYPE_IN_2_44 GLIB_UNAVAILABLE_TYPE(2, 44) -#else -# define GLIB_AVAILABLE_IN_2_44 _GLIB_EXTERN -# define GLIB_AVAILABLE_STATIC_INLINE_IN_2_44 -# define GLIB_AVAILABLE_MACRO_IN_2_44 -# define GLIB_AVAILABLE_ENUMERATOR_IN_2_44 -# define GLIB_AVAILABLE_TYPE_IN_2_44 -#endif - -#if GLIB_VERSION_MIN_REQUIRED >= GLIB_VERSION_2_46 -# define GLIB_DEPRECATED_IN_2_46 GLIB_DEPRECATED -# define GLIB_DEPRECATED_IN_2_46_FOR(f) GLIB_DEPRECATED_FOR(f) -# define GLIB_DEPRECATED_MACRO_IN_2_46 GLIB_DEPRECATED_MACRO -# define GLIB_DEPRECATED_MACRO_IN_2_46_FOR(f) GLIB_DEPRECATED_MACRO_FOR(f) -#else -# define GLIB_DEPRECATED_IN_2_46 _GLIB_EXTERN -# define GLIB_DEPRECATED_IN_2_46_FOR(f) _GLIB_EXTERN -# define GLIB_DEPRECATED_MACRO_IN_2_46 -# define GLIB_DEPRECATED_MACRO_IN_2_46_FOR(f) -# define GLIB_DEPRECATED_ENUMERATOR_IN_2_46 -# define GLIB_DEPRECATED_ENUMERATOR_IN_2_46_FOR(f) -# define GLIB_DEPRECATED_TYPE_IN_2_46 -# define GLIB_DEPRECATED_TYPE_IN_2_46_FOR(f) -#endif - -#if GLIB_VERSION_MAX_ALLOWED < GLIB_VERSION_2_46 -# define GLIB_AVAILABLE_IN_2_46 GLIB_UNAVAILABLE(2, 46) -# define GLIB_AVAILABLE_MACRO_IN_2_46 GLIB_UNAVAILABLE_MACRO(2, 46) -# define GLIB_AVAILABLE_ENUMERATOR_IN_2_46 GLIB_UNAVAILABLE_ENUMERATOR(2, 46) -# define GLIB_AVAILABLE_TYPE_IN_2_46 GLIB_UNAVAILABLE_TYPE(2, 46) -#else -# define GLIB_AVAILABLE_IN_2_46 _GLIB_EXTERN -# define GLIB_AVAILABLE_MACRO_IN_2_46 -# define GLIB_AVAILABLE_ENUMERATOR_IN_2_46 -# define GLIB_AVAILABLE_TYPE_IN_2_46 -#endif - -#if GLIB_VERSION_MIN_REQUIRED >= GLIB_VERSION_2_48 -# define GLIB_DEPRECATED_IN_2_48 GLIB_DEPRECATED -# define GLIB_DEPRECATED_IN_2_48_FOR(f) GLIB_DEPRECATED_FOR(f) -# define GLIB_DEPRECATED_MACRO_IN_2_48 GLIB_DEPRECATED_MACRO -# define GLIB_DEPRECATED_MACRO_IN_2_48_FOR(f) GLIB_DEPRECATED_MACRO_FOR(f) -# define GLIB_DEPRECATED_ENUMERATOR_IN_2_48 GLIB_DEPRECATED_ENUMERATOR -# define GLIB_DEPRECATED_ENUMERATOR_IN_2_48_FOR(f) GLIB_DEPRECATED_ENUMERATOR_FOR(f) -# define GLIB_DEPRECATED_TYPE_IN_2_48 GLIB_DEPRECATED_TYPE -# define GLIB_DEPRECATED_TYPE_IN_2_48_FOR(f) GLIB_DEPRECATED_TYPE_FOR(f) -#else -# define GLIB_DEPRECATED_IN_2_48 _GLIB_EXTERN -# define GLIB_DEPRECATED_IN_2_48_FOR(f) _GLIB_EXTERN -# define GLIB_DEPRECATED_MACRO_IN_2_48 -# define GLIB_DEPRECATED_MACRO_IN_2_48_FOR(f) -# define GLIB_DEPRECATED_ENUMERATOR_IN_2_48 -# define GLIB_DEPRECATED_ENUMERATOR_IN_2_48_FOR(f) -# define GLIB_DEPRECATED_TYPE_IN_2_48 -# define GLIB_DEPRECATED_TYPE_IN_2_48_FOR(f) -#endif - -#if GLIB_VERSION_MAX_ALLOWED < GLIB_VERSION_2_48 -# define GLIB_AVAILABLE_IN_2_48 GLIB_UNAVAILABLE(2, 48) -# define GLIB_AVAILABLE_MACRO_IN_2_48 GLIB_UNAVAILABLE_MACRO(2, 48) -# define GLIB_AVAILABLE_ENUMERATOR_IN_2_48 GLIB_UNAVAILABLE_ENUMERATOR(2, 48) -# define GLIB_AVAILABLE_TYPE_IN_2_48 GLIB_UNAVAILABLE_TYPE(2, 48) -#else -# define GLIB_AVAILABLE_IN_2_48 _GLIB_EXTERN -# define GLIB_AVAILABLE_MACRO_IN_2_48 -# define GLIB_AVAILABLE_ENUMERATOR_IN_2_48 -# define GLIB_AVAILABLE_TYPE_IN_2_48 -#endif - -#if GLIB_VERSION_MIN_REQUIRED >= GLIB_VERSION_2_50 -# define GLIB_DEPRECATED_IN_2_50 GLIB_DEPRECATED -# define GLIB_DEPRECATED_IN_2_50_FOR(f) GLIB_DEPRECATED_FOR(f) -# define GLIB_DEPRECATED_MACRO_IN_2_50 GLIB_DEPRECATED_MACRO -# define GLIB_DEPRECATED_MACRO_IN_2_50_FOR(f) GLIB_DEPRECATED_MACRO_FOR(f) -# define GLIB_DEPRECATED_ENUMERATOR_IN_2_50 GLIB_DEPRECATED_ENUMERATOR -# define GLIB_DEPRECATED_ENUMERATOR_IN_2_50_FOR(f) GLIB_DEPRECATED_ENUMERATOR_FOR(f) -# define GLIB_DEPRECATED_TYPE_IN_2_50 GLIB_DEPRECATED_TYPE -# define GLIB_DEPRECATED_TYPE_IN_2_50_FOR(f) GLIB_DEPRECATED_TYPE_FOR(f) -#else -# define GLIB_DEPRECATED_IN_2_50 _GLIB_EXTERN -# define GLIB_DEPRECATED_IN_2_50_FOR(f) _GLIB_EXTERN -# define GLIB_DEPRECATED_MACRO_IN_2_50 -# define GLIB_DEPRECATED_MACRO_IN_2_50_FOR(f) -# define GLIB_DEPRECATED_ENUMERATOR_IN_2_50 -# define GLIB_DEPRECATED_ENUMERATOR_IN_2_50_FOR(f) -# define GLIB_DEPRECATED_TYPE_IN_2_50 -# define GLIB_DEPRECATED_TYPE_IN_2_50_FOR(f) -#endif - -#if GLIB_VERSION_MAX_ALLOWED < GLIB_VERSION_2_50 -# define GLIB_AVAILABLE_IN_2_50 GLIB_UNAVAILABLE(2, 50) -# define GLIB_AVAILABLE_MACRO_IN_2_50 GLIB_UNAVAILABLE_MACRO(2, 50) -# define GLIB_AVAILABLE_ENUMERATOR_IN_2_50 GLIB_UNAVAILABLE_ENUMERATOR(2, 50) -# define GLIB_AVAILABLE_TYPE_IN_2_50 GLIB_UNAVAILABLE_TYPE(2, 50) -#else -# define GLIB_AVAILABLE_IN_2_50 _GLIB_EXTERN -# define GLIB_AVAILABLE_MACRO_IN_2_50 -# define GLIB_AVAILABLE_ENUMERATOR_IN_2_50 -# define GLIB_AVAILABLE_TYPE_IN_2_50 -#endif - -#if GLIB_VERSION_MIN_REQUIRED >= GLIB_VERSION_2_52 -# define GLIB_DEPRECATED_IN_2_52 GLIB_DEPRECATED -# define GLIB_DEPRECATED_IN_2_52_FOR(f) GLIB_DEPRECATED_FOR(f) -# define GLIB_DEPRECATED_MACRO_IN_2_52 GLIB_DEPRECATED_MACRO -# define GLIB_DEPRECATED_MACRO_IN_2_52_FOR(f) GLIB_DEPRECATED_MACRO_FOR(f) -# define GLIB_DEPRECATED_ENUMERATOR_IN_2_52 GLIB_DEPRECATED_ENUMERATOR -# define GLIB_DEPRECATED_ENUMERATOR_IN_2_52_FOR(f) GLIB_DEPRECATED_ENUMERATOR_FOR(f) -# define GLIB_DEPRECATED_TYPE_IN_2_52 GLIB_DEPRECATED_TYPE -# define GLIB_DEPRECATED_TYPE_IN_2_52_FOR(f) GLIB_DEPRECATED_TYPE_FOR(f) -#else -# define GLIB_DEPRECATED_IN_2_52 _GLIB_EXTERN -# define GLIB_DEPRECATED_IN_2_52_FOR(f) _GLIB_EXTERN -# define GLIB_DEPRECATED_MACRO_IN_2_52 -# define GLIB_DEPRECATED_MACRO_IN_2_52_FOR(f) -# define GLIB_DEPRECATED_ENUMERATOR_IN_2_52 -# define GLIB_DEPRECATED_ENUMERATOR_IN_2_52_FOR(f) -# define GLIB_DEPRECATED_TYPE_IN_2_52 -# define GLIB_DEPRECATED_TYPE_IN_2_52_FOR(f) -#endif - -#if GLIB_VERSION_MAX_ALLOWED < GLIB_VERSION_2_52 -# define GLIB_AVAILABLE_IN_2_52 GLIB_UNAVAILABLE(2, 52) -# define GLIB_AVAILABLE_MACRO_IN_2_52 GLIB_UNAVAILABLE_MACRO(2, 52) -# define GLIB_AVAILABLE_ENUMERATOR_IN_2_52 GLIB_UNAVAILABLE_ENUMERATOR(2, 52) -# define GLIB_AVAILABLE_TYPE_IN_2_52 GLIB_UNAVAILABLE_TYPE(2, 52) -#else -# define GLIB_AVAILABLE_IN_2_52 _GLIB_EXTERN -# define GLIB_AVAILABLE_MACRO_IN_2_52 -# define GLIB_AVAILABLE_ENUMERATOR_IN_2_52 -# define GLIB_AVAILABLE_TYPE_IN_2_52 -#endif - -#if GLIB_VERSION_MIN_REQUIRED >= GLIB_VERSION_2_54 -# define GLIB_DEPRECATED_IN_2_54 GLIB_DEPRECATED -# define GLIB_DEPRECATED_IN_2_54_FOR(f) GLIB_DEPRECATED_FOR(f) -# define GLIB_DEPRECATED_MACRO_IN_2_54 GLIB_DEPRECATED_MACRO -# define GLIB_DEPRECATED_MACRO_IN_2_54_FOR(f) GLIB_DEPRECATED_MACRO_FOR(f) -# define GLIB_DEPRECATED_ENUMERATOR_IN_2_54 GLIB_DEPRECATED_ENUMERATOR -# define GLIB_DEPRECATED_ENUMERATOR_IN_2_54_FOR(f) GLIB_DEPRECATED_ENUMERATOR_FOR(f) -# define GLIB_DEPRECATED_TYPE_IN_2_54 GLIB_DEPRECATED_TYPE -# define GLIB_DEPRECATED_TYPE_IN_2_54_FOR(f) GLIB_DEPRECATED_TYPE_FOR(f) -#else -# define GLIB_DEPRECATED_IN_2_54 _GLIB_EXTERN -# define GLIB_DEPRECATED_IN_2_54_FOR(f) _GLIB_EXTERN -# define GLIB_DEPRECATED_MACRO_IN_2_54 -# define GLIB_DEPRECATED_MACRO_IN_2_54_FOR(f) -# define GLIB_DEPRECATED_ENUMERATOR_IN_2_54 -# define GLIB_DEPRECATED_ENUMERATOR_IN_2_54_FOR(f) -# define GLIB_DEPRECATED_TYPE_IN_2_54 -# define GLIB_DEPRECATED_TYPE_IN_2_54_FOR(f) -#endif - -#if GLIB_VERSION_MAX_ALLOWED < GLIB_VERSION_2_54 -# define GLIB_AVAILABLE_IN_2_54 GLIB_UNAVAILABLE(2, 54) -# define GLIB_AVAILABLE_MACRO_IN_2_54 GLIB_UNAVAILABLE_MACRO(2, 54) -# define GLIB_AVAILABLE_ENUMERATOR_IN_2_54 GLIB_UNAVAILABLE_ENUMERATOR(2, 54) -# define GLIB_AVAILABLE_TYPE_IN_2_54 GLIB_UNAVAILABLE_TYPE(2, 54) -#else -# define GLIB_AVAILABLE_IN_2_54 _GLIB_EXTERN -# define GLIB_AVAILABLE_MACRO_IN_2_54 -# define GLIB_AVAILABLE_ENUMERATOR_IN_2_54 -# define GLIB_AVAILABLE_TYPE_IN_2_54 -#endif - -#if GLIB_VERSION_MIN_REQUIRED >= GLIB_VERSION_2_56 -# define GLIB_DEPRECATED_IN_2_56 GLIB_DEPRECATED -# define GLIB_DEPRECATED_IN_2_56_FOR(f) GLIB_DEPRECATED_FOR(f) -# define GLIB_DEPRECATED_MACRO_IN_2_56 GLIB_DEPRECATED_MACRO -# define GLIB_DEPRECATED_MACRO_IN_2_56_FOR(f) GLIB_DEPRECATED_MACRO_FOR(f) -# define GLIB_DEPRECATED_ENUMERATOR_IN_2_56 GLIB_DEPRECATED_ENUMERATOR -# define GLIB_DEPRECATED_ENUMERATOR_IN_2_56_FOR(f) GLIB_DEPRECATED_ENUMERATOR_FOR(f) -# define GLIB_DEPRECATED_TYPE_IN_2_56 GLIB_DEPRECATED_TYPE -# define GLIB_DEPRECATED_TYPE_IN_2_56_FOR(f) GLIB_DEPRECATED_TYPE_FOR(f) -#else -# define GLIB_DEPRECATED_IN_2_56 _GLIB_EXTERN -# define GLIB_DEPRECATED_IN_2_56_FOR(f) _GLIB_EXTERN -# define GLIB_DEPRECATED_MACRO_IN_2_56 -# define GLIB_DEPRECATED_MACRO_IN_2_56_FOR(f) -# define GLIB_DEPRECATED_ENUMERATOR_IN_2_56 -# define GLIB_DEPRECATED_ENUMERATOR_IN_2_56_FOR(f) -# define GLIB_DEPRECATED_TYPE_IN_2_56 -# define GLIB_DEPRECATED_TYPE_IN_2_56_FOR(f) -#endif - -#if GLIB_VERSION_MAX_ALLOWED < GLIB_VERSION_2_56 -# define GLIB_AVAILABLE_IN_2_56 GLIB_UNAVAILABLE(2, 56) -# define GLIB_AVAILABLE_MACRO_IN_2_56 GLIB_UNAVAILABLE_MACRO(2, 56) -# define GLIB_AVAILABLE_ENUMERATOR_IN_2_56 GLIB_UNAVAILABLE_ENUMERATOR(2, 56) -# define GLIB_AVAILABLE_TYPE_IN_2_56 GLIB_UNAVAILABLE_TYPE(2, 56) -#else -# define GLIB_AVAILABLE_IN_2_56 _GLIB_EXTERN -# define GLIB_AVAILABLE_MACRO_IN_2_56 -# define GLIB_AVAILABLE_ENUMERATOR_IN_2_56 -# define GLIB_AVAILABLE_TYPE_IN_2_56 -#endif - -#if GLIB_VERSION_MIN_REQUIRED >= GLIB_VERSION_2_58 -# define GLIB_DEPRECATED_IN_2_58 GLIB_DEPRECATED -# define GLIB_DEPRECATED_IN_2_58_FOR(f) GLIB_DEPRECATED_FOR(f) -# define GLIB_DEPRECATED_MACRO_IN_2_58 GLIB_DEPRECATED_MACRO -# define GLIB_DEPRECATED_MACRO_IN_2_58_FOR(f) GLIB_DEPRECATED_MACRO_FOR(f) -# define GLIB_DEPRECATED_ENUMERATOR_IN_2_58 GLIB_DEPRECATED_ENUMERATOR -# define GLIB_DEPRECATED_ENUMERATOR_IN_2_58_FOR(f) GLIB_DEPRECATED_ENUMERATOR_FOR(f) -# define GLIB_DEPRECATED_TYPE_IN_2_58 GLIB_DEPRECATED_TYPE -# define GLIB_DEPRECATED_TYPE_IN_2_58_FOR(f) GLIB_DEPRECATED_TYPE_FOR(f) -#else -# define GLIB_DEPRECATED_IN_2_58 _GLIB_EXTERN -# define GLIB_DEPRECATED_IN_2_58_FOR(f) _GLIB_EXTERN -# define GLIB_DEPRECATED_MACRO_IN_2_58 -# define GLIB_DEPRECATED_MACRO_IN_2_58_FOR(f) -# define GLIB_DEPRECATED_ENUMERATOR_IN_2_58 -# define GLIB_DEPRECATED_ENUMERATOR_IN_2_58_FOR(f) -# define GLIB_DEPRECATED_TYPE_IN_2_58 -# define GLIB_DEPRECATED_TYPE_IN_2_58_FOR(f) -#endif - -#if GLIB_VERSION_MAX_ALLOWED < GLIB_VERSION_2_58 -# define GLIB_AVAILABLE_IN_2_58 GLIB_UNAVAILABLE(2, 58) -# define GLIB_AVAILABLE_MACRO_IN_2_58 GLIB_UNAVAILABLE_MACRO(2, 58) -# define GLIB_AVAILABLE_ENUMERATOR_IN_2_58 GLIB_UNAVAILABLE_ENUMERATOR(2, 58) -# define GLIB_AVAILABLE_TYPE_IN_2_58 GLIB_UNAVAILABLE_TYPE(2, 58) -#else -# define GLIB_AVAILABLE_IN_2_58 _GLIB_EXTERN -# define GLIB_AVAILABLE_MACRO_IN_2_58 -# define GLIB_AVAILABLE_ENUMERATOR_IN_2_58 -# define GLIB_AVAILABLE_TYPE_IN_2_58 -#endif - -#if GLIB_VERSION_MIN_REQUIRED >= GLIB_VERSION_2_60 -# define GLIB_DEPRECATED_IN_2_60 GLIB_DEPRECATED -# define GLIB_DEPRECATED_IN_2_60_FOR(f) GLIB_DEPRECATED_FOR(f) -# define GLIB_DEPRECATED_MACRO_IN_2_60 GLIB_DEPRECATED_MACRO -# define GLIB_DEPRECATED_MACRO_IN_2_60_FOR(f) GLIB_DEPRECATED_MACRO_FOR(f) -# define GLIB_DEPRECATED_ENUMERATOR_IN_2_60 GLIB_DEPRECATED_ENUMERATOR -# define GLIB_DEPRECATED_ENUMERATOR_IN_2_60_FOR(f) GLIB_DEPRECATED_ENUMERATOR_FOR(f) -# define GLIB_DEPRECATED_TYPE_IN_2_60 GLIB_DEPRECATED_TYPE -# define GLIB_DEPRECATED_TYPE_IN_2_60_FOR(f) GLIB_DEPRECATED_TYPE_FOR(f) -#else -# define GLIB_DEPRECATED_IN_2_60 _GLIB_EXTERN -# define GLIB_DEPRECATED_IN_2_60_FOR(f) _GLIB_EXTERN -# define GLIB_DEPRECATED_MACRO_IN_2_60 -# define GLIB_DEPRECATED_MACRO_IN_2_60_FOR(f) -# define GLIB_DEPRECATED_ENUMERATOR_IN_2_60 -# define GLIB_DEPRECATED_ENUMERATOR_IN_2_60_FOR(f) -# define GLIB_DEPRECATED_TYPE_IN_2_60 -# define GLIB_DEPRECATED_TYPE_IN_2_60_FOR(f) -#endif - -#if GLIB_VERSION_MAX_ALLOWED < GLIB_VERSION_2_60 -# define GLIB_AVAILABLE_IN_2_60 GLIB_UNAVAILABLE(2, 60) -# define GLIB_AVAILABLE_STATIC_INLINE_IN_2_60 GLIB_UNAVAILABLE_STATIC_INLINE(2, 60) -# define GLIB_AVAILABLE_MACRO_IN_2_60 GLIB_UNAVAILABLE_MACRO(2, 60) -# define GLIB_AVAILABLE_ENUMERATOR_IN_2_60 GLIB_UNAVAILABLE_ENUMERATOR(2, 60) -# define GLIB_AVAILABLE_TYPE_IN_2_60 GLIB_UNAVAILABLE_TYPE(2, 60) -#else -# define GLIB_AVAILABLE_IN_2_60 _GLIB_EXTERN -# define GLIB_AVAILABLE_STATIC_INLINE_IN_2_60 -# define GLIB_AVAILABLE_MACRO_IN_2_60 -# define GLIB_AVAILABLE_ENUMERATOR_IN_2_60 -# define GLIB_AVAILABLE_TYPE_IN_2_60 -#endif - -#if GLIB_VERSION_MIN_REQUIRED >= GLIB_VERSION_2_62 -# define GLIB_DEPRECATED_IN_2_62 GLIB_DEPRECATED -# define GLIB_DEPRECATED_IN_2_62_FOR(f) GLIB_DEPRECATED_FOR(f) -# define GLIB_DEPRECATED_MACRO_IN_2_62 GLIB_DEPRECATED_MACRO -# define GLIB_DEPRECATED_MACRO_IN_2_62_FOR(f) GLIB_DEPRECATED_MACRO_FOR(f) -# define GLIB_DEPRECATED_ENUMERATOR_IN_2_62 GLIB_DEPRECATED_ENUMERATOR -# define GLIB_DEPRECATED_ENUMERATOR_IN_2_62_FOR(f) GLIB_DEPRECATED_ENUMERATOR_FOR(f) -# define GLIB_DEPRECATED_TYPE_IN_2_62 GLIB_DEPRECATED_TYPE -# define GLIB_DEPRECATED_TYPE_IN_2_62_FOR(f) GLIB_DEPRECATED_TYPE_FOR(f) -#else -# define GLIB_DEPRECATED_IN_2_62 _GLIB_EXTERN -# define GLIB_DEPRECATED_IN_2_62_FOR(f) _GLIB_EXTERN -# define GLIB_DEPRECATED_MACRO_IN_2_62 -# define GLIB_DEPRECATED_MACRO_IN_2_62_FOR(f) -# define GLIB_DEPRECATED_ENUMERATOR_IN_2_62 -# define GLIB_DEPRECATED_ENUMERATOR_IN_2_62_FOR(f) -# define GLIB_DEPRECATED_TYPE_IN_2_62 -# define GLIB_DEPRECATED_TYPE_IN_2_62_FOR(f) -#endif - -#if GLIB_VERSION_MAX_ALLOWED < GLIB_VERSION_2_62 -# define GLIB_AVAILABLE_IN_2_62 GLIB_UNAVAILABLE(2, 62) -# define GLIB_AVAILABLE_STATIC_INLINE_IN_2_62 GLIB_UNAVAILABLE_STATIC_INLINE(2, 62) -# define GLIB_AVAILABLE_MACRO_IN_2_62 GLIB_UNAVAILABLE_MACRO(2, 62) -# define GLIB_AVAILABLE_ENUMERATOR_IN_2_62 GLIB_UNAVAILABLE_ENUMERATOR(2, 62) -# define GLIB_AVAILABLE_TYPE_IN_2_62 GLIB_UNAVAILABLE_TYPE(2, 62) -#else -# define GLIB_AVAILABLE_IN_2_62 _GLIB_EXTERN -# define GLIB_AVAILABLE_STATIC_INLINE_IN_2_62 -# define GLIB_AVAILABLE_MACRO_IN_2_62 -# define GLIB_AVAILABLE_ENUMERATOR_IN_2_62 -# define GLIB_AVAILABLE_TYPE_IN_2_62 -#endif - -#if GLIB_VERSION_MIN_REQUIRED >= GLIB_VERSION_2_64 -# define GLIB_DEPRECATED_IN_2_64 GLIB_DEPRECATED -# define GLIB_DEPRECATED_IN_2_64_FOR(f) GLIB_DEPRECATED_FOR(f) -# define GLIB_DEPRECATED_MACRO_IN_2_64 GLIB_DEPRECATED_MACRO -# define GLIB_DEPRECATED_MACRO_IN_2_64_FOR(f) GLIB_DEPRECATED_MACRO_FOR(f) -# define GLIB_DEPRECATED_ENUMERATOR_IN_2_64 GLIB_DEPRECATED_ENUMERATOR -# define GLIB_DEPRECATED_ENUMERATOR_IN_2_64_FOR(f) GLIB_DEPRECATED_ENUMERATOR_FOR(f) -# define GLIB_DEPRECATED_TYPE_IN_2_64 GLIB_DEPRECATED_TYPE -# define GLIB_DEPRECATED_TYPE_IN_2_64_FOR(f) GLIB_DEPRECATED_TYPE_FOR(f) -#else -# define GLIB_DEPRECATED_IN_2_64 _GLIB_EXTERN -# define GLIB_DEPRECATED_IN_2_64_FOR(f) _GLIB_EXTERN -# define GLIB_DEPRECATED_MACRO_IN_2_64 -# define GLIB_DEPRECATED_MACRO_IN_2_64_FOR(f) -# define GLIB_DEPRECATED_ENUMERATOR_IN_2_64 -# define GLIB_DEPRECATED_ENUMERATOR_IN_2_64_FOR(f) -# define GLIB_DEPRECATED_TYPE_IN_2_64 -# define GLIB_DEPRECATED_TYPE_IN_2_64_FOR(f) -#endif - -#if GLIB_VERSION_MAX_ALLOWED < GLIB_VERSION_2_64 -# define GLIB_AVAILABLE_IN_2_64 GLIB_UNAVAILABLE(2, 64) -# define GLIB_AVAILABLE_STATIC_INLINE_IN_2_64 GLIB_UNAVAILABLE_STATIC_INLINE(2, 64) -# define GLIB_AVAILABLE_MACRO_IN_2_64 GLIB_UNAVAILABLE_MACRO(2, 64) -# define GLIB_AVAILABLE_ENUMERATOR_IN_2_64 GLIB_UNAVAILABLE_ENUMERATOR(2, 64) -# define GLIB_AVAILABLE_TYPE_IN_2_64 GLIB_UNAVAILABLE_TYPE(2, 64) -#else -# define GLIB_AVAILABLE_IN_2_64 _GLIB_EXTERN -# define GLIB_AVAILABLE_STATIC_INLINE_IN_2_64 -# define GLIB_AVAILABLE_MACRO_IN_2_64 -# define GLIB_AVAILABLE_ENUMERATOR_IN_2_64 -# define GLIB_AVAILABLE_TYPE_IN_2_64 -#endif - -#if GLIB_VERSION_MIN_REQUIRED >= GLIB_VERSION_2_66 -# define GLIB_DEPRECATED_IN_2_66 GLIB_DEPRECATED -# define GLIB_DEPRECATED_IN_2_66_FOR(f) GLIB_DEPRECATED_FOR(f) -# define GLIB_DEPRECATED_MACRO_IN_2_66 GLIB_DEPRECATED_MACRO -# define GLIB_DEPRECATED_MACRO_IN_2_66_FOR(f) GLIB_DEPRECATED_MACRO_FOR(f) -# define GLIB_DEPRECATED_ENUMERATOR_IN_2_66 GLIB_DEPRECATED_ENUMERATOR -# define GLIB_DEPRECATED_ENUMERATOR_IN_2_66_FOR(f) GLIB_DEPRECATED_ENUMERATOR_FOR(f) -# define GLIB_DEPRECATED_TYPE_IN_2_66 GLIB_DEPRECATED_TYPE -# define GLIB_DEPRECATED_TYPE_IN_2_66_FOR(f) GLIB_DEPRECATED_TYPE_FOR(f) -#else -# define GLIB_DEPRECATED_IN_2_66 _GLIB_EXTERN -# define GLIB_DEPRECATED_IN_2_66_FOR(f) _GLIB_EXTERN -# define GLIB_DEPRECATED_MACRO_IN_2_66 -# define GLIB_DEPRECATED_MACRO_IN_2_66_FOR(f) -# define GLIB_DEPRECATED_ENUMERATOR_IN_2_66 -# define GLIB_DEPRECATED_ENUMERATOR_IN_2_66_FOR(f) -# define GLIB_DEPRECATED_TYPE_IN_2_66 -# define GLIB_DEPRECATED_TYPE_IN_2_66_FOR(f) -#endif - -#if GLIB_VERSION_MAX_ALLOWED < GLIB_VERSION_2_66 -# define GLIB_AVAILABLE_IN_2_66 GLIB_UNAVAILABLE(2, 66) -# define GLIB_AVAILABLE_STATIC_INLINE_IN_2_66 GLIB_UNAVAILABLE_STATIC_INLINE(2, 66) -# define GLIB_AVAILABLE_MACRO_IN_2_66 GLIB_UNAVAILABLE_MACRO(2, 66) -# define GLIB_AVAILABLE_ENUMERATOR_IN_2_66 GLIB_UNAVAILABLE_ENUMERATOR(2, 66) -# define GLIB_AVAILABLE_TYPE_IN_2_66 GLIB_UNAVAILABLE_TYPE(2, 66) -#else -# define GLIB_AVAILABLE_IN_2_66 _GLIB_EXTERN -# define GLIB_AVAILABLE_STATIC_INLINE_IN_2_66 -# define GLIB_AVAILABLE_MACRO_IN_2_66 -# define GLIB_AVAILABLE_ENUMERATOR_IN_2_66 -# define GLIB_AVAILABLE_TYPE_IN_2_66 -#endif - -#if GLIB_VERSION_MIN_REQUIRED >= GLIB_VERSION_2_68 -# define GLIB_DEPRECATED_IN_2_68 GLIB_DEPRECATED -# define GLIB_DEPRECATED_IN_2_68_FOR(f) GLIB_DEPRECATED_FOR(f) -# define GLIB_DEPRECATED_MACRO_IN_2_68 GLIB_DEPRECATED_MACRO -# define GLIB_DEPRECATED_MACRO_IN_2_68_FOR(f) GLIB_DEPRECATED_MACRO_FOR(f) -# define GLIB_DEPRECATED_ENUMERATOR_IN_2_68 GLIB_DEPRECATED_ENUMERATOR -# define GLIB_DEPRECATED_ENUMERATOR_IN_2_68_FOR(f) GLIB_DEPRECATED_ENUMERATOR_FOR(f) -# define GLIB_DEPRECATED_TYPE_IN_2_68 GLIB_DEPRECATED_TYPE -# define GLIB_DEPRECATED_TYPE_IN_2_68_FOR(f) GLIB_DEPRECATED_TYPE_FOR(f) -#else -# define GLIB_DEPRECATED_IN_2_68 _GLIB_EXTERN -# define GLIB_DEPRECATED_IN_2_68_FOR(f) _GLIB_EXTERN -# define GLIB_DEPRECATED_MACRO_IN_2_68 -# define GLIB_DEPRECATED_MACRO_IN_2_68_FOR(f) -# define GLIB_DEPRECATED_ENUMERATOR_IN_2_68 -# define GLIB_DEPRECATED_ENUMERATOR_IN_2_68_FOR(f) -# define GLIB_DEPRECATED_TYPE_IN_2_68 -# define GLIB_DEPRECATED_TYPE_IN_2_68_FOR(f) -#endif - -#if GLIB_VERSION_MAX_ALLOWED < GLIB_VERSION_2_68 -# define GLIB_AVAILABLE_IN_2_68 GLIB_UNAVAILABLE(2, 68) -# define GLIB_AVAILABLE_STATIC_INLINE_IN_2_68 GLIB_UNAVAILABLE_STATIC_INLINE(2, 68) -# define GLIB_AVAILABLE_MACRO_IN_2_68 GLIB_UNAVAILABLE_MACRO(2, 68) -# define GLIB_AVAILABLE_ENUMERATOR_IN_2_68 GLIB_UNAVAILABLE_ENUMERATOR(2, 68) -# define GLIB_AVAILABLE_TYPE_IN_2_68 GLIB_UNAVAILABLE_TYPE(2, 68) -#else -# define GLIB_AVAILABLE_IN_2_68 _GLIB_EXTERN -# define GLIB_AVAILABLE_STATIC_INLINE_IN_2_68 -# define GLIB_AVAILABLE_MACRO_IN_2_68 -# define GLIB_AVAILABLE_ENUMERATOR_IN_2_68 -# define GLIB_AVAILABLE_TYPE_IN_2_68 -#endif - -#if GLIB_VERSION_MIN_REQUIRED >= GLIB_VERSION_2_70 -# define GLIB_DEPRECATED_IN_2_70 GLIB_DEPRECATED -# define GLIB_DEPRECATED_IN_2_70_FOR(f) GLIB_DEPRECATED_FOR(f) -# define GLIB_DEPRECATED_MACRO_IN_2_70 GLIB_DEPRECATED_MACRO -# define GLIB_DEPRECATED_MACRO_IN_2_70_FOR(f) GLIB_DEPRECATED_MACRO_FOR(f) -# define GLIB_DEPRECATED_ENUMERATOR_IN_2_70 GLIB_DEPRECATED_ENUMERATOR -# define GLIB_DEPRECATED_ENUMERATOR_IN_2_70_FOR(f) GLIB_DEPRECATED_ENUMERATOR_FOR(f) -# define GLIB_DEPRECATED_TYPE_IN_2_70 GLIB_DEPRECATED_TYPE -# define GLIB_DEPRECATED_TYPE_IN_2_70_FOR(f) GLIB_DEPRECATED_TYPE_FOR(f) -#else -# define GLIB_DEPRECATED_IN_2_70 _GLIB_EXTERN -# define GLIB_DEPRECATED_IN_2_70_FOR(f) _GLIB_EXTERN -# define GLIB_DEPRECATED_MACRO_IN_2_70 -# define GLIB_DEPRECATED_MACRO_IN_2_70_FOR(f) -# define GLIB_DEPRECATED_ENUMERATOR_IN_2_70 -# define GLIB_DEPRECATED_ENUMERATOR_IN_2_70_FOR(f) -# define GLIB_DEPRECATED_TYPE_IN_2_70 -# define GLIB_DEPRECATED_TYPE_IN_2_70_FOR(f) -#endif - -#if GLIB_VERSION_MAX_ALLOWED < GLIB_VERSION_2_70 -# define GLIB_AVAILABLE_IN_2_70 GLIB_UNAVAILABLE(2, 70) -# define GLIB_AVAILABLE_STATIC_INLINE_IN_2_70 GLIB_UNAVAILABLE_STATIC_INLINE(2, 70) -# define GLIB_AVAILABLE_MACRO_IN_2_70 GLIB_UNAVAILABLE_MACRO(2, 70) -# define GLIB_AVAILABLE_ENUMERATOR_IN_2_70 GLIB_UNAVAILABLE_ENUMERATOR(2, 70) -# define GLIB_AVAILABLE_TYPE_IN_2_70 GLIB_UNAVAILABLE_TYPE(2, 70) -#else -# define GLIB_AVAILABLE_IN_2_70 _GLIB_EXTERN -# define GLIB_AVAILABLE_STATIC_INLINE_IN_2_70 -# define GLIB_AVAILABLE_MACRO_IN_2_70 -# define GLIB_AVAILABLE_ENUMERATOR_IN_2_70 -# define GLIB_AVAILABLE_TYPE_IN_2_70 -#endif - -#if GLIB_VERSION_MIN_REQUIRED >= GLIB_VERSION_2_72 -# define GLIB_DEPRECATED_IN_2_72 GLIB_DEPRECATED -# define GLIB_DEPRECATED_IN_2_72_FOR(f) GLIB_DEPRECATED_FOR(f) -# define GLIB_DEPRECATED_MACRO_IN_2_72 GLIB_DEPRECATED_MACRO -# define GLIB_DEPRECATED_MACRO_IN_2_72_FOR(f) GLIB_DEPRECATED_MACRO_FOR(f) -# define GLIB_DEPRECATED_ENUMERATOR_IN_2_72 GLIB_DEPRECATED_ENUMERATOR -# define GLIB_DEPRECATED_ENUMERATOR_IN_2_72_FOR(f) GLIB_DEPRECATED_ENUMERATOR_FOR(f) -# define GLIB_DEPRECATED_TYPE_IN_2_72 GLIB_DEPRECATED_TYPE -# define GLIB_DEPRECATED_TYPE_IN_2_72_FOR(f) GLIB_DEPRECATED_TYPE_FOR(f) -#else -# define GLIB_DEPRECATED_IN_2_72 _GLIB_EXTERN -# define GLIB_DEPRECATED_IN_2_72_FOR(f) _GLIB_EXTERN -# define GLIB_DEPRECATED_MACRO_IN_2_72 -# define GLIB_DEPRECATED_MACRO_IN_2_72_FOR(f) -# define GLIB_DEPRECATED_ENUMERATOR_IN_2_72 -# define GLIB_DEPRECATED_ENUMERATOR_IN_2_72_FOR(f) -# define GLIB_DEPRECATED_TYPE_IN_2_72 -# define GLIB_DEPRECATED_TYPE_IN_2_72_FOR(f) -#endif - -#if GLIB_VERSION_MAX_ALLOWED < GLIB_VERSION_2_72 -# define GLIB_AVAILABLE_IN_2_72 GLIB_UNAVAILABLE(2, 72) -# define GLIB_AVAILABLE_STATIC_INLINE_IN_2_72 GLIB_UNAVAILABLE_STATIC_INLINE(2, 72) -# define GLIB_AVAILABLE_MACRO_IN_2_72 GLIB_UNAVAILABLE_MACRO(2, 72) -# define GLIB_AVAILABLE_ENUMERATOR_IN_2_72 GLIB_UNAVAILABLE_ENUMERATOR(2, 72) -# define GLIB_AVAILABLE_TYPE_IN_2_72 GLIB_UNAVAILABLE_TYPE(2, 72) -#else -# define GLIB_AVAILABLE_IN_2_72 _GLIB_EXTERN -# define GLIB_AVAILABLE_STATIC_INLINE_IN_2_72 -# define GLIB_AVAILABLE_MACRO_IN_2_72 -# define GLIB_AVAILABLE_ENUMERATOR_IN_2_72 -# define GLIB_AVAILABLE_TYPE_IN_2_72 -#endif - -#if GLIB_VERSION_MIN_REQUIRED >= GLIB_VERSION_2_74 -# define GLIB_DEPRECATED_IN_2_74 GLIB_DEPRECATED -# define GLIB_DEPRECATED_IN_2_74_FOR(f) GLIB_DEPRECATED_FOR(f) -# define GLIB_DEPRECATED_MACRO_IN_2_74 GLIB_DEPRECATED_MACRO -# define GLIB_DEPRECATED_MACRO_IN_2_74_FOR(f) GLIB_DEPRECATED_MACRO_FOR(f) -# define GLIB_DEPRECATED_ENUMERATOR_IN_2_74 GLIB_DEPRECATED_ENUMERATOR -# define GLIB_DEPRECATED_ENUMERATOR_IN_2_74_FOR(f) GLIB_DEPRECATED_ENUMERATOR_FOR(f) -# define GLIB_DEPRECATED_TYPE_IN_2_74 GLIB_DEPRECATED_TYPE -# define GLIB_DEPRECATED_TYPE_IN_2_74_FOR(f) GLIB_DEPRECATED_TYPE_FOR(f) -#else -# define GLIB_DEPRECATED_IN_2_74 _GLIB_EXTERN -# define GLIB_DEPRECATED_IN_2_74_FOR(f) _GLIB_EXTERN -# define GLIB_DEPRECATED_MACRO_IN_2_74 -# define GLIB_DEPRECATED_MACRO_IN_2_74_FOR(f) -# define GLIB_DEPRECATED_ENUMERATOR_IN_2_74 -# define GLIB_DEPRECATED_ENUMERATOR_IN_2_74_FOR(f) -# define GLIB_DEPRECATED_TYPE_IN_2_74 -# define GLIB_DEPRECATED_TYPE_IN_2_74_FOR(f) -#endif - -#if GLIB_VERSION_MAX_ALLOWED < GLIB_VERSION_2_74 -# define GLIB_AVAILABLE_IN_2_74 GLIB_UNAVAILABLE(2, 74) -# define GLIB_AVAILABLE_STATIC_INLINE_IN_2_74 GLIB_UNAVAILABLE_STATIC_INLINE(2, 74) -# define GLIB_AVAILABLE_MACRO_IN_2_74 GLIB_UNAVAILABLE_MACRO(2, 74) -# define GLIB_AVAILABLE_ENUMERATOR_IN_2_74 GLIB_UNAVAILABLE_ENUMERATOR(2, 74) -# define GLIB_AVAILABLE_TYPE_IN_2_74 GLIB_UNAVAILABLE_TYPE(2, 74) -#else -# define GLIB_AVAILABLE_IN_2_74 _GLIB_EXTERN -# define GLIB_AVAILABLE_STATIC_INLINE_IN_2_74 -# define GLIB_AVAILABLE_MACRO_IN_2_74 -# define GLIB_AVAILABLE_ENUMERATOR_IN_2_74 -# define GLIB_AVAILABLE_TYPE_IN_2_74 -#endif - -#endif /* __G_VERSION_MACROS_H__ */
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/tests/.gitignore
Deleted
@@ -1,89 +0,0 @@ -1bit-emufutex -1bit-mutex -642026 -642026-ec -array-test -asyncqueue -atomic -autoptr -base64 -bitlock -bookmarkfile -bytes -cache -checksum -collate -cond -convert -dataset -date -dir -environment -error -fileutils -gdatetime -guuid -gvariant -gwakeup -gwakeup-fallback -hash -hmac -hook -hostutils -include -keyfile -list -logging -mainloop -malloc -mappedfile -markup -markup-collect -markup-escape -markup-parse -markup-subparser -mem-overflow -mutex -node -once -option-argv0 -option-context -overflow -overflow-fallback -pattern -private -protocol -queue -rand -rec-mutex -regex -rwlock -scannerapi -search-utils -sequence -shell -slice -slist -sort -spawn-multithreaded -spawn-singlethread -strfuncs -string -testing -test-printf -test-spawn-echo -thread -timeout -timer -tmpsample.xml -tree -unicode -unix -unix-multithreaded -unix-nothreads -uri -utf8-misc -utf8-performance -utf8-pointer -utf8-validate -utils
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/tests/memchunks.c
Deleted
@@ -1,603 +0,0 @@ -/* GLIB - Library of useful routines for C programming - * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, see <http://www.gnu.org/licenses/>. - */ - -/* - * Modified by the GLib Team and others 1997-2000. See the AUTHORS - * file for a list of people on the GLib Team. See the ChangeLog - * files for a list of changes. These files are distributed with - * GLib at ftp://ftp.gtk.org/pub/gtk/. - */ - -/* - * MT safe - */ - -#include "config.h" - -#include <stdlib.h> -#include <string.h> -#include <signal.h> - -#include "glib.h" - -/* notes on macros: - * if ENABLE_GC_FRIENDLY is defined, freed memory should be 0-wiped. - */ - -#define MEM_PROFILE_TABLE_SIZE 4096 - -#define MEM_AREA_SIZE 4L - -static guint mem_chunk_recursion = 0; -# define MEM_CHUNK_ROUTINE_COUNT() (mem_chunk_recursion) -# define ENTER_MEM_CHUNK_ROUTINE() (mem_chunk_recursion = MEM_CHUNK_ROUTINE_COUNT () + 1) -# define LEAVE_MEM_CHUNK_ROUTINE() (mem_chunk_recursion = MEM_CHUNK_ROUTINE_COUNT () - 1) - -/* --- old memchunk prototypes --- */ -GMemChunk* old_mem_chunk_new (const gchar *name, - gulong atom_size, - gulong area_size, - gint type); -void old_mem_chunk_destroy (GMemChunk *mem_chunk); -gpointer old_mem_chunk_alloc (GMemChunk *mem_chunk); -gpointer old_mem_chunk_alloc0 (GMemChunk *mem_chunk); -void old_mem_chunk_free (GMemChunk *mem_chunk, - gpointer mem); -void old_mem_chunk_clean (GMemChunk *mem_chunk); -void old_mem_chunk_reset (GMemChunk *mem_chunk); -void old_mem_chunk_print (GMemChunk *mem_chunk); -void old_mem_chunk_info (void); - - -/* --- MemChunks --- */ -#ifndef G_ALLOC_AND_FREE -typedef struct _GAllocator GAllocator; -typedef struct _GMemChunk GMemChunk; -#define G_ALLOC_ONLY 1 -#define G_ALLOC_AND_FREE 2 -#endif - -typedef struct _GFreeAtom GFreeAtom; -typedef struct _GMemArea GMemArea; - -struct _GFreeAtom -{ - GFreeAtom *next; -}; - -struct _GMemArea -{ - GMemArea *next; /* the next mem area */ - GMemArea *prev; /* the previous mem area */ - gulong index; /* the current index into the "mem" array */ - gulong free; /* the number of free bytes in this mem area */ - gulong allocated; /* the number of atoms allocated from this area */ - gulong mark; /* is this mem area marked for deletion */ - gchar memMEM_AREA_SIZE; /* the mem array from which atoms get allocated - * the actual size of this array is determined by - * the mem chunk "area_size". ANSI says that it - * must be declared to be the maximum size it - * can possibly be (even though the actual size - * may be less). - */ -}; - -struct _GMemChunk -{ - const gchar *name; /* name of this MemChunk...used for debugging output */ - gint type; /* the type of MemChunk: ALLOC_ONLY or ALLOC_AND_FREE */ - gint num_mem_areas; /* the number of memory areas */ - gint num_marked_areas; /* the number of areas marked for deletion */ - guint atom_size; /* the size of an atom */ - gulong area_size; /* the size of a memory area */ - GMemArea *mem_area; /* the current memory area */ - GMemArea *mem_areas; /* a list of all the mem areas owned by this chunk */ - GMemArea *free_mem_area; /* the free area...which is about to be destroyed */ - GFreeAtom *free_atoms; /* the free atoms list */ - GTree *mem_tree; /* tree of mem areas sorted by memory address */ - GMemChunk *next; /* pointer to the next chunk */ - GMemChunk *prev; /* pointer to the previous chunk */ -}; - - -static gulong old_mem_chunk_compute_size (gulong size, - gulong min_size) G_GNUC_CONST; -static gint old_mem_chunk_area_compare (GMemArea *a, - GMemArea *b); -static gint old_mem_chunk_area_search (GMemArea *a, - gchar *addr); - -/* here we can't use StaticMutexes, as they depend upon a working - * g_malloc, the same holds true for StaticPrivate - */ -static GMutex mem_chunks_lock; -static GMemChunk *mem_chunks = NULL; - -GMemChunk* -old_mem_chunk_new (const gchar *name, - gulong atom_size, - gulong area_size, - gint type) -{ - GMemChunk *mem_chunk; - gulong rarea_size; - - g_return_val_if_fail (atom_size > 0, NULL); - g_return_val_if_fail (area_size >= atom_size, NULL); - - ENTER_MEM_CHUNK_ROUTINE (); - - area_size = (area_size + atom_size - 1) / atom_size; - area_size *= atom_size; - - mem_chunk = g_new (GMemChunk, 1); - mem_chunk->name = name; - mem_chunk->type = type; - mem_chunk->num_mem_areas = 0; - mem_chunk->num_marked_areas = 0; - mem_chunk->mem_area = NULL; - mem_chunk->free_mem_area = NULL; - mem_chunk->free_atoms = NULL; - mem_chunk->mem_tree = NULL; - mem_chunk->mem_areas = NULL; - mem_chunk->atom_size = atom_size; - - if (mem_chunk->type == G_ALLOC_AND_FREE) - mem_chunk->mem_tree = g_tree_new ((GCompareFunc) old_mem_chunk_area_compare); - - if (mem_chunk->atom_size % G_MEM_ALIGN) - mem_chunk->atom_size += G_MEM_ALIGN - (mem_chunk->atom_size % G_MEM_ALIGN); - - rarea_size = area_size + sizeof (GMemArea) - MEM_AREA_SIZE; - rarea_size = old_mem_chunk_compute_size (rarea_size, atom_size + sizeof (GMemArea) - MEM_AREA_SIZE); - mem_chunk->area_size = rarea_size - (sizeof (GMemArea) - MEM_AREA_SIZE); - - g_mutex_lock (&mem_chunks_lock); - mem_chunk->next = mem_chunks; - mem_chunk->prev = NULL; - if (mem_chunks) - mem_chunks->prev = mem_chunk; - mem_chunks = mem_chunk; - g_mutex_unlock (&mem_chunks_lock); - - LEAVE_MEM_CHUNK_ROUTINE (); - - return mem_chunk; -} - -void -old_mem_chunk_destroy (GMemChunk *mem_chunk) -{ - GMemArea *mem_areas; - GMemArea *temp_area; - - g_return_if_fail (mem_chunk != NULL); - - ENTER_MEM_CHUNK_ROUTINE (); - - mem_areas = mem_chunk->mem_areas; - while (mem_areas) - { - temp_area = mem_areas; - mem_areas = mem_areas->next; - g_free (temp_area); - } - - g_mutex_lock (&mem_chunks_lock); - if (mem_chunk->next) - mem_chunk->next->prev = mem_chunk->prev; - if (mem_chunk->prev) - mem_chunk->prev->next = mem_chunk->next; - - if (mem_chunk == mem_chunks) - mem_chunks = mem_chunks->next; - g_mutex_unlock (&mem_chunks_lock); - - if (mem_chunk->type == G_ALLOC_AND_FREE) - g_tree_destroy (mem_chunk->mem_tree); - - g_free (mem_chunk); - - LEAVE_MEM_CHUNK_ROUTINE (); -} - -gpointer -old_mem_chunk_alloc (GMemChunk *mem_chunk) -{ - GMemArea *temp_area; - gpointer mem; - - ENTER_MEM_CHUNK_ROUTINE (); - - g_return_val_if_fail (mem_chunk != NULL, NULL); - - while (mem_chunk->free_atoms) - { - /* Get the first piece of memory on the "free_atoms" list. - * We can go ahead and destroy the list node we used to keep - * track of it with and to update the "free_atoms" list to - * point to its next element. - */ - mem = mem_chunk->free_atoms; - mem_chunk->free_atoms = mem_chunk->free_atoms->next; - - /* Determine which area this piece of memory is allocated from */ - temp_area = g_tree_search (mem_chunk->mem_tree, - (GCompareFunc) old_mem_chunk_area_search, - mem); - - /* If the area has been marked, then it is being destroyed. - * (ie marked to be destroyed). - * We check to see if all of the segments on the free list that - * reference this area have been removed. This occurs when - * the amount of free memory is less than the allocatable size. - * If the chunk should be freed, then we place it in the "free_mem_area". - * This is so we make sure not to free the mem area here and then - * allocate it again a few lines down. - * If we don't allocate a chunk a few lines down then the "free_mem_area" - * will be freed. - * If there is already a "free_mem_area" then we'll just free this mem area. - */ - if (temp_area->mark) - { - /* Update the "free" memory available in that area */ - temp_area->free += mem_chunk->atom_size; - - if (temp_area->free == mem_chunk->area_size) - { - if (temp_area == mem_chunk->mem_area) - mem_chunk->mem_area = NULL; - - if (mem_chunk->free_mem_area) - { - mem_chunk->num_mem_areas -= 1; - - if (temp_area->next) - temp_area->next->prev = temp_area->prev; - if (temp_area->prev) - temp_area->prev->next = temp_area->next; - if (temp_area == mem_chunk->mem_areas) - mem_chunk->mem_areas = mem_chunk->mem_areas->next; - - if (mem_chunk->type == G_ALLOC_AND_FREE) - g_tree_remove (mem_chunk->mem_tree, temp_area); - g_free (temp_area); - } - else - mem_chunk->free_mem_area = temp_area; - - mem_chunk->num_marked_areas -= 1; - } - } - else - { - /* Update the number of allocated atoms count. - */ - temp_area->allocated += 1; - - /* The area wasn't marked...return the memory - */ - goto outa_here; - } - } - - /* If there isn't a current mem area or the current mem area is out of space - * then allocate a new mem area. We'll first check and see if we can use - * the "free_mem_area". Otherwise we'll just malloc the mem area. - */ - if ((!mem_chunk->mem_area) || - ((mem_chunk->mem_area->index + mem_chunk->atom_size) > mem_chunk->area_size)) - { - if (mem_chunk->free_mem_area) - { - mem_chunk->mem_area = mem_chunk->free_mem_area; - mem_chunk->free_mem_area = NULL; - } - else - { -#ifdef ENABLE_GC_FRIENDLY - mem_chunk->mem_area = (GMemArea*) g_malloc0 (sizeof (GMemArea) - - MEM_AREA_SIZE + - mem_chunk->area_size); -#else /* !ENABLE_GC_FRIENDLY */ - mem_chunk->mem_area = (GMemArea*) g_malloc (sizeof (GMemArea) - - MEM_AREA_SIZE + - mem_chunk->area_size); -#endif /* ENABLE_GC_FRIENDLY */ - - mem_chunk->num_mem_areas += 1; - mem_chunk->mem_area->next = mem_chunk->mem_areas; - mem_chunk->mem_area->prev = NULL; - - if (mem_chunk->mem_areas) - mem_chunk->mem_areas->prev = mem_chunk->mem_area; - mem_chunk->mem_areas = mem_chunk->mem_area; - - if (mem_chunk->type == G_ALLOC_AND_FREE) - g_tree_insert (mem_chunk->mem_tree, mem_chunk->mem_area, mem_chunk->mem_area); - } - - mem_chunk->mem_area->index = 0; - mem_chunk->mem_area->free = mem_chunk->area_size; - mem_chunk->mem_area->allocated = 0; - mem_chunk->mem_area->mark = 0; - } - - /* Get the memory and modify the state variables appropriately. - */ - mem = (gpointer) &mem_chunk->mem_area->memmem_chunk->mem_area->index; - mem_chunk->mem_area->index += mem_chunk->atom_size; - mem_chunk->mem_area->free -= mem_chunk->atom_size; - mem_chunk->mem_area->allocated += 1; - - outa_here: - - LEAVE_MEM_CHUNK_ROUTINE (); - - return mem; -} - -gpointer -old_mem_chunk_alloc0 (GMemChunk *mem_chunk) -{ - gpointer mem; - - mem = old_mem_chunk_alloc (mem_chunk); - if (mem) - { - memset (mem, 0, mem_chunk->atom_size); - } - - return mem; -} - -void -old_mem_chunk_free (GMemChunk *mem_chunk, - gpointer mem) -{ - GMemArea *temp_area; - GFreeAtom *free_atom; - - g_return_if_fail (mem_chunk != NULL); - g_return_if_fail (mem != NULL); - - ENTER_MEM_CHUNK_ROUTINE (); - -#ifdef ENABLE_GC_FRIENDLY - memset (mem, 0, mem_chunk->atom_size); -#endif /* ENABLE_GC_FRIENDLY */ - - /* Don't do anything if this is an ALLOC_ONLY chunk - */ - if (mem_chunk->type == G_ALLOC_AND_FREE) - { - /* Place the memory on the "free_atoms" list - */ - free_atom = (GFreeAtom*) mem; - free_atom->next = mem_chunk->free_atoms; - mem_chunk->free_atoms = free_atom; - - temp_area = g_tree_search (mem_chunk->mem_tree, - (GCompareFunc) old_mem_chunk_area_search, - mem); - - temp_area->allocated -= 1; - - if (temp_area->allocated == 0) - { - temp_area->mark = 1; - mem_chunk->num_marked_areas += 1; - } - } - - LEAVE_MEM_CHUNK_ROUTINE (); -} - -/* This doesn't free the free_area if there is one */ -void -old_mem_chunk_clean (GMemChunk *mem_chunk) -{ - GMemArea *mem_area; - GFreeAtom *prev_free_atom; - GFreeAtom *temp_free_atom; - gpointer mem; - - g_return_if_fail (mem_chunk != NULL); - - ENTER_MEM_CHUNK_ROUTINE (); - - if (mem_chunk->type == G_ALLOC_AND_FREE) - { - prev_free_atom = NULL; - temp_free_atom = mem_chunk->free_atoms; - - while (temp_free_atom) - { - mem = (gpointer) temp_free_atom; - - mem_area = g_tree_search (mem_chunk->mem_tree, - (GCompareFunc) old_mem_chunk_area_search, - mem); - - /* If this mem area is marked for destruction then delete the - * area and list node and decrement the free mem. - */ - if (mem_area->mark) - { - if (prev_free_atom) - prev_free_atom->next = temp_free_atom->next; - else - mem_chunk->free_atoms = temp_free_atom->next; - temp_free_atom = temp_free_atom->next; - - mem_area->free += mem_chunk->atom_size; - if (mem_area->free == mem_chunk->area_size) - { - mem_chunk->num_mem_areas -= 1; - mem_chunk->num_marked_areas -= 1; - - if (mem_area->next) - mem_area->next->prev = mem_area->prev; - if (mem_area->prev) - mem_area->prev->next = mem_area->next; - if (mem_area == mem_chunk->mem_areas) - mem_chunk->mem_areas = mem_chunk->mem_areas->next; - if (mem_area == mem_chunk->mem_area) - mem_chunk->mem_area = NULL; - - if (mem_chunk->type == G_ALLOC_AND_FREE) - g_tree_remove (mem_chunk->mem_tree, mem_area); - g_free (mem_area); - } - } - else - { - prev_free_atom = temp_free_atom; - temp_free_atom = temp_free_atom->next; - } - } - } - LEAVE_MEM_CHUNK_ROUTINE (); -} - -void -old_mem_chunk_reset (GMemChunk *mem_chunk) -{ - GMemArea *mem_areas; - GMemArea *temp_area; - - g_return_if_fail (mem_chunk != NULL); - - ENTER_MEM_CHUNK_ROUTINE (); - - mem_areas = mem_chunk->mem_areas; - mem_chunk->num_mem_areas = 0; - mem_chunk->mem_areas = NULL; - mem_chunk->mem_area = NULL; - - while (mem_areas) - { - temp_area = mem_areas; - mem_areas = mem_areas->next; - g_free (temp_area); - } - - mem_chunk->free_atoms = NULL; - - if (mem_chunk->mem_tree) - { - g_tree_destroy (mem_chunk->mem_tree); - mem_chunk->mem_tree = g_tree_new ((GCompareFunc) old_mem_chunk_area_compare); - } - - LEAVE_MEM_CHUNK_ROUTINE (); -} - -void -old_mem_chunk_print (GMemChunk *mem_chunk) -{ - GMemArea *mem_areas; - gulong mem; - - g_return_if_fail (mem_chunk != NULL); - - mem_areas = mem_chunk->mem_areas; - mem = 0; - - while (mem_areas) - { - mem += mem_chunk->area_size - mem_areas->free; - mem_areas = mem_areas->next; - } - - g_log (G_LOG_DOMAIN, G_LOG_LEVEL_INFO, - "%s: %ld bytes using %d mem areas", - mem_chunk->name, mem, mem_chunk->num_mem_areas); -} - -void -old_mem_chunk_info (void) -{ - GMemChunk *mem_chunk; - gint count; - - count = 0; - g_mutex_lock (&mem_chunks_lock); - mem_chunk = mem_chunks; - while (mem_chunk) - { - count += 1; - mem_chunk = mem_chunk->next; - } - g_mutex_unlock (&mem_chunks_lock); - - g_log (G_LOG_DOMAIN, G_LOG_LEVEL_INFO, "%d mem chunks", count); - - g_mutex_lock (&mem_chunks_lock); - mem_chunk = mem_chunks; - g_mutex_unlock (&mem_chunks_lock); - - while (mem_chunk) - { - old_mem_chunk_print ((GMemChunk*) mem_chunk); - mem_chunk = mem_chunk->next; - } -} - -static gulong -old_mem_chunk_compute_size (gulong size, - gulong min_size) -{ - gulong power_of_2; - gulong lower, upper; - - power_of_2 = 16; - while (power_of_2 < size) - power_of_2 <<= 1; - - lower = power_of_2 >> 1; - upper = power_of_2; - - if (size - lower < upper - size && lower >= min_size) - return lower; - else - return upper; -} - -static gint -old_mem_chunk_area_compare (GMemArea *a, - GMemArea *b) -{ - if (a->mem > b->mem) - return 1; - else if (a->mem < b->mem) - return -1; - return 0; -} - -static gint -old_mem_chunk_area_search (GMemArea *a, - gchar *addr) -{ - if (a->mem <= addr) - { - if (addr < &a->mema->index) - return 0; - return 1; - } - return -1; -}
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/tests/slice-color.c
Deleted
@@ -1,135 +0,0 @@ -/* GLIB sliced memory - fast threaded memory chunk allocator - * Copyright (C) 2005 Tim Janik - * - * SPDX-License-Identifier: LGPL-2.1-or-later - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, see <http://www.gnu.org/licenses/>. - */ - -#include <glib.h> - -#define ALIGN(size, base) \ - ((base) * (gsize) (((size) + (base) - 1) / (base))) - -static void -fill_memory (guint **mem, - guint n, - guint val) -{ - guint j; - - for (j = 0; j < n; j++) - memj0 = val; -} - -static guint64 -access_memory3 (guint **mema, - guint **memb, - guint **memd, - guint n, - guint64 repeats) -{ - guint64 accu = 0, i, j; - - for (i = 0; i < repeats; i++) - { - for (j = 1; j < n; j += 2) - memdj0 = memaj0 + membj0; - } - - for (i = 0; i < repeats; i++) - for (j = 0; j < n; j++) - accu += memdj0; - - return accu; -} - -static void -touch_mem (guint64 block_size, - guint64 n_blocks, - guint64 repeats) -{ - GTimer *timer; - guint **mema, **memb, **memc; - guint64 j, accu, n = n_blocks; - - mema = g_new (guint*, n); - for (j = 0; j < n; j++) - memaj = g_slice_alloc (block_size); - - memb = g_new (guint*, n); - for (j = 0; j < n; j++) - membj = g_slice_alloc (block_size); - - memc = g_new (guint*, n); - for (j = 0; j < n; j++) - memcj = g_slice_alloc (block_size); - - timer = g_timer_new(); - - fill_memory (mema, n, 2); - fill_memory (memb, n, 3); - fill_memory (memc, n, 4); - - access_memory3 (mema, memb, memc, n, 3); - - g_timer_start (timer); - accu = access_memory3 (mema, memb, memc, n, repeats); - g_timer_stop (timer); - - g_test_message ("Access-time = %fs", g_timer_elapsed (timer, NULL)); - g_assert_cmpuint (accu / repeats, ==, (2 + 3) * n / 2 + 4 * n / 2); - - for (j = 0; j < n; j++) - { - g_slice_free1 (block_size, memaj); - g_slice_free1 (block_size, membj); - g_slice_free1 (block_size, memcj); - } - - g_timer_destroy (timer); - g_free (mema); - g_free (memb); - g_free (memc); -} - -static void -test_slice_colors (void) -{ - guint64 block_size = 512; - guint64 area_size = 1024 * 1024; - guint64 n_blocks, repeats = 1000000; - - /* figure number of blocks from block and area size. - * divide area by 3 because touch_mem() allocates 3 areas */ - n_blocks = area_size / 3 / ALIGN (block_size, sizeof (gsize) * 2); - - g_test_message ("Allocate and touch %" G_GUINT64_FORMAT - " blocks of %" G_GUINT64_FORMAT " bytes" - " (= %" G_GUINT64_FORMAT " bytes) %" G_GUINT64_FORMAT - " times with color increment", - n_blocks, block_size, n_blocks * block_size, repeats); - - touch_mem (block_size, n_blocks, repeats); -} - -int -main (int argc, char **argv) -{ - g_test_init (&argc, &argv, NULL); - - g_test_add_func ("/slice/colors", test_slice_colors); - - return g_test_run (); -}
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/tests/slice-concurrent.c
Deleted
@@ -1,132 +0,0 @@ -/* test for gslice cross thread allocation/free - * Copyright (C) 2006 Stefan Westerfeld - * Copyright (C) 2007 Tim Janik - * - * SPDX-License-Identifier: LGPL-2.1-or-later - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, see <http://www.gnu.org/licenses/>. - */ - -#include <glib.h> - -#include <stdlib.h> - -#define N_THREADS 8 -#define N_ALLOCS 50000 -#define MAX_BLOCK_SIZE 64 - -struct ThreadData -{ - int thread_id; - GThread* gthread; - - GMutex to_free_mutex; - void* to_free N_THREADS * N_ALLOCS; - int bytes_to_free N_THREADS * N_ALLOCS; - int n_to_free; - int n_freed; -} tdataN_THREADS; - -static void * -thread_func (void *arg) -{ - int i; - struct ThreadData *td = arg; - - for (i = 0; i < N_ALLOCS; i++) - { - int bytes, f, t; - char *mem; - - if (rand() % (N_ALLOCS / 20) == 0) - g_test_message ("%c", 'a' - 1 + td->thread_id); - - /* allocate block of random size and randomly fill */ - bytes = rand() % MAX_BLOCK_SIZE + 1; - mem = g_slice_alloc (bytes); - - for (f = 0; f < bytes; f++) - memf = rand(); - - /* associate block with random thread */ - t = rand() % N_THREADS; - g_mutex_lock (&tdatat.to_free_mutex); - tdatat.to_freetdatat.n_to_free = mem; - tdatat.bytes_to_freetdatat.n_to_free = bytes; - tdatat.n_to_free++; - g_mutex_unlock (&tdatat.to_free_mutex); - - /* shuffle thread execution order every once in a while */ - if (rand() % 97 == 0) - { - if (rand() % 2) - g_thread_yield(); /* concurrent shuffling for single core */ - else - g_usleep (1000); /* concurrent shuffling for multi core */ - } - - /* free a block associated with this thread */ - g_mutex_lock (&td->to_free_mutex); - if (td->n_to_free > 0) - { - td->n_to_free--; - g_slice_free1 (td->bytes_to_freetd->n_to_free, - td->to_freetd->n_to_free); - td->n_freed++; - } - g_mutex_unlock (&td->to_free_mutex); - } - - return NULL; -} - -static void -test_concurrent_slice (void) -{ - int t; - - for (t = 0; t < N_THREADS; t++) - { - tdatat.thread_id = t + 1; - tdatat.n_to_free = 0; - tdatat.n_freed = 0; - } - - for (t = 0; t < N_THREADS; t++) - { - tdatat.gthread = g_thread_new (NULL, thread_func, &tdatat); - g_assert_nonnull (tdatat.gthread); - } - - for (t = 0; t < N_THREADS; t++) - { - g_thread_join (tdatat.gthread); - } - - for (t = 0; t < N_THREADS; t++) - { - g_test_message ("Thread %d: %d blocks freed, %d blocks not freed", - tdatat.thread_id, tdatat.n_freed, tdatat.n_to_free); - } -} - -int -main (int argc, char **argv) -{ - g_test_init (&argc, &argv, NULL); - - g_test_add_func ("/slice/concurrent", test_concurrent_slice); - - return g_test_run (); -}
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/tests/slice-eager-freeing.c
Deleted
@@ -1,158 +0,0 @@ -/* GLIB sliced memory - fast threaded memory chunk allocator - * Copyright (C) 2005 Tim Janik - * - * SPDX-License-Identifier: LGPL-2.1-or-later - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, see <http://www.gnu.org/licenses/>. - */ - -/* We are testing some deprecated APIs here */ -#ifndef GLIB_DISABLE_DEPRECATION_WARNINGS -#define GLIB_DISABLE_DEPRECATION_WARNINGS -#endif - -#include <glib.h> - -#define quick_rand32() \ - (rand_accu = 1664525 * rand_accu + 1013904223, rand_accu) - -static guint prime_size = 1021; /* 769; 509 */ -static gboolean clean_memchunks = FALSE; -static guint number_of_blocks = 10000; /* total number of blocks allocated */ -static guint number_of_repetitions = 10000; /* number of alloc+free repetitions */ -static gboolean want_corruption = FALSE; - -/* --- old memchunk prototypes (memchunks.c) --- */ -GMemChunk* old_mem_chunk_new (const gchar *name, - gulong atom_size, - gulong area_size, - gint type); -void old_mem_chunk_destroy (GMemChunk *mem_chunk); -gpointer old_mem_chunk_alloc (GMemChunk *mem_chunk); -gpointer old_mem_chunk_alloc0 (GMemChunk *mem_chunk); -void old_mem_chunk_free (GMemChunk *mem_chunk, - gpointer mem); -void old_mem_chunk_clean (GMemChunk *mem_chunk); -void old_mem_chunk_reset (GMemChunk *mem_chunk); -void old_mem_chunk_print (GMemChunk *mem_chunk); -void old_mem_chunk_info (void); - -#ifndef G_ALLOC_AND_FREE -#define G_ALLOC_AND_FREE 2 -#endif - -/* --- functions --- */ -static inline int -corruption (void) -{ - if (G_UNLIKELY (want_corruption)) - { - /* corruption per call likelyness is about 1:4000000 */ - guint32 r = g_random_int() % 8000009; - return r == 277 ? +1 : r == 281 ? -1 : 0; - } - return 0; -} - -static gpointer -test_sliced_mem_thread (gpointer data) -{ - guint32 rand_accu = 2147483563; - guint i, j; - guint8 **ps; - guint *ss; - - /* initialize random numbers */ - if (data) - rand_accu = *(guint32*) data; - else - { - GTimeVal rand_tv; - g_get_current_time (&rand_tv); - rand_accu = rand_tv.tv_usec + (rand_tv.tv_sec << 16); - } - - ps = g_new (guint8*, number_of_blocks); - ss = g_new (guint, number_of_blocks); - /* create number_of_blocks random sizes */ - for (i = 0; i < number_of_blocks; i++) - ssi = quick_rand32() % prime_size; - /* allocate number_of_blocks blocks */ - for (i = 0; i < number_of_blocks; i++) - psi = g_slice_alloc (ssi + corruption()); - for (j = 0; j < number_of_repetitions; j++) - { - /* free number_of_blocks/2 blocks */ - for (i = 0; i < number_of_blocks; i += 2) - g_slice_free1 (ssi + corruption(), psi + corruption()); - /* allocate number_of_blocks/2 blocks with new sizes */ - for (i = 0; i < number_of_blocks; i += 2) - { - ssi = quick_rand32() % prime_size; - psi = g_slice_alloc (ssi + corruption()); - } - } - /* free number_of_blocks blocks */ - for (i = 0; i < number_of_blocks; i++) - g_slice_free1 (ssi + corruption(), psi + corruption()); - /* alloc and free many equally sized chunks in a row */ - for (i = 0; i < number_of_repetitions; i++) - { - guint sz = quick_rand32() % prime_size; - guint k = number_of_blocks / 100; - for (j = 0; j < k; j++) - psj = g_slice_alloc (sz + corruption()); - for (j = 0; j < k; j++) - g_slice_free1 (sz + corruption(), psj + corruption()); - } - g_free (ps); - g_free (ss); - - return NULL; -} - -static void -test_slice_eager_freeing (void) -{ - GThread **threads; - guint i, n_threads = 1; - - clean_memchunks = TRUE; - - g_test_message ("Starting %d threads allocating random blocks <= %u bytes", - n_threads, prime_size); - - threads = g_alloca (sizeof(GThread*) * n_threads); - - for (i = 0; i < n_threads; i++) - threadsi = g_thread_create (test_sliced_mem_thread, NULL, TRUE, NULL); - - for (i = 0; i < n_threads; i++) - g_thread_join (threadsi); - - clean_memchunks = FALSE; -} - -int -main (int argc, - char *argv) -{ - g_slice_set_config (G_SLICE_CONFIG_WORKING_SET_MSECS, 0); - - g_test_init (&argc, &argv, NULL); - - g_test_add_func ("/slice/eager-freeing", test_slice_eager_freeing); - - return g_test_run (); -}
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/tests/slice-glib.c
Deleted
@@ -1,154 +0,0 @@ -/* GLIB sliced memory - fast threaded memory chunk allocator - * Copyright (C) 2005 Tim Janik - * - * SPDX-License-Identifier: LGPL-2.1-or-later - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, see <http://www.gnu.org/licenses/>. - */ - -/* We are testing some deprecated APIs here */ -#ifndef GLIB_DISABLE_DEPRECATION_WARNINGS -#define GLIB_DISABLE_DEPRECATION_WARNINGS -#endif - -#include <glib.h> - -#define quick_rand32() \ - (rand_accu = 1664525 * rand_accu + 1013904223, rand_accu) - -static guint prime_size = 1021; /* 769; 509 */ -static guint number_of_blocks = 10000; /* total number of blocks allocated */ -static guint number_of_repetitions = 10000; /* number of alloc+free repetitions */ -static gboolean want_corruption = FALSE; - -/* --- old memchunk prototypes (memchunks.c) --- */ -GMemChunk* old_mem_chunk_new (const gchar *name, - gulong atom_size, - gulong area_size, - gint type); -void old_mem_chunk_destroy (GMemChunk *mem_chunk); -gpointer old_mem_chunk_alloc (GMemChunk *mem_chunk); -gpointer old_mem_chunk_alloc0 (GMemChunk *mem_chunk); -void old_mem_chunk_free (GMemChunk *mem_chunk, - gpointer mem); -void old_mem_chunk_clean (GMemChunk *mem_chunk); -void old_mem_chunk_reset (GMemChunk *mem_chunk); -void old_mem_chunk_print (GMemChunk *mem_chunk); -void old_mem_chunk_info (void); - -#ifndef G_ALLOC_AND_FREE -#define G_ALLOC_AND_FREE 2 -#endif - -/* --- functions --- */ -static inline int -corruption (void) -{ - if (G_UNLIKELY (want_corruption)) - { - /* corruption per call likelyness is about 1:4000000 */ - guint32 r = g_random_int() % 8000009; - return r == 277 ? +1 : r == 281 ? -1 : 0; - } - return 0; -} - -static gpointer -test_sliced_mem_thread (gpointer data) -{ - guint32 rand_accu = 2147483563; - guint i, j; - guint8 **ps; - guint *ss; - - /* initialize random numbers */ - if (data) - rand_accu = *(guint32*) data; - else - { - GTimeVal rand_tv; - g_get_current_time (&rand_tv); - rand_accu = rand_tv.tv_usec + (rand_tv.tv_sec << 16); - } - - ps = g_new (guint8*, number_of_blocks); - ss = g_new (guint, number_of_blocks); - /* create number_of_blocks random sizes */ - for (i = 0; i < number_of_blocks; i++) - ssi = quick_rand32() % prime_size; - /* allocate number_of_blocks blocks */ - for (i = 0; i < number_of_blocks; i++) - psi = g_slice_alloc (ssi + corruption()); - for (j = 0; j < number_of_repetitions; j++) - { - /* free number_of_blocks/2 blocks */ - for (i = 0; i < number_of_blocks; i += 2) - g_slice_free1 (ssi + corruption(), psi + corruption()); - /* allocate number_of_blocks/2 blocks with new sizes */ - for (i = 0; i < number_of_blocks; i += 2) - { - ssi = quick_rand32() % prime_size; - psi = g_slice_alloc (ssi + corruption()); - } - } - /* free number_of_blocks blocks */ - for (i = 0; i < number_of_blocks; i++) - g_slice_free1 (ssi + corruption(), psi + corruption()); - /* alloc and free many equally sized chunks in a row */ - for (i = 0; i < number_of_repetitions; i++) - { - guint sz = quick_rand32() % prime_size; - guint k = number_of_blocks / 100; - for (j = 0; j < k; j++) - psj = g_slice_alloc (sz + corruption()); - for (j = 0; j < k; j++) - g_slice_free1 (sz + corruption(), psj + corruption()); - } - g_free (ps); - g_free (ss); - - return NULL; -} - -static void -test_slice_glib (void) -{ - GThread **threads; - guint i, n_threads = 1; - - g_test_message ("Starting %d threads allocating random blocks <= %u bytes", - n_threads, prime_size); - - threads = g_alloca (sizeof(GThread*) * n_threads); - - for (i = 0; i < n_threads; i++) - threadsi = g_thread_create (test_sliced_mem_thread, NULL, TRUE, NULL); - - for (i = 0; i < n_threads; i++) - g_thread_join (threadsi); -} - -int -main (int argc, - char *argv) -{ - g_slice_set_config (G_SLICE_CONFIG_ALWAYS_MALLOC, FALSE); - g_slice_set_config (G_SLICE_CONFIG_BYPASS_MAGAZINES, FALSE); - - g_test_init (&argc, &argv, NULL); - - g_test_add_func ("/slice/glib", test_slice_glib); - - return g_test_run (); -}
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/tests/slice-known-pages.c
Deleted
@@ -1,173 +0,0 @@ -/* slice-known-pages.c - test GSlice across known pages - * Copyright (C) 2007 Tim Janik - * - * This work is provided "as is"; redistribution and modification - * in whole or in part, in any medium, physical or electronic is - * permitted without restriction. - * - * This work is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * - * In no event shall the authors or contributors be liable for any - * direct, indirect, incidental, special, exemplary, or consequential - * damages (including, but not limited to, procurement of substitute - * goods or services; loss of use, data, or profits; or business - * interruption) however caused and on any theory of liability, whether - * in contract, strict liability, or tort (including negligence or - * otherwise) arising in any way out of the use of this software, even - * if advised of the possibility of such damage. - */ - -#include <glib.h> - -#define N_PAGES (101) /* number of pages to sample */ -#define SAMPLE_SIZE (7) -#define PAGE_SIZE (128) /* must be <= minimum GSlice alignment block */ -#define MAGAZINE_PROBES \ - { \ - 97, 265, 347 \ - } /* block sizes hopefully unused */ -#define MAX_PROBE_TRIALS (1031) /* must be >= maximum magazine size */ - -#define ALIGN(size, base) \ - ((base) * (gsize) (((size) + (base) - 1) / (base))) - -static struct { - void *page; - void *sample; -} pagesN_PAGES = { { NULL, NULL }, }; - -static const guint magazine_probes = MAGAZINE_PROBES; - -#define N_MAGAZINE_PROBES G_N_ELEMENTS (magazine_probes) - -static void -release_trash_list (GSList **trash_list, - gsize block_size) -{ - while (*trash_list) - { - g_slice_free1 (block_size, (*trash_list)->data); - *trash_list = g_slist_delete_link (*trash_list, *trash_list); - } -} - -static GSList *free_list = NULL; - -static gboolean -allocate_from_known_page (void) -{ - guint i, j, n_trials = N_PAGES * PAGE_SIZE / SAMPLE_SIZE; /* upper bound */ - for (i = 0; i < n_trials; i++) - { - void *b = g_slice_alloc (SAMPLE_SIZE); - void *p = (void*) (PAGE_SIZE * ((gsize) b / PAGE_SIZE)); - free_list = g_slist_prepend (free_list, b); - /* find page */ - for (j = 0; j < N_PAGES; j++) - if (pagesj.page == p) - return TRUE; - } - return FALSE; -} - -static void -test_slice_known_pages (void) -{ - gsize j, n_pages = 0; - void *mpsN_MAGAZINE_PROBES; - - /* probe some magazine sizes */ - for (j = 0; j < N_MAGAZINE_PROBES; j++) - mpsj = g_slice_alloc (magazine_probesj); - /* mps* now contains pointers to allocated slices */ - - /* allocate blocks from N_PAGES different pages */ - while (n_pages < N_PAGES) - { - void *b = g_slice_alloc (SAMPLE_SIZE); - void *p = (void*) (PAGE_SIZE * ((gsize) b / PAGE_SIZE)); - for (j = 0; j < N_PAGES; j++) - if (pagesj.page == p) - break; - if (j < N_PAGES) /* known page */ - free_list = g_slist_prepend (free_list, b); - else /* new page */ - { - j = n_pages++; - pagesj.page = p; - pagesj.sample = b; - } - } - /* release intermediate allocations */ - release_trash_list (&free_list, SAMPLE_SIZE); - - /* ensure that we can allocate from known pages */ - g_assert_true (allocate_from_known_page()); - - /* release intermediate allocations */ - release_trash_list (&free_list, SAMPLE_SIZE); - - /* release magazine probes to be retained */ - for (j = 0; j < N_MAGAZINE_PROBES; j++) - g_slice_free1 (magazine_probesj, mpsj); - /* mps* now contains pointers to released slices */ - - /* ensure probes were retained */ - for (j = 0; j < N_MAGAZINE_PROBES; j++) - { - GSList *trash = NULL; - guint k; - for (k = 0; k < MAX_PROBE_TRIALS; k++) - { - void *mem = g_slice_alloc (magazine_probesj); - if (mem == mpsj) - break; /* reallocated previously freed slice */ - trash = g_slist_prepend (trash, mem); - } - release_trash_list (&trash, magazine_probesj); - g_assert_cmpint (k, <, MAX_PROBE_TRIALS); /* failed to reallocate slice */ - } - /* mps* now contains pointers to reallocated slices */ - - /* release magazine probes to be retained across known pages */ - for (j = 0; j < N_MAGAZINE_PROBES; j++) - g_slice_free1 (magazine_probesj, mpsj); - /* mps* now contains pointers to released slices */ - - /* ensure probes were retained */ - for (j = 0; j < N_MAGAZINE_PROBES; j++) - { - GSList *trash = NULL; - guint k; - for (k = 0; k < MAX_PROBE_TRIALS; k++) - { - void *mem = g_slice_alloc (magazine_probesj); - if (mem == mpsj) - break; /* reallocated previously freed slice */ - trash = g_slist_prepend (trash, mem); - } - release_trash_list (&trash, magazine_probesj); - g_assert_cmpint (k, <, MAX_PROBE_TRIALS); /* failed to reallocate slice */ - } - /* mps* now contains pointers to reallocated slices */ - - /* ensure that we can allocate from known pages */ - g_assert_true (allocate_from_known_page()); - - /* some cleanups */ - for (j = 0; j < N_MAGAZINE_PROBES; j++) - g_slice_free1 (magazine_probesj, mpsj); - release_trash_list (&free_list, SAMPLE_SIZE); -} - -int -main (int argc, char *argv) -{ - g_test_init (&argc, &argv, NULL); - - g_test_add_func ("/slice/known_pages", test_slice_known_pages); - - return g_test_run (); -}
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/tests/slice-malloc.c
Deleted
@@ -1,153 +0,0 @@ -/* GLIB sliced memory - fast threaded memory chunk allocator - * Copyright (C) 2005 Tim Janik - * - * SPDX-License-Identifier: LGPL-2.1-or-later - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, see <http://www.gnu.org/licenses/>. - */ - -/* We are testing some deprecated APIs here */ -#ifndef GLIB_DISABLE_DEPRECATION_WARNINGS -#define GLIB_DISABLE_DEPRECATION_WARNINGS -#endif - -#include <glib.h> - -#define quick_rand32() \ - (rand_accu = 1664525 * rand_accu + 1013904223, rand_accu) - -static guint prime_size = 1021; /* 769; 509 */ -static guint number_of_blocks = 10000; /* total number of blocks allocated */ -static guint number_of_repetitions = 10000; /* number of alloc+free repetitions */ -static gboolean want_corruption = FALSE; - -/* --- old memchunk prototypes (memchunks.c) --- */ -GMemChunk* old_mem_chunk_new (const gchar *name, - gulong atom_size, - gulong area_size, - gint type); -void old_mem_chunk_destroy (GMemChunk *mem_chunk); -gpointer old_mem_chunk_alloc (GMemChunk *mem_chunk); -gpointer old_mem_chunk_alloc0 (GMemChunk *mem_chunk); -void old_mem_chunk_free (GMemChunk *mem_chunk, - gpointer mem); -void old_mem_chunk_clean (GMemChunk *mem_chunk); -void old_mem_chunk_reset (GMemChunk *mem_chunk); -void old_mem_chunk_print (GMemChunk *mem_chunk); -void old_mem_chunk_info (void); - -#ifndef G_ALLOC_AND_FREE -#define G_ALLOC_AND_FREE 2 -#endif - -/* --- functions --- */ -static inline int -corruption (void) -{ - if (G_UNLIKELY (want_corruption)) - { - /* corruption per call likelyness is about 1:4000000 */ - guint32 r = g_random_int() % 8000009; - return r == 277 ? +1 : r == 281 ? -1 : 0; - } - return 0; -} - -static gpointer -test_sliced_mem_thread (gpointer data) -{ - guint32 rand_accu = 2147483563; - guint i, j; - guint8 **ps; - guint *ss; - - /* initialize random numbers */ - if (data) - rand_accu = *(guint32*) data; - else - { - GTimeVal rand_tv; - g_get_current_time (&rand_tv); - rand_accu = rand_tv.tv_usec + (rand_tv.tv_sec << 16); - } - - ps = g_new (guint8*, number_of_blocks); - ss = g_new (guint, number_of_blocks); - /* create number_of_blocks random sizes */ - for (i = 0; i < number_of_blocks; i++) - ssi = quick_rand32() % prime_size; - /* allocate number_of_blocks blocks */ - for (i = 0; i < number_of_blocks; i++) - psi = g_slice_alloc (ssi + corruption()); - for (j = 0; j < number_of_repetitions; j++) - { - /* free number_of_blocks/2 blocks */ - for (i = 0; i < number_of_blocks; i += 2) - g_slice_free1 (ssi + corruption(), psi + corruption()); - /* allocate number_of_blocks/2 blocks with new sizes */ - for (i = 0; i < number_of_blocks; i += 2) - { - ssi = quick_rand32() % prime_size; - psi = g_slice_alloc (ssi + corruption()); - } - } - /* free number_of_blocks blocks */ - for (i = 0; i < number_of_blocks; i++) - g_slice_free1 (ssi + corruption(), psi + corruption()); - /* alloc and free many equally sized chunks in a row */ - for (i = 0; i < number_of_repetitions; i++) - { - guint sz = quick_rand32() % prime_size; - guint k = number_of_blocks / 100; - for (j = 0; j < k; j++) - psj = g_slice_alloc (sz + corruption()); - for (j = 0; j < k; j++) - g_slice_free1 (sz + corruption(), psj + corruption()); - } - g_free (ps); - g_free (ss); - - return NULL; -} - -static void -test_slice_malloc (void) -{ - GThread **threads; - guint i, n_threads = 1; - - g_test_message ("Starting %d threads allocating random blocks <= %u bytes", - n_threads, prime_size); - - threads = g_alloca (sizeof(GThread*) * n_threads); - - for (i = 0; i < n_threads; i++) - threadsi = g_thread_create (test_sliced_mem_thread, NULL, TRUE, NULL); - - for (i = 0; i < n_threads; i++) - g_thread_join (threadsi); -} - -int -main (int argc, - char *argv) -{ - g_slice_set_config (G_SLICE_CONFIG_ALWAYS_MALLOC, TRUE); - - g_test_init (&argc, &argv, NULL); - - g_test_add_func ("/slice/malloc", test_slice_malloc); - - return g_test_run (); -}
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/tests/slice-memchunk.c
Deleted
@@ -1,167 +0,0 @@ -/* GLIB sliced memory - fast threaded memory chunk allocator - * Copyright (C) 2005 Tim Janik - * - * SPDX-License-Identifier: LGPL-2.1-or-later - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, see <http://www.gnu.org/licenses/>. - */ - -/* We are testing some deprecated APIs here */ -#ifndef GLIB_DISABLE_DEPRECATION_WARNINGS -#define GLIB_DISABLE_DEPRECATION_WARNINGS -#endif - -#include <glib.h> - -#define quick_rand32() \ - (rand_accu = 1664525 * rand_accu + 1013904223, rand_accu) - -static const guint prime_size = 1021; /* 769; 509 */ -static const gboolean clean_memchunks = FALSE; -static const guint number_of_blocks = 10000; /* total number of blocks allocated */ -static const guint number_of_repetitions = 10000; /* number of alloc+free repetitions */ - -/* --- old memchunk prototypes (memchunks.c) --- */ -GMemChunk* old_mem_chunk_new (const gchar *name, - gulong atom_size, - gulong area_size, - gint type); -void old_mem_chunk_destroy (GMemChunk *mem_chunk); -gpointer old_mem_chunk_alloc (GMemChunk *mem_chunk); -gpointer old_mem_chunk_alloc0 (GMemChunk *mem_chunk); -void old_mem_chunk_free (GMemChunk *mem_chunk, - gpointer mem); -void old_mem_chunk_clean (GMemChunk *mem_chunk); -void old_mem_chunk_reset (GMemChunk *mem_chunk); -void old_mem_chunk_print (GMemChunk *mem_chunk); -void old_mem_chunk_info (void); - -#ifndef G_ALLOC_AND_FREE -#define G_ALLOC_AND_FREE 2 -#endif - -/* --- functions --- */ -static inline gpointer -memchunk_alloc (GMemChunk **memchunkp, - guint size) -{ - size = MAX (size, 1); - if (G_UNLIKELY (!*memchunkp)) - *memchunkp = old_mem_chunk_new ("", size, 4096, G_ALLOC_AND_FREE); - return old_mem_chunk_alloc (*memchunkp); -} - -static inline void -memchunk_free (GMemChunk *memchunk, - gpointer chunk) -{ - old_mem_chunk_free (memchunk, chunk); - if (clean_memchunks) - old_mem_chunk_clean (memchunk); -} - -static gpointer -test_memchunk_thread (gpointer data) -{ - GMemChunk **memchunks; - guint i, j; - guint8 **ps; - guint *ss; - guint32 rand_accu = 2147483563; - /* initialize random numbers */ - if (data) - rand_accu = *(guint32*) data; - else - { - GTimeVal rand_tv; - g_get_current_time (&rand_tv); - rand_accu = rand_tv.tv_usec + (rand_tv.tv_sec << 16); - } - - /* prepare for memchunk creation */ - memchunks = g_newa0 (GMemChunk*, prime_size); - - ps = g_new (guint8*, number_of_blocks); - ss = g_new (guint, number_of_blocks); - /* create number_of_blocks random sizes */ - for (i = 0; i < number_of_blocks; i++) - ssi = quick_rand32() % prime_size; - /* allocate number_of_blocks blocks */ - for (i = 0; i < number_of_blocks; i++) - psi = memchunk_alloc (&memchunksssi, ssi); - for (j = 0; j < number_of_repetitions; j++) - { - /* free number_of_blocks/2 blocks */ - for (i = 0; i < number_of_blocks; i += 2) - memchunk_free (memchunksssi, psi); - /* allocate number_of_blocks/2 blocks with new sizes */ - for (i = 0; i < number_of_blocks; i += 2) - { - ssi = quick_rand32() % prime_size; - psi = memchunk_alloc (&memchunksssi, ssi); - } - } - /* free number_of_blocks blocks */ - for (i = 0; i < number_of_blocks; i++) - memchunk_free (memchunksssi, psi); - /* alloc and free many equally sized chunks in a row */ - for (i = 0; i < number_of_repetitions; i++) - { - guint sz = quick_rand32() % prime_size; - guint k = number_of_blocks / 100; - for (j = 0; j < k; j++) - psj = memchunk_alloc (&memchunkssz, sz); - for (j = 0; j < k; j++) - memchunk_free (memchunkssz, psj); - } - /* cleanout memchunks */ - for (i = 0; i < prime_size; i++) - if (memchunksi) - old_mem_chunk_destroy (memchunksi); - g_free (ps); - g_free (ss); - - return NULL; -} - -static void -test_slice_memchunk (void) -{ - GThread **threads; - guint i, n_threads = 1; - - g_test_message ("Starting %d threads allocating random blocks <= %u bytes", - n_threads, prime_size); - - threads = g_alloca (sizeof(GThread*) * n_threads); - - for (i = 0; i < n_threads; i++) - threadsi = g_thread_create (test_memchunk_thread, NULL, TRUE, NULL); - - for (i = 0; i < n_threads; i++) - g_thread_join (threadsi); -} - -int -main (int argc, - char *argv) -{ - g_slice_set_config (G_SLICE_CONFIG_ALWAYS_MALLOC, TRUE); - - g_test_init (&argc, &argv, NULL); - - g_test_add_func ("/slice/memchunk", test_slice_memchunk); - - return g_test_run (); -}
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/tests/slice-slab.c
Deleted
@@ -1,154 +0,0 @@ -/* GLIB sliced memory - fast threaded memory chunk allocator - * Copyright (C) 2005 Tim Janik - * - * SPDX-License-Identifier: LGPL-2.1-or-later - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, see <http://www.gnu.org/licenses/>. - */ - -/* We are testing some deprecated APIs here */ -#ifndef GLIB_DISABLE_DEPRECATION_WARNINGS -#define GLIB_DISABLE_DEPRECATION_WARNINGS -#endif - -#include <glib.h> - -#define quick_rand32() \ - (rand_accu = 1664525 * rand_accu + 1013904223, rand_accu) - -static guint prime_size = 1021; /* 769; 509 */ -static guint number_of_blocks = 10000; /* total number of blocks allocated */ -static guint number_of_repetitions = 10000; /* number of alloc+free repetitions */ -static gboolean want_corruption = FALSE; - -/* --- old memchunk prototypes (memchunks.c) --- */ -GMemChunk* old_mem_chunk_new (const gchar *name, - gulong atom_size, - gulong area_size, - gint type); -void old_mem_chunk_destroy (GMemChunk *mem_chunk); -gpointer old_mem_chunk_alloc (GMemChunk *mem_chunk); -gpointer old_mem_chunk_alloc0 (GMemChunk *mem_chunk); -void old_mem_chunk_free (GMemChunk *mem_chunk, - gpointer mem); -void old_mem_chunk_clean (GMemChunk *mem_chunk); -void old_mem_chunk_reset (GMemChunk *mem_chunk); -void old_mem_chunk_print (GMemChunk *mem_chunk); -void old_mem_chunk_info (void); - -#ifndef G_ALLOC_AND_FREE -#define G_ALLOC_AND_FREE 2 -#endif - -/* --- functions --- */ -static inline int -corruption (void) -{ - if (G_UNLIKELY (want_corruption)) - { - /* corruption per call likelyness is about 1:4000000 */ - guint32 r = g_random_int() % 8000009; - return r == 277 ? +1 : r == 281 ? -1 : 0; - } - return 0; -} - -static gpointer -test_sliced_mem_thread (gpointer data) -{ - guint32 rand_accu = 2147483563; - guint i, j; - guint8 **ps; - guint *ss; - - /* initialize random numbers */ - if (data) - rand_accu = *(guint32*) data; - else - { - GTimeVal rand_tv; - g_get_current_time (&rand_tv); - rand_accu = rand_tv.tv_usec + (rand_tv.tv_sec << 16); - } - - ps = g_new (guint8*, number_of_blocks); - ss = g_new (guint, number_of_blocks); - /* create number_of_blocks random sizes */ - for (i = 0; i < number_of_blocks; i++) - ssi = quick_rand32() % prime_size; - /* allocate number_of_blocks blocks */ - for (i = 0; i < number_of_blocks; i++) - psi = g_slice_alloc (ssi + corruption()); - for (j = 0; j < number_of_repetitions; j++) - { - /* free number_of_blocks/2 blocks */ - for (i = 0; i < number_of_blocks; i += 2) - g_slice_free1 (ssi + corruption(), psi + corruption()); - /* allocate number_of_blocks/2 blocks with new sizes */ - for (i = 0; i < number_of_blocks; i += 2) - { - ssi = quick_rand32() % prime_size; - psi = g_slice_alloc (ssi + corruption()); - } - } - /* free number_of_blocks blocks */ - for (i = 0; i < number_of_blocks; i++) - g_slice_free1 (ssi + corruption(), psi + corruption()); - /* alloc and free many equally sized chunks in a row */ - for (i = 0; i < number_of_repetitions; i++) - { - guint sz = quick_rand32() % prime_size; - guint k = number_of_blocks / 100; - for (j = 0; j < k; j++) - psj = g_slice_alloc (sz + corruption()); - for (j = 0; j < k; j++) - g_slice_free1 (sz + corruption(), psj + corruption()); - } - g_free (ps); - g_free (ss); - - return NULL; -} - -static void -test_slice_slab (void) -{ - GThread **threads; - guint i, n_threads = 1; - - g_test_message ("Starting %d threads allocating random blocks <= %u bytes", - n_threads, prime_size); - - threads = g_alloca (sizeof(GThread*) * n_threads); - - for (i = 0; i < n_threads; i++) - threadsi = g_thread_create (test_sliced_mem_thread, NULL, TRUE, NULL); - - for (i = 0; i < n_threads; i++) - g_thread_join (threadsi); -} - -int -main (int argc, - char *argv) -{ - g_slice_set_config (G_SLICE_CONFIG_ALWAYS_MALLOC, FALSE); - g_slice_set_config (G_SLICE_CONFIG_BYPASS_MAGAZINES, TRUE); - - g_test_init (&argc, &argv, NULL); - - g_test_add_func ("/slice/slab", test_slice_slab); - - return g_test_run (); -}
View file
_service:tar_scm:glib-2.74.4.tar.xz/gobject/tests/.gitignore
Deleted
@@ -1,18 +0,0 @@ -binding -boxed -closure -dynamictests -enums -ifaceproperties -object -param -properties -qdata -reference -signal-handler -signals -threadtests -type -value -private -marshalers.ch
View file
_service:tar_scm:glib-2.74.4.tar.xz/tools/check-abis.sh
Deleted
@@ -1,23 +0,0 @@ -#!/bin/sh -e - -list_leaked_symbols () { - nm -D "$1" | grep ' T ' | cut -f 3 -d ' ' | grep -E -v "$2" -} - -check_symbols () { - if "$(list_leaked_symbols "$1" "$2" | wc -l)" -ne 0 ; then - echo File "$1" possibly leaking symbols: - list_leaked_symbols "$1" "$2" - exit 1 - fi -} - -allowed="^_init$|^_fini$|^_ftext$|^g_" -allowed_in_libglib="${allowed}|^glib__private__$|^glib_gettext$|^glib_pgettext$|^glib_check_version$" -allowed_in_libgthread='^_init$|^_fini$|^_ftext$|^g_thread_init$|^g_thread_init_with_errorcheck_mutexes$' - -check_symbols glib/.libs/libglib-2.0.so "$allowed_in_libglib" -check_symbols gthread/.libs/libgthread-2.0.so "$allowed_in_libgthread" -for file in gmodule/.libs/libgmodule-2.0.so gobject/.libs/libgobject-2.0.so gio/.libs/libgio-2.0.so; do - check_symbols "$file" "$allowed" -done
View file
_service:tar_scm:glib-2.74.4.tar.xz/.gitlab-ci.yml -> _service:tar_scm:glib-2.76.4.tar.xz/.gitlab-ci.yml
Changed
@@ -4,17 +4,18 @@ - coverage - analysis - deploy + - report cache: paths: - _ccache/ variables: - FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/glib/fedora:v19" + FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/glib/fedora:v20" COVERITY_IMAGE: "registry.gitlab.gnome.org/gnome/glib/coverity:v7" - DEBIAN_IMAGE: "registry.gitlab.gnome.org/gnome/glib/debian-stable:v13" - MINGW_IMAGE: "registry.gitlab.gnome.org/gnome/glib/mingw:v9" - MESON_TEST_TIMEOUT_MULTIPLIER: 2 + DEBIAN_IMAGE: "registry.gitlab.gnome.org/gnome/glib/debian-stable:v14" + MINGW_IMAGE: "registry.gitlab.gnome.org/gnome/glib/mingw:v10" + MESON_TEST_TIMEOUT_MULTIPLIER: 4 G_MESSAGES_DEBUG: all MESON_COMMON_OPTIONS: "--buildtype debug --wrap-mode=nodownload --fatal-meson-warnings" @@ -48,17 +49,39 @@ - bash .gitlab-ci/show-execution-environment.sh - cp -r $HOME/subprojects/* subprojects/ -style-check-diff: +style-check-advisory: extends: .only-default image: $DEBIAN_IMAGE stage: style-check allow_failure: true script: - .gitlab-ci/run-style-check-diff.sh + - .gitlab-ci/run-check-todos.sh + +sh-and-py-check: + extends: .only-default + image: $DEBIAN_IMAGE + stage: style-check + allow_failure: false + script: - .gitlab-ci/run-shellcheck.sh - .gitlab-ci/run-black.sh - .gitlab-ci/run-flake8.sh - - .gitlab-ci/run-check-todos.sh + only: + changes: + - "**/*.py" + - "**/*.sh" + +style-check-mandatory: + extends: .only-default + image: $DEBIAN_IMAGE + stage: style-check + allow_failure: false + script: + - .gitlab-ci/run-reuse.sh + variables: + # The submodules are needed for `reuse lint` to work properly + GIT_SUBMODULE_STRATEGY: "normal" fedora-x86_64: extends: @@ -88,12 +111,13 @@ - lcov --config-file .lcovrc --directory _build --capture --output-file "_coverage/${CI_JOB_NAME}.lcov" artifacts: reports: - junit: "_build/meson-logs/testlog.junit.xml" + junit: + - _build/meson-logs/testlog.junit.xml + - _build/meson-logs/testlog-*.junit.xml name: "glib-${CI_JOB_NAME}-${CI_COMMIT_REF_NAME}" when: always expire_in: 1 week paths: - - "_build/docs/reference/" - "_build/config.h" - "_build/glib/glibconfig.h" - "_build/meson-logs" @@ -124,13 +148,14 @@ --libdir=lib -Dsystemtap=true -Ddtrace=true - -Dinstalled_tests=true _build - ninja -C _build - .gitlab-ci/run-tests.sh artifacts: reports: - junit: "_build/meson-logs/testlog.junit.xml" + junit: + - _build/meson-logs/testlog.junit.xml + - _build/meson-logs/testlog-*.junit.xml name: "glib-${CI_JOB_NAME}-${CI_COMMIT_REF_NAME}" when: always expire_in: 1 week @@ -196,7 +221,9 @@ - bash -x ./.gitlab-ci/run-tests.sh artifacts: reports: - junit: "_build/meson-logs/testlog.junit.xml" + junit: + - _build/meson-logs/testlog.junit.xml + - _build/meson-logs/testlog-*.junit.xml name: "glib-${CI_JOB_NAME}-${CI_COMMIT_REF_NAME}" when: always expire_in: 1 week @@ -265,13 +292,17 @@ - .cross-build-linux - .only-default image: $MINGW_IMAGE + variables: + PYTHONUTF8: "1" script: # FIXME: Add --werror - meson ${MESON_COMMON_OPTIONS} --cross-file=/opt/cross_file_mingw64.txt _build - ninja -C _build artifacts: reports: - junit: "_build/meson-logs/testlog.junit.xml" + junit: + - _build/meson-logs/testlog.junit.xml + - _build/meson-logs/testlog-*.junit.xml name: "glib-${env:CI_JOB_NAME}-${env:CI_COMMIT_REF_NAME}" when: always expire_in: 1 week @@ -292,13 +323,21 @@ variables: MSYSTEM: "MINGW32" CHERE_INVOKING: "yes" + CFLAGS: -coverage -ftest-coverage -fprofile-arcs + PYTHONUTF8: "1" + # FIXME: For some reason enabling jit debugging "fixes" random python crashes + # see https://github.com/msys2/MINGW-packages/issues/11864 and + # https://gitlab.gnome.org/GNOME/glib/-/merge_requests/3280#note_1678973 + MSYS: "winjitdebug" script: - C:\msys64\usr\bin\pacman --noconfirm -Syyuu --ask 20 - C:\msys64\usr\bin\bash .gitlab-ci/show-execution-environment.sh - C:\msys64\usr\bin\bash -lc "bash -x ./.gitlab-ci/test-msys2.sh" artifacts: reports: - junit: "_build/meson-logs/testlog.junit.xml" + junit: + - _build/meson-logs/testlog.junit.xml + - _build/meson-logs/testlog-*.junit.xml name: "glib-${env:CI_JOB_NAME}-${env:CI_COMMIT_REF_NAME}" when: always expire_in: 1 week @@ -306,12 +345,41 @@ - _build/meson-logs - _coverage/ +msys2-clang64: + extends: .only-schedules + stage: build + tags: + - win32-ps + needs: + variables: + MSYSTEM: "CLANG64" + CHERE_INVOKING: "yes" + PYTHONUTF8: "1" + # FIXME: For some reason enabling jit debugging "fixes" random python crashes + # see https://github.com/msys2/MINGW-packages/issues/11864 and + # https://gitlab.gnome.org/GNOME/glib/-/merge_requests/3280#note_1678973 + MSYS: "winjitdebug" + script: + - C:\msys64\usr\bin\pacman --noconfirm -Syyuu --ask 20 + - C:\msys64\usr\bin\bash .gitlab-ci/show-execution-environment.sh + - C:\msys64\usr\bin\bash -lc "bash -x ./.gitlab-ci/test-msys2.sh" + artifacts: + reports: + junit: "_build/meson-logs/testlog.junit.xml" + name: "glib-${env:CI_JOB_NAME}-${env:CI_COMMIT_REF_NAME}" + when: always + expire_in: 1 week + paths: + - _build/meson-logs + vs2017-x64: extends: .only-default stage: build tags: - win32-ps needs: + variables: + PYTHONUTF8: "1" script: # FIXME: These should use --wrap-mode=nodownload but the Windows CI machines # aren’t currently set up for that. @@ -321,7 +389,9 @@ --python.purelibdir=C:\Python37\site-packages artifacts: reports: - junit: "_build/meson-logs/testlog.junit.xml" + junit: + - _build/meson-logs/testlog.junit.xml + - _build/meson-logs/testlog-*.junit.xml name: "glib-${env:CI_JOB_NAME}-${env:CI_COMMIT_REF_NAME}" when: always expire_in: 1 week @@ -339,6 +409,8 @@ tags: - win32-ps needs: + variables: + PYTHONUTF8: "1" script: # FIXME: These should use --wrap-mode=nodownload but the Windows CI machines # aren’t currently set up for that. @@ -349,7 +421,9 @@ --python.purelibdir=C:\Python37\site-packages artifacts: reports: - junit: "_build/meson-logs/testlog.junit.xml" + junit: + - _build/meson-logs/testlog.junit.xml + - _build/meson-logs/testlog-*.junit.xml name: "glib-${env:CI_JOB_NAME}-${env:CI_COMMIT_REF_NAME}" when: always expire_in: 1 week @@ -391,7 +465,9 @@ - bash -x ./.gitlab-ci/run-tests.sh artifacts: reports: - junit: "_build/meson-logs/testlog.junit.xml" + junit: + - _build/meson-logs/testlog.junit.xml + - _build/meson-logs/testlog-*.junit.xml name: "glib-${CI_JOB_NAME}-${CI_COMMIT_REF_NAME}" when: always expire_in: 1 week @@ -418,7 +494,9 @@ - bash -x ./.gitlab-ci/run-tests.sh artifacts: reports: - junit: "_build/meson-logs/testlog.junit.xml" + junit: + - _build/meson-logs/testlog.junit.xml + - _build/meson-logs/testlog-*.junit.xml name: "glib-${CI_JOB_NAME}-${CI_COMMIT_REF_NAME}" when: always expire_in: 1 week @@ -441,7 +519,7 @@ CFLAGS: '-Wno-overlength-strings' before_script: - bash .gitlab-ci/show-execution-environment.sh - - pip3 install --user meson==0.60.1 + - pip3 install --user meson==1.0.0 - pip3 install --user ninja - export PATH=/Users/gitlabrunner/Library/Python/3.7/bin:$PATH script: @@ -458,7 +536,9 @@ - .gitlab-ci/run-tests.sh artifacts: reports: - junit: "_build/meson-logs/testlog.junit.xml" + junit: + - _build/meson-logs/testlog.junit.xml + - _build/meson-logs/testlog-*.junit.xml name: "glib-${CI_JOB_NAME}-${CI_COMMIT_REF_NAME}" when: always expire_in: 1 week @@ -553,7 +633,7 @@ stage: deploy only: - main - needs: 'coverage', 'style-check-diff' + needs: 'coverage', 'style-check-advisory' script: - mv _coverage/ public/ artifacts: @@ -584,3 +664,11 @@ - "${CI_PROJECT_DIR}/_build/gobject-docs-$CI_COMMIT_TAG.tar.xz" - "${CI_PROJECT_DIR}/_build/gio-docs-$CI_COMMIT_TAG.tar.xz" - "${CI_PROJECT_DIR}/_build/meson-dist/glib-*.tar.xz" + +issue-bot: + stage: report + image: registry.gitlab.com/gitlab-org/distribution/issue-bot:latest + script: /issue-bot + rules: + - if: $CI_COMMIT_REF_NAME == $CI_DEFAULT_BRANCH && $CI_PIPELINE_SOURCE == "schedule" + when: on_failure
View file
_service:tar_scm:glib-2.74.4.tar.xz/.gitlab-ci/README.md -> _service:tar_scm:glib-2.76.4.tar.xz/.gitlab-ci/README.md
Changed
@@ -5,7 +5,7 @@ GitLab CI jobs run in a Docker image, defined here. To update that image (perhaps to install some more packages): -1. Edit `.gitlab-ci/Dockerfile` with the changes you want +1. Edit `.gitlab-ci/*.Dockerfile` with the changes you want 1. Run `.gitlab-ci/run-docker.sh build --base=debian-stable --base-version=1` to build the new image (bump the version from the latest listed for that `base` on https://gitlab.gnome.org/GNOME/glib/container_registry). If rebuilding the @@ -23,5 +23,5 @@ 1. Edit `.gitlab-ci.yml` (in the root of this repository) to use your new image -pat: https://gitlab.gnome.org/profile/personal_access_tokens +pat: https://gitlab.gnome.org/-/profile/personal_access_tokens cs: https://scan.coverity.com/
View file
_service:tar_scm:glib-2.74.4.tar.xz/.gitlab-ci/check-missing-install-tag.py -> _service:tar_scm:glib-2.76.4.tar.xz/.gitlab-ci/check-missing-install-tag.py
Changed
@@ -6,6 +6,7 @@ """ import argparse +import json from pathlib import Path @@ -14,14 +15,16 @@ parser.add_argument("builddir", type=Path) args = parser.parse_args() - logfile = args.builddir / "meson-logs" / "meson-log.txt" - with logfile.open(encoding="utf-8") as f: - if "Failed to guess install tag" in f.read(): - print( - f"Some files are missing install_tag, see {logfile} for details." # no-qa - ) - return 1 - return 0 + success = True + path = args.builddir / "meson-info" / "intro-install_plan.json" + with path.open(encoding="utf-8") as f: + install_plan = json.load(f) + for target in install_plan.values(): + for info in target.values(): + if not info"tag": + print("Missing install_tag for", info"destination") + success = False + return 0 if success else 1 if __name__ == "__main__":
View file
_service:tar_scm:glib-2.74.4.tar.xz/.gitlab-ci/coverage-docker.sh -> _service:tar_scm:glib-2.76.4.tar.xz/.gitlab-ci/coverage-docker.sh
Changed
@@ -1,6 +1,6 @@ #!/bin/bash -set -e +set -ex # Fixup Windows paths python3 ./.gitlab-ci/fixup-cov-paths.py _coverage/*.lcov @@ -10,6 +10,12 @@ lcov --config-file .lcovrc -r "${path}" '*/_build/*' -o "$(pwd)/${path}" # Remove any coverage from system files lcov --config-file .lcovrc -e "${path}" "$(pwd)/*" -o "$(pwd)/${path}" + # Remove coverage from the fuzz tests, since they are run on a separate CI system + lcov --config-file .lcovrc -r "${path}" "*/fuzzing/*" -o "$(pwd)/${path}" + # Remove coverage from copylibs and subprojects + for lib in xdgmime libcharset gnulib; do + lcov --config-file .lcovrc -r "${path}" "*/${lib}/*" -o "$(pwd)/${path}" + done # Convert to cobertura format for gitlab integration cobertura_base="${path/.lcov}-cobertura"
View file
_service:tar_scm:glib-2.74.4.tar.xz/.gitlab-ci/debian-stable.Dockerfile -> _service:tar_scm:glib-2.76.4.tar.xz/.gitlab-ci/debian-stable.Dockerfile
Changed
@@ -68,6 +68,9 @@ RUN pip3 install meson==0.60.3 +# FIXME: Once we use Debian Bookworm, we can just install the `reuse` package +RUN pip3 install reuse==1.0.0 + ARG HOST_USER_ID=5555 ENV HOST_USER_ID ${HOST_USER_ID} RUN useradd -u $HOST_USER_ID -ms /bin/bash user
View file
_service:tar_scm:glib-2.74.4.tar.xz/.gitlab-ci/run-docker.sh -> _service:tar_scm:glib-2.76.4.tar.xz/.gitlab-ci/run-docker.sh
Changed
@@ -15,16 +15,17 @@ fi } -SUDO_CMD="sudo" -if docker -v |& grep -q podman; then +if type -p podman; then # Using podman - SUDO_CMD="" + DOCKER_CMD="podman" # Docker is actually implemented by podman, and its OCI output # is incompatible with some of the dockerd instances on GitLab # CI runners. export BUILDAH_FORMAT=docker elif getent group docker | grep -q "\b${USER}\b"; then - SUDO_CMD="" + DOCKER_CMD="docker" +else + DOCKER_CMD="sudo docker" fi set -e @@ -103,7 +104,7 @@ if $build == 1 ; then echo -e "\\e1;32mBUILDING\\e0m: ${base} as ${TAG}" - $SUDO_CMD docker build \ + $DOCKER_CMD build \ --build-arg HOST_USER_ID="$UID" \ --build-arg COVERITY_SCAN_PROJECT_NAME="${COVERITY_SCAN_PROJECT_NAME}" \ --build-arg COVERITY_SCAN_TOKEN="${COVERITY_SCAN_TOKEN}" \ @@ -116,16 +117,16 @@ echo -e "\\e1;32mPUSHING\\e0m: ${base} as ${TAG}" if $no_login == 0 ; then - $SUDO_CMD docker login registry.gitlab.gnome.org + $DOCKER_CMD login registry.gitlab.gnome.org fi - $SUDO_CMD docker push $TAG + $DOCKER_CMD push $TAG exit $? fi if $run == 1 ; then echo -e "\\e1;32mRUNNING\\e0m: ${base} as ${TAG}" - $SUDO_CMD docker run \ + $DOCKER_CMD run \ --rm \ --volume "$(pwd)/..:/home/user/app" \ --workdir "/home/user/app" \
View file
_service:tar_scm:glib-2.76.4.tar.xz/.gitlab-ci/run-reuse.sh
Added
@@ -0,0 +1,62 @@ +#!/bin/bash +# +# Copyright 2022 Endless OS Foundation, LLC +# +# SPDX-License-Identifier: LGPL-2.1-or-later +# +# Original author: Philip Withnall + +set -e + +# We need to make sure the submodules are up to date, or `reuse lint` will fail +# when it tries to run `git status` internally +git submodule update --init + +# Run `reuse lint` on the code base and see if the number of files without +# suitable copyright/licensing information has increased from a baseline +# FIXME: Eventually this script can check whether *any* files are missing +# information. But for now, let’s slowly improve the baseline. +files_without_copyright_information_max=407 +files_without_license_information_max=559 + +# The || true is because `reuse lint` will exit with status 1 if the project is not compliant +# FIXME: Once https://github.com/fsfe/reuse-tool/issues/512 or +# https://github.com/fsfe/reuse-tool/issues/183 land, we can check only files +# which have changed in this merge request, and confidently parse structured +# output rather than the current human-readable output. +lint_output="$(reuse lint || true)" + +files_with_copyright_information="$(echo "${lint_output}" | awk '/^\* Files with copyright information: / { print $6 }')" +files_with_license_information="$(echo "${lint_output}" | awk '/^\* Files with license information: / { print $6 }')" +total_files="$(echo "${lint_output}" | awk '/^\* Files with copyright information: / { print $8 }')" +error=0 + +files_without_copyright_information="$(( total_files - files_with_copyright_information ))" +files_without_license_information="$(( total_files - files_with_license_information ))" + +if "${files_without_copyright_information}" -gt "${files_without_copyright_information_max}" || \ + "${files_without_license_information}" -gt "${files_without_license_information_max}" ; then + echo "${lint_output}" +fi + +if "${files_without_copyright_information}" -gt "${files_without_copyright_information_max}" ; then + echo "" + echo "Error: New files added without REUSE-compliant copyright information" + echo "Please make sure that all files added in this branch/merge request have correct copyright information" + error=1 +fi + +if "${files_without_license_information}" -gt "${files_without_license_information_max}" ; then + echo "" + echo "Error: New files added without REUSE-compliant licensing information" + echo "Please make sure that all files added in this branch/merge request have correct license information" + error=1 +fi + +if "${error}" -eq "1" ; then + echo "" + echo "See https://reuse.software/tutorial/#step-2 for information on how to add REUSE information" + echo "Also see https://gitlab.gnome.org/GNOME/glib/-/issues/1415" +fi + +exit "${error}" \ No newline at end of file
View file
_service:tar_scm:glib-2.74.4.tar.xz/.gitlab-ci/run-tests.sh -> _service:tar_scm:glib-2.76.4.tar.xz/.gitlab-ci/run-tests.sh
Changed
@@ -1,9 +1,16 @@ #!/bin/bash +set -ex + ./.gitlab-ci/check-missing-install-tag.py _build -meson test \ +meson test -v \ -C _build \ --timeout-multiplier "${MESON_TEST_TIMEOUT_MULTIPLIER}" \ - --no-suite flaky \ "$@" + +# Run only the flaky tests, so we can log the failures but without hard failing +meson test -v \ + -C _build \ + --timeout-multiplier "${MESON_TEST_TIMEOUT_MULTIPLIER}" \ + "$@" --setup=unstable_tests --suite=failing --suite=flaky || true
View file
_service:tar_scm:glib-2.74.4.tar.xz/.gitlab-ci/test-msvc.bat -> _service:tar_scm:glib-2.76.4.tar.xz/.gitlab-ci/test-msvc.bat
Changed
@@ -12,16 +12,25 @@ set args=%args:~1% :: FIXME: make warnings fatal -pip3 install --upgrade --user meson==0.60.3 || goto :error +pip3 install --upgrade --user meson==1.0.0 || goto :error meson %args% _build || goto :error python .gitlab-ci/check-missing-install-tag.py _build || goto :error ninja -C _build || goto :error -:: FIXME: dont ignore test errors -meson test -C _build --timeout-multiplier %MESON_TEST_TIMEOUT_MULTIPLIER% --no-suite flaky +meson test -v -C _build --timeout-multiplier %MESON_TEST_TIMEOUT_MULTIPLIER% || goto :error +meson test -v -C _build --timeout-multiplier %MESON_TEST_TIMEOUT_MULTIPLIER% --setup=unstable_tests --suite=failing --suite=flaky + +:: Workaround meson issue https://github.com/mesonbuild/meson/issues/9894 +python -c "n = '_build/meson-logs/testlog.junit.xml'; c = open(n, 'rb').read().replace(b'\x1b', b''); open(n, 'wb').write(c)" || goto :error +python -c "n = '_build/meson-logs/testlog-unstable_tests.junit.xml'; c = open(n, 'rb').read().replace(b'\x1b', b''); open(n, 'wb').write(c)" :: FIXME: can we get code coverage support? goto :EOF :error + +:: Workaround meson issue https://github.com/mesonbuild/meson/issues/9894 +python -c "n = '_build/meson-logs/testlog.junit.xml'; c = open(n, 'rb').read().replace(b'\x1b', b''); open(n, 'wb').write(c)" +python -c "n = '_build/meson-logs/testlog-unstable_tests.junit.xml'; c = open(n, 'rb').read().replace(b'\x1b', b''); open(n, 'wb').write(c)" + exit /b 1
View file
_service:tar_scm:glib-2.74.4.tar.xz/.gitlab-ci/test-msys2.sh -> _service:tar_scm:glib-2.76.4.tar.xz/.gitlab-ci/test-msys2.sh
Changed
@@ -1,29 +1,24 @@ #!/bin/bash -set -e +set -ex export PATH="/c/msys64/$MSYSTEM/bin:$PATH" -if "$MSYSTEM" == "MINGW32" ; then - export MSYS2_ARCH="i686" -else - export MSYS2_ARCH="x86_64" -fi pacman --noconfirm -Suy pacman --noconfirm -S --needed \ base-devel \ lcov \ - mingw-w64-$MSYS2_ARCH-ccache \ - mingw-w64-$MSYS2_ARCH-gettext \ - mingw-w64-$MSYS2_ARCH-libffi \ - mingw-w64-$MSYS2_ARCH-meson \ - mingw-w64-$MSYS2_ARCH-pcre2 \ - mingw-w64-$MSYS2_ARCH-python3 \ - mingw-w64-$MSYS2_ARCH-python-pip \ - mingw-w64-$MSYS2_ARCH-toolchain \ - mingw-w64-$MSYS2_ARCH-zlib \ - mingw-w64-$MSYS2_ARCH-libelf + "${MINGW_PACKAGE_PREFIX}"-ccache \ + "${MINGW_PACKAGE_PREFIX}"-gettext \ + "${MINGW_PACKAGE_PREFIX}"-libffi \ + "${MINGW_PACKAGE_PREFIX}"-meson \ + "${MINGW_PACKAGE_PREFIX}"-pcre2 \ + "${MINGW_PACKAGE_PREFIX}"-python3 \ + "${MINGW_PACKAGE_PREFIX}"-python-pip \ + "${MINGW_PACKAGE_PREFIX}"-toolchain \ + "${MINGW_PACKAGE_PREFIX}"-zlib \ + "${MINGW_PACKAGE_PREFIX}"-libelf mkdir -p _coverage mkdir -p _ccache @@ -31,31 +26,43 @@ CCACHE_DIR="${CCACHE_BASEDIR}/_ccache" export CCACHE_BASEDIR CCACHE_DIR -pip3 install --upgrade --user meson==0.60.3 +pip3 install --upgrade --user meson==1.0.0 PATH="$(cygpath "$USERPROFILE")/.local/bin:$HOME/.local/bin:$PATH" -CFLAGS="-coverage -ftest-coverage -fprofile-arcs" DIR="$(pwd)" export PATH CFLAGS -meson --werror --buildtype debug _build +if "$MSYSTEM" == "CLANG64" ; then + # FIXME: fix the clang build warnings + # shellcheck disable=SC2086 + meson ${MESON_COMMON_OPTIONS} _build +else + # shellcheck disable=SC2086 + meson ${MESON_COMMON_OPTIONS} --werror _build +fi + cd _build ninja -lcov \ - --quiet \ - --config-file "${DIR}"/.lcovrc \ - --directory "${DIR}/_build" \ - --capture \ - --initial \ - --output-file "${DIR}/_coverage/${CI_JOB_NAME}-baseline.lcov" - -# FIXME: fix the test suite -meson test --timeout-multiplier "${MESON_TEST_TIMEOUT_MULTIPLIER}" --no-suite flaky || true - -lcov \ - --quiet \ - --config-file "${DIR}"/.lcovrc \ - --directory "${DIR}/_build" \ - --capture \ - --output-file "${DIR}/_coverage/${CI_JOB_NAME}.lcov" +if "$CFLAGS" == *"-coverage"* ; then + lcov \ + --quiet \ + --config-file "${DIR}"/.lcovrc \ + --directory "${DIR}/_build" \ + --capture \ + --initial \ + --output-file "${DIR}/_coverage/${CI_JOB_NAME}-baseline.lcov" +fi + +meson test -v --timeout-multiplier "${MESON_TEST_TIMEOUT_MULTIPLIER}" +meson test -v --timeout-multiplier "${MESON_TEST_TIMEOUT_MULTIPLIER}" \ + --setup=unstable_tests --suite=failing --suite=flaky || true + +if "$CFLAGS" == *"-coverage"* ; then + lcov \ + --quiet \ + --config-file "${DIR}"/.lcovrc \ + --directory "${DIR}/_build" \ + --capture \ + --output-file "${DIR}/_coverage/${CI_JOB_NAME}.lcov" +fi
View file
_service:tar_scm:glib-2.74.4.tar.xz/.gitmodules -> _service:tar_scm:glib-2.76.4.tar.xz/.gitmodules
Changed
@@ -1,5 +1,5 @@ submodule "subprojects/gvdb" path = subprojects/gvdb - url = https://gitlab.gnome.org/GNOME/gvdb.git + url = ../../GNOME/gvdb.git branch = 0854af0fdb6d527a8d1999835ac2c5059976c210 shallow = true
View file
_service:tar_scm:glib-2.74.4.tar.xz/.reuse/dep5 -> _service:tar_scm:glib-2.76.4.tar.xz/.reuse/dep5
Changed
@@ -34,3 +34,10 @@ subprojects/*.wrap Copyright: Meson Wrap Database (wrapdb) contributors License: CC0-1.0 + +# SVG files do contain the licensing metadata, but `reuse` can’t extract it +# yet. The canonical licensing information for these files is in their internal +# metadata. +Files: docs/reference/glib/gvariant-*.svg +Copyright: 2022 Philip Withnall +License: CC-BY-SA-3.0
View file
_service:tar_scm:glib-2.74.4.tar.xz/CONTRIBUTING.md -> _service:tar_scm:glib-2.76.4.tar.xz/CONTRIBUTING.md
Changed
@@ -137,7 +137,7 @@ have a GNOME account, you can skip the fork, and use the following instead: ```sh -$ git clone git@gitlab.gnome.org:GNOME/glib.git +$ git clone git@ssh.gitlab.gnome.org:GNOME/glib.git $ cd glib ```
View file
_service:tar_scm:glib-2.74.4.tar.xz/INSTALL.md -> _service:tar_scm:glib-2.76.4.tar.xz/INSTALL.md
Changed
@@ -87,7 +87,7 @@ Or online at: - https://developer.gnome.org/glib/stable/glib-building.html + https://docs.gtk.org/glib/building.html Installation directories @@ -127,4 +127,4 @@ Or online at: - https://developer.gnome.org/glib/stable/glib-cross-compiling.html + https://docs.gtk.org/glib/cross-compiling.html
View file
_service:tar_scm:glib-2.76.4.tar.xz/LICENSES/LicenseRef-old-glib-tests.txt
Added
@@ -0,0 +1,16 @@ +This work is provided "as is"; redistribution and modification +in whole or in part, in any medium, physical or electronic is +permitted without restriction. + +This work is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + +In no event shall the authors or contributors be liable for any +direct, indirect, incidental, special, exemplary, or consequential +damages (including, but not limited to, procurement of substitute +goods or services; loss of use, data, or profits; or business +interruption) however caused and on any theory of liability, whether +in contract, strict liability, or tort (including negligence or +otherwise) arising in any way out of the use of this software, even +if advised of the possibility of such damage.
View file
_service:tar_scm:glib-2.74.4.tar.xz/NEWS -> _service:tar_scm:glib-2.76.4.tar.xz/NEWS
Changed
@@ -1,104 +1,560 @@ -Overview of changes in GLib 2.74.4 -================================== +Overview of changes in GLib 2.76.4, 2023-07-06 +============================================== + +* Fix build failure on Android with `statx()` support (#3039) + +* Bugs fixed: + - #3003 glib-compile-schemas failed on directory name with no Latin symbols + (Daniyar Tleulin) + - #3039 Build failure due to statx fields with NDK r25.c (Philip Withnall) + - !3447 Backport !3446 “glib-compile-resources: Fix non-ASCII arg parsing on + Windows” to glib-2-76 + - !3479 Backport !3473 ”glib: reset errno to 0 when futex() returns EAGAIN” to + glib-2-76 + - !3480 Backport !3468 “Avoid stack overflow in gspawn on macOS” to glib-2-76 + - !3492 Backport !3482 “glocalfileinfo: Fix incorrect use of struct + statx.st_mtimensec on Android” to glib-2-76 + +* Translation updates: + - English (United Kingdom) (Bruce Cowan) + - Portuguese (Brazil) (Leônidas Araújo) + - Slovak (Dušan Kazik) + + +Overview of changes in GLib 2.76.3, 2023-05-23 +============================================== + +* Bugs fixed: + - #1264 Use-after-free under + send_message_with_reply_cleanup():gdbusconnection.c:1792 (Philip Withnall) + - !3402 Backport !3398 “Avoid having g_futex_simple() inadvertently modify + errno” to glib-2-76 + - !3403 Backport !3400 “Revert "Fix error format in gio/gunixconnection.c + (part 2)"” to glib-2-76 + - !3427 Backport !3291 “gdbusconnection: Fix double unref on timeout/cancel + sending a message” to glib-2-76 + - !3428 Backport !3425 “gwin32networkmonitor: Fix returning address of local + variable” to glib-2-76 + - !3434 Backport !3430 “gobject_gdb.py: fix regression caused by bfbe7127d5” + to glib-2-76 + +* Translation updates: + - Galician (Fran Dieguez) + + +Overview of changes in GLib 2.76.2, 2023-04-21 +============================================== + +* Fixed various build failures in less common setups (#2861 by Philip Withnall, + #2973 by Marco Trevisan) + +* Fix launching files in Windows via GtkFileLauncher (#2972 by Luca Bacci) + +* Bugs fixed: + - #95 GMarkupParser documentation completion (David King) + - #252 Disagreement between runtime and docs on whether interfaces are + "classed" (Philip Withnall) + - #322 gdbus-example-proxy-subclass.c is not complete. (Colin Walters) + - #799 GAppInfoMonitor documentation deficiencies (Philip Withnall) + - #2861 Check for __kernel_long_t when enabling futex() + - #2864 Documentation mentions non-existing function `g_value_free` (Philip + Withnall) + - #2952 Not clear that GPollableInputStream methods are undefined if + can_poll() returns FALSE (Philip Withnall) + - #2953 Missing docs for GOption (commandline parser) (Sam Thursfield) + - #2960 GDebugControllerDBus wrong default in documentation (Philip Withnall) + - #2963 Probably wrong information regarding G_PLATFORM_WIN32 in + README.win32.md + - #2966 Multiple Definition Error When Generating gio/tests/test5.gresource + (Dan Yeaw) + - #2969 user docs: GLib.DateTime.format: broken highlighting (Philip Withnall) + - #2972 GtkFileLauncher: generated paths not recognized on Win32 (Luca Bacci) + - #2973 Build failed due to NULL pointer redefinition in C++ (Marco Trevisan) + - #2982 Build randomly fails with: 'gmodule/gmodule-visibility.h' file not + found (Marco Trevisan) + - !3326 unicode: add tests for g_utf8_normalize() and empty strings + - !3333 build: Drop old .gitignore files from test directories + - !3344 tools: Drop check-abis.sh script + - !3345 docs: Drop section about default branch renaming from README.md + - !3351 tests: Update Unicode normalisation tests from Unicode 15 + - !3357 Make clang++ happier when using G_STATIC_ASSERT + - !3365 gwin32: Avoid use of function call with side effect in g_return_* + macro + - !3377 gsignal: Clarify documentation for GSignalMatchType matching + +* Translation updates: + - Bulgarian (Alexander Shopov) + - Chinese (China) (Boyuan Yang) + + +Overview of changes in GLib 2.76.1, 2023-03-22 +============================================== + +* Fix build failures in third party C++ projects using `g_strdup()` via C++ + qualified symbol lookup (#2936, work by Xi Ruoyao) + +* Downgrade critical warnings from `GFileInfo` about missing attributes to debug + messages, as it was affecting too many apps; the critical warnings will be + reinstated early in the 2.78 cycle, so apps should continue to fix their + ambiguous use of `GFileInfo` API (#2948, work by Philip Withnall) + +* Bugs fixed: + - #159 g_strstr_len() ignores haystack_len (Philip Withnall) + - #352 Docs for g_file_enumerator_next_files_async () are unclear about end + condition (Owen Taylor) + - #919 g_variant_dict_lookup is unclear about what happens on failure (Philip + Withnall) + - #2922 GWin32AppInfo: Missing NULL string check (Luca Bacci) + - #2936 Possible regression in 2.75.3 when used from C++ due to g_strdup + becoming a macro + - #2943 Meson fails TAP test when g_test_message is called before g_test_init + (Philip Withnall) + - #2948 gio list triggers 'GFileInfo created without …' warnings for trash, + smb and google-drive GVFS backends (Philip Withnall) + - !3241 inotify: Avoid empty root directory string + - !3315 tests: Change the time function used in the bookmark tests + - !3318 gmacros: Add GCC < 5 fallback for __always_inline__ + - !3319 fuzzing: do not build tests if build_tests is false + - !3321 tests: only build messages-low-memory if RTLD_NEXT is available + - !3323 tests: Fix timeout sources in gdbus-auth and gapplication tests + - !3324 tests: Reduce number of iterations in queue test + - !3325 gdesktopappinfo: Add a missing NULL check + - !3330 tests: Check a few results in strfuncs tests + - !3338 gfileinfo: Temporarily downgrade missing attribute criticals to debugs + +* Translation updates: + - French (Guillaume Bernard) + - Persian (Danial Behzadi) + - Turkish (Sabri Ünal) + + +Overview of changes in GLib 2.76.0, 2023-03-10 +============================================== + +* Fix several regressions in handling `GFileInfo` attributes (#2932, #2934, + work by Ondrej Holy and Philip Withnall) + +* Bugs fixed: + - #2932 ETAG_VALUE not set in GFileInfo when requested (Philip Withnall) + - #2934 File attributes are not set when their value is FALSE/NULL (Philip + Withnall) + - !3309 gfile: Fix file size detection when copying on btrfs + - !3310 glocalfileinfo: Mark the lost+found dir as hidden again + - !3311 glocalfileinfo: Ensure that is-backup is always set + +* Translation updates: + - Bulgarian (Alexander Shopov) + - Catalan (Jordi Mas i Hernandez) + - Czech (Marek Černocký) + - German (Tim Sabsch) + - Korean (Changwoo Ryu) + - Polish (Piotr Drąg) + - Russian (Aleksandr Melman) + - Turkish (Sabri Ünal) + + +Overview of changes in GLib 2.75.4, 2023-03-03 +============================================== + +* Emit a critical warning when acquiring the notification queue during GObject + finalization. A type's `finalize()` implementation should not call public + API that emits property notifications. (!3119, work by Marco Trevisan and Emmanuele Bassi) + +* Bugs fixed: + - #2720 Fails to create resource.o with LLVM ld + - #2905 MSVC gstring.h: warning C4141: 'inline': used more than once + - #2907 g_file_info_get_name returns NULL in contradiction to docs (Philip + Withnall) + - #2913 `glib:glib / error` fails with Glibc-2.37 (Philip Withnall) + - #2915 Python tests fail on Windows when an environment variable contains + non-ASCII characters (Luca Bacci) + - #2916 gdbus: Never buffer reads during server authentication + - #2918 2.75.3: array-test fails on big-endian CPUs (Simon McVittie) + - #2919 2.75.3: g_string_append_len_inline: error: implicit conversion changes + signedness + - #2924 Use-after-free of GDBusMethodInvocation in GDBusInterfaceSkeleton + (Philip Withnall) + - !3168 GWin32AppInfo: Retrieve display name for UWP / Packaged apps + - !3273 Revert "Revert "tests: Temporarily disable socket test due to a kernel + bug"" + - !3275 tests: Add a -Wsign-conversion test for gstring.h + - !3279 tests: Don’t run the GObject performance tests under valgrind + - !3280 ci: Use Meson 1.0.0 on Windows and macOS CI builds + - !3281 tests: Remove custom printerr logging from live-g-file + - !3282 spawn-test: Use an absolute path to the system sort.exe on Windows + - !3283 Make sure new file descriptors have close-on-exec flag set on them in + a race-free way + - !3284 Allow passing a `NULL` item to `g_list_store_find_with_equal_func()` + - !3288 spawn-test: Fix running on non-English Windows + - !3290 g_type_name: Fix return annotation + - !3292 Close-on-exec flag few missed places + - !3294 gio/tests/cxx.cpp: fix missing sentinel for musl + - !3295 tests: Add some missing g_thread_join() calls to onceinit test + - !3296 gdbusconnection: Explicitly destroy an idle source on cleanup + - !3299 Update the NEWS file + - !3301 GObject: Add nullable annotations + - !3304 tests: Skip assert-msg-test.py if gdb fails + - !3305 Fix a memory leak in g_strerror + +* Translation updates: + - Basque (Asier Sarasua Garmendia) + - Danish (Alan Mortensen) + - Galician (Fran Dieguez) + - Georgian (Ekaterine Papava) + - German (Tim Sabsch) + - Hebrew (Yaron Shahrabani) + - Hungarian (Balázs Úr) + - Indonesian (Kukuh Syafaat) + - Lithuanian (Aurimas Černius) + - Portuguese (Hugo Carvalho) + - Serbian (Марко Костић) + - Slovenian (Matej Urbančič) + - Spanish (Daniel) + - Swedish (Anders Jonsson) + - Turkish (Sabri Ünal, Emin Tufan Çetin) + - Ukrainian (Yuri Chornoivan) + + +Overview of changes in GLib 2.75.3, 2023-02-13 +============================================== + +* Drop the implementation of GSlice, and make the API use the system `malloc()` + internally (#1079) (based on investigation work by multiple people) + +* Use a thread-spawning thread to keep thread scheduler settings consistent; + fixes GThreadPool critical warnings due to failing to set scheduler settings + in some situations (#2769, work by Sebastian Dröge and others) + +* GIR annotation improvements for multiple APIs (#2827, #2894, #2895, #2897, + !3198, !3234, !3236, !3238, !3245, !3266, work by multiple people) + +* Optimise printing of nested maybes in `g_variant_print()` (#2862, work by Philip Withnall) + +* Use `tap` test protocol within GLib, and support TAP 13/14 (!3140, work by Marco Trevisan) + +* Fix a regression in glib-compile-schemas 2.75.2 causing schemas and override + files to be sorted incorrectly (!3188, spotted by John Wudrick, work by Philip Withnall) + +* Support per-desktop overrides in `GSettingsAction` (!3193, work by Philip Withnall) + +* Various optimisations to `GString` (!3199, work by Matthias Clasen and Marco Trevisan) + +* Reduce allocations in message printing functions if there’s nothing to format (!3205, work by Marco Trevisan) + +* Add inline version of `g_strdup()`, allowing the compiler to do `NULL` folding + and constant folding on `strlen()` calls (!3209, work by Marco Trevisan) + +* Add a `GPathBuf` API for building and manipulating file paths (!3216, work by Emmanuele Bassi) + +* Add `g_string_free_and_steal()` and use it to warn on unused results from + `g_string_free (_, FALSE)` (!3219, !3226, work by Matthias Clasen and Sergey Bugaev) + +* Add `g_free_sized()` and `g_aligned_free_sized()` to mirror the upcoming + `free_sized()` function in C23; use these if porting away from `g_slice_free()` + (!3231, work by Philip Withnall) + +* Fix underspecified dependencies on generated headers in `meson.build`, which + should reduce spurious build failures (!3260, work by Eli Schwartz) + +* Bugs fixed: + - #1079 Investigate dropping or deprecating the GSlice allocator (Natanael + Copa) + - #2769 GThreadPool crashes with: Failed to set scheduler settings: Operation + not permitted (Sebastian Dröge) + - #2827 Callback parameters get wrong attributes in gir files + - #2862 fuzz_variant_text: Timeout in fuzz_variant_text when printing nested + maybes + - #2876 g_find_program_for_path is public ABI but not declared in a public + header (Philip Withnall) + - #2877 glib/tests/array- + test.c:1828:pointer_array_new_from_null_terminated_array_from_gstrv: + 'g_ptr_array_index (gparray, 4)' should be NULL (Simon McVittie) + - #2881 Invalid read of size 4 in get_matched_substring_number (Philip + Withnall) + - #2883 g_file_set_contents fails on mingw64 with "no error" if file size > + INT_MAX (CCode) + - #2890 g_string_append() macro evaluates arguments multiple times (Marco + Trevisan (Treviño)) + - #2891 Memory leak in "gio/win32/gwin32fsmonitorutils.c" (Philip Withnall) + - #2892 Memory leak in "gio/gwin32mount.c" (Philip Withnall) + - #2894 g_value_take_string: wrong ownership transfer info in GIR (Lukáš + Tyrychtr) + - #2895 g_io_channel_get_line_term: wrong GIR (Bart Jacobs) + - #2897 g_time_zone_adjust_time: GIR says gint64 but it's gint64* (Bart + Jacobs) + - #2898 g_print replaces non-ascii characters with question mark + - #2900 msys2-clang64: g_spawn_async() fails in clang builds when envp is + not NULL + - #2901 g_app_info_get_executable doesn't work well on latest Ubuntu with + Firefox installed as snap + - #2908 Crash when creating GtkTextView with G_DEBUG=gc-friendly (Marco + Trevisan (Treviño)) + - #2914 Should GPathBuf split on both directions of slashes on Windows? (Simon + McVittie) + - GNOME/gimp#9094 devel: None of the extensions and plugins load in Clang + builds + - !3140 meson: Use 'tap' test protocol and support TAP 13/14 + - !3184 build: Don't overwrite build variables + - !3185 Include gobject-visibility.h in glib-types.h + - !3187 tests/desktop-app-info: fix stack-use-after-scope + - !3188 glib-compile-schemas: Fix typo in comparison function + - !3189 docs: Fix return type in cmpint + - !3191 tests: Improve error message if setting max processes to 1 fails + - !3192 garray: Avoid calling memcpy with no items + - !3193 gsettings: Support per-desktop overrides in GSettingsAction + - !3196 gio/tests/file.c:Fix expectations when running as root + - !3198 Fix a couple of `closure` annotations + - !3199 Some GString optimizations + - !3203 GTask: Document issues + - !3205 gmessages: Avoid strings duplication if there's nothing to format + - !3206 tests: Add a test print to spawn-test on Windows + - !3207 tests: Fix a minor leak in the GString tests + - !3209 gstrfuncs: Add inline version of g_strdup() + - !3216 Add GPathBuf + - !3219 Add g_string_free_and_steal + - !3221 TAP: some further cleanups + - !3223 Add a few suppressions to glib.supp and fix a minor bug in + gapplication test + - !3224 gtestutils: Fix a potential NULL pointer dereference in g_test_log() + - !3225 tests: Temporarily disable socket test due to a kernel bug + - !3226 Make g_string_free (_, FALSE) warn on unused result + - !3231 gmem: Add g_free_sized() and g_aligned_free_sized() + - !3234 GMainContext: Use nullable context in docs (and in some missing code) + - !3236 g_regex_escape_string: bad GIR: utf8 -> utf8 + - !3238 Fix GIR: gunichar -> gunichar + - !3242 GAtomicArray: Ensure metadata does not misalign the payload + - !3243 Allow using msort_r CHERI-enabled architectures + - !3245 gio: converter: Forbid null out arguments + - !3246 tests: Fix a few minor leaks in gdbus-example-peer + - !3247 tests: Fix a minor leak in the cxx string append tests + - !3248 timezone: Fix a compiler warning + - !3249 gstring: Avoid warnings from inline functions + - !3250 ci: Temporarily only run the FreeBSD 13 CI on a schedule + - !3251 Revert "gtype: Use the system allocator on UNIX" and use g_free_sized + instead + - !3256 Remove n_preallocs field from InstanceData + - !3258 Revert "ci: Temporarily only run the FreeBSD 13 CI on a schedule" + - !3259 gmessages: use g_atomic_pointer to access handlers for + g_print()/g_printerr() + - !3260 fix underspecified dependencies on generated headers + - !3262 Add a (temporary) assertion that sizeof(gsize) == sizeof(guintptr) + - !3263 Revert "glib-init: Add more static assertions for gintptr, guintptr" + - !3265 fileutils: Make some sample code detect symlinks as intended + - !3266 Avoid some warnings from GObject-Introspection + - !3268 po: Add missing header file to POTFILES.in + +* Translation updates: + - Belarusian (Vasil Pupkin) + - Galician (Fran Dieguez) + - Georgian (Ekaterine Papava) + - Hebrew (Yosef Or Boczko) + - Indonesian (Kukuh Syafaat) + - Portuguese (Hugo Carvalho) + - Russian (Aleksandr Melman) + - Turkish (Sabri Ünal, Emin Tufan Çetin) + - Ukrainian (Yuri Chornoivan) + + +Overview of changes in GLib 2.75.2, 2023-01-06 +============================================== + +* Add `g_ptr_array_sort_values()` and `g_ptr_array_sort_values_with_data()` APIs + (work by Marco Trevisan) (!3155) + +* Some fixes for activation of UWP apps on Windows (work by Luca Bacci) (#2843, !3167) + +* Support Markdown output from `gdbus-codegen` (work by Guido Günther) (!3171) + +* Bugs fixed: + - #2871 Leak in g_find_program_for_path() (Philip Withnall) + - #2843 gtk_show_uri can't open browser on MSYS2 on Windows (Luca Bacci) + - #2857 Grammar issue in documentation glib stpcpy (Peter Bloomfield) + - !3155 garray: Add g_ptr_array_sort_values_with_data() wrappers + - !3162 gobject: Add a missing NULL check for the return from + lookup_type_node_I() + - !3167 GWin32AppInfo: Fixes for UWP (packaged) apps activation + - !3169 GLocalFile: Delete redundant error saving statement + - !3170 GLocalFile: add error handle for trash info file writing + - !3171 codegen: Support markdown suitable for gi-docgen + - !3173 gdesktopappinfo: Drop an unnecessary NULL check + - !3174 garray: Add some additional length assertions + - !3175 codegen: Check parameter before calling its interface method + - !3177 Various fixes for how we interact with subproject dependencies + - !3178 glocalfileinfo: Don't reset mtime tv_sec when setting tv_usec + - !3181 INSTALL.md,README.win32.md: Actualize links + +* Translation updates: + - Turkish (Sabri Ünal) + + +Overview of changes in GLib 2.75.1, 2022-12-21 +============================================== + +* Add new `GFileInfo` properties for large thumbnails (work by Matthias Clasen) (#621) * Fix missing input validation in `GDBusMenuModel` (work by Lars Uebernickel) (#861) +* Change default `g_desktop_app_info_search()` algorithm to include substring + matches (work by Alynx Zhou) (#1152) + * Various GVariant security fixes when handling untrusted data (work by William Manley, Philip Withnall, Simon McVittie) (#2121, #2540, #2794, #2797, #2839, #2840, #2841) +* Add support for XDG Activation protocol in `GAppLaunchContext` (work by + Ilya Fedin) (#2709) + +* Return `application/x-zerosize` rather than `text/plain` as content type for + empty files (work by Philip Withnall) (#2777) + +* Deprecate `-Druntime_libdir` configure option because it was unused (work by + Philip Withnall) (#2786) + +* Check for snap plugs when accessing portals (work by Robert Ancell) (!3020) + +* Add `GArray` and `GPtrArray` constructors to take or copy C arrays (work by + Marco Trevisan) (!3128) + +* Add `GHashTable` methods to get and steal hash table keys and values as + `GPtrArray`s (work by Marco Trevisan) (!3130) + +* Change the default D-Bus system bus socket address from + `/var/run/dbus/system_bus_socket` to `/run/dbus/system_bus_socket`, in line + with changes in dbus.git. This can now be overridden by passing + `-Druntime_dir=/some/path` at configure time — the default is `/run`, which + should work for all users except distributions where `/run` is not equivalent + to `/var/run`. OS distributors should check that this configured path matches + the runtime directory configured for their D-Bus daemon. (work by + Roman Stratiienko, Philip Withnall) (!3095, !3101) + * Bugs fixed: + - #621 file-info: catch thumbnail files in large directory as well (Matthias + Clasen) - #861 insufficient input validation in GDBusMenuModel (Lars Uebernickel) + - #1152 Application search algorithm (g_desktop_app_info_search()) should use + fuzzy matching (Alynx Zhou) + - #1904 gaction: remote triggered crashes - #2121 GVariant deserialisation does not match spec for non-normal data - (William Manley, Philip Withnall) + (Philip Withnall, William Manley) - #2540 Parsing serialized GVariants can blow up run-time and memory (Philip Withnall) + - #2709 Add support for XDG_ACTIVATION_TOKEN/XDG Activation protocol in + GAppLaunchContext (Ilya Fedin) + - #2777 Return application/x-zerosize for empty file content types rather than + text/plain (Philip Withnall) + - #2786 runtime_libdir and iconv options documented and exposed but not + effective? (Philip Withnall) + - #2793 Introspection annotations for g_clear_pointer() and g_clear_fd() might + not be correct (Philip Withnall) - #2794 GVariant offset table entry size is not checked in is_normal() (Philip Withnall) - #2797 g_variant_byteswap() can take a long time with some non-normal inputs (Philip Withnall) + - #2809 g_str_equal switched to stricter API (typing) (Philip Withnall) + - #2811 Internal inotify symbols exposed in 2.75.0 ABI (Simon McVittie) + - #2812 CI failing on macOS: -Werror,-Wmissing-field-initializers (Simon + McVittie) + - #2820 g_str_equal: New macro version breaks compilation in C++ projects + (Philip Withnall) + - #2821 GObject webpage documentation is mis-formatted during generation + (Emmanuele Bassi) - #2835 gio/gapplication test fails with test_dbus_activate: assertion failed (n_activations == 2): (1 == 2) (Philip Withnall) + - #2836 Conditional jump on uninitialised value in spawn-singlethread (Philip + Withnall) + - #2837 Assertion failure in contexts test (Philip Withnall) - #2839 bisected GVariant test regression on big-endian architectures (Simon McVittie) - #2840 fuzz_variant_binary_byteswap: Heap-buffer-overflow in g_variant_serialised_get_child (Philip Withnall) - #2841 fuzz_variant_text: Timeout in fuzz_variant_text (Philip Withnall) + - #2845 MSVC: Build failure with g_array_append_val() in C++ mode + - #2846 Follow-up from "garray: Add support adding literal values" — doesn’t + work with clang (Emmanuele Bassi) - #2852 alpine/musl: catching signals from a subprocess triggers GLib:ERROR:../glib/gmain.c:5569:siginfo_t_to_wait_status: code should not be reached (Philip Withnall) - - !3114 Backport !3113 “gaction: Validate actions activated over D-Bus” to - glib-2-74 - - !3126 Backport !3125 “Various fixes to normal form handling in GVariant” to - glib-2-74 - - !3134 Backport !3133 “gmenumodel: disallow exporting large menus on the bus” - to glib-2-74 - - !3138 Backport !3136 “gvariant-serialiser: Convert endianness of offsets” to - glib-2-74 - - !3153 Backport !3120 “glib/gthread-posix: Conditionally use `futex` and/or - `futex_time64` syscalls...” to glib-2-74 - - !3161 Backport !3158 ”gmain: Define fallback values for siginfo_t constants - for musl” to glib-2-74 - - !3164 Backport !3163 “gvariant: Check offset table doesn’t fall outside - variant bounds and speed up text parsing” to glib-2-74 + - !385 gtask: Warn if a GTask is finalised without returning + - !2479 glib/spawn: check user source_fds doesn't contain private fds + - !2728 gtype: Speed up type checking for final types + - !2764 GCancellable: Ensure it is always cancelled on connect callback + - !2886 gtestutils: Use $G_TEST_TMPDIR as temporary directory when defined + - !2895 Expose C and C++ standard versions and add macros to check them + - !2917 meson: Use gnome.mkenum_simple() + - !2992 glib/tests: Add test to check that we abort on low-memory + - !3020 portal: Check for snap plugs before accessing portals + - !3042 gdesktopappinfo: Fail early if trying to launch an invalid executable + and always use desktop Path and context $PATH + - !3064 ci: Exclude copylibs and fuzz tests from code coverage + - !3065 tests: Add some trivial tests for g_thread_init() + - !3067 tests/meson.build: do not use can_run_host_binaries() + - !3068 gio: Fix missing visibility header dependency + - !3070 type-flags test: Force G_ENABLE_DIAGNOSTIC=1 to be set + - !3073 Misc docs fixes and test improvements in GAction and + GNotificationBackend + - !3075 gmodule: Fix redeclaration of symbol + - !3076 gspawn: Ignore invalid FDs when using safe_fdwalk() + - !3077 build: Bump Meson dependency to 0.64.0 + - !3078 build: Move -Wnonnull flag to meson.build + - !3079 giochannel: Clarify assertions in g_io_channel_write_chars() + - !3080 A few test improvements for scan-build + - !3081 gthreadpool: Mark an explicit leak as to be ignored + - !3083 tests: Remove a manual timeout from desktop-app-info test + - !3086 gmacros: Use C++ namespaces attribute specifier sequences for msvc + - !3088 tests: Add G_TEST_OPTION_ISOLATE_DIRS to almost all gdbus tests + - !3089 Revert dependency bump to use Meson 0.64 + - !3091 Fix doc typo in g_dbus_connection_signal_subscribe + - !3092 Fix gmodule/COPYING symlink path + - !3095 gdbusaddress: Form default system dbus path using meson definitions + - !3097 garray: Add assertions to help static analysis + - !3098 gobject: Use compare and exchange full to re-read old ref value + - !3099 gsocketcontrolmessage: add nullable annotation to deserialize return + - !3100 gsimpleproxyresolver: Make explicit that a port is needed for + HTTP/HTTPS + - !3101 gdbusaddress: Use runstatedir rather than localstatedir + - !3103 gclosure: Documentation improvements around floating closures + - !3105 gsocket: use socklen_t in more places to fix build under cygwin + - !3106 gobject: Check for valid ref counting via g_return_if_fail + - !3107 gdesktopappinfo: Group search results by both categories and match + types + - !3108 gwakeuptest: Do not rely on alarm() to stop tests on timeout + - !3112 docs: Remove a stray > in the glib-mkenums man page + - !3115 ci: Don’t fail if testlog-unstable_tests.junit.xml doesn’t exist on + MSVC + - !3116 docs: Remove HACKING + - !3117 tests: fix assert-msg-test with custom gdbinit + - !3119 Improve notification queue warning + - !3120 glib/gthread-posix: Conditionally use `futex` and/or `futex_time64` + syscalls... + - !3124 More gobject performance tests + - !3127 docs: Update SECURITY to stop mentioning a deprecated mailing list + - !3128 garray: Add more G(Ptr)Array constructors to take or copy C arrays + - !3129 garray: Add support adding literal values + - !3130 ghash: Add APIs to get (and steal) hash table keys and values as + GPtrArray + - !3132 gtestutils: Check for failure to setenv() and return + - !3139 gtype: avoid "-Wcast-align" warning with optimized + G_TYPE_CHECK_INSTANCE_CAST() + - !3141 tests/slice-concurrent.c: avoid using rand() from multiple threads + - !3142 tests/gdbus-method-invocation: Fix missing g_variant_new() argument + - !3144 gspawn.c: prefer close_range() on FreeBSD if available + - !3145 tests/gvariant.c: ensure posix_memalign alignment argument is correct + - !3147 ci: Temporarily only run the FreeBSD 13 CI on a schedule + - !3148 ghash: Use unsigned types for number of nodes and occupied ones + - !3151 Revert "ci: Temporarily only run the FreeBSD 13 CI on a schedule" + - !3152 tests: Fix stall/deadlock in slice-concurrent on macOS CI + - !3156 gobject: Some GValue setting code cleanups + - !3157 gthread-posix: need to #include <errno.h> + - !3159 gmenuexporter: Fix warning of unused n_items when building with + G_DISABLE_ASSERT * Translation updates: - - Abkhazian (Nart Tlisha) - - Belarusian (Vasil Pupkin) - - Georgian (Ekaterine Papava) - Interlingue (Olga Smirnova) - - -Overview of changes in GLib 2.74.3 -================================== - -* Fix regression in type checking `g_str_equal()` from C++ projects (#2820) - -* Bugs fixed: - - #2820 g_str_equal: New macro version breaks compilation in C++ projects - (Philip Withnall) - - !3096 Backport !3094 “gstrfuncs: Fix regression in C++ types accepted by - g_str_equal()” to glib-2-74 - - -Overview of changes in GLib 2.74.2 -================================== - -* Fix `GVariant` type depths checks on text format variants (work by Philip Withnall) (#2782) - -* Fix an obscure corner case with FD handling in `g_spawn_*()` when a process - has already closed the standard I/O FDs (work by Ray Strode) (#2795) - -* Fix regression in type checking on `const` arguments to `g_str_equal()` (#2809) - -* Bugs fixed: - - #2782 GVariant type depth not checked on typedecls in text format variants - (Philip Withnall) - - #2795 regression gnome-keyring-daemon uses 100% CPU with glib-2.74.1 (Ray - Strode) - - #2799 Wrong GTask tag on error return path in - g_proxy_resolver_lookup_async() (Michael Catanzaro) - - #2809 g_str_equal switched to stricter API (typing) (Philip Withnall) - - !3017 Backport !3008 “gio/gdesktopappinfo: Free the wrapped argv array on - launch failure” to glib-2-74 - - !3038 Backport !3035 “portal: Fix broken header guard” to glib-2-74 - - !3039 Backport !3029 “Revert "Handling collision between standard i/o file - descriptors and newly created ones" ” to glib-2-74 - - !3046 Backport !3045 “gproxyresolver: lookup_finish() should better parallel - lookup_async()” to glib-2-74 - - !3063 Backport !3061 “gvariant-parser: Speed up maybe_wrapper() by an order - of magnitude” to glib-2-74 - - !3084 Backport !3082 “gstrfuncs: Fix regression in types accepted by - g_str_equal()” to glib-2-74 - -* Translation updates: - - Abkhazian (Nart Tlisha) - - Dutch (Nathan Follens) - Serbian (Мирослав Николић) -Overview of changes in GLib 2.74.1 -================================== +Overview of changes in GLib 2.75.0, 2022-11-10 +============================================== * Update Unicode data to version 15 (work by Marco Trevisan) (#2735) @@ -115,6 +571,8 @@ * Add inline optimised version of `g_str_equal()` (work by Xavier Claessens) (#2775) +* Add inline optimised version of `g_str_has_{prefix,suffix}()` (work by Emmanuel Fleury) (#24) + * Fix `GVariant` type depths checks on text format variants (work by Philip Withnall) (#2782) * Fix regression with int64 and double hashing functions on big-endian architectures @@ -127,15 +585,60 @@ * Avoid `EINTR` races when closing FDs in `g_spawn_*()` (work by Thomas Haller) (!2988) +* Deprecate `G_MODULE_SUFFIX` and improve `g_module_open()` to automatically find + modules better on different platforms (work by Nirbheek Chauhan) (#520, #1413) + +* Soft-deprecate sized integer types in favour of C99 `stdint.h` types (work by Simon McVittie) (#1484) + +* Correctly mark sshfs file systems as `G_FILE_ATTRIBUTE_FILESYSTEM_REMOTE` (work by Philip Withnall) (#2726) + +* Add `g_set_string()` function for setting strings simply (work by Christian Hergert) (#2747) + +* Add support for `xdg-terminal-exec` for handling desktop applications using + `Terminal=true` (work by Max Gautier) (!2839) + +* Change various configure-time defaults for cast checks and related + (work by Michael Catanzaro) (!2850, !2894) + +* Set Meson’s `install_tag` on installed files (work by Xavier Claessens) (!2905) + +* Add `G_TYPE_FLAG_DEPRECATED` for tagging deprecated `GType`s/`GObject`s + (work by Matthias Clasen) (!2993) + +* Add `g_clear_fd()` and `g_autofd` for automatically closing FDs when exiting a + scope (work by Simon McVittie) (!3007) + +* Convert GVariant Specification to reStructuredText and host it at + https://developer.gnome.org/documentation/specifications/gvariant-specification-1.0.html + (work by Philip Withnall) (!3044) + * Bugs fixed: - - #16 gspawn.c file descriptor handling (Emmanuel Fleury) + - #16 gspawn.c file descriptor handling (Emmanuel Fleury, Ray Strode) + - #19 Workaround dlopen(NULL, 0) brokenness + - #24 inlined g_str_has optimisations (Emmanuel Fleury) - #333 Make GLib valgrind friendly (Marco Trevisan (Treviño)) + - #520 g_module_build_path builds incorrect paths on macOS and Windows (MSVC) + (Nirbheek Chauhan) + - #1211 macros: generate uniq variable name in _G_BOOLEAN_EXPR()/G_LIKELY() + (Thomas Haller) + - #1413 Meson build defines G_MODULE_SUFFIX to `dylib` on macOS but autotools + uses `so` (Nirbheek Chauhan) + - #1484 Deprecate sized integer types in favour of C99 stdint.h (Simon + McVittie) + - #2622 GThreadedResolver incorrectly expands domain names in SRV records + (Philip Withnall) + - #2726 G_FILE_ATTRIBUTE_FILESYSTEM_REMOTE not set for sshfs (Philip Withnall) - #2735 Update unicode data to version 15 - #2740 gio-launch-desktop: clang compiler can't compile with commit 813ce7f0b (Kjell Ahlstedt) - #2742 glib:gio / file test fails after update to 2.73.3. (Marco Trevisan (Treviño)) + - #2747 Add g_set_string for simplified and correct property setters + (Christian Hergert) - #2748 construct properties always trigger the deprecated property warning + (Simon McVittie) + - #2753 Infinite recursion on ENOMEM in g_vasprintf() (Philip Withnall) + - #2754 `glib / spawn-test` fails with non-English locale (Philip Withnall) - #2758 gmessages.c compile failure with -Werror=unused-result (Marco Trevisan (Treviño)) - #2759 gosxcontenttype.m compile failure with -Werror=declaration-after- @@ -150,10 +653,36 @@ - #2775 Add an inline version of g_str_equal (Xavier Claessens) - #2782 GVariant type depth not checked on typedecls in text format variants (Philip Withnall) + - #2783 Enable no-interrupt close() on macOS + - #2784 Remove workaround to avoid false-positive -Werror=nonnull in + g_str_has_*() macro versions + - #2785 Invalid FD assertion in g_close() triggers test failures on macOS (Ray + Strode) - #2787 new int64, double hash functions always hash to 0 on big-endian (Simon McVittie) - - #2788 GObject warnings: keep or revert warning -> critical change in 2.74.x - branch? (Philip Withnall) + - #2791 function name typo in comment explaining the private struct memory + layout (gtype.c) (sunce) + - #2795 regression gnome-keyring-daemon uses 100% CPU with glib-2.74.1 (Ray + Strode) + - #2796 _g_clear_fd_ignore_error() breaks with GLIB_VERSION_MAX_ALLOWED (Simon + McVittie) + - #2798 msys2-clang64 fails to compile cxx tests on versions < 11 (Marco + Trevisan (Treviño)) + - #2799 Wrong GTask tag on error return path in + g_proxy_resolver_lookup_async() (Michael Catanzaro) + - #2800 fileutils test regression on vs2017-x64 builds: + appcrt\lowio\commit.cpp(19) : Assertion failed: (_osfile(fh) & FOPEN) + - #2802 Remove G_OS_DARWIN in favour of platform-specific defines (Philip + Withnall) + - #2805 g_task_set_name() should not use g_task_set_static_name() unless + permitted by GLIB_VERSION_MAX_ALLOWED (Michael Catanzaro) + - #2807 ../glib/gstrfuncs.h:186:41: error: argument 1 null where non-null + expected -Werror=nonnull (Ray Strode) + - !2799 Use the system allocator on UNIX when creating GTypeInstances + - !2839 Add support for xdg-terminal-exec for handling desktop applications + using 'Terminal=true' + - !2848 giomodule: Automatically detect modules on macOS + - !2850 Automatically disable cast checks when building with optimization - !2852 Replace most GObject warnings with criticals - !2857 glib-mkenums: Specify output encoding as UTF-8 explicitly for non- English locale @@ -161,9 +690,14 @@ standard versions - !2866 tests: skip g-file-info test if atime unsupported - !2867 tests: skip shared libs if default_library=static + - !2869 task: Don't overwrite source names - !2880 gbacktrace: Don't truncate gdb output + - !2884 tests/desktop-app-info: Add tests to verify if launching with terminal + works - !2885 tests/desktop-app-info: Use unique temporary paths for action files + - !2889 Run tests with G_ENABLE_DIAGNOSTIC=1 - !2892 tests/unix-streams: Free the cancelled error on cancelled cancellable + - !2894 Disable cast checks in plain builds - !2896 Build API docs only with shared libraries - !2899 gio: make g_task_get_cancellable return value (nullable) - !2901 glocalfileoutputstream: Do not double-close an fd on unlink error @@ -183,43 +717,104 @@ - !2928 build: Let Meson figure out Python installation - !2931 gdatetime: add missing g_return_() check in g_date_time_format_iso8601 - !2933 Fix style warning in gvariant.c + - !2936 Fix symbol visibility macros on Windows + - !2937 gicon: Add introspection for to_tokens / from_tokens vfunc's - !2938 gdatetime: add NULL guard in g_date_time_new_now() - !2939 gobject/tests/param: Add unit test for handling invalid NULL param spec + - !2942 gbookmarkfile: Add copy function and define it as boxed type for + introspection + - !2945 gmessages: Add missing trailing newline in fallback log handler - !2946 tests: Check the return value of fwrite() in a test + - !2947 gspawn: avoid race due to retry with EINTR on close() - !2948 ghash: document g_hash_table_steal_extended() behavior for sets - !2949 doc: Correctly annotate g_async_queue_push() - - !2958 Backport !2952 “Various win32 test fixes” to glib-2-74 - - !2960 Backport !2959 “Some leaks fixes” to glib-2-74 - - !2973 Backport !2955 “gtimezone: Reject weird /etc/localtime configurations” - to glib-2-74 - - !2975 Backport !2974 “gvariant-parser: Reject deeply-nested typedecls in - text form variants” to glib-2-74 - - !2982 Backport !2887 “glocalfileinfo: Ensure we always sniff some data to - get the content type” to glib-2-74 - - !2983 Backport !2910 “gmessages: Handle unused results from fputs and - fwrite” to glib-2-74 - - !2988 Backport !2947 “gspawn: avoid race due to retry with EINTR on close()” - to glib-2-74 - - !2989 Backport !2978 “A couple of test fixes on OS X” to glib-2-74 - - !2995 Revert !2924 in 2.74.x branch - - !2996 Revert "Replace most GObject warnings with criticals" on glib-2-74 - - !2998 Backport !2934 “gobject: Always ref-sink variants in g_object_set” to - glib-2-74 - - !3010 Backport !3009 “gtimezone: Fix symlink checks on relative link - targets” to glib-2-74 + - !2951 meson: Don't explicitly disable mixed declarations and statements + - !2952 Various win32 test fixes + - !2953 build: Post-release version bump to 2.75.0 + - !2954 tools: Fix code style warnings in gen-visibility-macros.py + - !2955 gtimezone: Reject weird /etc/localtime configurations + - !2956 gstrfuncs: Fix a compiler warning in g_strerror() + - !2957 Fix include order of glib-visibility.h + - !2959 Some leaks fixes + - !2961 tests: Remove an unnecessary sleep from desktop-app-info test + - !2963 tests: Fix race condition on cancellation in unix-streams test + - !2964 gstdio: fail assertion in g_close() for invalid file descriptor + (EBADF) + - !2965 ghash: comment g_hash_table_steal_extended() about not destroying + key/value + - !2967 Fix build when G_DISABLE_CAST_CHECKS is defined to empty string + - !2968 tests: Fix minor race in desktop-app-info terminals test + - !2969 tests/desktop-app-info: Make sure scripts writes to the right end of + the pipe + - !2970 Fix GIOModule regression from !2959 + - !2972 tests: Temporarily disable desktop-app-info terminal test on FreeBSD + - !2976 Fix a couple of minor Coverity issues + - !2977 gstdio: Temporarily disable g_close() warning on macOS + - !2978 A couple of test fixes on OS X + - !2979 gtask: Use unsigned bit-field struct values to avoid warnings + - !2981 meson: Define G_OS_DARWIN when compiling under OSX or iOS + - !2984 tests: Fix code style in Python files to satisfy black and flake8 + - !2985 ci: Do not store docs artifacts + - !2987 meson, ci: Support tests that can fail under certain conditions + - !2990 gio/tests/g-file-info: don't assume million-in-one events don't happen + - !2991 glib, gmodule, gobject: Add generated headers to the lib dependency + - !2993 Add G_TYPE_FLAG_DEPRECATED + - !2997 docs: Mention platform-specific predefined macros + - !2999 Soft-deprecate G_VA_COPY in favour of va_copy + - !3000 docs: Stop claiming that gsize is wide enough to hold a pointer + - !3001 Improve documentation and static assertions around g(s)size, + g(u)intptr + - !3002 docs: Soft-deprecate G_STRUCT_OFFSET in favour of offsetof + - !3003 docs: Soft-deprecate types that are just aliases for a standard C type + - !3004 build: Mark the g-file-info test as succeeding + - !3005 Fix sandbox escape in GDBusServer + - !3007 gstdio: Add g_clear_fd() and g_autofd + - !3008 gio/gdesktopappinfo: Free the wrapped argv array on launch failure + - !3009 gtimezone: Fix symlink checks on relative link targets + - !3011 meson: Cleanup and fix include files paths, using base path without + repetitions + - !3012 meson: Handle various build system FIXME's + - !3013 tests: Fix few new clang warnings + - !3015 test/meson: Add tests dependencies on built programs, libraries and + modules + - !3018 Install gversionmacros.h in the right place + - !3019 ci: Fix check for missing install tag + - !3021 Add kgx (gnome console) to known terminals lists + - !3022 Fix coding style issue in .gitlab-ci/check-missing-install-tag.py + - !3023 ci: Move shellcheck/black/flake8 checks to a new CI job which can fail + - !3025 fuzzing: Add a new fuzz test for g_variant_byteswap() + - !3027 gstdio: Preserve errno in g_autofd, document async-signal safety + - !3033 glib/gmacros: Always define NULL as nullptr in C++11 and newer + - !3034 ci: Open issues when scheduled pipelines fail + - !3035 portal: Fix broken header guard + - !3037 gio: Create a sandbox checking function + - !3040 gspawn: Provide less brute force fdwalk implementation on macOS + - !3043 glib-mkenums: feature use of previous symbols in evaluation + - !3044 docs: Convert GVariant Specification to reStructuredText + - !3048 docs: Add licensing/copyright data to GVariant specification and fix + various formatting issues + - !3049 Add a SPDX LicenseRef for the license historically used for tests + - !3050 tests: Shorten internal codegen test timeout + - !3051 ci: Add a CI check for REUSE-compliant licensing/copyright headers + - !3055 fileutils test: Use no-op invalid-parameter handler when exercising + EBADF + - !3058 ci: Build with -Wnonnull + - !3060 fuzzing: Add a fuzz test for g_utf8_validate() + - !3062 tests: Fix a small leak in the GVariant tests and some minor + documentation typos * Translation updates: - Abkhazian (Nart Tlisha) + - Dutch (Nathan Follens) - Friulian (Fabio Tomat) - German (Christian Kirbach) - Hebrew (Yaron Shahrabani) - Kazakh (Baurzhan Muftakhidinov) - Occitan (post 1500) (Quentin PAGÈS) - - Turkish (Sabri Ünal) -Overview of changes in GLib 2.74.0, 17-09-2022 +Overview of changes in GLib 2.74.0, 2022-09-17 ============================================== * Use EPOLL_CLOEXEC by default (Colin Walters) @@ -289,7 +884,7 @@ - Turkish (Emin Tufan Çetin) - Ukrainian (Yuri Chornoivan) -Overview of changes in GLib 2.73.3, 05-08-2022 +Overview of changes in GLib 2.73.3, 2022-08-05 ============================================== * Revitalize G_REGEX_OPTIMIZE flag and use it to enable PCRE JIT compiler (work @@ -401,7 +996,7 @@ Nart Tlisha, Owen Rafferty, Philip Withnall, Ryan Hope, Simon McVittie, Yosef Or Boczko, Yuri Chornoivan, Zurab Kargareteli. -Overview of changes in GLib 2.73.2, 12-07-2022 +Overview of changes in GLib 2.73.2, 2022-07-12 ============================================== * Replace PCRE1 with PCRE2: This is a major change to drop the libpcre1
View file
_service:tar_scm:glib-2.74.4.tar.xz/README.md -> _service:tar_scm:glib-2.76.4.tar.xz/README.md
Changed
@@ -79,15 +79,3 @@ Otherwise, create a new merge request that introduces the change. Filing a separate issue is not required. -## Default branch renamed to `main` - -The default development branch of GLib has been renamed to `main`. To update -your local checkout, use: -```sh -git checkout master -git branch -m master main -git fetch -git branch --unset-upstream -git branch -u origin/main -git symbolic-ref refs/remotes/origin/HEAD refs/remotes/origin/main -```
View file
_service:tar_scm:glib-2.74.4.tar.xz/README.win32.md -> _service:tar_scm:glib-2.76.4.tar.xz/README.win32.md
Changed
@@ -10,7 +10,7 @@ For prebuilt binaries (DLLs and EXEs) and developer packages (headers, import libraries) of GLib, Pango, GTK+ etc for Windows, go to -https://www.gtk.org/download/windows.php . They are for "native" +https://www.gtk.org/docs/installations/windows/ . They are for "native" Windows meaning they use the Win32 API and Microsoft C runtime library only. No POSIX (Unix) emulation layer like Cygwin is involved. @@ -30,17 +30,16 @@ The following preprocessor macros are to be used for conditional compilation related to Win32 in GLib-using code: -- `G_OS_WIN32` is defined when compiling for native Win32, without - any POSIX emulation, other than to the extent provided by the - bundled Microsoft C library. +- `G_OS_WIN32` and `G_PLATFORM_WIN32` are defined when compiling for native + Win32, without any POSIX emulation, other than to the extent provided by + the bundled Microsoft C library. Either can be used to check when + conditionally compiling GLib-using code for Win32. - `G_WITH_CYGWIN` is defined if compiling for the Cygwin environment. Note that `G_OS_WIN32` is *not* defined in that case, as Cygwin is supposed to behave like Unix. `G_OS_UNIX` *is* defined by a GLib - for Cygwin. - -- `G_PLATFORM_WIN32` is defined when either `G_OS_WIN32` or `G_WITH_CYGWIN` - is defined. + for Cygwin, but `G_PLATFORM_WIN32` is *no longer* defined by GLib for + Cygwin. These macros are defined in `glibconfig.h`, and are thus available in all source files that include `<glib.h>`.
View file
_service:tar_scm:glib-2.74.4.tar.xz/SECURITY.md -> _service:tar_scm:glib-2.76.4.tar.xz/SECURITY.md
Changed
@@ -63,9 +63,7 @@ ## Security Announcements Security announcements are made publicly via the -`distributor` tag on discourse.gnome.org(https://discourse.gnome.org/tag/distributor) -and cross-posted to the -distributor-list(https://mail.gnome.org/mailman/listinfo/distributor-list). +`distributor` tag on discourse.gnome.org(https://discourse.gnome.org/tag/distributor). Announcements for security issues with wide applicability or high impact may additionally be made via
View file
_service:tar_scm:glib-2.74.4.tar.xz/docs/meson-version.md -> _service:tar_scm:glib-2.76.4.tar.xz/docs/meson-version.md
Changed
@@ -17,7 +17,9 @@ * Stable branches of GLib will not change their Meson dependency after the first release of that stable series * Unstable branches of GLib can bump their Meson dependency if - - at least that version of Meson currently available in Debian Testing; or + - at least that version of Meson is currently available in the freedesktop + SDK(https://gitlab.com/freedesktop-sdk/freedesktop-sdk/-/blob/master/elements/components/meson.bst); *and* + - at least that version of Meson is currently available in Debian Testing, or - the Python version required by the new Meson dependency is available in Debian Stable *and* the oldest currently-supported Ubuntu LTS * The version of Meson used by GLib should be pinned and pre-installed in the @@ -28,3 +30,8 @@ on is available in Debian Stable is that it’s straightforward to install a more recent Meson version using `pip`(https://mesonbuild.com/Getting-meson.html#installing-meson-with-pip). + +The reasoning behind requiring the version of Meson to be available in the +freedesktop SDK is that it is used to build GLib on nightly pipelines in +gnome-build-meta(https://gitlab.gnome.org/GNOME/gnome-build-meta/), which is +used to test GLib against multiple third party projects.
View file
_service:tar_scm:glib-2.74.4.tar.xz/docs/reference/gio/gdbus-object-manager-example/meson.build -> _service:tar_scm:glib-2.76.4.tar.xz/docs/reference/gio/gdbus-object-manager-example/meson.build
Changed
@@ -3,7 +3,7 @@ namespace : 'example', dependencies : libgdbus_example_objectmanager_dep, src_dir : 'gio/tests/gdbus-object-manager-example', - scan_args : gtkdoc_common_scan_args + + scan_args : '--rebuild-types', , install : false,
View file
_service:tar_scm:glib-2.74.4.tar.xz/docs/reference/gio/gio-docs.xml -> _service:tar_scm:glib-2.76.4.tar.xz/docs/reference/gio/gio-docs.xml
Changed
@@ -404,6 +404,10 @@ <title>Index of new symbols in 2.74</title> <xi:include href="xml/api-index-2.74.xml"><xi:fallback /></xi:include> </index> + <index id="api-index-2-76" role="2.76"> + <title>Index of new symbols in 2.76</title> + <xi:include href="xml/api-index-2.76.xml"><xi:fallback /></xi:include> + </index> <xi:include href="xml/annotation-glossary.xml"><xi:fallback /></xi:include>
View file
_service:tar_scm:glib-2.74.4.tar.xz/docs/reference/gio/gio-sections-common.txt -> _service:tar_scm:glib-2.76.4.tar.xz/docs/reference/gio/gio-sections-common.txt
Changed
@@ -350,6 +350,18 @@ G_FILE_ATTRIBUTE_THUMBNAIL_PATH G_FILE_ATTRIBUTE_THUMBNAILING_FAILED G_FILE_ATTRIBUTE_THUMBNAIL_IS_VALID +G_FILE_ATTRIBUTE_THUMBNAIL_PATH_NORMAL +G_FILE_ATTRIBUTE_THUMBNAILING_FAILED_NORMAL +G_FILE_ATTRIBUTE_THUMBNAIL_IS_VALID_NORMAL +G_FILE_ATTRIBUTE_THUMBNAIL_PATH_LARGE +G_FILE_ATTRIBUTE_THUMBNAILING_FAILED_LARGE +G_FILE_ATTRIBUTE_THUMBNAIL_IS_VALID_LARGE +G_FILE_ATTRIBUTE_THUMBNAIL_PATH_XLARGE +G_FILE_ATTRIBUTE_THUMBNAILING_FAILED_XLARGE +G_FILE_ATTRIBUTE_THUMBNAIL_IS_VALID_XLARGE +G_FILE_ATTRIBUTE_THUMBNAIL_PATH_XXLARGE +G_FILE_ATTRIBUTE_THUMBNAILING_FAILED_XXLARGE +G_FILE_ATTRIBUTE_THUMBNAIL_IS_VALID_XXLARGE G_FILE_ATTRIBUTE_PREVIEW_ICON G_FILE_ATTRIBUTE_FILESYSTEM_SIZE G_FILE_ATTRIBUTE_FILESYSTEM_FREE @@ -4316,6 +4328,7 @@ <SECTION> <FILE>gmenuexporter</FILE> +G_MENU_EXPORTER_MAX_SECTION_SIZE g_dbus_connection_export_menu_model g_dbus_connection_unexport_menu_model </SECTION> @@ -4562,6 +4575,7 @@ g_task_set_return_on_cancel g_task_set_source_tag g_task_set_name +g_task_set_static_name <SUBSECTION> g_task_report_error g_task_report_new_error
View file
_service:tar_scm:glib-2.74.4.tar.xz/docs/reference/gio/meson.build -> _service:tar_scm:glib-2.76.4.tar.xz/docs/reference/gio/meson.build
Changed
@@ -68,6 +68,7 @@ 'gproxyresolverportal.h', 'gregistrysettingsbackend.h', 'gresourcefile.h', + 'gsandbox.h', 'gsettingsbackendinternal.h', 'gsettings-mapping.h', 'gsettingsschema-internal.h', @@ -98,6 +99,7 @@ 'gwin32volumemonitor.h', 'thumbnail-verify.h', 'xdp-dbus.h', + 'gio-visibility.h', sections_files = files('gio-sections-common.txt') @@ -187,7 +189,8 @@ mode : 'none', dependencies : libgio_dep, libgobject_dep, libglib_dep, src_dir : 'gio', - scan_args : gtkdoc_common_scan_args + + scan_args : + '--ignore-decorators=' + ignore_decorators.replace('GLIB', 'GIO'), '--rebuild-types', '--ignore-headers=' + ' '.join(ignore_headers), ,
View file
_service:tar_scm:glib-2.74.4.tar.xz/docs/reference/glib/building.xml -> _service:tar_scm:glib-2.76.4.tar.xz/docs/reference/glib/building.xml
Changed
@@ -334,23 +334,6 @@ <filename>meson-logs</filename> directory. </para> </formalpara> - - <formalpara> - <title><option>-Druntime_libdir=RELPATH</option></title> - - <para> - Allows specifying a relative path to where to install the runtime - libraries (meaning library files used for running, not developing, - GLib applications). This can be used in operating system setups where - programs using GLib needs to run before e.g. <filename>/usr</filename> - is mounted. - For example, if <varname>LIBDIR</varname> is <filename>/usr/lib</filename> and - <filename>../../lib</filename> is passed to - <option>-Druntime_libdir</option> then the - runtime libraries are installed into <filename>/lib</filename> rather - than <filename>/usr/lib</filename>. - </para> - </formalpara> </refsect1> </refentry>
View file
_service:tar_scm:glib-2.74.4.tar.xz/docs/reference/glib/glib-docs.xml -> _service:tar_scm:glib-2.76.4.tar.xz/docs/reference/glib/glib-docs.xml
Changed
@@ -81,10 +81,11 @@ <xi:include href="xml/timers.xml" /> <xi:include href="xml/spawn.xml" /> <xi:include href="xml/fileutils.xml" /> + <xi:include href="xml/gpathbuf.xml" /> <xi:include href="xml/guri.xml" /> <xi:include href="xml/ghostutils.xml" /> <xi:include href="xml/shell.xml" /> - <xi:include href="xml/option.xml" /> + <xi:include href="xml/goptioncontext.xml" /> <xi:include href="xml/patterns.xml" /> <xi:include href="xml/gregex.xml" /> <xi:include href="regex-syntax.xml" /> @@ -300,6 +301,10 @@ <title>Index of new symbols in 2.74</title> <xi:include href="xml/api-index-2.74.xml"><xi:fallback /></xi:include> </index> + <index id="api-index-2-76" role="2.76"> + <title>Index of new symbols in 2.76</title> + <xi:include href="xml/api-index-2.76.xml"><xi:fallback /></xi:include> + </index> <xi:include href="xml/annotation-glossary.xml"><xi:fallback /></xi:include>
View file
_service:tar_scm:glib-2.76.4.tar.xz/docs/reference/glib/glib-sections.txt.in
Added
@@ -0,0 +1,3756 @@ +<INCLUDE>glib.h</INCLUDE> + +<SECTION> +<TITLE>Basic Types</TITLE> +<FILE>types</FILE> +gboolean +gpointer +gconstpointer +gchar +guchar + +<SUBSECTION> +gint +G_MININT +G_MAXINT +guint +G_MAXUINT +gshort +G_MINSHORT +G_MAXSHORT +gushort +G_MAXUSHORT +glong +G_MINLONG +G_MAXLONG +gulong +G_MAXULONG + +<SUBSECTION> +gint8 +G_MININT8 +G_MAXINT8 +guint8 +G_MAXUINT8 +gint16 +G_MININT16 +G_MAXINT16 +G_GINT16_MODIFIER +G_GINT16_FORMAT +guint16 +G_MAXUINT16 +G_GUINT16_FORMAT +gint32 +G_MININT32 +G_MAXINT32 +G_GINT32_MODIFIER +G_GINT32_FORMAT +guint32 +G_MAXUINT32 +G_GUINT32_FORMAT +gint64 +G_MININT64 +G_MAXINT64 +G_GINT64_MODIFIER +G_GINT64_FORMAT +G_GINT64_CONSTANT +guint64 +G_MAXUINT64 +G_GUINT64_FORMAT +G_GUINT64_CONSTANT + +<SUBSECTION> +gfloat +G_MINFLOAT +G_MAXFLOAT +gdouble +G_MINDOUBLE +G_MAXDOUBLE + +<SUBSECTION> +gsize +G_MAXSIZE +G_GSIZE_MODIFIER +G_GSIZE_FORMAT +gssize +G_MINSSIZE +G_MAXSSIZE +G_GSSIZE_MODIFIER +G_GSSIZE_FORMAT +goffset +G_MINOFFSET +G_MAXOFFSET +G_GOFFSET_MODIFIER +G_GOFFSET_FORMAT +G_GOFFSET_CONSTANT + +<SUBSECTION> +gintptr +G_GINTPTR_MODIFIER +G_GINTPTR_FORMAT +guintptr +G_GUINTPTR_FORMAT + +<SUBSECTION Private> +GLIB_SIZEOF_SSIZE_T +GLIB_SIZEOF_VOID_P +GLIB_SIZEOF_LONG +GLIB_SIZEOF_SIZE_T +G_HAVE_GINT64 +</SECTION> + +<SECTION> +<TITLE>Version Information</TITLE> +<FILE>version</FILE> +glib_major_version +glib_minor_version +glib_micro_version +glib_binary_age +glib_interface_age +glib_check_version + +<SUBSECTION> +GLIB_MAJOR_VERSION +GLIB_MINOR_VERSION +GLIB_MICRO_VERSION +GLIB_CHECK_VERSION + +<SUBSECTION> +GLIB_VERSION_CUR_STABLE +GLIB_VERSION_PREV_STABLE +GLIB_VERSION_MIN_REQUIRED +GLIB_VERSION_MAX_ALLOWED +GLIB_DISABLE_DEPRECATION_WARNINGS +@GLIB_VERSIONS@ + +<SUBSECTION Private> +G_ENCODE_VERSION +GLIB_AVAILABLE_IN_ALL +GLIB_DEPRECATED_ENUMERATOR +GLIB_DEPRECATED_ENUMERATOR_FOR +GLIB_DEPRECATED_MACRO +GLIB_DEPRECATED_MACRO_FOR +GLIB_DEPRECATED_TYPE +GLIB_DEPRECATED_TYPE_FOR +GLIB_VERSION_CUR_STABLE +GLIB_VERSION_PREV_STABLE +</SECTION> + +<SECTION> +<TITLE>Standard Macros</TITLE> +<FILE>macros</FILE> +<SUBSECTION> +G_OS_WIN32 +G_OS_UNIX + +<SUBSECTION> +G_DIR_SEPARATOR +G_DIR_SEPARATOR_S +G_IS_DIR_SEPARATOR +G_SEARCHPATH_SEPARATOR +G_SEARCHPATH_SEPARATOR_S + +<SUBSECTION> +TRUE +FALSE + +<SUBSECTION> +NULL + +<SUBSECTION> +MIN +MAX + +<SUBSECTION> +ABS +CLAMP +G_APPROX_VALUE + +<SUBSECTION> +G_SIZEOF_MEMBER +G_STRUCT_MEMBER +G_STRUCT_MEMBER_P +G_STRUCT_OFFSET + +<SUBSECTION> +G_MEM_ALIGN + +<SUBSECTION> +G_ALIGNOF + +<SUBSECTION> +G_CONST_RETURN +G_NORETURN +G_NORETURN_FUNCPTR + +<SUBSECTION> +G_ALWAYS_INLINE +G_NO_INLINE + +<SUBSECTION> +G_N_ELEMENTS +</SECTION> + +<SECTION> +<TITLE>Type Conversion Macros</TITLE> +<FILE>type_conversion</FILE> +GINT_TO_POINTER +GPOINTER_TO_INT + +<SUBSECTION> +GUINT_TO_POINTER +GPOINTER_TO_UINT +GSIZE_TO_POINTER +GPOINTER_TO_SIZE +</SECTION> + +<SECTION> +<TITLE>Byte Order Macros</TITLE> +<FILE>byte_order</FILE> +G_BYTE_ORDER +G_LITTLE_ENDIAN +G_BIG_ENDIAN +G_PDP_ENDIAN + +<SUBSECTION> +g_htonl +g_htons +g_ntohl +g_ntohs + +<SUBSECTION> +GINT_FROM_BE +GINT_FROM_LE +GINT_TO_BE +GINT_TO_LE + +<SUBSECTION> +GUINT_FROM_BE +GUINT_FROM_LE +GUINT_TO_BE +GUINT_TO_LE + +<SUBSECTION> +GLONG_FROM_BE +GLONG_FROM_LE +GLONG_TO_BE +GLONG_TO_LE + +<SUBSECTION> +GULONG_FROM_BE +GULONG_FROM_LE +GULONG_TO_BE +GULONG_TO_LE + +<SUBSECTION> +GSIZE_FROM_BE +GSIZE_FROM_LE +GSIZE_TO_BE +GSIZE_TO_LE + +<SUBSECTION> +GSSIZE_FROM_BE +GSSIZE_FROM_LE +GSSIZE_TO_BE +GSSIZE_TO_LE + +<SUBSECTION> +GINT16_FROM_BE +GINT16_FROM_LE +GINT16_TO_BE +GINT16_TO_LE + +<SUBSECTION> +GUINT16_FROM_BE +GUINT16_FROM_LE +GUINT16_TO_BE +GUINT16_TO_LE + +<SUBSECTION> +GINT32_FROM_BE +GINT32_FROM_LE +GINT32_TO_BE +GINT32_TO_LE + +<SUBSECTION> +GUINT32_FROM_BE +GUINT32_FROM_LE +GUINT32_TO_BE +GUINT32_TO_LE + +<SUBSECTION> +GINT64_FROM_BE +GINT64_FROM_LE +GINT64_TO_BE +GINT64_TO_LE + +<SUBSECTION> +GUINT64_FROM_BE +GUINT64_FROM_LE +GUINT64_TO_BE +GUINT64_TO_LE + +<SUBSECTION> +GUINT16_SWAP_BE_PDP +GUINT16_SWAP_LE_BE +GUINT16_SWAP_LE_PDP + +<SUBSECTION> +GUINT32_SWAP_BE_PDP +GUINT32_SWAP_LE_BE +GUINT32_SWAP_LE_PDP + +<SUBSECTION> +GUINT64_SWAP_LE_BE + +<SUBSECTION Private> +GUINT16_SWAP_LE_BE_CONSTANT +GUINT32_SWAP_LE_BE_CONSTANT +GUINT64_SWAP_LE_BE_CONSTANT +GUINT16_SWAP_LE_BE_IA32 +GUINT32_SWAP_LE_BE_IA32 +GUINT64_SWAP_LE_BE_IA32 +GUINT16_SWAP_LE_BE_IA64 +GUINT32_SWAP_LE_BE_IA64 +GUINT64_SWAP_LE_BE_IA64 +GUINT32_SWAP_LE_BE_X86_64 +GUINT64_SWAP_LE_BE_X86_64 + +</SECTION> + +<SECTION> +<TITLE>Bounds-checked integer arithmetic</TITLE> +<FILE>checkedmath</FILE> +g_uint_checked_add +g_uint_checked_mul +g_uint64_checked_add +g_uint64_checked_mul +g_size_checked_add +g_size_checked_mul +</SECTION> + +<SECTION> +<TITLE>Numerical Definitions</TITLE> +<FILE>numerical</FILE> +G_IEEE754_FLOAT_BIAS +G_IEEE754_DOUBLE_BIAS +GFloatIEEE754 +GDoubleIEEE754 + +<SUBSECTION> +G_E +G_LN2 +G_LN10 +G_PI +G_PI_2 +G_PI_4 +G_SQRT2 +G_LOG_2_BASE_10 +</SECTION> + +<SECTION> +<TITLE>Miscellaneous Macros</TITLE> +<FILE>macros_misc</FILE> +G_INLINE_FUNC + +<SUBSECTION> +g_auto +g_autoptr +g_autofree +g_autolist +g_autoslist +g_autoqueue +G_DEFINE_AUTOPTR_CLEANUP_FUNC +G_DEFINE_AUTO_CLEANUP_CLEAR_FUNC +G_DEFINE_AUTO_CLEANUP_FREE_FUNC + +<SUBSECTION> +G_STMT_START +G_STMT_END + +<SUBSECTION> +G_BEGIN_DECLS +G_END_DECLS + +<SUBSECTION> +G_VA_COPY + +<SUBSECTION> +G_STRINGIFY +G_PASTE +G_STATIC_ASSERT +G_STATIC_ASSERT_EXPR + +<SUBSECTION> +G_GNUC_CHECK_VERSION +G_GNUC_EXTENSION +G_GNUC_CONST +G_GNUC_PURE +G_GNUC_MALLOC +G_GNUC_ALLOC_SIZE +G_GNUC_ALLOC_SIZE2 +G_GNUC_DEPRECATED +G_GNUC_DEPRECATED_FOR +G_GNUC_BEGIN_IGNORE_DEPRECATIONS +G_GNUC_END_IGNORE_DEPRECATIONS +G_GNUC_NORETURN +G_GNUC_FALLTHROUGH +G_GNUC_UNUSED +G_GNUC_PRINTF +G_GNUC_SCANF +G_GNUC_STRFTIME +G_GNUC_FORMAT +G_GNUC_NULL_TERMINATED +G_GNUC_WARN_UNUSED_RESULT +G_GNUC_FUNCTION +G_GNUC_PRETTY_FUNCTION +G_GNUC_NO_INLINE +G_GNUC_NO_INSTRUMENT +G_HAVE_GNUC_VISIBILITY +G_GNUC_INTERNAL +G_GNUC_MAY_ALIAS + +<SUBSECTION> +G_C_STD_VERSION +G_C_STD_CHECK_VERSION +G_CXX_STD_VERSION +G_CXX_STD_CHECK_VERSION + +<SUBSECTION> +G_DEPRECATED +G_DEPRECATED_FOR +G_UNAVAILABLE + +<SUBSECTION> +G_LIKELY +G_UNLIKELY + +<SUBSECTION> +G_STRLOC +G_STRFUNC + +<SUBSECTION Private> +GLIB_VAR +G_STRINGIFY_ARG +G_PASTE_ARGS +G_HAVE_INLINE +G_CAN_INLINE +inline +G_HAVE___INLINE +G_HAVE___INLINE__ +G_INLINE_DEFINE_NEEDED +G_HAVE_GNUC_VARARGS +G_HAVE_ISO_VARARGS +G_HAVE_GROWING_STACK +G_VA_COPY_AS_ARRAY +GLIB_CANNOT_IGNORE_DEPRECATIONS +GLIB_DEPRECATED +GLIB_DEPRECATED_FOR +GLIB_UNAVAILABLE +GLIB_UNAVAILABLE_ENUMERATOR +GLIB_UNAVAILABLE_MACRO +GLIB_UNAVAILABLE_STATIC_INLINE +GLIB_UNAVAILABLE_TYPE +G_ANALYZER_ANALYZING +G_ANALYZER_NORETURN +g_autoptr_cleanup_generic_gfree +glib_typeof +g_macro__has_attribute +g_macro__has_builtin +g_macro__has_feature +g_macro__has_extension +g_macro__has_attribute___always_inline__ +g_macro__has_attribute___alloc_size__ +g_macro__has_attribute___const__ +g_macro__has_attribute___deprecated__ +g_macro__has_attribute___format__ +g_macro__has_attribute___format_arg__ +g_macro__has_attribute___malloc__ +g_macro__has_attribute___no_instrument_function__ +g_macro__has_attribute___noreturn__ +g_macro__has_attribute___pure__ +g_macro__has_attribute___sentinel__ +g_macro__has_attribute___unused__ +g_macro__has_attribute_fallthrough +g_macro__has_attribute_may_alias +g_macro__has_attribute___noinline__ +g_macro__has_attribute_warn_unused_result +g_macro__has_attribute_cleanup +</SECTION> + +<SECTION> +<TITLE>Error Reporting</TITLE> +<FILE>error_reporting</FILE> +GError +g_error_new +g_error_new_literal +g_error_new_valist +g_error_free +g_error_copy +g_error_matches +g_set_error +g_set_error_literal +g_propagate_error +g_clear_error +g_prefix_error +g_prefix_error_literal +g_propagate_prefixed_error +<SUBSECTION> +GErrorInitFunc +GErrorCopyFunc +GErrorClearFunc +G_DEFINE_EXTENDED_ERROR +g_error_domain_register_static +g_error_domain_register +</SECTION> + +<SECTION> +<TITLE>The Main Event Loop</TITLE> +<FILE>main</FILE> +GMainLoop +g_main_loop_new +g_main_loop_ref +g_main_loop_unref +g_main_loop_run +g_main_loop_quit +g_main_loop_is_running +g_main_loop_get_context +g_main_new +g_main_destroy +g_main_run +g_main_quit +g_main_is_running + +<SUBSECTION> +G_PRIORITY_HIGH +G_PRIORITY_DEFAULT +G_PRIORITY_HIGH_IDLE +G_PRIORITY_DEFAULT_IDLE +G_PRIORITY_LOW + +<SUBSECTION> +G_SOURCE_CONTINUE +G_SOURCE_REMOVE + +<SUBSECTION> +GMainContext +GMainContextFlags +g_main_context_new +g_main_context_new_with_flags +g_main_context_ref +g_main_context_unref +g_main_context_default +g_main_context_iteration +g_main_iteration +g_main_context_pending +g_main_pending +g_main_context_find_source_by_id +g_main_context_find_source_by_user_data +g_main_context_find_source_by_funcs_user_data +g_main_context_wakeup +g_main_context_acquire +g_main_context_release +g_main_context_is_owner +g_main_context_wait +g_main_context_prepare +g_main_context_query +g_main_context_check +g_main_context_dispatch +g_main_context_set_poll_func +g_main_context_get_poll_func +GPollFunc +g_main_context_add_poll +g_main_context_remove_poll +g_main_depth +g_main_current_source +g_main_set_poll_func +g_main_context_invoke +g_main_context_invoke_full + +<SUBSECTION> +GMainContextPusher +g_main_context_pusher_new +g_main_context_pusher_free + +<SUBSECTION> +g_main_context_get_thread_default +g_main_context_ref_thread_default +g_main_context_push_thread_default +g_main_context_pop_thread_default + +<SUBSECTION> +g_timeout_source_new +g_timeout_source_new_seconds +g_timeout_add +g_timeout_add_once +g_timeout_add_full +g_timeout_add_seconds +g_timeout_add_seconds_full + +<SUBSECTION> +g_idle_source_new +g_idle_add +g_idle_add_once +g_idle_add_full +g_idle_remove_by_data + +<SUBSECTION> +GPid +G_PID_FORMAT +GChildWatchFunc +g_child_watch_source_new +g_child_watch_add +g_child_watch_add_full + +<SUBSECTION> +GPollFD +g_poll +G_POLLFD_FORMAT + +<SUBSECTION> +GSource +GSourceDummyMarshal +GSourceFuncs +GSourceDisposeFunc +GSourceCallbackFuncs +g_source_new +g_source_ref +g_source_unref +g_source_set_funcs +g_source_set_dispose_function +g_source_attach +g_source_destroy +g_source_is_destroyed +g_source_set_priority +g_source_get_priority +g_source_set_can_recurse +g_source_get_can_recurse +g_source_get_id +g_source_get_name +g_source_set_name +g_source_set_static_name +g_source_set_name_by_id +g_source_get_context +g_source_set_callback +GSourceFunc +G_SOURCE_FUNC +GSourceOnceFunc +g_source_set_callback_indirect +g_source_set_ready_time +g_source_get_ready_time +g_source_add_unix_fd +g_source_remove_unix_fd +g_source_modify_unix_fd +g_source_query_unix_fd +g_source_add_poll +g_source_remove_poll +g_source_add_child_source +g_source_remove_child_source +g_source_get_time +g_source_get_current_time +g_source_remove +g_source_remove_by_funcs_user_data +g_source_remove_by_user_data +GClearHandleFunc +g_clear_handle_id + +<SUBSECTION> +g_steal_fd + +<SUBSECTION Private> +GLIB_HAVE_ALLOCA_H +alloca +GLIB_USING_SYSTEM_PRINTF +GLIB_SYSDEF_POLLERR +GLIB_SYSDEF_POLLHUP +GLIB_SYSDEF_POLLIN +GLIB_SYSDEF_POLLNVAL +GLIB_SYSDEF_POLLOUT +GLIB_SYSDEF_POLLPRI +GLIB_SYSDEF_AF_INET +GLIB_SYSDEF_AF_INET6 +GLIB_SYSDEF_AF_UNIX +GLIB_SYSDEF_MSG_DONTROUTE +GLIB_SYSDEF_MSG_OOB +GLIB_SYSDEF_MSG_PEEK +G_WIN32_MSG_HANDLE +g_idle_funcs +g_timeout_funcs +g_child_watch_funcs +g_unix_signal_funcs +g_unix_fd_source_funcs +GSourcePrivate +</SECTION> + + +<SECTION> +<TITLE>Threads</TITLE> +<FILE>threads</FILE> +<SUBSECTION> +G_THREAD_ERROR +GThreadError + +<SUBSECTION> +GThread +GThreadFunc +g_thread_new +g_thread_try_new +g_thread_ref +g_thread_unref +g_thread_join +g_thread_yield +g_thread_exit +g_thread_self + +<SUBSECTION> +GMutex +g_mutex_init +g_mutex_clear +g_mutex_lock +g_mutex_trylock +g_mutex_unlock + +<SUBSECTION> +GMutexLocker +g_mutex_locker_new +g_mutex_locker_free + +<SUBSECTION> +G_LOCK_DEFINE +G_LOCK_DEFINE_STATIC +G_LOCK_EXTERN +G_LOCK +G_TRYLOCK +G_UNLOCK + +<SUBSECTION> +GRecMutex +g_rec_mutex_init +g_rec_mutex_clear +g_rec_mutex_lock +g_rec_mutex_trylock +g_rec_mutex_unlock + +<SUBSECTION> +GRecMutexLocker +g_rec_mutex_locker_new +g_rec_mutex_locker_free + +<SUBSECTION> +GRWLockWriterLocker +g_rw_lock_writer_locker_new +g_rw_lock_writer_locker_free + +<SUBSECTION> +GRWLockReaderLocker +g_rw_lock_reader_locker_new +g_rw_lock_reader_locker_free + +<SUBSECTION> +GRWLock +g_rw_lock_init +g_rw_lock_clear +g_rw_lock_writer_lock +g_rw_lock_writer_trylock +g_rw_lock_writer_unlock +g_rw_lock_reader_lock +g_rw_lock_reader_trylock +g_rw_lock_reader_unlock + +<SUBSECTION> +GCond +g_cond_init +g_cond_clear +g_cond_wait +g_cond_timed_wait +g_cond_wait_until +g_cond_signal +g_cond_broadcast + +<SUBSECTION> +GPrivate +G_PRIVATE_INIT +g_private_get +g_private_set +g_private_replace + +<SUBSECTION> +GOnce +GOnceStatus +G_ONCE_INIT +g_once +g_once_init_enter +g_once_init_leave + +<SUBSECTION> +g_bit_lock +g_bit_trylock +g_bit_unlock +g_pointer_bit_lock +g_pointer_bit_trylock +g_pointer_bit_unlock + +<SUBSECTION> +g_get_num_processors + +<SUBSECTION Private> +G_LOCK_NAME +atexit +g_thread_error_quark +g_once_impl +</SECTION> + +<SECTION> +<TITLE>Deprecated Thread APIs</TITLE> +<FILE>threads-deprecated</FILE> + +<SUBSECTION> +G_THREADS_IMPL_POSIX +G_THREADS_IMPL_WIN32 + +<SUBSECTION> +g_thread_init +g_thread_supported +g_thread_get_initialized + +<SUBSECTION> +g_thread_create +g_thread_create_full +GThreadPriority +g_thread_set_priority +g_thread_foreach + +<SUBSECTION> +g_mutex_new +g_mutex_free +g_cond_new +g_cond_free +g_private_new + +<SUBSECTION> +GStaticMutex +G_STATIC_MUTEX_INIT +g_static_mutex_init +g_static_mutex_lock +g_static_mutex_trylock +g_static_mutex_unlock +g_static_mutex_get_mutex +g_static_mutex_free + +<SUBSECTION> +GStaticRecMutex +G_STATIC_REC_MUTEX_INIT +g_static_rec_mutex_init +g_static_rec_mutex_lock +g_static_rec_mutex_trylock +g_static_rec_mutex_unlock +g_static_rec_mutex_lock_full +g_static_rec_mutex_unlock_full +g_static_rec_mutex_free + +<SUBSECTION> +GStaticRWLock +G_STATIC_RW_LOCK_INIT +g_static_rw_lock_init +g_static_rw_lock_reader_lock +g_static_rw_lock_reader_trylock +g_static_rw_lock_reader_unlock +g_static_rw_lock_writer_lock +g_static_rw_lock_writer_trylock +g_static_rw_lock_writer_unlock +g_static_rw_lock_free + +<SUBSECTION> +GStaticPrivate +G_STATIC_PRIVATE_INIT +g_static_private_init +g_static_private_get +g_static_private_set +g_static_private_free + +<SUBSECTION Private> +GThreadFunctions +g_thread_init_with_errorcheck_mutexes +G_THREADS_ENABLED +g_static_mutex_get_mutex_impl +g_thread_use_default_impl +g_threads_got_initialized +g_thread_functions_for_glib_use +g_thread_gettime +g_once_init_enter_impl +</SECTION> + +<SECTION> +<TITLE>Thread Pools</TITLE> +<FILE>thread_pools</FILE> +GThreadPool +g_thread_pool_new +g_thread_pool_new_full +g_thread_pool_push +g_thread_pool_set_max_threads +g_thread_pool_get_max_threads +g_thread_pool_get_num_threads +g_thread_pool_unprocessed +g_thread_pool_free +g_thread_pool_set_max_unused_threads +g_thread_pool_get_max_unused_threads +g_thread_pool_get_num_unused_threads +g_thread_pool_stop_unused_threads +g_thread_pool_set_sort_function +g_thread_pool_set_max_idle_time +g_thread_pool_get_max_idle_time +g_thread_pool_move_to_front +</SECTION> + +<SECTION> +<TITLE>Asynchronous Queues</TITLE> +<FILE>async_queues</FILE> +GAsyncQueue +g_async_queue_new +g_async_queue_new_full +g_async_queue_ref +g_async_queue_unref +g_async_queue_push +g_async_queue_push_sorted +g_async_queue_push_front +g_async_queue_remove +g_async_queue_pop +g_async_queue_try_pop +g_async_queue_timeout_pop +g_async_queue_length +g_async_queue_sort + +<SUBSECTION> +g_async_queue_lock +g_async_queue_unlock +g_async_queue_ref_unlocked +g_async_queue_unref_and_unlock +g_async_queue_push_unlocked +g_async_queue_push_sorted_unlocked +g_async_queue_push_front_unlocked +g_async_queue_remove_unlocked +g_async_queue_pop_unlocked +g_async_queue_try_pop_unlocked +g_async_queue_timeout_pop_unlocked +g_async_queue_length_unlocked +g_async_queue_sort_unlocked + +<SUBSECTION> +g_async_queue_timed_pop +g_async_queue_timed_pop_unlocked +</SECTION> + +<SECTION> +<TITLE>Atomic Operations</TITLE> +<FILE>atomic_operations</FILE> +G_ATOMIC_LOCK_FREE + +<SUBSECTION> +g_atomic_int_get +g_atomic_int_set +g_atomic_int_inc +g_atomic_int_dec_and_test +g_atomic_int_compare_and_exchange +g_atomic_int_compare_and_exchange_full +g_atomic_int_exchange +g_atomic_int_add +g_atomic_int_and +g_atomic_int_or +g_atomic_int_xor + +<SUBSECTION> +g_atomic_pointer_get +g_atomic_pointer_set +g_atomic_pointer_compare_and_exchange +g_atomic_pointer_compare_and_exchange_full +g_atomic_pointer_exchange +g_atomic_pointer_add +g_atomic_pointer_and +g_atomic_pointer_or +g_atomic_pointer_xor + +<SUBSECTION> +g_atomic_int_exchange_and_add +</SECTION> + +<SECTION> +<TITLE>IO Channels</TITLE> +<FILE>iochannels</FILE> +GIOChannel + +<SUBSECTION> +g_io_channel_unix_new +g_io_channel_unix_get_fd +g_io_channel_win32_new_fd +g_io_channel_win32_new_socket +g_io_channel_win32_new_messages + +<SUBSECTION> +g_io_channel_init + +<SUBSECTION> +g_io_channel_new_file +g_io_channel_read_chars +g_io_channel_read_unichar +g_io_channel_read_line +g_io_channel_read_line_string +g_io_channel_read_to_end +g_io_channel_write_chars +g_io_channel_write_unichar +g_io_channel_flush +g_io_channel_seek_position +GSeekType +g_io_channel_shutdown + +<SUBSECTION> +GIOStatus +GIOChannelError +G_IO_CHANNEL_ERROR +g_io_channel_error_from_errno + +<SUBSECTION> +g_io_channel_ref +g_io_channel_unref + +<SUBSECTION> +g_io_create_watch +g_io_add_watch +g_io_add_watch_full +GIOCondition +GIOFunc + +<SUBSECTION> +GIOFuncs + +<SUBSECTION> +g_io_channel_get_buffer_size +g_io_channel_set_buffer_size +g_io_channel_get_buffer_condition +g_io_channel_get_flags +g_io_channel_set_flags +GIOFlags +g_io_channel_get_line_term +g_io_channel_set_line_term +g_io_channel_get_buffered +g_io_channel_set_buffered +g_io_channel_get_encoding +g_io_channel_set_encoding +g_io_channel_get_close_on_unref +g_io_channel_set_close_on_unref + +<SUBSECTION> +g_io_channel_read +GIOError +g_io_channel_write +g_io_channel_seek +g_io_channel_close + +<SUBSECTION Private> +g_io_channel_win32_poll +g_io_channel_win32_make_pollfd +g_io_channel_win32_get_fd +g_io_channel_win32_new_stream_socket +g_io_channel_win32_set_debug +g_io_channel_error_quark +g_io_watch_funcs +G_IO_FLAG_IS_WRITEABLE +</SECTION> + +<SECTION> +<TITLE>Memory Allocation</TITLE> +<FILE>memory</FILE> +g_new +g_new0 +g_renew +g_try_new +g_try_new0 +g_try_renew + +<SUBSECTION> +g_malloc +g_malloc0 +g_realloc +g_try_malloc +g_try_malloc0 +g_try_realloc +g_malloc_n +g_malloc0_n +g_realloc_n +g_try_malloc_n +g_try_malloc0_n +g_try_realloc_n + +<SUBSECTION> +g_free +g_free_sized +g_clear_pointer +g_steal_pointer +g_mem_gc_friendly + +<SUBSECTION> +g_alloca +g_alloca0 +g_newa +g_newa0 + +<SUBSECTION> +g_aligned_alloc +g_aligned_alloc0 +g_aligned_free +g_aligned_free_sized + +<SUBSECTION> +g_memmove +g_memdup +g_memdup2 + +<SUBSECTION> +GMemVTable +g_mem_set_vtable +g_mem_is_system_malloc + +<SUBSECTION> +glib_mem_profiler_table +g_mem_profile +</SECTION> + +<SECTION> +<TITLE>Warnings and Assertions</TITLE> +<FILE>warnings</FILE> +g_print +g_set_print_handler +GPrintFunc + +<SUBSECTION> +g_printerr +g_set_printerr_handler + +<SUBSECTION> +g_return_if_fail +g_return_val_if_fail +g_return_if_reached +g_return_val_if_reached +g_warn_if_fail +g_warn_if_reached + +<SUBSECTION> +g_on_error_query +g_on_error_stack_trace + +<SUBSECTION> +G_BREAKPOINT + +<SUBSECTION Private> +g_return_if_fail_warning +g_assert_warning +g_warn_message +</SECTION> + +<SECTION> +<TITLE>Glob-style pattern matching</TITLE> +<FILE>patterns</FILE> +GPatternSpec +g_pattern_spec_new +g_pattern_spec_free +g_pattern_spec_equal +g_pattern_spec_copy +g_pattern_spec_match +g_pattern_spec_match_string +g_pattern_match +g_pattern_match_string +g_pattern_match_simple +</SECTION> + +<SECTION> +<TITLE>Perl-compatible regular expressions</TITLE> +<FILE>gregex</FILE> +GRegexError +G_REGEX_ERROR +GRegexCompileFlags +GRegexMatchFlags +GRegex +GRegexEvalCallback +g_regex_new +g_regex_ref +g_regex_unref +g_regex_get_pattern +g_regex_get_max_backref +g_regex_get_capture_count +g_regex_get_has_cr_or_lf +g_regex_get_max_lookbehind +g_regex_get_string_number +g_regex_get_compile_flags +g_regex_get_match_flags +g_regex_escape_string +g_regex_escape_nul +g_regex_match_simple +g_regex_match +g_regex_match_full +g_regex_match_all +g_regex_match_all_full +g_regex_split_simple +g_regex_split +g_regex_split_full +g_regex_replace +g_regex_replace_literal +g_regex_replace_eval +g_regex_check_replacement +GMatchInfo +g_match_info_get_regex +g_match_info_get_string +g_match_info_ref +g_match_info_unref +g_match_info_free +g_match_info_matches +g_match_info_next +g_match_info_get_match_count +g_match_info_is_partial_match +g_match_info_expand_references +g_match_info_fetch +g_match_info_fetch_pos +g_match_info_fetch_named +g_match_info_fetch_named_pos +g_match_info_fetch_all +<SUBSECTION Private> +g_regex_error_quark +</SECTION> + +<SECTION> +<TITLE>Message Logging</TITLE> +<FILE>messages</FILE> +G_LOG_DOMAIN +G_LOG_FATAL_MASK +G_LOG_LEVEL_USER_SHIFT +GLogFunc +GLogLevelFlags + +<SUBSECTION> +g_log +g_logv +g_message +g_warning +g_warning_once +g_critical +g_error +g_info +g_debug + +<SUBSECTION> +g_log_set_handler +g_log_set_handler_full +g_log_remove_handler +g_log_set_always_fatal +g_log_set_fatal_mask +g_log_default_handler +g_log_set_default_handler +g_log_get_debug_enabled +g_log_set_debug_enabled + +<SUBSECTION> +g_log_structured +g_log_variant +GLogField +g_log_structured_array +G_DEBUG_HERE + +<SUBSECTION> +GLogWriterOutput +GLogWriterFunc +g_log_set_writer_func +g_log_writer_supports_color +g_log_writer_is_journald +g_log_writer_format_fields +g_log_writer_journald +g_log_writer_standard_streams +g_log_writer_default +g_log_writer_default_set_use_stderr +g_log_writer_default_would_drop + +<SUBSECTION Private> +g_log_structured_standard +</SECTION> + +<SECTION> +<TITLE>Timers</TITLE> +<FILE>timers</FILE> +GTimer +g_timer_new +g_timer_start +g_timer_stop +g_timer_continue +g_timer_elapsed +g_timer_reset +g_timer_destroy +g_timer_is_active +</SECTION> + +<SECTION> +<TITLE>Spawning Processes</TITLE> +<FILE>spawn</FILE> +GSpawnError +G_SPAWN_ERROR +GSpawnFlags +GSpawnChildSetupFunc +g_spawn_async_with_fds +g_spawn_async_with_pipes +g_spawn_async_with_pipes_and_fds +g_spawn_async +g_spawn_sync +G_SPAWN_EXIT_ERROR +g_spawn_check_wait_status +g_spawn_check_exit_status +g_spawn_command_line_async +g_spawn_command_line_sync +g_spawn_close_pid +<SUBSECTION Private> +g_spawn_error_quark +g_spawn_exit_error_quark +</SECTION> + +<SECTION> +<TITLE>Simple XML Subset Parser</TITLE> +<FILE>markup</FILE> +GMarkupError +G_MARKUP_ERROR +GMarkupParseFlags +GMarkupParseContext +GMarkupParser +g_markup_escape_text +g_markup_printf_escaped +g_markup_vprintf_escaped +g_markup_parse_context_new +g_markup_parse_context_parse +g_markup_parse_context_end_parse +g_markup_parse_context_free +g_markup_parse_context_get_position +g_markup_parse_context_get_element +g_markup_parse_context_get_element_stack +g_markup_parse_context_get_user_data +g_markup_parse_context_push +g_markup_parse_context_pop +g_markup_parse_context_ref +g_markup_parse_context_unref +<SUBSECTION> +GMarkupCollectType +g_markup_collect_attributes +<SUBSECTION Private> +g_markup_error_quark +</SECTION> + + +<SECTION> +<TITLE>Shell-related Utilities</TITLE> +<FILE>shell</FILE> +GShellError +G_SHELL_ERROR +g_shell_parse_argv +g_shell_quote +g_shell_unquote +<SUBSECTION Private> +g_shell_error_quark +</SECTION> + + +<SECTION> +<TITLE>Commandline option parser</TITLE> +<FILE>goptioncontext</FILE> +GOptionError +G_OPTION_ERROR +GOptionArgFunc +GOptionContext +g_option_context_new +g_option_context_set_summary +g_option_context_get_summary +g_option_context_set_description +g_option_context_get_description +GTranslateFunc +g_option_context_set_translate_func +g_option_context_set_translation_domain +g_option_context_free +g_option_context_parse +g_option_context_parse_strv +g_option_context_set_help_enabled +g_option_context_get_help_enabled +g_option_context_set_ignore_unknown_options +g_option_context_get_ignore_unknown_options +g_option_context_get_help +g_option_context_get_strict_posix +g_option_context_set_strict_posix +GOptionArg +GOptionFlags +G_OPTION_REMAINING +GOptionEntry +G_OPTION_ENTRY_NULL +g_option_context_add_main_entries +GOptionGroup +g_option_context_add_group +g_option_context_set_main_group +g_option_context_get_main_group +g_option_group_new +g_option_group_ref +g_option_group_unref +g_option_group_free +g_option_group_add_entries +GOptionParseFunc +g_option_group_set_parse_hooks +GOptionErrorFunc +g_option_group_set_error_hook +g_option_group_set_translate_func +g_option_group_set_translation_domain +<SUBSECTION Private> +g_option_error_quark +</SECTION> + + +<SECTION> +<TITLE>File Utilities</TITLE> +<FILE>fileutils</FILE> +<INCLUDE>glib.h,glib/gstdio.h,fcntl.h,sys/types.h,sys/stat.h</INCLUDE> +GFileError +G_FILE_ERROR +GFileTest +g_file_error_from_errno +g_file_get_contents +GFileSetContentsFlags +g_file_set_contents +g_file_set_contents_full +g_file_test +g_mkstemp +g_mkstemp_full +g_file_open_tmp +g_file_read_link +g_mkdir_with_parents +g_mkdtemp +g_mkdtemp_full +g_dir_make_tmp + +<SUBSECTION> +GDir +g_dir_open +g_dir_read_name +g_dir_rewind +g_dir_close + +<SUBSECTION> +GMappedFile +g_mapped_file_new +g_mapped_file_new_from_fd +g_mapped_file_ref +g_mapped_file_unref +g_mapped_file_free +g_mapped_file_get_length +g_mapped_file_get_contents +g_mapped_file_get_bytes + +<SUBSECTION> +g_open +g_rename +g_mkdir +GStatBuf +g_stat +g_lstat +g_unlink +g_remove +g_rmdir +g_fopen +g_freopen +g_fsync +g_chmod +g_access +g_creat +g_chdir +g_utime +g_close +g_clear_fd +g_autofd + +<SUBSECTION Private> +g_file_error_quark +utimbuf +</SECTION> + + +<SECTION> +<TITLE>String Utility Functions</TITLE> +<FILE>string_utils</FILE> +<INCLUDE>glib.h,glib/gprintf.h</INCLUDE> +g_set_str +g_strdup +g_strndup +g_strdupv +g_strnfill +g_stpcpy +g_strstr_len +g_strrstr +g_strrstr_len +g_str_has_prefix +g_str_has_suffix +g_strcmp0 +g_str_to_ascii +g_str_tokenize_and_fold +g_str_match_string + +<SUBSECTION> +g_strlcpy +g_strlcat + +<SUBSECTION> +g_strdup_printf +g_strdup_vprintf +g_printf +g_vprintf +g_fprintf +g_vfprintf +g_sprintf +g_vsprintf +g_snprintf +g_vsnprintf +g_vasprintf +g_printf_string_upper_bound + +<SUBSECTION> +g_str_is_ascii +g_ascii_isalnum +g_ascii_isalpha +g_ascii_iscntrl +g_ascii_isdigit +g_ascii_isgraph +g_ascii_islower +g_ascii_isprint +g_ascii_ispunct +g_ascii_isspace +g_ascii_isupper +g_ascii_isxdigit + +<SUBSECTION> +g_ascii_digit_value +g_ascii_xdigit_value + +<SUBSECTION> +g_ascii_strcasecmp +g_ascii_strncasecmp + +<SUBSECTION> +g_ascii_strup +g_ascii_strdown + +<SUBSECTION> +g_ascii_tolower +g_ascii_toupper + +<SUBSECTION> +g_string_ascii_up +g_string_ascii_down + +<SUBSECTION> +g_strup +g_strdown + +<SUBSECTION> +g_strcasecmp +g_strncasecmp + +<SUBSECTION> +g_strreverse + +<SUBSECTION> +g_ascii_strtoll +g_ascii_strtoull +G_ASCII_DTOSTR_BUF_SIZE +g_ascii_strtod +g_ascii_dtostr +g_ascii_formatd +g_strtod + +<SUBSECTION> +GNumberParserError +G_NUMBER_PARSER_ERROR +g_ascii_string_to_signed +g_ascii_string_to_unsigned + +<SUBSECTION Private> +g_number_parser_error_quark + +<SUBSECTION> +g_strchug +g_strchomp +g_strstrip + +<SUBSECTION> +g_strdelimit +G_STR_DELIMITERS +g_strescape +g_strcompress +g_strcanon +g_strsplit +g_strsplit_set +g_strfreev +g_strconcat +g_strjoin +g_strjoinv + +<SUBSECTION> +GStrv +GStrvBuilder +g_strv_length +g_strv_contains +g_strv_equal +g_strv_builder_new +g_strv_builder_ref +g_strv_builder_unref +g_strv_builder_add +g_strv_builder_addv +g_strv_builder_add_many +g_strv_builder_end + +<SUBSECTION> +g_strerror +g_strsignal + +<SUBSECTION Private> +GAsciiType +g_ascii_table +</SECTION> + +<SECTION> +<TITLE>Date and Time Functions</TITLE> +<FILE>date</FILE> +G_USEC_PER_SEC +GTimeVal +g_get_current_time +g_usleep +g_time_val_add +g_time_val_from_iso8601 +g_time_val_to_iso8601 + +<SUBSECTION> +g_get_monotonic_time +g_get_real_time + +<SUBSECTION> +GDate +GTime +GDateDMY +GDateDay +GDateMonth +GDateYear +GDateWeekday + +<SUBSECTION> +G_DATE_BAD_DAY +G_DATE_BAD_JULIAN +G_DATE_BAD_YEAR + +<SUBSECTION> +g_date_new +g_date_new_dmy +g_date_new_julian +g_date_clear +g_date_free +g_date_copy + +<SUBSECTION> +g_date_set_day +g_date_set_month +g_date_set_year +g_date_set_dmy +g_date_set_julian +g_date_set_time +g_date_set_time_t +g_date_set_time_val +g_date_set_parse + +<SUBSECTION> +g_date_add_days +g_date_subtract_days +g_date_add_months +g_date_subtract_months +g_date_add_years +g_date_subtract_years +g_date_days_between +g_date_compare +g_date_clamp +g_date_order + +<SUBSECTION> +g_date_get_day +g_date_get_month +g_date_get_year +g_date_get_julian +g_date_get_weekday +g_date_get_day_of_year + +<SUBSECTION> +g_date_get_days_in_month +g_date_is_first_of_month +g_date_is_last_of_month +g_date_is_leap_year +g_date_get_monday_week_of_year +g_date_get_monday_weeks_in_year +g_date_get_sunday_week_of_year +g_date_get_sunday_weeks_in_year +g_date_get_iso8601_week_of_year + +<SUBSECTION> +g_date_strftime +g_date_to_struct_tm + +<SUBSECTION> +g_date_valid +g_date_valid_day +g_date_valid_month +g_date_valid_year +g_date_valid_dmy +g_date_valid_julian +g_date_valid_weekday + +<SUBSECTION Private> +g_date_weekday +g_date_month +g_date_year +g_date_day +g_date_julian +g_date_day_of_year +g_date_monday_week_of_year +g_date_sunday_week_of_year +g_date_days_in_month +g_date_monday_weeks_in_year +g_date_sunday_weeks_in_year +</SECTION> + +<SECTION> +<FILE>timezone</FILE> +<SUBSECTION> +GTimeZone +g_time_zone_unref +g_time_zone_ref +<SUBSECTION> +g_time_zone_new +g_time_zone_new_identifier +g_time_zone_new_local +g_time_zone_new_utc +g_time_zone_new_offset +<SUBSECTION> +GTimeType +g_time_zone_find_interval +g_time_zone_adjust_time +<SUBSECTION> +g_time_zone_get_identifier +g_time_zone_get_abbreviation +g_time_zone_get_offset +g_time_zone_is_dst +</SECTION> + +<SECTION> +<FILE>date-time</FILE> +GTimeSpan +G_TIME_SPAN_DAY +G_TIME_SPAN_HOUR +G_TIME_SPAN_MINUTE +G_TIME_SPAN_SECOND +G_TIME_SPAN_MILLISECOND + +<SUBSECTION> +GDateTime +g_date_time_unref +g_date_time_ref + +<SUBSECTION> +g_date_time_new_now +g_date_time_new_now_local +g_date_time_new_now_utc + +<SUBSECTION> +g_date_time_new_from_unix_local +g_date_time_new_from_unix_utc + +<SUBSECTION> +g_date_time_new_from_timeval_local +g_date_time_new_from_timeval_utc +g_date_time_new_from_iso8601 + +<SUBSECTION> +g_date_time_new +g_date_time_new_local +g_date_time_new_utc + +<SUBSECTION> +g_date_time_add + +<SUBSECTION> +g_date_time_add_years +g_date_time_add_months +g_date_time_add_weeks +g_date_time_add_days + +<SUBSECTION> +g_date_time_add_hours +g_date_time_add_minutes +g_date_time_add_seconds + +<SUBSECTION> +g_date_time_add_full + +<SUBSECTION> +g_date_time_compare +g_date_time_difference +g_date_time_hash +g_date_time_equal + +<SUBSECTION> +g_date_time_get_ymd + +<SUBSECTION> +g_date_time_get_year +g_date_time_get_month +g_date_time_get_day_of_month + +<SUBSECTION> +g_date_time_get_week_numbering_year +g_date_time_get_week_of_year +g_date_time_get_day_of_week + +<SUBSECTION> +g_date_time_get_day_of_year + +<SUBSECTION> +g_date_time_get_hour +g_date_time_get_minute +g_date_time_get_second +g_date_time_get_microsecond +g_date_time_get_seconds + +<SUBSECTION> +g_date_time_to_unix +g_date_time_to_timeval + +<SUBSECTION> +g_date_time_get_utc_offset +g_date_time_get_timezone +g_date_time_get_timezone_abbreviation +g_date_time_is_daylight_savings + +<SUBSECTION> +g_date_time_to_timezone +g_date_time_to_local +g_date_time_to_utc + +<SUBSECTION> +g_date_time_format +g_date_time_format_iso8601 +</SECTION> + +<SECTION> +<TITLE>Hook Functions</TITLE> +<FILE>hooks</FILE> +GHookList +GHookFinalizeFunc +GHook +GHookFunc +GHookCheckFunc + +<SUBSECTION> +g_hook_list_init +g_hook_list_invoke +g_hook_list_invoke_check +g_hook_list_marshal +GHookMarshaller +g_hook_list_marshal_check +GHookCheckMarshaller +g_hook_list_clear + +<SUBSECTION> +g_hook_alloc +g_hook_append +g_hook_prepend +g_hook_insert_before +g_hook_insert_sorted +GHookCompareFunc +g_hook_compare_ids + +<SUBSECTION> +g_hook_get +g_hook_find +GHookFindFunc +g_hook_find_data +g_hook_find_func +g_hook_find_func_data + +<SUBSECTION> +g_hook_first_valid +g_hook_next_valid + +GHookFlagMask +G_HOOK_FLAGS +G_HOOK_FLAG_USER_SHIFT + +<SUBSECTION> +G_HOOK +G_HOOK_IS_VALID +G_HOOK_ACTIVE +G_HOOK_IN_CALL +G_HOOK_IS_UNLINKED + +<SUBSECTION> +g_hook_ref +g_hook_unref + +g_hook_free +g_hook_destroy +g_hook_destroy_link +</SECTION> + +<SECTION> +<TITLE>Miscellaneous Utility Functions</TITLE> +<FILE>misc_utils</FILE> +g_get_application_name +g_set_application_name +g_get_prgname +g_set_prgname +g_get_environ +g_environ_getenv +g_environ_setenv +g_environ_unsetenv +g_getenv +g_setenv +g_unsetenv +g_listenv +g_get_user_name +g_get_real_name +g_get_user_cache_dir +g_get_user_data_dir +g_get_user_config_dir +g_get_user_state_dir +g_get_user_runtime_dir +GUserDirectory +g_get_user_special_dir +g_get_system_data_dirs +g_get_system_config_dirs +g_reload_user_special_dirs_cache +g_get_os_info + +<SUBSECTION> +G_OS_INFO_KEY_NAME +G_OS_INFO_KEY_PRETTY_NAME +G_OS_INFO_KEY_VERSION +G_OS_INFO_KEY_VERSION_CODENAME +G_OS_INFO_KEY_VERSION_ID +G_OS_INFO_KEY_ID +G_OS_INFO_KEY_HOME_URL +G_OS_INFO_KEY_DOCUMENTATION_URL +G_OS_INFO_KEY_SUPPORT_URL +G_OS_INFO_KEY_BUG_REPORT_URL +G_OS_INFO_KEY_PRIVACY_POLICY_URL + +<SUBSECTION> +g_get_host_name +g_get_home_dir +g_get_tmp_dir +g_get_current_dir +g_basename +g_dirname +g_canonicalize_filename +g_path_is_absolute +g_path_skip_root +g_path_get_basename +g_path_get_dirname +g_build_filename +g_build_filenamev +g_build_filename_valist +g_build_path +g_build_pathv + +<SUBSECTION> +g_format_size +GFormatSizeFlags +g_format_size_full +g_format_size_for_display + +<SUBSECTION> +g_find_program_in_path + +<SUBSECTION> +g_bit_nth_lsf +g_bit_nth_msf +g_bit_storage + +<SUBSECTION> +g_spaced_primes_closest + +<SUBSECTION> +g_atexit +g_abort + +<SUBSECTION> +g_parse_debug_string +GDebugKey + +<SUBSECTION> +GVoidFunc +GFreeFunc + +<SUBSECTION> +g_qsort_with_data + +<SUBSECTION> +g_nullify_pointer + +<SUBSECTION Private> +G_NATIVE_ATEXIT +g_ATEXIT +g_win32_get_system_data_dirs_for_module +ATEXIT +g_bit_nth_lsf_impl +g_bit_nth_msf_impl +g_bit_storage_impl + +</SECTION> + +<SECTION> +<TITLE>Lexical Scanner</TITLE> +<FILE>scanner</FILE> +GScanner +GScannerConfig +g_scanner_new +g_scanner_destroy + +<SUBSECTION> +g_scanner_input_file +g_scanner_sync_file_offset +g_scanner_input_text +g_scanner_peek_next_token +g_scanner_get_next_token +g_scanner_eof + +<SUBSECTION> +g_scanner_cur_line +g_scanner_cur_position +g_scanner_cur_token +g_scanner_cur_value + +<SUBSECTION> +g_scanner_set_scope +g_scanner_scope_add_symbol +g_scanner_scope_foreach_symbol +g_scanner_scope_lookup_symbol +g_scanner_scope_remove_symbol +g_scanner_add_symbol +g_scanner_remove_symbol +g_scanner_foreach_symbol + +<SUBSECTION> +g_scanner_freeze_symbol_table +g_scanner_thaw_symbol_table +g_scanner_lookup_symbol + +<SUBSECTION> +g_scanner_warn +g_scanner_error +g_scanner_unexp_token +GScannerMsgFunc + +<SUBSECTION> +G_CSET_a_2_z +G_CSET_A_2_Z +G_CSET_DIGITS +G_CSET_LATINC +G_CSET_LATINS +GTokenType +GTokenValue +GErrorType + +</SECTION> + +<SECTION> +<TITLE>Key-value file parser</TITLE> +<FILE>keyfile</FILE> +GKeyFile +G_KEY_FILE_ERROR +GKeyFileError +GKeyFileFlags + +<SUBSECTION> +g_key_file_new +g_key_file_free +g_key_file_ref +g_key_file_unref +g_key_file_set_list_separator +g_key_file_load_from_file +g_key_file_load_from_data +g_key_file_load_from_bytes +g_key_file_load_from_data_dirs +g_key_file_load_from_dirs +g_key_file_to_data +g_key_file_save_to_file +g_key_file_get_start_group +g_key_file_get_groups +g_key_file_get_keys +g_key_file_has_group +g_key_file_has_key + +<SUBSECTION> +g_key_file_get_value +g_key_file_get_string +g_key_file_get_locale_string +g_key_file_get_locale_for_key +g_key_file_get_boolean +g_key_file_get_integer +g_key_file_get_int64 +g_key_file_get_uint64 +g_key_file_get_double +g_key_file_get_string_list +g_key_file_get_locale_string_list +g_key_file_get_boolean_list +g_key_file_get_integer_list +g_key_file_get_double_list +g_key_file_get_comment + +<SUBSECTION> +g_key_file_set_value +g_key_file_set_string +g_key_file_set_locale_string +g_key_file_set_boolean +g_key_file_set_integer +g_key_file_set_int64 +g_key_file_set_uint64 +g_key_file_set_double +g_key_file_set_string_list +g_key_file_set_locale_string_list +g_key_file_set_boolean_list +g_key_file_set_integer_list +g_key_file_set_double_list +g_key_file_set_comment +g_key_file_remove_group +g_key_file_remove_key +g_key_file_remove_comment + +<SUBSECTION> +G_KEY_FILE_DESKTOP_GROUP +G_KEY_FILE_DESKTOP_KEY_TYPE +G_KEY_FILE_DESKTOP_KEY_VERSION +G_KEY_FILE_DESKTOP_KEY_NAME +G_KEY_FILE_DESKTOP_KEY_GENERIC_NAME +G_KEY_FILE_DESKTOP_KEY_NO_DISPLAY +G_KEY_FILE_DESKTOP_KEY_COMMENT +G_KEY_FILE_DESKTOP_KEY_ICON +G_KEY_FILE_DESKTOP_KEY_HIDDEN +G_KEY_FILE_DESKTOP_KEY_ONLY_SHOW_IN +G_KEY_FILE_DESKTOP_KEY_NOT_SHOW_IN +G_KEY_FILE_DESKTOP_KEY_TRY_EXEC +G_KEY_FILE_DESKTOP_KEY_EXEC +G_KEY_FILE_DESKTOP_KEY_PATH +G_KEY_FILE_DESKTOP_KEY_TERMINAL +G_KEY_FILE_DESKTOP_KEY_MIME_TYPE +G_KEY_FILE_DESKTOP_KEY_CATEGORIES +G_KEY_FILE_DESKTOP_KEY_STARTUP_NOTIFY +G_KEY_FILE_DESKTOP_KEY_STARTUP_WM_CLASS +G_KEY_FILE_DESKTOP_KEY_URL +G_KEY_FILE_DESKTOP_KEY_ACTIONS +G_KEY_FILE_DESKTOP_KEY_DBUS_ACTIVATABLE +G_KEY_FILE_DESKTOP_TYPE_APPLICATION +G_KEY_FILE_DESKTOP_TYPE_LINK +G_KEY_FILE_DESKTOP_TYPE_DIRECTORY + +<SUBSECTION Private> +g_key_file_error_quark +g_key_file_get_type +</SECTION> + +<SECTION> +<TITLE>Bookmark file parser</TITLE> +<FILE>bookmarkfile</FILE> +GBookmarkFile +G_BOOKMARK_FILE_ERROR +GBookmarkFileError +g_bookmark_file_new +g_bookmark_file_copy +g_bookmark_file_free +g_bookmark_file_load_from_file +g_bookmark_file_load_from_data +g_bookmark_file_load_from_data_dirs +g_bookmark_file_to_data +g_bookmark_file_to_file +g_bookmark_file_has_item +g_bookmark_file_has_group +g_bookmark_file_has_application +g_bookmark_file_get_size +g_bookmark_file_get_uris G_GNUC_MALLOC + +<SUBSECTION> +g_bookmark_file_get_title +g_bookmark_file_get_description +g_bookmark_file_get_mime_type +g_bookmark_file_get_is_private +g_bookmark_file_get_icon +g_bookmark_file_get_added +g_bookmark_file_get_added_date_time +g_bookmark_file_get_modified +g_bookmark_file_get_modified_date_time +g_bookmark_file_get_visited +g_bookmark_file_get_visited_date_time +g_bookmark_file_get_groups +g_bookmark_file_get_applications +g_bookmark_file_get_app_info +g_bookmark_file_get_application_info + +<SUBSECTION> +g_bookmark_file_set_title +g_bookmark_file_set_description +g_bookmark_file_set_mime_type +g_bookmark_file_set_is_private +g_bookmark_file_set_icon +g_bookmark_file_set_added +g_bookmark_file_set_added_date_time +g_bookmark_file_set_groups +g_bookmark_file_set_modified +g_bookmark_file_set_modified_date_time +g_bookmark_file_set_visited +g_bookmark_file_set_visited_date_time +g_bookmark_file_set_app_info +g_bookmark_file_set_application_info +g_bookmark_file_add_group +g_bookmark_file_add_application +g_bookmark_file_remove_group +g_bookmark_file_remove_application +g_bookmark_file_remove_item +g_bookmark_file_move_item + +<SUBSECTION Private> +g_bookmark_file_error_quark +</SECTION> + +<SECTION> +<TITLE>Dynamic Loading of Modules</TITLE> +<FILE>modules</FILE> +<INCLUDE>gmodule.h</INCLUDE> +GModule +GModuleError +G_MODULE_ERROR +g_module_supported +g_module_build_path +g_module_open +g_module_open_full +GModuleFlags +g_module_symbol +g_module_name +g_module_make_resident +g_module_close +g_module_error +<SUBSECTION> +GModuleCheckInit +GModuleUnload +G_MODULE_SUFFIX +G_MODULE_EXPORT +G_MODULE_IMPORT +<SUBSECTION Private> +g_module_error_quark +</SECTION> + +<SECTION> +<TITLE>Automatic String Completion</TITLE> +<FILE>completion</FILE> +GCompletion +g_completion_new +GCompletionFunc +g_completion_add_items +g_completion_remove_items +g_completion_clear_items +g_completion_complete +g_completion_complete_utf8 +g_completion_set_compare +GCompletionStrncmpFunc +g_completion_free +</SECTION> + +<SECTION> +<TITLE>Windows Compatibility Functions</TITLE> +<FILE>windows</FILE> +MAXPATHLEN +GWin32OSType + +g_win32_check_windows_version +g_win32_get_command_line +g_win32_error_message +g_win32_getlocale +g_win32_get_package_installation_directory +g_win32_get_package_installation_directory_of_module +g_win32_get_package_installation_subdirectory +g_win32_get_windows_version +g_win32_locale_filename_from_utf8 +G_WIN32_DLLMAIN_FOR_DLL_NAME +G_WIN32_HAVE_WIDECHAR_API +G_WIN32_IS_NT_BASED + +<SUBSECTION Private> +g_win32_ftruncate + +</SECTION> + +<SECTION> +<TITLE>UNIX-specific utilities and integration</TITLE> +<FILE>gunix</FILE> +G_UNIX_ERROR +g_unix_open_pipe +g_unix_set_fd_nonblocking + +<SUBSECTION> +g_unix_signal_add +g_unix_signal_add_full +g_unix_signal_source_new + +<SUBSECTION> +GUnixFDSourceFunc +g_unix_fd_add +g_unix_fd_add_full +g_unix_fd_source_new + +<SUBSECTION> +g_unix_get_passwd_entry + +<SUBSECTION Private> +g_unix_error_quark +</SECTION> + +# Data Structures + +<SECTION> +<TITLE>Memory Slices</TITLE> +<FILE>memory_slices</FILE> +g_slice_alloc +g_slice_alloc0 +g_slice_copy +g_slice_free1 +g_slice_free_chain_with_offset + +<SUBSECTION> +g_slice_new +g_slice_new0 +g_slice_dup +g_slice_free +g_slice_free_chain + +<SUBSECTION Private> +GSliceConfig +g_slice_set_config +g_slice_get_config +g_slice_get_config_state +g_slice_debug_tree_statistics +</SECTION> + +<SECTION> +<TITLE>Doubly-Linked Lists</TITLE> +<FILE>linked_lists_double</FILE> +GList + +<SUBSECTION> +g_list_append +g_list_prepend +g_list_insert +g_list_insert_before +g_list_insert_before_link +g_list_insert_sorted +g_list_remove +g_list_remove_link +g_list_delete_link +g_list_remove_all +g_list_free +g_list_free_full +g_clear_list + +<SUBSECTION> +g_list_alloc +g_list_free_1 +g_list_free1 + +<SUBSECTION> +g_list_length +g_list_copy +g_list_copy_deep +g_list_reverse +g_list_sort +GCompareFunc +g_list_insert_sorted_with_data +g_list_sort_with_data +GCompareDataFunc +g_list_concat +g_list_foreach +GFunc + +<SUBSECTION> +g_list_first +g_list_last +g_list_previous +g_list_next +g_list_nth +g_list_nth_data +g_list_nth_prev + +<SUBSECTION> +g_list_find +g_list_find_custom +g_list_position +g_list_index +</SECTION> + +<SECTION> +<TITLE>Singly-Linked Lists</TITLE> +<FILE>linked_lists_single</FILE> +GSList + +<SUBSECTION> +g_slist_alloc +g_slist_append +g_slist_prepend +g_slist_insert +g_slist_insert_before +g_slist_insert_sorted +g_slist_remove +g_slist_remove_link +g_slist_delete_link +g_slist_remove_all +g_slist_free +g_slist_free_full +g_slist_free_1 +g_slist_free1 +g_clear_slist + +<SUBSECTION> +g_slist_length +g_slist_copy +g_slist_copy_deep +g_slist_reverse +g_slist_insert_sorted_with_data +g_slist_sort +g_slist_sort_with_data +g_slist_concat +g_slist_foreach + +<SUBSECTION> +g_slist_last +g_slist_next +g_slist_nth +g_slist_nth_data + +<SUBSECTION> +g_slist_find +g_slist_find_custom +g_slist_position +g_slist_index +</SECTION> + +<SECTION> +<TITLE>Double-ended Queues</TITLE> +<FILE>queue</FILE> + +GQueue +g_queue_new +g_queue_free +g_queue_free_full +G_QUEUE_INIT +g_queue_init +g_queue_clear +g_queue_clear_full +g_queue_is_empty +g_queue_get_length +g_queue_reverse +g_queue_copy +g_queue_foreach +g_queue_find +g_queue_find_custom +g_queue_sort +g_queue_push_head +g_queue_push_tail +g_queue_push_nth +g_queue_pop_head +g_queue_pop_tail +g_queue_pop_nth +g_queue_peek_head +g_queue_peek_tail +g_queue_peek_nth +g_queue_index +g_queue_remove +g_queue_remove_all +g_queue_insert_before +g_queue_insert_before_link +g_queue_insert_after +g_queue_insert_after_link +g_queue_insert_sorted +g_queue_push_head_link +g_queue_push_tail_link +g_queue_push_nth_link +g_queue_pop_head_link +g_queue_pop_tail_link +g_queue_pop_nth_link +g_queue_peek_head_link +g_queue_peek_tail_link +g_queue_peek_nth_link +g_queue_link_index +g_queue_unlink +g_queue_delete_link +</SECTION> + +<SECTION> +<TITLE>Sequences</TITLE> +<FILE>sequence</FILE> + +GSequence +GSequenceIter +GSequenceIterCompareFunc + +<SUBSECTION> +g_sequence_new +g_sequence_free +g_sequence_get_length +g_sequence_is_empty +g_sequence_foreach +g_sequence_foreach_range +g_sequence_sort +g_sequence_sort_iter + +<SUBSECTION> +g_sequence_get_begin_iter +g_sequence_get_end_iter +g_sequence_get_iter_at_pos +g_sequence_append +g_sequence_prepend +g_sequence_insert_before +g_sequence_move +g_sequence_swap +g_sequence_insert_sorted +g_sequence_insert_sorted_iter +g_sequence_sort_changed +g_sequence_sort_changed_iter +g_sequence_remove +g_sequence_remove_range +g_sequence_move_range +g_sequence_search +g_sequence_search_iter +g_sequence_lookup +g_sequence_lookup_iter + +<SUBSECTION> +g_sequence_get +g_sequence_set + +<SUBSECTION> +g_sequence_iter_is_begin +g_sequence_iter_is_end +g_sequence_iter_next +g_sequence_iter_prev +g_sequence_iter_get_position +g_sequence_iter_move +g_sequence_iter_get_sequence + +<SUBSECTION> +g_sequence_iter_compare +g_sequence_range_get_midpoint +</SECTION> + +<SECTION> +<TITLE>Trash Stacks</TITLE> +<FILE>trash_stack</FILE> +GTrashStack + +g_trash_stack_push +g_trash_stack_pop +g_trash_stack_peek +g_trash_stack_height +</SECTION> + +<SECTION> +<TITLE>Hash Tables</TITLE> +<FILE>hash_tables</FILE> +GHashTable +g_hash_table_new +g_hash_table_new_full +g_hash_table_new_similar +GHashFunc +GEqualFunc +GEqualFuncFull +g_hash_table_insert +g_hash_table_replace +g_hash_table_add +g_hash_table_contains +g_hash_table_size +g_hash_table_lookup +g_hash_table_lookup_extended +g_hash_table_foreach +g_hash_table_find +GHFunc +g_hash_table_remove +g_hash_table_steal +g_hash_table_steal_extended +g_hash_table_steal_all_keys +g_hash_table_steal_all_values +g_hash_table_foreach_remove +g_hash_table_foreach_steal +g_hash_table_remove_all +g_hash_table_steal_all +g_hash_table_get_keys +g_hash_table_get_values +g_hash_table_get_values_as_ptr_array +g_hash_table_get_keys_as_array +g_hash_table_get_keys_as_ptr_array +GHRFunc +g_hash_table_freeze +g_hash_table_thaw +g_hash_table_destroy +g_hash_table_ref +g_hash_table_unref +GHashTableIter +g_hash_table_iter_init +g_hash_table_iter_next +g_hash_table_iter_get_hash_table +g_hash_table_iter_replace +g_hash_table_iter_remove +g_hash_table_iter_steal + +<SUBSECTION> +g_direct_equal +g_direct_hash +g_int_equal +g_int_hash +g_int64_equal +g_int64_hash +g_double_equal +g_double_hash +g_str_equal +g_str_hash + +</SECTION> + +<SECTION> +<TITLE>Strings</TITLE> +<FILE>strings</FILE> +GString +g_string_new +g_string_new_len +g_string_sized_new +g_string_assign +g_string_sprintf +g_string_sprintfa +g_string_vprintf +g_string_append_vprintf +g_string_printf +g_string_append_printf +g_string_append +g_string_append_c +g_string_append_unichar +g_string_append_len +g_string_append_uri_escaped +g_string_prepend +g_string_prepend_c +g_string_prepend_unichar +g_string_prepend_len +g_string_insert +g_string_insert_c +g_string_insert_unichar +g_string_insert_len +g_string_overwrite +g_string_overwrite_len +g_string_replace +g_string_erase +g_string_truncate +g_string_set_size +g_string_free +g_string_free_to_bytes +g_string_free_and_steal + +<SUBSECTION> +g_string_up +g_string_down + +<SUBSECTION> +g_string_hash +g_string_equal + +<SUBSECTION Private> +g_string_append_c_inline +g_autoptr_cleanup_gstring_free +</SECTION> + +<SECTION> +<TITLE>String Chunks</TITLE> +<FILE>string_chunks</FILE> +GStringChunk +g_string_chunk_new +g_string_chunk_insert +g_string_chunk_insert_const +g_string_chunk_insert_len +g_string_chunk_clear +g_string_chunk_free + +</SECTION> + +<SECTION> +<TITLE>Arrays</TITLE> +<FILE>arrays</FILE> +GArray +g_array_new +g_array_new_take +g_array_new_take_zero_terminated +g_array_steal +g_array_sized_new +g_array_copy +g_array_ref +g_array_unref +g_array_get_element_size +g_array_append_val +g_array_append_vals +g_array_prepend_val +g_array_prepend_vals +g_array_insert_val +g_array_insert_vals +g_array_remove_index +g_array_remove_index_fast +g_array_remove_range +g_array_sort +g_array_sort_with_data +g_array_binary_search +g_array_index +g_array_set_size +g_array_set_clear_func +g_array_free +</SECTION> + +<SECTION> +<TITLE>Pointer Arrays</TITLE> +<FILE>arrays_pointer</FILE> +GPtrArray +g_ptr_array_new +g_ptr_array_steal +g_ptr_array_sized_new +g_ptr_array_new_with_free_func +g_ptr_array_copy +g_ptr_array_new_full +g_ptr_array_new_null_terminated +g_ptr_array_new_take +g_ptr_array_new_take_null_terminated +g_ptr_array_new_from_array +g_ptr_array_new_from_null_terminated_array +g_ptr_array_set_free_func +g_ptr_array_is_null_terminated +g_ptr_array_ref +g_ptr_array_unref +g_ptr_array_add +g_ptr_array_extend +g_ptr_array_extend_and_steal +g_ptr_array_insert +g_ptr_array_remove +g_ptr_array_remove_index +g_ptr_array_remove_fast +g_ptr_array_remove_index_fast +g_ptr_array_remove_range +g_ptr_array_steal_index +g_ptr_array_steal_index_fast +g_ptr_array_sort +g_ptr_array_sort_with_data +g_ptr_array_sort_values +g_ptr_array_sort_values_with_data +g_ptr_array_set_size +g_ptr_array_index +g_ptr_array_free +g_ptr_array_foreach +g_ptr_array_find +g_ptr_array_find_with_equal_func + +</SECTION> + +<SECTION> +<TITLE>Byte Arrays</TITLE> +<FILE>arrays_byte</FILE> +<SUBSECTION> +GByteArray +g_byte_array_new +g_byte_array_steal +g_byte_array_new_take +g_byte_array_sized_new +g_byte_array_ref +g_byte_array_unref +g_byte_array_append +g_byte_array_prepend +g_byte_array_remove_index +g_byte_array_remove_index_fast +g_byte_array_remove_range +g_byte_array_sort +g_byte_array_sort_with_data +g_byte_array_set_size +g_byte_array_free +g_byte_array_free_to_bytes + +<SUBSECTION> +GBytes +g_bytes_new +g_bytes_new_take +g_bytes_new_static +g_bytes_new_with_free_func +g_bytes_new_from_bytes +g_bytes_get_data +g_bytes_get_region +g_bytes_get_size +g_bytes_hash +g_bytes_equal +g_bytes_compare +g_bytes_ref +g_bytes_unref +g_bytes_unref_to_data +g_bytes_unref_to_array + +<SUBSECTION Private> +g_bytes_get_type +</SECTION> + +<SECTION> +<TITLE>Balanced Binary Trees</TITLE> +<FILE>trees-binary</FILE> +GTree +GTreeNode +g_tree_new +g_tree_ref +g_tree_unref +g_tree_new_with_data +g_tree_new_full +g_tree_node_first +g_tree_node_last +g_tree_node_previous +g_tree_node_next +g_tree_insert_node +g_tree_insert +g_tree_replace_node +g_tree_replace +g_tree_node_key +g_tree_node_value +g_tree_nnodes +g_tree_height +g_tree_lookup_node +g_tree_lookup +g_tree_lookup_extended +g_tree_foreach_node +g_tree_foreach +g_tree_traverse +GTraverseFunc +GTraverseNodeFunc +g_tree_search_node +g_tree_search +g_tree_lower_bound +g_tree_upper_bound +g_tree_remove +g_tree_steal +g_tree_remove_all +g_tree_destroy +</SECTION> + +<SECTION> +<TITLE>N-ary Trees</TITLE> +<FILE>trees-nary</FILE> +GNode +g_node_new +g_node_copy +GCopyFunc +g_node_copy_deep + +<SUBSECTION> +g_node_insert +g_node_insert_before +g_node_insert_after +g_node_append +g_node_prepend + +<SUBSECTION> +g_node_insert_data +g_node_insert_data_after +g_node_insert_data_before +g_node_append_data +g_node_prepend_data + +<SUBSECTION> +g_node_reverse_children +g_node_traverse +GTraverseType +GTraverseFlags +GNodeTraverseFunc +g_node_children_foreach +GNodeForeachFunc + +<SUBSECTION> +g_node_get_root +g_node_find +g_node_find_child +g_node_child_index +g_node_child_position +g_node_first_child +g_node_last_child +g_node_nth_child +g_node_first_sibling +g_node_next_sibling +g_node_prev_sibling +g_node_last_sibling + +<SUBSECTION> +G_NODE_IS_LEAF +G_NODE_IS_ROOT +g_node_depth +g_node_n_nodes +g_node_n_children +g_node_is_ancestor +g_node_max_height + +<SUBSECTION> +g_node_unlink +g_node_destroy +</SECTION> + + +<SECTION> +<TITLE>Quarks</TITLE> +<FILE>quarks</FILE> +GQuark +G_DEFINE_QUARK +g_quark_from_string +g_quark_from_static_string +g_quark_to_string +g_quark_try_string +g_intern_string +g_intern_static_string +</SECTION> + +<SECTION> +<TITLE>Keyed Data Lists</TITLE> +<FILE>datalist</FILE> +GData +g_datalist_init + +<SUBSECTION> +g_datalist_id_set_data +g_datalist_id_set_data_full +g_datalist_id_get_data +g_datalist_id_remove_data +g_datalist_id_remove_no_notify +g_datalist_id_remove_multiple +GDuplicateFunc +g_datalist_id_dup_data +g_datalist_id_replace_data + +<SUBSECTION> +g_datalist_set_data +g_datalist_set_data_full +g_datalist_get_data +g_datalist_remove_data +g_datalist_remove_no_notify + +<SUBSECTION> +g_datalist_foreach +g_datalist_clear +g_datalist_set_flags +g_datalist_unset_flags +g_datalist_get_flags +G_DATALIST_FLAGS_MASK +</SECTION> + + +<SECTION> +<TITLE>Datasets</TITLE> +<FILE>datasets</FILE> +g_dataset_id_set_data +g_dataset_id_set_data_full +GDestroyNotify +g_dataset_id_get_data +g_dataset_id_remove_data +g_dataset_id_remove_no_notify + +<SUBSECTION> +g_dataset_set_data +g_dataset_set_data_full +g_dataset_get_data +g_dataset_remove_data +g_dataset_remove_no_notify + +<SUBSECTION> +g_dataset_foreach +GDataForeachFunc +g_dataset_destroy + +</SECTION> + +<SECTION> +<TITLE>Relations and Tuples</TITLE> +<FILE>relations</FILE> +GRelation +g_relation_new +g_relation_index +g_relation_insert +g_relation_exists +g_relation_count +g_relation_select +g_relation_delete +g_relation_destroy + +<SUBSECTION> +g_relation_print + +<SUBSECTION> +GTuples +g_tuples_destroy +g_tuples_index +</SECTION> + +<SECTION> +<TITLE>Caches</TITLE> +<FILE>caches</FILE> +GCache +g_cache_new +g_cache_insert +g_cache_remove +g_cache_destroy + +<SUBSECTION> +g_cache_key_foreach +g_cache_value_foreach + +<SUBSECTION> +GCacheDestroyFunc +GCacheDupFunc +GCacheNewFunc +</SECTION> + +<SECTION> +<TITLE>Random Numbers</TITLE> +<FILE>random_numbers</FILE> +GRand +g_rand_new_with_seed +g_rand_new_with_seed_array +g_rand_new +g_rand_copy +g_rand_free +g_rand_set_seed +g_rand_set_seed_array +g_rand_boolean +g_rand_int +g_rand_int_range +g_rand_double +g_rand_double_range +g_random_set_seed +g_random_boolean +g_random_int +g_random_int_range +g_random_double +g_random_double_range +</SECTION> + +<SECTION> +<TITLE>Character Set Conversion</TITLE> +<FILE>conversions</FILE> +g_convert +g_convert_with_fallback +GIConv +g_convert_with_iconv +G_CONVERT_ERROR +g_iconv_open +g_iconv +g_iconv_close +g_locale_to_utf8 +g_filename_to_utf8 +g_filename_from_utf8 +g_get_filename_charsets +g_filename_display_name +g_filename_display_basename +g_locale_from_utf8 +GConvertError + +<SUBSECTION> +g_get_charset +g_get_codeset +g_get_console_charset + +<SUBSECTION Private> +g_convert_error_quark +</SECTION> + +<SECTION> +<TITLE>Unicode Manipulation</TITLE> +<FILE>unicode</FILE> +gunichar +gunichar2 + +<SUBSECTION> +g_unichar_validate +g_unichar_isalnum +g_unichar_isalpha +g_unichar_iscntrl +g_unichar_isdefined +g_unichar_isdigit +g_unichar_isgraph +g_unichar_islower +g_unichar_ismark +g_unichar_isprint +g_unichar_ispunct +g_unichar_isspace +g_unichar_istitle +g_unichar_isupper +g_unichar_isxdigit +g_unichar_iswide +g_unichar_iswide_cjk +g_unichar_iszerowidth +g_unichar_toupper +g_unichar_tolower +g_unichar_totitle +g_unichar_digit_value +g_unichar_xdigit_value +g_unichar_compose +g_unichar_decompose +g_unichar_fully_decompose +G_UNICHAR_MAX_DECOMPOSITION_LENGTH +GUnicodeType +G_UNICODE_COMBINING_MARK +g_unichar_type +GUnicodeBreakType +g_unichar_break_type +g_unichar_combining_class +g_unicode_canonical_ordering +g_unicode_canonical_decomposition +g_unichar_get_mirror_char +GUnicodeScript +g_unichar_get_script +g_unicode_script_from_iso15924 +g_unicode_script_to_iso15924 + +<SUBSECTION> +g_utf8_next_char +g_utf8_get_char +g_utf8_get_char_validated +g_utf8_offset_to_pointer +g_utf8_pointer_to_offset +g_utf8_prev_char +g_utf8_find_next_char +g_utf8_find_prev_char +g_utf8_strlen +g_utf8_strncpy +g_utf8_strchr +g_utf8_strrchr +g_utf8_strreverse +g_utf8_substring +g_utf8_validate +g_utf8_validate_len +g_utf8_make_valid + +<SUBSECTION> +g_utf8_strup +g_utf8_strdown +g_utf8_casefold +g_utf8_normalize +GNormalizeMode +g_utf8_collate +g_utf8_collate_key +g_utf8_collate_key_for_filename + +<SUBSECTION> +g_utf8_to_utf16 +g_utf8_to_ucs4 +g_utf8_to_ucs4_fast +g_utf16_to_ucs4 +g_utf16_to_utf8 +g_ucs4_to_utf16 +g_ucs4_to_utf8 +g_unichar_to_utf8 + +<SUBSECTION Private> +g_utf8_skip +</SECTION> + +<SECTION> +<TITLE>I18N</TITLE> +<FILE>i18n</FILE> +<INCLUDE>glib.h,glib/gi18n.h</INCLUDE> +_ +Q_ +C_ +N_ +NC_ +g_dgettext +g_dcgettext +g_dngettext +g_dpgettext +g_dpgettext2 +g_strip_context +<SUBSECTION> +g_get_language_names +g_get_locale_variants +</SECTION> + +<SECTION> +<TITLE>Base64 Encoding</TITLE> +<FILE>base64</FILE> +g_base64_encode_step +g_base64_encode_close +g_base64_encode +g_base64_decode_step +g_base64_decode +g_base64_decode_inplace +</SECTION> + +<SECTION> +<TITLE>URI Functions</TITLE> +<FILE>guri</FILE> +GUri +g_uri_ref +g_uri_unref +<SUBSECTION> +GUriFlags +g_uri_split +g_uri_split_with_user +g_uri_split_network +g_uri_is_valid +g_uri_join +g_uri_join_with_user +g_uri_parse +g_uri_parse_relative +g_uri_resolve_relative +g_uri_build +g_uri_build_with_user +g_uri_peek_scheme +g_uri_parse_scheme +<SUBSECTION> +GUriHideFlags +g_uri_to_string +g_uri_to_string_partial +<SUBSECTION> +g_uri_get_scheme +g_uri_get_userinfo +g_uri_get_user +g_uri_get_password +g_uri_get_auth_params +g_uri_get_host +g_uri_get_port +g_uri_get_path +g_uri_get_query +g_uri_get_fragment +g_uri_get_flags +<SUBSECTION> +GUriParamsIter +GUriParamsFlags +g_uri_params_iter_init +g_uri_params_iter_next +g_uri_parse_params +<SUBSECTION> +G_URI_RESERVED_CHARS_ALLOWED_IN_PATH +G_URI_RESERVED_CHARS_ALLOWED_IN_PATH_ELEMENT +G_URI_RESERVED_CHARS_ALLOWED_IN_USERINFO +G_URI_RESERVED_CHARS_GENERIC_DELIMITERS +G_URI_RESERVED_CHARS_SUBCOMPONENT_DELIMITERS +g_uri_escape_string +g_uri_unescape_string +g_uri_escape_bytes +g_uri_unescape_bytes +g_uri_unescape_segment +<SUBSECTION> +g_uri_list_extract_uris +g_filename_from_uri +g_filename_to_uri +<SUBSECTION> +G_URI_ERROR +GUriError +<SUBSECTION Private> +g_uri_error_quark +</SECTION> + +<SECTION> +<TITLE>Data Checksums</TITLE> +<FILE>checksum</FILE> +GChecksumType +g_checksum_type_get_length +GChecksum +g_checksum_new +g_checksum_copy +g_checksum_free +g_checksum_reset +g_checksum_update +g_checksum_get_string +g_checksum_get_digest +<SUBSECTION> +g_compute_checksum_for_data +g_compute_checksum_for_string +g_compute_checksum_for_bytes +</SECTION> + +<SECTION> +<TITLE>Data HMACs</TITLE> +<FILE>hmac</FILE> +GHmac +g_hmac_new +g_hmac_copy +g_hmac_ref +g_hmac_unref +g_hmac_update +g_hmac_get_string +g_hmac_get_digest +<SUBSECTION> +g_compute_hmac_for_data +g_compute_hmac_for_string +g_compute_hmac_for_bytes +</SECTION> + +<SECTION> +<TITLE>Testing</TITLE> +<FILE>testing</FILE> +G_TEST_OPTION_ISOLATE_DIRS +g_test_minimized_result +g_test_maximized_result +g_test_init +g_test_initialized +g_test_quick +g_test_slow +g_test_thorough +g_test_perf +g_test_verbose +g_test_undefined +g_test_quiet +g_test_subprocess +g_test_run +GTestFunc +g_test_add_func +GTestDataFunc +g_test_add_data_func +g_test_add_data_func_full +g_test_add +g_test_get_path + +GTestFileType +g_test_build_filename +g_test_get_filename +g_test_get_dir + +g_test_fail +g_test_fail_printf +g_test_skip +g_test_skip_printf +g_test_incomplete +g_test_incomplete_printf +g_test_failed +g_test_message +g_test_bug_base +g_test_bug +g_test_summary +GTestLogFatalFunc +g_test_log_set_fatal_handler + +g_test_timer_start +g_test_timer_elapsed +g_test_timer_last + +g_test_queue_free +g_test_queue_destroy +g_test_queue_unref + +g_test_expect_message +g_test_assert_expected_messages + +GTestTrapFlags +GTestSubprocessFlags +g_test_trap_subprocess +g_test_trap_has_passed +g_test_trap_reached_timeout +g_test_trap_assert_passed +g_test_trap_assert_failed +g_test_trap_assert_stdout +g_test_trap_assert_stdout_unmatched +g_test_trap_assert_stderr +g_test_trap_assert_stderr_unmatched +g_test_trap_fork + +g_test_rand_bit +g_test_rand_int +g_test_rand_int_range +g_test_rand_double +g_test_rand_double_range + +g_assert +g_assert_not_reached + +g_assert_cmpstr +g_assert_cmpstrv +g_assert_cmpint +g_assert_cmpuint +g_assert_cmphex +g_assert_cmpfloat +g_assert_cmpfloat_with_epsilon +g_assert_cmpmem +g_assert_cmpvariant +g_assert_no_error +g_assert_error +g_assert_true +g_assert_false +g_assert_null +g_assert_nonnull +g_assert_no_errno +g_test_set_nonfatal_assertions + +GTestCase +GTestSuite +GTestFixtureFunc +g_test_create_case +g_test_create_suite +g_test_get_root +g_test_suite_add +g_test_suite_add_suite +g_test_run_suite +g_test_case_free +g_test_suite_free + +<SUBSECTION Private> +g_test_trap_assertions +g_assertion_message +g_assertion_message_expr +g_assertion_message_cmpstr +g_assertion_message_cmpnum +g_assertion_message_error +g_test_assert_expected_messages_internal + +g_test_config_vars + +g_test_add_vtable +GTestConfig +GTestLogType +GTestLogMsg +GTestLogBuffer +GTestResult + +g_test_log_type_name +g_test_log_buffer_new +g_test_log_buffer_free +g_test_log_buffer_push +g_test_log_buffer_pop +g_test_log_msg_free +</SECTION> + +<SECTION> +<TITLE>GVariantType</TITLE> +<FILE>gvarianttype</FILE> +GVariantType +G_VARIANT_TYPE_BOOLEAN +G_VARIANT_TYPE_BYTE +G_VARIANT_TYPE_INT16 +G_VARIANT_TYPE_UINT16 +G_VARIANT_TYPE_INT32 +G_VARIANT_TYPE_UINT32 +G_VARIANT_TYPE_INT64 +G_VARIANT_TYPE_UINT64 +G_VARIANT_TYPE_HANDLE +G_VARIANT_TYPE_DOUBLE +G_VARIANT_TYPE_STRING +G_VARIANT_TYPE_OBJECT_PATH +G_VARIANT_TYPE_SIGNATURE +G_VARIANT_TYPE_VARIANT +G_VARIANT_TYPE_ANY +G_VARIANT_TYPE_BASIC +G_VARIANT_TYPE_MAYBE +G_VARIANT_TYPE_ARRAY +G_VARIANT_TYPE_TUPLE +G_VARIANT_TYPE_UNIT +G_VARIANT_TYPE_DICT_ENTRY +G_VARIANT_TYPE_DICTIONARY +G_VARIANT_TYPE_STRING_ARRAY +G_VARIANT_TYPE_OBJECT_PATH_ARRAY +G_VARIANT_TYPE_BYTESTRING +G_VARIANT_TYPE_BYTESTRING_ARRAY +G_VARIANT_TYPE_VARDICT + +<SUBSECTION> +G_VARIANT_TYPE +g_variant_type_free +g_variant_type_copy +g_variant_type_new + +<SUBSECTION> +g_variant_type_string_is_valid +g_variant_type_string_scan +g_variant_type_get_string_length +g_variant_type_peek_string +g_variant_type_dup_string + +<SUBSECTION> +g_variant_type_is_definite +g_variant_type_is_container +g_variant_type_is_basic +g_variant_type_is_maybe +g_variant_type_is_array +g_variant_type_is_tuple +g_variant_type_is_dict_entry +g_variant_type_is_variant + +<SUBSECTION> +g_variant_type_hash +g_variant_type_equal +g_variant_type_is_subtype_of + +<SUBSECTION> +g_variant_type_new_maybe +g_variant_type_new_array +g_variant_type_new_tuple +g_variant_type_new_dict_entry + +<SUBSECTION> +g_variant_type_element +g_variant_type_n_items +g_variant_type_first +g_variant_type_next +g_variant_type_key +g_variant_type_value +</SECTION> + +<SECTION> +<TITLE>GVariant</TITLE> +<FILE>gvariant</FILE> +GVariant +g_variant_unref +g_variant_ref +g_variant_ref_sink +g_variant_is_floating +g_variant_take_ref +g_variant_get_type +g_variant_get_type_string +g_variant_is_of_type +g_variant_is_container +g_variant_compare + +<SUBSECTION> +g_variant_classify +GVariantClass + +<SUBSECTION> +g_variant_check_format_string +g_variant_get +g_variant_get_va +g_variant_new +g_variant_new_va + +<SUBSECTION> +g_variant_new_boolean +g_variant_new_byte +g_variant_new_int16 +g_variant_new_uint16 +g_variant_new_int32 +g_variant_new_uint32 +g_variant_new_int64 +g_variant_new_uint64 +g_variant_new_handle +g_variant_new_double +g_variant_new_string +g_variant_new_take_string +g_variant_new_printf +g_variant_new_object_path +g_variant_is_object_path +g_variant_new_signature +g_variant_is_signature +g_variant_new_variant +g_variant_new_strv +g_variant_new_objv +g_variant_new_bytestring +g_variant_new_bytestring_array + +<SUBSECTION> +g_variant_get_boolean +g_variant_get_byte +g_variant_get_int16 +g_variant_get_uint16 +g_variant_get_int32 +g_variant_get_uint32 +g_variant_get_int64 +g_variant_get_uint64 +g_variant_get_handle +g_variant_get_double +g_variant_get_string +g_variant_dup_string +g_variant_get_variant +g_variant_get_strv +g_variant_dup_strv +g_variant_get_objv +g_variant_dup_objv +g_variant_get_bytestring +g_variant_dup_bytestring +g_variant_get_bytestring_array +g_variant_dup_bytestring_array + +<SUBSECTION> +g_variant_new_maybe +g_variant_new_array +g_variant_new_tuple +g_variant_new_dict_entry +g_variant_new_fixed_array + +<SUBSECTION> +g_variant_get_maybe +g_variant_n_children +g_variant_get_child_value +g_variant_get_child +g_variant_lookup_value +g_variant_lookup +g_variant_get_fixed_array + +<SUBSECTION> +g_variant_get_size +g_variant_get_data +g_variant_get_data_as_bytes +g_variant_store +g_variant_new_from_data +g_variant_new_from_bytes +g_variant_byteswap +g_variant_get_normal_form +g_variant_is_normal_form + +<SUBSECTION> +g_variant_hash +g_variant_equal + +<SUBSECTION> +g_variant_print +g_variant_print_string + +<SUBSECTION> +GVariantIter +g_variant_iter_copy +g_variant_iter_free +g_variant_iter_init +g_variant_iter_n_children +g_variant_iter_new +g_variant_iter_next_value +g_variant_iter_next +g_variant_iter_loop + +<SUBSECTION> +G_VARIANT_BUILDER_INIT +GVariantBuilder +g_variant_builder_unref +g_variant_builder_ref +g_variant_builder_new +g_variant_builder_init +g_variant_builder_clear +g_variant_builder_add_value +g_variant_builder_add +g_variant_builder_add_parsed +g_variant_builder_end +g_variant_builder_open +g_variant_builder_close + +<SUBSECTION> +G_VARIANT_DICT_INIT +GVariantDict +g_variant_dict_unref +g_variant_dict_ref +g_variant_dict_new +g_variant_dict_init +g_variant_dict_clear +g_variant_dict_contains +g_variant_dict_lookup +g_variant_dict_lookup_value +g_variant_dict_insert +g_variant_dict_insert_value +g_variant_dict_remove +g_variant_dict_end + +<SUBSECTION> +GVariantParseError +G_VARIANT_PARSE_ERROR +g_variant_parse +g_variant_new_parsed_va +g_variant_new_parsed +g_variant_parse_error_print_context + +<SUBSECTION Private> +g_variant_parse_error_quark +g_variant_parser_get_error_quark +g_variant_type_checked_ +g_variant_type_string_get_depth_ +</SECTION> + + +<SECTION> +<FILE>ghostutils</FILE> +<TITLE>Hostname Utilities</TITLE> +g_hostname_to_ascii +g_hostname_to_unicode +<SUBSECTION> +g_hostname_is_non_ascii +g_hostname_is_ascii_encoded +<SUBSECTION> +g_hostname_is_ip_address +</SECTION> + +<SECTION> +<FILE>uuid</FILE> +<TITLE>GUuid</TITLE> +g_uuid_string_is_valid +g_uuid_string_random +</SECTION> + +<SECTION> +<FILE>refcount</FILE> +grefcount +g_ref_count_init +g_ref_count_inc +g_ref_count_dec +g_ref_count_compare +<SUBSECTION> +gatomicrefcount +g_atomic_ref_count_init +g_atomic_ref_count_inc +g_atomic_ref_count_dec +g_atomic_ref_count_compare +</SECTION> + +<SECTION> +<FILE>rcbox</FILE> +g_rc_box_alloc +g_rc_box_alloc0 +g_rc_box_new +g_rc_box_new0 +g_rc_box_dup +g_rc_box_acquire +g_rc_box_release +g_rc_box_release_full +g_rc_box_get_size +</SECTION> + +<SECTION> +<FILE>arcbox</FILE> +g_atomic_rc_box_alloc +g_atomic_rc_box_alloc0 +g_atomic_rc_box_new +g_atomic_rc_box_new0 +g_atomic_rc_box_dup +g_atomic_rc_box_acquire +g_atomic_rc_box_release +g_atomic_rc_box_release_full +g_atomic_rc_box_get_size +</SECTION> + +<SECTION> +<FILE>refstring</FILE> +GRefString +g_ref_string_new +g_ref_string_new_intern +g_ref_string_new_len +g_ref_string_acquire +g_ref_string_release +g_ref_string_length +</SECTION> + +<SECTION> +<FILE>gpathbuf</FILE> +GPathBuf +G_PATH_BUF_INIT +g_path_buf_new +g_path_buf_new_from_path +g_path_buf_init +g_path_buf_init_from_path +g_path_buf_clear +g_path_buf_clear_to_path +g_path_buf_free +g_path_buf_free_to_path +g_path_buf_push +g_path_buf_pop +g_path_buf_set_filename +g_path_buf_set_extension +g_path_buf_to_path +g_path_buf_copy +g_path_buf_equal +</SECTION>
View file
_service:tar_scm:glib-2.76.4.tar.xz/docs/reference/glib/gvariant-byte-boundaries.svg
Added
@@ -0,0 +1,204 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<svg + width="43.395473mm" + height="14.533744mm" + viewBox="0 0 43.395473 14.533744" + version="1.1" + id="svg5" + sodipodi:docname="gvariant-byte-boundaries.svg" + inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + <sodipodi:namedview + id="namedview7" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:showpageshadow="2" + inkscape:pageopacity="0.0" + inkscape:pagecheckerboard="0" + inkscape:deskcolor="#d1d1d1" + inkscape:document-units="mm" + showgrid="false" + inkscape:zoom="1.2598564" + inkscape:cx="38.496451" + inkscape:cy="-42.862028" + inkscape:window-width="1920" + inkscape:window-height="1043" + inkscape:window-x="0" + inkscape:window-y="0" + inkscape:window-maximized="1" + inkscape:current-layer="layer1" /> + <defs + id="defs2" /> + <g + inkscape:label="Layer 1" + inkscape:groupmode="layer" + id="layer1" + transform="translate(-45.177837,-76.28292)"> + <rect + style="fill:#ff8080;stroke:#000000;stroke-width:0.264583" + id="rect455" + width="10" + height="10" + x="46.387753" + y="80.684372" /> + <rect + style="fill:#ff8080;stroke:#000000;stroke-width:0.264583" + id="rect455-1" + width="10" + height="10" + x="56.652336" + y="80.684372" /> + <rect + style="fill:#ff8080;stroke:#000000;stroke-width:0.264583" + id="rect455-9" + width="10" + height="10" + x="66.916916" + y="80.684372" /> + <rect + style="fill:#ff8080;stroke:#000000;stroke-width:0.264583" + id="rect455-4" + width="10" + height="10" + x="77.181496" + y="80.684372" /> + <text + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.35px;line-height:1.25;font-family:'DejaVu Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583" + x="49.476242" + y="87.995857" + id="text248"><tspan + sodipodi:role="line" + id="tspan246" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.35px;font-family:'DejaVu Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono';stroke-width:0.264583" + x="49.476242" + y="87.995857">0</tspan></text> + <text + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.35px;line-height:1.25;font-family:'DejaVu Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583" + x="59.574944" + y="87.998962" + id="text248-2"><tspan + sodipodi:role="line" + id="tspan246-3" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.35px;font-family:'DejaVu Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono';stroke-width:0.264583" + x="59.574944" + y="87.998962">1</tspan></text> + <text + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.35px;line-height:1.25;font-family:'DejaVu Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583" + x="70.039513" + y="88.040817" + id="text248-7"><tspan + sodipodi:role="line" + id="tspan246-5" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.35px;font-family:'DejaVu Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono';stroke-width:0.264583" + x="70.039513" + y="88.040817">2</tspan></text> + <text + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.35px;line-height:1.25;font-family:'DejaVu Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583" + x="80.296341" + y="87.995857" + id="text248-9"><tspan + sodipodi:role="line" + id="tspan246-2" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.35px;font-family:'DejaVu Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono';stroke-width:0.264583" + x="80.296341" + y="87.995857">3</tspan></text> + <text + xml:space="preserve" + style="font-style:normal;font-weight:normal;font-size:5.64444px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583" + x="44.811279" + y="80.472153" + id="text369"><tspan + sodipodi:role="line" + id="tspan367" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444px;font-family:'DejaVu Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono';stroke-width:0.264583" + x="44.811279" + y="80.472153">0</tspan></text> + <text + xml:space="preserve" + style="font-style:normal;font-weight:normal;font-size:5.64444px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583" + x="54.673473" + y="80.552078" + id="text369-2"><tspan + sodipodi:role="line" + id="tspan367-8" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444px;font-family:'DejaVu Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono';stroke-width:0.264583" + x="54.673473" + y="80.552078">1</tspan></text> + <text + xml:space="preserve" + style="font-style:normal;font-weight:normal;font-size:5.64444px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583" + x="65.115822" + y="80.552078" + id="text369-9"><tspan + sodipodi:role="line" + id="tspan367-7" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444px;font-family:'DejaVu Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono';stroke-width:0.264583" + x="65.115822" + y="80.552078">2</tspan></text> + <text + xml:space="preserve" + style="font-style:normal;font-weight:normal;font-size:5.64444px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583" + x="75.373512" + y="80.472153" + id="text369-3"><tspan + sodipodi:role="line" + id="tspan367-6" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444px;font-family:'DejaVu Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono';stroke-width:0.264583" + x="75.373512" + y="80.472153">3</tspan></text> + <text + xml:space="preserve" + style="font-style:normal;font-weight:normal;font-size:5.64444px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583" + x="85.445168" + y="80.552078" + id="text369-1"><tspan + sodipodi:role="line" + id="tspan367-2" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444px;font-family:'DejaVu Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono';stroke-width:0.264583" + x="85.445168" + y="80.552078">4</tspan></text> + </g> + <metadata + id="metadata1431"> + <rdf:RDF> + <cc:License + rdf:about="http://creativecommons.org/licenses/by-sa/4.0/"> + <cc:permits + rdf:resource="http://creativecommons.org/ns#Reproduction" /> + <cc:permits + rdf:resource="http://creativecommons.org/ns#Distribution" /> + <cc:requires + rdf:resource="http://creativecommons.org/ns#Notice" /> + <cc:requires + rdf:resource="http://creativecommons.org/ns#Attribution" /> + <cc:permits + rdf:resource="http://creativecommons.org/ns#DerivativeWorks" /> + <cc:requires + rdf:resource="http://creativecommons.org/ns#ShareAlike" /> + </cc:License> + <cc:Work + rdf:about=""> + <cc:license + rdf:resource="http://creativecommons.org/licenses/by-sa/3.0/" /> + <dc:rights> + <cc:Agent> + <dc:title>Copyright © 2022 Philip Withnall</dc:title> + </cc:Agent> + </dc:rights> + </cc:Work> + </rdf:RDF> + </metadata> +</svg>
View file
_service:tar_scm:glib-2.76.4.tar.xz/docs/reference/glib/gvariant-integer-and-string-structure.svg
Added
@@ -0,0 +1,358 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<svg + width="116.87785mm" + height="30.931454mm" + viewBox="0 0 116.87785 30.931454" + version="1.1" + id="svg5155" + inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)" + sodipodi:docname="gvariant-integer-and-string-structure.svg" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + <sodipodi:namedview + id="namedview5157" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:showpageshadow="2" + inkscape:pageopacity="0.0" + inkscape:pagecheckerboard="0" + inkscape:deskcolor="#d1d1d1" + inkscape:document-units="mm" + showgrid="false" + inkscape:zoom="2.5197127" + inkscape:cx="187.52138" + inkscape:cy="32.940263" + inkscape:window-width="1920" + inkscape:window-height="1043" + inkscape:window-x="0" + inkscape:window-y="0" + inkscape:window-maximized="1" + inkscape:current-layer="layer1" /> + <defs + id="defs5152"> + <marker + style="overflow:visible" + id="marker9949" + refX="0" + refY="0" + orient="auto" + inkscape:stockid="Square" + markerWidth="6" + markerHeight="6" + viewBox="0 0 6 6" + inkscape:isstock="true" + inkscape:collect="always" + preserveAspectRatio="xMidYMid"> + <path + transform="scale(0.5)" + style="fill:context-fill;fill-rule:evenodd;stroke:context-stroke;stroke-width:2" + d="M -5,-5 V 5 H 5 V -5 Z" + id="path9947" /> + </marker> + <marker + style="overflow:visible" + id="Arrow1" + refX="0" + refY="0" + orient="auto-start-reverse" + inkscape:stockid="Arrow1" + markerWidth="4.0606599" + markerHeight="6.7071061" + viewBox="0 0 4.0606602 6.7071068" + inkscape:isstock="true" + inkscape:collect="always" + preserveAspectRatio="xMidYMid"> + <path + style="fill:none;stroke:context-stroke;stroke-width:1;stroke-linecap:butt" + d="M 3,-3 0,0 3,3" + id="path5057" + transform="rotate(180,0.125,0)" + sodipodi:nodetypes="ccc" /> + </marker> + </defs> + <g + inkscape:label="Layer 1" + inkscape:groupmode="layer" + id="layer1" + transform="translate(-30.768787,-158.84707)"> + <rect + style="fill:#ff8080;stroke:#000000;stroke-width:0.43204;stroke-dasharray:none" + id="rect455-2" + width="114.56796" + height="13.006005" + x="32.188347" + y="163.33226" /> + <text + xml:space="preserve" + style="font-style:normal;font-weight:normal;font-size:5.64444px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583" + x="30.402229" + y="163.0363" + id="text369"><tspan + sodipodi:role="line" + id="tspan367" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444px;font-family:'DejaVu Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono';stroke-width:0.264583" + x="30.402229" + y="163.0363">0</tspan></text> + <text + xml:space="preserve" + style="font-style:normal;font-weight:normal;font-size:5.64444px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583" + x="44.872921" + y="163.11624" + id="text369-2"><tspan + sodipodi:role="line" + id="tspan367-8" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444px;font-family:'DejaVu Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono';stroke-width:0.264583" + x="44.872921" + y="163.11624">1</tspan></text> + <text + xml:space="preserve" + style="font-style:normal;font-weight:normal;font-size:5.64444px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583" + x="57.698662" + y="163.11624" + id="text369-9"><tspan + sodipodi:role="line" + id="tspan367-7" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444px;font-family:'DejaVu Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono';stroke-width:0.264583" + x="57.698662" + y="163.11624">2</tspan></text> + <text + xml:space="preserve" + style="font-style:normal;font-weight:normal;font-size:5.64444px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583" + x="68.045494" + y="163.0363" + id="text369-3"><tspan + sodipodi:role="line" + id="tspan367-6" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444px;font-family:'DejaVu Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono';stroke-width:0.264583" + x="68.045494" + y="163.0363">3</tspan></text> + <text + xml:space="preserve" + style="font-style:normal;font-weight:normal;font-size:5.64444px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583" + x="77.817863" + y="163.11624" + id="text369-1"><tspan + sodipodi:role="line" + id="tspan367-2" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444px;font-family:'DejaVu Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono';stroke-width:0.264583" + x="77.817863" + y="163.11624">4</tspan></text> + <text + xml:space="preserve" + style="font-style:normal;font-weight:normal;font-size:5.64444px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583" + x="87.978661" + y="163.0363" + id="text369-7"><tspan + sodipodi:role="line" + id="tspan367-84" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444px;font-family:'DejaVu Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono';stroke-width:0.264583" + x="87.978661" + y="163.0363">5</tspan></text> + <text + xml:space="preserve" + style="font-style:normal;font-weight:normal;font-size:5.64444px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583" + x="98.571381" + y="163.0363" + id="text369-2-5"><tspan + sodipodi:role="line" + id="tspan367-8-0" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444px;font-family:'DejaVu Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono';stroke-width:0.264583" + x="98.571381" + y="163.0363">6</tspan></text> + <text + xml:space="preserve" + style="font-style:normal;font-weight:normal;font-size:5.64444px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583" + x="111.0451" + y="163.11624" + id="text369-9-3"><tspan + sodipodi:role="line" + id="tspan367-7-6" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444px;font-family:'DejaVu Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono';stroke-width:0.264583" + x="111.0451" + y="163.11624">7</tspan></text> + <text + xml:space="preserve" + style="font-style:normal;font-weight:normal;font-size:5.64444px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583" + x="123.44961" + y="163.0363" + id="text369-3-1"><tspan + sodipodi:role="line" + id="tspan367-6-0" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444px;font-family:'DejaVu Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono';stroke-width:0.264583" + x="123.44961" + y="163.0363">8</tspan></text> + <text + xml:space="preserve" + style="font-style:normal;font-weight:normal;font-size:5.64444px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583" + x="133.39301" + y="163.0363" + id="text369-3-9"><tspan + sodipodi:role="line" + id="tspan367-6-2" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444px;font-family:'DejaVu Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono';stroke-width:0.264583" + x="133.39301" + y="163.0363">9</tspan></text> + <text + xml:space="preserve" + style="font-style:normal;font-weight:normal;font-size:5.64444px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583" + x="144.72795" + y="163.0363" + id="text369-1-0"><tspan + sodipodi:role="line" + id="tspan367-2-6" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444px;font-family:'DejaVu Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono';stroke-width:0.264583" + x="144.72795" + y="163.0363">a</tspan></text> + <rect + style="fill:#ff8080;stroke:#000000;stroke-width:0.264583" + id="rect455-71-1-7" + width="10" + height="10" + x="125.61029" + y="164.83527" /> + <text + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.35px;line-height:1.25;font-family:'DejaVu Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583" + x="126.63515" + y="171.89716" + id="text248-78"><tspan + sodipodi:role="line" + id="tspan246-6" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.35px;font-family:'DejaVu Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono';stroke-width:0.264583" + x="126.63515" + y="171.89716">\0</tspan></text> + <text + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.35px;line-height:1.25;font-family:'DejaVu Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583" + x="137.58762" + y="172.14676" + id="text248-8"><tspan + sodipodi:role="line" + id="tspan246-8" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.35px;font-family:'DejaVu Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono';stroke-width:0.264583" + x="137.58762" + y="172.14676">05</tspan></text> + <rect + style="fill:#ff8080;stroke:#000000;stroke-width:0.411817" + id="rect455-0" + width="24.588182" + height="9.852766" + x="34.4254" + y="164.90889" /> + <rect + style="fill:#ff8080;stroke:#000000;stroke-width:0.40555;stroke-dasharray:none" + id="rect455-0-6" + width="29.59445" + height="9.7798347" + x="59.831776" + y="164.94536" /> + <text + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.35px;line-height:1.25;font-family:'DejaVu Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583" + x="37.171238" + y="172.14676" + id="text248"><tspan + sodipodi:role="line" + id="tspan246" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.35px;font-family:'DejaVu Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono';stroke-width:0.264583" + x="37.171238" + y="172.14676">01 01</tspan></text> + <rect + style="fill:#ff8080;stroke:#000000;stroke-width:0.411817" + id="rect455-0-5" + width="24.588182" + height="9.852766" + x="100.48373" + y="164.90889" /> + <text + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.35px;line-height:1.25;font-family:'DejaVu Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583" + x="103.22956" + y="172.14676" + id="text248-9"><tspan + sodipodi:role="line" + id="tspan246-7" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.35px;font-family:'DejaVu Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono';stroke-width:0.264583" + x="103.22956" + y="172.14676">02 02</tspan></text> + <text + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.35px;line-height:1.25;font-family:'DejaVu Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583" + x="81.10598" + y="171.89716" + id="text248-5"><tspan + sodipodi:role="line" + id="tspan246-54" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.35px;font-family:'DejaVu Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono';stroke-width:0.264583" + x="81.10598" + y="171.89716">\0</tspan></text> + <text + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.35px;line-height:1.25;font-family:'DejaVu Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583" + x="62.440269" + y="171.57159" + id="text248-2"><tspan + sodipodi:role="line" + id="tspan246-3" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.35px;font-family:'DejaVu Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono';stroke-width:0.264583" + x="62.440269" + y="171.57159">x</tspan></text> + <text + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.35px;line-height:1.25;font-family:'DejaVu Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583" + x="72.704849" + y="171.57159" + id="text248-7"><tspan + sodipodi:role="line" + id="tspan246-5" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.35px;font-family:'DejaVu Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono';stroke-width:0.264583" + x="72.704849" + y="171.57159">x</tspan></text> + <path + style="fill:none;stroke:#000000;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-start:url(#marker9949);marker-end:url(#Arrow1)" + d="m 141.51769,176.47052 v 13.17571 H 89.305825 v -13.12854" + id="path7583" /> + <path + style="fill:none;stroke:#000000;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-start:url(#marker9949);marker-end:url(#Arrow1)" + d="m 89.351354,183.3049 h 11.073556 v -6.87539" + id="path7585" /> + </g> + <metadata + id="metadata4685"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:rights> + <cc:Agent> + <dc:title>Copyright © 2022 Philip Withnall</dc:title> + </cc:Agent> + </dc:rights> + <cc:license + rdf:resource="http://creativecommons.org/licenses/by-sa/3.0/" /> + </cc:Work> + <cc:License + rdf:about="http://creativecommons.org/licenses/by-sa/4.0/"> + <cc:permits + rdf:resource="http://creativecommons.org/ns#Reproduction" /> + <cc:permits + rdf:resource="http://creativecommons.org/ns#Distribution" /> + <cc:requires + rdf:resource="http://creativecommons.org/ns#Notice" /> + <cc:requires + rdf:resource="http://creativecommons.org/ns#Attribution" /> + <cc:permits + rdf:resource="http://creativecommons.org/ns#DerivativeWorks" /> + <cc:requires + rdf:resource="http://creativecommons.org/ns#ShareAlike" /> + </cc:License> + </rdf:RDF> + </metadata> +</svg>
View file
_service:tar_scm:glib-2.76.4.tar.xz/docs/reference/glib/gvariant-integer-array.svg
Added
@@ -0,0 +1,255 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<svg + width="104.43805mm" + height="17.707197mm" + viewBox="0 0 104.43805 17.707197" + version="1.1" + id="svg611" + inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)" + sodipodi:docname="gvariant-integer-array.svg" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + <sodipodi:namedview + id="namedview613" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:showpageshadow="2" + inkscape:pageopacity="0.0" + inkscape:pagecheckerboard="0" + inkscape:deskcolor="#d1d1d1" + inkscape:document-units="mm" + showgrid="false" + inkscape:zoom="1.7817059" + inkscape:cx="42.936379" + inkscape:cy="32.553072" + inkscape:window-width="1920" + inkscape:window-height="1043" + inkscape:window-x="0" + inkscape:window-y="0" + inkscape:window-maximized="1" + inkscape:current-layer="layer1" /> + <defs + id="defs608" /> + <g + inkscape:label="Layer 1" + inkscape:groupmode="layer" + id="layer1" + transform="translate(-65.228319,-153.94883)"> + <rect + style="fill:#ff8080;stroke:#000000;stroke-width:0.412;stroke-dasharray:none" + id="rect455-2" + width="104.02605" + height="13.026045" + x="65.434319" + y="158.42398" /> + <rect + style="fill:#ff8080;stroke:#000000;stroke-width:0.411817" + id="rect455" + width="24.588182" + height="9.852766" + x="67.653252" + y="160.01062" /> + <rect + style="fill:#ff8080;stroke:#000000;stroke-width:0.411817" + id="rect455-1" + width="24.588182" + height="9.852766" + x="92.653252" + y="160.01062" /> + <rect + style="fill:#ff8080;stroke:#000000;stroke-width:0.411817" + id="rect455-9" + width="24.588182" + height="9.852766" + x="117.65325" + y="160.01062" /> + <rect + style="fill:#ff8080;stroke:#000000;stroke-width:0.411817" + id="rect455-4" + width="24.588182" + height="9.852766" + x="142.65324" + y="160.01062" /> + <text + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.35px;line-height:1.25;font-family:'DejaVu Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583" + x="70.389786" + y="167.24849" + id="text248"><tspan + sodipodi:role="line" + id="tspan246" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.35px;font-family:'DejaVu Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono';stroke-width:0.264583" + x="70.389786" + y="167.24849">00 00</tspan></text> + <text + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.35px;line-height:1.25;font-family:'DejaVu Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583" + x="95.389786" + y="167.24849" + id="text248-2"><tspan + sodipodi:role="line" + id="tspan246-3" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.35px;font-family:'DejaVu Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono';stroke-width:0.264583" + x="95.389786" + y="167.24849">01 00</tspan></text> + <text + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.35px;line-height:1.25;font-family:'DejaVu Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583" + x="120.38979" + y="167.24849" + id="text248-7"><tspan + sodipodi:role="line" + id="tspan246-5" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.35px;font-family:'DejaVu Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono';stroke-width:0.264583" + x="120.38979" + y="167.24849">02 00</tspan></text> + <text + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.35px;line-height:1.25;font-family:'DejaVu Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583" + x="145.38979" + y="167.24849" + id="text248-9"><tspan + sodipodi:role="line" + id="tspan246-2" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.35px;font-family:'DejaVu Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono';stroke-width:0.264583" + x="145.38979" + y="167.24849">03 00</tspan></text> + <text + xml:space="preserve" + style="font-style:normal;font-weight:normal;font-size:5.64444px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583" + x="66.003166" + y="158.13806" + id="text369"><tspan + sodipodi:role="line" + id="tspan367" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444px;font-family:'DejaVu Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono';stroke-width:0.264583" + x="66.003166" + y="158.13806">0</tspan></text> + <text + xml:space="preserve" + style="font-style:normal;font-weight:normal;font-size:5.64444px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583" + x="78.100777" + y="158.21799" + id="text369-2"><tspan + sodipodi:role="line" + id="tspan367-8" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444px;font-family:'DejaVu Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono';stroke-width:0.264583" + x="78.100777" + y="158.21799">1</tspan></text> + <text + xml:space="preserve" + style="font-style:normal;font-weight:normal;font-size:5.64444px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583" + x="90.778542" + y="158.21799" + id="text369-9"><tspan + sodipodi:role="line" + id="tspan367-7" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444px;font-family:'DejaVu Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono';stroke-width:0.264583" + x="90.778542" + y="158.21799">2</tspan></text> + <text + xml:space="preserve" + style="font-style:normal;font-weight:normal;font-size:5.64444px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583" + x="103.27165" + y="158.13806" + id="text369-3"><tspan + sodipodi:role="line" + id="tspan367-6" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444px;font-family:'DejaVu Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono';stroke-width:0.264583" + x="103.27165" + y="158.13806">3</tspan></text> + <text + xml:space="preserve" + style="font-style:normal;font-weight:normal;font-size:5.64444px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583" + x="115.74271" + y="158.21799" + id="text369-1"><tspan + sodipodi:role="line" + id="tspan367-2" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444px;font-family:'DejaVu Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono';stroke-width:0.264583" + x="115.74271" + y="158.21799">4</tspan></text> + <text + xml:space="preserve" + style="font-style:normal;font-weight:normal;font-size:5.64444px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583" + x="128.27716" + y="158.13806" + id="text369-7"><tspan + sodipodi:role="line" + id="tspan367-84" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444px;font-family:'DejaVu Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono';stroke-width:0.264583" + x="128.27716" + y="158.13806">5</tspan></text> + <text + xml:space="preserve" + style="font-style:normal;font-weight:normal;font-size:5.64444px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583" + x="140.74821" + y="158.13806" + id="text369-2-5"><tspan + sodipodi:role="line" + id="tspan367-8-0" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444px;font-family:'DejaVu Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono';stroke-width:0.264583" + x="140.74821" + y="158.13806">6</tspan></text> + <text + xml:space="preserve" + style="font-style:normal;font-weight:normal;font-size:5.64444px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583" + x="153.26889" + y="158.21799" + id="text369-9-3"><tspan + sodipodi:role="line" + id="tspan367-7-6" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444px;font-family:'DejaVu Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono';stroke-width:0.264583" + x="153.26889" + y="158.21799">7</tspan></text> + <text + xml:space="preserve" + style="font-style:normal;font-weight:normal;font-size:5.64444px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583" + x="165.49881" + y="158.13806" + id="text369-3-1"><tspan + sodipodi:role="line" + id="tspan367-6-0" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444px;font-family:'DejaVu Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono';stroke-width:0.264583" + x="165.49881" + y="158.13806">8</tspan></text> + </g> + <metadata + id="metadata5852"> + <rdf:RDF> + <cc:License + rdf:about="http://creativecommons.org/licenses/by-sa/4.0/"> + <cc:permits + rdf:resource="http://creativecommons.org/ns#Reproduction" /> + <cc:permits + rdf:resource="http://creativecommons.org/ns#Distribution" /> + <cc:requires + rdf:resource="http://creativecommons.org/ns#Notice" /> + <cc:requires + rdf:resource="http://creativecommons.org/ns#Attribution" /> + <cc:permits + rdf:resource="http://creativecommons.org/ns#DerivativeWorks" /> + <cc:requires + rdf:resource="http://creativecommons.org/ns#ShareAlike" /> + </cc:License> + <cc:Work + rdf:about=""> + <cc:license + rdf:resource="http://creativecommons.org/licenses/by-sa/3.0/" /> + <dc:rights> + <cc:Agent> + <dc:title>Copyright © 2022 Philip Withnall</dc:title> + </cc:Agent> + </dc:rights> + </cc:Work> + </rdf:RDF> + </metadata> +</svg>
View file
_service:tar_scm:glib-2.76.4.tar.xz/docs/reference/glib/gvariant-specification-1.0.rst
Added
@@ -0,0 +1,1465 @@ +.. sectnum:: +.. meta:: + :copyright: Copyright 2007 Allison Karlitskaya + :license: CC-BY-SA-3.0 +.. + This has to be duplicated from above to make it machine-readable by `reuse`: + SPDX-FileCopyrightText: 2007 Allison Karlitskaya + SPDX-License-Identifier: CC-BY-SA-3.0 + +========================== +GVariant Specification 1.0 +========================== + +.. rubric:: Revision History + +Notable changes between versions are listed here. For the full set of changes +and diffs, see the `commit log <https://gitlab.gnome.org/GNOME/glib/-/blob/main/docs/reference/glib/gvariant-specification-1.0.rst>`_. + +**Version 1.0, 2007 and 2022-11-01** + - Convert the original PDF GVariant Specification to version control + - No semantic or formatting changes +**Version 1.0.1, 2022-11-02** + - Formatting improvements + - No semantic changes + +***** +Types +***** + +As per requirement, GVariant must be substantially compatible with the D-Bus message +bus system (as specified in the `D-Bus specification <https://dbus.freedesktop.org/doc/dbus-specification.html>`__). + +To this end, the type system used in GVariant is almost identical to that used by D-Bus. +Some very minimal changes were made, however, in order to provide for a better system +while still remaining highly compatible; specifically, every message that can by sent over +D-Bus can be represented as a GVariant. + +Some baggage has been carried in from D-Bus that would not otherwise have been present +in the type system if it were designed from scratch. The object path and signature types, +for example, are highly D-Bus-specific and would not be present in a general-purpose type +system if it were to be created from scratch. + +Differences from D-Bus +====================== + +In order to increase conceptual clarity some limitations have been lifted, allowing calls +to “never fail” instead of having to check for these special cases. + + * Whereas D-Bus limits the maximum depth of container type nesting, GVariant makes + no such limitations; nesting is supported to arbitrary depths. + * Whereas D-Bus limits the maximum complexity of its messages by imposing a + limitation on the “signature string” to be no more than 255 characters, GVariant + makes no such limitation; type strings of arbitrary length are supported, allowing + for the creation of values with arbitrarily complex types. + * Whereas D-Bus allows dictionary entry types to appear only as the element type of + an array type, GVariant makes no such limitation; dictionary entry types may exist + on their own or as children of any other type constructor. + * Whereas D-Bus requires structure types to contain at least one child type, GVariant + makes no such limitation; the unit type is a perfectly valid type in GVariant. + +Some of the limitations of D-Bus were imposed as security considerations (for example, +to bound the depth of recursion that may result from processing a message from an +untrusted sender). If GVariant is used in ways that are sensitive to these considerations +then programmers should employ checks for these cases upon entry of values into the +program from an untrusted source. + +Additionally, D-Bus has no type constructor for expressing the concept of nullability #f1_. To +this end, the Maybe type constructor (represented by m in type strings) has been added. + +Some of these changes are under consideration for inclusion into D-Bus #f2_. + +.. #f1 A “nullable type” is a type that, in addition to containing its normal range of values, also contains a + special value outside of that range, called ``NULL``, ``Nothing``, ``None`` or similar. In most languages with reference + or pointer types, these types are nullable. Some languages have the ability to have nullable versions of + any type (for example, “``Maybe Int``” in Haskell and “``int? i;``” in C#). +.. #f2 Considerable discussion has been made in face-to-face meetings and some discussion has also occured + on the D-Bus mailing list: http://lists.freedesktop.org/archives/dbus/2007-August/008290.html + +Enumeration of Types +==================== + +The Basic Types +--------------- + +**Boolean** + A boolean is a value which must be True or False. + +**Byte** + A byte is a value, unsigned by convention, which ranges from 0 to 255. + +**Integer Types** + There are 6 integer types other than byte — signed and unsigned versions of 16, 32 + and 64 integers. The signed versions have a range of values consistent with a two's + complement representation. + +**Double Precision Floating Point** + A double precision floating point value is precisely defined by IEEE 754. + +**String** + A string is zero or more bytes. Officially, GVariant is encoding-agnostic but the use + of UTF-8 is expected and encouraged. + +**Object Path** + A D-Bus object path, exactly as described in the + `D-Bus specification <https://dbus.freedesktop.org/doc/dbus-specification.html#message-protocol-marshaling-object-path>`__. + +**Signature** + A D-Bus signature string, exactly as described in the + `D-Bus specification <https://dbus.freedesktop.org/doc/dbus-specification.html#message-protocol-marshaling-signature>`__. As this type + has been preserved solely for compatibility with D-Bus, all of the D-Bus restrictions + on the range of values of this type apply (eg: nesting depth and maximum length + restrictions). + +Container Types +--------------- + +**Variant** + The variant type is a dependent pair of a type (any of the types described in this + chapter, including the variant type itself) and a value of that type. You might use this + type to overcome the restriction that all elements of an array must have the same type. + +**Maybe** + The maybe type constructor provides nullability for any other single type. The non-null + case is distinguished, such that in the event that multiple maybe type constructors + are applied to a type, different levels of null can be detected. + +**Array** + The array type constructor allows the creation of array (or list) types corresponding + to the provided element type. Exactly one element type must be provided and all array + elements in any instance of the array type must have this element type. + +**Structure** + The structure type constructor allows the creation of structure types corresponding + to the provided element types. These “structures” are actually closer to tuples in the + sense that their fields are not named, but “structure” is used because that is what + the D-Bus specification calls them. + + The structure type constructor is the only type constructor that is variadic — any + natural number of types may be given (including zero and one). + +**Dictionary entry** + The dictionary entry type constructor allows the creation of a special sort of structure + which, when used as the element type of an array, implies that the content of the array + is a list of key/value pairs. For compatibility with D-Bus, this binary type constructor + requires a basic type as its first argument (which by convention is seen to be the key) + but any type is acceptable for the second argument (by convention, the value). + + Dictionary entries are as such by convention only; this includes when they are put in + an array to form a “dictionary”. GVariant imposes no restrictions that might normally + be expected of a dictionary (such as key uniqueness). + +Type Strings +============ + +Just as with D-Bus, a concise string representation is used to express types. + +In GVariant, which deals directly with values as first order objects, a type string (by that +name) is a string representing a single type. + +Contrast this with “signature strings” #f3_ in D-Bus, which apply to messages, and contain +zero or more types (corresponding to the arguments of the message). + +.. #f3 Compare with the whence parameter to the ``lseek()`` system call. + +Syntax +------ + +The language of type string is context free. It is also a prefix code, which is a property +that is used by the recursive structure of the language itself. + +Type strings can be described by a non-ambiguous context free grammar. + + * *type* ⇒ *base_type* | *container_type* + * *base_type* ⇒ **b** | **y** | **n** | **q** | **i** | **u** | **x** | **t** | **s** | **o** | **g** + * *container_type* ⇒ **v** | **m** *type* | **a** *type* | **(** *types* **)** | **{** *base_type* *type* **}** + * *types* ⇒ ε | *type* *types* + +Semantics +--------- + +The derivation used to obtain a type string from the given grammar creates an abstract +syntax tree describing the type. The effect of deriving through each right hand side +term containing a terminal is specified below: + +**b** + This derivation corresponds to the boolean type. +**y** + This derivation corresponds to the byte type. +**n** + This derivation corresponds to the signed 16-bit integer type. +**q** + This derivation corresponds to the unsigned 16-bit integer type. +**i** + This derivation corresponds to the signed 32-bit integer type. +**u** + This derivation corresponds to the unsigned 32-bit integer type. +**x** + This derivation corresponds to the signed 64-bit integer type. +**t** + This derivation corresponds to the unsigned 64-bit integer type. +**d** + This derivation corresponds to the double precision floating point number type. +**s** + This derivation corresponds to the string type. +**o** + This derivation corresponds to the object path type. +**g** + This derivation corresponds to the signature type. +**v** + This derivation corresponds to the variant type. +**m** *type* + This derivation corresponds to the maybe type which has a value of ``Nothing`` or ``Just + x`` for some *x* in the range of *type*. +**a** *type* + This derivation corresponds to the array type in which each element has the type *type*. +**(** *types* **)** + This derivation corresponds to the structure type that has the types expanded by + *types*, in order, as its item types. +**{** *base_type* *type* **}** + This derivation corresponds to the dictionary entry type that has *base_type* as its key + type and *type* as its value type. + +******************** +Serialisation Format +******************** + +This chapter describes the serialisation format that is used by GVariant. This serialisation +format is newly developed and described for the first time here. + +Why not D-Bus? +============== + +Since GVariant is largely compatible with D-Bus, it would make sense to use the +serialisation format of D-Bus (plus modifications where appropriate) as the serialisation +format for GVariant. + +To do so, however, would conflict with a number of requirements that were established +for GVariant. + +Most fundamentally, the requirements would be violated. D-Bus messages are encoded in such +a way that in order to fetch the 100th item out of an array you first have to iterate over +the first 99 items to discover where the 100th item lies. A side effect of this iteration +would be a violation of the requirements. + +Additionally, using the D-Bus serialisation format with an API like that mandated by +the requirements would likely imply a violation of the requirements due to the fact that subparts +of D-Bus messages can change meaning when subjected to different starting alignments. +This is discussed in more detail in `Simple Containment`_. + +Notation +======== + +Throughout this section a number of examples will be provided using a common notation +for types and values. + +The notation used for types is exactly the type strings described in `Types`_. + +The notation used for values will be familiar to users of either Python or Haskell. Arrays +(lists) are represented with square brackets and structures (tuples) with parentheses. +Commas separate elements. Strings are single-quoted. Numbers prefixed with ``0x`` are +taken to be hexadecimal. + +The constants ``True`` and ``False`` represent the boolean constants. The nulary data +constructor of the maybe type is denoted ``Nothing`` and the unary one ``Just``. + +Concepts +======== + +GVariant value serialisation is a total and injective function from values to pairs of +byte sequences and type strings. Serialisation is deterministic in that there is only one +acceptable “normal form” that results from serialising a given value. Serialisation is non- +surjective: non-normal forms exist. + +The byte sequence produced by serialisation is useless without also having the type +string. Put another way, deserialising a byte sequence requires knowing this type. + +Before discussing the specifics of serialisation, there are some concepts that are +pervasive in the design of the format that should be understood. + +Byte Sequence +------------- + +A byte sequence is defined as a sequence of bytes which has a known length. In all cases, +in GVariant, knowing the length is essential to being able to successfully deserialise +a value. + +Byte Boundaries +--------------- + +Starting and ending offsets used in GVariant refer not to byte positions, but to byte +boundaries. For the same reason that it's possible to have *n + 1* prefixes of a string of +length *n*, there are *n + 1* byte boundaries in a byte sequence of size *n*. + +.. figure:: gvariant-byte-boundaries.svg + :align: center + :name: byte-boundaries + + Byte boundaries + +When speaking of the start position of a byte sequence, the index of the starting +boundary happens to correspond to the index of the first byte. When speaking of the +end position, however, the index of the ending boundary will be the index of the last +byte, plus 1. This paradigm is very commonly used and allows for specifying zero-length +byte sequences. + +Simple Containment +------------------ + +A number of container types exist with the ability to have child values. In all cases, the +serialised byte sequence of each child value of the container will appear as a contiguous +sub-sequence of the serialised byte sequence of that container — in exactly the same +form as it would appear if it were on its own. The child byte sequences will appear in +order of their position in the container. + +It is the responsibility of the container to be able to determine the start and end (or +equivalently, length) of each child element. + +This property permits a container to be deconstructed into child values simply by +referencing a subsequence of the byte sequence of the container as the value of the +child which is an effective way of satisfying the requirements. + +This property is not the case for the D-Bus serialisation format. In many cases (for +example, arrays) the encoding of a child value of a D-Bus message will change depending +on the context in which that value appears. As an example: in the case of an array of +doubles, should the value immediately preceding the array end on an offset that is an +even multiple of 8 then the array will contain 4 padding bytes that it would not contain +in the event that the end offset of the preceding value were shifted 4 bytes in either +direction. + +Alignment +--------- + +In order to satisfy the requirement, we must provide programmers with a pointer that they +can comfortably use. On many machines, programmers cannot directly dereference +unaligned values, and even on machines where they can, there is often a performance +hit. + +For this reason, all types in the serialisation format have an alignment associated with +them. For strings or single bytes, this alignment is simply 1, but for 32-bit integers (for +example) the alignment is 4. The alignment is a property of a type — all instances of +a type have the same alignment. + +All aligned values must start in memory at an address that is an integer multiple of +their alignment. + +The alignment of a container type is equal to the largest alignment of any potential +child of that container. This means that, even if an array of 32-bit integers is empty, it +still must be aligned to the nearest multiple of 4 bytes. It also means that the variant +type (described below) has an alignment of 8 (since it could potentially contain a value +of any other type and the maximum alignment is 8). + +Fixed Size +---------- + +To avoid a lot of framing overhead, it is possible to take advantage of the fact that, for +certain types, all instances will have the same size. In this case, the type is said to be a +fixed-sized type, and all of its values are said to be fixed-sized values. Examples are a +single integer and a tuple of an integer and a floating point number. Counterexamples +are a string and an array of integers. + +If a type has a fixed size then this fixed size must be an integer multiple of the alignment +of the type. A type never has a fixed size of zero. + +If a container type always holds a fixed number of fixed-size items (as in the case of +some structures or dictionary entries) then this container type will also be fixed-sized. + +Framing Offsets +--------------- + +If a container contains non-fixed-size child elements, it is the responsibility of the +container to be able to determine their sizes. This is done using framing offsets. + +A framing offset is an integer of some predetermined size. The size is always a power +of 2. The size is determined from the overall size of the container byte sequence. It is +chosen to be just large enough to reference each of the byte boundaries in the container. + +As examples, a container of size 0 would have framing offsets of size 0 (since no bits +are required to represent no choice). A container of sizes 1 through 255 would have +framing offsets of size 1 (since 256 choices can be represented with a single byte). A +container of sizes 256 through 65535 would have framing offsets of size 2. A container +of size 65536 would have framing offsets of size 4. + +There is no theoretical upper limit in how large a framing offset can be. This fact (along +with the absence of other limitations in the serialisation format) allows for values of +arbitrary size. + +When serialising, the proper framing offset size must be determined by “trial and error” +— checking each size to determine if it will work. It is possible, since the size of the +offsets is included in the size of the container, that having larger offsets might bump +the size of the container up into the next category, which would then require larger +offsets. Such containers, however, would not be considered to be in “normal form”. The +smallest possible offset size must be used if the serialised data is to be in normal form. + +Framing offsets always appear at the end of containers and are unaligned. They are +always stored in little-endian byte order. + +Endianness +---------- + +Although the framing offsets of serialised data are always stored in little-endian byte +order, the data visible to the user (via the interface mandated by the requirements) is +allowed to be in either big or little-endian byte order. This is referred to as the “encoding +byte order”. When transmitting messages, this byte order should be specified if not +explicitly agreed upon. + +The encoding byte order affects the representation of only 7 types of values: those of +the 6 (16, 32 and 64-bit, signed and unsigned) integer types and those of the double +precision floating point type. Conversion between different encoding byte orders is a +simple operation that can usually be performed in-place (but see `Notes on Byteswapping`_ for an +exception). + +Serialisation of Base Types +=========================== + +Base types are handled as follows: + +Booleans +-------- + +A boolean has a fixed size of 1 and an alignment of 1. It has a value of 1 for True or +0 for False. + +Bytes +----- + +A byte has a fixed size of 1 and an alignment of 1. It may have any valid byte value. By +convention, bytes are unsigned. + +Integers +-------- + +There are 16, 32 and 64-bit signed and unsigned integers. Each integer type is fixed- +sized (to its natural size). Each integer type has alignment equal to its fixed size. +Integers are stored in the encoding byte order. Signed integers are represented in two's +complement. + +Double Precision Floating Point +------------------------------- + +Double precision floating point numbers have an alignment and a fixed-size of 8. +Doubles are stored in the encoding byte order. + +Strings +------- + +Including object paths and signature strings, strings are not fixed-sized and have an +alignment of 1. The size of any given serialised string is equal to the length of the string, +plus 1, and the final serialised byte is a nul (0) terminator. The character set encoding +of the string is not specified, but no nul byte is allowed to appear within the content +of the string. + +Serialisation of Container Types +================================ + +Containers are handled as follows: + +Variants +-------- + +Variants are serialised by storing the serialised data of the child, plus a zero byte, plus +the type string of the child. + +The zero byte is required because, although type strings are a prefix code, they are not +a suffix code. In the absence of this separator, consider the case of a variant serialised +as two bytes — “ay”. Is this a single byte, ``'a'``, or an empty array of bytes? + +Maybes +------ + +Maybes are encoded differently depending on if their element type is fixed-sized or not. + +The alignment of a maybe type is always equal to the alignment of its element type. + +Maybe of a Fixed-Size Element +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +For the ``Nothing`` case, the serialised data is the empty byte sequence. + +For the ``Just`` case, the serialised data is exactly equal to the serialised data of the child. +This is always distinguishable from the ``Nothing`` case because all fixed-sized values +have a non-zero size. + +Maybe of a Non-Fixed-Size Element +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +For the ``Nothing`` case, the serialised data is, again, the empty byte sequence. + +For the ``Just`` case, the serialised form is the serialised data of the child element, +followed by a single zero byte. This extra byte ensures that the ``Just`` case is +distinguishable from the ``Nothing`` case even in the event that the child value has a +size of zero. + +Arrays +------ + +Arrays are said to be fixed width arrays or variable width arrays based on if their +element type is a fixed-sized type or not. The encoding of these two cases is very +different. + +The alignment of an array type is always equal to the alignment of its element type. + +Fixed Width Arrays +^^^^^^^^^^^^^^^^^^ + +In this case, the serialised form of each array element is packed sequentially, with no +extra padding or framing, to obtain the array. Since all fixed-sized values have a size +that is a multiple of their alignment requirement, and since all elements in the array +will have the same alignment requirements, all elements are automatically aligned. + +.. figure:: gvariant-integer-array.svg + :align: center + :name: integer-array + + An array of 16-bit integers + +The length of the array can be determined by taking the size of the array and dividing +by the fixed element size. This will always work since all fixed-size values have a non- +zero size. + +Variable Width Arrays +^^^^^^^^^^^^^^^^^^^^^ + +In this case, the serialised form of each array element is again packed sequentially. +Unlike the fixed-width case, though, padding bytes may need to be added between the +elements for alignment purposes. These padding bytes must be zeros. + +After all of the elements have been added, a framing offset is appended for each +element, in order. The framing offset specifies the end boundary of that element. + +.. figure:: gvariant-string-array.svg + :align: center + :name: string-array + + An array of strings + +The size of each framing offset is a function of the serialised size of the array and the +final framing offset, by identifying the end boundary of the final element in the array +also identifies the start boundary of the framing offsets. Since there is one framing +offset for each element in the array, we can easily determine the length of the array. + +.. math:: + length = (size - last\_offset) / offset\_size + +To find the start of any element, you simply take the end boundary of the previous +element and round it up to the nearest integer multiple of the array (and therefore +element) alignment. The start of the first element is the start of the array. + +Since determining the length of the array relies on our ability to count the number of +framing offsets and since the number of framing offsets is determined from how much +space they take up, zero byte framing offsets are not permitted in arrays, even in the +case where all other serialised data has a size of zero. This special exception avoids +having to divide zero by zero and wonder what the answer is. + +Structures +---------- + +As with arrays, structures are serialised by storing each child item, in sequence, +properly aligned with padding bytes, which must be zero. + +After all of the items have been added, a framing offset is appended, in reverse order, +for each non-fixed-sized item that is not the last item in the structure. The framing offset +specifies the end boundary of that element. + +The framing offsets are stored in reverse order to allow iterator-based interfaces to +begin iterating over the items in the structure without first measuring the number of +items implied by the type string (an operation which requires time linear to the size +of the string). + +.. figure:: gvariant-integer-and-string-structure.svg + :align: center + :name: integer-and-string-structure + + A structure containing 16-bit integers and strings + +The reason that no framing offset is stored for the last item in the structure is because +its end boundary can be determined by subtracting the size of the framing offsets from +the size of the structure. The number of framing offsets present in any instance of a +structure of a given type can be determined entirely from the type (following the rule +given above). + +The reason that no framing offset is stored for fixed-sized items is that their end +boundaries can always be found by adding the fixed size to the start boundary. + +To find the start boundary of any item in the structure, simply start from the end +boundary of the nearest preceding non-fixed-size item (or from 0 in the case of no +preceding non-fixed-sized items). From there, round up for alignment and add the fixed +size for each intermediate item. Finally, round up to the alignment of the desired item. + +For random access, it seems like this process can take a time linear to the number of +elements in the structure, but it can actually be performed in a very small constant +time. See `Calculating Structure Item Addresses`_. + +If all of the items contained in a structure are fixed-size then the structure itself is fixed- +size. Considerations have to be made to satisfy the constraints that are placed on the +value of this fixed size. + +First, the fixed size must be non-zero. This case would only occur for structures of the +unit type or structures containing only such structures (recursively). This problem is +solved by arbitrary declaring that the serialised encoding of an instance of the unit type +is a single zero byte (size 1). + +Second, the fixed sized must be a multiple of the alignment of the structure. This is +accomplished by adding zero-filled padding bytes to the end of any fixed-width structure +until this property becomes true. These bytes will never result in confusion with respect +to locating framing offsets or the end of a variable-sized child because, by definition, +neither of these things occur inside fixed-sized structures. + +The figure above depicts a structure of type ``(nsns)`` and value ``257, 'xx', 514, ''``. One +framing offset exists for the one non-fixed-sized item that is not the final item (namely, +the string ``'xx'``). The process of “rounding up” to find the start of the second integer +is indicated. + +Dictionary Entries +------------------ + +Dictionary entries are treated as structures with exactly two items — first the key, then +the value. In the case that the key is fixed-sized, there will be no framing offsets, and +in the case the key is non-fixed-size there will be exactly one. As the value is treated as +the last item in the structure, it will never have a framing offset. + +Examples +======== + +This section contains some clarifying examples to demonstrate the serialisation format. +All examples are in little endian byte order. + +The example data is given 16 bytes per line, with two characters representing the +value of each byte. For clarity, a number of different notations are used for byte values +depending on purpose. + + * ``'A`` shows that a byte has the ASCII value of ``A`` (65). + * ``sp`` shows that a byte is an ASCII space character (32). + * ``\0`` shows that a byte is a zero byte used to mark the end of a string. + * ``--`` shows that the byte is a zero-filled padding byte used as part of a structure or + dictionary entry. + * ``##`` shows that the byte is a zero-filled padding byte used as part of an array. + * ``@@`` shows that the byte is the zero-filled padding byte at the end of a ``Just`` value. + * any two hexadecimal digits show that a byte has that value. + +Each example specifies a type, a sequence of bytes, and what value this byte sequence +represents when deserialised with the given type. + +**String Example** + With type ``'s'``:: + + 'h 'e 'l 'l 'o sp 'w 'o 'r 'l 'd \0 + + has a value of ``'hello world'``. + +**Maybe String** + With type ``'ms'``:: + + 'h 'e 'l 'l 'o sp 'w 'o 'r 'l 'd \0 @@ + + has a value of ``Just 'hello world'``. + +**Array of Booleans Example** + With type ``'ab'``:: + + 01 00 00 01 01 + + has a value of ``True, False, False, True, True``. + +**Structure Example** + With type ``'(si)'``:: + + 'f 'o 'o \0 ff ff ff ff 04 + + has a value of ``('foo', -1)``. + +**Structure Array Example** + With type ``'a(si)'``:: + + 'h 'i \0 -- fe ff ff ff 03 ## ## ## 'b 'y 'e \0 + ff ff ff ff 04 09 + + has a value of ``('hi', -2), ('bye', -1)``. + +**String Array Example** + With type ``'as'``:: + + 'i \0 'c 'a 'n \0 'h 'a 's \0 's 't 'r 'i 'n 'g + 's '? \0 02 06 0a 13 + + has a value of ``'i', 'can', 'has', 'strings?'``. + +**Nested Structure Example** + With type ``'((ys)as)'``:: + + 'i 'c 'a 'n \0 'h 'a 's \0 's 't 'r 'i 'n 'g 's + '? \0 04 05 + + has a value of ``(('i', 'can'), 'has', 'strings?')``. + +**Simple Structure Example** + With type ``'(yy)'``:: + + 70 80 + + has a value of ``(0x70, 0x80)``. + +**Padded Structure Example 1** + With type ``'(iy)'``:: + + 60 00 00 00 70 -- -- -- + + has a value of ``(96, 0x70)``. + +**Padded Structure Example 2** + With type ``'(yi)'``:: + + 70 -- -- -- 60 00 00 00 + + has a value of ``(0x70, 96)``. + +**Array of Structures Example** + With type ``'a(iy)'``:: + + 60 00 00 00 70 -- -- -- 88 02 00 00 f7 -- -- -- + + has a value of ``(96, 0x70), (648, 0xf7)``. + +**Array of Bytes Example** + With type ``'ay'``:: + + 04 05 06 07 + + has a value of ``0x04, 0x05, 0x06, 0x07``. + +**Array of Integers Example** + With type ``'ai'``:: + + 04 00 00 00 02 01 00 00 + + has a value of ``4, 258``. + +**Dictionary Entry Example** + With type ``'{si}'``:: + + 'a sp 'k 'e 'y \0 -- -- 02 02 00 00 06 + + has a value of ``{'a key', 514}``. + +Non-Normal Serialised Data +========================== + +Nominally, deserialisation is the inverse operation of serialisation. This would imply that +deserialisation should be a bijective partial function. + +If deserialisation is a partial function, something must be done about the cases where the +serialised data is not in normal form. Normally this would result in an error being raised. + +An Argument Against Errors +-------------------------- + +The requirements forbids us from scanning the entirety of the serialised byte sequence +at load time; we can not check for normality and issue errors at this time. This leaves +any errors that might occur to be raised as exceptions as the values are accessed. + +Faced with the C language's poor (practically non-existent) support for exceptions and +with the idea that any access to a simple data value might possibly fail, this solution +also becomes rapidly untenable. + +The only reasonable solution to deal with errors, given our constraints, is to define them +out of existence. Accepting serialised data in non-normal form makes deserialisation +a surjective (but non-injective) total function. All byte sequences deserialise to some +valid value. + +For security purposes, what is done with the non-normal values is precisely specified. +One can easily imagine a situation where a content filter is acting on the contents of +messages, regulating access to a security-sensitive component. If one could create a +non-normal form of a message that is interpreted differently by the deserialiser in the +filter and the deserialiser in the security-sensitive component, one could “sneak by” +the filter. + +Default Values +-------------- + +When errors are encountered during deserialisation, lacking the ability to raise an +exception, we are forced into a situation where we must return a valid value of the +expected type. For this reasons, a “default value” is defined for each type. This value +will often be the result of an error encountered during deserialisation. + +One might argue that a reduction in robustness comes from ignoring errors and +returning arbitrary values to the user. It should be pointed out, though, that for most +types of serialised data, a random byte error is much more likely to cause the data to +remain in normal form, but with a different value. We cannot capture these cases and +these cases might result in any possible value of a given type being returned to the user. +We are forced to resign ourselves to the fact that the best we can do, in the presence +of corruption, is to ensure that the user receives some value of the correct type. + +The default value for each type is: + +**Booleans** + The default boolean value is False. +**Bytes** + The default byte value is nul. +**Integers** + The default value for any size of integer (signed or unsigned) is zero. +**Floats** + The default value for a double precision floating point number is positive zero. +**Strings** + The default value for a string is the empty string. +**Object Paths** + The default value for an object path is ``'/'``. +**Signatures** + The default value for a signature is the nulary signature (ie: the empty string). +**Arrays** + The default value for an array of any type is the empty array of that type. +**Maybes** + The default value for a maybe of any type is the ``Nothing`` of that type. +**Structures** + The default value for a structure type is the structure instance that has for the values + of each item, the default value for the type of that item. +**Dictionary Entries** + Similarly to structures, the default value for a dictionary entry type is the dictionary + entry instance that has its key and value equal to their respective defaults. +**Variants** + The default variant value is the variant holding a child with the unit type. + +Handling Non-Normal Serialised Data +----------------------------------- + +On a normally functioning system, non-normal values will not be normally encountered, +so once a problem has been detected, it is acceptable if performance is arbitrarily bad. +For security reasons, however, untrusted data must always be checked for normality as +it is being accessed. Due to the frequency of these checks, they must be fast. + +Nearly all rules contained in this section for deserialisation of non-normal data keep this +requirement in mind. Specifically, all rules can be decided in a small constant time (with +a couple of very small exceptions). It would not be permissible, for example, to require +that an array with an inconsistency anywhere among its framing offsets be treated as +an empty array since this would require scanning over all of offsets (linear in the size +of the array) just to determine the array size. + +There are only a small number of different sorts of abnormalities that can occur in a +serialised byte sequence. Each of them, along with what to do, is addressed in this +section. + +The following list is meant to be a definitive list. If a serialised byte sequence has none +of these problems then it is in normal form. If a serialised byte sequence has any of +these problems then it is not in normal form. + +**Wrong Size for Fixed Size Value** + In the event that the user attempts deserialisation using the type of a fixed-width type + and a byte sequence of the wrong length, the default value for that type will be used. + +**Non-zero Padding Bytes** + This abnormality occurs when any padding bytes are non-zero. This applies for arrays, + maybes, structures and dictionary entries. This abnormality is never checked for — + child values are deserialised from their containers as if the padding was zero-filled. + +**Boolean Out of Range** + In the event that a boolean contains a number other than zero or one it is treated as + if it were true. This is for purpose of consistency with the user accessing an array + of booleans directly in C. If, for example, one of the bytes in the array contained the + number 5, this would evaluate to True in C. + +**Possibly Unterminated String** + If the final byte of the serialised form of a string is not the zero byte then the value + of the string is taken to be the empty string. + +**String with Embedded Nul** + If a string has a nul character as its final byte, but also contains another nul character + before this final terminator, the value of the string is taken to be the part of the string + that precedes the embedded nul. This means that obtaining a C pointer to a string + is still a constant time operation. + +**Invalid Object Path** + If the serialised form of an object path is not a valid object path followed by a zero + byte then the default value is used. + +**Invalid Signature** + If the serialised form of a signature string is not a valid D-Bus signature followed by + a zero byte then the default value is used. + +**Wrong Size for Fixed Size Maybe** + In the event that a maybe instance with a fixed element size is not exactly equal to + the size of that element, then the value is taken to be ``Nothing``. + +**Wrong Size for Fixed Width Array** + In the event that the serialised size of a fixed-width array is not an integer multiple + of the fixed element size, the value is taken to be the empty array. + +**Start or End Boundary of a Child Falls Outside the Container** + If the framing offsets (or calculations based on them) indicate that any part of the + byte sequence of a child value would fall outside of the byte sequence of the parent + then the child is given the default value for its type. + +**End Boundary Precedes Start Boundary** + If the framing offsets (or calculations based on them) indicate that the end boundary + of the byte sequence of a child value precedes its start boundary then the child is + given the default value for its type. + + The end boundary of a child preceding the start boundary may cause the byte + sequences of two or more children to overlap. This error is ignored for the + other children. These children are given values that correspond to the normal + deserialisation process performed on these byte sequences with the type of the child. + + If children in a container are out of sequence then it is the case that this abnormality + is present. No other specific check is performed for children out of sequence. + +**Child Values Overlapping Framing Offsets** + If the byte sequence of a child value overlaps the framing offsets of the container it + resides within then this error is ignored. The child is given a value that corresponds + to the normal deserialisation process performed on this byte sequence (including the + bytes from the framing offsets) with the type of the child. + +**Non-Sense Length for Non-Fixed Width Array** + In the event that the final framing offset of a non-fixed-width array points to a + boundary outside of the byte sequence of the array, or indicates a non-integral number + of framing offsets is present in the array, the value is taken to be the empty array. + +**Insufficient Space for Structure Framing Offsets** + In the event that a serialised structure contains an insufficient space to store the + requisite number of framing offsets, the error is silently ignored as long as the item + that is being accessed has its required framing offsets in place. An attempt to access + an item that requires an offset beyond those available will result in the default value. + +Examples +-------- + +This section contains some clarifying examples to demonstrate the proper +deserialisation of non-normal data. + +The byte sequences are presented in the same form as for the normal-form examples. +A brief description is provided for why a value deserialises to the given value. + +**Wrong Size for Fixed Size Value** + With type ``'i'``:: + + 07 33 90 + + has a value of ``0``. + + Since any value with a type of ``'i'`` should have a serialised size of 4, and since only + 3 bytes are given, the default value of zero is used instead. + +**Non-zero Padding Bytes** + With type ``'(yi)'``:: + + 55 66 77 88 02 01 00 00 + + has a value of ``(0x55, 258)``. + + Non-zero padding bytes (``66 77 88``) are simply ignored. + +**Boolean Out of Range** + With type ``'ab'``:: + + 01 00 03 04 00 01 ff 80 00 + + has a value of ``True, False, True, True, False, True, True, True, False``. + + Any non-zero booleans are treated as ``True``. + +**Unterminated String** + With type ``'as'``:: + + 'h 'e 'l 'l 'o sp 'w 'o 'r 'l 'd \0 0b 0c + + has a value of ``'', ''`` (two empty strings). + + The second string deserialises normally as a single nul character, but the first + string does not contain a nul character. Regardless of the fact that a nul character + immediately follows it, the first string is replaced with the empty string (the default + value for strings). + +**String with Embedded Nul** + With type ``'s'``:: + + 'f 'o 'o \0 'b 'a 'r \0 + + has a value of ``'foo'``. + +**String with Embedded Nul but None at End** + With type ``'s'``:: + + 'f 'o 'o \0 'b 'a 'r + + has a value of ``''`` (the empty string). + + The last byte in the string is always checked to determine if there is a nul and, if not, + the empty string is used as the value. This includes the case where a nul is present + elsewhere in the string. + +**Wrong Size for Fixed-Size Maybe** + With type ``'mi'``:: + + 33 44 55 66 77 88 + + has a value of ``Nothing``. + + The only possible way for a value with type ``'mi'`` to be ``Just`` is for its serialised form + to be exactly 4 bytes. + +**Wrong Size for Fixed-Width Array** + With type ``'a(yy)'``:: + + 03 04 05 06 07 + + has a value of ````. + + With each array element as a pair of bytes, the serialised size of the array should be + a multiple of two. Since this is not the case, the value of the array is the empty array. + +**Start or End Boundary of Child Falls Outside the Container** + With type ``'(as)'``:: + + 'f 'o 'o \0 'b 'a 'r \0 'b 'a 'z \0 04 10 0c + + has a value of ``'foo', '', ''``. + + No problems are encountered while unpacking the first element in the array (which + is marked as falling between byte boundaries 0 and 4). When unpacking the 2nd + element, its end offset (16) is outside of the bounds of the array. This offset (16) is + also the start of the 3rd array element. As a result, both of these elements are given + their default value (the empty string). + +**End Boundary Precedes Start Boundary** + With type ``'(as)'``:: + + 'f 'o 'o \0 'b 'a 'r \0 'b 'a 'z \0 04 00 0c + + has a value of ``'foo', '', 'foo'``. + + Again, no problems are encountered while unpacking the first element in the array. + When unpacking the second element it is noticed that the end boundary precedes the + start. Since this is impossible, the default value of ``''`` is used instead. Unpacking the + final element (from 0 to 12) occurs without problem. The final element overlaps the + first element, however, and when assessing its value, the embedded nul character + causes it to be cut off at ``'foo'``. + +**Insufficient Space for Structure Framing Offsets** + With type ``'(ayayayayay)'``:: + + 03 02 01 + + has a value of ``(3, 2, 1, , )``. + + Since this is not a fixed-size value, the fact that it has an impossible size does not cause + it to receive its default value (ie: there is no concept of “minimum-size”). Unpacking + the first three items in the structure occurs without a problem (demonstrating that + the content of a value can overlap the framing offsets). Attempting to unpack the last + two items fails, however, since the required framing offsets simply do not exist. The + default values are used instead. + +*********************** +Implementing the Format +*********************** + +This chapter contains information about the serialisation format that is not part of its +specification. + +This information discusses issues that will arise during implementation of the serialisation +format. + +An unfortunate observation is made about the safety of byteswapping operations and a +method is given (along with proof of correctness) that random accesses to the contents of +a structure can be made in constant time, despite the fact that framing offset are omitted +for fixed-sized values. + +Notes on Byteswapping +===================== + +Implementors may wish to perform in-place byteswapping of serialised GVariant data. +There are a couple of things to consider in this case. + +The primary concern arises from the fact that if non-normal serialised data is present +then byteswapping may not be possible. + +With a type string of ``(ssn)`` consider the following non-normal serialised data in little- +endian byte order:: + + 78 00 00 02 + +The first string has a length of 2 (including the nul terminator) and a value of ``'x'``. The +second string is given its default value of ``''`` as a result of its end offset of 0 preceding +its start offset of 2. Finally, the 16-bit integer, with a start offset of 0 (thus overlapping +the first string) has a value of ``0x78``. The value of the entire structure is ``('x', '', 120)``. + +To change this serialised data to be in big-endian byte order requires the swapping of +the bytes of the 16-bit value. To do so, however, would also modify the value of the string +which these bytes overlap. In this case (and in general) there is no way to avoid this +problem. + +Because of this problem, any implementation wishing to perform in-place byteswapping +of serialised data must first ensure that the data is in normal form. + +There are a couple of cases where this requirement for normal form does not exist. In +the case of any fixed-sized value or variable sized array, no framing offsets are present. +This effectively eliminates the possibility of overlapping data and means that this cases +can be byteswapped in-place without first checking for normality. + +Through a fortunate alignment of circumstances, these types (together with strings, +which need not be byteswapped at all) are exactly the sorts of data that an +implementation may wish to make available to the user via a pointer. As a result it is +easy to imagine that an implementation may end up not requiring the ability to in-place +byteswap serialised data except in cases where it is always safe. + +Calculating Structure Item Addresses +==================================== + +In the C language, structures exist in much the same way as they exist in the serialisation +format. Each item in the structure follows the one preceding it as closely as possible, +subject to alignment constraints. + +No matter what is done, it is impossible to determine the address of an item in a structure +in C in a constant amount of time. The sizes and alignments of the items preceding it +each need to be considered — a process which can not occur in less than linear time. +The algorithm for doing this is to start at the starting address of the structure and then +for each preceding item in the structure, round up to its alignment requirement and add +its size. Finally, round up to the alignment requirement of the item to be accessed. + +This process can be described with a simple algebra containing two types of operations: + + * :math:`(+c)`: add to a natural number, some constant, :math:`c`. + * :math:`(↑c)`: “align” (round up) a natural number up to the nearest multiple of some constant + power of two, :math:`2^c`. + +Assume that the compiler aligns integer values to their size. To find the address of a 32- +bit integer following a 16-bit integer following an array of 3 64-bit integers, for example, +the following computation must be performed, given the address of the start of the +structure, :math:`s`: + +.. math:: + ((↑3);\ (+24);\ (↑1);\ (+2);\ (↑2))\ s + +Of course, no modern C compiler saves this computation to be performed at each access. +Instead, the compiler performs the computation at the time of the structure definition +and builds a table containing the starting offset and size of each item in the structure. +Because every item in the structure is of a fixed size and because the start address of +the structure is always appropriately aligned, the address of an item in a structure can +always be specified as a constant relative to the address of the start of that structure. + +For our example: + +.. math:: + (+28)\ s + +Admitting non-fixed-sized items to structures very obviously prevents the starting offset +of items following any non-fixed-sized item from being a constant relative to the start +of the structure. The start address of any item will clearly depend on the end address +of the non-fixed-sized item that most immediately precedes it. Worse than this though, +due to the fact that this end address has no particular alignment, the starting offset of +each item cannot be expressed as a constant offset, even to the end of the non-fixed- +sized item preceding it. + +Without discovering another method to build a table, the address computation would +have to be performed, in full, at each access – in linear time. Fortunately, another method +exists, permitting constant-time access to structure members. It is possible to build a +table with each row containing four integers such that this table permits calculating the +start address of any structure item to be performed in only four operations: + +.. math:: + ((+a);\ (↑b);\ (+c))\ offsetsi + +Where :math:`offsets` is the array of framing offsets for the structure and :math:`i`, :math:`a`, :math:`b` and :math:`c` are the +four integers from the table. By definition, :math:`offsets{-1} = 0`. + +Performing the Reduction +------------------------ + +Essentially, we are interested in a process by which we can reduce any length of +sequence of constant adding and alignment operations to a sequence of length 3, with +the form shown above. We can then perform this small constant number of operations +at each access instead of the full computation. + +This reduction process occurs according to the following reduction rules: + +**Addition rule** + :math:`(+a);\ (+b) ⇒ (+(a + b))` + +**Greater alignment rule** + :math:`(↑a);\ (+b);\ (↑c) ⇒ (+(b ↑ a));\ (↑c)`, where :math:`c ≥ a` + +**Lesser alignment rule** + :math:`(↑a);\ (+b);\ (↑c) ⇒ (↑a);\ (+(b ↑ c))`, where :math:`c ≤ a` + +We can prove that, using these rules, any sequence of operations can be reduced to +have no more than one alignment operation. If there exist two alignment operations in +the sequence, one of these cases must be true: + + * two alignment operations separated by exactly one addition + * two adjacent alignment operations + * two alignment operations separated by more than one addition + +In the case that there is exactly one addition separating our two alignment operations +then either the greater or the lesser alignment rule may be immediately applied to +reduce the number of alignment operations by one. + +In the case that there are more than one additions, they can be merged down to a single +addition by application of the addition rule before applying one of the alignment rules. +In the case of two adjacent alignment operations, a :math:`(+0)` operation can be introduced +between then before applying one of the alignment rules. + +Since we can reduce any sequence of operations to a sequence containing only one +alignment operation, we can further reduce it to the form :math:`(+a);\ (↑b);\ (+c)` by using +the addition rule to merge all of the additions that occur before and after this single +alignment operation. + +Computing the Table +------------------- + +Based on the reduction rules above, an efficient (but still linear time) algorithm for +computing the entire table at once can be developed. + +At all times, the “state so far” is kept as the four variables: :math:`i`, :math:`a`, :math:`b` and :math:`c` such that +getting to the current location is possible by computing :math:`((+a);\ (↑b);\ (+c))` relative to +the :math:`offseti`. :math:`i` is kept equal to the index of the framing offset which specifies the end of +the most recently encountered non-fixed-sized item in the structure (or :math:`-1` in the case +that no such item has been encountered). :math:`a`, :math:`b`, :math:`c` start at 0. + +Three merge rules are defined to allow any additional operation to be appended to this +sequence without changing the size of the form of the sequence; the merge rules effect +only the integer values of :math:`a`, :math:`b` and :math:`c`. + + 1. appending an alignment :math:`d` less than or equal to the current alignment: :math:`(a, b, c) := (a, b, c ↑ d)` + as a direct result of the lesser alignment rule application :math:`(+a);\ (↑b);\ (+c);\ (↑d) ⇒ (+a);\ (↑b) (+c ↑ d)`. + 2. appending an alignment :math:`d` greater than the current alignment: :math:`(a, b, c) := (a + (c ↑b), d, 0)` + by the greater alignment rule application :math:`(+a);\ (↑b);\ (+c);\ (↑d) ⇒ (+a);\ (+c ↑ b);\ (↑d)`, + addition rule application to :math:`(+a + (c ↑ b));\ (↑d)` and harmless appending + of :math:`(+0)` to give :math:`(+a + (c ↑ b));\ (↑d);\ (+0)`. + 3. appending an addition :math:`e`: :math:`(a, b, c) := (a, b, c + e)` by obvious use of the addition rule + :math:`(+a);\ (↑b);\ (+c);\ (+e) ⇒ (+a);\ (↑b);\ (+(c + e))`. + +Each time a non-fixed-sized item is encountered, :math:`i` is incremented and :math:`a`, :math:`b`, :math:`c` are set +back to zero. + +The algorithm is implemented by the following Python function which takes a list of +(alignment, fixed size) pairs as input, representing the structure items. Its output is the +table, given as an array of 4-tuples. + +.. code-block:: python + + def generate_table(items): + (i, a, b, c) = (-1, 0, 0, 0) + table = + + for (d, e) in items: + if d <= b: + (a, b, c) = (a, b, align(c, d)) # merge rule #1 + else: + (a, b, c) = (a + align(c, b), d, 0) # merge rule #2 + + table.append ((i, a, b, c)) + + if e == -1: # item is not fixed-sized + (i, a, b, c) = (i + 1, 0, 0, 0) + else: + (a, b, c) = (a, b, c + e) # merge rule #3 + + return table + +It is assumed that ``align(a, b)`` computes :math:`(a ↑ b)`. + +Further Reduction +----------------- + +The reductions described above are non-confluent. An equivalence on the final +sequence of operations exists. Specifically, if :math:`d` is a multiple of :math:`2^b`, then: + +.. math:: + (+a);\ (↑b);\ (+(c + d)) = (+(a + d));\ (↑b); (+c) + +This is because, being a multiple of :math:`2^b`, :math:`d` can “pass through” the alignment operation +without change. + +Consider, for example, the following: + +.. math:: + (n + 16) ↑ 3 + +It is clear that this is equivalent to + +.. math:: + (n ↑ 3) + 16 + +since there are no low order bits in the binary representation of 16 to be affected by a +rounding operation that clears only the bottom 3 bits. + +In the case where only small alignment constraints are encountered (no larger than 8) it +is possible (by shifting multiples of 256 out of :math:`c` into :math:`a`) to ensure that :math:`c` fits into no more +than a single byte. This applies to the serialisation format as specified, considering that +the largest alignment constraint ever encountered is 3. + +Plus/And/Or Representation +-------------------------- + +As a micro-optimisation, after performing the reduction in the previous section, the +resulting values of :math:`a`, :math:`b`, :math:`c` can be transformed such that the calculation can be performed +in only 3 commonly-available machine instructions. + +This transformation takes advantage of three simple facts about rounding. + +First note that rounding up to the nearest multiple of any number is the same as adding +that number, minus 1, then rounding down to the nearest multiple of that number. + +Second, note that rounding down to the nearest multiple of a number that is a power of +two is the same as taking the bitwise and with the bitwise complement of that number +minus 1. + +Third, note that the result of rounding to a multiple of a power of 2 results in the +low order bits of the result being cleared. Adding a number less than that multiple to +the result of the rounding can't possibly result in carrying, so using bitwise or is an +equivalent operation. + +Keeping in mind that after the reduction in the last section, :math:`c < 2^b`: + +.. math:: + ((+a);\ (↑b);\ (+c)\ s) = ((+ (a + 2 - 1));\ (\&\ \sim(2 - 1));\ (|c))\ s) + +where :math:`|` denotes bitwise or, :math:`\&` denotes bitwise and, and :math:`\sim` denotes bitwise complement. + +We can therefore choose to store the following into the table: + +.. math:: + (a + 2^b - 1, \sim(2^b - 1), c) + +and for each address we calculate, we are only required to perform an addition, a +bitwise and and a bitwise or. + +Proof of Reduction Rules +------------------------ + +Given a few “intuitive” lemmas, we can prove that the reduction rules are sound. + +**Lemma 1** + .. math:: + \forall{a, b}: (↑a);\ (↑b) = (↑(max(a, b))) + + since alignment is always to powers of two, two successive alignment operations are + equivalent to the “most powerful” of the two. + +**Lemma 2** + .. math:: + \forall{a, b, c, r}: r = (↑c) ⇒ r(a) + r(b) = r(a + r(b)) + + since :math:`r(b)` is already a multiple of :math:`2c` it can “pass through” the second application of + :math:`r` without change. + +**Lemma 3** + .. math:: + \forall{c}: (0 ↑ c) = 0 + +Addition Rule +^^^^^^^^^^^^^ + +Associativity of addition: + +.. math:: + \forall{a, b, n}: (n + a) + b = n + (a + b) + +which is just the same as: + +.. math:: + \forall{a, b, n}: ((+a);\ (+b))\ n = (+(a + b))\ n + +By partial instantiation: + +.. math:: + \forall{n}: ((+a);\ (+b))\ n = (+(a + b))\ n + +and then by extensionality: + +.. math:: + (+a);\ (+b) = (+(a + b)) + +Greater Alignment Rule +^^^^^^^^^^^^^^^^^^^^^^ + +Let :math:`r = (↑c)` and :math:`s = (↑a)`. + +Lemma 2: + +.. math:: + \forall{m, n}: s(n) + s(m) = s(s(n) + m) + +Lemma 3 allows: + +.. math:: + \forall{m, n}: s(n) + s(m) + s(0) = s(s(n) + m) + +Repeated application of lemma 2 to the above: + +.. math:: + \forall{m, n}: s(n) + s(s(m) + 0) = s(s(n) + m) \\ + \forall{m, n}: s(s(n) + s(m) + 0) = s(s(n) + m) + +Which of course is equivalent to: + +.. math:: + \forall{m, n}: s(s(n) + s(m)) = s(s(n) + m) + +Since addition commutes and we universally quantify over both :math:`m` and :math:`n`, there is no +reason that what works for one won’t work equally well for the other: + +.. math:: + \forall{m, n}: s(s(n) + s(m)) = s(n + s(m)) + +so, clearly: + +.. math:: + \forall{m, n}: s(s(n) + m) = s(n + s(m)) + +Which we can partially instantiate as: + +.. math:: + \forall{n}: s(s(n) + b) = s(n + s(b)) + +It must be true, then, that: + +.. math:: + \forall{n}: r(s(s(n) + b)) = r(s(n + s(b))) + +Remembering that :math:`r = (↑c)` and :math:`s = (↑a)`: + +.. math:: + \forall{n}: ((↑a);\ (↑c))\ ((n ↑ a) + b) = ((↑a);\ (↑c))\ (n + (b ↑ a)) + +And lemma 1 (since :math:`a ≤ c`) merges this into: + +.. math:: + \forall{n}: (↑c)\ ((n ↑ a) + b) = (↑c)\ (n + (b ↑ a)) \\ + \forall{n}: ((↑a);\ (+b);\ (↑c))\ n = ((+(b ↑ a));\ (↑c))\ n + +By extensionality: + +.. math:: + (↑a);\ (+b);\ (↑c) = (+(b ↑ a));\ (↑c) + +Lesser Alignment Rule +^^^^^^^^^^^^^^^^^^^^^ + +Let :math:`r = (↑a)` and :math:`s = (↑c)`. + +Trivially: + +.. math:: + \forall{n}: s(r(n) + b) = s(r(n) + b) + +From lemma 1, since :math:`c ≤ a`: + +.. math:: + \forall{n}: s(s(r(n)) + b) = s(r(n) + b) + +Then lemma 2 allows: + +.. math:: + \forall{n}: s(r(n)) + s(b) = s(r(n) + b) + +Effectively reversing the first application of lemma 1: + +.. math:: + \forall{n}: r(n) + s(b) = s(r(n) + b) + +Remembering :math:`r = (↑a)` and :math:`s = (↑c)`: + +.. math:: + \forall{n}: ((+(b ↑ c));\ (↑a))\ n = ((↑a);\ (+b);\ (↑c))\ n + +By extensionality: + +.. math:: + (+(b ↑ c)); (↑a) = (↑a); (+b); (↑c) \ No newline at end of file
View file
_service:tar_scm:glib-2.76.4.tar.xz/docs/reference/glib/gvariant-string-array.svg
Added
@@ -0,0 +1,465 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<svg + width="149.22821mm" + height="29.919605mm" + viewBox="0 0 149.22821 29.919605" + version="1.1" + id="svg1664" + sodipodi:docname="gvariant-string-array.svg" + inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + <sodipodi:namedview + id="namedview1666" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:showpageshadow="2" + inkscape:pageopacity="0.0" + inkscape:pagecheckerboard="0" + inkscape:deskcolor="#d1d1d1" + inkscape:document-units="mm" + showgrid="false" + inkscape:zoom="1.7817059" + inkscape:cx="280.91056" + inkscape:cy="124.59969" + inkscape:window-width="1920" + inkscape:window-height="1043" + inkscape:window-x="0" + inkscape:window-y="0" + inkscape:window-maximized="1" + inkscape:current-layer="layer1" /> + <defs + id="defs1661"> + <marker + style="overflow:visible" + id="marker9949" + refX="0" + refY="0" + orient="auto" + inkscape:stockid="Square" + markerWidth="6" + markerHeight="6" + viewBox="0 0 6 6" + inkscape:isstock="true" + inkscape:collect="always" + preserveAspectRatio="xMidYMid"> + <path + transform="scale(0.5)" + style="fill:context-fill;fill-rule:evenodd;stroke:context-stroke;stroke-width:2" + d="M -5,-5 V 5 H 5 V -5 Z" + id="path9947" /> + </marker> + <marker + style="overflow:visible" + id="Arrow1" + refX="0" + refY="0" + orient="auto-start-reverse" + inkscape:stockid="Arrow1" + markerWidth="4.0606599" + markerHeight="6.7071066" + viewBox="0 0 4.0606602 6.7071068" + inkscape:isstock="true" + inkscape:collect="always" + preserveAspectRatio="xMidYMid"> + <path + style="fill:none;stroke:context-stroke;stroke-width:1;stroke-linecap:butt" + d="M 3,-3 0,0 3,3" + id="path5057" + transform="rotate(180,0.125,0)" + sodipodi:nodetypes="ccc" /> + </marker> + </defs> + <g + inkscape:label="Layer 1" + inkscape:groupmode="layer" + id="layer1" + transform="translate(-25.710224,-95.496216)"> + <rect + style="fill:#ff8080;stroke:#000000;stroke-width:0.489157;stroke-dasharray:none" + id="rect455-2" + width="147.51085" + height="12.948888" + x="27.183014" + y="100.10917" /> + <rect + style="fill:#ff8080;stroke:#000000;stroke-width:0.265;stroke-dasharray:none" + id="rect455" + width="60.94622" + height="9.6238031" + x="28.709707" + y="101.77171" /> + <rect + style="fill:#ff8080;stroke:#000000;stroke-width:0.265;stroke-dasharray:none" + id="rect455-9" + width="60.94622" + height="9.6238031" + x="90.297195" + y="101.77171" /> + <text + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.35px;line-height:1.25;font-family:'DejaVu Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583" + x="81.257446" + y="109.18375" + id="text248-5"><tspan + sodipodi:role="line" + id="tspan246-54" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.35px;font-family:'DejaVu Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono';stroke-width:0.264583" + x="81.257446" + y="109.18375">\0</tspan></text> + <text + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.35px;line-height:1.25;font-family:'DejaVu Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583" + x="93.385475" + y="109.18375" + id="text248-76"><tspan + sodipodi:role="line" + id="tspan246-56" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.35px;font-family:'DejaVu Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono';stroke-width:0.264583" + x="93.385475" + y="109.18375">w</tspan></text> + <text + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.35px;line-height:1.25;font-family:'DejaVu Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583" + x="103.65005" + y="109.18375" + id="text248-93"><tspan + sodipodi:role="line" + id="tspan246-7" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.35px;font-family:'DejaVu Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono';stroke-width:0.264583" + x="103.65005" + y="109.18375">o</tspan></text> + <text + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.35px;line-height:1.25;font-family:'DejaVu Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583" + x="113.47436" + y="109.18375" + id="text248-4"><tspan + sodipodi:role="line" + id="tspan246-52" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.35px;font-family:'DejaVu Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono';stroke-width:0.264583" + x="113.47436" + y="109.18375">r</tspan></text> + <text + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.35px;line-height:1.25;font-family:'DejaVu Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583" + x="124.23968" + y="109.18375" + id="text248-54"><tspan + sodipodi:role="line" + id="tspan246-74" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.35px;font-family:'DejaVu Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono';stroke-width:0.264583" + x="124.23968" + y="109.18375">l</tspan></text> + <text + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.35px;line-height:1.25;font-family:'DejaVu Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583" + x="134.54922" + y="109.18375" + id="text248-43"><tspan + sodipodi:role="line" + id="tspan246-0" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.35px;font-family:'DejaVu Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono';stroke-width:0.264583" + x="134.54922" + y="109.18375">d</tspan></text> + <text + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.35px;line-height:1.25;font-family:'DejaVu Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583" + x="142.84494" + y="109.18375" + id="text248-78"><tspan + sodipodi:role="line" + id="tspan246-6" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.35px;font-family:'DejaVu Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono';stroke-width:0.264583" + x="142.84494" + y="109.18375">\0</tspan></text> + <text + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.35px;line-height:1.25;font-family:'DejaVu Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583" + x="153.58762" + y="109.18375" + id="text248-8"><tspan + sodipodi:role="line" + id="tspan246-8" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.35px;font-family:'DejaVu Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono';stroke-width:0.264583" + x="153.58762" + y="109.18375">06</tspan></text> + <text + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.35px;line-height:1.25;font-family:'DejaVu Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583" + x="163.58762" + y="109.18375" + id="text248-431"><tspan + sodipodi:role="line" + id="tspan246-4" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.35px;font-family:'DejaVu Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono';stroke-width:0.264583" + x="163.58762" + y="109.18375">0c</tspan></text> + <text + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.35px;line-height:1.25;font-family:'DejaVu Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583" + x="31.777834" + y="109.18375" + id="text248"><tspan + sodipodi:role="line" + id="tspan246" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.35px;font-family:'DejaVu Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono';stroke-width:0.264583" + x="31.777834" + y="109.18375">h</tspan></text> + <text + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.35px;line-height:1.25;font-family:'DejaVu Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583" + x="42.059471" + y="109.18375" + id="text248-2"><tspan + sodipodi:role="line" + id="tspan246-3" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.35px;font-family:'DejaVu Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono';stroke-width:0.264583" + x="42.059471" + y="109.18375">e</tspan></text> + <text + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.35px;line-height:1.25;font-family:'DejaVu Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583" + x="52.387615" + y="109.18375" + id="text248-7"><tspan + sodipodi:role="line" + id="tspan246-5" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.35px;font-family:'DejaVu Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono';stroke-width:0.264583" + x="52.387615" + y="109.18375">l</tspan></text> + <text + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.35px;line-height:1.25;font-family:'DejaVu Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583" + x="72.856316" + y="109.18375" + id="text248-6"><tspan + sodipodi:role="line" + id="tspan246-1" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.35px;font-family:'DejaVu Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono';stroke-width:0.264583" + x="72.856316" + y="109.18375">o</tspan></text> + <text + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.35px;line-height:1.25;font-family:'DejaVu Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583" + x="62.652199" + y="109.18375" + id="text248-9"><tspan + sodipodi:role="line" + id="tspan246-2" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.35px;font-family:'DejaVu Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono';stroke-width:0.264583" + x="62.652199" + y="109.18375">l</tspan></text> + <text + xml:space="preserve" + style="font-style:normal;font-weight:normal;font-size:5.64444px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583" + x="25.343666" + y="99.784668" + id="text369"><tspan + sodipodi:role="line" + id="tspan367" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444px;font-family:'DejaVu Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono';stroke-width:0.264583" + x="25.343666" + y="99.784668">0</tspan></text> + <text + xml:space="preserve" + style="font-style:normal;font-weight:normal;font-size:5.64444px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583" + x="37.098316" + y="99.864594" + id="text369-2"><tspan + sodipodi:role="line" + id="tspan367-8" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444px;font-family:'DejaVu Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono';stroke-width:0.264583" + x="37.098316" + y="99.864594">1</tspan></text> + <text + xml:space="preserve" + style="font-style:normal;font-weight:normal;font-size:5.64444px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583" + x="47.348431" + y="99.864594" + id="text369-9"><tspan + sodipodi:role="line" + id="tspan367-7" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444px;font-family:'DejaVu Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono';stroke-width:0.264583" + x="47.348431" + y="99.864594">2</tspan></text> + <text + xml:space="preserve" + style="font-style:normal;font-weight:normal;font-size:5.64444px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583" + x="57.695263" + y="99.784668" + id="text369-3"><tspan + sodipodi:role="line" + id="tspan367-6" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444px;font-family:'DejaVu Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono';stroke-width:0.264583" + x="57.695263" + y="99.784668">3</tspan></text> + <text + xml:space="preserve" + style="font-style:normal;font-weight:normal;font-size:5.64444px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583" + x="67.996796" + y="99.864594" + id="text369-1"><tspan + sodipodi:role="line" + id="tspan367-2" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444px;font-family:'DejaVu Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono';stroke-width:0.264583" + x="67.996796" + y="99.864594">4</tspan></text> + <text + xml:space="preserve" + style="font-style:normal;font-weight:normal;font-size:5.64444px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583" + x="79.215927" + y="99.784668" + id="text369-7"><tspan + sodipodi:role="line" + id="tspan367-84" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444px;font-family:'DejaVu Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono';stroke-width:0.264583" + x="79.215927" + y="99.784668">5</tspan></text> + <text + xml:space="preserve" + style="font-style:normal;font-weight:normal;font-size:5.64444px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583" + x="87.691978" + y="99.784668" + id="text369-2-5"><tspan + sodipodi:role="line" + id="tspan367-8-0" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444px;font-family:'DejaVu Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono';stroke-width:0.264583" + x="87.691978" + y="99.784668">6</tspan></text> + <text + xml:space="preserve" + style="font-style:normal;font-weight:normal;font-size:5.64444px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583" + x="98.538429" + y="99.864594" + id="text369-9-3"><tspan + sodipodi:role="line" + id="tspan367-7-6" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444px;font-family:'DejaVu Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono';stroke-width:0.264583" + x="98.538429" + y="99.864594">7</tspan></text> + <text + xml:space="preserve" + style="font-style:normal;font-weight:normal;font-size:5.64444px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583" + x="108.86606" + y="99.784668" + id="text369-3-1"><tspan + sodipodi:role="line" + id="tspan367-6-0" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444px;font-family:'DejaVu Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono';stroke-width:0.264583" + x="108.86606" + y="99.784668">8</tspan></text> + <text + xml:space="preserve" + style="font-style:normal;font-weight:normal;font-size:5.64444px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583" + x="119.33865" + y="99.784668" + id="text369-3-9"><tspan + sodipodi:role="line" + id="tspan367-6-2" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444px;font-family:'DejaVu Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono';stroke-width:0.264583" + x="119.33865" + y="99.784668">9</tspan></text> + <text + xml:space="preserve" + style="font-style:normal;font-weight:normal;font-size:5.64444px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583" + x="129.61528" + y="99.784668" + id="text369-1-0"><tspan + sodipodi:role="line" + id="tspan367-2-6" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444px;font-family:'DejaVu Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono';stroke-width:0.264583" + x="129.61528" + y="99.784668">a</tspan></text> + <text + xml:space="preserve" + style="font-style:normal;font-weight:normal;font-size:5.64444px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583" + x="140.70627" + y="99.784668" + id="text369-7-8"><tspan + sodipodi:role="line" + id="tspan367-84-9" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444px;font-family:'DejaVu Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono';stroke-width:0.264583" + x="140.70627" + y="99.784668">b</tspan></text> + <text + xml:space="preserve" + style="font-style:normal;font-weight:normal;font-size:5.64444px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583" + x="150.26042" + y="99.784668" + id="text369-2-5-2"><tspan + sodipodi:role="line" + id="tspan367-8-0-6" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444px;font-family:'DejaVu Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono';stroke-width:0.264583" + x="150.26042" + y="99.784668">c</tspan></text> + <text + xml:space="preserve" + style="font-style:normal;font-weight:normal;font-size:5.64444px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583" + x="160.74477" + y="99.784668" + id="text369-9-3-6"><tspan + sodipodi:role="line" + id="tspan367-7-6-4" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444px;font-family:'DejaVu Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono';stroke-width:0.264583" + x="160.74477" + y="99.784668">d</tspan></text> + <text + xml:space="preserve" + style="font-style:normal;font-weight:normal;font-size:5.64444px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583" + x="168.77388" + y="99.784668" + id="text369-3-1-9"><tspan + sodipodi:role="line" + id="tspan367-6-0-5" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444px;font-family:'DejaVu Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono';stroke-width:0.264583" + x="168.77388" + y="99.784668">e</tspan></text> + <path + style="fill:none;stroke:#000000;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-start:url(#marker9949);marker-end:url(#Arrow1)" + d="m 157.48947,113.10711 v 12.17642 H 90.07105 v -12.27329" + id="path3133" /> + <path + style="fill:none;stroke:#000000;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-start:url(#marker9949);marker-end:url(#Arrow1)" + d="m 167.65592,113.19876 v 6.5108 h -16.28106 v -6.26542" + id="path3388" /> + </g> + <metadata + id="metadata7003"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:rights> + <cc:Agent> + <dc:title>Copyright © 2022 Philip Withnall</dc:title> + </cc:Agent> + </dc:rights> + <cc:license + rdf:resource="http://creativecommons.org/licenses/by-sa/3.0/" /> + </cc:Work> + <cc:License + rdf:about="http://creativecommons.org/licenses/by-sa/4.0/"> + <cc:permits + rdf:resource="http://creativecommons.org/ns#Reproduction" /> + <cc:permits + rdf:resource="http://creativecommons.org/ns#Distribution" /> + <cc:requires + rdf:resource="http://creativecommons.org/ns#Notice" /> + <cc:requires + rdf:resource="http://creativecommons.org/ns#Attribution" /> + <cc:permits + rdf:resource="http://creativecommons.org/ns#DerivativeWorks" /> + <cc:requires + rdf:resource="http://creativecommons.org/ns#ShareAlike" /> + </cc:License> + </rdf:RDF> + </metadata> +</svg>
View file
_service:tar_scm:glib-2.74.4.tar.xz/docs/reference/glib/meson.build -> _service:tar_scm:glib-2.76.4.tar.xz/docs/reference/glib/meson.build
Changed
@@ -38,6 +38,9 @@ 'gutilsprivate.h', 'gvalgrind.h', 'dirent.h', + 'glib-unixprivate.h', + 'glib-visibility.h', + 'gmodule-visibility.h', docpath = join_paths(glib_datadir, 'gtk-doc', 'html') @@ -49,13 +52,20 @@ configuration: version_conf ) + configure_file( + input: 'glib-sections.txt.in', + output: 'glib-sections.txt', + command: gen_visibility_macros, meson.project_version(), 'doc-sections', '@INPUT@', '@OUTPUT@', + ) + gnome.gtkdoc('glib', main_xml : 'glib-docs.xml', namespace : 'g', mode : 'none', src_dir : 'glib', 'gmodule' , dependencies : libglib_dep, - scan_args : gtkdoc_common_scan_args + + scan_args : + '--ignore-decorators=' + ignore_decorators + '|' + ignore_decorators.replace('GLIB', 'GMODULE'), '--ignore-headers=' + ' '.join(ignore_headers), , content_files : @@ -102,3 +112,36 @@ install_dir: man1_dir) endforeach endif + +# GVariant specification is currently standalone +rst2html5 = find_program('rst2html5', 'rst2html5.py', required: false) + +if rst2html5.found() + spec_path = glib_datadir / 'doc' / 'glib-2.0' + + figures = files( + 'gvariant-byte-boundaries.svg', + 'gvariant-integer-and-string-structure.svg', + 'gvariant-integer-array.svg', + 'gvariant-string-array.svg', + ) + + custom_target('gvariant-specification-1.0', + input: 'gvariant-specification-1.0.rst', + output: 'gvariant-specification-1.0.html', + command: + rst2html5, + '@INPUT@', + , + capture: true, + install: true, + install_dir: spec_path, + install_tag: 'doc', + depend_files: figures, + ) + + install_data(figures, + install_dir : spec_path, + install_tag : 'doc', + ) +endif \ No newline at end of file
View file
_service:tar_scm:glib-2.74.4.tar.xz/docs/reference/glib/running.xml -> _service:tar_scm:glib-2.76.4.tar.xz/docs/reference/glib/running.xml
Changed
@@ -165,53 +165,10 @@ <title><envar>G_SLICE</envar></title> <para> - This environment variable allows reconfiguration of the GSlice - memory allocator. - <variablelist> - <varlistentry> - <term>always-malloc</term> - <listitem><para>This will cause all slices allocated through - g_slice_alloc() and released by g_slice_free1() to be actually - allocated via direct calls to g_malloc() and g_free(). - This is most useful for memory checkers and similar programs that - use Boehm GC alike algorithms to produce more accurate results. - It can also be in conjunction with debugging features of the system's - malloc() implementation such as glibc's MALLOC_CHECK_=2 to debug - erroneous slice allocation code, although - <literal>debug-blocks</literal> is usually a better suited debugging - tool.</para> - </listitem> - </varlistentry> - <varlistentry> - <term>debug-blocks</term> - <listitem><para>Using this option (present since GLib 2.13) engages - extra code which performs sanity checks on the released memory - slices. Invalid slice addresses or slice sizes will be reported and - lead to a program halt. This option is for debugging scenarios. - In particular, client packages sporting their own test suite should - <emphasis>always enable this option when running tests</emphasis>. - Global slice validation is ensured by storing size and address - information for each allocated chunk, and maintaining a global - hash table of that data. That way, multi-thread scalability is - given up, and memory consumption is increased. However, the - resulting code usually performs acceptably well, possibly better - than with comparable memory checking carried out using external - tools.</para> - <para>An example of a memory corruption scenario that cannot be - reproduced with <literal>G_SLICE=always-malloc</literal>, but will - be caught by <literal>G_SLICE=debug-blocks</literal> is as follows: - <programlisting> - /* void* gives up type-safety */ - void *slist = g_slist_alloc (); - - /* corruption: sizeof (GSList) != sizeof (GList) */ - g_list_free (slist); - </programlisting></para> - </listitem> - </varlistentry> - </variablelist> - The special value <literal>all</literal> can be used to turn on all options. - The special value <literal>help</literal> can be used to print all available options. + This environment variable allowed reconfiguration of the GSlice + memory allocator. Since GLib 2.76, GSlice uses the system + <literal>malloc()</literal> implementation internally, so this variable is + ignored. </para> </formalpara>
View file
_service:tar_scm:glib-2.74.4.tar.xz/docs/reference/gobject/glib-mkenums.xml -> _service:tar_scm:glib-2.76.4.tar.xz/docs/reference/gobject/glib-mkenums.xml
Changed
@@ -65,7 +65,7 @@ </programlisting></informalexample> <variablelist> <varlistentry> -<term><literal>@EnumName@</literal>></term> +<term><literal>@EnumName@</literal></term> <listitem><para> The name of the enum currently being processed, enum names are assumed to be properly namespaced and to use mixed capitalization to separate
View file
_service:tar_scm:glib-2.74.4.tar.xz/docs/reference/gobject/gobject-docs.xml -> _service:tar_scm:glib-2.76.4.tar.xz/docs/reference/gobject/gobject-docs.xml
Changed
@@ -222,6 +222,10 @@ <title>Index of new symbols in 2.74</title> <xi:include href="xml/api-index-2.74.xml"><xi:fallback /></xi:include> </index> + <index id="api-index-2-76" role="2.76"> + <title>Index of new symbols in 2.76</title> + <xi:include href="xml/api-index-2.76.xml"><xi:fallback /></xi:include> + </index> <xi:include href="xml/annotation-glossary.xml"><xi:fallback /></xi:include>
View file
_service:tar_scm:glib-2.74.4.tar.xz/docs/reference/gobject/gobject-sections.txt -> _service:tar_scm:glib-2.76.4.tar.xz/docs/reference/gobject/gobject-sections.txt
Changed
@@ -18,6 +18,7 @@ G_TYPE_IS_DEEP_DERIVABLE G_TYPE_IS_INTERFACE G_TYPE_IS_FINAL +G_TYPE_IS_DEPRECATED GTypeInterface GTypeInstance GTypeClass @@ -185,9 +186,6 @@ G_TYPE_RESERVED_BSE_FIRST G_TYPE_RESERVED_BSE_LAST G_TYPE_RESERVED_USER_FIRST - -<SUBSECTION Private> -GOBJECT_VAR </SECTION> <SECTION> @@ -420,6 +418,7 @@ G_TYPE_URI G_TYPE_TREE G_TYPE_PATTERN_SPEC +G_TYPE_BOOKMARK_FILE <SUBSECTION Standard> G_TYPE_IS_BOXED @@ -456,6 +455,7 @@ g_uri_get_type g_tree_get_type g_pattern_spec_get_type +g_bookmark_file_get_type </SECTION> <SECTION>
View file
_service:tar_scm:glib-2.74.4.tar.xz/docs/reference/gobject/meson.build -> _service:tar_scm:glib-2.76.4.tar.xz/docs/reference/gobject/meson.build
Changed
@@ -8,6 +8,7 @@ 'gobject_trace.h', 'gtype-private.h', 'glib-enumtypes.h', + 'gobject-visibility.h', docpath = join_paths(glib_datadir, 'gtk-doc', 'html') @@ -28,7 +29,8 @@ dependencies : libgobject_dep, libglib_dep, include_directories : gtkdocincl, src_dir : 'gobject', - scan_args : gtkdoc_common_scan_args + + scan_args : + '--ignore-decorators=' + '|'.join(ignore_decorators.replace('GLIB', 'GOBJECT')), '--rebuild-types', '--ignore-headers=' + ' '.join(ignore_headers), ,
View file
_service:tar_scm:glib-2.74.4.tar.xz/docs/reference/gobject/tut_gobject.xml -> _service:tar_scm:glib-2.76.4.tar.xz/docs/reference/gobject/tut_gobject.xml
Changed
@@ -294,7 +294,7 @@ memory will be freed or returned to the object pool for this type. Once the object has been freed, if it was the last instance of the type, the type's class will be destroyed as described in <xref linkend="gtype-instantiatable-classed"/> and - <xref linkend="gtype-non-instantiatable-classed"/>. + <xref linkend="gtype-non-instantiatable-non-classed"/>. </para> <para>
View file
_service:tar_scm:glib-2.74.4.tar.xz/docs/reference/gobject/tut_gtype.xml -> _service:tar_scm:glib-2.76.4.tar.xz/docs/reference/gobject/tut_gtype.xml
Changed
@@ -599,7 +599,7 @@ <row> <!--entry>First call to <function><link linkend="g-type-create-instance">g_type_create_instance</link></function> for target type</entry--> <entry>interface initialization, see - <xref linkend="gtype-non-instantiatable-classed-init"/></entry> + <xref linkend="gtype-non-instantiatable-non-classed-init"/></entry> <entry></entry> </row> <row> @@ -610,7 +610,7 @@ <row> <entry morerows="2">Last call to <function><link linkend="g-type-free-instance">g_type_free_instance</link></function> for target type</entry> <entry>interface destruction, see - <xref linkend="gtype-non-instantiatable-classed-dest"/></entry> + <xref linkend="gtype-non-instantiatable-non-classed-dest"/></entry> <entry></entry> </row> <row> @@ -633,8 +633,8 @@ </sect1> - <sect1 id="gtype-non-instantiatable-classed"> - <title>Non-instantiatable classed types: interfaces</title> + <sect1 id="gtype-non-instantiatable-non-classed"> + <title>Non-instantiatable non-classed types: interfaces</title> <para> This section covers the theory behind interfaces. See @@ -649,7 +649,7 @@ be seen as a playback interface. Once you know what they do, you can control your CD player, MP3 player or anything that uses these symbols. To declare an interface you have to register a non-instantiatable - classed type which derives from + non-classed type which derives from <link linkend="GTypeInterface"><type>GTypeInterface</type></link>. The following piece of code declares such an interface. <informalexample><programlisting> #define VIEWER_TYPE_EDITABLE viewer_editable_get_type () @@ -792,7 +792,7 @@ </programlisting></informalexample> </para> - <sect2 id="gtype-non-instantiatable-classed-init"> + <sect2 id="gtype-non-instantiatable-non-classed-init"> <title>Interface Initialization</title> <para> @@ -937,7 +937,7 @@ </sect2> - <sect2 id="gtype-non-instantiatable-classed-dest"> + <sect2 id="gtype-non-instantiatable-non-classed-dest"> <title>Interface Destruction</title> <para> @@ -955,7 +955,7 @@ <para> Again, it is important to understand, as in - <xref linkend="gtype-non-instantiatable-classed-init"/>, + <xref linkend="gtype-non-instantiatable-non-classed-init"/>, that both <function>interface_finalize</function> and <function>base_finalize</function> are invoked exactly once for the destruction of each implementation of an interface. Thus, if you were to use one of these functions, you would need to use a static integer variable
View file
_service:tar_scm:glib-2.74.4.tar.xz/docs/reference/gobject/tut_howto.xml -> _service:tar_scm:glib-2.76.4.tar.xz/docs/reference/gobject/tut_howto.xml
Changed
@@ -854,7 +854,7 @@ <para> The theory behind how GObject interfaces work is given in - <xref linkend="gtype-non-instantiatable-classed"/>; this section covers how to + <xref linkend="gtype-non-instantiatable-non-classed"/>; this section covers how to define and implement an interface. </para>
View file
_service:tar_scm:glib-2.74.4.tar.xz/docs/reference/meson.build -> _service:tar_scm:glib-2.76.4.tar.xz/docs/reference/meson.build
Changed
@@ -37,9 +37,7 @@ endforeach -gtkdoc_common_scan_args = - '--ignore-decorators=' + '|'.join(ignore_decorators), - +ignore_decorators = '|'.join(ignore_decorators) if get_option('gtk_doc') # Check we have the minimum gtk-doc version required. Older versions won't @@ -47,12 +45,12 @@ dependency('gtk-doc', version : '>=1.32.1', fallback : 'gtk-doc', 'dummy_dep', default_options : 'tests=false') -endif -# We cannot built the API reference off of a static library, -# as symbols might get dropped by the linker -if get_option('gtk_doc') and get_option('default_library') == 'static' - error('The API reference can only be built against a shared library') + # We cannot built the API reference off of a static library, + # as symbols might get dropped by the linker + if not glib_build_shared + error('The API reference can only be built against a shared library') + endif endif subdir('gio')
View file
_service:tar_scm:glib-2.76.4.tar.xz/fuzzing/fuzz_utf8_validate.c
Added
@@ -0,0 +1,32 @@ +/* + * Copyright 2022 Endless OS Foundation, LLC + * + * SPDX-License-Identifier: LGPL-2.1-or-later + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, see <http://www.gnu.org/licenses/>. + */ + +#include "fuzz.h" + +int +LLVMFuzzerTestOneInput (const unsigned char *data, size_t size) +{ + fuzz_set_logging_func (); + + /* We don’t care whether the fuzzer provides valid or invalid UTF-8 data, just + * that the validation function doesn’t crash or do anything undefined. */ + g_utf8_validate_len ((const gchar *) data, size, NULL); + + return 0; +}
View file
_service:tar_scm:glib-2.76.4.tar.xz/fuzzing/fuzz_variant_binary_byteswap.c
Added
@@ -0,0 +1,41 @@ +/* + * Copyright 2018 pdknsk + * Copyright 2022 Endless OS Foundation, LLC + * + * SPDX-License-Identifier: LGPL-2.1-or-later + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, see <http://www.gnu.org/licenses/>. + */ + +#include "fuzz.h" + +int +LLVMFuzzerTestOneInput (const unsigned char *data, size_t size) +{ + GVariant *variant = NULL, *swapped_variant = NULL; + + fuzz_set_logging_func (); + + variant = g_variant_new_from_data (G_VARIANT_TYPE_VARIANT, data, size, FALSE, + NULL, NULL); + if (variant == NULL) + return 0; + + swapped_variant = g_variant_byteswap (variant); + g_variant_get_data (swapped_variant); + + g_variant_unref (swapped_variant); + g_variant_unref (variant); + return 0; +}
View file
_service:tar_scm:glib-2.74.4.tar.xz/fuzzing/meson.build -> _service:tar_scm:glib-2.76.4.tar.xz/fuzzing/meson.build
Changed
@@ -33,8 +33,10 @@ 'fuzz_uri_escape', 'fuzz_uri_parse', 'fuzz_uri_parse_params', + 'fuzz_utf8_validate', 'fuzz_uuid_string_is_valid', 'fuzz_variant_binary', + 'fuzz_variant_binary_byteswap', 'fuzz_variant_text', @@ -65,7 +67,7 @@ # If the FuzzingEngine isn’t available, build some unit tests to check that # the fuzzing files do basically work. This doesn’t do any actual fuzzing though. # Pass in the README as an arbitrary fuzzing input, just so we have something. - if not have_fuzzing_engine + if build_tests and not have_fuzzing_engine test(target_name, exe, args : files('README.md'), suite : 'fuzzing',
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gaction.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gaction.c
Changed
@@ -437,8 +437,9 @@ /** * g_action_parse_detailed_name: * @detailed_name: a detailed action name - * @action_name: (out): the action name - * @target_value: (out): the target value, or %NULL for no target + * @action_name: (out) (optional) (not nullable) (transfer full): the action name + * @target_value: (out) (optional) (nullable) (transfer full): the target value, + * or %NULL for no target * @error: a pointer to a %NULL #GError, or %NULL * * Parses a detailed action name into its separate name and target @@ -448,23 +449,29 @@ * * The first format is used to represent an action name with no target * value and consists of just an action name containing no whitespace - * nor the characters ':', '(' or ')'. For example: "app.action". + * nor the characters `:`, `(` or `)`. For example: `app.action`. * * The second format is used to represent an action with a target value - * that is a non-empty string consisting only of alphanumerics, plus '-' - * and '.'. In that case, the action name and target value are - * separated by a double colon ("::"). For example: - * "app.action::target". + * that is a non-empty string consisting only of alphanumerics, plus `-` + * and `.`. In that case, the action name and target value are + * separated by a double colon (`::`). For example: + * `app.action::target`. * * The third format is used to represent an action with any type of * target value, including strings. The target value follows the action - * name, surrounded in parens. For example: "app.action(42)". The + * name, surrounded in parens. For example: `app.action(42)`. The * target value is parsed using g_variant_parse(). If a tuple-typed * value is desired, it must be specified in the same way, resulting in - * two sets of parens, for example: "app.action((1,2,3))". A string - * target can be specified this way as well: "app.action('target')". - * For strings, this third format must be used if * target value is - * empty or contains characters other than alphanumerics, '-' and '.'. + * two sets of parens, for example: `app.action((1,2,3))`. A string + * target can be specified this way as well: `app.action('target')`. + * For strings, this third format must be used if target value is + * empty or contains characters other than alphanumerics, `-` and `.`. + * + * If this function returns %TRUE, a non-%NULL value is guaranteed to be returned + * in @action_name (if a pointer is passed in). A %NULL value may still be + * returned in @target_value, as the @detailed_name may not contain a target. + * + * If returned, the #GVariant in @target_value is guaranteed to not be floating. * * Returns: %TRUE if successful, else %FALSE with @error set *
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gaction.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gaction.h
Changed
@@ -58,40 +58,40 @@ GVariant *parameter); }; -GLIB_AVAILABLE_IN_2_30 +GIO_AVAILABLE_IN_2_30 GType g_action_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL const gchar * g_action_get_name (GAction *action); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL const GVariantType * g_action_get_parameter_type (GAction *action); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL const GVariantType * g_action_get_state_type (GAction *action); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GVariant * g_action_get_state_hint (GAction *action); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_action_get_enabled (GAction *action); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GVariant * g_action_get_state (GAction *action); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_action_change_state (GAction *action, GVariant *value); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_action_activate (GAction *action, GVariant *parameter); -GLIB_AVAILABLE_IN_2_28 +GIO_AVAILABLE_IN_2_28 gboolean g_action_name_is_valid (const gchar *action_name); -GLIB_AVAILABLE_IN_2_38 +GIO_AVAILABLE_IN_2_38 gboolean g_action_parse_detailed_name (const gchar *detailed_name, gchar **action_name, GVariant **target_value, GError **error); -GLIB_AVAILABLE_IN_2_38 +GIO_AVAILABLE_IN_2_38 gchar * g_action_print_detailed_name (const gchar *action_name, GVariant *target_value);
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gactiongroup.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gactiongroup.h
Changed
@@ -96,60 +96,60 @@ GVariant **state); }; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GType g_action_group_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_action_group_has_action (GActionGroup *action_group, const gchar *action_name); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gchar ** g_action_group_list_actions (GActionGroup *action_group); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL const GVariantType * g_action_group_get_action_parameter_type (GActionGroup *action_group, const gchar *action_name); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL const GVariantType * g_action_group_get_action_state_type (GActionGroup *action_group, const gchar *action_name); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GVariant * g_action_group_get_action_state_hint (GActionGroup *action_group, const gchar *action_name); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_action_group_get_action_enabled (GActionGroup *action_group, const gchar *action_name); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GVariant * g_action_group_get_action_state (GActionGroup *action_group, const gchar *action_name); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_action_group_change_action_state (GActionGroup *action_group, const gchar *action_name, GVariant *value); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_action_group_activate_action (GActionGroup *action_group, const gchar *action_name, GVariant *parameter); /* signals */ -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_action_group_action_added (GActionGroup *action_group, const gchar *action_name); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_action_group_action_removed (GActionGroup *action_group, const gchar *action_name); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_action_group_action_enabled_changed (GActionGroup *action_group, const gchar *action_name, gboolean enabled); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_action_group_action_state_changed (GActionGroup *action_group, const gchar *action_name, GVariant *state); -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 gboolean g_action_group_query_action (GActionGroup *action_group, const gchar *action_name, gboolean *enabled,
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gactiongroupexporter.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gactiongroupexporter.h
Changed
@@ -32,13 +32,13 @@ G_BEGIN_DECLS -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 guint g_dbus_connection_export_action_group (GDBusConnection *connection, const gchar *object_path, GActionGroup *action_group, GError **error); -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 void g_dbus_connection_unexport_action_group (GDBusConnection *connection, guint export_id);
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gactionmap.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gactionmap.h
Changed
@@ -74,19 +74,19 @@ gsize padding3; }; -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 GType g_action_map_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 GAction * g_action_map_lookup_action (GActionMap *action_map, const gchar *action_name); -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 void g_action_map_add_action (GActionMap *action_map, GAction *action); -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 void g_action_map_remove_action (GActionMap *action_map, const gchar *action_name); -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 void g_action_map_add_action_entries (GActionMap *action_map, const GActionEntry *entries, gint n_entries,
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gappinfo.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gappinfo.c
Changed
@@ -263,6 +263,10 @@ * * Gets the executable's name for the installed application. * + * This is intended to be used for debugging or labelling what program is going + * to be run. To launch the executable, use g_app_info_launch() and related + * functions, rather than spawning the return value from this function. + * * Returns: (type filename): a string containing the @appinfo's application * binaries name **/ @@ -577,9 +581,9 @@ * environment variable with the path of the launched desktop file and * `GIO_LAUNCHED_DESKTOP_FILE_PID` to the process id of the launched * process. This can be used to ignore `GIO_LAUNCHED_DESKTOP_FILE`, - * should it be inherited by further processes. The `DISPLAY` and - * `DESKTOP_STARTUP_ID` environment variables are also set, based - * on information provided in @context. + * should it be inherited by further processes. The `DISPLAY`, + * `XDG_ACTIVATION_TOKEN` and `DESKTOP_STARTUP_ID` environment + * variables are also set, based on information provided in @context. * * Returns: %TRUE on successful launch, %FALSE otherwise. **/ @@ -1594,10 +1598,18 @@ * @files: (element-type GFile): a #GList of of #GFile objects * * Initiates startup notification for the application and returns the - * `DESKTOP_STARTUP_ID` for the launched operation, if supported. + * `XDG_ACTIVATION_TOKEN` or `DESKTOP_STARTUP_ID` for the launched operation, + * if supported. + * + * The returned token may be referred to equivalently as an ‘activation token’ + * (using Wayland terminology) or a ‘startup sequence ID’ (using X11 terminology). + * The two are interoperable(https://gitlab.freedesktop.org/wayland/wayland-protocols/-/blob/main/staging/xdg-activation/x11-interoperation.rst). + * + * Activation tokens are defined in the XDG Activation Protocol(https://wayland.app/protocols/xdg-activation-v1), + * and startup notification IDs are defined in the + * freedesktop.org Startup Notification Protocol(http://standards.freedesktop.org/startup-notification-spec/startup-notification-latest.txt). * - * Startup notification IDs are defined in the - * FreeDesktop.Org Startup Notifications standard(http://standards.freedesktop.org/startup-notification-spec/startup-notification-latest.txt). + * Support for the XDG Activation Protocol was added in GLib 2.76. * * Returns: (nullable): a startup notification ID for the application, or %NULL if * not supported. @@ -1646,19 +1658,34 @@ * @short_description: Monitor application information for changes * * #GAppInfoMonitor is a very simple object used for monitoring the app - * info database for changes (ie: newly installed or removed - * applications). + * info database for changes (newly installed or removed applications). * * Call g_app_info_monitor_get() to get a #GAppInfoMonitor and connect - * to the "changed" signal. + * to the #GAppInfoMonitor::changed signal. The signal will be emitted once when + * the app info database changes, and will not be emitted again until after the + * next call to g_app_info_get_all() or another `g_app_info_*()` function. This + * is because monitoring the app info database for changes is expensive. + * + * The following functions will re-arm the #GAppInfoMonitor::changed signal so + * it can be emitted again: + * - g_app_info_get_all() + * - g_app_info_get_all_for_type() + * - g_app_info_get_default_for_type() + * - g_app_info_get_fallback_for_type() + * - g_app_info_get_recommended_for_type() + * - g_desktop_app_info_get_implementations() + * - g_desktop_app_info_new() + * - g_desktop_app_info_new_from_filename() + * - g_desktop_app_info_new_from_keyfile() + * - g_desktop_app_info_search() * * In the usual case, applications should try to make note of the change * (doing things like invalidating caches) but not act on it. In * particular, applications should avoid making calls to #GAppInfo APIs * in response to the change signal, deferring these until the time that - * the data is actually required. The exception to this case is when + * the updated data is actually required. The exception to this case is when * application information is actually being displayed on the screen - * (eg: during a search or when the list of all applications is shown). + * (for example, during a search or when the list of all applications is shown). * The reason for this is that changes to the list of installed * applications often come in groups (like during system updates) and * rescanning the list on every change is pointless and expensive. @@ -1716,8 +1743,10 @@ /** * GAppInfoMonitor::changed: * - * Signal emitted when the app info database for changes (ie: newly installed - * or removed applications). + * Signal emitted when the app info database changes, when applications are + * installed or removed. + * + * Since: 2.40 **/ g_app_info_monitor_changed_signal = g_signal_new (I_("changed"), G_TYPE_APP_INFO_MONITOR, G_SIGNAL_RUN_FIRST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); @@ -1735,6 +1764,10 @@ * thread-default main context whenever the list of installed * applications (as reported by g_app_info_get_all()) may have changed. * + * The #GAppInfoMonitor::changed signal will only be emitted once until + * g_app_info_get_all() (or another `g_app_info_*()` function) is called. Doing + * so will re-arm the signal ready to notify about the next change. + * * You must only call g_object_unref() on the return value from under * the same main context as you created it. *
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gappinfo.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gappinfo.h
Changed
@@ -146,139 +146,139 @@ GError **error); }; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GType g_app_info_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GAppInfo * g_app_info_create_from_commandline (const char *commandline, const char *application_name, GAppInfoCreateFlags flags, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GAppInfo * g_app_info_dup (GAppInfo *appinfo); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_app_info_equal (GAppInfo *appinfo1, GAppInfo *appinfo2); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL const char *g_app_info_get_id (GAppInfo *appinfo); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL const char *g_app_info_get_name (GAppInfo *appinfo); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL const char *g_app_info_get_display_name (GAppInfo *appinfo); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL const char *g_app_info_get_description (GAppInfo *appinfo); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL const char *g_app_info_get_executable (GAppInfo *appinfo); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL const char *g_app_info_get_commandline (GAppInfo *appinfo); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GIcon * g_app_info_get_icon (GAppInfo *appinfo); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_app_info_launch (GAppInfo *appinfo, GList *files, GAppLaunchContext *context, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_app_info_supports_uris (GAppInfo *appinfo); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_app_info_supports_files (GAppInfo *appinfo); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_app_info_launch_uris (GAppInfo *appinfo, GList *uris, GAppLaunchContext *context, GError **error); -GLIB_AVAILABLE_IN_2_60 +GIO_AVAILABLE_IN_2_60 void g_app_info_launch_uris_async (GAppInfo *appinfo, GList *uris, GAppLaunchContext *context, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); -GLIB_AVAILABLE_IN_2_60 +GIO_AVAILABLE_IN_2_60 gboolean g_app_info_launch_uris_finish (GAppInfo *appinfo, GAsyncResult *result, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_app_info_should_show (GAppInfo *appinfo); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_app_info_set_as_default_for_type (GAppInfo *appinfo, const char *content_type, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_app_info_set_as_default_for_extension (GAppInfo *appinfo, const char *extension, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_app_info_add_supports_type (GAppInfo *appinfo, const char *content_type, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_app_info_can_remove_supports_type (GAppInfo *appinfo); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_app_info_remove_supports_type (GAppInfo *appinfo, const char *content_type, GError **error); -GLIB_AVAILABLE_IN_2_34 +GIO_AVAILABLE_IN_2_34 const char **g_app_info_get_supported_types (GAppInfo *appinfo); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_app_info_can_delete (GAppInfo *appinfo); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_app_info_delete (GAppInfo *appinfo); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_app_info_set_as_last_used_for_type (GAppInfo *appinfo, const char *content_type, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GList * g_app_info_get_all (void); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GList * g_app_info_get_all_for_type (const char *content_type); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GList * g_app_info_get_recommended_for_type (const gchar *content_type); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GList * g_app_info_get_fallback_for_type (const gchar *content_type); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_app_info_reset_type_associations (const char *content_type); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GAppInfo *g_app_info_get_default_for_type (const char *content_type, gboolean must_support_uris); -GLIB_AVAILABLE_IN_2_74 +GIO_AVAILABLE_IN_2_74 void g_app_info_get_default_for_type_async (const char *content_type, gboolean must_support_uris, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); -GLIB_AVAILABLE_IN_2_74 +GIO_AVAILABLE_IN_2_74 GAppInfo *g_app_info_get_default_for_type_finish (GAsyncResult *result, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GAppInfo *g_app_info_get_default_for_uri_scheme (const char *uri_scheme); -GLIB_AVAILABLE_IN_2_74 +GIO_AVAILABLE_IN_2_74 void g_app_info_get_default_for_uri_scheme_async (const char *uri_scheme, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); -GLIB_AVAILABLE_IN_2_74 +GIO_AVAILABLE_IN_2_74 GAppInfo *g_app_info_get_default_for_uri_scheme_finish (GAsyncResult *result, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_app_info_launch_default_for_uri (const char *uri, GAppLaunchContext *context, GError **error); -GLIB_AVAILABLE_IN_2_50 +GIO_AVAILABLE_IN_2_50 void g_app_info_launch_default_for_uri_async (const char *uri, GAppLaunchContext *context, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); -GLIB_AVAILABLE_IN_2_50 +GIO_AVAILABLE_IN_2_50 gboolean g_app_info_launch_default_for_uri_finish (GAsyncResult *result, GError **error); @@ -323,30 +323,30 @@ void (*_g_reserved3) (void); }; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GType g_app_launch_context_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GAppLaunchContext *g_app_launch_context_new (void); -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 void g_app_launch_context_setenv (GAppLaunchContext *context, const char *variable, const char *value); -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 void g_app_launch_context_unsetenv (GAppLaunchContext *context, const char *variable); -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 char ** g_app_launch_context_get_environment (GAppLaunchContext *context); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL char * g_app_launch_context_get_display (GAppLaunchContext *context, GAppInfo *info, GList *files); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL char * g_app_launch_context_get_startup_notify_id (GAppLaunchContext *context, GAppInfo *info, GList *files); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_app_launch_context_launch_failed (GAppLaunchContext *context, const char * startup_notify_id); @@ -358,10 +358,10 @@ typedef struct _GAppInfoMonitor GAppInfoMonitor; -GLIB_AVAILABLE_IN_2_40 +GIO_AVAILABLE_IN_2_40 GType g_app_info_monitor_get_type (void); -GLIB_AVAILABLE_IN_2_40 +GIO_AVAILABLE_IN_2_40 GAppInfoMonitor * g_app_info_monitor_get (void); G_END_DECLS
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gapplication-tool.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gapplication-tool.c
Changed
@@ -304,6 +304,9 @@ if ((startup_id = g_getenv ("DESKTOP_STARTUP_ID"))) g_variant_builder_add (&builder, "{sv}", "desktop-startup-id", g_variant_new_string (startup_id)); + if ((startup_id = g_getenv ("XDG_ACTIVATION_TOKEN"))) + g_variant_builder_add (&builder, "{sv}", "activation-token", g_variant_new_string (startup_id)); + return g_variant_builder_end (&builder); }
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gapplication.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gapplication.h
Changed
@@ -123,54 +123,54 @@ gpointer padding7; }; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GType g_application_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_application_id_is_valid (const gchar *application_id); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GApplication * g_application_new (const gchar *application_id, GApplicationFlags flags); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL const gchar * g_application_get_application_id (GApplication *application); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_application_set_application_id (GApplication *application, const gchar *application_id); -GLIB_AVAILABLE_IN_2_34 +GIO_AVAILABLE_IN_2_34 GDBusConnection * g_application_get_dbus_connection (GApplication *application); -GLIB_AVAILABLE_IN_2_34 +GIO_AVAILABLE_IN_2_34 const gchar * g_application_get_dbus_object_path (GApplication *application); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL guint g_application_get_inactivity_timeout (GApplication *application); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_application_set_inactivity_timeout (GApplication *application, guint inactivity_timeout); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GApplicationFlags g_application_get_flags (GApplication *application); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_application_set_flags (GApplication *application, GApplicationFlags flags); -GLIB_AVAILABLE_IN_2_42 +GIO_AVAILABLE_IN_2_42 const gchar * g_application_get_resource_base_path (GApplication *application); -GLIB_AVAILABLE_IN_2_42 +GIO_AVAILABLE_IN_2_42 void g_application_set_resource_base_path (GApplication *application, const gchar *resource_path); -GLIB_DEPRECATED +GIO_DEPRECATED void g_application_set_action_group (GApplication *application, GActionGroup *action_group); -GLIB_AVAILABLE_IN_2_40 +GIO_AVAILABLE_IN_2_40 void g_application_add_main_option_entries (GApplication *application, const GOptionEntry *entries); -GLIB_AVAILABLE_IN_2_42 +GIO_AVAILABLE_IN_2_42 void g_application_add_main_option (GApplication *application, const char *long_name, char short_name, @@ -178,76 +178,76 @@ GOptionArg arg, const char *description, const char *arg_description); -GLIB_AVAILABLE_IN_2_40 +GIO_AVAILABLE_IN_2_40 void g_application_add_option_group (GApplication *application, GOptionGroup *group); -GLIB_AVAILABLE_IN_2_56 +GIO_AVAILABLE_IN_2_56 void g_application_set_option_context_parameter_string (GApplication *application, const gchar *parameter_string); -GLIB_AVAILABLE_IN_2_56 +GIO_AVAILABLE_IN_2_56 void g_application_set_option_context_summary (GApplication *application, const gchar *summary); -GLIB_AVAILABLE_IN_2_56 +GIO_AVAILABLE_IN_2_56 void g_application_set_option_context_description (GApplication *application, const gchar *description); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_application_get_is_registered (GApplication *application); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_application_get_is_remote (GApplication *application); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_application_register (GApplication *application, GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_application_hold (GApplication *application); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_application_release (GApplication *application); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_application_activate (GApplication *application); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_application_open (GApplication *application, GFile **files, gint n_files, const gchar *hint); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL int g_application_run (GApplication *application, int argc, char **argv); -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 void g_application_quit (GApplication *application); -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 GApplication * g_application_get_default (void); -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 void g_application_set_default (GApplication *application); -GLIB_AVAILABLE_IN_2_38 +GIO_AVAILABLE_IN_2_38 void g_application_mark_busy (GApplication *application); -GLIB_AVAILABLE_IN_2_38 +GIO_AVAILABLE_IN_2_38 void g_application_unmark_busy (GApplication *application); -GLIB_AVAILABLE_IN_2_44 +GIO_AVAILABLE_IN_2_44 gboolean g_application_get_is_busy (GApplication *application); -GLIB_AVAILABLE_IN_2_40 +GIO_AVAILABLE_IN_2_40 void g_application_send_notification (GApplication *application, const gchar *id, GNotification *notification); -GLIB_AVAILABLE_IN_2_40 +GIO_AVAILABLE_IN_2_40 void g_application_withdraw_notification (GApplication *application, const gchar *id); -GLIB_AVAILABLE_IN_2_44 +GIO_AVAILABLE_IN_2_44 void g_application_bind_busy_property (GApplication *application, gpointer object, const gchar *property); -GLIB_AVAILABLE_IN_2_44 +GIO_AVAILABLE_IN_2_44 void g_application_unbind_busy_property (GApplication *application, gpointer object, const gchar *property);
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gapplicationcommandline.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gapplicationcommandline.c
Changed
@@ -497,7 +497,7 @@ * g_application_command_line_get_options_dict: * @cmdline: a #GApplicationCommandLine * - * Gets the options there were passed to g_application_command_line(). + * Gets the options that were passed to g_application_command_line(). * * If you did not override local_command_line() then these are the same * options that were parsed according to the #GOptionEntrys added to the @@ -801,7 +801,7 @@ * * For local invocation, it will be %NULL. * - * Returns: (nullable): the platform data, or %NULL + * Returns: (nullable) (transfer full): the platform data, or %NULL * * Since: 2.28 **/
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gapplicationcommandline.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gapplicationcommandline.h
Changed
@@ -71,51 +71,51 @@ gpointer padding11; }; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GType g_application_command_line_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gchar ** g_application_command_line_get_arguments (GApplicationCommandLine *cmdline, int *argc); -GLIB_AVAILABLE_IN_2_40 +GIO_AVAILABLE_IN_2_40 GVariantDict * g_application_command_line_get_options_dict (GApplicationCommandLine *cmdline); -GLIB_AVAILABLE_IN_2_36 +GIO_AVAILABLE_IN_2_36 GInputStream * g_application_command_line_get_stdin (GApplicationCommandLine *cmdline); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL const gchar * const * g_application_command_line_get_environ (GApplicationCommandLine *cmdline); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL const gchar * g_application_command_line_getenv (GApplicationCommandLine *cmdline, const gchar *name); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL const gchar * g_application_command_line_get_cwd (GApplicationCommandLine *cmdline); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_application_command_line_get_is_remote (GApplicationCommandLine *cmdline); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_application_command_line_print (GApplicationCommandLine *cmdline, const gchar *format, ...) G_GNUC_PRINTF(2, 3); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_application_command_line_printerr (GApplicationCommandLine *cmdline, const gchar *format, ...) G_GNUC_PRINTF(2, 3); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL int g_application_command_line_get_exit_status (GApplicationCommandLine *cmdline); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_application_command_line_set_exit_status (GApplicationCommandLine *cmdline, int exit_status); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GVariant * g_application_command_line_get_platform_data (GApplicationCommandLine *cmdline); -GLIB_AVAILABLE_IN_2_36 +GIO_AVAILABLE_IN_2_36 GFile * g_application_command_line_create_file_for_arg (GApplicationCommandLine *cmdline, const gchar *arg);
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gasyncinitable.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gasyncinitable.h
Changed
@@ -74,22 +74,22 @@ GError **error); }; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GType g_async_initable_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_async_initable_init_async (GAsyncInitable *initable, int io_priority, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_async_initable_init_finish (GAsyncInitable *initable, GAsyncResult *res, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_async_initable_new_async (GType object_type, int io_priority, GCancellable *cancellable, @@ -100,7 +100,7 @@ G_GNUC_BEGIN_IGNORE_DEPRECATIONS -GLIB_DEPRECATED_IN_2_54_FOR(g_object_new_with_properties and g_async_initable_init_async) +GIO_DEPRECATED_IN_2_54_FOR(g_object_new_with_properties and g_async_initable_init_async) void g_async_initable_newv_async (GType object_type, guint n_parameters, GParameter *parameters, @@ -111,7 +111,7 @@ G_GNUC_END_IGNORE_DEPRECATIONS -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_async_initable_new_valist_async (GType object_type, const gchar *first_property_name, va_list var_args, @@ -119,7 +119,7 @@ GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GObject *g_async_initable_new_finish (GAsyncInitable *initable, GAsyncResult *res, GError **error);
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gasyncresult.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gasyncresult.h
Changed
@@ -67,18 +67,18 @@ gpointer source_tag); }; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GType g_async_result_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gpointer g_async_result_get_user_data (GAsyncResult *res); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GObject *g_async_result_get_source_object (GAsyncResult *res); -GLIB_AVAILABLE_IN_2_34 +GIO_AVAILABLE_IN_2_34 gboolean g_async_result_legacy_propagate_error (GAsyncResult *res, GError **error); -GLIB_AVAILABLE_IN_2_34 +GIO_AVAILABLE_IN_2_34 gboolean g_async_result_is_tagged (GAsyncResult *res, gpointer source_tag);
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gbufferedinputstream.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gbufferedinputstream.h
Changed
@@ -84,48 +84,48 @@ }; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GType g_buffered_input_stream_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GInputStream* g_buffered_input_stream_new (GInputStream *base_stream); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GInputStream* g_buffered_input_stream_new_sized (GInputStream *base_stream, gsize size); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gsize g_buffered_input_stream_get_buffer_size (GBufferedInputStream *stream); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_buffered_input_stream_set_buffer_size (GBufferedInputStream *stream, gsize size); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gsize g_buffered_input_stream_get_available (GBufferedInputStream *stream); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gsize g_buffered_input_stream_peek (GBufferedInputStream *stream, void *buffer, gsize offset, gsize count); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL const void* g_buffered_input_stream_peek_buffer (GBufferedInputStream *stream, gsize *count); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gssize g_buffered_input_stream_fill (GBufferedInputStream *stream, gssize count, GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_buffered_input_stream_fill_async (GBufferedInputStream *stream, gssize count, int io_priority, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gssize g_buffered_input_stream_fill_finish (GBufferedInputStream *stream, GAsyncResult *result, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL int g_buffered_input_stream_read_byte (GBufferedInputStream *stream, GCancellable *cancellable, GError **error);
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gbufferedoutputstream.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gbufferedoutputstream.h
Changed
@@ -65,21 +65,21 @@ }; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GType g_buffered_output_stream_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GOutputStream* g_buffered_output_stream_new (GOutputStream *base_stream); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GOutputStream* g_buffered_output_stream_new_sized (GOutputStream *base_stream, gsize size); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gsize g_buffered_output_stream_get_buffer_size (GBufferedOutputStream *stream); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_buffered_output_stream_set_buffer_size (GBufferedOutputStream *stream, gsize size); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_buffered_output_stream_get_auto_grow (GBufferedOutputStream *stream); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_buffered_output_stream_set_auto_grow (GBufferedOutputStream *stream, gboolean auto_grow);
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gbytesicon.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gbytesicon.h
Changed
@@ -40,13 +40,13 @@ * * Gets an icon for a #GBytes. Implements #GLoadableIcon. **/ -GLIB_AVAILABLE_IN_2_38 +GIO_AVAILABLE_IN_2_38 GType g_bytes_icon_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_2_38 +GIO_AVAILABLE_IN_2_38 GIcon * g_bytes_icon_new (GBytes *bytes); -GLIB_AVAILABLE_IN_2_38 +GIO_AVAILABLE_IN_2_38 GBytes * g_bytes_icon_get_bytes (GBytesIcon *icon); G_END_DECLS
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gcancellable.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gcancellable.c
Changed
@@ -50,6 +50,8 @@ /* Access to fields below is protected by cancellable_mutex. */ guint cancelled_running : 1; guint cancelled_running_waiting : 1; + unsigned cancelled_emissions; + unsigned cancelled_emissions_waiting : 1; guint fd_refcount; GWakeup *wakeup; @@ -267,9 +269,14 @@ priv = cancellable->priv; - while (priv->cancelled_running) + while (priv->cancelled_running || priv->cancelled_emissions > 0) { - priv->cancelled_running_waiting = TRUE; + if (priv->cancelled_running) + priv->cancelled_running_waiting = TRUE; + + if (priv->cancelled_emissions > 0) + priv->cancelled_emissions_waiting = TRUE; + g_cond_wait (&cancellable_cond, &cancellable_mutex); } @@ -571,15 +578,26 @@ void (*_callback) (GCancellable *cancellable, gpointer user_data); - g_mutex_unlock (&cancellable_mutex); - _callback = (void *)callback; id = 0; + cancellable->priv->cancelled_emissions++; + + g_mutex_unlock (&cancellable_mutex); + _callback (cancellable, data); if (data_destroy_func) data_destroy_func (data); + + g_mutex_lock (&cancellable_mutex); + + if (cancellable->priv->cancelled_emissions_waiting) + g_cond_broadcast (&cancellable_cond); + + cancellable->priv->cancelled_emissions--; + + g_mutex_unlock (&cancellable_mutex); } else { @@ -630,9 +648,14 @@ priv = cancellable->priv; - while (priv->cancelled_running) + while (priv->cancelled_running || priv->cancelled_emissions) { - priv->cancelled_running_waiting = TRUE; + if (priv->cancelled_running) + priv->cancelled_running_waiting = TRUE; + + if (priv->cancelled_emissions) + priv->cancelled_emissions_waiting = TRUE; + g_cond_wait (&cancellable_cond, &cancellable_mutex); }
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gcancellable.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gcancellable.h
Changed
@@ -69,50 +69,50 @@ void (*_g_reserved5) (void); }; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GType g_cancellable_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GCancellable *g_cancellable_new (void); /* These are only safe to call inside a cancellable op */ -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_cancellable_is_cancelled (GCancellable *cancellable); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_cancellable_set_error_if_cancelled (GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL int g_cancellable_get_fd (GCancellable *cancellable); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_cancellable_make_pollfd (GCancellable *cancellable, GPollFD *pollfd); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_cancellable_release_fd (GCancellable *cancellable); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GSource * g_cancellable_source_new (GCancellable *cancellable); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GCancellable *g_cancellable_get_current (void); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_cancellable_push_current (GCancellable *cancellable); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_cancellable_pop_current (GCancellable *cancellable); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_cancellable_reset (GCancellable *cancellable); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gulong g_cancellable_connect (GCancellable *cancellable, GCallback callback, gpointer data, GDestroyNotify data_destroy_func); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_cancellable_disconnect (GCancellable *cancellable, gulong handler_id); /* This is safe to call from another thread */ -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_cancellable_cancel (GCancellable *cancellable); G_END_DECLS
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gcharsetconverter.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gcharsetconverter.h
Changed
@@ -45,19 +45,19 @@ GObjectClass parent_class; }; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GType g_charset_converter_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GCharsetConverter *g_charset_converter_new (const gchar *to_charset, const gchar *from_charset, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_charset_converter_set_use_fallback (GCharsetConverter *converter, gboolean use_fallback); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_charset_converter_get_use_fallback (GCharsetConverter *converter); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL guint g_charset_converter_get_num_fallbacks (GCharsetConverter *converter); G_END_DECLS
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gcontenttype.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gcontenttype.h
Changed
@@ -31,51 +31,51 @@ G_BEGIN_DECLS -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_content_type_equals (const gchar *type1, const gchar *type2); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_content_type_is_a (const gchar *type, const gchar *supertype); -GLIB_AVAILABLE_IN_2_52 +GIO_AVAILABLE_IN_2_52 gboolean g_content_type_is_mime_type (const gchar *type, const gchar *mime_type); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_content_type_is_unknown (const gchar *type); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gchar * g_content_type_get_description (const gchar *type); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gchar * g_content_type_get_mime_type (const gchar *type); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GIcon * g_content_type_get_icon (const gchar *type); -GLIB_AVAILABLE_IN_2_34 +GIO_AVAILABLE_IN_2_34 GIcon * g_content_type_get_symbolic_icon (const gchar *type); -GLIB_AVAILABLE_IN_2_34 +GIO_AVAILABLE_IN_2_34 gchar * g_content_type_get_generic_icon_name (const gchar *type); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_content_type_can_be_executable (const gchar *type); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gchar * g_content_type_from_mime_type (const gchar *mime_type); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gchar * g_content_type_guess (const gchar *filename, const guchar *data, gsize data_size, gboolean *result_uncertain); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gchar ** g_content_type_guess_for_tree (GFile *root); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GList * g_content_types_get_registered (void); /*< private >*/ #ifndef __GTK_DOC_IGNORE__ -GLIB_AVAILABLE_IN_2_60 +GIO_AVAILABLE_IN_2_60 const gchar * const *g_content_type_get_mime_dirs (void); -GLIB_AVAILABLE_IN_2_60 +GIO_AVAILABLE_IN_2_60 void g_content_type_set_mime_dirs (const gchar * const *dirs); #endif /* __GTK_DOC_IGNORE__ */
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gconverter.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gconverter.c
Changed
@@ -57,12 +57,14 @@ * @inbuf: (array length=inbuf_size) (element-type guint8): the buffer * containing the data to convert. * @inbuf_size: the number of bytes in @inbuf - * @outbuf: (element-type guint8) (array length=outbuf_size): a buffer to write - * converted data in. + * @outbuf: (element-type guint8) (array length=outbuf_size) (not nullable): a + * buffer to write converted data in. * @outbuf_size: the number of bytes in @outbuf, must be at least one * @flags: a #GConverterFlags controlling the conversion details - * @bytes_read: (out): will be set to the number of bytes read from @inbuf on success - * @bytes_written: (out): will be set to the number of bytes written to @outbuf on success + * @bytes_read: (out) (not nullable): will be set to the number of bytes read + * from @inbuf on success + * @bytes_written: (out) (not nullable): will be set to the number of bytes + * written to @outbuf on success * @error: location to store the error occurring, or %NULL to ignore * * This is the main operation used when converting data. It is to be called @@ -166,7 +168,12 @@ GConverterIface *iface; g_return_val_if_fail (G_IS_CONVERTER (converter), G_CONVERTER_ERROR); + g_return_val_if_fail (inbuf != NULL || inbuf_size == 0, G_CONVERTER_ERROR); + g_return_val_if_fail (outbuf != NULL, G_CONVERTER_ERROR); g_return_val_if_fail (outbuf_size > 0, G_CONVERTER_ERROR); + g_return_val_if_fail (bytes_read != NULL, G_CONVERTER_ERROR); + g_return_val_if_fail (bytes_written != NULL, G_CONVERTER_ERROR); + g_return_val_if_fail (error == NULL || *error == NULL, G_CONVERTER_ERROR); *bytes_read = 0; *bytes_written = 0;
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gconverter.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gconverter.h
Changed
@@ -75,10 +75,10 @@ void (* reset) (GConverter *converter); }; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GType g_converter_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GConverterResult g_converter_convert (GConverter *converter, const void *inbuf, gsize inbuf_size, @@ -88,7 +88,7 @@ gsize *bytes_read, gsize *bytes_written, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_converter_reset (GConverter *converter);
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gconverterinputstream.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gconverterinputstream.h
Changed
@@ -69,12 +69,12 @@ void (*_g_reserved5) (void); }; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GType g_converter_input_stream_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GInputStream *g_converter_input_stream_new (GInputStream *base_stream, GConverter *converter); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GConverter *g_converter_input_stream_get_converter (GConverterInputStream *converter_stream); G_END_DECLS
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gconverteroutputstream.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gconverteroutputstream.h
Changed
@@ -69,12 +69,12 @@ void (*_g_reserved5) (void); }; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GType g_converter_output_stream_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GOutputStream *g_converter_output_stream_new (GOutputStream *base_stream, GConverter *converter); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GConverter *g_converter_output_stream_get_converter (GConverterOutputStream *converter_stream); G_END_DECLS
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gcredentials.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gcredentials.h
Changed
@@ -46,37 +46,37 @@ typedef struct _GCredentialsClass GCredentialsClass; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GType g_credentials_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GCredentials *g_credentials_new (void); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gchar *g_credentials_to_string (GCredentials *credentials); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gpointer g_credentials_get_native (GCredentials *credentials, GCredentialsType native_type); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_credentials_set_native (GCredentials *credentials, GCredentialsType native_type, gpointer native); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_credentials_is_same_user (GCredentials *credentials, GCredentials *other_credentials, GError **error); #ifdef G_OS_UNIX -GLIB_AVAILABLE_IN_2_36 +GIO_AVAILABLE_IN_2_36 pid_t g_credentials_get_unix_pid (GCredentials *credentials, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL uid_t g_credentials_get_unix_user (GCredentials *credentials, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_credentials_set_unix_user (GCredentials *credentials, uid_t uid, GError **error);
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gdatagrambased.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gdatagrambased.h
Changed
@@ -100,11 +100,11 @@ GError **error); }; -GLIB_AVAILABLE_IN_2_48 +GIO_AVAILABLE_IN_2_48 GType g_datagram_based_get_type (void); -GLIB_AVAILABLE_IN_2_48 +GIO_AVAILABLE_IN_2_48 gint g_datagram_based_receive_messages (GDatagramBased *datagram_based, GInputMessage *messages, @@ -114,7 +114,7 @@ GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_2_48 +GIO_AVAILABLE_IN_2_48 gint g_datagram_based_send_messages (GDatagramBased *datagram_based, GOutputMessage *messages, @@ -124,16 +124,16 @@ GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_2_48 +GIO_AVAILABLE_IN_2_48 GSource * g_datagram_based_create_source (GDatagramBased *datagram_based, GIOCondition condition, GCancellable *cancellable); -GLIB_AVAILABLE_IN_2_48 +GIO_AVAILABLE_IN_2_48 GIOCondition g_datagram_based_condition_check (GDatagramBased *datagram_based, GIOCondition condition); -GLIB_AVAILABLE_IN_2_48 +GIO_AVAILABLE_IN_2_48 gboolean g_datagram_based_condition_wait (GDatagramBased *datagram_based, GIOCondition condition,
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gdatainputstream.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gdatainputstream.h
Changed
@@ -68,102 +68,102 @@ void (*_g_reserved5) (void); }; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GType g_data_input_stream_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GDataInputStream * g_data_input_stream_new (GInputStream *base_stream); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_data_input_stream_set_byte_order (GDataInputStream *stream, GDataStreamByteOrder order); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GDataStreamByteOrder g_data_input_stream_get_byte_order (GDataInputStream *stream); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_data_input_stream_set_newline_type (GDataInputStream *stream, GDataStreamNewlineType type); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GDataStreamNewlineType g_data_input_stream_get_newline_type (GDataInputStream *stream); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL guchar g_data_input_stream_read_byte (GDataInputStream *stream, GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gint16 g_data_input_stream_read_int16 (GDataInputStream *stream, GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL guint16 g_data_input_stream_read_uint16 (GDataInputStream *stream, GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gint32 g_data_input_stream_read_int32 (GDataInputStream *stream, GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL guint32 g_data_input_stream_read_uint32 (GDataInputStream *stream, GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gint64 g_data_input_stream_read_int64 (GDataInputStream *stream, GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL guint64 g_data_input_stream_read_uint64 (GDataInputStream *stream, GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL char * g_data_input_stream_read_line (GDataInputStream *stream, gsize *length, GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_2_30 +GIO_AVAILABLE_IN_2_30 char * g_data_input_stream_read_line_utf8 (GDataInputStream *stream, gsize *length, GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_data_input_stream_read_line_async (GDataInputStream *stream, gint io_priority, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL char * g_data_input_stream_read_line_finish (GDataInputStream *stream, GAsyncResult *result, gsize *length, GError **error); -GLIB_AVAILABLE_IN_2_30 +GIO_AVAILABLE_IN_2_30 char * g_data_input_stream_read_line_finish_utf8(GDataInputStream *stream, GAsyncResult *result, gsize *length, GError **error); -GLIB_DEPRECATED_IN_2_56_FOR (g_data_input_stream_read_upto) +GIO_DEPRECATED_IN_2_56_FOR (g_data_input_stream_read_upto) char * g_data_input_stream_read_until (GDataInputStream *stream, const gchar *stop_chars, gsize *length, GCancellable *cancellable, GError **error); -GLIB_DEPRECATED_IN_2_56_FOR (g_data_input_stream_read_upto_async) +GIO_DEPRECATED_IN_2_56_FOR (g_data_input_stream_read_upto_async) void g_data_input_stream_read_until_async (GDataInputStream *stream, const gchar *stop_chars, gint io_priority, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); -GLIB_DEPRECATED_IN_2_56_FOR (g_data_input_stream_read_upto_finish) +GIO_DEPRECATED_IN_2_56_FOR (g_data_input_stream_read_upto_finish) char * g_data_input_stream_read_until_finish (GDataInputStream *stream, GAsyncResult *result, gsize *length, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL char * g_data_input_stream_read_upto (GDataInputStream *stream, const gchar *stop_chars, gssize stop_chars_len, gsize *length, GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_data_input_stream_read_upto_async (GDataInputStream *stream, const gchar *stop_chars, gssize stop_chars_len, @@ -171,7 +171,7 @@ GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL char * g_data_input_stream_read_upto_finish (GDataInputStream *stream, GAsyncResult *result, gsize *length,
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gdataoutputstream.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gdataoutputstream.h
Changed
@@ -70,53 +70,53 @@ }; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GType g_data_output_stream_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GDataOutputStream * g_data_output_stream_new (GOutputStream *base_stream); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_data_output_stream_set_byte_order (GDataOutputStream *stream, GDataStreamByteOrder order); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GDataStreamByteOrder g_data_output_stream_get_byte_order (GDataOutputStream *stream); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_data_output_stream_put_byte (GDataOutputStream *stream, guchar data, GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_data_output_stream_put_int16 (GDataOutputStream *stream, gint16 data, GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_data_output_stream_put_uint16 (GDataOutputStream *stream, guint16 data, GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_data_output_stream_put_int32 (GDataOutputStream *stream, gint32 data, GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_data_output_stream_put_uint32 (GDataOutputStream *stream, guint32 data, GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_data_output_stream_put_int64 (GDataOutputStream *stream, gint64 data, GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_data_output_stream_put_uint64 (GDataOutputStream *stream, guint64 data, GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_data_output_stream_put_string (GDataOutputStream *stream, const char *str, GCancellable *cancellable,
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gdbus-2.0/codegen/codegen.py -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gdbus-2.0/codegen/codegen.py
Changed
@@ -2364,8 +2364,17 @@ "{\n" % (p.arg.ctype_in, i.name_lower, p.name_lower, i.camel_name) ) self.outfile.write( + " g_return_val_if_fail (%sIS_%s (object), %s);\n" + "\n" " return %s%s_GET_IFACE (object)->get_%s (object);\n" - % (i.ns_upper, i.name_upper, p.name_lower) + % ( + i.ns_upper, + i.name_upper, + p.arg.ctype_in_default_value, + i.ns_upper, + i.name_upper, + p.name_lower, + ) ) self.outfile.write("}\n") self.outfile.write("\n") @@ -3100,9 +3109,6 @@ # property vfuncs for p in i.properties: - nul_value = "0" - if p.arg.free_func is not None: - nul_value = "NULL" self.outfile.write( "static %s\n" "%s_proxy_get_%s (%s *object)\n" @@ -3119,7 +3125,7 @@ i.ns_upper, i.name_upper, p.arg.ctype_in, - nul_value, + p.arg.ctype_in_default_value, ) ) # For some property types, we have to free the returned
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gdbus-2.0/codegen/codegen_main.py -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gdbus-2.0/codegen/codegen_main.py
Changed
@@ -30,6 +30,7 @@ from . import parser from . import codegen from . import codegen_docbook +from . import codegen_md from . import codegen_rst from .utils import print_error, print_warning @@ -213,6 +214,11 @@ help="Generate Docbook in OUTFILES-org.Project.IFace.xml", ) arg_parser.add_argument( + "--generate-md", + metavar="OUTFILES", + help="Generate Markdown in OUTFILES-org.Project.IFace.md", + ) + arg_parser.add_argument( "--generate-rst", metavar="OUTFILES", help="Generate reStructuredText in OUTFILES-org.Project.IFace.rst", @@ -295,10 +301,11 @@ if ( args.generate_c_code is not None or args.generate_docbook is not None + or args.generate_md is not None or args.generate_rst is not None ) and args.output is not None: print_error( - "Using --generate-c-code or --generate-docbook or --generate-rst and " + "Using --generate-c-code or --generate-{docbook,md,rst} and " "--output at the same time is not allowed" ) @@ -428,6 +435,11 @@ if docbook: docbook_gen.generate(docbook, args.output_directory) + md = args.generate_md + md_gen = codegen_md.MdCodeGenerator(all_ifaces) + if md: + md_gen.generate(md, args.output_directory) + rst = args.generate_rst rst_gen = codegen_rst.RstCodeGenerator(all_ifaces) if rst:
View file
_service:tar_scm:glib-2.76.4.tar.xz/gio/gdbus-2.0/codegen/codegen_md.py
Added
@@ -0,0 +1,302 @@ +# SPDX-FileCopyrightText: 2023 Guido Günther +# base on # codegen_rst.py (C) 2022 Emmanuele Bassi +# +# SPDX-License-Identifier: LGPL-2.1-or-later + +import os +import re + +from . import utils + +# Disable line length warnings as wrapping the templates would be hard +# flake8: noqa: E501 + + +class MdCodeGenerator: + """Generates documentation in Markdown format.""" + + def __init__(self, ifaces): + self.ifaces = ifaces + self._generate_expand_dicts() + + def _expand(self, s, expandParamsAndConstants): + """Expands parameters and constant literals.""" + res = + for line in s.split("\n"): + line = line.strip() + if line == "": + res.append("") + continue + for key in self._expand_member_dict_keys: + line = line.replace(key, self._expand_member_dictkey) + for key in self._expand_iface_dict_keys: + line = line.replace(key, self._expand_iface_dictkey) + if expandParamsAndConstants: + # replace @foo with `foo` + line = re.sub( + "@a-zA-Z0-9_*", + lambda m: "`" + m.group(0)1: + "`", + line, + ) + # replace e.g. %TRUE with ``TRUE`` + line = re.sub( + "%a-zA-Z0-9_*", + lambda m: "`" + m.group(0)1: + "`", + line, + ) + res.append(line) + return "\n".join(res) + + def _generate_expand_dicts(self): + """Generates the dictionaries used to expand gtk-doc sigils.""" + self._expand_member_dict = {} + self._expand_iface_dict = {} + for i in self.ifaces: + key = f"#{i.name}" + value = f"`{i.name}`_" + self._expand_iface_dictkey = value + + for m in i.methods: + key = "%s.%s()" % (i.name, m.name) + value = f"`{i.name}.{m.name}`_" + self._expand_member_dictkey = value + + for s in i.signals: + key = "#%s::%s" % (i.name, s.name) + value = f"`{i.name}::{s.name}`_" + self._expand_member_dictkey = value + + for p in i.properties: + key = "#%s:%s" % (i.name, p.name) + value = f"`{i.name}:{p.name}`_" + self._expand_member_dictkey = value + + # Make sure to expand the keys in reverse order so e.g. #org.foo.Iface:MediaCompat + # is evaluated before #org.foo.Iface:Media ... + self._expand_member_dict_keys = sorted( + self._expand_member_dict.keys(), reverse=True + ) + self._expand_iface_dict_keys = sorted( + self._expand_iface_dict.keys(), reverse=True + ) + + def _generate_header(self, iface): + """Generates the header and preamble of the document.""" + header_len = len(iface.name) + res = + f"Title: {iface.name} D-Bus Interface", + f"Slug: {iface.name}", + "", + "# " + iface.name, + "", + "## Description", + "", + iface.doc_string_brief.strip(), + "", + self._expand(iface.doc_string, True), + "", + + if iface.since: + res += + f"Interface available since: {iface.since}.", + "", + + if iface.deprecated: + res += + "*Warning*: This interface is deprecated.", + "", + + res += "" + return "\n".join(res) + + def _generate_section(self, title, name): + """Generates a section with the given title.""" + res = + "### " + title, + "", + + return "\n".join(res) + + def _generate_properties(self, iface): + """Generates the properties section.""" + res = + for p in iface.properties: + title = f"{iface.name}:{p.name}" + if p.readable and p.writable: + access = "readwrite" + elif p.writable: + access = "writable" + else: + access = "readable" + res += + "### " + title, + "", + "```", + f" {p.name} {access} {p.signature}", + "```", + "", + self._expand(p.doc_string, True), + "", + + if p.since: + res += + f"Property available since: {p.since}.", + "", + + if p.deprecated: + res += + "*Warning*: This property is deprecated.", + "", + + res += "" + return "\n".join(res) + + def _generate_method_signature(self, method): + """Generates the method signature as a code block.""" + res = + "```", + + n_in_args = len(method.in_args) + n_out_args = len(method.out_args) + if n_in_args == 0 and n_out_args == 0: + res += + f" {method.name} ()", + + else: + res += + f" {method.name} (", + + for idx, arg in enumerate(method.in_args): + if idx == n_in_args - 1 and n_out_args == 0: + res += + f" IN {arg.name} {arg.signature}", + + else: + res += + f" IN {arg.name} {arg.signature},", + + for idx, arg in enumerate(method.out_args): + if idx == n_out_args - 1: + res += + f" OUT {arg.name} {arg.signature}", + + else: + res += + f" OUT {arg.name} {arg.signature},", + + res += + " )", + + res += "```" + return "\n".join(res) + + def _generate_methods(self, iface): + """Generates the methods section.""" + res = + for m in iface.methods: + title = f"{iface.name}.{m.name}" + res += + "### " + title, + "", + self._generate_method_signature(m), + "", + self._expand(m.doc_string, True), + "", + + for a in m.in_args: + arg_desc = self._expand(a.doc_string, True) + res += + f"* {a.name}: {arg_desc}", + "", + + res += "" + if m.since: + res += + f"Method available since: {m.since}.", + "", + + if m.deprecated: + res += + "*Warning*: This method is deprecated.", + "", + + res += "" + return "\n".join(res) + + def _generate_signal_signature(self, signal): + """Generates the signal signature.""" + res = + "```", + + n_args = len(signal.args) + if n_args == 0: + res += + f" {signal.name} ()", + + else: + res += + f" {signal.name} (", + + for idx, arg in enumerate(signal.args): + if idx == n_args - 1: + res += + f" {arg.name} {arg.signature}", + + else: + res += + f" {arg.name} {arg.signature},", + + res += + " )", + + res += "```" + return "\n".join(res) + + def _generate_signals(self, iface): + """Generates the signals section.""" + res = + for s in iface.signals: + title = f"{iface.name}::{s.name}" + res += + "### " + title, + "", + self._generate_signal_signature(s), + "", + self._expand(s.doc_string, True), + "", + + for a in s.args: + arg_desc = self._expand(a.doc_string, True) + res += + f"{a.name}", + f" {arg_desc}", + "", + + res += "" + if s.since: + res += + f"Signal available since: {s.since}.", + "", + + if s.deprecated: + res += + "*Warning*: This signal is deprecated.", + "", + + res += "" + return "\n".join(res) + + def generate(self, md, outdir): + """Generates the Markdown file for each interface.""" + for i in self.ifaces: + with open(os.path.join(outdir, f"{md}-{i.name}.md"), "w") as outfile: + outfile.write(self._generate_header(i)) + if len(i.properties) > 0: + outfile.write(self._generate_section("Properties", i.name)) + outfile.write(self._generate_properties(i)) + if len(i.methods) > 0: + outfile.write(self._generate_section("Methods", i.name)) + outfile.write(self._generate_methods(i)) + if len(i.signals) > 0: + outfile.write(self._generate_section("Signals", i.name)) + outfile.write(self._generate_signals(i))
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gdbus-2.0/codegen/dbustypes.py -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gdbus-2.0/codegen/dbustypes.py
Changed
@@ -76,6 +76,7 @@ self.ctype_in_g = "GVariant *" self.ctype_in = "GVariant *" self.ctype_in_dup = "GVariant *" + self.ctype_in_default_value = "NULL" self.ctype_out = "GVariant **" self.gtype = "G_TYPE_VARIANT" self.free_func = "g_variant_unref" @@ -91,6 +92,7 @@ if self.signature == "b": self.ctype_in_g = "gboolean " self.ctype_in = "gboolean " + self.ctype_in_default_value = "FALSE" self.ctype_out = "gboolean *" self.gtype = "G_TYPE_BOOLEAN" self.free_func = None @@ -101,6 +103,7 @@ elif self.signature == "y": self.ctype_in_g = "guchar " self.ctype_in = "guchar " + self.ctype_in_default_value = "'\\0'" self.ctype_out = "guchar *" self.gtype = "G_TYPE_UCHAR" self.free_func = None @@ -111,6 +114,7 @@ elif self.signature == "n": self.ctype_in_g = "gint " self.ctype_in = "gint16 " + self.ctype_in_default_value = "0" self.ctype_out = "gint16 *" self.gtype = "G_TYPE_INT" self.free_func = None @@ -121,6 +125,7 @@ elif self.signature == "q": self.ctype_in_g = "guint " self.ctype_in = "guint16 " + self.ctype_in_default_value = "0" self.ctype_out = "guint16 *" self.gtype = "G_TYPE_UINT" self.free_func = None @@ -131,6 +136,7 @@ elif self.signature == "i": self.ctype_in_g = "gint " self.ctype_in = "gint " + self.ctype_in_default_value = "0" self.ctype_out = "gint *" self.gtype = "G_TYPE_INT" self.free_func = None @@ -141,6 +147,7 @@ elif self.signature == "u": self.ctype_in_g = "guint " self.ctype_in = "guint " + self.ctype_in_default_value = "0" self.ctype_out = "guint *" self.gtype = "G_TYPE_UINT" self.free_func = None @@ -151,6 +158,7 @@ elif self.signature == "x": self.ctype_in_g = "gint64 " self.ctype_in = "gint64 " + self.ctype_in_default_value = "0" self.ctype_out = "gint64 *" self.gtype = "G_TYPE_INT64" self.free_func = None @@ -162,6 +170,7 @@ self.ctype_in_g = "guint64 " self.ctype_in = "guint64 " self.ctype_out = "guint64 *" + self.ctype_in_default_value = "0" self.gtype = "G_TYPE_UINT64" self.free_func = None self.format_in = "t" @@ -171,6 +180,7 @@ elif self.signature == "d": self.ctype_in_g = "gdouble " self.ctype_in = "gdouble " + self.ctype_in_default_value = "0.0" self.ctype_out = "gdouble *" self.gtype = "G_TYPE_DOUBLE" self.free_func = None @@ -182,6 +192,7 @@ self.ctype_in_g = "const gchar *" self.ctype_in = "const gchar *" self.ctype_in_dup = "gchar *" + self.ctype_in_default_value = "NULL" self.ctype_out = "gchar **" self.gtype = "G_TYPE_STRING" self.free_func = "g_free" @@ -193,6 +204,7 @@ self.ctype_in_g = "const gchar *" self.ctype_in = "const gchar *" self.ctype_in_dup = "gchar *" + self.ctype_in_default_value = "NULL" self.ctype_out = "gchar **" self.gtype = "G_TYPE_STRING" self.free_func = "g_free" @@ -204,6 +216,7 @@ self.ctype_in_g = "const gchar *" self.ctype_in = "const gchar *" self.ctype_in_dup = "gchar *" + self.ctype_in_default_value = "NULL" self.ctype_out = "gchar **" self.gtype = "G_TYPE_STRING" self.free_func = "g_free" @@ -214,6 +227,7 @@ elif self.signature == "ay": self.ctype_in_g = "const gchar *" self.ctype_in = "const gchar *" + self.ctype_in_default_value = "NULL" self.ctype_in_dup = "gchar *" self.ctype_out = "gchar **" self.gtype = "G_TYPE_STRING" @@ -226,6 +240,7 @@ self.ctype_in_g = "const gchar *const *" self.ctype_in = "const gchar *const *" self.ctype_in_dup = "gchar **" + self.ctype_in_default_value = "NULL" self.ctype_out = "gchar ***" self.gtype = "G_TYPE_STRV" self.free_func = "g_strfreev" @@ -238,6 +253,7 @@ self.ctype_in_g = "const gchar *const *" self.ctype_in = "const gchar *const *" self.ctype_in_dup = "gchar **" + self.ctype_in_default_value = "NULL" self.ctype_out = "gchar ***" self.gtype = "G_TYPE_STRV" self.free_func = "g_strfreev" @@ -250,6 +266,7 @@ self.ctype_in_g = "const gchar *const *" self.ctype_in = "const gchar *const *" self.ctype_in_dup = "gchar **" + self.ctype_in_default_value = "NULL" self.ctype_out = "gchar ***" self.gtype = "G_TYPE_STRV" self.free_func = "g_strfreev"
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gdbus-2.0/codegen/meson.build -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gdbus-2.0/codegen/meson.build
Changed
@@ -3,6 +3,7 @@ 'codegen.py', 'codegen_main.py', 'codegen_docbook.py', + 'codegen_md.py', 'codegen_rst.py', 'dbustypes.py', 'parser.py',
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gdbus-tool.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gdbus-tool.c
Changed
@@ -326,8 +326,7 @@ GVariantIter *iter; gchar *str; GHashTable *name_set; - GList *keys; - GList *l; + GPtrArray *keys; name_set = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL); @@ -379,17 +378,17 @@ g_variant_iter_free (iter); g_variant_unref (result); - keys = g_hash_table_get_keys (name_set); - keys = g_list_sort (keys, (GCompareFunc) g_strcmp0); - for (l = keys; l != NULL; l = l->next) + keys = g_hash_table_steal_all_keys (name_set); + g_ptr_array_sort_values (keys, (GCompareFunc) g_strcmp0); + for (guint i = 0; i < keys->len; ++i) { - const gchar *name = l->data; + const gchar *name = g_ptr_array_index (keys, i); if (!include_unique_names && g_str_has_prefix (name, ":")) continue; g_print ("%s \n", name); } - g_list_free (keys); + g_clear_pointer (&keys, g_ptr_array_unref); out: g_hash_table_unref (name_set);
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gdbusactiongroup.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gdbusactiongroup.h
Changed
@@ -43,10 +43,10 @@ #define G_DBUS_ACTION_GROUP_GET_CLASS(inst) (G_TYPE_INSTANCE_GET_CLASS ((inst), \ G_TYPE_DBUS_ACTION_GROUP, GDBusActionGroupClass)) -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GType g_dbus_action_group_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 GDBusActionGroup * g_dbus_action_group_get (GDBusConnection *connection, const gchar *bus_name, const gchar *object_path);
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gdbusaddress.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gdbusaddress.c
Changed
@@ -53,6 +53,12 @@ #include <windows.h> #endif +#ifdef G_OS_WIN32 +#define FO_CLOEXEC "" +#else +#define FO_CLOEXEC "e" +#endif + #include "glibintl.h" /** @@ -130,24 +136,22 @@ GError **error) { gboolean ret; - GList *keys; - GList *l; + GPtrArray *keys; const gchar *path; const gchar *dir; const gchar *tmpdir; const gchar *abstract; ret = FALSE; - keys = NULL; path = NULL; dir = NULL; tmpdir = NULL; abstract = NULL; - keys = g_hash_table_get_keys (key_value_pairs); - for (l = keys; l != NULL; l = l->next) + keys = g_hash_table_get_keys_as_ptr_array (key_value_pairs); + for (guint i = 0; i < keys->len; ++i) { - const gchar *key = l->data; + const gchar *key = g_ptr_array_index (keys, i); if (g_strcmp0 (key, "path") == 0) path = g_hash_table_lookup (key_value_pairs, key); else if (g_strcmp0 (key, "dir") == 0) @@ -191,7 +195,7 @@ ret = TRUE; out: - g_list_free (keys); + g_ptr_array_unref (keys); return ret; } @@ -202,8 +206,7 @@ GError **error) { gboolean ret; - GList *keys; - GList *l; + GPtrArray *keys; const gchar *host; const gchar *port; const gchar *family; @@ -212,16 +215,15 @@ gchar *endp; ret = FALSE; - keys = NULL; host = NULL; port = NULL; family = NULL; nonce_file = NULL; - keys = g_hash_table_get_keys (key_value_pairs); - for (l = keys; l != NULL; l = l->next) + keys = g_hash_table_get_keys_as_ptr_array (key_value_pairs); + for (guint i = 0; i < keys->len; ++i) { - const gchar *key = l->data; + const gchar *key = g_ptr_array_index (keys, i); if (g_strcmp0 (key, "host") == 0) host = g_hash_table_lookup (key_value_pairs, key); else if (g_strcmp0 (key, "port") == 0) @@ -284,7 +286,7 @@ ret = TRUE; out: - g_list_free (keys); + g_ptr_array_unref (keys); return ret; } @@ -295,8 +297,7 @@ GError **error) { gboolean ret; - GList *keys; - GList *l; + GPtrArray *keys; const gchar *host; const gchar *port; const gchar *family; @@ -304,15 +305,14 @@ gchar *endp; ret = FALSE; - keys = NULL; host = NULL; port = NULL; family = NULL; - keys = g_hash_table_get_keys (key_value_pairs); - for (l = keys; l != NULL; l = l->next) + keys = g_hash_table_get_keys_as_ptr_array (key_value_pairs); + for (guint i = 0; i < keys->len; ++i) { - const gchar *key = l->data; + const gchar *key = g_ptr_array_index (keys, i); if (g_strcmp0 (key, "host") == 0) host = g_hash_table_lookup (key_value_pairs, key); else if (g_strcmp0 (key, "port") == 0) @@ -363,7 +363,7 @@ ret= TRUE; out: - g_list_free (keys); + g_ptr_array_unref (keys); return ret; } @@ -717,7 +717,7 @@ int errsv; /* be careful to read only 16 bytes - we also check that the file is only 16 bytes long */ - f = fopen (nonce_file, "rb"); + f = fopen (nonce_file, "rb" FO_CLOEXEC); errsv = errno; if (f == NULL) { @@ -1337,7 +1337,12 @@ if (ret == NULL) { - ret = g_strdup ("unix:path=/var/run/dbus/system_bus_socket"); + /* While the D-Bus specification says this must be `/var/run/dbus/system_bus_socket`, + * a footnote allows it to use localstatedir: + * https://dbus.freedesktop.org/doc/dbus-specification.html#ftn.id-1.13.6.4.3.3 + * or, on systems where /run is the same as /var/run, runstatedir: + * https://gitlab.freedesktop.org/dbus/dbus/-/merge_requests/209 */ + ret = g_strdup ("unix:path=" GLIB_RUNSTATEDIR "/dbus/system_bus_socket"); } break;
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gdbusaddress.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gdbusaddress.h
Changed
@@ -31,33 +31,33 @@ G_BEGIN_DECLS -GLIB_AVAILABLE_IN_2_36 +GIO_AVAILABLE_IN_2_36 gchar *g_dbus_address_escape_value (const gchar *string); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_dbus_is_address (const gchar *string); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_dbus_is_supported_address (const gchar *string, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_dbus_address_get_stream (const gchar *address, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GIOStream *g_dbus_address_get_stream_finish (GAsyncResult *res, gchar **out_guid, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GIOStream *g_dbus_address_get_stream_sync (const gchar *address, gchar **out_guid, GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gchar *g_dbus_address_get_for_bus_sync (GBusType bus_type, GCancellable *cancellable, GError **error);
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gdbusauth.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gdbusauth.c
Changed
@@ -949,7 +949,6 @@ { gboolean ret; ServerState state; - GDataInputStream *dis; GDataOutputStream *dos; GError *local_error; gchar *line; @@ -965,7 +964,6 @@ _g_dbus_auth_add_mechs (auth, observer); ret = FALSE; - dis = NULL; dos = NULL; mech = NULL; negotiated_capabilities = 0; @@ -981,13 +979,18 @@ goto out; } - dis = G_DATA_INPUT_STREAM (g_data_input_stream_new (g_io_stream_get_input_stream (auth->priv->stream))); + /* We use an extremely slow (but reliable) line reader for input + * instead of something buffered - this basically does a recvfrom() + * system call per character + * + * (the problem with using GDataInputStream's read_line is that + * because of buffering it might start reading into the first D-Bus + * message that appears after "BEGIN\r\n"....) + */ + dos = G_DATA_OUTPUT_STREAM (g_data_output_stream_new (g_io_stream_get_output_stream (auth->priv->stream))); - g_filter_input_stream_set_close_base_stream (G_FILTER_INPUT_STREAM (dis), FALSE); g_filter_output_stream_set_close_base_stream (G_FILTER_OUTPUT_STREAM (dos), FALSE); - g_data_input_stream_set_newline_type (dis, G_DATA_STREAM_NEWLINE_TYPE_CR_LF); - /* read the NUL-byte, possibly with credentials attached */ #ifndef G_CREDENTIALS_PREFER_MESSAGE_PASSING if (G_IS_SOCKET_CONNECTION (auth->priv->stream)) @@ -1026,11 +1029,22 @@ } else { + gchar c; + gssize num_read; + local_error = NULL; - (void)g_data_input_stream_read_byte (dis, cancellable, &local_error); - if (local_error != NULL) + num_read = g_input_stream_read (g_io_stream_get_input_stream (auth->priv->stream), + &c, 1, + cancellable, &local_error); + if (num_read != 1 || local_error != NULL) { - g_propagate_error (error, local_error); + if (local_error == NULL) + g_set_error_literal (error, + G_IO_ERROR, + G_IO_ERROR_FAILED, + _ ("Unexpected lack of content trying to read a byte")); + else + g_propagate_error (error, local_error); goto out; } } @@ -1058,7 +1072,10 @@ { case SERVER_STATE_WAITING_FOR_AUTH: debug_print ("SERVER: WaitingForAuth"); - line = _my_g_data_input_stream_read_line (dis, &line_length, cancellable, error); + line = _my_g_input_stream_read_line_safe (g_io_stream_get_input_stream (auth->priv->stream), + &line_length, + cancellable, + error); debug_print ("SERVER: WaitingForAuth, read '%s'", line); if (line == NULL) goto out; @@ -1276,7 +1293,10 @@ case SERVER_STATE_WAITING_FOR_DATA: debug_print ("SERVER: WaitingForData"); - line = _my_g_data_input_stream_read_line (dis, &line_length, cancellable, error); + line = _my_g_input_stream_read_line_safe (g_io_stream_get_input_stream (auth->priv->stream), + &line_length, + cancellable, + error); debug_print ("SERVER: WaitingForData, read '%s'", line); if (line == NULL) goto out; @@ -1315,13 +1335,6 @@ case SERVER_STATE_WAITING_FOR_BEGIN: debug_print ("SERVER: WaitingForBegin"); - /* Use extremely slow (but reliable) line reader - this basically - * does a recvfrom() system call per character - * - * (the problem with using GDataInputStream's read_line is that because of - * buffering it might start reading into the first D-Bus message that - * appears after "BEGIN\r\n"....) - */ line = _my_g_input_stream_read_line_safe (g_io_stream_get_input_stream (auth->priv->stream), &line_length, cancellable, @@ -1380,7 +1393,6 @@ out: g_clear_object (&mech); - g_clear_object (&dis); g_clear_object (&dos); g_clear_object (&own_credentials);
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gdbusauthmechanismsha1.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gdbusauthmechanismsha1.c
Changed
@@ -37,6 +37,10 @@ #include "gwin32sid.h" #endif +#ifndef O_CLOEXEC +#define O_CLOEXEC 0 +#endif + #include "gdbusauthmechanismsha1.h" #include "gcredentials.h" #include "gdbuserror.h" @@ -519,7 +523,7 @@ int errsv; gint ret; - ret = g_open (lock_path, O_CREAT | O_EXCL, 0600); + ret = g_open (lock_path, O_CREAT | O_EXCL | O_CLOEXEC, 0600); errsv = errno; if (ret < 0) {
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gdbusauthobserver.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gdbusauthobserver.h
Changed
@@ -35,16 +35,16 @@ #define G_DBUS_AUTH_OBSERVER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_DBUS_AUTH_OBSERVER, GDBusAuthObserver)) #define G_IS_DBUS_AUTH_OBSERVER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_DBUS_AUTH_OBSERVER)) -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GType g_dbus_auth_observer_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GDBusAuthObserver *g_dbus_auth_observer_new (void); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_dbus_auth_observer_authorize_authenticated_peer (GDBusAuthObserver *observer, GIOStream *stream, GCredentials *credentials); -GLIB_AVAILABLE_IN_2_34 +GIO_AVAILABLE_IN_2_34 gboolean g_dbus_auth_observer_allow_mechanism (GDBusAuthObserver *observer, const gchar *mechanism);
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gdbusconnection.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gdbusconnection.c
Changed
@@ -409,7 +409,7 @@ GDBusConnectionFlags flags; /* Map used for managing method replies, protected by @lock */ - GHashTable *map_method_serial_to_task; /* guint32 -> GTask* */ + GHashTable *map_method_serial_to_task; /* guint32 -> owned GTask* */ /* Maps used for managing signal subscription, protected by @lock */ GHashTable *map_rule_to_signal_data; /* match rule (gchar*) -> SignalData */ @@ -1061,7 +1061,7 @@ g_mutex_init (&connection->lock); g_mutex_init (&connection->init_lock); - connection->map_method_serial_to_task = g_hash_table_new (g_direct_hash, g_direct_equal); + connection->map_method_serial_to_task = g_hash_table_new_full (g_direct_hash, g_direct_equal, NULL, g_object_unref); connection->map_rule_to_signal_data = g_hash_table_new (g_str_hash, g_str_equal); @@ -1750,8 +1750,9 @@ guint32 serial; gulong cancellable_handler_id; + GSource *cancelled_idle_source; /* (owned) (nullable) */ - GSource *timeout_source; + GSource *timeout_source; /* (owned) (nullable) */ gboolean delivered; } SendMessageData; @@ -1760,6 +1761,7 @@ static void send_message_data_free (SendMessageData *data) { + /* These should already have been cleared by send_message_with_reply_cleanup(). */ g_assert (data->timeout_source == NULL); g_assert (data->cancellable_handler_id == 0); @@ -1768,7 +1770,7 @@ /* ---------------------------------------------------------------------------------------------------- */ -/* can be called from any thread with lock held; @task is (transfer full) */ +/* can be called from any thread with lock held; @task is (transfer none) */ static void send_message_with_reply_cleanup (GTask *task, gboolean remove) { @@ -1784,13 +1786,18 @@ if (data->timeout_source != NULL) { g_source_destroy (data->timeout_source); - data->timeout_source = NULL; + g_clear_pointer (&data->timeout_source, g_source_unref); } if (data->cancellable_handler_id > 0) { g_cancellable_disconnect (g_task_get_cancellable (task), data->cancellable_handler_id); data->cancellable_handler_id = 0; } + if (data->cancelled_idle_source != NULL) + { + g_source_destroy (data->cancelled_idle_source); + g_clear_pointer (&data->cancelled_idle_source, g_source_unref); + } if (remove) { @@ -1798,13 +1805,11 @@ GUINT_TO_POINTER (data->serial)); g_warn_if_fail (removed); } - - g_object_unref (task); } /* ---------------------------------------------------------------------------------------------------- */ -/* Called from GDBus worker thread with lock held; @task is (transfer full). */ +/* Called from GDBus worker thread with lock held; @task is (transfer none). */ static void send_message_data_deliver_reply_unlocked (GTask *task, GDBusMessage *reply) @@ -1822,7 +1827,7 @@ ; } -/* Called from a user thread, lock is not held */ +/* Called from a user thread, lock is not held; @task is (transfer none) */ static void send_message_data_deliver_error (GTask *task, GQuark domain, @@ -1839,7 +1844,10 @@ return; } + /* Hold a ref on @task as send_message_with_reply_cleanup() will remove it + * from the task map and could end up dropping the last reference */ g_object_ref (task); + send_message_with_reply_cleanup (task, TRUE); CONNECTION_UNLOCK (connection); @@ -1849,7 +1857,7 @@ /* ---------------------------------------------------------------------------------------------------- */ -/* Called from a user thread, lock is not held; @task is (transfer full) */ +/* Called from a user thread, lock is not held; @task is (transfer none) */ static gboolean send_message_with_reply_cancelled_idle_cb (gpointer user_data) { @@ -1857,7 +1865,7 @@ send_message_data_deliver_error (task, G_IO_ERROR, G_IO_ERROR_CANCELLED, _("Operation was cancelled")); - return FALSE; + return G_SOURCE_REMOVE; } /* Can be called from any thread with or without lock held */ @@ -1866,20 +1874,22 @@ gpointer user_data) { GTask *task = user_data; - GSource *idle_source; + SendMessageData *data = g_task_get_task_data (task); /* postpone cancellation to idle handler since we may be called directly * via g_cancellable_connect() (e.g. holding lock) */ - idle_source = g_idle_source_new (); - g_source_set_static_name (idle_source, "gio send_message_with_reply_cancelled_idle_cb"); - g_task_attach_source (task, idle_source, send_message_with_reply_cancelled_idle_cb); - g_source_unref (idle_source); + if (data->cancelled_idle_source != NULL) + return; + + data->cancelled_idle_source = g_idle_source_new (); + g_source_set_static_name (data->cancelled_idle_source, "gio send_message_with_reply_cancelled_idle_cb"); + g_task_attach_source (task, data->cancelled_idle_source, send_message_with_reply_cancelled_idle_cb); } /* ---------------------------------------------------------------------------------------------------- */ -/* Called from a user thread, lock is not held; @task is (transfer full) */ +/* Called from a user thread, lock is not held; @task is (transfer none) */ static gboolean send_message_with_reply_timeout_cb (gpointer user_data) { @@ -1887,7 +1897,7 @@ send_message_data_deliver_error (task, G_IO_ERROR, G_IO_ERROR_TIMED_OUT, _("Timeout was reached")); - return FALSE; + return G_SOURCE_REMOVE; } /* ---------------------------------------------------------------------------------------------------- */ @@ -1945,9 +1955,9 @@ if (timeout_msec != G_MAXINT) { data->timeout_source = g_timeout_source_new (timeout_msec); + g_source_set_static_name (data->timeout_source, "gio send_message_with_reply_unlocked"); g_task_attach_source (task, data->timeout_source, (GSourceFunc) send_message_with_reply_timeout_cb); - g_source_unref (data->timeout_source); } g_hash_table_insert (connection->map_method_serial_to_task, @@ -2388,7 +2398,8 @@ return message; } -/* called with connection lock held, in GDBusWorker thread */ +/* called with connection lock held, in GDBusWorker thread + * @key, @value and @user_data are (transfer none) */ static gboolean cancel_method_on_close (gpointer key, gpointer value, gpointer user_data) { @@ -3443,7 +3454,7 @@ * @user_data_free_func: (nullable): function to free @user_data with when * subscription is removed or %NULL * - * Subscribes to signals on @connection and invokes @callback with a whenever + * Subscribes to signals on @connection and invokes @callback whenever * the signal is received. Note that @callback will be invoked in the * thread-default main contextg-main-context-push-thread-default * of the thread you are calling this method from. @@ -3740,7 +3751,7 @@ typedef struct { SignalSubscriber *subscriber; /* (owned) */ - GDBusMessage *message; + GDBusMessage *message; /* (owned) */ GDBusConnection *connection; const gchar *sender; /* (nullable) for peer-to-peer connections */ const gchar *path; @@ -3804,7 +3815,7 @@ static void signal_instance_free (SignalInstance *signal_instance) { - g_object_unref (signal_instance->message); + g_clear_object (&signal_instance->message); g_object_unref (signal_instance->connection); signal_subscriber_unref (signal_instance->subscriber); g_free (signal_instance); @@ -4216,7 +4227,7 @@ typedef struct { GDBusConnection *connection; - GDBusMessage *message; + GDBusMessage *message; /* (owned) */ gpointer user_data; const gchar *property_name; const GDBusInterfaceVTable *vtable; @@ -4230,7 +4241,7 @@ property_data_free (PropertyData *data) { g_object_unref (data->connection); - g_object_unref (data->message); + g_clear_object (&data->message); g_free (data); } @@ -4572,7 +4583,7 @@ typedef struct { GDBusConnection *connection; - GDBusMessage *message; + GDBusMessage *message; /* (owned) */ gpointer user_data; const GDBusInterfaceVTable *vtable; GDBusInterfaceInfo *interface_info; @@ -4581,10 +4592,10 @@ } PropertyGetAllData; static void -property_get_all_data_free (PropertyData *data) +property_get_all_data_free (PropertyGetAllData *data) { g_object_unref (data->connection); - g_object_unref (data->message); + g_clear_object (&data->message); g_free (data); } @@ -4869,8 +4880,6 @@ const gchar *object_path; gsize path_len; GHashTable *set; - GList *keys; - GList *l; CONNECTION_ENSURE_LOCK (connection); @@ -4888,12 +4897,8 @@ while (g_hash_table_iter_next (&hash_iter, (gpointer) &object_path, NULL)) maybe_add_path (path, path_len, object_path, set); - p = g_ptr_array_new (); - keys = g_hash_table_get_keys (set); - for (l = keys; l != NULL; l = l->next) - g_ptr_array_add (p, l->data); + p = g_hash_table_steal_all_keys (set); g_hash_table_unref (set); - g_list_free (keys); g_ptr_array_add (p, NULL); ret = (gchar **) g_ptr_array_free (p, FALSE); @@ -5048,7 +5053,7 @@ g_source_set_priority (idle_source, G_PRIORITY_DEFAULT); g_source_set_callback (idle_source, call_in_idle_cb, - invocation, + g_steal_pointer (&invocation), g_object_unref); g_source_set_static_name (idle_source, "gio, " __FILE__ " call_in_idle_cb"); g_source_attach (idle_source, main_context); @@ -6818,7 +6823,7 @@ static void subtree_deferred_data_free (SubtreeDeferredData *data) { - g_object_unref (data->message); + g_clear_object (&data->message); exported_subtree_unref (data->es); g_free (data); }
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gdbusconnection.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gdbusconnection.h
Changed
@@ -35,27 +35,27 @@ #define G_DBUS_CONNECTION(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_DBUS_CONNECTION, GDBusConnection)) #define G_IS_DBUS_CONNECTION(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_DBUS_CONNECTION)) -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GType g_dbus_connection_get_type (void) G_GNUC_CONST; /* ---------------------------------------------------------------------------------------------------- */ -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_bus_get (GBusType bus_type, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GDBusConnection *g_bus_get_finish (GAsyncResult *res, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GDBusConnection *g_bus_get_sync (GBusType bus_type, GCancellable *cancellable, GError **error); /* ---------------------------------------------------------------------------------------------------- */ -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_dbus_connection_new (GIOStream *stream, const gchar *guid, GDBusConnectionFlags flags, @@ -63,10 +63,10 @@ GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GDBusConnection *g_dbus_connection_new_finish (GAsyncResult *res, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GDBusConnection *g_dbus_connection_new_sync (GIOStream *stream, const gchar *guid, GDBusConnectionFlags flags, @@ -74,17 +74,17 @@ GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_dbus_connection_new_for_address (const gchar *address, GDBusConnectionFlags flags, GDBusAuthObserver *observer, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GDBusConnection *g_dbus_connection_new_for_address_finish (GAsyncResult *res, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GDBusConnection *g_dbus_connection_new_for_address_sync (const gchar *address, GDBusConnectionFlags flags, GDBusAuthObserver *observer, @@ -93,73 +93,73 @@ /* ---------------------------------------------------------------------------------------------------- */ -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_dbus_connection_start_message_processing (GDBusConnection *connection); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_dbus_connection_is_closed (GDBusConnection *connection); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GIOStream *g_dbus_connection_get_stream (GDBusConnection *connection); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL const gchar *g_dbus_connection_get_guid (GDBusConnection *connection); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL const gchar *g_dbus_connection_get_unique_name (GDBusConnection *connection); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GCredentials *g_dbus_connection_get_peer_credentials (GDBusConnection *connection); -GLIB_AVAILABLE_IN_2_34 +GIO_AVAILABLE_IN_2_34 guint32 g_dbus_connection_get_last_serial (GDBusConnection *connection); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_dbus_connection_get_exit_on_close (GDBusConnection *connection); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_dbus_connection_set_exit_on_close (GDBusConnection *connection, gboolean exit_on_close); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GDBusCapabilityFlags g_dbus_connection_get_capabilities (GDBusConnection *connection); -GLIB_AVAILABLE_IN_2_60 +GIO_AVAILABLE_IN_2_60 GDBusConnectionFlags g_dbus_connection_get_flags (GDBusConnection *connection); /* ---------------------------------------------------------------------------------------------------- */ -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_dbus_connection_close (GDBusConnection *connection, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_dbus_connection_close_finish (GDBusConnection *connection, GAsyncResult *res, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_dbus_connection_close_sync (GDBusConnection *connection, GCancellable *cancellable, GError **error); /* ---------------------------------------------------------------------------------------------------- */ -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_dbus_connection_flush (GDBusConnection *connection, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_dbus_connection_flush_finish (GDBusConnection *connection, GAsyncResult *res, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_dbus_connection_flush_sync (GDBusConnection *connection, GCancellable *cancellable, GError **error); /* ---------------------------------------------------------------------------------------------------- */ -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_dbus_connection_send_message (GDBusConnection *connection, GDBusMessage *message, GDBusSendMessageFlags flags, volatile guint32 *out_serial, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_dbus_connection_send_message_with_reply (GDBusConnection *connection, GDBusMessage *message, GDBusSendMessageFlags flags, @@ -168,11 +168,11 @@ GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GDBusMessage *g_dbus_connection_send_message_with_reply_finish (GDBusConnection *connection, GAsyncResult *res, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GDBusMessage *g_dbus_connection_send_message_with_reply_sync (GDBusConnection *connection, GDBusMessage *message, GDBusSendMessageFlags flags, @@ -183,7 +183,7 @@ /* ---------------------------------------------------------------------------------------------------- */ -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_dbus_connection_emit_signal (GDBusConnection *connection, const gchar *destination_bus_name, const gchar *object_path, @@ -191,7 +191,7 @@ const gchar *signal_name, GVariant *parameters, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_dbus_connection_call (GDBusConnection *connection, const gchar *bus_name, const gchar *object_path, @@ -204,11 +204,11 @@ GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GVariant *g_dbus_connection_call_finish (GDBusConnection *connection, GAsyncResult *res, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GVariant *g_dbus_connection_call_sync (GDBusConnection *connection, const gchar *bus_name, const gchar *object_path, @@ -223,7 +223,7 @@ #ifdef G_OS_UNIX -GLIB_AVAILABLE_IN_2_30 +GIO_AVAILABLE_IN_2_30 void g_dbus_connection_call_with_unix_fd_list (GDBusConnection *connection, const gchar *bus_name, const gchar *object_path, @@ -237,12 +237,12 @@ GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); -GLIB_AVAILABLE_IN_2_30 +GIO_AVAILABLE_IN_2_30 GVariant *g_dbus_connection_call_with_unix_fd_list_finish (GDBusConnection *connection, GUnixFDList **out_fd_list, GAsyncResult *res, GError **error); -GLIB_AVAILABLE_IN_2_30 +GIO_AVAILABLE_IN_2_30 GVariant *g_dbus_connection_call_with_unix_fd_list_sync (GDBusConnection *connection, const gchar *bus_name, const gchar *object_path, @@ -402,7 +402,7 @@ gpointer padding8; }; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL guint g_dbus_connection_register_object (GDBusConnection *connection, const gchar *object_path, GDBusInterfaceInfo *interface_info, @@ -410,7 +410,7 @@ gpointer user_data, GDestroyNotify user_data_free_func, GError **error); -GLIB_AVAILABLE_IN_2_46 +GIO_AVAILABLE_IN_2_46 guint g_dbus_connection_register_object_with_closures (GDBusConnection *connection, const gchar *object_path, GDBusInterfaceInfo *interface_info, @@ -418,7 +418,7 @@ GClosure *get_property_closure, GClosure *set_property_closure, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_dbus_connection_unregister_object (GDBusConnection *connection, guint registration_id); @@ -540,7 +540,7 @@ gpointer padding8; }; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL guint g_dbus_connection_register_subtree (GDBusConnection *connection, const gchar *object_path, const GDBusSubtreeVTable *vtable, @@ -548,7 +548,7 @@ gpointer user_data, GDestroyNotify user_data_free_func, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_dbus_connection_unregister_subtree (GDBusConnection *connection, guint registration_id); @@ -577,7 +577,7 @@ GVariant *parameters, gpointer user_data); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL guint g_dbus_connection_signal_subscribe (GDBusConnection *connection, const gchar *sender, const gchar *interface_name, @@ -588,7 +588,7 @@ GDBusSignalCallback callback, gpointer user_data, GDestroyNotify user_data_free_func); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_dbus_connection_signal_unsubscribe (GDBusConnection *connection, guint subscription_id); @@ -673,13 +673,13 @@ gboolean incoming, gpointer user_data); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL guint g_dbus_connection_add_filter (GDBusConnection *connection, GDBusMessageFilterFunction filter_function, gpointer user_data, GDestroyNotify user_data_free_func); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_dbus_connection_remove_filter (GDBusConnection *connection, guint filter_id);
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gdbusdaemon.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gdbusdaemon.c
Changed
@@ -1087,29 +1087,13 @@ { GDBusDaemon *daemon = G_DBUS_DAEMON (object); GPtrArray *array; - GList *clients, *names, *l; + GPtrArray *clients, *names; - array = g_ptr_array_new (); + clients = g_hash_table_get_values_as_ptr_array (daemon->clients); + array = g_steal_pointer (&clients); - clients = g_hash_table_get_values (daemon->clients); - for (l = clients; l != NULL; l = l->next) - { - Client *client = l->data; - - g_ptr_array_add (array, client->id); - } - - g_list_free (clients); - - names = g_hash_table_get_values (daemon->names); - for (l = names; l != NULL; l = l->next) - { - Name *name = l->data; - - g_ptr_array_add (array, name->name); - } - - g_list_free (names); + names = g_hash_table_get_values_as_ptr_array (daemon->names); + g_ptr_array_extend_and_steal (array, g_steal_pointer (&names)); g_ptr_array_add (array, NULL); @@ -1618,13 +1602,8 @@ if (daemon->address == NULL) { #ifdef G_OS_UNIX - if (g_unix_socket_address_abstract_names_supported ()) - daemon->address = g_strdup ("unix:tmpdir=/tmp/gdbus-daemon"); - else - { - daemon->tmpdir = g_dir_make_tmp ("gdbus-daemon-XXXXXX", NULL); - daemon->address = g_strdup_printf ("unix:tmpdir=%s", daemon->tmpdir); - } + daemon->tmpdir = g_dir_make_tmp ("gdbus-daemon-XXXXXX", NULL); + daemon->address = g_strdup_printf ("unix:tmpdir=%s", daemon->tmpdir); flags |= G_DBUS_SERVER_FLAGS_AUTHENTICATION_REQUIRE_SAME_USER; #else /* Don’t require authentication on Windows as that hasn’t been
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gdbuserror.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gdbuserror.h
Changed
@@ -47,15 +47,15 @@ */ #define G_DBUS_ERROR g_dbus_error_quark() -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GQuark g_dbus_error_quark (void); /* Used by applications to check, get and strip the D-Bus error name */ -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_dbus_error_is_remote_error (const GError *error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gchar *g_dbus_error_get_remote_error (const GError *error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_dbus_error_strip_remote_error (GError *error); /** @@ -73,37 +73,37 @@ const gchar *dbus_error_name; }; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_dbus_error_register_error (GQuark error_domain, gint error_code, const gchar *dbus_error_name); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_dbus_error_unregister_error (GQuark error_domain, gint error_code, const gchar *dbus_error_name); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_dbus_error_register_error_domain (const gchar *error_domain_quark_name, volatile gsize *quark_volatile, const GDBusErrorEntry *entries, guint num_entries); /* Only used by object mappings to map back and forth to GError */ -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GError *g_dbus_error_new_for_dbus_error (const gchar *dbus_error_name, const gchar *dbus_error_message); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_dbus_error_set_dbus_error (GError **error, const gchar *dbus_error_name, const gchar *dbus_error_message, const gchar *format, ...) G_GNUC_PRINTF(4, 5); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_dbus_error_set_dbus_error_valist (GError **error, const gchar *dbus_error_name, const gchar *dbus_error_message, const gchar *format, va_list var_args) G_GNUC_PRINTF(4, 0); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gchar *g_dbus_error_encode_gerror (const GError *error); G_END_DECLS
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gdbusinterface.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gdbusinterface.h
Changed
@@ -66,16 +66,16 @@ GDBusObject *(*dup_object) (GDBusInterface *interface_); }; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GType g_dbus_interface_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GDBusInterfaceInfo *g_dbus_interface_get_info (GDBusInterface *interface_); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GDBusObject *g_dbus_interface_get_object (GDBusInterface *interface_); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_dbus_interface_set_object (GDBusInterface *interface_, GDBusObject *object); -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 GDBusObject *g_dbus_interface_dup_object (GDBusInterface *interface_); G_END_DECLS
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gdbusinterfaceskeleton.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gdbusinterfaceskeleton.c
Changed
@@ -461,16 +461,18 @@ typedef struct { gint ref_count; /* (atomic) */ - GDBusInterfaceSkeleton *interface; GDBusInterfaceMethodCallFunc method_call_func; - GDBusMethodInvocation *invocation; + GDBusMethodInvocation *invocation; /* (owned) */ } DispatchData; static void dispatch_data_unref (DispatchData *data) { if (g_atomic_int_dec_and_test (&data->ref_count)) - g_slice_free (DispatchData, data); + { + g_clear_object (&data->invocation); + g_slice_free (DispatchData, data); + } } static DispatchData * @@ -502,16 +504,17 @@ GCancellable *cancellable) { DispatchData *data = task_data; + GDBusInterfaceSkeleton *interface = g_task_get_source_object (task); GDBusInterfaceSkeletonFlags flags; GDBusObject *object; gboolean authorized; - g_mutex_lock (&data->interface->priv->lock); - flags = data->interface->priv->flags; - object = data->interface->priv->object; + g_mutex_lock (&interface->priv->lock); + flags = interface->priv->flags; + object = interface->priv->object; if (object != NULL) g_object_ref (object); - g_mutex_unlock (&data->interface->priv->lock); + g_mutex_unlock (&interface->priv->lock); /* first check on the enclosing object (if any), then the interface */ authorized = TRUE; @@ -519,13 +522,13 @@ { g_signal_emit_by_name (object, "authorize-method", - data->interface, + interface, data->invocation, &authorized); } if (authorized) { - g_signal_emit (data->interface, + g_signal_emit (interface, signalsG_AUTHORIZE_METHOD_SIGNAL, 0, data->invocation, @@ -627,9 +630,8 @@ DispatchData *data; data = g_slice_new0 (DispatchData); - data->interface = interface; data->method_call_func = method_call_func; - data->invocation = invocation; + data->invocation = g_object_ref (invocation); data->ref_count = 1; task = g_task_new (interface, NULL, NULL, NULL);
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gdbusinterfaceskeleton.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gdbusinterfaceskeleton.h
Changed
@@ -87,41 +87,41 @@ gpointer signal_padding8; }; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GType g_dbus_interface_skeleton_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GDBusInterfaceSkeletonFlags g_dbus_interface_skeleton_get_flags (GDBusInterfaceSkeleton *interface_); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_dbus_interface_skeleton_set_flags (GDBusInterfaceSkeleton *interface_, GDBusInterfaceSkeletonFlags flags); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GDBusInterfaceInfo *g_dbus_interface_skeleton_get_info (GDBusInterfaceSkeleton *interface_); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GDBusInterfaceVTable *g_dbus_interface_skeleton_get_vtable (GDBusInterfaceSkeleton *interface_); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GVariant *g_dbus_interface_skeleton_get_properties (GDBusInterfaceSkeleton *interface_); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_dbus_interface_skeleton_flush (GDBusInterfaceSkeleton *interface_); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_dbus_interface_skeleton_export (GDBusInterfaceSkeleton *interface_, GDBusConnection *connection, const gchar *object_path, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_dbus_interface_skeleton_unexport (GDBusInterfaceSkeleton *interface_); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_dbus_interface_skeleton_unexport_from_connection (GDBusInterfaceSkeleton *interface_, GDBusConnection *connection); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GDBusConnection *g_dbus_interface_skeleton_get_connection (GDBusInterfaceSkeleton *interface_); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GList *g_dbus_interface_skeleton_get_connections (GDBusInterfaceSkeleton *interface_); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_dbus_interface_skeleton_has_connection (GDBusInterfaceSkeleton *interface_, GDBusConnection *connection); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL const gchar *g_dbus_interface_skeleton_get_object_path (GDBusInterfaceSkeleton *interface_); G_END_DECLS
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gdbusintrospection.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gdbusintrospection.h
Changed
@@ -181,67 +181,67 @@ GDBusAnnotationInfo **annotations; }; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL const gchar *g_dbus_annotation_info_lookup (GDBusAnnotationInfo **annotations, const gchar *name); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GDBusMethodInfo *g_dbus_interface_info_lookup_method (GDBusInterfaceInfo *info, const gchar *name); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GDBusSignalInfo *g_dbus_interface_info_lookup_signal (GDBusInterfaceInfo *info, const gchar *name); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GDBusPropertyInfo *g_dbus_interface_info_lookup_property (GDBusInterfaceInfo *info, const gchar *name); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_dbus_interface_info_cache_build (GDBusInterfaceInfo *info); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_dbus_interface_info_cache_release (GDBusInterfaceInfo *info); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_dbus_interface_info_generate_xml (GDBusInterfaceInfo *info, guint indent, GString *string_builder); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GDBusNodeInfo *g_dbus_node_info_new_for_xml (const gchar *xml_data, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GDBusInterfaceInfo *g_dbus_node_info_lookup_interface (GDBusNodeInfo *info, const gchar *name); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_dbus_node_info_generate_xml (GDBusNodeInfo *info, guint indent, GString *string_builder); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GDBusNodeInfo *g_dbus_node_info_ref (GDBusNodeInfo *info); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GDBusInterfaceInfo *g_dbus_interface_info_ref (GDBusInterfaceInfo *info); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GDBusMethodInfo *g_dbus_method_info_ref (GDBusMethodInfo *info); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GDBusSignalInfo *g_dbus_signal_info_ref (GDBusSignalInfo *info); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GDBusPropertyInfo *g_dbus_property_info_ref (GDBusPropertyInfo *info); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GDBusArgInfo *g_dbus_arg_info_ref (GDBusArgInfo *info); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GDBusAnnotationInfo *g_dbus_annotation_info_ref (GDBusAnnotationInfo *info); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_dbus_node_info_unref (GDBusNodeInfo *info); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_dbus_interface_info_unref (GDBusInterfaceInfo *info); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_dbus_method_info_unref (GDBusMethodInfo *info); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_dbus_signal_info_unref (GDBusSignalInfo *info); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_dbus_property_info_unref (GDBusPropertyInfo *info); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_dbus_arg_info_unref (GDBusArgInfo *info); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_dbus_annotation_info_unref (GDBusAnnotationInfo *info); /** @@ -307,19 +307,19 @@ */ #define G_TYPE_DBUS_ANNOTATION_INFO (g_dbus_annotation_info_get_type ()) -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GType g_dbus_node_info_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GType g_dbus_interface_info_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GType g_dbus_method_info_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GType g_dbus_signal_info_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GType g_dbus_property_info_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GType g_dbus_arg_info_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GType g_dbus_annotation_info_get_type (void) G_GNUC_CONST; G_END_DECLS
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gdbusmenumodel.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gdbusmenumodel.c
Changed
@@ -23,11 +23,9 @@ #include "gdbusmenumodel.h" +#include "gmenuexporter.h" #include "gmenumodel.h" -/* Copied from gmenuexporter.c for the glib-2-74 backport */ -#define G_MENU_EXPORTER_MAX_SECTION_SIZE 1000 - /* Prelude {{{1 */ /**
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gdbusmenumodel.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gdbusmenumodel.h
Changed
@@ -34,10 +34,10 @@ typedef struct _GDBusMenuModel GDBusMenuModel; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GType g_dbus_menu_model_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GDBusMenuModel * g_dbus_menu_model_get (GDBusConnection *connection, const gchar *bus_name, const gchar *object_path);
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gdbusmessage.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gdbusmessage.c
Changed
@@ -1094,24 +1094,27 @@ guchar * g_dbus_message_get_header_fields (GDBusMessage *message) { - GList *keys; - guchar *ret; - guint num_keys; - GList *l; - guint n; + GPtrArray *keys; + GArray *array; g_return_val_if_fail (G_IS_DBUS_MESSAGE (message), NULL); - keys = g_hash_table_get_keys (message->headers); - num_keys = g_list_length (keys); - ret = g_new (guchar, num_keys + 1); - for (l = keys, n = 0; l != NULL; l = l->next, n++) - retn = GPOINTER_TO_UINT (l->data); - g_assert (n == num_keys); - retn = G_DBUS_MESSAGE_HEADER_FIELD_INVALID; - g_list_free (keys); + keys = g_hash_table_get_keys_as_ptr_array (message->headers); + array = g_array_sized_new (FALSE, FALSE, sizeof (guchar), keys->len + 1); - return ret; + for (guint i = 0; i < keys->len; ++i) + { + guchar val = GPOINTER_TO_UINT (g_ptr_array_index (keys, i)); + g_array_append_val (array, val); + } + + g_assert (array->len == keys->len); + g_clear_pointer (&keys, g_ptr_array_unref); + + guchar invalid_field = G_DBUS_MESSAGE_HEADER_FIELD_INVALID; + g_array_append_val (array, invalid_field); + + return (guchar *) g_array_free (array, FALSE); } /* ---------------------------------------------------------------------------------------------------- */
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gdbusmessage.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gdbusmessage.h
Changed
@@ -35,167 +35,167 @@ #define G_DBUS_MESSAGE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_DBUS_MESSAGE, GDBusMessage)) #define G_IS_DBUS_MESSAGE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_DBUS_MESSAGE)) -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GType g_dbus_message_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GDBusMessage *g_dbus_message_new (void); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GDBusMessage *g_dbus_message_new_signal (const gchar *path, const gchar *interface_, const gchar *signal); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GDBusMessage *g_dbus_message_new_method_call (const gchar *name, const gchar *path, const gchar *interface_, const gchar *method); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GDBusMessage *g_dbus_message_new_method_reply (GDBusMessage *method_call_message); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GDBusMessage *g_dbus_message_new_method_error (GDBusMessage *method_call_message, const gchar *error_name, const gchar *error_message_format, ...) G_GNUC_PRINTF(3, 4); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GDBusMessage *g_dbus_message_new_method_error_valist (GDBusMessage *method_call_message, const gchar *error_name, const gchar *error_message_format, va_list var_args); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GDBusMessage *g_dbus_message_new_method_error_literal (GDBusMessage *method_call_message, const gchar *error_name, const gchar *error_message); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gchar *g_dbus_message_print (GDBusMessage *message, guint indent); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_dbus_message_get_locked (GDBusMessage *message); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_dbus_message_lock (GDBusMessage *message); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GDBusMessage *g_dbus_message_copy (GDBusMessage *message, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GDBusMessageByteOrder g_dbus_message_get_byte_order (GDBusMessage *message); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_dbus_message_set_byte_order (GDBusMessage *message, GDBusMessageByteOrder byte_order); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GDBusMessageType g_dbus_message_get_message_type (GDBusMessage *message); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_dbus_message_set_message_type (GDBusMessage *message, GDBusMessageType type); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GDBusMessageFlags g_dbus_message_get_flags (GDBusMessage *message); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_dbus_message_set_flags (GDBusMessage *message, GDBusMessageFlags flags); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL guint32 g_dbus_message_get_serial (GDBusMessage *message); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_dbus_message_set_serial (GDBusMessage *message, guint32 serial); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GVariant *g_dbus_message_get_header (GDBusMessage *message, GDBusMessageHeaderField header_field); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_dbus_message_set_header (GDBusMessage *message, GDBusMessageHeaderField header_field, GVariant *value); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL guchar *g_dbus_message_get_header_fields (GDBusMessage *message); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GVariant *g_dbus_message_get_body (GDBusMessage *message); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_dbus_message_set_body (GDBusMessage *message, GVariant *body); #ifdef G_OS_UNIX -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GUnixFDList *g_dbus_message_get_unix_fd_list (GDBusMessage *message); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_dbus_message_set_unix_fd_list (GDBusMessage *message, GUnixFDList *fd_list); #endif /* G_OS_UNIX */ -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL guint32 g_dbus_message_get_reply_serial (GDBusMessage *message); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_dbus_message_set_reply_serial (GDBusMessage *message, guint32 value); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL const gchar *g_dbus_message_get_interface (GDBusMessage *message); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_dbus_message_set_interface (GDBusMessage *message, const gchar *value); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL const gchar *g_dbus_message_get_member (GDBusMessage *message); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_dbus_message_set_member (GDBusMessage *message, const gchar *value); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL const gchar *g_dbus_message_get_path (GDBusMessage *message); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_dbus_message_set_path (GDBusMessage *message, const gchar *value); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL const gchar *g_dbus_message_get_sender (GDBusMessage *message); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_dbus_message_set_sender (GDBusMessage *message, const gchar *value); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL const gchar *g_dbus_message_get_destination (GDBusMessage *message); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_dbus_message_set_destination (GDBusMessage *message, const gchar *value); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL const gchar *g_dbus_message_get_error_name (GDBusMessage *message); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_dbus_message_set_error_name (GDBusMessage *message, const gchar *value); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL const gchar *g_dbus_message_get_signature (GDBusMessage *message); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_dbus_message_set_signature (GDBusMessage *message, const gchar *value); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL guint32 g_dbus_message_get_num_unix_fds (GDBusMessage *message); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_dbus_message_set_num_unix_fds (GDBusMessage *message, guint32 value); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL const gchar *g_dbus_message_get_arg0 (GDBusMessage *message); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GDBusMessage *g_dbus_message_new_from_blob (guchar *blob, gsize blob_len, GDBusCapabilityFlags capabilities, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gssize g_dbus_message_bytes_needed (guchar *blob, gsize blob_len, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL guchar *g_dbus_message_to_blob (GDBusMessage *message, gsize *out_size, GDBusCapabilityFlags capabilities, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_dbus_message_to_gerror (GDBusMessage *message, GError **error);
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gdbusmethodinvocation.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gdbusmethodinvocation.h
Changed
@@ -53,7 +53,7 @@ * * Since: 2.68 */ -#define G_DBUS_METHOD_INVOCATION_HANDLED TRUE GLIB_AVAILABLE_MACRO_IN_2_68 +#define G_DBUS_METHOD_INVOCATION_HANDLED TRUE GIO_AVAILABLE_MACRO_IN_2_68 /** * G_DBUS_METHOD_INVOCATION_UNHANDLED: @@ -68,65 +68,65 @@ * * Since: 2.68 */ -#define G_DBUS_METHOD_INVOCATION_UNHANDLED FALSE GLIB_AVAILABLE_MACRO_IN_2_68 +#define G_DBUS_METHOD_INVOCATION_UNHANDLED FALSE GIO_AVAILABLE_MACRO_IN_2_68 -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GType g_dbus_method_invocation_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL const gchar *g_dbus_method_invocation_get_sender (GDBusMethodInvocation *invocation); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL const gchar *g_dbus_method_invocation_get_object_path (GDBusMethodInvocation *invocation); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL const gchar *g_dbus_method_invocation_get_interface_name (GDBusMethodInvocation *invocation); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL const gchar *g_dbus_method_invocation_get_method_name (GDBusMethodInvocation *invocation); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL const GDBusMethodInfo *g_dbus_method_invocation_get_method_info (GDBusMethodInvocation *invocation); -GLIB_AVAILABLE_IN_2_38 +GIO_AVAILABLE_IN_2_38 const GDBusPropertyInfo *g_dbus_method_invocation_get_property_info (GDBusMethodInvocation *invocation); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GDBusConnection *g_dbus_method_invocation_get_connection (GDBusMethodInvocation *invocation); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GDBusMessage *g_dbus_method_invocation_get_message (GDBusMethodInvocation *invocation); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GVariant *g_dbus_method_invocation_get_parameters (GDBusMethodInvocation *invocation); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gpointer g_dbus_method_invocation_get_user_data (GDBusMethodInvocation *invocation); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_dbus_method_invocation_return_value (GDBusMethodInvocation *invocation, GVariant *parameters); #ifdef G_OS_UNIX -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_dbus_method_invocation_return_value_with_unix_fd_list (GDBusMethodInvocation *invocation, GVariant *parameters, GUnixFDList *fd_list); #endif /* G_OS_UNIX */ -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_dbus_method_invocation_return_error (GDBusMethodInvocation *invocation, GQuark domain, gint code, const gchar *format, ...) G_GNUC_PRINTF(4, 5); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_dbus_method_invocation_return_error_valist (GDBusMethodInvocation *invocation, GQuark domain, gint code, const gchar *format, va_list var_args) G_GNUC_PRINTF(4, 0); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_dbus_method_invocation_return_error_literal (GDBusMethodInvocation *invocation, GQuark domain, gint code, const gchar *message); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_dbus_method_invocation_return_gerror (GDBusMethodInvocation *invocation, const GError *error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_dbus_method_invocation_take_error (GDBusMethodInvocation *invocation, GError *error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_dbus_method_invocation_return_dbus_error (GDBusMethodInvocation *invocation, const gchar *error_name, const gchar *error_message);
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gdbusnameowning.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gdbusnameowning.h
Changed
@@ -74,7 +74,7 @@ const gchar *name, gpointer user_data); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL guint g_bus_own_name (GBusType bus_type, const gchar *name, GBusNameOwnerFlags flags, @@ -84,7 +84,7 @@ gpointer user_data, GDestroyNotify user_data_free_func); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL guint g_bus_own_name_on_connection (GDBusConnection *connection, const gchar *name, GBusNameOwnerFlags flags, @@ -93,7 +93,7 @@ gpointer user_data, GDestroyNotify user_data_free_func); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL guint g_bus_own_name_with_closures (GBusType bus_type, const gchar *name, GBusNameOwnerFlags flags, @@ -101,7 +101,7 @@ GClosure *name_acquired_closure, GClosure *name_lost_closure); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL guint g_bus_own_name_on_connection_with_closures ( GDBusConnection *connection, const gchar *name, @@ -109,7 +109,7 @@ GClosure *name_acquired_closure, GClosure *name_lost_closure); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_bus_unown_name (guint owner_id); G_END_DECLS
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gdbusnamewatching.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gdbusnamewatching.h
Changed
@@ -67,7 +67,7 @@ gpointer user_data); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL guint g_bus_watch_name (GBusType bus_type, const gchar *name, GBusNameWatcherFlags flags, @@ -75,7 +75,7 @@ GBusNameVanishedCallback name_vanished_handler, gpointer user_data, GDestroyNotify user_data_free_func); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL guint g_bus_watch_name_on_connection (GDBusConnection *connection, const gchar *name, GBusNameWatcherFlags flags, @@ -83,20 +83,20 @@ GBusNameVanishedCallback name_vanished_handler, gpointer user_data, GDestroyNotify user_data_free_func); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL guint g_bus_watch_name_with_closures (GBusType bus_type, const gchar *name, GBusNameWatcherFlags flags, GClosure *name_appeared_closure, GClosure *name_vanished_closure); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL guint g_bus_watch_name_on_connection_with_closures ( GDBusConnection *connection, const gchar *name, GBusNameWatcherFlags flags, GClosure *name_appeared_closure, GClosure *name_vanished_closure); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_bus_unwatch_name (guint watcher_id); G_END_DECLS
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gdbusobject.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gdbusobject.h
Changed
@@ -65,13 +65,13 @@ }; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GType g_dbus_object_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL const gchar *g_dbus_object_get_object_path (GDBusObject *object); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GList *g_dbus_object_get_interfaces (GDBusObject *object); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GDBusInterface *g_dbus_object_get_interface (GDBusObject *object, const gchar *interface_name);
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gdbusobjectmanager.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gdbusobjectmanager.h
Changed
@@ -77,16 +77,16 @@ GDBusInterface *interface_); }; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GType g_dbus_object_manager_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL const gchar *g_dbus_object_manager_get_object_path (GDBusObjectManager *manager); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GList *g_dbus_object_manager_get_objects (GDBusObjectManager *manager); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GDBusObject *g_dbus_object_manager_get_object (GDBusObjectManager *manager, const gchar *object_path); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GDBusInterface *g_dbus_object_manager_get_interface (GDBusObjectManager *manager, const gchar *object_path, const gchar *interface_name);
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gdbusobjectmanagerclient.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gdbusobjectmanagerclient.c
Changed
@@ -1355,13 +1355,11 @@ if (g_strcmp0 (old_name_owner, new_name_owner) != 0) { - GList *l; - GList *proxies; + GPtrArray *proxies; /* remote manager changed; nuke all local proxies */ - proxies = g_hash_table_get_values (manager->priv->map_object_path_to_object_proxy); - g_list_foreach (proxies, (GFunc) g_object_ref, NULL); - g_hash_table_remove_all (manager->priv->map_object_path_to_object_proxy); + proxies = g_hash_table_steal_all_values ( + manager->priv->map_object_path_to_object_proxy); g_mutex_unlock (&manager->priv->lock); @@ -1371,12 +1369,13 @@ */ g_object_notify (G_OBJECT (manager), "name-owner"); - for (l = proxies; l != NULL; l = l->next) + for (guint i = 0; i < proxies->len; ++i) { - GDBusObjectProxy *object_proxy = G_DBUS_OBJECT_PROXY (l->data); + GDBusObjectProxy *object_proxy = + G_DBUS_OBJECT_PROXY (g_ptr_array_index (proxies, i)); g_signal_emit_by_name (manager, "object-removed", object_proxy); } - g_list_free_full (proxies, g_object_unref); + g_clear_pointer (&proxies, g_ptr_array_unref); /* nuke local filter */ maybe_unsubscribe_signals (manager);
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gdbusobjectmanagerclient.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gdbusobjectmanagerclient.h
Changed
@@ -84,9 +84,9 @@ gpointer padding8; }; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GType g_dbus_object_manager_client_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_dbus_object_manager_client_new (GDBusConnection *connection, GDBusObjectManagerClientFlags flags, const gchar *name, @@ -97,10 +97,10 @@ GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GDBusObjectManager *g_dbus_object_manager_client_new_finish (GAsyncResult *res, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GDBusObjectManager *g_dbus_object_manager_client_new_sync (GDBusConnection *connection, GDBusObjectManagerClientFlags flags, const gchar *name, @@ -110,7 +110,7 @@ GDestroyNotify get_proxy_type_destroy_notify, GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_dbus_object_manager_client_new_for_bus (GBusType bus_type, GDBusObjectManagerClientFlags flags, const gchar *name, @@ -121,10 +121,10 @@ GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GDBusObjectManager *g_dbus_object_manager_client_new_for_bus_finish (GAsyncResult *res, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GDBusObjectManager *g_dbus_object_manager_client_new_for_bus_sync (GBusType bus_type, GDBusObjectManagerClientFlags flags, const gchar *name, @@ -134,13 +134,13 @@ GDestroyNotify get_proxy_type_destroy_notify, GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GDBusConnection *g_dbus_object_manager_client_get_connection (GDBusObjectManagerClient *manager); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GDBusObjectManagerClientFlags g_dbus_object_manager_client_get_flags (GDBusObjectManagerClient *manager); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL const gchar *g_dbus_object_manager_client_get_name (GDBusObjectManagerClient *manager); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gchar *g_dbus_object_manager_client_get_name_owner (GDBusObjectManagerClient *manager); G_END_DECLS
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gdbusobjectmanagerserver.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gdbusobjectmanagerserver.h
Changed
@@ -68,25 +68,25 @@ gpointer padding8; }; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GType g_dbus_object_manager_server_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GDBusObjectManagerServer *g_dbus_object_manager_server_new (const gchar *object_path); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GDBusConnection *g_dbus_object_manager_server_get_connection (GDBusObjectManagerServer *manager); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_dbus_object_manager_server_set_connection (GDBusObjectManagerServer *manager, GDBusConnection *connection); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_dbus_object_manager_server_export (GDBusObjectManagerServer *manager, GDBusObjectSkeleton *object); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_dbus_object_manager_server_export_uniquely (GDBusObjectManagerServer *manager, GDBusObjectSkeleton *object); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_dbus_object_manager_server_is_exported (GDBusObjectManagerServer *manager, GDBusObjectSkeleton *object); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_dbus_object_manager_server_unexport (GDBusObjectManagerServer *manager, const gchar *object_path);
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gdbusobjectproxy.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gdbusobjectproxy.h
Changed
@@ -68,12 +68,12 @@ gpointer padding8; }; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GType g_dbus_object_proxy_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GDBusObjectProxy *g_dbus_object_proxy_new (GDBusConnection *connection, const gchar *object_path); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GDBusConnection *g_dbus_object_proxy_get_connection (GDBusObjectProxy *proxy); G_END_DECLS
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gdbusobjectskeleton.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gdbusobjectskeleton.c
Changed
@@ -473,17 +473,21 @@ void g_dbus_object_skeleton_flush (GDBusObjectSkeleton *object) { - GList *to_flush, *l; + GPtrArray *to_flush; g_mutex_lock (&object->priv->lock); - to_flush = g_hash_table_get_values (object->priv->map_name_to_iface); - g_list_foreach (to_flush, (GFunc) g_object_ref, NULL); + to_flush = g_hash_table_get_values_as_ptr_array (object->priv->map_name_to_iface); + g_ptr_array_foreach (to_flush, (GFunc) g_object_ref, NULL); + g_ptr_array_set_free_func (to_flush, g_object_unref); g_mutex_unlock (&object->priv->lock); - for (l = to_flush; l != NULL; l = l->next) - g_dbus_interface_skeleton_flush (G_DBUS_INTERFACE_SKELETON (l->data)); + for (guint i = 0; i < to_flush->len; ++i) + { + g_dbus_interface_skeleton_flush ( + G_DBUS_INTERFACE_SKELETON (g_ptr_array_index (to_flush, i))); + } - g_list_free_full (to_flush, g_object_unref); + g_clear_pointer (&to_flush, g_ptr_array_unref); } static void
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gdbusobjectskeleton.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gdbusobjectskeleton.h
Changed
@@ -74,22 +74,22 @@ gpointer padding8; }; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GType g_dbus_object_skeleton_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GDBusObjectSkeleton *g_dbus_object_skeleton_new (const gchar *object_path); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_dbus_object_skeleton_flush (GDBusObjectSkeleton *object); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_dbus_object_skeleton_add_interface (GDBusObjectSkeleton *object, GDBusInterfaceSkeleton *interface_); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_dbus_object_skeleton_remove_interface (GDBusObjectSkeleton *object, GDBusInterfaceSkeleton *interface_); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_dbus_object_skeleton_remove_interface_by_name (GDBusObjectSkeleton *object, const gchar *interface_name); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_dbus_object_skeleton_set_object_path (GDBusObjectSkeleton *object, const gchar *object_path);
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gdbusprivate.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gdbusprivate.c
Changed
@@ -889,21 +889,25 @@ struct _MessageToWriteData { GDBusWorker *worker; - GDBusMessage *message; + GDBusMessage *message; /* (owned) */ gchar *blob; gsize blob_size; gsize total_written; - GTask *task; + GTask *task; /* (owned) and (nullable) before writing starts and after g_task_return_*() is called */ }; static void message_to_write_data_free (MessageToWriteData *data) { _g_dbus_worker_unref (data->worker); - if (data->message) - g_object_unref (data->message); + g_clear_object (&data->message); g_free (data->blob); + + /* The task must either not have been created, or have been created, returned + * and finalised by now. */ + g_assert (data->task == NULL); + g_slice_free (MessageToWriteData, data); } @@ -915,21 +919,22 @@ * * write-lock is not held on entry * output_pending is PENDING_WRITE on entry + * @user_data is (transfer full) */ static void write_message_async_cb (GObject *source_object, GAsyncResult *res, gpointer user_data) { - MessageToWriteData *data = user_data; - GTask *task; + MessageToWriteData *data = g_steal_pointer (&user_data); gssize bytes_written; GError *error; - /* Note: we can't access data->task after calling g_task_return_* () because the - * callback can free @data and we're not completing in idle. So use a copy of the pointer. - */ - task = data->task; + /* The ownership of @data is a bit odd in this function: it’s (transfer full) + * when the function is called, but the code paths which call g_task_return_*() + * on @data->task will indirectly cause it to be freed, because @data is + * always guaranteed to be the user_data in the #GTask. So that’s why it looks + * like @data is not always freed on every code path in this function. */ error = NULL; bytes_written = g_output_stream_write_finish (G_OUTPUT_STREAM (source_object), @@ -937,8 +942,9 @@ &error); if (bytes_written == -1) { + GTask *task = g_steal_pointer (&data->task); g_task_return_error (task, error); - g_object_unref (task); + g_clear_object (&task); goto out; } g_assert (bytes_written > 0); /* zero is never returned */ @@ -949,12 +955,13 @@ g_assert (data->total_written <= data->blob_size); if (data->total_written == data->blob_size) { + GTask *task = g_steal_pointer (&data->task); g_task_return_boolean (task, TRUE); - g_object_unref (task); + g_clear_object (&task); goto out; } - write_message_continue_writing (data); + write_message_continue_writing (g_steal_pointer (&data)); out: ; @@ -971,9 +978,9 @@ GIOCondition condition, gpointer user_data) { - MessageToWriteData *data = user_data; - write_message_continue_writing (data); - return FALSE; /* remove source */ + MessageToWriteData *data = g_steal_pointer (&user_data); + write_message_continue_writing (g_steal_pointer (&data)); + return G_SOURCE_REMOVE; } #endif @@ -981,22 +988,21 @@ * * write-lock is not held on entry * output_pending is PENDING_WRITE on entry + * @data is (transfer full) */ static void write_message_continue_writing (MessageToWriteData *data) { GOutputStream *ostream; #ifdef G_OS_UNIX - GTask *task; GUnixFDList *fd_list; #endif -#ifdef G_OS_UNIX - /* Note: we can't access data->task after calling g_task_return_* () because the - * callback can free @data and we're not completing in idle. So use a copy of the pointer. - */ - task = data->task; -#endif + /* The ownership of @data is a bit odd in this function: it’s (transfer full) + * when the function is called, but the code paths which call g_task_return_*() + * on @data->task will indirectly cause it to be freed, because @data is + * always guaranteed to be the user_data in the #GTask. So that’s why it looks + * like @data is not always freed on every code path in this function. */ ostream = g_io_stream_get_output_stream (data->worker->stream); #ifdef G_OS_UNIX @@ -1025,11 +1031,12 @@ { if (!(data->worker->capabilities & G_DBUS_CAPABILITY_FLAGS_UNIX_FD_PASSING)) { + GTask *task = g_steal_pointer (&data->task); g_task_return_new_error (task, G_IO_ERROR, G_IO_ERROR_FAILED, "Tried sending a file descriptor but remote peer does not support this capability"); - g_object_unref (task); + g_clear_object (&task); goto out; } control_message = g_unix_fd_message_new_with_fd_list (fd_list); @@ -1059,16 +1066,20 @@ data->worker->cancellable); g_source_set_callback (source, (GSourceFunc) on_socket_ready, - data, + g_steal_pointer (&data), NULL); /* GDestroyNotify */ g_source_attach (source, g_main_context_get_thread_default ()); g_source_unref (source); g_error_free (error); goto out; } - g_task_return_error (task, error); - g_object_unref (task); - goto out; + else + { + GTask *task = g_steal_pointer (&data->task); + g_task_return_error (task, error); + g_clear_object (&task); + goto out; + } } g_assert (bytes_written > 0); /* zero is never returned */ @@ -1078,12 +1089,13 @@ g_assert (data->total_written <= data->blob_size); if (data->total_written == data->blob_size) { + GTask *task = g_steal_pointer (&data->task); g_task_return_boolean (task, TRUE); - g_object_unref (task); + g_clear_object (&task); goto out; } - write_message_continue_writing (data); + write_message_continue_writing (g_steal_pointer (&data)); } #endif else @@ -1094,12 +1106,13 @@ /* We were trying to write byte 0 of the message, which needs * the fd list to be attached to it, but this connection doesn't * support doing that. */ + GTask *task = g_steal_pointer (&data->task); g_task_return_new_error (task, G_IO_ERROR, G_IO_ERROR_FAILED, "Tried sending a file descriptor on unsupported stream of type %s", g_type_name (G_TYPE_FROM_INSTANCE (ostream))); - g_object_unref (task); + g_clear_object (&task); goto out; } #endif @@ -1110,7 +1123,7 @@ G_PRIORITY_DEFAULT, data->worker->cancellable, write_message_async_cb, - data); + data); /* steal @data */ } #ifdef G_OS_UNIX out: @@ -1133,7 +1146,7 @@ g_task_set_source_tag (data->task, write_message_async); g_task_set_name (data->task, "gio D-Bus write message"); data->total_written = 0; - write_message_continue_writing (data); + write_message_continue_writing (g_steal_pointer (&data)); } /* called in private thread shared by all GDBusConnection instances (with write-lock held) */ @@ -1322,6 +1335,7 @@ * * write-lock is not held on entry * output_pending is PENDING_WRITE on entry + * @user_data is (transfer full) */ static void write_message_cb (GObject *source_object, @@ -1540,7 +1554,7 @@ write_message_async (worker, data, write_message_cb, - data); + data); /* takes ownership of @data as user_data */ } }
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gdbusprivate.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gdbusprivate.h
Changed
@@ -23,10 +23,6 @@ #ifndef __G_DBUS_PRIVATE_H__ #define __G_DBUS_PRIVATE_H__ -#if !defined (GIO_COMPILATION) -#error "gdbusprivate.h is a private header file." -#endif - #include <gio/giotypes.h> G_BEGIN_DECLS @@ -119,7 +115,7 @@ * Initially this function was introduces for usage with rundll, * so the signature is kept rundll-compatible, though parameters aren't used. */ -_GLIB_EXTERN void __stdcall +_GIO_EXTERN void __stdcall g_win32_run_session_bus (void* hwnd, void* hinst, const char* cmdline, int cmdshow); gchar *_g_dbus_win32_get_session_address_dbus_launch (GError **error); #endif
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gdbusproxy.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gdbusproxy.c
Changed
@@ -631,13 +631,6 @@ /* ---------------------------------------------------------------------------------------------------- */ -static gint -property_name_sort_func (const gchar **a, - const gchar **b) -{ - return g_strcmp0 (*a, *b); -} - /** * g_dbus_proxy_get_cached_property_names: * @proxy: A #GDBusProxy. @@ -672,7 +665,7 @@ g_hash_table_iter_init (&iter, proxy->priv->properties); while (g_hash_table_iter_next (&iter, (gpointer) &key, NULL)) g_ptr_array_add (p, g_strdup (key)); - g_ptr_array_sort (p, (GCompareFunc) property_name_sort_func); + g_ptr_array_sort_values (p, (GCompareFunc) g_strcmp0); g_ptr_array_add (p, NULL); names = (gchar **) g_ptr_array_free (p, FALSE);
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gdbusproxy.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gdbusproxy.h
Changed
@@ -86,9 +86,9 @@ gpointer padding32; }; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GType g_dbus_proxy_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_dbus_proxy_new (GDBusConnection *connection, GDBusProxyFlags flags, GDBusInterfaceInfo *info, @@ -98,10 +98,10 @@ GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GDBusProxy *g_dbus_proxy_new_finish (GAsyncResult *res, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GDBusProxy *g_dbus_proxy_new_sync (GDBusConnection *connection, GDBusProxyFlags flags, GDBusInterfaceInfo *info, @@ -110,7 +110,7 @@ const gchar *interface_name, GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_dbus_proxy_new_for_bus (GBusType bus_type, GDBusProxyFlags flags, GDBusInterfaceInfo *info, @@ -120,10 +120,10 @@ GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GDBusProxy *g_dbus_proxy_new_for_bus_finish (GAsyncResult *res, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GDBusProxy *g_dbus_proxy_new_for_bus_sync (GBusType bus_type, GDBusProxyFlags flags, GDBusInterfaceInfo *info, @@ -132,38 +132,38 @@ const gchar *interface_name, GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GDBusConnection *g_dbus_proxy_get_connection (GDBusProxy *proxy); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GDBusProxyFlags g_dbus_proxy_get_flags (GDBusProxy *proxy); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL const gchar *g_dbus_proxy_get_name (GDBusProxy *proxy); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gchar *g_dbus_proxy_get_name_owner (GDBusProxy *proxy); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL const gchar *g_dbus_proxy_get_object_path (GDBusProxy *proxy); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL const gchar *g_dbus_proxy_get_interface_name (GDBusProxy *proxy); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gint g_dbus_proxy_get_default_timeout (GDBusProxy *proxy); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_dbus_proxy_set_default_timeout (GDBusProxy *proxy, gint timeout_msec); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GDBusInterfaceInfo *g_dbus_proxy_get_interface_info (GDBusProxy *proxy); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_dbus_proxy_set_interface_info (GDBusProxy *proxy, GDBusInterfaceInfo *info); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GVariant *g_dbus_proxy_get_cached_property (GDBusProxy *proxy, const gchar *property_name); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_dbus_proxy_set_cached_property (GDBusProxy *proxy, const gchar *property_name, GVariant *value); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gchar **g_dbus_proxy_get_cached_property_names (GDBusProxy *proxy); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_dbus_proxy_call (GDBusProxy *proxy, const gchar *method_name, GVariant *parameters, @@ -172,11 +172,11 @@ GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GVariant *g_dbus_proxy_call_finish (GDBusProxy *proxy, GAsyncResult *res, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GVariant *g_dbus_proxy_call_sync (GDBusProxy *proxy, const gchar *method_name, GVariant *parameters, @@ -187,7 +187,7 @@ #ifdef G_OS_UNIX -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_dbus_proxy_call_with_unix_fd_list (GDBusProxy *proxy, const gchar *method_name, GVariant *parameters, @@ -197,12 +197,12 @@ GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GVariant *g_dbus_proxy_call_with_unix_fd_list_finish (GDBusProxy *proxy, GUnixFDList **out_fd_list, GAsyncResult *res, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GVariant *g_dbus_proxy_call_with_unix_fd_list_sync (GDBusProxy *proxy, const gchar *method_name, GVariant *parameters,
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gdbusserver.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gdbusserver.c
Changed
@@ -725,14 +725,7 @@ for (n = 0; n < 8; n++) g_string_append_c (s, random_ascii ()); - /* prefer abstract namespace if available for tmpdir: addresses - * abstract namespace is disallowed for dir: addresses */ - if (tmpdir != NULL && g_unix_socket_address_abstract_names_supported ()) - address = g_unix_socket_address_new_with_type (s->str, - -1, - G_UNIX_SOCKET_ADDRESS_ABSTRACT); - else - address = g_unix_socket_address_new (s->str); + address = g_unix_socket_address_new (s->str); g_string_free (s, TRUE); local_error = NULL;
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gdbusserver.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gdbusserver.h
Changed
@@ -35,26 +35,26 @@ #define G_DBUS_SERVER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_DBUS_SERVER, GDBusServer)) #define G_IS_DBUS_SERVER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_DBUS_SERVER)) -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GType g_dbus_server_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GDBusServer *g_dbus_server_new_sync (const gchar *address, GDBusServerFlags flags, const gchar *guid, GDBusAuthObserver *observer, GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL const gchar *g_dbus_server_get_client_address (GDBusServer *server); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL const gchar *g_dbus_server_get_guid (GDBusServer *server); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GDBusServerFlags g_dbus_server_get_flags (GDBusServer *server); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_dbus_server_start (GDBusServer *server); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_dbus_server_stop (GDBusServer *server); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_dbus_server_is_active (GDBusServer *server); G_END_DECLS
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gdbusutils.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gdbusutils.h
Changed
@@ -31,33 +31,33 @@ G_BEGIN_DECLS -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_dbus_is_guid (const gchar *string); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gchar *g_dbus_generate_guid (void); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_dbus_is_name (const gchar *string); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_dbus_is_unique_name (const gchar *string); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_dbus_is_member_name (const gchar *string); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_dbus_is_interface_name (const gchar *string); -GLIB_AVAILABLE_IN_2_70 +GIO_AVAILABLE_IN_2_70 gboolean g_dbus_is_error_name (const gchar *string); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_dbus_gvariant_to_gvalue (GVariant *value, GValue *out_gvalue); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GVariant *g_dbus_gvalue_to_gvariant (const GValue *gvalue, const GVariantType *type); -GLIB_AVAILABLE_IN_2_68 +GIO_AVAILABLE_IN_2_68 gchar *g_dbus_escape_object_path_bytestring (const guint8 *bytes); -GLIB_AVAILABLE_IN_2_68 +GIO_AVAILABLE_IN_2_68 gchar *g_dbus_escape_object_path (const gchar *s); -GLIB_AVAILABLE_IN_2_68 +GIO_AVAILABLE_IN_2_68 guint8 *g_dbus_unescape_object_path (const gchar *s); G_END_DECLS
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gdebugcontroller.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gdebugcontroller.h
Changed
@@ -50,7 +50,7 @@ * Since: 2.72 */ #define G_TYPE_DEBUG_CONTROLLER (g_debug_controller_get_type ()) -GLIB_AVAILABLE_IN_2_72 +GIO_AVAILABLE_IN_2_72 G_DECLARE_INTERFACE(GDebugController, g_debug_controller, g, debug_controller, GObject) #define G_DEBUG_CONTROLLER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_DEBUG_CONTROLLER, GDebugController)) @@ -70,9 +70,9 @@ GTypeInterface g_iface; }; -GLIB_AVAILABLE_IN_2_72 +GIO_AVAILABLE_IN_2_72 gboolean g_debug_controller_get_debug_enabled (GDebugController *self); -GLIB_AVAILABLE_IN_2_72 +GIO_AVAILABLE_IN_2_72 void g_debug_controller_set_debug_enabled (GDebugController *self, gboolean debug_enabled);
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gdebugcontrollerdbus.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gdebugcontrollerdbus.c
Changed
@@ -50,9 +50,10 @@ * #GDebugController:debug-enabled and, by default, g_log_get_debug_enabled(). * default. * - * By default, all processes will be able to call `SetDebugEnabled()`. If this - * process is privileged, or might expose sensitive information in its debug - * output, you may want to restrict the ability to enable debug output to + * By default, no processes are allowed to call `SetDebugEnabled()` unless a + * #GDebugControllerDBus::authorize signal handler is installed. This is because + * the process may be privileged, or might expose sensitive information in its + * debug output. You may want to restrict the ability to enable debug output to * privileged users or processes. * * One option is to install a D-Bus security policy which restricts access to
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gdebugcontrollerdbus.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gdebugcontrollerdbus.h
Changed
@@ -36,7 +36,7 @@ * Since: 2.72 */ #define G_TYPE_DEBUG_CONTROLLER_DBUS (g_debug_controller_dbus_get_type ()) -GLIB_AVAILABLE_IN_2_72 +GIO_AVAILABLE_IN_2_72 G_DECLARE_DERIVABLE_TYPE (GDebugControllerDBus, g_debug_controller_dbus, G, DEBUG_CONTROLLER_DBUS, GObject) /** @@ -58,12 +58,12 @@ gpointer padding12; }; -GLIB_AVAILABLE_IN_2_72 +GIO_AVAILABLE_IN_2_72 GDebugControllerDBus *g_debug_controller_dbus_new (GDBusConnection *connection, GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_2_72 +GIO_AVAILABLE_IN_2_72 void g_debug_controller_dbus_stop (GDebugControllerDBus *self); G_END_DECLS
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gdesktopappinfo.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gdesktopappinfo.c
Changed
@@ -56,6 +56,7 @@ #include "gappinfo.h" #include "gappinfoprivate.h" #include "glocalfilemonitor.h" +#include "gutilsprivate.h" #ifdef G_OS_UNIX #include "gdocumentportal.h" @@ -455,6 +456,14 @@ DESKTOP_KEY_Comment = 6 }; +typedef enum { + /* Lower numbers have higher priority. + * Prefix match should put before substring match. + */ + MATCH_TYPE_PREFIX = 1, + MATCH_TYPE_SUBSTRING = 2 +} MatchType; + /* Common prefix commands to ignore from Exec= lines */ const char * const exec_key_match_blocklist = { "bash", @@ -536,6 +545,7 @@ { const gchar *app_name; gint category; + gint match_type; }; static struct search_result *static_token_results; @@ -557,13 +567,20 @@ const struct search_result *rb = b; if (ra->app_name < rb->app_name) - return -1; - + { + return -1; + } else if (ra->app_name > rb->app_name) - return 1; - + { + return 1; + } else - return ra->category - rb->category; + { + if (ra->category == rb->category) + return ra->match_type - rb->match_type; + + return ra->category - rb->category; + } } static gint @@ -573,12 +590,19 @@ const struct search_result *ra = a; const struct search_result *rb = b; + /* Also compare match types so we can put prefix match in a group while + * substring match in another group. + */ + if (ra->category == rb->category) + return ra->match_type - rb->match_type; + return ra->category - rb->category; } static void add_token_result (const gchar *app_name, - guint16 category) + guint16 category, + guint16 match_type) { if G_UNLIKELY (static_token_results_size == static_token_results_allocated) { @@ -588,6 +612,7 @@ static_token_resultsstatic_token_results_size.app_name = app_name; static_token_resultsstatic_token_results_size.category = category; + static_token_resultsstatic_token_results_size.match_type = match_type; static_token_results_size++; } @@ -671,10 +696,22 @@ * * Category should be the worse of the two (ie: * numerically larger). + * + * Match type should also be the worse, so if an app has two + * prefix matches it will has higher priority than one prefix + * matches and one substring matches, for example, LibreOffice + * Writer should be higher priority than LibreOffice Draw with + * `lib w`. + * + * (This ignores the difference between partly prefix matches and + * all substring matches, however most time we just focus on exact + * prefix matches, who cares the 10th-20th search results?) */ static_search_resultsj.app_name = static_search_resultsk.app_name; static_search_resultsj.category = MAX (static_search_resultsk.category, static_token_resultsi.category); + static_search_resultsj.match_type = MAX (static_search_resultsk.match_type, + static_token_resultsi.match_type); j++; } } @@ -1216,6 +1253,8 @@ GHashTableIter iter; gpointer key, value; + g_assert (search_token != NULL); + if (!dir->memory_index) desktop_file_dir_unindexed_setup_search (dir); @@ -1223,13 +1262,24 @@ while (g_hash_table_iter_next (&iter, &key, &value)) { MemoryIndexEntry *mie = value; + const char *p; + MatchType match_type; - if (!g_str_has_prefix (key, search_token)) + /* strstr(haystack, needle) returns haystack if needle is empty, so if + * needle is not empty and return value equals to haystack means a prefix + * match. + */ + p = strstr (key, search_token); + if (p == NULL) continue; + else if (p == key && *search_token != '\0') + match_type = MATCH_TYPE_PREFIX; + else + match_type = MATCH_TYPE_SUBSTRING; while (mie) { - add_token_result (mie->app_name, mie->match_category); + add_token_result (mie->app_name, mie->match_category, match_type); mie = mie->next; } } @@ -1830,6 +1880,7 @@ char *type; char *try_exec; char *exec; + char *path; gboolean bus_activatable; start_group = g_key_file_get_start_group (key_file); @@ -1851,6 +1902,10 @@ } g_free (type); + path = g_key_file_get_string (key_file, + G_KEY_FILE_DESKTOP_GROUP, + G_KEY_FILE_DESKTOP_KEY_PATH, NULL); + try_exec = g_key_file_get_string (key_file, G_KEY_FILE_DESKTOP_GROUP, G_KEY_FILE_DESKTOP_KEY_TRY_EXEC, @@ -1858,9 +1913,11 @@ if (try_exec && try_exec0 != '\0') { char *t; - t = g_find_program_in_path (try_exec); + /* Use the desktop file path (if any) as working dir to search program */ + t = GLIB_PRIVATE_CALL (g_find_program_for_path) (try_exec, NULL, path); if (t == NULL) { + g_free (path); g_free (try_exec); return FALSE; } @@ -1877,6 +1934,7 @@ char **argv; if (!g_shell_parse_argv (exec, &argc, &argv, NULL)) { + g_free (path); g_free (exec); g_free (try_exec); return FALSE; @@ -1888,11 +1946,13 @@ /* Since @exec is not an empty string, there must be at least one * argument, so dereferencing argv0 should return non-NULL. */ g_assert (argc > 0); - t = g_find_program_in_path (argv0); + /* Use the desktop file path (if any) as working dir to search program */ + t = GLIB_PRIVATE_CALL (g_find_program_for_path) (argv0, NULL, path); g_strfreev (argv); if (t == NULL) { + g_free (path); g_free (exec); g_free (try_exec); return FALSE; @@ -1912,7 +1972,7 @@ info->not_show_in = g_key_file_get_string_list (key_file, G_KEY_FILE_DESKTOP_GROUP, G_KEY_FILE_DESKTOP_KEY_NOT_SHOW_IN, NULL, NULL); info->try_exec = try_exec; info->exec = exec; - info->path = g_key_file_get_string (key_file, G_KEY_FILE_DESKTOP_GROUP, G_KEY_FILE_DESKTOP_KEY_PATH, NULL); + info->path = g_steal_pointer (&path); info->terminal = g_key_file_get_boolean (key_file, G_KEY_FILE_DESKTOP_GROUP, G_KEY_FILE_DESKTOP_KEY_TERMINAL, NULL) != FALSE; info->startup_notify = g_key_file_get_boolean (key_file, G_KEY_FILE_DESKTOP_GROUP, G_KEY_FILE_DESKTOP_KEY_STARTUP_NOTIFY, NULL) != FALSE; info->no_fuse = g_key_file_get_boolean (key_file, G_KEY_FILE_DESKTOP_GROUP, "X-GIO-NoFuse", NULL) != FALSE; @@ -2622,17 +2682,36 @@ } static gboolean -prepend_terminal_to_vector (int *argc, - char ***argv) +prepend_terminal_to_vector (int *argc, + char ***argv, + const char *path, + const char *working_dir) { #ifndef G_OS_WIN32 char **real_argv; - int real_argc; - int i, j; - char **term_argv = NULL; - int term_argc = 0; - char *check; + size_t real_argc; + size_t i; + size_t term_argc; + char *found_terminal; char **the_argv; + const char *term_arg; + static const struct { + const char *exec; + const char *exec_arg; + } known_terminals = { + { "xdg-terminal-exec", NULL }, + { "kgx", "-e" }, + { "gnome-terminal", "--" }, + { "mate-terminal", "-x" }, + { "xfce4-terminal", "-x" }, + { "tilix", "-e" }, + { "konsole", "-e" }, + { "nxterm", "-e" }, + { "color-xterm", "-e" }, + { "rxvt", "-e" }, + { "dtterm", "-e" }, + { "xterm", "-e" } + }; g_return_val_if_fail (argc != NULL, FALSE); g_return_val_if_fail (argv != NULL, FALSE); @@ -2646,69 +2725,42 @@ /* compute size if not given */ if (*argc < 0) { - for (i = 0; the_argvi != NULL; i++) + for ((*argc) = 0; the_argv*argc != NULL; (*argc)++) ; - *argc = i; } - term_argc = 2; - term_argv = g_new0 (char *, 3); - - check = g_find_program_in_path ("gnome-terminal"); - if (check != NULL) - { - term_argv0 = check; - /* Since 2017, gnome-terminal has preferred `--` over `-x` or `-e`. */ - term_argv1 = g_strdup ("--"); - } - else + for (i = 0, found_terminal = NULL; i < G_N_ELEMENTS (known_terminals); i++) { - if (check == NULL) - check = g_find_program_in_path ("mate-terminal"); - if (check == NULL) - check = g_find_program_in_path ("xfce4-terminal"); - if (check != NULL) - { - term_argv0 = check; - /* Note that gnome-terminal takes -x and - * as -e in gnome-terminal is broken we use that. */ - term_argv1 = g_strdup ("-x"); - } - else + found_terminal = GLIB_PRIVATE_CALL (g_find_program_for_path) (known_terminalsi.exec, + path, working_dir); + if (found_terminal != NULL) { - if (check == NULL) - check = g_find_program_in_path ("tilix"); - if (check == NULL) - check = g_find_program_in_path ("konsole"); - if (check == NULL) - check = g_find_program_in_path ("nxterm"); - if (check == NULL) - check = g_find_program_in_path ("color-xterm"); - if (check == NULL) - check = g_find_program_in_path ("rxvt"); - if (check == NULL) - check = g_find_program_in_path ("dtterm"); - if (check == NULL) - check = g_find_program_in_path ("xterm"); - if (check == NULL) - { - g_debug ("Couldn’t find a known terminal"); - g_free (term_argv); - return FALSE; - } - term_argv0 = check; - term_argv1 = g_strdup ("-e"); + term_arg = known_terminalsi.exec_arg; + break; } } + if (found_terminal == NULL) + { + g_debug ("Couldn’t find a known terminal"); + return FALSE; + } + + /* check if the terminal require an option */ + term_argc = term_arg ? 2 : 1; + real_argc = term_argc + *argc; real_argv = g_new (char *, real_argc + 1); - for (i = 0; i < term_argc; i++) - real_argvi = term_argvi; + i = 0; + real_argvi++ = found_terminal; + + if (term_arg) + real_argvi++ = g_strdup (term_arg); - for (j = 0; j < *argc; j++, i++) - real_argvi = (char *)the_argvj; + g_assert (i == term_argc); + for (int j = 0; j < *argc; j++) + real_argvi++ = the_argvj; real_argvi = NULL; @@ -2716,9 +2768,6 @@ *argv = real_argv; *argc = real_argc; - /* we use g_free here as we sucked all the inner strings - * out from it into real_argv */ - g_free (term_argv); return TRUE; #else return FALSE; @@ -2885,7 +2934,9 @@ launched_uris = g_list_prepend (launched_uris, iter->data); launched_uris = g_list_reverse (launched_uris); - if (info->terminal && !prepend_terminal_to_vector (&argc, &argv)) + if (info->terminal && !prepend_terminal_to_vector (&argc, &argv, + g_environ_getenv (envp, "PATH"), + info->path)) { g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_FAILED, _("Unable to find terminal required for application")); @@ -2909,7 +2960,10 @@ G_APP_INFO (info), launched_files); if (sn_id) - envp = g_environ_setenv (envp, "DESKTOP_STARTUP_ID", sn_id, TRUE); + { + envp = g_environ_setenv (envp, "DESKTOP_STARTUP_ID", sn_id, TRUE); + envp = g_environ_setenv (envp, "XDG_ACTIVATION_TOKEN", sn_id, TRUE); + } } g_list_free_full (launched_files, g_object_unref); @@ -2917,6 +2971,46 @@ emit_launch_started (launch_context, info, sn_id); } + g_assert (argc > 0); + + if (!g_path_is_absolute (argv0) || + !g_file_test (argv0, G_FILE_TEST_IS_EXECUTABLE) || + g_file_test (argv0, G_FILE_TEST_IS_DIR)) + { + char *program = g_steal_pointer (&argv0); + char *program_path = NULL; + + if (!g_path_is_absolute (program)) + { + const char *env_path = g_environ_getenv (envp, "PATH"); + + program_path = GLIB_PRIVATE_CALL (g_find_program_for_path) (program, + env_path, + info->path); + } + + if (program_path) + { + argv0 = g_steal_pointer (&program_path); + } + else + { + if (sn_id) + g_app_launch_context_launch_failed (launch_context, sn_id); + + g_set_error (error, G_SPAWN_ERROR, G_SPAWN_ERROR_NOENT, + _("Program ‘%s’ not found in $PATH"), + program); + + g_free (program); + g_clear_pointer (&sn_id, g_free); + g_clear_list (&launched_uris, NULL); + goto out; + } + + g_free (program); + } + if (g_once_init_enter (&gio_launch_desktop_path)) { const gchar *tmp = NULL; @@ -3046,7 +3140,10 @@ sn_id = g_app_launch_context_get_startup_notify_id (launch_context, G_APP_INFO (info), launched_files); if (sn_id) - g_variant_builder_add (&builder, "{sv}", "desktop-startup-id", g_variant_new_take_string (sn_id)); + { + g_variant_builder_add (&builder, "{sv}", "desktop-startup-id", g_variant_new_string (sn_id)); + g_variant_builder_add (&builder, "{sv}", "activation-token", g_variant_new_take_string (g_steal_pointer (&sn_id))); + } } g_list_free_full (launched_files, g_object_unref); @@ -3060,7 +3157,7 @@ GDesktopAppInfo *info; /* (owned) */ GAppLaunchContext *launch_context; /* (owned) (nullable) */ GAsyncReadyCallback callback; - gchar *startup_id; /* (owned) */ + gchar *startup_id; /* (owned) (nullable) */ gpointer user_data; } LaunchUrisWithDBusData; @@ -3085,7 +3182,10 @@ if (data->launch_context) { if (g_task_had_error (G_TASK (result))) - g_app_launch_context_launch_failed (data->launch_context, data->startup_id); + { + if (data->startup_id != NULL) + g_app_launch_context_launch_failed (data->launch_context, data->startup_id); + } else { GVariant *platform_data; @@ -3455,11 +3555,11 @@ * @uris: (element-type utf8): List of URIs * @launch_context: (nullable): a #GAppLaunchContext * @spawn_flags: #GSpawnFlags, used for each process - * @user_setup: (scope async) (nullable): a #GSpawnChildSetupFunc, used once + * @user_setup: (scope async) (nullable) (closure user_setup_data): a #GSpawnChildSetupFunc, used once * for each process. - * @user_setup_data: (closure user_setup) (nullable): User data for @user_setup - * @pid_callback: (scope call) (nullable): Callback for child processes - * @pid_callback_data: (closure pid_callback) (nullable): User data for @callback + * @user_setup_data: User data for @user_setup + * @pid_callback: (scope call) (nullable) (closure pid_callback_data): Callback for child processes + * @pid_callback_data: User data for @callback * @stdin_fd: file descriptor to use for child's stdin, or -1 * @stdout_fd: file descriptor to use for child's stdout, or -1 * @stderr_fd: file descriptor to use for child's stderr, or -1 @@ -4728,9 +4828,10 @@ { gchar **search_tokens; gint last_category = -1; + gint last_match_type = -1; gchar ***results; - gint n_categories = 0; - gint start_of_category; + gint n_groups = 0; + gint start_of_group; gint i, j; guint k; @@ -4752,36 +4853,41 @@ sort_total_search_results (); - /* Count the total number of unique categories */ + /* Count the total number of unique categories and match types */ for (i = 0; i < static_total_results_size; i++) - if (static_total_resultsi.category != last_category) + if (static_total_resultsi.category != last_category || + static_total_resultsi.match_type != last_match_type) { last_category = static_total_resultsi.category; - n_categories++; + last_match_type = static_total_resultsi.match_type; + n_groups++; } - results = g_new (gchar **, n_categories + 1); + results = g_new (gchar **, n_groups + 1); /* Start loading into the results list */ - start_of_category = 0; - for (i = 0; i < n_categories; i++) + start_of_group = 0; + for (i = 0; i < n_groups; i++) { - gint n_items_in_category = 0; + gint n_items_in_group = 0; gint this_category; + gint this_match_type; gint j; - this_category = static_total_resultsstart_of_category.category; + this_category = static_total_resultsstart_of_group.category; + this_match_type = static_total_resultsstart_of_group.match_type; - while (start_of_category + n_items_in_category < static_total_results_size && - static_total_resultsstart_of_category + n_items_in_category.category == this_category) - n_items_in_category++; - - resultsi = g_new (gchar *, n_items_in_category + 1); - for (j = 0; j < n_items_in_category; j++) - resultsij = g_strdup (static_total_resultsstart_of_category + j.app_name); + while (start_of_group + n_items_in_group < static_total_results_size && + static_total_resultsstart_of_group + n_items_in_group.category == this_category && + static_total_resultsstart_of_group + n_items_in_group.match_type == this_match_type) + n_items_in_group++; + + resultsi = g_new (gchar *, n_items_in_group + 1); + for (j = 0; j < n_items_in_group; j++) + resultsij = g_strdup (static_total_resultsstart_of_group + j.app_name); resultsij = NULL; - start_of_category += n_items_in_category; + start_of_group += n_items_in_group; } resultsi = NULL;
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gdesktopappinfo.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gdesktopappinfo.h
Changed
@@ -45,73 +45,73 @@ }; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GType g_desktop_app_info_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GDesktopAppInfo *g_desktop_app_info_new_from_filename (const char *filename); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GDesktopAppInfo *g_desktop_app_info_new_from_keyfile (GKeyFile *key_file); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL const char * g_desktop_app_info_get_filename (GDesktopAppInfo *info); -GLIB_AVAILABLE_IN_2_30 +GIO_AVAILABLE_IN_2_30 const char * g_desktop_app_info_get_generic_name (GDesktopAppInfo *info); -GLIB_AVAILABLE_IN_2_30 +GIO_AVAILABLE_IN_2_30 const char * g_desktop_app_info_get_categories (GDesktopAppInfo *info); -GLIB_AVAILABLE_IN_2_30 +GIO_AVAILABLE_IN_2_30 const char * const *g_desktop_app_info_get_keywords (GDesktopAppInfo *info); -GLIB_AVAILABLE_IN_2_30 +GIO_AVAILABLE_IN_2_30 gboolean g_desktop_app_info_get_nodisplay (GDesktopAppInfo *info); -GLIB_AVAILABLE_IN_2_30 +GIO_AVAILABLE_IN_2_30 gboolean g_desktop_app_info_get_show_in (GDesktopAppInfo *info, const gchar *desktop_env); -GLIB_AVAILABLE_IN_2_34 +GIO_AVAILABLE_IN_2_34 const char * g_desktop_app_info_get_startup_wm_class (GDesktopAppInfo *info); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GDesktopAppInfo *g_desktop_app_info_new (const char *desktop_id); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_desktop_app_info_get_is_hidden (GDesktopAppInfo *info); -GLIB_DEPRECATED_IN_2_42 +GIO_DEPRECATED_IN_2_42 void g_desktop_app_info_set_desktop_env (const char *desktop_env); -GLIB_AVAILABLE_IN_2_36 +GIO_AVAILABLE_IN_2_36 gboolean g_desktop_app_info_has_key (GDesktopAppInfo *info, const char *key); -GLIB_AVAILABLE_IN_2_36 +GIO_AVAILABLE_IN_2_36 char * g_desktop_app_info_get_string (GDesktopAppInfo *info, const char *key); -GLIB_AVAILABLE_IN_2_56 +GIO_AVAILABLE_IN_2_56 char * g_desktop_app_info_get_locale_string (GDesktopAppInfo *info, const char *key); -GLIB_AVAILABLE_IN_2_36 +GIO_AVAILABLE_IN_2_36 gboolean g_desktop_app_info_get_boolean (GDesktopAppInfo *info, const char *key); -GLIB_AVAILABLE_IN_2_60 +GIO_AVAILABLE_IN_2_60 gchar ** g_desktop_app_info_get_string_list (GDesktopAppInfo *info, const char *key, gsize *length); -GLIB_AVAILABLE_IN_2_38 +GIO_AVAILABLE_IN_2_38 const gchar * const * g_desktop_app_info_list_actions (GDesktopAppInfo *info); -GLIB_AVAILABLE_IN_2_38 +GIO_AVAILABLE_IN_2_38 void g_desktop_app_info_launch_action (GDesktopAppInfo *info, const gchar *action_name, GAppLaunchContext *launch_context); -GLIB_AVAILABLE_IN_2_38 +GIO_AVAILABLE_IN_2_38 gchar * g_desktop_app_info_get_action_name (GDesktopAppInfo *info, const gchar *action_name); -#define G_TYPE_DESKTOP_APP_INFO_LOOKUP (g_desktop_app_info_lookup_get_type ()) GLIB_DEPRECATED_MACRO_IN_2_28 -#define G_DESKTOP_APP_INFO_LOOKUP(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), G_TYPE_DESKTOP_APP_INFO_LOOKUP, GDesktopAppInfoLookup)) GLIB_DEPRECATED_MACRO_IN_2_28 -#define G_IS_DESKTOP_APP_INFO_LOOKUP(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), G_TYPE_DESKTOP_APP_INFO_LOOKUP)) GLIB_DEPRECATED_MACRO_IN_2_28 -#define G_DESKTOP_APP_INFO_LOOKUP_GET_IFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), G_TYPE_DESKTOP_APP_INFO_LOOKUP, GDesktopAppInfoLookupIface)) GLIB_DEPRECATED_MACRO_IN_2_28 +#define G_TYPE_DESKTOP_APP_INFO_LOOKUP (g_desktop_app_info_lookup_get_type ()) GIO_DEPRECATED_MACRO_IN_2_28 +#define G_DESKTOP_APP_INFO_LOOKUP(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), G_TYPE_DESKTOP_APP_INFO_LOOKUP, GDesktopAppInfoLookup)) GIO_DEPRECATED_MACRO_IN_2_28 +#define G_IS_DESKTOP_APP_INFO_LOOKUP(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), G_TYPE_DESKTOP_APP_INFO_LOOKUP)) GIO_DEPRECATED_MACRO_IN_2_28 +#define G_DESKTOP_APP_INFO_LOOKUP_GET_IFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), G_TYPE_DESKTOP_APP_INFO_LOOKUP, GDesktopAppInfoLookupIface)) GIO_DEPRECATED_MACRO_IN_2_28 /** * G_DESKTOP_APP_INFO_LOOKUP_EXTENSION_POINT_NAME: @@ -122,7 +122,7 @@ * Deprecated: 2.28: The #GDesktopAppInfoLookup interface is deprecated and * unused by GIO. */ -#define G_DESKTOP_APP_INFO_LOOKUP_EXTENSION_POINT_NAME "gio-desktop-app-info-lookup" GLIB_DEPRECATED_MACRO_IN_2_28 +#define G_DESKTOP_APP_INFO_LOOKUP_EXTENSION_POINT_NAME "gio-desktop-app-info-lookup" GIO_DEPRECATED_MACRO_IN_2_28 /** * GDesktopAppInfoLookupIface: @@ -143,10 +143,10 @@ const char *uri_scheme); }; -GLIB_DEPRECATED +GIO_DEPRECATED GType g_desktop_app_info_lookup_get_type (void) G_GNUC_CONST; -GLIB_DEPRECATED +GIO_DEPRECATED GAppInfo *g_desktop_app_info_lookup_get_default_for_uri_scheme (GDesktopAppInfoLookup *lookup, const char *uri_scheme); @@ -164,7 +164,7 @@ GPid pid, gpointer user_data); -GLIB_AVAILABLE_IN_2_28 +GIO_AVAILABLE_IN_2_28 gboolean g_desktop_app_info_launch_uris_as_manager (GDesktopAppInfo *appinfo, GList *uris, GAppLaunchContext *launch_context, @@ -175,7 +175,7 @@ gpointer pid_callback_data, GError **error); -GLIB_AVAILABLE_IN_2_58 +GIO_AVAILABLE_IN_2_58 gboolean g_desktop_app_info_launch_uris_as_manager_with_fds (GDesktopAppInfo *appinfo, GList *uris, GAppLaunchContext *launch_context, @@ -189,10 +189,10 @@ gint stderr_fd, GError **error); -GLIB_AVAILABLE_IN_2_40 +GIO_AVAILABLE_IN_2_40 gchar *** g_desktop_app_info_search (const gchar *search_string); -GLIB_AVAILABLE_IN_2_42 +GIO_AVAILABLE_IN_2_42 GList *g_desktop_app_info_get_implementations (const gchar *interface); G_END_DECLS
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gdrive.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gdrive.h
Changed
@@ -170,103 +170,103 @@ }; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GType g_drive_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL char * g_drive_get_name (GDrive *drive); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GIcon * g_drive_get_icon (GDrive *drive); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GIcon * g_drive_get_symbolic_icon (GDrive *drive); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_drive_has_volumes (GDrive *drive); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GList * g_drive_get_volumes (GDrive *drive); -GLIB_AVAILABLE_IN_2_50 +GIO_AVAILABLE_IN_2_50 gboolean g_drive_is_removable (GDrive *drive); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_drive_is_media_removable (GDrive *drive); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_drive_has_media (GDrive *drive); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_drive_is_media_check_automatic (GDrive *drive); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_drive_can_poll_for_media (GDrive *drive); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_drive_can_eject (GDrive *drive); -GLIB_DEPRECATED_FOR(g_drive_eject_with_operation) +GIO_DEPRECATED_FOR(g_drive_eject_with_operation) void g_drive_eject (GDrive *drive, GMountUnmountFlags flags, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); -GLIB_DEPRECATED_FOR(g_drive_eject_with_operation_finish) +GIO_DEPRECATED_FOR(g_drive_eject_with_operation_finish) gboolean g_drive_eject_finish (GDrive *drive, GAsyncResult *result, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_drive_poll_for_media (GDrive *drive, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_drive_poll_for_media_finish (GDrive *drive, GAsyncResult *result, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL char * g_drive_get_identifier (GDrive *drive, const char *kind); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL char ** g_drive_enumerate_identifiers (GDrive *drive); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GDriveStartStopType g_drive_get_start_stop_type (GDrive *drive); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_drive_can_start (GDrive *drive); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_drive_can_start_degraded (GDrive *drive); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_drive_start (GDrive *drive, GDriveStartFlags flags, GMountOperation *mount_operation, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_drive_start_finish (GDrive *drive, GAsyncResult *result, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_drive_can_stop (GDrive *drive); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_drive_stop (GDrive *drive, GMountUnmountFlags flags, GMountOperation *mount_operation, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_drive_stop_finish (GDrive *drive, GAsyncResult *result, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_drive_eject_with_operation (GDrive *drive, GMountUnmountFlags flags, GMountOperation *mount_operation, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_drive_eject_with_operation_finish (GDrive *drive, GAsyncResult *result, GError **error); -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 const gchar *g_drive_get_sort_key (GDrive *drive); G_END_DECLS
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gdtlsclientconnection.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gdtlsclientconnection.h
Changed
@@ -50,25 +50,25 @@ GTypeInterface g_iface; }; -GLIB_AVAILABLE_IN_2_48 +GIO_AVAILABLE_IN_2_48 GType g_dtls_client_connection_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_2_48 +GIO_AVAILABLE_IN_2_48 GDatagramBased *g_dtls_client_connection_new (GDatagramBased *base_socket, GSocketConnectable *server_identity, GError **error); -GLIB_AVAILABLE_IN_2_48 +GIO_AVAILABLE_IN_2_48 GTlsCertificateFlags g_dtls_client_connection_get_validation_flags (GDtlsClientConnection *conn); -GLIB_AVAILABLE_IN_2_48 +GIO_AVAILABLE_IN_2_48 void g_dtls_client_connection_set_validation_flags (GDtlsClientConnection *conn, GTlsCertificateFlags flags); -GLIB_AVAILABLE_IN_2_48 +GIO_AVAILABLE_IN_2_48 GSocketConnectable *g_dtls_client_connection_get_server_identity (GDtlsClientConnection *conn); -GLIB_AVAILABLE_IN_2_48 +GIO_AVAILABLE_IN_2_48 void g_dtls_client_connection_set_server_identity (GDtlsClientConnection *conn, GSocketConnectable *identity); -GLIB_AVAILABLE_IN_2_48 +GIO_AVAILABLE_IN_2_48 GList * g_dtls_client_connection_get_accepted_cas (GDtlsClientConnection *conn);
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gdtlsconnection.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gdtlsconnection.h
Changed
@@ -107,70 +107,70 @@ G_GNUC_END_IGNORE_DEPRECATIONS }; -GLIB_AVAILABLE_IN_2_48 +GIO_AVAILABLE_IN_2_48 GType g_dtls_connection_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_2_48 +GIO_AVAILABLE_IN_2_48 void g_dtls_connection_set_database (GDtlsConnection *conn, GTlsDatabase *database); -GLIB_AVAILABLE_IN_2_48 +GIO_AVAILABLE_IN_2_48 GTlsDatabase *g_dtls_connection_get_database (GDtlsConnection *conn); -GLIB_AVAILABLE_IN_2_48 +GIO_AVAILABLE_IN_2_48 void g_dtls_connection_set_certificate (GDtlsConnection *conn, GTlsCertificate *certificate); -GLIB_AVAILABLE_IN_2_48 +GIO_AVAILABLE_IN_2_48 GTlsCertificate *g_dtls_connection_get_certificate (GDtlsConnection *conn); -GLIB_AVAILABLE_IN_2_48 +GIO_AVAILABLE_IN_2_48 void g_dtls_connection_set_interaction (GDtlsConnection *conn, GTlsInteraction *interaction); -GLIB_AVAILABLE_IN_2_48 +GIO_AVAILABLE_IN_2_48 GTlsInteraction *g_dtls_connection_get_interaction (GDtlsConnection *conn); -GLIB_AVAILABLE_IN_2_48 +GIO_AVAILABLE_IN_2_48 GTlsCertificate *g_dtls_connection_get_peer_certificate (GDtlsConnection *conn); -GLIB_AVAILABLE_IN_2_48 +GIO_AVAILABLE_IN_2_48 GTlsCertificateFlags g_dtls_connection_get_peer_certificate_errors (GDtlsConnection *conn); -GLIB_AVAILABLE_IN_2_48 +GIO_AVAILABLE_IN_2_48 void g_dtls_connection_set_require_close_notify (GDtlsConnection *conn, gboolean require_close_notify); -GLIB_AVAILABLE_IN_2_48 +GIO_AVAILABLE_IN_2_48 gboolean g_dtls_connection_get_require_close_notify (GDtlsConnection *conn); G_GNUC_BEGIN_IGNORE_DEPRECATIONS -GLIB_DEPRECATED_IN_2_60 +GIO_DEPRECATED_IN_2_60 void g_dtls_connection_set_rehandshake_mode (GDtlsConnection *conn, GTlsRehandshakeMode mode); -GLIB_DEPRECATED_IN_2_60 +GIO_DEPRECATED_IN_2_60 GTlsRehandshakeMode g_dtls_connection_get_rehandshake_mode (GDtlsConnection *conn); G_GNUC_END_IGNORE_DEPRECATIONS -GLIB_AVAILABLE_IN_2_48 +GIO_AVAILABLE_IN_2_48 gboolean g_dtls_connection_handshake (GDtlsConnection *conn, GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_2_48 +GIO_AVAILABLE_IN_2_48 void g_dtls_connection_handshake_async (GDtlsConnection *conn, int io_priority, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); -GLIB_AVAILABLE_IN_2_48 +GIO_AVAILABLE_IN_2_48 gboolean g_dtls_connection_handshake_finish (GDtlsConnection *conn, GAsyncResult *result, GError **error); -GLIB_AVAILABLE_IN_2_48 +GIO_AVAILABLE_IN_2_48 gboolean g_dtls_connection_shutdown (GDtlsConnection *conn, gboolean shutdown_read, gboolean shutdown_write, GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_2_48 +GIO_AVAILABLE_IN_2_48 void g_dtls_connection_shutdown_async (GDtlsConnection *conn, gboolean shutdown_read, gboolean shutdown_write, @@ -178,51 +178,51 @@ GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); -GLIB_AVAILABLE_IN_2_48 +GIO_AVAILABLE_IN_2_48 gboolean g_dtls_connection_shutdown_finish (GDtlsConnection *conn, GAsyncResult *result, GError **error); -GLIB_AVAILABLE_IN_2_48 +GIO_AVAILABLE_IN_2_48 gboolean g_dtls_connection_close (GDtlsConnection *conn, GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_2_48 +GIO_AVAILABLE_IN_2_48 void g_dtls_connection_close_async (GDtlsConnection *conn, int io_priority, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); -GLIB_AVAILABLE_IN_2_48 +GIO_AVAILABLE_IN_2_48 gboolean g_dtls_connection_close_finish (GDtlsConnection *conn, GAsyncResult *result, GError **error); /*< protected >*/ -GLIB_AVAILABLE_IN_2_48 +GIO_AVAILABLE_IN_2_48 gboolean g_dtls_connection_emit_accept_certificate (GDtlsConnection *conn, GTlsCertificate *peer_cert, GTlsCertificateFlags errors); -GLIB_AVAILABLE_IN_2_60 +GIO_AVAILABLE_IN_2_60 void g_dtls_connection_set_advertised_protocols (GDtlsConnection *conn, const gchar * const *protocols); -GLIB_AVAILABLE_IN_2_60 +GIO_AVAILABLE_IN_2_60 const gchar * g_dtls_connection_get_negotiated_protocol (GDtlsConnection *conn); G_GNUC_BEGIN_IGNORE_DEPRECATIONS -GLIB_AVAILABLE_IN_2_66 +GIO_AVAILABLE_IN_2_66 gboolean g_dtls_connection_get_channel_binding_data (GDtlsConnection *conn, GTlsChannelBindingType type, GByteArray *data, GError **error); G_GNUC_END_IGNORE_DEPRECATIONS -GLIB_AVAILABLE_IN_2_70 +GIO_AVAILABLE_IN_2_70 GTlsProtocolVersion g_dtls_connection_get_protocol_version (GDtlsConnection *conn); -GLIB_AVAILABLE_IN_2_70 +GIO_AVAILABLE_IN_2_70 gchar * g_dtls_connection_get_ciphersuite_name (GDtlsConnection *conn); G_END_DECLS
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gdtlsserverconnection.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gdtlsserverconnection.h
Changed
@@ -58,10 +58,10 @@ GTypeInterface g_iface; }; -GLIB_AVAILABLE_IN_2_48 +GIO_AVAILABLE_IN_2_48 GType g_dtls_server_connection_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_2_48 +GIO_AVAILABLE_IN_2_48 GDatagramBased *g_dtls_server_connection_new (GDatagramBased *base_socket, GTlsCertificate *certificate, GError **error);
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gemblem.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gemblem.h
Changed
@@ -45,17 +45,17 @@ typedef struct _GEmblem GEmblem; typedef struct _GEmblemClass GEmblemClass; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GType g_emblem_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GEmblem *g_emblem_new (GIcon *icon); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GEmblem *g_emblem_new_with_origin (GIcon *icon, GEmblemOrigin origin); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GIcon *g_emblem_get_icon (GEmblem *emblem); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GEmblemOrigin g_emblem_get_origin (GEmblem *emblem); G_END_DECLS
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gemblemedicon.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gemblemedicon.h
Changed
@@ -62,20 +62,20 @@ GObjectClass parent_class; }; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GType g_emblemed_icon_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GIcon *g_emblemed_icon_new (GIcon *icon, GEmblem *emblem); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GIcon *g_emblemed_icon_get_icon (GEmblemedIcon *emblemed); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GList *g_emblemed_icon_get_emblems (GEmblemedIcon *emblemed); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_emblemed_icon_add_emblem (GEmblemedIcon *emblemed, GEmblem *emblem); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_emblemed_icon_clear_emblems (GEmblemedIcon *emblemed); G_END_DECLS
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gfile.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gfile.c
Changed
@@ -3158,15 +3158,25 @@ gpointer progress_callback_data, GError **error) { - goffset source_size; + goffset total_size; int fd_in, fd_out; int ret, errsv; fd_in = g_file_descriptor_based_get_fd (G_FILE_DESCRIPTOR_BASED (in)); fd_out = g_file_descriptor_based_get_fd (G_FILE_DESCRIPTOR_BASED (out)); + total_size = -1; + /* avoid performance impact of querying total size when it's not needed */ if (progress_callback) - source_size = g_file_info_get_size (info); + { + struct stat sbuf; + + if (fstat (fd_in, &sbuf) == 0) + total_size = sbuf.st_size; + } + + if (total_size == -1) + total_size = 0; /* Btrfs clone ioctl properties: * - Works at the inode level @@ -3201,7 +3211,7 @@ /* Make sure we send full copied size */ if (progress_callback) - progress_callback (source_size, source_size, progress_callback_data); + progress_callback (total_size, total_size, progress_callback_data); return TRUE; } @@ -3462,9 +3472,9 @@ * @flags: set of #GFileCopyFlags * @cancellable: (nullable): optional #GCancellable object, * %NULL to ignore - * @progress_callback: (nullable) (scope call): function to callback with + * @progress_callback: (nullable) (scope call) (closure progress_callback_data): function to callback with * progress information, or %NULL if progress information is not needed - * @progress_callback_data: (closure): user data to pass to @progress_callback + * @progress_callback_data: user data to pass to @progress_callback * @error: #GError to set on error, or %NULL * * Copies the file @source to the location specified by @destination. @@ -3670,9 +3680,9 @@ * @flags: set of #GFileCopyFlags * @cancellable: (nullable): optional #GCancellable object, * %NULL to ignore - * @progress_callback: (nullable) (scope call): #GFileProgressCallback + * @progress_callback: (nullable) (scope call) (closure progress_callback_data): #GFileProgressCallback * function for updates - * @progress_callback_data: (closure): gpointer to user data for + * @progress_callback_data: gpointer to user data for * the callback function * @error: #GError for returning error conditions, or %NULL * @@ -7773,7 +7783,7 @@ NULL); if (info) { - *etag_out = g_strdup (g_file_info_get_etag (info)); + *etag_out = g_file_info_has_attribute (info, G_FILE_ATTRIBUTE_ETAG_VALUE) ? g_strdup (g_file_info_get_etag (info)) : NULL; g_object_unref (info); } } @@ -7847,7 +7857,7 @@ stat_res, NULL); if (info) { - data->etag = g_strdup (g_file_info_get_etag (info)); + data->etag = g_file_info_has_attribute (info, G_FILE_ATTRIBUTE_ETAG_VALUE) ? g_strdup (g_file_info_get_etag (info)) : NULL; g_object_unref (info); }
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gfile.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gfile.h
Changed
@@ -610,145 +610,145 @@ GError **error); }; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GType g_file_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GFile * g_file_new_for_path (const char *path); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GFile * g_file_new_for_uri (const char *uri); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GFile * g_file_new_for_commandline_arg (const char *arg); -GLIB_AVAILABLE_IN_2_36 +GIO_AVAILABLE_IN_2_36 GFile * g_file_new_for_commandline_arg_and_cwd (const gchar *arg, const gchar *cwd); -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 GFile * g_file_new_tmp (const char *tmpl, GFileIOStream **iostream, GError **error); -GLIB_AVAILABLE_IN_2_74 +GIO_AVAILABLE_IN_2_74 void g_file_new_tmp_async (const char *tmpl, int io_priority, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); -GLIB_AVAILABLE_IN_2_74 +GIO_AVAILABLE_IN_2_74 GFile * g_file_new_tmp_finish (GAsyncResult *result, GFileIOStream **iostream, GError **error); -GLIB_AVAILABLE_IN_2_74 +GIO_AVAILABLE_IN_2_74 void g_file_new_tmp_dir_async (const char *tmpl, int io_priority, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); -GLIB_AVAILABLE_IN_2_74 +GIO_AVAILABLE_IN_2_74 GFile * g_file_new_tmp_dir_finish (GAsyncResult *result, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GFile * g_file_parse_name (const char *parse_name); -GLIB_AVAILABLE_IN_2_56 +GIO_AVAILABLE_IN_2_56 GFile * g_file_new_build_filename (const gchar *first_element, ...) G_GNUC_NULL_TERMINATED; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GFile * g_file_dup (GFile *file); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL guint g_file_hash (gconstpointer file); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_file_equal (GFile *file1, GFile *file2); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL char * g_file_get_basename (GFile *file); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL char * g_file_get_path (GFile *file); -GLIB_AVAILABLE_IN_2_56 +GIO_AVAILABLE_IN_2_56 const char * g_file_peek_path (GFile *file); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL char * g_file_get_uri (GFile *file); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL char * g_file_get_parse_name (GFile *file); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GFile * g_file_get_parent (GFile *file); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_file_has_parent (GFile *file, GFile *parent); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GFile * g_file_get_child (GFile *file, const char *name); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GFile * g_file_get_child_for_display_name (GFile *file, const char *display_name, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_file_has_prefix (GFile *file, GFile *prefix); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL char * g_file_get_relative_path (GFile *parent, GFile *descendant); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GFile * g_file_resolve_relative_path (GFile *file, const char *relative_path); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_file_is_native (GFile *file); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_file_has_uri_scheme (GFile *file, const char *uri_scheme); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL char * g_file_get_uri_scheme (GFile *file); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GFileInputStream * g_file_read (GFile *file, GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_file_read_async (GFile *file, int io_priority, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GFileInputStream * g_file_read_finish (GFile *file, GAsyncResult *res, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GFileOutputStream * g_file_append_to (GFile *file, GFileCreateFlags flags, GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GFileOutputStream * g_file_create (GFile *file, GFileCreateFlags flags, GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GFileOutputStream * g_file_replace (GFile *file, const char *etag, gboolean make_backup, GFileCreateFlags flags, GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_file_append_to_async (GFile *file, GFileCreateFlags flags, int io_priority, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GFileOutputStream * g_file_append_to_finish (GFile *file, GAsyncResult *res, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_file_create_async (GFile *file, GFileCreateFlags flags, int io_priority, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GFileOutputStream * g_file_create_finish (GFile *file, GAsyncResult *res, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_file_replace_async (GFile *file, const char *etag, gboolean make_backup, @@ -757,48 +757,48 @@ GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GFileOutputStream * g_file_replace_finish (GFile *file, GAsyncResult *res, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GFileIOStream * g_file_open_readwrite (GFile *file, GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_file_open_readwrite_async (GFile *file, int io_priority, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GFileIOStream * g_file_open_readwrite_finish (GFile *file, GAsyncResult *res, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GFileIOStream * g_file_create_readwrite (GFile *file, GFileCreateFlags flags, GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_file_create_readwrite_async (GFile *file, GFileCreateFlags flags, int io_priority, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GFileIOStream * g_file_create_readwrite_finish (GFile *file, GAsyncResult *res, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GFileIOStream * g_file_replace_readwrite (GFile *file, const char *etag, gboolean make_backup, GFileCreateFlags flags, GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_file_replace_readwrite_async (GFile *file, const char *etag, gboolean make_backup, @@ -807,24 +807,24 @@ GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GFileIOStream * g_file_replace_readwrite_finish (GFile *file, GAsyncResult *res, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_file_query_exists (GFile *file, GCancellable *cancellable); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GFileType g_file_query_file_type (GFile *file, GFileQueryInfoFlags flags, GCancellable *cancellable); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GFileInfo * g_file_query_info (GFile *file, const char *attributes, GFileQueryInfoFlags flags, GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_file_query_info_async (GFile *file, const char *attributes, GFileQueryInfoFlags flags, @@ -832,47 +832,47 @@ GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GFileInfo * g_file_query_info_finish (GFile *file, GAsyncResult *res, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GFileInfo * g_file_query_filesystem_info (GFile *file, const char *attributes, GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_file_query_filesystem_info_async (GFile *file, const char *attributes, int io_priority, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GFileInfo * g_file_query_filesystem_info_finish (GFile *file, GAsyncResult *res, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GMount * g_file_find_enclosing_mount (GFile *file, GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_file_find_enclosing_mount_async (GFile *file, int io_priority, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GMount * g_file_find_enclosing_mount_finish (GFile *file, GAsyncResult *res, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GFileEnumerator * g_file_enumerate_children (GFile *file, const char *attributes, GFileQueryInfoFlags flags, GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_file_enumerate_children_async (GFile *file, const char *attributes, GFileQueryInfoFlags flags, @@ -880,61 +880,61 @@ GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GFileEnumerator * g_file_enumerate_children_finish (GFile *file, GAsyncResult *res, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GFile * g_file_set_display_name (GFile *file, const char *display_name, GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_file_set_display_name_async (GFile *file, const char *display_name, int io_priority, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GFile * g_file_set_display_name_finish (GFile *file, GAsyncResult *res, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_file_delete (GFile *file, GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_2_34 +GIO_AVAILABLE_IN_2_34 void g_file_delete_async (GFile *file, int io_priority, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); -GLIB_AVAILABLE_IN_2_34 +GIO_AVAILABLE_IN_2_34 gboolean g_file_delete_finish (GFile *file, GAsyncResult *result, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_file_trash (GFile *file, GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_2_38 +GIO_AVAILABLE_IN_2_38 void g_file_trash_async (GFile *file, int io_priority, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); -GLIB_AVAILABLE_IN_2_38 +GIO_AVAILABLE_IN_2_38 gboolean g_file_trash_finish (GFile *file, GAsyncResult *result, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_file_copy (GFile *source, GFile *destination, GFileCopyFlags flags, @@ -942,7 +942,7 @@ GFileProgressCallback progress_callback, gpointer progress_callback_data, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_file_copy_async (GFile *source, GFile *destination, GFileCopyFlags flags, @@ -952,11 +952,11 @@ gpointer progress_callback_data, GAsyncReadyCallback callback, gpointer user_data); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_file_copy_finish (GFile *file, GAsyncResult *res, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_file_move (GFile *source, GFile *destination, GFileCopyFlags flags, @@ -964,7 +964,7 @@ GFileProgressCallback progress_callback, gpointer progress_callback_data, GError **error); -GLIB_AVAILABLE_IN_2_72 +GIO_AVAILABLE_IN_2_72 void g_file_move_async (GFile *source, GFile *destination, GFileCopyFlags flags, @@ -974,54 +974,54 @@ gpointer progress_callback_data, GAsyncReadyCallback callback, gpointer user_data); -GLIB_AVAILABLE_IN_2_72 +GIO_AVAILABLE_IN_2_72 gboolean g_file_move_finish (GFile *file, GAsyncResult *result, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_file_make_directory (GFile *file, GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_2_38 +GIO_AVAILABLE_IN_2_38 void g_file_make_directory_async (GFile *file, int io_priority, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); -GLIB_AVAILABLE_IN_2_38 +GIO_AVAILABLE_IN_2_38 gboolean g_file_make_directory_finish (GFile *file, GAsyncResult *result, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_file_make_directory_with_parents (GFile *file, GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_file_make_symbolic_link (GFile *file, const char *symlink_value, GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_2_74 +GIO_AVAILABLE_IN_2_74 void g_file_make_symbolic_link_async (GFile *file, const char *symlink_value, int io_priority, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); -GLIB_AVAILABLE_IN_2_74 +GIO_AVAILABLE_IN_2_74 gboolean g_file_make_symbolic_link_finish (GFile *file, GAsyncResult *result, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GFileAttributeInfoList *g_file_query_settable_attributes (GFile *file, GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GFileAttributeInfoList *g_file_query_writable_namespaces (GFile *file, GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_file_set_attribute (GFile *file, const char *attribute, GFileAttributeType type, @@ -1029,13 +1029,13 @@ GFileQueryInfoFlags flags, GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_file_set_attributes_from_info (GFile *file, GFileInfo *info, GFileQueryInfoFlags flags, GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_file_set_attributes_async (GFile *file, GFileInfo *info, GFileQueryInfoFlags flags, @@ -1043,127 +1043,127 @@ GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_file_set_attributes_finish (GFile *file, GAsyncResult *result, GFileInfo **info, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_file_set_attribute_string (GFile *file, const char *attribute, const char *value, GFileQueryInfoFlags flags, GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_file_set_attribute_byte_string (GFile *file, const char *attribute, const char *value, GFileQueryInfoFlags flags, GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_file_set_attribute_uint32 (GFile *file, const char *attribute, guint32 value, GFileQueryInfoFlags flags, GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_file_set_attribute_int32 (GFile *file, const char *attribute, gint32 value, GFileQueryInfoFlags flags, GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_file_set_attribute_uint64 (GFile *file, const char *attribute, guint64 value, GFileQueryInfoFlags flags, GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_file_set_attribute_int64 (GFile *file, const char *attribute, gint64 value, GFileQueryInfoFlags flags, GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_file_mount_enclosing_volume (GFile *location, GMountMountFlags flags, GMountOperation *mount_operation, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_file_mount_enclosing_volume_finish (GFile *location, GAsyncResult *result, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_file_mount_mountable (GFile *file, GMountMountFlags flags, GMountOperation *mount_operation, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GFile * g_file_mount_mountable_finish (GFile *file, GAsyncResult *result, GError **error); -GLIB_DEPRECATED_FOR(g_file_unmount_mountable_with_operation) +GIO_DEPRECATED_FOR(g_file_unmount_mountable_with_operation) void g_file_unmount_mountable (GFile *file, GMountUnmountFlags flags, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); -GLIB_DEPRECATED_FOR(g_file_unmount_mountable_with_operation_finish) +GIO_DEPRECATED_FOR(g_file_unmount_mountable_with_operation_finish) gboolean g_file_unmount_mountable_finish (GFile *file, GAsyncResult *result, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_file_unmount_mountable_with_operation (GFile *file, GMountUnmountFlags flags, GMountOperation *mount_operation, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_file_unmount_mountable_with_operation_finish (GFile *file, GAsyncResult *result, GError **error); -GLIB_DEPRECATED_FOR(g_file_eject_mountable_with_operation) +GIO_DEPRECATED_FOR(g_file_eject_mountable_with_operation) void g_file_eject_mountable (GFile *file, GMountUnmountFlags flags, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); -GLIB_DEPRECATED_FOR(g_file_eject_mountable_with_operation_finish) +GIO_DEPRECATED_FOR(g_file_eject_mountable_with_operation_finish) gboolean g_file_eject_mountable_finish (GFile *file, GAsyncResult *result, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_file_eject_mountable_with_operation (GFile *file, GMountUnmountFlags flags, GMountOperation *mount_operation, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_file_eject_mountable_with_operation_finish (GFile *file, GAsyncResult *result, GError **error); -GLIB_AVAILABLE_IN_2_68 +GIO_AVAILABLE_IN_2_68 char * g_file_build_attribute_list_for_copy (GFile *file, GFileCopyFlags flags, GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_file_copy_attributes (GFile *source, GFile *destination, GFileCopyFlags flags, @@ -1171,23 +1171,23 @@ GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GFileMonitor* g_file_monitor_directory (GFile *file, GFileMonitorFlags flags, GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GFileMonitor* g_file_monitor_file (GFile *file, GFileMonitorFlags flags, GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GFileMonitor* g_file_monitor (GFile *file, GFileMonitorFlags flags, GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_2_38 +GIO_AVAILABLE_IN_2_38 gboolean g_file_measure_disk_usage (GFile *file, GFileMeasureFlags flags, GCancellable *cancellable, @@ -1198,7 +1198,7 @@ guint64 *num_files, GError **error); -GLIB_AVAILABLE_IN_2_38 +GIO_AVAILABLE_IN_2_38 void g_file_measure_disk_usage_async (GFile *file, GFileMeasureFlags flags, gint io_priority, @@ -1208,7 +1208,7 @@ GAsyncReadyCallback callback, gpointer user_data); -GLIB_AVAILABLE_IN_2_38 +GIO_AVAILABLE_IN_2_38 gboolean g_file_measure_disk_usage_finish (GFile *file, GAsyncResult *result, guint64 *disk_usage, @@ -1216,89 +1216,89 @@ guint64 *num_files, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_file_start_mountable (GFile *file, GDriveStartFlags flags, GMountOperation *start_operation, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_file_start_mountable_finish (GFile *file, GAsyncResult *result, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_file_stop_mountable (GFile *file, GMountUnmountFlags flags, GMountOperation *mount_operation, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_file_stop_mountable_finish (GFile *file, GAsyncResult *result, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_file_poll_mountable (GFile *file, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_file_poll_mountable_finish (GFile *file, GAsyncResult *result, GError **error); /* Utilities */ -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GAppInfo *g_file_query_default_handler (GFile *file, GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_2_60 +GIO_AVAILABLE_IN_2_60 void g_file_query_default_handler_async (GFile *file, int io_priority, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); -GLIB_AVAILABLE_IN_2_60 +GIO_AVAILABLE_IN_2_60 GAppInfo *g_file_query_default_handler_finish (GFile *file, GAsyncResult *result, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_file_load_contents (GFile *file, GCancellable *cancellable, char **contents, gsize *length, char **etag_out, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_file_load_contents_async (GFile *file, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_file_load_contents_finish (GFile *file, GAsyncResult *res, char **contents, gsize *length, char **etag_out, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_file_load_partial_contents_async (GFile *file, GCancellable *cancellable, GFileReadMoreCallback read_more_callback, GAsyncReadyCallback callback, gpointer user_data); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_file_load_partial_contents_finish (GFile *file, GAsyncResult *res, char **contents, gsize *length, char **etag_out, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_file_replace_contents (GFile *file, const char *contents, gsize length, @@ -1308,7 +1308,7 @@ char **new_etag, GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_file_replace_contents_async (GFile *file, const char *contents, gsize length, @@ -1318,7 +1318,7 @@ GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); -GLIB_AVAILABLE_IN_2_40 +GIO_AVAILABLE_IN_2_40 void g_file_replace_contents_bytes_async (GFile *file, GBytes *contents, const char *etag, @@ -1327,26 +1327,26 @@ GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_file_replace_contents_finish (GFile *file, GAsyncResult *res, char **new_etag, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_file_supports_thread_contexts (GFile *file); -GLIB_AVAILABLE_IN_2_56 +GIO_AVAILABLE_IN_2_56 GBytes *g_file_load_bytes (GFile *file, GCancellable *cancellable, gchar **etag_out, GError **error); -GLIB_AVAILABLE_IN_2_56 +GIO_AVAILABLE_IN_2_56 void g_file_load_bytes_async (GFile *file, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); -GLIB_AVAILABLE_IN_2_56 +GIO_AVAILABLE_IN_2_56 GBytes *g_file_load_bytes_finish (GFile *file, GAsyncResult *result, gchar **etag_out,
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gfileattribute.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gfileattribute.h
Changed
@@ -61,21 +61,21 @@ }; #define G_TYPE_FILE_ATTRIBUTE_INFO_LIST (g_file_attribute_info_list_get_type ()) -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GType g_file_attribute_info_list_get_type (void); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GFileAttributeInfoList * g_file_attribute_info_list_new (void); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GFileAttributeInfoList * g_file_attribute_info_list_ref (GFileAttributeInfoList *list); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_file_attribute_info_list_unref (GFileAttributeInfoList *list); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GFileAttributeInfoList * g_file_attribute_info_list_dup (GFileAttributeInfoList *list); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL const GFileAttributeInfo *g_file_attribute_info_list_lookup (GFileAttributeInfoList *list, const char *name); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_file_attribute_info_list_add (GFileAttributeInfoList *list, const char *name, GFileAttributeType type,
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gfiledescriptorbased.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gfiledescriptorbased.h
Changed
@@ -55,10 +55,10 @@ int (*get_fd) (GFileDescriptorBased *fd_based); }; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GType g_file_descriptor_based_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL int g_file_descriptor_based_get_fd (GFileDescriptorBased *fd_based); G_END_DECLS
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gfileenumerator.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gfileenumerator.c
Changed
@@ -318,22 +318,67 @@ * @user_data: (closure): the data to pass to callback function * * Request information for a number of files from the enumerator asynchronously. - * When all i/o for the operation is finished the @callback will be called with + * When all I/O for the operation is finished the @callback will be called with * the requested information. * * See the documentation of #GFileEnumerator for information about the * order of returned files. * - * The callback can be called with less than @num_files files in case of error - * or at the end of the enumerator. In case of a partial error the callback will - * be called with any succeeding items and no error, and on the next request the - * error will be reported. If a request is cancelled the callback will be called - * with %G_IO_ERROR_CANCELLED. + * Once the end of the enumerator is reached, or if an error occurs, the + * @callback will be called with an empty list. In this case, the previous call + * to g_file_enumerator_next_files_async() will typically have returned fewer + * than @num_files items. + * + * If a request is cancelled the callback will be called with + * %G_IO_ERROR_CANCELLED. + * + * This leads to the following pseudo-code usage: + * | + * g_autoptr(GFile) dir = get_directory (); + * g_autoptr(GFileEnumerator) enumerator = NULL; + * g_autolist(GFileInfo) files = NULL; + * g_autoptr(GError) local_error = NULL; + * + * enumerator = yield g_file_enumerate_children_async (dir, + * G_FILE_ATTRIBUTE_STANDARD_NAME "," + * G_FILE_ATTRIBUTE_STANDARD_TYPE, + * G_FILE_QUERY_INFO_NONE, + * G_PRIORITY_DEFAULT, + * cancellable, + * …, + * &local_error); + * if (enumerator == NULL) + * g_error ("Error enumerating: %s", local_error->message); + * + * // Loop until no files are returned, either because the end of the enumerator + * // has been reached, or an error was returned. + * do + * { + * files = yield g_file_enumerator_next_files_async (enumerator, + * 5, // number of files to request + * G_PRIORITY_DEFAULT, + * cancellable, + * …, + * &local_error); + * + * // Process the returned files, but don’t assume that exactly 5 were returned. + * for (GList *l = files; l != NULL; l = l->next) + * { + * GFileInfo *info = l->data; + * handle_file_info (info); + * } + * } + * while (files != NULL); + * + * if (local_error != NULL && + * !g_error_matches (local_error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) + * g_error ("Error while enumerating: %s", local_error->message); + * | * * During an async request no other sync and async calls are allowed, and will * result in %G_IO_ERROR_PENDING errors. * - * Any outstanding i/o request with higher priority (lower numerical value) will + * Any outstanding I/O request with higher priority (lower numerical value) will * be executed before an outstanding request with lower priority. Default * priority is %G_PRIORITY_DEFAULT. **/
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gfileenumerator.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gfileenumerator.h
Changed
@@ -96,52 +96,52 @@ void (*_g_reserved7) (void); }; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GType g_file_enumerator_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GFileInfo *g_file_enumerator_next_file (GFileEnumerator *enumerator, GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_file_enumerator_close (GFileEnumerator *enumerator, GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_file_enumerator_next_files_async (GFileEnumerator *enumerator, int num_files, int io_priority, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GList * g_file_enumerator_next_files_finish (GFileEnumerator *enumerator, GAsyncResult *result, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_file_enumerator_close_async (GFileEnumerator *enumerator, int io_priority, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_file_enumerator_close_finish (GFileEnumerator *enumerator, GAsyncResult *result, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_file_enumerator_is_closed (GFileEnumerator *enumerator); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_file_enumerator_has_pending (GFileEnumerator *enumerator); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_file_enumerator_set_pending (GFileEnumerator *enumerator, gboolean pending); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GFile * g_file_enumerator_get_container (GFileEnumerator *enumerator); -GLIB_AVAILABLE_IN_2_36 +GIO_AVAILABLE_IN_2_36 GFile * g_file_enumerator_get_child (GFileEnumerator *enumerator, GFileInfo *info); -GLIB_AVAILABLE_IN_2_44 +GIO_AVAILABLE_IN_2_44 gboolean g_file_enumerator_iterate (GFileEnumerator *direnum, GFileInfo **out_info, GFile **out_child,
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gfileicon.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gfileicon.h
Changed
@@ -45,13 +45,13 @@ **/ typedef struct _GFileIconClass GFileIconClass; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GType g_file_icon_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GIcon * g_file_icon_new (GFile *file); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GFile * g_file_icon_get_file (GFileIcon *icon); G_END_DECLS
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gfileinfo-priv.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gfileinfo-priv.h
Changed
@@ -99,6 +99,18 @@ #define G_FILE_ATTRIBUTE_ID_THUMBNAIL_PATH (10485760 + 1) #define G_FILE_ATTRIBUTE_ID_THUMBNAILING_FAILED (10485760 + 2) #define G_FILE_ATTRIBUTE_ID_THUMBNAIL_IS_VALID (10485760 + 3) +#define G_FILE_ATTRIBUTE_ID_THUMBNAIL_PATH_NORMAL (10485760 + 4) +#define G_FILE_ATTRIBUTE_ID_THUMBNAILING_FAILED_NORMAL (10485760 + 5) +#define G_FILE_ATTRIBUTE_ID_THUMBNAIL_IS_VALID_NORMAL (10485760 + 6) +#define G_FILE_ATTRIBUTE_ID_THUMBNAIL_PATH_LARGE (10485760 + 7) +#define G_FILE_ATTRIBUTE_ID_THUMBNAILING_FAILED_LARGE (10485760 + 8) +#define G_FILE_ATTRIBUTE_ID_THUMBNAIL_IS_VALID_LARGE (10485760 + 9) +#define G_FILE_ATTRIBUTE_ID_THUMBNAIL_PATH_XLARGE (10485760 + 10) +#define G_FILE_ATTRIBUTE_ID_THUMBNAILING_FAILED_XLARGE (10485760 + 11) +#define G_FILE_ATTRIBUTE_ID_THUMBNAIL_IS_VALID_XLARGE (10485760 + 12) +#define G_FILE_ATTRIBUTE_ID_THUMBNAIL_PATH_XXLARGE (10485760 + 13) +#define G_FILE_ATTRIBUTE_ID_THUMBNAILING_FAILED_XXLARGE (10485760 + 14) +#define G_FILE_ATTRIBUTE_ID_THUMBNAIL_IS_VALID_XXLARGE (10485760 + 15) #define G_FILE_ATTRIBUTE_ID_PREVIEW_ICON (11534336 + 1) #define G_FILE_ATTRIBUTE_ID_FILESYSTEM_SIZE (12582912 + 1) #define G_FILE_ATTRIBUTE_ID_FILESYSTEM_FREE (12582912 + 2)
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gfileinfo.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gfileinfo.c
Changed
@@ -53,6 +53,11 @@ * g_file_info_get_attribute_byte_string().This optimization will matter * only if calling the API in a tight loop. * + * It is an error to call these accessors without specifying their required file + * attributes when creating the #GFileInfo. Use g_file_info_has_attribute() or + * g_file_info_list_attributes() to check what attributes are specified for a + * #GFileInfo. + * * #GFileAttributeMatcher allows for searching through a #GFileInfo for * attributes. **/ @@ -265,6 +270,18 @@ REGISTER_ATTRIBUTE (THUMBNAIL_PATH); REGISTER_ATTRIBUTE (THUMBNAILING_FAILED); REGISTER_ATTRIBUTE (THUMBNAIL_IS_VALID); + REGISTER_ATTRIBUTE (THUMBNAIL_PATH_NORMAL); + REGISTER_ATTRIBUTE (THUMBNAILING_FAILED_NORMAL); + REGISTER_ATTRIBUTE (THUMBNAIL_IS_VALID_NORMAL); + REGISTER_ATTRIBUTE (THUMBNAIL_PATH_LARGE); + REGISTER_ATTRIBUTE (THUMBNAILING_FAILED_LARGE); + REGISTER_ATTRIBUTE (THUMBNAIL_IS_VALID_LARGE); + REGISTER_ATTRIBUTE (THUMBNAIL_PATH_XLARGE); + REGISTER_ATTRIBUTE (THUMBNAILING_FAILED_XLARGE); + REGISTER_ATTRIBUTE (THUMBNAIL_IS_VALID_XLARGE); + REGISTER_ATTRIBUTE (THUMBNAIL_PATH_XXLARGE); + REGISTER_ATTRIBUTE (THUMBNAILING_FAILED_XXLARGE); + REGISTER_ATTRIBUTE (THUMBNAIL_IS_VALID_XXLARGE); REGISTER_ATTRIBUTE (PREVIEW_ICON); REGISTER_ATTRIBUTE (FILESYSTEM_SIZE); REGISTER_ATTRIBUTE (FILESYSTEM_FREE); @@ -857,7 +874,7 @@ * @info: a #GFileInfo. * @attribute: a file attribute key. * - * Gets the value of a attribute, formatted as a string. + * Gets the value of an attribute, formatted as a string. * This escapes things as needed to make the string valid * UTF-8. * @@ -1473,13 +1490,28 @@ } /* Helper getters */ +#define get_required_attribute(value_ptr, info, attribute_name, error_value) \ + G_STMT_START { \ + static guint32 attr = 0; \ +\ + if (attr == 0) \ + attr = lookup_attribute (attribute_name); \ +\ + *value_ptr = g_file_info_find_value (info, attr); \ + if (G_UNLIKELY (*value_ptr == NULL)) \ + { \ + g_debug ("GFileInfo created without " attribute_name); \ + return error_value; \ + } \ + } G_STMT_END + /** * g_file_info_get_deletion_date: * @info: a #GFileInfo. * * Returns the #GDateTime representing the deletion date of the file, as - * available in G_FILE_ATTRIBUTE_TRASH_DELETION_DATE. If the - * G_FILE_ATTRIBUTE_TRASH_DELETION_DATE attribute is unset, %NULL is returned. + * available in %G_FILE_ATTRIBUTE_TRASH_DELETION_DATE. If the + * %G_FILE_ATTRIBUTE_TRASH_DELETION_DATE attribute is unset, %NULL is returned. * * Returns: (nullable): a #GDateTime, or %NULL. * @@ -1518,20 +1550,19 @@ * Gets a file's type (whether it is a regular file, symlink, etc). * This is different from the file's content type, see g_file_info_get_content_type(). * + * It is an error to call this if the #GFileInfo does not contain + * %G_FILE_ATTRIBUTE_STANDARD_TYPE. + * * Returns: a #GFileType for the given file. **/ GFileType g_file_info_get_file_type (GFileInfo *info) { - static guint32 attr = 0; GFileAttributeValue *value; g_return_val_if_fail (G_IS_FILE_INFO (info), G_FILE_TYPE_UNKNOWN); - if (attr == 0) - attr = lookup_attribute (G_FILE_ATTRIBUTE_STANDARD_TYPE); - - value = g_file_info_find_value (info, attr); + get_required_attribute (&value, info, G_FILE_ATTRIBUTE_STANDARD_TYPE, G_FILE_TYPE_UNKNOWN); return (GFileType)_g_file_attribute_value_get_uint32 (value); } @@ -1541,21 +1572,20 @@ * * Checks if a file is hidden. * + * It is an error to call this if the #GFileInfo does not contain + * %G_FILE_ATTRIBUTE_STANDARD_IS_HIDDEN. + * * Returns: %TRUE if the file is a hidden file, %FALSE otherwise. **/ gboolean g_file_info_get_is_hidden (GFileInfo *info) { - static guint32 attr = 0; GFileAttributeValue *value; g_return_val_if_fail (G_IS_FILE_INFO (info), FALSE); - if (attr == 0) - attr = lookup_attribute (G_FILE_ATTRIBUTE_STANDARD_IS_HIDDEN); - - value = g_file_info_find_value (info, attr); - return (GFileType)_g_file_attribute_value_get_boolean (value); + get_required_attribute (&value, info, G_FILE_ATTRIBUTE_STANDARD_IS_HIDDEN, FALSE); + return _g_file_attribute_value_get_boolean (value); } /** @@ -1564,21 +1594,20 @@ * * Checks if a file is a backup file. * + * It is an error to call this if the #GFileInfo does not contain + * %G_FILE_ATTRIBUTE_STANDARD_IS_BACKUP. + * * Returns: %TRUE if file is a backup file, %FALSE otherwise. **/ gboolean g_file_info_get_is_backup (GFileInfo *info) { - static guint32 attr = 0; GFileAttributeValue *value; g_return_val_if_fail (G_IS_FILE_INFO (info), FALSE); - if (attr == 0) - attr = lookup_attribute (G_FILE_ATTRIBUTE_STANDARD_IS_BACKUP); - - value = g_file_info_find_value (info, attr); - return (GFileType)_g_file_attribute_value_get_boolean (value); + get_required_attribute (&value, info, G_FILE_ATTRIBUTE_STANDARD_IS_BACKUP, FALSE); + return _g_file_attribute_value_get_boolean (value); } /** @@ -1587,21 +1616,20 @@ * * Checks if a file is a symlink. * + * It is an error to call this if the #GFileInfo does not contain + * %G_FILE_ATTRIBUTE_STANDARD_IS_SYMLINK. + * * Returns: %TRUE if the given @info is a symlink. **/ gboolean g_file_info_get_is_symlink (GFileInfo *info) { - static guint32 attr = 0; GFileAttributeValue *value; g_return_val_if_fail (G_IS_FILE_INFO (info), FALSE); - if (attr == 0) - attr = lookup_attribute (G_FILE_ATTRIBUTE_STANDARD_IS_SYMLINK); - - value = g_file_info_find_value (info, attr); - return (GFileType)_g_file_attribute_value_get_boolean (value); + get_required_attribute (&value, info, G_FILE_ATTRIBUTE_STANDARD_IS_SYMLINK, FALSE); + return _g_file_attribute_value_get_boolean (value); } /** @@ -1610,20 +1638,19 @@ * * Gets the name for a file. This is guaranteed to always be set. * + * It is an error to call this if the #GFileInfo does not contain + * %G_FILE_ATTRIBUTE_STANDARD_NAME. + * * Returns: (type filename) (not nullable): a string containing the file name. **/ const char * g_file_info_get_name (GFileInfo *info) { - static guint32 attr = 0; GFileAttributeValue *value; g_return_val_if_fail (G_IS_FILE_INFO (info), NULL); - if (attr == 0) - attr = lookup_attribute (G_FILE_ATTRIBUTE_STANDARD_NAME); - - value = g_file_info_find_value (info, attr); + get_required_attribute (&value, info, G_FILE_ATTRIBUTE_STANDARD_NAME, NULL); return _g_file_attribute_value_get_byte_string (value); } @@ -1633,20 +1660,19 @@ * * Gets a display name for a file. This is guaranteed to always be set. * + * It is an error to call this if the #GFileInfo does not contain + * %G_FILE_ATTRIBUTE_STANDARD_DISPLAY_NAME. + * * Returns: (not nullable): a string containing the display name. **/ const char * g_file_info_get_display_name (GFileInfo *info) { - static guint32 attr = 0; GFileAttributeValue *value; g_return_val_if_fail (G_IS_FILE_INFO (info), NULL); - if (attr == 0) - attr = lookup_attribute (G_FILE_ATTRIBUTE_STANDARD_DISPLAY_NAME); - - value = g_file_info_find_value (info, attr); + get_required_attribute (&value, info, G_FILE_ATTRIBUTE_STANDARD_DISPLAY_NAME, NULL); return _g_file_attribute_value_get_string (value); } @@ -1656,20 +1682,19 @@ * * Gets the edit name for a file. * + * It is an error to call this if the #GFileInfo does not contain + * %G_FILE_ATTRIBUTE_STANDARD_EDIT_NAME. + * * Returns: a string containing the edit name. **/ const char * g_file_info_get_edit_name (GFileInfo *info) { - static guint32 attr = 0; GFileAttributeValue *value; g_return_val_if_fail (G_IS_FILE_INFO (info), NULL); - if (attr == 0) - attr = lookup_attribute (G_FILE_ATTRIBUTE_STANDARD_EDIT_NAME); - - value = g_file_info_find_value (info, attr); + get_required_attribute (&value, info, G_FILE_ATTRIBUTE_STANDARD_EDIT_NAME, NULL); return _g_file_attribute_value_get_string (value); } @@ -1679,21 +1704,21 @@ * * Gets the icon for a file. * + * It is an error to call this if the #GFileInfo does not contain + * %G_FILE_ATTRIBUTE_STANDARD_ICON. + * * Returns: (nullable) (transfer none): #GIcon for the given @info. **/ GIcon * g_file_info_get_icon (GFileInfo *info) { - static guint32 attr = 0; GFileAttributeValue *value; GObject *obj; g_return_val_if_fail (G_IS_FILE_INFO (info), NULL); - if (attr == 0) - attr = lookup_attribute (G_FILE_ATTRIBUTE_STANDARD_ICON); + get_required_attribute (&value, info, G_FILE_ATTRIBUTE_STANDARD_ICON, NULL); - value = g_file_info_find_value (info, attr); obj = _g_file_attribute_value_get_object (value); if (G_IS_ICON (obj)) return G_ICON (obj); @@ -1706,6 +1731,9 @@ * * Gets the symbolic icon for a file. * + * It is an error to call this if the #GFileInfo does not contain + * %G_FILE_ATTRIBUTE_STANDARD_SYMBOLIC_ICON. + * * Returns: (nullable) (transfer none): #GIcon for the given @info. * * Since: 2.34 @@ -1713,16 +1741,13 @@ GIcon * g_file_info_get_symbolic_icon (GFileInfo *info) { - static guint32 attr = 0; GFileAttributeValue *value; GObject *obj; g_return_val_if_fail (G_IS_FILE_INFO (info), NULL); - if (attr == 0) - attr = lookup_attribute (G_FILE_ATTRIBUTE_STANDARD_SYMBOLIC_ICON); + get_required_attribute (&value, info, G_FILE_ATTRIBUTE_STANDARD_SYMBOLIC_ICON, NULL); - value = g_file_info_find_value (info, attr); obj = _g_file_attribute_value_get_object (value); if (G_IS_ICON (obj)) return G_ICON (obj); @@ -1735,21 +1760,20 @@ * * Gets the file's content type. * + * It is an error to call this if the #GFileInfo does not contain + * %G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE. + * * Returns: (nullable): a string containing the file's content type, * or %NULL if unknown. **/ const char * g_file_info_get_content_type (GFileInfo *info) { - static guint32 attr = 0; GFileAttributeValue *value; g_return_val_if_fail (G_IS_FILE_INFO (info), NULL); - if (attr == 0) - attr = lookup_attribute (G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE); - - value = g_file_info_find_value (info, attr); + get_required_attribute (&value, info, G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE, NULL); return _g_file_attribute_value_get_string (value); } @@ -1761,20 +1785,19 @@ * the %G_FILE_ATTRIBUTE_STANDARD_SIZE attribute and is converted * from #guint64 to #goffset before returning the result. * + * It is an error to call this if the #GFileInfo does not contain + * %G_FILE_ATTRIBUTE_STANDARD_SIZE. + * * Returns: a #goffset containing the file's size (in bytes). **/ goffset g_file_info_get_size (GFileInfo *info) { - static guint32 attr = 0; GFileAttributeValue *value; g_return_val_if_fail (G_IS_FILE_INFO (info), (goffset) 0); - if (attr == 0) - attr = lookup_attribute (G_FILE_ATTRIBUTE_STANDARD_SIZE); - - value = g_file_info_find_value (info, attr); + get_required_attribute (&value, info, G_FILE_ATTRIBUTE_STANDARD_SIZE, (goffset) 0); return (goffset) _g_file_attribute_value_get_uint64 (value); } @@ -1786,6 +1809,10 @@ * Gets the modification time of the current @info and sets it * in @result. * + * It is an error to call this if the #GFileInfo does not contain + * %G_FILE_ATTRIBUTE_TIME_MODIFIED. If %G_FILE_ATTRIBUTE_TIME_MODIFIED_USEC is + * provided it will be used too. + * * Deprecated: 2.62: Use g_file_info_get_modification_date_time() instead, as * #GTimeVal is deprecated due to the year 2038 problem. **/ @@ -1807,6 +1834,14 @@ } value = g_file_info_find_value (info, attr_mtime); + + if (G_UNLIKELY (value == NULL)) + { + g_debug ("GFileInfo created without " G_FILE_ATTRIBUTE_TIME_MODIFIED); + result->tv_sec = result->tv_usec = 0; + return; + } + result->tv_sec = _g_file_attribute_value_get_uint64 (value); value = g_file_info_find_value (info, attr_mtime_usec); result->tv_usec = _g_file_attribute_value_get_uint32 (value); @@ -1820,9 +1855,10 @@ * Gets the modification time of the current @info and returns it as a * #GDateTime. * - * This requires the %G_FILE_ATTRIBUTE_TIME_MODIFIED attribute. If - * %G_FILE_ATTRIBUTE_TIME_MODIFIED_USEC is provided, the resulting #GDateTime - * will have microsecond precision. + * It is an error to call this if the #GFileInfo does not contain + * %G_FILE_ATTRIBUTE_TIME_MODIFIED. If %G_FILE_ATTRIBUTE_TIME_MODIFIED_USEC is + * provided, the resulting #GDateTime will additionally have microsecond + * precision. * * If nanosecond precision is needed, %G_FILE_ATTRIBUTE_TIME_MODIFIED_NSEC must * be queried separately using g_file_info_get_attribute_uint32(). @@ -1868,9 +1904,10 @@ * Gets the access time of the current @info and returns it as a * #GDateTime. * - * This requires the %G_FILE_ATTRIBUTE_TIME_ACCESS attribute. If - * %G_FILE_ATTRIBUTE_TIME_ACCESS_USEC is provided, the resulting #GDateTime - * will have microsecond precision. + * It is an error to call this if the #GFileInfo does not contain + * %G_FILE_ATTRIBUTE_TIME_ACCESS. If %G_FILE_ATTRIBUTE_TIME_ACCESS_USEC is + * provided, the resulting #GDateTime will additionally have microsecond + * precision. * * If nanosecond precision is needed, %G_FILE_ATTRIBUTE_TIME_ACCESS_NSEC must * be queried separately using g_file_info_get_attribute_uint32(). @@ -1916,9 +1953,10 @@ * Gets the creation time of the current @info and returns it as a * #GDateTime. * - * This requires the %G_FILE_ATTRIBUTE_TIME_CREATED attribute. If - * %G_FILE_ATTRIBUTE_TIME_CREATED_USEC is provided, the resulting #GDateTime - * will have microsecond precision. + * It is an error to call this if the #GFileInfo does not contain + * %G_FILE_ATTRIBUTE_TIME_CREATED. If %G_FILE_ATTRIBUTE_TIME_CREATED_USEC is + * provided, the resulting #GDateTime will additionally have microsecond + * precision. * * If nanosecond precision is needed, %G_FILE_ATTRIBUTE_TIME_CREATED_NSEC must * be queried separately using g_file_info_get_attribute_uint32(). @@ -1963,20 +2001,19 @@ * * Gets the symlink target for a given #GFileInfo. * + * It is an error to call this if the #GFileInfo does not contain + * %G_FILE_ATTRIBUTE_STANDARD_SYMLINK_TARGET. + * * Returns: (nullable): a string containing the symlink target. **/ const char * g_file_info_get_symlink_target (GFileInfo *info) { - static guint32 attr = 0; GFileAttributeValue *value; g_return_val_if_fail (G_IS_FILE_INFO (info), NULL); - if (attr == 0) - attr = lookup_attribute (G_FILE_ATTRIBUTE_STANDARD_SYMLINK_TARGET); - - value = g_file_info_find_value (info, attr); + get_required_attribute (&value, info, G_FILE_ATTRIBUTE_STANDARD_SYMLINK_TARGET, NULL); return _g_file_attribute_value_get_byte_string (value); } @@ -1987,20 +2024,19 @@ * Gets the entity taggfile-etag for a given * #GFileInfo. See %G_FILE_ATTRIBUTE_ETAG_VALUE. * + * It is an error to call this if the #GFileInfo does not contain + * %G_FILE_ATTRIBUTE_ETAG_VALUE. + * * Returns: (nullable): a string containing the value of the "etag:value" attribute. **/ const char * g_file_info_get_etag (GFileInfo *info) { - static guint32 attr = 0; GFileAttributeValue *value; g_return_val_if_fail (G_IS_FILE_INFO (info), NULL); - if (attr == 0) - attr = lookup_attribute (G_FILE_ATTRIBUTE_ETAG_VALUE); - - value = g_file_info_find_value (info, attr); + get_required_attribute (&value, info, G_FILE_ATTRIBUTE_ETAG_VALUE, NULL); return _g_file_attribute_value_get_string (value); } @@ -2011,20 +2047,19 @@ * Gets the value of the sort_order attribute from the #GFileInfo. * See %G_FILE_ATTRIBUTE_STANDARD_SORT_ORDER. * + * It is an error to call this if the #GFileInfo does not contain + * %G_FILE_ATTRIBUTE_STANDARD_SORT_ORDER. + * * Returns: a #gint32 containing the value of the "standard::sort_order" attribute. **/ gint32 g_file_info_get_sort_order (GFileInfo *info) { - static guint32 attr = 0; GFileAttributeValue *value; g_return_val_if_fail (G_IS_FILE_INFO (info), 0); - if (attr == 0) - attr = lookup_attribute (G_FILE_ATTRIBUTE_STANDARD_SORT_ORDER); - - value = g_file_info_find_value (info, attr); + get_required_attribute (&value, info, G_FILE_ATTRIBUTE_STANDARD_SORT_ORDER, 0); return _g_file_attribute_value_get_int32 (value); } @@ -2804,7 +2839,7 @@ * @matcher: a #GFileAttributeMatcher. * @attribute: a file attribute key. * - * Checks if a attribute matcher only matches a given attribute. Always + * Checks if an attribute matcher only matches a given attribute. Always * returns %FALSE if "*" was used when creating the matcher. * * Returns: %TRUE if the matcher only matches @attribute. %FALSE otherwise.
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gfileinfo.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gfileinfo.h
Changed
@@ -917,7 +917,7 @@ * G_FILE_ATTRIBUTE_THUMBNAIL_PATH: * * A key in the "thumbnail" namespace for getting the path to the thumbnail - * image. + * image with the biggest size available. * * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_BYTE_STRING. **/ @@ -949,6 +949,182 @@ */ #define G_FILE_ATTRIBUTE_THUMBNAIL_IS_VALID "thumbnail::is-valid" /* boolean */ +/** + * G_FILE_ATTRIBUTE_THUMBNAIL_PATH_NORMAL: + * + * A key in the "thumbnail" namespace for getting the path to the normal + * thumbnail image. + * + * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_BYTE_STRING. + * + * Since: 2.76 + */ +#define G_FILE_ATTRIBUTE_THUMBNAIL_PATH_NORMAL "thumbnail::path-normal" /* bytestring */ +/** + * G_FILE_ATTRIBUTE_THUMBNAILING_FAILED_NORMAL: + * + * A key in the "thumbnail" namespace for checking if thumbnailing failed + * for the normal image. + * + * This attribute is %TRUE if thumbnailing failed. + * + * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_BOOLEAN. + * + * Since: 2.76 + */ +#define G_FILE_ATTRIBUTE_THUMBNAILING_FAILED_NORMAL "thumbnail::failed-normal" /* boolean */ +/** + * G_FILE_ATTRIBUTE_THUMBNAIL_IS_VALID_NORMAL: + * + * A key in the "thumbnail" namespace for checking whether the normal + * thumbnail is outdated. + * + * This attribute is %TRUE if the normal thumbnail is up-to-date with the file + * it represents, and %FALSE if the file has been modified since the thumbnail + * was generated. + * + * If %G_FILE_ATTRIBUTE_THUMBNAILING_FAILED_NORMAL is %TRUE and this attribute + * is %FALSE, it indicates that thumbnailing may be attempted again and may + * succeed. + * + * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_BOOLEAN. + * + * Since: 2.76 + */ +#define G_FILE_ATTRIBUTE_THUMBNAIL_IS_VALID_NORMAL "thumbnail::is-valid-normal" /* boolean */ + +/** + * G_FILE_ATTRIBUTE_THUMBNAIL_PATH_LARGE: + * + * A key in the "thumbnail" namespace for getting the path to the large + * thumbnail image. + * + * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_BYTE_STRING. + * + * Since: 2.76 + */ +#define G_FILE_ATTRIBUTE_THUMBNAIL_PATH_LARGE "thumbnail::path-large" /* bytestring */ +/** + * G_FILE_ATTRIBUTE_THUMBNAILING_FAILED_LARGE: + * + * A key in the "thumbnail" namespace for checking if thumbnailing failed + * for the large image. + * + * This attribute is %TRUE if thumbnailing failed. + * + * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_BOOLEAN. + * + * Since: 2.76 + */ +#define G_FILE_ATTRIBUTE_THUMBNAILING_FAILED_LARGE "thumbnail::failed-large" /* boolean */ +/** + * G_FILE_ATTRIBUTE_THUMBNAIL_IS_VALID_LARGE: + * + * A key in the "thumbnail" namespace for checking whether the large + * thumbnail is outdated. + * + * This attribute is %TRUE if the large thumbnail is up-to-date with the file + * it represents, and %FALSE if the file has been modified since the thumbnail + * was generated. + * + * If %G_FILE_ATTRIBUTE_THUMBNAILING_FAILED_LARGE is %TRUE and this attribute + * is %FALSE, it indicates that thumbnailing may be attempted again and may + * succeed. + * + * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_BOOLEAN. + * + * Since: 2.76 + */ +#define G_FILE_ATTRIBUTE_THUMBNAIL_IS_VALID_LARGE "thumbnail::is-valid-large" /* boolean */ + +/** + * G_FILE_ATTRIBUTE_THUMBNAIL_PATH_XLARGE: + * + * A key in the "thumbnail" namespace for getting the path to the x-large + * thumbnail image. + * + * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_BYTE_STRING. + * + * Since: 2.76 + */ +#define G_FILE_ATTRIBUTE_THUMBNAIL_PATH_XLARGE "thumbnail::path-xlarge" /* bytestring */ +/** + * G_FILE_ATTRIBUTE_THUMBNAILING_FAILED_XLARGE: + * + * A key in the "thumbnail" namespace for checking if thumbnailing failed + * for the x-large image. + * + * This attribute is %TRUE if thumbnailing failed. + * + * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_BOOLEAN. + * + * Since: 2.76 + */ +#define G_FILE_ATTRIBUTE_THUMBNAILING_FAILED_XLARGE "thumbnail::failed-xlarge" /* boolean */ +/** + * G_FILE_ATTRIBUTE_THUMBNAIL_IS_VALID_XLARGE: + * + * A key in the "thumbnail" namespace for checking whether the x-large + * thumbnail is outdated. + * + * This attribute is %TRUE if the x-large thumbnail is up-to-date with the file + * it represents, and %FALSE if the file has been modified since the thumbnail + * was generated. + * + * If %G_FILE_ATTRIBUTE_THUMBNAILING_FAILED_XLARGE is %TRUE and this attribute + * is %FALSE, it indicates that thumbnailing may be attempted again and may + * succeed. + * + * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_BOOLEAN. + * + * Since: 2.76 + */ +#define G_FILE_ATTRIBUTE_THUMBNAIL_IS_VALID_XLARGE "thumbnail::is-valid-xlarge" /* boolean */ + +/** + * G_FILE_ATTRIBUTE_THUMBNAIL_PATH_XXLARGE: + * + * A key in the "thumbnail" namespace for getting the path to the xx-large + * thumbnail image. + * + * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_BYTE_STRING. + * + * Since: 2.76 + */ +#define G_FILE_ATTRIBUTE_THUMBNAIL_PATH_XXLARGE "thumbnail::path-xxlarge" /* bytestring */ +/** + * G_FILE_ATTRIBUTE_THUMBNAILING_FAILED_XXLARGE: + * + * A key in the "thumbnail" namespace for checking if thumbnailing failed + * for the xx-large image. + * + * This attribute is %TRUE if thumbnailing failed. + * + * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_BOOLEAN. + * + * Since: 2.76 + */ +#define G_FILE_ATTRIBUTE_THUMBNAILING_FAILED_XXLARGE "thumbnail::failed-xxlarge" /* boolean */ +/** + * G_FILE_ATTRIBUTE_THUMBNAIL_IS_VALID_XXLARGE: + * + * A key in the "thumbnail" namespace for checking whether the xx-large + * thumbnail is outdated. + * + * This attribute is %TRUE if the x-large thumbnail is up-to-date with the file + * it represents, and %FALSE if the file has been modified since the thumbnail + * was generated. + * + * If %G_FILE_ATTRIBUTE_THUMBNAILING_FAILED_XXLARGE is %TRUE and this attribute + * is %FALSE, it indicates that thumbnailing may be attempted again and may + * succeed. + * + * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_BOOLEAN. + * + * Since: 2.76 + */ +#define G_FILE_ATTRIBUTE_THUMBNAIL_IS_VALID_XXLARGE "thumbnail::is-valid-xxlarge" /* boolean */ + /* Preview */ /** @@ -1116,246 +1292,246 @@ **/ #define G_FILE_ATTRIBUTE_RECENT_MODIFIED "recent::modified" /* int64 (time_t) */ -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GType g_file_info_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GFileInfo * g_file_info_new (void); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GFileInfo * g_file_info_dup (GFileInfo *other); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_file_info_copy_into (GFileInfo *src_info, GFileInfo *dest_info); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_file_info_has_attribute (GFileInfo *info, const char *attribute); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_file_info_has_namespace (GFileInfo *info, const char *name_space); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL char ** g_file_info_list_attributes (GFileInfo *info, const char *name_space); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_file_info_get_attribute_data (GFileInfo *info, const char *attribute, GFileAttributeType *type, gpointer *value_pp, GFileAttributeStatus *status); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GFileAttributeType g_file_info_get_attribute_type (GFileInfo *info, const char *attribute); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_file_info_remove_attribute (GFileInfo *info, const char *attribute); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GFileAttributeStatus g_file_info_get_attribute_status (GFileInfo *info, const char *attribute); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_file_info_set_attribute_status (GFileInfo *info, const char *attribute, GFileAttributeStatus status); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL char * g_file_info_get_attribute_as_string (GFileInfo *info, const char *attribute); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL const char * g_file_info_get_attribute_string (GFileInfo *info, const char *attribute); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL const char * g_file_info_get_attribute_byte_string (GFileInfo *info, const char *attribute); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_file_info_get_attribute_boolean (GFileInfo *info, const char *attribute); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL guint32 g_file_info_get_attribute_uint32 (GFileInfo *info, const char *attribute); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gint32 g_file_info_get_attribute_int32 (GFileInfo *info, const char *attribute); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL guint64 g_file_info_get_attribute_uint64 (GFileInfo *info, const char *attribute); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gint64 g_file_info_get_attribute_int64 (GFileInfo *info, const char *attribute); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GObject * g_file_info_get_attribute_object (GFileInfo *info, const char *attribute); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL char ** g_file_info_get_attribute_stringv (GFileInfo *info, const char *attribute); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_file_info_set_attribute (GFileInfo *info, const char *attribute, GFileAttributeType type, gpointer value_p); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_file_info_set_attribute_string (GFileInfo *info, const char *attribute, const char *attr_value); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_file_info_set_attribute_byte_string (GFileInfo *info, const char *attribute, const char *attr_value); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_file_info_set_attribute_boolean (GFileInfo *info, const char *attribute, gboolean attr_value); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_file_info_set_attribute_uint32 (GFileInfo *info, const char *attribute, guint32 attr_value); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_file_info_set_attribute_int32 (GFileInfo *info, const char *attribute, gint32 attr_value); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_file_info_set_attribute_uint64 (GFileInfo *info, const char *attribute, guint64 attr_value); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_file_info_set_attribute_int64 (GFileInfo *info, const char *attribute, gint64 attr_value); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_file_info_set_attribute_object (GFileInfo *info, const char *attribute, GObject *attr_value); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_file_info_set_attribute_stringv (GFileInfo *info, const char *attribute, char **attr_value); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_file_info_clear_status (GFileInfo *info); /* Helper getters: */ -GLIB_AVAILABLE_IN_2_36 +GIO_AVAILABLE_IN_2_36 GDateTime * g_file_info_get_deletion_date (GFileInfo *info); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GFileType g_file_info_get_file_type (GFileInfo *info); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_file_info_get_is_hidden (GFileInfo *info); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_file_info_get_is_backup (GFileInfo *info); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_file_info_get_is_symlink (GFileInfo *info); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL const char * g_file_info_get_name (GFileInfo *info); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL const char * g_file_info_get_display_name (GFileInfo *info); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL const char * g_file_info_get_edit_name (GFileInfo *info); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GIcon * g_file_info_get_icon (GFileInfo *info); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GIcon * g_file_info_get_symbolic_icon (GFileInfo *info); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL const char * g_file_info_get_content_type (GFileInfo *info); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL goffset g_file_info_get_size (GFileInfo *info); G_GNUC_BEGIN_IGNORE_DEPRECATIONS -GLIB_DEPRECATED_IN_2_62_FOR(g_file_info_get_modification_date_time) +GIO_DEPRECATED_IN_2_62_FOR(g_file_info_get_modification_date_time) void g_file_info_get_modification_time (GFileInfo *info, GTimeVal *result); G_GNUC_END_IGNORE_DEPRECATIONS -GLIB_AVAILABLE_IN_2_62 +GIO_AVAILABLE_IN_2_62 GDateTime * g_file_info_get_modification_date_time (GFileInfo *info); -GLIB_AVAILABLE_IN_2_70 +GIO_AVAILABLE_IN_2_70 GDateTime * g_file_info_get_access_date_time (GFileInfo *info); -GLIB_AVAILABLE_IN_2_70 +GIO_AVAILABLE_IN_2_70 GDateTime * g_file_info_get_creation_date_time (GFileInfo *info); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL const char * g_file_info_get_symlink_target (GFileInfo *info); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL const char * g_file_info_get_etag (GFileInfo *info); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gint32 g_file_info_get_sort_order (GFileInfo *info); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_file_info_set_attribute_mask (GFileInfo *info, GFileAttributeMatcher *mask); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_file_info_unset_attribute_mask (GFileInfo *info); /* Helper setters: */ -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_file_info_set_file_type (GFileInfo *info, GFileType type); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_file_info_set_is_hidden (GFileInfo *info, gboolean is_hidden); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_file_info_set_is_symlink (GFileInfo *info, gboolean is_symlink); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_file_info_set_name (GFileInfo *info, const char *name); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_file_info_set_display_name (GFileInfo *info, const char *display_name); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_file_info_set_edit_name (GFileInfo *info, const char *edit_name); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_file_info_set_icon (GFileInfo *info, GIcon *icon); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_file_info_set_symbolic_icon (GFileInfo *info, GIcon *icon); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_file_info_set_content_type (GFileInfo *info, const char *content_type); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_file_info_set_size (GFileInfo *info, goffset size); G_GNUC_BEGIN_IGNORE_DEPRECATIONS -GLIB_DEPRECATED_IN_2_62_FOR(g_file_info_set_modification_date_time) +GIO_DEPRECATED_IN_2_62_FOR(g_file_info_set_modification_date_time) void g_file_info_set_modification_time (GFileInfo *info, GTimeVal *mtime); G_GNUC_END_IGNORE_DEPRECATIONS -GLIB_AVAILABLE_IN_2_62 +GIO_AVAILABLE_IN_2_62 void g_file_info_set_modification_date_time (GFileInfo *info, GDateTime *mtime); -GLIB_AVAILABLE_IN_2_70 +GIO_AVAILABLE_IN_2_70 void g_file_info_set_access_date_time (GFileInfo *info, GDateTime *atime); -GLIB_AVAILABLE_IN_2_70 +GIO_AVAILABLE_IN_2_70 void g_file_info_set_creation_date_time (GFileInfo *info, GDateTime *creation_time); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_file_info_set_symlink_target (GFileInfo *info, const char *symlink_target); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_file_info_set_sort_order (GFileInfo *info, gint32 sort_order); #define G_TYPE_FILE_ATTRIBUTE_MATCHER (g_file_attribute_matcher_get_type ()) -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GType g_file_attribute_matcher_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GFileAttributeMatcher *g_file_attribute_matcher_new (const char *attributes); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GFileAttributeMatcher *g_file_attribute_matcher_ref (GFileAttributeMatcher *matcher); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_file_attribute_matcher_unref (GFileAttributeMatcher *matcher); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GFileAttributeMatcher *g_file_attribute_matcher_subtract (GFileAttributeMatcher *matcher, GFileAttributeMatcher *subtract); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_file_attribute_matcher_matches (GFileAttributeMatcher *matcher, const char *attribute); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_file_attribute_matcher_matches_only (GFileAttributeMatcher *matcher, const char *attribute); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_file_attribute_matcher_enumerate_namespace (GFileAttributeMatcher *matcher, const char *ns); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL const char * g_file_attribute_matcher_enumerate_next (GFileAttributeMatcher *matcher); -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 char * g_file_attribute_matcher_to_string (GFileAttributeMatcher *matcher); G_END_DECLS
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gfileinputstream.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gfileinputstream.h
Changed
@@ -91,22 +91,22 @@ void (*_g_reserved5) (void); }; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GType g_file_input_stream_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GFileInfo *g_file_input_stream_query_info (GFileInputStream *stream, const char *attributes, GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_file_input_stream_query_info_async (GFileInputStream *stream, const char *attributes, int io_priority, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GFileInfo *g_file_input_stream_query_info_finish (GFileInputStream *stream, GAsyncResult *result, GError **error);
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gfileiostream.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gfileiostream.h
Changed
@@ -96,26 +96,26 @@ void (*_g_reserved5) (void); }; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GType g_file_io_stream_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GFileInfo *g_file_io_stream_query_info (GFileIOStream *stream, const char *attributes, GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_file_io_stream_query_info_async (GFileIOStream *stream, const char *attributes, int io_priority, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GFileInfo *g_file_io_stream_query_info_finish (GFileIOStream *stream, GAsyncResult *result, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL char * g_file_io_stream_get_etag (GFileIOStream *stream); G_END_DECLS
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gfilemonitor.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gfilemonitor.h
Changed
@@ -76,20 +76,20 @@ void (*_g_reserved5) (void); }; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GType g_file_monitor_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_file_monitor_cancel (GFileMonitor *monitor); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_file_monitor_is_cancelled (GFileMonitor *monitor); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_file_monitor_set_rate_limit (GFileMonitor *monitor, gint limit_msecs); /* For implementations */ -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_file_monitor_emit_event (GFileMonitor *monitor, GFile *child, GFile *other_file,
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gfilenamecompleter.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gfilenamecompleter.h
Changed
@@ -60,19 +60,19 @@ void (*_g_reserved3) (void); }; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GType g_filename_completer_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GFilenameCompleter *g_filename_completer_new (void); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL char * g_filename_completer_get_completion_suffix (GFilenameCompleter *completer, const char *initial_text); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL char ** g_filename_completer_get_completions (GFilenameCompleter *completer, const char *initial_text); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_filename_completer_set_dirs_only (GFilenameCompleter *completer, gboolean dirs_only);
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gfileoutputstream.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gfileoutputstream.h
Changed
@@ -96,27 +96,27 @@ void (*_g_reserved5) (void); }; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GType g_file_output_stream_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GFileInfo *g_file_output_stream_query_info (GFileOutputStream *stream, const char *attributes, GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_file_output_stream_query_info_async (GFileOutputStream *stream, const char *attributes, int io_priority, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GFileInfo *g_file_output_stream_query_info_finish (GFileOutputStream *stream, GAsyncResult *result, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL char * g_file_output_stream_get_etag (GFileOutputStream *stream); G_END_DECLS
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gfilterinputstream.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gfilterinputstream.h
Changed
@@ -65,13 +65,13 @@ }; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GType g_filter_input_stream_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GInputStream * g_filter_input_stream_get_base_stream (GFilterInputStream *stream); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_filter_input_stream_get_close_base_stream (GFilterInputStream *stream); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_filter_input_stream_set_close_base_stream (GFilterInputStream *stream, gboolean close_base);
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gfilteroutputstream.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gfilteroutputstream.h
Changed
@@ -65,13 +65,13 @@ }; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GType g_filter_output_stream_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GOutputStream * g_filter_output_stream_get_base_stream (GFilterOutputStream *stream); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_filter_output_stream_get_close_base_stream (GFilterOutputStream *stream); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_filter_output_stream_set_close_base_stream (GFilterOutputStream *stream, gboolean close_base);
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/ggtknotificationbackend.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/ggtknotificationbackend.c
Changed
@@ -50,7 +50,7 @@ GVariant *reply; /* Find out if the notification server is running. This is a - * synchronous call because gio extension points don't support asnyc + * synchronous call because gio extension points don't support async * backend verification. This is only run once and only contacts the * dbus daemon. */
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gicon.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gicon.c
Changed
@@ -85,7 +85,7 @@ /** * g_icon_hash: - * @icon: (not nullable): #gconstpointer to an icon object. + * @icon: (not nullable) (type Gio.Icon): #gconstpointer to an icon object. * * Gets a hash for an icon. * @@ -106,7 +106,7 @@ } /** - * g_icon_equal: + * g_icon_equal: (virtual equal) * @icon1: (nullable): pointer to the first #GIcon. * @icon2: (nullable): pointer to the second #GIcon. * @@ -204,7 +204,6 @@ * - If @icon is a #GThemedIcon with exactly one name and no fallbacks, * the encoding is simply the name (such as `network-server`). * - * Virtual: to_tokens * Returns: (nullable): An allocated NUL-terminated UTF8 string or * %NULL if @icon can't be serialized. Use g_free() to free. * @@ -646,7 +645,7 @@ } /** - * g_icon_serialize: + * g_icon_serialize: (virtual serialize) * @icon: a #GIcon * * Serializes a #GIcon into a #GVariant. An equivalent #GIcon can be retrieved
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gicon.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gicon.h
Changed
@@ -69,9 +69,38 @@ guint (* hash) (GIcon *icon); gboolean (* equal) (GIcon *icon1, GIcon *icon2); + + /** + * GIconIface::to_tokens: + * @icon: The #GIcon + * @tokens: (element-type utf8) (out caller-allocates): + * The array to fill with tokens + * @out_version: (out): version of serialized tokens + * + * Serializes the @icon into string tokens. + * This is can be invoked when g_icon_new_for_string() is called. + * + * Returns: %TRUE if serialization took place, %FALSE otherwise + * + * Since: 2.20 + */ gboolean (* to_tokens) (GIcon *icon, - GPtrArray *tokens, + GPtrArray *tokens, gint *out_version); + + /** + * GIconIface::from_tokens: + * @tokens: (array length=num_tokens): An array of tokens + * @num_tokens: The number of tokens in @tokens + * @version: Version of the serialized tokens + * @error: Return location for errors, or %NULL to ignore + * + * Constructs a #GIcon from a list of @tokens. + * + * Returns: (nullable) (transfer full): the #GIcon or %NULL on error + * + * Since: 2.20 + */ GIcon * (* from_tokens) (gchar **tokens, gint num_tokens, gint version, @@ -80,23 +109,23 @@ GVariant * (* serialize) (GIcon *icon); }; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GType g_icon_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL guint g_icon_hash (gconstpointer icon); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_icon_equal (GIcon *icon1, GIcon *icon2); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gchar *g_icon_to_string (GIcon *icon); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GIcon *g_icon_new_for_string (const gchar *str, GError **error); -GLIB_AVAILABLE_IN_2_38 +GIO_AVAILABLE_IN_2_38 GVariant * g_icon_serialize (GIcon *icon); -GLIB_AVAILABLE_IN_2_38 +GIO_AVAILABLE_IN_2_38 GIcon * g_icon_deserialize (GVariant *value); G_END_DECLS
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/ginetaddress.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/ginetaddress.h
Changed
@@ -58,66 +58,66 @@ const guint8 * (*to_bytes) (GInetAddress *address); }; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GType g_inet_address_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GInetAddress * g_inet_address_new_from_string (const gchar *string); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GInetAddress * g_inet_address_new_from_bytes (const guint8 *bytes, GSocketFamily family); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GInetAddress * g_inet_address_new_loopback (GSocketFamily family); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GInetAddress * g_inet_address_new_any (GSocketFamily family); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_inet_address_equal (GInetAddress *address, GInetAddress *other_address); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gchar * g_inet_address_to_string (GInetAddress *address); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL const guint8 * g_inet_address_to_bytes (GInetAddress *address); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gsize g_inet_address_get_native_size (GInetAddress *address); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GSocketFamily g_inet_address_get_family (GInetAddress *address); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_inet_address_get_is_any (GInetAddress *address); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_inet_address_get_is_loopback (GInetAddress *address); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_inet_address_get_is_link_local (GInetAddress *address); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_inet_address_get_is_site_local (GInetAddress *address); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_inet_address_get_is_multicast (GInetAddress *address); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_inet_address_get_is_mc_global (GInetAddress *address); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_inet_address_get_is_mc_link_local (GInetAddress *address); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_inet_address_get_is_mc_node_local (GInetAddress *address); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_inet_address_get_is_mc_org_local (GInetAddress *address); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_inet_address_get_is_mc_site_local (GInetAddress *address); G_END_DECLS
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/ginetaddressmask.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/ginetaddressmask.h
Changed
@@ -53,31 +53,31 @@ }; -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 GType g_inet_address_mask_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 GInetAddressMask *g_inet_address_mask_new (GInetAddress *addr, guint length, GError **error); -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 GInetAddressMask *g_inet_address_mask_new_from_string (const gchar *mask_string, GError **error); -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 gchar *g_inet_address_mask_to_string (GInetAddressMask *mask); -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 GSocketFamily g_inet_address_mask_get_family (GInetAddressMask *mask); -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 GInetAddress *g_inet_address_mask_get_address (GInetAddressMask *mask); -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 guint g_inet_address_mask_get_length (GInetAddressMask *mask); -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 gboolean g_inet_address_mask_matches (GInetAddressMask *mask, GInetAddress *address); -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 gboolean g_inet_address_mask_equal (GInetAddressMask *mask, GInetAddressMask *mask2);
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/ginetsocketaddress.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/ginetsocketaddress.h
Changed
@@ -55,24 +55,24 @@ GSocketAddressClass parent_class; }; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GType g_inet_socket_address_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GSocketAddress *g_inet_socket_address_new (GInetAddress *address, guint16 port); -GLIB_AVAILABLE_IN_2_40 +GIO_AVAILABLE_IN_2_40 GSocketAddress *g_inet_socket_address_new_from_string (const char *address, guint port); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GInetAddress * g_inet_socket_address_get_address (GInetSocketAddress *address); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL guint16 g_inet_socket_address_get_port (GInetSocketAddress *address); -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 guint32 g_inet_socket_address_get_flowinfo (GInetSocketAddress *address); -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 guint32 g_inet_socket_address_get_scope_id (GInetSocketAddress *address); G_END_DECLS
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/ginitable.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/ginitable.h
Changed
@@ -68,15 +68,15 @@ }; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GType g_initable_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_initable_init (GInitable *initable, GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gpointer g_initable_new (GType object_type, GCancellable *cancellable, GError **error, @@ -85,7 +85,7 @@ G_GNUC_BEGIN_IGNORE_DEPRECATIONS -GLIB_DEPRECATED_IN_2_54_FOR(g_object_new_with_properties and g_initable_init) +GIO_DEPRECATED_IN_2_54_FOR(g_object_new_with_properties and g_initable_init) gpointer g_initable_newv (GType object_type, guint n_parameters, GParameter *parameters, @@ -94,7 +94,7 @@ G_GNUC_END_IGNORE_DEPRECATIONS -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GObject* g_initable_new_valist (GType object_type, const gchar *first_property_name, va_list var_args,
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/ginputstream.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/ginputstream.h
Changed
@@ -111,37 +111,37 @@ void (*_g_reserved5) (void); }; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GType g_input_stream_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gssize g_input_stream_read (GInputStream *stream, void *buffer, gsize count, GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_input_stream_read_all (GInputStream *stream, void *buffer, gsize count, gsize *bytes_read, GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_2_34 +GIO_AVAILABLE_IN_2_34 GBytes *g_input_stream_read_bytes (GInputStream *stream, gsize count, GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gssize g_input_stream_skip (GInputStream *stream, gsize count, GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_input_stream_close (GInputStream *stream, GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_input_stream_read_async (GInputStream *stream, void *buffer, gsize count, @@ -149,12 +149,12 @@ GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gssize g_input_stream_read_finish (GInputStream *stream, GAsyncResult *result, GError **error); -GLIB_AVAILABLE_IN_2_44 +GIO_AVAILABLE_IN_2_44 void g_input_stream_read_all_async (GInputStream *stream, void *buffer, gsize count, @@ -162,55 +162,55 @@ GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); -GLIB_AVAILABLE_IN_2_44 +GIO_AVAILABLE_IN_2_44 gboolean g_input_stream_read_all_finish (GInputStream *stream, GAsyncResult *result, gsize *bytes_read, GError **error); -GLIB_AVAILABLE_IN_2_34 +GIO_AVAILABLE_IN_2_34 void g_input_stream_read_bytes_async (GInputStream *stream, gsize count, int io_priority, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); -GLIB_AVAILABLE_IN_2_34 +GIO_AVAILABLE_IN_2_34 GBytes *g_input_stream_read_bytes_finish (GInputStream *stream, GAsyncResult *result, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_input_stream_skip_async (GInputStream *stream, gsize count, int io_priority, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gssize g_input_stream_skip_finish (GInputStream *stream, GAsyncResult *result, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_input_stream_close_async (GInputStream *stream, int io_priority, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_input_stream_close_finish (GInputStream *stream, GAsyncResult *result, GError **error); /* For implementations: */ -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_input_stream_is_closed (GInputStream *stream); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_input_stream_has_pending (GInputStream *stream); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_input_stream_set_pending (GInputStream *stream, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_input_stream_clear_pending (GInputStream *stream); G_END_DECLS
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gio-querymodules.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gio-querymodules.c
Changed
@@ -21,7 +21,8 @@ */ #include "config.h" -#include "giomodule.h" + +#include <gio/gio.h> #include "giomodule-priv.h" #include <gstdio.h> @@ -34,9 +35,15 @@ is_valid_module_name (const gchar *basename) { #if !defined(G_OS_WIN32) && !defined(G_WITH_CYGWIN) + #if defined(__APPLE__) + return g_str_has_prefix (basename, "lib") && + (g_str_has_suffix (basename, ".so") || + g_str_has_suffix (basename, ".dylib")); + #else return g_str_has_prefix (basename, "lib") && g_str_has_suffix (basename, ".so"); + #endif #else return g_str_has_suffix (basename, ".dll"); #endif
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gio-tool-info.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gio-tool-info.c
Changed
@@ -157,7 +157,8 @@ GUnixMountEntry *entry; #endif - name = g_file_info_get_display_name (info); + name = g_file_info_has_attribute (info, G_FILE_ATTRIBUTE_STANDARD_DISPLAY_NAME) ? + g_file_info_get_display_name (info) : NULL; if (name) { /* Translators: This is a noun and represents and attribute of a file */ @@ -166,7 +167,8 @@ g_free (flatten); } - name = g_file_info_get_edit_name (info); + name = g_file_info_has_attribute (info, G_FILE_ATTRIBUTE_STANDARD_EDIT_NAME) ? + g_file_info_get_edit_name (info) : NULL; if (name) { /* Translators: This is a noun and represents and attribute of a file */ @@ -196,7 +198,8 @@ g_print (" %"G_GUINT64_FORMAT"\n", (guint64)size); } - if (g_file_info_get_is_hidden (info)) + if (g_file_info_has_attribute (info, G_FILE_ATTRIBUTE_STANDARD_IS_HIDDEN) && + g_file_info_get_is_hidden (info)) g_print (_("hidden\n")); uri = g_file_get_uri (file);
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gio-tool-launch.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gio-tool-launch.c
Changed
@@ -23,7 +23,7 @@ #include <gio/gio.h> -#if defined(G_OS_UNIX) && !defined(HAVE_COCOA) +#if defined(G_OS_UNIX) && !defined(__APPLE__) #include <gio/gdesktopappinfo.h> #endif @@ -40,7 +40,7 @@ { GOptionContext *context; GError *error = NULL; -#if defined(G_OS_UNIX) && !defined(HAVE_COCOA) +#if defined(G_OS_UNIX) && !defined(__APPLE__) int i; GAppInfo *app = NULL; GAppLaunchContext *app_context = NULL; @@ -83,7 +83,7 @@ g_option_context_free (context); -#if !defined(G_OS_UNIX) || defined(HAVE_COCOA) +#if !defined(G_OS_UNIX) || defined(__APPLE__) print_error (_("The launch command is not currently supported on this platform")); retval = 1; #else
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gio-tool-list.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gio-tool-list.c
Changed
@@ -54,10 +54,12 @@ gboolean first_attr; GFile *child; - if ((g_file_info_get_is_hidden (info)) && !show_hidden) + if (g_file_info_has_attribute (info, G_FILE_ATTRIBUTE_STANDARD_IS_HIDDEN) && + g_file_info_get_is_hidden (info) && + !show_hidden) return; - if (print_display_names) + if (print_display_names && g_file_info_has_attribute (info, G_FILE_ATTRIBUTE_STANDARD_DISPLAY_NAME)) name = g_file_info_get_display_name (info); else name = g_file_info_get_name (info); @@ -71,7 +73,8 @@ g_object_unref (child); } - size = g_file_info_get_size (info); + size = g_file_info_has_attribute (info, G_FILE_ATTRIBUTE_STANDARD_SIZE) ? + g_file_info_get_size (info) : 0; type = file_type_to_string (g_file_info_get_file_type (info)); if (show_long) g_print ("%s\t%"G_GUINT64_FORMAT"\t(%s)", print_uris? uri: name, (guint64)size, type);
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gio-tool-open.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gio-tool-open.c
Changed
@@ -23,7 +23,7 @@ #include <gio/gio.h> -#if defined(G_OS_UNIX) && !defined(HAVE_COCOA) +#if defined(G_OS_UNIX) && !defined(__APPLE__) #include <gio/gdesktopappinfo.h> #endif
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gio-tool-tree.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gio-tool-tree.c
Changed
@@ -95,7 +95,9 @@ info_list = NULL; while ((info = g_file_enumerator_next_file (enumerator, NULL, NULL)) != NULL) { - if (g_file_info_get_is_hidden (info) && !show_hidden) + if (g_file_info_has_attribute (info, G_FILE_ATTRIBUTE_STANDARD_IS_HIDDEN) && + g_file_info_get_is_hidden (info) && + !show_hidden) { g_object_unref (info); } @@ -151,7 +153,8 @@ } else { - if (g_file_info_get_is_symlink (info)) + if (g_file_info_has_attribute (info, G_FILE_ATTRIBUTE_STANDARD_IS_SYMLINK) && + g_file_info_get_is_symlink (info)) { const char *target; target = g_file_info_get_symlink_target (info); @@ -162,7 +165,9 @@ g_print ("\n"); if ((type & G_FILE_TYPE_DIRECTORY) && - (follow_symlinks || !g_file_info_get_is_symlink (info))) + (follow_symlinks || + !(g_file_info_has_attribute (info, G_FILE_ATTRIBUTE_STANDARD_IS_SYMLINK) && + g_file_info_get_is_symlink (info)))) { guint64 new_pattern; GFile *child;
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gioenums.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gioenums.h
Changed
@@ -28,6 +28,7 @@ #endif #include <glib-object.h> +#include <gio/gio-visibility.h> G_BEGIN_DECLS @@ -579,7 +580,7 @@ G_IO_ERROR_CONNECTION_CLOSED = G_IO_ERROR_BROKEN_PIPE, G_IO_ERROR_NOT_CONNECTED, G_IO_ERROR_MESSAGE_TOO_LARGE, - G_IO_ERROR_NO_SUCH_DEVICE GLIB_AVAILABLE_ENUMERATOR_IN_2_74, + G_IO_ERROR_NO_SUCH_DEVICE GIO_AVAILABLE_ENUMERATOR_IN_2_74, } GIOErrorEnum; @@ -1041,7 +1042,7 @@ G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START = (1<<2), G_DBUS_PROXY_FLAGS_GET_INVALIDATED_PROPERTIES = (1<<3), G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START_AT_CONSTRUCTION = (1<<4), - G_DBUS_PROXY_FLAGS_NO_MATCH_RULE GLIB_AVAILABLE_ENUMERATOR_IN_2_72 = (1<<5) + G_DBUS_PROXY_FLAGS_NO_MATCH_RULE GIO_AVAILABLE_ENUMERATOR_IN_2_72 = (1<<5) } GDBusProxyFlags; /** @@ -1234,8 +1235,8 @@ G_DBUS_CONNECTION_FLAGS_AUTHENTICATION_ALLOW_ANONYMOUS = (1<<2), G_DBUS_CONNECTION_FLAGS_MESSAGE_BUS_CONNECTION = (1<<3), G_DBUS_CONNECTION_FLAGS_DELAY_MESSAGE_PROCESSING = (1<<4), - G_DBUS_CONNECTION_FLAGS_AUTHENTICATION_REQUIRE_SAME_USER GLIB_AVAILABLE_ENUMERATOR_IN_2_68 = (1<<5), - G_DBUS_CONNECTION_FLAGS_CROSS_NAMESPACE GLIB_AVAILABLE_ENUMERATOR_IN_2_74 = (1<<6) + G_DBUS_CONNECTION_FLAGS_AUTHENTICATION_REQUIRE_SAME_USER GIO_AVAILABLE_ENUMERATOR_IN_2_68 = (1<<5), + G_DBUS_CONNECTION_FLAGS_CROSS_NAMESPACE GIO_AVAILABLE_ENUMERATOR_IN_2_74 = (1<<6) } GDBusConnectionFlags; /** @@ -1398,7 +1399,7 @@ G_DBUS_SERVER_FLAGS_NONE = 0, G_DBUS_SERVER_FLAGS_RUN_IN_THREAD = (1<<0), G_DBUS_SERVER_FLAGS_AUTHENTICATION_ALLOW_ANONYMOUS = (1<<1), - G_DBUS_SERVER_FLAGS_AUTHENTICATION_REQUIRE_SAME_USER GLIB_AVAILABLE_ENUMERATOR_IN_2_68 = (1<<2) + G_DBUS_SERVER_FLAGS_AUTHENTICATION_REQUIRE_SAME_USER GIO_AVAILABLE_ENUMERATOR_IN_2_68 = (1<<2) } GDBusServerFlags; /** @@ -1533,8 +1534,8 @@ **/ typedef enum /*< prefix=G_APPLICATION >*/ { - G_APPLICATION_FLAGS_NONE GLIB_DEPRECATED_ENUMERATOR_IN_2_74_FOR(G_APPLICATION_DEFAULT_FLAGS), - G_APPLICATION_DEFAULT_FLAGS GLIB_AVAILABLE_ENUMERATOR_IN_2_74 = 0, + G_APPLICATION_FLAGS_NONE GIO_DEPRECATED_ENUMERATOR_IN_2_74_FOR(G_APPLICATION_DEFAULT_FLAGS), + G_APPLICATION_DEFAULT_FLAGS GIO_AVAILABLE_ENUMERATOR_IN_2_74 = 0, G_APPLICATION_IS_SERVICE = (1 << 0), G_APPLICATION_IS_LAUNCHER = (1 << 1), @@ -1622,7 +1623,7 @@ * Since: 2.28 */ typedef enum { - G_TLS_CERTIFICATE_NO_FLAGS GLIB_AVAILABLE_ENUMERATOR_IN_2_74 = 0, + G_TLS_CERTIFICATE_NO_FLAGS GIO_AVAILABLE_ENUMERATOR_IN_2_74 = 0, G_TLS_CERTIFICATE_UNKNOWN_CA = (1 << 0), G_TLS_CERTIFICATE_BAD_IDENTITY = (1 << 1), G_TLS_CERTIFICATE_NOT_ACTIVATED = (1 << 2), @@ -1669,11 +1670,11 @@ * * Since: 2.66 */ -GLIB_AVAILABLE_TYPE_IN_2_66 +GIO_AVAILABLE_TYPE_IN_2_66 typedef enum { G_TLS_CHANNEL_BINDING_TLS_UNIQUE, G_TLS_CHANNEL_BINDING_TLS_SERVER_END_POINT, - G_TLS_CHANNEL_BINDING_TLS_EXPORTER GLIB_AVAILABLE_ENUMERATOR_IN_2_74, + G_TLS_CHANNEL_BINDING_TLS_EXPORTER GIO_AVAILABLE_ENUMERATOR_IN_2_74, } GTlsChannelBindingType; /** @@ -1700,7 +1701,7 @@ * * Since: 2.66 */ -GLIB_AVAILABLE_TYPE_IN_2_66 +GIO_AVAILABLE_TYPE_IN_2_66 typedef enum { G_TLS_CHANNEL_BINDING_ERROR_NOT_IMPLEMENTED, G_TLS_CHANNEL_BINDING_ERROR_INVALID_STATE, @@ -1728,7 +1729,7 @@ G_TLS_REHANDSHAKE_NEVER, G_TLS_REHANDSHAKE_SAFELY, G_TLS_REHANDSHAKE_UNSAFELY -} GTlsRehandshakeMode GLIB_DEPRECATED_TYPE_IN_2_60; +} GTlsRehandshakeMode GIO_DEPRECATED_TYPE_IN_2_60; /** * GTlsPasswordFlags:
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gioenumtypes.h.template -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gioenumtypes.h.template
Changed
@@ -24,6 +24,7 @@ #define __GIO_ENUM_TYPES_H__ #include <glib-object.h> +#include <gio/gio-visibility.h> G_BEGIN_DECLS /*** END file-header ***/ @@ -34,7 +35,7 @@ /*** END file-production ***/ /*** BEGIN value-header ***/ -GLIB_AVAILABLE_IN_ALL GType @enum_name@_get_type (void) G_GNUC_CONST; +GIO_AVAILABLE_IN_ALL GType @enum_name@_get_type (void) G_GNUC_CONST; #define @ENUMPREFIX@_TYPE_@ENUMSHORT@ (@enum_name@_get_type ()) /*** END value-header ***/
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gioerror.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gioerror.h
Changed
@@ -41,15 +41,15 @@ **/ #define G_IO_ERROR g_io_error_quark() -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GQuark g_io_error_quark (void); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GIOErrorEnum g_io_error_from_errno (gint err_no); -GLIB_AVAILABLE_IN_2_74 +GIO_AVAILABLE_IN_2_74 GIOErrorEnum g_io_error_from_file_error (GFileError file_error); #ifdef G_OS_WIN32 -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GIOErrorEnum g_io_error_from_win32_error (gint error_code); #endif
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/giomodule-priv.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/giomodule-priv.c
Changed
@@ -21,6 +21,8 @@ */ #include "config.h" + +#define __GIO_GIO_H_INSIDE__ #include "giomodule.h" #include "giomodule-priv.h"
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/giomodule.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/giomodule.c
Changed
@@ -61,14 +61,14 @@ #endif #include <glib/gstdio.h> -#if defined(G_OS_UNIX) && !defined(HAVE_COCOA) +#if defined(G_OS_UNIX) && !defined(__APPLE__) #include "gdesktopappinfo.h" #endif #ifdef HAVE_COCOA #include "gosxappinfo.h" #endif -#ifdef HAVE_COCOA +#ifdef __APPLE__ #include <AvailabilityMacros.h> #endif @@ -430,9 +430,16 @@ gboolean result; #if !defined(G_OS_WIN32) && !defined(G_WITH_CYGWIN) + #if defined(__APPLE__) + if (!g_str_has_prefix (basename, "lib") || + !(g_str_has_suffix (basename, ".so") || + g_str_has_suffix (basename, ".dylib"))) + return FALSE; + #else if (!g_str_has_prefix (basename, "lib") || !g_str_has_suffix (basename, ".so")) return FALSE; + #endif #else if (!g_str_has_suffix (basename, ".dll")) return FALSE; @@ -579,13 +586,15 @@ { /* Try to load and init types */ if (g_type_module_use (G_TYPE_MODULE (module))) - g_type_module_unuse (G_TYPE_MODULE (module)); /* Unload */ + { + g_type_module_unuse (G_TYPE_MODULE (module)); /* Unload */ + /* module must remain alive, because the type system keeps weak refs */ + g_ignore_leak (module); + } else - { /* Failure to load */ + { g_printerr ("Failed to load module: %s\n", path); g_object_unref (module); - g_free (path); - continue; } } @@ -1183,7 +1192,7 @@ if (g_once_init_enter (®istered_extensions)) { -#if defined(G_OS_UNIX) && !defined(HAVE_COCOA) +#if defined(G_OS_UNIX) && !defined(__APPLE__) #if !GLIB_CHECK_VERSION (3, 0, 0) ep = g_io_extension_point_register (G_DESKTOP_APP_INFO_LOOKUP_EXTENSION_POINT_NAME); g_io_extension_point_set_required_type (ep, G_TYPE_DESKTOP_APP_INFO_LOOKUP); @@ -1262,6 +1271,29 @@ g_free (install_dir); #else module_dir = g_strdup (GIO_MODULE_DIR); +#ifdef __APPLE__ +#include "TargetConditionals.h" +#if TARGET_OS_OSX +#include <dlfcn.h> + { + g_autofree gchar *path = NULL; + g_autofree gchar *possible_dir = NULL; + Dl_info info; + + if (dladdr (get_gio_module_dir, &info)) + { + /* Gets path to the PREFIX/lib directory */ + path = g_path_get_dirname (info.dli_fname); + possible_dir = g_build_filename (path, "gio", "modules", NULL); + if (g_file_test (possible_dir, G_FILE_TEST_IS_DIR)) + { + g_free (module_dir); + module_dir = g_steal_pointer (&possible_dir); + } + } + } +#endif +#endif #endif }
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/giomodule.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/giomodule.h
Changed
@@ -34,11 +34,11 @@ typedef struct _GIOModuleScope GIOModuleScope; -GLIB_AVAILABLE_IN_2_30 +GIO_AVAILABLE_IN_2_30 GIOModuleScope * g_io_module_scope_new (GIOModuleScopeFlags flags); -GLIB_AVAILABLE_IN_2_30 +GIO_AVAILABLE_IN_2_30 void g_io_module_scope_free (GIOModuleScope *scope); -GLIB_AVAILABLE_IN_2_30 +GIO_AVAILABLE_IN_2_30 void g_io_module_scope_block (GIOModuleScope *scope, const gchar *basename); @@ -56,54 +56,58 @@ **/ typedef struct _GIOModuleClass GIOModuleClass; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GType g_io_module_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GIOModule *g_io_module_new (const gchar *filename); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_io_modules_scan_all_in_directory (const char *dirname); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GList *g_io_modules_load_all_in_directory (const gchar *dirname); -GLIB_AVAILABLE_IN_2_30 +GIO_AVAILABLE_IN_2_30 void g_io_modules_scan_all_in_directory_with_scope (const gchar *dirname, GIOModuleScope *scope); -GLIB_AVAILABLE_IN_2_30 +GIO_AVAILABLE_IN_2_30 GList *g_io_modules_load_all_in_directory_with_scope (const gchar *dirname, GIOModuleScope *scope); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GIOExtensionPoint *g_io_extension_point_register (const char *name); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GIOExtensionPoint *g_io_extension_point_lookup (const char *name); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_io_extension_point_set_required_type (GIOExtensionPoint *extension_point, GType type); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GType g_io_extension_point_get_required_type (GIOExtensionPoint *extension_point); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GList *g_io_extension_point_get_extensions (GIOExtensionPoint *extension_point); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GIOExtension * g_io_extension_point_get_extension_by_name (GIOExtensionPoint *extension_point, const char *name); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GIOExtension * g_io_extension_point_implement (const char *extension_point_name, GType type, const char *extension_name, gint priority); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GType g_io_extension_get_type (GIOExtension *extension); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL const char * g_io_extension_get_name (GIOExtension *extension); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gint g_io_extension_get_priority (GIOExtension *extension); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GTypeClass* g_io_extension_ref_class (GIOExtension *extension); -/* API for the modules to implement */ +/* API for the modules to implement. + * Note that those functions are not implemented by libgio, they are declared + * here to be implemented in modules, that's why it uses G_MODULE_EXPORT + * instead of GIO_AVAILABLE_IN_ALL. + */ /** * g_io_module_load: (skip) @@ -123,7 +127,7 @@ * statically. The old symbol names continue to be supported, but cannot be used * for static builds. **/ -GLIB_AVAILABLE_IN_ALL +G_MODULE_EXPORT void g_io_module_load (GIOModule *module); /** @@ -143,7 +147,7 @@ * statically. The old symbol names continue to be supported, but cannot be used * for static builds. **/ -GLIB_AVAILABLE_IN_ALL +G_MODULE_EXPORT void g_io_module_unload (GIOModule *module); /** @@ -187,7 +191,7 @@ * * Since: 2.24 **/ -GLIB_AVAILABLE_IN_ALL +G_MODULE_EXPORT char **g_io_module_query (void); G_END_DECLS
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gioscheduler.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gioscheduler.h
Changed
@@ -32,20 +32,20 @@ G_BEGIN_DECLS -GLIB_DEPRECATED_IN_2_36_FOR ("GThreadPool or g_task_run_in_thread") +GIO_DEPRECATED_IN_2_36_FOR ("GThreadPool or g_task_run_in_thread") void g_io_scheduler_push_job (GIOSchedulerJobFunc job_func, gpointer user_data, GDestroyNotify notify, gint io_priority, GCancellable *cancellable); -GLIB_DEPRECATED_IN_2_36 +GIO_DEPRECATED_IN_2_36 void g_io_scheduler_cancel_all_jobs (void); -GLIB_DEPRECATED_IN_2_36_FOR (g_main_context_invoke) +GIO_DEPRECATED_IN_2_36_FOR (g_main_context_invoke) gboolean g_io_scheduler_job_send_to_mainloop (GIOSchedulerJob *job, GSourceFunc func, gpointer user_data, GDestroyNotify notify); -GLIB_DEPRECATED_IN_2_36_FOR (g_main_context_invoke) +GIO_DEPRECATED_IN_2_36_FOR (g_main_context_invoke) void g_io_scheduler_job_send_to_mainloop_async (GIOSchedulerJob *job, GSourceFunc func, gpointer user_data,
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/giostream.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/giostream.h
Changed
@@ -85,15 +85,15 @@ void (*_g_reserved10) (void); }; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GType g_io_stream_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GInputStream * g_io_stream_get_input_stream (GIOStream *stream); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GOutputStream *g_io_stream_get_output_stream (GIOStream *stream); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_io_stream_splice_async (GIOStream *stream1, GIOStream *stream2, GIOStreamSpliceFlags flags, @@ -102,34 +102,34 @@ GAsyncReadyCallback callback, gpointer user_data); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_io_stream_splice_finish (GAsyncResult *result, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_io_stream_close (GIOStream *stream, GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_io_stream_close_async (GIOStream *stream, int io_priority, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_io_stream_close_finish (GIOStream *stream, GAsyncResult *result, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_io_stream_is_closed (GIOStream *stream); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_io_stream_has_pending (GIOStream *stream); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_io_stream_set_pending (GIOStream *stream, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_io_stream_clear_pending (GIOStream *stream); G_END_DECLS
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/giotypes.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/giotypes.h
Changed
@@ -263,7 +263,7 @@ * GAsyncReadyCallback: * @source_object: (nullable): the object the asynchronous operation was started with. * @res: a #GAsyncResult. - * @user_data: user data passed to the callback. + * @data: user data passed to the callback. * * Type definition for a function that will be called back when an asynchronous * operation within GIO has been completed. #GAsyncReadyCallback @@ -280,13 +280,13 @@ **/ typedef void (*GAsyncReadyCallback) (GObject *source_object, GAsyncResult *res, - gpointer user_data); + gpointer data); /** * GFileProgressCallback: * @current_num_bytes: the current number of bytes in the operation. * @total_num_bytes: the total number of bytes in the operation. - * @user_data: user data passed to the callback. + * @data: user data passed to the callback. * * When doing file operations that may take a while, such as moving * a file or copying a file, a progress callback is used to pass how @@ -294,13 +294,13 @@ **/ typedef void (*GFileProgressCallback) (goffset current_num_bytes, goffset total_num_bytes, - gpointer user_data); + gpointer data); /** * GFileReadMoreCallback: * @file_contents: the data as currently read. * @file_size: the size of the data currently read. - * @user_data: data passed to the callback. + * @callback_data: data passed to the callback. * * When loading the partial contents of a file with g_file_load_partial_contents_async(), * it may become necessary to determine if any more data from the file should be loaded. @@ -311,7 +311,7 @@ **/ typedef gboolean (* GFileReadMoreCallback) (const char *file_contents, goffset file_size, - gpointer user_data); + gpointer callback_data); /** * GFileMeasureProgressCallback: @@ -319,7 +319,7 @@ * @current_size: the current cumulative size measurement * @num_dirs: the number of directories visited so far * @num_files: the number of non-directory files encountered - * @user_data: the data passed to the original request for this callback + * @data: the data passed to the original request for this callback * * This callback type is used by g_file_measure_disk_usage() to make * periodic progress reports when measuring the amount of disk spaced @@ -355,13 +355,13 @@ guint64 current_size, guint64 num_dirs, guint64 num_files, - gpointer user_data); + gpointer data); /** * GIOSchedulerJobFunc: * @job: a #GIOSchedulerJob. * @cancellable: optional #GCancellable object, %NULL to ignore. - * @user_data: the data to pass to callback function + * @data: data passed to the callback function * * I/O Job function. * @@ -373,7 +373,7 @@ **/ typedef gboolean (*GIOSchedulerJobFunc) (GIOSchedulerJob *job, GCancellable *cancellable, - gpointer user_data); + gpointer data); /** * GSimpleAsyncThreadFunc: @@ -392,7 +392,7 @@ * GSocketSourceFunc: * @socket: the #GSocket * @condition: the current condition at the source fired. - * @user_data: data passed in by the user. + * @data: data passed in by the user. * * This is the function type of the callback used for the #GSource * returned by g_socket_create_source(). @@ -403,13 +403,13 @@ */ typedef gboolean (*GSocketSourceFunc) (GSocket *socket, GIOCondition condition, - gpointer user_data); + gpointer data); /** * GDatagramBasedSourceFunc: * @datagram_based: the #GDatagramBased * @condition: the current condition at the source fired - * @user_data: data passed in by the user + * @data: data passed in by the user * * This is the function type of the callback used for the #GSource * returned by g_datagram_based_create_source(). @@ -421,7 +421,7 @@ */ typedef gboolean (*GDatagramBasedSourceFunc) (GDatagramBased *datagram_based, GIOCondition condition, - gpointer user_data); + gpointer data); /** * GInputVector: @@ -573,7 +573,7 @@ /** * GCancellableSourceFunc: * @cancellable: the #GCancellable - * @user_data: data passed in by the user. + * @data: data passed in by the user. * * This is the function type of the callback used for the #GSource * returned by g_cancellable_source_new(). @@ -583,12 +583,12 @@ * Since: 2.28 */ typedef gboolean (*GCancellableSourceFunc) (GCancellable *cancellable, - gpointer user_data); + gpointer data); /** * GPollableSourceFunc: * @pollable_stream: the #GPollableInputStream or #GPollableOutputStream - * @user_data: data passed in by the user. + * @data: data passed in by the user. * * This is the function type of the callback used for the #GSource * returned by g_pollable_input_stream_create_source() and @@ -599,7 +599,7 @@ * Since: 2.28 */ typedef gboolean (*GPollableSourceFunc) (GObject *pollable_stream, - gpointer user_data); + gpointer data); typedef struct _GDBusInterface GDBusInterface; /* Dummy typedef */ typedef struct _GDBusInterfaceSkeleton GDBusInterfaceSkeleton; @@ -615,7 +615,7 @@ * @manager: A #GDBusObjectManagerClient. * @object_path: The object path of the remote object. * @interface_name: (nullable): The interface name of the remote object or %NULL if a #GDBusObjectProxy #GType is requested. - * @user_data: User data. + * @data: data passed in by the user. * * Function signature for a function used to determine the #GType to * use for an interface proxy (if @interface_name is not %NULL) or @@ -634,7 +634,7 @@ typedef GType (*GDBusProxyTypeFunc) (GDBusObjectManagerClient *manager, const gchar *object_path, const gchar *interface_name, - gpointer user_data); + gpointer data); typedef struct _GTestDBus GTestDBus;
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/glib-compile-resources.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/glib-compile-resources.c
Changed
@@ -24,8 +24,6 @@ #include <glib.h> #include <gstdio.h> #include <gi18n.h> -#include <gioenums.h> - #include <string.h> #include <stdio.h> #include <locale.h> @@ -37,6 +35,8 @@ #include <io.h> #endif +#define __GIO_GIO_H_INSIDE__ +#include <gio/gioenums.h> #include <gio/gmemoryoutputstream.h> #include <gio/gzlibcompressor.h> #include <gio/gconverteroutputstream.h> @@ -837,6 +837,7 @@ #ifdef G_OS_WIN32 gchar *tmp; + gchar **command_line = NULL; #endif setlocale (LC_ALL, GLIB_DEFAULT_LOCALE); @@ -863,11 +864,21 @@ g_option_context_add_main_entries (context, entries, GETTEXT_PACKAGE); error = NULL; +#ifdef G_OS_WIN32 + command_line = g_win32_get_command_line (); + if (!g_option_context_parse_strv (context, &command_line, &error)) + { + g_printerr ("%s\n", error->message); + return 1; + } + argc = g_strv_length (command_line); +#else if (!g_option_context_parse (context, &argc, &argv, &error)) { g_printerr ("%s\n", error->message); return 1; } +#endif g_option_context_free (context); @@ -890,7 +901,11 @@ compiler_type = get_compiler_id (compiler); g_free (compiler); +#ifdef G_OS_WIN32 + srcfile = command_line1; +#else srcfile = argv1; +#endif xmllint = g_strdup (g_getenv ("XMLLINT")); if (xmllint == NULL) @@ -1310,5 +1325,9 @@ g_free (c_name); g_hash_table_unref (files); +#ifdef G_OS_WIN32 + g_strfreev (command_line); +#endif + return 0; }
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/glib-compile-schemas.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/glib-compile-schemas.c
Changed
@@ -22,6 +22,7 @@ /* Prologue {{{1 */ #include "config.h" +#include <glib.h> #include <gstdio.h> #include <gi18n.h> @@ -709,8 +710,8 @@ gsize size; gsize i; - data = state->strinfo->str; size = state->strinfo->len; + data = g_string_free_and_steal (g_steal_pointer (&state->strinfo)); words = data; for (i = 0; i < size / sizeof (guint32); i++) @@ -720,9 +721,6 @@ data, size, TRUE, g_free, data); - g_string_free (state->strinfo, FALSE); - state->strinfo = NULL; - g_variant_builder_add (&builder, "(y@au)", state->is_flags ? 'f' : state->is_enum ? 'e' : 'c', @@ -1869,8 +1867,8 @@ compare_strings (gconstpointer a, gconstpointer b) { - gchar *one = *(gchar **) a; - gchar *two = *(gchar **) b; + const gchar *one = a; + const gchar *two = b; gint cmp; cmp = g_str_has_suffix (two, ".enums.xml") - @@ -2185,6 +2183,7 @@ #ifdef G_OS_WIN32 gchar *tmp = NULL; + gchar **command_line = NULL; #endif setlocale (LC_ALL, GLIB_DEFAULT_LOCALE); @@ -2209,12 +2208,23 @@ "and the cache file is called gschemas.compiled.")); g_option_context_add_main_entries (context, entries, GETTEXT_PACKAGE); +#ifdef G_OS_WIN32 + command_line = g_win32_get_command_line (); + if (!g_option_context_parse_strv (context, &command_line, &error)) + { + fprintf (stderr, "%s\n", error->message); + retval = 1; + goto done; + } + argc = g_strv_length (command_line); +#else if (!g_option_context_parse (context, &argc, &argv, &error)) { fprintf (stderr, "%s\n", error->message); retval = 1; goto done; } +#endif if (show_version_and_exit) { @@ -2230,7 +2240,11 @@ goto done; } +#ifdef G_OS_WIN32 + srcdir = command_line1; +#else srcdir = argv1; +#endif target = g_build_filename (targetdir ? targetdir : srcdir, "gschemas.compiled", NULL); @@ -2278,10 +2292,10 @@ retval = 0; goto done; } - g_ptr_array_sort (files, compare_strings); + g_ptr_array_sort_values (files, compare_strings); g_ptr_array_add (files, NULL); - g_ptr_array_sort (overrides, compare_strings); + g_ptr_array_sort_values (overrides, compare_strings); g_ptr_array_add (overrides, NULL); schema_files = (char **) g_ptr_array_free (files, FALSE); @@ -2323,6 +2337,7 @@ #ifdef G_OS_WIN32 g_free (tmp); + g_strfreev (command_line); #endif return retval;
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/glistmodel.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/glistmodel.h
Changed
@@ -34,7 +34,7 @@ G_BEGIN_DECLS #define G_TYPE_LIST_MODEL g_list_model_get_type () -GLIB_AVAILABLE_IN_2_44 +GIO_AVAILABLE_IN_2_44 G_DECLARE_INTERFACE(GListModel, g_list_model, G, LIST_MODEL, GObject) struct _GListModelInterface @@ -49,21 +49,21 @@ guint position); }; -GLIB_AVAILABLE_IN_2_44 +GIO_AVAILABLE_IN_2_44 GType g_list_model_get_item_type (GListModel *list); -GLIB_AVAILABLE_IN_2_44 +GIO_AVAILABLE_IN_2_44 guint g_list_model_get_n_items (GListModel *list); -GLIB_AVAILABLE_IN_2_44 +GIO_AVAILABLE_IN_2_44 gpointer g_list_model_get_item (GListModel *list, guint position); -GLIB_AVAILABLE_IN_2_44 +GIO_AVAILABLE_IN_2_44 GObject * g_list_model_get_object (GListModel *list, guint position); -GLIB_AVAILABLE_IN_2_44 +GIO_AVAILABLE_IN_2_44 void g_list_model_items_changed (GListModel *list, guint position, guint removed,
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gliststore.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gliststore.c
Changed
@@ -530,7 +530,7 @@ /** * g_list_store_find_with_equal_func: * @store: a #GListStore - * @item: (type GObject): an item + * @item: (type GObject) (nullable): an item * @equal_func: (scope call): A custom equality check function * @position: (out) (optional): the first position of @item, if it was found. * @@ -539,6 +539,10 @@ * matches. If @item was not found, then @position will not be set, and this * method will return %FALSE. * + * @item is always passed as second parameter to @equal_func. + * + * Since GLib 2.76 it is possible to pass `NULL` for @item. + * * Returns: Whether @store contains @item. If it was found, @position will be * set to the position where @item occurred for the first time. * @@ -559,7 +563,7 @@ /** * g_list_store_find_with_equal_func_full: * @store: a #GListStore - * @item: (type GObject): an item + * @item: (type GObject) (nullable): an item * @equal_func: (scope call): A custom equality check function * @user_data: (closure): user data for @equal_func * @position: (out) (optional): the first position of @item, if it was found. @@ -567,6 +571,10 @@ * Like g_list_store_find_with_equal_func() but with an additional @user_data * that is passed to @equal_func. * + * @item is always passed as second parameter to @equal_func. + * + * Since GLib 2.76 it is possible to pass `NULL` for @item. + * * Returns: Whether @store contains @item. If it was found, @position will be * set to the position where @item occurred for the first time. * @@ -582,7 +590,7 @@ GSequenceIter *iter, *begin, *end; g_return_val_if_fail (G_IS_LIST_STORE (store), FALSE); - g_return_val_if_fail (g_type_is_a (G_OBJECT_TYPE (item), store->item_type), + g_return_val_if_fail (item == NULL || g_type_is_a (G_OBJECT_TYPE (item), store->item_type), FALSE); g_return_val_if_fail (equal_func != NULL, FALSE);
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gliststore.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gliststore.h
Changed
@@ -34,58 +34,58 @@ G_BEGIN_DECLS #define G_TYPE_LIST_STORE (g_list_store_get_type ()) -GLIB_AVAILABLE_IN_2_44 +GIO_AVAILABLE_IN_2_44 G_DECLARE_FINAL_TYPE(GListStore, g_list_store, G, LIST_STORE, GObject) -GLIB_AVAILABLE_IN_2_44 +GIO_AVAILABLE_IN_2_44 GListStore * g_list_store_new (GType item_type); -GLIB_AVAILABLE_IN_2_44 +GIO_AVAILABLE_IN_2_44 void g_list_store_insert (GListStore *store, guint position, gpointer item); -GLIB_AVAILABLE_IN_2_44 +GIO_AVAILABLE_IN_2_44 guint g_list_store_insert_sorted (GListStore *store, gpointer item, GCompareDataFunc compare_func, gpointer user_data); -GLIB_AVAILABLE_IN_2_46 +GIO_AVAILABLE_IN_2_46 void g_list_store_sort (GListStore *store, GCompareDataFunc compare_func, gpointer user_data); -GLIB_AVAILABLE_IN_2_44 +GIO_AVAILABLE_IN_2_44 void g_list_store_append (GListStore *store, gpointer item); -GLIB_AVAILABLE_IN_2_44 +GIO_AVAILABLE_IN_2_44 void g_list_store_remove (GListStore *store, guint position); -GLIB_AVAILABLE_IN_2_44 +GIO_AVAILABLE_IN_2_44 void g_list_store_remove_all (GListStore *store); -GLIB_AVAILABLE_IN_2_44 +GIO_AVAILABLE_IN_2_44 void g_list_store_splice (GListStore *store, guint position, guint n_removals, gpointer *additions, guint n_additions); -GLIB_AVAILABLE_IN_2_64 +GIO_AVAILABLE_IN_2_64 gboolean g_list_store_find (GListStore *store, gpointer item, guint *position); -GLIB_AVAILABLE_IN_2_64 +GIO_AVAILABLE_IN_2_64 gboolean g_list_store_find_with_equal_func (GListStore *store, gpointer item, GEqualFunc equal_func, guint *position); -GLIB_AVAILABLE_IN_2_74 +GIO_AVAILABLE_IN_2_74 gboolean g_list_store_find_with_equal_func_full (GListStore *store, gpointer item, GEqualFuncFull equal_func,
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gloadableicon.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gloadableicon.h
Changed
@@ -75,22 +75,22 @@ GError **error); }; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GType g_loadable_icon_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GInputStream *g_loadable_icon_load (GLoadableIcon *icon, int size, char **type, GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_loadable_icon_load_async (GLoadableIcon *icon, int size, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GInputStream *g_loadable_icon_load_finish (GLoadableIcon *icon, GAsyncResult *res, char **type,
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/glocalfile.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/glocalfile.c
Changed
@@ -51,6 +51,10 @@ #define O_BINARY 0 #endif +#ifndef O_CLOEXEC +#define O_CLOEXEC 0 +#endif + #include "gfileattribute.h" #include "glocalfile.h" #include "glocalfileinfo.h" @@ -787,6 +791,7 @@ dev_t *dev; GUnixMountEntry *mount; guint64 cache_time; + gboolean is_remote = FALSE; if (g_lstat (path, &buf) != 0) return; @@ -823,6 +828,8 @@ { if (g_unix_mount_is_readonly (mount)) mount_info |= MOUNT_INFO_READONLY; + if (is_remote_fs_type (g_unix_mount_get_fs_type (mount))) + is_remote = TRUE; g_unix_mount_free (mount); } @@ -838,8 +845,14 @@ G_UNLOCK (mount_info_hash); } - if (mount_info & MOUNT_INFO_READONLY) - g_file_info_set_attribute_boolean (fs_info, G_FILE_ATTRIBUTE_FILESYSTEM_READONLY, TRUE); + if (g_file_attribute_matcher_matches (matcher, + G_FILE_ATTRIBUTE_FILESYSTEM_READONLY)) + g_file_info_set_attribute_boolean (fs_info, G_FILE_ATTRIBUTE_FILESYSTEM_READONLY, + (mount_info & MOUNT_INFO_READONLY)); + + if (g_file_attribute_matcher_matches (matcher, + G_FILE_ATTRIBUTE_FILESYSTEM_REMOTE)) + g_file_info_set_attribute_boolean (fs_info, G_FILE_ATTRIBUTE_FILESYSTEM_REMOTE, is_remote); } #endif @@ -1085,7 +1098,9 @@ #endif /* G_OS_WIN32 */ if (g_file_attribute_matcher_matches (attribute_matcher, - G_FILE_ATTRIBUTE_FILESYSTEM_READONLY)) + G_FILE_ATTRIBUTE_FILESYSTEM_READONLY) || + g_file_attribute_matcher_matches (attribute_matcher, + G_FILE_ATTRIBUTE_FILESYSTEM_REMOTE)) { #ifdef G_OS_WIN32 get_filesystem_readonly (info, local->filename); @@ -1094,13 +1109,6 @@ #endif /* G_OS_WIN32 */ } -#ifndef G_OS_WIN32 - if (g_file_attribute_matcher_matches (attribute_matcher, - G_FILE_ATTRIBUTE_FILESYSTEM_REMOTE)) - g_file_info_set_attribute_boolean (info, G_FILE_ATTRIBUTE_FILESYSTEM_REMOTE, - is_remote_fs_type (fstype)); -#endif - g_file_attribute_matcher_unref (attribute_matcher); return info; @@ -1348,7 +1356,7 @@ int fd, ret; GLocalFileStat buf; - fd = g_open (local->filename, O_RDONLY|O_BINARY, 0); + fd = g_open (local->filename, O_RDONLY | O_BINARY | O_CLOEXEC, 0); if (fd == -1) { int errsv = errno; @@ -1921,7 +1929,7 @@ return res; } -#ifdef G_OS_UNIX +#ifndef G_OS_WIN32 gboolean _g_local_file_is_lost_found_dir (const char *path, dev_t path_dev) { @@ -2223,7 +2231,7 @@ infofile = g_build_filename (infodir, infoname, NULL); g_free (infoname); - fd = g_open (infofile, O_CREAT | O_EXCL, 0666); + fd = g_open (infofile, O_CREAT | O_EXCL | O_CLOEXEC, 0666); errsv = errno; } while (fd == -1 && errsv == EEXIST); @@ -2232,8 +2240,6 @@ if (fd == -1) { - errsv = errno; - g_free (filesdir); g_free (topdir); g_free (trashname); @@ -2274,9 +2280,18 @@ original_name_escaped, delete_time); g_free (delete_time); - g_file_set_contents_full (infofile, data, -1, + if (!g_file_set_contents_full (infofile, data, -1, G_FILE_SET_CONTENTS_CONSISTENT | G_FILE_SET_CONTENTS_ONLY_EXISTING, - 0600, NULL); + 0600, error)) + { + g_unlink (infofile); + + g_free (filesdir); + g_free (trashname); + g_free (infofile); + + return FALSE; + } /* TODO: Maybe we should verify that you can delete the file from the trash * before moving it? OTOH, that is hard, as it needs a recursive scan @@ -2603,6 +2618,8 @@ return TRUE; if (strcmp (fsname, "smb2") == 0) return TRUE; + if (strcmp (fsname, "fuse.sshfs") == 0) + return TRUE; } return FALSE; @@ -2868,9 +2885,9 @@ #ifdef AT_FDCWD #ifdef HAVE_OPEN_O_DIRECTORY - dir_fd = openat (parent_fd, name->data, O_RDONLY|O_DIRECTORY); + dir_fd = openat (parent_fd, name->data, O_RDONLY | O_DIRECTORY | O_CLOEXEC); #else - dir_fd = openat (parent_fd, name->data, O_RDONLY); + dir_fd = openat (parent_fd, name->data, O_RDONLY | O_CLOEXEC); #endif errsv = errno; if (dir_fd < 0)
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/glocalfileinfo.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/glocalfileinfo.c
Changed
@@ -92,6 +92,10 @@ #endif #endif +#ifndef O_CLOEXEC +#define O_CLOEXEC 0 +#endif + #include "glocalfileinfo.h" #include "gioerror.h" #include "gthemedicon.h" @@ -127,23 +131,9 @@ g_return_val_if_fail (_g_stat_has_field (statbuf, G_LOCAL_FILE_STAT_FIELD_MTIME), NULL); -#if defined (G_OS_WIN32) - sec = statbuf->st_mtim.tv_sec; - usec = statbuf->st_mtim.tv_nsec / 1000; - nsec = statbuf->st_mtim.tv_nsec; -#else sec = _g_stat_mtime (statbuf); -#if defined (HAVE_STRUCT_STAT_ST_MTIMENSEC) - usec = statbuf->st_mtimensec / 1000; - nsec = statbuf->st_mtimensec; -#elif defined (HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC) usec = _g_stat_mtim_nsec (statbuf) / 1000; nsec = _g_stat_mtim_nsec (statbuf); -#else - usec = 0; - nsec = 0; -#endif -#endif return g_strdup_printf ("%lu:%lu:%lu", sec, usec, nsec); } @@ -1032,35 +1022,16 @@ #endif -#if defined (G_OS_WIN32) - _g_file_info_set_attribute_uint64_by_id (info, G_FILE_ATTRIBUTE_ID_TIME_MODIFIED, statbuf->st_mtim.tv_sec); - _g_file_info_set_attribute_uint32_by_id (info, G_FILE_ATTRIBUTE_ID_TIME_MODIFIED_USEC, statbuf->st_mtim.tv_nsec / 1000); - _g_file_info_set_attribute_uint32_by_id (info, G_FILE_ATTRIBUTE_ID_TIME_MODIFIED_NSEC, statbuf->st_mtim.tv_nsec); - _g_file_info_set_attribute_uint64_by_id (info, G_FILE_ATTRIBUTE_ID_TIME_ACCESS, statbuf->st_atim.tv_sec); - _g_file_info_set_attribute_uint32_by_id (info, G_FILE_ATTRIBUTE_ID_TIME_ACCESS_USEC, statbuf->st_atim.tv_nsec / 1000); - _g_file_info_set_attribute_uint32_by_id (info, G_FILE_ATTRIBUTE_ID_TIME_ACCESS_NSEC, statbuf->st_atim.tv_nsec); -#else _g_file_info_set_attribute_uint64_by_id (info, G_FILE_ATTRIBUTE_ID_TIME_MODIFIED, _g_stat_mtime (statbuf)); -#if defined (HAVE_STRUCT_STAT_ST_MTIMENSEC) - _g_file_info_set_attribute_uint32_by_id (info, G_FILE_ATTRIBUTE_ID_TIME_MODIFIED_USEC, statbuf->st_mtimensec / 1000); - _g_file_info_set_attribute_uint32_by_id (info, G_FILE_ATTRIBUTE_ID_TIME_MODIFIED_NSEC, statbuf->st_mtimensec); -#elif defined (HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC) _g_file_info_set_attribute_uint32_by_id (info, G_FILE_ATTRIBUTE_ID_TIME_MODIFIED_USEC, _g_stat_mtim_nsec (statbuf) / 1000); _g_file_info_set_attribute_uint32_by_id (info, G_FILE_ATTRIBUTE_ID_TIME_MODIFIED_NSEC, _g_stat_mtim_nsec (statbuf)); -#endif if (_g_stat_has_field (statbuf, G_LOCAL_FILE_STAT_FIELD_ATIME)) { _g_file_info_set_attribute_uint64_by_id (info, G_FILE_ATTRIBUTE_ID_TIME_ACCESS, _g_stat_atime (statbuf)); -#if defined (HAVE_STRUCT_STAT_ST_ATIMENSEC) - _g_file_info_set_attribute_uint32_by_id (info, G_FILE_ATTRIBUTE_ID_TIME_ACCESS_USEC, statbuf->st_atimensec / 1000); - _g_file_info_set_attribute_uint32_by_id (info, G_FILE_ATTRIBUTE_ID_TIME_ACCESS_NSEC, statbuf->st_atimensec); -#elif defined (HAVE_STRUCT_STAT_ST_ATIM_TV_NSEC) _g_file_info_set_attribute_uint32_by_id (info, G_FILE_ATTRIBUTE_ID_TIME_ACCESS_USEC, _g_stat_atim_nsec (statbuf) / 1000); _g_file_info_set_attribute_uint32_by_id (info, G_FILE_ATTRIBUTE_ID_TIME_ACCESS_NSEC, _g_stat_atim_nsec (statbuf)); -#endif } -#endif #ifndef G_OS_WIN32 /* Microsoft uses st_ctime for file creation time, @@ -1069,14 +1040,9 @@ * Thank you, Microsoft! */ _g_file_info_set_attribute_uint64_by_id (info, G_FILE_ATTRIBUTE_ID_TIME_CHANGED, _g_stat_ctime (statbuf)); -#if defined (HAVE_STRUCT_STAT_ST_CTIMENSEC) - _g_file_info_set_attribute_uint32_by_id (info, G_FILE_ATTRIBUTE_ID_TIME_CHANGED_USEC, statbuf->st_ctimensec / 1000); - _g_file_info_set_attribute_uint32_by_id (info, G_FILE_ATTRIBUTE_ID_TIME_CHANGED_NSEC, statbuf->st_ctimensec); -#elif defined (HAVE_STRUCT_STAT_ST_CTIM_TV_NSEC) _g_file_info_set_attribute_uint32_by_id (info, G_FILE_ATTRIBUTE_ID_TIME_CHANGED_USEC, _g_stat_ctim_nsec (statbuf) / 1000); _g_file_info_set_attribute_uint32_by_id (info, G_FILE_ATTRIBUTE_ID_TIME_CHANGED_NSEC, _g_stat_ctim_nsec (statbuf)); #endif -#endif #if defined (HAVE_STATX) if (_g_stat_has_field (statbuf, G_LOCAL_FILE_STAT_FIELD_BTIME)) @@ -1361,12 +1327,8 @@ { /* Don't sniff zero-length files in order to avoid reading files * that appear normal but are not (eg: files in /proc and /sys) - * - * Note that we need to return text/plain here so that - * newly-created text files are opened by the text editor. - * See https://bugzilla.gnome.org/show_bug.cgi?id=755795 */ - return g_content_type_from_mime_type ("text/plain"); + return g_content_type_from_mime_type ("application/x-zerosize"); } #endif #ifdef S_ISSOCK @@ -1380,23 +1342,26 @@ content_type = g_content_type_guess (basename, NULL, 0, &result_uncertain); -#if !defined(G_OS_WIN32) && !defined(HAVE_COCOA) +#if !defined(G_OS_WIN32) && !defined(__APPLE__) if (!fast && result_uncertain && path != NULL) { guchar sniff_buffer4096; gsize sniff_length; - int fd, errsv; +#ifdef O_NOATIME + int errsv; +#endif + int fd; sniff_length = _g_unix_content_type_get_sniff_len (); if (sniff_length == 0 || sniff_length > 4096) sniff_length = 4096; #ifdef O_NOATIME - fd = g_open (path, O_RDONLY | O_NOATIME, 0); + fd = g_open (path, O_RDONLY | O_NOATIME | O_CLOEXEC, 0); errsv = errno; if (fd < 0 && errsv == EPERM) #endif - fd = g_open (path, O_RDONLY, 0); + fd = g_open (path, O_RDONLY | O_CLOEXEC, 0); if (fd != -1) { @@ -1418,19 +1383,90 @@ } +typedef enum { + THUMBNAIL_SIZE_AUTO, + THUMBNAIL_SIZE_NORMAL, + THUMBNAIL_SIZE_LARGE, + THUMBNAIL_SIZE_XLARGE, + THUMBNAIL_SIZE_XXLARGE, + THUMBNAIL_SIZE_LAST, +} ThumbnailSize; + +static const char * +get_thumbnail_dirname_from_size (ThumbnailSize size) +{ + switch (size) + { + case THUMBNAIL_SIZE_AUTO: + return NULL; + break; + case THUMBNAIL_SIZE_NORMAL: + return "normal"; + break; + case THUMBNAIL_SIZE_LARGE: + return "large"; + break; + case THUMBNAIL_SIZE_XLARGE: + return "x-large"; + break; + case THUMBNAIL_SIZE_XXLARGE: + return "xx-large"; + break; + default: + g_assert_not_reached (); + } + + g_return_val_if_reached (NULL); +} + /* @stat_buf is the pre-calculated result of stat(path), or %NULL if that failed. */ static void get_thumbnail_attributes (const char *path, GFileInfo *info, - const GLocalFileStat *stat_buf) + const GLocalFileStat *stat_buf, + ThumbnailSize size) { GChecksum *checksum; + const char *dirname; char *uri; char *filename = NULL; char *basename; - const char *size_dirs4 = { "xx-large", "x-large", "large", "normal" }; - gsize i; - + guint32 failed_attr_id; + guint32 is_valid_attr_id; + guint32 path_attr_id; + + switch (size) + { + case THUMBNAIL_SIZE_AUTO: + failed_attr_id = G_FILE_ATTRIBUTE_ID_THUMBNAILING_FAILED; + is_valid_attr_id = G_FILE_ATTRIBUTE_ID_THUMBNAIL_IS_VALID; + path_attr_id = G_FILE_ATTRIBUTE_ID_THUMBNAIL_PATH; + break; + case THUMBNAIL_SIZE_NORMAL: + failed_attr_id = G_FILE_ATTRIBUTE_ID_THUMBNAILING_FAILED_NORMAL; + is_valid_attr_id = G_FILE_ATTRIBUTE_ID_THUMBNAIL_IS_VALID_NORMAL; + path_attr_id = G_FILE_ATTRIBUTE_ID_THUMBNAIL_PATH_NORMAL; + break; + case THUMBNAIL_SIZE_LARGE: + failed_attr_id = G_FILE_ATTRIBUTE_ID_THUMBNAILING_FAILED_LARGE; + is_valid_attr_id = G_FILE_ATTRIBUTE_ID_THUMBNAIL_IS_VALID_LARGE; + path_attr_id = G_FILE_ATTRIBUTE_ID_THUMBNAIL_PATH_LARGE; + break; + case THUMBNAIL_SIZE_XLARGE: + failed_attr_id = G_FILE_ATTRIBUTE_ID_THUMBNAILING_FAILED_XLARGE; + is_valid_attr_id = G_FILE_ATTRIBUTE_ID_THUMBNAIL_IS_VALID_XLARGE; + path_attr_id = G_FILE_ATTRIBUTE_ID_THUMBNAIL_PATH_XLARGE; + break; + case THUMBNAIL_SIZE_XXLARGE: + failed_attr_id = G_FILE_ATTRIBUTE_ID_THUMBNAILING_FAILED_XXLARGE; + is_valid_attr_id = G_FILE_ATTRIBUTE_ID_THUMBNAIL_IS_VALID_XXLARGE; + path_attr_id = G_FILE_ATTRIBUTE_ID_THUMBNAIL_PATH_XXLARGE; + break; + default: + g_assert_not_reached (); + } + + dirname = get_thumbnail_dirname_from_size (size); uri = g_filename_to_uri (path, NULL, NULL); checksum = g_checksum_new (G_CHECKSUM_MD5); @@ -1439,21 +1475,37 @@ basename = g_strconcat (g_checksum_get_string (checksum), ".png", NULL); g_checksum_free (checksum); - for (i = 0; i < G_N_ELEMENTS (size_dirs); i++) + if (dirname) { filename = g_build_filename (g_get_user_cache_dir (), - "thumbnails", size_dirsi, basename, + "thumbnails", dirname, basename, NULL); - if (g_file_test (filename, G_FILE_TEST_IS_REGULAR)) - break; - g_clear_pointer (&filename, g_free); + if (!g_file_test (filename, G_FILE_TEST_IS_REGULAR)) + g_clear_pointer (&filename, g_free); + } + else + { + gssize i; + + for (i = THUMBNAIL_SIZE_LAST - 1; i >= 0 ; i--) + { + filename = g_build_filename (g_get_user_cache_dir (), + "thumbnails", + get_thumbnail_dirname_from_size (i), + basename, + NULL); + if (g_file_test (filename, G_FILE_TEST_IS_REGULAR)) + break; + + g_clear_pointer (&filename, g_free); + } } if (filename) { - _g_file_info_set_attribute_byte_string_by_id (info, G_FILE_ATTRIBUTE_ID_THUMBNAIL_PATH, filename); - _g_file_info_set_attribute_boolean_by_id (info, G_FILE_ATTRIBUTE_ID_THUMBNAIL_IS_VALID, + _g_file_info_set_attribute_byte_string_by_id (info, path_attr_id, filename); + _g_file_info_set_attribute_boolean_by_id (info, is_valid_attr_id, thumbnail_verify (filename, uri, stat_buf)); } else @@ -1466,11 +1518,12 @@ if (g_file_test (filename, G_FILE_TEST_IS_REGULAR)) { - _g_file_info_set_attribute_boolean_by_id (info, G_FILE_ATTRIBUTE_ID_THUMBNAILING_FAILED, TRUE); - _g_file_info_set_attribute_boolean_by_id (info, G_FILE_ATTRIBUTE_ID_THUMBNAIL_IS_VALID, + _g_file_info_set_attribute_boolean_by_id (info, failed_attr_id, TRUE); + _g_file_info_set_attribute_boolean_by_id (info, is_valid_attr_id, thumbnail_verify (filename, uri, stat_buf)); } } + g_free (basename); g_free (filename); g_free (uri); @@ -1937,43 +1990,46 @@ symlink_broken = TRUE; } } + else + g_file_info_set_is_symlink (info, FALSE); if (stat_ok) set_info_from_stat (info, &statbuf, attribute_matcher); -#ifdef G_OS_UNIX - if (stat_ok && _g_local_file_is_lost_found_dir (path, _g_stat_dev (&statbuf))) - g_file_info_set_is_hidden (info, TRUE); -#endif - #ifndef G_OS_WIN32 if (_g_file_attribute_matcher_matches_id (attribute_matcher, G_FILE_ATTRIBUTE_ID_STANDARD_IS_HIDDEN)) { - if (basename != NULL && - (basename0 == '.' || - file_is_hidden (path, basename))) - g_file_info_set_is_hidden (info, TRUE); + g_file_info_set_is_hidden (info, + (basename != NULL && + (basename0 == '.' || + file_is_hidden (path, basename) || + (stat_ok && + _g_local_file_is_lost_found_dir (path, _g_stat_dev (&statbuf)))))); } - if (basename != NULL && basenamestrlen (basename) -1 == '~' && - (stat_ok && S_ISREG (_g_stat_mode (&statbuf)))) - _g_file_info_set_attribute_boolean_by_id (info, G_FILE_ATTRIBUTE_ID_STANDARD_IS_BACKUP, TRUE); + _g_file_info_set_attribute_boolean_by_id (info, + G_FILE_ATTRIBUTE_ID_STANDARD_IS_BACKUP, + basename != NULL && basenamestrlen (basename) - 1 == '~' && + (stat_ok && S_ISREG (_g_stat_mode (&statbuf)))); #else - if (statbuf.attributes & FILE_ATTRIBUTE_HIDDEN) - g_file_info_set_is_hidden (info, TRUE); + _g_file_info_set_attribute_boolean_by_id (info, G_FILE_ATTRIBUTE_ID_STANDARD_IS_BACKUP, FALSE); - if (statbuf.attributes & FILE_ATTRIBUTE_ARCHIVE) - _g_file_info_set_attribute_boolean_by_id (info, G_FILE_ATTRIBUTE_ID_DOS_IS_ARCHIVE, TRUE); + g_file_info_set_is_hidden (info, (statbuf.attributes & FILE_ATTRIBUTE_HIDDEN)); - if (statbuf.attributes & FILE_ATTRIBUTE_SYSTEM) - _g_file_info_set_attribute_boolean_by_id (info, G_FILE_ATTRIBUTE_ID_DOS_IS_SYSTEM, TRUE); + _g_file_info_set_attribute_boolean_by_id (info, G_FILE_ATTRIBUTE_ID_DOS_IS_ARCHIVE, + (statbuf.attributes & FILE_ATTRIBUTE_ARCHIVE)); - if (statbuf.reparse_tag == IO_REPARSE_TAG_MOUNT_POINT) - _g_file_info_set_attribute_boolean_by_id (info, G_FILE_ATTRIBUTE_ID_DOS_IS_MOUNTPOINT, TRUE); + _g_file_info_set_attribute_boolean_by_id (info, G_FILE_ATTRIBUTE_ID_DOS_IS_SYSTEM, + (statbuf.attributes & FILE_ATTRIBUTE_SYSTEM)); + + _g_file_info_set_attribute_boolean_by_id (info, G_FILE_ATTRIBUTE_ID_DOS_IS_MOUNTPOINT, + (statbuf.reparse_tag == IO_REPARSE_TAG_MOUNT_POINT)); if (statbuf.reparse_tag != 0) _g_file_info_set_attribute_uint32_by_id (info, G_FILE_ATTRIBUTE_ID_DOS_REPARSE_POINT_TAG, statbuf.reparse_tag); + + _g_file_info_set_attribute_boolean_by_id (info, G_FILE_ATTRIBUTE_ID_STANDARD_IS_BACKUP, FALSE); #endif symlink_target = NULL; @@ -2089,9 +2145,9 @@ } if (stat_ok && parent_info && parent_info->device != 0 && - _g_file_attribute_matcher_matches_id (attribute_matcher, G_FILE_ATTRIBUTE_ID_UNIX_IS_MOUNTPOINT) && - (_g_stat_dev (&statbuf) != parent_info->device || _g_stat_ino (&statbuf) == parent_info->inode)) - _g_file_info_set_attribute_boolean_by_id (info, G_FILE_ATTRIBUTE_ID_UNIX_IS_MOUNTPOINT, TRUE); + _g_file_attribute_matcher_matches_id (attribute_matcher, G_FILE_ATTRIBUTE_ID_UNIX_IS_MOUNTPOINT)) + _g_file_info_set_attribute_boolean_by_id (info, G_FILE_ATTRIBUTE_ID_UNIX_IS_MOUNTPOINT, + (_g_stat_dev (&statbuf) != parent_info->device || _g_stat_ino (&statbuf) == parent_info->inode)); if (stat_ok) get_access_rights (attribute_matcher, info, path, &statbuf, parent_info); @@ -2109,10 +2165,47 @@ _g_file_attribute_matcher_matches_id (attribute_matcher, G_FILE_ATTRIBUTE_ID_THUMBNAILING_FAILED)) { - if (stat_ok) - get_thumbnail_attributes (path, info, &statbuf); - else - get_thumbnail_attributes (path, info, NULL); + get_thumbnail_attributes (path, info, stat_ok ? &statbuf : NULL, THUMBNAIL_SIZE_AUTO); + } + + if (_g_file_attribute_matcher_matches_id (attribute_matcher, + G_FILE_ATTRIBUTE_ID_THUMBNAIL_PATH_NORMAL) || + _g_file_attribute_matcher_matches_id (attribute_matcher, + G_FILE_ATTRIBUTE_ID_THUMBNAIL_IS_VALID_NORMAL) || + _g_file_attribute_matcher_matches_id (attribute_matcher, + G_FILE_ATTRIBUTE_ID_THUMBNAILING_FAILED_NORMAL)) + { + get_thumbnail_attributes (path, info, stat_ok ? &statbuf : NULL, THUMBNAIL_SIZE_NORMAL); + } + + if (_g_file_attribute_matcher_matches_id (attribute_matcher, + G_FILE_ATTRIBUTE_ID_THUMBNAIL_PATH_LARGE) || + _g_file_attribute_matcher_matches_id (attribute_matcher, + G_FILE_ATTRIBUTE_ID_THUMBNAIL_IS_VALID_LARGE) || + _g_file_attribute_matcher_matches_id (attribute_matcher, + G_FILE_ATTRIBUTE_ID_THUMBNAILING_FAILED_LARGE)) + { + get_thumbnail_attributes (path, info, stat_ok ? &statbuf : NULL, THUMBNAIL_SIZE_LARGE); + } + + if (_g_file_attribute_matcher_matches_id (attribute_matcher, + G_FILE_ATTRIBUTE_ID_THUMBNAIL_PATH_XLARGE) || + _g_file_attribute_matcher_matches_id (attribute_matcher, + G_FILE_ATTRIBUTE_ID_THUMBNAIL_IS_VALID_XLARGE) || + _g_file_attribute_matcher_matches_id (attribute_matcher, + G_FILE_ATTRIBUTE_ID_THUMBNAILING_FAILED_XLARGE)) + { + get_thumbnail_attributes (path, info, stat_ok ? &statbuf : NULL, THUMBNAIL_SIZE_XLARGE); + } + + if (_g_file_attribute_matcher_matches_id (attribute_matcher, + G_FILE_ATTRIBUTE_ID_THUMBNAIL_PATH_XXLARGE) || + _g_file_attribute_matcher_matches_id (attribute_matcher, + G_FILE_ATTRIBUTE_ID_THUMBNAIL_IS_VALID_XXLARGE) || + _g_file_attribute_matcher_matches_id (attribute_matcher, + G_FILE_ATTRIBUTE_ID_THUMBNAILING_FAILED_XXLARGE)) + { + get_thumbnail_attributes (path, info, stat_ok ? &statbuf : NULL, THUMBNAIL_SIZE_XXLARGE); } vfs = g_vfs_get_default (); @@ -2759,6 +2852,7 @@ { if (lazy_stat (filename, &statbuf, &got_stat) == 0) { + times_n1.tv_sec = statbuf.st_mtime; #if defined (HAVE_STRUCT_STAT_ST_MTIMENSEC) times_n1.tv_nsec = statbuf.st_mtimensec; #elif defined (HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC)
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/glocalfileinfo.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/glocalfileinfo.h
Changed
@@ -316,18 +316,22 @@ #endif #ifndef G_OS_WIN32 -inline static time_t _g_stat_atime (const GLocalFileStat *buf) { return buf->st_atime; } -inline static time_t _g_stat_ctime (const GLocalFileStat *buf) { return buf->st_ctime; } -inline static time_t _g_stat_mtime (const GLocalFileStat *buf) { return buf->st_mtime; } +inline static guint64 _g_stat_atime (const GLocalFileStat *buf) { return buf->st_atime; } +inline static guint64 _g_stat_ctime (const GLocalFileStat *buf) { return buf->st_ctime; } +inline static guint64 _g_stat_mtime (const GLocalFileStat *buf) { return buf->st_mtime; } #else -inline static time_t _g_stat_atime (const GLocalFileStat *buf) { return buf->st_atim.tv_sec; } -inline static time_t _g_stat_ctime (const GLocalFileStat *buf) { return buf->st_ctim.tv_sec; } -inline static time_t _g_stat_mtime (const GLocalFileStat *buf) { return buf->st_mtim.tv_sec; } +inline static guint64 _g_stat_atime (const GLocalFileStat *buf) { return buf->st_atim.tv_sec; } +inline static guint64 _g_stat_ctime (const GLocalFileStat *buf) { return buf->st_ctim.tv_sec; } +inline static guint64 _g_stat_mtime (const GLocalFileStat *buf) { return buf->st_mtim.tv_sec; } #endif #if defined(HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC) || defined(G_OS_WIN32) inline static guint32 _g_stat_atim_nsec (const GLocalFileStat *buf) { return buf->st_atim.tv_nsec; } inline static guint32 _g_stat_ctim_nsec (const GLocalFileStat *buf) { return buf->st_ctim.tv_nsec; } inline static guint32 _g_stat_mtim_nsec (const GLocalFileStat *buf) { return buf->st_mtim.tv_nsec; } +#elif defined(HAVE_STRUCT_STAT_ST_MTIMENSEC) +inline static guint32 _g_stat_atim_nsec (const GLocalFileStat *buf) { return buf->st_atimensec; } +inline static guint32 _g_stat_ctim_nsec (const GLocalFileStat *buf) { return buf->st_ctimensec; } +inline static guint32 _g_stat_mtim_nsec (const GLocalFileStat *buf) { return buf->st_mtimensec; } #else inline static guint32 _g_stat_atim_nsec (const GLocalFileStat *buf) { return 0; } inline static guint32 _g_stat_ctim_nsec (const GLocalFileStat *buf) { return 0; }
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/glocalfilemonitor.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/glocalfilemonitor.h
Changed
@@ -66,7 +66,7 @@ }; #ifdef G_OS_UNIX -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL #endif GType g_local_file_monitor_get_type (void) G_GNUC_CONST; @@ -93,7 +93,7 @@ GError **error); /* for implementations of GLocalFileMonitor */ -GLIB_AVAILABLE_IN_2_44 +GIO_AVAILABLE_IN_2_44 gboolean g_file_monitor_source_handle_event (GFileMonitorSource *fms, GFileMonitorEvent event_type,
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/glocalfileoutputstream.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/glocalfileoutputstream.c
Changed
@@ -700,7 +700,7 @@ if (g_cancellable_set_error_if_cancelled (cancellable, error)) return NULL; - open_flags = O_BINARY; + open_flags = O_BINARY | O_CLOEXEC; if (readable) open_flags |= O_RDWR; else @@ -737,7 +737,7 @@ mode = mode_from_flags_or_info (flags, reference_info); - open_flags = O_CREAT | O_EXCL | O_BINARY; + open_flags = O_CREAT | O_EXCL | O_BINARY | O_CLOEXEC; if (readable) open_flags |= O_RDWR; else @@ -762,7 +762,7 @@ else mode = 0666; - return output_stream_open (filename, O_CREAT | O_APPEND | O_WRONLY | O_BINARY, mode, + return output_stream_open (filename, O_CREAT | O_APPEND | O_WRONLY | O_BINARY | O_CLOEXEC, mode, cancellable, error); } @@ -865,9 +865,9 @@ /* We only need read access to the original file if we are creating a backup. * We also add O_CREAT to avoid a race if the file was just removed */ if (create_backup || readable) - open_flags = O_RDWR | O_CREAT | O_BINARY; + open_flags = O_RDWR | O_CREAT | O_BINARY | O_CLOEXEC; else - open_flags = O_WRONLY | O_CREAT | O_BINARY; + open_flags = O_WRONLY | O_CREAT | O_BINARY | O_CLOEXEC; /* Some systems have O_NOFOLLOW, which lets us avoid some races * when finding out if the file we opened was a symlink */ @@ -1040,7 +1040,7 @@ tmp_filename = g_build_filename (dirname, ".goutputstream-XXXXXX", NULL); g_free (dirname); - tmpfd = g_mkstemp_full (tmp_filename, (readable ? O_RDWR : O_WRONLY) | O_BINARY, mode); + tmpfd = g_mkstemp_full (tmp_filename, (readable ? O_RDWR : O_WRONLY) | O_BINARY | O_CLOEXEC, mode); if (tmpfd == -1) { g_free (tmp_filename); @@ -1113,7 +1113,7 @@ } bfd = g_open (backup_filename, - O_WRONLY | O_CREAT | O_EXCL | O_BINARY, + O_WRONLY | O_CREAT | O_EXCL | O_BINARY | O_CLOEXEC, _g_stat_mode (&original_stat) & 0777); if (bfd == -1) @@ -1208,9 +1208,9 @@ } if (readable) - open_flags = O_RDWR | O_CREAT | O_BINARY; + open_flags = O_RDWR | O_CREAT | O_BINARY | O_CLOEXEC; else - open_flags = O_WRONLY | O_CREAT | O_BINARY; + open_flags = O_WRONLY | O_CREAT | O_BINARY | O_CLOEXEC; fd = g_open (filename, open_flags, mode); if (fd == -1) {
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gmarshal-internal.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gmarshal-internal.c
Changed
@@ -125,7 +125,7 @@ gpointer arg0; va_list args_copy; - G_VA_COPY (args_copy, args); + va_copy (args_copy, args); arg0 = (gpointer) va_arg (args_copy, gpointer); if (arg0 != NULL) arg0 = g_object_ref (arg0); @@ -216,7 +216,7 @@ guint arg1; va_list args_copy; - G_VA_COPY (args_copy, args); + va_copy (args_copy, args); arg0 = (gpointer) va_arg (args_copy, gpointer); if (arg0 != NULL) arg0 = g_object_ref (arg0); @@ -309,7 +309,7 @@ gpointer arg1; va_list args_copy; - G_VA_COPY (args_copy, args); + va_copy (args_copy, args); arg0 = (gpointer) va_arg (args_copy, gpointer); if (arg0 != NULL) arg0 = g_object_ref (arg0); @@ -406,7 +406,7 @@ gint arg1; va_list args_copy; - G_VA_COPY (args_copy, args); + va_copy (args_copy, args); arg0 = (gpointer) va_arg (args_copy, gpointer); arg1 = (gint) va_arg (args_copy, gint); va_end (args_copy); @@ -494,7 +494,7 @@ g_return_if_fail (return_value != NULL); - G_VA_COPY (args_copy, args); + va_copy (args_copy, args); arg0 = (gpointer) va_arg (args_copy, gpointer); if ((param_types0 & G_SIGNAL_TYPE_STATIC_SCOPE) == 0 && arg0 != NULL) arg0 = g_strdup (arg0); @@ -579,7 +579,7 @@ guint arg0; va_list args_copy; - G_VA_COPY (args_copy, args); + va_copy (args_copy, args); arg0 = (guint) va_arg (args_copy, guint); va_end (args_copy); @@ -737,7 +737,7 @@ gpointer arg0; va_list args_copy; - G_VA_COPY (args_copy, args); + va_copy (args_copy, args); arg0 = (gpointer) va_arg (args_copy, gpointer); if ((param_types0 & G_SIGNAL_TYPE_STATIC_SCOPE) == 0 && arg0 != NULL) arg0 = g_boxed_copy (param_types0 & ~G_SIGNAL_TYPE_STATIC_SCOPE, arg0); @@ -824,7 +824,7 @@ gpointer arg0; va_list args_copy; - G_VA_COPY (args_copy, args); + va_copy (args_copy, args); arg0 = (gpointer) va_arg (args_copy, gpointer); if (arg0 != NULL) arg0 = g_object_ref (arg0); @@ -910,7 +910,7 @@ gpointer arg1; va_list args_copy; - G_VA_COPY (args_copy, args); + va_copy (args_copy, args); arg0 = (gboolean) va_arg (args_copy, gboolean); arg1 = (gpointer) va_arg (args_copy, gpointer); if ((param_types1 & G_SIGNAL_TYPE_STATIC_SCOPE) == 0 && arg1 != NULL) @@ -995,7 +995,7 @@ gpointer arg1; va_list args_copy; - G_VA_COPY (args_copy, args); + va_copy (args_copy, args); arg0 = (gint) va_arg (args_copy, gint); arg1 = (gpointer) va_arg (args_copy, gpointer); if (arg1 != NULL) @@ -1084,7 +1084,7 @@ gpointer arg2; va_list args_copy; - G_VA_COPY (args_copy, args); + va_copy (args_copy, args); arg0 = (gint) va_arg (args_copy, gint); arg1 = (gpointer) va_arg (args_copy, gpointer); if (arg1 != NULL) @@ -1179,7 +1179,7 @@ gint arg2; va_list args_copy; - G_VA_COPY (args_copy, args); + va_copy (args_copy, args); arg0 = (gint) va_arg (args_copy, gint); arg1 = (gint) va_arg (args_copy, gint); arg2 = (gint) va_arg (args_copy, gint); @@ -1263,7 +1263,7 @@ gpointer arg1; va_list args_copy; - G_VA_COPY (args_copy, args); + va_copy (args_copy, args); arg0 = (gpointer) va_arg (args_copy, gpointer); if (arg0 != NULL) arg0 = g_object_ref (arg0); @@ -1356,7 +1356,7 @@ gint arg2; va_list args_copy; - G_VA_COPY (args_copy, args); + va_copy (args_copy, args); arg0 = (gpointer) va_arg (args_copy, gpointer); if (arg0 != NULL) arg0 = g_object_ref (arg0); @@ -1459,7 +1459,7 @@ gpointer arg4; va_list args_copy; - G_VA_COPY (args_copy, args); + va_copy (args_copy, args); arg0 = (gpointer) va_arg (args_copy, gpointer); if (arg0 != NULL) arg0 = g_object_ref (arg0); @@ -1574,7 +1574,7 @@ gpointer arg3; va_list args_copy; - G_VA_COPY (args_copy, args); + va_copy (args_copy, args); arg0 = (gpointer) va_arg (args_copy, gpointer); if (arg0 != NULL) arg0 = g_object_ref (arg0); @@ -1675,7 +1675,7 @@ gpointer arg1; va_list args_copy; - G_VA_COPY (args_copy, args); + va_copy (args_copy, args); arg0 = (gpointer) va_arg (args_copy, gpointer); if (arg0 != NULL) arg0 = g_object_ref (arg0); @@ -1768,7 +1768,7 @@ gpointer arg2; va_list args_copy; - G_VA_COPY (args_copy, args); + va_copy (args_copy, args); arg0 = (gpointer) va_arg (args_copy, gpointer); arg1 = (gint) va_arg (args_copy, gint); arg2 = (gpointer) va_arg (args_copy, gpointer); @@ -1855,7 +1855,7 @@ gboolean arg1; va_list args_copy; - G_VA_COPY (args_copy, args); + va_copy (args_copy, args); arg0 = (gpointer) va_arg (args_copy, gpointer); if ((param_types0 & G_SIGNAL_TYPE_STATIC_SCOPE) == 0 && arg0 != NULL) arg0 = g_strdup (arg0); @@ -1940,7 +1940,7 @@ gpointer arg1; va_list args_copy; - G_VA_COPY (args_copy, args); + va_copy (args_copy, args); arg0 = (gpointer) va_arg (args_copy, gpointer); if ((param_types0 & G_SIGNAL_TYPE_STATIC_SCOPE) == 0 && arg0 != NULL) arg0 = g_strdup (arg0); @@ -2033,7 +2033,7 @@ gpointer arg2; va_list args_copy; - G_VA_COPY (args_copy, args); + va_copy (args_copy, args); arg0 = (gpointer) va_arg (args_copy, gpointer); if ((param_types0 & G_SIGNAL_TYPE_STATIC_SCOPE) == 0 && arg0 != NULL) arg0 = g_strdup (arg0); @@ -2132,7 +2132,7 @@ gint64 arg2; va_list args_copy; - G_VA_COPY (args_copy, args); + va_copy (args_copy, args); arg0 = (gpointer) va_arg (args_copy, gpointer); if ((param_types0 & G_SIGNAL_TYPE_STATIC_SCOPE) == 0 && arg0 != NULL) arg0 = g_strdup (arg0); @@ -2227,7 +2227,7 @@ guint arg3; va_list args_copy; - G_VA_COPY (args_copy, args); + va_copy (args_copy, args); arg0 = (gpointer) va_arg (args_copy, gpointer); if ((param_types0 & G_SIGNAL_TYPE_STATIC_SCOPE) == 0 && arg0 != NULL) arg0 = g_strdup (arg0); @@ -2328,7 +2328,7 @@ gpointer arg2; va_list args_copy; - G_VA_COPY (args_copy, args); + va_copy (args_copy, args); arg0 = (gpointer) va_arg (args_copy, gpointer); if ((param_types0 & G_SIGNAL_TYPE_STATIC_SCOPE) == 0 && arg0 != NULL) arg0 = g_strdup (arg0); @@ -2423,7 +2423,7 @@ gpointer arg1; va_list args_copy; - G_VA_COPY (args_copy, args); + va_copy (args_copy, args); arg0 = (gpointer) va_arg (args_copy, gpointer); if ((param_types0 & G_SIGNAL_TYPE_STATIC_SCOPE) == 0 && arg0 != NULL) arg0 = g_strdup (arg0); @@ -2516,7 +2516,7 @@ guint arg2; va_list args_copy; - G_VA_COPY (args_copy, args); + va_copy (args_copy, args); arg0 = (guint) va_arg (args_copy, guint); arg1 = (guint) va_arg (args_copy, guint); arg2 = (guint) va_arg (args_copy, guint); @@ -2600,7 +2600,7 @@ gpointer arg1; va_list args_copy; - G_VA_COPY (args_copy, args); + va_copy (args_copy, args); arg0 = (gpointer) va_arg (args_copy, gpointer); if ((param_types0 & G_SIGNAL_TYPE_STATIC_SCOPE) == 0 && arg0 != NULL) arg0 = g_variant_ref_sink (arg0);
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gmemoryinputstream.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gmemoryinputstream.h
Changed
@@ -67,23 +67,23 @@ }; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GType g_memory_input_stream_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GInputStream * g_memory_input_stream_new (void); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GInputStream * g_memory_input_stream_new_from_data (const void *data, gssize len, GDestroyNotify destroy); -GLIB_AVAILABLE_IN_2_34 +GIO_AVAILABLE_IN_2_34 GInputStream * g_memory_input_stream_new_from_bytes (GBytes *bytes); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_memory_input_stream_add_data (GMemoryInputStream *stream, const void *data, gssize len, GDestroyNotify destroy); -GLIB_AVAILABLE_IN_2_34 +GIO_AVAILABLE_IN_2_34 void g_memory_input_stream_add_bytes (GMemoryInputStream *stream, GBytes *bytes);
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gmemorymonitor.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gmemorymonitor.h
Changed
@@ -40,7 +40,7 @@ #define G_MEMORY_MONITOR_EXTENSION_POINT_NAME "gio-memory-monitor" #define G_TYPE_MEMORY_MONITOR (g_memory_monitor_get_type ()) -GLIB_AVAILABLE_IN_2_64 +GIO_AVAILABLE_IN_2_64 G_DECLARE_INTERFACE(GMemoryMonitor, g_memory_monitor, g, memory_monitor, GObject) #define G_MEMORY_MONITOR(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_MEMORY_MONITOR, GMemoryMonitor)) @@ -56,7 +56,7 @@ GMemoryMonitorWarningLevel level); }; -GLIB_AVAILABLE_IN_2_64 +GIO_AVAILABLE_IN_2_64 GMemoryMonitor *g_memory_monitor_dup_default (void); G_END_DECLS
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gmemoryoutputstream.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gmemoryoutputstream.h
Changed
@@ -82,26 +82,26 @@ typedef gpointer (* GReallocFunc) (gpointer data, gsize size); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GType g_memory_output_stream_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GOutputStream *g_memory_output_stream_new (gpointer data, gsize size, GReallocFunc realloc_function, GDestroyNotify destroy_function); -GLIB_AVAILABLE_IN_2_36 +GIO_AVAILABLE_IN_2_36 GOutputStream *g_memory_output_stream_new_resizable (void); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gpointer g_memory_output_stream_get_data (GMemoryOutputStream *ostream); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gsize g_memory_output_stream_get_size (GMemoryOutputStream *ostream); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gsize g_memory_output_stream_get_data_size (GMemoryOutputStream *ostream); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gpointer g_memory_output_stream_steal_data (GMemoryOutputStream *ostream); -GLIB_AVAILABLE_IN_2_34 +GIO_AVAILABLE_IN_2_34 GBytes * g_memory_output_stream_steal_as_bytes (GMemoryOutputStream *ostream); G_END_DECLS
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gmenu.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gmenu.h
Changed
@@ -41,141 +41,141 @@ typedef struct _GMenuItem GMenuItem; typedef struct _GMenu GMenu; -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 GType g_menu_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 GMenu * g_menu_new (void); -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 void g_menu_freeze (GMenu *menu); -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 void g_menu_insert_item (GMenu *menu, gint position, GMenuItem *item); -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 void g_menu_prepend_item (GMenu *menu, GMenuItem *item); -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 void g_menu_append_item (GMenu *menu, GMenuItem *item); -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 void g_menu_remove (GMenu *menu, gint position); -GLIB_AVAILABLE_IN_2_38 +GIO_AVAILABLE_IN_2_38 void g_menu_remove_all (GMenu *menu); -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 void g_menu_insert (GMenu *menu, gint position, const gchar *label, const gchar *detailed_action); -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 void g_menu_prepend (GMenu *menu, const gchar *label, const gchar *detailed_action); -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 void g_menu_append (GMenu *menu, const gchar *label, const gchar *detailed_action); -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 void g_menu_insert_section (GMenu *menu, gint position, const gchar *label, GMenuModel *section); -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 void g_menu_prepend_section (GMenu *menu, const gchar *label, GMenuModel *section); -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 void g_menu_append_section (GMenu *menu, const gchar *label, GMenuModel *section); -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 void g_menu_insert_submenu (GMenu *menu, gint position, const gchar *label, GMenuModel *submenu); -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 void g_menu_prepend_submenu (GMenu *menu, const gchar *label, GMenuModel *submenu); -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 void g_menu_append_submenu (GMenu *menu, const gchar *label, GMenuModel *submenu); -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 GType g_menu_item_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 GMenuItem * g_menu_item_new (const gchar *label, const gchar *detailed_action); -GLIB_AVAILABLE_IN_2_34 +GIO_AVAILABLE_IN_2_34 GMenuItem * g_menu_item_new_from_model (GMenuModel *model, gint item_index); -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 GMenuItem * g_menu_item_new_submenu (const gchar *label, GMenuModel *submenu); -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 GMenuItem * g_menu_item_new_section (const gchar *label, GMenuModel *section); -GLIB_AVAILABLE_IN_2_34 +GIO_AVAILABLE_IN_2_34 GVariant * g_menu_item_get_attribute_value (GMenuItem *menu_item, const gchar *attribute, const GVariantType *expected_type); -GLIB_AVAILABLE_IN_2_34 +GIO_AVAILABLE_IN_2_34 gboolean g_menu_item_get_attribute (GMenuItem *menu_item, const gchar *attribute, const gchar *format_string, ...); -GLIB_AVAILABLE_IN_2_34 +GIO_AVAILABLE_IN_2_34 GMenuModel *g_menu_item_get_link (GMenuItem *menu_item, const gchar *link); -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 void g_menu_item_set_attribute_value (GMenuItem *menu_item, const gchar *attribute, GVariant *value); -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 void g_menu_item_set_attribute (GMenuItem *menu_item, const gchar *attribute, const gchar *format_string, ...); -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 void g_menu_item_set_link (GMenuItem *menu_item, const gchar *link, GMenuModel *model); -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 void g_menu_item_set_label (GMenuItem *menu_item, const gchar *label); -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 void g_menu_item_set_submenu (GMenuItem *menu_item, GMenuModel *submenu); -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 void g_menu_item_set_section (GMenuItem *menu_item, GMenuModel *section); -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 void g_menu_item_set_action_and_target_value (GMenuItem *menu_item, const gchar *action, GVariant *target_value); -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 void g_menu_item_set_action_and_target (GMenuItem *menu_item, const gchar *action, const gchar *format_string, ...); -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 void g_menu_item_set_detailed_action (GMenuItem *menu_item, const gchar *detailed_action); -GLIB_AVAILABLE_IN_2_38 +GIO_AVAILABLE_IN_2_38 void g_menu_item_set_icon (GMenuItem *menu_item, GIcon *icon);
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gmenuexporter.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gmenuexporter.c
Changed
@@ -28,18 +28,6 @@ #include "gdbusnamewatching.h" #include "gdbuserror.h" -/* - * G_MENU_EXPORTER_MAX_SECTION_SIZE: - * - * The maximum number of entries in a menu section supported by - * g_dbus_connection_export_menu_model(). - * - * The exact value of the limit may change in future GLib versions. - * - * Since: 2.76 - */ -#define G_MENU_EXPORTER_MAX_SECTION_SIZE 1000 - /** * SECTION:gmenuexporter * @title: GMenuModel exporter @@ -264,12 +252,16 @@ GMenuExporterMenu *menu = user_data; GSequenceIter *point; gint i; +#ifndef G_DISABLE_ASSERT gint n_items; +#endif g_assert (menu->model == model); g_assert (menu->item_links != NULL); +#ifndef G_DISABLE_ASSERT n_items = g_sequence_get_length (menu->item_links); +#endif g_assert (position >= 0 && position < G_MENU_EXPORTER_MAX_SECTION_SIZE); g_assert (removed >= 0 && removed < G_MENU_EXPORTER_MAX_SECTION_SIZE); g_assert (added < G_MENU_EXPORTER_MAX_SECTION_SIZE); @@ -790,7 +782,7 @@ * returned (with @error set accordingly). * * Exporting menus with sections containing more than - * 1000 items is not supported and results in + * %G_MENU_EXPORTER_MAX_SECTION_SIZE items is not supported and results in * undefined behavior. * * You can unexport the menu model using
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gmenuexporter.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gmenuexporter.h
Changed
@@ -27,13 +27,26 @@ G_BEGIN_DECLS -GLIB_AVAILABLE_IN_2_32 +/** + * G_MENU_EXPORTER_MAX_SECTION_SIZE: + * + * The maximum number of entries in a menu section supported by + * g_dbus_connection_export_menu_model(). + * + * The exact value of the limit may change in future GLib versions. + * + * Since: 2.76 + */ +#define G_MENU_EXPORTER_MAX_SECTION_SIZE 1000 \ + GIO_AVAILABLE_MACRO_IN_2_76 + +GIO_AVAILABLE_IN_2_32 guint g_dbus_connection_export_menu_model (GDBusConnection *connection, const gchar *object_path, GMenuModel *menu, GError **error); -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 void g_dbus_connection_unexport_menu_model (GDBusConnection *connection, guint export_id);
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gmenumodel.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gmenumodel.h
Changed
@@ -182,37 +182,37 @@ const gchar *link); }; -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 GType g_menu_model_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 gboolean g_menu_model_is_mutable (GMenuModel *model); -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 gint g_menu_model_get_n_items (GMenuModel *model); -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 GMenuAttributeIter * g_menu_model_iterate_item_attributes (GMenuModel *model, gint item_index); -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 GVariant * g_menu_model_get_item_attribute_value (GMenuModel *model, gint item_index, const gchar *attribute, const GVariantType *expected_type); -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 gboolean g_menu_model_get_item_attribute (GMenuModel *model, gint item_index, const gchar *attribute, const gchar *format_string, ...); -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 GMenuLinkIter * g_menu_model_iterate_item_links (GMenuModel *model, gint item_index); -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 GMenuModel * g_menu_model_get_item_link (GMenuModel *model, gint item_index, const gchar *link); -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 void g_menu_model_items_changed (GMenuModel *model, gint position, gint removed, @@ -246,18 +246,18 @@ GVariant **value); }; -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 GType g_menu_attribute_iter_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 gboolean g_menu_attribute_iter_get_next (GMenuAttributeIter *iter, const gchar **out_name, GVariant **value); -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 gboolean g_menu_attribute_iter_next (GMenuAttributeIter *iter); -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 const gchar * g_menu_attribute_iter_get_name (GMenuAttributeIter *iter); -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 GVariant * g_menu_attribute_iter_get_value (GMenuAttributeIter *iter); @@ -288,18 +288,18 @@ GMenuModel **value); }; -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 GType g_menu_link_iter_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 gboolean g_menu_link_iter_get_next (GMenuLinkIter *iter, const gchar **out_link, GMenuModel **value); -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 gboolean g_menu_link_iter_next (GMenuLinkIter *iter); -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 const gchar * g_menu_link_iter_get_name (GMenuLinkIter *iter); -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 GMenuModel * g_menu_link_iter_get_value (GMenuLinkIter *iter); G_END_DECLS
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gmount.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gmount.h
Changed
@@ -163,114 +163,114 @@ GIcon * (* get_symbolic_icon) (GMount *mount); }; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GType g_mount_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GFile * g_mount_get_root (GMount *mount); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GFile * g_mount_get_default_location (GMount *mount); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL char * g_mount_get_name (GMount *mount); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GIcon * g_mount_get_icon (GMount *mount); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GIcon * g_mount_get_symbolic_icon (GMount *mount); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL char * g_mount_get_uuid (GMount *mount); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GVolume * g_mount_get_volume (GMount *mount); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GDrive * g_mount_get_drive (GMount *mount); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_mount_can_unmount (GMount *mount); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_mount_can_eject (GMount *mount); -GLIB_DEPRECATED_FOR(g_mount_unmount_with_operation) +GIO_DEPRECATED_FOR(g_mount_unmount_with_operation) void g_mount_unmount (GMount *mount, GMountUnmountFlags flags, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); -GLIB_DEPRECATED_FOR(g_mount_unmount_with_operation_finish) +GIO_DEPRECATED_FOR(g_mount_unmount_with_operation_finish) gboolean g_mount_unmount_finish (GMount *mount, GAsyncResult *result, GError **error); -GLIB_DEPRECATED_FOR(g_mount_eject_with_operation) +GIO_DEPRECATED_FOR(g_mount_eject_with_operation) void g_mount_eject (GMount *mount, GMountUnmountFlags flags, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); -GLIB_DEPRECATED_FOR(g_mount_eject_with_operation_finish) +GIO_DEPRECATED_FOR(g_mount_eject_with_operation_finish) gboolean g_mount_eject_finish (GMount *mount, GAsyncResult *result, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_mount_remount (GMount *mount, GMountMountFlags flags, GMountOperation *mount_operation, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_mount_remount_finish (GMount *mount, GAsyncResult *result, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_mount_guess_content_type (GMount *mount, gboolean force_rescan, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gchar ** g_mount_guess_content_type_finish (GMount *mount, GAsyncResult *result, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gchar ** g_mount_guess_content_type_sync (GMount *mount, gboolean force_rescan, GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_mount_is_shadowed (GMount *mount); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_mount_shadow (GMount *mount); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_mount_unshadow (GMount *mount); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_mount_unmount_with_operation (GMount *mount, GMountUnmountFlags flags, GMountOperation *mount_operation, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_mount_unmount_with_operation_finish (GMount *mount, GAsyncResult *result, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_mount_eject_with_operation (GMount *mount, GMountUnmountFlags flags, GMountOperation *mount_operation, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_mount_eject_with_operation_finish (GMount *mount, GAsyncResult *result, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL const gchar *g_mount_get_sort_key (GMount *mount); G_END_DECLS
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gmountoperation.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gmountoperation.h
Changed
@@ -120,57 +120,57 @@ void (*_g_reserved9) (void); }; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GType g_mount_operation_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GMountOperation * g_mount_operation_new (void); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL const char * g_mount_operation_get_username (GMountOperation *op); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_mount_operation_set_username (GMountOperation *op, const char *username); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL const char * g_mount_operation_get_password (GMountOperation *op); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_mount_operation_set_password (GMountOperation *op, const char *password); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_mount_operation_get_anonymous (GMountOperation *op); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_mount_operation_set_anonymous (GMountOperation *op, gboolean anonymous); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL const char * g_mount_operation_get_domain (GMountOperation *op); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_mount_operation_set_domain (GMountOperation *op, const char *domain); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GPasswordSave g_mount_operation_get_password_save (GMountOperation *op); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_mount_operation_set_password_save (GMountOperation *op, GPasswordSave save); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL int g_mount_operation_get_choice (GMountOperation *op); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_mount_operation_set_choice (GMountOperation *op, int choice); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_mount_operation_reply (GMountOperation *op, GMountOperationResult result); -GLIB_AVAILABLE_IN_2_58 +GIO_AVAILABLE_IN_2_58 gboolean g_mount_operation_get_is_tcrypt_hidden_volume (GMountOperation *op); -GLIB_AVAILABLE_IN_2_58 +GIO_AVAILABLE_IN_2_58 void g_mount_operation_set_is_tcrypt_hidden_volume (GMountOperation *op, gboolean hidden_volume); -GLIB_AVAILABLE_IN_2_58 +GIO_AVAILABLE_IN_2_58 gboolean g_mount_operation_get_is_tcrypt_system_volume (GMountOperation *op); -GLIB_AVAILABLE_IN_2_58 +GIO_AVAILABLE_IN_2_58 void g_mount_operation_set_is_tcrypt_system_volume (GMountOperation *op, gboolean system_volume); -GLIB_AVAILABLE_IN_2_58 +GIO_AVAILABLE_IN_2_58 guint g_mount_operation_get_pim (GMountOperation *op); -GLIB_AVAILABLE_IN_2_58 +GIO_AVAILABLE_IN_2_58 void g_mount_operation_set_pim (GMountOperation *op, guint pim);
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gnativesocketaddress.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gnativesocketaddress.h
Changed
@@ -55,10 +55,10 @@ GSocketAddressClass parent_class; }; -GLIB_AVAILABLE_IN_2_46 +GIO_AVAILABLE_IN_2_46 GType g_native_socket_address_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_2_46 +GIO_AVAILABLE_IN_2_46 GSocketAddress *g_native_socket_address_new (gpointer native, gsize len);
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gnativevolumemonitor.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gnativevolumemonitor.h
Changed
@@ -55,7 +55,7 @@ GCancellable *cancellable); }; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GType g_native_volume_monitor_get_type (void) G_GNUC_CONST; G_END_DECLS
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gnetworkaddress.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gnetworkaddress.h
Changed
@@ -53,27 +53,27 @@ }; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GType g_network_address_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GSocketConnectable *g_network_address_new (const gchar *hostname, guint16 port); -GLIB_AVAILABLE_IN_2_44 +GIO_AVAILABLE_IN_2_44 GSocketConnectable *g_network_address_new_loopback (guint16 port); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GSocketConnectable *g_network_address_parse (const gchar *host_and_port, guint16 default_port, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GSocketConnectable *g_network_address_parse_uri (const gchar *uri, guint16 default_port, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL const gchar *g_network_address_get_hostname (GNetworkAddress *addr); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL guint16 g_network_address_get_port (GNetworkAddress *addr); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL const gchar *g_network_address_get_scheme (GNetworkAddress *addr);
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gnetworking.h.in -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gnetworking.h.in
Changed
@@ -22,6 +22,7 @@ #define __G_NETWORKING_H__ #include <glib.h> +#include <gio/gio-visibility.h> #ifdef G_OS_WIN32 #include <winsock2.h> @@ -72,7 +73,7 @@ G_BEGIN_DECLS -GLIB_AVAILABLE_IN_2_36 +GIO_AVAILABLE_IN_2_36 void g_networking_init (void); G_END_DECLS
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gnetworkmonitor.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gnetworkmonitor.h
Changed
@@ -66,32 +66,32 @@ GError **error); }; -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 GType g_network_monitor_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 GNetworkMonitor *g_network_monitor_get_default (void); -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 gboolean g_network_monitor_get_network_available (GNetworkMonitor *monitor); -GLIB_AVAILABLE_IN_2_46 +GIO_AVAILABLE_IN_2_46 gboolean g_network_monitor_get_network_metered (GNetworkMonitor *monitor); -GLIB_AVAILABLE_IN_2_44 +GIO_AVAILABLE_IN_2_44 GNetworkConnectivity g_network_monitor_get_connectivity (GNetworkMonitor *monitor); -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 gboolean g_network_monitor_can_reach (GNetworkMonitor *monitor, GSocketConnectable *connectable, GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 void g_network_monitor_can_reach_async (GNetworkMonitor *monitor, GSocketConnectable *connectable, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 gboolean g_network_monitor_can_reach_finish (GNetworkMonitor *monitor, GAsyncResult *result, GError **error);
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gnetworkmonitorbase.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gnetworkmonitorbase.h
Changed
@@ -50,17 +50,17 @@ gpointer padding8; }; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GType g_network_monitor_base_get_type (void); /*< protected >*/ -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 void g_network_monitor_base_add_network (GNetworkMonitorBase *monitor, GInetAddressMask *network); -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 void g_network_monitor_base_remove_network (GNetworkMonitorBase *monitor, GInetAddressMask *network); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_network_monitor_base_set_networks (GNetworkMonitorBase *monitor, GInetAddressMask **networks, gint length);
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gnetworkservice.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gnetworkservice.h
Changed
@@ -53,23 +53,23 @@ }; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GType g_network_service_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GSocketConnectable *g_network_service_new (const gchar *service, const gchar *protocol, const gchar *domain); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL const gchar *g_network_service_get_service (GNetworkService *srv); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL const gchar *g_network_service_get_protocol (GNetworkService *srv); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL const gchar *g_network_service_get_domain (GNetworkService *srv); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL const gchar *g_network_service_get_scheme (GNetworkService *srv); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_network_service_set_scheme (GNetworkService *srv, const gchar *scheme); G_END_DECLS
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gnotification.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gnotification.c
Changed
@@ -102,7 +102,7 @@ gchar *category; GPtrArray *buttons; gchar *default_action; - GVariant *default_action_target; + GVariant *default_action_target; /* (nullable) (owned), not floating */ }; typedef struct @@ -355,11 +355,11 @@ * g_notification_get_category: * @notification: a #GNotification * - * Gets the cateogry of @notification. + * Gets the category of @notification. * * This will be %NULL if no category is set. * - * Returns: (nullable): the cateogry of @notification + * Returns: (nullable): the category of @notification * * Since: 2.70 */ @@ -615,11 +615,17 @@ /*< private > * g_notification_get_default_action: * @notification: a #GNotification - * @action: (nullable): return location for the default action - * @target: (nullable): return location for the target of the default action + * @action: (out) (optional) (nullable) (transfer full): return location for the + * default action, or %NULL if unset + * @target: (out) (optional) (nullable) (transfer full): return location for the + * target of the default action, or %NULL if unset * * Gets the action and target for the default action of @notification. * + * If this function returns %TRUE, @action is guaranteed to be set to a non-%NULL + * value (if a pointer is passed to @action). @target may still return a %NULL + * value, as the default action may have no target. + * * Returns: %TRUE if @notification has a default action */ gboolean @@ -736,7 +742,7 @@ * application-wide action (start with "app."). * * If @target is non-%NULL, @action will be activated with @target as - * its parameter. + * its parameter. If @target is floating, it will be consumed. * * When no default action is set, the application that the notification * was sent on is activated.
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gnotification.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gnotification.h
Changed
@@ -35,65 +35,65 @@ #define G_NOTIFICATION(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_NOTIFICATION, GNotification)) #define G_IS_NOTIFICATION(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_NOTIFICATION)) -GLIB_AVAILABLE_IN_2_40 +GIO_AVAILABLE_IN_2_40 GType g_notification_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_2_40 +GIO_AVAILABLE_IN_2_40 GNotification * g_notification_new (const gchar *title); -GLIB_AVAILABLE_IN_2_40 +GIO_AVAILABLE_IN_2_40 void g_notification_set_title (GNotification *notification, const gchar *title); -GLIB_AVAILABLE_IN_2_40 +GIO_AVAILABLE_IN_2_40 void g_notification_set_body (GNotification *notification, const gchar *body); -GLIB_AVAILABLE_IN_2_40 +GIO_AVAILABLE_IN_2_40 void g_notification_set_icon (GNotification *notification, GIcon *icon); -GLIB_DEPRECATED_IN_2_42_FOR(g_notification_set_priority) +GIO_DEPRECATED_IN_2_42_FOR(g_notification_set_priority) void g_notification_set_urgent (GNotification *notification, gboolean urgent); -GLIB_AVAILABLE_IN_2_42 +GIO_AVAILABLE_IN_2_42 void g_notification_set_priority (GNotification *notification, GNotificationPriority priority); -GLIB_AVAILABLE_IN_2_70 +GIO_AVAILABLE_IN_2_70 void g_notification_set_category (GNotification *notification, const gchar *category); -GLIB_AVAILABLE_IN_2_40 +GIO_AVAILABLE_IN_2_40 void g_notification_add_button (GNotification *notification, const gchar *label, const gchar *detailed_action); -GLIB_AVAILABLE_IN_2_40 +GIO_AVAILABLE_IN_2_40 void g_notification_add_button_with_target (GNotification *notification, const gchar *label, const gchar *action, const gchar *target_format, ...); -GLIB_AVAILABLE_IN_2_40 +GIO_AVAILABLE_IN_2_40 void g_notification_add_button_with_target_value (GNotification *notification, const gchar *label, const gchar *action, GVariant *target); -GLIB_AVAILABLE_IN_2_40 +GIO_AVAILABLE_IN_2_40 void g_notification_set_default_action (GNotification *notification, const gchar *detailed_action); -GLIB_AVAILABLE_IN_2_40 +GIO_AVAILABLE_IN_2_40 void g_notification_set_default_action_and_target (GNotification *notification, const gchar *action, const gchar *target_format, ...); -GLIB_AVAILABLE_IN_2_40 +GIO_AVAILABLE_IN_2_40 void g_notification_set_default_action_and_target_value (GNotification *notification, const gchar *action, GVariant *target);
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gosxappinfo.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gosxappinfo.h
Changed
@@ -41,13 +41,13 @@ GObjectClass parent_class; }; -GLIB_AVAILABLE_IN_2_52 +GIO_AVAILABLE_IN_2_52 GType g_osx_app_info_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_2_52 +GIO_AVAILABLE_IN_2_52 const char *g_osx_app_info_get_filename (GOsxAppInfo *info); -GLIB_AVAILABLE_IN_2_52 +GIO_AVAILABLE_IN_2_52 GList * g_osx_app_info_get_all_for_scheme (const gchar *scheme); G_END_DECLS
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gosxcontenttype.m -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gosxcontenttype.m
Changed
@@ -419,6 +419,12 @@ if (strcmp (mime_type, "text/plain") == 0) return g_strdup ("public.text"); + /* I don’t know of an appropriate equivalent for application/x-zerosize, but + * historically GLib has returned public.text for zero-sized files, so let’s + * continue doing that. */ + if (strcmp (mime_type, "application/x-zerosize") == 0) + return g_strdup ("public.text"); + /* Non standard type */ if (strcmp (mime_type, "application/x-executable") == 0) return g_strdup ("public.executable");
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/goutputstream.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/goutputstream.h
Changed
@@ -150,16 +150,16 @@ void (*_g_reserved8) (void); }; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GType g_output_stream_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gssize g_output_stream_write (GOutputStream *stream, const void *buffer, gsize count, GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_output_stream_write_all (GOutputStream *stream, const void *buffer, gsize count, @@ -167,14 +167,14 @@ GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_2_60 +GIO_AVAILABLE_IN_2_60 gboolean g_output_stream_writev (GOutputStream *stream, const GOutputVector *vectors, gsize n_vectors, gsize *bytes_written, GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_2_60 +GIO_AVAILABLE_IN_2_60 gboolean g_output_stream_writev_all (GOutputStream *stream, GOutputVector *vectors, gsize n_vectors, @@ -182,40 +182,40 @@ GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_2_40 +GIO_AVAILABLE_IN_2_40 gboolean g_output_stream_printf (GOutputStream *stream, gsize *bytes_written, GCancellable *cancellable, GError **error, const gchar *format, ...) G_GNUC_PRINTF (5, 6); -GLIB_AVAILABLE_IN_2_40 +GIO_AVAILABLE_IN_2_40 gboolean g_output_stream_vprintf (GOutputStream *stream, gsize *bytes_written, GCancellable *cancellable, GError **error, const gchar *format, va_list args) G_GNUC_PRINTF (5, 0); -GLIB_AVAILABLE_IN_2_34 +GIO_AVAILABLE_IN_2_34 gssize g_output_stream_write_bytes (GOutputStream *stream, GBytes *bytes, GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gssize g_output_stream_splice (GOutputStream *stream, GInputStream *source, GOutputStreamSpliceFlags flags, GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_output_stream_flush (GOutputStream *stream, GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_output_stream_close (GOutputStream *stream, GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_output_stream_write_async (GOutputStream *stream, const void *buffer, gsize count, @@ -223,12 +223,12 @@ GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gssize g_output_stream_write_finish (GOutputStream *stream, GAsyncResult *result, GError **error); -GLIB_AVAILABLE_IN_2_44 +GIO_AVAILABLE_IN_2_44 void g_output_stream_write_all_async (GOutputStream *stream, const void *buffer, gsize count, @@ -237,13 +237,13 @@ GAsyncReadyCallback callback, gpointer user_data); -GLIB_AVAILABLE_IN_2_44 +GIO_AVAILABLE_IN_2_44 gboolean g_output_stream_write_all_finish (GOutputStream *stream, GAsyncResult *result, gsize *bytes_written, GError **error); -GLIB_AVAILABLE_IN_2_60 +GIO_AVAILABLE_IN_2_60 void g_output_stream_writev_async (GOutputStream *stream, const GOutputVector *vectors, gsize n_vectors, @@ -251,13 +251,13 @@ GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); -GLIB_AVAILABLE_IN_2_60 +GIO_AVAILABLE_IN_2_60 gboolean g_output_stream_writev_finish (GOutputStream *stream, GAsyncResult *result, gsize *bytes_written, GError **error); -GLIB_AVAILABLE_IN_2_60 +GIO_AVAILABLE_IN_2_60 void g_output_stream_writev_all_async (GOutputStream *stream, GOutputVector *vectors, gsize n_vectors, @@ -266,24 +266,24 @@ GAsyncReadyCallback callback, gpointer user_data); -GLIB_AVAILABLE_IN_2_60 +GIO_AVAILABLE_IN_2_60 gboolean g_output_stream_writev_all_finish (GOutputStream *stream, GAsyncResult *result, gsize *bytes_written, GError **error); -GLIB_AVAILABLE_IN_2_34 +GIO_AVAILABLE_IN_2_34 void g_output_stream_write_bytes_async (GOutputStream *stream, GBytes *bytes, int io_priority, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); -GLIB_AVAILABLE_IN_2_34 +GIO_AVAILABLE_IN_2_34 gssize g_output_stream_write_bytes_finish (GOutputStream *stream, GAsyncResult *result, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_output_stream_splice_async (GOutputStream *stream, GInputStream *source, GOutputStreamSpliceFlags flags, @@ -291,41 +291,41 @@ GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gssize g_output_stream_splice_finish (GOutputStream *stream, GAsyncResult *result, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_output_stream_flush_async (GOutputStream *stream, int io_priority, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_output_stream_flush_finish (GOutputStream *stream, GAsyncResult *result, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_output_stream_close_async (GOutputStream *stream, int io_priority, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_output_stream_close_finish (GOutputStream *stream, GAsyncResult *result, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_output_stream_is_closed (GOutputStream *stream); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_output_stream_is_closing (GOutputStream *stream); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_output_stream_has_pending (GOutputStream *stream); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_output_stream_set_pending (GOutputStream *stream, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_output_stream_clear_pending (GOutputStream *stream);
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gpermission.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gpermission.h
Changed
@@ -81,44 +81,44 @@ gpointer reserved16; }; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GType g_permission_get_type (void); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_permission_acquire (GPermission *permission, GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_permission_acquire_async (GPermission *permission, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_permission_acquire_finish (GPermission *permission, GAsyncResult *result, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_permission_release (GPermission *permission, GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_permission_release_async (GPermission *permission, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_permission_release_finish (GPermission *permission, GAsyncResult *result, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_permission_get_allowed (GPermission *permission); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_permission_get_can_acquire (GPermission *permission); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_permission_get_can_release (GPermission *permission); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_permission_impl_update (GPermission *permission, gboolean allowed, gboolean can_acquire,
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gpollableinputstream.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gpollableinputstream.c
Changed
@@ -37,6 +37,11 @@ * interfacing with a non-GIO API that expects * UNIX-file-descriptor-style asynchronous I/O rather than GIO-style. * + * Some classes may implement #GPollableInputStream but have only certain + * instances of that class be pollable. If g_pollable_input_stream_can_poll() + * returns %FALSE, then the behavior of other #GPollableInputStream methods is + * undefined. + * * Since: 2.28 */ @@ -98,6 +103,9 @@ * g_pollable_input_stream_read_nonblocking(), which will return a * %G_IO_ERROR_WOULD_BLOCK error rather than blocking. * + * The behaviour of this method is undefined if + * g_pollable_input_stream_can_poll() returns %FALSE for @stream. + * * Returns: %TRUE if @stream is readable, %FALSE if not. If an error * has occurred on @stream, this will result in * g_pollable_input_stream_is_readable() returning %TRUE, and the @@ -127,6 +135,9 @@ * triggers, so you should use g_pollable_input_stream_read_nonblocking() * rather than g_input_stream_read() from the callback. * + * The behaviour of this method is undefined if + * g_pollable_input_stream_can_poll() returns %FALSE for @stream. + * * Returns: (transfer full): a new #GSource * * Since: 2.28 @@ -179,6 +190,9 @@ * may happen if you call this method after a source triggers due * to having been cancelled. * + * The behaviour of this method is undefined if + * g_pollable_input_stream_can_poll() returns %FALSE for @stream. + * * Virtual: read_nonblocking * Returns: the number of bytes read, or -1 on error (including * %G_IO_ERROR_WOULD_BLOCK).
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gpollableinputstream.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gpollableinputstream.h
Changed
@@ -81,19 +81,19 @@ GError **error); }; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GType g_pollable_input_stream_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_pollable_input_stream_can_poll (GPollableInputStream *stream); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_pollable_input_stream_is_readable (GPollableInputStream *stream); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GSource *g_pollable_input_stream_create_source (GPollableInputStream *stream, GCancellable *cancellable); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gssize g_pollable_input_stream_read_nonblocking (GPollableInputStream *stream, void *buffer, gsize count,
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gpollableoutputstream.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gpollableoutputstream.c
Changed
@@ -38,6 +38,11 @@ * interfacing with a non-GIO API that expects * UNIX-file-descriptor-style asynchronous I/O rather than GIO-style. * + * Some classes may implement #GPollableOutputStream but have only certain + * instances of that class be pollable. If g_pollable_output_stream_can_poll() + * returns %FALSE, then the behavior of other #GPollableOutputStream methods is + * undefined. + * * Since: 2.28 */ @@ -105,6 +110,9 @@ * g_pollable_output_stream_write_nonblocking(), which will return a * %G_IO_ERROR_WOULD_BLOCK error rather than blocking. * + * The behaviour of this method is undefined if + * g_pollable_output_stream_can_poll() returns %FALSE for @stream. + * * Returns: %TRUE if @stream is writable, %FALSE if not. If an error * has occurred on @stream, this will result in * g_pollable_output_stream_is_writable() returning %TRUE, and the @@ -134,6 +142,9 @@ * triggers, so you should use g_pollable_output_stream_write_nonblocking() * rather than g_output_stream_write() from the callback. * + * The behaviour of this method is undefined if + * g_pollable_output_stream_can_poll() returns %FALSE for @stream. + * * Returns: (transfer full): a new #GSource * * Since: 2.28 @@ -251,6 +262,9 @@ * transports like D/TLS require that you re-send the same @buffer and * @count in the next write call. * + * The behaviour of this method is undefined if + * g_pollable_output_stream_can_poll() returns %FALSE for @stream. + * * Virtual: write_nonblocking * Returns: the number of bytes written, or -1 on error (including * %G_IO_ERROR_WOULD_BLOCK). @@ -319,6 +333,9 @@ * transports like D/TLS require that you re-send the same @vectors and * @n_vectors in the next write call. * + * The behaviour of this method is undefined if + * g_pollable_output_stream_can_poll() returns %FALSE for @stream. + * * Virtual: writev_nonblocking * * Returns: %@G_POLLABLE_RETURN_OK on success, %G_POLLABLE_RETURN_WOULD_BLOCK
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gpollableoutputstream.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gpollableoutputstream.h
Changed
@@ -94,26 +94,26 @@ GError **error); }; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GType g_pollable_output_stream_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_pollable_output_stream_can_poll (GPollableOutputStream *stream); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_pollable_output_stream_is_writable (GPollableOutputStream *stream); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GSource *g_pollable_output_stream_create_source (GPollableOutputStream *stream, GCancellable *cancellable); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gssize g_pollable_output_stream_write_nonblocking (GPollableOutputStream *stream, const void *buffer, gsize count, GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_2_60 +GIO_AVAILABLE_IN_2_60 GPollableReturn g_pollable_output_stream_writev_nonblocking (GPollableOutputStream *stream, const GOutputVector *vectors, gsize n_vectors,
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gpollableutils.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gpollableutils.h
Changed
@@ -29,15 +29,15 @@ G_BEGIN_DECLS -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GSource *g_pollable_source_new (GObject *pollable_stream); -GLIB_AVAILABLE_IN_2_34 +GIO_AVAILABLE_IN_2_34 GSource *g_pollable_source_new_full (gpointer pollable_stream, GSource *child_source, GCancellable *cancellable); -GLIB_AVAILABLE_IN_2_34 +GIO_AVAILABLE_IN_2_34 gssize g_pollable_stream_read (GInputStream *stream, void *buffer, gsize count, @@ -45,14 +45,14 @@ GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_2_34 +GIO_AVAILABLE_IN_2_34 gssize g_pollable_stream_write (GOutputStream *stream, const void *buffer, gsize count, gboolean blocking, GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_2_34 +GIO_AVAILABLE_IN_2_34 gboolean g_pollable_stream_write_all (GOutputStream *stream, const void *buffer, gsize count,
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gpollfilemonitor.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gpollfilemonitor.c
Changed
@@ -89,10 +89,14 @@ if (last != NULL && new == NULL) return G_FILE_MONITOR_EVENT_DELETED; - if (g_strcmp0 (g_file_info_get_etag (last), g_file_info_get_etag (new))) + if (g_file_info_has_attribute (last, G_FILE_ATTRIBUTE_ETAG_VALUE) && + g_file_info_has_attribute (new, G_FILE_ATTRIBUTE_ETAG_VALUE) && + g_strcmp0 (g_file_info_get_etag (last), g_file_info_get_etag (new)) != 0) return G_FILE_MONITOR_EVENT_CHANGED; - if (g_file_info_get_size (last) != g_file_info_get_size (new)) + if (g_file_info_has_attribute (last, G_FILE_ATTRIBUTE_STANDARD_SIZE) && + g_file_info_has_attribute (new, G_FILE_ATTRIBUTE_STANDARD_SIZE) && + g_file_info_get_size (last) != g_file_info_get_size (new)) return G_FILE_MONITOR_EVENT_CHANGED; return -1;
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gportalsupport.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gportalsupport.c
Changed
@@ -20,84 +20,159 @@ #include "config.h" +#include "glib-private.h" #include "gportalsupport.h" +#include "gsandbox.h" +static GSandboxType sandbox_type = G_SANDBOX_TYPE_UNKNOWN; static gboolean use_portal; static gboolean network_available; static gboolean dconf_access; +#ifdef G_PORTAL_SUPPORT_TEST +static const char *snapctl = "snapctl"; +#else +static const char *snapctl = "/usr/bin/snapctl"; +#endif + +static gboolean +snap_plug_is_connected (const gchar *plug_name) +{ + gint wait_status; + const gchar *argv = { snapctl, "is-connected", plug_name, NULL }; + + /* Bail out if our process is privileged - we don't want to pass those + * privileges to snapctl. It could be overridden and this would + * allow arbitrary code execution. + */ + if (GLIB_PRIVATE_CALL (g_check_setuid) ()) + return FALSE; + + if (!g_spawn_sync (NULL, (gchar **) argv, NULL, +#ifdef G_PORTAL_SUPPORT_TEST + G_SPAWN_SEARCH_PATH | +#endif + G_SPAWN_STDOUT_TO_DEV_NULL | + G_SPAWN_STDERR_TO_DEV_NULL, + NULL, NULL, NULL, NULL, &wait_status, + NULL)) + return FALSE; + + return g_spawn_check_wait_status (wait_status, NULL); +} + static void -read_flatpak_info (void) +sandbox_info_read (void) { - static gsize flatpak_info_read = 0; - const gchar *path = "/.flatpak-info"; + static gsize sandbox_info_is_read = 0; - if (!g_once_init_enter (&flatpak_info_read)) + /* Sandbox type and Flatpak info is static, so only read once */ + if (!g_once_init_enter (&sandbox_info_is_read)) return; - if (g_file_test (path, G_FILE_TEST_EXISTS)) - { - GKeyFile *keyfile; - - use_portal = TRUE; - network_available = FALSE; - dconf_access = FALSE; - - keyfile = g_key_file_new (); - if (g_key_file_load_from_file (keyfile, path, G_KEY_FILE_NONE, NULL)) - { - char **shared = NULL; - char *dconf_policy = NULL; - - shared = g_key_file_get_string_list (keyfile, "Context", "shared", NULL, NULL); - if (shared) - { - network_available = g_strv_contains ((const char * const *)shared, "network"); - g_strfreev (shared); - } - - dconf_policy = g_key_file_get_string (keyfile, "Session Bus Policy", "ca.desrt.dconf", NULL); - if (dconf_policy) - { - if (strcmp (dconf_policy, "talk") == 0) - dconf_access = TRUE; - g_free (dconf_policy); - } - } - - g_key_file_unref (keyfile); - } - else + sandbox_type = glib_get_sandbox_type (); + + switch (sandbox_type) { - const char *var; + case G_SANDBOX_TYPE_FLATPAK: + { + GKeyFile *keyfile; + const char *keyfile_path = "/.flatpak-info"; - var = g_getenv ("GTK_USE_PORTAL"); - if (var && var0 == '1') use_portal = TRUE; - network_available = TRUE; - dconf_access = TRUE; + network_available = FALSE; + dconf_access = FALSE; + + keyfile = g_key_file_new (); + +#ifdef G_PORTAL_SUPPORT_TEST + char *test_key_file = + g_build_filename (g_get_user_runtime_dir (), keyfile_path, NULL); + keyfile_path = test_key_file; +#endif + + if (g_key_file_load_from_file (keyfile, keyfile_path, G_KEY_FILE_NONE, NULL)) + { + char **shared = NULL; + char *dconf_policy = NULL; + + shared = g_key_file_get_string_list (keyfile, "Context", "shared", NULL, NULL); + if (shared) + { + network_available = g_strv_contains ((const char *const *) shared, "network"); + g_strfreev (shared); + } + + dconf_policy = g_key_file_get_string (keyfile, "Session Bus Policy", "ca.desrt.dconf", NULL); + if (dconf_policy) + { + if (strcmp (dconf_policy, "talk") == 0) + dconf_access = TRUE; + g_free (dconf_policy); + } + } + +#ifdef G_PORTAL_SUPPORT_TEST + g_clear_pointer (&test_key_file, g_free); +#endif + + g_key_file_unref (keyfile); + } + break; + case G_SANDBOX_TYPE_SNAP: + break; + case G_SANDBOX_TYPE_UNKNOWN: + { + const char *var; + + var = g_getenv ("GTK_USE_PORTAL"); + if (var && var0 == '1') + use_portal = TRUE; + network_available = TRUE; + dconf_access = TRUE; + } + break; } - g_once_init_leave (&flatpak_info_read, 1); + g_once_init_leave (&sandbox_info_is_read, 1); } gboolean glib_should_use_portal (void) { - read_flatpak_info (); + sandbox_info_read (); + + if (sandbox_type == G_SANDBOX_TYPE_SNAP) + return snap_plug_is_connected ("desktop"); + return use_portal; } gboolean glib_network_available_in_sandbox (void) { - read_flatpak_info (); + sandbox_info_read (); + + if (sandbox_type == G_SANDBOX_TYPE_SNAP) + { + /* FIXME: This is inefficient doing multiple calls to check connections. + * See https://github.com/snapcore/snapd/pull/12301 for a proposed + * improvement to snapd for this. + */ + return snap_plug_is_connected ("desktop") || + snap_plug_is_connected ("network-status"); + } + return network_available; } gboolean glib_has_dconf_access_in_sandbox (void) { - read_flatpak_info (); + sandbox_info_read (); + + if (sandbox_type == G_SANDBOX_TYPE_SNAP) + return snap_plug_is_connected ("gsettings"); + return dconf_access; }
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gpowerprofilemonitor.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gpowerprofilemonitor.h
Changed
@@ -41,7 +41,7 @@ #define G_POWER_PROFILE_MONITOR_EXTENSION_POINT_NAME "gio-power-profile-monitor" #define G_TYPE_POWER_PROFILE_MONITOR (g_power_profile_monitor_get_type ()) -GLIB_AVAILABLE_IN_2_70 +GIO_AVAILABLE_IN_2_70 G_DECLARE_INTERFACE (GPowerProfileMonitor, g_power_profile_monitor, g, power_profile_monitor, GObject) #define G_POWER_PROFILE_MONITOR(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_POWER_PROFILE_MONITOR, GPowerProfileMonitor)) @@ -54,10 +54,10 @@ GTypeInterface g_iface; }; -GLIB_AVAILABLE_IN_2_70 +GIO_AVAILABLE_IN_2_70 GPowerProfileMonitor *g_power_profile_monitor_dup_default (void); -GLIB_AVAILABLE_IN_2_70 +GIO_AVAILABLE_IN_2_70 gboolean g_power_profile_monitor_get_power_saver_enabled (GPowerProfileMonitor *monitor); G_END_DECLS
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gpropertyaction.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gpropertyaction.h
Changed
@@ -36,10 +36,10 @@ #define G_IS_PROPERTY_ACTION(inst) (G_TYPE_CHECK_INSTANCE_TYPE ((inst), \ G_TYPE_PROPERTY_ACTION)) -GLIB_AVAILABLE_IN_2_38 +GIO_AVAILABLE_IN_2_38 GType g_property_action_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_2_38 +GIO_AVAILABLE_IN_2_38 GPropertyAction * g_property_action_new (const gchar *name, gpointer object, const gchar *property_name);
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gproxy.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gproxy.h
Changed
@@ -96,20 +96,20 @@ gboolean (* supports_hostname) (GProxy *proxy); }; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GType g_proxy_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GProxy *g_proxy_get_default_for_protocol (const gchar *protocol); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GIOStream *g_proxy_connect (GProxy *proxy, GIOStream *connection, GProxyAddress *proxy_address, GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_proxy_connect_async (GProxy *proxy, GIOStream *connection, GProxyAddress *proxy_address, @@ -117,12 +117,12 @@ GAsyncReadyCallback callback, gpointer user_data); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GIOStream *g_proxy_connect_finish (GProxy *proxy, GAsyncResult *result, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_proxy_supports_hostname (GProxy *proxy); G_END_DECLS
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gproxyaddress.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gproxyaddress.h
Changed
@@ -55,10 +55,10 @@ }; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GType g_proxy_address_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GSocketAddress *g_proxy_address_new (GInetAddress *inetaddr, guint16 port, const gchar *protocol, @@ -67,20 +67,20 @@ const gchar *username, const gchar *password); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL const gchar *g_proxy_address_get_protocol (GProxyAddress *proxy); -GLIB_AVAILABLE_IN_2_34 +GIO_AVAILABLE_IN_2_34 const gchar *g_proxy_address_get_destination_protocol (GProxyAddress *proxy); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL const gchar *g_proxy_address_get_destination_hostname (GProxyAddress *proxy); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL guint16 g_proxy_address_get_destination_port (GProxyAddress *proxy); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL const gchar *g_proxy_address_get_username (GProxyAddress *proxy); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL const gchar *g_proxy_address_get_password (GProxyAddress *proxy); -GLIB_AVAILABLE_IN_2_34 +GIO_AVAILABLE_IN_2_34 const gchar *g_proxy_address_get_uri (GProxyAddress *proxy); G_END_DECLS
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gproxyaddressenumerator.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gproxyaddressenumerator.h
Changed
@@ -75,7 +75,7 @@ void (*_g_reserved7) (void); }; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GType g_proxy_address_enumerator_get_type (void) G_GNUC_CONST; G_END_DECLS
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gproxyresolver.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gproxyresolver.c
Changed
@@ -131,7 +131,7 @@ * * Looks into the system proxy configuration to determine what proxy, * if any, to use to connect to @uri. The returned proxy URIs are of - * the form `<protocol>://user:password@host:port` or + * the form `<protocol>://user:password@host:port` or * `direct://`, where <protocol> could be http, rtsp, socks * or other proxying protocol. *
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gproxyresolver.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gproxyresolver.h
Changed
@@ -68,25 +68,25 @@ GError **error); }; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GType g_proxy_resolver_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GProxyResolver *g_proxy_resolver_get_default (void); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_proxy_resolver_is_supported (GProxyResolver *resolver); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gchar **g_proxy_resolver_lookup (GProxyResolver *resolver, const gchar *uri, GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_proxy_resolver_lookup_async (GProxyResolver *resolver, const gchar *uri, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gchar **g_proxy_resolver_lookup_finish (GProxyResolver *resolver, GAsyncResult *result, GError **error);
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gremoteactiongroup.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gremoteactiongroup.h
Changed
@@ -57,16 +57,16 @@ GVariant *platform_data); }; -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 GType g_remote_action_group_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 void g_remote_action_group_activate_action_full (GRemoteActionGroup *remote, const gchar *action_name, GVariant *parameter, GVariant *platform_data); -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 void g_remote_action_group_change_action_state_full (GRemoteActionGroup *remote, const gchar *action_name, GVariant *value,
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gresolver.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gresolver.h
Changed
@@ -183,69 +183,69 @@ }; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GType g_resolver_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GResolver *g_resolver_get_default (void); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_resolver_set_default (GResolver *resolver); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GList *g_resolver_lookup_by_name (GResolver *resolver, const gchar *hostname, GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_resolver_lookup_by_name_async (GResolver *resolver, const gchar *hostname, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GList *g_resolver_lookup_by_name_finish (GResolver *resolver, GAsyncResult *result, GError **error); -GLIB_AVAILABLE_IN_2_60 +GIO_AVAILABLE_IN_2_60 void g_resolver_lookup_by_name_with_flags_async (GResolver *resolver, const gchar *hostname, GResolverNameLookupFlags flags, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); -GLIB_AVAILABLE_IN_2_60 +GIO_AVAILABLE_IN_2_60 GList *g_resolver_lookup_by_name_with_flags_finish (GResolver *resolver, GAsyncResult *result, GError **error); -GLIB_AVAILABLE_IN_2_60 +GIO_AVAILABLE_IN_2_60 GList *g_resolver_lookup_by_name_with_flags (GResolver *resolver, const gchar *hostname, GResolverNameLookupFlags flags, GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_resolver_free_addresses (GList *addresses); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gchar *g_resolver_lookup_by_address (GResolver *resolver, GInetAddress *address, GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_resolver_lookup_by_address_async (GResolver *resolver, GInetAddress *address, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gchar *g_resolver_lookup_by_address_finish (GResolver *resolver, GAsyncResult *result, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GList *g_resolver_lookup_service (GResolver *resolver, const gchar *service, const gchar *protocol, const gchar *domain, GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_resolver_lookup_service_async (GResolver *resolver, const gchar *service, const gchar *protocol, @@ -253,28 +253,28 @@ GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GList *g_resolver_lookup_service_finish (GResolver *resolver, GAsyncResult *result, GError **error); -GLIB_AVAILABLE_IN_2_34 +GIO_AVAILABLE_IN_2_34 GList *g_resolver_lookup_records (GResolver *resolver, const gchar *rrname, GResolverRecordType record_type, GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_2_34 +GIO_AVAILABLE_IN_2_34 void g_resolver_lookup_records_async (GResolver *resolver, const gchar *rrname, GResolverRecordType record_type, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); -GLIB_AVAILABLE_IN_2_34 +GIO_AVAILABLE_IN_2_34 GList *g_resolver_lookup_records_finish (GResolver *resolver, GAsyncResult *result, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_resolver_free_targets (GList *targets); @@ -286,7 +286,7 @@ * error domains. */ #define G_RESOLVER_ERROR (g_resolver_error_quark ()) -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GQuark g_resolver_error_quark (void); G_END_DECLS
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gresource.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gresource.h
Changed
@@ -47,7 +47,7 @@ * error domains. */ #define G_RESOURCE_ERROR (g_resource_error_quark ()) -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 GQuark g_resource_error_quark (void); typedef struct _GStaticResource GStaticResource; @@ -61,34 +61,34 @@ gpointer padding; }; -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 GType g_resource_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 GResource * g_resource_new_from_data (GBytes *data, GError **error); -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 GResource * g_resource_ref (GResource *resource); -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 void g_resource_unref (GResource *resource); -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 GResource * g_resource_load (const gchar *filename, GError **error); -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 GInputStream *g_resource_open_stream (GResource *resource, const char *path, GResourceLookupFlags lookup_flags, GError **error); -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 GBytes * g_resource_lookup_data (GResource *resource, const char *path, GResourceLookupFlags lookup_flags, GError **error); -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 char ** g_resource_enumerate_children (GResource *resource, const char *path, GResourceLookupFlags lookup_flags, GError **error); -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 gboolean g_resource_get_info (GResource *resource, const char *path, GResourceLookupFlags lookup_flags, @@ -96,23 +96,23 @@ guint32 *flags, GError **error); -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 void g_resources_register (GResource *resource); -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 void g_resources_unregister (GResource *resource); -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 GInputStream *g_resources_open_stream (const char *path, GResourceLookupFlags lookup_flags, GError **error); -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 GBytes * g_resources_lookup_data (const char *path, GResourceLookupFlags lookup_flags, GError **error); -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 char ** g_resources_enumerate_children (const char *path, GResourceLookupFlags lookup_flags, GError **error); -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 gboolean g_resources_get_info (const char *path, GResourceLookupFlags lookup_flags, gsize *size, @@ -120,11 +120,11 @@ GError **error); -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 void g_static_resource_init (GStaticResource *static_resource); -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 void g_static_resource_fini (GStaticResource *static_resource); -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 GResource *g_static_resource_get_resource (GStaticResource *static_resource); G_END_DECLS
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gresourcefile.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gresourcefile.c
Changed
@@ -558,7 +558,8 @@ if (g_file_attribute_matcher_matches (matcher, G_FILE_ATTRIBUTE_FILESYSTEM_TYPE)) g_file_info_set_attribute_string (info, G_FILE_ATTRIBUTE_FILESYSTEM_TYPE, "resource"); - if (g_file_attribute_matcher_matches (matcher, G_FILE_ATTRIBUTE_FILESYSTEM_READONLY)) g_file_info_set_attribute_boolean (info, G_FILE_ATTRIBUTE_FILESYSTEM_READONLY, TRUE); + if (g_file_attribute_matcher_matches (matcher, G_FILE_ATTRIBUTE_FILESYSTEM_READONLY)) + g_file_info_set_attribute_boolean (info, G_FILE_ATTRIBUTE_FILESYSTEM_READONLY, TRUE); g_file_attribute_matcher_unref (matcher);
View file
_service:tar_scm:glib-2.76.4.tar.xz/gio/gsandbox.c
Added
@@ -0,0 +1,141 @@ +/* GIO - GLib Input, Output and Streaming Library + * + * Copyright 2022 Canonical Ltd + * + * SPDX-License-Identifier: LGPL-2.1-or-later + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General + * Public License along with this library; if not, see <http://www.gnu.org/licenses/>. + */ + +#include "config.h" + +#include "gsandbox.h" + +#include <string.h> + +#define SNAP_CONFINEMENT_PREFIX "confinement:" + +static gboolean +is_flatpak (void) +{ + const char *flatpak_info = "/.flatpak-info"; + gboolean found; + +#ifdef G_PORTAL_SUPPORT_TEST + char *test_key_file = + g_build_filename (g_get_user_runtime_dir (), flatpak_info, NULL); + flatpak_info = test_key_file; +#endif + + found = g_file_test (flatpak_info, G_FILE_TEST_EXISTS); + +#ifdef G_PORTAL_SUPPORT_TEST + g_clear_pointer (&test_key_file, g_free); +#endif + + return found; +} + +static gchar * +get_snap_confinement (const char *snap_yaml, + GError **error) +{ + char *confinement = NULL; + char *yaml_contents; + + if (g_file_get_contents (snap_yaml, &yaml_contents, NULL, error)) + { + const char *line = yaml_contents; + + do + { + if (g_str_has_prefix (line, SNAP_CONFINEMENT_PREFIX)) + break; + + line = strchr (line, '\n'); + if (line) + line += 1; + } + while (line != NULL); + + if (line) + { + const char *start = line + strlen (SNAP_CONFINEMENT_PREFIX); + const char *end = strchr (start, '\n'); + + confinement = + g_strstrip (end ? g_strndup (start, end-start) : g_strdup (start)); + } + + g_free (yaml_contents); + } + + return g_steal_pointer (&confinement); +} + +static gboolean +is_snap (void) +{ + GError *error = NULL; + const gchar *snap_path; + gchar *yaml_path; + char *confinement; + gboolean result; + + snap_path = g_getenv ("SNAP"); + if (snap_path == NULL) + return FALSE; + + result = FALSE; + yaml_path = g_build_filename (snap_path, "meta", "snap.yaml", NULL); + confinement = get_snap_confinement (yaml_path, &error); + g_free (yaml_path); + + /* Classic snaps are de-facto no sandboxed apps, so we can ignore them */ + if (!error && g_strcmp0 (confinement, "classic") != 0) + result = TRUE; + + g_clear_error (&error); + g_free (confinement); + + return result; +} + +/* + * glib_get_sandbox_type: + * + * Gets the type of sandbox this process is running inside. + * + * Checking for sandboxes may involve doing blocking I/O calls, but should not take + * any significant time. + * + * The sandbox will not change over the lifetime of the process, so calling this + * function once and reusing the result is valid. + * + * If this process is not sandboxed then @G_SANDBOX_TYPE_UNKNOWN will be returned. + * This is because this function only detects known sandbox types in #GSandboxType. + * It may be updated in the future if new sandboxes come into use. + * + * Returns: a #GSandboxType. + */ +GSandboxType +glib_get_sandbox_type (void) +{ + if (is_flatpak ()) + return G_SANDBOX_TYPE_FLATPAK; + else if (is_snap ()) + return G_SANDBOX_TYPE_SNAP; + else + return G_SANDBOX_TYPE_UNKNOWN; +}
View file
_service:tar_scm:glib-2.76.4.tar.xz/gio/gsandbox.h
Added
@@ -0,0 +1,47 @@ +/* GIO - GLib Input, Output and Streaming Library + * + * Copyright 2022 Canonical Ltd + * + * SPDX-License-Identifier: LGPL-2.1-or-later + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General + * Public License along with this library; if not, see <http://www.gnu.org/licenses/>. + */ + +#ifndef __G_SANDBOX_H__ +#define __G_SANDBOX_H__ + +#include <gio.h> + +G_BEGIN_DECLS + +/* + * GSandboxType: + * @G_SANDBOX_TYPE_UNKNOWN: process is running inside an unknown or no sandbox. + * @G_SANDBOX_TYPE_FLATPAK: process is running inside a flatpak sandbox. + * @G_SANDBOX_TYPE_SNAP: process is running inside a snap sandbox. + * + * The type of sandbox that processes can be running inside. + */ +typedef enum +{ + G_SANDBOX_TYPE_UNKNOWN, + G_SANDBOX_TYPE_FLATPAK, + G_SANDBOX_TYPE_SNAP +} GSandboxType; + +GSandboxType glib_get_sandbox_type (void); + +G_END_DECLS + +#endif
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gseekable.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gseekable.h
Changed
@@ -78,22 +78,22 @@ /* TODO: Async seek/truncate */ }; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GType g_seekable_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL goffset g_seekable_tell (GSeekable *seekable); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_seekable_can_seek (GSeekable *seekable); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_seekable_seek (GSeekable *seekable, goffset offset, GSeekType type, GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_seekable_can_truncate (GSeekable *seekable); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_seekable_truncate (GSeekable *seekable, goffset offset, GCancellable *cancellable,
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gsettings.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gsettings.c
Changed
@@ -3223,10 +3223,7 @@ value = g_settings_read_from_backend (gsa->settings, &gsa->key, FALSE, FALSE); if (value == NULL) - value = g_settings_schema_key_get_translated_default (&gsa->key); - - if (value == NULL) - value = g_variant_ref (gsa->key.default_value); + value = g_settings_schema_key_get_default_value (&gsa->key); return value; }
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gsettings.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gsettings.h
Changed
@@ -69,157 +69,157 @@ }; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GType g_settings_get_type (void); -GLIB_DEPRECATED_IN_2_40_FOR(g_settings_schema_source_list_schemas) +GIO_DEPRECATED_IN_2_40_FOR(g_settings_schema_source_list_schemas) const gchar * const * g_settings_list_schemas (void); -GLIB_DEPRECATED_IN_2_40_FOR(g_settings_schema_source_list_schemas) +GIO_DEPRECATED_IN_2_40_FOR(g_settings_schema_source_list_schemas) const gchar * const * g_settings_list_relocatable_schemas (void); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GSettings * g_settings_new (const gchar *schema_id); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GSettings * g_settings_new_with_path (const gchar *schema_id, const gchar *path); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GSettings * g_settings_new_with_backend (const gchar *schema_id, GSettingsBackend *backend); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GSettings * g_settings_new_with_backend_and_path (const gchar *schema_id, GSettingsBackend *backend, const gchar *path); -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 GSettings * g_settings_new_full (GSettingsSchema *schema, GSettingsBackend *backend, const gchar *path); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gchar ** g_settings_list_children (GSettings *settings); -GLIB_DEPRECATED_IN_2_46_FOR(g_settings_schema_list_keys) +GIO_DEPRECATED_IN_2_46_FOR(g_settings_schema_list_keys) gchar ** g_settings_list_keys (GSettings *settings); -GLIB_DEPRECATED_IN_2_40_FOR(g_settings_schema_key_get_range) +GIO_DEPRECATED_IN_2_40_FOR(g_settings_schema_key_get_range) GVariant * g_settings_get_range (GSettings *settings, const gchar *key); -GLIB_DEPRECATED_IN_2_40_FOR(g_settings_schema_key_range_check) +GIO_DEPRECATED_IN_2_40_FOR(g_settings_schema_key_range_check) gboolean g_settings_range_check (GSettings *settings, const gchar *key, GVariant *value); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_settings_set_value (GSettings *settings, const gchar *key, GVariant *value); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GVariant * g_settings_get_value (GSettings *settings, const gchar *key); -GLIB_AVAILABLE_IN_2_40 +GIO_AVAILABLE_IN_2_40 GVariant * g_settings_get_user_value (GSettings *settings, const gchar *key); -GLIB_AVAILABLE_IN_2_40 +GIO_AVAILABLE_IN_2_40 GVariant * g_settings_get_default_value (GSettings *settings, const gchar *key); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_settings_set (GSettings *settings, const gchar *key, const gchar *format, ...); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_settings_get (GSettings *settings, const gchar *key, const gchar *format, ...); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_settings_reset (GSettings *settings, const gchar *key); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gint g_settings_get_int (GSettings *settings, const gchar *key); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_settings_set_int (GSettings *settings, const gchar *key, gint value); -GLIB_AVAILABLE_IN_2_50 +GIO_AVAILABLE_IN_2_50 gint64 g_settings_get_int64 (GSettings *settings, const gchar *key); -GLIB_AVAILABLE_IN_2_50 +GIO_AVAILABLE_IN_2_50 gboolean g_settings_set_int64 (GSettings *settings, const gchar *key, gint64 value); -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 guint g_settings_get_uint (GSettings *settings, const gchar *key); -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 gboolean g_settings_set_uint (GSettings *settings, const gchar *key, guint value); -GLIB_AVAILABLE_IN_2_50 +GIO_AVAILABLE_IN_2_50 guint64 g_settings_get_uint64 (GSettings *settings, const gchar *key); -GLIB_AVAILABLE_IN_2_50 +GIO_AVAILABLE_IN_2_50 gboolean g_settings_set_uint64 (GSettings *settings, const gchar *key, guint64 value); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gchar * g_settings_get_string (GSettings *settings, const gchar *key); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_settings_set_string (GSettings *settings, const gchar *key, const gchar *value); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_settings_get_boolean (GSettings *settings, const gchar *key); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_settings_set_boolean (GSettings *settings, const gchar *key, gboolean value); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gdouble g_settings_get_double (GSettings *settings, const gchar *key); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_settings_set_double (GSettings *settings, const gchar *key, gdouble value); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gchar ** g_settings_get_strv (GSettings *settings, const gchar *key); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_settings_set_strv (GSettings *settings, const gchar *key, const gchar *const *value); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gint g_settings_get_enum (GSettings *settings, const gchar *key); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_settings_set_enum (GSettings *settings, const gchar *key, gint value); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL guint g_settings_get_flags (GSettings *settings, const gchar *key); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_settings_set_flags (GSettings *settings, const gchar *key, guint value); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GSettings * g_settings_get_child (GSettings *settings, const gchar *name); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_settings_is_writable (GSettings *settings, const gchar *name); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_settings_delay (GSettings *settings); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_settings_apply (GSettings *settings); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_settings_revert (GSettings *settings); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_settings_get_has_unapplied (GSettings *settings); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_settings_sync (void); /** @@ -306,13 +306,13 @@ G_SETTINGS_BIND_INVERT_BOOLEAN = (1<<4) } GSettingsBindFlags; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_settings_bind (GSettings *settings, const gchar *key, gpointer object, const gchar *property, GSettingsBindFlags flags); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_settings_bind_with_mapping (GSettings *settings, const gchar *key, gpointer object, @@ -322,21 +322,21 @@ GSettingsBindSetMapping set_mapping, gpointer user_data, GDestroyNotify destroy); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_settings_bind_writable (GSettings *settings, const gchar *key, gpointer object, const gchar *property, gboolean inverted); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_settings_unbind (gpointer object, const gchar *property); -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 GAction * g_settings_create_action (GSettings *settings, const gchar *key); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gpointer g_settings_get_mapped (GSettings *settings, const gchar *key, GSettingsGetMapping mapping,
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gsettingsbackend.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gsettingsbackend.h
Changed
@@ -124,51 +124,51 @@ GSettingsBackendPrivate *priv; }; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GType g_settings_backend_get_type (void); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_settings_backend_changed (GSettingsBackend *backend, const gchar *key, gpointer origin_tag); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_settings_backend_path_changed (GSettingsBackend *backend, const gchar *path, gpointer origin_tag); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_settings_backend_flatten_tree (GTree *tree, gchar **path, const gchar ***keys, GVariant ***values); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_settings_backend_keys_changed (GSettingsBackend *backend, const gchar *path, gchar const * const *items, gpointer origin_tag); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_settings_backend_path_writable_changed (GSettingsBackend *backend, const gchar *path); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_settings_backend_writable_changed (GSettingsBackend *backend, const gchar *key); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_settings_backend_changed_tree (GSettingsBackend *backend, GTree *tree, gpointer origin_tag); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GSettingsBackend * g_settings_backend_get_default (void); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GSettingsBackend * g_keyfile_settings_backend_new (const gchar *filename, const gchar *root_path, const gchar *root_group); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GSettingsBackend * g_null_settings_backend_new (void); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GSettingsBackend * g_memory_settings_backend_new (void); G_END_DECLS
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gsettingsschema.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gsettingsschema.h
Changed
@@ -22,6 +22,7 @@ #define __G_SETTINGS_SCHEMA_H__ #include <glib-object.h> +#include <gio/gio-visibility.h> G_BEGIN_DECLS @@ -30,83 +31,83 @@ typedef struct _GSettingsSchemaKey GSettingsSchemaKey; #define G_TYPE_SETTINGS_SCHEMA_SOURCE (g_settings_schema_source_get_type ()) -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 GType g_settings_schema_source_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 GSettingsSchemaSource * g_settings_schema_source_get_default (void); -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 GSettingsSchemaSource * g_settings_schema_source_ref (GSettingsSchemaSource *source); -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 void g_settings_schema_source_unref (GSettingsSchemaSource *source); -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 GSettingsSchemaSource * g_settings_schema_source_new_from_directory (const gchar *directory, GSettingsSchemaSource *parent, gboolean trusted, GError **error); -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 GSettingsSchema * g_settings_schema_source_lookup (GSettingsSchemaSource *source, const gchar *schema_id, gboolean recursive); -GLIB_AVAILABLE_IN_2_40 +GIO_AVAILABLE_IN_2_40 void g_settings_schema_source_list_schemas (GSettingsSchemaSource *source, gboolean recursive, gchar ***non_relocatable, gchar ***relocatable); #define G_TYPE_SETTINGS_SCHEMA (g_settings_schema_get_type ()) -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 GType g_settings_schema_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 GSettingsSchema * g_settings_schema_ref (GSettingsSchema *schema); -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 void g_settings_schema_unref (GSettingsSchema *schema); -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 const gchar * g_settings_schema_get_id (GSettingsSchema *schema); -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 const gchar * g_settings_schema_get_path (GSettingsSchema *schema); -GLIB_AVAILABLE_IN_2_40 +GIO_AVAILABLE_IN_2_40 GSettingsSchemaKey * g_settings_schema_get_key (GSettingsSchema *schema, const gchar *name); -GLIB_AVAILABLE_IN_2_40 +GIO_AVAILABLE_IN_2_40 gboolean g_settings_schema_has_key (GSettingsSchema *schema, const gchar *name); -GLIB_AVAILABLE_IN_2_46 +GIO_AVAILABLE_IN_2_46 gchar** g_settings_schema_list_keys (GSettingsSchema *schema); -GLIB_AVAILABLE_IN_2_44 +GIO_AVAILABLE_IN_2_44 gchar ** g_settings_schema_list_children (GSettingsSchema *schema); #define G_TYPE_SETTINGS_SCHEMA_KEY (g_settings_schema_key_get_type ()) -GLIB_AVAILABLE_IN_2_40 +GIO_AVAILABLE_IN_2_40 GType g_settings_schema_key_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_2_40 +GIO_AVAILABLE_IN_2_40 GSettingsSchemaKey * g_settings_schema_key_ref (GSettingsSchemaKey *key); -GLIB_AVAILABLE_IN_2_40 +GIO_AVAILABLE_IN_2_40 void g_settings_schema_key_unref (GSettingsSchemaKey *key); -GLIB_AVAILABLE_IN_2_40 +GIO_AVAILABLE_IN_2_40 const GVariantType * g_settings_schema_key_get_value_type (GSettingsSchemaKey *key); -GLIB_AVAILABLE_IN_2_40 +GIO_AVAILABLE_IN_2_40 GVariant * g_settings_schema_key_get_default_value (GSettingsSchemaKey *key); -GLIB_AVAILABLE_IN_2_40 +GIO_AVAILABLE_IN_2_40 GVariant * g_settings_schema_key_get_range (GSettingsSchemaKey *key); -GLIB_AVAILABLE_IN_2_40 +GIO_AVAILABLE_IN_2_40 gboolean g_settings_schema_key_range_check (GSettingsSchemaKey *key, GVariant *value); -GLIB_AVAILABLE_IN_2_44 +GIO_AVAILABLE_IN_2_44 const gchar * g_settings_schema_key_get_name (GSettingsSchemaKey *key); -GLIB_AVAILABLE_IN_2_40 +GIO_AVAILABLE_IN_2_40 const gchar * g_settings_schema_key_get_summary (GSettingsSchemaKey *key); -GLIB_AVAILABLE_IN_2_40 +GIO_AVAILABLE_IN_2_40 const gchar * g_settings_schema_key_get_description (GSettingsSchemaKey *key); G_END_DECLS
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gsimpleaction.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gsimpleaction.h
Changed
@@ -36,27 +36,27 @@ #define G_IS_SIMPLE_ACTION(inst) (G_TYPE_CHECK_INSTANCE_TYPE ((inst), \ G_TYPE_SIMPLE_ACTION)) -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GType g_simple_action_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GSimpleAction * g_simple_action_new (const gchar *name, const GVariantType *parameter_type); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GSimpleAction * g_simple_action_new_stateful (const gchar *name, const GVariantType *parameter_type, GVariant *state); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_simple_action_set_enabled (GSimpleAction *simple, gboolean enabled); -GLIB_AVAILABLE_IN_2_30 +GIO_AVAILABLE_IN_2_30 void g_simple_action_set_state (GSimpleAction *simple, GVariant *value); -GLIB_AVAILABLE_IN_2_44 +GIO_AVAILABLE_IN_2_44 void g_simple_action_set_state_hint (GSimpleAction *simple, GVariant *state_hint);
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gsimpleactiongroup.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gsimpleactiongroup.h
Changed
@@ -70,25 +70,25 @@ gpointer padding12; }; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GType g_simple_action_group_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GSimpleActionGroup * g_simple_action_group_new (void); -GLIB_DEPRECATED_IN_2_38_FOR (g_action_map_lookup_action) +GIO_DEPRECATED_IN_2_38_FOR (g_action_map_lookup_action) GAction * g_simple_action_group_lookup (GSimpleActionGroup *simple, const gchar *action_name); -GLIB_DEPRECATED_IN_2_38_FOR (g_action_map_add_action) +GIO_DEPRECATED_IN_2_38_FOR (g_action_map_add_action) void g_simple_action_group_insert (GSimpleActionGroup *simple, GAction *action); -GLIB_DEPRECATED_IN_2_38_FOR (g_action_map_remove_action) +GIO_DEPRECATED_IN_2_38_FOR (g_action_map_remove_action) void g_simple_action_group_remove (GSimpleActionGroup *simple, const gchar *action_name); -GLIB_DEPRECATED_IN_2_38_FOR (g_action_map_add_action_entries) +GIO_DEPRECATED_IN_2_38_FOR (g_action_map_add_action_entries) void g_simple_action_group_add_entries (GSimpleActionGroup *simple, const GActionEntry *entries, gint n_entries,
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gsimpleasyncresult.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gsimpleasyncresult.h
Changed
@@ -46,15 +46,15 @@ typedef struct _GSimpleAsyncResultClass GSimpleAsyncResultClass; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GType g_simple_async_result_get_type (void) G_GNUC_CONST; -GLIB_DEPRECATED_IN_2_46_FOR(g_task_new) +GIO_DEPRECATED_IN_2_46_FOR(g_task_new) GSimpleAsyncResult *g_simple_async_result_new (GObject *source_object, GAsyncReadyCallback callback, gpointer user_data, gpointer source_tag); -GLIB_DEPRECATED_IN_2_46_FOR(g_task_new) +GIO_DEPRECATED_IN_2_46_FOR(g_task_new) GSimpleAsyncResult *g_simple_async_result_new_error (GObject *source_object, GAsyncReadyCallback callback, gpointer user_data, @@ -62,83 +62,83 @@ gint code, const char *format, ...) G_GNUC_PRINTF (6, 7); -GLIB_DEPRECATED_IN_2_46_FOR(g_task_new) +GIO_DEPRECATED_IN_2_46_FOR(g_task_new) GSimpleAsyncResult *g_simple_async_result_new_from_error (GObject *source_object, GAsyncReadyCallback callback, gpointer user_data, const GError *error); -GLIB_DEPRECATED_IN_2_46_FOR(g_task_new) +GIO_DEPRECATED_IN_2_46_FOR(g_task_new) GSimpleAsyncResult *g_simple_async_result_new_take_error (GObject *source_object, GAsyncReadyCallback callback, gpointer user_data, GError *error); -GLIB_DEPRECATED_IN_2_46 +GIO_DEPRECATED_IN_2_46 void g_simple_async_result_set_op_res_gpointer (GSimpleAsyncResult *simple, gpointer op_res, GDestroyNotify destroy_op_res); -GLIB_DEPRECATED_IN_2_46 +GIO_DEPRECATED_IN_2_46 gpointer g_simple_async_result_get_op_res_gpointer (GSimpleAsyncResult *simple); -GLIB_DEPRECATED_IN_2_46 +GIO_DEPRECATED_IN_2_46 void g_simple_async_result_set_op_res_gssize (GSimpleAsyncResult *simple, gssize op_res); -GLIB_DEPRECATED_IN_2_46 +GIO_DEPRECATED_IN_2_46 gssize g_simple_async_result_get_op_res_gssize (GSimpleAsyncResult *simple); -GLIB_DEPRECATED_IN_2_46 +GIO_DEPRECATED_IN_2_46 void g_simple_async_result_set_op_res_gboolean (GSimpleAsyncResult *simple, gboolean op_res); -GLIB_DEPRECATED_IN_2_46 +GIO_DEPRECATED_IN_2_46 gboolean g_simple_async_result_get_op_res_gboolean (GSimpleAsyncResult *simple); -GLIB_AVAILABLE_IN_2_32 /* Also deprecated, but can't mark something both AVAILABLE and DEPRECATED */ +GIO_AVAILABLE_IN_2_32 /* Also deprecated, but can't mark something both AVAILABLE and DEPRECATED */ void g_simple_async_result_set_check_cancellable (GSimpleAsyncResult *simple, GCancellable *check_cancellable); -GLIB_DEPRECATED_IN_2_46 +GIO_DEPRECATED_IN_2_46 gpointer g_simple_async_result_get_source_tag (GSimpleAsyncResult *simple); -GLIB_DEPRECATED_IN_2_46 +GIO_DEPRECATED_IN_2_46 void g_simple_async_result_set_handle_cancellation (GSimpleAsyncResult *simple, gboolean handle_cancellation); -GLIB_DEPRECATED_IN_2_46 +GIO_DEPRECATED_IN_2_46 void g_simple_async_result_complete (GSimpleAsyncResult *simple); -GLIB_DEPRECATED_IN_2_46 +GIO_DEPRECATED_IN_2_46 void g_simple_async_result_complete_in_idle (GSimpleAsyncResult *simple); -GLIB_DEPRECATED_IN_2_46 +GIO_DEPRECATED_IN_2_46 void g_simple_async_result_run_in_thread (GSimpleAsyncResult *simple, GSimpleAsyncThreadFunc func, int io_priority, GCancellable *cancellable); -GLIB_DEPRECATED_IN_2_46 +GIO_DEPRECATED_IN_2_46 void g_simple_async_result_set_from_error (GSimpleAsyncResult *simple, const GError *error); -GLIB_DEPRECATED_IN_2_46 +GIO_DEPRECATED_IN_2_46 void g_simple_async_result_take_error (GSimpleAsyncResult *simple, GError *error); -GLIB_DEPRECATED_IN_2_46 +GIO_DEPRECATED_IN_2_46 gboolean g_simple_async_result_propagate_error (GSimpleAsyncResult *simple, GError **dest); -GLIB_DEPRECATED_IN_2_46 +GIO_DEPRECATED_IN_2_46 void g_simple_async_result_set_error (GSimpleAsyncResult *simple, GQuark domain, gint code, const char *format, ...) G_GNUC_PRINTF (4, 5); -GLIB_DEPRECATED_IN_2_46 +GIO_DEPRECATED_IN_2_46 void g_simple_async_result_set_error_va (GSimpleAsyncResult *simple, GQuark domain, gint code, const char *format, va_list args) G_GNUC_PRINTF(4, 0); -GLIB_DEPRECATED_IN_2_46 +GIO_DEPRECATED_IN_2_46 gboolean g_simple_async_result_is_valid (GAsyncResult *result, GObject *source, gpointer source_tag); -GLIB_DEPRECATED_IN_2_46_FOR(g_task_report_error) +GIO_DEPRECATED_IN_2_46_FOR(g_task_report_error) void g_simple_async_report_error_in_idle (GObject *object, GAsyncReadyCallback callback, gpointer user_data, @@ -146,12 +146,12 @@ gint code, const char *format, ...) G_GNUC_PRINTF(6, 7); -GLIB_DEPRECATED_IN_2_46_FOR(g_task_report_error) +GIO_DEPRECATED_IN_2_46_FOR(g_task_report_error) void g_simple_async_report_gerror_in_idle (GObject *object, GAsyncReadyCallback callback, gpointer user_data, const GError *error); -GLIB_DEPRECATED_IN_2_46_FOR(g_task_report_error) +GIO_DEPRECATED_IN_2_46_FOR(g_task_report_error) void g_simple_async_report_take_gerror_in_idle (GObject *object, GAsyncReadyCallback callback, gpointer user_data,
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gsimpleiostream.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gsimpleiostream.h
Changed
@@ -35,10 +35,10 @@ #define G_SIMPLE_IO_STREAM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), G_TYPE_SIMPLE_IO_STREAM, GSimpleIOStream)) #define G_IS_SIMPLE_IO_STREAM(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), G_TYPE_SIMPLE_IO_STREAM)) -GLIB_AVAILABLE_IN_2_44 +GIO_AVAILABLE_IN_2_44 GType g_simple_io_stream_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_2_44 +GIO_AVAILABLE_IN_2_44 GIOStream *g_simple_io_stream_new (GInputStream *input_stream, GOutputStream *output_stream);
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gsimplepermission.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gsimplepermission.h
Changed
@@ -37,9 +37,9 @@ #define G_IS_SIMPLE_PERMISSION(inst) (G_TYPE_CHECK_INSTANCE_TYPE ((inst), \ G_TYPE_SIMPLE_PERMISSION)) -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GType g_simple_permission_get_type (void); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GPermission * g_simple_permission_new (gboolean allowed); G_END_DECLS
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gsimpleproxyresolver.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gsimpleproxyresolver.h
Changed
@@ -66,22 +66,22 @@ void (*_g_reserved5) (void); }; -GLIB_AVAILABLE_IN_2_36 +GIO_AVAILABLE_IN_2_36 GType g_simple_proxy_resolver_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_2_36 +GIO_AVAILABLE_IN_2_36 GProxyResolver *g_simple_proxy_resolver_new (const gchar *default_proxy, gchar **ignore_hosts); -GLIB_AVAILABLE_IN_2_36 +GIO_AVAILABLE_IN_2_36 void g_simple_proxy_resolver_set_default_proxy (GSimpleProxyResolver *resolver, const gchar *default_proxy); -GLIB_AVAILABLE_IN_2_36 +GIO_AVAILABLE_IN_2_36 void g_simple_proxy_resolver_set_ignore_hosts (GSimpleProxyResolver *resolver, gchar **ignore_hosts); -GLIB_AVAILABLE_IN_2_36 +GIO_AVAILABLE_IN_2_36 void g_simple_proxy_resolver_set_uri_proxy (GSimpleProxyResolver *resolver, const gchar *uri_scheme, const gchar *proxy);
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gsocket.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gsocket.c
Changed
@@ -461,7 +461,7 @@ struct sockaddr sa; } address; gint fd; - guint addrlen; + socklen_t addrlen; int value, family; int errsv; @@ -503,7 +503,7 @@ if (addrlen > 0) { g_assert (G_STRUCT_OFFSET (struct sockaddr, sa_family) + - sizeof address.storage.ss_family <= addrlen); + (socklen_t) sizeof address.storage.ss_family <= addrlen); family = address.storage.ss_family; } else @@ -1990,7 +1990,7 @@ struct sockaddr_storage storage; struct sockaddr sa; } buffer; - guint len = sizeof (buffer); + socklen_t len = sizeof (buffer); g_return_val_if_fail (G_IS_SOCKET (socket), NULL); @@ -2026,7 +2026,7 @@ struct sockaddr_storage storage; struct sockaddr sa; } buffer; - guint len = sizeof (buffer); + socklen_t len = sizeof (buffer); g_return_val_if_fail (G_IS_SOCKET (socket), NULL); @@ -2858,6 +2858,9 @@ GCancellable *cancellable, GError **error) { +#ifdef HAVE_ACCEPT4 + gboolean try_accept4 = TRUE; +#endif GSocket *new_socket; gint ret; @@ -2871,7 +2874,28 @@ while (TRUE) { - if ((ret = accept (socket->priv->fd, NULL, 0)) < 0) + gboolean try_accept = TRUE; + +#ifdef HAVE_ACCEPT4 + if (try_accept4) + { + ret = accept4 (socket->priv->fd, NULL, 0, SOCK_CLOEXEC); + if (ret < 0 && errno == ENOSYS) + { + try_accept4 = FALSE; + } + else + { + try_accept = FALSE; + } + } + + g_assert (try_accept4 || try_accept); +#endif + if (try_accept) + ret = accept (socket->priv->fd, NULL, 0); + + if (ret < 0) { int errsv = get_socket_errno (); @@ -3363,7 +3387,7 @@ * pointer, or %NULL * @buffer: (array length=size) (element-type guint8) (out caller-allocates): * a buffer to read data into (which should be at least @size bytes long). - * @size: the number of bytes you want to read from the socket + * @size: (in): the number of bytes you want to read from the socket * @cancellable: (nullable): a %GCancellable or %NULL * @error: #GError for error reporting, or %NULL to ignore. * @@ -4679,7 +4703,7 @@ GPtrArray *my_messages = NULL; struct cmsghdr *cmsg; - if (msg->msg_controllen >= sizeof (struct cmsghdr)) + if (msg->msg_controllen >= (socklen_t) sizeof (struct cmsghdr)) { g_assert (message->control_messages != NULL); for (cmsg = CMSG_FIRSTHDR (msg); @@ -6220,7 +6244,7 @@ gint *value, GError **error) { - guint size; + socklen_t size; g_return_val_if_fail (G_IS_SOCKET (socket), FALSE);
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gsocket.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gsocket.h
Changed
@@ -73,164 +73,164 @@ GSocketPrivate *priv; }; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GType g_socket_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GSocket * g_socket_new (GSocketFamily family, GSocketType type, GSocketProtocol protocol, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GSocket * g_socket_new_from_fd (gint fd, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL int g_socket_get_fd (GSocket *socket); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GSocketFamily g_socket_get_family (GSocket *socket); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GSocketType g_socket_get_socket_type (GSocket *socket); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GSocketProtocol g_socket_get_protocol (GSocket *socket); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GSocketAddress * g_socket_get_local_address (GSocket *socket, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GSocketAddress * g_socket_get_remote_address (GSocket *socket, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_socket_set_blocking (GSocket *socket, gboolean blocking); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_socket_get_blocking (GSocket *socket); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_socket_set_keepalive (GSocket *socket, gboolean keepalive); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_socket_get_keepalive (GSocket *socket); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gint g_socket_get_listen_backlog (GSocket *socket); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_socket_set_listen_backlog (GSocket *socket, gint backlog); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL guint g_socket_get_timeout (GSocket *socket); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_socket_set_timeout (GSocket *socket, guint timeout); -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 guint g_socket_get_ttl (GSocket *socket); -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 void g_socket_set_ttl (GSocket *socket, guint ttl); -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 gboolean g_socket_get_broadcast (GSocket *socket); -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 void g_socket_set_broadcast (GSocket *socket, gboolean broadcast); -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 gboolean g_socket_get_multicast_loopback (GSocket *socket); -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 void g_socket_set_multicast_loopback (GSocket *socket, gboolean loopback); -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 guint g_socket_get_multicast_ttl (GSocket *socket); -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 void g_socket_set_multicast_ttl (GSocket *socket, guint ttl); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_socket_is_connected (GSocket *socket); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_socket_bind (GSocket *socket, GSocketAddress *address, gboolean allow_reuse, GError **error); -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 gboolean g_socket_join_multicast_group (GSocket *socket, GInetAddress *group, gboolean source_specific, const gchar *iface, GError **error); -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 gboolean g_socket_leave_multicast_group (GSocket *socket, GInetAddress *group, gboolean source_specific, const gchar *iface, GError **error); -GLIB_AVAILABLE_IN_2_56 +GIO_AVAILABLE_IN_2_56 gboolean g_socket_join_multicast_group_ssm (GSocket *socket, GInetAddress *group, GInetAddress *source_specific, const gchar *iface, GError **error); -GLIB_AVAILABLE_IN_2_56 +GIO_AVAILABLE_IN_2_56 gboolean g_socket_leave_multicast_group_ssm (GSocket *socket, GInetAddress *group, GInetAddress *source_specific, const gchar *iface, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_socket_connect (GSocket *socket, GSocketAddress *address, GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_socket_check_connect_result (GSocket *socket, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gssize g_socket_get_available_bytes (GSocket *socket); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GIOCondition g_socket_condition_check (GSocket *socket, GIOCondition condition); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_socket_condition_wait (GSocket *socket, GIOCondition condition, GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 gboolean g_socket_condition_timed_wait (GSocket *socket, GIOCondition condition, gint64 timeout_us, GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GSocket * g_socket_accept (GSocket *socket, GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_socket_listen (GSocket *socket, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gssize g_socket_receive (GSocket *socket, gchar *buffer, gsize size, GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gssize g_socket_receive_from (GSocket *socket, GSocketAddress **address, gchar *buffer, gsize size, GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gssize g_socket_send (GSocket *socket, const gchar *buffer, gsize size, GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gssize g_socket_send_to (GSocket *socket, GSocketAddress *address, const gchar *buffer, gsize size, GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gssize g_socket_receive_message (GSocket *socket, GSocketAddress **address, GInputVector *vectors, @@ -240,7 +240,7 @@ gint *flags, GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gssize g_socket_send_message (GSocket *socket, GSocketAddress *address, GOutputVector *vectors, @@ -251,14 +251,14 @@ GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_2_48 +GIO_AVAILABLE_IN_2_48 gint g_socket_receive_messages (GSocket *socket, GInputMessage *messages, guint num_messages, gint flags, GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_2_44 +GIO_AVAILABLE_IN_2_44 gint g_socket_send_messages (GSocket *socket, GOutputMessage *messages, guint num_messages, @@ -266,41 +266,41 @@ GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_socket_close (GSocket *socket, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_socket_shutdown (GSocket *socket, gboolean shutdown_read, gboolean shutdown_write, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_socket_is_closed (GSocket *socket); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GSource * g_socket_create_source (GSocket *socket, GIOCondition condition, GCancellable *cancellable); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_socket_speaks_ipv4 (GSocket *socket); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GCredentials *g_socket_get_credentials (GSocket *socket, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gssize g_socket_receive_with_blocking (GSocket *socket, gchar *buffer, gsize size, gboolean blocking, GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gssize g_socket_send_with_blocking (GSocket *socket, const gchar *buffer, gsize size, gboolean blocking, GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_2_60 +GIO_AVAILABLE_IN_2_60 GPollableReturn g_socket_send_message_with_timeout (GSocket *socket, GSocketAddress *address, const GOutputVector *vectors, @@ -312,13 +312,13 @@ gsize *bytes_written, GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_2_36 +GIO_AVAILABLE_IN_2_36 gboolean g_socket_get_option (GSocket *socket, gint level, gint optname, gint *value, GError **error); -GLIB_AVAILABLE_IN_2_36 +GIO_AVAILABLE_IN_2_36 gboolean g_socket_set_option (GSocket *socket, gint level, gint optname,
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gsocketaddress.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gsocketaddress.h
Changed
@@ -60,23 +60,23 @@ GError **error); }; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GType g_socket_address_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GSocketFamily g_socket_address_get_family (GSocketAddress *address); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GSocketAddress * g_socket_address_new_from_native (gpointer native, gsize len); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_socket_address_to_native (GSocketAddress *address, gpointer dest, gsize destlen, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gssize g_socket_address_get_native_size (GSocketAddress *address); G_END_DECLS
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gsocketaddressenumerator.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gsocketaddressenumerator.h
Changed
@@ -79,20 +79,20 @@ GError **error); }; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GType g_socket_address_enumerator_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GSocketAddress *g_socket_address_enumerator_next (GSocketAddressEnumerator *enumerator, GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_socket_address_enumerator_next_async (GSocketAddressEnumerator *enumerator, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GSocketAddress *g_socket_address_enumerator_next_finish (GSocketAddressEnumerator *enumerator, GAsyncResult *result, GError **error);
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gsocketclient.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gsocketclient.c
Changed
@@ -1469,7 +1469,7 @@ GCancellable *enumeration_parent_cancellable; /* (nullable) (owned) */ gulong enumeration_cancelled_id; - GSList *connection_attempts; + GSList *connection_attempts; /* (element-type ConnectionAttempt) (owned) */ GSList *successful_connections; SocketClientErrorInfo *error_info; @@ -1874,7 +1874,7 @@ GAsyncResult *result, gpointer user_data) { - ConnectionAttempt *attempt = user_data; + ConnectionAttempt *attempt = g_steal_pointer (&user_data); GSocketClientAsyncConnectData *data = attempt->data; if (task_completed_or_cancelled (data) || g_cancellable_is_cancelled (attempt->cancellable)) @@ -2032,7 +2032,7 @@ g_source_set_callback (attempt->timeout_source, on_connection_attempt_timeout, attempt, NULL); g_source_attach (attempt->timeout_source, g_task_get_context (data->task)); - data->connection_attempts = g_slist_append (data->connection_attempts, attempt); + data->connection_attempts = g_slist_append (data->connection_attempts, connection_attempt_ref (attempt)); if (g_task_get_cancellable (data->task)) { @@ -2048,7 +2048,7 @@ g_socket_connection_connect_async (G_SOCKET_CONNECTION (attempt->connection), address, attempt->cancellable, - g_socket_client_connected_callback, connection_attempt_ref (attempt)); + g_socket_client_connected_callback, attempt /* transfer full */); } /**
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gsocketclient.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gsocketclient.h
Changed
@@ -70,127 +70,127 @@ GSocketClientPrivate *priv; }; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GType g_socket_client_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GSocketClient *g_socket_client_new (void); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GSocketFamily g_socket_client_get_family (GSocketClient *client); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_socket_client_set_family (GSocketClient *client, GSocketFamily family); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GSocketType g_socket_client_get_socket_type (GSocketClient *client); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_socket_client_set_socket_type (GSocketClient *client, GSocketType type); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GSocketProtocol g_socket_client_get_protocol (GSocketClient *client); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_socket_client_set_protocol (GSocketClient *client, GSocketProtocol protocol); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GSocketAddress *g_socket_client_get_local_address (GSocketClient *client); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_socket_client_set_local_address (GSocketClient *client, GSocketAddress *address); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL guint g_socket_client_get_timeout (GSocketClient *client); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_socket_client_set_timeout (GSocketClient *client, guint timeout); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_socket_client_get_enable_proxy (GSocketClient *client); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_socket_client_set_enable_proxy (GSocketClient *client, gboolean enable); -GLIB_AVAILABLE_IN_2_28 +GIO_AVAILABLE_IN_2_28 gboolean g_socket_client_get_tls (GSocketClient *client); -GLIB_AVAILABLE_IN_2_28 +GIO_AVAILABLE_IN_2_28 void g_socket_client_set_tls (GSocketClient *client, gboolean tls); -GLIB_DEPRECATED_IN_2_72 +GIO_DEPRECATED_IN_2_72 GTlsCertificateFlags g_socket_client_get_tls_validation_flags (GSocketClient *client); -GLIB_DEPRECATED_IN_2_72 +GIO_DEPRECATED_IN_2_72 void g_socket_client_set_tls_validation_flags (GSocketClient *client, GTlsCertificateFlags flags); -GLIB_AVAILABLE_IN_2_36 +GIO_AVAILABLE_IN_2_36 GProxyResolver *g_socket_client_get_proxy_resolver (GSocketClient *client); -GLIB_AVAILABLE_IN_2_36 +GIO_AVAILABLE_IN_2_36 void g_socket_client_set_proxy_resolver (GSocketClient *client, GProxyResolver *proxy_resolver); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GSocketConnection * g_socket_client_connect (GSocketClient *client, GSocketConnectable *connectable, GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GSocketConnection * g_socket_client_connect_to_host (GSocketClient *client, const gchar *host_and_port, guint16 default_port, GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GSocketConnection * g_socket_client_connect_to_service (GSocketClient *client, const gchar *domain, const gchar *service, GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_2_26 +GIO_AVAILABLE_IN_2_26 GSocketConnection * g_socket_client_connect_to_uri (GSocketClient *client, const gchar *uri, guint16 default_port, GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_socket_client_connect_async (GSocketClient *client, GSocketConnectable *connectable, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GSocketConnection * g_socket_client_connect_finish (GSocketClient *client, GAsyncResult *result, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_socket_client_connect_to_host_async (GSocketClient *client, const gchar *host_and_port, guint16 default_port, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GSocketConnection * g_socket_client_connect_to_host_finish (GSocketClient *client, GAsyncResult *result, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_socket_client_connect_to_service_async (GSocketClient *client, const gchar *domain, const gchar *service, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GSocketConnection * g_socket_client_connect_to_service_finish (GSocketClient *client, GAsyncResult *result, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_socket_client_connect_to_uri_async (GSocketClient *client, const gchar *uri, guint16 default_port, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GSocketConnection * g_socket_client_connect_to_uri_finish (GSocketClient *client, GAsyncResult *result, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_socket_client_add_application_proxy (GSocketClient *client, const gchar *protocol);
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gsocketconnectable.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gsocketconnectable.h
Changed
@@ -65,16 +65,16 @@ gchar * (* to_string) (GSocketConnectable *connectable); }; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GType g_socket_connectable_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GSocketAddressEnumerator *g_socket_connectable_enumerate (GSocketConnectable *connectable); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GSocketAddressEnumerator *g_socket_connectable_proxy_enumerate (GSocketConnectable *connectable); -GLIB_AVAILABLE_IN_2_48 +GIO_AVAILABLE_IN_2_48 gchar *g_socket_connectable_to_string (GSocketConnectable *connectable); G_END_DECLS
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gsocketconnection.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gsocketconnection.h
Changed
@@ -70,46 +70,46 @@ GSocketConnectionPrivate *priv; }; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GType g_socket_connection_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 gboolean g_socket_connection_is_connected (GSocketConnection *connection); -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 gboolean g_socket_connection_connect (GSocketConnection *connection, GSocketAddress *address, GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 void g_socket_connection_connect_async (GSocketConnection *connection, GSocketAddress *address, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 gboolean g_socket_connection_connect_finish (GSocketConnection *connection, GAsyncResult *result, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GSocket *g_socket_connection_get_socket (GSocketConnection *connection); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GSocketAddress *g_socket_connection_get_local_address (GSocketConnection *connection, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GSocketAddress *g_socket_connection_get_remote_address (GSocketConnection *connection, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_socket_connection_factory_register_type (GType g_type, GSocketFamily family, GSocketType type, gint protocol); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GType g_socket_connection_factory_lookup_type (GSocketFamily family, GSocketType type, gint protocol_id); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GSocketConnection *g_socket_connection_factory_create_connection (GSocket *socket); G_END_DECLS
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gsocketcontrolmessage.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gsocketcontrolmessage.c
Changed
@@ -164,7 +164,7 @@ * If there is no implementation for this kind of control message, %NULL * will be returned. * - * Returns: (transfer full): the deserialized message or %NULL + * Returns: (nullable) (transfer full): the deserialized message or %NULL * * Since: 2.22 */
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gsocketcontrolmessage.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gsocketcontrolmessage.h
Changed
@@ -90,18 +90,18 @@ GSocketControlMessagePrivate *priv; }; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GType g_socket_control_message_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gsize g_socket_control_message_get_size (GSocketControlMessage *message); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL int g_socket_control_message_get_level (GSocketControlMessage *message); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL int g_socket_control_message_get_msg_type (GSocketControlMessage *message); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_socket_control_message_serialize (GSocketControlMessage *message, gpointer data); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GSocketControlMessage *g_socket_control_message_deserialize (int level, int type, gsize size,
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gsocketlistener.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gsocketlistener.h
Changed
@@ -81,22 +81,22 @@ GSocketListenerPrivate *priv; }; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GType g_socket_listener_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GSocketListener * g_socket_listener_new (void); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_socket_listener_set_backlog (GSocketListener *listener, int listen_backlog); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_socket_listener_add_socket (GSocketListener *listener, GSocket *socket, GObject *source_object, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_socket_listener_add_address (GSocketListener *listener, GSocketAddress *address, GSocketType type, @@ -104,52 +104,52 @@ GObject *source_object, GSocketAddress **effective_address, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_socket_listener_add_inet_port (GSocketListener *listener, guint16 port, GObject *source_object, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL guint16 g_socket_listener_add_any_inet_port (GSocketListener *listener, GObject *source_object, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GSocket * g_socket_listener_accept_socket (GSocketListener *listener, GObject **source_object, GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_socket_listener_accept_socket_async (GSocketListener *listener, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GSocket * g_socket_listener_accept_socket_finish (GSocketListener *listener, GAsyncResult *result, GObject **source_object, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GSocketConnection * g_socket_listener_accept (GSocketListener *listener, GObject **source_object, GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_socket_listener_accept_async (GSocketListener *listener, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GSocketConnection * g_socket_listener_accept_finish (GSocketListener *listener, GAsyncResult *result, GObject **source_object, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_socket_listener_close (GSocketListener *listener); G_END_DECLS
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gsocketservice.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gsocketservice.h
Changed
@@ -77,16 +77,16 @@ GSocketServicePrivate *priv; }; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GType g_socket_service_get_type (void); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GSocketService *g_socket_service_new (void); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_socket_service_start (GSocketService *service); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_socket_service_stop (GSocketService *service); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_socket_service_is_active (GSocketService *service);
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gsrvtarget.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gsrvtarget.h
Changed
@@ -29,30 +29,30 @@ G_BEGIN_DECLS -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GType g_srv_target_get_type (void) G_GNUC_CONST; #define G_TYPE_SRV_TARGET (g_srv_target_get_type ()) -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GSrvTarget *g_srv_target_new (const gchar *hostname, guint16 port, guint16 priority, guint16 weight); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GSrvTarget *g_srv_target_copy (GSrvTarget *target); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_srv_target_free (GSrvTarget *target); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL const gchar *g_srv_target_get_hostname (GSrvTarget *target); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL guint16 g_srv_target_get_port (GSrvTarget *target); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL guint16 g_srv_target_get_priority (GSrvTarget *target); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL guint16 g_srv_target_get_weight (GSrvTarget *target); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GList *g_srv_target_list_sort (GList *targets); G_END_DECLS
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gsubprocess.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gsubprocess.h
Changed
@@ -35,129 +35,129 @@ #define G_SUBPROCESS(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_SUBPROCESS, GSubprocess)) #define G_IS_SUBPROCESS(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_SUBPROCESS)) -GLIB_AVAILABLE_IN_2_40 +GIO_AVAILABLE_IN_2_40 GType g_subprocess_get_type (void) G_GNUC_CONST; /**** Core API ****/ -GLIB_AVAILABLE_IN_2_40 +GIO_AVAILABLE_IN_2_40 GSubprocess * g_subprocess_new (GSubprocessFlags flags, GError **error, const gchar *argv0, ...) G_GNUC_NULL_TERMINATED; -GLIB_AVAILABLE_IN_2_40 +GIO_AVAILABLE_IN_2_40 GSubprocess * g_subprocess_newv (const gchar * const *argv, GSubprocessFlags flags, GError **error); -GLIB_AVAILABLE_IN_2_40 +GIO_AVAILABLE_IN_2_40 GOutputStream * g_subprocess_get_stdin_pipe (GSubprocess *subprocess); -GLIB_AVAILABLE_IN_2_40 +GIO_AVAILABLE_IN_2_40 GInputStream * g_subprocess_get_stdout_pipe (GSubprocess *subprocess); -GLIB_AVAILABLE_IN_2_40 +GIO_AVAILABLE_IN_2_40 GInputStream * g_subprocess_get_stderr_pipe (GSubprocess *subprocess); -GLIB_AVAILABLE_IN_2_40 +GIO_AVAILABLE_IN_2_40 const gchar * g_subprocess_get_identifier (GSubprocess *subprocess); #ifdef G_OS_UNIX -GLIB_AVAILABLE_IN_2_40 +GIO_AVAILABLE_IN_2_40 void g_subprocess_send_signal (GSubprocess *subprocess, gint signal_num); #endif -GLIB_AVAILABLE_IN_2_40 +GIO_AVAILABLE_IN_2_40 void g_subprocess_force_exit (GSubprocess *subprocess); -GLIB_AVAILABLE_IN_2_40 +GIO_AVAILABLE_IN_2_40 gboolean g_subprocess_wait (GSubprocess *subprocess, GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_2_40 +GIO_AVAILABLE_IN_2_40 void g_subprocess_wait_async (GSubprocess *subprocess, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); -GLIB_AVAILABLE_IN_2_40 +GIO_AVAILABLE_IN_2_40 gboolean g_subprocess_wait_finish (GSubprocess *subprocess, GAsyncResult *result, GError **error); -GLIB_AVAILABLE_IN_2_40 +GIO_AVAILABLE_IN_2_40 gboolean g_subprocess_wait_check (GSubprocess *subprocess, GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_2_40 +GIO_AVAILABLE_IN_2_40 void g_subprocess_wait_check_async (GSubprocess *subprocess, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); -GLIB_AVAILABLE_IN_2_40 +GIO_AVAILABLE_IN_2_40 gboolean g_subprocess_wait_check_finish (GSubprocess *subprocess, GAsyncResult *result, GError **error); -GLIB_AVAILABLE_IN_2_40 +GIO_AVAILABLE_IN_2_40 gint g_subprocess_get_status (GSubprocess *subprocess); -GLIB_AVAILABLE_IN_2_40 +GIO_AVAILABLE_IN_2_40 gboolean g_subprocess_get_successful (GSubprocess *subprocess); -GLIB_AVAILABLE_IN_2_40 +GIO_AVAILABLE_IN_2_40 gboolean g_subprocess_get_if_exited (GSubprocess *subprocess); -GLIB_AVAILABLE_IN_2_40 +GIO_AVAILABLE_IN_2_40 gint g_subprocess_get_exit_status (GSubprocess *subprocess); -GLIB_AVAILABLE_IN_2_40 +GIO_AVAILABLE_IN_2_40 gboolean g_subprocess_get_if_signaled (GSubprocess *subprocess); -GLIB_AVAILABLE_IN_2_40 +GIO_AVAILABLE_IN_2_40 gint g_subprocess_get_term_sig (GSubprocess *subprocess); -GLIB_AVAILABLE_IN_2_40 +GIO_AVAILABLE_IN_2_40 gboolean g_subprocess_communicate (GSubprocess *subprocess, GBytes *stdin_buf, GCancellable *cancellable, GBytes **stdout_buf, GBytes **stderr_buf, GError **error); -GLIB_AVAILABLE_IN_2_40 +GIO_AVAILABLE_IN_2_40 void g_subprocess_communicate_async (GSubprocess *subprocess, GBytes *stdin_buf, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); -GLIB_AVAILABLE_IN_2_40 +GIO_AVAILABLE_IN_2_40 gboolean g_subprocess_communicate_finish (GSubprocess *subprocess, GAsyncResult *result, GBytes **stdout_buf, GBytes **stderr_buf, GError **error); -GLIB_AVAILABLE_IN_2_40 +GIO_AVAILABLE_IN_2_40 gboolean g_subprocess_communicate_utf8 (GSubprocess *subprocess, const char *stdin_buf, GCancellable *cancellable, char **stdout_buf, char **stderr_buf, GError **error); -GLIB_AVAILABLE_IN_2_40 +GIO_AVAILABLE_IN_2_40 void g_subprocess_communicate_utf8_async (GSubprocess *subprocess, const char *stdin_buf, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); -GLIB_AVAILABLE_IN_2_40 +GIO_AVAILABLE_IN_2_40 gboolean g_subprocess_communicate_utf8_finish (GSubprocess *subprocess, GAsyncResult *result, char **stdout_buf,
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gsubprocesslauncher.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gsubprocesslauncher.c
Changed
@@ -678,7 +678,7 @@ /** * g_subprocess_launcher_set_child_setup: (skip) * @self: a #GSubprocessLauncher - * @child_setup: a #GSpawnChildSetupFunc to use as the child setup function + * @child_setup: (closure user_data): a #GSpawnChildSetupFunc to use as the child setup function * @user_data: user data for @child_setup * @destroy_notify: a #GDestroyNotify for @user_data *
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gsubprocesslauncher.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gsubprocesslauncher.h
Changed
@@ -37,79 +37,79 @@ #define G_SUBPROCESS_LAUNCHER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_SUBPROCESS_LAUNCHER, GSubprocessLauncher)) #define G_IS_SUBPROCESS_LAUNCHER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_SUBPROCESS_LAUNCHER)) -GLIB_AVAILABLE_IN_2_40 +GIO_AVAILABLE_IN_2_40 GType g_subprocess_launcher_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_2_40 +GIO_AVAILABLE_IN_2_40 GSubprocessLauncher * g_subprocess_launcher_new (GSubprocessFlags flags); -GLIB_AVAILABLE_IN_2_40 +GIO_AVAILABLE_IN_2_40 GSubprocess * g_subprocess_launcher_spawn (GSubprocessLauncher *self, GError **error, const gchar *argv0, ...) G_GNUC_NULL_TERMINATED; -GLIB_AVAILABLE_IN_2_40 +GIO_AVAILABLE_IN_2_40 GSubprocess * g_subprocess_launcher_spawnv (GSubprocessLauncher *self, const gchar * const *argv, GError **error); -GLIB_AVAILABLE_IN_2_40 +GIO_AVAILABLE_IN_2_40 void g_subprocess_launcher_set_environ (GSubprocessLauncher *self, gchar **env); -GLIB_AVAILABLE_IN_2_40 +GIO_AVAILABLE_IN_2_40 void g_subprocess_launcher_setenv (GSubprocessLauncher *self, const gchar *variable, const gchar *value, gboolean overwrite); -GLIB_AVAILABLE_IN_2_40 +GIO_AVAILABLE_IN_2_40 void g_subprocess_launcher_unsetenv (GSubprocessLauncher *self, const gchar *variable); -GLIB_AVAILABLE_IN_2_40 +GIO_AVAILABLE_IN_2_40 const gchar * g_subprocess_launcher_getenv (GSubprocessLauncher *self, const gchar *variable); -GLIB_AVAILABLE_IN_2_40 +GIO_AVAILABLE_IN_2_40 void g_subprocess_launcher_set_cwd (GSubprocessLauncher *self, const gchar *cwd); -GLIB_AVAILABLE_IN_2_40 +GIO_AVAILABLE_IN_2_40 void g_subprocess_launcher_set_flags (GSubprocessLauncher *self, GSubprocessFlags flags); /* Extended I/O control, only available on UNIX */ #ifdef G_OS_UNIX -GLIB_AVAILABLE_IN_2_40 +GIO_AVAILABLE_IN_2_40 void g_subprocess_launcher_set_stdin_file_path (GSubprocessLauncher *self, const gchar *path); -GLIB_AVAILABLE_IN_2_40 +GIO_AVAILABLE_IN_2_40 void g_subprocess_launcher_take_stdin_fd (GSubprocessLauncher *self, gint fd); -GLIB_AVAILABLE_IN_2_40 +GIO_AVAILABLE_IN_2_40 void g_subprocess_launcher_set_stdout_file_path (GSubprocessLauncher *self, const gchar *path); -GLIB_AVAILABLE_IN_2_40 +GIO_AVAILABLE_IN_2_40 void g_subprocess_launcher_take_stdout_fd (GSubprocessLauncher *self, gint fd); -GLIB_AVAILABLE_IN_2_40 +GIO_AVAILABLE_IN_2_40 void g_subprocess_launcher_set_stderr_file_path (GSubprocessLauncher *self, const gchar *path); -GLIB_AVAILABLE_IN_2_40 +GIO_AVAILABLE_IN_2_40 void g_subprocess_launcher_take_stderr_fd (GSubprocessLauncher *self, gint fd); -GLIB_AVAILABLE_IN_2_40 +GIO_AVAILABLE_IN_2_40 void g_subprocess_launcher_take_fd (GSubprocessLauncher *self, gint source_fd, gint target_fd); -GLIB_AVAILABLE_IN_2_68 +GIO_AVAILABLE_IN_2_68 void g_subprocess_launcher_close (GSubprocessLauncher *self); /* Child setup, only available on UNIX */ -GLIB_AVAILABLE_IN_2_40 +GIO_AVAILABLE_IN_2_40 void g_subprocess_launcher_set_child_setup (GSubprocessLauncher *self, GSpawnChildSetupFunc child_setup, gpointer user_data,
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gtask.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gtask.c
Changed
@@ -64,6 +64,10 @@ * #GTask was constructed to be running at least until the task has completed * and its data has been freed. * + * If a #GTask has been constructed and its callback set, it is an error to + * not call `g_task_return_*()` on it. GLib will warn at runtime if this happens + * (since 2.76). + * * Here is an example for using GTask as a GAsyncResult: * |<!-- language="C" --> * typedef struct { @@ -538,6 +542,24 @@ * having come from the `_async()` wrapper * function (for "short-circuit" results, such as when passing * 0 to g_input_stream_read_async()). + * + * ## Thread-safety considerations + * + * Due to some infelicities in the API design, there is a + * thread-safety concern that users of GTask have to be aware of: + * + * If the `main` thread drops its last reference to the source object + * or the task data before the task is finalized, then the finalizers + * of these objects may be called on the worker thread. + * + * This is a problem if the finalizers use non-threadsafe API, and + * can lead to hard-to-debug crashes. Possible workarounds include: + * + * - Clear task data in a signal handler for `notify::completed` + * + * - Keep iterating a main context in the main thread and defer + * dropping the reference to the source object to that main + * context when the task is finalized */ /** @@ -573,21 +595,22 @@ gboolean thread_cancelled; /* Protected by the lock when task is threaded: */ - gboolean thread_complete : 1; - gboolean return_on_cancel : 1; - gboolean : 0; + guint thread_complete : 1; + guint return_on_cancel : 1; + guint : 0; /* Unprotected, but written to when task runs in thread: */ - gboolean completed : 1; - gboolean had_error : 1; - gboolean result_set : 1; - gboolean ever_returned : 1; - gboolean : 0; + guint completed : 1; + guint had_error : 1; + guint result_set : 1; + guint ever_returned : 1; + guint : 0; /* Read-only once task runs in thread: */ - gboolean check_cancellable : 1; - gboolean synchronous : 1; - gboolean blocking_other_task : 1; + guint check_cancellable : 1; + guint synchronous : 1; + guint blocking_other_task : 1; + guint name_is_static : 1; GError *error; union { @@ -658,9 +681,38 @@ { GTask *task = G_TASK (object); + /* Warn if a #GTask is finalised without g_task_return() ever having been + * called on it. + * + * Tasks without a callback or which are run in g_task_run_in_thread{,_sync}() + * only trigger a debug message as that’s sometimes used as a pattern for + * running work in a worker thread without caring about the result. */ + if (!task->ever_returned) + { + gchar *owned_task_name = NULL; + const gchar *task_name = g_task_get_name (task); + + if (task_name == NULL) + task_name = owned_task_name = g_strdup_printf ("%p", task); + + if (task->callback != NULL && !G_TASK_IS_THREADED (task)) + g_critical ("GTask %s (source object: %p, source tag: %p) finalized without " + "ever returning (using g_task_return_*()). This potentially " + "indicates a bug in the program.", + task_name, task->source_object, task->source_tag); + else + g_debug ("GTask %s (source object: %p, source tag: %p) finalized without " + "ever returning (using g_task_return_*()). This potentially " + "indicates a bug in the program.", + task_name, task->source_object, task->source_tag); + + g_free (owned_task_name); + } + g_clear_object (&task->source_object); g_clear_object (&task->cancellable); - g_free (task->name); + if (!task->name_is_static) + g_free (task->name); if (task->context) g_main_context_unref (task->context); @@ -769,7 +821,7 @@ task = g_task_new (source_object, NULL, callback, callback_data); g_task_set_source_tag (task, source_tag); - g_task_set_name (task, G_STRFUNC); + g_task_set_static_name (task, G_STRFUNC); g_task_return_error (task, error); g_object_unref (task); } @@ -1028,16 +1080,41 @@ * Since: 2.60 */ void -g_task_set_name (GTask *task, - const gchar *name) +(g_task_set_name) (GTask *task, + const char *name) { - gchar *new_name; + char *new_name; g_return_if_fail (G_IS_TASK (task)); new_name = g_strdup (name); - g_free (task->name); + if (!task->name_is_static) + g_free (task->name); task->name = g_steal_pointer (&new_name); + task->name_is_static = FALSE; +} + +/** + * g_task_set_static_name: + * @task: a #GTask + * @name: (nullable): a human readable name for the task. Must be a string literal + * + * Sets @task’s name, used in debugging and profiling. + * + * This is a variant of g_task_set_name() that avoids copying @name. + * + * Since: 2.76 + */ +void +g_task_set_static_name (GTask *task, + const char *name) +{ + g_return_if_fail (G_IS_TASK (task)); + + if (!task->name_is_static) + g_free (task->name); + task->name = (char *) name; + task->name_is_static = TRUE; } /** @@ -1645,7 +1722,8 @@ * callback to @callback, with @task as the callback's `user_data`. * * It will set the @source’s name to the task’s name (as set with - * g_task_set_name()), if one has been set. + * g_task_set_name()), if one has been set on the task and the source doesn’t + * yet have a name. * * This takes a reference on @task until @source is destroyed. * @@ -1661,7 +1739,7 @@ g_source_set_callback (source, callback, g_object_ref (task), g_object_unref); g_source_set_priority (source, task->priority); - if (task->name != NULL) + if (task->name != NULL && g_source_get_name (source) == NULL) g_source_set_name (source, task->name); g_source_attach (source, task->context);
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gtask.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gtask.h
Changed
@@ -38,22 +38,22 @@ typedef struct _GTaskClass GTaskClass; -GLIB_AVAILABLE_IN_2_36 +GIO_AVAILABLE_IN_2_36 GType g_task_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_2_36 +GIO_AVAILABLE_IN_2_36 GTask *g_task_new (gpointer source_object, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer callback_data); -GLIB_AVAILABLE_IN_2_36 +GIO_AVAILABLE_IN_2_36 void g_task_report_error (gpointer source_object, GAsyncReadyCallback callback, gpointer callback_data, gpointer source_tag, GError *error); -GLIB_AVAILABLE_IN_2_36 +GIO_AVAILABLE_IN_2_36 void g_task_report_new_error (gpointer source_object, GAsyncReadyCallback callback, gpointer callback_data, @@ -63,51 +63,66 @@ const char *format, ...) G_GNUC_PRINTF(7, 8); -GLIB_AVAILABLE_IN_2_36 +GIO_AVAILABLE_IN_2_36 void g_task_set_task_data (GTask *task, gpointer task_data, GDestroyNotify task_data_destroy); -GLIB_AVAILABLE_IN_2_36 +GIO_AVAILABLE_IN_2_36 void g_task_set_priority (GTask *task, gint priority); -GLIB_AVAILABLE_IN_2_36 +GIO_AVAILABLE_IN_2_36 void g_task_set_check_cancellable (GTask *task, gboolean check_cancellable); -GLIB_AVAILABLE_IN_2_36 +GIO_AVAILABLE_IN_2_36 void g_task_set_source_tag (GTask *task, gpointer source_tag); -GLIB_AVAILABLE_IN_2_60 +GIO_AVAILABLE_IN_2_60 void g_task_set_name (GTask *task, const gchar *name); +GIO_AVAILABLE_IN_2_76 +void g_task_set_static_name (GTask *task, + const gchar *name); /* Macro wrapper to set the task name when setting the source tag. */ -#if GLIB_VERSION_MIN_REQUIRED >= GLIB_VERSION_2_60 +#if GLIB_VERSION_MIN_REQUIRED >= GLIB_VERSION_2_76 #define g_task_set_source_tag(task, tag) G_STMT_START { \ GTask *_task = (task); \ (g_task_set_source_tag) (_task, tag); \ if (g_task_get_name (_task) == NULL) \ - g_task_set_name (_task, G_STRINGIFY (tag)); \ + g_task_set_static_name (_task, G_STRINGIFY (tag)); \ +} G_STMT_END +#endif + +#if GLIB_VERSION_MIN_REQUIRED >= GLIB_VERSION_2_76 +#if defined (__GNUC__) && (__GNUC__ >= 2) +#define g_task_set_name(task, name) G_STMT_START { \ + GTask *_task = (task); \ + if (__builtin_constant_p (name)) \ + g_task_set_static_name (_task, name); \ + else \ + g_task_set_name (_task, name); \ } G_STMT_END #endif +#endif -GLIB_AVAILABLE_IN_2_36 +GIO_AVAILABLE_IN_2_36 gpointer g_task_get_source_object (GTask *task); -GLIB_AVAILABLE_IN_2_36 +GIO_AVAILABLE_IN_2_36 gpointer g_task_get_task_data (GTask *task); -GLIB_AVAILABLE_IN_2_36 +GIO_AVAILABLE_IN_2_36 gint g_task_get_priority (GTask *task); -GLIB_AVAILABLE_IN_2_36 +GIO_AVAILABLE_IN_2_36 GMainContext *g_task_get_context (GTask *task); -GLIB_AVAILABLE_IN_2_36 +GIO_AVAILABLE_IN_2_36 GCancellable *g_task_get_cancellable (GTask *task); -GLIB_AVAILABLE_IN_2_36 +GIO_AVAILABLE_IN_2_36 gboolean g_task_get_check_cancellable (GTask *task); -GLIB_AVAILABLE_IN_2_36 +GIO_AVAILABLE_IN_2_36 gpointer g_task_get_source_tag (GTask *task); -GLIB_AVAILABLE_IN_2_60 +GIO_AVAILABLE_IN_2_60 const gchar *g_task_get_name (GTask *task); -GLIB_AVAILABLE_IN_2_36 +GIO_AVAILABLE_IN_2_36 gboolean g_task_is_valid (gpointer result, gpointer source_object); @@ -116,67 +131,67 @@ gpointer source_object, gpointer task_data, GCancellable *cancellable); -GLIB_AVAILABLE_IN_2_36 +GIO_AVAILABLE_IN_2_36 void g_task_run_in_thread (GTask *task, GTaskThreadFunc task_func); -GLIB_AVAILABLE_IN_2_36 +GIO_AVAILABLE_IN_2_36 void g_task_run_in_thread_sync (GTask *task, GTaskThreadFunc task_func); -GLIB_AVAILABLE_IN_2_36 +GIO_AVAILABLE_IN_2_36 gboolean g_task_set_return_on_cancel (GTask *task, gboolean return_on_cancel); -GLIB_AVAILABLE_IN_2_36 +GIO_AVAILABLE_IN_2_36 gboolean g_task_get_return_on_cancel (GTask *task); -GLIB_AVAILABLE_IN_2_36 +GIO_AVAILABLE_IN_2_36 void g_task_attach_source (GTask *task, GSource *source, GSourceFunc callback); -GLIB_AVAILABLE_IN_2_36 +GIO_AVAILABLE_IN_2_36 void g_task_return_pointer (GTask *task, gpointer result, GDestroyNotify result_destroy); -GLIB_AVAILABLE_IN_2_36 +GIO_AVAILABLE_IN_2_36 void g_task_return_boolean (GTask *task, gboolean result); -GLIB_AVAILABLE_IN_2_36 +GIO_AVAILABLE_IN_2_36 void g_task_return_int (GTask *task, gssize result); -GLIB_AVAILABLE_IN_2_36 +GIO_AVAILABLE_IN_2_36 void g_task_return_error (GTask *task, GError *error); -GLIB_AVAILABLE_IN_2_36 +GIO_AVAILABLE_IN_2_36 void g_task_return_new_error (GTask *task, GQuark domain, gint code, const char *format, ...) G_GNUC_PRINTF (4, 5); -GLIB_AVAILABLE_IN_2_64 +GIO_AVAILABLE_IN_2_64 void g_task_return_value (GTask *task, GValue *result); -GLIB_AVAILABLE_IN_2_36 +GIO_AVAILABLE_IN_2_36 gboolean g_task_return_error_if_cancelled (GTask *task); -GLIB_AVAILABLE_IN_2_36 +GIO_AVAILABLE_IN_2_36 gpointer g_task_propagate_pointer (GTask *task, GError **error); -GLIB_AVAILABLE_IN_2_36 +GIO_AVAILABLE_IN_2_36 gboolean g_task_propagate_boolean (GTask *task, GError **error); -GLIB_AVAILABLE_IN_2_36 +GIO_AVAILABLE_IN_2_36 gssize g_task_propagate_int (GTask *task, GError **error); -GLIB_AVAILABLE_IN_2_64 +GIO_AVAILABLE_IN_2_64 gboolean g_task_propagate_value (GTask *task, GValue *value, GError **error); -GLIB_AVAILABLE_IN_2_36 +GIO_AVAILABLE_IN_2_36 gboolean g_task_had_error (GTask *task); -GLIB_AVAILABLE_IN_2_44 +GIO_AVAILABLE_IN_2_44 gboolean g_task_get_completed (GTask *task); G_END_DECLS
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gtcpconnection.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gtcpconnection.h
Changed
@@ -57,13 +57,13 @@ GTcpConnectionPrivate *priv; }; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GType g_tcp_connection_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_tcp_connection_set_graceful_disconnect (GTcpConnection *connection, gboolean graceful_disconnect); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_tcp_connection_get_graceful_disconnect (GTcpConnection *connection); G_END_DECLS
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gtcpwrapperconnection.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gtcpwrapperconnection.h
Changed
@@ -57,13 +57,13 @@ GTcpWrapperConnectionPrivate *priv; }; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GType g_tcp_wrapper_connection_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GSocketConnection *g_tcp_wrapper_connection_new (GIOStream *base_io_stream, GSocket *socket); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GIOStream *g_tcp_wrapper_connection_get_base_io_stream (GTcpWrapperConnection *conn); G_END_DECLS
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gtestdbus.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gtestdbus.c
Changed
@@ -50,6 +50,7 @@ #ifdef G_OS_UNIX #include "glib-unix.h" +#include "glib-unixprivate.h" #endif /* -------------------------------------------------------------------------- */ @@ -248,7 +249,7 @@ gint pipe_fds2; /* fork a child to clean up when we are killed */ - if (pipe (pipe_fds) != 0) + if (!g_unix_open_pipe_internal (pipe_fds, TRUE)) { errsv = errno; g_warning ("pipe() failed: %s", g_strerror (errsv));
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gtestdbus.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gtestdbus.h
Changed
@@ -41,32 +41,32 @@ #define G_IS_TEST_DBUS(obj) \ (G_TYPE_CHECK_INSTANCE_TYPE ((obj), G_TYPE_TEST_DBUS)) -GLIB_AVAILABLE_IN_2_34 +GIO_AVAILABLE_IN_2_34 GType g_test_dbus_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_2_34 +GIO_AVAILABLE_IN_2_34 GTestDBus * g_test_dbus_new (GTestDBusFlags flags); -GLIB_AVAILABLE_IN_2_34 +GIO_AVAILABLE_IN_2_34 GTestDBusFlags g_test_dbus_get_flags (GTestDBus *self); -GLIB_AVAILABLE_IN_2_34 +GIO_AVAILABLE_IN_2_34 const gchar * g_test_dbus_get_bus_address (GTestDBus *self); -GLIB_AVAILABLE_IN_2_34 +GIO_AVAILABLE_IN_2_34 void g_test_dbus_add_service_dir (GTestDBus *self, const gchar *path); -GLIB_AVAILABLE_IN_2_34 +GIO_AVAILABLE_IN_2_34 void g_test_dbus_up (GTestDBus *self); -GLIB_AVAILABLE_IN_2_34 +GIO_AVAILABLE_IN_2_34 void g_test_dbus_stop (GTestDBus *self); -GLIB_AVAILABLE_IN_2_34 +GIO_AVAILABLE_IN_2_34 void g_test_dbus_down (GTestDBus *self); -GLIB_AVAILABLE_IN_2_34 +GIO_AVAILABLE_IN_2_34 void g_test_dbus_unset (void); G_END_DECLS
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gthemedicon.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gthemedicon.h
Changed
@@ -45,24 +45,24 @@ **/ typedef struct _GThemedIconClass GThemedIconClass; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GType g_themed_icon_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GIcon *g_themed_icon_new (const char *iconname); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GIcon *g_themed_icon_new_with_default_fallbacks (const char *iconname); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GIcon *g_themed_icon_new_from_names (char **iconnames, int len); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_themed_icon_prepend_name (GThemedIcon *icon, const char *iconname); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_themed_icon_append_name (GThemedIcon *icon, const char *iconname); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL const gchar* const * g_themed_icon_get_names (GThemedIcon *icon); G_END_DECLS
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gthreadedresolver.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gthreadedresolver.c
Changed
@@ -579,6 +579,22 @@ GETSHORT (weight, *p); GETSHORT (port, *p); + /* RFC 2782 says (on page 4) that “Unless and until permitted by future + * standards action, name compression is not to be used for this field.”, so + * technically we shouldn’t be expanding names here for SRV records. + * + * However, other DNS resolvers (such as systemd1) do, and it seems in + * keeping with the principle of being liberal in what you accept and strict + * in what you emit. It also seems harmless. + * + * An earlier version of the RFC, RFC 2052 (now obsolete) specified that name + * compression *was* to be used for SRV targets2. + * + * See discussion on https://gitlab.gnome.org/GNOME/glib/-/issues/2622. + * + * 1: https://github.com/yuwata/systemd/blob/2d23cc3c07c49722ce93170737b3efd2692a2d08/src/resolve/resolved-dns-packet.c#L1674 + * 2: https://datatracker.ietf.org/doc/html/rfc2052#page-3 + */ if (!expand_name ("SRV", answer, end, p, namebuf, sizeof (namebuf), error)) return NULL;
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gthreadedresolver.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gthreadedresolver.h
Changed
@@ -41,19 +41,19 @@ } GThreadedResolverClass; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GType g_threaded_resolver_get_type (void) G_GNUC_CONST; /* Used for a private test API */ #ifdef G_OS_UNIX -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GList *g_resolver_records_from_res_query (const gchar *rrname, gint rrtype, const guint8 *answer, gssize len, gint herr, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gint g_resolver_record_type_to_rrtype (GResolverRecordType type); #endif
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gthreadedsocketservice.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gthreadedsocketservice.h
Changed
@@ -73,9 +73,9 @@ GThreadedSocketServicePrivate *priv; }; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GType g_threaded_socket_service_get_type (void); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GSocketService * g_threaded_socket_service_new (int max_threads); G_END_DECLS
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gtlsbackend.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gtlsbackend.h
Changed
@@ -79,35 +79,35 @@ GType ( *get_dtls_server_connection_type) (void); }; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GType g_tls_backend_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GTlsBackend * g_tls_backend_get_default (void); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GTlsDatabase * g_tls_backend_get_default_database (GTlsBackend *backend); -GLIB_AVAILABLE_IN_2_60 +GIO_AVAILABLE_IN_2_60 void g_tls_backend_set_default_database (GTlsBackend *backend, GTlsDatabase *database); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_tls_backend_supports_tls (GTlsBackend *backend); -GLIB_AVAILABLE_IN_2_48 +GIO_AVAILABLE_IN_2_48 gboolean g_tls_backend_supports_dtls (GTlsBackend *backend); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GType g_tls_backend_get_certificate_type (GTlsBackend *backend); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GType g_tls_backend_get_client_connection_type (GTlsBackend *backend); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GType g_tls_backend_get_server_connection_type (GTlsBackend *backend); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GType g_tls_backend_get_file_database_type (GTlsBackend *backend); -GLIB_AVAILABLE_IN_2_48 +GIO_AVAILABLE_IN_2_48 GType g_tls_backend_get_dtls_client_connection_type (GTlsBackend *backend); -GLIB_AVAILABLE_IN_2_48 +GIO_AVAILABLE_IN_2_48 GType g_tls_backend_get_dtls_server_connection_type (GTlsBackend *backend); G_END_DECLS
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gtlscertificate.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gtlscertificate.h
Changed
@@ -58,66 +58,66 @@ gpointer padding8; }; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GType g_tls_certificate_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GTlsCertificate *g_tls_certificate_new_from_pem (const gchar *data, gssize length, GError **error); -GLIB_AVAILABLE_IN_2_72 +GIO_AVAILABLE_IN_2_72 GTlsCertificate *g_tls_certificate_new_from_pkcs12 (const guint8 *data, gsize length, const gchar *password, GError **error); -GLIB_AVAILABLE_IN_2_72 +GIO_AVAILABLE_IN_2_72 GTlsCertificate *g_tls_certificate_new_from_file_with_password (const gchar *file, const gchar *password, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GTlsCertificate *g_tls_certificate_new_from_file (const gchar *file, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GTlsCertificate *g_tls_certificate_new_from_files (const gchar *cert_file, const gchar *key_file, GError **error); -GLIB_AVAILABLE_IN_2_68 +GIO_AVAILABLE_IN_2_68 GTlsCertificate *g_tls_certificate_new_from_pkcs11_uris (const gchar *pkcs11_uri, const gchar *private_key_pkcs11_uri, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GList *g_tls_certificate_list_new_from_file (const gchar *file, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GTlsCertificate *g_tls_certificate_get_issuer (GTlsCertificate *cert); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GTlsCertificateFlags g_tls_certificate_verify (GTlsCertificate *cert, GSocketConnectable *identity, GTlsCertificate *trusted_ca); -GLIB_AVAILABLE_IN_2_34 +GIO_AVAILABLE_IN_2_34 gboolean g_tls_certificate_is_same (GTlsCertificate *cert_one, GTlsCertificate *cert_two); -GLIB_AVAILABLE_IN_2_70 +GIO_AVAILABLE_IN_2_70 GDateTime *g_tls_certificate_get_not_valid_before (GTlsCertificate *cert); -GLIB_AVAILABLE_IN_2_70 +GIO_AVAILABLE_IN_2_70 GDateTime *g_tls_certificate_get_not_valid_after (GTlsCertificate *cert); -GLIB_AVAILABLE_IN_2_70 +GIO_AVAILABLE_IN_2_70 gchar *g_tls_certificate_get_subject_name (GTlsCertificate *cert); -GLIB_AVAILABLE_IN_2_70 +GIO_AVAILABLE_IN_2_70 gchar *g_tls_certificate_get_issuer_name (GTlsCertificate *cert); -GLIB_AVAILABLE_IN_2_70 +GIO_AVAILABLE_IN_2_70 GPtrArray *g_tls_certificate_get_dns_names (GTlsCertificate *cert); -GLIB_AVAILABLE_IN_2_70 +GIO_AVAILABLE_IN_2_70 GPtrArray *g_tls_certificate_get_ip_addresses (GTlsCertificate *cert); G_END_DECLS
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gtlsclientconnection.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gtlsclientconnection.h
Changed
@@ -53,33 +53,33 @@ GTlsClientConnection *source); }; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GType g_tls_client_connection_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GIOStream * g_tls_client_connection_new (GIOStream *base_io_stream, GSocketConnectable *server_identity, GError **error); -GLIB_DEPRECATED_IN_2_72 +GIO_DEPRECATED_IN_2_72 GTlsCertificateFlags g_tls_client_connection_get_validation_flags (GTlsClientConnection *conn); -GLIB_DEPRECATED_IN_2_72 +GIO_DEPRECATED_IN_2_72 void g_tls_client_connection_set_validation_flags (GTlsClientConnection *conn, GTlsCertificateFlags flags); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GSocketConnectable *g_tls_client_connection_get_server_identity (GTlsClientConnection *conn); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_tls_client_connection_set_server_identity (GTlsClientConnection *conn, GSocketConnectable *identity); -GLIB_DEPRECATED_IN_2_56 +GIO_DEPRECATED_IN_2_56 gboolean g_tls_client_connection_get_use_ssl3 (GTlsClientConnection *conn); -GLIB_DEPRECATED_IN_2_56 +GIO_DEPRECATED_IN_2_56 void g_tls_client_connection_set_use_ssl3 (GTlsClientConnection *conn, gboolean use_ssl3); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GList * g_tls_client_connection_get_accepted_cas (GTlsClientConnection *conn); -GLIB_AVAILABLE_IN_2_46 +GIO_AVAILABLE_IN_2_46 void g_tls_client_connection_copy_session_state (GTlsClientConnection *conn, GTlsClientConnection *source);
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gtlsconnection.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gtlsconnection.h
Changed
@@ -96,87 +96,87 @@ gpointer padding6; }; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GType g_tls_connection_get_type (void) G_GNUC_CONST; -GLIB_DEPRECATED +GIO_DEPRECATED void g_tls_connection_set_use_system_certdb (GTlsConnection *conn, gboolean use_system_certdb); -GLIB_DEPRECATED +GIO_DEPRECATED gboolean g_tls_connection_get_use_system_certdb (GTlsConnection *conn); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_tls_connection_set_database (GTlsConnection *conn, GTlsDatabase *database); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GTlsDatabase * g_tls_connection_get_database (GTlsConnection *conn); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_tls_connection_set_certificate (GTlsConnection *conn, GTlsCertificate *certificate); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GTlsCertificate *g_tls_connection_get_certificate (GTlsConnection *conn); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_tls_connection_set_interaction (GTlsConnection *conn, GTlsInteraction *interaction); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GTlsInteraction * g_tls_connection_get_interaction (GTlsConnection *conn); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GTlsCertificate *g_tls_connection_get_peer_certificate (GTlsConnection *conn); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GTlsCertificateFlags g_tls_connection_get_peer_certificate_errors (GTlsConnection *conn); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_tls_connection_set_require_close_notify (GTlsConnection *conn, gboolean require_close_notify); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_tls_connection_get_require_close_notify (GTlsConnection *conn); G_GNUC_BEGIN_IGNORE_DEPRECATIONS -GLIB_DEPRECATED_IN_2_60 +GIO_DEPRECATED_IN_2_60 void g_tls_connection_set_rehandshake_mode (GTlsConnection *conn, GTlsRehandshakeMode mode); -GLIB_DEPRECATED_IN_2_60 +GIO_DEPRECATED_IN_2_60 GTlsRehandshakeMode g_tls_connection_get_rehandshake_mode (GTlsConnection *conn); G_GNUC_END_IGNORE_DEPRECATIONS -GLIB_AVAILABLE_IN_2_60 +GIO_AVAILABLE_IN_2_60 void g_tls_connection_set_advertised_protocols (GTlsConnection *conn, const gchar * const *protocols); -GLIB_AVAILABLE_IN_2_60 +GIO_AVAILABLE_IN_2_60 const gchar * g_tls_connection_get_negotiated_protocol (GTlsConnection *conn); G_GNUC_BEGIN_IGNORE_DEPRECATIONS -GLIB_AVAILABLE_IN_2_66 +GIO_AVAILABLE_IN_2_66 gboolean g_tls_connection_get_channel_binding_data (GTlsConnection *conn, GTlsChannelBindingType type, GByteArray *data, GError **error); G_GNUC_END_IGNORE_DEPRECATIONS -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_tls_connection_handshake (GTlsConnection *conn, GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_tls_connection_handshake_async (GTlsConnection *conn, int io_priority, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_tls_connection_handshake_finish (GTlsConnection *conn, GAsyncResult *result, GError **error); -GLIB_AVAILABLE_IN_2_70 +GIO_AVAILABLE_IN_2_70 GTlsProtocolVersion g_tls_connection_get_protocol_version (GTlsConnection *conn); -GLIB_AVAILABLE_IN_2_70 +GIO_AVAILABLE_IN_2_70 gchar * g_tls_connection_get_ciphersuite_name (GTlsConnection *conn); /** @@ -187,7 +187,7 @@ * domains. */ #define G_TLS_ERROR (g_tls_error_quark ()) -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GQuark g_tls_error_quark (void); /** @@ -200,11 +200,11 @@ * Since: 2.66 */ #define G_TLS_CHANNEL_BINDING_ERROR (g_tls_channel_binding_error_quark ()) -GLIB_AVAILABLE_IN_2_66 +GIO_AVAILABLE_IN_2_66 GQuark g_tls_channel_binding_error_quark (void); /*< protected >*/ -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_tls_connection_emit_accept_certificate (GTlsConnection *conn, GTlsCertificate *peer_cert, GTlsCertificateFlags errors);
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gtlsdatabase.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gtlsdatabase.h
Changed
@@ -145,10 +145,10 @@ gpointer padding16; }; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GType g_tls_database_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GTlsCertificateFlags g_tls_database_verify_chain (GTlsDatabase *self, GTlsCertificate *chain, const gchar *purpose, @@ -158,7 +158,7 @@ GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_tls_database_verify_chain_async (GTlsDatabase *self, GTlsCertificate *chain, const gchar *purpose, @@ -169,16 +169,16 @@ GAsyncReadyCallback callback, gpointer user_data); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GTlsCertificateFlags g_tls_database_verify_chain_finish (GTlsDatabase *self, GAsyncResult *result, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gchar* g_tls_database_create_certificate_handle (GTlsDatabase *self, GTlsCertificate *certificate); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GTlsCertificate* g_tls_database_lookup_certificate_for_handle (GTlsDatabase *self, const gchar *handle, GTlsInteraction *interaction, @@ -186,7 +186,7 @@ GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_tls_database_lookup_certificate_for_handle_async (GTlsDatabase *self, const gchar *handle, GTlsInteraction *interaction, @@ -195,12 +195,12 @@ GAsyncReadyCallback callback, gpointer user_data); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GTlsCertificate* g_tls_database_lookup_certificate_for_handle_finish (GTlsDatabase *self, GAsyncResult *result, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GTlsCertificate* g_tls_database_lookup_certificate_issuer (GTlsDatabase *self, GTlsCertificate *certificate, GTlsInteraction *interaction, @@ -208,7 +208,7 @@ GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_tls_database_lookup_certificate_issuer_async (GTlsDatabase *self, GTlsCertificate *certificate, GTlsInteraction *interaction, @@ -217,12 +217,12 @@ GAsyncReadyCallback callback, gpointer user_data); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GTlsCertificate* g_tls_database_lookup_certificate_issuer_finish (GTlsDatabase *self, GAsyncResult *result, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GList* g_tls_database_lookup_certificates_issued_by (GTlsDatabase *self, GByteArray *issuer_raw_dn, GTlsInteraction *interaction, @@ -230,7 +230,7 @@ GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_tls_database_lookup_certificates_issued_by_async (GTlsDatabase *self, GByteArray *issuer_raw_dn, GTlsInteraction *interaction, @@ -239,7 +239,7 @@ GAsyncReadyCallback callback, gpointer user_data); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GList* g_tls_database_lookup_certificates_issued_by_finish (GTlsDatabase *self, GAsyncResult *result, GError **error);
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gtlsfiledatabase.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gtlsfiledatabase.h
Changed
@@ -48,10 +48,10 @@ gpointer padding8; }; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GType g_tls_file_database_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GTlsDatabase* g_tls_file_database_new (const gchar *anchors, GError **error);
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gtlsinteraction.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gtlsinteraction.h
Changed
@@ -91,48 +91,48 @@ gpointer padding21; }; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GType g_tls_interaction_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GTlsInteractionResult g_tls_interaction_invoke_ask_password (GTlsInteraction *interaction, GTlsPassword *password, GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GTlsInteractionResult g_tls_interaction_ask_password (GTlsInteraction *interaction, GTlsPassword *password, GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_tls_interaction_ask_password_async (GTlsInteraction *interaction, GTlsPassword *password, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GTlsInteractionResult g_tls_interaction_ask_password_finish (GTlsInteraction *interaction, GAsyncResult *result, GError **error); -GLIB_AVAILABLE_IN_2_40 +GIO_AVAILABLE_IN_2_40 GTlsInteractionResult g_tls_interaction_invoke_request_certificate (GTlsInteraction *interaction, GTlsConnection *connection, GTlsCertificateRequestFlags flags, GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_2_40 +GIO_AVAILABLE_IN_2_40 GTlsInteractionResult g_tls_interaction_request_certificate (GTlsInteraction *interaction, GTlsConnection *connection, GTlsCertificateRequestFlags flags, GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_2_40 +GIO_AVAILABLE_IN_2_40 void g_tls_interaction_request_certificate_async (GTlsInteraction *interaction, GTlsConnection *connection, GTlsCertificateRequestFlags flags, @@ -140,7 +140,7 @@ GAsyncReadyCallback callback, gpointer user_data); -GLIB_AVAILABLE_IN_2_40 +GIO_AVAILABLE_IN_2_40 GTlsInteractionResult g_tls_interaction_request_certificate_finish (GTlsInteraction *interaction, GAsyncResult *result, GError **error);
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gtlspassword.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gtlspassword.h
Changed
@@ -78,41 +78,41 @@ gpointer padding4; }; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GType g_tls_password_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GTlsPassword * g_tls_password_new (GTlsPasswordFlags flags, const gchar *description); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL const guchar * g_tls_password_get_value (GTlsPassword *password, gsize *length); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_tls_password_set_value (GTlsPassword *password, const guchar *value, gssize length); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_tls_password_set_value_full (GTlsPassword *password, guchar *value, gssize length, GDestroyNotify destroy); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GTlsPasswordFlags g_tls_password_get_flags (GTlsPassword *password); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_tls_password_set_flags (GTlsPassword *password, GTlsPasswordFlags flags); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL const gchar* g_tls_password_get_description (GTlsPassword *password); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_tls_password_set_description (GTlsPassword *password, const gchar *description); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL const gchar * g_tls_password_get_warning (GTlsPassword *password); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_tls_password_set_warning (GTlsPassword *password, const gchar *warning);
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gtlsserverconnection.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gtlsserverconnection.h
Changed
@@ -58,10 +58,10 @@ }; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GType g_tls_server_connection_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GIOStream * g_tls_server_connection_new (GIOStream *base_io_stream, GTlsCertificate *certificate, GError **error);
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gunixconnection.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gunixconnection.c
Changed
@@ -177,10 +177,11 @@ gint i; g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, - ngettext("Expecting 1 control message, got %d", - "Expecting 1 control message, got %d", - nscm), - nscm); + g_dngettext (NULL, + "Expecting 1 control message, got %d", + "Expecting 1 control message, got %d", + nscm), + nscm); for (i = 0; i < nscm; i++) g_object_unref (scmsi); @@ -211,9 +212,10 @@ gint i; g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, - ngettext("Expecting one fd, but got %d\n", - "Expecting one fd, but got %d\n", - nfd), + g_dngettext (NULL, + "Expecting one fd, but got %d\n", + "Expecting one fd, but got %d\n", + nfd), nfd); for (i = 0; i < nfd; i++) @@ -595,9 +597,10 @@ g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, - ngettext("Expecting 1 control message, got %d", - "Expecting 1 control message, got %d", - nscm), + g_dngettext (NULL, + "Expecting 1 control message, got %d", + "Expecting 1 control message, got %d", + nscm), nscm); goto out; }
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gunixconnection.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gunixconnection.h
Changed
@@ -56,43 +56,43 @@ GUnixConnectionPrivate *priv; }; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GType g_unix_connection_get_type (void); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_unix_connection_send_fd (GUnixConnection *connection, gint fd, GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gint g_unix_connection_receive_fd (GUnixConnection *connection, GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_unix_connection_send_credentials (GUnixConnection *connection, GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 void g_unix_connection_send_credentials_async (GUnixConnection *connection, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 gboolean g_unix_connection_send_credentials_finish (GUnixConnection *connection, GAsyncResult *result, GError **error); -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 GCredentials *g_unix_connection_receive_credentials (GUnixConnection *connection, GCancellable *cancellable, GError **error); -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 void g_unix_connection_receive_credentials_async (GUnixConnection *connection, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GCredentials *g_unix_connection_receive_credentials_finish (GUnixConnection *connection, GAsyncResult *result, GError **error);
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gunixcredentialsmessage.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gunixcredentialsmessage.h
Changed
@@ -72,16 +72,16 @@ GUnixCredentialsMessagePrivate *priv; }; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GType g_unix_credentials_message_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GSocketControlMessage *g_unix_credentials_message_new (void); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GSocketControlMessage *g_unix_credentials_message_new_with_credentials (GCredentials *credentials); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GCredentials *g_unix_credentials_message_get_credentials (GUnixCredentialsMessage *message); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_unix_credentials_message_is_supported (void); G_END_DECLS
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gunixfdlist.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gunixfdlist.h
Changed
@@ -63,32 +63,32 @@ GUnixFDListPrivate *priv; }; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GType g_unix_fd_list_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GUnixFDList * g_unix_fd_list_new (void); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GUnixFDList * g_unix_fd_list_new_from_array (const gint *fds, gint n_fds); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gint g_unix_fd_list_append (GUnixFDList *list, gint fd, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gint g_unix_fd_list_get_length (GUnixFDList *list); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gint g_unix_fd_list_get (GUnixFDList *list, gint index_, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL const gint * g_unix_fd_list_peek_fds (GUnixFDList *list, gint *length); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gint * g_unix_fd_list_steal_fds (GUnixFDList *list, gint *length);
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gunixfdmessage.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gunixfdmessage.h
Changed
@@ -63,20 +63,20 @@ GUnixFDMessagePrivate *priv; }; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GType g_unix_fd_message_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GSocketControlMessage * g_unix_fd_message_new_with_fd_list (GUnixFDList *fd_list); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GSocketControlMessage * g_unix_fd_message_new (void); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GUnixFDList * g_unix_fd_message_get_fd_list (GUnixFDMessage *message); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gint * g_unix_fd_message_steal_fds (GUnixFDMessage *message, gint *length); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_unix_fd_message_append_fd (GUnixFDMessage *message, gint fd, GError **error);
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gunixinputstream.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gunixinputstream.h
Changed
@@ -66,18 +66,18 @@ void (*_g_reserved5) (void); }; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GType g_unix_input_stream_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GInputStream * g_unix_input_stream_new (gint fd, gboolean close_fd); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_unix_input_stream_set_close_fd (GUnixInputStream *stream, gboolean close_fd); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_unix_input_stream_get_close_fd (GUnixInputStream *stream); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gint g_unix_input_stream_get_fd (GUnixInputStream *stream); G_END_DECLS
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gunixmounts.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gunixmounts.c
Changed
@@ -266,10 +266,12 @@ "/var", "/var/crash", "/var/local", + GLIB_LOCALSTATEDIR, "/var/log", "/var/log/audit", /* https://bugzilla.redhat.com/show_bug.cgi?id=333041 */ "/var/mail", "/var/run", + GLIB_RUNSTATEDIR, "/var/tmp", /* https://bugzilla.redhat.com/show_bug.cgi?id=335241 */ "/proc", "/sbin", @@ -583,7 +585,7 @@ read_file = get_mtab_read_file (); - file = setmntent (read_file, "r"); + file = setmntent (read_file, "re"); if (file == NULL) return NULL; @@ -725,7 +727,7 @@ read_file = get_mtab_read_file (); - file = setmntent (read_file, "r"); + file = setmntent (read_file, "re"); if (file == NULL) return NULL; @@ -1112,7 +1114,7 @@ read_file = get_fstab_file (); - file = setmntent (read_file, "r"); + file = setmntent (read_file, "re"); if (file == NULL) return NULL; @@ -1201,7 +1203,7 @@ read_file = get_fstab_file (); - file = setmntent (read_file, "r"); + file = setmntent (read_file, "re"); if (file == NULL) return NULL; @@ -1376,7 +1378,7 @@ read_file = get_fstab_file (); - file = setmntent (read_file, "r"); + file = setmntent (read_file, "re"); if (file == NULL) return NULL; @@ -3164,7 +3166,7 @@ /* see if device with similar major:minor as /dev/root is mention * in /etc/mtab (it usually is) */ - f = fopen ("/etc/mtab", "r"); + f = fopen ("/etc/mtab", "re"); if (f != NULL) { struct mntent *entp;
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gunixmounts.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gunixmounts.h
Changed
@@ -36,7 +36,7 @@ typedef struct _GUnixMountEntry GUnixMountEntry; #define G_TYPE_UNIX_MOUNT_ENTRY (g_unix_mount_entry_get_type ()) -GLIB_AVAILABLE_IN_2_54 +GIO_AVAILABLE_IN_2_54 GType g_unix_mount_entry_get_type (void) G_GNUC_CONST; /** @@ -48,7 +48,7 @@ typedef struct _GUnixMountPoint GUnixMountPoint; #define G_TYPE_UNIX_MOUNT_POINT (g_unix_mount_point_get_type ()) -GLIB_AVAILABLE_IN_2_54 +GIO_AVAILABLE_IN_2_54 GType g_unix_mount_point_get_type (void) G_GNUC_CONST; /** @@ -66,105 +66,105 @@ #define G_IS_UNIX_MOUNT_MONITOR_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_UNIX_MOUNT_MONITOR)) G_DEFINE_AUTOPTR_CLEANUP_FUNC(GUnixMountMonitor, g_object_unref) -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_unix_mount_free (GUnixMountEntry *mount_entry); -GLIB_AVAILABLE_IN_2_54 +GIO_AVAILABLE_IN_2_54 GUnixMountEntry *g_unix_mount_copy (GUnixMountEntry *mount_entry); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_unix_mount_point_free (GUnixMountPoint *mount_point); -GLIB_AVAILABLE_IN_2_54 +GIO_AVAILABLE_IN_2_54 GUnixMountPoint *g_unix_mount_point_copy (GUnixMountPoint *mount_point); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gint g_unix_mount_compare (GUnixMountEntry *mount1, GUnixMountEntry *mount2); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL const char * g_unix_mount_get_mount_path (GUnixMountEntry *mount_entry); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL const char * g_unix_mount_get_device_path (GUnixMountEntry *mount_entry); -GLIB_AVAILABLE_IN_2_60 +GIO_AVAILABLE_IN_2_60 const char * g_unix_mount_get_root_path (GUnixMountEntry *mount_entry); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL const char * g_unix_mount_get_fs_type (GUnixMountEntry *mount_entry); -GLIB_AVAILABLE_IN_2_58 +GIO_AVAILABLE_IN_2_58 const char * g_unix_mount_get_options (GUnixMountEntry *mount_entry); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_unix_mount_is_readonly (GUnixMountEntry *mount_entry); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_unix_mount_is_system_internal (GUnixMountEntry *mount_entry); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_unix_mount_guess_can_eject (GUnixMountEntry *mount_entry); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_unix_mount_guess_should_display (GUnixMountEntry *mount_entry); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL char * g_unix_mount_guess_name (GUnixMountEntry *mount_entry); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GIcon * g_unix_mount_guess_icon (GUnixMountEntry *mount_entry); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GIcon * g_unix_mount_guess_symbolic_icon (GUnixMountEntry *mount_entry); G_DEFINE_AUTOPTR_CLEANUP_FUNC(GUnixMountEntry, g_unix_mount_free) G_DEFINE_AUTOPTR_CLEANUP_FUNC(GUnixMountPoint, g_unix_mount_point_free) -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gint g_unix_mount_point_compare (GUnixMountPoint *mount1, GUnixMountPoint *mount2); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL const char * g_unix_mount_point_get_mount_path (GUnixMountPoint *mount_point); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL const char * g_unix_mount_point_get_device_path (GUnixMountPoint *mount_point); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL const char * g_unix_mount_point_get_fs_type (GUnixMountPoint *mount_point); -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 const char * g_unix_mount_point_get_options (GUnixMountPoint *mount_point); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_unix_mount_point_is_readonly (GUnixMountPoint *mount_point); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_unix_mount_point_is_user_mountable (GUnixMountPoint *mount_point); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_unix_mount_point_is_loopback (GUnixMountPoint *mount_point); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_unix_mount_point_guess_can_eject (GUnixMountPoint *mount_point); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL char * g_unix_mount_point_guess_name (GUnixMountPoint *mount_point); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GIcon * g_unix_mount_point_guess_icon (GUnixMountPoint *mount_point); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GIcon * g_unix_mount_point_guess_symbolic_icon (GUnixMountPoint *mount_point); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GList * g_unix_mount_points_get (guint64 *time_read); -GLIB_AVAILABLE_IN_2_66 +GIO_AVAILABLE_IN_2_66 GUnixMountPoint *g_unix_mount_point_at (const char *mount_path, guint64 *time_read); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GList * g_unix_mounts_get (guint64 *time_read); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GUnixMountEntry *g_unix_mount_at (const char *mount_path, guint64 *time_read); -GLIB_AVAILABLE_IN_2_52 +GIO_AVAILABLE_IN_2_52 GUnixMountEntry *g_unix_mount_for (const char *file_path, guint64 *time_read); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_unix_mounts_changed_since (guint64 time); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_unix_mount_points_changed_since (guint64 time); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GType g_unix_mount_monitor_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_2_44 +GIO_AVAILABLE_IN_2_44 GUnixMountMonitor *g_unix_mount_monitor_get (void); -GLIB_DEPRECATED_IN_2_44_FOR(g_unix_mount_monitor_get) +GIO_DEPRECATED_IN_2_44_FOR(g_unix_mount_monitor_get) GUnixMountMonitor *g_unix_mount_monitor_new (void); -GLIB_DEPRECATED_IN_2_44 +GIO_DEPRECATED_IN_2_44 void g_unix_mount_monitor_set_rate_limit (GUnixMountMonitor *mount_monitor, int limit_msec); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_unix_is_mount_path_system_internal (const char *mount_path); -GLIB_AVAILABLE_IN_2_56 +GIO_AVAILABLE_IN_2_56 gboolean g_unix_is_system_fs_type (const char *fs_type); -GLIB_AVAILABLE_IN_2_56 +GIO_AVAILABLE_IN_2_56 gboolean g_unix_is_system_device_path (const char *device_path); G_END_DECLS
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gunixoutputstream.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gunixoutputstream.h
Changed
@@ -66,18 +66,18 @@ void (*_g_reserved5) (void); }; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GType g_unix_output_stream_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GOutputStream * g_unix_output_stream_new (gint fd, gboolean close_fd); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_unix_output_stream_set_close_fd (GUnixOutputStream *stream, gboolean close_fd); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_unix_output_stream_get_close_fd (GUnixOutputStream *stream); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gint g_unix_output_stream_get_fd (GUnixOutputStream *stream); G_END_DECLS
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gunixsocketaddress.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gunixsocketaddress.h
Changed
@@ -54,28 +54,28 @@ GSocketAddressClass parent_class; }; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GType g_unix_socket_address_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GSocketAddress *g_unix_socket_address_new (const gchar *path); -GLIB_DEPRECATED_FOR(g_unix_socket_address_new_with_type) +GIO_DEPRECATED_FOR(g_unix_socket_address_new_with_type) GSocketAddress *g_unix_socket_address_new_abstract (const gchar *path, gint path_len); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GSocketAddress *g_unix_socket_address_new_with_type (const gchar *path, gint path_len, GUnixSocketAddressType type); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL const char * g_unix_socket_address_get_path (GUnixSocketAddress *address); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gsize g_unix_socket_address_get_path_len (GUnixSocketAddress *address); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GUnixSocketAddressType g_unix_socket_address_get_address_type (GUnixSocketAddress *address); -GLIB_DEPRECATED +GIO_DEPRECATED gboolean g_unix_socket_address_get_is_abstract (GUnixSocketAddress *address); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_unix_socket_address_abstract_names_supported (void); G_END_DECLS
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gvfs.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gvfs.h
Changed
@@ -128,30 +128,30 @@ void (*_g_reserved6) (void); }; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GType g_vfs_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_vfs_is_active (GVfs *vfs); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GFile * g_vfs_get_file_for_path (GVfs *vfs, const char *path); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GFile * g_vfs_get_file_for_uri (GVfs *vfs, const char *uri); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL const gchar* const * g_vfs_get_supported_uri_schemes (GVfs *vfs); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GFile * g_vfs_parse_name (GVfs *vfs, const char *parse_name); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GVfs * g_vfs_get_default (void); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GVfs * g_vfs_get_local (void); -GLIB_AVAILABLE_IN_2_50 +GIO_AVAILABLE_IN_2_50 gboolean g_vfs_register_uri_scheme (GVfs *vfs, const char *scheme, GVfsFileLookupFunc uri_func, @@ -160,7 +160,7 @@ GVfsFileLookupFunc parse_name_func, gpointer parse_name_data, GDestroyNotify parse_name_destroy); -GLIB_AVAILABLE_IN_2_50 +GIO_AVAILABLE_IN_2_50 gboolean g_vfs_unregister_uri_scheme (GVfs *vfs, const char *scheme);
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gvolume.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gvolume.h
Changed
@@ -39,7 +39,7 @@ * * Deprecated: 2.58: Do not use, HAL is deprecated. */ -#define G_VOLUME_IDENTIFIER_KIND_HAL_UDI "hal-udi" GLIB_DEPRECATED_MACRO_IN_2_58 +#define G_VOLUME_IDENTIFIER_KIND_HAL_UDI "hal-udi" GIO_DEPRECATED_MACRO_IN_2_58 /** * G_VOLUME_IDENTIFIER_KIND_UNIX_DEVICE: @@ -183,71 +183,71 @@ GIcon * (* get_symbolic_icon) (GVolume *volume); }; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GType g_volume_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL char * g_volume_get_name (GVolume *volume); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GIcon * g_volume_get_icon (GVolume *volume); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GIcon * g_volume_get_symbolic_icon (GVolume *volume); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL char * g_volume_get_uuid (GVolume *volume); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GDrive * g_volume_get_drive (GVolume *volume); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GMount * g_volume_get_mount (GVolume *volume); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_volume_can_mount (GVolume *volume); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_volume_can_eject (GVolume *volume); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_volume_should_automount (GVolume *volume); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_volume_mount (GVolume *volume, GMountMountFlags flags, GMountOperation *mount_operation, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_volume_mount_finish (GVolume *volume, GAsyncResult *result, GError **error); -GLIB_DEPRECATED_FOR(g_volume_eject_with_operation) +GIO_DEPRECATED_FOR(g_volume_eject_with_operation) void g_volume_eject (GVolume *volume, GMountUnmountFlags flags, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); -GLIB_DEPRECATED_FOR(g_volume_eject_with_operation_finish) +GIO_DEPRECATED_FOR(g_volume_eject_with_operation_finish) gboolean g_volume_eject_finish (GVolume *volume, GAsyncResult *result, GError **error); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL char * g_volume_get_identifier (GVolume *volume, const char *kind); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL char ** g_volume_enumerate_identifiers (GVolume *volume); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GFile * g_volume_get_activation_root (GVolume *volume); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_volume_eject_with_operation (GVolume *volume, GMountUnmountFlags flags, GMountOperation *mount_operation, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_volume_eject_with_operation_finish (GVolume *volume, GAsyncResult *result, GError **error); -GLIB_AVAILABLE_IN_2_32 +GIO_AVAILABLE_IN_2_32 const gchar *g_volume_get_sort_key (GVolume *volume); G_END_DECLS
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gvolumemonitor.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gvolumemonitor.h
Changed
@@ -130,25 +130,25 @@ void (*_g_reserved6) (void); }; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GType g_volume_monitor_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GVolumeMonitor *g_volume_monitor_get (void); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GList * g_volume_monitor_get_connected_drives (GVolumeMonitor *volume_monitor); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GList * g_volume_monitor_get_volumes (GVolumeMonitor *volume_monitor); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GList * g_volume_monitor_get_mounts (GVolumeMonitor *volume_monitor); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GVolume * g_volume_monitor_get_volume_for_uuid (GVolumeMonitor *volume_monitor, const char *uuid); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GMount * g_volume_monitor_get_mount_for_uuid (GVolumeMonitor *volume_monitor, const char *uuid); -GLIB_DEPRECATED +GIO_DEPRECATED GVolume * g_volume_monitor_adopt_orphan_mount (GMount *mount); G_END_DECLS
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gwin32api-package.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gwin32api-package.h
Changed
@@ -4,15 +4,42 @@ * * This file is part of the w64 mingw-runtime package. * No warranty is given; refer to https://github.com/kinke/mingw-w64-crt/blob/master/DISCLAIMER.PD. + * + * Additional code derived from the windows-rs repository on GitHub + * (https://github.com/microsoft/windows-rs) with the MIT license: + * + * MIT License + * + * Copyright (c) Microsoft Corporation. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE */ typedef interface IPackageManager IPackageManager; typedef interface IPackage IPackage; typedef interface IPackageId IPackageId; typedef interface IPackageVersion IPackageVersion; +typedef interface IPackage2 IPackage2; DEFINE_GUID(IID_IPackageManager, 0x9A7D4B65, 0x5E8F, 0x4FC7, 0xA2, 0xE5, 0x7F, 0x69, 0x25, 0xCB, 0x8B, 0x53); DEFINE_GUID(IID_IPackage, 0x163C792F, 0xBD75, 0x413C, 0xBF, 0x23, 0xB1, 0xFE, 0x7B, 0x95, 0xD8, 0x25); +DEFINE_GUID(IID_IPackage2, 0xA6612fb6, 0x7688, 0x4ACE, 0x95, 0xFB, 0x35, 0x95, 0x38, 0xE7, 0xAA, 0x01); /* IPackageManager */ typedef struct IPackageManagerVtbl { @@ -270,3 +297,86 @@ #define IPackage_get_InstalledLocation(This,value) (This)->lpVtbl->get_InstalledLocation(This,value) #define IPackage_get_IsFramework(This,value) (This)->lpVtbl->get_IsFramework(This,value) #define IPackage_get_Dependencies(This,value) (This)->lpVtbl->get_Dependencies(This,value) + +/* IPackage2 */ +typedef struct IPackage2Vtbl { + BEGIN_INTERFACE + + /*** IUnknown methods ***/ + HRESULT (STDMETHODCALLTYPE *QueryInterface)( + IPackage2 *This, + REFIID riid, + void **ppvObject); + + ULONG (STDMETHODCALLTYPE *AddRef)( + IPackage2 *This); + + ULONG (STDMETHODCALLTYPE *Release)( + IPackage2 *This); + + /*** IInspectable methods ***/ + HRESULT (STDMETHODCALLTYPE *GetIids)( + IPackage2 *This, + UINT32 *count, + IID **ids); + + HRESULT (STDMETHODCALLTYPE *GetRuntimeClassName)( + IPackage2 *This, + HSTRING *className); + + HRESULT (STDMETHODCALLTYPE *GetTrustLevel)( + IPackage2 *This, + TrustLevel *trustLevel); + + /*** IPackage2 methods ***/ + HRESULT (STDMETHODCALLTYPE *get_DisplayName)( + IPackage2 *This, + HSTRING *value); + + HRESULT (STDMETHODCALLTYPE *get_PublisherDisplayName)( + IPackage2 *This, + HSTRING *value); + + HRESULT (STDMETHODCALLTYPE *get_Description)( + IPackage2 *This, + HSTRING *value); + + HRESULT (STDMETHODCALLTYPE *get_Logo)( + IPackage2 *This, + void **value); + + HRESULT (STDMETHODCALLTYPE *get_IsResourcePackage)( + IPackage2 *This, + UCHAR *value); + + HRESULT (STDMETHODCALLTYPE *get_IsBundle)( + IPackage2 *This, + UCHAR *value); + + HRESULT (STDMETHODCALLTYPE *get_IsDevelopmentMode)( + IPackage2 *This, + UCHAR *value); + + END_INTERFACE +} IPackage2Vtbl; + +interface IPackage2 { + CONST_VTBL IPackage2Vtbl* lpVtbl; +}; + +/*** IUnknown methods ***/ +#define IPackage2_QueryInterface(This,riid,ppvObject) (This)->lpVtbl->QueryInterface(This,riid,ppvObject) +#define IPackage2_AddRef(This) (This)->lpVtbl->AddRef(This) +#define IPackage2_Release(This) (This)->lpVtbl->Release(This) +/*** IInspectable methods ***/ +#define IPackage2_GetIids(This,count,ids) (This)->lpVtbl->GetIids(This,count,ids) +#define IPackage2_GetRuntimeClassName(This,name) (This)->lpVtbl->GetRuntimeClassName(This,name) +#define IPackage2_GetTrustLevel(This,level) (This)->lpVtbl->GetTrustLevel(This,level) +/*** IPackage2 methods ***/ +#define IPackage2_get_DisplayName(This,value) (This)->lpVtbl->get_DisplayName(This,value) +#define IPackage2_get_PublisherDisplayName(This,value) (This)->lpVtbl->get_PublisherDisplayName(This,value) +#define IPackage2_get_Description(This,value) (This)->lpVtbl->get_Description(This,value) +#define IPackage2_get_Logo(This,value) (This)->lpVtbl->get_Logo(This,value) +#define IPackage2_get_IsResourcePackage(This,value) (This)->lpVtbl->get_IsResourcePackage(This,value) +#define IPackage2_get_IsBundle(This,value) (This)->lpVtbl->get_IsBundle(This,value) +#define IPackage2_get_IsDevelopmentMode(This,value) (This)->lpVtbl->get_IsDevelopmentMode(This,value)
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gwin32appinfo.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gwin32appinfo.c
Changed
@@ -858,7 +858,7 @@ if (output == NULL) return FALSE; - G_VA_COPY (lentest, components); + va_copy (lentest, components); for (length = 0, component = va_arg (lentest, gunichar2 *); component != NULL; @@ -3100,6 +3100,9 @@ if (handler_verb->app != NULL) continue; + if (handler_verb->executable_folded == NULL) + continue; + handler_exe_basename = g_utf8_find_basename (handler_verb->executable_folded, -1); g_hash_table_iter_init (&app_iter, apps_by_id); @@ -3119,6 +3122,9 @@ const gchar *app_exe_basename; app_verb = _verb_idx (app->verbs, ai); + if (app_verb->executable_folded == NULL) + continue; + app_exe_basename = g_utf8_find_basename (app_verb->executable_folded, -1); /* First check that the executable paths are identical */ @@ -3356,6 +3362,7 @@ uwp_package_cb (gpointer user_data, const gunichar2 *full_package_name, const gunichar2 *package_name, + const gunichar2 *display_name, const gunichar2 *app_user_model_id, gboolean show_in_applist, GPtrArray *supported_extgroups, @@ -3384,6 +3391,13 @@ FALSE, TRUE); + if (!app->pretty_name && !app->pretty_name_u8 && display_name) + { + char *display_name_u8 = g_utf16_to_utf8 (display_name, -1, NULL, NULL, NULL); + app->pretty_name = g_wcsdup (display_name, -1); + app->pretty_name_u8 = g_steal_pointer (&display_name_u8); + } + extensions_considered = 0; for (i = 0; i < supported_extgroups->len; i++) @@ -4334,10 +4348,25 @@ case '8': case '9': /* TODO: handle 'l' and 'd' differently (longname and desktop name) */ - if (obj->uri) - result = g_strdup (obj->uri); - else if (obj->file) - result = g_strdup (obj->file); + if (obj->file) + { + result = g_strdup (obj->file); + } + else if (obj->uri) + { + const char *prefix = "file:///"; + const size_t prefix_len = strlen (prefix); + + if (g_str_has_prefix (obj->uri, prefix) && obj->uriprefix_len != 0) + { + GFile *file = g_file_new_for_uri (obj->uri); + result = g_file_get_path (file); + g_object_unref (file); + } + + if (!result) + result = g_strdup (obj->uri); + } break; case 'u': case 'U': @@ -4865,81 +4894,68 @@ } } +typedef enum +{ + /* PLAIN: just open the application, without arguments of any kind + * corresponds to: LaunchActivatedEventArgs */ + UWP_ACTIVATION_TYPE_PLAIN, + + /* FILE: open the applications passing a set of files + * corresponds to: FileActivatedEventArgs */ + UWP_ACTIVATION_TYPE_FILE, + + /* PROTOCOL: open the application passing a URI which describe an + app activity + * corresponds to: ProtocolActivatedEventArgs */ + UWP_ACTIVATION_TYPE_PROTOCOL, +} UwpActivationType; + static gboolean -g_win32_app_info_launch_uwp_internal (GWin32AppInfo *info, - gboolean for_files, - IShellItemArray *items, - GWin32AppInfoShellVerb *shverb, - GAppLaunchContext *launch_context, - GTask *from_task, - GError **error) +g_win32_app_info_launch_uwp_single (IApplicationActivationManager *app_activation_manager, + UwpActivationType activation_type, + IShellItemArray *items, + const wchar_t *verb, + GWin32AppInfo *info, + GAppLaunchContext *launch_context, + GTask *from_task, + GError **error) { - IApplicationActivationManager* paam = NULL; - gboolean com_initialized = FALSE; - gboolean result = FALSE; + const wchar_t *canonical_name = (const wchar_t *) info->app->canonical_name; DWORD process_id = 0; - HRESULT hr; - const wchar_t *app_canonical_name = (const wchar_t *) info->app->canonical_name; - - /* ApplicationActivationManager threading model is both, - * prefer the multithreaded apartment type, as we don't - * need anything of the STA here. */ - hr = CoInitializeEx (NULL, COINIT_MULTITHREADED); - if (SUCCEEDED (hr)) - com_initialized = TRUE; - else if (hr != RPC_E_CHANGED_MODE) - { - g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, - "Failed to initialize the COM support library for the thread: 0x%lx", hr); - goto cleanup; - } - - /* It's best to instantiate ApplicationActivationManager out-of-proc, - * as documented on MSDN: - * - * An IApplicationActivationManager object creates a thread in its - * host process to serve any activated event arguments objects - * (LaunchActivatedEventArgs, FileActivatedEventArgs, and Protocol- - * ActivatedEventArgs) that are passed to the app. If the calling - * process is long-lived, you can create this object in-proc, - * based on the assumption that the event arguments will exist long - * enough for the target app to use them. - * However, if the calling process is spawned only to launch the - * target app, it should create the IApplicationActivationManager - * object out-of-process, by using CLSCTX_LOCAL_SERVER. This causes - * the object to be created in a Dllhost instance that automatically - * manages the object's lifetime based on outstanding references to - * the activated event argument objects. - */ - hr = CoCreateInstance (&CLSID_ApplicationActivationManager, NULL, - CLSCTX_LOCAL_SERVER, - &IID_IApplicationActivationManager, (void **) &paam); - if (FAILED (hr)) - { - g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, - "Failed to create ApplicationActivationManager: 0x%lx", hr); - goto cleanup; - } + HRESULT hr = S_OK; emit_launch_started (launch_context, info, from_task); /* The Activate methods return a process identifier (PID), so we should consider * those methods as potentially blocking */ - if (items == NULL) - hr = IApplicationActivationManager_ActivateApplication (paam, - app_canonical_name, - NULL, AO_NONE, - &process_id); - else if (for_files) - hr = IApplicationActivationManager_ActivateForFile (paam, - app_canonical_name, - items, shverb->verb_name, - &process_id); - else - hr = IApplicationActivationManager_ActivateForProtocol (paam, - app_canonical_name, - items, - &process_id); + + switch (activation_type) + { + case UWP_ACTIVATION_TYPE_PLAIN: + g_assert (items == NULL); + + hr = IApplicationActivationManager_ActivateApplication (app_activation_manager, + canonical_name, + NULL, AO_NONE, + &process_id); + break; + case UWP_ACTIVATION_TYPE_PROTOCOL: + g_assert (items != NULL); + + hr = IApplicationActivationManager_ActivateForProtocol (app_activation_manager, + canonical_name, + items, + &process_id); + break; + case UWP_ACTIVATION_TYPE_FILE: + g_assert (items != NULL); + + hr = IApplicationActivationManager_ActivateForFile (app_activation_manager, + canonical_name, + items, verb, + &process_id); + break; + } if (FAILED (hr)) { @@ -4949,9 +4965,10 @@ emit_launch_failed (launch_context, info, from_task); - goto cleanup; + return FALSE; } - else if (launch_context) + + if (launch_context) { DWORD access_rights = 0; HANDLE process_handle = NULL; @@ -4999,7 +5016,150 @@ g_spawn_close_pid ((GPid) process_handle); } - result = TRUE; + return TRUE; +} + +static gboolean +g_win32_app_info_supports_files (GAppInfo *appinfo); + +static IShellItemArray * +make_item_array (gboolean for_files, + GList *objs, + GError **error); + +static inline GList +make_single_entry_list (gpointer data) +{ + GList l = { NULL, NULL, NULL }; + l.data = data; + + return l; +} + +static gboolean +g_win32_app_info_launch_uwp_internal (GWin32AppInfo *info, + gboolean for_files, + GList *objs, /* (element-type file_or_uri) */ + GWin32AppInfoShellVerb *shverb, + GAppLaunchContext *launch_context, + GTask *from_task, + GError **error) +{ + IApplicationActivationManager *paam = NULL; + gboolean com_initialized = FALSE; + gboolean result = FALSE; + HRESULT hr; + + /* ApplicationActivationManager threading model is both, + * prefer the multithreaded apartment type, as we don't + * need anything of the STA here. */ + hr = CoInitializeEx (NULL, COINIT_MULTITHREADED); + if (SUCCEEDED (hr)) + com_initialized = TRUE; + else if (hr != RPC_E_CHANGED_MODE) + { + g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, + "Failed to initialize the COM support library for the thread: 0x%lx", hr); + goto cleanup; + } + + /* It's best to instantiate ApplicationActivationManager out-of-proc, + * as documented on MSDN: + * + * An IApplicationActivationManager object creates a thread in its + * host process to serve any activated event arguments objects + * (LaunchActivatedEventArgs, FileActivatedEventArgs, and Protocol- + * ActivatedEventArgs) that are passed to the app. If the calling + * process is long-lived, you can create this object in-proc, + * based on the assumption that the event arguments will exist long + * enough for the target app to use them. + * However, if the calling process is spawned only to launch the + * target app, it should create the IApplicationActivationManager + * object out-of-process, by using CLSCTX_LOCAL_SERVER. This causes + * the object to be created in a Dllhost instance that automatically + * manages the object's lifetime based on outstanding references to + * the activated event argument objects. + */ + hr = CoCreateInstance (&CLSID_ApplicationActivationManager, NULL, + CLSCTX_LOCAL_SERVER, + &IID_IApplicationActivationManager, (void **) &paam); + if (FAILED (hr)) + { + g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, + "Failed to create ApplicationActivationManager: 0x%lx", hr); + goto cleanup; + } + + if (!objs) + { + result = g_win32_app_info_launch_uwp_single (paam, UWP_ACTIVATION_TYPE_PLAIN, NULL, NULL, + info, launch_context, from_task, error); + } + else if (for_files) + { + IShellItemArray *items = make_item_array (TRUE, objs, error); + + if (!items) + goto cleanup; + + result = g_win32_app_info_launch_uwp_single (paam, UWP_ACTIVATION_TYPE_FILE, items, + shverb->verb_name, + info, launch_context, from_task, error); + + IShellItemArray_Release (items); + } + else + { + gboolean supports_files; + gboolean supports_file_uris; + gboolean outcome = TRUE; + GList *l; + + supports_files = g_win32_app_info_supports_files (G_APP_INFO (info)); + supports_file_uris = info->app && + info->app->supported_urls && + g_hash_table_lookup (info->app->supported_urls, "file"); + + for (l = objs; l != NULL; l = l->next) + { + file_or_uri *obj = (file_or_uri*) l->data; + GList single = make_single_entry_list (obj); + IShellItemArray *item = NULL; + UwpActivationType type; + + /* Most UWP applications support opening files but do not support + * the file:// protocol in URI's. That's because the UWP platform + * has a specific activation for files (see FileActivatedEventArgs) + * which is different from protocol activation. Here we check for + * that. */ + + if (!supports_file_uris && supports_files && obj->file) + { + type = UWP_ACTIVATION_TYPE_FILE; + item = make_item_array (TRUE, &single, error); + } + else + { + type = UWP_ACTIVATION_TYPE_PROTOCOL; + item = make_item_array (FALSE, &single, error); + } + + if (!item) + { + outcome = FALSE; + continue; + } + + if (!g_win32_app_info_launch_uwp_single (paam, type, + item, shverb->verb_name, info, + launch_context, from_task, error)) + outcome = FALSE; + + IShellItemArray_Release (item); + } + + result = outcome; + } cleanup: @@ -5021,9 +5181,8 @@ static gboolean g_win32_app_info_launch_internal (GWin32AppInfo *info, - GList *objs, /* non-UWP only */ + GList *objs, /* (element-type file_or_uri) */ gboolean for_files, /* UWP only */ - IShellItemArray *items, /* UWP only */ GAppLaunchContext *launch_context, GSpawnFlags spawn_flags, GTask *from_task, @@ -5068,7 +5227,7 @@ if (info->app->is_uwp) return g_win32_app_info_launch_uwp_internal (info, for_files, - items, + objs, shverb, launch_context, from_task, @@ -5228,7 +5387,7 @@ static IShellItemArray * make_item_array (gboolean for_files, - GList *files_or_uris, + GList *objs, /* (element-type file_or_uri) */ GError **error) { ITEMIDLIST **item_ids; @@ -5238,19 +5397,20 @@ gsize i; HRESULT hr; - count = g_list_length (files_or_uris); + count = g_list_length (objs); items = NULL; item_ids = g_new (ITEMIDLIST*, count); - for (i = 0, p = files_or_uris; p != NULL; p = p->next, i++) + for (i = 0, p = objs; p != NULL; p = p->next, i++) { + file_or_uri *obj = (file_or_uri*) p->data; wchar_t *file_or_uri_utf16; if (!for_files) - file_or_uri_utf16 = g_utf8_to_utf16 ((gchar *) p->data, -1, NULL, NULL, error); + file_or_uri_utf16 = g_utf8_to_utf16 (obj->uri, -1, NULL, NULL, error); else - file_or_uri_utf16 = g_utf8_to_utf16 (g_file_peek_path (G_FILE (p->data)), -1, NULL, NULL, error); + file_or_uri_utf16 = g_utf8_to_utf16 (obj->file, -1, NULL, NULL, error); if (file_or_uri_utf16 == NULL) break; @@ -5283,14 +5443,18 @@ } hr = SHParseDisplayName (file_or_uri_utf16, NULL, &item_idsi, 0, NULL); - g_free (file_or_uri_utf16); if (FAILED (hr)) { g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, - "File or URI `%S' cannot be parsed by SHParseDisplayName: 0x%lx", file_or_uri_utf16, hr); + "File or URI `%S' cannot be parsed by SHParseDisplayName: 0x%lx", + file_or_uri_utf16, hr); + + g_free (file_or_uri_utf16); break; } + + g_free (file_or_uri_utf16); } if (i == count) @@ -5317,38 +5481,19 @@ static gboolean g_win32_app_info_launch_uris_impl (GAppInfo *appinfo, - GList *uris, + GList *uris, /* (element-type utf8) */ GAppLaunchContext *launch_context, GTask *from_task, GError **error) { gboolean res = FALSE; gboolean do_files; - GList *objs; + GList *objs = NULL; GWin32AppInfo *info = G_WIN32_APP_INFO (appinfo); - - if (info->app != NULL && info->app->is_uwp) - { - IShellItemArray *items = NULL; - - if (uris) - { - items = make_item_array (FALSE, uris, error); - if (items == NULL) - return res; - } - - res = g_win32_app_info_launch_internal (info, NULL, FALSE, items, launch_context, 0, from_task, error); - - if (items != NULL) - IShellItemArray_Release (items); - - return res; - } + gboolean is_uwp; do_files = g_win32_app_info_supports_files (appinfo); - objs = NULL; while (uris) { file_or_uri *obj; @@ -5370,14 +5515,16 @@ objs = g_list_prepend (objs, obj); uris = uris->next; } - objs = g_list_reverse (objs); + is_uwp = (info->app != NULL && info->app->is_uwp); + res = g_win32_app_info_launch_internal (info, objs, FALSE, - NULL, launch_context, + is_uwp ? + 0 : G_SPAWN_SEARCH_PATH, from_task, error); @@ -5472,37 +5619,18 @@ static gboolean g_win32_app_info_launch (GAppInfo *appinfo, - GList *files, + GList *files, /* (element-type GFile) */ GAppLaunchContext *launch_context, GError **error) { gboolean res = FALSE; gboolean do_uris; - GList *objs; + GList *objs = NULL; GWin32AppInfo *info = G_WIN32_APP_INFO (appinfo); - - if (info->app != NULL && info->app->is_uwp) - { - IShellItemArray *items = NULL; - - if (files) - { - items = make_item_array (TRUE, files, error); - if (items == NULL) - return res; - } - - res = g_win32_app_info_launch_internal (info, NULL, TRUE, items, launch_context, 0, NULL, error); - - if (items != NULL) - IShellItemArray_Release (items); - - return res; - } + gboolean is_uwp; do_uris = g_win32_app_info_supports_uris (appinfo); - objs = NULL; while (files) { file_or_uri *obj; @@ -5515,14 +5643,16 @@ objs = g_list_prepend (objs, obj); files = files->next; } - objs = g_list_reverse (objs); + is_uwp = (info->app != NULL && info->app->is_uwp); + res = g_win32_app_info_launch_internal (info, objs, TRUE, - NULL, launch_context, + is_uwp ? + 0 : G_SPAWN_SEARCH_PATH, NULL, error);
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gwin32inputstream.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gwin32inputstream.h
Changed
@@ -67,18 +67,18 @@ void (*_g_reserved5) (void); }; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GType g_win32_input_stream_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GInputStream * g_win32_input_stream_new (void *handle, gboolean close_handle); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_win32_input_stream_set_close_handle (GWin32InputStream *stream, gboolean close_handle); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_win32_input_stream_get_close_handle (GWin32InputStream *stream); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void *g_win32_input_stream_get_handle (GWin32InputStream *stream); G_END_DECLS
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gwin32mount.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gwin32mount.c
Changed
@@ -406,6 +406,8 @@ { win32_mount->icon = g_themed_icon_new_with_default_fallbacks (_win32_drive_type_to_icon (win32_mount->drive_type, FALSE)); } + + g_free (wfn); } return g_object_ref (win32_mount->icon);
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gwin32networkmonitor.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gwin32networkmonitor.c
Changed
@@ -78,24 +78,24 @@ } static gboolean -win_network_monitor_get_ip_info (IP_ADDRESS_PREFIX prefix, - GSocketFamily *family, - const guint8 **dest, - gsize *len) +win_network_monitor_get_ip_info (const IP_ADDRESS_PREFIX *prefix, + GSocketFamily *family, + const guint8 **dest, + gsize *len) { - switch (prefix.Prefix.si_family) + switch (prefix->Prefix.si_family) { case AF_UNSPEC: /* Fall-through: AF_UNSPEC deliveres both IPV4 and IPV6 infos, let`s stick with IPV4 here */ case AF_INET: *family = G_SOCKET_FAMILY_IPV4; - *dest = (guint8 *) &prefix.Prefix.Ipv4.sin_addr; - *len = prefix.PrefixLength; + *dest = (guint8 *) &(prefix->Prefix.Ipv4.sin_addr); + *len = prefix->PrefixLength; break; case AF_INET6: *family = G_SOCKET_FAMILY_IPV6; - *dest = (guint8 *) &prefix.Prefix.Ipv6.sin6_addr; - *len = prefix.PrefixLength; + *dest = (guint8 *) &(prefix->Prefix.Ipv6.sin6_addr); + *len = prefix->PrefixLength; break; default: return FALSE; @@ -152,7 +152,7 @@ route = routes->Table + i; - if (!win_network_monitor_get_ip_info (route->DestinationPrefix, &family, &dest, &len)) + if (!win_network_monitor_get_ip_info (&route->DestinationPrefix, &family, &dest, &len)) continue; network = get_network_mask (family, dest, len); @@ -218,13 +218,13 @@ switch (route_data->type) { case MibDeleteInstance: - if (!win_network_monitor_get_ip_info (route_data->route->DestinationPrefix, &family, &dest, &len)) + if (!win_network_monitor_get_ip_info (&route_data->route->DestinationPrefix, &family, &dest, &len)) break; remove_network (route_data->win, family, dest, len); break; case MibAddInstance: - if (!win_network_monitor_get_ip_info (route_data->route->DestinationPrefix, &family, &dest, &len)) + if (!win_network_monitor_get_ip_info (&route_data->route->DestinationPrefix, &family, &dest, &len)) break; add_network (route_data->win, family, dest, len);
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gwin32outputstream.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gwin32outputstream.h
Changed
@@ -67,18 +67,18 @@ void (*_g_reserved5) (void); }; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GType g_win32_output_stream_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GOutputStream * g_win32_output_stream_new (void *handle, gboolean close_handle); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_win32_output_stream_set_close_handle (GWin32OutputStream *stream, gboolean close_handle); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL gboolean g_win32_output_stream_get_close_handle (GWin32OutputStream *stream); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void *g_win32_output_stream_get_handle (GWin32OutputStream *stream); G_END_DECLS
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gwin32packageparser.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gwin32packageparser.c
Changed
@@ -141,6 +141,7 @@ gsize package_index; const wchar_t *wcs_full_name; const wchar_t *wcs_name; + const wchar_t *wcs_display_name; HSTRING package_family; gboolean applist; @@ -322,17 +323,20 @@ { IUnknown *item = NULL; IPackage *ipackage = NULL; + IPackage2 *ipackage2 = NULL; IPackageId *ipackageid = NULL; IUnknown *package_install_location = NULL; IStorageItem *storage_item = NULL; HSTRING path = NULL; HSTRING name = NULL; HSTRING full_name = NULL; + HSTRING display_name = NULL; HSTRING package_family = NULL; size_t manifest_filename_size; const wchar_t *wcs_path; const wchar_t *wcs_full_name; const wchar_t *wcs_name; + const wchar_t *wcs_display_name; wchar_t *manifest_filename = NULL; #define canned_com_error_handler_pkg(function_name_literal, where_to_go) \ @@ -353,6 +357,9 @@ hr = IUnknown_QueryInterface (item, &IID_IPackage, (void **) &ipackage); canned_com_error_handler_pkg ("IUnknown_QueryInterface(IID_IPackage)", package_cleanup); + hr = IUnknown_QueryInterface (item, &IID_IPackage2, (void **) &ipackage2); + canned_com_error_handler_pkg ("IUnknown_QueryInterface(IID_IPackage2)", package_cleanup); + hr = IPackage_get_Id (ipackage, &ipackageid); canned_com_error_handler_pkg ("IPackage_get_Id()", package_cleanup); @@ -362,8 +369,12 @@ hr = IPackageId_get_Name (ipackageid, &name); canned_com_error_handler_pkg ("IPackageId_get_Name()", package_cleanup); + hr = IPackage2_get_DisplayName (ipackage2, &display_name); + canned_com_error_handler_pkg ("IPackage2_get_DisplayName()", package_cleanup); + wcs_full_name = LoadedWindowsGetStringRawBuffer (full_name, NULL); wcs_name = LoadedWindowsGetStringRawBuffer (name, NULL); + wcs_display_name = LoadedWindowsGetStringRawBuffer (display_name, NULL); #define canned_com_error_handler_pkg_named(function_name_literal, where_to_go) \ do \ @@ -402,6 +413,7 @@ sax->package_index = package_index; sax->wcs_full_name = wcs_full_name; sax->wcs_name = wcs_name; + sax->wcs_display_name = wcs_display_name; sax->package_family = package_family; sax->applist = TRUE; sax->exit_early = FALSE; @@ -426,22 +438,26 @@ if (path) LoadedWindowsDeleteString (path); + if (package_family) + LoadedWindowsDeleteString (package_family); + if (display_name) + LoadedWindowsDeleteString (display_name); + if (name) + LoadedWindowsDeleteString (name); + if (full_name) + LoadedWindowsDeleteString (full_name); + if (storage_item) (void) IStorageItem_Release (storage_item); if (package_install_location) (void) IUnknown_Release (package_install_location); + if (ipackage2) + (void) IPackage2_Release (ipackage2); if (ipackage) (void) IPackage_Release (ipackage); if (item) (void) IUnknown_Release (item); - if (package_family) - LoadedWindowsDeleteString (package_family); - if (name) - LoadedWindowsDeleteString (name); - if (full_name) - LoadedWindowsDeleteString (full_name); - if (ipackageid) (void) IPackageId_Release (ipackageid); if (sax->exit_early) @@ -791,8 +807,8 @@ { if (sax->application_usermodelid != NULL) sax->exit_early = !sax->callback (sax->user_data, sax->wcs_full_name, sax->wcs_name, - sax->application_usermodelid, sax->applist, - sax->supported_extgroups, sax->supported_protocols); + sax->wcs_display_name, sax->application_usermodelid, + sax->applist, sax->supported_extgroups, sax->supported_protocols); g_clear_pointer (&sax->supported_extgroups, g_ptr_array_unref); g_clear_pointer (&sax->supported_protocols, g_ptr_array_unref); sax->supported_protocols = g_ptr_array_new_full (0, (GDestroyNotify) g_free);
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gwin32packageparser.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gwin32packageparser.h
Changed
@@ -36,6 +36,7 @@ typedef gboolean (*GWin32PackageParserCallback)(gpointer user_data, const gunichar2 *full_package_name, const gunichar2 *package_name, + const gunichar2 *display_name, const gunichar2 *app_user_model_id, gboolean show_in_applist, GPtrArray *supported_extgroups,
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gwin32registrykey.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gwin32registrykey.h
Changed
@@ -136,112 +136,112 @@ gsize value_data_expanded_u8_size; }; -GLIB_AVAILABLE_IN_2_46 +GIO_AVAILABLE_IN_2_46 GWin32RegistrySubkeyIter *g_win32_registry_subkey_iter_copy (const GWin32RegistrySubkeyIter *iter); -GLIB_AVAILABLE_IN_2_46 +GIO_AVAILABLE_IN_2_46 void g_win32_registry_subkey_iter_free (GWin32RegistrySubkeyIter *iter); -GLIB_AVAILABLE_IN_2_46 +GIO_AVAILABLE_IN_2_46 void g_win32_registry_subkey_iter_assign (GWin32RegistrySubkeyIter *iter, const GWin32RegistrySubkeyIter *other); -GLIB_AVAILABLE_IN_2_46 +GIO_AVAILABLE_IN_2_46 GType g_win32_registry_subkey_iter_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_2_46 +GIO_AVAILABLE_IN_2_46 GWin32RegistryValueIter *g_win32_registry_value_iter_copy (const GWin32RegistryValueIter *iter); -GLIB_AVAILABLE_IN_2_46 +GIO_AVAILABLE_IN_2_46 void g_win32_registry_value_iter_free (GWin32RegistryValueIter *iter); -GLIB_AVAILABLE_IN_2_46 +GIO_AVAILABLE_IN_2_46 void g_win32_registry_value_iter_assign (GWin32RegistryValueIter *iter, const GWin32RegistryValueIter *other); -GLIB_AVAILABLE_IN_2_46 +GIO_AVAILABLE_IN_2_46 GType g_win32_registry_value_iter_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_2_46 +GIO_AVAILABLE_IN_2_46 GType g_win32_registry_key_get_type (void); -GLIB_AVAILABLE_IN_2_46 +GIO_AVAILABLE_IN_2_46 GWin32RegistryKey *g_win32_registry_key_new (const gchar *path, GError **error); -GLIB_AVAILABLE_IN_2_46 +GIO_AVAILABLE_IN_2_46 GWin32RegistryKey *g_win32_registry_key_new_w (const gunichar2 *path, GError **error); -GLIB_AVAILABLE_IN_2_46 +GIO_AVAILABLE_IN_2_46 GWin32RegistryKey *g_win32_registry_key_get_child (GWin32RegistryKey *key, const gchar *subkey, GError **error); -GLIB_AVAILABLE_IN_2_46 +GIO_AVAILABLE_IN_2_46 GWin32RegistryKey *g_win32_registry_key_get_child_w (GWin32RegistryKey *key, const gunichar2 *subkey, GError **error); -GLIB_AVAILABLE_IN_2_46 +GIO_AVAILABLE_IN_2_46 gboolean g_win32_registry_subkey_iter_init (GWin32RegistrySubkeyIter *iter, GWin32RegistryKey *key, GError **error); -GLIB_AVAILABLE_IN_2_46 +GIO_AVAILABLE_IN_2_46 void g_win32_registry_subkey_iter_clear (GWin32RegistrySubkeyIter *iter); -GLIB_AVAILABLE_IN_2_46 +GIO_AVAILABLE_IN_2_46 gsize g_win32_registry_subkey_iter_n_subkeys (GWin32RegistrySubkeyIter *iter); -GLIB_AVAILABLE_IN_2_46 +GIO_AVAILABLE_IN_2_46 gboolean g_win32_registry_subkey_iter_next (GWin32RegistrySubkeyIter *iter, gboolean skip_errors, GError **error); -GLIB_AVAILABLE_IN_2_46 +GIO_AVAILABLE_IN_2_46 gboolean g_win32_registry_subkey_iter_get_name (GWin32RegistrySubkeyIter *iter, const gchar **subkey_name, gsize *subkey_name_len, GError **error); -GLIB_AVAILABLE_IN_2_46 +GIO_AVAILABLE_IN_2_46 gboolean g_win32_registry_subkey_iter_get_name_w (GWin32RegistrySubkeyIter *iter, const gunichar2 **subkey_name, gsize *subkey_name_len, GError **error); -GLIB_AVAILABLE_IN_2_46 +GIO_AVAILABLE_IN_2_46 gboolean g_win32_registry_value_iter_init (GWin32RegistryValueIter *iter, GWin32RegistryKey *key, GError **error); -GLIB_AVAILABLE_IN_2_46 +GIO_AVAILABLE_IN_2_46 void g_win32_registry_value_iter_clear (GWin32RegistryValueIter *iter); -GLIB_AVAILABLE_IN_2_46 +GIO_AVAILABLE_IN_2_46 gsize g_win32_registry_value_iter_n_values (GWin32RegistryValueIter *iter); -GLIB_AVAILABLE_IN_2_46 +GIO_AVAILABLE_IN_2_46 gboolean g_win32_registry_value_iter_next (GWin32RegistryValueIter *iter, gboolean skip_errors, GError **error); -GLIB_AVAILABLE_IN_2_46 +GIO_AVAILABLE_IN_2_46 gboolean g_win32_registry_value_iter_get_value_type (GWin32RegistryValueIter *iter, GWin32RegistryValueType *value_type, GError **error); -GLIB_AVAILABLE_IN_2_46 +GIO_AVAILABLE_IN_2_46 gboolean g_win32_registry_value_iter_get_name (GWin32RegistryValueIter *iter, gchar **value_name, gsize *value_name_len, GError **error); -GLIB_AVAILABLE_IN_2_46 +GIO_AVAILABLE_IN_2_46 gboolean g_win32_registry_value_iter_get_name_w (GWin32RegistryValueIter *iter, gunichar2 **value_name, gsize *value_name_len, GError **error); -GLIB_AVAILABLE_IN_2_46 +GIO_AVAILABLE_IN_2_46 gboolean g_win32_registry_value_iter_get_data (GWin32RegistryValueIter *iter, gboolean auto_expand, gpointer *value_data, gsize *value_data_size, GError **error); -GLIB_AVAILABLE_IN_2_46 +GIO_AVAILABLE_IN_2_46 gboolean g_win32_registry_value_iter_get_data_w (GWin32RegistryValueIter *iter, gboolean auto_expand, gpointer *value_data, gsize *value_data_size, GError **error); -GLIB_AVAILABLE_IN_2_66 +GIO_AVAILABLE_IN_2_66 gboolean g_win32_registry_key_get_value (GWin32RegistryKey *key, const gchar * const *mui_dll_dirs, gboolean auto_expand, @@ -251,7 +251,7 @@ gsize *value_data_size, GError **error); -GLIB_AVAILABLE_IN_2_66 +GIO_AVAILABLE_IN_2_66 gboolean g_win32_registry_key_get_value_w (GWin32RegistryKey *key, const gunichar2 * const *mui_dll_dirs, gboolean auto_expand, @@ -261,29 +261,29 @@ gsize *value_data_size, GError **error); -GLIB_AVAILABLE_IN_2_46 +GIO_AVAILABLE_IN_2_46 const gchar *g_win32_registry_key_get_path (GWin32RegistryKey *key); -GLIB_AVAILABLE_IN_2_46 +GIO_AVAILABLE_IN_2_46 const gunichar2 *g_win32_registry_key_get_path_w (GWin32RegistryKey *key); -GLIB_AVAILABLE_IN_2_46 +GIO_AVAILABLE_IN_2_46 gboolean g_win32_registry_key_watch (GWin32RegistryKey *key, gboolean watch_children, GWin32RegistryKeyWatcherFlags watch_flags, GWin32RegistryKeyWatchCallbackFunc callback, gpointer user_data, GError **error); -GLIB_AVAILABLE_IN_2_46 +GIO_AVAILABLE_IN_2_46 gboolean g_win32_registry_key_has_changed (GWin32RegistryKey *key); -GLIB_AVAILABLE_IN_2_46 +GIO_AVAILABLE_IN_2_46 void g_win32_registry_key_erase_change_indicator (GWin32RegistryKey *key); -GLIB_AVAILABLE_IN_2_66 +GIO_AVAILABLE_IN_2_66 const gunichar2 * const *g_win32_registry_get_os_dirs_w (void); -GLIB_AVAILABLE_IN_2_66 +GIO_AVAILABLE_IN_2_66 const gchar * const *g_win32_registry_get_os_dirs (void); G_END_DECLS
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gzlibcompressor.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gzlibcompressor.h
Changed
@@ -46,16 +46,16 @@ GObjectClass parent_class; }; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GType g_zlib_compressor_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GZlibCompressor *g_zlib_compressor_new (GZlibCompressorFormat format, int level); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GFileInfo *g_zlib_compressor_get_file_info (GZlibCompressor *compressor); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL void g_zlib_compressor_set_file_info (GZlibCompressor *compressor, GFileInfo *file_info);
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/gzlibdecompressor.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/gzlibdecompressor.h
Changed
@@ -46,13 +46,13 @@ GObjectClass parent_class; }; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GType g_zlib_decompressor_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GZlibDecompressor *g_zlib_decompressor_new (GZlibCompressorFormat format); -GLIB_AVAILABLE_IN_ALL +GIO_AVAILABLE_IN_ALL GFileInfo *g_zlib_decompressor_get_file_info (GZlibDecompressor *decompressor); G_END_DECLS
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/inotify/inotify-sub.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/inotify/inotify-sub.c
Changed
@@ -36,7 +36,7 @@ gchar *d_dirname = g_strdup (dirname); size_t len = strlen (d_dirname); - if (d_dirnamelen - 1 == '/') + if (len > 1 && d_dirnamelen - 1 == '/') d_dirnamelen - 1 = '\0'; return d_dirname;
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/inotify/meson.build -> _service:tar_scm:glib-2.76.4.tar.xz/gio/inotify/meson.build
Changed
@@ -8,8 +8,14 @@ inotify_lib = static_library('inotify', - sources : inotify_sources, - include_directories : configinc, glibinc, gmoduleinc, - dependencies : gioenumtypes_dep, libglib_dep, libgobject_dep, + sources : inotify_sources, + include_directories : configinc, glibinc, + dependencies : + gioenumtypes_dep, + libglib_dep, + libgobject_dep, + gmodule_inc_dep, + , + gnu_symbol_visibility : 'hidden', pic : true, - c_args : gio_c_args) + c_args : gio_c_args, gio_c_args_internal)
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/kqueue/gkqueuefilemonitor.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/kqueue/gkqueuefilemonitor.c
Changed
@@ -32,6 +32,10 @@ #include <fcntl.h> #include <string.h> +#ifndef O_CLOEXEC +#define O_CLOEXEC 0 +#endif + #include <glib-object.h> #include <glib/gfileutils.h> #include <gio/gfilemonitor.h> @@ -583,7 +587,7 @@ struct stat st; struct kevent ev; - sub->fd = open (sub->filename, O_KQFLAG); + sub->fd = open (sub->filename, O_KQFLAG | O_CLOEXEC); if (sub->fd == -1) return FALSE;
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/kqueue/meson.build -> _service:tar_scm:glib-2.76.4.tar.xz/gio/kqueue/meson.build
Changed
@@ -6,8 +6,12 @@ kqueue_lib = static_library('kqueue', - sources : kqueue_sources, - include_directories : configinc, glibinc, gmoduleinc, - dependencies : gioenumtypes_dep, + sources : kqueue_sources, + include_directories : configinc, glibinc, + dependencies : + gioenumtypes_dep, + gmodule_inc_dep, + , + gnu_symbol_visibility : 'hidden', pic : true, - c_args : gio_c_args) + c_args : gio_c_args, gio_c_args_internal)
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/meson.build -> _service:tar_scm:glib-2.76.4.tar.xz/gio/meson.build
Changed
@@ -1,14 +1,18 @@ gio_c_args = '-DG_LOG_DOMAIN="GLib-GIO"', - '-DGIO_COMPILATION', '-DGIO_LAUNCH_DESKTOP="@0@"'.format(glib_prefix / multiarch_libexecdir / 'gio-launch-desktop'), '-DGIO_MODULE_DIR="@0@"'.format(glib_giomodulesdir), '-DLOCALSTATEDIR="@0@"'.format(glib_localstatedir), -gio_c_args += glib_hidden_visibility_args +gio_c_args_internal = + '-DGIO_COMPILATION', + + +# Install empty glib_giomodulesdir +install_emptydir(glib_giomodulesdir) -# FIXME: Install empty glib_giomodulesdir +gio_includedir = glib_includedir / 'gio' gnetworking_h_conf = configuration_data() @@ -168,7 +172,7 @@ gnetworking_h = configure_file(input : 'gnetworking.h.in', output : 'gnetworking.h', - install_dir : join_paths(get_option('includedir'), 'glib-2.0/gio'), + install_dir : gio_includedir, configuration : gnetworking_h_conf) gdbus_headers = files( @@ -366,15 +370,17 @@ ) portal_sources = files( - 'gdocumentportal.c', - 'gopenuriportal.c', - 'gmemorymonitorportal.c', - 'gnetworkmonitorportal.c', - 'gpowerprofilemonitorportal.c', - 'gproxyresolverportal.c', - 'gtrashportal.c', - 'gportalsupport.c', - 'gportalnotificationbackend.c'), + 'gdocumentportal.c', + 'gopenuriportal.c', + 'gmemorymonitorportal.c', + 'gnetworkmonitorportal.c', + 'gpowerprofilemonitorportal.c', + 'gproxyresolverportal.c', + 'gtrashportal.c', + 'gportalsupport.c', + 'gportalnotificationbackend.c', + 'gsandbox.c', + ), xdp_dbus_generated @@ -598,7 +604,7 @@ 'gliststore.c', ) -if get_option('default_library') != 'static' +if glib_build_shared gio_sources += files ('../glib/gtrace.c') endif @@ -742,10 +748,20 @@ 'gliststore.h', ) +gio_visibility_h = custom_target( + output: 'gio-visibility.h', + command: gen_visibility_macros, meson.project_version(), 'visibility-macros', 'GIO', '@OUTPUT@', + install: true, + install_dir: gio_includedir, + # FIXME: Not needed with Meson >= 0.64.0 + install_tag: 'devel', +) +gio_sources += gio_visibility_h + gio_headers += application_headers gio_headers += settings_headers gio_headers += gdbus_headers -install_headers(gio_headers, subdir : 'glib-2.0/gio/') +install_headers(gio_headers, install_dir : gio_includedir) # We can't use gnome.mkenums() because the GNOME module looks for glib-mkenums # in PATH, which means you can't bootstrap glib with its own glib-mkenums. @@ -754,7 +770,9 @@ capture : true, input : gio_headers, install : true, - install_dir : join_paths(get_option('includedir'), 'glib-2.0/gio'), + install_dir : gio_includedir, + # FIXME: Not needed with Meson >= 0.64.0 + install_tag: 'devel', command : python, glib_mkenums, '--template', files('gioenumtypes.h.template'), '@INPUT@', gnetworking_h) @@ -768,7 +786,7 @@ '--template', files('gioenumtypes.c.template'), '@INPUT@', gnetworking_h) -gioenumtypes_dep = declare_dependency(sources : gioenumtypes_h, glib_enumtypes_h) +gioenumtypes_dep = declare_dependency(sources : gioenumtypes_h, glib_enumtypes_h, gio_visibility_h) # inotify if glib_conf.has('HAVE_SYS_INOTIFY_H') and have_func_inotify_init1 @@ -833,8 +851,9 @@ libgobject_dep, libgmodule_dep, selinux_dep, xattr_dep, platform_deps, network_libs, libsysprof_capture_dep, gioenumtypes_dep, gvdb_dep, - c_args : gio_c_args, - objc_args : gio_c_args, + c_args : gio_c_args, gio_c_args_internal, + objc_args : gio_c_args, gio_c_args_internal, + gnu_symbol_visibility : 'hidden', # intl.lib is not compatible with SAFESEH link_args : noseh_link_args, glib_link_flags, ) @@ -1051,6 +1070,7 @@ output : '@0@.stp'.format(libgio.full_path().split('/').get(-1)), configuration : stp_cdata, install_dir : tapset_install_dir, + install_tag : 'systemtap', ) endif
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/tests/actions.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/tests/actions.c
Changed
@@ -896,7 +896,6 @@ ensure_state (G_ACTION_GROUP (group), "lang", "'spanish'"); /* check that various error conditions are rejected */ - { struct { const gchar *action_name; @@ -940,7 +939,6 @@ g_clear_error (&error); g_clear_object (&async_result); } - } /* check that setting an action’s state over D-Bus works */ g_assert_cmpint (activation_count ("lang"), ==, 1); @@ -973,7 +971,6 @@ ensure_state (G_ACTION_GROUP (group), "lang", "'portuguese'"); /* check that various error conditions are rejected */ - { struct { const gchar *action_name; @@ -1013,7 +1010,6 @@ g_clear_error (&error); g_clear_object (&async_result); } - } /* test that the initial transfer works */ g_assert_true (G_IS_DBUS_ACTION_GROUP (proxy));
View file
_service:tar_scm:glib-2.76.4.tar.xz/gio/tests/appinfo-test-path.desktop.in
Added
@@ -0,0 +1,22 @@ +Desktop Entry +Type=Application +GenericName=generic-appinfo-test-path +Name=appinfo-test-path +Namede=appinfo-test-de +X-GNOME-FullName=example +X-GNOME-FullNamede=Beispiel +Comment=GAppInfo example +Commentde=GAppInfo Beispiel +Path=@installed_tests_dir@ +TryExec=apps +Exec=appinfo-test --option %U %i --name %c --filename %k %m %% +Icon=testicon.svg +Terminal=false +StartupNotify=true +StartupWMClass=appinfo-path-class +MimeType=image/png;image/jpeg; +Keywords=keyword1;test keyword; +Categories=GNOME;GTK; +X-JunkFood=Burger +X-JunkFoodde=Bratwurst +X-JunkFoodit=
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/tests/appinfo.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/tests/appinfo.c
Changed
@@ -16,12 +16,6 @@ const gchar *path; gchar *uri; - if (g_getenv ("DISPLAY") == NULL || g_getenv ("DISPLAY")0 == '\0') - { - g_test_skip ("No DISPLAY set"); - return; - } - success = g_app_info_launch (appinfo, NULL, NULL, &error); g_assert_no_error (error); g_assert_true (success); @@ -62,12 +56,7 @@ path = g_test_get_filename (G_TEST_BUILT, "appinfo-test.desktop", NULL); appinfo = (GAppInfo*)g_desktop_app_info_new_from_filename (path); - - if (appinfo == NULL) - { - g_test_skip ("appinfo-test binary not installed"); - return; - } + g_assert_true (G_IS_APP_INFO (appinfo)); test_launch_for_app_info (appinfo); g_object_unref (appinfo); @@ -226,12 +215,7 @@ path = g_test_get_filename (G_TEST_BUILT, "appinfo-test.desktop", NULL); appinfo = (GAppInfo*)g_desktop_app_info_new_from_filename (path); - - if (appinfo == NULL) - { - g_test_skip ("appinfo-test binary not installed"); - return; - } + g_assert_true (G_IS_APP_INFO (appinfo)); g_assert_true (g_app_info_should_show (appinfo)); g_object_unref (appinfo);
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/tests/appmonitor.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/tests/appmonitor.c
Changed
@@ -1,6 +1,31 @@ +/* GLib testing framework examples and tests + * + * Copyright © 2013 Red Hat, Inc. + * Copyright © 2015, 2017, 2018 Endless Mobile, Inc. + * + * SPDX-License-Identifier: LGPL-2.1-or-later + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General + * Public License along with this library; if not, see <http://www.gnu.org/licenses/>. + */ + #include <gio/gio.h> #include <gstdio.h> +#if defined (G_OS_UNIX) && !defined (__APPLE__) +#include <gio/gdesktopappinfo.h> +#endif + typedef struct { gchar *applications_dir; @@ -24,6 +49,7 @@ g_clear_pointer (&fixture->applications_dir, g_free); } +#if defined (G_OS_UNIX) && !defined (__APPLE__) static gboolean create_app (gpointer data) { @@ -50,73 +76,97 @@ g_remove (path); } -static gboolean changed_fired; - static void -changed_cb (GAppInfoMonitor *monitor, GMainLoop *loop) +changed_cb (GAppInfoMonitor *monitor, + gpointer user_data) { - changed_fired = TRUE; - g_main_loop_quit (loop); + gboolean *changed_fired = user_data; + + *changed_fired = TRUE; + g_main_context_wakeup (g_main_context_get_thread_default ()); } static gboolean -quit_loop (gpointer data) +timeout_cb (gpointer user_data) { - GMainLoop *loop = data; + gboolean *timed_out = user_data; - if (g_main_loop_is_running (loop)) - g_main_loop_quit (loop); + g_assert (!timed_out); + *timed_out = TRUE; + g_main_context_wakeup (g_main_context_get_thread_default ()); return G_SOURCE_REMOVE; } +#endif /* defined (G_OS_UNIX) && !defined (__APPLE__) */ static void test_app_monitor (Fixture *fixture, gconstpointer user_data) { +#if defined (G_OS_UNIX) && !defined (__APPLE__) gchar *app_path; GAppInfoMonitor *monitor; - GMainLoop *loop; - -#ifdef G_OS_WIN32 - g_test_skip (".desktop monitor on win32"); - return; -#endif + GMainContext *context = NULL; /* use the global default main context */ + GSource *timeout_source = NULL; + GDesktopAppInfo *app = NULL; + gboolean changed_fired = FALSE; + gboolean timed_out = FALSE; app_path = g_build_filename (fixture->applications_dir, "app.desktop", NULL); /* FIXME: this shouldn't be required */ g_list_free_full (g_app_info_get_all (), g_object_unref); + /* Create an app monitor and check that its ::changed signal is emitted when + * a new app is installed. */ monitor = g_app_info_monitor_get (); - loop = g_main_loop_new (NULL, FALSE); - g_signal_connect (monitor, "changed", G_CALLBACK (changed_cb), loop); + g_signal_connect (monitor, "changed", G_CALLBACK (changed_cb), &changed_fired); g_idle_add (create_app, app_path); - g_timeout_add_seconds (3, quit_loop, loop); + timeout_source = g_timeout_source_new_seconds (3); + g_source_set_callback (timeout_source, timeout_cb, &timed_out, NULL); + g_source_attach (timeout_source, NULL); + + while (!changed_fired && !timed_out) + g_main_context_iteration (context, TRUE); - g_main_loop_run (loop); - g_assert (changed_fired); + g_assert_true (changed_fired); changed_fired = FALSE; - /* FIXME: this shouldn't be required */ - g_list_free_full (g_app_info_get_all (), g_object_unref); + g_source_destroy (timeout_source); + g_clear_pointer (&timeout_source, g_source_unref); + + /* Check that the app is now queryable. This has the side-effect of re-arming + * the #GAppInfoMonitor::changed signal for the next part of the test. */ + app = g_desktop_app_info_new ("app.desktop"); + g_assert_nonnull (app); + g_clear_object (&app); - g_timeout_add_seconds (3, quit_loop, loop); + /* Now check that ::changed is emitted when an app is uninstalled. */ + timeout_source = g_timeout_source_new_seconds (3); + g_source_set_callback (timeout_source, timeout_cb, &timed_out, NULL); + g_source_attach (timeout_source, NULL); delete_app (app_path); - g_main_loop_run (loop); + while (!changed_fired && !timed_out) + g_main_context_iteration (context, TRUE); - g_assert (changed_fired); + g_assert_true (changed_fired); - g_main_loop_unref (loop); + g_source_destroy (timeout_source); + g_clear_pointer (&timeout_source, g_source_unref); g_remove (app_path); g_object_unref (monitor); g_free (app_path); +#elif defined (__APPLE__) + g_test_skip (".desktop monitor on macos"); +#else /* if !(defined (G_OS_UNIX) && !defined (__APPLE__)) */ + g_test_skip (".desktop monitor on win32"); +#endif /* !(defined (G_OS_UNIX) && !defined (__APPLE__)) */ } int
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/tests/async-close-output-stream.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/tests/async-close-output-stream.c
Changed
@@ -1,6 +1,8 @@ /* GLib testing framework examples and tests * Authors: Jesse van den Kieboom <jessevdk@gnome.org> * + * SPDX-License-Identifier: LicenseRef-old-glib-tests + * * This work is provided "as is"; redistribution and modification * in whole or in part, in any medium, physical or electronic is * permitted without restriction.
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/tests/async-splice-output-stream.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/tests/async-splice-output-stream.c
Changed
@@ -3,6 +3,8 @@ * Authors: Xavier Claessens <xclaesse@gmail.com> * Mike Ruprecht <mike.ruprecht@collabora.co.uk> * + * SPDX-License-Identifier: LicenseRef-old-glib-tests + * * This work is provided "as is"; redistribution and modification * in whole or in part, in any medium, physical or electronic is * permitted without restriction.
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/tests/buffered-input-stream.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/tests/buffered-input-stream.c
Changed
@@ -2,6 +2,8 @@ * Copyright (C) 2008 Red Hat, Inc. * Authors: Matthias Clasen <mclasen@redhat.com> * + * SPDX-License-Identifier: LicenseRef-old-glib-tests + * * This work is provided "as is"; redistribution and modification * in whole or in part, in any medium, physical or electronic is * permitted without restriction.
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/tests/cancellable.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/tests/cancellable.c
Changed
@@ -728,6 +728,68 @@ g_object_unref (cancellable); } +static gpointer +repeatedly_connecting_thread (gpointer data) +{ + GCancellable *cancellable = data; + const guint iterations = 10000; + gboolean callback_ever_called = FALSE; + + for (guint i = 0; i < iterations; ++i) + { + gboolean callback_called = FALSE; + gboolean called; + gulong id = g_cancellable_connect (cancellable, + G_CALLBACK (on_racy_cancellable_cancelled), + &callback_called, NULL); + called = g_atomic_int_get (&callback_called); + callback_ever_called |= called; + if (g_test_verbose () && called) + g_test_message ("Reconnecting cancellation callback called"); + g_cancellable_disconnect (cancellable, id); + } + + if (!callback_ever_called) + g_test_incomplete ("We didn't really checked if callbacks is called properly"); + + return NULL; +} + +static void +test_cancellable_cancel_reset_connect_races (void) +{ + GCancellable *cancellable; + GThread *resetting_thread = NULL; + GThread *cancelling_thread = NULL; + GThread *connecting_thread = NULL; + gboolean callback_called = FALSE; + + g_test_summary ("Tests threads racing for cancelling, connecting and disconnecting " + " and resetting a GCancellable"); + + cancellable = g_cancellable_new (); + + g_cancellable_connect (cancellable, G_CALLBACK (on_racy_cancellable_cancelled), + &callback_called, NULL); + g_assert_false (callback_called); + + resetting_thread = g_thread_new ("/cancel-reset-connect-races/resetting", + repeatedly_resetting_thread, + cancellable); + cancelling_thread = g_thread_new ("/cancel-reset-connect-races/cancelling", + repeatedly_cancelling_thread, cancellable); + connecting_thread = g_thread_new ("/cancel-reset-connect-races/connecting", + repeatedly_connecting_thread, cancellable); + + g_thread_join (g_steal_pointer (&cancelling_thread)); + g_thread_join (g_steal_pointer (&resetting_thread)); + g_thread_join (g_steal_pointer (&connecting_thread)); + + g_assert_true (callback_called); + + g_object_unref (cancellable); +} + int main (int argc, char *argv) { @@ -741,6 +803,7 @@ g_test_add_func ("/cancellable/poll-fd-cancelled", test_cancellable_cancelled_poll_fd); g_test_add_func ("/cancellable/poll-fd-cancelled-threaded", test_cancellable_cancelled_poll_fd_threaded); g_test_add_func ("/cancellable/cancel-reset-races", test_cancellable_cancel_reset_races); + g_test_add_func ("/cancellable/cancel-reset-connect-races", test_cancellable_cancel_reset_connect_races); g_test_add_func ("/cancellable-source/threaded-dispose", test_cancellable_source_threaded_dispose); return g_test_run ();
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/tests/codegen.py -> _service:tar_scm:glib-2.76.4.tar.xz/gio/tests/codegen.py
Changed
@@ -61,7 +61,7 @@ cwd = "" def setUp(self): - self.timeout_seconds = 100 # seconds per test + self.timeout_seconds = 6 # seconds per test self.tmpdir = tempfile.TemporaryDirectory() self.cwd = os.getcwd() os.chdir(self.tmpdir.name) @@ -411,6 +411,26 @@ xml_data = f.readlines() self.assertTrue(len(xml_data) != 0) + def test_generate_md(self): + """Test the basic functionality of the markdown generator.""" + xml_contents = """ + <node> + <interface name="org.project.Bar.Frobnicator"> + <method name="RandomMethod"/> + </interface> + </node> + """ + res = self.runCodegenWithInterface( + xml_contents, + "--generate-md", + "test", + ) + self.assertEqual("", res.err) + self.assertEqual("", res.out) + with open("test-org.project.Bar.Frobnicator.md", "r") as f: + rst = f.readlines() + self.assertTrue(len(rst) != 0) + def test_generate_rst(self): """Test the basic functionality of the rst generator.""" xml_contents = """
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/tests/contexts.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/tests/contexts.c
Changed
@@ -81,7 +81,7 @@ g_mutex_lock (&test1_mutex); thread = g_thread_new ("test1", test1_thread, NULL); - time = g_get_monotonic_time () + 2 * G_TIME_SPAN_SECOND; + time = g_get_monotonic_time () + 20 * G_TIME_SPAN_SECOND; while (!test1_done) { io_completed = g_cond_wait_until (&test1_cond, &test1_mutex, time);
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/tests/converter-stream.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/tests/converter-stream.c
Changed
@@ -2,6 +2,8 @@ * Copyright (C) 2009 Red Hat, Inc. * Authors: Alexander Larsson <alexl@redhat.com> * + * SPDX-License-Identifier: LicenseRef-old-glib-tests + * * This work is provided "as is"; redistribution and modification * in whole or in part, in any medium, physical or electronic is * permitted without restriction.
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/tests/credentials.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/tests/credentials.c
Changed
@@ -2,6 +2,8 @@ * * Copyright © 2012 Collabora Ltd. * + * SPDX-License-Identifier: LicenseRef-old-glib-tests + * * This work is provided "as is"; redistribution and modification * in whole or in part, in any medium, physical or electronic is * permitted without restriction.
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/tests/cxx.cpp -> _service:tar_scm:glib-2.76.4.tar.xz/gio/tests/cxx.cpp
Changed
@@ -21,8 +21,51 @@ #include <gio/gio.h> +static void +test_name (void) +{ + GTask *task = NULL; + char *orig = g_strdup ("some task"); + + task = g_task_new (NULL, NULL, NULL, NULL); + (g_task_set_name) (task, orig); + g_assert_cmpstr (g_task_get_name (task), ==, "some task"); + + (g_task_set_name) (task, "some other name"); + g_assert_cmpstr (g_task_get_name (task), ==, "some other name"); + + g_clear_object (&task); + g_free (orig); +} + +static void +test_name_macro_wrapper (void) +{ + GTask *task = NULL; + char *orig = g_strdup ("some task"); + + task = g_task_new (NULL, NULL, NULL, NULL); + g_task_set_name (task, orig); + g_assert_cmpstr (g_task_get_name (task), ==, "some task"); + + g_task_set_name (task, "some other name"); + g_assert_cmpstr (g_task_get_name (task), ==, "some other name"); + + g_clear_object (&task); + g_free (orig); +} + int -main () +main (int argc, char **argv) { - return 0; +#if G_CXX_STD_CHECK_VERSION (11) + g_test_init (&argc, &argv, NULL); +#else + g_test_init (&argc, &argv, static_cast<void *>(NULL)); +#endif + + g_test_add_func ("/gtask/name", test_name); + g_test_add_func ("/gtask/name/macro-wrapper", test_name_macro_wrapper); + + return g_test_run (); }
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/tests/data-input-stream.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/tests/data-input-stream.c
Changed
@@ -2,6 +2,8 @@ * Copyright (C) 2008 Red Hat, Inc. * Authors: Tomas Bzatek <tbzatek@redhat.com> * + * SPDX-License-Identifier: LicenseRef-old-glib-tests + * * This work is provided "as is"; redistribution and modification * in whole or in part, in any medium, physical or electronic is * permitted without restriction.
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/tests/data-output-stream.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/tests/data-output-stream.c
Changed
@@ -2,6 +2,8 @@ * Copyright (C) 2008 Red Hat, Inc. * Authors: Tomas Bzatek <tbzatek@redhat.com> * + * SPDX-License-Identifier: LicenseRef-old-glib-tests + * * This work is provided "as is"; redistribution and modification * in whole or in part, in any medium, physical or electronic is * permitted without restriction.
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/tests/dbus-appinfo.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/tests/dbus-appinfo.c
Changed
@@ -226,13 +226,24 @@ GVariant *platform_data) { const gchar *startup_id; + gsize i; g_assert (!saw_startup_id); - if (!g_variant_lookup (platform_data, "desktop-startup-id", "&s", &startup_id)) - return; + const gchar *startup_id_keys = { + "desktop-startup-id", + "activation-token", + NULL, + }; + + for (i = 0; startup_id_keysi != NULL; i++) + { + if (!g_variant_lookup (platform_data, startup_id_keysi, "&s", &startup_id)) + return; + + g_assert_cmpstr (startup_id, ==, "expected startup id"); + } - g_assert_cmpstr (startup_id, ==, "expected startup id"); saw_startup_id = TRUE; }
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/tests/defaultvalue.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/tests/defaultvalue.c
Changed
@@ -193,6 +193,9 @@ g_setenv ("GIO_USE_VFS", "local", TRUE); g_setenv ("GSETTINGS_BACKEND", "memory", TRUE); + /* Disable deprecation warnings when we poke at deprecated properties */ + g_setenv ("G_ENABLE_DIAGNOSTIC", "0", TRUE); + g_test_init (&argc, &argv, NULL); /* Create one test bus for all tests, as we have a lot of very small
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/tests/desktop-app-info.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/tests/desktop-app-info.c
Changed
@@ -25,9 +25,69 @@ #include <glib/gstdio.h> #include <gio/gio.h> #include <gio/gdesktopappinfo.h> +#include <gio/gunixinputstream.h> +#include <glib-unix.h> #include <stdlib.h> #include <string.h> #include <unistd.h> +#include <sys/types.h> +#include <sys/stat.h> + +G_DECLARE_FINAL_TYPE (TestLaunchContext, test_launch_context, TEST, + LAUNCH_CONTEXT, GAppLaunchContext); + +struct _TestLaunchContext { + GAppLaunchContext parent; + + char *overriden_startup_notify_id; +}; + +struct _TestLaunchContextClass { + GAppLaunchContextClass parent; +}; + +G_DEFINE_FINAL_TYPE (TestLaunchContext, test_launch_context, + G_TYPE_APP_LAUNCH_CONTEXT); + +static void +test_launch_context_init (TestLaunchContext *test_context) +{ +} + +static char * +test_launch_context_get_startup_notify_id (GAppLaunchContext *context, + GAppInfo *app_info, + GList *files) +{ + TestLaunchContext *test_context = TEST_LAUNCH_CONTEXT (context); + + if (test_context->overriden_startup_notify_id) + return g_strdup (test_context->overriden_startup_notify_id); + + if (g_app_info_get_id (app_info)) + return g_strdup (g_app_info_get_id (app_info)); + + if (g_app_info_get_display_name (app_info)) + return g_strdup (g_app_info_get_display_name (app_info)); + + return g_strdup (g_app_info_get_commandline (app_info)); +} + +static void +test_launch_context_get_startup_notify_dispose (GObject *object) +{ + TestLaunchContext *test_context = TEST_LAUNCH_CONTEXT (object); + + g_clear_pointer (&test_context->overriden_startup_notify_id, g_free); + G_OBJECT_CLASS (test_launch_context_parent_class)->dispose (object); +} + +static void +test_launch_context_class_init (TestLaunchContextClass *klass) +{ + G_APP_LAUNCH_CONTEXT_CLASS (klass)->get_startup_notify_id = test_launch_context_get_startup_notify_id; + G_OBJECT_CLASS (klass)->dispose = test_launch_context_get_startup_notify_dispose; +} static GAppInfo * create_command_line_app_info (const char *name, @@ -522,20 +582,8 @@ const gchar *but_not_this, const gchar *or_this) { - guint retries = 600; - - /* I hate time-based conditions in tests, but this will wait up to one - * whole minute for "touch file" to finish running. I think it should - * be OK. - * - * 600 * 100ms = 60 seconds. - */ while (access (want_this, F_OK) != 0) - { - g_usleep (100000); /* 100ms */ - g_assert_cmpuint (retries, >, 0); - retries--; - } + g_usleep (100000); /* 100ms */ g_assert_cmpuint (access (but_not_this, F_OK), !=, 0); g_assert_cmpuint (access (or_this, F_OK), !=, 0); @@ -627,6 +675,7 @@ argv2 = g_strdup (arg); argv3 = NULL; + g_assert_true (g_file_test (argv0, G_FILE_TEST_IS_EXECUTABLE)); envp = g_get_environ (); if (with_usr) @@ -818,9 +867,12 @@ assert_search ("image viewer", "", TRUE, TRUE, NULL, NULL); /* There're "flatpak" apps (clocks) installed as well - they should *not* - * match the prefix command ("/bin/sh") in the Exec= line though. + * match the prefix command ("/bin/sh") in the Exec= line though. Then with + * substring matching, Image Viewer (eog) should be in next group because it + * contains "Slideshow" in its keywords. */ - assert_search ("sh", "gnome-terminal.desktop\n", TRUE, FALSE, NULL, NULL); + assert_search ("sh", "gnome-terminal.desktop\n" + "eog.desktop\n", TRUE, FALSE, NULL, NULL); /* "frobnicator.desktop" is ignored by get_all() because the binary is * missing, but search should still find it (to avoid either stale results @@ -835,11 +887,12 @@ assert_search ("files file fil fi f", "nautilus.desktop\n" "gedit.desktop\n", TRUE, TRUE, NULL, NULL); - /* "con" will match "connect" and "contacts" on name but dconf only on - * the "config" keyword + /* "con" will match "connect" and "contacts" on name with prefix match in + * first group, then match "Dconf Editor" and "Desktop Icons" with substring + * match in next group. */ - assert_search ("con", "nautilus-connect-server.desktop gnome-contacts.desktop\n" - "dconf-editor.desktop\n", TRUE, TRUE, NULL, NULL); + assert_search ("con", "gnome-contacts.desktop nautilus-connect-server.desktop\n" + "dconf-editor.desktop nautilus-classic.desktop\n", TRUE, TRUE, NULL, NULL); /* "gnome" will match "eye of gnome" from the user's directory, plus * matching "GNOME Clocks" X-GNOME-FullName. It's only a comment on @@ -947,9 +1000,61 @@ gboolean *invoked = data; g_assert_true (G_IS_APP_LAUNCH_CONTEXT (context)); + + if (TEST_IS_LAUNCH_CONTEXT (context)) + { + GVariantDict dict; + const char *sni; + char *expected_sni; + + g_assert_nonnull (platform_data); + g_variant_dict_init (&dict, platform_data); + g_assert_true ( + g_variant_dict_lookup (&dict, "startup-notification-id", "&s", &sni)); + expected_sni = g_app_launch_context_get_startup_notify_id (context, info, NULL); + g_assert_cmpstr (sni, ==, expected_sni); + + g_free (expected_sni); + g_variant_dict_clear (&dict); + } + else + { + /* Our default context doesn't fill in any platform data */ + g_assert_null (platform_data); + } + + g_assert_false (*invoked); + *invoked = TRUE; +} + +static void +on_launched (GAppLaunchContext *context, GAppInfo *info, GVariant *platform_data, gpointer data) +{ + gboolean *launched = data; + GVariantDict dict; + int pid; + + g_assert_true (G_IS_APP_LAUNCH_CONTEXT (context)); g_assert_true (G_IS_APP_INFO (info)); - /* Our default context doesn't fill in any platform data */ - g_assert_null (platform_data); + g_assert_nonnull (platform_data); + g_variant_dict_init (&dict, platform_data); + g_assert_true (g_variant_dict_lookup (&dict, "pid", "i", &pid, NULL)); + g_assert_cmpint (pid, >, 1); + + g_assert_false (*launched); + *launched = TRUE; + + g_variant_dict_clear (&dict); +} + +static void +on_launch_failed (GAppLaunchContext *context, const char *startup_notify_id, gpointer data) +{ + gboolean *invoked = data; + + g_assert_true (G_IS_APP_LAUNCH_CONTEXT (context)); + g_assert_nonnull (startup_notify_id); + g_test_message ("Application launch failed: %s", startup_notify_id); g_assert_false (*invoked); *invoked = TRUE; @@ -966,27 +1071,24 @@ gboolean retval; const gchar *path; gboolean invoked = FALSE; + gboolean launched = FALSE; + gboolean failed = FALSE; GAppLaunchContext *context; - if (g_getenv ("DISPLAY") == NULL || g_getenv ("DISPLAY")0 == '\0') - { - g_test_skip ("No DISPLAY. Skipping test."); - return; - } - path = g_test_get_filename (G_TEST_BUILT, "appinfo-test.desktop", NULL); appinfo = g_desktop_app_info_new_from_filename (path); + g_assert_true (G_IS_APP_INFO (appinfo)); - if (appinfo == NULL) - { - g_test_skip ("appinfo-test binary not installed"); - return; - } - - context = g_app_launch_context_new (); + context = g_object_new (test_launch_context_get_type (), NULL); g_signal_connect (context, "launch-started", G_CALLBACK (on_launch_started), &invoked); + g_signal_connect (context, "launched", + G_CALLBACK (on_launched), + &launched); + g_signal_connect (context, "launch-failed", + G_CALLBACK (on_launch_failed), + &failed); retval = g_desktop_app_info_launch_uris_as_manager (appinfo, NULL, context, 0, NULL, NULL, NULL, NULL, @@ -994,8 +1096,12 @@ g_assert_no_error (error); g_assert_true (retval); g_assert_true (invoked); + g_assert_true (launched); + g_assert_false (failed); invoked = FALSE; + launched = FALSE; + failed = FALSE; retval = g_desktop_app_info_launch_uris_as_manager_with_fds (appinfo, NULL, context, 0, NULL, NULL, @@ -1005,7 +1111,56 @@ g_assert_no_error (error); g_assert_true (retval); g_assert_true (invoked); + g_assert_true (launched); + g_assert_false (failed); + + g_object_unref (appinfo); + g_assert_finalize_object (context); +} +static void +test_launch_as_manager_fail (void) +{ + GAppLaunchContext *context; + GDesktopAppInfo *appinfo; + GError *error = NULL; + gboolean retval; + const gchar *path; + gboolean launch_started = FALSE; + gboolean launched = FALSE; + gboolean failed = FALSE; + + g_test_summary ("Tests that launch-errors are properly handled, we force " \ + "this by using invalid FD's values when launching as manager"); + + path = g_test_get_filename (G_TEST_BUILT, "appinfo-test.desktop", NULL); + appinfo = g_desktop_app_info_new_from_filename (path); + g_assert_true (G_IS_APP_INFO (appinfo)); + + context = g_object_new (test_launch_context_get_type (), NULL); + g_signal_connect (context, "launch-started", + G_CALLBACK (on_launch_started), + &launch_started); + g_signal_connect (context, "launched", + G_CALLBACK (on_launched), + &launched); + g_signal_connect (context, "launch-failed", + G_CALLBACK (on_launch_failed), + &failed); + + retval = g_desktop_app_info_launch_uris_as_manager_with_fds (appinfo, + NULL, context, 0, + NULL, NULL, + NULL, NULL, + 3000, 3001, 3002, + &error); + g_assert_error (error, G_SPAWN_ERROR, G_SPAWN_ERROR_FAILED); + g_assert_false (retval); + g_assert_true (launch_started); + g_assert_false (launched); + g_assert_true (failed); + + g_clear_error (&error); g_object_unref (appinfo); g_assert_finalize_object (context); } @@ -1120,6 +1275,7 @@ GAppInfo *info; GMainLoop *loop; gboolean called = FALSE; + gint64 start_time, touch_time; loop = g_main_loop_new (NULL, FALSE); info = create_app_info_toucher ("Touch Handled", "handled-async", @@ -1128,6 +1284,7 @@ g_assert_true (G_IS_APP_INFO (info)); g_assert_nonnull (file_path); + start_time = g_get_real_time (); g_app_info_launch_default_for_uri_async ("glib-async-touch://touch-me", NULL, NULL, on_launch_default_for_uri_success_cb, @@ -1136,6 +1293,7 @@ while (!g_file_test (file_path, G_FILE_TEST_IS_REGULAR) || !called) g_main_context_iteration (NULL, FALSE); + touch_time = g_get_real_time () - start_time; g_assert_true (called); g_assert_true (g_file_test (file_path, G_FILE_TEST_IS_REGULAR)); @@ -1156,11 +1314,13 @@ g_cancellable_cancel (cancellable); g_main_loop_run (loop); - /* Once started our touch app may take some time before having written the - * file, so let's wait a bit here before ensuring that the file has been - * created as expected. + /* If started, our touch app would take some time to actually write the + * file to disk, so let's wait a bit here to ensure that the file isn't + * inadvertently getting created when a launch operation is canceled up + * front. Give it 3× as long as the successful case took, to allow for + * some variance. */ - g_usleep (G_USEC_PER_SEC / 10); + g_usleep (touch_time * 3); g_assert_false (g_file_test (file_path, G_FILE_TEST_IS_REGULAR)); g_object_unref (info); @@ -1180,10 +1340,543 @@ g_free (result); } +static const char * +get_terminal_divider (const char *terminal_name) +{ + if (g_str_equal (terminal_name, "xdg-terminal-exec")) + return NULL; + if (g_str_equal (terminal_name, "kgx")) + return "-e"; + if (g_str_equal (terminal_name, "gnome-terminal")) + return "--"; + if (g_str_equal (terminal_name, "tilix")) + return "-e"; + if (g_str_equal (terminal_name, "konsole")) + return "-e"; + if (g_str_equal (terminal_name, "nxterm")) + return "-e"; + if (g_str_equal (terminal_name, "color-xterm")) + return "-e"; + if (g_str_equal (terminal_name, "rxvt")) + return "-e"; + if (g_str_equal (terminal_name, "dtterm")) + return "-e"; + if (g_str_equal (terminal_name, "xterm")) + return "-e"; + if (g_str_equal (terminal_name, "mate-terminal")) + return "-x"; + if (g_str_equal (terminal_name, "xfce4-terminal")) + return "-x"; + + g_return_val_if_reached (NULL); +} + +typedef enum { + TERMINAL_LAUNCH_TYPE_COMMAND_LINE_WITH_PATH_OVERRIDE, + TERMINAL_LAUNCH_TYPE_COMMAND_LINE_WITH_CONTEXT, + TERMINAL_LAUNCH_TYPE_KEY_FILE_WITH_PATH, +} TerminalLaunchType; + +typedef struct { + const char *exec; + TerminalLaunchType type; +} TerminalLaunchData; + +static TerminalLaunchData * +terminal_launch_data_new (const char *exec, TerminalLaunchType type) +{ + TerminalLaunchData *d = NULL; + + d = g_new0 (TerminalLaunchData, 1); + d->exec = exec; + d->type = type; + + return d; +} + +static void +test_launch_uris_with_terminal (gconstpointer data) +{ + int fd; + int ret; + int flags; + int terminal_divider_arg_length; + const TerminalLaunchData *launch_data = data; + const char *terminal_exec = launch_data->exec; + char *old_path = NULL; + char *command_line; + char *bin_path; + char *terminal_path; + char *output_fd_path; + char *script_contents; + char *output_contents = NULL; + char *sh; + GAppInfo *app_info; + GList *uris; + GList *paths; + GStrv output_args; + GError *error = NULL; + GInputStream *input_stream; + GDataInputStream *data_input_stream; + GAppLaunchContext *launch_context; + + sh = g_find_program_in_path ("sh"); + g_assert_nonnull (sh); + + bin_path = g_dir_make_tmp ("bin-path-XXXXXX", &error); + g_assert_no_error (error); + + launch_context = g_object_new (test_launch_context_get_type (), NULL); + + switch (launch_data->type) + { + case TERMINAL_LAUNCH_TYPE_COMMAND_LINE_WITH_PATH_OVERRIDE: + old_path = g_strdup (g_getenv ("PATH")); + g_assert_true (g_setenv ("PATH", bin_path, TRUE)); + break; + + case TERMINAL_LAUNCH_TYPE_COMMAND_LINE_WITH_CONTEXT: + g_app_launch_context_setenv (launch_context, "PATH", bin_path); + break; + + case TERMINAL_LAUNCH_TYPE_KEY_FILE_WITH_PATH: + g_app_launch_context_setenv (launch_context, "PATH", "/not/valid"); + break; + + default: + g_assert_not_reached (); + } + + terminal_path = g_build_filename (bin_path, terminal_exec, NULL); + output_fd_path = g_build_filename (bin_path, "fifo", NULL); + + ret = mkfifo (output_fd_path, 0600); + g_assert_cmpint (ret, ==, 0); + + fd = g_open (output_fd_path, O_RDONLY | O_CLOEXEC | O_NONBLOCK, 0); + g_assert_cmpint (fd, >=, 0); + + flags = fcntl (fd, F_GETFL); + g_assert_cmpint (flags, >=, 0); + + ret = fcntl (fd, F_SETFL, flags & ~O_NONBLOCK); + g_assert_cmpint (ret, ==, 0); + + input_stream = g_unix_input_stream_new (fd, TRUE); + data_input_stream = g_data_input_stream_new (input_stream); + script_contents = g_strdup_printf ("#!%s\n" \ + "out='%s'\n" + "printf '%%s\\n' \"$*\" > \"$out\"\n", + sh, + output_fd_path); + g_file_set_contents (terminal_path, script_contents, -1, &error); + g_assert_no_error (error); + g_assert_cmpint (g_chmod (terminal_path, 0500), ==, 0); + + g_test_message ("Fake '%s' terminal created as: %s", terminal_exec, terminal_path); + + command_line = g_strdup_printf ("true %s-argument", terminal_exec); + + if (launch_data->type == TERMINAL_LAUNCH_TYPE_KEY_FILE_WITH_PATH) + { + GKeyFile *key_file; + char *key_file_contents; + const char base_file = + "Desktop Entry\n" + "Type=Application\n" + "Name=terminal launched app\n" + "Terminal=true\n" + "Path=%s\n" + "Exec=%s\n"; + + key_file = g_key_file_new (); + key_file_contents = g_strdup_printf (base_file, bin_path, command_line); + + g_assert_true ( + g_key_file_load_from_data (key_file, key_file_contents, -1, + G_KEY_FILE_NONE, NULL)); + + app_info = (GAppInfo*) g_desktop_app_info_new_from_keyfile (key_file); + g_assert_true (G_IS_DESKTOP_APP_INFO (app_info)); + g_assert_true ( + g_desktop_app_info_get_boolean (G_DESKTOP_APP_INFO (app_info), "Terminal")); + + g_key_file_unref (key_file); + g_free (key_file_contents); + } + else + { + app_info = g_app_info_create_from_commandline (command_line, + "Test App on Terminal", + G_APP_INFO_CREATE_NEEDS_TERMINAL | + G_APP_INFO_CREATE_SUPPORTS_URIS, + &error); + g_assert_no_error (error); + } + + paths = g_list_prepend (NULL, bin_path); + uris = g_list_prepend (NULL, g_filename_to_uri (bin_path, NULL, &error)); + g_assert_no_error (error); + + paths = g_list_prepend (paths, (gpointer) g_get_user_data_dir ()); + uris = g_list_append (uris, g_filename_to_uri (g_get_user_data_dir (), NULL, &error)); + g_assert_no_error (error); + + g_assert_cmpint (g_list_length (paths), ==, 2); + g_app_info_launch_uris (app_info, uris, launch_context, &error); + g_assert_no_error (error); + + while (output_contents == NULL) + { + output_contents = + g_data_input_stream_read_upto (data_input_stream, "\n", 1, NULL, NULL, &error); + g_assert_no_error (error); + + if (output_contents == NULL) + g_usleep (G_USEC_PER_SEC / 10); + } + g_test_message ("'%s' called with arguments: '%s'", terminal_exec, output_contents); + + g_data_input_stream_read_byte (data_input_stream, NULL, &error); + g_assert_no_error (error); + + output_args = g_strsplit (output_contents, " ", -1); + g_clear_pointer (&output_contents, g_free); + + terminal_divider_arg_length = (get_terminal_divider (terminal_exec) != NULL) ? 1 : 0; + g_assert_cmpuint (g_strv_length (output_args), ==, 3 + terminal_divider_arg_length); + if (terminal_divider_arg_length == 1) + { + g_assert_cmpstr (output_args0, ==, get_terminal_divider (terminal_exec)); + g_assert_cmpstr (output_args1, ==, "true"); + g_assert_cmpstr (output_args2, ==, command_line + 5); + } + else + { + g_assert_cmpstr (output_args0, ==, "true"); + g_assert_cmpstr (output_args1, ==, command_line + 5); + } + paths = g_list_delete_link (paths, + g_list_find_custom (paths, output_args2 + terminal_divider_arg_length, g_str_equal)); + g_assert_cmpint (g_list_length (paths), ==, 1); + g_clear_pointer (&output_args, g_strfreev); + + while (output_contents == NULL) + { + output_contents = + g_data_input_stream_read_upto (data_input_stream, "\n", 1, NULL, NULL, &error); + g_assert_no_error (error); + + if (output_contents == NULL) + g_usleep (G_USEC_PER_SEC / 10); + } + g_test_message ("'%s' called with arguments: '%s'", terminal_exec, output_contents); + + g_data_input_stream_read_byte (data_input_stream, NULL, &error); + g_assert_no_error (error); + + output_args = g_strsplit (output_contents, " ", -1); + g_clear_pointer (&output_contents, g_free); + g_assert_cmpuint (g_strv_length (output_args), ==, 3 + terminal_divider_arg_length); + if (terminal_divider_arg_length > 0) + { + g_assert_cmpstr (output_args0, ==, get_terminal_divider (terminal_exec)); + g_assert_cmpstr (output_args1, ==, "true"); + g_assert_cmpstr (output_args2, ==, command_line + 5); + } + else + { + g_assert_cmpstr (output_args0, ==, "true"); + g_assert_cmpstr (output_args1, ==, command_line + 5); + } + paths = g_list_delete_link (paths, + g_list_find_custom (paths, output_args2 + terminal_divider_arg_length, g_str_equal)); + g_assert_cmpint (g_list_length (paths), ==, 0); + g_clear_pointer (&output_args, g_strfreev); + + g_assert_null (paths); + + if (launch_data->type == TERMINAL_LAUNCH_TYPE_COMMAND_LINE_WITH_PATH_OVERRIDE) + g_assert_true (g_setenv ("PATH", old_path, TRUE)); + + g_close (fd, &error); + g_assert_no_error (error); + + g_free (sh); + g_free (command_line); + g_free (bin_path); + g_free (terminal_path); + g_free (output_fd_path); + g_free (script_contents); + g_free (old_path); + g_clear_pointer (&output_args, g_strfreev); + g_clear_pointer (&output_contents, g_free); + g_clear_object (&data_input_stream); + g_clear_object (&input_stream); + g_clear_object (&app_info); + g_clear_object (&launch_context); + g_clear_error (&error); + g_clear_list (&paths, NULL); + g_clear_list (&uris, g_free); +} + +static void +test_launch_uris_with_invalid_terminal (void) +{ + char *old_path; + char *bin_path; + GAppInfo *app_info; + GError *error = NULL; + + bin_path = g_dir_make_tmp ("bin-path-XXXXXX", &error); + g_assert_no_error (error); + + old_path = g_strdup (g_getenv ("PATH")); + g_assert_true (g_setenv ("PATH", bin_path, TRUE)); + + app_info = g_app_info_create_from_commandline ("true invalid-glib-terminal", + "Test App on Invalid Terminal", + G_APP_INFO_CREATE_NEEDS_TERMINAL | + G_APP_INFO_CREATE_SUPPORTS_URIS, + &error); + g_assert_no_error (error); + + g_app_info_launch_uris (app_info, NULL, NULL, &error); + g_assert_error (error, G_IO_ERROR, G_IO_ERROR_FAILED); + g_clear_error (&error); + + g_assert_true (g_setenv ("PATH", old_path, TRUE)); + + g_clear_object (&app_info); + g_clear_error (&error); + g_free (bin_path); + g_free (old_path); +} + +static void +test_app_path (void) +{ + GDesktopAppInfo *appinfo; + const char *desktop_path; + + desktop_path = g_test_get_filename (G_TEST_BUILT, "appinfo-test-path.desktop", NULL); + appinfo = g_desktop_app_info_new_from_filename (desktop_path); + + g_assert_true (G_IS_DESKTOP_APP_INFO (appinfo)); + + g_clear_object (&appinfo); +} + +static void +test_app_path_wrong (void) +{ + GKeyFile *key_file; + GDesktopAppInfo *appinfo; + const gchar bad_try_exec_file_contents = + "Desktop Entry\n" + "Type=Application\n" + "Name=appinfo-test\n" + "TryExec=appinfo-test\n" + "Path=this-must-not-exist‼\n" + "Exec=true\n"; + const gchar bad_exec_file_contents = + "Desktop Entry\n" + "Type=Application\n" + "Name=appinfo-test\n" + "TryExec=true\n" + "Path=this-must-not-exist‼\n" + "Exec=appinfo-test\n"; + + g_assert_true ( + g_file_test (g_test_get_filename (G_TEST_BUILT, "appinfo-test", NULL), + G_FILE_TEST_IS_REGULAR | G_FILE_TEST_IS_EXECUTABLE)); + + key_file = g_key_file_new (); + + g_assert_true ( + g_key_file_load_from_data (key_file, bad_try_exec_file_contents, -1, + G_KEY_FILE_NONE, NULL)); + + appinfo = g_desktop_app_info_new_from_keyfile (key_file); + g_assert_false (G_IS_DESKTOP_APP_INFO (appinfo)); + + g_assert_true ( + g_key_file_load_from_data (key_file, bad_exec_file_contents, -1, + G_KEY_FILE_NONE, NULL)); + + appinfo = g_desktop_app_info_new_from_keyfile (key_file); + g_assert_false (G_IS_DESKTOP_APP_INFO (appinfo)); + + g_clear_pointer (&key_file, g_key_file_unref); + g_clear_object (&appinfo); +} + +static void +test_launch_startup_notify_fail (void) +{ + GAppInfo *app_info; + GAppLaunchContext *context; + GError *error = NULL; + gboolean launch_started; + gboolean launch_failed; + gboolean launched; + GList *uris; + + app_info = g_app_info_create_from_commandline ("this-must-not-exist‼", + "failing app", + G_APP_INFO_CREATE_NONE | + G_APP_INFO_CREATE_SUPPORTS_STARTUP_NOTIFICATION, + &error); + g_assert_no_error (error); + + context = g_object_new (test_launch_context_get_type (), NULL); + g_signal_connect (context, "launch-started", + G_CALLBACK (on_launch_started), + &launch_started); + g_signal_connect (context, "launched", + G_CALLBACK (on_launch_started), + &launched); + g_signal_connect (context, "launch-failed", + G_CALLBACK (on_launch_failed), + &launch_failed); + + launch_started = FALSE; + launch_failed = FALSE; + launched = FALSE; + uris = g_list_prepend (NULL, g_file_new_for_uri ("foo://bar")); + uris = g_list_prepend (uris, g_file_new_for_uri ("bar://foo")); + g_assert_false (g_app_info_launch (app_info, uris, context, &error)); + g_assert_error (error, G_SPAWN_ERROR, G_SPAWN_ERROR_NOENT); + g_assert_true (launch_started); + g_assert_true (launch_failed); + g_assert_false (launched); + + g_clear_error (&error); + g_clear_object (&app_info); + g_clear_object (&context); + g_clear_list (&uris, g_object_unref); +} + +static void +test_launch_fail (void) +{ + GAppInfo *app_info; + GError *error = NULL; + + app_info = g_app_info_create_from_commandline ("this-must-not-exist‼", + "failing app", + G_APP_INFO_CREATE_NONE, + &error); + g_assert_no_error (error); + + g_assert_false (g_app_info_launch (app_info, NULL, NULL, &error)); + g_assert_error (error, G_SPAWN_ERROR, G_SPAWN_ERROR_NOENT); + + g_clear_error (&error); + g_clear_object (&app_info); +} + +static void +test_launch_fail_absolute_path (void) +{ + GAppInfo *app_info; + GError *error = NULL; + + app_info = g_app_info_create_from_commandline ("/nothing/of/this-must-exist‼", + NULL, + G_APP_INFO_CREATE_NONE, + &error); + g_assert_no_error (error); + + g_assert_false (g_app_info_launch (app_info, NULL, NULL, &error)); + g_assert_error (error, G_SPAWN_ERROR, G_SPAWN_ERROR_NOENT); + + g_clear_error (&error); + g_clear_object (&app_info); + + app_info = g_app_info_create_from_commandline ("/", + NULL, + G_APP_INFO_CREATE_NONE, + &error); + g_assert_no_error (error); + + g_assert_false (g_app_info_launch (app_info, NULL, NULL, &error)); + g_assert_error (error, G_SPAWN_ERROR, G_SPAWN_ERROR_NOENT); + + g_clear_error (&error); + g_clear_object (&app_info); +} + +static void +async_result_cb (GObject *source_object, + GAsyncResult *result, + gpointer user_data) +{ + GAsyncResult **result_out = user_data; + + g_assert (*result_out == NULL); + *result_out = g_object_ref (result); + g_main_context_wakeup (g_main_context_get_thread_default ()); +} + +static void +test_launch_fail_dbus (void) +{ + GTestDBus *bus = NULL; + GDesktopAppInfo *app_info = NULL; + GAppLaunchContext *context = NULL; + GAsyncResult *result = NULL; + GError *error = NULL; + + /* Set up a test session bus to ensure that launching the app happens using + * D-Bus rather than spawning. */ + bus = g_test_dbus_new (G_TEST_DBUS_NONE); + g_test_dbus_up (bus); + + app_info = g_desktop_app_info_new_from_filename (g_test_get_filename (G_TEST_DIST, "org.gtk.test.dbusappinfo.desktop", NULL)); + g_assert_nonnull (app_info); + + g_assert_true (g_desktop_app_info_has_key (app_info, "DBusActivatable")); + + context = g_app_launch_context_new (); + + g_app_info_launch_uris_async (G_APP_INFO (app_info), NULL, context, NULL, async_result_cb, &result); + + while (result == NULL) + g_main_context_iteration (NULL, TRUE); + + g_assert_false (g_app_info_launch_uris_finish (G_APP_INFO (app_info), result, &error)); + g_assert_error (error, G_DBUS_ERROR, G_DBUS_ERROR_SERVICE_UNKNOWN); + + g_test_dbus_down (bus); + g_clear_object (&bus); + + g_clear_error (&error); + g_clear_object (&result); + g_clear_object (&context); + g_clear_object (&app_info); +} + int main (int argc, char *argv) { + guint i; + const gchar *supported_terminals = { + "xdg-terminal-exec", + "kgx", + "gnome-terminal", + "mate-terminal", + "xfce4-terminal", + "tilix", + "konsole", + "nxterm", + "color-xterm", + "rxvt", + "dtterm", + "xterm", + }; + /* While we use %G_TEST_OPTION_ISOLATE_DIRS to create temporary directories * for each of the tests, we want to use the system MIME registry, assuming * that it exists and correctly has shared-mime-info installed. */ @@ -1201,10 +1894,49 @@ g_test_add_func ("/desktop-app-info/search", test_search); g_test_add_func ("/desktop-app-info/implements", test_implements); g_test_add_func ("/desktop-app-info/show-in", test_show_in); + g_test_add_func ("/desktop-app-info/app-path", test_app_path); + g_test_add_func ("/desktop-app-info/app-path/wrong", test_app_path_wrong); + g_test_add_func ("/desktop-app-info/launch/fail", test_launch_fail); + g_test_add_func ("/desktop-app-info/launch/fail-absolute-path", test_launch_fail_absolute_path); + g_test_add_func ("/desktop-app-info/launch/fail-startup-notify", test_launch_startup_notify_fail); + g_test_add_func ("/desktop-app-info/launch/fail-dbus", test_launch_fail_dbus); g_test_add_func ("/desktop-app-info/launch-as-manager", test_launch_as_manager); + g_test_add_func ("/desktop-app-info/launch-as-manager/fail", test_launch_as_manager_fail); g_test_add_func ("/desktop-app-info/launch-default-uri-handler", test_default_uri_handler); g_test_add_func ("/desktop-app-info/launch-default-uri-handler-async", test_default_uri_handler_async); g_test_add_func ("/desktop-app-info/id", test_id); + for (i = 0; i < G_N_ELEMENTS (supported_terminals); i++) + { + char *path; + + path = g_strdup_printf ("/desktop-app-info/launch-uris-with-terminal/with-path/%s", + supported_terminalsi); + g_test_add_data_func_full (path, + terminal_launch_data_new (supported_terminalsi, + TERMINAL_LAUNCH_TYPE_COMMAND_LINE_WITH_PATH_OVERRIDE), + test_launch_uris_with_terminal, g_free); + g_clear_pointer (&path, g_free); + + path = g_strdup_printf ("/desktop-app-info/launch-uris-with-terminal/with-context/%s", + supported_terminalsi); + g_test_add_data_func_full (path, + terminal_launch_data_new (supported_terminalsi, + TERMINAL_LAUNCH_TYPE_COMMAND_LINE_WITH_CONTEXT), + test_launch_uris_with_terminal, g_free); + g_clear_pointer (&path, g_free); + + path = g_strdup_printf ("/desktop-app-info/launch-uris-with-terminal/with-desktop-path/%s", + supported_terminalsi); + g_test_add_data_func_full (path, + terminal_launch_data_new (supported_terminalsi, + TERMINAL_LAUNCH_TYPE_KEY_FILE_WITH_PATH), + test_launch_uris_with_terminal, g_free); + g_clear_pointer (&path, g_free); + } + + g_test_add_func ("/desktop-app-info/launch-uris-with-terminal/invalid-glib-terminal", + test_launch_uris_with_invalid_terminal); + return g_test_run (); }
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/tests/fake-document-portal.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/tests/fake-document-portal.c
Changed
@@ -125,6 +125,8 @@ GMainLoop *loop; guint id; + g_log_writer_default_set_use_stderr (TRUE); + loop = g_main_loop_new (NULL, FALSE); id = g_bus_own_name (G_BUS_TYPE_SESSION,
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/tests/fake-service-name.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/tests/fake-service-name.c
Changed
@@ -98,6 +98,8 @@ { guint id; + g_log_writer_default_set_use_stderr (TRUE); + loop = g_main_loop_new (NULL, FALSE); introspection_data = g_dbus_node_info_new_for_xml (introspection_xml, NULL); g_assert (introspection_data != NULL);
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/tests/file-thumbnail.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/tests/file-thumbnail.c
Changed
@@ -29,6 +29,18 @@ G_FILE_ATTRIBUTE_THUMBNAIL_PATH "," \ G_FILE_ATTRIBUTE_THUMBNAILING_FAILED "," \ G_FILE_ATTRIBUTE_THUMBNAIL_IS_VALID "," \ + G_FILE_ATTRIBUTE_THUMBNAIL_PATH_NORMAL "," \ + G_FILE_ATTRIBUTE_THUMBNAILING_FAILED_NORMAL "," \ + G_FILE_ATTRIBUTE_THUMBNAIL_IS_VALID_NORMAL "," \ + G_FILE_ATTRIBUTE_THUMBNAIL_PATH_LARGE "," \ + G_FILE_ATTRIBUTE_THUMBNAILING_FAILED_LARGE "," \ + G_FILE_ATTRIBUTE_THUMBNAIL_IS_VALID_LARGE "," \ + G_FILE_ATTRIBUTE_THUMBNAIL_PATH_XLARGE "," \ + G_FILE_ATTRIBUTE_THUMBNAILING_FAILED_XLARGE "," \ + G_FILE_ATTRIBUTE_THUMBNAIL_IS_VALID_XLARGE "," \ + G_FILE_ATTRIBUTE_THUMBNAIL_PATH_XXLARGE "," \ + G_FILE_ATTRIBUTE_THUMBNAILING_FAILED_XXLARGE "," \ + G_FILE_ATTRIBUTE_THUMBNAIL_IS_VALID_XXLARGE "," \ ) /* Must be kept in order, for priority */ @@ -202,6 +214,48 @@ return thumbnail; } +static gboolean +get_size_attributes (const char *size, + const gchar **path, + const gchar **is_valid, + const gchar **failed) +{ + if (g_str_equal (size, "normal")) + { + *path = G_FILE_ATTRIBUTE_THUMBNAIL_PATH_NORMAL; + *is_valid = G_FILE_ATTRIBUTE_THUMBNAIL_IS_VALID_NORMAL; + *failed = G_FILE_ATTRIBUTE_THUMBNAILING_FAILED_NORMAL; + return TRUE; + } + else if (g_str_equal (size, "large")) + { + *path = G_FILE_ATTRIBUTE_THUMBNAIL_PATH_LARGE; + *is_valid = G_FILE_ATTRIBUTE_THUMBNAIL_IS_VALID_LARGE; + *failed = G_FILE_ATTRIBUTE_THUMBNAILING_FAILED_LARGE; + return TRUE; + } + else if (g_str_equal (size, "x-large")) + { + *path = G_FILE_ATTRIBUTE_THUMBNAIL_PATH_XLARGE; + *is_valid = G_FILE_ATTRIBUTE_THUMBNAIL_IS_VALID_XLARGE; + *failed = G_FILE_ATTRIBUTE_THUMBNAILING_FAILED_XLARGE; + return TRUE; + } + else if (g_str_equal (size, "xx-large")) + { + *path = G_FILE_ATTRIBUTE_THUMBNAIL_PATH_XXLARGE; + *is_valid = G_FILE_ATTRIBUTE_THUMBNAIL_IS_VALID_XXLARGE; + *failed = G_FILE_ATTRIBUTE_THUMBNAILING_FAILED_XXLARGE; + return TRUE; + } + + *path = NULL; + *is_valid = NULL; + *failed = NULL; + + return FALSE; +} + static void test_valid_thumbnail_size (gconstpointer data) { @@ -211,6 +265,7 @@ GError *error = NULL; GFileInfo *info; const gchar *size = data; + const gchar *path_attr, *failed_attr, *is_valid_attr; thumbnail = create_thumbnail_from_test_file ("valid.png", size, &source); info = g_file_query_info (source, THUMBNAILS_ATTRIBS, G_FILE_QUERY_INFO_NONE, @@ -227,12 +282,31 @@ ==, g_file_peek_path (thumbnail) ); + g_clear_object (&f); /* TODO: We can't really test this without having a proper thumbnail created g_assert_true ( g_file_info_get_attribute_boolean (info, G_FILE_ATTRIBUTE_THUMBNAIL_IS_VALID)); */ + g_assert_true (get_size_attributes (size, &path_attr, &is_valid_attr, &failed_attr)); + + g_assert_true (g_file_info_has_attribute (info, path_attr)); + g_assert_true (g_file_info_has_attribute (info, is_valid_attr)); + g_assert_false (g_file_info_has_attribute (info, failed_attr)); + + f = g_file_new_for_path (g_file_info_get_attribute_byte_string (info, path_attr)); + g_assert_cmpstr ( + g_file_info_get_attribute_byte_string (info, path_attr), + ==, + g_file_peek_path (thumbnail) + ); + g_clear_object (&f); + + /* TODO: We can't really test this without having a proper thumbnail created + g_assert_true (g_file_info_get_attribute_boolean (info, is_valid_attr)); + */ + g_clear_object (&source); g_clear_object (&thumbnail); g_clear_error (&error); @@ -258,6 +332,22 @@ g_assert_false (g_file_info_has_attribute (info, G_FILE_ATTRIBUTE_THUMBNAIL_IS_VALID)); g_assert_false (g_file_info_has_attribute (info, G_FILE_ATTRIBUTE_THUMBNAILING_FAILED)); + g_assert_false (g_file_info_has_attribute (info, G_FILE_ATTRIBUTE_THUMBNAIL_PATH_NORMAL)); + g_assert_false (g_file_info_has_attribute (info, G_FILE_ATTRIBUTE_THUMBNAIL_IS_VALID_NORMAL)); + g_assert_false (g_file_info_has_attribute (info, G_FILE_ATTRIBUTE_THUMBNAILING_FAILED_NORMAL)); + + g_assert_false (g_file_info_has_attribute (info, G_FILE_ATTRIBUTE_THUMBNAIL_PATH_LARGE)); + g_assert_false (g_file_info_has_attribute (info, G_FILE_ATTRIBUTE_THUMBNAIL_IS_VALID_LARGE)); + g_assert_false (g_file_info_has_attribute (info, G_FILE_ATTRIBUTE_THUMBNAILING_FAILED_LARGE)); + + g_assert_false (g_file_info_has_attribute (info, G_FILE_ATTRIBUTE_THUMBNAIL_PATH_XLARGE)); + g_assert_false (g_file_info_has_attribute (info, G_FILE_ATTRIBUTE_THUMBNAIL_IS_VALID_XLARGE)); + g_assert_false (g_file_info_has_attribute (info, G_FILE_ATTRIBUTE_THUMBNAILING_FAILED_XLARGE)); + + g_assert_false (g_file_info_has_attribute (info, G_FILE_ATTRIBUTE_THUMBNAIL_PATH_XXLARGE)); + g_assert_false (g_file_info_has_attribute (info, G_FILE_ATTRIBUTE_THUMBNAIL_IS_VALID_XXLARGE)); + g_assert_false (g_file_info_has_attribute (info, G_FILE_ATTRIBUTE_THUMBNAIL_IS_VALID_XXLARGE)); + g_clear_object (&source); g_clear_object (&thumbnail); g_clear_error (&error); @@ -309,6 +399,7 @@ for (i = 0; i < G_N_ELEMENTS (SIZES_NAMES); i++) { GFile *thumbnail = create_thumbnail (source, SIZES_NAMESi); + const gchar *path_attr, *failed_attr, *is_valid_attr; GFile *f; g_ptr_array_add (sized_thumbnails, thumbnail); @@ -327,6 +418,21 @@ ==, g_file_peek_path (thumbnail) ); + g_clear_object (&f); + + g_assert_true (get_size_attributes (SIZES_NAMESi, + &path_attr, &is_valid_attr, &failed_attr)); + + g_assert_true (g_file_info_has_attribute (info, path_attr)); + g_assert_true (g_file_info_has_attribute (info, is_valid_attr)); + g_assert_false (g_file_info_has_attribute (info, failed_attr)); + + f = g_file_new_for_path (g_file_info_get_attribute_byte_string (info, path_attr)); + g_assert_cmpstr ( + g_file_peek_path (f), + ==, + g_file_peek_path (thumbnail) + ); g_clear_object (&info); g_clear_object (&f); @@ -334,11 +440,41 @@ g_assert_cmpuint (sized_thumbnails->len, ==, G_N_ELEMENTS (SIZES_NAMES)); + /* Ensuring we can access to all the thumbnails by explicit size request */ + for (i = 0; i < G_N_ELEMENTS (SIZES_NAMES); i++) + { + GFile *thumbnail = g_ptr_array_index (sized_thumbnails, i); + const gchar *path_attr, *failed_attr, *is_valid_attr; + GFile *f; + + info = g_file_query_info (source, THUMBNAILS_ATTRIBS, + G_FILE_QUERY_INFO_NONE, NULL, &error); + g_assert_no_error (error); + + g_assert_true (get_size_attributes (SIZES_NAMESi, + &path_attr, &is_valid_attr, &failed_attr)); + + g_assert_true (g_file_info_has_attribute (info, path_attr)); + g_assert_true (g_file_info_has_attribute (info, is_valid_attr)); + g_assert_false (g_file_info_has_attribute (info, failed_attr)); + + f = g_file_new_for_path (g_file_info_get_attribute_byte_string (info, path_attr)); + g_assert_cmpstr ( + g_file_peek_path (f), + ==, + g_file_peek_path (thumbnail) + ); + g_clear_object (&f); + + g_clear_object (&info); + } + /* Now removing them in the inverse order, to check this again */ for (i = G_N_ELEMENTS (SIZES_NAMES); i > 1; i--) { GFile *thumbnail = g_ptr_array_index (sized_thumbnails, i - 1); GFile *less_priority_thumbnail = g_ptr_array_index (sized_thumbnails, i - 2); + const gchar *path_attr, *failed_attr, *is_valid_attr; GFile *f; g_file_delete (thumbnail, NULL, &error); @@ -358,6 +494,21 @@ ==, g_file_peek_path (less_priority_thumbnail) ); + g_clear_object (&f); + + g_assert_true (get_size_attributes (SIZES_NAMESi-2, + &path_attr, &is_valid_attr, &failed_attr)); + + g_assert_true (g_file_info_has_attribute (info, path_attr)); + g_assert_true (g_file_info_has_attribute (info, is_valid_attr)); + g_assert_false (g_file_info_has_attribute (info, failed_attr)); + + f = g_file_new_for_path (g_file_info_get_attribute_byte_string (info, path_attr)); + g_assert_cmpstr ( + g_file_peek_path (f), + ==, + g_file_peek_path (less_priority_thumbnail) + ); g_clear_object (&info); g_clear_object (&f); @@ -382,6 +533,28 @@ g_clear_object (&info); + /* And check if we get the failed state for all explicit requests */ + for (i = 0; i < G_N_ELEMENTS (SIZES_NAMES); i++) + { + const gchar *path_attr, *failed_attr, *is_valid_attr; + + info = g_file_query_info (source, THUMBNAILS_ATTRIBS, + G_FILE_QUERY_INFO_NONE, NULL, &error); + g_assert_no_error (error); + + g_assert_true (get_size_attributes (SIZES_NAMESi, + &path_attr, &is_valid_attr, &failed_attr)); + + g_assert_false (g_file_info_has_attribute (info, path_attr)); + g_assert_true (g_file_info_has_attribute (info, is_valid_attr)); + g_assert_true (g_file_info_has_attribute (info, failed_attr)); + + g_assert_false (g_file_info_get_attribute_boolean (info, is_valid_attr)); + g_assert_true (g_file_info_get_attribute_boolean (info, failed_attr)); + + g_clear_object (&info); + } + /* Removing the failed thumbnail too, so no thumbnail should be available */ g_file_delete (failed_thumbnail, NULL, &error); g_assert_no_error (error); @@ -394,6 +567,26 @@ g_assert_false (g_file_info_has_attribute (info, G_FILE_ATTRIBUTE_THUMBNAIL_IS_VALID)); g_assert_false (g_file_info_has_attribute (info, G_FILE_ATTRIBUTE_THUMBNAILING_FAILED)); + g_clear_object (&info); + + for (i = 0; i < G_N_ELEMENTS (SIZES_NAMES); i++) + { + const gchar *path_attr, *failed_attr, *is_valid_attr; + + info = g_file_query_info (source, THUMBNAILS_ATTRIBS, + G_FILE_QUERY_INFO_NONE, NULL, &error); + g_assert_no_error (error); + + g_assert_true (get_size_attributes (SIZES_NAMESi, + &path_attr, &is_valid_attr, &failed_attr)); + + g_assert_false (g_file_info_has_attribute (info, path_attr)); + g_assert_false (g_file_info_has_attribute (info, is_valid_attr)); + g_assert_false (g_file_info_has_attribute (info, failed_attr)); + + g_clear_object (&info); + } + g_clear_object (&source); g_clear_pointer (&sized_thumbnails, g_ptr_array_unref); g_clear_object (&failed_thumbnail);
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/tests/file.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/tests/file.c
Changed
@@ -1310,6 +1310,65 @@ #endif /* __linux__ */ +#ifdef __linux__ +/* + * check_cap_dac_override: + * @tmpdir: A temporary directory in which we can create and delete files + * + * Check whether the current process can bypass DAC permissions. + * + * Traditionally, "privileged" processes (those with effective uid 0) + * could do this (and bypass many other checks), and "unprivileged" + * processes could not. + * + * In Linux, the special powers of euid 0 are divided into many + * capabilities: see `capabilities(7)`. The one we are interested in + * here is `CAP_DAC_OVERRIDE`. + * + * We do this generically instead of actually looking at the capability + * bits, so that the right thing will happen on non-Linux Unix + * implementations, in particular if they have something equivalent to + * but not identical to Linux permissions. + * + * Returns: %TRUE if we have Linux `CAP_DAC_OVERRIDE` or equivalent + * privileges + */ +static gboolean +check_cap_dac_override (const char *tmpdir) +{ + gchar *dac_denies_write; + gchar *inside; + gboolean have_cap; + + dac_denies_write = g_build_filename (tmpdir, "dac-denies-write", NULL); + inside = g_build_filename (dac_denies_write, "inside", NULL); + + g_assert_no_errno (mkdir (dac_denies_write, S_IRWXU)); + g_assert_no_errno (chmod (dac_denies_write, 0)); + + if (mkdir (inside, S_IRWXU) == 0) + { + g_test_message ("Looks like we have CAP_DAC_OVERRIDE or equivalent"); + g_assert_no_errno (rmdir (inside)); + have_cap = TRUE; + } + else + { + int saved_errno = errno; + + g_test_message ("We do not have CAP_DAC_OVERRIDE or equivalent"); + g_assert_cmpint (saved_errno, ==, EACCES); + have_cap = FALSE; + } + + g_assert_no_errno (chmod (dac_denies_write, S_IRWXU)); + g_assert_no_errno (rmdir (dac_denies_write)); + g_free (dac_denies_write); + g_free (inside); + return have_cap; +} +#endif + /* A big test for g_file_replace() and g_file_replace_readwrite(). The * @test_data is a boolean: %TRUE to test g_file_replace_readwrite(), %FALSE to * test g_file_replace(). The test setup and checks are identical for both @@ -1350,6 +1409,7 @@ guint setup_source_mode; FileTestSetupType setup_backup_type; guint setup_backup_mode; + gboolean skip_if_cap_dac_override; /* Expected results. */ gboolean expected_success; @@ -1373,7 +1433,7 @@ { FALSE, G_FILE_CREATE_NONE, NULL, FILE_TEST_SETUP_TYPE_NONEXISTENT, 0, - FILE_TEST_SETUP_TYPE_NONEXISTENT, 0, + FILE_TEST_SETUP_TYPE_NONEXISTENT, 0, FALSE, TRUE, 0, 0, 1, FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_public_mode, new_contents, FILE_TEST_SETUP_TYPE_NONEXISTENT, 0, NULL, @@ -1381,7 +1441,7 @@ { FALSE, G_FILE_CREATE_NONE, NULL, FILE_TEST_SETUP_TYPE_REGULAR_EMPTY, default_public_mode, - FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_public_mode, + FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_public_mode, FALSE, TRUE, 0, 0, 2, FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_public_mode, new_contents, FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_public_mode, original_backup_contents, @@ -1389,7 +1449,7 @@ { FALSE, G_FILE_CREATE_NONE, NULL, FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_public_mode, - FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_public_mode, + FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_public_mode, FALSE, TRUE, 0, 0, 2, FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_public_mode, new_contents, FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_public_mode, original_backup_contents, @@ -1397,7 +1457,7 @@ { FALSE, G_FILE_CREATE_NONE, NULL, FILE_TEST_SETUP_TYPE_DIRECTORY, 0, - FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_public_mode, + FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_public_mode, FALSE, FALSE, G_IO_ERROR, G_IO_ERROR_IS_DIRECTORY, 2, FILE_TEST_SETUP_TYPE_DIRECTORY, 0, NULL, FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_public_mode, original_backup_contents, @@ -1405,7 +1465,7 @@ { FALSE, G_FILE_CREATE_NONE, NULL, FILE_TEST_SETUP_TYPE_SOCKET, default_public_mode, - FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_public_mode, + FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_public_mode, FALSE, FALSE, G_IO_ERROR, G_IO_ERROR_NOT_REGULAR_FILE, 2, FILE_TEST_SETUP_TYPE_SOCKET, default_public_mode, NULL, FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_public_mode, original_backup_contents, @@ -1413,7 +1473,7 @@ { FALSE, G_FILE_CREATE_NONE, NULL, FILE_TEST_SETUP_TYPE_SYMLINK_DANGLING, 0, - FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_public_mode, + FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_public_mode, FALSE, TRUE, 0, 0, 3, FILE_TEST_SETUP_TYPE_SYMLINK_VALID, default_public_mode, "source-target", FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_public_mode, original_backup_contents, @@ -1421,7 +1481,7 @@ { FALSE, G_FILE_CREATE_NONE, NULL, FILE_TEST_SETUP_TYPE_SYMLINK_VALID, default_public_mode, - FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_public_mode, + FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_public_mode, FALSE, TRUE, 0, 0, 3, FILE_TEST_SETUP_TYPE_SYMLINK_VALID, default_public_mode, "source-target", FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_public_mode, original_backup_contents, @@ -1432,7 +1492,7 @@ { FALSE, G_FILE_CREATE_NONE, "incorrect etag", FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_public_mode, - FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_public_mode, + FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_public_mode, FALSE, FALSE, G_IO_ERROR, G_IO_ERROR_WRONG_ETAG, 2, FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_public_mode, original_source_contents, FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_public_mode, original_backup_contents, @@ -1444,7 +1504,7 @@ { TRUE, G_FILE_CREATE_NONE, NULL, FILE_TEST_SETUP_TYPE_NONEXISTENT, 0, - FILE_TEST_SETUP_TYPE_NONEXISTENT, 0, + FILE_TEST_SETUP_TYPE_NONEXISTENT, 0, FALSE, TRUE, 0, 0, 1, FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_public_mode, new_contents, FILE_TEST_SETUP_TYPE_NONEXISTENT, 0, NULL, @@ -1452,7 +1512,7 @@ { TRUE, G_FILE_CREATE_NONE, NULL, FILE_TEST_SETUP_TYPE_REGULAR_EMPTY, default_public_mode, - FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_public_mode, + FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_public_mode, FALSE, TRUE, 0, 0, 2, FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_public_mode, new_contents, FILE_TEST_SETUP_TYPE_REGULAR_EMPTY, default_public_mode, NULL, @@ -1460,7 +1520,7 @@ { TRUE, G_FILE_CREATE_NONE, NULL, FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_public_mode, - FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_public_mode, + FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_public_mode, FALSE, TRUE, 0, 0, 2, FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_public_mode, new_contents, FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_public_mode, original_source_contents, @@ -1468,7 +1528,7 @@ { TRUE, G_FILE_CREATE_NONE, NULL, FILE_TEST_SETUP_TYPE_DIRECTORY, 0, - FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_public_mode, + FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_public_mode, FALSE, FALSE, G_IO_ERROR, G_IO_ERROR_IS_DIRECTORY, 2, FILE_TEST_SETUP_TYPE_DIRECTORY, 0, NULL, FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_public_mode, original_backup_contents, @@ -1476,7 +1536,7 @@ { TRUE, G_FILE_CREATE_NONE, NULL, FILE_TEST_SETUP_TYPE_SOCKET, default_public_mode, - FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_public_mode, + FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_public_mode, FALSE, FALSE, G_IO_ERROR, G_IO_ERROR_NOT_REGULAR_FILE, 2, FILE_TEST_SETUP_TYPE_SOCKET, default_public_mode, NULL, FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_public_mode, original_backup_contents, @@ -1484,7 +1544,7 @@ { TRUE, G_FILE_CREATE_NONE, NULL, FILE_TEST_SETUP_TYPE_SYMLINK_DANGLING, 0, - FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_public_mode, + FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_public_mode, FALSE, TRUE, 0, 0, /* The final situation here is a bit odd; the backup file is a bit * pointless as the original source file was a dangling symlink. @@ -1500,7 +1560,7 @@ { TRUE, G_FILE_CREATE_NONE, NULL, FILE_TEST_SETUP_TYPE_SYMLINK_VALID, default_public_mode, - FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_public_mode, + FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_public_mode, FALSE, TRUE, 0, 0, /* FIXME: The permissions for the backup file are just the default umask, * but should probably be the same as the permissions for the source @@ -1516,7 +1576,7 @@ { TRUE, G_FILE_CREATE_NONE, NULL, FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_public_mode, - FILE_TEST_SETUP_TYPE_NONEXISTENT, 0, + FILE_TEST_SETUP_TYPE_NONEXISTENT, 0, FALSE, TRUE, 0, 0, 2, FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_public_mode, new_contents, FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_public_mode, original_source_contents, @@ -1524,7 +1584,7 @@ { TRUE, G_FILE_CREATE_NONE, NULL, FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_public_mode, - FILE_TEST_SETUP_TYPE_REGULAR_EMPTY, default_public_mode, + FILE_TEST_SETUP_TYPE_REGULAR_EMPTY, default_public_mode, FALSE, TRUE, 0, 0, 2, FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_public_mode, new_contents, FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_public_mode, original_source_contents, @@ -1532,7 +1592,7 @@ { TRUE, G_FILE_CREATE_NONE, NULL, FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_public_mode, - FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_public_mode, + FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_public_mode, FALSE, TRUE, 0, 0, 2, FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_public_mode, new_contents, FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_public_mode, original_source_contents, @@ -1540,7 +1600,7 @@ { TRUE, G_FILE_CREATE_NONE, NULL, FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_public_mode, - FILE_TEST_SETUP_TYPE_DIRECTORY, 0, + FILE_TEST_SETUP_TYPE_DIRECTORY, 0, FALSE, FALSE, G_IO_ERROR, G_IO_ERROR_CANT_CREATE_BACKUP, 2, FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_public_mode, original_source_contents, FILE_TEST_SETUP_TYPE_DIRECTORY, 0, NULL, @@ -1548,7 +1608,7 @@ { TRUE, G_FILE_CREATE_NONE, NULL, FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_public_mode, - FILE_TEST_SETUP_TYPE_SOCKET, default_public_mode, + FILE_TEST_SETUP_TYPE_SOCKET, default_public_mode, FALSE, TRUE, 0, 0, 2, FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_public_mode, new_contents, FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_public_mode, original_source_contents, @@ -1556,7 +1616,7 @@ { TRUE, G_FILE_CREATE_NONE, NULL, FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_public_mode, - FILE_TEST_SETUP_TYPE_SYMLINK_DANGLING, 0, + FILE_TEST_SETUP_TYPE_SYMLINK_DANGLING, 0, FALSE, TRUE, 0, 0, 2, FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_public_mode, new_contents, FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_public_mode, original_source_contents, @@ -1564,7 +1624,7 @@ { TRUE, G_FILE_CREATE_NONE, NULL, FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_public_mode, - FILE_TEST_SETUP_TYPE_SYMLINK_VALID, default_public_mode, + FILE_TEST_SETUP_TYPE_SYMLINK_VALID, default_public_mode, FALSE, TRUE, 0, 0, /* the third file is `source~-target`, the original target of the old * backup symlink */ @@ -1578,7 +1638,7 @@ { FALSE, G_FILE_CREATE_REPLACE_DESTINATION, NULL, FILE_TEST_SETUP_TYPE_NONEXISTENT, 0, - FILE_TEST_SETUP_TYPE_NONEXISTENT, 0, + FILE_TEST_SETUP_TYPE_NONEXISTENT, 0, FALSE, TRUE, 0, 0, 1, FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_public_mode, new_contents, FILE_TEST_SETUP_TYPE_NONEXISTENT, 0, NULL, @@ -1586,7 +1646,7 @@ { FALSE, G_FILE_CREATE_REPLACE_DESTINATION, NULL, FILE_TEST_SETUP_TYPE_REGULAR_EMPTY, default_public_mode, - FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_public_mode, + FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_public_mode, FALSE, TRUE, 0, 0, 2, FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_public_mode, new_contents, FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_public_mode, original_backup_contents, @@ -1594,7 +1654,7 @@ { FALSE, G_FILE_CREATE_REPLACE_DESTINATION, NULL, FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_public_mode, - FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_public_mode, + FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_public_mode, FALSE, TRUE, 0, 0, 2, FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_public_mode, new_contents, FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_public_mode, original_backup_contents, @@ -1602,7 +1662,7 @@ { FALSE, G_FILE_CREATE_REPLACE_DESTINATION, NULL, FILE_TEST_SETUP_TYPE_DIRECTORY, 0, - FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_public_mode, + FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_public_mode, FALSE, FALSE, G_IO_ERROR, G_IO_ERROR_IS_DIRECTORY, 2, FILE_TEST_SETUP_TYPE_DIRECTORY, 0, NULL, FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_public_mode, original_backup_contents, @@ -1610,7 +1670,7 @@ { FALSE, G_FILE_CREATE_REPLACE_DESTINATION, NULL, FILE_TEST_SETUP_TYPE_SOCKET, default_public_mode, - FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_public_mode, + FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_public_mode, FALSE, FALSE, G_IO_ERROR, G_IO_ERROR_NOT_REGULAR_FILE, 2, FILE_TEST_SETUP_TYPE_SOCKET, default_public_mode, NULL, FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_public_mode, original_backup_contents, @@ -1618,7 +1678,7 @@ { FALSE, G_FILE_CREATE_REPLACE_DESTINATION, NULL, FILE_TEST_SETUP_TYPE_SYMLINK_DANGLING, 0, - FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_public_mode, + FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_public_mode, FALSE, TRUE, 0, 0, 2, FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_public_mode, new_contents, FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_public_mode, original_backup_contents, @@ -1626,7 +1686,7 @@ { FALSE, G_FILE_CREATE_REPLACE_DESTINATION, NULL, FILE_TEST_SETUP_TYPE_SYMLINK_VALID, default_public_mode, - FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_public_mode, + FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_public_mode, FALSE, TRUE, 0, 0, /* the third file is `source-target`, the original target of the old * source file */ @@ -1640,7 +1700,7 @@ { FALSE, G_FILE_CREATE_REPLACE_DESTINATION, "incorrect etag", FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_public_mode, - FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_public_mode, + FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_public_mode, FALSE, FALSE, G_IO_ERROR, G_IO_ERROR_WRONG_ETAG, 2, FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_public_mode, original_source_contents, FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_public_mode, original_backup_contents, @@ -1653,7 +1713,7 @@ { TRUE, G_FILE_CREATE_REPLACE_DESTINATION, NULL, FILE_TEST_SETUP_TYPE_NONEXISTENT, 0, - FILE_TEST_SETUP_TYPE_NONEXISTENT, 0, + FILE_TEST_SETUP_TYPE_NONEXISTENT, 0, FALSE, TRUE, 0, 0, 1, FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_public_mode, new_contents, FILE_TEST_SETUP_TYPE_NONEXISTENT, 0, NULL, @@ -1661,7 +1721,7 @@ { TRUE, G_FILE_CREATE_REPLACE_DESTINATION, NULL, FILE_TEST_SETUP_TYPE_REGULAR_EMPTY, default_public_mode, - FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_public_mode, + FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_public_mode, FALSE, TRUE, 0, 0, 2, FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_public_mode, new_contents, FILE_TEST_SETUP_TYPE_REGULAR_EMPTY, default_public_mode, NULL, @@ -1669,7 +1729,7 @@ { TRUE, G_FILE_CREATE_REPLACE_DESTINATION, NULL, FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_public_mode, - FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_public_mode, + FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_public_mode, FALSE, TRUE, 0, 0, 2, FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_public_mode, new_contents, FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_public_mode, original_source_contents, @@ -1677,7 +1737,7 @@ { TRUE, G_FILE_CREATE_REPLACE_DESTINATION, NULL, FILE_TEST_SETUP_TYPE_DIRECTORY, 0, - FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_public_mode, + FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_public_mode, FALSE, FALSE, G_IO_ERROR, G_IO_ERROR_IS_DIRECTORY, 2, FILE_TEST_SETUP_TYPE_DIRECTORY, 0, NULL, FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_public_mode, original_backup_contents, @@ -1685,7 +1745,7 @@ { TRUE, G_FILE_CREATE_REPLACE_DESTINATION, NULL, FILE_TEST_SETUP_TYPE_SOCKET, default_public_mode, - FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_public_mode, + FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_public_mode, FALSE, FALSE, G_IO_ERROR, G_IO_ERROR_NOT_REGULAR_FILE, 2, FILE_TEST_SETUP_TYPE_SOCKET, default_public_mode, NULL, FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_public_mode, original_backup_contents, @@ -1693,7 +1753,7 @@ { TRUE, G_FILE_CREATE_REPLACE_DESTINATION, NULL, FILE_TEST_SETUP_TYPE_SYMLINK_DANGLING, 0, - FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_public_mode, + FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_public_mode, FALSE, TRUE, 0, 0, 2, FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_public_mode, new_contents, FILE_TEST_SETUP_TYPE_SYMLINK_DANGLING, 0, "source-target", @@ -1701,7 +1761,7 @@ { TRUE, G_FILE_CREATE_REPLACE_DESTINATION, NULL, FILE_TEST_SETUP_TYPE_SYMLINK_VALID, default_public_mode, - FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_public_mode, + FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_public_mode, FALSE, TRUE, 0, 0, /* the third file is `source-target`, the original target of the old * source file */ @@ -1716,7 +1776,7 @@ { TRUE, G_FILE_CREATE_REPLACE_DESTINATION, NULL, FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_public_mode, - FILE_TEST_SETUP_TYPE_NONEXISTENT, 0, + FILE_TEST_SETUP_TYPE_NONEXISTENT, 0, FALSE, TRUE, 0, 0, 2, FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_public_mode, new_contents, FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_public_mode, original_source_contents, @@ -1724,7 +1784,7 @@ { TRUE, G_FILE_CREATE_REPLACE_DESTINATION, NULL, FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_public_mode, - FILE_TEST_SETUP_TYPE_REGULAR_EMPTY, default_public_mode, + FILE_TEST_SETUP_TYPE_REGULAR_EMPTY, default_public_mode, FALSE, TRUE, 0, 0, 2, FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_public_mode, new_contents, FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_public_mode, original_source_contents, @@ -1732,7 +1792,7 @@ { TRUE, G_FILE_CREATE_REPLACE_DESTINATION, NULL, FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_public_mode, - FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_public_mode, + FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_public_mode, FALSE, TRUE, 0, 0, 2, FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_public_mode, new_contents, FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_public_mode, original_source_contents, @@ -1740,7 +1800,7 @@ { TRUE, G_FILE_CREATE_REPLACE_DESTINATION, NULL, FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_public_mode, - FILE_TEST_SETUP_TYPE_DIRECTORY, 0, + FILE_TEST_SETUP_TYPE_DIRECTORY, 0, FALSE, FALSE, G_IO_ERROR, G_IO_ERROR_CANT_CREATE_BACKUP, 2, FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_public_mode, original_source_contents, FILE_TEST_SETUP_TYPE_DIRECTORY, 0, NULL, @@ -1748,7 +1808,7 @@ { TRUE, G_FILE_CREATE_REPLACE_DESTINATION, NULL, FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_public_mode, - FILE_TEST_SETUP_TYPE_SOCKET, default_public_mode, + FILE_TEST_SETUP_TYPE_SOCKET, default_public_mode, FALSE, TRUE, 0, 0, 2, FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_public_mode, new_contents, FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_public_mode, original_source_contents, @@ -1756,7 +1816,7 @@ { TRUE, G_FILE_CREATE_REPLACE_DESTINATION, NULL, FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_public_mode, - FILE_TEST_SETUP_TYPE_SYMLINK_DANGLING, 0, + FILE_TEST_SETUP_TYPE_SYMLINK_DANGLING, 0, FALSE, TRUE, 0, 0, 2, FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_public_mode, new_contents, FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_public_mode, original_source_contents, @@ -1764,7 +1824,7 @@ { TRUE, G_FILE_CREATE_REPLACE_DESTINATION, NULL, FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_public_mode, - FILE_TEST_SETUP_TYPE_SYMLINK_VALID, default_public_mode, + FILE_TEST_SETUP_TYPE_SYMLINK_VALID, default_public_mode, FALSE, TRUE, 0, 0, /* the third file is `source~-target`, the original target of the old * backup symlink */ @@ -1776,7 +1836,7 @@ { FALSE, G_FILE_CREATE_PRIVATE, NULL, FILE_TEST_SETUP_TYPE_NONEXISTENT, 0, - FILE_TEST_SETUP_TYPE_NONEXISTENT, 0, + FILE_TEST_SETUP_TYPE_NONEXISTENT, 0, FALSE, TRUE, 0, 0, 1, FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_private_mode, new_contents, FILE_TEST_SETUP_TYPE_NONEXISTENT, 0, NULL, @@ -1784,7 +1844,7 @@ { FALSE, G_FILE_CREATE_PRIVATE, NULL, FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_public_mode, - FILE_TEST_SETUP_TYPE_NONEXISTENT, 0, + FILE_TEST_SETUP_TYPE_NONEXISTENT, 0, FALSE, TRUE, 0, 0, /* the file isn’t being replaced, so it should keep its existing permissions */ 1, FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_public_mode, new_contents, @@ -1793,7 +1853,7 @@ { FALSE, G_FILE_CREATE_PRIVATE | G_FILE_CREATE_REPLACE_DESTINATION, NULL, FILE_TEST_SETUP_TYPE_NONEXISTENT, 0, - FILE_TEST_SETUP_TYPE_NONEXISTENT, 0, + FILE_TEST_SETUP_TYPE_NONEXISTENT, 0, FALSE, TRUE, 0, 0, 1, FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_private_mode, new_contents, FILE_TEST_SETUP_TYPE_NONEXISTENT, 0, NULL, @@ -1801,18 +1861,21 @@ { FALSE, G_FILE_CREATE_PRIVATE | G_FILE_CREATE_REPLACE_DESTINATION, NULL, FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_public_mode, - FILE_TEST_SETUP_TYPE_NONEXISTENT, 0, + FILE_TEST_SETUP_TYPE_NONEXISTENT, 0, FALSE, TRUE, 0, 0, 1, FILE_TEST_SETUP_TYPE_REGULAR_NONEMPTY, default_private_mode, new_contents, FILE_TEST_SETUP_TYPE_NONEXISTENT, 0, NULL, }, /* make the initial source file unreadable, so the replace operation - * should fail */ + * should fail + * + * Permissions are ignored if we have CAP_DAC_OVERRIDE or equivalent, + * and in particular if we're root. In this scenario,we need to skip it */ { FALSE, G_FILE_CREATE_NONE, NULL, FILE_TEST_SETUP_TYPE_REGULAR_EMPTY, 0 /* most restrictive permissions */, - FILE_TEST_SETUP_TYPE_NONEXISTENT, 0, + FILE_TEST_SETUP_TYPE_NONEXISTENT, 0, TRUE, FALSE, G_IO_ERROR, G_IO_ERROR_PERMISSION_DENIED, 1, FILE_TEST_SETUP_TYPE_REGULAR_EMPTY, 0, NULL, FILE_TEST_SETUP_TYPE_NONEXISTENT, 0, NULL, @@ -1844,6 +1907,19 @@ tmpdir = g_file_new_for_path (tmpdir_path); g_test_message ("Test %" G_GSIZE_FORMAT ", using temporary directory %s", i, tmpdir_path); + + if (testsi.skip_if_cap_dac_override && check_cap_dac_override (tmpdir_path)) + { + g_test_message ("Skipping test as process has CAP_DAC_OVERRIDE capability and the test checks permissions"); + + g_file_delete (tmpdir, NULL, &local_error); + g_assert_no_error (local_error); + g_clear_object (&tmpdir); + g_free (tmpdir_path); + + continue; + } + g_free (tmpdir_path); /* Set up the test directory. */ @@ -2472,7 +2548,7 @@ GError *error = NULL; gchar *du_path = NULL; -#ifndef HAVE_COCOA +#ifndef __APPLE__ du_path = g_find_program_in_path ("du"); #endif @@ -3537,10 +3613,14 @@ GFileIOStream *iostream; g_test_bug ("https://bugzilla.gnome.org/show_bug.cgi?id=755795"); - /* This is historic behaviour. See: + /* Historically, GLib used to explicitly consider zero-size files as text/plain, + * so they opened in a text editor. In 2.76, we changed that to application/x-zerosize, + * because that’s what xdgmime uses: * - https://gitlab.gnome.org/GNOME/glib/-/blob/2.74.0/gio/glocalfileinfo.c#L1360-1369 - * - https://bugzilla.gnome.org/show_bug.cgi?id=755795 */ - g_test_summary ("empty files should always be considered text/plain"); + * - https://bugzilla.gnome.org/show_bug.cgi?id=755795 + * - https://gitlab.gnome.org/GNOME/glib/-/issues/2777 + */ + g_test_summary ("empty files should always be considered application/x-zerosize"); empty_file = g_file_new_tmp ("empty-file-XXXXXX", &iostream, &error); g_assert_no_error (error); @@ -3556,8 +3636,8 @@ NULL, &error); g_assert_no_error (error); -#ifndef HAVE_COCOA - g_assert_cmpstr (g_file_info_get_content_type (file_info), ==, "text/plain"); +#ifndef __APPLE__ + g_assert_cmpstr (g_file_info_get_content_type (file_info), ==, "application/x-zerosize"); #else g_assert_cmpstr (g_file_info_get_content_type (file_info), ==, "public.text"); #endif
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/tests/g-file-info-filesystem-readonly.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/tests/g-file-info-filesystem-readonly.c
Changed
@@ -1,6 +1,8 @@ /* Testcase for bug in GIO function g_file_query_filesystem_info() * Author: Nelson Benítez León * + * SPDX-License-Identifier: LicenseRef-old-glib-tests + * * This work is provided "as is"; redistribution and modification * in whole or in part, in any medium, physical or electronic is * permitted without restriction.
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/tests/g-file-info.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/tests/g-file-info.c
Changed
@@ -2,6 +2,8 @@ * Copyright (C) 2008 Red Hat, Inc. * Authors: Tomas Bzatek <tbzatek@redhat.com> * + * SPDX-License-Identifier: LicenseRef-old-glib-tests + * * This work is provided "as is"; redistribution and modification * in whole or in part, in any medium, physical or electronic is * permitted without restriction. @@ -307,7 +309,7 @@ g_assert_nonnull (dt_usecs); ts = g_date_time_difference (dt_usecs, dt); - g_assert_cmpint (ts, >, 0); + g_assert_cmpint (ts, >=, 0); g_assert_cmpint (ts, <, G_USEC_PER_SEC); /* Try again with nanosecond precision. */ @@ -442,7 +444,7 @@ g_assert_nonnull (dt_usecs); ts = g_date_time_difference (dt_usecs, dt); - g_assert_cmpint (ts, >, 0); + g_assert_cmpint (ts, >=, 0); g_assert_cmpint (ts, <, G_USEC_PER_SEC); /* Try again with nanosecond precision. */
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/tests/g-file.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/tests/g-file.c
Changed
@@ -2,6 +2,8 @@ * Copyright (C) 2008 Red Hat, Inc. * Authors: Tomas Bzatek <tbzatek@redhat.com> * + * SPDX-License-Identifier: LicenseRef-old-glib-tests + * * This work is provided "as is"; redistribution and modification * in whole or in part, in any medium, physical or electronic is * permitted without restriction.
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/tests/g-icon.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/tests/g-icon.c
Changed
@@ -2,6 +2,8 @@ * * Copyright (C) 2008 Red Hat, Inc. * + * SPDX-License-Identifier: LicenseRef-old-glib-tests + * * This work is provided "as is"; redistribution and modification * in whole or in part, in any medium, physical or electronic is * permitted without restriction.
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/tests/gapplication.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/tests/gapplication.c
Changed
@@ -1071,6 +1071,8 @@ { gboolean allow_replacement; GSubprocess *subprocess; + GApplication *app; /* (not owned) */ + guint timeout_id; } TestReplaceData; static void @@ -1116,11 +1118,12 @@ } static gboolean -quit_already (gpointer data) +quit_already (gpointer user_data) { - GApplication *app = data; + TestReplaceData *data = user_data; - g_application_quit (app); + g_application_quit (data->app); + data->timeout_id = 0; return G_SOURCE_REMOVE; } @@ -1162,18 +1165,19 @@ data.allow_replacement = allow; data.subprocess = NULL; + data.timeout_id = 0; bus = g_test_dbus_new (0); g_test_dbus_up (bus); - app = g_application_new ("org.gtk.TestApplication.Replace", allow ? G_APPLICATION_ALLOW_REPLACEMENT : G_APPLICATION_DEFAULT_FLAGS); + app = data.app = g_application_new ("org.gtk.TestApplication.Replace", allow ? G_APPLICATION_ALLOW_REPLACEMENT : G_APPLICATION_DEFAULT_FLAGS); g_application_set_inactivity_timeout (app, 500); g_signal_connect (app, "name-lost", G_CALLBACK (name_was_lost), &name_lost); g_signal_connect (app, "startup", G_CALLBACK (startup_cb), &data); g_signal_connect (app, "activate", G_CALLBACK (activate), NULL); if (!allow) - g_timeout_add_seconds (1, quit_already, app); + data.timeout_id = g_timeout_add_seconds (1, quit_already, &data); g_application_run (app, G_N_ELEMENTS (argv) - 1, argv); @@ -1183,6 +1187,7 @@ else g_assert_false (name_lost); + g_clear_handle_id (&data.timeout_id, g_source_remove); g_object_unref (app); g_free (binpath); @@ -1686,6 +1691,8 @@ { g_setenv ("LC_ALL", "C", TRUE); + g_log_writer_default_set_use_stderr (TRUE); + g_test_init (&argc, &argv, NULL); if (!g_test_subprocess ())
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/tests/gdbus-addresses.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/tests/gdbus-addresses.c
Changed
@@ -209,7 +209,7 @@ main (int argc, char *argv) { - g_test_init (&argc, &argv, NULL); + g_test_init (&argc, &argv, G_TEST_OPTION_ISOLATE_DIRS, NULL); g_test_add_func ("/gdbus/empty-address", test_empty_address); g_test_add_func ("/gdbus/unsupported-address", test_unsupported_address);
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/tests/gdbus-auth.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/tests/gdbus-auth.c
Changed
@@ -63,17 +63,10 @@ guid = g_dbus_generate_guid (); #ifdef G_OS_UNIX - if (g_unix_socket_address_abstract_names_supported ()) - { - addr = g_strdup ("unix:tmpdir=/tmp/gdbus-test-"); - } - else - { - gchar *tmpdir; - tmpdir = g_dir_make_tmp ("gdbus-test-XXXXXX", NULL); - addr = g_strdup_printf ("unix:tmpdir=%s", tmpdir); - g_free (tmpdir); - } + gchar *tmpdir; + tmpdir = g_dir_make_tmp ("gdbus-test-XXXXXX", NULL); + addr = g_strdup_printf ("unix:tmpdir=%s", tmpdir); + g_free (tmpdir); #else addr = g_strdup ("nonce-tcp:"); #endif @@ -118,15 +111,6 @@ return FALSE; } -static gboolean -test_auth_on_timeout (gpointer user_data) -{ - g_error ("Timeout waiting for client"); - g_assert_not_reached (); - return G_SOURCE_REMOVE; -} - - typedef struct { const gchar *address; @@ -169,7 +153,6 @@ GMainLoop *loop; GThread *client_thread; TestAuthData data; - guint timeout_id; server = server_new_for_mechanism (allowed_server_mechanism); @@ -180,13 +163,12 @@ G_CALLBACK (test_auth_on_new_connection), loop); - timeout_id = g_timeout_add_seconds (5, test_auth_on_timeout, NULL); - data.allowed_client_mechanism = allowed_client_mechanism; data.allowed_server_mechanism = allowed_server_mechanism; data.address = g_dbus_server_get_client_address (server); - /* run the D-Bus client in a thread */ + /* Run the D-Bus client in a thread. If this hangs forever, the test harness + * (typically Meson) will eventually kill the test. */ client_thread = g_thread_new ("gdbus-client-thread", test_auth_client_thread_func, &data); @@ -198,7 +180,6 @@ g_dbus_server_stop (server); g_thread_join (client_thread); - g_source_remove (timeout_id); while (g_main_context_iteration (NULL, FALSE)); g_main_loop_unref (loop); @@ -294,7 +275,7 @@ temp_dbus_keyrings_setup (); - g_test_init (&argc, &argv, NULL); + g_test_init (&argc, &argv, G_TEST_OPTION_ISOLATE_DIRS, NULL); g_test_add_func ("/gdbus/auth/client/EXTERNAL", auth_client_external); g_test_add_func ("/gdbus/auth/client/DBUS_COOKIE_SHA1", auth_client_dbus_cookie_sha1);
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/tests/gdbus-bz627724.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/tests/gdbus-bz627724.c
Changed
@@ -80,7 +80,7 @@ main (int argc, char *argv) { - g_test_init (&argc, &argv, NULL); + g_test_init (&argc, &argv, G_TEST_OPTION_ISOLATE_DIRS, NULL); g_test_dbus_unset ();
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/tests/gdbus-close-pending.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/tests/gdbus-close-pending.c
Changed
@@ -385,7 +385,7 @@ main (int argc, char *argv) { - g_test_init (&argc, &argv, NULL); + g_test_init (&argc, &argv, G_TEST_OPTION_ISOLATE_DIRS, NULL); g_test_add ("/gdbus/close-pending", Fixture, "close", setup, test_many_times, teardown);
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/tests/gdbus-connection-loss.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/tests/gdbus-connection-loss.c
Changed
@@ -114,7 +114,7 @@ gint ret; gchar *path; - g_test_init (&argc, &argv, NULL); + g_test_init (&argc, &argv, G_TEST_OPTION_ISOLATE_DIRS, NULL); /* all the tests rely on a shared main loop */ loop = g_main_loop_new (NULL, FALSE);
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/tests/gdbus-connection-slow.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/tests/gdbus-connection-slow.c
Changed
@@ -225,7 +225,7 @@ { gint ret; - g_test_init (&argc, &argv, NULL); + g_test_init (&argc, &argv, G_TEST_OPTION_ISOLATE_DIRS, NULL); /* all the tests rely on a shared main loop */ loop = g_main_loop_new (NULL, FALSE);
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/tests/gdbus-connection.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/tests/gdbus-connection.c
Changed
@@ -1277,7 +1277,7 @@ { int ret; - g_test_init (&argc, &argv, NULL); + g_test_init (&argc, &argv, G_TEST_OPTION_ISOLATE_DIRS, NULL); /* all the tests rely on a shared main loop */ loop = g_main_loop_new (NULL, FALSE);
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/tests/gdbus-error.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/tests/gdbus-error.c
Changed
@@ -260,7 +260,7 @@ main (int argc, char *argv) { - g_test_init (&argc, &argv, NULL); + g_test_init (&argc, &argv, G_TEST_OPTION_ISOLATE_DIRS, NULL); g_test_add_func ("/gdbus/registered-errors", test_registered_errors); g_test_add_func ("/gdbus/unregistered-errors", test_unregistered_errors);
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/tests/gdbus-example-peer.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/tests/gdbus-example-peer.c
Changed
@@ -147,7 +147,6 @@ else s = g_credentials_to_string (credentials); - g_print ("Client connected.\n" "Peer credentials: %s\n" "Negotiated capabilities: unix-fd-passing=%d\n", @@ -165,6 +164,8 @@ NULL); /* GError** */ g_assert (registration_id > 0); + g_free (s); + return TRUE; } @@ -266,10 +267,14 @@ g_option_context_add_main_entries (opt_context, opt_entries, NULL); if (!g_option_context_parse (opt_context, &argc, &argv, &error)) { + g_option_context_free (opt_context); g_printerr ("Error parsing options: %s\n", error->message); g_error_free (error); goto out; } + + g_option_context_free (opt_context); + if (opt_address == NULL) { g_printerr ("Incorrect usage, try --help.\n"); @@ -373,6 +378,8 @@ -1, NULL, &error); + g_free (greeting); + if (value == NULL) { g_printerr ("Error invoking HelloWorld(): %s\n", error->message); @@ -390,5 +397,7 @@ ret = 0; out: + g_free (opt_address); + return ret; }
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/tests/gdbus-example-proxy-subclass.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/tests/gdbus-example-proxy-subclass.c
Changed
@@ -340,9 +340,111 @@ } /* ---------------------------------------------------------------------------------------------------- */ +/* Example usage of the AccountsUser type */ +/* ---------------------------------------------------------------------------------------------------- */ + +static void +print_user (AccountsUser *user) +{ + g_print (" user-name = `%s'\n", accounts_user_get_user_name (user)); + g_print (" real-name = `%s'\n", accounts_user_get_real_name (user)); + g_print (" automatic-login = %s\n", accounts_user_get_automatic_login (user) ? "true" : "false"); +} + +static void +on_changed (AccountsUser *user, + gpointer user_data) +{ + g_print ("+++ Received the AccountsUser::changed signal\n"); + print_user (user); +} + +static void +on_notify (GObject *object, + GParamSpec *pspec, + gpointer user_data) +{ + AccountsUser *user = ACCOUNTS_USER (object); + g_print ("+++ Received the GObject::notify signal for property `%s'\n", + pspec->name); + print_user (user); +} + +static void +on_accounts_proxy_available (GObject *object, + GAsyncResult *result, + gpointer user_data) +{ + GError *error = NULL; + GObject *user_object; + AccountsUser *user; + + user_object = g_async_initable_new_finish (G_ASYNC_INITABLE (object), + result, + &error); + if (!user_object) + { + g_error ("Failed to create proxy: %s", error->message); + g_clear_error (&error); + return; + } + user = ACCOUNTS_USER (user_object); + + g_print ("+++ Acquired proxy for user\n"); + print_user (user); + + g_signal_connect (user, + "notify", + G_CALLBACK (on_notify), + NULL); + g_signal_connect (user, + "changed", + G_CALLBACK (on_changed), + NULL); +} + +static void +on_accounts_appeared (GDBusConnection *connection, + const gchar *name, + const gchar *name_owner, + gpointer user_data) +{ + g_async_initable_new_async (ACCOUNTS_TYPE_USER, 0, NULL, + on_accounts_proxy_available, + "g-flags", 0, + "g-interface-info", NULL, + "g-unique-bus-name", name_owner, + "g-connection", connection, + "g-object-path", "/org/freedesktop/Accounts/User500", + "g-interface-name", "org.freedesktop.Accounts.User"); +} + +static void +on_accounts_vanished (GDBusConnection *connection, + const gchar *name, + gpointer user_data) +{ +} + +/* ---------------------------------------------------------------------------------------------------- */ gint main (gint argc, gchar *argv) { + guint watcher_id; + GMainLoop *loop; + + watcher_id = g_bus_watch_name (G_BUS_TYPE_SYSTEM, + "org.freedesktop.Accounts", + G_BUS_NAME_WATCHER_FLAGS_AUTO_START, + on_accounts_appeared, + on_accounts_vanished, + NULL, NULL); + + loop = g_main_loop_new (NULL, FALSE); + g_main_loop_run (loop); + g_main_loop_unref (loop); + g_bus_unwatch_name (watcher_id); + return 0; }
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/tests/gdbus-exit-on-close.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/tests/gdbus-exit-on-close.c
Changed
@@ -201,7 +201,7 @@ { gint i; - g_test_init (&argc, &argv, NULL); + g_test_init (&argc, &argv, G_TEST_OPTION_ISOLATE_DIRS, NULL); for (i = 0; casesi.name != NULL; i++) {
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/tests/gdbus-export.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/tests/gdbus-export.c
Changed
@@ -347,8 +347,8 @@ compare_strings (gconstpointer a, gconstpointer b) { - const gchar *sa = *(const gchar **) a; - const gchar *sb = *(const gchar **) b; + const gchar *sa = a; + const gchar *sb = b; /* Array terminator must sort last */ if (sa == NULL) @@ -413,7 +413,7 @@ g_dbus_node_info_unref (node_info); /* Nodes are semantically unordered; sort array so tests can rely on order */ - g_ptr_array_sort (p, compare_strings); + g_ptr_array_sort_values (p, compare_strings); return (gchar **) g_ptr_array_free (p, FALSE); } @@ -1966,7 +1966,7 @@ { gint ret; - g_test_init (&argc, &argv, NULL); + g_test_init (&argc, &argv, G_TEST_OPTION_ISOLATE_DIRS, NULL); /* all the tests rely on a shared main loop */ loop = g_main_loop_new (NULL, FALSE);
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/tests/gdbus-introspection.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/tests/gdbus-introspection.c
Changed
@@ -307,7 +307,7 @@ { gint ret; - g_test_init (&argc, &argv, NULL); + g_test_init (&argc, &argv, G_TEST_OPTION_ISOLATE_DIRS, NULL); /* all the tests rely on a shared main loop */ loop = g_main_loop_new (NULL, FALSE);
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/tests/gdbus-message.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/tests/gdbus-message.c
Changed
@@ -217,7 +217,7 @@ { setlocale (LC_ALL, "C"); - g_test_init (&argc, &argv, NULL); + g_test_init (&argc, &argv, G_TEST_OPTION_ISOLATE_DIRS, NULL); g_test_add_func ("/gdbus/message/lock", message_lock); g_test_add_func ("/gdbus/message/copy", message_copy);
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/tests/gdbus-method-invocation.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/tests/gdbus-method-invocation.c
Changed
@@ -251,7 +251,7 @@ if (g_str_equal (action, "Valid") || g_str_equal (action, "WrongNumber")) - g_dbus_method_invocation_return_value_with_unix_fd_list (invocation, g_variant_new ("(h)"), list); + g_dbus_method_invocation_return_value_with_unix_fd_list (invocation, g_variant_new ("(h)", 0), list); else g_assert_not_reached ();
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/tests/gdbus-names.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/tests/gdbus-names.c
Changed
@@ -1340,7 +1340,7 @@ { gint ret; - g_test_init (&argc, &argv, NULL); + g_test_init (&argc, &argv, G_TEST_OPTION_ISOLATE_DIRS, NULL); g_test_dbus_unset ();
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/tests/gdbus-object-manager-example/meson.build -> _service:tar_scm:glib-2.76.4.tar.xz/gio/tests/gdbus-object-manager-example/meson.build
Changed
@@ -1,4 +1,9 @@ -# FIXME: set UNINSTALLED_GLIB_{SRC|BUILD}DIR=top_{src|build}dir ? +gdbus_example_objectmanager_visibility_h = configure_file( + output: 'gdbus-example-objectmanager-visibility.h', + command: gen_visibility_macros, '2.0', 'visibility-macros', + 'GDBUS_OBJECT_MANAGER_EXAMPLE', '@OUTPUT@', +) + gdbus_example_objectmanager_xml = files('gdbus-example-objectmanager.xml') gdbus_example_objectmanager_generated = custom_target('objectmanager-gen', input : gdbus_example_objectmanager_xml, @@ -13,8 +18,8 @@ '--output-directory', '@OUTDIR@', '--generate-c-code', 'objectmanager-gen', '--generate-docbook', 'objectmanager-gen', - '--symbol-decorator', '_GLIB_EXTERN', - '--symbol-decorator-define', 'HAVE_CONFIG_H', + '--symbol-decorator', 'GDBUS_OBJECT_MANAGER_EXAMPLE_AVAILABLE_IN_ALL', + '--symbol-decorator-header', 'gdbus-example-objectmanager-visibility.h', '@INPUT@') gdbus_example_objectmanager_rst_gen = custom_target('objectmanager-rst-gen', @@ -33,9 +38,15 @@ , ) +extra_c_args = +if glib_build_static_only + extra_c_args = '-DGDBUS_OBJECT_MANAGER_EXAMPLE_STATIC_COMPILATION' +endif + libgdbus_example_objectmanager = library('gdbus-example-objectmanager', - gdbus_example_objectmanager_generated, - c_args : test_c_args, + gdbus_example_objectmanager_generated, gdbus_example_objectmanager_visibility_h, + c_args : test_c_args, extra_c_args, + '-DGDBUS_OBJECT_MANAGER_EXAMPLE_COMPILATION', dependencies : libglib_dep, libgmodule_dep, libgobject_dep, libgio_dep, install : installed_tests_enabled, install_dir : installed_tests_execdir) @@ -46,4 +57,6 @@ gdbus_example_objectmanager_rst_gen0, , link_with : libgdbus_example_objectmanager, - dependencies : libgio_dep) + dependencies : libgio_dep, + compile_args : extra_c_args, +)
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/tests/gdbus-overflow.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/tests/gdbus-overflow.c
Changed
@@ -209,7 +209,7 @@ GDBusNodeInfo *introspection_data = NULL; gchar *tmpdir = NULL; - g_test_init (&argc, &argv, NULL); + g_test_init (&argc, &argv, G_TEST_OPTION_ISOLATE_DIRS, NULL); introspection_data = g_dbus_node_info_new_for_xml (test_interface_introspection_xml, NULL); g_assert (introspection_data != NULL); @@ -219,13 +219,8 @@ if (is_unix) { - if (g_unix_socket_address_abstract_names_supported ()) - tmp_address = g_strdup ("unix:tmpdir=/tmp/gdbus-test-"); - else - { - tmpdir = g_dir_make_tmp ("gdbus-test-XXXXXX", NULL); - tmp_address = g_strdup_printf ("unix:tmpdir=%s", tmpdir); - } + tmpdir = g_dir_make_tmp ("gdbus-test-XXXXXX", NULL); + tmp_address = g_strdup_printf ("unix:tmpdir=%s", tmpdir); } else tmp_address = g_strdup ("nonce-tcp:");
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/tests/gdbus-proxy-threads.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/tests/gdbus-proxy-threads.c
Changed
@@ -250,7 +250,7 @@ main (int argc, char *argv) { - g_test_init (&argc, &argv, NULL); + g_test_init (&argc, &argv, G_TEST_OPTION_ISOLATE_DIRS, NULL); g_test_dbus_unset ();
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/tests/gdbus-proxy-unique-name.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/tests/gdbus-proxy-unique-name.c
Changed
@@ -203,7 +203,7 @@ { gint ret; - g_test_init (&argc, &argv, NULL); + g_test_init (&argc, &argv, G_TEST_OPTION_ISOLATE_DIRS, NULL); /* all the tests rely on a shared main loop */ loop = g_main_loop_new (NULL, FALSE);
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/tests/gdbus-proxy-well-known-name.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/tests/gdbus-proxy-well-known-name.c
Changed
@@ -260,7 +260,7 @@ { gint ret; - g_test_init (&argc, &argv, NULL); + g_test_init (&argc, &argv, G_TEST_OPTION_ISOLATE_DIRS, NULL); /* all the tests rely on a shared main loop */ loop = g_main_loop_new (NULL, FALSE);
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/tests/gdbus-proxy.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/tests/gdbus-proxy.c
Changed
@@ -1017,7 +1017,7 @@ gint ret; GDBusNodeInfo *introspection_data = NULL; - g_test_init (&argc, &argv, NULL); + g_test_init (&argc, &argv, G_TEST_OPTION_ISOLATE_DIRS, NULL); introspection_data = g_dbus_node_info_new_for_xml (frob_dbus_interface_xml, NULL); g_assert_nonnull (introspection_data);
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/tests/gdbus-serialization.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/tests/gdbus-serialization.c
Changed
@@ -1624,7 +1624,7 @@ g_setenv ("LC_ALL", "C", TRUE); setlocale (LC_ALL, "C"); - g_test_init (&argc, &argv, NULL); + g_test_init (&argc, &argv, G_TEST_OPTION_ISOLATE_DIRS, NULL); g_test_add_func ("/gdbus/message-serialize/basic", test_message_serialize_basic);
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/tests/gdbus-server-auth.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/tests/gdbus-server-auth.c
Changed
@@ -210,6 +210,7 @@ libdbus_call->call, -1, &libdbus_call->error); + g_task_return_boolean (task, TRUE); } #endif /* HAVE_DBUS1 */
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/tests/gdbus-test-codegen.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/tests/gdbus-test-codegen.c
Changed
@@ -1551,12 +1551,6 @@ guint num_interface_removed_signals; } OMData; -static gint -my_pstrcmp (const gchar **a, const gchar **b) -{ - return g_strcmp0 (*a, *b); -} - static void om_check_interfaces_added (const gchar *signal_name, GVariant *parameters, @@ -1597,8 +1591,10 @@ g_ptr_array_add (interfaces_in_message, (gpointer) iface_name); } g_assert_cmpint (interfaces_in_message->len, ==, interfaces->len); - g_ptr_array_sort (interfaces, (GCompareFunc) my_pstrcmp); - g_ptr_array_sort (interfaces_in_message, (GCompareFunc) my_pstrcmp); + G_GNUC_BEGIN_IGNORE_DEPRECATIONS + g_ptr_array_sort_values (interfaces, (GCompareFunc) g_strcmp0); + g_ptr_array_sort_values (interfaces_in_message, (GCompareFunc) g_strcmp0); + G_GNUC_END_IGNORE_DEPRECATIONS for (n = 0; n < interfaces->len; n++) g_assert_cmpstr (interfaces->pdatan, ==, interfaces_in_message->pdatan); g_ptr_array_unref (interfaces_in_message); @@ -1646,8 +1642,10 @@ g_ptr_array_add (interfaces_in_message, (gpointer) iface_name); } g_assert_cmpint (interfaces_in_message->len, ==, interfaces->len); - g_ptr_array_sort (interfaces, (GCompareFunc) my_pstrcmp); - g_ptr_array_sort (interfaces_in_message, (GCompareFunc) my_pstrcmp); + G_GNUC_BEGIN_IGNORE_DEPRECATIONS + g_ptr_array_sort_values (interfaces, (GCompareFunc) g_strcmp0); + g_ptr_array_sort_values (interfaces_in_message, (GCompareFunc) g_strcmp0); + G_GNUC_END_IGNORE_DEPRECATIONS for (n = 0; n < interfaces->len; n++) g_assert_cmpstr (interfaces->pdatan, ==, interfaces_in_message->pdatan); g_ptr_array_unref (interfaces_in_message); @@ -2736,7 +2734,7 @@ main (int argc, char *argv) { - g_test_init (&argc, &argv, NULL); + g_test_init (&argc, &argv, G_TEST_OPTION_ISOLATE_DIRS, NULL); g_test_add_func ("/gdbus/codegen/annotations", test_annotations); g_test_add_func ("/gdbus/codegen/interface_stability", test_interface_stability);
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/tests/gdbus-test-fixture.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/tests/gdbus-test-fixture.c
Changed
@@ -80,7 +80,7 @@ main (int argc, char *argv) { - g_test_init (&argc, &argv, NULL); + g_test_init (&argc, &argv, G_TEST_OPTION_ISOLATE_DIRS, NULL); /* This test simply ensures that we can bring the GTestDBus up and down a hand * full of times in a row, each time successfully activating the in-tree service
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/tests/gdbus-testserver.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/tests/gdbus-testserver.c
Changed
@@ -843,6 +843,8 @@ { guint owner_id; + g_log_writer_default_set_use_stderr (TRUE); + introspection_data = g_dbus_node_info_new_for_xml (introspection_xml, NULL); properties = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, (GDestroyNotify)g_variant_unref); g_hash_table_insert (properties, g_strdup ("y"), g_variant_ref_sink (g_variant_new_byte (1)));
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/tests/gdbus-threading.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/tests/gdbus-threading.c
Changed
@@ -677,7 +677,7 @@ gint ret; gchar *path; - g_test_init (&argc, &argv, NULL); + g_test_init (&argc, &argv, G_TEST_OPTION_ISOLATE_DIRS, NULL); session_bus_up ();
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/tests/giomodule.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/tests/giomodule.c
Changed
@@ -2,6 +2,8 @@ * Copyright (C) 2013 Red Hat, Inc * Author: Matthias Clasen * + * SPDX-License-Identifier: LicenseRef-old-glib-tests + * * This work is provided "as is"; redistribution and modification * in whole or in part, in any medium, physical or electronic is * permitted without restriction. @@ -23,10 +25,16 @@ #include <gio/gio.h> #include <glibconfig.h> -#ifdef _MSC_VER -# define MODULE_FILENAME_PREFIX "" +#ifdef G_OS_WIN32 + #ifdef _MSC_VER + #define MODULE_FILENAME(x) "" x ".dll" + #else + #define MODULE_FILENAME(x) "lib" x ".dll" + #endif +#elif defined(__APPLE__) + #define MODULE_FILENAME(x) "lib" x ".dylib" #else -# define MODULE_FILENAME_PREFIX "lib" + #define MODULE_FILENAME(x) "lib" x ".so" #endif static void @@ -131,7 +139,7 @@ ep = g_io_extension_point_register ("test-extension-point"); scope = g_io_module_scope_new (G_IO_MODULE_SCOPE_BLOCK_DUPLICATES); - g_io_module_scope_block (scope, MODULE_FILENAME_PREFIX "testmoduleb." G_MODULE_SUFFIX); + g_io_module_scope_block (scope, MODULE_FILENAME ("testmoduleb")); g_io_modules_scan_all_in_directory_with_scope (g_test_get_filename (G_TEST_BUILT, "modules", NULL), scope); list = g_io_extension_point_get_extensions (ep); g_assert_cmpint (g_list_length (list), ==, 1);
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/tests/glistmodel.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/tests/glistmodel.c
Changed
@@ -73,7 +73,7 @@ g_test_trap_subprocess (NULL, 0, G_TEST_SUBPROCESS_DEFAULT); g_test_trap_assert_failed (); - g_test_trap_assert_stderr ("*WARNING*value * of type 'GType' is invalid or " + g_test_trap_assert_stderr ("*CRITICAL*value * of type 'GType' is invalid or " "out of range for property 'item-type'*"); } @@ -572,13 +572,7 @@ } static gint -ptr_array_cmp_action_by_name (GAction **a, GAction **b) -{ - return g_strcmp0 (g_action_get_name (*a), g_action_get_name (*b)); -} - -static gint -list_model_cmp_action_by_name (GAction *a, GAction *b, gpointer user_data) +cmp_action_by_name (GAction *a, GAction *b, gpointer user_data) { return g_strcmp0 (g_action_get_name (a), g_action_get_name (b)); } @@ -606,16 +600,16 @@ g_ptr_array_add (array, g_simple_action_new ("1", NULL)); /* Sort an empty list */ - g_list_store_sort (store, (GCompareDataFunc)list_model_cmp_action_by_name, NULL); + g_list_store_sort (store, (GCompareDataFunc) cmp_action_by_name, NULL); /* Add all */ g_list_store_splice (store, 0, 0, array->pdata, array->len); g_assert_true (model_array_equal (model, array)); /* Sort both and check if the result is the same */ - g_ptr_array_sort (array, (GCompareFunc)ptr_array_cmp_action_by_name); + g_ptr_array_sort_values (array, (GCompareFunc)cmp_action_by_name); g_assert_false (model_array_equal (model, array)); - g_list_store_sort (store, (GCompareDataFunc)list_model_cmp_action_by_name, NULL); + g_list_store_sort (store, (GCompareDataFunc) cmp_action_by_name, NULL); g_assert_true (model_array_equal (model, array)); g_ptr_array_unref (array); @@ -763,7 +757,7 @@ /* Sort the list */ expect_items_changed (&expected, 0, 2, 2); g_list_store_sort (store, - (GCompareDataFunc)list_model_cmp_action_by_name, + (GCompareDataFunc) cmp_action_by_name, NULL); g_assert_true (expected.called); g_assert_false (expected.notified); @@ -773,7 +767,7 @@ item = g_simple_action_new ("3", NULL); g_list_store_insert_sorted (store, item, - (GCompareDataFunc)list_model_cmp_action_by_name, + (GCompareDataFunc) cmp_action_by_name, NULL); g_object_unref (item); g_assert_true (expected.called);
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/tests/gmenumodel.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/tests/gmenumodel.c
Changed
@@ -831,13 +831,8 @@ flags = G_DBUS_SERVER_FLAGS_NONE; #ifdef G_OS_UNIX - if (g_unix_socket_address_abstract_names_supported ()) - address = g_strdup ("unix:tmpdir=/tmp/test-dbus-peer"); - else - { - tmpdir = g_dir_make_tmp ("test-dbus-peer-XXXXXX", NULL); - address = g_strdup_printf ("unix:tmpdir=%s", tmpdir); - } + tmpdir = g_dir_make_tmp ("test-dbus-peer-XXXXXX", NULL); + address = g_strdup_printf ("unix:tmpdir=%s", tmpdir); #else address = g_strdup ("nonce-tcp:"); flags |= G_DBUS_SERVER_FLAGS_AUTHENTICATION_ALLOW_ANONYMOUS;
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/tests/gsettings.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/tests/gsettings.c
Changed
@@ -798,7 +798,9 @@ str = NULL; } else - g_printerr ("warning: translation is not working... skipping test. "); + { + g_test_skip ("translation is not working"); + } g_setenv ("LC_MESSAGES", locale, TRUE); setlocale (LC_MESSAGES, locale); @@ -843,7 +845,7 @@ if (g_str_equal (dgettext ("test", "\"Unnamed\""), "\"Unbenannt\"")) settings_assert_cmpstr (settings, "backspace", ==, "Löschen"); else - g_printerr ("warning: translation is not working... skipping test. "); + g_test_skip ("translation is not working"); g_setenv ("LC_MESSAGES", locale, TRUE); setlocale (LC_MESSAGES, locale); @@ -2886,6 +2888,7 @@ test_per_desktop (void) { GSettings *settings; + GAction *action_string; TestObject *obj; gpointer p; gchar *str; @@ -2918,6 +2921,10 @@ g_assert_cmpstr (str, ==, "GNOME"); g_free (str); + action_string = g_settings_create_action (settings, "desktop"); + check_and_free (g_action_get_state (action_string), "'GNOME'"); + + g_clear_object (&action_string); g_object_unref (settings); g_object_unref (obj); } @@ -2929,6 +2936,7 @@ test_per_desktop_subprocess (void) { GSettings *settings; + GAction *action_string; TestObject *obj; gpointer p; gchar *str; @@ -2956,6 +2964,10 @@ g_assert_cmpstr (str, ==, "GNOME Classic"); g_free (str); + action_string = g_settings_create_action (settings, "desktop"); + check_and_free (g_action_get_state (action_string), "'GNOME Classic'"); + + g_clear_object (&action_string); g_object_unref (settings); g_object_unref (obj); } @@ -3007,6 +3019,8 @@ if (!g_test_subprocess ()) { GError *local_error = NULL; + char *subprocess_stdout = NULL; + /* A GVDB header is 6 guint32s, and requires a magic number in the first * two guint32s. A set of zero bytes of a greater length is considered * corrupt. */ @@ -3046,14 +3060,20 @@ "--schema-file=org.gtk.test.enums.xml " "--schema-file=org.gtk.test.gschema.xml " "--override-file=org.gtk.test.gschema.override", - NULL, NULL, &result, NULL)); + &subprocess_stdout, NULL, &result, NULL)); + if (subprocess_stdout && *g_strstrip (subprocess_stdout) != '\0') + g_test_message ("%s", subprocess_stdout); + g_clear_pointer (&subprocess_stdout, g_free); g_assert_cmpint (result, ==, 0); g_remove ("schema-source/gschemas.compiled"); g_mkdir ("schema-source", 0777); g_assert_true (g_spawn_command_line_sync (GLIB_COMPILE_SCHEMAS " --targetdir=schema-source " "--schema-file=" SRCDIR "/org.gtk.schemasourcecheck.gschema.xml", - NULL, NULL, &result, NULL)); + &subprocess_stdout, NULL, &result, NULL)); + if (subprocess_stdout && *g_strstrip (subprocess_stdout) != '\0') + g_test_message ("%s", subprocess_stdout); + g_clear_pointer (&subprocess_stdout, g_free); g_assert_cmpint (result, ==, 0); g_remove ("schema-source-corrupt/gschemas.compiled");
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/tests/gsubprocess.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/tests/gsubprocess.c
Changed
@@ -757,11 +757,15 @@ { if (data->is_utf8) { + g_assert_nonnull (stdout_str); stdout_data = (guint8*)stdout_str; stdout_len = strlen (stdout_str); } else - stdout_data = g_bytes_get_data (stdout_bytes, &stdout_len); + { + g_assert_nonnull (stdout_bytes); + stdout_data = g_bytes_get_data (stdout_bytes, &stdout_len); + } g_assert_cmpmem (stdout_data, stdout_len, "# hello world" LINEEND, 13 + strlen (LINEEND)); }
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/tests/inet-address.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/tests/inet-address.c
Changed
@@ -2,6 +2,8 @@ * Copyright (C) 2012 Red Hat, Inc * Author: Matthias Clasen * + * SPDX-License-Identifier: LicenseRef-old-glib-tests + * * This work is provided "as is"; redistribution and modification * in whole or in part, in any medium, physical or electronic is * permitted without restriction.
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/tests/io-stream.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/tests/io-stream.c
Changed
@@ -2,6 +2,8 @@ * Copyright (C) 2010 Collabora Ltd. * Authors: Xavier Claessens <xclaesse@gmail.com> * + * SPDX-License-Identifier: LicenseRef-old-glib-tests + * * This work is provided "as is"; redistribution and modification * in whole or in part, in any medium, physical or electronic is * permitted without restriction.
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/tests/live-g-file.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/tests/live-g-file.c
Changed
@@ -2,6 +2,8 @@ * Copyright (C) 2008 Red Hat, Inc. * Authors: Tomas Bzatek <tbzatek@redhat.com> * + * SPDX-License-Identifier: LicenseRef-old-glib-tests + * * This work is provided "as is"; redistribution and modification * in whole or in part, in any medium, physical or electronic is * permitted without restriction. @@ -175,20 +177,6 @@ } #endif -#ifdef G_HAVE_ISO_VARARGS -#define log(...) if (verbose) g_printerr (__VA_ARGS__) -#elif defined(G_HAVE_GNUC_VARARGS) -#define log(msg...) if (verbose) g_printerr (msg) -#else /* no varargs macros */ -static void log (const g_char *format, ...) -{ - va_list args; - va_start (args, format); - if (verbose) g_printerr (format, args); - va_end (args); -} -#endif - static GFile * create_empty_file (GFile * parent, const char *filename, GFileCreateFlags create_flags) @@ -255,8 +243,8 @@ struct StructureItem item; g_assert_nonnull (test_data); - log ("\n Going to create testing structure in '%s'...\n", - (char *) test_data); + g_test_message ("\n Going to create testing structure in '%s'...", + (char *) test_data); root = g_file_new_for_commandline_arg ((char *) test_data); g_assert_nonnull (root); @@ -278,16 +266,16 @@ switch (item.file_type) { case G_FILE_TYPE_REGULAR: - log (" Creating file '%s'...\n", item.filename); + g_test_message (" Creating file '%s'...", item.filename); child = create_empty_file (root, item.filename, item.create_flags); break; case G_FILE_TYPE_DIRECTORY: - log (" Creating directory '%s'...\n", item.filename); + g_test_message (" Creating directory '%s'...", item.filename); child = create_empty_dir (root, item.filename); break; case G_FILE_TYPE_SYMBOLIC_LINK: - log (" Creating symlink '%s' --> '%s'...\n", item.filename, - item.link_to); + g_test_message (" Creating symlink '%s' --> '%s'...", item.filename, + item.link_to); child = create_symlink (root, item.filename, item.link_to); break; case G_FILE_TYPE_UNKNOWN: @@ -332,7 +320,7 @@ } /* create a pattern file */ - log (" Creating pattern file..."); + g_test_message (" Creating pattern file..."); child = g_file_get_child (root, "pattern_file"); g_assert_nonnull (child); @@ -354,7 +342,7 @@ g_object_unref (outds); g_object_unref (outs); g_object_unref (child); - log (" done.\n"); + g_test_message (" done."); g_object_unref (root); } @@ -501,7 +489,7 @@ struct StructureItem item; g_assert_nonnull (test_data); - log ("\n Testing sample structure in '%s'...\n", (char *) test_data); + g_test_message (" Testing sample structure in '%s'...", (char *) test_data); root = g_file_new_for_commandline_arg ((char *) test_data); g_assert_nonnull (root); @@ -516,7 +504,7 @@ || (item.handle_special)) continue; - log (" Testing file '%s'...\n", item.filename); + g_test_message (" Testing file '%s'...", item.filename); child = file_exists (root, item.filename, &res); g_assert_nonnull (child); @@ -536,7 +524,7 @@ } /* read and test the pattern file */ - log (" Testing pattern file...\n"); + g_test_message (" Testing pattern file..."); child = file_exists (root, "pattern_file", &res); g_assert_nonnull (child); g_assert_true (res); @@ -567,8 +555,8 @@ PATTERN_FILE_SIZE, NULL, &error); g_assert_no_error (error); total_read += read; - log (" read %"G_GSSIZE_FORMAT" bytes, total = %"G_GSSIZE_FORMAT" of %d.\n", - read, total_read, PATTERN_FILE_SIZE); + g_test_message (" read %"G_GSSIZE_FORMAT" bytes, total = %"G_GSSIZE_FORMAT" of %d.", + read, total_read, PATTERN_FILE_SIZE); } g_assert_cmpint (total_read, ==, PATTERN_FILE_SIZE); @@ -633,8 +621,8 @@ } g_assert_true (found); - log (" Found file %s, relative to root: %s\n", - g_file_info_get_display_name (info), relative_path); + g_test_message (" Found file %s, relative to root: %s", + g_file_info_get_display_name (info), relative_path); if (g_file_info_get_file_type (info) == G_FILE_TYPE_DIRECTORY) traverse_recurse_dirs (descend, root); @@ -664,8 +652,8 @@ gboolean res; g_assert_nonnull (test_data); - log ("\n Traversing through the sample structure in '%s'...\n", - (char *) test_data); + g_test_message (" Traversing through the sample structure in '%s'...", + (char *) test_data); root = g_file_new_for_commandline_arg ((char *) test_data); g_assert_nonnull (root); @@ -693,7 +681,7 @@ g_assert_nonnull (test_data); - log ("\n Test enumerate '%s'...\n", (char *) test_data); + g_test_message (" Test enumerate '%s'...", (char *) test_data); root = g_file_new_for_commandline_arg ((char *) test_data); g_assert_nonnull (root); @@ -713,7 +701,7 @@ || ((item.extra_flags & TEST_ENUMERATE_FILE) == TEST_ENUMERATE_FILE)) { - log (" Testing file '%s'\n", item.filename); + g_test_message (" Testing file '%s'", item.filename); child = g_file_get_child (root, item.filename); g_assert_nonnull (child); error = NULL; @@ -772,7 +760,7 @@ gboolean have_cap_dac_override = check_cap_dac_override (g_file_peek_path (root)); #endif - log (" do_copy_move: '%s' --> '%s'\n", item.filename, target_dir); + g_test_message (" do_copy_move: '%s' --> '%s'", item.filename, target_dir); dst_dir = g_file_get_child (root, target_dir); g_assert_nonnull (dst_dir); @@ -795,8 +783,8 @@ NULL, NULL, &error); if (error) - log (" res = %d, error code %d = %s\n", res, error->code, - error->message); + g_test_message (" res = %d, error code %d = %s", res, error->code, + error->message); /* copying file/directory to itself (".") */ if (((item.extra_flags & TEST_NOT_EXISTS) != TEST_NOT_EXISTS) && @@ -871,8 +859,6 @@ guint i; struct StructureItem item; - log ("\n"); - g_assert_nonnull (test_data); root = g_file_new_for_commandline_arg ((char *) test_data); g_assert_nonnull (root); @@ -964,7 +950,6 @@ GFileOutputStream *os; g_assert_nonnull (test_data); - log ("\n"); root = g_file_new_for_commandline_arg ((char *) test_data); g_assert_nonnull (root); @@ -979,7 +964,7 @@ ((item.extra_flags & TEST_REPLACE) == TEST_REPLACE) || ((item.extra_flags & TEST_APPEND) == TEST_APPEND)) { - log (" test_create: '%s'\n", item.filename); + g_test_message (" test_create: '%s'", item.filename); child = g_file_get_child (root, item.filename); g_assert_nonnull (child); @@ -997,7 +982,7 @@ if (error) - log (" error code %d = %s\n", error->code, error->message); + g_test_message (" error code %d = %s", error->code, error->message); if (((item.extra_flags & TEST_NOT_EXISTS) == 0) && ((item.extra_flags & TEST_CREATE) == TEST_CREATE)) @@ -1028,8 +1013,8 @@ res = g_output_stream_close (G_OUTPUT_STREAM (os), NULL, &error); if (error) - log (" g_output_stream_close: error %d = %s\n", - error->code, error->message); + g_test_message (" g_output_stream_close: error %d = %s", + error->code, error->message); g_assert_true (res); g_assert_no_error (error); g_object_unref (os); @@ -1051,7 +1036,6 @@ GFileInputStream *input_stream; g_assert_nonnull (test_data); - log ("\n"); root = g_file_new_for_commandline_arg ((char *) test_data); g_assert_nonnull (root); @@ -1067,7 +1051,7 @@ if ((item.extra_flags & TEST_OPEN) == TEST_OPEN) { - log (" test_open: '%s'\n", item.filename); + g_test_message (" test_open: '%s'", item.filename); child = g_file_get_child (root, item.filename); g_assert_nonnull (child); @@ -1123,7 +1107,6 @@ gchar *path; g_assert_nonnull (test_data); - log ("\n"); root = g_file_new_for_commandline_arg ((char *) test_data); g_assert_nonnull (root); @@ -1145,7 +1128,7 @@ /* we don't care about result here */ path = g_file_get_path (child); - log (" Deleting %s, path = %s\n", item.filename, path); + g_test_message (" Deleting %s, path = %s", item.filename, path); g_free (path); error = NULL; @@ -1173,7 +1156,7 @@ if (error) { - log (" result = %d, error = %s\n", res, error->message); + g_test_message (" result = %d, error = %s", res, error->message); g_error_free (error); } @@ -1311,7 +1294,7 @@ g_assert_nonnull (relative_path); g_free (relative_path); - log (" deleting '%s'\n", g_file_info_get_display_name (info)); + g_test_message (" deleting '%s'", g_file_info_get_display_name (info)); if (g_file_info_get_file_type (info) == G_FILE_TYPE_DIRECTORY) cleanup_dir_recurse (descend, root); @@ -1342,8 +1325,8 @@ GFile *root; g_assert_nonnull (test_data); - log ("\n Cleaning target testing structure in '%s'...\n", - (char *) test_data); + g_test_message (" Cleaning target testing structure in '%s'...", + (char *) test_data); root = g_file_new_for_commandline_arg ((char *) test_data); g_assert_nonnull (root);
View file
_service:tar_scm:glib-2.76.4.tar.xz/gio/tests/max-version.c
Added
@@ -0,0 +1,74 @@ +/* + * Copyright 2022 Collabora Ltd. + * SPDX-License-Identifier: LGPL-2.1-or-later + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General + * Public License along with this library; if not, see + * <http://www.gnu.org/licenses/>. + */ + +#ifndef GLIB_VERSION_MAX_ALLOWED +/* This is the oldest version macro available */ +#define GLIB_VERSION_MIN_REQUIRED GLIB_VERSION_2_26 +#define GLIB_VERSION_MAX_ALLOWED GLIB_VERSION_2_26 +#endif + +#include <glib.h> + +/* All the headers that can validly be included in third-party code */ +#include <gio/gio.h> +#include <gio/gnetworking.h> + +#define G_SETTINGS_ENABLE_BACKEND +#include <gio/gsettingsbackend.h> + +#ifdef G_OS_UNIX +#include <gio/gdesktopappinfo.h> +#include <gio/gfiledescriptorbased.h> +#include <gio/gunixconnection.h> +#include <gio/gunixcredentialsmessage.h> +#include <gio/gunixfdlist.h> +#include <gio/gunixfdmessage.h> +#include <gio/gunixinputstream.h> +#include <gio/gunixmounts.h> +#include <gio/gunixoutputstream.h> +#include <gio/gunixsocketaddress.h> +#endif + +#ifdef G_OS_WIN32 +#include <gio/gwin32inputstream.h> +#include <gio/gwin32outputstream.h> +#include <gio/gwin32registrykey.h> +#endif + +#ifdef HAVE_COCOA +#include <gio/gosxappinfo.h> +#endif + +static void +nothing (void) +{ + /* This doesn't really do anything: the real "test" is at compile time. + * Just make sure the GIO library gets linked. */ + g_debug ("Loaded %s from GIO library", g_type_name (G_TYPE_CANCELLABLE)); +} + +int +main (int argc, + char *argv) +{ + g_test_init (&argc, &argv, NULL); + + g_test_add_func ("/max-version/tested-at-compile-time", nothing); + return g_test_run (); +}
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/tests/memory-input-stream.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/tests/memory-input-stream.c
Changed
@@ -2,6 +2,8 @@ * Copyright (C) 2007 Imendio AB * Authors: Tim Janik * + * SPDX-License-Identifier: LicenseRef-old-glib-tests + * * This work is provided "as is"; redistribution and modification * in whole or in part, in any medium, physical or electronic is * permitted without restriction.
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/tests/memory-output-stream.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/tests/memory-output-stream.c
Changed
@@ -2,6 +2,8 @@ * Copyright (C) 2008 Red Hat, Inc. * Author: Matthias Clasen * + * SPDX-License-Identifier: LicenseRef-old-glib-tests + * * This work is provided "as is"; redistribution and modification * in whole or in part, in any medium, physical or electronic is * permitted without restriction.
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/tests/meson.build -> _service:tar_scm:glib-2.76.4.tar.xz/gio/tests/meson.build
Changed
@@ -42,12 +42,16 @@ input : gio_headers + gioenumtypes_h + gobject_install_headers, command: gengiotypefuncs_prog, '@OUTPUT@', '@INPUT@') +if glib_build_shared + subdir('modules') +endif + # Test programs buildable on all platforms gio_tests = { 'application-command-line': {}, 'appmonitor' : { # FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392 - 'should_fail' : host_system == 'darwin', + 'can_fail' : host_system == 'darwin', }, 'async-close-output-stream' : {}, 'async-splice-output-stream' : {}, @@ -57,7 +61,7 @@ 'contexts' : {}, 'contenttype' : { # FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392 / https://gitlab.gnome.org/GNOME/glib/-/issues/1251 - 'should_fail' : host_system == 'darwin', + 'can_fail' : host_system == 'darwin', }, 'converter-stream' : {}, 'credentials' : {}, @@ -68,14 +72,15 @@ 'fileattributematcher' : {}, 'filter-streams' : {}, 'giomodule' : { - # FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392 - 'should_fail' : host_system == 'darwin', + 'depends' : glib_build_shared ? libtestmodulea, libtestmoduleb : , + }, + 'gsubprocess' : { + 'suite': host_system == 'windows' ? 'flaky' : , + 'extra_programs': 'gsubprocess-testprog', }, - 'gsubprocess' : {}, 'g-file' : {}, 'g-file-info' : { - # FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392 - 'should_fail' : host_system == 'darwin', + 'can_fail' : host_system == 'windows' and cc.get_id() != 'gcc', }, 'g-icon' : {}, 'gdbus-addresses' : {}, @@ -84,10 +89,11 @@ 'dependencies' : libgdbus_example_objectmanager_dep, 'install_rpath' : installed_tests_execdir, # FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392 - 'should_fail' : host_system == 'darwin', + 'can_fail' : host_system in 'darwin', 'windows', }, 'inet-address' : {}, 'io-stream' : {}, + 'max-version' : {'install' : false}, 'memory-input-stream' : {}, 'memory-monitor' : {}, 'memory-output-stream' : {}, @@ -102,12 +108,16 @@ 'power-profile-monitor' : {}, 'proxy-test' : {}, 'readwrite' : {}, + 'sandbox' : { + 'extra_sources': '../gsandbox.c', 'portal-support-utils.c', + 'c_args': '-DG_PORTAL_SUPPORT_TEST', + }, 'simple-async-result' : {}, 'simple-proxy' : {}, 'sleepy-stream' : {}, 'socket' : { # FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392 - 'should_fail' : host_system == 'darwin', + 'can_fail' : host_system == 'darwin', }, 'socket-listener' : {}, 'socket-service' : {}, @@ -124,8 +134,9 @@ 'tls-bindings' : {'extra_sources' : 'gtesttlsbackend.c'}, 'unix-fd' : {}, 'gdbus-address-get-session' : { + 'extra_programs': host_system != 'windows' ? 'dbus-launch' : , # FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392 - 'should_fail' : host_system == 'darwin', + 'can_fail' : host_system == 'darwin', }, 'win32-appinfo' : {}, } @@ -133,14 +144,16 @@ if have_cxx gio_tests += { 'cxx' : { + 'protocol': 'exitcode', 'source' : 'cxx.cpp', - 'suite': 'C++', + 'suite': 'cpp', }, } foreach std, arg: cxx_standards gio_tests += { 'cxx-@0@'.format(std) : { + 'protocol': 'exitcode', 'source' : 'cxx.cpp', 'suite' : 'cpp', 'cpp_args' : arg, @@ -155,9 +168,10 @@ 'gsubprocess-testprog' : {}, } -python_tests = - 'codegen.py', - +python_tests = { + # FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/2764 + 'codegen.py' : { 'can_fail' : host_system == 'freebsd' }, +} test_env = environment() test_env.set('G_TEST_SRCDIR', meson.current_source_dir()) @@ -217,6 +231,45 @@ 'gdbus-peer-object-manager' : {}, 'gdbus-sasl' : {}, 'live-g-file' : {}, + 'portal-support-flatpak-none' : { + 'extra_sources': '../gportalsupport.c', '../gsandbox.c', 'portal-support-utils.c', + 'c_args': '-DG_PORTAL_SUPPORT_TEST', + 'suite': 'portal-support', + }, + 'portal-support-flatpak-full' : { + 'extra_sources': '../gportalsupport.c', '../gsandbox.c', 'portal-support-utils.c', + 'c_args': '-DG_PORTAL_SUPPORT_TEST', + 'suite': 'portal-support', + }, + 'portal-support-flatpak-network-only' : { + 'extra_sources': '../gportalsupport.c', '../gsandbox.c', 'portal-support-utils.c', + 'c_args': '-DG_PORTAL_SUPPORT_TEST', + 'suite': 'portal-support', + }, + 'portal-support-flatpak-gsettings-only' : { + 'extra_sources': '../gportalsupport.c', '../gsandbox.c', 'portal-support-utils.c', + 'c_args': '-DG_PORTAL_SUPPORT_TEST', + 'suite': 'portal-support', + }, + 'portal-support-none' : { + 'extra_sources': '../gportalsupport.c', '../gsandbox.c', + 'c_args': '-DG_PORTAL_SUPPORT_TEST', + 'suite': 'portal-support', + }, + 'portal-support-env-var' : { + 'extra_sources': '../gportalsupport.c', '../gsandbox.c', + 'suite': 'portal-support', + }, + 'portal-support-snap' : { + 'extra_sources': '../gportalsupport.c', '../gsandbox.c', 'portal-support-utils.c', + 'c_args': '-DG_PORTAL_SUPPORT_TEST', + 'suite': 'portal-support', + }, + 'portal-support-snap-classic' : { + 'extra_sources': '../gportalsupport.c', '../gsandbox.c', 'portal-support-utils.c', + 'c_args': '-DG_PORTAL_SUPPORT_TEST', + 'suite': 'portal-support', + }, 'resolver-parsing' : {'dependencies' : network_libs}, 'socket-address' : {}, 'stream-rw_all' : {}, @@ -228,7 +281,7 @@ } # LD_PRELOAD modules don't work so well with AddressSanitizer - if have_rtld_next and get_option('default_library') != 'static' and get_option('b_sanitize') == 'none' + if have_rtld_next and glib_build_shared and get_option('b_sanitize') == 'none' gio_tests += { 'gsocketclient-slow' : { 'depends' : @@ -257,9 +310,12 @@ gio_tests += { 'appinfo' : { 'install' : false, + 'extra_programs' : 'appinfo-test', }, 'desktop-app-info' : { 'install' : false, + 'depends' : gio_launch_desktop, + 'extra_programs' : 'apps', 'appinfo-test', }, } endif @@ -345,6 +401,7 @@ extra_sources = 'gdbus-sessionbus.c', 'gdbus-tests.c' + extra_programs = 'gdbus-testserver' gio_tests += { 'actions' : { @@ -355,31 +412,56 @@ 'gdbus-auth' : {'extra_sources' : extra_sources}, 'gdbus-bz627724' : {'extra_sources' : extra_sources}, 'gdbus-close-pending' : {'extra_sources' : extra_sources}, - 'gdbus-connection' : {'extra_sources' : extra_sources}, - 'gdbus-connection-loss' : {'extra_sources' : extra_sources}, - 'gdbus-connection-slow' : {'extra_sources' : extra_sources}, + 'gdbus-connection' : { + 'extra_sources' : extra_sources, + 'extra_programs': extra_programs, + }, + 'gdbus-connection-loss' : { + 'extra_sources' : extra_sources, + 'extra_programs': extra_programs, + }, + 'gdbus-connection-slow' : { + 'extra_sources' : extra_sources, + 'extra_programs': extra_programs + 'gdbus-connection-flush-helper', + }, 'gdbus-error' : {'extra_sources' : extra_sources}, 'gdbus-exit-on-close' : {'extra_sources' : extra_sources}, 'gdbus-export' : { 'extra_sources' : extra_sources, 'suite' : 'slow', }, - 'gdbus-introspection' : {'extra_sources' : extra_sources}, + 'gdbus-introspection' : { + 'extra_sources' : extra_sources, + 'extra_programs': extra_programs, + }, 'gdbus-method-invocation' : {'extra_sources' : extra_sources}, - 'gdbus-names' : {'extra_sources' : extra_sources}, - 'gdbus-proxy' : {'extra_sources' : extra_sources}, + 'gdbus-names' : { + 'extra_sources' : extra_sources, + 'extra_programs' : 'fake-service-name', + }, + 'gdbus-proxy' : { + 'extra_sources' : extra_sources, + 'extra_programs': extra_programs, + }, 'gdbus-proxy-threads' : { 'extra_sources' : extra_sources, 'dependencies' : dbus1_dep, }, - 'gdbus-proxy-unique-name' : {'extra_sources' : extra_sources}, - 'gdbus-proxy-well-known-name' : {'extra_sources' : extra_sources}, + 'gdbus-proxy-unique-name' : { + 'extra_sources' : extra_sources, + 'extra_programs': extra_programs, + }, + 'gdbus-proxy-well-known-name' : { + 'extra_sources' : extra_sources, + 'extra_programs': extra_programs, + }, 'gdbus-test-codegen' : { 'extra_sources' : extra_sources, gdbus_test_codegen_generated, gdbus_test_codegen_generated_interface_info, 'c_args' : '-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_32', }, 'gdbus-threading' : { 'extra_sources' : extra_sources, + 'extra_programs': extra_programs, 'suite' : 'slow', }, 'gmenumodel' : { @@ -400,13 +482,17 @@ 'extra_sources' : extra_sources, gdbus_test_codegen_generated_min_required_2_64, gdbus_test_codegen_generated_interface_info, 'c_args' : '-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_64', }, - 'gapplication' : {'extra_sources' : extra_sources}, + 'gapplication' : { + 'extra_sources' : extra_sources, + 'extra_programs': 'basic-application', + }, } if not glib_have_cocoa gio_tests += { 'dbus-appinfo' : { 'extra_sources' : extra_sources, + 'extra_programs' : 'fake-document-portal', }, } endif @@ -458,6 +544,7 @@ 'c_args' : '-DSRCDIR="@0@"'.format(meson.current_source_dir()), '-DTEST_LOCALE_PATH="@0@"'.format(test_mo_dir), 'install' : false, + 'depends' : glib_compile_schemas, }, } endif @@ -543,33 +630,37 @@ endif appinfo_test_desktop_files = - 'appinfo-test-gnome.desktop', - 'appinfo-test-notgnome.desktop', - 'appinfo-test.desktop', - 'appinfo-test2.desktop', + 'appinfo-test-gnome', + 'appinfo-test-notgnome', + 'appinfo-test-path', + 'appinfo-test', + 'appinfo-test2', -cdata = configuration_data() -if installed_tests_enabled - cdata.set('installed_tests_dir', installed_tests_execdir) -else - cdata.set('installed_tests_dir', meson.current_build_dir()) -endif - foreach appinfo_test_desktop_file : appinfo_test_desktop_files + input_desktop_file = appinfo_test_desktop_file + '.desktop.in' + output_desktop_file = appinfo_test_desktop_file + '.desktop' + configure_file( + input: input_desktop_file, + output: output_desktop_file, + configuration: { + 'installed_tests_dir' : meson.current_build_dir(), + }, + ) + if installed_tests_enabled - configure_file( - input: appinfo_test_desktop_file + '.in', - output: appinfo_test_desktop_file, + installed_desktop = configure_file( + input: input_desktop_file, + output: appinfo_test_desktop_file + '-installed.desktop', + configuration: { + 'installed_tests_dir' : installed_tests_execdir, + }, + ) + + install_data(installed_desktop, install_dir: installed_tests_execdir, install_tag: 'tests', - configuration: cdata, - ) - else - configure_file( - input: appinfo_test_desktop_file + '.in', - output: appinfo_test_desktop_file, - configuration: cdata, + rename: output_desktop_file, ) endif endforeach @@ -654,11 +745,14 @@ endforeach endif -if meson.can_run_host_binaries() +# FIXME: Work around Meson not automatically using exe_wrapper around glib_compile_resources +# https://github.com/mesonbuild/meson/issues/11029 +if not meson.is_cross_build() + resource_plugin = compiler_type = '--compiler=@0@'.format(cc.get_id()) - if get_option('default_library') != 'static' + if glib_build_shared plugin_resources_c = custom_target('plugin-resources.c', input : 'test4.gresource.xml', output : 'plugin-resources.c', @@ -671,7 +765,8 @@ '--c-name', '_g_plugin', '@INPUT@') - shared_module('resourceplugin', 'resourceplugin.c', plugin_resources_c, + resource_plugin += shared_module('resourceplugin', + sources: 'resourceplugin.c', plugin_resources_c, link_args : export_dynamic_ldflags, dependencies : common_gio_tests_deps, install_dir : installed_tests_execdir, @@ -833,12 +928,8 @@ test_resources_binary = custom_target('test_resources.o', input : test_gresource_binary, output : 'test_resources.o', - command : ld, - '-z', 'noexecstack', - '-r', - '-b','binary', - '@INPUT@', - '-o','@OUTPUT@') + command : cc.cmd_array() + '-Wl,-z,noexecstack', '-r', '-Wl,-b,binary', + '-nostdlib', '@INPUT@', '-o','@OUTPUT@') # Rename symbol to match the one in the C file if cc.get_id() == 'gcc' and host_system == 'windows' @@ -850,7 +941,7 @@ input : test_resources_binary, output : 'test_resources2.o', command : objcopy, - '--strip-all', + '--strip-debug', '--add-symbol', underscore + '_g_binary_test1_resource_data=.data:0', '@INPUT@', '@OUTPUT@') @@ -864,12 +955,28 @@ gio_tests += { 'resources' : { 'extra_sources' : resources_extra_sources, - # FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392 - 'should_fail' : host_system == 'darwin', + 'depends' : resource_plugin, }, } endif +test_extra_programs_targets = {} +foreach program_name, extra_args : test_extra_programs + source = extra_args.get('source', program_name + '.c') + extra_sources = extra_args.get('extra_sources', ) + install = installed_tests_enabled and extra_args.get('install', true) + test_extra_programs_targets += { + program_name : executable(program_name, + sources: source, extra_sources, + c_args : test_c_args, + dependencies : common_gio_tests_deps + extra_args.get('dependencies', ), + install_dir : installed_tests_execdir, + install_tag : 'tests', + install : install, + ) + } +endforeach + foreach test_name, extra_args : gio_tests source = extra_args.get('source', test_name + '.c') extra_sources = extra_args.get('extra_sources', ) @@ -911,41 +1018,51 @@ suite = 'gio' + extra_args.get('suite', ) timeout = suite.contains('slow') ? test_timeout_slow : test_timeout local_test_env = test_env + depends = extra_args.get('depends', ) + + foreach program : extra_args.get('extra_programs', ) + depends += test_extra_programs_targetsprogram + endforeach foreach var, value : extra_args.get('env', {}) local_test_env.append(var, value) endforeach + if extra_args.get('can_fail', false) + suite += 'failing' + endif + test(test_name, exe, + protocol : extra_args.get('protocol', test_protocol), env : local_test_env, timeout : timeout, suite : suite, is_parallel : extra_args.get('is_parallel', true), - depends : extra_args.get('depends', ), + depends : depends, should_fail : extra_args.get('should_fail', false), ) endforeach -foreach program_name, extra_args : test_extra_programs - source = extra_args.get('source', program_name + '.c') - extra_sources = extra_args.get('extra_sources', ) - install = installed_tests_enabled and extra_args.get('install', true) - executable(program_name, source, extra_sources, - c_args : test_c_args, - dependencies : common_gio_tests_deps + extra_args.get('dependencies', ), - install_dir : installed_tests_execdir, - install_tag : 'tests', - install : install, - ) -endforeach +foreach test_name, extra_args : python_tests + depends = extra_args.get('depends', ) + suite = 'gio', 'no-valgrind' + + if extra_args.get('can_fail', false) + suite += 'failing' + endif + + foreach program : extra_args.get('extra_programs', ) + depends += test_extra_programs_targetsprogram + endforeach -foreach test_name : python_tests test( test_name, python, + protocol : extra_args.get('protocol', test_protocol), + depends: depends, args: '-B', files(test_name), env: test_env, - suite: 'gio', 'no-valgrind', + suite: suite, ) if installed_tests_enabled @@ -980,7 +1097,3 @@ endif subdir('services') - -if get_option('default_library') != 'static' - subdir('modules') -endif
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/tests/modules/symbol-visibility.h -> _service:tar_scm:glib-2.76.4.tar.xz/gio/tests/modules/symbol-visibility.h
Changed
@@ -3,7 +3,7 @@ /* This is the same check that's done in configure to create config.h */ #ifdef _WIN32 -#ifdef GLIB_STATIC_COMPILATION +#ifdef GLIB_TEST_STATIC_COMPILATION #define GLIB_TEST_EXPORT_SYMBOL extern #else #ifdef _MSC_VER
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/tests/modules/test-module-a.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/tests/modules/test-module-a.c
Changed
@@ -20,8 +20,6 @@ * if advised of the possibility of such damage. */ -#include "config.h" /* for _GLIB_EXTERN */ - #include <gio/gio.h> #include "symbol-visibility.h"
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/tests/modules/test-module-b.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/tests/modules/test-module-b.c
Changed
@@ -20,8 +20,6 @@ * if advised of the possibility of such damage. */ -#include "config.h" /* for _GLIB_EXTERN */ - #include <gio/gio.h> #include "symbol-visibility.h"
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/tests/permission.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/tests/permission.c
Changed
@@ -2,6 +2,8 @@ * Copyright (C) 2012 Red Hat, Inc * Author: Matthias Clasen * + * SPDX-License-Identifier: LicenseRef-old-glib-tests + * * This work is provided "as is"; redistribution and modification * in whole or in part, in any medium, physical or electronic is * permitted without restriction.
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/tests/pollable.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/tests/pollable.c
Changed
@@ -263,14 +263,12 @@ static void test_pollable_unix_nulldev (void) { - int fd; - g_test_summary ("Test that /dev/null is not considered pollable, but only if " "on a system where we are able to tell it apart from devices " "that actually implement poll"); #if defined (HAVE_EPOLL_CREATE) || defined (HAVE_KQUEUE) - fd = g_open ("/dev/null", O_RDWR, 0); + int fd = g_open ("/dev/null", O_RDWR, 0); g_assert_cmpint (fd, !=, -1); g_assert_not_pollable (fd);
View file
_service:tar_scm:glib-2.76.4.tar.xz/gio/tests/portal-support-env-var.c
Added
@@ -0,0 +1,45 @@ +/* + * GIO - GLib Input, Output and Streaming Library + * + * Copyright (C) 2022 Canonical Ltd. + * + * SPDX-License-Identifier: LGPL-2.1-or-later + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General + * Public License along with this library; if not, see <http://www.gnu.org/licenses/>. + * + * Author: Marco Trevisan <marco.trevisan@canonical.com> + */ + +#include "../gportalsupport.h" +#include <gio/gio.h> + +static void +test_portal_support_env_var (void) +{ + g_assert_true (glib_should_use_portal ()); + g_assert_true (glib_network_available_in_sandbox ()); + g_assert_true (glib_has_dconf_access_in_sandbox ()); +} + +int +main (int argc, char **argv) +{ + g_test_init (&argc, &argv, NULL); + + g_setenv ("GTK_USE_PORTAL", "1", TRUE); + + g_test_add_func ("/portal-support/env-var", test_portal_support_env_var); + + return g_test_run (); +}
View file
_service:tar_scm:glib-2.76.4.tar.xz/gio/tests/portal-support-flatpak-full.c
Added
@@ -0,0 +1,49 @@ +/* + * GIO - GLib Input, Output and Streaming Library + * + * Copyright (C) 2022 Canonical Ltd. + * + * SPDX-License-Identifier: LGPL-2.1-or-later + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General + * Public License along with this library; if not, see <http://www.gnu.org/licenses/>. + * + * Author: Marco Trevisan <marco.trevisan@canonical.com> + */ + +#include "portal-support-utils.h" + +#include "../gportalsupport.h" +#include <gio/gio.h> + +static void +test_portal_support_flatpak_full (void) +{ + create_fake_flatpak_info (g_get_user_runtime_dir (), + (GStrv)(const char* ) {"foo", "bar", "network", "more", NULL}, + "talk"); + + g_assert_true (glib_should_use_portal ()); + g_assert_true (glib_network_available_in_sandbox ()); + g_assert_true (glib_has_dconf_access_in_sandbox ()); +} + +int +main (int argc, char **argv) +{ + g_test_init (&argc, &argv, G_TEST_OPTION_ISOLATE_DIRS, NULL); + + g_test_add_func ("/portal-support/flatpak/full", test_portal_support_flatpak_full); + + return g_test_run (); +}
View file
_service:tar_scm:glib-2.76.4.tar.xz/gio/tests/portal-support-flatpak-gsettings-only.c
Added
@@ -0,0 +1,49 @@ +/* + * GIO - GLib Input, Output and Streaming Library + * + * Copyright (C) 2022 Canonical Ltd. + * + * SPDX-License-Identifier: LGPL-2.1-or-later + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General + * Public License along with this library; if not, see <http://www.gnu.org/licenses/>. + * + * Author: Marco Trevisan <marco.trevisan@canonical.com> + */ + +#include "portal-support-utils.h" + +#include "../gportalsupport.h" +#include <gio/gio.h> + +static void +test_portal_support_flatpak_gsettings_only (void) +{ + create_fake_flatpak_info (g_get_user_runtime_dir (), + (GStrv)(const char* ) {"unsupported-stuff", NULL}, + "talk"); + + g_assert_true (glib_should_use_portal ()); + g_assert_false (glib_network_available_in_sandbox ()); + g_assert_true (glib_has_dconf_access_in_sandbox ()); +} + +int +main (int argc, char **argv) +{ + g_test_init (&argc, &argv, G_TEST_OPTION_ISOLATE_DIRS, NULL); + + g_test_add_func ("/portal-support/flatpak/gsettings", test_portal_support_flatpak_gsettings_only); + + return g_test_run (); +}
View file
_service:tar_scm:glib-2.76.4.tar.xz/gio/tests/portal-support-flatpak-network-only.c
Added
@@ -0,0 +1,49 @@ +/* + * GIO - GLib Input, Output and Streaming Library + * + * Copyright (C) 2022 Canonical Ltd. + * + * SPDX-License-Identifier: LGPL-2.1-or-later + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General + * Public License along with this library; if not, see <http://www.gnu.org/licenses/>. + * + * Author: Marco Trevisan <marco.trevisan@canonical.com> + */ + +#include "portal-support-utils.h" + +#include "../gportalsupport.h" +#include <gio/gio.h> + +static void +test_portal_support_flatpak_network (void) +{ + create_fake_flatpak_info (g_get_user_runtime_dir (), + (GStrv)(const char* ) {"foo", "bar", "network", "more", NULL}, + "do-not-talk"); + + g_assert_true (glib_should_use_portal ()); + g_assert_true (glib_network_available_in_sandbox ()); + g_assert_false (glib_has_dconf_access_in_sandbox ()); +} + +int +main (int argc, char **argv) +{ + g_test_init (&argc, &argv, G_TEST_OPTION_ISOLATE_DIRS, NULL); + + g_test_add_func ("/portal-support/flatpak/network", test_portal_support_flatpak_network); + + return g_test_run (); +}
View file
_service:tar_scm:glib-2.76.4.tar.xz/gio/tests/portal-support-flatpak-none.c
Added
@@ -0,0 +1,47 @@ +/* + * GIO - GLib Input, Output and Streaming Library + * + * Copyright (C) 2022 Canonical Ltd. + * + * SPDX-License-Identifier: LGPL-2.1-or-later + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General + * Public License along with this library; if not, see <http://www.gnu.org/licenses/>. + * + * Author: Marco Trevisan <marco.trevisan@canonical.com> + */ + +#include "portal-support-utils.h" + +#include "../gportalsupport.h" +#include <gio/gio.h> + +static void +test_portal_support_flatpak_none (void) +{ + create_fake_flatpak_info (g_get_user_runtime_dir (), NULL, NULL); + + g_assert_true (glib_should_use_portal ()); + g_assert_false (glib_network_available_in_sandbox ()); + g_assert_false (glib_has_dconf_access_in_sandbox ()); +} + +int +main (int argc, char **argv) +{ + g_test_init (&argc, &argv, G_TEST_OPTION_ISOLATE_DIRS, NULL); + + g_test_add_func ("/portal-support/flatpak/none", test_portal_support_flatpak_none); + + return g_test_run (); +}
View file
_service:tar_scm:glib-2.76.4.tar.xz/gio/tests/portal-support-none.c
Added
@@ -0,0 +1,43 @@ +/* + * GIO - GLib Input, Output and Streaming Library + * + * Copyright (C) 2022 Canonical Ltd. + * + * SPDX-License-Identifier: LGPL-2.1-or-later + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General + * Public License along with this library; if not, see <http://www.gnu.org/licenses/>. + * + * Author: Marco Trevisan <marco.trevisan@canonical.com> + */ + +#include "../gportalsupport.h" +#include <gio/gio.h> + +static void +test_portal_support_none (void) +{ + g_assert_false (glib_should_use_portal ()); + g_assert_true (glib_network_available_in_sandbox ()); + g_assert_true (glib_has_dconf_access_in_sandbox ()); +} + +int +main (int argc, char **argv) +{ + g_test_init (&argc, &argv, NULL); + + g_test_add_func ("/portal-support/none", test_portal_support_none); + + return g_test_run (); +}
View file
_service:tar_scm:glib-2.76.4.tar.xz/gio/tests/portal-support-snap-classic.c
Added
@@ -0,0 +1,119 @@ +/* + * GIO - GLib Input, Output and Streaming Library + * + * Copyright (C) 2022 Canonical Ltd. + * + * SPDX-License-Identifier: LGPL-2.1-or-later + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General + * Public License along with this library; if not, see <http://www.gnu.org/licenses/>. + * + * Author: Marco Trevisan <marco.trevisan@canonical.com> + */ + +#include "portal-support-utils.h" + +#include "../gportalsupport.h" +#include <gio/gio.h> + +typedef struct +{ + char *old_path; + char *old_snap; + + const char *bin_path; + const char *snap_path; +} SetupData; + +static void +tests_setup (SetupData *setup_data, + gconstpointer data) +{ + setup_data->old_path = g_strdup (g_getenv ("PATH")); + setup_data->old_snap = g_strdup (g_getenv ("SNAP")); + + setup_data->bin_path = g_get_user_runtime_dir (); + setup_data->snap_path = g_getenv ("G_TEST_TMPDIR"); + + g_assert_nonnull (setup_data->bin_path); + g_assert_nonnull (setup_data->snap_path); + + g_setenv ("PATH", setup_data->bin_path, TRUE); + g_setenv ("SNAP", setup_data->snap_path, TRUE); +} + +static void +tests_teardown (SetupData *setup_data, + gconstpointer data) +{ + if (setup_data->old_path) + g_setenv ("PATH", setup_data->old_path, TRUE); + else + g_unsetenv ("PATH"); + + if (setup_data->old_snap) + g_setenv ("SNAP", setup_data->old_snap, TRUE); + else + g_unsetenv ("SNAP"); + + g_clear_pointer (&setup_data->old_path, g_free); + g_clear_pointer (&setup_data->old_snap, g_free); +} + +static void +test_portal_support_snap_no_snapctl (SetupData *setup, + gconstpointer data) +{ + g_assert_false (glib_should_use_portal ()); + g_assert_true (glib_network_available_in_sandbox ()); + g_assert_true (glib_has_dconf_access_in_sandbox ()); +} + +static void +test_portal_support_snap_none (SetupData *setup, + gconstpointer data) +{ + create_fake_snap_yaml (setup->snap_path, TRUE); + create_fake_snapctl (setup->bin_path, NULL); + + g_assert_false (glib_should_use_portal ()); + g_assert_true (glib_network_available_in_sandbox ()); + g_assert_true (glib_has_dconf_access_in_sandbox ()); +} + +static void +test_portal_support_snap_all (SetupData *setup, + gconstpointer data) +{ + create_fake_snap_yaml (setup->snap_path, TRUE); + create_fake_snapctl (setup->bin_path, "desktop|network-status|gsettings"); + + g_assert_false (glib_should_use_portal ()); + g_assert_true (glib_network_available_in_sandbox ()); + g_assert_true (glib_has_dconf_access_in_sandbox ()); +} + +int +main (int argc, char **argv) +{ + g_test_init (&argc, &argv, G_TEST_OPTION_ISOLATE_DIRS, NULL); + + g_test_add ("/portal-support/snap-classic/no-snapctl", SetupData, NULL, + tests_setup, test_portal_support_snap_no_snapctl, tests_teardown); + g_test_add ("/portal-support/snap-classic/none", SetupData, NULL, + tests_setup, test_portal_support_snap_none, tests_teardown); + g_test_add ("/portal-support/snap-classic/all", SetupData, NULL, + tests_setup, test_portal_support_snap_all, tests_teardown); + + return g_test_run (); +}
View file
_service:tar_scm:glib-2.76.4.tar.xz/gio/tests/portal-support-snap.c
Added
@@ -0,0 +1,208 @@ +/* + * GIO - GLib Input, Output and Streaming Library + * + * Copyright (C) 2022 Canonical Ltd. + * + * SPDX-License-Identifier: LGPL-2.1-or-later + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General + * Public License along with this library; if not, see <http://www.gnu.org/licenses/>. + * + * Author: Marco Trevisan <marco.trevisan@canonical.com> + */ + +#include "portal-support-utils.h" + +#include "../gportalsupport.h" +#include <gio/gio.h> +#include <glib/gstdio.h> + +typedef struct +{ + char *old_path; + char *old_snap; + + const char *bin_path; + const char *snap_path; +} SetupData; + +static void +tests_setup (SetupData *setup_data, + gconstpointer data) +{ + setup_data->old_path = g_strdup (g_getenv ("PATH")); + setup_data->old_snap = g_strdup (g_getenv ("SNAP")); + + setup_data->bin_path = g_get_user_runtime_dir (); + setup_data->snap_path = g_getenv ("G_TEST_TMPDIR"); + + g_assert_nonnull (setup_data->bin_path); + g_assert_nonnull (setup_data->snap_path); + + g_setenv ("PATH", setup_data->bin_path, TRUE); + g_setenv ("SNAP", setup_data->snap_path, TRUE); +} + +static void +tests_teardown (SetupData *setup_data, + gconstpointer data) +{ + if (setup_data->old_path) + g_setenv ("PATH", setup_data->old_path, TRUE); + else + g_unsetenv ("PATH"); + + if (setup_data->old_snap) + g_setenv ("SNAP", setup_data->old_snap, TRUE); + else + g_unsetenv ("SNAP"); + + g_clear_pointer (&setup_data->old_path, g_free); + g_clear_pointer (&setup_data->old_snap, g_free); +} + +static void +test_portal_support_snap_no_snapctl (SetupData *setup, + gconstpointer data) +{ + create_fake_snap_yaml (setup->snap_path, FALSE); + + g_assert_false (glib_should_use_portal ()); + g_assert_false (glib_network_available_in_sandbox ()); + g_assert_false (glib_has_dconf_access_in_sandbox ()); +} + +static void +test_portal_support_snap_none (SetupData *setup, + gconstpointer data) +{ + create_fake_snap_yaml (setup->snap_path, FALSE); + create_fake_snapctl (setup->bin_path, NULL); + + g_assert_false (glib_should_use_portal ()); + g_assert_false (glib_network_available_in_sandbox ()); + g_assert_false (glib_has_dconf_access_in_sandbox ()); +} + +static void +test_portal_support_snap_all (SetupData *setup, + gconstpointer data) +{ + create_fake_snap_yaml (setup->snap_path, FALSE); + create_fake_snapctl (setup->bin_path, "desktop|network-status|gsettings"); + + g_assert_true (glib_should_use_portal ()); + g_assert_true (glib_network_available_in_sandbox ()); + g_assert_true (glib_has_dconf_access_in_sandbox ()); +} + +static void +test_portal_support_snap_desktop_only (SetupData *setup, + gconstpointer data) +{ + create_fake_snap_yaml (setup->snap_path, FALSE); + create_fake_snapctl (setup->bin_path, "desktop"); + + g_assert_true (glib_should_use_portal ()); + g_assert_true (glib_network_available_in_sandbox ()); + g_assert_false (glib_has_dconf_access_in_sandbox ()); +} + +static void +test_portal_support_snap_network_only (SetupData *setup, + gconstpointer data) +{ + create_fake_snap_yaml (setup->snap_path, FALSE); + create_fake_snapctl (setup->bin_path, "network-status"); + + g_assert_false (glib_should_use_portal ()); + g_assert_true (glib_network_available_in_sandbox ()); + g_assert_false (glib_has_dconf_access_in_sandbox ()); +} + +static void +test_portal_support_snap_gsettings_only (SetupData *setup, + gconstpointer data) +{ + create_fake_snap_yaml (setup->snap_path, FALSE); + create_fake_snapctl (setup->bin_path, "gsettings"); + + g_assert_false (glib_should_use_portal ()); + g_assert_false (glib_network_available_in_sandbox ()); + g_assert_true (glib_has_dconf_access_in_sandbox ()); +} + +static void +test_portal_support_snap_updates_dynamically (SetupData *setup, + gconstpointer data) +{ + create_fake_snap_yaml (setup->snap_path, FALSE); + create_fake_snapctl (setup->bin_path, NULL); + + g_assert_false (glib_should_use_portal ()); + g_assert_false (glib_network_available_in_sandbox ()); + g_assert_false (glib_has_dconf_access_in_sandbox ()); + + create_fake_snapctl (setup->bin_path, "desktop"); + g_assert_true (glib_should_use_portal ()); + g_assert_true (glib_network_available_in_sandbox ()); + g_assert_false (glib_has_dconf_access_in_sandbox ()); + + create_fake_snapctl (setup->bin_path, "network-status|gsettings"); + g_assert_false (glib_should_use_portal ()); + g_assert_true (glib_network_available_in_sandbox ()); + g_assert_true (glib_has_dconf_access_in_sandbox ()); + + create_fake_snapctl (setup->bin_path, "desktop|network-status|gsettings"); + g_assert_true (glib_should_use_portal ()); + g_assert_true (glib_network_available_in_sandbox ()); + g_assert_true (glib_has_dconf_access_in_sandbox ()); + + create_fake_snapctl (setup->bin_path, "desktop|gsettings"); + g_assert_true (glib_should_use_portal ()); + g_assert_true (glib_network_available_in_sandbox ()); + g_assert_true (glib_has_dconf_access_in_sandbox ()); + + create_fake_snapctl (setup->bin_path, "gsettings"); + g_assert_false (glib_should_use_portal ()); + g_assert_false (glib_network_available_in_sandbox ()); + g_assert_true (glib_has_dconf_access_in_sandbox ()); + + create_fake_snapctl (setup->bin_path, NULL); + g_assert_false (glib_should_use_portal ()); + g_assert_false (glib_network_available_in_sandbox ()); + g_assert_false (glib_has_dconf_access_in_sandbox ()); +} + +int +main (int argc, char **argv) +{ + g_test_init (&argc, &argv, G_TEST_OPTION_ISOLATE_DIRS, NULL); + + g_test_add ("/portal-support/snap/no-snapctl", SetupData, NULL, + tests_setup, test_portal_support_snap_no_snapctl, tests_teardown); + g_test_add ("/portal-support/snap/none", SetupData, NULL, + tests_setup, test_portal_support_snap_none, tests_teardown); + g_test_add ("/portal-support/snap/all", SetupData, NULL, + tests_setup, test_portal_support_snap_all, tests_teardown); + g_test_add ("/portal-support/snap/desktop-only", SetupData, NULL, + tests_setup, test_portal_support_snap_desktop_only, tests_teardown); + g_test_add ("/portal-support/snap/network-only", SetupData, NULL, + tests_setup, test_portal_support_snap_network_only, tests_teardown); + g_test_add ("/portal-support/snap/gsettings-only", SetupData, NULL, + tests_setup, test_portal_support_snap_gsettings_only, tests_teardown); + g_test_add ("/portal-support/snap/updates-dynamically", SetupData, NULL, + tests_setup, test_portal_support_snap_updates_dynamically, tests_teardown); + + return g_test_run (); +}
View file
_service:tar_scm:glib-2.76.4.tar.xz/gio/tests/portal-support-utils.c
Added
@@ -0,0 +1,141 @@ +/* + * GIO - GLib Input, Output and Streaming Library + * + * Copyright (C) 2022 Canonical Ltd. + * + * SPDX-License-Identifier: LGPL-2.1-or-later + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General + * Public License along with this library; if not, see <http://www.gnu.org/licenses/>. + * + * Author: Marco Trevisan <marco.trevisan@canonical.com> + */ + +#include "portal-support-utils.h" + +#include <glib.h> +#include <glib/gstdio.h> + +void +create_fake_snapctl (const char *path, + const char *supported_op) +{ + GError *error = NULL; + char *snapctl_content; + char *snapctl; + + snapctl = g_build_filename (path, "snapctl", NULL); + snapctl_content = g_strdup_printf ("#!/bin/sh\n" \ + " \"$1\" != 'is-connected' && exit 2\n" + " -z \"$2\" && exit 3\n" + " -n \"$3\" && exit 4\n" + "case \"$2\" in\n" + " %s) exit 0;;\n" + " *) exit 1;;\n" + "esac\n", + supported_op ? supported_op : "<invalid>"); + + g_file_set_contents (snapctl, snapctl_content, -1, &error); + g_assert_no_error (error); + g_assert_cmpint (g_chmod (snapctl, 0500), ==, 0); + + g_test_message ("Created snapctl in %s", snapctl); + + g_clear_error (&error); + g_free (snapctl_content); + g_free (snapctl); +} + +void +create_fake_snap_yaml (const char *snap_path, + gboolean is_classic) +{ + char *meta_path; + char *yaml_path; + char *yaml_contents; + + g_assert_nonnull (snap_path); + + yaml_contents = g_strconcat ("name: glib-test-portal-support\n" + "title: GLib Portal Support Test\n" + "version: 2.76\n" + "summary: Test it works\n", + is_classic ? + "confinement: classic\n" : NULL, NULL); + + meta_path = g_build_filename (snap_path, "meta", NULL); + g_assert_cmpint (g_mkdir_with_parents (meta_path, 0700), ==, 0); + + yaml_path = g_build_filename (meta_path, "snap.yaml", NULL); + g_file_set_contents (yaml_path, yaml_contents, -1, NULL); + + g_test_message ("Created snap.yaml in %s", yaml_path); + + g_free (meta_path); + g_free (yaml_path); + g_free (yaml_contents); +} + +void +create_fake_flatpak_info_from_key_file (const char *root_path, + GKeyFile *key_file) +{ + GError *error = NULL; + char *key_file_path; + + g_assert_nonnull (root_path); + + key_file_path = g_build_filename (root_path, ".flatpak-info", NULL); + g_test_message ("Creating .flatpak-info in %s", key_file_path); + g_key_file_save_to_file (key_file, key_file_path, &error); + g_assert_no_error (error); + + g_free (key_file_path); +} + +void +create_fake_flatpak_info (const char *root_path, + const GStrv shared_context, + const char *dconf_dbus_policy) +{ + GKeyFile *key_file; + + key_file = g_key_file_new (); + + /* File format is defined at: + * https://docs.flatpak.org/en/latest/flatpak-command-reference.html + */ + g_key_file_set_string (key_file, "Application", "name", + "org.gnome.GLib.Test.Flatpak"); + g_key_file_set_string (key_file, "Application", "runtime", + "org.gnome.Platform/x86_64/44"); + g_key_file_set_string (key_file, "Application", "sdk", + "org.gnome.Sdk/x86_64/44"); + + if (shared_context) + { + g_key_file_set_string_list (key_file, "Context", "shared", + (const char * const *) shared_context, + g_strv_length (shared_context)); + } + + if (dconf_dbus_policy) + { + g_key_file_set_string (key_file, "Session Bus Policy", "ca.desrt.dconf", + dconf_dbus_policy); + } + + create_fake_flatpak_info_from_key_file (root_path, key_file); + + g_key_file_free (key_file); +}
View file
_service:tar_scm:glib-2.76.4.tar.xz/gio/tests/portal-support-utils.h
Added
@@ -0,0 +1,37 @@ +/* + * GIO - GLib Input, Output and Streaming Library + * + * Copyright (C) 2022 Canonical Ltd. + * + * SPDX-License-Identifier: LGPL-2.1-or-later + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General + * Public License along with this library; if not, see <http://www.gnu.org/licenses/>. + * + * Author: Marco Trevisan <marco.trevisan@canonical.com> + */ + +#include <glib.h> + +void create_fake_snap_yaml (const char *snap_path, + gboolean is_classic); + +void create_fake_snapctl (const char *path, + const char *supported_op); + +void create_fake_flatpak_info (const char *root_path, + const GStrv shared_context, + const char *dconf_dbus_policy); + +void create_fake_flatpak_info_from_key_file (const char *root_path, + GKeyFile *key_file);
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/tests/resourceplugin.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/tests/resourceplugin.c
Changed
@@ -6,8 +6,6 @@ * g_io_module*() symbols, is defined to be _GLIB_EXTERN, * which must be overridden to export the symbols. */ -#include "modules/symbol-visibility.h" -#define _GLIB_EXTERN GLIB_TEST_EXPORT_SYMBOL #include <gio/gio.h>
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/tests/resources.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/tests/resources.c
Changed
@@ -805,7 +805,11 @@ g_assert_nonnull (content_type); mime_type = g_content_type_get_mime_type (content_type); g_assert_nonnull (mime_type); +#ifdef __APPLE__ + g_assert_cmpstr (mime_type, ==, "text/*"); +#else g_assert_cmpstr (mime_type, ==, "text/plain"); +#endif g_free (mime_type); g_object_unref (info);
View file
_service:tar_scm:glib-2.76.4.tar.xz/gio/tests/sandbox.c
Added
@@ -0,0 +1,88 @@ +/* + * Copyright 2022 Canonical Ltd + * + * SPDX-License-Identifier: LGPL-2.1-or-later + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General + * Public License along with this library; if not, see <http://www.gnu.org/licenses/>. + */ + +#include "portal-support-utils.h" + +#include "../gsandbox.h" +#include <gio/gio.h> +#include <glib/gstdio.h> + +static void +test_sandbox_none (void) +{ + g_assert_cmpint (glib_get_sandbox_type (), ==, G_SANDBOX_TYPE_UNKNOWN); +} + +static void +test_sandbox_snap (void) +{ + const char *temp_dir; + gchar *snap_path; + + temp_dir = g_getenv ("G_TEST_TMPDIR"); + g_assert_nonnull (temp_dir); + + snap_path = g_build_filename (temp_dir, "snap", "current", NULL); + create_fake_snap_yaml (snap_path, FALSE); + g_setenv ("SNAP", snap_path, TRUE); + + g_assert_cmpint (glib_get_sandbox_type (), ==, G_SANDBOX_TYPE_SNAP); + + g_unsetenv ("SNAP"); + g_free (snap_path); +} + +static void +test_sandbox_snap_classic (void) +{ + const char *temp_dir; + char *snap_path; + + temp_dir = g_getenv ("G_TEST_TMPDIR"); + g_assert_nonnull (temp_dir); + + snap_path = g_build_filename (temp_dir, "snap", "current", NULL); + create_fake_snap_yaml (snap_path, TRUE); + g_setenv ("SNAP", snap_path, TRUE); + + g_assert_cmpint (glib_get_sandbox_type (), ==, G_SANDBOX_TYPE_UNKNOWN); + + g_unsetenv ("SNAP"); + g_free (snap_path); +} + +static void +test_sandbox_flatpak (void) +{ + create_fake_flatpak_info (g_get_user_runtime_dir (), NULL, NULL); + g_assert_cmpint (glib_get_sandbox_type (), ==, G_SANDBOX_TYPE_FLATPAK); +} + +int +main (int argc, char **argv) +{ + g_test_init (&argc, &argv, G_TEST_OPTION_ISOLATE_DIRS, NULL); + + g_test_add_func ("/sandbox/none", test_sandbox_none); + g_test_add_func ("/sandbox/snap", test_sandbox_snap); + g_test_add_func ("/sandbox/classic-snap", test_sandbox_snap_classic); + g_test_add_func ("/sandbox/flatpak", test_sandbox_flatpak); + + return g_test_run (); +}
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/tests/socket.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/tests/socket.c
Changed
@@ -1621,6 +1621,10 @@ static void test_reuse_tcp (void) { +#if 1 + g_test_skip ("Test is currently failing due to a kernel bug; see https://gitlab.gnome.org/GNOME/glib/-/issues/2879"); + return; +#else GSocket *sock1, *sock2; GError *error = NULL; GInetAddress *iaddr; @@ -1657,6 +1661,7 @@ g_object_unref (sock1); g_object_unref (sock2); +#endif } static void
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/tests/srvtarget.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/tests/srvtarget.c
Changed
@@ -1,6 +1,8 @@ /* GLib testing framework examples and tests * Copyright (C) 2009 Red Hat, Inc. * + * SPDX-License-Identifier: LicenseRef-old-glib-tests + * * This work is provided "as is"; redistribution and modification * in whole or in part, in any medium, physical or electronic is * permitted without restriction.
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/tests/task.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/tests/task.c
Changed
@@ -625,18 +625,40 @@ test_name (void) { GTask *t1 = NULL; + char *orig = g_strdup ("some task"); gchar *name1 = NULL; t1 = g_task_new (NULL, NULL, name_callback, &name1); - g_task_set_name (t1, "some task"); + (g_task_set_name) (t1, orig); g_task_return_boolean (t1, TRUE); g_object_unref (t1); g_main_loop_run (loop); - g_assert_cmpstr (name1, ==, "some task"); + g_assert_cmpstr (name1, ==, orig); g_free (name1); + g_free (orig); +} + +static void +test_name_macro_wrapper (void) +{ + GTask *t1 = NULL; + char *orig = g_strdup ("some task"); + gchar *name1 = NULL; + + t1 = g_task_new (NULL, NULL, name_callback, &name1); + g_task_set_name (t1, orig); + g_task_return_boolean (t1, TRUE); + g_object_unref (t1); + + g_main_loop_run (loop); + + g_assert_cmpstr (name1, ==, orig); + + g_free (name1); + g_free (orig); } static void @@ -656,6 +678,44 @@ g_main_loop_quit (loop); } +static void static_name_callback (GObject *object, + GAsyncResult *result, + gpointer user_data); + +static void +test_static_name (void) +{ + GTask *t1 = NULL; + char *orig = "some task"; + char *name1 = NULL; + + t1 = g_task_new (NULL, NULL, static_name_callback, &name1); + g_task_set_static_name (t1, orig); + g_task_return_boolean (t1, TRUE); + g_object_unref (t1); + + g_main_loop_run (loop); + + g_assert_true (name1 == orig); +} + +static void +static_name_callback (GObject *object, + GAsyncResult *result, + gpointer user_data) +{ + const char **name_out = user_data; + GError *local_error = NULL; + + g_assert_null (*name_out); + *name_out = g_task_get_name (G_TASK (result)); + + g_task_propagate_boolean (G_TASK (result), &local_error); + g_assert_no_error (local_error); + + g_main_loop_quit (loop); +} + /* test_asynchronous_cancellation: cancelled tasks are returned * asynchronously, i.e. not from inside the GCancellable::cancelled * handler. @@ -2358,6 +2418,77 @@ g_test_trap_assert_stderr ("*CRITICAL*assertion '!task->ever_returned' failed*"); } +static gboolean +source_cb (gpointer user_data) +{ + return G_SOURCE_REMOVE; +} + +static void +test_attach_source_set_name (void) +{ + guint calls = 0; + GTask *task = NULL; + GSource *source = NULL; + GSourceFuncs source_funcs = { NULL, NULL, NULL, NULL, NULL, NULL }; + + g_test_summary ("Test that attaching a source to a task will set the source’s name if unset"); + + task = g_task_new (NULL, NULL, task_complete_cb, &calls); + g_task_set_name (task, "test name"); + + source = g_source_new (&source_funcs, sizeof (GSource)); + g_task_attach_source (task, source, source_cb); + g_assert_cmpstr (g_source_get_name (source), ==, "test name"); + g_source_unref (source); + + source = g_source_new (&source_funcs, sizeof (GSource)); + g_source_set_name (source, "not the task name"); + g_task_attach_source (task, source, source_cb); + g_assert_cmpstr (g_source_get_name (source), ==, "not the task name"); + g_source_unref (source); + + g_object_unref (task); +} + +static void +test_finalize_without_return (void) +{ + GTask *task = NULL; + guint n_calls = 0; + + /* With a callback set. */ + task = g_task_new (NULL, NULL, task_complete_cb, &n_calls); + + g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL, + "GTask * (source object: *, source tag: *) finalized without " + "ever returning (using g_task_return_*()). This potentially " + "indicates a bug in the program."); + g_object_unref (task); + g_test_assert_expected_messages (); + + /* With a callback and task name set. */ + task = g_task_new (NULL, NULL, task_complete_cb, &n_calls); + g_task_set_static_name (task, "oogly boogly"); + + g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL, + "GTask oogly boogly (source object: *, source tag: *) finalized without " + "ever returning (using g_task_return_*()). This potentially " + "indicates a bug in the program."); + g_object_unref (task); + g_test_assert_expected_messages (); + + /* Without a callback set. */ + task = g_task_new (NULL, NULL, NULL, NULL); + + g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, + "GTask * (source object: *, source tag: *) finalized without " + "ever returning (using g_task_return_*()). This potentially " + "indicates a bug in the program."); + g_object_unref (task); + g_test_assert_expected_messages (); +} + int main (int argc, char **argv) { @@ -2379,6 +2510,8 @@ g_test_add_func ("/gtask/report-error", test_report_error); g_test_add_func ("/gtask/priority", test_priority); g_test_add_func ("/gtask/name", test_name); + g_test_add_func ("/gtask/name/macro-wrapper", test_name_macro_wrapper); + g_test_add_func ("/gtask/static-name", test_static_name); g_test_add_func ("/gtask/asynchronous-cancellation", test_asynchronous_cancellation); g_test_add_func ("/gtask/check-cancellable", test_check_cancellable); g_test_add_func ("/gtask/return-if-cancelled", test_return_if_cancelled); @@ -2398,6 +2531,8 @@ g_test_add_func ("/gtask/return/in-idle/value-first", test_return_in_idle_value_first); g_test_add_func ("/gtask/return/error-first", test_return_error_first); g_test_add_func ("/gtask/return/value-first", test_return_value_first); + g_test_add_func ("/gtask/attach-source/set-name", test_attach_source_set_name); + g_test_add_func ("/gtask/finalize-without-return", test_finalize_without_return); ret = g_test_run();
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/tests/testfilemonitor.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/tests/testfilemonitor.c
Changed
@@ -1087,6 +1087,36 @@ g_object_unref (file); } +static void +test_root (Fixture *fixture, + gconstpointer user_data) +{ + GFile *file = NULL; + GFileMonitor *monitor = NULL; + GError *local_error = NULL; + + g_test_summary ("Test that GFileMonitor can monitor the root directory."); + g_test_bug ("https://gitlab.gnome.org/GNOME/glib/-/merge_requests/3241"); + +#if defined(G_OS_UNIX) + file = g_file_new_for_path ("/"); +#elif defined(G_OS_WIN32) + file = g_file_new_for_path ("C:\\"); +#else + g_test_skip ("Unsupported root directory"); + return; +#endif + + /* We can’t test for any monitor events, but we can at least check that this + * doesn’t crash or error. */ + monitor = g_file_monitor_directory (file, G_FILE_MONITOR_NONE, NULL, &local_error); + g_assert_no_error (local_error); + g_assert_nonnull (monitor); + + g_clear_object (&monitor); + g_clear_object (&file); +} + int main (int argc, char *argv) { @@ -1099,6 +1129,7 @@ g_test_add ("/monitor/cross-dir-moves", Fixture, NULL, setup, test_cross_dir_moves, teardown); g_test_add ("/monitor/file/hard-links", Fixture, NULL, setup, test_file_hard_links, teardown); g_test_add ("/monitor/finalize-in-callback", Fixture, NULL, setup, test_finalize_in_callback, teardown); + g_test_add ("/monitor/root", Fixture, NULL, setup, test_root, teardown); return g_test_run (); }
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/tests/thumbnail-verification.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/tests/thumbnail-verification.c
Changed
@@ -2,6 +2,8 @@ * * Copyright (C) 2013 Collabora, Ltd. * + * SPDX-License-Identifier: LicenseRef-old-glib-tests + * * This work is provided "as is"; redistribution and modification * in whole or in part, in any medium, physical or electronic is * permitted without restriction.
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/tests/unix-streams.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/tests/unix-streams.c
Changed
@@ -1,6 +1,8 @@ /* GLib testing framework examples and tests * Copyright (C) 2008 Red Hat, Inc * + * SPDX-License-Identifier: LicenseRef-old-glib-tests + * * This work is provided "as is"; redistribution and modification * in whole or in part, in any medium, physical or electronic is * permitted without restriction. @@ -62,7 +64,7 @@ offset += nwrote; } - g_assert (nwrote > 0 || err != NULL); + g_assert_true (nwrote > 0 || err != NULL); } while (err == NULL); @@ -105,14 +107,14 @@ if (nread == 0) { - g_assert (err == NULL); + g_assert_no_error (err); /* pipe closed */ g_object_unref (in); return NULL; } g_assert_cmpstr (buf, ==, DATA); - g_assert (!g_cancellable_is_cancelled (reader_cancel)); + g_assert_false (g_cancellable_is_cancelled (reader_cancel)); } while (err == NULL); @@ -144,9 +146,9 @@ nskipped = g_input_stream_skip_finish (in, res, &err); - if (g_cancellable_is_cancelled (main_cancel)) + if (g_error_matches (err, G_IO_ERROR, G_IO_ERROR_CANCELLED)) { - g_assert_error (err, G_IO_ERROR, G_IO_ERROR_CANCELLED); + g_assert_true (g_cancellable_is_cancelled (main_cancel)); do_main_cancel (out); g_clear_error (&err); return; @@ -180,9 +182,9 @@ nread = g_input_stream_read_finish (in, res, &err); - if (g_cancellable_is_cancelled (main_cancel)) + if (g_error_matches (err, G_IO_ERROR, G_IO_ERROR_CANCELLED)) { - g_assert_error (err, G_IO_ERROR, G_IO_ERROR_CANCELLED); + g_assert_true (g_cancellable_is_cancelled (main_cancel)); do_main_cancel (out); g_clear_error (&err); return; @@ -218,9 +220,9 @@ nwrote = g_output_stream_write_finish (out, res, &err); - if (g_cancellable_is_cancelled (main_cancel)) + if (g_error_matches (err, G_IO_ERROR, G_IO_ERROR_CANCELLED)) { - g_assert_error (err, G_IO_ERROR, G_IO_ERROR_CANCELLED); + g_assert_true (g_cancellable_is_cancelled (main_cancel)); do_main_cancel (out); g_clear_error (&err); return; @@ -271,7 +273,7 @@ * read op to fail. */ - g_assert (pipe (writer_pipe) == 0 && pipe (reader_pipe) == 0); + g_assert_true (pipe (writer_pipe) == 0 && pipe (reader_pipe) == 0); if (nonblocking) { @@ -331,13 +333,13 @@ "close-fd", &close_fd, NULL); g_assert_cmpint (fd, ==, 0); - g_assert (close_fd); + g_assert_true (close_fd); g_unix_input_stream_set_close_fd (is, FALSE); - g_assert (!g_unix_input_stream_get_close_fd (is)); + g_assert_false (g_unix_input_stream_get_close_fd (is)); g_assert_cmpint (g_unix_input_stream_get_fd (is), ==, 0); - g_assert (!g_input_stream_has_pending (G_INPUT_STREAM (is))); + g_assert_false (g_input_stream_has_pending (G_INPUT_STREAM (is))); g_object_unref (is); @@ -347,13 +349,13 @@ "close-fd", &close_fd, NULL); g_assert_cmpint (fd, ==, 1); - g_assert (close_fd); + g_assert_true (close_fd); g_unix_output_stream_set_close_fd (os, FALSE); - g_assert (!g_unix_output_stream_get_close_fd (os)); + g_assert_false (g_unix_output_stream_get_close_fd (os)); g_assert_cmpint (g_unix_output_stream_get_fd (os), ==, 1); - g_assert (!g_output_stream_has_pending (G_OUTPUT_STREAM (os))); + g_assert_false (g_output_stream_has_pending (G_OUTPUT_STREAM (os))); g_object_unref (os); }
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/tests/vfs.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/tests/vfs.c
Changed
@@ -3,6 +3,8 @@ * Copyright (C) 2011 Red Hat, Inc * Author: Matthias Clasen * + * SPDX-License-Identifier: LicenseRef-old-glib-tests + * * This work is provided "as is"; redistribution and modification * in whole or in part, in any medium, physical or electronic is * permitted without restriction.
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/tests/win32-appinfo.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/tests/win32-appinfo.c
Changed
@@ -1,6 +1,8 @@ /* GLib testing framework examples and tests * Copyright (C) 2019 Руслан Ижбулатов <lrn1986@gmail.com> * + * SPDX-License-Identifier: LicenseRef-old-glib-tests + * * This work is provided "as is"; redistribution and modification * in whole or in part, in any medium, physical or electronic is * permitted without restriction.
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/tests/win32-streams.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/tests/win32-streams.c
Changed
@@ -1,6 +1,8 @@ /* GLib testing framework examples and tests * Copyright (C) 2008 Red Hat, Inc * + * SPDX-License-Identifier: LicenseRef-old-glib-tests + * * This work is provided "as is"; redistribution and modification * in whole or in part, in any medium, physical or electronic is * permitted without restriction. @@ -40,7 +42,8 @@ writer_thread (gpointer user_data) { GOutputStream *out; - gssize nwrote, offset; + gssize nwrote; + size_t offset; GError *err = NULL; HANDLE out_handle; @@ -58,7 +61,7 @@ g_usleep (10); offset = 0; - while (offset < (gssize) sizeof (DATA)) + while (offset < sizeof (DATA)) { nwrote = g_output_stream_write (out, DATA + offset, sizeof (DATA) - offset,
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/win32/gwin32fsmonitorutils.c -> _service:tar_scm:glib-2.76.4.tar.xz/gio/win32/gwin32fsmonitorutils.c
Changed
@@ -316,6 +316,7 @@ wcsdup (wshortname); } + g_free (wfullpath); g_free (fullpath); } else
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/win32/meson.build -> _service:tar_scm:glib-2.76.4.tar.xz/gio/win32/meson.build
Changed
@@ -9,7 +9,12 @@ giowin32_lib = static_library('giowin32', sources : giowin32_sources, - include_directories : configinc, glibinc, gioinc, gmoduleinc, - dependencies : libintl, gioenumtypes_dep, + include_directories : configinc, glibinc, gioinc, + dependencies : + libintl, + gioenumtypes_dep, + gmodule_inc_dep, + , + gnu_symbol_visibility : 'hidden', pic : true, - c_args : gio_c_args) + c_args : gio_c_args, gio_c_args_internal)
View file
_service:tar_scm:glib-2.74.4.tar.xz/gio/xdgmime/meson.build -> _service:tar_scm:glib-2.76.4.tar.xz/gio/xdgmime/meson.build
Changed
@@ -14,4 +14,6 @@ include_directories : configinc, pic : true, c_args : '-DHAVE_CONFIG_H', - '-DXDG_PREFIX=_gio_xdg' + glib_hidden_visibility_args) + '-DXDG_PREFIX=_gio_xdg' , + gnu_symbol_visibility : 'hidden', +)
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/deprecated/gthread-deprecated.c -> _service:tar_scm:glib-2.76.4.tar.xz/glib/deprecated/gthread-deprecated.c
Changed
@@ -376,7 +376,7 @@ GThread *thread; thread = g_thread_new_internal (NULL, g_deprecated_thread_proxy, - func, data, stack_size, NULL, error); + func, data, stack_size, error); if (thread && !joinable) {
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/docs.c -> _service:tar_scm:glib-2.76.4.tar.xz/glib/docs.c
Changed
@@ -80,132 +80,221 @@ /** * gpointer: * - * An untyped pointer. - * #gpointer looks better and is easier to use than void*. + * An untyped pointer, exactly equivalent to `void *`. + * + * The standard C `void *` type should usually be preferred in + * new code, but `gpointer` can be used in contexts where a type name + * must be a single word, such as in the g_type_name() of %G_TYPE_POINTER + * or when generating a family of function names for multiple types + * using macros. */ /** * gconstpointer: * - * An untyped pointer to constant data. + * An untyped pointer to constant data, exactly equivalent to `const void *`. + * * The data pointed to should not be changed. * * This is typically used in function prototypes to indicate * that the data pointed to will not be altered by the function. + * + * The standard C `const void *` type should usually be preferred in + * new code, but `gconstpointer` can be used in contexts where a type name + * must be a single word. */ /** * gchar: * - * Corresponds to the standard C char type. + * Equivalent to the standard C `char` type. + * + * This type only exists for symmetry with `guchar`. + * The standard C `char` type should be preferred in new code. */ /** * guchar: * - * Corresponds to the standard C unsigned char type. + * Equivalent to the standard C `unsigned char` type. + * + * The standard C `unsigned char` type should usually be preferred in + * new code, but `guchar` can be used in contexts where a type name + * must be a single word, such as in the g_type_name() of %G_TYPE_UCHAR + * or when generating a family of function names for multiple types + * using macros. */ /** * gint: * - * Corresponds to the standard C int type. - * Values of this type can range from %G_MININT to %G_MAXINT. + * Equivalent to the standard C `int` type. + * + * Values of this type can range from `INT_MIN` to `INT_MAX`, + * or equivalently from %G_MININT to %G_MAXINT. + * + * This type only exists for symmetry with `guint`. + * The standard C `int` type should be preferred in new code. */ /** * G_MININT: * * The minimum value which can be held in a #gint. + * + * This is the same as standard C `INT_MIN`, which is available since C99 + * and should be preferred in new code. */ /** * G_MAXINT: * * The maximum value which can be held in a #gint. + * + * This is the same as standard C `INT_MAX`, which is available since C99 + * and should be preferred in new code. */ /** * guint: * - * Corresponds to the standard C unsigned int type. - * Values of this type can range from 0 to %G_MAXUINT. + * Equivalent to the standard C `unsigned int` type. + * + * Values of this type can range from 0 to `UINT_MAX`, + * or equivalently 0 to %G_MAXUINT. + * + * The standard C `unsigned int` type should usually be preferred in + * new code, but `guint` can be used in contexts where a type name + * must be a single word, such as in the g_type_name() of %G_TYPE_UINT + * or when generating a family of function names for multiple types + * using macros. */ /** * G_MAXUINT: * * The maximum value which can be held in a #guint. + * + * This is the same as standard C `UINT_MAX`, which is available since C99 + * and should be preferred in new code. */ /** * gshort: * - * Corresponds to the standard C short type. - * Values of this type can range from %G_MINSHORT to %G_MAXSHORT. + * Equivalent to the standard C `short` type. + * + * Values of this type can range from `SHRT_MIN` to `SHRT_MAX`, + * or equivalently %G_MINSHORT to %G_MAXSHORT. + * + * This type only exists for symmetry with `gushort`. + * The standard C `short` type should be preferred in new code. */ /** * G_MINSHORT: * * The minimum value which can be held in a #gshort. + * + * This is the same as standard C `SHRT_MIN`, which is available since C99 + * and should be preferred in new code. */ /** * G_MAXSHORT: * * The maximum value which can be held in a #gshort. + * + * This is the same as standard C `SHRT_MAX`, which is available since C99 + * and should be preferred in new code. */ /** * gushort: * - * Corresponds to the standard C unsigned short type. - * Values of this type can range from 0 to %G_MAXUSHORT. + * Equivalent to the standard C `unsigned short` type. + * + * Values of this type can range from 0 to `USHRT_MAX`, + * or equivalently from 0 to %G_MAXUSHORT. + * + * The standard C `unsigned short` type should usually be preferred in + * new code, but `gushort` can be used in contexts where a type name + * must be a single word, such as when generating a family of function + * names for multiple types using macros. */ /** * G_MAXUSHORT: * * The maximum value which can be held in a #gushort. + * + * This is the same as standard C `USHRT_MAX`, which is available since C99 + * and should be preferred in new code. */ /** * glong: * - * Corresponds to the standard C long type. - * Values of this type can range from %G_MINLONG to %G_MAXLONG. + * Equivalent to the standard C `long` type. + * + * Values of this type can range from `LONG_MIN` to `LONG_MAX`, + * or equivalently %G_MINLONG to %G_MAXLONG. + * + * This type only exists for symmetry with `gulong`. + * The standard C `long` type should be preferred in new code. */ /** * G_MINLONG: * * The minimum value which can be held in a #glong. + * + * This is the same as standard C `LONG_MIN`, which is available since C99 + * and should be preferred in new code. */ /** * G_MAXLONG: * * The maximum value which can be held in a #glong. + * + * This is the same as standard C `ULONG_MAX`, which is available since C99 + * and should be preferred in new code. */ /** * gulong: * - * Corresponds to the standard C unsigned long type. + * Equivalent to the standard C `unsigned long` type. + * * Values of this type can range from 0 to %G_MAXULONG. + * + * The standard C `unsigned long` type should usually be preferred in + * new code, but `gulong` can be used in contexts where a type name + * must be a single word, such as in the g_type_name() of %G_TYPE_ULONG + * or when generating a family of function names for multiple types + * using macros. */ /** * G_MAXULONG: * * The maximum value which can be held in a #gulong. + * + * This is the same as standard C `ULONG_MAX`, which is available since C99 + * and should be preferred in new code. */ /** * gint8: * - * A signed integer guaranteed to be 8 bits on all platforms. + * A signed integer guaranteed to be 8 bits on all platforms, + * similar to the standard C `int8_t`. + * + * The `int8_t` type should be preferred in new code, unless + * consistency with pre-existing APIs requires use of `gint8` + * (see #gsize for more details). + * * Values of this type can range from %G_MININT8 (= -128) to * %G_MAXINT8 (= 127). */ @@ -215,13 +304,22 @@ * * The maximum value which can be held in a #gint8. * + * This is the same as standard C `INT8_MAX`, which should be + * preferred in new code. + * * Since: 2.4 */ /** * guint8: * - * An unsigned integer guaranteed to be 8 bits on all platforms. + * An unsigned integer guaranteed to be 8 bits on all platforms, + * similar to the standard C `uint8_t`. + * + * The `uint8_t` type should be preferred in new code, unless + * consistency with pre-existing APIs requires use of `guint8` + * (see #gsize for more details). + * * Values of this type can range from 0 to %G_MAXUINT8 (= 255). */ @@ -230,13 +328,22 @@ * * The maximum value which can be held in a #guint8. * + * This is the same as standard C `UINT8_MAX`, which should be + * preferred in new code. + * * Since: 2.4 */ /** * gint16: * - * A signed integer guaranteed to be 16 bits on all platforms. + * A signed integer guaranteed to be 16 bits on all platforms, + * similar to the standard C `int16_t`. + * + * The `int16_t` type should be preferred in new code, unless + * consistency with pre-existing APIs requires use of `gint16` + * (see #gsize for more details). + * * Values of this type can range from %G_MININT16 (= -32,768) to * %G_MAXINT16 (= 32,767). * @@ -249,6 +356,9 @@ * * The maximum value which can be held in a #gint16. * + * This is the same as standard C `INT16_MAX`, which should be + * preferred in new code. + * * Since: 2.4 */ @@ -267,6 +377,10 @@ * g_print ("%#" G_GINT16_MODIFIER "x", value); * | * + * This is not necessarily the correct modifier for printing and scanning + * `int16_t` values, even though the in-memory representation is the same. + * Standard C macros like `PRId16` and `SCNd16` should be used for `int16_t`. + * * Since: 2.4 */ @@ -284,13 +398,23 @@ * sscanf ("42", "%" G_GINT16_FORMAT, &in) * out = in * 1000; * g_print ("%" G_GINT32_FORMAT, out); + * + * This is not necessarily the correct format for printing and scanning + * `int16_t` values, even though the in-memory representation is the same. + * Standard C macros like `PRId16` and `SCNd16` should be used for `int16_t`. * | */ /** * guint16: * - * An unsigned integer guaranteed to be 16 bits on all platforms. + * An unsigned integer guaranteed to be 16 bits on all platforms, + * similar to the standard C `uint16_t`. + * + * The `uint16_t` type should be preferred in new code, unless + * consistency with pre-existing APIs requires use of `guint16` + * (see #gsize for more details). + * * Values of this type can range from 0 to %G_MAXUINT16 (= 65,535). * * To print or scan values of this type, use @@ -302,6 +426,9 @@ * * The maximum value which can be held in a #guint16. * + * This is the same as standard C `UINT16_MAX`, which should be + * preferred in new code. + * * Since: 2.4 */ @@ -310,17 +437,34 @@ * * This is the platform dependent conversion specifier for scanning * and printing values of type #guint16. See also %G_GINT16_FORMAT + * + * This is not necessarily the correct modifier for printing and scanning + * `uint16_t` values, even though the in-memory representation is the same. + * Standard C macros like `PRIu16` and `SCNu16` should be used for `uint16_t`. */ /** * gint32: * * A signed integer guaranteed to be 32 bits on all platforms. + * + * The `int32_t` type should be preferred in new code, unless + * consistency with pre-existing APIs requires use of `gint16` + * (see #gsize for more details). + * * Values of this type can range from %G_MININT32 (= -2,147,483,648) * to %G_MAXINT32 (= 2,147,483,647). * * To print or scan values of this type, use * %G_GINT32_MODIFIER and/or %G_GINT32_FORMAT. + * + * Note that on platforms with more than one 32-bit standard integer type, + * `gint32` and `int32_t` are not necessarily implemented by the same + * 32-bit integer type. + * For example, on an ILP32 platform where `int` and `long` are both 32-bit, + * it might be the case that one of these types is `int` and the other + * is `long`. + * See #gsize for more details of what this implies. */ /** @@ -328,6 +472,9 @@ * * The maximum value which can be held in a #gint32. * + * This is the same as standard C `INT32_MAX`, which should be + * preferred in new code. + * * Since: 2.4 */ @@ -338,6 +485,10 @@ * for scanning and printing values of type #gint32 or #guint32. It * is a string literal. See also %G_GINT16_MODIFIER. * + * This is not necessarily the correct modifier for printing and scanning + * `int32_t` values, even though the in-memory representation is the same. + * Standard C macros like `PRId32` and `SCNd32` should be used for `int32_t`. + * * Since: 2.4 */ @@ -346,16 +497,31 @@ * * This is the platform dependent conversion specifier for scanning * and printing values of type #gint32. See also %G_GINT16_FORMAT. + * + * This is not necessarily the correct modifier for printing and scanning + * `int32_t` values, even though the in-memory representation is the same. + * Standard C macros like `PRId32` and `SCNd32` should be used for `int32_t`. */ /** * guint32: * - * An unsigned integer guaranteed to be 32 bits on all platforms. + * An unsigned integer guaranteed to be 32 bits on all platforms, + * similar to the standard C `uint32_t`. + * + * The `uint32_t` type should be preferred in new code, unless + * consistency with pre-existing APIs requires use of `guint32` + * (see #gsize for more details). + * * Values of this type can range from 0 to %G_MAXUINT32 (= 4,294,967,295). * * To print or scan values of this type, use * %G_GINT32_MODIFIER and/or %G_GUINT32_FORMAT. + * + * Note that on platforms with more than one 32-bit standard integer type, + * `guint32` and `uint32_t` are not necessarily implemented by the same + * 32-bit integer type. + * See #gsize for more details of what this implies. */ /** @@ -363,6 +529,9 @@ * * The maximum value which can be held in a #guint32. * + * This is the same as standard C `UINT32_MAX`, which should be + * preferred in new code. + * * Since: 2.4 */ @@ -371,18 +540,36 @@ * * This is the platform dependent conversion specifier for scanning * and printing values of type #guint32. See also %G_GINT16_FORMAT. + * + * This is not necessarily the correct modifier for printing and scanning + * `uint32_t` values, even though the in-memory representation is the same. + * Standard C macros like `PRIu32` and `SCNu32` should be used for `uint32_t`. */ /** * gint64: * - * A signed integer guaranteed to be 64 bits on all platforms. + * A signed integer guaranteed to be 64 bits on all platforms, + * similar to the standard C `int64_t`. + * + * The `int64_t` type should be preferred in new code, unless + * consistency with pre-existing APIs requires use of `gint64` + * (see #gsize for more details). + * * Values of this type can range from %G_MININT64 * (= -9,223,372,036,854,775,808) to %G_MAXINT64 * (= 9,223,372,036,854,775,807). * * To print or scan values of this type, use * %G_GINT64_MODIFIER and/or %G_GINT64_FORMAT. + * + * Note that on platforms with more than one 64-bit standard integer type, + * `gint64` and `int64_t` are not necessarily implemented by the same + * 64-bit integer type. + * For example, on a platform where both `long` and `long long` are 64-bit, + * it might be the case that one of those types is used for `gint64` + * and the other is used for `int64_t`. + * See #gsize for more details of what this implies. */ /** @@ -402,6 +589,10 @@ * though the types are supported. On such platforms %G_GINT64_MODIFIER * is not defined. * + * This is not necessarily the correct modifier for printing and scanning + * `int64_t` values, even though the in-memory representation is the same. + * Standard C macros like `PRId64` and `SCNd64` should be used for `int64_t`. + * * Since: 2.4 */ @@ -417,23 +608,41 @@ * if %G_GINT64_FORMAT is defined. Due to its weak error handling, scanf() * is not recommended for parsing anyway; consider using g_ascii_strtoull() * instead. + * + * This is not necessarily the correct format for printing and scanning + * `int64_t` values, even though the in-memory representation is the same. + * Standard C macros like `PRId64` and `SCNd64` should be used for `int64_t`. */ /** * guint64: * - * An unsigned integer guaranteed to be 64-bits on all platforms. + * An unsigned integer guaranteed to be 64-bits on all platforms, + * similar to the standard C `uint64_t` type. + * + * The `uint64_t` type should be preferred in new code, unless + * consistency with pre-existing APIs requires use of `guint64` + * (see #gsize for more details). + * * Values of this type can range from 0 to %G_MAXUINT64 * (= 18,446,744,073,709,551,615). * * To print or scan values of this type, use * %G_GINT64_MODIFIER and/or %G_GUINT64_FORMAT. + * + * Note that on platforms with more than one 64-bit standard integer type, + * `guint64` and `uint64_t` are not necessarily implemented by the same + * 64-bit integer type. + * See #gsize for more details of what this implies. */ /** * G_MAXUINT64: * * The maximum value which can be held in a #guint64. + * + * This is the same as standard C `UINT64_MAX`, which should be + * preferred in new code. */ /** @@ -448,6 +657,10 @@ * if %G_GINT64_FORMAT is defined. Due to its weak error handling, scanf() * is not recommended for parsing anyway; consider using g_ascii_strtoull() * instead. + * + * This is not necessarily the correct modifier for printing and scanning + * `uint64_t` values, even though the in-memory representation is the same. + * Standard C macros like `PRIu64` and `SCNu64` should be used for `uint64_t`. */ /** @@ -456,6 +669,9 @@ * * This macro is used to insert 64-bit integer literals * into the source code. + * + * It is similar to the standard C `INT64_C` macro, + * which should be preferred in new code. */ /** @@ -465,14 +681,19 @@ * This macro is used to insert 64-bit unsigned integer * literals into the source code. * + * It is similar to the standard C `UINT64_C` macro, + * which should be preferred in new code. + * * Since: 2.10 */ /** * gfloat: * - * Corresponds to the standard C float type. - * Values of this type can range from -%G_MAXFLOAT to %G_MAXFLOAT. + * Equivalent to the standard C `float` type. + * + * Values of this type can range from `-FLT_MAX` to `FLT_MAX`, + * or equivalently from -%G_MAXFLOAT to %G_MAXFLOAT. */ /** @@ -482,19 +703,27 @@ * * If you are interested in the smallest value which can be held * in a #gfloat, use -%G_MAXFLOAT. + * + * This is the same as standard C `FLT_MIN`, which is available since C99 + * and should be preferred in new code. */ /** * G_MAXFLOAT: * * The maximum value which can be held in a #gfloat. + * + * This is the same as standard C `FLT_MAX`, which is available since C99 + * and should be preferred in new code. */ /** * gdouble: * - * Corresponds to the standard C double type. - * Values of this type can range from -%G_MAXDOUBLE to %G_MAXDOUBLE. + * Equivalent to the standard C `double` type. + * + * Values of this type can range from `-DBL_MAX` to `DBL_MAX`, + * or equivalently from -%G_MAXDOUBLE to %G_MAXDOUBLE. */ /** @@ -504,26 +733,66 @@ * * If you are interested in the smallest value which can be held * in a #gdouble, use -%G_MAXDOUBLE. + * + * This is the same as standard C `DBL_MIN`, which is available since C99 + * and should be preferred in new code. */ /** * G_MAXDOUBLE: * * The maximum value which can be held in a #gdouble. + * + * This is the same as standard C `DBL_MAX`, which is available since C99 + * and should be preferred in new code. */ /** * gsize: * - * An unsigned integer type of the result of the sizeof operator, - * corresponding to the size_t type defined in C99. - * This type is wide enough to hold the numeric value of a pointer, - * so it is usually 32 bit wide on a 32-bit platform and 64 bit wide + * An unsigned integer type of the result of the `sizeof` operator, + * corresponding to the `size_t` type defined in C99. + * + * The standard `size_t` type should be preferred in new code, unless + * consistency with pre-existing APIs requires `gsize` + * (see below for more details). + * + * `gsize` is usually 32 bit wide on a 32-bit platform and 64 bit wide * on a 64-bit platform. Values of this type can range from 0 to * %G_MAXSIZE. * + * This type is wide enough to hold the size of the largest possible + * memory allocation, but is not guaranteed to be wide enough to hold + * the numeric value of a pointer: on platforms that use tagged pointers, + * such as CHERI(https://cheri-cpu.org/), pointers can be numerically + * larger than the size of the address space. + * If the numeric value of a pointer needs to be stored in an integer + * without information loss, use the standard C types `intptr_t` or + * `uintptr_t`, or the similar GLib types #gintptr or #guintptr. + * * To print or scan values of this type, use * %G_GSIZE_MODIFIER and/or %G_GSIZE_FORMAT. + * + * Note that on platforms where more than one standard integer type is + * the same size, `size_t` and `gsize` are always the same size but are + * not necessarily implemented by the same standard integer type. + * For example, on an ILP32 platform where `int`, `long` and pointers + * are all 32-bit, `size_t` might be `unsigned long` while `gsize` + * might be `unsigned int`. + * This can result in compiler warnings or unexpected C++ name-mangling + * if the two types are used inconsistently. + * + * As a result, changing a type from `gsize` to `size_t` in existing APIs + * might be an incompatible API or ABI change, especially if C++ + * is involved. The safe option is to leave existing APIs using the same type + * that they have historically used, and only use the standard C types in + * new APIs. + * + * Similar considerations apply to all the fixed-size types + * (#gint8, #guint8, #gint16, #guint16, #gint32, #guint32, #gint64, + * #guint64 and #goffset), as well as #gintptr and #guintptr. + * Types that are 32 bits or larger are particularly likely to be + * affected by this. */ /** @@ -531,6 +800,9 @@ * * The maximum value which can be held in a #gsize. * + * This is the same as standard C `SIZE_MAX` (available since C99), + * which should be preferred in new code. + * * Since: 2.4 */ @@ -541,6 +813,11 @@ * for scanning and printing values of type #gsize. It * is a string literal. * + * Note that this is not necessarily the correct modifier to scan or + * print a `size_t`, even though the in-memory representation is the + * same. The Standard C `"z"` modifier should be used for `size_t`, + * assuming a C99-compliant `printf` implementation is available. + * * Since: 2.6 */ @@ -550,6 +827,11 @@ * This is the platform dependent conversion specifier for scanning * and printing values of type #gsize. See also %G_GINT16_FORMAT. * + * Note that this is not necessarily the correct format to scan or + * print a `size_t`, even though the in-memory representation is the + * same. The standard C `"zu"` format should be used for `size_t`, + * assuming a C99-compliant `printf` implementation is available. + * * Since: 2.6 */ @@ -557,10 +839,23 @@ * gssize: * * A signed variant of #gsize, corresponding to the - * ssize_t defined on most platforms. + * `ssize_t` defined in POSIX or the similar `SSIZE_T` in Windows. + * + * In new platform-specific code, consider using `ssize_t` or `SSIZE_T` + * directly. + * * Values of this type can range from %G_MINSSIZE * to %G_MAXSSIZE. * + * Note that on platforms where `ssize_t` is implemented, `ssize_t` and + * `gssize` might be implemented by different standard integer types + * of the same size. Similarly, on Windows, `SSIZE_T` and `gssize` + * might be implemented by different standard integer types of the same + * size. See #gsize for more details. + * + * This type is also not guaranteed to be the same as standard C + * `ptrdiff_t`, although they are the same on many platforms. + * * To print or scan values of this type, use * %G_GSSIZE_MODIFIER and/or %G_GSSIZE_FORMAT. */ @@ -587,6 +882,11 @@ * This is the platform dependent conversion specifier for scanning * and printing values of type #gssize. See also %G_GINT16_FORMAT. * + * Note that this is not necessarily the correct format to scan or print + * a POSIX `ssize_t` or a Windows `SSIZE_T`, even though the in-memory + * representation is the same. + * On POSIX platforms, the `"zd"` format should be used for `ssize_t`. + * * Since: 2.6 */ @@ -597,6 +897,11 @@ * for scanning and printing values of type #gssize. It * is a string literal. * + * Note that this is not necessarily the correct modifier to scan or print + * a POSIX `ssize_t` or a Windows `SSIZE_T`, even though the in-memory + * representation is the same. + * On POSIX platforms, the `"z"` modifier should be used for `ssize_t`. + * * Since: 2.6 */ @@ -606,13 +911,18 @@ * A signed integer type that is used for file offsets, * corresponding to the POSIX type `off_t` as if compiling with * `_FILE_OFFSET_BITS` set to 64. #goffset is always 64 bits wide, even on - * 32-bit architectures. + * 32-bit architectures, and even if `off_t` is only 32 bits. * Values of this type can range from %G_MINOFFSET to * %G_MAXOFFSET. * * To print or scan values of this type, use * %G_GOFFSET_MODIFIER and/or %G_GOFFSET_FORMAT. * + * On platforms with more than one 64-bit standard integer type, + * even if `off_t` is also 64 bits in size, `goffset` and `off_t` are not + * necessarily implemented by the same 64-bit integer type. + * See #gsize for more details of what this implies. + * * Since: 2.14 */ @@ -635,6 +945,9 @@ * for scanning and printing values of type #goffset. It is a string * literal. See also %G_GINT64_MODIFIER. * + * This modifier should only be used with #goffset values, and not + * with `off_t`, which is not necessarily the same type or even the same size. + * * Since: 2.20 */ @@ -644,6 +957,9 @@ * This is the platform dependent conversion specifier for scanning * and printing values of type #goffset. See also %G_GINT64_FORMAT. * + * This format should only be used with #goffset values, and not + * with `off_t`, which is not necessarily the same type or even the same size. + * * Since: 2.20 */ @@ -665,6 +981,14 @@ * Corresponds to the C99 type intptr_t, * a signed integer type that can hold any pointer. * + * The standard `intptr_t` type should be preferred in new code, unless + * consistency with pre-existing APIs requires `gintptr`. + * Note that `intptr_t` and `gintptr` might be implemented by different + * standard integer types of the same size. See #gsize for more details. + * + * #gintptr is not guaranteed to be the same type or the same size as #gssize, + * even though they are the same on many CPU architectures. + * * To print or scan values of this type, use * %G_GINTPTR_MODIFIER and/or %G_GINTPTR_FORMAT. * @@ -678,6 +1002,12 @@ * for scanning and printing values of type #gintptr or #guintptr. * It is a string literal. * + * Note that this is not necessarily the correct modifier to scan or + * print an `intptr_t`, even though the in-memory representation is the + * same. + * Standard C macros like `PRIdPTR` and `SCNdPTR` should be used for + * `intptr_t`. + * * Since: 2.22 */ @@ -687,6 +1017,12 @@ * This is the platform dependent conversion specifier for scanning * and printing values of type #gintptr. * + * Note that this is not necessarily the correct format to scan or + * print an `intptr_t`, even though the in-memory representation is the + * same. + * Standard C macros like `PRIdPTR` and `SCNdPTR` should be used for + * `intptr_t`. + * * Since: 2.22 */ @@ -696,6 +1032,14 @@ * Corresponds to the C99 type uintptr_t, * an unsigned integer type that can hold any pointer. * + * The standard `uintptr_t` type should be preferred in new code, unless + * consistency with pre-existing APIs requires `guintptr`. + * Note that `uintptr_t` and `guintptr` might be implemented by different + * standard integer types of the same size. See #gsize for more details. + * + * #guintptr is not guaranteed to be the same type or the same size as #gsize, + * even though they are the same on many CPU architectures. + * * To print or scan values of this type, use * %G_GINTPTR_MODIFIER and/or %G_GUINTPTR_FORMAT. * @@ -708,6 +1052,12 @@ * This is the platform dependent conversion specifier * for scanning and printing values of type #guintptr. * + * Note that this is not necessarily the correct format to scan or + * print a `uintptr_t`, even though the in-memory representation is the + * same. + * Standard C macros like `PRIuPTR` and `SCNuPTR` should be used for + * `uintptr_t`. + * * Since: 2.22 */ @@ -1659,6 +2009,19 @@ * * This macro is defined only on UNIX. So you can bracket * UNIX-specific code in "\#ifdef G_OS_UNIX". + * + * To detect whether to compile features that require a specific kernel + * or operating system, check for the appropriate OS-specific predefined + * macros instead, for example: + * + * - Linux kernel (any libc, including glibc, musl or Android): `\#ifdef __linux__` + * - Linux kernel and GNU user-space: `\#if defined(__linux__) && defined(__GLIBC__)` + * - FreeBSD kernel (any libc, including glibc): `\#ifdef __FreeBSD_kernel__` + * - FreeBSD kernel and user-space: `\#ifdef __FreeBSD__` + * - Apple operating systems (macOS, iOS, tvOS), regardless of whether + * Cocoa/Carbon toolkits are available: `\#ifdef __APPLE__` + * + * See <https://sourceforge.net/p/predef/wiki/OperatingSystems/> for more. */ /** @@ -1818,7 +2181,12 @@ * * Returns the offset, in bytes, of a member of a struct. * - * Returns: the offset of @member from the start of @struct_type + * Consider using standard C `offsetof()`, available since at least C89 + * and C++98, in new code (but note that `offsetof()` returns a `size_t` + * rather than a `long`). + * + * Returns: the offset of @member from the start of @struct_type, + * as a value of type #glong. */ /** @@ -1885,6 +2253,9 @@ * * Each invocation of `G_VA_COPY (ap1, ap2)` must be matched with a * corresponding `va_end (ap1)` call in the same function. + * + * This is equivalent to standard C `va_copy()`, available since C99 + * and C++11, which should be preferred in new code. */ /** @@ -2157,6 +2528,87 @@ */ /** + * G_C_STD_VERSION: + * + * The C standard version the code is compiling against, it's normally + * defined with the same value of `__STDC_VERSION__` for C standard + * compatible compilers, while it uses the lowest standard version + * in pure MSVC, given that in such compiler the definition depends on + * a compilation flag. + * + * This is granted to be undefined when compiling with a C++ compiler. + * + * See also: %G_C_STD_CHECK_VERSION and %G_CXX_STD_VERSION + * + * Since: 2.76 + */ + +/** + * G_C_STD_CHECK_VERSION: + * @version: The C version to be checked for compatibility + * + * Macro to check if the current compiler supports a specified @version + * of the C standard. Such value must be numeric and can be provided both + * in the short form for the well-known versions (e.g. `90`, `99`...) or in + * the complete form otherwise (e.g. `199000L`, `199901L`, `205503L`...). + * + * When a C++ compiler is used, the macro is defined and returns always %FALSE. + * + * This value is compared against %G_C_STD_VERSION. + * + * |<!-- language="C" --> + * #if G_C_STD_CHECK_VERSION(17) + * #endif + * | + * + * See also: %G_CXX_STD_CHECK_VERSION + * + * Returns: %TRUE if @version is supported by the compiler, %FALSE otherwise + * + * Since: 2.76 + */ + +/** + * G_CXX_STD_VERSION: + * + * The C++ standard version the code is compiling against, it's defined + * with the same value of `__cplusplus` for C++ standard compatible + * compilers, while it uses `_MSVC_LANG` in MSVC, given that the + * standard definition depends on a compilation flag in such compiler. + * + * This is granted to be undefined when not compiling with a C++ compiler. + * + * See also: %G_CXX_STD_CHECK_VERSION and %G_C_STD_VERSION + * + * Since: 2.76 + */ + +/** + * G_CXX_STD_CHECK_VERSION: + * @version: The C++ version to be checked for compatibility + * + * Macro to check if the current compiler supports a specified @version + * of the C++ standard. Such value must be numeric and can be provided both + * in the short form for the well-known versions (e.g. `11`, `17`...) or in + * the complete form otherwise (e.g. `201103L`, `201703L`, `205503L`...). + * + * When a C compiler is used, the macro is defined and returns always %FALSE. + * + * This value is compared against %G_CXX_STD_VERSION. + * + * |<!-- language="C" --> + * #if G_CXX_STD_CHECK_VERSION(20) + * #endif + * | + * + * See also: %G_C_STD_CHECK_VERSION + * + * Returns: %TRUE if @version is supported by the compiler, %FALSE otherwise + * + * Since: 2.76 + */ + +/** * G_LIKELY: * @expr: the expression * @@ -2567,11 +3019,18 @@ * } * | * - * g_print(), g_printerr() and g_set_print_handler() are intended to be used for + * g_print() and g_printerr() are intended to be used for * output from command line applications, since they output to standard output * and standard error by default — whereas functions like g_message() and * g_log() may be redirected to special purpose message windows, files, or the * system journal. + * + * If the console encoding is not UTF-8 (as specified by g_get_console_charset()) + * then these functions convert the message first. Any Unicode + * characters not defined by that charset are replaced by `'?'`. On Linux, + * setlocale() must be called early in main() to load the encoding. This behaviour + * can be changed by providing custom handlers to g_set_print_handler(), + * g_set_printerr_handler() and g_log_set_handler(). */ /* Windows Compatibility Functions {{{1 */
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/garray.c -> _service:tar_scm:glib-2.76.4.tar.xz/glib/garray.c
Changed
@@ -35,6 +35,7 @@ #include "garray.h" +#include "galloca.h" #include "gbytes.h" #include "ghash.h" #include "gslice.h" @@ -191,6 +192,119 @@ } /** + * g_array_new_take: (skip) + * @data: (array length=len) (transfer full) (nullable): an array of + * elements of @element_size, or %NULL for an empty array + * @len: the number of elements in @data + * @clear: %TRUE if #GArray elements should be automatically cleared + * to 0 when they are allocated + * @element_size: the size of each element in bytes + * + * Creates a new #GArray with @data as array data, @len as length and a + * reference count of 1. + * + * This avoids having to copy the data manually, when it can just be + * inherited. @data will eventually be freed using g_free(), so must + * have been allocated with a suitable allocator. + * + * In case the elements need to be cleared when the array is freed, use + * g_array_set_clear_func() to set a #GDestroyNotify function to perform + * such task. + * + * Do not use it if @len or @element_size are greater than %G_MAXUINT. + * #GArray stores the length of its data in #guint, which may be shorter + * than #gsize. + * + * Returns: (transfer full): A new #GArray + * + * Since: 2.76 + */ +GArray * +g_array_new_take (gpointer data, + gsize len, + gboolean clear, + gsize element_size) +{ + GRealArray *rarray; + GArray *array; + + g_return_val_if_fail (data != NULL || len == 0, NULL); + g_return_val_if_fail (len <= G_MAXUINT, NULL); + g_return_val_if_fail (element_size <= G_MAXUINT, NULL); + + array = g_array_sized_new (FALSE, clear, element_size, 0); + rarray = (GRealArray *) array; + rarray->data = (guint8 *) g_steal_pointer (&data); + rarray->len = len; + rarray->elt_capacity = len; + + return array; +} + +/** + * g_array_new_take_zero_terminated: (skip) + * @data: (array zero-terminated=1): an array of elements of @element_size + * @clear: %TRUE if #GArray elements should be automatically cleared + * to 0 when they are allocated + * @element_size: the size of each element in bytes + * + * Creates a new #GArray with @data as array data, computing the length of it + * and setting the reference count to 1. + * + * This avoids having to copy the data manually, when it can just be + * inherited. @data will eventually be freed using g_free(), so must + * have been allocated with a suitable allocator. + * + * The length is calculated by iterating through @data until the first %NULL + * element is found. + * + * In case the elements need to be cleared when the array is freed, use + * g_array_set_clear_func() to set a #GDestroyNotify function to perform + * such task. + * + * Do not use it if @data length or @element_size are greater than %G_MAXUINT. + * #GArray stores the length of its data in #guint, which may be shorter + * than #gsize. + * + * Returns: (transfer full): A new #GArray + * + * Since: 2.76 + */ +GArray * +g_array_new_take_zero_terminated (gpointer data, + gboolean clear, + gsize element_size) +{ + GArray *array; + gsize len = 0; + + g_return_val_if_fail (element_size <= G_MAXUINT, NULL); + + if (data != NULL) + { + guint8 *array_data = data; + + for (gsize i = 0; ; ++i) + { + const guint8 *element_start = array_data + (i * element_size); + + if (*element_start == 0 && + memcmp (element_start, element_start + 1, element_size - 1) == 0) + break; + + len += 1; + } + } + + g_return_val_if_fail (len <= G_MAXUINT, NULL); + + array = g_array_new_take (data, len, clear, element_size); + ((GRealArray *)array)->zero_terminated = TRUE; + + return array; +} + +/** * g_array_steal: * @array: a #GArray. * @len: (optional) (out): pointer to retrieve the number of @@ -285,7 +399,8 @@ if (array->zero_terminated || reserved_size != 0) { g_array_maybe_expand (array, reserved_size); - g_array_zero_terminate(array); + g_assert (array->data != NULL); + g_array_zero_terminate (array); } return (GArray*) array; @@ -911,7 +1026,7 @@ * * This example defines a comparison function and search an element in a #GArray: * |<!-- language="C" --> - * static gint* + * static gint * cmpint (gconstpointer a, gconstpointer b) * { * const gint *_a = a; @@ -1071,7 +1186,7 @@ guint len; guint alloc; gatomicrefcount ref_count; - guint8 null_terminated; /* always either 0 or 1, so it can be added to array lengths */ + guint8 null_terminated : 1; /* always either 0 or 1, so it can be added to array lengths */ GDestroyNotify element_free_func; }; @@ -1120,7 +1235,10 @@ if (G_LIKELY (reserved_size < G_MAXUINT) && null_terminated) reserved_size++; + g_ptr_array_maybe_expand (array, reserved_size); + g_assert (array->pdata != NULL); + if (null_terminated) { /* don't use ptr_array_maybe_null_terminate(). It helps the compiler @@ -1147,6 +1265,231 @@ } /** + * g_ptr_array_new_take: (skip) + * @data: (array length=len) (transfer full) (nullable): an array of pointers, + * or %NULL for an empty array + * @len: the number of pointers in @data + * @element_free_func: (nullable): A function to free elements on @array + * destruction or %NULL + * + * Creates a new #GPtrArray with @data as pointers, @len as length and a + * reference count of 1. + * + * This avoids having to copy such data manually. @data will eventually be + * freed using g_free(), so must have been allocated with a suitable allocator. + * + * It also sets @element_free_func for freeing each element when the array is + * destroyed either via g_ptr_array_unref(), when g_ptr_array_free() is called + * with @free_segment set to %TRUE or when removing elements. + * + * Do not use it if @len is greater than %G_MAXUINT. #GPtrArray + * stores the length of its data in #guint, which may be shorter than + * #gsize. + * + * Returns: (transfer full): A new #GPtrArray + * + * Since: 2.76 + */ +GPtrArray * +g_ptr_array_new_take (gpointer *data, + gsize len, + GDestroyNotify element_free_func) +{ + GPtrArray *array; + GRealPtrArray *rarray; + + g_return_val_if_fail (data != NULL || len == 0, NULL); + g_return_val_if_fail (len <= G_MAXUINT, NULL); + + array = ptr_array_new (0, element_free_func, FALSE); + rarray = (GRealPtrArray *)array; + + rarray->pdata = g_steal_pointer (&data); + rarray->len = len; + rarray->alloc = len; + + return array; +} + +/** + * g_ptr_array_new_take_null_terminated: (skip) + * @data: (array zero-terminated=1) (transfer full) (nullable): an array + * of pointers, %NULL terminated, or %NULL for an empty array + * @element_free_func: (nullable): a function to free elements on @array + * destruction or %NULL + * + * Creates a new #GPtrArray with @data as pointers, computing the length of it + * and setting the reference count to 1. + * + * This avoids having to copy such data manually. @data will eventually be + * freed using g_free(), so must have been allocated with a suitable allocator. + * + * The length is calculated by iterating through @data until the first %NULL + * element is found. + * + * It also sets @element_free_func for freeing each element when the array is + * destroyed either via g_ptr_array_unref(), when g_ptr_array_free() is called + * with @free_segment set to %TRUE or when removing elements. + * + * Do not use it if the @data length is greater than %G_MAXUINT. #GPtrArray + * stores the length of its data in #guint, which may be shorter than + * #gsize. + * + * Returns: (transfer full): A new #GPtrArray + * + * Since: 2.76 + */ +GPtrArray * +g_ptr_array_new_take_null_terminated (gpointer *data, + GDestroyNotify element_free_func) +{ + GPtrArray *array; + gsize len = 0; + + if (data != NULL) + { + for (gsize i = 0; datai != NULL; ++i) + len += 1; + } + + g_return_val_if_fail (len <= G_MAXUINT, NULL); + + array = g_ptr_array_new_take (g_steal_pointer (&data), len, element_free_func); + ((GRealPtrArray *)array)->null_terminated = TRUE; + + return array; +} + +static GPtrArray * +ptr_array_new_from_array (gpointer *data, + gsize len, + GCopyFunc copy_func, + gpointer copy_func_user_data, + GDestroyNotify element_free_func, + gboolean null_terminated) +{ + GPtrArray *array; + GRealPtrArray *rarray; + + g_assert (data != NULL || len == 0); + g_assert (len <= G_MAXUINT); + + array = ptr_array_new (len, element_free_func, null_terminated); + rarray = (GRealPtrArray *)array; + + if (copy_func != NULL) + { + for (gsize i = 0; i < len; i++) + rarray->pdatai = copy_func (datai, copy_func_user_data); + } + else if (len != 0) + { + memcpy (rarray->pdata, data, len * sizeof (gpointer)); + } + + if (null_terminated && rarray->pdata != NULL) + rarray->pdatalen = NULL; + + rarray->len = len; + + return array; +} + +/** + * g_ptr_array_new_from_array: (skip) + * @data: (array length=len) (transfer none) (nullable): an array of pointers, + * or %NULL for an empty array + * @len: the number of pointers in @data + * @copy_func: (nullable): a copy function used to copy every element in the + * array or %NULL. + * @copy_func_user_data: user data passed to @copy_func, or %NULL + * @element_free_func: (nullable): a function to free elements on @array + * destruction or %NULL + * + * Creates a new #GPtrArray, copying @len pointers from @data, and setting + * the array’s reference count to 1. + * + * This avoids having to manually add each element one by one. + * + * If @copy_func is provided, then it is used to copy each element before + * adding them to the new array. If it is %NULL then the pointers are copied + * directly. + * + * It also sets @element_free_func for freeing each element when the array is + * destroyed either via g_ptr_array_unref(), when g_ptr_array_free() is called + * with @free_segment set to %TRUE or when removing elements. + * + * Do not use it if @len is greater than %G_MAXUINT. #GPtrArray + * stores the length of its data in #guint, which may be shorter than + * #gsize. + * + * Returns: (transfer full): A new #GPtrArray + * + * Since: 2.76 + */ +GPtrArray * +g_ptr_array_new_from_array (gpointer *data, + gsize len, + GCopyFunc copy_func, + gpointer copy_func_user_data, + GDestroyNotify element_free_func) +{ + g_return_val_if_fail (data != NULL || len == 0, NULL); + g_return_val_if_fail (len <= G_MAXUINT, NULL); + + return ptr_array_new_from_array ( + data, len, copy_func, copy_func_user_data, element_free_func, FALSE); +} + +/** + * g_ptr_array_new_from_null_terminated_array: (skip) + * @data: (array zero-terminated=1) (transfer none) (nullable): an array of + * pointers, %NULL terminated; or %NULL for an empty array + * @copy_func: (nullable): a copy function used to copy every element in the + * array or %NULL. + * @copy_func_user_data: user data passed to @copy_func, or %NULL + * @element_free_func: (nullable): a function to free elements on @array + * destruction or %NULL + * + * Creates a new #GPtrArray copying the pointers from @data after having + * computed the length of it and with a reference count of 1. + * This avoids having to manually add each element one by one. + * If @copy_func is provided, then it is used to copy the data in the new + * array. + * It also set @element_free_func for freeing each element when the array is + * destroyed either via g_ptr_array_unref(), when g_ptr_array_free() is called + * with @free_segment set to %TRUE or when removing elements. + * + * Do not use it if the @data has more than %G_MAXUINT elements. #GPtrArray + * stores the length of its data in #guint, which may be shorter than + * #gsize. + * + * Returns: (transfer full): A new #GPtrArray + * + * Since: 2.76 + */ +GPtrArray * +g_ptr_array_new_from_null_terminated_array (gpointer *data, + GCopyFunc copy_func, + gpointer copy_func_user_data, + GDestroyNotify element_free_func) +{ + gsize len = 0; + + if (data != NULL) + { + for (gsize i = 0; datai != NULL; ++i) + len += 1; + } + + g_assert (data != NULL || len == 0); + g_return_val_if_fail (len <= G_MAXUINT, NULL); + + return ptr_array_new_from_array ( + data, len, copy_func, copy_func_user_data, element_free_func, TRUE); +} + +/** * g_ptr_array_steal: * @array: a #GPtrArray. * @len: (optional) (out): pointer to retrieve the number of @@ -2109,12 +2452,15 @@ * * Sorts the array, using @compare_func which should be a qsort()-style * comparison function (returns less than zero for first arg is less - * than second arg, zero for equal, greater than zero if irst arg is + * than second arg, zero for equal, greater than zero if first arg is * greater than second arg). * * Note that the comparison function for g_ptr_array_sort() doesn't * take the pointers from the array as arguments, it takes pointers to - * the pointers in the array. Here is a full example of usage: + * the pointers in the array. + * + * Use g_ptr_array_sort_with_data() if you want to use normal + * #GCompareFuncs, otherwise here is a full example of use: * * |<!-- language="C" --> * typedef struct @@ -2171,7 +2517,10 @@ * * Note that the comparison function for g_ptr_array_sort_with_data() * doesn't take the pointers from the array as arguments, it takes - * pointers to the pointers in the array. Here is a full example of use: + * pointers to the pointers in the array. + * + * Use g_ptr_array_sort_with_data() if you want to use normal + * #GCompareDataFuncs, otherwise here is a full example of use: * * |<!-- language="C" --> * typedef enum { SORT_NAME, SORT_SIZE } SortMode; @@ -2235,6 +2584,80 @@ user_data); } +static inline gint +compare_ptr_array_values (gconstpointer a, gconstpointer b, gpointer user_data) +{ + gconstpointer aa = *((gconstpointer *) a); + gconstpointer bb = *((gconstpointer *) b); + GCompareFunc compare_func = user_data; + + return compare_func (aa, bb); +} + +/** + * g_ptr_array_sort_values: + * @array: a #GPtrArray + * @compare_func: a #GCompareFunc comparison function + * + * Sorts the array, using @compare_func which should be a qsort()-style + * comparison function (returns less than zero for first arg is less + * than second arg, zero for equal, greater than zero if first arg is + * greater than second arg). + * + * This is guaranteed to be a stable sort. + * + * Since: 2.76 + */ +void +g_ptr_array_sort_values (GPtrArray *array, + GCompareFunc compare_func) +{ + g_ptr_array_sort_with_data (array, compare_ptr_array_values, compare_func); +} + +typedef struct +{ + GCompareDataFunc compare_func; + gpointer user_data; +} GPtrArraySortValuesData; + +static inline gint +compare_ptr_array_values_with_data (gconstpointer a, + gconstpointer b, + gpointer user_data) +{ + gconstpointer aa = *((gconstpointer *) a); + gconstpointer bb = *((gconstpointer *) b); + GPtrArraySortValuesData *data = user_data; + + return data->compare_func (aa, bb, data->user_data); +} + +/** + * g_ptr_array_sort_values_with_data: + * @array: a #GPtrArray + * @compare_func: a #GCompareDataFunc comparison function + * @user_data: data to pass to @compare_func + * + * Like g_ptr_array_sort_values(), but the comparison function has an extra + * user data argument. + * + * This is guaranteed to be a stable sort. + * + * Since: 2.76 + */ +void +g_ptr_array_sort_values_with_data (GPtrArray *array, + GCompareDataFunc compare_func, + gpointer user_data) +{ + g_ptr_array_sort_with_data (array, compare_ptr_array_values_with_data, + &(GPtrArraySortValuesData){ + .compare_func = compare_func, + .user_data = user_data, + }); +} + /** * g_ptr_array_foreach: * @array: a #GPtrArray
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/garray.h -> _service:tar_scm:glib-2.76.4.tar.xz/glib/garray.h
Changed
@@ -72,6 +72,15 @@ GArray* g_array_new (gboolean zero_terminated, gboolean clear_, guint element_size); +GLIB_AVAILABLE_IN_2_76 +GArray* g_array_new_take (gpointer data, + gsize len, + gboolean clear, + gsize element_size); +GLIB_AVAILABLE_IN_2_76 +GArray* g_array_new_take_zero_terminated (gpointer data, + gboolean clear, + gsize element_size); GLIB_AVAILABLE_IN_2_64 gpointer g_array_steal (GArray *array, gsize *len); @@ -142,6 +151,16 @@ GPtrArray* g_ptr_array_new (void); GLIB_AVAILABLE_IN_ALL GPtrArray* g_ptr_array_new_with_free_func (GDestroyNotify element_free_func); +GLIB_AVAILABLE_IN_2_76 +GPtrArray* g_ptr_array_new_take (gpointer *data, + gsize len, + GDestroyNotify element_free_func); +GLIB_AVAILABLE_IN_2_76 +GPtrArray* g_ptr_array_new_from_array (gpointer *data, + gsize len, + GCopyFunc copy_func, + gpointer copy_func_user_data, + GDestroyNotify element_free_func); GLIB_AVAILABLE_IN_2_64 gpointer* g_ptr_array_steal (GPtrArray *array, gsize *len); @@ -158,6 +177,14 @@ GPtrArray* g_ptr_array_new_null_terminated (guint reserved_size, GDestroyNotify element_free_func, gboolean null_terminated); +GLIB_AVAILABLE_IN_2_76 +GPtrArray* g_ptr_array_new_take_null_terminated (gpointer *data, + GDestroyNotify element_free_func); +GLIB_AVAILABLE_IN_2_76 +GPtrArray* g_ptr_array_new_from_null_terminated_array (gpointer *data, + GCopyFunc copy_func, + gpointer copy_func_user_data, + GDestroyNotify element_free_func); GLIB_AVAILABLE_IN_ALL gpointer* g_ptr_array_free (GPtrArray *array, gboolean free_seg); @@ -215,6 +242,13 @@ void g_ptr_array_sort_with_data (GPtrArray *array, GCompareDataFunc compare_func, gpointer user_data); +GLIB_AVAILABLE_IN_2_76 +void g_ptr_array_sort_values (GPtrArray *array, + GCompareFunc compare_func); +GLIB_AVAILABLE_IN_2_76 +void g_ptr_array_sort_values_with_data (GPtrArray *array, + GCompareDataFunc compare_func, + gpointer user_data); GLIB_AVAILABLE_IN_ALL void g_ptr_array_foreach (GPtrArray *array, GFunc func,
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/gatomic.h -> _service:tar_scm:glib-2.76.4.tar.xz/glib/gatomic.h
Changed
@@ -170,7 +170,7 @@ (void) (0 ? *(atomic) ^ *(atomic) : 1); \ __atomic_fetch_sub ((atomic), 1, __ATOMIC_SEQ_CST) == 1; \ })) -#if defined(glib_typeof) && defined(__cplusplus) +#if defined(glib_typeof) && defined(G_CXX_STD_VERSION) /* See comments below about equivalent g_atomic_pointer_compare_and_exchange() * shenanigans for type-safety when compiling in C++ mode. */ #define g_atomic_int_compare_and_exchange(atomic, oldval, newval) \ @@ -180,7 +180,7 @@ (void) (0 ? *(atomic) ^ (newval) ^ (oldval) : 1); \ __atomic_compare_exchange_n ((atomic), &gaicae_oldval, (newval), FALSE, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST) ? TRUE : FALSE; \ })) -#else /* if !(defined(glib_typeof) && defined(__cplusplus)) */ +#else /* if !(defined(glib_typeof) && defined(G_CXX_STD_VERSION)) */ #define g_atomic_int_compare_and_exchange(atomic, oldval, newval) \ (G_GNUC_EXTENSION ({ \ gint gaicae_oldval = (oldval); \ @@ -230,7 +230,7 @@ (guint) __atomic_fetch_xor ((atomic), (val), __ATOMIC_SEQ_CST); \ })) -#if defined(glib_typeof) && defined(__cplusplus) +#if defined(glib_typeof) && defined(G_CXX_STD_VERSION) /* This is typesafe because we check we can assign oldval to the type of * (*atomic). Unfortunately it can only be done in C++ because gcc/clang warn * when atomic is volatile and not oldval, or when atomic is gsize* and oldval @@ -241,13 +241,14 @@ * https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1715#note_1024120. */ #define g_atomic_pointer_compare_and_exchange(atomic, oldval, newval) \ (G_GNUC_EXTENSION ({ \ - G_STATIC_ASSERT (sizeof (oldval) == sizeof (gpointer)); \ + G_STATIC_ASSERT (sizeof (static_cast<glib_typeof (*(atomic))>((oldval))) \ + == sizeof (gpointer)); \ glib_typeof (*(atomic)) gapcae_oldval = (oldval); \ G_STATIC_ASSERT (sizeof *(atomic) == sizeof (gpointer)); \ (void) (0 ? (gpointer) *(atomic) : NULL); \ __atomic_compare_exchange_n ((atomic), &gapcae_oldval, (newval), FALSE, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST) ? TRUE : FALSE; \ })) -#else /* if !(defined(glib_typeof) && defined(__cplusplus) */ +#else /* if !(defined(glib_typeof) && defined(G_CXX_STD_VERSION) */ #define g_atomic_pointer_compare_and_exchange(atomic, oldval, newval) \ (G_GNUC_EXTENSION ({ \ G_STATIC_ASSERT (sizeof (oldval) == sizeof (gpointer)); \
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/gbacktrace.c -> _service:tar_scm:glib-2.76.4.tar.xz/glib/gbacktrace.c
Changed
@@ -45,6 +45,7 @@ #include <time.h> #ifdef G_OS_UNIX +#include "glib-unixprivate.h" #include <errno.h> #include <unistd.h> #include <sys/wait.h> @@ -397,7 +398,8 @@ stack_trace_done = FALSE; signal (SIGCHLD, stack_trace_sigchld); - if ((pipe (in_fd) == -1) || (pipe (out_fd) == -1)) + if (!g_unix_open_pipe_internal (in_fd, TRUE) || + !g_unix_open_pipe_internal (out_fd, TRUE)) { perror ("unable to open pipe"); _exit (0);
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/gbookmarkfile.c -> _service:tar_scm:glib-2.76.4.tar.xz/glib/gbookmarkfile.c
Changed
@@ -287,6 +287,24 @@ g_slice_free (BookmarkAppInfo, app_info); } +static BookmarkAppInfo * +bookmark_app_info_copy (BookmarkAppInfo *app_info) +{ + BookmarkAppInfo *copy; + + if (!app_info) + return NULL; + + copy = bookmark_app_info_new (app_info->name); + copy->count = app_info->count; + copy->exec = g_strdup (app_info->exec); + + if (app_info->stamp) + copy->stamp = g_date_time_ref (app_info->stamp); + + return copy; +} + static gchar * bookmark_app_info_dump (BookmarkAppInfo *app_info) { @@ -300,14 +318,27 @@ name = g_markup_escape_text (app_info->name, -1); exec = g_markup_escape_text (app_info->exec, -1); - modified = g_date_time_format_iso8601 (app_info->stamp); count = g_strdup_printf ("%u", app_info->count); + if (app_info->stamp) + { + char *tmp; + + tmp = g_date_time_format_iso8601 (app_info->stamp); + modified = g_strconcat (" " BOOKMARK_MODIFIED_ATTRIBUTE "=\"", tmp, "\"", + NULL); + g_free (tmp); + } + else + { + modified = g_strdup (""); + } + retval = g_strconcat (" " "<" BOOKMARK_NAMESPACE_NAME ":" BOOKMARK_APPLICATION_ELEMENT " " BOOKMARK_NAME_ATTRIBUTE "=\"", name, "\"" - " " BOOKMARK_EXEC_ATTRIBUTE "=\"", exec, "\"" - " " BOOKMARK_MODIFIED_ATTRIBUTE "=\"", modified, "\"" + " " BOOKMARK_EXEC_ATTRIBUTE "=\"", exec, "\"", + modified, " " BOOKMARK_COUNT_ATTRIBUTE "=\"", count, "\"/>\n", NULL); @@ -369,6 +400,37 @@ g_slice_free (BookmarkMetadata, metadata); } +static BookmarkMetadata * +bookmark_metadata_copy (BookmarkMetadata *metadata) +{ + BookmarkMetadata *copy; + GList *l; + + if (!metadata) + return NULL; + + copy = bookmark_metadata_new (); + copy->is_private = metadata->is_private; + copy->mime_type = g_strdup (metadata->mime_type); + copy->icon_href = g_strdup (metadata->icon_href); + copy->icon_mime = g_strdup (metadata->icon_mime); + + copy->groups = g_list_copy_deep (metadata->groups, (GCopyFunc) g_strdup, NULL); + copy->applications = + g_list_copy_deep (metadata->applications, (GCopyFunc) bookmark_app_info_copy, NULL); + + for (l = copy->applications; l; l = l->next) + { + BookmarkAppInfo *app_info = l->data; + g_hash_table_insert (copy->apps_by_name, app_info->name, app_info); + } + + g_assert (g_hash_table_size (copy->apps_by_name) == + g_hash_table_size (metadata->apps_by_name)); + + return copy; +} + static gchar * bookmark_metadata_dump (BookmarkMetadata *metadata) { @@ -543,6 +605,31 @@ g_slice_free (BookmarkItem, item); } +static BookmarkItem * +bookmark_item_copy (BookmarkItem *item) +{ + BookmarkItem* copy; + + if (!item) + return NULL; + + copy = bookmark_item_new (item->uri); + + copy->title = g_strdup (item->title); + copy->description = g_strdup (item->description); + + copy->metadata = bookmark_metadata_copy (item->metadata); + + if (item->added) + copy->added = g_date_time_ref (item->added); + if (item->modified) + copy->modified = g_date_time_ref (item->modified); + if (item->visited) + copy->visited = g_date_time_ref (item->visited); + + return copy; +} + static void bookmark_item_touch_modified (BookmarkItem *item) { @@ -696,12 +783,7 @@ g_list_free_full (bookmark->items, (GDestroyNotify) bookmark_item_free); bookmark->items = NULL; - if (bookmark->items_by_uri) - { - g_hash_table_destroy (bookmark->items_by_uri); - - bookmark->items_by_uri = NULL; - } + g_clear_pointer (&bookmark->items_by_uri, g_hash_table_unref); } struct _ParseData @@ -1672,6 +1754,42 @@ } /** + * g_bookmark_file_copy: + * @bookmark: A #GBookmarkFile + * + * Deeply copies a @bookmark #GBookmarkFile object to a new one. + * + * Returns: (transfer full): the copy of @bookmark. Use + * g_bookmark_free() when finished using it. + * + * Since: 2.76 + */ +GBookmarkFile * +g_bookmark_file_copy (GBookmarkFile *bookmark) +{ + GBookmarkFile *copy; + GList *l; + + g_return_val_if_fail (bookmark != NULL, NULL); + + copy = g_bookmark_file_new (); + copy->title = g_strdup (bookmark->title); + copy->description = g_strdup (bookmark->description); + copy->items = g_list_copy_deep (bookmark->items, (GCopyFunc) bookmark_item_copy, NULL); + + for (l = copy->items; l; l = l->next) + { + BookmarkItem *item = l->data; + g_hash_table_insert (copy->items_by_uri, item->uri, item); + } + + g_assert (g_hash_table_size (copy->items_by_uri) == + g_hash_table_size (bookmark->items_by_uri)); + + return copy; +} + +/** * g_bookmark_file_free: * @bookmark: a #GBookmarkFile *
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/gbookmarkfile.h -> _service:tar_scm:glib-2.76.4.tar.xz/glib/gbookmarkfile.h
Changed
@@ -84,6 +84,9 @@ GLIB_AVAILABLE_IN_ALL void g_bookmark_file_free (GBookmarkFile *bookmark); +GLIB_AVAILABLE_IN_2_76 +GBookmarkFile *g_bookmark_file_copy (GBookmarkFile *bookmark); + GLIB_AVAILABLE_IN_ALL gboolean g_bookmark_file_load_from_file (GBookmarkFile *bookmark, const gchar *filename,
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/gcharset.c -> _service:tar_scm:glib-2.76.4.tar.xz/glib/gcharset.c
Changed
@@ -188,7 +188,8 @@ * * On Linux, the character set is found by consulting nl_langinfo() if * available. If not, the environment variables `LC_ALL`, `LC_CTYPE`, `LANG` - * and `CHARSET` are queried in order. + * and `CHARSET` are queried in order. nl_langinfo() returns the C locale if + * no locale has been loaded by setlocale(). * * The return value is %TRUE if the locale's encoding is UTF-8, in that * case you can perhaps avoid calling g_convert(). @@ -445,7 +446,7 @@ FILE *fp; char buf256; - fp = fopen (file,"r"); + fp = fopen (file, "re"); if (!fp) return; while (fgets (buf, 256, fp))
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/gdatetime.c -> _service:tar_scm:glib-2.76.4.tar.xz/glib/gdatetime.c
Changed
@@ -3340,103 +3340,103 @@ * Creates a newly allocated string representing the requested @format. * * The format strings understood by this function are a subset of the - * strftime() format language as specified by C99. The \%D, \%U and \%W - * conversions are not supported, nor is the 'E' modifier. The GNU - * extensions \%k, \%l, \%s and \%P are supported, however, as are the - * '0', '_' and '-' modifiers. The Python extension \%f is also supported. + * `strftime()` format language as specified by C99. The `%D`, `%U` and `%W` + * conversions are not supported, nor is the `E` modifier. The GNU + * extensions `%k`, `%l`, `%s` and `%P` are supported, however, as are the + * `0`, `_` and `-` modifiers. The Python extension `%f` is also supported. * - * In contrast to strftime(), this function always produces a UTF-8 + * In contrast to `strftime()`, this function always produces a UTF-8 * string, regardless of the current locale. Note that the rendering of - * many formats is locale-dependent and may not match the strftime() + * many formats is locale-dependent and may not match the `strftime()` * output exactly. * * The following format specifiers are supported: * - * - \%a: the abbreviated weekday name according to the current locale - * - \%A: the full weekday name according to the current locale - * - \%b: the abbreviated month name according to the current locale - * - \%B: the full month name according to the current locale - * - \%c: the preferred date and time representation for the current locale - * - \%C: the century number (year/100) as a 2-digit integer (00-99) - * - \%d: the day of the month as a decimal number (range 01 to 31) - * - \%e: the day of the month as a decimal number (range 1 to 31); - * single digits are preceded by a figure space - * - \%F: equivalent to `%Y-%m-%d` (the ISO 8601 date format) - * - \%g: the last two digits of the ISO 8601 week-based year as a - * decimal number (00-99). This works well with \%V and \%u. - * - \%G: the ISO 8601 week-based year as a decimal number. This works - * well with \%V and \%u. - * - \%h: equivalent to \%b - * - \%H: the hour as a decimal number using a 24-hour clock (range 00 to 23) - * - \%I: the hour as a decimal number using a 12-hour clock (range 01 to 12) - * - \%j: the day of the year as a decimal number (range 001 to 366) - * - \%k: the hour (24-hour clock) as a decimal number (range 0 to 23); - * single digits are preceded by a figure space - * - \%l: the hour (12-hour clock) as a decimal number (range 1 to 12); - * single digits are preceded by a figure space - * - \%m: the month as a decimal number (range 01 to 12) - * - \%M: the minute as a decimal number (range 00 to 59) - * - \%f: the microsecond as a decimal number (range 000000 to 999999) - * - \%p: either "AM" or "PM" according to the given time value, or the + * - `%a`: the abbreviated weekday name according to the current locale + * - `%A`: the full weekday name according to the current locale + * - `%b`: the abbreviated month name according to the current locale + * - `%B`: the full month name according to the current locale + * - `%c`: the preferred date and time representation for the current locale + * - `%C`: the century number (year/100) as a 2-digit integer (00-99) + * - `%d`: the day of the month as a decimal number (range 01 to 31) + * - `%e`: the day of the month as a decimal number (range 1 to 31); + * single digits are preceded by a figure space (U+2007) + * - `%F`: equivalent to `%Y-%m-%d` (the ISO 8601 date format) + * - `%g`: the last two digits of the ISO 8601 week-based year as a + * decimal number (00-99). This works well with `%V` and `%u`. + * - `%G`: the ISO 8601 week-based year as a decimal number. This works + * well with `%V` and `%u`. + * - `%h`: equivalent to `%b` + * - `%H`: the hour as a decimal number using a 24-hour clock (range 00 to 23) + * - `%I`: the hour as a decimal number using a 12-hour clock (range 01 to 12) + * - `%j`: the day of the year as a decimal number (range 001 to 366) + * - `%k`: the hour (24-hour clock) as a decimal number (range 0 to 23); + * single digits are preceded by a figure space (U+2007) + * - `%l`: the hour (12-hour clock) as a decimal number (range 1 to 12); + * single digits are preceded by a figure space (U+2007) + * - `%m`: the month as a decimal number (range 01 to 12) + * - `%M`: the minute as a decimal number (range 00 to 59) + * - `%f`: the microsecond as a decimal number (range 000000 to 999999) + * - `%p`: either ‘AM’ or ‘PM’ according to the given time value, or the * corresponding strings for the current locale. Noon is treated as - * "PM" and midnight as "AM". Use of this format specifier is discouraged, as - * many locales have no concept of AM/PM formatting. Use \%c or \%X instead. - * - \%P: like \%p but lowercase: "am" or "pm" or a corresponding string for + * ‘PM’ and midnight as ‘AM’. Use of this format specifier is discouraged, as + * many locales have no concept of AM/PM formatting. Use `%c` or `%X` instead. + * - `%P`: like `%p` but lowercase: ‘am’ or ‘pm’ or a corresponding string for * the current locale. Use of this format specifier is discouraged, as - * many locales have no concept of AM/PM formatting. Use \%c or \%X instead. - * - \%r: the time in a.m. or p.m. notation. Use of this format specifier is - * discouraged, as many locales have no concept of AM/PM formatting. Use \%c - * or \%X instead. - * - \%R: the time in 24-hour notation (\%H:\%M) - * - \%s: the number of seconds since the Epoch, that is, since 1970-01-01 + * many locales have no concept of AM/PM formatting. Use `%c` or `%X` instead. + * - `%r`: the time in a.m. or p.m. notation. Use of this format specifier is + * discouraged, as many locales have no concept of AM/PM formatting. Use `%c` + * or `%X` instead. + * - `%R`: the time in 24-hour notation (`%H:%M`) + * - `%s`: the number of seconds since the Epoch, that is, since 1970-01-01 * 00:00:00 UTC - * - \%S: the second as a decimal number (range 00 to 60) - * - \%t: a tab character - * - \%T: the time in 24-hour notation with seconds (\%H:\%M:\%S) - * - \%u: the ISO 8601 standard day of the week as a decimal, range 1 to 7, - * Monday being 1. This works well with \%G and \%V. - * - \%V: the ISO 8601 standard week number of the current year as a decimal + * - `%S`: the second as a decimal number (range 00 to 60) + * - `%t`: a tab character + * - `%T`: the time in 24-hour notation with seconds (`%H:%M:%S`) + * - `%u`: the ISO 8601 standard day of the week as a decimal, range 1 to 7, + * Monday being 1. This works well with `%G` and `%V`. + * - `%V`: the ISO 8601 standard week number of the current year as a decimal * number, range 01 to 53, where week 1 is the first week that has at * least 4 days in the new year. See g_date_time_get_week_of_year(). - * This works well with \%G and \%u. - * - \%w: the day of the week as a decimal, range 0 to 6, Sunday being 0. - * This is not the ISO 8601 standard format -- use \%u instead. - * - \%x: the preferred date representation for the current locale without + * This works well with `%G` and `%u`. + * - `%w`: the day of the week as a decimal, range 0 to 6, Sunday being 0. + * This is not the ISO 8601 standard format — use `%u` instead. + * - `%x`: the preferred date representation for the current locale without * the time - * - \%X: the preferred time representation for the current locale without + * - `%X`: the preferred time representation for the current locale without * the date - * - \%y: the year as a decimal number without the century - * - \%Y: the year as a decimal number including the century - * - \%z: the time zone as an offset from UTC (+hhmm) - * - \%:z: the time zone as an offset from UTC (+hh:mm). - * This is a gnulib strftime() extension. Since: 2.38 - * - \%::z: the time zone as an offset from UTC (+hh:mm:ss). This is a - * gnulib strftime() extension. Since: 2.38 - * - \%:::z: the time zone as an offset from UTC, with : to necessary - * precision (e.g., -04, +05:30). This is a gnulib strftime() extension. Since: 2.38 - * - \%Z: the time zone or name or abbreviation - * - \%\%: a literal \% character + * - `%y`: the year as a decimal number without the century + * - `%Y`: the year as a decimal number including the century + * - `%z`: the time zone as an offset from UTC (`+hhmm`) + * - `%:z`: the time zone as an offset from UTC (`+hh:mm`). + * This is a gnulib `strftime()` extension. Since: 2.38 + * - `%::z`: the time zone as an offset from UTC (`+hh:mm:ss`). This is a + * gnulib `strftime()` extension. Since: 2.38 + * - `%:::z`: the time zone as an offset from UTC, with `:` to necessary + * precision (e.g., `-04`, `+05:30`). This is a gnulib `strftime()` extension. Since: 2.38 + * - `%Z`: the time zone or name or abbreviation + * - `%%`: a literal `%` character * * Some conversion specifications can be modified by preceding the * conversion specifier by one or more modifier characters. The * following modifiers are supported for many of the numeric * conversions: * - * - O: Use alternative numeric symbols, if the current locale supports those. - * - _: Pad a numeric result with spaces. This overrides the default padding + * - `O`: Use alternative numeric symbols, if the current locale supports those. + * - `_`: Pad a numeric result with spaces. This overrides the default padding * for the specifier. - * - -: Do not pad a numeric result. This overrides the default padding + * - `-`: Do not pad a numeric result. This overrides the default padding * for the specifier. - * - 0: Pad a numeric result with zeros. This overrides the default padding + * - `0`: Pad a numeric result with zeros. This overrides the default padding * for the specifier. * - * Additionally, when O is used with B, b, or h, it produces the alternative + * Additionally, when `O` is used with `B`, `b`, or `h`, it produces the alternative * form of a month name. The alternative form should be used when the month * name is used without a day number (e.g., standalone). It is required in * some languages (Baltic, Slavic, Greek, and more) due to their grammatical - * rules. For other languages there is no difference. \%OB is a GNU and BSD - * strftime() extension expected to be added to the future POSIX specification, - * \%Ob and \%Oh are GNU strftime() extensions. Since: 2.56 + * rules. For other languages there is no difference. `%OB` is a GNU and BSD + * `strftime()` extension expected to be added to the future POSIX specification, + * `%Ob` and `%Oh` are GNU `strftime()` extensions. Since: 2.56 * * Returns: (transfer full) (nullable): a newly allocated string formatted to * the requested format or %NULL in the case that there was an error (such
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/gerror.c -> _service:tar_scm:glib-2.76.4.tar.xz/glib/gerror.c
Changed
@@ -755,13 +755,14 @@ const gchar *format, va_list args) { + g_return_val_if_fail (format != NULL, NULL); + /* Historically, GError allowed this (although it was never meant to work), * and it has significant use in the wild, which g_return_val_if_fail * would break. It should maybe g_return_val_if_fail in GLib 4. * (GNOME#660371, GNOME#560482) */ g_warn_if_fail (domain != 0); - g_warn_if_fail (format != NULL); return g_error_new_steal (domain, code, g_strdup_vprintf (format, args), NULL); } @@ -887,9 +888,10 @@ ErrorDomainInfo info; g_return_val_if_fail (error != NULL, NULL); - /* See g_error_new_valist for why these don't return */ + g_return_val_if_fail (error->message != NULL, NULL); + + /* See g_error_new_valist for why this doesn’t return */ g_warn_if_fail (error->domain != 0); - g_warn_if_fail (error->message != NULL); copy = g_error_new_steal (error->domain, error->code,
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/gfileutils.c -> _service:tar_scm:glib-2.76.4.tar.xz/glib/gfileutils.c
Changed
@@ -313,10 +313,13 @@ * * You should never use g_file_test() to test whether it is safe * to perform an operation, because there is always the possibility - * of the condition changing before you actually perform the operation. + * of the condition changing before you actually perform the operation, + * see TOCTOU(https://en.wikipedia.org/wiki/Time-of-check_to_time-of-use). + * * For example, you might think you could use %G_FILE_TEST_IS_SYMLINK * to know whether it is safe to write to a file without being * tricked into writing into a different location. It doesn't work! + * * |<!-- language="C" --> * // DON'T DO THIS * if (!g_file_test (filename, G_FILE_TEST_IS_SYMLINK)) @@ -324,6 +327,21 @@ * fd = g_open (filename, O_WRONLY); * // write to fd * } + * + * // DO THIS INSTEAD + * fd = g_open (filename, O_WRONLY | O_NOFOLLOW | O_CLOEXEC); + * if (fd == -1) + * { + * // check error + * if (errno == ELOOP) + * // file is a symlink and can be ignored + * else + * // handle errors as before + * } + * else + * { + * // write to fd + * } * | * * Another thing to note is that %G_FILE_TEST_EXISTS and @@ -890,7 +908,7 @@ gint fd; /* O_BINARY useful on Cygwin */ - fd = open (filename, O_RDONLY|O_BINARY); + fd = open (filename, O_RDONLY | O_BINARY | O_CLOEXEC); if (fd < 0) { @@ -1065,7 +1083,7 @@ if (do_fsync) { gchar *dir = g_path_get_dirname (new_name); - int dir_fd = g_open (dir, O_RDONLY, 0); + int dir_fd = g_open (dir, O_RDONLY | O_CLOEXEC, 0); if (dir_fd >= 0) { @@ -1143,8 +1161,13 @@ { gssize s; - s = write (fd, contents, MIN (length, G_MAXSSIZE)); - +#ifdef G_OS_WIN32 + /* 'write' on windows uses int types, so limit count to G_MAXINT */ + s = write (fd, contents, MIN (length, (gsize) G_MAXINT)); +#else + /* Limit count to G_MAXSSIZE to fit into the return value. */ + s = write (fd, contents, MIN (length, (gsize) G_MAXSSIZE)); +#endif if (s < 0) { int saved_errno = errno; @@ -1328,7 +1351,7 @@ tmp_filename = g_strdup_printf ("%s.XXXXXX", filename); errno = 0; - fd = g_mkstemp_full (tmp_filename, O_RDWR | O_BINARY, mode); + fd = g_mkstemp_full (tmp_filename, O_RDWR | O_BINARY | O_CLOEXEC, mode); if (fd == -1) { @@ -1574,8 +1597,8 @@ * g_dir_make_tmp() instead. * * Returns: (nullable) (type filename): A pointer to @tmpl, which has been - * modified to hold the directory name. In case of errors, %NULL is - * returned, and %errno will be set. + * modified to hold the directory name. In case of errors, %NULL is + * returned, and %errno will be set. * * Since: 2.30 */ @@ -1610,8 +1633,8 @@ * g_dir_make_tmp() instead. * * Returns: (nullable) (type filename): A pointer to @tmpl, which has been - * modified to hold the directory name. In case of errors, %NULL is - * returned and %errno will be set. + * modified to hold the directory name. In case of errors, %NULL is + * returned and %errno will be set. * * Since: 2.30 */ @@ -1625,7 +1648,7 @@ * g_mkstemp_full: (skip) * @tmpl: (type filename): template filename * @flags: flags to pass to an open() call in addition to O_EXCL - * and O_CREAT, which are passed automatically + * and O_CREAT, which are passed automatically * @mode: permissions to create the temporary file with * * Opens a temporary file. See the mkstemp() documentation @@ -1641,9 +1664,9 @@ * on Windows it should be in UTF-8. * * Returns: A file handle (as from open()) to the file - * opened for reading and writing. The file handle should be - * closed with close(). In case of errors, -1 is returned - * and %errno will be set. + * opened for reading and writing. The file handle should be + * closed with close(). In case of errors, -1 is returned + * and %errno will be set. * * Since: 2.22 */ @@ -1673,15 +1696,15 @@ * Most importantly, on Windows it should be in UTF-8. * * Returns: A file handle (as from open()) to the file - * opened for reading and writing. The file is opened in binary - * mode on platforms where there is a difference. The file handle - * should be closed with close(). In case of errors, -1 is - * returned and %errno will be set. + * opened for reading and writing. The file is opened in binary + * mode on platforms where there is a difference. The file handle + * should be closed with close(). In case of errors, -1 is + * returned and %errno will be set. */ gint g_mkstemp (gchar *tmpl) { - return g_mkstemp_full (tmpl, O_RDWR | O_BINARY, 0600); + return g_mkstemp_full (tmpl, O_RDWR | O_BINARY | O_CLOEXEC, 0600); } static gint @@ -1764,9 +1787,9 @@ /** * g_file_open_tmp: * @tmpl: (type filename) (nullable): Template for file name, as in - * g_mkstemp(), basename only, or %NULL for a default template + * g_mkstemp(), basename only, or %NULL for a default template * @name_used: (out) (type filename): location to store actual name used, - * or %NULL + * or %NULL * @error: return location for a #GError * * Opens a file for writing in the preferred directory for temporary @@ -1787,9 +1810,9 @@ * name encoding. * * Returns: A file handle (as from open()) to the file opened for - * reading and writing. The file is opened in binary mode on platforms - * where there is a difference. The file handle should be closed with - * close(). In case of errors, -1 is returned and @error will be set. + * reading and writing. The file is opened in binary mode on platforms + * where there is a difference. The file handle should be closed with + * close(). In case of errors, -1 is returned and @error will be set. */ gint g_file_open_tmp (const gchar *tmpl, @@ -1803,7 +1826,7 @@ result = g_get_tmp_name (tmpl, &fulltemplate, wrap_g_open, - O_CREAT | O_EXCL | O_RDWR | O_BINARY, + O_CREAT | O_EXCL | O_RDWR | O_BINARY | O_CLOEXEC, 0600, error); if (result != -1) @@ -1820,7 +1843,7 @@ /** * g_dir_make_tmp: * @tmpl: (type filename) (nullable): Template for directory name, - * as in g_mkdtemp(), basename only, or %NULL for a default template + * as in g_mkdtemp(), basename only, or %NULL for a default template * @error: return location for a #GError * * Creates a subdirectory in the preferred directory for temporary @@ -1836,9 +1859,9 @@ * modified, and might thus be a read-only literal string. * * Returns: (type filename) (transfer full): The actual name used. This string - * should be freed with g_free() when not needed any longer and is - * is in the GLib file name encoding. In case of errors, %NULL is - * returned and @error will be set. + * should be freed with g_free() when not needed any longer and is + * is in the GLib file name encoding. In case of errors, %NULL is + * returned and @error will be set. * * Since: 2.30 */ @@ -1963,11 +1986,12 @@ * g_build_pathv: * @separator: a string used to separator the elements of the path. * @args: (array zero-terminated=1) (element-type filename): %NULL-terminated - * array of strings containing the path elements. + * array of strings containing the path elements. * - * Behaves exactly like g_build_path(), but takes the path elements - * as a string array, instead of varargs. This function is mainly - * meant for language bindings. + * Behaves exactly like g_build_path(), but takes the path elements + * as a string array, instead of variadic arguments. + * + * This function is mainly meant for language bindings. * * Returns: (type filename) (transfer full): a newly-allocated string that * must be freed with g_free(). @@ -1992,10 +2016,12 @@ * @...: remaining elements in path, terminated by %NULL * * Creates a path from a series of elements using @separator as the - * separator between elements. At the boundary between two elements, - * any trailing occurrences of separator in the first element, or - * leading occurrences of separator in the second element are removed - * and exactly one copy of the separator is inserted. + * separator between elements. + * + * At the boundary between two elements, any trailing occurrences of + * separator in the first element, or leading occurrences of separator + * in the second element are removed and exactly one copy of the + * separator is inserted. * * Empty elements are ignored. * @@ -2018,8 +2044,7 @@ * copies of the separator, elements consisting only of copies * of the separator are ignored. * - * Returns: (type filename) (transfer full): a newly-allocated string that - * must be freed with g_free(). + * Returns: (type filename) (transfer full): the newly allocated path **/ gchar * g_build_path (const gchar *separator, @@ -2175,11 +2200,16 @@ * @first_element: (type filename): the first element in the path * @args: va_list of remaining elements in path * + * Creates a filename from a list of elements using the correct + * separator for the current platform. + * * Behaves exactly like g_build_filename(), but takes the path elements - * as a va_list. This function is mainly meant for language bindings. + * as a va_list. * - * Returns: (type filename) (transfer full): a newly-allocated string that - * must be freed with g_free(). + * This function is mainly meant for implementing other variadic arguments + * functions. + * + * Returns: (type filename) (transfer full): the newly allocated path * * Since: 2.56 */ @@ -2195,14 +2225,19 @@ /** * g_build_filenamev: * @args: (array zero-terminated=1) (element-type filename): %NULL-terminated - * array of strings containing the path elements. + * array of strings containing the path elements. * - * Behaves exactly like g_build_filename(), but takes the path elements - * as a string array, instead of varargs. This function is mainly + * Creates a filename from a vector of elements using the correct + * separator for the current platform. + * + * This function behaves exactly like g_build_filename(), but takes the path + * elements as a string array, instead of varargs. This function is mainly * meant for language bindings. * - * Returns: (type filename) (transfer full): a newly-allocated string that - * must be freed with g_free(). + * If you are building a path programmatically you may want to use + * #GPathBuf instead. + * + * Returns: (type filename) (transfer full): the newly allocated path * * Since: 2.8 */ @@ -2218,7 +2253,7 @@ * @...: remaining elements in path, terminated by %NULL * * Creates a filename from a series of elements using the correct - * separator for filenames. + * separator for the current platform. * * On Unix, this function behaves identically to `g_build_path * (G_DIR_SEPARATOR_S, first_element, ....)`. @@ -2233,9 +2268,11 @@ * path. If the first element is a relative path, the result will * be a relative path. * - * Returns: (type filename) (transfer full): a newly-allocated string that - * must be freed with g_free(). - **/ + * If you are building a path programmatically you may want to use + * #GPathBuf instead. + * + * Returns: (type filename) (transfer full): the newly allocated path + */ gchar * g_build_filename (const gchar *first_element, ...) @@ -2256,14 +2293,15 @@ * @error: return location for a #GError * * Reads the contents of the symbolic link @filename like the POSIX - * readlink() function. + * `readlink()` function. + * + * The returned string is in the encoding used for filenames. Use + * g_filename_to_utf8() to convert it to UTF-8. * - * The returned string is in the encoding used - * for filenames. Use g_filename_to_utf8() to convert it to UTF-8. + * The returned string may also be a relative path. Use g_build_filename() + * to convert it to an absolute path: * - * The returned string may also be a relative path. Use g_build_filename() to - * convert it to an absolute path: - * | + * |<!-- language="C" --> * g_autoptr(GError) local_error = NULL; * g_autofree gchar *link_target = g_file_read_link ("/etc/localtime", &local_error); * @@ -2279,7 +2317,7 @@ * | * * Returns: (type filename) (transfer full): A newly-allocated string with - * the contents of the symbolic link, or %NULL if an error occurred. + * the contents of the symbolic link, or %NULL if an error occurred. * * Since: 2.4 */ @@ -2486,12 +2524,12 @@ * string. * * Returns: (type filename): the name of the file without any leading - * directory components + * directory components * * Deprecated:2.2: Use g_path_get_basename() instead, but notice - * that g_path_get_basename() allocates new memory for the - * returned string, unlike this function which returns a pointer - * into the argument. + * that g_path_get_basename() allocates new memory for the + * returned string, unlike this function which returns a pointer + * into the argument. */ const gchar * g_basename (const gchar *file_name) @@ -2534,7 +2572,7 @@ * separator is returned. If @file_name is empty, it gets ".". * * Returns: (type filename) (transfer full): a newly allocated string - * containing the last component of the filename + * containing the last component of the filename */ gchar * g_path_get_basename (const gchar *file_name) @@ -2728,7 +2766,8 @@ * No file system I/O is done. * * Returns: (type filename) (transfer full): a newly allocated string with the - * canonical file path + * canonical file path + * * Since: 2.58 */ gchar *
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/ghash.c -> _service:tar_scm:glib-2.76.4.tar.xz/glib/ghash.c
Changed
@@ -260,8 +260,8 @@ gsize size; gint mod; guint mask; - gint nnodes; - gint noccupied; /* nnodes + tombstones */ + guint nnodes; + guint noccupied; /* nnodes + tombstones */ guint have_big_keys : 1; guint have_big_values : 1; @@ -548,6 +548,7 @@ g_hash_table_assign_key_or_value (hash_table->keys, i, hash_table->have_big_keys, NULL); g_hash_table_assign_key_or_value (hash_table->values, i, hash_table->have_big_values, NULL); + g_assert (hash_table->nnodes > 0); hash_table->nnodes--; if (notify && hash_table->key_destroy_func) @@ -909,8 +910,8 @@ static inline void g_hash_table_maybe_resize (GHashTable *hash_table) { - gint noccupied = hash_table->noccupied; - gint size = hash_table->size; + gsize noccupied = hash_table->noccupied; + gsize size = hash_table->size; if ((size > hash_table->nnodes * 4 && size > 1 << HASH_TABLE_MIN_SHIFT) || (size <= noccupied + (noccupied / 16))) @@ -1834,7 +1835,9 @@ * * If found, the stolen key and value are removed from the hash table without * calling the key and value destroy functions, and ownership is transferred to - * the caller of this method; as with g_hash_table_steal(). + * the caller of this method, as with g_hash_table_steal(). That is the case + * regardless whether @stolen_key or @stolen_value output parameters are + * requested. * * You can pass %NULL for @lookup_key, provided the hash and equal functions * of @hash_table are %NULL-safe. @@ -1940,6 +1943,80 @@ g_hash_table_maybe_resize (hash_table); } +/** + * g_hash_table_steal_all_keys: (skip) + * @hash_table: a #GHashTable + * + * Removes all keys and their associated values from a #GHashTable + * without calling the key destroy functions, returning the keys + * as a #GPtrArray with the free func set to the @hash_table key + * destroy function. + * + * Returns: (transfer container): a #GPtrArray containing each key of + * the table. Unref with with g_ptr_array_unref() when done. + * + * Since: 2.76 + */ +GPtrArray * +g_hash_table_steal_all_keys (GHashTable *hash_table) +{ + GPtrArray *array; + GDestroyNotify key_destroy_func; + + g_return_val_if_fail (hash_table != NULL, NULL); + + array = g_hash_table_get_keys_as_ptr_array (hash_table); + + /* Ignore the key destroy notify calls during removal, and use it for the + * array elements instead, but restore it after the hash table has been + * cleared, so that newly added keys will continue using it. + */ + key_destroy_func = g_steal_pointer (&hash_table->key_destroy_func); + g_ptr_array_set_free_func (array, key_destroy_func); + + g_hash_table_remove_all (hash_table); + hash_table->key_destroy_func = g_steal_pointer (&key_destroy_func); + + return array; +} + +/** + * g_hash_table_steal_all_values: (skip) + * @hash_table: a #GHashTable + * + * Removes all keys and their associated values from a #GHashTable + * without calling the value destroy functions, returning the values + * as a #GPtrArray with the free func set to the @hash_table value + * destroy function. + * + * Returns: (transfer container): a #GPtrArray containing each value of + * the table. Unref with with g_ptr_array_unref() when done. + * + * Since: 2.76 + */ +GPtrArray * +g_hash_table_steal_all_values (GHashTable *hash_table) +{ + GPtrArray *array; + GDestroyNotify value_destroy_func; + + g_return_val_if_fail (hash_table != NULL, NULL); + + array = g_hash_table_get_values_as_ptr_array (hash_table); + + /* Ignore the value destroy notify calls during removal, and use it for the + * array elements instead, but restore it after the hash table has been + * cleared, so that newly added values will continue using it. + */ + value_destroy_func = g_steal_pointer (&hash_table->value_destroy_func); + g_ptr_array_set_free_func (array, value_destroy_func); + + g_hash_table_remove_all (hash_table); + hash_table->value_destroy_func = g_steal_pointer (&value_destroy_func); + + return array; +} + /* * g_hash_table_foreach_remove_or_steal: * @hash_table: a #GHashTable @@ -2262,7 +2339,7 @@ if (HASH_IS_REAL (hash_table->hashesi)) resultj++ = g_hash_table_fetch_key_or_value (hash_table->keys, i, hash_table->have_big_keys); } - g_assert_cmpint (j, ==, hash_table->nnodes); + g_assert (j == hash_table->nnodes); resultj = NULL; if (length) @@ -2272,6 +2349,45 @@ } /** + * g_hash_table_get_keys_as_ptr_array: (skip) + * @hash_table: a #GHashTable + * + * Retrieves every key inside @hash_table, as a #GPtrArray. + * The returned data is valid until changes to the hash release those keys. + * + * This iterates over every entry in the hash table to build its return value. + * To iterate over the entries in a #GHashTable more efficiently, use a + * #GHashTableIter. + * + * You should always unref the returned array with g_ptr_array_unref(). + * + * Returns: (transfer container): a #GPtrArray containing each key from + * the table. Unref with with g_ptr_array_unref() when done. + * + * Since: 2.76 + **/ +GPtrArray * +g_hash_table_get_keys_as_ptr_array (GHashTable *hash_table) +{ + GPtrArray *array; + + g_return_val_if_fail (hash_table != NULL, NULL); + + array = g_ptr_array_sized_new (hash_table->size); + for (gsize i = 0; i < hash_table->size; ++i) + { + if (HASH_IS_REAL (hash_table->hashesi)) + { + g_ptr_array_add (array, g_hash_table_fetch_key_or_value ( + hash_table->keys, i, hash_table->have_big_keys)); + } + } + g_assert (array->len == hash_table->nnodes); + + return array; +} + +/** * g_hash_table_get_values: * @hash_table: a #GHashTable * @@ -2307,6 +2423,45 @@ return retval; } +/** + * g_hash_table_get_values_as_ptr_array: (skip) + * @hash_table: a #GHashTable + * + * Retrieves every value inside @hash_table, as a #GPtrArray. + * The returned data is valid until changes to the hash release those values. + * + * This iterates over every entry in the hash table to build its return value. + * To iterate over the entries in a #GHashTable more efficiently, use a + * #GHashTableIter. + * + * You should always unref the returned array with g_ptr_array_unref(). + * + * Returns: (transfer container): a #GPtrArray containing each value from + * the table. Unref with with g_ptr_array_unref() when done. + * + * Since: 2.76 + **/ +GPtrArray * +g_hash_table_get_values_as_ptr_array (GHashTable *hash_table) +{ + GPtrArray *array; + + g_return_val_if_fail (hash_table != NULL, NULL); + + array = g_ptr_array_sized_new (hash_table->size); + for (gsize i = 0; i < hash_table->size; ++i) + { + if (HASH_IS_REAL (hash_table->hashesi)) + { + g_ptr_array_add (array, g_hash_table_fetch_key_or_value ( + hash_table->values, i, hash_table->have_big_values)); + } + } + g_assert (array->len == hash_table->nnodes); + + return array; +} + /* Hash functions. */ @@ -2494,7 +2649,9 @@ guint g_int64_hash (gconstpointer v) { - return (guint) *(const gint64*) v; + const guint64 *bits = v; + + return (guint) ((*bits >> 32) ^ (*bits & 0xffffffffU)); } /** @@ -2535,5 +2692,8 @@ guint g_double_hash (gconstpointer v) { - return (guint) *(const gdouble*) v; + /* Same as g_int64_hash() */ + const guint64 *bits = v; + + return (guint) ((*bits >> 32) ^ (*bits & 0xffffffffU)); }
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/ghash.h -> _service:tar_scm:glib-2.76.4.tar.xz/glib/ghash.h
Changed
@@ -32,6 +32,7 @@ #endif #include <glib/gtypes.h> +#include <glib/garray.h> #include <glib/glist.h> G_BEGIN_DECLS @@ -93,6 +94,10 @@ gpointer *stolen_value); GLIB_AVAILABLE_IN_ALL void g_hash_table_steal_all (GHashTable *hash_table); +GLIB_AVAILABLE_IN_2_76 +GPtrArray * g_hash_table_steal_all_keys (GHashTable *hash_table); +GLIB_AVAILABLE_IN_2_76 +GPtrArray * g_hash_table_steal_all_values (GHashTable *hash_table); GLIB_AVAILABLE_IN_ALL gpointer g_hash_table_lookup (GHashTable *hash_table, gconstpointer key); @@ -129,6 +134,11 @@ GLIB_AVAILABLE_IN_2_40 gpointer * g_hash_table_get_keys_as_array (GHashTable *hash_table, guint *length); +GLIB_AVAILABLE_IN_2_76 +GPtrArray * g_hash_table_get_keys_as_ptr_array (GHashTable *hash_table); + +GLIB_AVAILABLE_IN_2_76 +GPtrArray * g_hash_table_get_values_as_ptr_array (GHashTable *hash_table); GLIB_AVAILABLE_IN_ALL void g_hash_table_iter_init (GHashTableIter *iter,
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/ghook.c -> _service:tar_scm:glib-2.76.4.tar.xz/glib/ghook.c
Changed
@@ -584,7 +584,7 @@ /** * GHookCheckMarshaller: * @hook: a #GHook - * @user_data: user data + * @marshal_data: user data * * Defines the type of function used by g_hook_list_marshal_check(). * @@ -636,7 +636,7 @@ /** * GHookMarshaller: * @hook: a #GHook - * @user_data: user data + * @marshal_data: user data * * Defines the type of function used by g_hook_list_marshal(). */ @@ -793,7 +793,7 @@ /** * GHookFindFunc: * @hook: a #GHook - * @user_data: user data passed to g_hook_find_func() + * @data: user data passed to g_hook_find_func() * * Defines the type of the function passed to g_hook_find(). *
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/ghook.h -> _service:tar_scm:glib-2.76.4.tar.xz/glib/ghook.h
Changed
@@ -43,11 +43,11 @@ typedef gint (*GHookCompareFunc) (GHook *new_hook, GHook *sibling); typedef gboolean (*GHookFindFunc) (GHook *hook, - gpointer user_data); + gpointer data); typedef void (*GHookMarshaller) (GHook *hook, - gpointer user_data); + gpointer marshal_data); typedef gboolean (*GHookCheckMarshaller) (GHook *hook, - gpointer user_data); + gpointer marshal_data); typedef void (*GHookFunc) (gpointer data); typedef gboolean (*GHookCheckFunc) (gpointer data); typedef void (*GHookFinalizeFunc) (GHookList *hook_list,
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/giochannel.c -> _service:tar_scm:glib-2.76.4.tar.xz/glib/giochannel.c
Changed
@@ -679,7 +679,7 @@ * GIOFunc: * @source: the #GIOChannel event source * @condition: the condition which has been satisfied - * @user_data: user data set in g_io_add_watch() or g_io_add_watch_full() + * @data: user data set in g_io_add_watch() or g_io_add_watch_full() * * Specifies the type of function passed to g_io_add_watch() or * g_io_add_watch_full(), which is called when the requested condition @@ -913,7 +913,7 @@ /** * g_io_channel_get_line_term: * @channel: a #GIOChannel - * @length: a location to return the length of the line terminator + * @length: (out) (optional): a location to return the length of the line terminator * * This returns the string that #GIOChannel uses to determine * where in the file a line break occurs. A value of %NULL @@ -2205,16 +2205,18 @@ { gsize count_unsigned; GIOStatus status; - gssize wrote_bytes = 0; + gsize wrote_bytes = 0; g_return_val_if_fail (channel != NULL, G_IO_STATUS_ERROR); + g_return_val_if_fail (buf != NULL || count == 0, G_IO_STATUS_ERROR); g_return_val_if_fail ((error == NULL) || (*error == NULL), G_IO_STATUS_ERROR); g_return_val_if_fail (channel->is_writeable, G_IO_STATUS_ERROR); - if ((count < 0) && buf) - count = strlen (buf); - count_unsigned = count; + if (count < 0) + count_unsigned = strlen (buf); + else + count_unsigned = count; if (count_unsigned == 0) { @@ -2223,8 +2225,7 @@ return G_IO_STATUS_NORMAL; } - g_return_val_if_fail (buf != NULL, G_IO_STATUS_ERROR); - g_return_val_if_fail (count_unsigned > 0, G_IO_STATUS_ERROR); + g_assert (count_unsigned > 0); /* Raw write case */ @@ -2266,7 +2267,7 @@ if (!channel->write_buf) channel->write_buf = g_string_sized_new (channel->buf_size); - while (wrote_bytes < count) + while (wrote_bytes < count_unsigned) { gsize space_in_buf; @@ -2312,7 +2313,11 @@ if (!channel->encoding) { - gssize write_this = MIN (space_in_buf, count_unsigned - wrote_bytes); + gsize write_this = MIN (space_in_buf, count_unsigned - wrote_bytes); + + /* g_string_append_len() takes a gssize, so don’t overflow it*/ + if (write_this > G_MAXSSIZE) + write_this = G_MAXSSIZE; g_string_append_len (channel->write_buf, buf, write_this); buf += write_this; @@ -2475,7 +2480,10 @@ g_warning ("Illegal sequence due to partial character " "at the end of a previous write."); else - wrote_bytes += from_buf_len - left_len - from_buf_old_len; + { + g_assert (from_buf_len >= left_len + from_buf_old_len); + wrote_bytes += from_buf_len - left_len - from_buf_old_len; + } if (bytes_written) *bytes_written = wrote_bytes; channel->partial_write_buf0 = '\0';
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/giochannel.h -> _service:tar_scm:glib-2.76.4.tar.xz/glib/giochannel.h
Changed
@@ -130,7 +130,7 @@ typedef gboolean (*GIOFunc) (GIOChannel *source, GIOCondition condition, - gpointer user_data); + gpointer data); struct _GIOFuncs { GIOStatus (*io_read) (GIOChannel *channel,
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/giounix.c -> _service:tar_scm:glib-2.76.4.tar.xz/glib/giounix.c
Changed
@@ -44,6 +44,10 @@ #include <fcntl.h> #include <glib/gstdio.h> +#ifndef O_CLOEXEC +#define O_CLOEXEC 0 +#endif + #include "giochannel.h" #include "gerror.h" @@ -527,7 +531,7 @@ create_mode = S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH; - fid = g_open (filename, flags, create_mode); + fid = g_open (filename, flags | O_CLOEXEC, create_mode); if (fid == -1) { int err = errno;
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/gkeyfile.c -> _service:tar_scm:glib-2.76.4.tar.xz/glib/gkeyfile.c
Changed
@@ -53,6 +53,10 @@ #endif /* G_OS_WIN23 */ +#ifndef O_CLOEXEC +#define O_CLOEXEC 0 +#endif + #include "gconvert.h" #include "gdataset.h" #include "gerror.h" @@ -761,7 +765,7 @@ path = g_build_filename (data_dir, sub_dir, candidate_file, NULL); - fd = g_open (path, O_RDONLY, 0); + fd = g_open (path, O_RDONLY | O_CLOEXEC, 0); if (fd == -1) { @@ -917,7 +921,7 @@ g_return_val_if_fail (key_file != NULL, FALSE); g_return_val_if_fail (file != NULL, FALSE); - fd = g_open (file, O_RDONLY, 0); + fd = g_open (file, O_RDONLY | O_CLOEXEC, 0); errsv = errno; if (fd == -1) @@ -3546,10 +3550,7 @@ } if (string != NULL) - { - comment = string->str; - g_string_free (string, FALSE); - } + comment = g_string_free_and_steal (g_steal_pointer (&string)); else comment = NULL;
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/glib-autocleanups.h -> _service:tar_scm:glib-2.76.4.tar.xz/glib/glib-autocleanups.h
Changed
@@ -101,5 +101,7 @@ G_DEFINE_AUTO_CLEANUP_FREE_FUNC(GStrv, g_strfreev, NULL) G_DEFINE_AUTOPTR_CLEANUP_FUNC(GRefString, g_ref_string_release) G_DEFINE_AUTOPTR_CLEANUP_FUNC(GUri, g_uri_unref) +G_DEFINE_AUTOPTR_CLEANUP_FUNC (GPathBuf, g_path_buf_free) +G_DEFINE_AUTO_CLEANUP_CLEAR_FUNC (GPathBuf, g_path_buf_clear) G_GNUC_END_IGNORE_DEPRECATIONS
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/glib-init.c -> _service:tar_scm:glib-2.76.4.tar.xz/glib/glib-init.c
Changed
@@ -89,7 +89,24 @@ G_STATIC_ASSERT (sizeof (gintptr) == sizeof (void *)); G_STATIC_ASSERT (sizeof (guintptr) == sizeof (void *)); +G_STATIC_ASSERT (sizeof (short) == sizeof (gshort)); +G_STATIC_ASSERT (G_MINSHORT == SHRT_MIN); +G_STATIC_ASSERT (G_MAXSHORT == SHRT_MAX); +G_STATIC_ASSERT (sizeof (unsigned short) == sizeof (gushort)); +G_STATIC_ASSERT (G_MAXUSHORT == USHRT_MAX); + +G_STATIC_ASSERT (sizeof (int) == sizeof (gint)); +G_STATIC_ASSERT (G_MININT == INT_MIN); +G_STATIC_ASSERT (G_MAXINT == INT_MAX); +G_STATIC_ASSERT (sizeof (unsigned int) == sizeof (guint)); +G_STATIC_ASSERT (G_MAXUINT == UINT_MAX); + G_STATIC_ASSERT (sizeof (long) == GLIB_SIZEOF_LONG); +G_STATIC_ASSERT (sizeof (long) == sizeof (glong)); +G_STATIC_ASSERT (G_MINLONG == LONG_MIN); +G_STATIC_ASSERT (G_MAXLONG == LONG_MAX); +G_STATIC_ASSERT (sizeof (unsigned long) == sizeof (gulong)); +G_STATIC_ASSERT (G_MAXULONG == ULONG_MAX); G_STATIC_ASSERT (G_HAVE_GINT64 == 1); @@ -99,11 +116,28 @@ G_STATIC_ASSERT (sizeof (size_t) == GLIB_SIZEOF_SSIZE_T); G_STATIC_ASSERT (sizeof (gsize) == GLIB_SIZEOF_SSIZE_T); G_STATIC_ASSERT (sizeof (gsize) == sizeof (size_t)); +G_STATIC_ASSERT (G_MAXSIZE == SIZE_MAX); /* Again this is size_t not ssize_t, because ssize_t is POSIX, not C99 */ G_STATIC_ASSERT (sizeof (gssize) == sizeof (size_t)); G_STATIC_ASSERT (G_ALIGNOF (gsize) == G_ALIGNOF (size_t)); G_STATIC_ASSERT (G_ALIGNOF (gssize) == G_ALIGNOF (size_t)); - +/* We assume that GSIZE_TO_POINTER is reversible by GPOINTER_TO_SIZE + * without losing information. + * However, we do not assume that GPOINTER_TO_SIZE can store an arbitrary + * pointer in a gsize (known to be false on CHERI). */ +G_STATIC_ASSERT (sizeof (size_t) <= sizeof (void *)); +/* Standard C does not guarantee that size_t is the same as uintptr_t, + * but GLib currently assumes they are the same: see + * <https://gitlab.gnome.org/GNOME/glib/-/issues/2842>. + * + * To enable working on bringup for new architectures these assertions + * can be disabled with -DG_ENABLE_EXPERIMENTAL_ABI_COMPILATION. + * + * FIXME: remove these assertions once the API/ABI has stabilized. */ +#ifndef G_ENABLE_EXPERIMENTAL_ABI_COMPILATION +G_STATIC_ASSERT (sizeof (size_t) == sizeof (uintptr_t)); +G_STATIC_ASSERT (G_ALIGNOF (size_t) == G_ALIGNOF (uintptr_t)); +#endif /* goffset is always 64-bit, even if off_t is only 32-bit * (compiling without large-file-support on 32-bit) */ G_STATIC_ASSERT (sizeof (goffset) == sizeof (gint64));
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/glib-private.c -> _service:tar_scm:glib-2.76.4.tar.xz/glib/glib-private.c
Changed
@@ -24,6 +24,10 @@ #include "glib-private.h" #include "glib-init.h" +#ifdef USE_INVALID_PARAMETER_HANDLER +#include <crtdbg.h> +#endif + /** * glib__private__: * @arg: Do not use this argument @@ -60,7 +64,83 @@ g_win32_reopen_noninherited, g_win32_handle_is_socket, #endif + + g_win32_push_empty_invalid_parameter_handler, + g_win32_pop_invalid_parameter_handler, + + g_find_program_for_path, }; return &table; } + +#ifdef USE_INVALID_PARAMETER_HANDLER +/* + * This is the (empty) invalid parameter handler + * that is used for Visual C++ 2005 (and later) builds + * so that we can use this instead of the system automatically + * aborting the process, when calling _get_osfhandle(), isatty() + * and _commit() (via g_fsync()) and so on with an invalid file + * descriptor. + * + * This is necessary so that the gspawn helper and the test programs + * will continue to run as expected, since we are purposely or + * forced to use invalid FDs. + * + * Please see https://learn.microsoft.com/en-us/cpp/c-runtime-library/parameter-validation?view=msvc-170 + * for an explanation on this. + */ +static void +empty_invalid_parameter_handler (const wchar_t *expression, + const wchar_t *function, + const wchar_t *file, + unsigned int line, + uintptr_t pReserved) +{ +} + +/* fallback to _set_invalid_parameter_handler() if we don't have _set_thread_local_invalid_parameter_handler() */ +#ifndef HAVE__SET_THREAD_LOCAL_INVALID_PARAMETER_HANDLER +# define _set_thread_local_invalid_parameter_handler _set_invalid_parameter_handler +#endif + +#endif +/* + * g_win32_push_empty_invalid_parameter_handler: + * @handler: a possibly uninitialized GWin32InvalidParameterHandler + */ +void +g_win32_push_empty_invalid_parameter_handler (GWin32InvalidParameterHandler *handler) +{ +#ifdef USE_INVALID_PARAMETER_HANDLER + /* use the empty invalid parameter handler to override the default invalid parameter_handler */ + handler->pushed_handler = empty_invalid_parameter_handler; + handler->old_handler = _set_thread_local_invalid_parameter_handler (handler->pushed_handler); + + /* Disable the message box for assertions. */ + handler->pushed_report_mode = 0; + handler->prev_report_mode = _CrtSetReportMode(_CRT_ASSERT, handler->pushed_report_mode); +#endif +} + +/* + * g_win32_pop_invalid_parameter_handler: + * @handler: a GWin32InvalidParameterHandler processed with + * g_win32_push_empty_invalid_parameter_handler() + */ +void +g_win32_pop_invalid_parameter_handler (GWin32InvalidParameterHandler *handler) +{ +#ifdef USE_INVALID_PARAMETER_HANDLER + G_GNUC_UNUSED _invalid_parameter_handler popped_handler; + G_GNUC_UNUSED int popped_report_mode; + + /* Restore previous/default invalid parameter handler, check the value returned matches the one we previously pushed */ + popped_handler = _set_thread_local_invalid_parameter_handler (handler->old_handler); + g_return_if_fail (handler->pushed_handler == popped_handler); + + /* Restore the message box for assertions, check the value returned matches the one we previously pushed */ + popped_report_mode = _CrtSetReportMode(_CRT_ASSERT, handler->prev_report_mode); + g_return_if_fail (handler->pushed_report_mode == popped_report_mode); +#endif +}
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/glib-private.h -> _service:tar_scm:glib-2.76.4.tar.xz/glib/glib-private.h
Changed
@@ -121,6 +121,27 @@ gboolean g_check_setuid (void); GMainContext * g_main_context_new_with_next_id (guint next_id); +#if (defined (HAVE__SET_THREAD_LOCAL_INVALID_PARAMETER_HANDLER) || \ + defined (HAVE__SET_INVALID_PARAMETER_HANDLER)) && \ + defined (HAVE__CRT_SET_REPORT_MODE) +# define USE_INVALID_PARAMETER_HANDLER +#endif + +#ifdef USE_INVALID_PARAMETER_HANDLER +struct _GWin32InvalidParameterHandler +{ + _invalid_parameter_handler old_handler; + _invalid_parameter_handler pushed_handler; + int prev_report_mode; + int pushed_report_mode; +}; +#else +struct _GWin32InvalidParameterHandler +{ + int unused_really; +}; +#endif + #ifdef G_OS_WIN32 GLIB_AVAILABLE_IN_ALL gchar *_glib_get_locale_dir (void); @@ -129,8 +150,17 @@ GDir * g_dir_open_with_errno (const gchar *path, guint flags); GDir * g_dir_new_from_dirp (gpointer dirp); +typedef struct _GWin32InvalidParameterHandler GWin32InvalidParameterHandler; +void g_win32_push_empty_invalid_parameter_handler (GWin32InvalidParameterHandler *items); +void g_win32_pop_invalid_parameter_handler (GWin32InvalidParameterHandler *items); + +char *g_find_program_for_path (const char *program, + const char *path, + const char *working_dir); + #define GLIB_PRIVATE_CALL(symbol) (glib__private__()->symbol) + typedef struct { /* See gwakeup.c */ GWakeup * (* g_wakeup_new) (void); @@ -182,6 +212,15 @@ #endif + /* See glib-private.c */ + void (* g_win32_push_empty_invalid_parameter_handler) (GWin32InvalidParameterHandler *items); + + void (* g_win32_pop_invalid_parameter_handler) (GWin32InvalidParameterHandler *items); + + /* See gutils.c */ + char *(* g_find_program_for_path) (const char *program, + const char *path, + const char *working_dir); /* Add other private functions here, initialize them in glib-private.c */ } GLibPrivateVTable;
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/glib-typeof.h -> _service:tar_scm:glib-2.76.4.tar.xz/glib/glib-typeof.h
Changed
@@ -34,11 +34,10 @@ * This symbol is private. */ #undef glib_typeof -#if (!defined(__cplusplus) || (!defined (_MSVC_LANG) && __cplusplus < 201103L)) && \ +#if !G_CXX_STD_CHECK_VERSION (11) && \ (G_GNUC_CHECK_VERSION(4, 8) || defined(__clang__)) #define glib_typeof(t) __typeof__ (t) -#elif defined(__cplusplus) && \ - (__cplusplus >= 201103L || (defined (_MSVC_LANG) && _MSVC_LANG > 201103L)) && \ +#elif G_CXX_STD_CHECK_VERSION (11) && \ GLIB_VERSION_MIN_REQUIRED >= GLIB_VERSION_2_68 /* C++11 decltype() is close enough for our usage */ #include <type_traits>
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/glib-unix.c -> _service:tar_scm:glib-2.76.4.tar.xz/glib/glib-unix.c
Changed
@@ -23,12 +23,8 @@ #include "config.h" -/* To make bionic export pipe2() */ -#ifndef _GNU_SOURCE -#define _GNU_SOURCE 1 -#endif - #include "glib-unix.h" +#include "glib-unixprivate.h" #include "gmain-internal.h" #include <string.h> @@ -94,48 +90,13 @@ int flags, GError **error) { - int ecode; - /* We only support FD_CLOEXEC */ g_return_val_if_fail ((flags & (FD_CLOEXEC)) == flags, FALSE); -#ifdef HAVE_PIPE2 - { - int pipe2_flags = 0; - if (flags & FD_CLOEXEC) - pipe2_flags |= O_CLOEXEC; - /* Atomic */ - ecode = pipe2 (fds, pipe2_flags); - if (ecode == -1 && errno != ENOSYS) - return g_unix_set_error_from_errno (error, errno); - else if (ecode == 0) - return TRUE; - /* Fall through on -ENOSYS, we must be running on an old kernel */ - } -#endif - ecode = pipe (fds); - if (ecode == -1) + if (!g_unix_open_pipe_internal (fds, + (flags & FD_CLOEXEC) != 0)) return g_unix_set_error_from_errno (error, errno); - if (flags == 0) - return TRUE; - - ecode = fcntl (fds0, F_SETFD, flags); - if (ecode == -1) - { - int saved_errno = errno; - close (fds0); - close (fds1); - return g_unix_set_error_from_errno (error, saved_errno); - } - ecode = fcntl (fds1, F_SETFD, flags); - if (ecode == -1) - { - int saved_errno = errno; - close (fds0); - close (fds1); - return g_unix_set_error_from_errno (error, saved_errno); - } return TRUE; }
View file
_service:tar_scm:glib-2.76.4.tar.xz/glib/glib-unixprivate.h
Added
@@ -0,0 +1,87 @@ +/* glib-unixprivate.h - Unix specific integration private functions + * + * SPDX-License-Identifier: LGPL-2.1-or-later + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this library; if not, see <http://www.gnu.org/licenses/>. + */ + +#ifndef __G_UNIXPRIVATE_H__ +#define __G_UNIXPRIVATE_H__ + +#include "config.h" + +#ifndef G_OS_UNIX +#error "This header may only be used on UNIX" +#endif + +/* To make bionic export pipe2() */ +#ifndef _GNU_SOURCE +#define _GNU_SOURCE 1 +#endif + +#include "gmacros.h" +#include "gtypes.h" + +#include <errno.h> +#include <fcntl.h> +#include <unistd.h> + +G_BEGIN_DECLS + +static inline gboolean +g_unix_open_pipe_internal (int *fds, + gboolean close_on_exec) + { +#ifdef HAVE_PIPE2 + do + { + int ecode; + + /* Atomic */ + ecode = pipe2 (fds, close_on_exec ? O_CLOEXEC : 0); + if (ecode == -1 && errno != ENOSYS) + return FALSE; + else if (ecode == 0) + return TRUE; + /* Fall through on -ENOSYS, we must be running on an old kernel */ + } + while (FALSE); +#endif + + if (pipe (fds) == -1) + return FALSE; + + if (!close_on_exec) + return TRUE; + + if (fcntl (fds0, F_SETFD, FD_CLOEXEC) == -1 || + fcntl (fds1, F_SETFD, FD_CLOEXEC) == -1) + { + int saved_errno = errno; + + close (fds0); + close (fds1); + fds0 = -1; + fds1 = -1; + + errno = saved_errno; + return FALSE; + } + + return TRUE; +} + +G_END_DECLS + +#endif /* __G_UNIXPRIVATE_H__ */
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/glib.h -> _service:tar_scm:glib-2.76.4.tar.xz/glib/glib.h
Changed
@@ -64,6 +64,7 @@ #include <glib/gmessages.h> #include <glib/gnode.h> #include <glib/goption.h> +#include <glib/gpathbuf.h> #include <glib/gpattern.h> #include <glib/gpoll.h> #include <glib/gprimes.h>
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/glibconfig.h.in -> _service:tar_scm:glib-2.76.4.tar.xz/glib/glibconfig.h.in
Changed
@@ -12,17 +12,19 @@ #include <float.h> #mesondefine GLIB_HAVE_ALLOCA_H +#mesondefine GLIB_STATIC_COMPILATION +#mesondefine GOBJECT_STATIC_COMPILATION +#mesondefine GIO_STATIC_COMPILATION +#mesondefine GMODULE_STATIC_COMPILATION +#mesondefine G_INTL_STATIC_COMPILATION +#mesondefine FFI_STATIC_BUILD + /* Specifies that GLib's g_print*() functions wrap the * system printf functions. This is useful to know, for example, * when using glibc's register_printf_function(). */ #mesondefine GLIB_USING_SYSTEM_PRINTF -#mesondefine GLIB_STATIC_COMPILATION -#mesondefine GOBJECT_STATIC_COMPILATION -#mesondefine G_INTL_STATIC_COMPILATION -#mesondefine FFI_STATIC_BUILD - G_BEGIN_DECLS #define G_MINFLOAT FLT_MIN @@ -116,6 +118,7 @@ @glib_os@ +#define G_VA_COPY va_copy @glib_vacopy@ #define G_HAVE_ISO_VARARGS 1 @@ -129,7 +132,6 @@ #endif #mesondefine G_HAVE_GROWING_STACK -#mesondefine G_HAVE_GNUC_VISIBILITY #ifndef _MSC_VER # define G_HAVE_GNUC_VARARGS 1 @@ -186,7 +188,13 @@ #define GLIB_SYSDEF_POLLERR =@g_pollerr@ #define GLIB_SYSDEF_POLLNVAL =@g_pollnval@ +/* No way to disable deprecation warnings for macros, so only emit deprecation + * warnings on platforms where usage of this macro is broken */ +#if defined(__APPLE__) || defined(_MSC_VER) || defined(__CYGWIN__) +#define G_MODULE_SUFFIX "@g_module_suffix@" GLIB_DEPRECATED_MACRO_IN_2_76 +#else #define G_MODULE_SUFFIX "@g_module_suffix@" +#endif typedef @g_pid_type@ GPid; #define G_PID_FORMAT @g_pid_format@
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/gmacros.h -> _service:tar_scm:glib-2.76.4.tar.xz/glib/gmacros.h
Changed
@@ -64,21 +64,64 @@ #define G_GNUC_EXTENSION #endif +#if !defined (__cplusplus) + +# undef G_CXX_STD_VERSION +# define G_CXX_STD_CHECK_VERSION(version) (0) + +# if defined (__STDC_VERSION__) +# define G_C_STD_VERSION __STDC_VERSION__ +# else +# define G_C_STD_VERSION 199000L +# endif /* defined (__STDC_VERSION__) */ + +# define G_C_STD_CHECK_VERSION(version) ( \ + ((version) >= 199000L && (version) <= G_C_STD_VERSION) || \ + ((version) == 89 && G_C_STD_VERSION >= 199000L) || \ + ((version) == 90 && G_C_STD_VERSION >= 199000L) || \ + ((version) == 99 && G_C_STD_VERSION >= 199901L) || \ + ((version) == 11 && G_C_STD_VERSION >= 201112L) || \ + ((version) == 17 && G_C_STD_VERSION >= 201710L) || \ + 0) + +#else /* defined (__cplusplus) */ + +# undef G_C_STD_VERSION +# define G_C_STD_CHECK_VERSION(version) (0) + +# if defined (_MSVC_LANG) +# define G_CXX_STD_VERSION (_MSVC_LANG > __cplusplus ? _MSVC_LANG : __cplusplus) +# else +# define G_CXX_STD_VERSION __cplusplus +# endif /* defined(_MSVC_LANG) */ + +# define G_CXX_STD_CHECK_VERSION(version) ( \ + ((version) >= 199711L && (version) <= G_CXX_STD_VERSION) || \ + ((version) == 98 && G_CXX_STD_VERSION >= 199711L) || \ + ((version) == 03 && G_CXX_STD_VERSION >= 199711L) || \ + ((version) == 11 && G_CXX_STD_VERSION >= 201103L) || \ + ((version) == 14 && G_CXX_STD_VERSION >= 201402L) || \ + ((version) == 17 && G_CXX_STD_VERSION >= 201703L) || \ + ((version) == 20 && G_CXX_STD_VERSION >= 202002L) || \ + 0) + +#endif /* !defined (__cplusplus) */ + /* Every compiler that we target supports inlining, but some of them may * complain about it if we don't say "__inline". If we have C99, or if - * we are using C++, then we can use "inline" directly. Unfortunately - * Visual Studio does not support __STDC_VERSION__, so we need to check - * whether we are on Visual Studio 2013 or earlier to see that we need to - * say "__inline" in C mode. + * we are using C++, then we can use "inline" directly. * Otherwise, we say "__inline" to avoid the warning. + * Unfortunately Visual Studio does not define __STDC_VERSION__ (if not + * using /std:cXX) so we need to check whether we are on Visual Studio 2013 + * or earlier to see whether we need to say "__inline" in C mode. */ #define G_CAN_INLINE -#ifndef __cplusplus +#ifdef G_C_STD_VERSION # ifdef _MSC_VER # if (_MSC_VER < 1900) # define G_INLINE_DEFINE_NEEDED # endif -# elif !defined(__STDC_VERSION__) || (__STDC_VERSION__ < 199900) +# elif !G_C_STD_CHECK_VERSION (99) # define G_INLINE_DEFINE_NEEDED # endif #endif @@ -129,22 +172,23 @@ */ #define g_macro__has_attribute(x) g_macro__has_attribute_##x -#define g_macro__has_attribute___pure__ G_GNUC_CHECK_VERSION (2, 96) -#define g_macro__has_attribute___malloc__ G_GNUC_CHECK_VERSION (2, 96) -#define g_macro__has_attribute___noinline__ G_GNUC_CHECK_VERSION (2, 96) -#define g_macro__has_attribute___sentinel__ G_GNUC_CHECK_VERSION (4, 0) #define g_macro__has_attribute___alloc_size__ G_GNUC_CHECK_VERSION (4, 3) +#define g_macro__has_attribute___always_inline__ G_GNUC_CHECK_VERSION (2, 0) +#define g_macro__has_attribute___const__ G_GNUC_CHECK_VERSION (2, 4) +#define g_macro__has_attribute___deprecated__ G_GNUC_CHECK_VERSION (3, 1) #define g_macro__has_attribute___format__ G_GNUC_CHECK_VERSION (2, 4) #define g_macro__has_attribute___format_arg__ G_GNUC_CHECK_VERSION (2, 4) +#define g_macro__has_attribute___malloc__ G_GNUC_CHECK_VERSION (2, 96) +#define g_macro__has_attribute___no_instrument_function__ G_GNUC_CHECK_VERSION (2, 4) +#define g_macro__has_attribute___noinline__ G_GNUC_CHECK_VERSION (2, 96) #define g_macro__has_attribute___noreturn__ (G_GNUC_CHECK_VERSION (2, 8) || (0x5110 <= __SUNPRO_C)) -#define g_macro__has_attribute___const__ G_GNUC_CHECK_VERSION (2, 4) +#define g_macro__has_attribute___pure__ G_GNUC_CHECK_VERSION (2, 96) +#define g_macro__has_attribute___sentinel__ G_GNUC_CHECK_VERSION (4, 0) #define g_macro__has_attribute___unused__ G_GNUC_CHECK_VERSION (2, 4) -#define g_macro__has_attribute___no_instrument_function__ G_GNUC_CHECK_VERSION (2, 4) +#define g_macro__has_attribute_cleanup G_GNUC_CHECK_VERSION (3, 3) #define g_macro__has_attribute_fallthrough G_GNUC_CHECK_VERSION (6, 0) -#define g_macro__has_attribute___deprecated__ G_GNUC_CHECK_VERSION (3, 1) #define g_macro__has_attribute_may_alias G_GNUC_CHECK_VERSION (3, 3) #define g_macro__has_attribute_warn_unused_result G_GNUC_CHECK_VERSION (3, 4) -#define g_macro__has_attribute_cleanup G_GNUC_CHECK_VERSION (3, 3) #endif @@ -819,34 +863,32 @@ #ifndef __GI_SCANNER__ /* The static assert macro really confuses the introspection parser */ #define G_PASTE_ARGS(identifier1,identifier2) identifier1 ## identifier2 #define G_PASTE(identifier1,identifier2) G_PASTE_ARGS (identifier1, identifier2) -#if !defined(__cplusplus) && defined(__STDC_VERSION__) && \ - (__STDC_VERSION__ >= 201112L || g_macro__has_feature(c_static_assert) || g_macro__has_extension(c_static_assert)) -#define G_STATIC_ASSERT(expr) _Static_assert (expr, "Expression evaluates to false") -#elif (defined(__cplusplus) && __cplusplus >= 201103L) || \ - (defined(__cplusplus) && defined (_MSC_VER) && (_MSC_VER >= 1600)) || \ - (defined (_MSC_VER) && (_MSC_VER >= 1800)) +#if G_CXX_STD_CHECK_VERSION (11) #define G_STATIC_ASSERT(expr) static_assert (expr, "Expression evaluates to false") +#elif (G_C_STD_CHECK_VERSION (11) || \ + g_macro__has_feature(c_static_assert) || g_macro__has_extension(c_static_assert)) +#define G_STATIC_ASSERT(expr) _Static_assert (expr, "Expression evaluates to false") #else #ifdef __COUNTER__ #define G_STATIC_ASSERT(expr) typedef char G_PASTE (_GStaticAssertCompileTimeAssertion_, __COUNTER__)(expr) ? 1 : -1 G_GNUC_UNUSED #else #define G_STATIC_ASSERT(expr) typedef char G_PASTE (_GStaticAssertCompileTimeAssertion_, __LINE__)(expr) ? 1 : -1 G_GNUC_UNUSED #endif -#endif /* __STDC_VERSION__ */ +#endif /* G_CXX_STD_CHECK_VERSION (11) */ #define G_STATIC_ASSERT_EXPR(expr) ((void) sizeof (char(expr) ? 1 : -1)) #endif /* !__GI_SCANNER__ */ /* Provide a string identifying the current code position */ -#if defined(__GNUC__) && (__GNUC__ < 3) && !defined(__cplusplus) +#if defined (__GNUC__) && (__GNUC__ < 3) && !defined (G_CXX_STD_VERSION) #define G_STRLOC __FILE__ ":" G_STRINGIFY (__LINE__) ":" __PRETTY_FUNCTION__ "()" #else #define G_STRLOC __FILE__ ":" G_STRINGIFY (__LINE__) #endif /* Provide a string identifying the current function, non-concatenatable */ -#if defined (__GNUC__) && defined (__cplusplus) +#if defined (__GNUC__) && defined (G_CXX_STD_VERSION) #define G_STRFUNC ((const char*) (__PRETTY_FUNCTION__)) -#elif defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L +#elif G_C_STD_CHECK_VERSION (99) #define G_STRFUNC ((const char*) (__func__)) #elif defined (__GNUC__) || (defined(_MSC_VER) && (_MSC_VER > 1300)) #define G_STRFUNC ((const char*) (__FUNCTION__)) @@ -855,7 +897,7 @@ #endif /* Guard C code in headers, while including them from C++ */ -#ifdef __cplusplus +#ifdef G_CXX_STD_VERSION #define G_BEGIN_DECLS extern "C" { #define G_END_DECLS } #else @@ -869,11 +911,13 @@ * defined then the current definition is correct. */ #ifndef NULL -# ifdef __cplusplus -# define NULL (0L) -# else /* !__cplusplus */ -# define NULL ((void*) 0) -# endif /* !__cplusplus */ +# if G_CXX_STD_CHECK_VERSION (11) +# define NULL (nullptr) +# elif defined (G_CXX_STD_VERSION) +# define NULL (0L) +# else +# define NULL ((void*) 0) +# endif /* G_CXX_STD_CHECK_VERSION (11) */ #endif #ifndef FALSE @@ -972,7 +1016,7 @@ * * Since: 2.60 */ -#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L && !defined(__cplusplus) +#if G_C_STD_CHECK_VERSION (11) #define G_ALIGNOF(type) _Alignof (type) \ GLIB_AVAILABLE_MACRO_IN_2_60 #else @@ -1024,18 +1068,18 @@ * evaluated when a header is included. This results in warnings in third party * code which includes glib.h, even if the third party code doesn’t use the new * macro itself. */ -#if g_macro__has_attribute(__noreturn__) +#if G_CXX_STD_CHECK_VERSION (11) + /* Use ISO C++11 syntax when the compiler supports it. */ +# define G_NORETURN noreturn +#elif g_macro__has_attribute(__noreturn__) /* For compatibility with G_NORETURN_FUNCPTR on clang, use __attribute__((__noreturn__)), not _Noreturn. */ # define G_NORETURN __attribute__ ((__noreturn__)) #elif defined (_MSC_VER) && (1200 <= _MSC_VER) /* Use MSVC specific syntax. */ # define G_NORETURN __declspec (noreturn) - /* Use ISO C++11 syntax when the compiler supports it. */ -#elif defined (__cplusplus) && __cplusplus >= 201103 -# define G_NORETURN noreturn /* Use ISO C11 syntax when the compiler supports it. */ -#elif defined (__STDC_VERSION__) && __STDC_VERSION__ >= 201112 +#elif G_C_STD_CHECK_VERSION (11) # define G_NORETURN _Noreturn #else # define G_NORETURN /* empty */ @@ -1103,7 +1147,7 @@ * code which includes glib.h, even if the third party code doesn’t use the new * macro itself. */ #if g_macro__has_attribute(__always_inline__) -# if defined (__cplusplus) && __cplusplus >= 201103L +# if G_CXX_STD_CHECK_VERSION (11) /* Use ISO C++11 syntax when the compiler supports it. */ # define G_ALWAYS_INLINE gnu::always_inline # else @@ -1111,7 +1155,11 @@ # endif #elif defined (_MSC_VER) /* Use MSVC specific syntax. */ -# define G_ALWAYS_INLINE __forceinline +# if G_CXX_STD_CHECK_VERSION (20) && _MSC_VER >= 1927 +# define G_ALWAYS_INLINE msvc::forceinline +# else +# define G_ALWAYS_INLINE __forceinline +# endif #else # define G_ALWAYS_INLINE /* empty */ #endif @@ -1147,16 +1195,24 @@ * code which includes glib.h, even if the third party code doesn’t use the new * macro itself. */ #if g_macro__has_attribute(__noinline__) -# if defined (__cplusplus) && __cplusplus >= 201103L +# if G_CXX_STD_CHECK_VERSION (11) /* Use ISO C++11 syntax when the compiler supports it. */ -# define G_NO_INLINE gnu::noinline +# if defined (__GNUC__) +# define G_NO_INLINE gnu::noinline +# elif defined (_MSC_VER) +# if G_CXX_STD_CHECK_VERSION (20) && _MSC_VER >= 1927 +# define G_NO_INLINE msvc::noinline +# else +# define G_NO_INLINE __declspec (noinline) +# endif +# endif # else # define G_NO_INLINE __attribute__ ((__noinline__)) # endif #elif defined (_MSC_VER) && (1200 <= _MSC_VER) /* Use MSVC specific syntax. */ -# if defined (__cplusplus) && __cplusplus >= 201103L /* Use ISO C++11 syntax when the compiler supports it. */ +# if G_CXX_STD_CHECK_VERSION (20) && _MSC_VER >= 1927 # define G_NO_INLINE msvc::noinline # else # define G_NO_INLINE __declspec (noinline) @@ -1174,15 +1230,16 @@ * putting assignments in g_return_if_fail (). */ #if G_GNUC_CHECK_VERSION(2, 0) && defined(__OPTIMIZE__) -#define _G_BOOLEAN_EXPR(expr) \ +#define _G_BOOLEAN_EXPR_IMPL(uniq, expr) \ G_GNUC_EXTENSION ({ \ - int _g_boolean_var_; \ + int G_PASTE (_g_boolean_var_, uniq); \ if (expr) \ - _g_boolean_var_ = 1; \ + G_PASTE (_g_boolean_var_, uniq) = 1; \ else \ - _g_boolean_var_ = 0; \ - _g_boolean_var_; \ + G_PASTE (_g_boolean_var_, uniq) = 0; \ + G_PASTE (_g_boolean_var_, uniq); \ }) +#define _G_BOOLEAN_EXPR(expr) _G_BOOLEAN_EXPR_IMPL (__COUNTER__, expr) #define G_LIKELY(expr) (__builtin_expect (_G_BOOLEAN_EXPR(expr), 1)) #define G_UNLIKELY(expr) (__builtin_expect (_G_BOOLEAN_EXPR(expr), 0)) #else @@ -1190,6 +1247,10 @@ #define G_UNLIKELY(expr) (expr) #endif +#if __GNUC__ >= 4 && !defined(_WIN32) && !defined(__CYGWIN__) +#define G_HAVE_GNUC_VISIBILITY 1 +#endif + /* GLIB_CANNOT_IGNORE_DEPRECATIONS is defined above for compilers that do not * have a way to temporarily suppress deprecation warnings. In these cases, * suppress the deprecated attribute altogether (otherwise a simple #include @@ -1223,28 +1284,12 @@ #define G_UNAVAILABLE(maj,min) G_DEPRECATED #endif -#ifndef _GLIB_EXTERN -#define _GLIB_EXTERN extern -#endif - /* These macros are used to mark deprecated symbols in GLib headers, * and thus have to be exposed in installed headers. But please * do *not* use them in other projects. Instead, use G_DEPRECATED * or define your own wrappers around it. */ -#ifdef GLIB_DISABLE_DEPRECATION_WARNINGS -#define GLIB_DEPRECATED _GLIB_EXTERN -#define GLIB_DEPRECATED_FOR(f) _GLIB_EXTERN -#define GLIB_UNAVAILABLE(maj,min) _GLIB_EXTERN -#define GLIB_UNAVAILABLE_STATIC_INLINE(maj,min) -#else -#define GLIB_DEPRECATED G_DEPRECATED _GLIB_EXTERN -#define GLIB_DEPRECATED_FOR(f) G_DEPRECATED_FOR(f) _GLIB_EXTERN -#define GLIB_UNAVAILABLE(maj,min) G_UNAVAILABLE(maj,min) _GLIB_EXTERN -#define GLIB_UNAVAILABLE_STATIC_INLINE(maj,min) G_UNAVAILABLE(maj,min) -#endif - #if !defined(GLIB_DISABLE_DEPRECATION_WARNINGS) && \ (G_GNUC_CHECK_VERSION(4, 6) || \ __clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >= 4)) @@ -1288,7 +1333,7 @@ #if g_macro__has_attribute(cleanup) -/* these macros are private */ +/* these macros are private; note that gstdio.h also uses _GLIB_CLEANUP */ #define _GLIB_AUTOPTR_FUNC_NAME(TypeName) glib_autoptr_cleanup_##TypeName #define _GLIB_AUTOPTR_CLEAR_FUNC_NAME(TypeName) glib_autoptr_clear_##TypeName #define _GLIB_AUTOPTR_TYPENAME(TypeName) TypeName##_autoptr
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/gmain.c -> _service:tar_scm:glib-2.76.4.tar.xz/glib/gmain.c
Changed
@@ -567,7 +567,7 @@ /** * g_main_context_ref: - * @context: a #GMainContext + * @context: (not nullable): a #GMainContext * * Increases the reference count on a #GMainContext object by one. * @@ -595,7 +595,7 @@ /** * g_main_context_unref: - * @context: a #GMainContext + * @context: (not nullable): a #GMainContext * * Decreases the reference count on a #GMainContext object by one. If * the result is zero, free the context and free all associated memory. @@ -787,12 +787,12 @@ /** * g_main_context_default: * - * Returns the global default main context. This is the main context + * Returns the global-default main context. This is the main context * used for main loop functions when a main loop is not explicitly * specified, and corresponds to the "main" main loop. See also * g_main_context_get_thread_default(). * - * Returns: (transfer none): the global default main context. + * Returns: (transfer none): the global-default main context. **/ GMainContext * g_main_context_default (void) @@ -809,7 +809,7 @@ #ifdef G_MAIN_POLL_DEBUG if (_g_main_poll_debug) - g_print ("default context=%p\n", context); + g_print ("global-default main context=%p\n", context); #endif g_once_init_leave (&default_main_context, context); @@ -840,14 +840,15 @@ /** * g_main_context_push_thread_default: - * @context: (nullable): a #GMainContext, or %NULL for the global default context + * @context: (nullable): a #GMainContext, or %NULL for the global-default + * main context * * Acquires @context and sets it as the thread-default context for the * current thread. This will cause certain asynchronous operations * (such as most giogio-based I/O) which are * started in this thread to run under @context and deliver their * results to its main loop, rather than running under the global - * default context in the main thread. Note that calling this function + * default main context in the main thread. Note that calling this function * changes the context returned by g_main_context_get_thread_default(), * not the one returned by g_main_context_default(), so it does not affect * the context used by functions like g_idle_add(). @@ -911,7 +912,8 @@ /** * g_main_context_pop_thread_default: - * @context: (nullable): a #GMainContext object, or %NULL + * @context: (nullable): a #GMainContext, or %NULL for the global-default + * main context * * Pops @context off the thread-default context stack (verifying that * it was on the top of the stack). @@ -956,7 +958,7 @@ * g_main_context_ref_thread_default() instead. * * Returns: (transfer none) (nullable): the thread-default #GMainContext, or - * %NULL if the thread-default context is the global default context. + * %NULL if the thread-default context is the global-default main context. * * Since: 2.22 **/ @@ -979,7 +981,7 @@ * g_main_context_get_thread_default(), but also adds a reference to * it with g_main_context_ref(). In addition, unlike * g_main_context_get_thread_default(), if the thread-default context - * is the global default context, this will return that #GMainContext + * is the global-default context, this will return that #GMainContext * (with a ref added to it) rather than returning %NULL. * * Returns: (transfer full): the thread-default #GMainContext. Unref @@ -1336,7 +1338,8 @@ /** * g_source_attach: * @source: a #GSource - * @context: (nullable): a #GMainContext (if %NULL, the default context will be used) + * @context: (nullable): a #GMainContext (if %NULL, the global-default + * main context will be used) * * Adds a #GSource to a @context so that it will be executed within * that context. Remove it by calling g_source_destroy(). @@ -2442,7 +2445,8 @@ /** * g_main_context_find_source_by_id: - * @context: (nullable): a #GMainContext (if %NULL, the default context will be used) + * @context: (nullable): a #GMainContext (if %NULL, the global-default + * main context will be used) * @source_id: the source ID, as returned by g_source_get_id(). * * Finds a #GSource given a pair of context and ID. @@ -2483,7 +2487,8 @@ /** * g_main_context_find_source_by_funcs_user_data: - * @context: (nullable): a #GMainContext (if %NULL, the default context will be used). + * @context: (nullable): a #GMainContext (if %NULL, the global-default + * main context will be used). * @funcs: the @source_funcs passed to g_source_new(). * @user_data: the user data from the callback. * @@ -2533,7 +2538,8 @@ /** * g_main_context_find_source_by_user_data: - * @context: a #GMainContext + * @context: (nullable): a #GMainContext (if %NULL, the global-default + * main context will be used) * @user_data: the user_data for the callback. * * Finds a source with the given user data for the callback. If @@ -3493,7 +3499,8 @@ /** * g_main_context_acquire: - * @context: a #GMainContext + * @context: (nullable): a #GMainContext (if %NULL, the global-default + * main context will be used) * * Tries to become the owner of the specified context. * If some other thread is the owner of the context, @@ -3505,6 +3512,9 @@ * You must be the owner of a context before you * can call g_main_context_prepare(), g_main_context_query(), * g_main_context_check(), g_main_context_dispatch(). + * + * Since 2.76 @context can be %NULL to use the global-default + * main context. * * Returns: %TRUE if the operation succeeded, and * this thread is now the owner of @context. @@ -3544,7 +3554,8 @@ /** * g_main_context_release: - * @context: a #GMainContext + * @context: (nullable): a #GMainContext (if %NULL, the global-default + * main context will be used) * * Releases ownership of a context previously acquired by this thread * with g_main_context_acquire(). If the context was acquired multiple @@ -3594,9 +3605,6 @@ GThread *self = G_THREAD_SELF; gboolean loop_internal_waiter; - if (context == NULL) - context = g_main_context_default (); - loop_internal_waiter = (mutex == &context->mutex); if (!loop_internal_waiter) @@ -3640,7 +3648,8 @@ /** * g_main_context_wait: - * @context: a #GMainContext + * @context: (nullable): a #GMainContext (if %NULL, the global-default + * main context will be used) * @cond: a condition variable * @mutex: a mutex, currently held * @@ -3679,7 +3688,8 @@ /** * g_main_context_prepare: - * @context: a #GMainContext + * @context: (nullable): a #GMainContext (if %NULL, the global-default + * main context will be used) * @priority: (out) (optional): location to store priority of highest priority * source already ready. * @@ -3855,7 +3865,8 @@ /** * g_main_context_query: - * @context: a #GMainContext + * @context: (nullable): a #GMainContext (if %NULL, the global-default + * main context will be used) * @max_priority: maximum priority source to check * @timeout_: (out): location to store timeout to be used in polling * @fds: (out caller-allocates) (array length=n_fds): location to @@ -3884,6 +3895,9 @@ gint n_poll; GPollRec *pollrec, *lastpollrec; gushort events; + + if (context == NULL) + context = g_main_context_default (); LOCK_CONTEXT (context); @@ -3950,7 +3964,8 @@ /** * g_main_context_check: - * @context: a #GMainContext + * @context: (nullable): a #GMainContext (if %NULL, the global-default + * main context will be used) * @max_priority: the maximum numerical priority of sources to check * @fds: (array length=n_fds): array of #GPollFD's that was passed to * the last call to g_main_context_query() @@ -3964,6 +3979,9 @@ * You must have successfully acquired the context with * g_main_context_acquire() before you may call this function. * + * Since 2.76 @context can be %NULL to use the global-default + * main context. + * * Returns: %TRUE if some sources are ready to be dispatched. **/ gboolean @@ -3977,6 +3995,9 @@ GPollRec *pollrec; gint n_ready = 0; gint i; + + if (context == NULL) + context = g_main_context_default (); LOCK_CONTEXT (context); @@ -4153,16 +4174,23 @@ /** * g_main_context_dispatch: - * @context: a #GMainContext + * @context: (nullable): a #GMainContext (if %NULL, the global-default + * main context will be used) * * Dispatches all pending sources. * * You must have successfully acquired the context with * g_main_context_acquire() before you may call this function. + * + * Since 2.76 @context can be %NULL to use the global-default + * main context. **/ void g_main_context_dispatch (GMainContext *context) { + if (context == NULL) + context = g_main_context_default (); + LOCK_CONTEXT (context); TRACE (GLIB_MAIN_CONTEXT_BEFORE_DISPATCH (context)); @@ -4260,7 +4288,8 @@ /** * g_main_context_pending: - * @context: (nullable): a #GMainContext (if %NULL, the default context will be used) + * @context: (nullable): a #GMainContext (if %NULL, the global-default + * main context will be used) * * Checks if any sources have pending events for the given context. * @@ -4283,7 +4312,8 @@ /** * g_main_context_iteration: - * @context: (nullable): a #GMainContext (if %NULL, the default context will be used) + * @context: (nullable): a #GMainContext (if %NULL, the global-default + * main context will be used) * @may_block: whether the call may block. * * Runs a single iteration for the given main loop. This involves @@ -4318,7 +4348,8 @@ /** * g_main_loop_new: - * @context: (nullable): a #GMainContext (if %NULL, the default context will be used). + * @context: (nullable): a #GMainContext (if %NULL, the global-default + * main context will be used). * @is_running: set to %TRUE to indicate that the loop is running. This * is not very important since calling g_main_loop_run() will set this to * %TRUE anyway. @@ -4612,7 +4643,8 @@ /** * g_main_context_add_poll: - * @context: (nullable): a #GMainContext (or %NULL for the default context) + * @context: (nullable): a #GMainContext (or %NULL for the global-default + * main context) * @fd: a #GPollFD structure holding information about a file * descriptor to watch. * @priority: the priority for this file descriptor which should be @@ -4686,7 +4718,8 @@ /** * g_main_context_remove_poll: - * @context:a #GMainContext + * @context: (nullable): a #GMainContext (if %NULL, the global-default + * main context will be used) * @fd: a #GPollFD descriptor previously added with g_main_context_add_poll() * * Removes file descriptor from the set of file descriptors to be @@ -4808,7 +4841,8 @@ /** * g_main_context_set_poll_func: - * @context: a #GMainContext + * @context: (nullable): a #GMainContext (if %NULL, the global-default + * main context will be used) * @func: the function to call to poll all file descriptors * * Sets the function to use to handle polling of file descriptors. It @@ -4840,7 +4874,8 @@ /** * g_main_context_get_poll_func: - * @context: a #GMainContext + * @context: (nullable): a #GMainContext (if %NULL, the global-default + * main context will be used) * * Gets the poll function set by g_main_context_set_poll_func(). * @@ -4865,7 +4900,8 @@ /** * g_main_context_wakeup: - * @context: a #GMainContext + * @context: (nullable): a #GMainContext (if %NULL, the global-default + * main context will be used) * * If @context is currently blocking in g_main_context_iteration() * waiting for a source to become ready, cause it to stop blocking @@ -4911,7 +4947,8 @@ /** * g_main_context_is_owner: - * @context: a #GMainContext + * @context: (nullable): a #GMainContext (if %NULL, the global-default + * main context will be used) * * Determines whether this thread holds the (recursive) * ownership of this #GMainContext. This is useful to @@ -6300,14 +6337,15 @@ /** * g_main_context_invoke: - * @context: (nullable): a #GMainContext, or %NULL + * @context: (nullable): a #GMainContext, or %NULL for the global-default + * main context * @function: function to call * @data: data to pass to @function * * Invokes a function in such a way that @context is owned during the * invocation of @function. * - * If @context is %NULL then the global default main context — as + * If @context is %NULL then the global-default main context — as * returned by g_main_context_default() — is used. * * If @context is owned by the current thread, @function is called @@ -6340,7 +6378,8 @@ /** * g_main_context_invoke_full: - * @context: (nullable): a #GMainContext, or %NULL + * @context: (nullable): a #GMainContext, or %NULL for the global-default + * main context * @priority: the priority at which to run @function * @function: function to call * @data: data to pass to @function
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/gmappedfile.c -> _service:tar_scm:glib-2.76.4.tar.xz/glib/gmappedfile.c
Changed
@@ -50,6 +50,10 @@ #endif +#ifndef O_CLOEXEC +#define O_CLOEXEC 0 +#endif + #include "gconvert.h" #include "gerror.h" #include "gfileutils.h" @@ -252,7 +256,7 @@ g_return_val_if_fail (filename != NULL, NULL); g_return_val_if_fail (!error || *error == NULL, NULL); - fd = g_open (filename, (writable ? O_RDWR : O_RDONLY) | _O_BINARY, 0); + fd = g_open (filename, (writable ? O_RDWR : O_RDONLY) | _O_BINARY | O_CLOEXEC, 0); if (fd == -1) { int save_errno = errno;
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/gmarkup.c -> _service:tar_scm:glib-2.76.4.tar.xz/glib/gmarkup.c
Changed
@@ -85,6 +85,11 @@ * - Character references * * - Sections marked as CDATA + + * ## An example parser # {#example} + * + * Here is an example for a markup parser: + * markup-example.c(https://gitlab.gnome.org/GNOME/glib/-/blob/HEAD/glib/tests/markup-example.c) */ G_DEFINE_QUARK (g-markup-error-quark, g_markup_error) @@ -195,13 +200,6 @@ context->spare_list_nodes = g_slist_concat (node, context->spare_list_nodes); } -static inline void -string_blank (GString *string) -{ - string->str0 = '\0'; - string->len = 0; -} - /** * g_markup_parse_context_new: * @parser: a #GMarkupParser @@ -856,7 +854,7 @@ g_string_free (str, TRUE); return; } - string_blank (str); + g_string_truncate (str, 0); node = get_list_node (context, str); context->spare_chunks = g_slist_concat (node, context->spare_chunks); } @@ -881,7 +879,7 @@ } if (text_start != text_end) - g_string_insert_len (context->partial_chunk, -1, + g_string_append_len (context->partial_chunk, text_start, text_end - text_start); } @@ -889,7 +887,7 @@ truncate_partial (GMarkupParseContext *context) { if (context->partial_chunk != NULL) - string_blank (context->partial_chunk); + g_string_truncate (context->partial_chunk, 0); } static inline const gchar* @@ -2530,7 +2528,7 @@ /* Use them to format the arguments */ - G_VA_COPY (args2, args); + va_copy (args2, args); output1 = g_strdup_vprintf (format1->str, args);
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/gmem.c -> _service:tar_scm:glib-2.76.4.tar.xz/glib/gmem.c
Changed
@@ -220,6 +220,9 @@ * * Frees the memory pointed to by @mem. * + * If you know the allocated size of @mem, calling g_free_sized() may be faster, + * depending on the libc implementation in use. + * * If @mem is %NULL it simply returns, so there is no need to check @mem * against %NULL before calling this function. */ @@ -231,9 +234,36 @@ } /** + * g_free_sized: + * @mem: (nullable): the memory to free + * @size: size of @mem, in bytes + * + * Frees the memory pointed to by @mem, assuming it is has the given @size. + * + * If @mem is %NULL this is a no-op (and @size is ignored). + * + * It is an error if @size doesn’t match the size passed when @mem was + * allocated. @size is passed to this function to allow optimizations in the + * allocator. If you don’t know the allocation size, use g_free() instead. + * + * Since: 2.76 + */ +void +g_free_sized (void *mem, + size_t size) +{ +#ifdef HAVE_FREE_SIZED + free_sized (mem, size); +#else + free (mem); +#endif + TRACE (GLIB_MEM_FREE ((void*) mem)); +} + +/** * g_clear_pointer: (skip) - * @pp: (not nullable): a pointer to a variable, struct member etc. holding a - * pointer + * @pp: (nullable) (not optional) (inout) (transfer full): a pointer to a + * variable, struct member etc. holding a pointer * @destroy: a function to which a gpointer can be passed, to destroy *@pp * * Clears a reference to a variable. @@ -578,7 +608,7 @@ * the program is terminated. * * Aligned memory allocations returned by this function can only be - * freed using g_aligned_free(). + * freed using g_aligned_free_sized() or g_aligned_free(). * * Returns: (transfer full): the allocated memory * @@ -702,3 +732,33 @@ { aligned_free (mem); } + +/** + * g_aligned_free_sized: + * @mem: (nullable): the memory to free + * @alignment: alignment of @mem + * @size: size of @mem, in bytes + * + * Frees the memory pointed to by @mem, assuming it is has the given @size and + * @alignment. + * + * If @mem is %NULL this is a no-op (and @size is ignored). + * + * It is an error if @size doesn’t match the size, or @alignment doesn’t match + * the alignment, passed when @mem was allocated. @size and @alignment are + * passed to this function to allow optimizations in the allocator. If you + * don’t know either of them, use g_aligned_free() instead. + * + * Since: 2.76 + */ +void +g_aligned_free_sized (void *mem, + size_t alignment, + size_t size) +{ +#ifdef HAVE_FREE_ALIGNED_SIZED + free_aligned_sized (mem, alignment, size); +#else + aligned_free (mem); +#endif +}
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/gmem.h -> _service:tar_scm:glib-2.76.4.tar.xz/glib/gmem.h
Changed
@@ -72,6 +72,9 @@ GLIB_AVAILABLE_IN_ALL void g_free (gpointer mem); +GLIB_AVAILABLE_IN_2_76 +void g_free_sized (gpointer mem, + size_t size); GLIB_AVAILABLE_IN_2_34 void g_clear_pointer (gpointer *pp, @@ -123,6 +126,10 @@ gsize alignment) G_GNUC_WARN_UNUSED_RESULT G_GNUC_ALLOC_SIZE2(1,2); GLIB_AVAILABLE_IN_2_72 void g_aligned_free (gpointer mem); +GLIB_AVAILABLE_IN_2_76 +void g_aligned_free_sized (gpointer mem, + size_t alignment, + size_t size); #if defined(glib_typeof) && GLIB_VERSION_MAX_ALLOWED >= GLIB_VERSION_2_58 #define g_clear_pointer(pp, destroy) \
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/gmessages.c -> _service:tar_scm:glib-2.76.4.tar.xz/glib/gmessages.c
Changed
@@ -192,6 +192,7 @@ #include "gcharset.h" #include "gconvert.h" #include "genviron.h" +#include "glib-private.h" #include "gmain.h" #include "gmem.h" #include "gprintfint.h" @@ -219,22 +220,6 @@ #define ENABLE_VIRTUAL_TERMINAL_PROCESSING 0x0004 #endif -#if defined (_MSC_VER) && (_MSC_VER >=1400) -/* This is ugly, but we need it for isatty() in case we have bad fd's, - * otherwise Windows will abort() the program on msvcrt80.dll and later - */ -#include <crtdbg.h> - -_GLIB_EXTERN void -myInvalidParameterHandler(const wchar_t *expression, - const wchar_t *function, - const wchar_t *file, - unsigned int line, - uintptr_t pReserved) -{ -} -#endif - #include "gwin32.h" #endif @@ -516,12 +501,14 @@ GLogHandler *next; }; +static void g_default_print_func (const gchar *string); +static void g_default_printerr_func (const gchar *string); /* --- variables --- */ static GMutex g_messages_lock; static GLogDomain *g_log_domains = NULL; -static GPrintFunc glib_print_func = NULL; -static GPrintFunc glib_printerr_func = NULL; +static GPrintFunc glib_print_func = g_default_print_func; +static GPrintFunc glib_printerr_func = g_default_printerr_func; static GPrivate g_log_depth; static GPrivate g_log_structured_depth; static GLogFunc default_log_func = g_log_default_handler; @@ -536,6 +523,11 @@ /* --- functions --- */ static void _g_log_abort (gboolean breakpoint); +static inline const char * format_string (const char *format, + va_list args, + char **out_allocated_string) + G_GNUC_PRINTF (1, 0); +static inline FILE * log_level_to_file (GLogLevelFlags log_level); static void _g_log_abort (gboolean breakpoint) @@ -1217,8 +1209,6 @@ GLogLevelFlags log_level, gboolean use_color) { - gboolean to_stdout = !gmessages_use_stderr; - /* we may not call _any_ GLib functions here */ strcpy (level_prefix, log_level_to_color (log_level, use_color)); @@ -1227,19 +1217,15 @@ { case G_LOG_LEVEL_ERROR: strcat (level_prefix, "ERROR"); - to_stdout = FALSE; break; case G_LOG_LEVEL_CRITICAL: strcat (level_prefix, "CRITICAL"); - to_stdout = FALSE; break; case G_LOG_LEVEL_WARNING: strcat (level_prefix, "WARNING"); - to_stdout = FALSE; break; case G_LOG_LEVEL_MESSAGE: strcat (level_prefix, "Message"); - to_stdout = FALSE; break; case G_LOG_LEVEL_INFO: strcat (level_prefix, "INFO"); @@ -1269,7 +1255,7 @@ if ((log_level & G_LOG_FLAG_FATAL) != 0 && !g_test_initialized ()) win32_keep_fatal_message = TRUE; #endif - return to_stdout ? stdout : stderr; + return log_level_to_file (log_level); } typedef struct { @@ -1309,7 +1295,8 @@ { gboolean was_fatal = (log_level & G_LOG_FLAG_FATAL) != 0; gboolean was_recursion = (log_level & G_LOG_FLAG_RECURSION) != 0; - gchar buffer1025, *msg, *msg_alloc = NULL; + char buffer1025, *msg_alloc = NULL; + const char *msg; gint i; log_level &= G_LOG_LEVEL_MASK; @@ -1327,7 +1314,9 @@ msg = buffer; } else - msg = msg_alloc = g_strdup_vprintf (format, args); + { + msg = format_string (format, args, &msg_alloc); + } if (expected_messages) { @@ -1495,7 +1484,7 @@ return "5"; } -static FILE * +static inline FILE * log_level_to_file (GLogLevelFlags log_level) { if (gmessages_use_stderr) @@ -1798,7 +1787,7 @@ } else { - message = message_allocated = g_strdup_vprintf (format, args); + message = format_string (format, args, &message_allocated); } /* Add MESSAGE, PRIORITY and GLIB_DOMAIN. */ @@ -2042,7 +2031,7 @@ } else { - fields4.value = message_allocated = g_strdup_vprintf (message_format, args); + fields4.value = format_string (message_format, args, &message_allocated); } va_end (args); @@ -2111,12 +2100,7 @@ { #ifdef G_OS_WIN32 gboolean result = FALSE; - -#if (defined (_MSC_VER) && _MSC_VER >= 1400) - _invalid_parameter_handler oldHandler, newHandler; - int prev_report_mode = 0; -#endif - + GWin32InvalidParameterHandler handler; #endif g_return_val_if_fail (output_fd >= 0, FALSE); @@ -2143,17 +2127,7 @@ */ #ifdef G_OS_WIN32 -#if (defined (_MSC_VER) && _MSC_VER >= 1400) - /* Set up our empty invalid parameter handler, for isatty(), - * in case of bad fd's passed in for isatty(), so that - * msvcrt80.dll+ won't abort the program - */ - newHandler = myInvalidParameterHandler; - oldHandler = _set_invalid_parameter_handler (newHandler); - - /* Disable the message box for assertions. */ - prev_report_mode = _CrtSetReportMode(_CRT_ASSERT, 0); -#endif + g_win32_push_empty_invalid_parameter_handler (&handler); if (g_win32_check_windows_version (10, 0, 0, G_WIN32_OS_ANY)) { @@ -2185,10 +2159,7 @@ result = win32_is_pipe_tty (output_fd); reset_invalid_param_handler: -#if defined (_MSC_VER) && (_MSC_VER >= 1400) - _CrtSetReportMode(_CRT_ASSERT, prev_report_mode); - _set_invalid_parameter_handler (oldHandler); -#endif + g_win32_pop_invalid_parameter_handler (&handler); return result; #else @@ -3168,6 +3139,7 @@ write_string (stream, level_prefix); write_string (stream, ": "); write_string (stream, message); + write_string (stream, "\n"); } static void @@ -3314,29 +3286,32 @@ /** * g_set_print_handler: - * @func: the new print handler + * @func: (nullable): the new print handler or %NULL to + * reset to the default * - * Sets the print handler. + * Sets the print handler to @func, or resets it to the + * default GLib handler if %NULL. * * Any messages passed to g_print() will be output via - * the new handler. The default handler simply outputs - * the message to stdout. By providing your own handler + * the new handler. The default handler outputs + * the encoded message to stdout. By providing your own handler * you can redirect the output, to a GTK+ widget or a * log file for example. * - * Returns: the old print handler + * Since 2.76 this functions always returns a valid + * #GPrintFunc, and never returns %NULL. If no custom + * print handler was set, it will return the GLib + * default print handler and that can be re-used to + * decorate its output and/or to write to stderr + * in all platforms. Before GLib 2.76, this was %NULL. + * + * Returns: (not nullable): the old print handler */ GPrintFunc g_set_print_handler (GPrintFunc func) { - GPrintFunc old_print_func; - - g_mutex_lock (&g_messages_lock); - old_print_func = glib_print_func; - glib_print_func = func; - g_mutex_unlock (&g_messages_lock); - - return old_print_func; + return g_atomic_pointer_exchange (&glib_print_func, + func ? func : g_default_print_func); } static void @@ -3368,13 +3343,47 @@ fflush (stream); } +G_ALWAYS_INLINE static inline const char * +format_string (const char *format, + va_list args, + char **out_allocated_string) +{ +#ifdef G_ENABLE_DEBUG + g_assert (out_allocated_string != NULL); +#endif + + /* If there is no formatting to be done, avoid an allocation */ + if (strchr (format, '%') == NULL) + { + *out_allocated_string = NULL; + return format; + } + else + { + *out_allocated_string = g_strdup_vprintf (format, args); + return *out_allocated_string; + } +} + +static void +g_default_print_func (const gchar *string) +{ + print_string (stdout, string); +} + +static void +g_default_printerr_func (const gchar *string) +{ + print_string (stderr, string); +} + /** * g_print: * @format: the message format. See the printf() documentation * @...: the parameters to insert into the format string * * Outputs a formatted message via the print handler. - * The default print handler simply outputs the message to stdout, without + * The default print handler outputs the encoded message to stdout, without * appending a trailing new-line character. Typically, @format should end with * its own new-line character. * @@ -3389,52 +3398,49 @@ ...) { va_list args; - gchar *string; + const gchar *string; + gchar *free_me = NULL; GPrintFunc local_glib_print_func; g_return_if_fail (format != NULL); va_start (args, format); - string = g_strdup_vprintf (format, args); + string = format_string (format, args, &free_me); va_end (args); - g_mutex_lock (&g_messages_lock); - local_glib_print_func = glib_print_func; - g_mutex_unlock (&g_messages_lock); - - if (local_glib_print_func) - local_glib_print_func (string); - else - print_string (stdout, string); - - g_free (string); + local_glib_print_func = g_atomic_pointer_get (&glib_print_func); + local_glib_print_func (string); + g_free (free_me); } /** * g_set_printerr_handler: - * @func: the new error message handler + * @func: (nullable): he new error message handler or %NULL + * to reset to the default * - * Sets the handler for printing error messages. + * Sets the handler for printing error messages to @func, + * or resets it to the default GLib handler if %NULL. * * Any messages passed to g_printerr() will be output via - * the new handler. The default handler simply outputs the + * the new handler. The default handler outputs the encoded * message to stderr. By providing your own handler you can * redirect the output, to a GTK+ widget or a log file for * example. * - * Returns: the old error message handler + * Since 2.76 this functions always returns a valid + * #GPrintFunc, and never returns %NULL. If no custom error + * print handler was set, it will return the GLib default + * error print handler and that can be re-used to decorate + * its output and/or to write to stderr in all platforms. + * Before GLib 2.76, this was %NULL. + * + * Returns: (not nullable): the old error message handler */ GPrintFunc g_set_printerr_handler (GPrintFunc func) { - GPrintFunc old_printerr_func; - - g_mutex_lock (&g_messages_lock); - old_printerr_func = glib_printerr_func; - glib_printerr_func = func; - g_mutex_unlock (&g_messages_lock); - - return old_printerr_func; + return g_atomic_pointer_exchange (&glib_printerr_func, + func ? func : g_default_printerr_func); } /** @@ -3443,7 +3449,7 @@ * @...: the parameters to insert into the format string * * Outputs a formatted message via the error message handler. - * The default handler simply outputs the message to stderr, without appending + * The default handler outputs the encoded message to stderr, without appending * a trailing new-line character. Typically, @format should end with its own * new-line character. * @@ -3456,25 +3462,19 @@ ...) { va_list args; - gchar *string; + const char *string; + char *free_me = NULL; GPrintFunc local_glib_printerr_func; g_return_if_fail (format != NULL); va_start (args, format); - string = g_strdup_vprintf (format, args); + string = format_string (format, args, &free_me); va_end (args); - g_mutex_lock (&g_messages_lock); - local_glib_printerr_func = glib_printerr_func; - g_mutex_unlock (&g_messages_lock); - - if (local_glib_printerr_func) - local_glib_printerr_func (string); - else - print_string (stderr, string); - - g_free (string); + local_glib_printerr_func = g_atomic_pointer_get (&glib_printerr_func); + local_glib_printerr_func (string); + g_free (free_me); } /**
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/gmessages.h -> _service:tar_scm:glib-2.76.4.tar.xz/glib/gmessages.h
Changed
@@ -291,8 +291,8 @@ int line, const char *func, const char *warnexpr) G_ANALYZER_NORETURN; -GLIB_DEPRECATED G_NORETURN +GLIB_DEPRECATED void g_assert_warning (const char *log_domain, const char *file, const int line, @@ -409,7 +409,7 @@ format) #endif #else /* no varargs macros */ -static G_NORETURN void g_error (const gchar *format, ...) G_ANALYZER_NORETURN; +G_NORETURN static void g_error (const gchar *format, ...) G_ANALYZER_NORETURN; static void g_critical (const gchar *format, ...) G_ANALYZER_NORETURN; static inline void
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/gnode.c -> _service:tar_scm:glib-2.76.4.tar.xz/glib/gnode.c
Changed
@@ -868,7 +868,7 @@ /** * GNodeTraverseFunc: * @node: a #GNode. - * @user_data: user data passed to g_node_traverse(). + * @data: user data passed to g_node_traverse(). * * Specifies the type of function passed to g_node_traverse(). The * function is called with each of the nodes visited, together with the @@ -1245,7 +1245,7 @@ /** * GNodeForeachFunc: * @node: a #GNode. - * @user_data: user data passed to g_node_children_foreach(). + * @data: user data passed to g_node_children_foreach(). * * Specifies the type of function passed to g_node_children_foreach(). * The function is called with each child node, together with the user
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/gnode.h -> _service:tar_scm:glib-2.76.4.tar.xz/glib/gnode.h
Changed
@@ -58,9 +58,9 @@ } GTraverseType; typedef gboolean (*GNodeTraverseFunc) (GNode *node, - gpointer user_data); + gpointer data); typedef void (*GNodeForeachFunc) (GNode *node, - gpointer user_data); + gpointer data); /* N-way tree implementation */
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/gnulib/meson.build -> _service:tar_scm:glib-2.76.4.tar.xz/glib/gnulib/meson.build
Changed
@@ -3,6 +3,13 @@ extra_gnulib_args = cc.get_supported_arguments( '-Wno-format-nonliteral', '-Wno-duplicated-branches') +if host_system == 'windows' and cc.get_id() == 'clang' + extra_gnulib_args += cc.get_supported_arguments( + '-Wno-unused-but-set-variable', + '-Wno-implicit-fallthrough', + ) +endif + math_h_config = configuration_data () unneeded_funcs = @@ -362,10 +369,19 @@ gnulib_sources += other_needed_math_sources +# g-gnulib.h includes glib.h that requires some headers to be generated +gnulib_sources += + 'g-gnulib.h', + glib_built_headers, + + gnulib_lib = static_library('gnulib', gnulib_sources, dependencies : libm, include_directories : configinc, glibinc, include_directories ('.'), pic : true, - c_args : '-DGCC_LINT=1', '-DLIBDIR="@0@"'.format(glib_libdir), '-DGLIB_COMPILATION', '-DG_LOG_DOMAIN="GLib"' + glib_hidden_visibility_args + extra_gnulib_args) + c_args : '-DGCC_LINT=1', '-DLIBDIR="@0@"'.format(glib_libdir), '-DG_LOG_DOMAIN="GLib"', + glib_c_args_internal, extra_gnulib_args, + gnu_symbol_visibility : 'hidden', +) gnulib_libm_dependency = libm
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/goption.c -> _service:tar_scm:glib-2.76.4.tar.xz/glib/goption.c
Changed
@@ -20,7 +20,7 @@ */ /** - * SECTION:option + * SECTION:goptioncontext * @Short_description: parses commandline options * @Title: Commandline option parser *
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/goption.h -> _service:tar_scm:glib-2.76.4.tar.xz/glib/goption.h
Changed
@@ -138,8 +138,8 @@ * single dash followed by a single letter (for a short name) or two dashes * followed by a long option name. * @value: The value to be parsed. - * @user_data: User data added to the #GOptionGroup containing the option when - * it was created with g_option_group_new() + * @data: User data added to the #GOptionGroup containing the option when it + * was created with g_option_group_new() * @error: A return location for errors. The error code %G_OPTION_ERROR_FAILED * is intended to be used for errors in #GOptionArgFunc callbacks. * @@ -151,15 +151,15 @@ */ typedef gboolean (*GOptionArgFunc) (const gchar *option_name, const gchar *value, - gpointer user_data, + gpointer data, GError **error); /** * GOptionParseFunc: * @context: The active #GOptionContext * @group: The group to which the function belongs - * @user_data: User data added to the #GOptionGroup containing the option when - * it was created with g_option_group_new() + * @data: User data added to the #GOptionGroup containing the option when it + * was created with g_option_group_new() * @error: A return location for error details * * The type of function that can be called before and after parsing. @@ -169,22 +169,22 @@ */ typedef gboolean (*GOptionParseFunc) (GOptionContext *context, GOptionGroup *group, - gpointer user_data, + gpointer data, GError **error); /** * GOptionErrorFunc: * @context: The active #GOptionContext * @group: The group to which the function belongs - * @user_data: User data added to the #GOptionGroup containing the option when - * it was created with g_option_group_new() + * @data: User data added to the #GOptionGroup containing the option when it + * was created with g_option_group_new() * @error: The #GError containing details about the parse error * * The type of function to be used as callback when a parse error occurs. */ typedef void (*GOptionErrorFunc) (GOptionContext *context, GOptionGroup *group, - gpointer user_data, + gpointer data, GError **error); /**
View file
_service:tar_scm:glib-2.76.4.tar.xz/glib/gpathbuf.c
Added
@@ -0,0 +1,598 @@ +/* gpathbuf.c: A mutable path builder + * + * SPDX-FileCopyrightText: 2023 Emmanuele Bassi + * SPDX-License-Identifier: LGPL-2.1-or-later + */ + +#include "config.h" + +#include "gpathbuf.h" + +#include "garray.h" +#include "gfileutils.h" +#include "ghash.h" +#include "gmessages.h" +#include "gstrfuncs.h" + +/** + * SECTION:gpathbuf + * @Title: GPathBuf + * @Short_description: A mutable path builder + * + * `GPathBuf` is a helper type that allows you to easily build paths from + * individual elements, using the platform specific conventions for path + * separators. + * + * |<!-- language="C" --> + * g_auto (GPathBuf) path; + * + * g_path_buf_init (&path); + * + * g_path_buf_push (&path, "usr"); + * g_path_buf_push (&path, "bin"); + * g_path_buf_push (&path, "echo"); + * + * g_autofree char *echo = g_path_buf_to_path (&path); + * g_assert_cmpstr (echo, ==, "/usr/bin/echo"); + * | + * + * You can also load a full path and then operate on its components: + * + * |<!-- language="C" --> + * g_auto (GPathBuf) path; + * + * g_path_buf_init_from_path (&path, "/usr/bin/echo"); + * + * g_path_buf_pop (&path); + * g_path_buf_push (&path, "sh"); + * + * g_autofree char *sh = g_path_buf_to_path (&path); + * g_assert_cmpstr (sh, ==, "/usr/bin/sh"); + * | + * + * `GPathBuf` is available since GLib 2.76. + */ + +typedef struct { + /* (nullable) (owned) (element-type filename) */ + GPtrArray *path; + + /* (nullable) (owned) */ + char *extension; + + gpointer padding6; +} RealPathBuf; + +G_STATIC_ASSERT (sizeof (GPathBuf) == sizeof (RealPathBuf)); + +#define PATH_BUF(b) ((RealPathBuf *) (b)) + +/** + * g_path_buf_init: + * @buf: a path buffer + * + * Initializes a `GPathBuf` instance. + * + * Returns: (transfer none): the initialized path builder + * + * Since: 2.76 + */ +GPathBuf * +g_path_buf_init (GPathBuf *buf) +{ + RealPathBuf *rbuf = PATH_BUF (buf); + + rbuf->path = NULL; + rbuf->extension = NULL; + + return buf; +} + +/** + * g_path_buf_init_from_path: + * @buf: a path buffer + * @path: (type filename) (nullable): a file system path + * + * Initializes a `GPathBuf` instance with the given path. + * + * Returns: (transfer none): the initialized path builder + * + * Since: 2.76 + */ +GPathBuf * +g_path_buf_init_from_path (GPathBuf *buf, + const char *path) +{ + g_return_val_if_fail (buf != NULL, NULL); + g_return_val_if_fail (path == NULL || *path != '\0', NULL); + + g_path_buf_init (buf); + + if (path == NULL) + return buf; + else + return g_path_buf_push (buf, path); +} + +/** + * g_path_buf_clear: + * @buf: a path buffer + * + * Clears the contents of the path buffer. + * + * This function should be use to free the resources in a stack-allocated + * `GPathBuf` initialized using g_path_buf_init() or + * g_path_buf_init_from_path(). + * + * Since: 2.76 + */ +void +g_path_buf_clear (GPathBuf *buf) +{ + RealPathBuf *rbuf = PATH_BUF (buf); + + g_return_if_fail (buf != NULL); + + g_clear_pointer (&rbuf->path, g_ptr_array_unref); + g_clear_pointer (&rbuf->extension, g_free); +} + +/** + * g_path_buf_clear_to_path: + * @buf: a path buffer + * + * Clears the contents of the path buffer and returns the built path. + * + * This function returns `NULL` if the `GPathBuf` is empty. + * + * See also: g_path_buf_to_path() + * + * Returns: (transfer full) (nullable) (type filename): the built path + * + * Since: 2.76 + */ +char * +g_path_buf_clear_to_path (GPathBuf *buf) +{ + char *res; + + g_return_val_if_fail (buf != NULL, NULL); + + res = g_path_buf_to_path (buf); + g_path_buf_clear (buf); + + return g_steal_pointer (&res); +} + +/** + * g_path_buf_new: + * + * Allocates a new `GPathBuf`. + * + * Returns: (transfer full): the newly allocated path buffer + * + * Since: 2.76 + */ +GPathBuf * +g_path_buf_new (void) +{ + return g_path_buf_init (g_new (GPathBuf, 1)); +} + +/** + * g_path_buf_new_from_path: + * @path: (type filename) (nullable): the path used to initialize the buffer + * + * Allocates a new `GPathBuf` with the given @path. + * + * Returns: (transfer full): the newly allocated path buffer + * + * Since: 2.76 + */ +GPathBuf * +g_path_buf_new_from_path (const char *path) +{ + return g_path_buf_init_from_path (g_new (GPathBuf, 1), path); +} + +/** + * g_path_buf_free: + * @buf: (transfer full) (not nullable): a path buffer + * + * Frees a `GPathBuf` allocated by g_path_buf_new(). + * + * Since: 2.76 + */ +void +g_path_buf_free (GPathBuf *buf) +{ + g_return_if_fail (buf != NULL); + + g_path_buf_clear (buf); + g_free (buf); +} + +/** + * g_path_buf_free_to_path: + * @buf: (transfer full) (not nullable): a path buffer + * + * Frees a `GPathBuf` allocated by g_path_buf_new(), and + * returns the path inside the buffer. + * + * This function returns `NULL` if the `GPathBuf` is empty. + * + * See also: g_path_buf_to_path() + * + * Returns: (transfer full) (nullable) (type filename): the path + * + * Since: 2.76 + */ +char * +g_path_buf_free_to_path (GPathBuf *buf) +{ + char *res; + + g_return_val_if_fail (buf != NULL, NULL); + + res = g_path_buf_clear_to_path (buf); + g_path_buf_free (buf); + + return g_steal_pointer (&res); +} + +/** + * g_path_buf_copy: + * @buf: (not nullable): a path buffer + * + * Copies the contents of a path buffer into a new `GPathBuf`. + * + * Returns: (transfer full): the newly allocated path buffer + * + * Since: 2.76 + */ +GPathBuf * +g_path_buf_copy (GPathBuf *buf) +{ + RealPathBuf *rbuf = PATH_BUF (buf); + RealPathBuf *rcopy; + GPathBuf *copy; + + g_return_val_if_fail (buf != NULL, NULL); + + copy = g_path_buf_new (); + rcopy = PATH_BUF (copy); + + if (rbuf->path != NULL) + { + rcopy->path = g_ptr_array_new_null_terminated (rbuf->path->len, g_free, TRUE); + for (guint i = 0; i < rbuf->path->len; i++) + { + const char *p = g_ptr_array_index (rbuf->path, i); + + if (p != NULL) + g_ptr_array_add (rcopy->path, g_strdup (p)); + } + } + + rcopy->extension = g_strdup (rbuf->extension); + + return copy; +} + +/** + * g_path_buf_push: + * @buf: a path buffer + * @path: (type filename): a path + * + * Extends the given path buffer with @path. + * + * If @path is absolute, it replaces the current path. + * + * If @path contains a directory separator, the buffer is extended by + * as many elements the path provides. + * + * On Windows, both forward slashes and backslashes are treated as + * directory separators. On other platforms, %G_DIR_SEPARATOR_S is the + * only directory separator. + * + * |<!-- language="C" --> + * GPathBuf buf, cmp; + * + * g_path_buf_init_from_path (&buf, "/tmp"); + * g_path_buf_push (&buf, ".X11-unix/X0"); + * g_path_buf_init_from_path (&cmp, "/tmp/.X11-unix/X0"); + * g_assert_true (g_path_buf_equal (&buf, &cmp)); + * g_path_buf_clear (&cmp); + * + * g_path_buf_push (&buf, "/etc/locale.conf"); + * g_path_buf_init_from_path (&cmp, "/etc/locale.conf"); + * g_assert_true (g_path_buf_equal (&buf, &cmp)); + * g_path_buf_clear (&cmp); + * + * g_path_buf_clear (&buf); + * | + * + * Returns: (transfer none): the same pointer to @buf, for convenience + * + * Since: 2.76 + */ +GPathBuf * +g_path_buf_push (GPathBuf *buf, + const char *path) +{ + RealPathBuf *rbuf = PATH_BUF (buf); + + g_return_val_if_fail (buf != NULL, NULL); + g_return_val_if_fail (path != NULL && *path != '\0', buf); + + if (g_path_is_absolute (path)) + { +#ifdef G_OS_WIN32 + char **elements = g_strsplit_set (path, "\\/", -1); +#else + char **elements = g_strsplit (path, G_DIR_SEPARATOR_S, -1); +#endif + +#ifdef G_OS_UNIX + /* strsplit() will add an empty element for the leading root, + * which will cause the path build to ignore it; to avoid it, + * we re-inject the root as the first element. + * + * The first string is empty, but it's still allocated, so we + * need to free it to avoid leaking it. + */ + g_free (elements0); + elements0 = g_strdup ("/"); +#endif + + g_clear_pointer (&rbuf->path, g_ptr_array_unref); + rbuf->path = g_ptr_array_new_null_terminated (g_strv_length (elements), g_free, TRUE); + + /* Skip empty elements caused by repeated separators */ + for (guint i = 0; elementsi != NULL; i++) + { + if (*elementsi != '\0') + g_ptr_array_add (rbuf->path, g_steal_pointer (&elementsi)); + else + g_free (elementsi); + } + + g_free (elements); + } + else + { + char **elements = g_strsplit (path, G_DIR_SEPARATOR_S, -1); + + if (rbuf->path == NULL) + rbuf->path = g_ptr_array_new_null_terminated (g_strv_length (elements), g_free, TRUE); + + /* Skip empty elements caused by repeated separators */ + for (guint i = 0; elementsi != NULL; i++) + { + if (*elementsi != '\0') + g_ptr_array_add (rbuf->path, g_steal_pointer (&elementsi)); + else + g_free (elementsi); + } + + g_free (elements); + } + + return buf; +} + +/** + * g_path_buf_pop: + * @buf: a path buffer + * + * Removes the last element of the path buffer. + * + * If there is only one element in the path buffer (for example, `/` on + * Unix-like operating systems or the drive on Windows systems), it will + * not be removed and %FALSE will be returned instead. + * + * |<!-- language="C" --> + * GPathBuf buf, cmp; + * + * g_path_buf_init_from_path (&buf, "/bin/sh"); + * + * g_path_buf_pop (&buf); + * g_path_buf_init_from_path (&cmp, "/bin"); + * g_assert_true (g_path_buf_equal (&buf, &cmp)); + * g_path_buf_clear (&cmp); + * + * g_path_buf_pop (&buf); + * g_path_buf_init_from_path (&cmp, "/"); + * g_assert_true (g_path_buf_equal (&buf, &cmp)); + * g_path_buf_clear (&cmp); + * + * g_path_buf_clear (&buf); + * | + * + * Returns: `TRUE` if the buffer was modified and `FALSE` otherwise + * + * Since: 2.76 + */ +gboolean +g_path_buf_pop (GPathBuf *buf) +{ + RealPathBuf *rbuf = PATH_BUF (buf); + + g_return_val_if_fail (buf != NULL, FALSE); + g_return_val_if_fail (rbuf->path != NULL, FALSE); + + /* Keep the first element of the buffer; it's either '/' or the drive */ + if (rbuf->path->len > 1) + { + g_ptr_array_remove_index (rbuf->path, rbuf->path->len - 1); + return TRUE; + } + + return FALSE; +} + +/** + * g_path_buf_set_filename: + * @buf: a path buffer + * @file_name: (type filename) (not nullable): the file name in the path + * + * Sets the file name of the path. + * + * If the path buffer is empty, the filename is left unset and this + * function returns `FALSE`. + * + * If the path buffer only contains the root element (on Unix-like operating + * systems) or the drive (on Windows), this is the equivalent of pushing + * the new @file_name. + * + * If the path buffer contains a path, this is the equivalent of + * popping the path buffer and pushing @file_name, creating a + * sibling of the original path. + * + * |<!-- language="C" --> + * GPathBuf buf, cmp; + * + * g_path_buf_init_from_path (&buf, "/"); + * + * g_path_buf_set_filename (&buf, "bar"); + * g_path_buf_init_from_path (&cmp, "/bar"); + * g_assert_true (g_path_buf_equal (&buf, &cmp)); + * g_path_buf_clear (&cmp); + * + * g_path_buf_set_filename (&buf, "baz.txt"); + * g_path_buf_init_from_path (&cmp, "/baz.txt"); + * g_assert_true (g_path_buf_equal (&buf, &cmp); + * g_path_buf_clear (&cmp); + * + * g_path_buf_clear (&buf); + * | + * + * Returns: `TRUE` if the file name was replaced, and `FALSE` otherwise + * + * Since: 2.76 + */ +gboolean +g_path_buf_set_filename (GPathBuf *buf, + const char *file_name) +{ + g_return_val_if_fail (buf != NULL, FALSE); + g_return_val_if_fail (file_name != NULL, FALSE); + + if (PATH_BUF (buf)->path == NULL) + return FALSE; + + g_path_buf_pop (buf); + g_path_buf_push (buf, file_name); + + return TRUE; +} + +/** + * g_path_buf_set_extension: + * @buf: a path buffer + * @extension: (type filename) (nullable): the file extension + * + * Adds an extension to the file name in the path buffer. + * + * If @extension is `NULL`, the extension will be unset. + * + * If the path buffer does not have a file name set, this function returns + * `FALSE` and leaves the path buffer unmodified. + * + * Returns: `TRUE` if the extension was replaced, and `FALSE` otherwise + * + * Since: 2.76 + */ +gboolean +g_path_buf_set_extension (GPathBuf *buf, + const char *extension) +{ + RealPathBuf *rbuf = PATH_BUF (buf); + + g_return_val_if_fail (buf != NULL, FALSE); + + if (rbuf->path != NULL) + return g_set_str (&rbuf->extension, extension); + else + return FALSE; +} + +/** + * g_path_buf_to_path: + * @buf: a path buffer + * + * Retrieves the built path from the path buffer. + * + * On Windows, the result contains backslashes as directory separators, + * even if forward slashes were used in input. + * + * If the path buffer is empty, this function returns `NULL`. + * + * Returns: (transfer full) (type filename) (nullable): the path + * + * Since: 2.76 + */ +char * +g_path_buf_to_path (GPathBuf *buf) +{ + RealPathBuf *rbuf = PATH_BUF (buf); + char *path = NULL; + + g_return_val_if_fail (buf != NULL, NULL); + + if (rbuf->path != NULL) + path = g_build_filenamev ((char **) rbuf->path->pdata); + + if (path != NULL && rbuf->extension != NULL) + { + char *tmp = g_strconcat (path, ".", rbuf->extension, NULL); + + g_free (path); + path = g_steal_pointer (&tmp); + } + + return path; +} + +/** + * g_path_buf_equal: + * @v1: (not nullable): a path buffer to compare + * @v2: (not nullable): a path buffer to compare + * + * Compares two path buffers for equality and returns `TRUE` + * if they are equal. + * + * The path inside the paths buffers are not going to be normalized, + * so `X/Y/Z/A/..`, `X/./Y/Z` and `X/Y/Z` are not going to be considered + * equal. + * + * This function can be passed to g_hash_table_new() as the + * `key_equal_func` parameter. + * + * Returns: `TRUE` if the two path buffers are equal, + * and `FALSE` otherwise + * + * Since: 2.76 + */ +gboolean +g_path_buf_equal (gconstpointer v1, + gconstpointer v2) +{ + if (v1 == v2) + return TRUE; + + /* We resolve the buffer into a path to normalize its contents; + * this won't resolve symbolic links or `.` and `..` components + */ + char *p1 = g_path_buf_to_path ((GPathBuf *) v1); + char *p2 = g_path_buf_to_path ((GPathBuf *) v2); + + gboolean res = p1 != NULL && p2 != NULL + ? g_str_equal (p1, p2) + : FALSE; + + g_free (p1); + g_free (p2); + + return res; +}
View file
_service:tar_scm:glib-2.76.4.tar.xz/glib/gpathbuf.h
Added
@@ -0,0 +1,90 @@ +/* gpathbuf.h: A mutable path builder + * + * SPDX-FileCopyrightText: 2023 Emmanuele Bassi + * SPDX-License-Identifier: LGPL-2.1-or-later + */ + +#pragma once + +#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION) +#error "Only <glib.h> can be included directly." +#endif + +#include <glib/gtypes.h> + +G_BEGIN_DECLS + +typedef struct _GPathBuf GPathBuf; + +/** + * GPathBuf: (copy-func g_path_buf_copy) (free-func g_path_buf_free) + * + * A mutable path builder. + * + * Since: 2.76 + */ +struct _GPathBuf +{ + /*< private >*/ + gpointer dummy8; +}; + +/** + * G_PATH_BUF_INIT: + * + * Initializes a #GPathBuf on the stack. + * + * A stack-allocated `GPathBuf` must be initialized if it is used + * together with g_auto() to avoid warnings and crashes if the + * function returns before calling g_path_buf_init(). + * + * |<!-- language="C" --> + * g_auto (GPathBuf) buf = G_PATH_BUF_INIT; + * | + * + * Since: 2.76 + */ +#define G_PATH_BUF_INIT { { NULL, } } \ + GLIB_AVAILABLE_MACRO_IN_2_76 + +GLIB_AVAILABLE_IN_2_76 +GPathBuf * g_path_buf_new (void); +GLIB_AVAILABLE_IN_2_76 +GPathBuf * g_path_buf_new_from_path (const char *path); +GLIB_AVAILABLE_IN_2_76 +GPathBuf * g_path_buf_init (GPathBuf *buf); +GLIB_AVAILABLE_IN_2_76 +GPathBuf * g_path_buf_init_from_path (GPathBuf *buf, + const char *path); +GLIB_AVAILABLE_IN_2_76 +void g_path_buf_clear (GPathBuf *buf); +GLIB_AVAILABLE_IN_2_76 +char * g_path_buf_clear_to_path (GPathBuf *buf) G_GNUC_WARN_UNUSED_RESULT; +GLIB_AVAILABLE_IN_2_76 +void g_path_buf_free (GPathBuf *buf); +GLIB_AVAILABLE_IN_2_76 +char * g_path_buf_free_to_path (GPathBuf *buf) G_GNUC_WARN_UNUSED_RESULT; +GLIB_AVAILABLE_IN_2_76 +GPathBuf * g_path_buf_copy (GPathBuf *buf); + +GLIB_AVAILABLE_IN_2_76 +GPathBuf * g_path_buf_push (GPathBuf *buf, + const char *path); +GLIB_AVAILABLE_IN_2_76 +gboolean g_path_buf_pop (GPathBuf *buf); + +GLIB_AVAILABLE_IN_2_76 +gboolean g_path_buf_set_filename (GPathBuf *buf, + const char *file_name); +GLIB_AVAILABLE_IN_2_76 +gboolean g_path_buf_set_extension (GPathBuf *buf, + const char *extension); + +GLIB_AVAILABLE_IN_2_76 +char * g_path_buf_to_path (GPathBuf *buf) G_GNUC_WARN_UNUSED_RESULT; + +GLIB_AVAILABLE_IN_2_76 +gboolean g_path_buf_equal (gconstpointer v1, + gconstpointer v2); + +G_END_DECLS
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/gprintf.c -> _service:tar_scm:glib-2.76.4.tar.xz/glib/gprintf.c
Changed
@@ -342,7 +342,14 @@ if (len < 0) { if (saved_errno == ENOMEM) - g_error ("%s: failed to allocate memory", G_STRLOC); + { + /* Try and print a message to be a bit helpful, but stick to the + * bare minimum to avoid any code path which could try and fail to + * allocate additional memory. */ + fputs (G_STRLOC, stderr); + fputs (": failed to allocate memory\n", stderr); + g_abort (); + } else *string = NULL; } @@ -353,7 +360,7 @@ { va_list args2; - G_VA_COPY (args2, args); + va_copy (args2, args); *string = g_new (gchar, g_printf_string_upper_bound (format, args));
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/gqsort.c -> _service:tar_scm:glib-2.76.4.tar.xz/glib/gqsort.c
Changed
@@ -128,23 +128,23 @@ case 2: while (n1 > 0 && n2 > 0) { - unsigned long *tmpl = (unsigned long *) tmp; - unsigned long *bl; + guintptr *tmpl = (guintptr *) tmp; + guintptr *bl; tmp += s; if ((*cmp) (b1, b2, arg) <= 0) { - bl = (unsigned long *) b1; + bl = (guintptr *) b1; b1 += s; --n1; } else { - bl = (unsigned long *) b2; + bl = (guintptr *) b2; b2 += s; --n2; } - while (tmpl < (unsigned long *) tmp) + while (tmpl < (guintptr *) tmp) *tmpl++ = *bl++; } break; @@ -265,15 +265,15 @@ else { if ((s & (sizeof (guint32) - 1)) == 0 - && (guintptr) b % ALIGNOF_GUINT32 == 0) + && (gsize) (guintptr) b % G_ALIGNOF(guint32) == 0) { if (s == sizeof (guint32)) p.var = 0; else if (s == sizeof (guint64) - && (guintptr) b % ALIGNOF_GUINT64 == 0) + && (gsize) (guintptr) b % G_ALIGNOF(guint64) == 0) p.var = 1; - else if ((s & (sizeof (unsigned long) - 1)) == 0 - && (guintptr) b % ALIGNOF_UNSIGNED_LONG == 0) + else if ((s & (sizeof (void *) - 1)) == 0 + && (gsize) (guintptr) b % G_ALIGNOF(void *) == 0) p.var = 2; } msort_with_tmp (&p, b, n);
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/grand.c -> _service:tar_scm:glib-2.76.4.tar.xz/glib/grand.c
Changed
@@ -230,7 +230,7 @@ do { - dev_urandom = fopen("/dev/urandom", "rb"); + dev_urandom = fopen ("/dev/urandom", "rbe"); } while G_UNLIKELY (dev_urandom == NULL && errno == EINTR);
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/gregex.c -> _service:tar_scm:glib-2.76.4.tar.xz/glib/gregex.c
Changed
@@ -947,7 +947,7 @@ break; } - return regex->jit_status; + g_assert_not_reached (); } /** @@ -1492,8 +1492,8 @@ for (entry = (guchar*) first; entry <= (guchar*) last; entry += entrysize) { - gint n = (entry0 << 8) + entry1; - if (match_info->offsetsn*2 >= 0) + guint n = (entry0 << 8) + entry1; + if (n * 2 < match_info->n_offsets && match_info->offsetsn * 2 >= 0) return n; } @@ -3584,7 +3584,7 @@ /** * g_regex_escape_string: - * @string: (array length=length): the string to escape + * @string: the string to escape * @length: the length of @string, in bytes, or -1 if @string is nul-terminated * * Escapes the special characters used for regular expressions
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/gsequence.c -> _service:tar_scm:glib-2.76.4.tar.xz/glib/gsequence.c
Changed
@@ -85,7 +85,7 @@ * GSequenceIterCompareFunc: * @a: a #GSequenceIter * @b: a #GSequenceIter - * @user_data: user data + * @data: user data * * A #GSequenceIterCompareFunc is a function used to compare iterators. * It must return zero if the iterators compare equal, a negative value
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/gsequence.h -> _service:tar_scm:glib-2.76.4.tar.xz/glib/gsequence.h
Changed
@@ -34,7 +34,7 @@ typedef gint (* GSequenceIterCompareFunc) (GSequenceIter *a, GSequenceIter *b, - gpointer user_data); + gpointer data); /* GSequence */
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/gslice.c -> _service:tar_scm:glib-2.76.4.tar.xz/glib/gslice.c
Changed
@@ -21,75 +21,33 @@ #include "config.h" #include "glibconfig.h" -#if defined(HAVE_POSIX_MEMALIGN) && !defined(_XOPEN_SOURCE) -#define _XOPEN_SOURCE 600 /* posix_memalign() */ -#endif -#include <stdlib.h> /* posix_memalign() */ +#include <stdio.h> #include <string.h> -#include <errno.h> - -#ifdef G_OS_UNIX -#include <unistd.h> /* sysconf() */ -#endif -#ifdef G_OS_WIN32 -#include <windows.h> -#include <process.h> -#endif - -#include <stdio.h> /* fputs */ #include "gslice.h" -#include "gmain.h" #include "gmem.h" /* gslice.h */ -#include "gstrfuncs.h" -#include "gutils.h" -#include "gtrashstack.h" -#include "gtestutils.h" -#include "gthread.h" -#include "gthreadprivate.h" #include "glib_trace.h" #include "gprintf.h" -#include "gvalgrind.h" - /** * SECTION:memory_slices * @title: Memory Slices * @short_description: efficient way to allocate groups of equal-sized * chunks of memory * - * Memory slices provide a space-efficient and multi-processing scalable - * way to allocate equal-sized pieces of memory, just like the original - * #GMemChunks (from GLib 2.8), while avoiding their excessive - * memory-waste, scalability and performance problems. - * - * To achieve these goals, the slice allocator uses a sophisticated, - * layered design that has been inspired by Bonwick's slab allocator - * (Bonwick94(http://citeseer.ist.psu.edu/bonwick94slab.html) - * Jeff Bonwick, The slab allocator: An object-caching kernel - * memory allocator. USENIX 1994, and - * Bonwick01(http://citeseer.ist.psu.edu/bonwick01magazines.html) - * Bonwick and Jonathan Adams, Magazines and vmem: Extending the - * slab allocator to many cpu's and arbitrary resources. USENIX 2001) - * - * It uses posix_memalign() to optimize allocations of many equally-sized - * chunks, and has per-thread free lists (the so-called magazine layer) - * to quickly satisfy allocation requests of already known structure sizes. - * This is accompanied by extra caching logic to keep freed memory around - * for some time before returning it to the system. Memory that is unused - * due to alignment constraints is used for cache colorization (random - * distribution of chunk addresses) to improve CPU cache utilization. The - * caching layer of the slice allocator adapts itself to high lock contention - * to improve scalability. - * - * The slice allocator can allocate blocks as small as two pointers, and - * unlike malloc(), it does not reserve extra space per block. For large block - * sizes, g_slice_new() and g_slice_alloc() will automatically delegate to the - * system malloc() implementation. For newly written code it is recommended - * to use the new `g_slice` API instead of g_malloc() and - * friends, as long as objects are not resized during their lifetime and the - * object size used at allocation time is still available when freeing. + * GSlice was a space-efficient and multi-processing scalable way to allocate + * equal sized pieces of memory. Since GLib 2.76, its implementation has been + * removed and it calls g_malloc() and g_free_sized(), because the performance + * of the system-default allocators has improved on all platforms since GSlice + * was written. + * + * The GSlice APIs have not been deprecated, as they are widely in use and doing + * so would be very disruptive for little benefit. + * + * New code should be written using g_new()/g_malloc() and g_free_sized() or + * g_free(). There is no particular benefit in porting existing code away from + * g_slice_new()/g_slice_free() unless it’s being rewritten anyway. * * Here is an example for using the slice allocator: * |<!-- language="C" --> @@ -132,209 +90,19 @@ * | */ -/* the GSlice allocator is split up into 4 layers, roughly modelled after the slab - * allocator and magazine extensions as outlined in: - * + Bonwick94 Jeff Bonwick, The slab allocator: An object-caching kernel - * memory allocator. USENIX 1994, http://citeseer.ist.psu.edu/bonwick94slab.html - * + Bonwick01 Bonwick and Jonathan Adams, Magazines and vmem: Extending the - * slab allocator to many cpu's and arbitrary resources. - * USENIX 2001, http://citeseer.ist.psu.edu/bonwick01magazines.html - * the layers are: - * - the thread magazines. for each (aligned) chunk size, a magazine (a list) - * of recently freed and soon to be allocated chunks is maintained per thread. - * this way, most alloc/free requests can be quickly satisfied from per-thread - * free lists which only require one g_private_get() call to retrieve the - * thread handle. - * - the magazine cache. allocating and freeing chunks to/from threads only - * occurs at magazine sizes from a global depot of magazines. the depot - * maintaines a 15 second working set of allocated magazines, so full - * magazines are not allocated and released too often. - * the chunk size dependent magazine sizes automatically adapt (within limits, - * see 3) to lock contention to properly scale performance across a variety - * of SMP systems. - * - the slab allocator. this allocator allocates slabs (blocks of memory) close - * to the system page size or multiples thereof which have to be page aligned. - * the blocks are divided into smaller chunks which are used to satisfy - * allocations from the upper layers. the space provided by the reminder of - * the chunk size division is used for cache colorization (random distribution - * of chunk addresses) to improve processor cache utilization. multiple slabs - * with the same chunk size are kept in a partially sorted ring to allow O(1) - * freeing and allocation of chunks (as long as the allocation of an entirely - * new slab can be avoided). - * - the page allocator. on most modern systems, posix_memalign(3) or - * memalign(3) should be available, so this is used to allocate blocks with - * system page size based alignments and sizes or multiples thereof. - * if no memalign variant is provided, valloc() is used instead and - * block sizes are limited to the system page size (no multiples thereof). - * as a fallback, on system without even valloc(), a malloc(3)-based page - * allocator with alloc-only behaviour is used. - * - * NOTES: - * 1 some systems memalign(3) implementations may rely on boundary tagging for - * the handed out memory chunks. to avoid excessive page-wise fragmentation, - * we reserve 2 * sizeof (void*) per block size for the systems memalign(3), - * specified in NATIVE_MALLOC_PADDING. - * 2 using the slab allocator alone already provides for a fast and efficient - * allocator, it doesn't properly scale beyond single-threaded uses though. - * also, the slab allocator implements eager free(3)-ing, i.e. does not - * provide any form of caching or working set maintenance. so if used alone, - * it's vulnerable to trashing for sequences of balanced (alloc, free) pairs - * at certain thresholds. - * 3 magazine sizes are bound by an implementation specific minimum size and - * a chunk size specific maximum to limit magazine storage sizes to roughly - * 16KB. - * 4 allocating ca. 8 chunks per block/page keeps a good balance between - * external and internal fragmentation (<= 12.5%). Bonwick94 - */ - -/* --- macros and constants --- */ -#define LARGEALIGNMENT (256) -#define P2ALIGNMENT (2 * sizeof (gsize)) /* fits 2 pointers (assumed to be 2 * GLIB_SIZEOF_SIZE_T below) */ -#define ALIGN(size, base) ((base) * (gsize) (((size) + (base) - 1) / (base))) -#define NATIVE_MALLOC_PADDING P2ALIGNMENT /* per-page padding left for native malloc(3) see 1 */ -#define SLAB_INFO_SIZE P2ALIGN (sizeof (SlabInfo) + NATIVE_MALLOC_PADDING) -#define MAX_MAGAZINE_SIZE (256) /* see 3 and allocator_get_magazine_threshold() for this */ -#define MIN_MAGAZINE_SIZE (4) -#define MAX_STAMP_COUNTER (7) /* distributes the load of gettimeofday() */ -#define MAX_SLAB_CHUNK_SIZE(al) (((al)->max_page_size - SLAB_INFO_SIZE) / 8) /* we want at last 8 chunks per page, see 4 */ -#define MAX_SLAB_INDEX(al) (SLAB_INDEX (al, MAX_SLAB_CHUNK_SIZE (al)) + 1) -#define SLAB_INDEX(al, asize) ((asize) / P2ALIGNMENT - 1) /* asize must be P2ALIGNMENT aligned */ -#define SLAB_CHUNK_SIZE(al, ix) (((ix) + 1) * P2ALIGNMENT) -#define SLAB_BPAGE_SIZE(al,csz) (8 * (csz) + SLAB_INFO_SIZE) - -/* optimized version of ALIGN (size, P2ALIGNMENT) */ -#if GLIB_SIZEOF_SIZE_T * 2 == 8 /* P2ALIGNMENT */ -#define P2ALIGN(size) (((size) + 0x7) & ~(gsize) 0x7) -#elif GLIB_SIZEOF_SIZE_T * 2 == 16 /* P2ALIGNMENT */ -#define P2ALIGN(size) (((size) + 0xf) & ~(gsize) 0xf) -#else -#define P2ALIGN(size) ALIGN (size, P2ALIGNMENT) -#endif - -/* special helpers to avoid gmessage.c dependency */ -static void mem_error (const char *format, ...) G_GNUC_PRINTF (1,2); -#define mem_assert(cond) do { if (G_LIKELY (cond)) ; else mem_error ("assertion failed: %s", #cond); } while (0) - -/* --- structures --- */ -typedef struct _ChunkLink ChunkLink; -typedef struct _SlabInfo SlabInfo; -typedef struct _CachedMagazine CachedMagazine; -struct _ChunkLink { - ChunkLink *next; - ChunkLink *data; -}; -struct _SlabInfo { - ChunkLink *chunks; - guint n_allocated; - SlabInfo *next, *prev; -}; -typedef struct { - ChunkLink *chunks; - gsize count; /* approximative chunks list length */ -} Magazine; -typedef struct { - Magazine *magazine1; /* array of MAX_SLAB_INDEX (allocator) */ - Magazine *magazine2; /* array of MAX_SLAB_INDEX (allocator) */ -} ThreadMemory; -typedef struct { - gboolean always_malloc; - gboolean bypass_magazines; - gboolean debug_blocks; - gsize working_set_msecs; - guint color_increment; -} SliceConfig; -typedef struct { - /* const after initialization */ - gsize min_page_size, max_page_size; - SliceConfig config; - gsize max_slab_chunk_size_for_magazine_cache; - /* magazine cache */ - GMutex magazine_mutex; - ChunkLink **magazines; /* array of MAX_SLAB_INDEX (allocator) */ - guint *contention_counters; /* array of MAX_SLAB_INDEX (allocator) */ - gint mutex_counter; - guint stamp_counter; - guint last_stamp; - /* slab allocator */ - GMutex slab_mutex; - SlabInfo **slab_stack; /* array of MAX_SLAB_INDEX (allocator) */ - guint color_accu; -} Allocator; - -/* --- g-slice prototypes --- */ -static gpointer slab_allocator_alloc_chunk (gsize chunk_size); -static void slab_allocator_free_chunk (gsize chunk_size, - gpointer mem); -static void private_thread_memory_cleanup (gpointer data); -static gpointer allocator_memalign (gsize alignment, - gsize memsize); -static void allocator_memfree (gsize memsize, - gpointer mem); -static inline void magazine_cache_update_stamp (void); -static inline gsize allocator_get_magazine_threshold (Allocator *allocator, - guint ix); - -/* --- g-slice memory checker --- */ -static void smc_notify_alloc (void *pointer, - size_t size); -static int smc_notify_free (void *pointer, - size_t size); - -/* --- variables --- */ -static GPrivate private_thread_memory = G_PRIVATE_INIT (private_thread_memory_cleanup); -static gsize sys_page_size = 0; -static Allocator allocator1 = { { 0, }, }; -static SliceConfig slice_config = { - FALSE, /* always_malloc */ - FALSE, /* bypass_magazines */ - FALSE, /* debug_blocks */ - 15 * 1000, /* working_set_msecs */ - 1, /* color increment, alt: 0x7fffffff */ -}; -static GMutex smc_tree_mutex; /* mutex for G_SLICE=debug-blocks */ - /* --- auxiliary functions --- */ void g_slice_set_config (GSliceConfig ckey, gint64 value) { - g_return_if_fail (sys_page_size == 0); - switch (ckey) - { - case G_SLICE_CONFIG_ALWAYS_MALLOC: - slice_config.always_malloc = value != 0; - break; - case G_SLICE_CONFIG_BYPASS_MAGAZINES: - slice_config.bypass_magazines = value != 0; - break; - case G_SLICE_CONFIG_WORKING_SET_MSECS: - slice_config.working_set_msecs = value; - break; - case G_SLICE_CONFIG_COLOR_INCREMENT: - slice_config.color_increment = value; - break; - default: ; - } + /* deprecated, no implementation */ } gint64 g_slice_get_config (GSliceConfig ckey) { - switch (ckey) - { - case G_SLICE_CONFIG_ALWAYS_MALLOC: - return slice_config.always_malloc; - case G_SLICE_CONFIG_BYPASS_MAGAZINES: - return slice_config.bypass_magazines; - case G_SLICE_CONFIG_WORKING_SET_MSECS: - return slice_config.working_set_msecs; - case G_SLICE_CONFIG_CHUNK_SIZES: - return MAX_SLAB_INDEX (allocator); - case G_SLICE_CONFIG_COLOR_INCREMENT: - return slice_config.color_increment; - default: - return 0; - } + /* deprecated, no implementation */ + return 0; } gint64* @@ -342,566 +110,8 @@ gint64 address, guint *n_values) { - guint i = 0; - g_return_val_if_fail (n_values != NULL, NULL); - *n_values = 0; - switch (ckey) - { - gint64 array64; - case G_SLICE_CONFIG_CONTENTION_COUNTER: - arrayi++ = SLAB_CHUNK_SIZE (allocator, address); - arrayi++ = allocator->contention_countersaddress; - arrayi++ = allocator_get_magazine_threshold (allocator, address); - *n_values = i; - return g_memdup2 (array, sizeof (array0) * *n_values); - default: - return NULL; - } -} - -static void -slice_config_init (SliceConfig *config) -{ - const gchar *val; - gchar *val_allocated = NULL; - - *config = slice_config; - - /* Note that the empty string (`G_SLICE=""`) is treated differently from the - * envvar being unset. In the latter case, we also check whether running under - * valgrind. */ -#ifndef G_OS_WIN32 - val = g_getenv ("G_SLICE"); -#else - /* The win32 implementation of g_getenv() has to do UTF-8 ↔ UTF-16 conversions - * which use the slice allocator, leading to deadlock. Use a simple in-place - * implementation here instead. - * - * Ignore references to other environment variables: only support values which - * are a combination of always-malloc and debug-blocks. */ - { - - wchar_t wvalue128; /* at least big enough for `always-malloc,debug-blocks` */ - gsize len; - - len = GetEnvironmentVariableW (L"G_SLICE", wvalue, G_N_ELEMENTS (wvalue)); - - if (len == 0) - { - if (GetLastError () == ERROR_ENVVAR_NOT_FOUND) - val = NULL; - else - val = ""; - } - else if (len >= G_N_ELEMENTS (wvalue)) - { - /* @wvalue isn’t big enough. Give up. */ - g_warning ("Unsupported G_SLICE value"); - val = NULL; - } - else - { - /* it’s safe to use g_utf16_to_utf8() here as it only allocates using - * malloc() rather than GSlice */ - val = val_allocated = g_utf16_to_utf8 (wvalue, -1, NULL, NULL, NULL); - } - - } -#endif /* G_OS_WIN32 */ - - if (val != NULL) - { - gint flags; - const GDebugKey keys = { - { "always-malloc", 1 << 0 }, - { "debug-blocks", 1 << 1 }, - }; - - flags = g_parse_debug_string (val, keys, G_N_ELEMENTS (keys)); - if (flags & (1 << 0)) - config->always_malloc = TRUE; - if (flags & (1 << 1)) - config->debug_blocks = TRUE; - } - else - { - /* G_SLICE was not specified, so check if valgrind is running and - * disable ourselves if it is. - * - * This way it's possible to force gslice to be enabled under - * valgrind just by setting G_SLICE to the empty string. - */ -#ifdef ENABLE_VALGRIND - if (RUNNING_ON_VALGRIND) - config->always_malloc = TRUE; -#endif - } - - g_free (val_allocated); -} - -static void -g_slice_init_nomessage (void) -{ - /* we may not use g_error() or friends here */ - mem_assert (sys_page_size == 0); - mem_assert (MIN_MAGAZINE_SIZE >= 4); - -#ifdef G_OS_WIN32 - { - SYSTEM_INFO system_info; - GetSystemInfo (&system_info); - sys_page_size = system_info.dwPageSize; - } -#else - sys_page_size = sysconf (_SC_PAGESIZE); /* = sysconf (_SC_PAGE_SIZE); = getpagesize(); */ -#endif - mem_assert (sys_page_size >= 2 * LARGEALIGNMENT); - mem_assert ((sys_page_size & (sys_page_size - 1)) == 0); - slice_config_init (&allocator->config); - allocator->min_page_size = sys_page_size; -#if HAVE_POSIX_MEMALIGN || HAVE_MEMALIGN - /* allow allocation of pages up to 8KB (with 8KB alignment). - * this is useful because many medium to large sized structures - * fit less than 8 times (see 4) into 4KB pages. - * we allow very small page sizes here, to reduce wastage in - * threads if only small allocations are required (this does - * bear the risk of increasing allocation times and fragmentation - * though). - */ - allocator->min_page_size = MAX (allocator->min_page_size, 4096); - allocator->max_page_size = MAX (allocator->min_page_size, 8192); - allocator->min_page_size = MIN (allocator->min_page_size, 128); -#else - /* we can only align to system page size */ - allocator->max_page_size = sys_page_size; -#endif - if (allocator->config.always_malloc) - { - allocator->contention_counters = NULL; - allocator->magazines = NULL; - allocator->slab_stack = NULL; - } - else - { - allocator->contention_counters = g_new0 (guint, MAX_SLAB_INDEX (allocator)); - allocator->magazines = g_new0 (ChunkLink*, MAX_SLAB_INDEX (allocator)); - allocator->slab_stack = g_new0 (SlabInfo*, MAX_SLAB_INDEX (allocator)); - } - - allocator->mutex_counter = 0; - allocator->stamp_counter = MAX_STAMP_COUNTER; /* force initial update */ - allocator->last_stamp = 0; - allocator->color_accu = 0; - magazine_cache_update_stamp(); - /* values cached for performance reasons */ - allocator->max_slab_chunk_size_for_magazine_cache = MAX_SLAB_CHUNK_SIZE (allocator); - if (allocator->config.always_malloc || allocator->config.bypass_magazines) - allocator->max_slab_chunk_size_for_magazine_cache = 0; /* non-optimized cases */ -} - -static inline guint -allocator_categorize (gsize aligned_chunk_size) -{ - /* speed up the likely path */ - if (G_LIKELY (aligned_chunk_size && aligned_chunk_size <= allocator->max_slab_chunk_size_for_magazine_cache)) - return 1; /* use magazine cache */ - - if (!allocator->config.always_malloc && - aligned_chunk_size && - aligned_chunk_size <= MAX_SLAB_CHUNK_SIZE (allocator)) - { - if (allocator->config.bypass_magazines) - return 2; /* use slab allocator, see 2 */ - return 1; /* use magazine cache */ - } - return 0; /* use malloc() */ -} - -static inline void -g_mutex_lock_a (GMutex *mutex, - guint *contention_counter) -{ - gboolean contention = FALSE; - if (!g_mutex_trylock (mutex)) - { - g_mutex_lock (mutex); - contention = TRUE; - } - if (contention) - { - allocator->mutex_counter++; - if (allocator->mutex_counter >= 1) /* quickly adapt to contention */ - { - allocator->mutex_counter = 0; - *contention_counter = MIN (*contention_counter + 1, MAX_MAGAZINE_SIZE); - } - } - else /* !contention */ - { - allocator->mutex_counter--; - if (allocator->mutex_counter < -11) /* moderately recover magazine sizes */ - { - allocator->mutex_counter = 0; - *contention_counter = MAX (*contention_counter, 1) - 1; - } - } -} - -static inline ThreadMemory* -thread_memory_from_self (void) -{ - ThreadMemory *tmem = g_private_get (&private_thread_memory); - if (G_UNLIKELY (!tmem)) - { - static GMutex init_mutex; - guint n_magazines; - - g_mutex_lock (&init_mutex); - if G_UNLIKELY (sys_page_size == 0) - g_slice_init_nomessage (); - g_mutex_unlock (&init_mutex); - - n_magazines = MAX_SLAB_INDEX (allocator); - tmem = g_private_set_alloc0 (&private_thread_memory, sizeof (ThreadMemory) + sizeof (Magazine) * 2 * n_magazines); - tmem->magazine1 = (Magazine*) (tmem + 1); - tmem->magazine2 = &tmem->magazine1n_magazines; - } - return tmem; -} - -static inline ChunkLink* -magazine_chain_pop_head (ChunkLink **magazine_chunks) -{ - /* magazine chains are linked via ChunkLink->next. - * each ChunkLink->data of the toplevel chain may point to a subchain, - * linked via ChunkLink->next. ChunkLink->data of the subchains just - * contains uninitialized junk. - */ - ChunkLink *chunk = (*magazine_chunks)->data; - if (G_UNLIKELY (chunk)) - { - /* allocating from freed list */ - (*magazine_chunks)->data = chunk->next; - } - else - { - chunk = *magazine_chunks; - *magazine_chunks = chunk->next; - } - return chunk; -} - -#if 0 /* useful for debugging */ -static guint -magazine_count (ChunkLink *head) -{ - guint count = 0; - if (!head) - return 0; - while (head) - { - ChunkLink *child = head->data; - count += 1; - for (child = head->data; child; child = child->next) - count += 1; - head = head->next; - } - return count; -} -#endif - -static inline gsize -allocator_get_magazine_threshold (Allocator *local_allocator, - guint ix) -{ - /* the magazine size calculated here has a lower bound of MIN_MAGAZINE_SIZE, - * which is required by the implementation. also, for moderately sized chunks - * (say >= 64 bytes), magazine sizes shouldn't be much smaller then the number - * of chunks available per page/2 to avoid excessive traffic in the magazine - * cache for small to medium sized structures. - * the upper bound of the magazine size is effectively provided by - * MAX_MAGAZINE_SIZE. for larger chunks, this number is scaled down so that - * the content of a single magazine doesn't exceed ca. 16KB. - */ - gsize chunk_size = SLAB_CHUNK_SIZE (local_allocator, ix); - guint threshold = MAX (MIN_MAGAZINE_SIZE, local_allocator->max_page_size / MAX (5 * chunk_size, 5 * 32)); - guint contention_counter = local_allocator->contention_countersix; - if (G_UNLIKELY (contention_counter)) /* single CPU bias */ - { - /* adapt contention counter thresholds to chunk sizes */ - contention_counter = contention_counter * 64 / chunk_size; - threshold = MAX (threshold, contention_counter); - } - return threshold; -} - -/* --- magazine cache --- */ -static inline void -magazine_cache_update_stamp (void) -{ - if (allocator->stamp_counter >= MAX_STAMP_COUNTER) - { - gint64 now_us = g_get_real_time (); - allocator->last_stamp = now_us / 1000; /* milli seconds */ - allocator->stamp_counter = 0; - } - else - allocator->stamp_counter++; -} - -static inline ChunkLink* -magazine_chain_prepare_fields (ChunkLink *magazine_chunks) -{ - ChunkLink *chunk1; - ChunkLink *chunk2; - ChunkLink *chunk3; - ChunkLink *chunk4; - /* checked upon initialization: mem_assert (MIN_MAGAZINE_SIZE >= 4); */ - /* ensure a magazine with at least 4 unused data pointers */ - chunk1 = magazine_chain_pop_head (&magazine_chunks); - chunk2 = magazine_chain_pop_head (&magazine_chunks); - chunk3 = magazine_chain_pop_head (&magazine_chunks); - chunk4 = magazine_chain_pop_head (&magazine_chunks); - chunk4->next = magazine_chunks; - chunk3->next = chunk4; - chunk2->next = chunk3; - chunk1->next = chunk2; - return chunk1; -} - -/* access the first 3 fields of a specially prepared magazine chain */ -#define magazine_chain_prev(mc) ((mc)->data) -#define magazine_chain_stamp(mc) ((mc)->next->data) -#define magazine_chain_uint_stamp(mc) GPOINTER_TO_UINT ((mc)->next->data) -#define magazine_chain_next(mc) ((mc)->next->next->data) -#define magazine_chain_count(mc) ((mc)->next->next->next->data) - -static void -magazine_cache_trim (Allocator *local_allocator, - guint ix, - guint stamp) -{ - /* g_mutex_lock (local_allocator->mutex); done by caller */ - /* trim magazine cache from tail */ - ChunkLink *current = magazine_chain_prev (local_allocator->magazinesix); - ChunkLink *trash = NULL; - while (!G_APPROX_VALUE (stamp, magazine_chain_uint_stamp (current), - local_allocator->config.working_set_msecs)) - { - /* unlink */ - ChunkLink *prev = magazine_chain_prev (current); - ChunkLink *next = magazine_chain_next (current); - magazine_chain_next (prev) = next; - magazine_chain_prev (next) = prev; - /* clear special fields, put on trash stack */ - magazine_chain_next (current) = NULL; - magazine_chain_count (current) = NULL; - magazine_chain_stamp (current) = NULL; - magazine_chain_prev (current) = trash; - trash = current; - /* fixup list head if required */ - if (current == local_allocator->magazinesix) - { - local_allocator->magazinesix = NULL; - break; - } - current = prev; - } - g_mutex_unlock (&local_allocator->magazine_mutex); - /* free trash */ - if (trash) - { - const gsize chunk_size = SLAB_CHUNK_SIZE (local_allocator, ix); - g_mutex_lock (&local_allocator->slab_mutex); - while (trash) - { - current = trash; - trash = magazine_chain_prev (current); - magazine_chain_prev (current) = NULL; /* clear special field */ - while (current) - { - ChunkLink *chunk = magazine_chain_pop_head (¤t); - slab_allocator_free_chunk (chunk_size, chunk); - } - } - g_mutex_unlock (&local_allocator->slab_mutex); - } -} - -static void -magazine_cache_push_magazine (guint ix, - ChunkLink *magazine_chunks, - gsize count) /* must be >= MIN_MAGAZINE_SIZE */ -{ - ChunkLink *current = magazine_chain_prepare_fields (magazine_chunks); - ChunkLink *next, *prev; - g_mutex_lock (&allocator->magazine_mutex); - /* add magazine at head */ - next = allocator->magazinesix; - if (next) - prev = magazine_chain_prev (next); - else - next = prev = current; - magazine_chain_next (prev) = current; - magazine_chain_prev (next) = current; - magazine_chain_prev (current) = prev; - magazine_chain_next (current) = next; - magazine_chain_count (current) = (gpointer) count; - /* stamp magazine */ - magazine_cache_update_stamp(); - magazine_chain_stamp (current) = GUINT_TO_POINTER (allocator->last_stamp); - allocator->magazinesix = current; - /* free old magazines beyond a certain threshold */ - magazine_cache_trim (allocator, ix, allocator->last_stamp); - /* g_mutex_unlock (allocator->mutex); was done by magazine_cache_trim() */ -} - -static ChunkLink* -magazine_cache_pop_magazine (guint ix, - gsize *countp) -{ - g_mutex_lock_a (&allocator->magazine_mutex, &allocator->contention_countersix); - if (!allocator->magazinesix) - { - guint magazine_threshold = allocator_get_magazine_threshold (allocator, ix); - gsize i, chunk_size = SLAB_CHUNK_SIZE (allocator, ix); - ChunkLink *chunk, *head; - g_mutex_unlock (&allocator->magazine_mutex); - g_mutex_lock (&allocator->slab_mutex); - head = slab_allocator_alloc_chunk (chunk_size); - head->data = NULL; - chunk = head; - for (i = 1; i < magazine_threshold; i++) - { - chunk->next = slab_allocator_alloc_chunk (chunk_size); - chunk = chunk->next; - chunk->data = NULL; - } - chunk->next = NULL; - g_mutex_unlock (&allocator->slab_mutex); - *countp = i; - return head; - } - else - { - ChunkLink *current = allocator->magazinesix; - ChunkLink *prev = magazine_chain_prev (current); - ChunkLink *next = magazine_chain_next (current); - /* unlink */ - magazine_chain_next (prev) = next; - magazine_chain_prev (next) = prev; - allocator->magazinesix = next == current ? NULL : next; - g_mutex_unlock (&allocator->magazine_mutex); - /* clear special fields and hand out */ - *countp = (gsize) magazine_chain_count (current); - magazine_chain_prev (current) = NULL; - magazine_chain_next (current) = NULL; - magazine_chain_count (current) = NULL; - magazine_chain_stamp (current) = NULL; - return current; - } -} - -/* --- thread magazines --- */ -static void -private_thread_memory_cleanup (gpointer data) -{ - ThreadMemory *tmem = data; - const guint n_magazines = MAX_SLAB_INDEX (allocator); - guint ix; - for (ix = 0; ix < n_magazines; ix++) - { - Magazine *mags2; - guint j; - mags0 = &tmem->magazine1ix; - mags1 = &tmem->magazine2ix; - for (j = 0; j < 2; j++) - { - Magazine *mag = magsj; - if (mag->count >= MIN_MAGAZINE_SIZE) - magazine_cache_push_magazine (ix, mag->chunks, mag->count); - else - { - const gsize chunk_size = SLAB_CHUNK_SIZE (allocator, ix); - g_mutex_lock (&allocator->slab_mutex); - while (mag->chunks) - { - ChunkLink *chunk = magazine_chain_pop_head (&mag->chunks); - slab_allocator_free_chunk (chunk_size, chunk); - } - g_mutex_unlock (&allocator->slab_mutex); - } - } - } - g_free (tmem); -} - -static void -thread_memory_magazine1_reload (ThreadMemory *tmem, - guint ix) -{ - Magazine *mag = &tmem->magazine1ix; - mem_assert (mag->chunks == NULL); /* ensure that we may reset mag->count */ - mag->count = 0; - mag->chunks = magazine_cache_pop_magazine (ix, &mag->count); -} - -static void -thread_memory_magazine2_unload (ThreadMemory *tmem, - guint ix) -{ - Magazine *mag = &tmem->magazine2ix; - magazine_cache_push_magazine (ix, mag->chunks, mag->count); - mag->chunks = NULL; - mag->count = 0; -} - -static inline void -thread_memory_swap_magazines (ThreadMemory *tmem, - guint ix) -{ - Magazine xmag = tmem->magazine1ix; - tmem->magazine1ix = tmem->magazine2ix; - tmem->magazine2ix = xmag; -} - -static inline gboolean -thread_memory_magazine1_is_empty (ThreadMemory *tmem, - guint ix) -{ - return tmem->magazine1ix.chunks == NULL; -} - -static inline gboolean -thread_memory_magazine2_is_full (ThreadMemory *tmem, - guint ix) -{ - return tmem->magazine2ix.count >= allocator_get_magazine_threshold (allocator, ix); -} - -static inline gpointer -thread_memory_magazine1_alloc (ThreadMemory *tmem, - guint ix) -{ - Magazine *mag = &tmem->magazine1ix; - ChunkLink *chunk = magazine_chain_pop_head (&mag->chunks); - if (G_LIKELY (mag->count > 0)) - mag->count--; - return chunk; -} - -static inline void -thread_memory_magazine2_free (ThreadMemory *tmem, - guint ix, - gpointer mem) -{ - Magazine *mag = &tmem->magazine2ix; - ChunkLink *chunk = mem; - chunk->data = NULL; - chunk->next = mag->chunks; - mag->chunks = chunk; - mag->count++; + /* deprecated, no implementation */ + return NULL; } /* --- API functions --- */ @@ -915,13 +125,14 @@ * * It calls g_slice_alloc() with `sizeof (@type)` and casts the * returned pointer to a pointer of the given type, avoiding a type - * cast in the source code. Note that the underlying slice allocation - * mechanism can be changed with the `G_SLICE=always-malloc`G_SLICE - * environment variable. + * cast in the source code. * * This can never return %NULL as the minimum allocation size from * `sizeof (@type)` is 1 byte. * + * Since GLib 2.76 this always uses the system malloc() implementation + * internally. + * * Returns: (not nullable): a pointer to the allocated block, cast to a pointer * to @type * @@ -938,13 +149,13 @@ * It calls g_slice_alloc0() with `sizeof (@type)` * and casts the returned pointer to a pointer of the given type, * avoiding a type cast in the source code. - * Note that the underlying slice allocation mechanism can - * be changed with the `G_SLICE=always-malloc`G_SLICE - * environment variable. * * This can never return %NULL as the minimum allocation size from * `sizeof (@type)` is 1 byte. * + * Since GLib 2.76 this always uses the system malloc() implementation + * internally. + * * Returns: (not nullable): a pointer to the allocated block, cast to a pointer * to @type * @@ -962,12 +173,12 @@ * It calls g_slice_copy() with `sizeof (@type)` * and casts the returned pointer to a pointer of the given type, * avoiding a type cast in the source code. - * Note that the underlying slice allocation mechanism can - * be changed with the `G_SLICE=always-malloc`G_SLICE - * environment variable. * * This can never return %NULL. * + * Since GLib 2.76 this always uses the system malloc() implementation + * internally. + * * Returns: (not nullable): a pointer to the allocated block, cast to a pointer * to @type * @@ -977,7 +188,7 @@ /** * g_slice_free: * @type: the type of the block to free, typically a structure name - * @mem: a pointer to the block to free + * @mem: (nullable): a pointer to the block to free * * A convenience macro to free a block of memory that has * been allocated from the slice allocator. @@ -985,18 +196,19 @@ * It calls g_slice_free1() using `sizeof (type)` * as the block size. * Note that the exact release behaviour can be changed with the - * `G_DEBUG=gc-friendly`G_DEBUG environment variable, also see - * `G_SLICE`G_SLICE for related debugging options. + * `G_DEBUG=gc-friendly`G_DEBUG environment variable. * * If @mem is %NULL, this macro does nothing. * + * Since GLib 2.76 this always uses the system free() implementation internally. + * * Since: 2.10 */ /** * g_slice_free_chain: * @type: the type of the @mem_chain blocks - * @mem_chain: a pointer to the first block of the chain + * @mem_chain: (nullable): a pointer to the first block of the chain * @next: the field name of the next pointer in @type * * Frees a linked list of memory blocks of structure type @type. @@ -1006,11 +218,12 @@ * a @next pointer (similar to #GSList). The name of the * @next field in @type is passed as third argument. * Note that the exact release behaviour can be changed with the - * `G_DEBUG=gc-friendly`G_DEBUG environment variable, also see - * `G_SLICE`G_SLICE for related debugging options. + * `G_DEBUG=gc-friendly`G_DEBUG environment variable. * * If @mem_chain is %NULL, this function does nothing. * + * Since GLib 2.76 this always uses the system free() implementation internally. + * * Since: 2.10 */ @@ -1018,19 +231,15 @@ * g_slice_alloc: * @block_size: the number of bytes to allocate * - * Allocates a block of memory from the slice allocator. + * Allocates a block of memory from the libc allocator. * * The block address handed out can be expected to be aligned - * to at least `1 * sizeof (void*)`, though in general slices - * are `2 * sizeof (void*)` bytes aligned; if a `malloc()` - * fallback implementation is used instead, the alignment may - * be reduced in a libc dependent fashion. + * to at least `1 * sizeof (void*)`. * - * Note that the underlying slice allocation mechanism can - * be changed with the `G_SLICE=always-malloc`G_SLICE - * environment variable. + * Since GLib 2.76 this always uses the system malloc() implementation + * internally. * - * Returns: a pointer to the allocated memory block, which will + * Returns: (nullable): a pointer to the allocated memory block, which will * be %NULL if and only if @mem_size is 0 * * Since: 2.10 @@ -1038,43 +247,9 @@ gpointer g_slice_alloc (gsize mem_size) { - ThreadMemory *tmem; - gsize chunk_size; gpointer mem; - guint acat; - - /* This gets the private structure for this thread. If the private - * structure does not yet exist, it is created. - * - * This has a side effect of causing GSlice to be initialised, so it - * must come first. - */ - tmem = thread_memory_from_self (); - - chunk_size = P2ALIGN (mem_size); - acat = allocator_categorize (chunk_size); - if (G_LIKELY (acat == 1)) /* allocate through magazine layer */ - { - guint ix = SLAB_INDEX (allocator, chunk_size); - if (G_UNLIKELY (thread_memory_magazine1_is_empty (tmem, ix))) - { - thread_memory_swap_magazines (tmem, ix); - if (G_UNLIKELY (thread_memory_magazine1_is_empty (tmem, ix))) - thread_memory_magazine1_reload (tmem, ix); - } - mem = thread_memory_magazine1_alloc (tmem, ix); - } - else if (acat == 2) /* allocate through slab allocator */ - { - g_mutex_lock (&allocator->slab_mutex); - mem = slab_allocator_alloc_chunk (chunk_size); - g_mutex_unlock (&allocator->slab_mutex); - } - else /* delegate to system malloc */ - mem = g_malloc (mem_size); - if (G_UNLIKELY (allocator->config.debug_blocks)) - smc_notify_alloc (mem, mem_size); + mem = g_malloc (mem_size); TRACE (GLIB_SLICE_ALLOC((void*)mem, mem_size)); return mem; @@ -1085,12 +260,13 @@ * @block_size: the number of bytes to allocate * * Allocates a block of memory via g_slice_alloc() and initializes - * the returned memory to 0. Note that the underlying slice allocation - * mechanism can be changed with the `G_SLICE=always-malloc`G_SLICE - * environment variable. + * the returned memory to 0. + * + * Since GLib 2.76 this always uses the system malloc() implementation + * internally. * - * Returns: a pointer to the allocated block, which will be %NULL if and only - * if @mem_size is 0 + * Returns: (nullable): a pointer to the allocated block, which will be %NULL + * if and only if @mem_size is 0 * * Since: 2.10 */ @@ -1113,8 +289,11 @@ * * @mem_block must be non-%NULL if @block_size is non-zero. * - * Returns: a pointer to the allocated memory block, which will be %NULL if and - * only if @mem_size is 0 + * Since GLib 2.76 this always uses the system malloc() implementation + * internally. + * + * Returns: (nullable): a pointer to the allocated memory block, + * which will be %NULL if and only if @mem_size is 0 * * Since: 2.14 */ @@ -1131,7 +310,7 @@ /** * g_slice_free1: * @block_size: the size of the block - * @mem_block: a pointer to the block to free + * @mem_block: (nullable): a pointer to the block to free * * Frees a block of memory. * @@ -1139,58 +318,29 @@ * g_slice_alloc0() and the @block_size has to match the size * specified upon allocation. Note that the exact release behaviour * can be changed with the `G_DEBUG=gc-friendly`G_DEBUG environment - * variable, also see `G_SLICE`G_SLICE for related debugging options. + * variable. * * If @mem_block is %NULL, this function does nothing. * + * Since GLib 2.76 this always uses the system free_sized() implementation + * internally. + * * Since: 2.10 */ void g_slice_free1 (gsize mem_size, gpointer mem_block) { - gsize chunk_size = P2ALIGN (mem_size); - guint acat = allocator_categorize (chunk_size); - if (G_UNLIKELY (!mem_block)) - return; - if (G_UNLIKELY (allocator->config.debug_blocks) && - !smc_notify_free (mem_block, mem_size)) - abort(); - if (G_LIKELY (acat == 1)) /* allocate through magazine layer */ - { - ThreadMemory *tmem = thread_memory_from_self(); - guint ix = SLAB_INDEX (allocator, chunk_size); - if (G_UNLIKELY (thread_memory_magazine2_is_full (tmem, ix))) - { - thread_memory_swap_magazines (tmem, ix); - if (G_UNLIKELY (thread_memory_magazine2_is_full (tmem, ix))) - thread_memory_magazine2_unload (tmem, ix); - } - if (G_UNLIKELY (g_mem_gc_friendly)) - memset (mem_block, 0, chunk_size); - thread_memory_magazine2_free (tmem, ix, mem_block); - } - else if (acat == 2) /* allocate through slab allocator */ - { - if (G_UNLIKELY (g_mem_gc_friendly)) - memset (mem_block, 0, chunk_size); - g_mutex_lock (&allocator->slab_mutex); - slab_allocator_free_chunk (chunk_size, mem_block); - g_mutex_unlock (&allocator->slab_mutex); - } - else /* delegate to system malloc */ - { - if (G_UNLIKELY (g_mem_gc_friendly)) - memset (mem_block, 0, mem_size); - g_free (mem_block); - } + if (G_UNLIKELY (g_mem_gc_friendly && mem_block)) + memset (mem_block, 0, mem_size); + g_free_sized (mem_block, mem_size); TRACE (GLIB_SLICE_FREE((void*)mem_block, mem_size)); } /** * g_slice_free_chain_with_offset: * @block_size: the size of the blocks - * @mem_chain: a pointer to the first block of the chain + * @mem_chain: (nullable): a pointer to the first block of the chain * @next_offset: the offset of the @next field in the blocks * * Frees a linked list of memory blocks of structure type @type. @@ -1200,11 +350,13 @@ * @next pointer (similar to #GSList). The offset of the @next * field in each block is passed as third argument. * Note that the exact release behaviour can be changed with the - * `G_DEBUG=gc-friendly`G_DEBUG environment variable, also see - * `G_SLICE`G_SLICE for related debugging options. + * `G_DEBUG=gc-friendly`G_DEBUG environment variable. * * If @mem_chain is %NULL, this function does nothing. * + * Since GLib 2.76 this always uses the system free_sized() implementation + * internally. + * * Since: 2.10 */ void @@ -1213,589 +365,20 @@ gsize next_offset) { gpointer slice = mem_chain; - /* while the thread magazines and the magazine cache are implemented so that - * they can easily be extended to allow for free lists containing more free - * lists for the first level nodes, which would allow O(1) freeing in this - * function, the benefit of such an extension is questionable, because: - * - the magazine size counts will become mere lower bounds which confuses - * the code adapting to lock contention; - * - freeing a single node to the thread magazines is very fast, so this - * O(list_length) operation is multiplied by a fairly small factor; - * - memory usage histograms on larger applications seem to indicate that - * the amount of released multi node lists is negligible in comparison - * to single node releases. - * - the major performance bottle neck, namely g_private_get() or - * g_mutex_lock()/g_mutex_unlock() has already been moved out of the - * inner loop for freeing chained slices. - */ - gsize chunk_size = P2ALIGN (mem_size); - guint acat = allocator_categorize (chunk_size); - if (G_LIKELY (acat == 1)) /* allocate through magazine layer */ - { - ThreadMemory *tmem = thread_memory_from_self(); - guint ix = SLAB_INDEX (allocator, chunk_size); - while (slice) - { - guint8 *current = slice; - slice = *(gpointer*) (current + next_offset); - if (G_UNLIKELY (allocator->config.debug_blocks) && - !smc_notify_free (current, mem_size)) - abort(); - if (G_UNLIKELY (thread_memory_magazine2_is_full (tmem, ix))) - { - thread_memory_swap_magazines (tmem, ix); - if (G_UNLIKELY (thread_memory_magazine2_is_full (tmem, ix))) - thread_memory_magazine2_unload (tmem, ix); - } - if (G_UNLIKELY (g_mem_gc_friendly)) - memset (current, 0, chunk_size); - thread_memory_magazine2_free (tmem, ix, current); - } - } - else if (acat == 2) /* allocate through slab allocator */ + while (slice) { - g_mutex_lock (&allocator->slab_mutex); - while (slice) - { - guint8 *current = slice; - slice = *(gpointer*) (current + next_offset); - if (G_UNLIKELY (allocator->config.debug_blocks) && - !smc_notify_free (current, mem_size)) - abort(); - if (G_UNLIKELY (g_mem_gc_friendly)) - memset (current, 0, chunk_size); - slab_allocator_free_chunk (chunk_size, current); - } - g_mutex_unlock (&allocator->slab_mutex); - } - else /* delegate to system malloc */ - while (slice) - { - guint8 *current = slice; - slice = *(gpointer*) (current + next_offset); - if (G_UNLIKELY (allocator->config.debug_blocks) && - !smc_notify_free (current, mem_size)) - abort(); - if (G_UNLIKELY (g_mem_gc_friendly)) - memset (current, 0, mem_size); - g_free (current); - } -} - -/* --- single page allocator --- */ -static void -allocator_slab_stack_push (Allocator *local_allocator, - guint ix, - SlabInfo *sinfo) -{ - /* insert slab at slab ring head */ - if (!local_allocator->slab_stackix) - { - sinfo->next = sinfo; - sinfo->prev = sinfo; - } - else - { - SlabInfo *next = local_allocator->slab_stackix, *prev = next->prev; - next->prev = sinfo; - prev->next = sinfo; - sinfo->next = next; - sinfo->prev = prev; - } - local_allocator->slab_stackix = sinfo; -} - -static gsize -allocator_aligned_page_size (Allocator *local_allocator, - gsize n_bytes) -{ - gsize val = (gsize) 1 << g_bit_storage (n_bytes - 1); - val = MAX (val, local_allocator->min_page_size); - return val; -} - -static void -allocator_add_slab (Allocator *local_allocator, - guint ix, - gsize chunk_size) -{ - ChunkLink *chunk; - SlabInfo *sinfo; - gsize addr, padding, n_chunks, color = 0; - gsize page_size; - int errsv; - gpointer aligned_memory; - guint8 *mem; - guint i; - - page_size = allocator_aligned_page_size (local_allocator, SLAB_BPAGE_SIZE (local_allocator, chunk_size)); - /* allocate 1 page for the chunks and the slab */ - aligned_memory = allocator_memalign (page_size, page_size - NATIVE_MALLOC_PADDING); - errsv = errno; - mem = aligned_memory; - - if (!mem) - { - const gchar *syserr = strerror (errsv); - mem_error ("failed to allocate %u bytes (alignment: %u): %s\n", - (guint) (page_size - NATIVE_MALLOC_PADDING), (guint) page_size, syserr); - } - /* mask page address */ - addr = ((gsize) mem / page_size) * page_size; - /* assert alignment */ - mem_assert (aligned_memory == (gpointer) addr); - /* basic slab info setup */ - sinfo = (SlabInfo*) (mem + page_size - SLAB_INFO_SIZE); - sinfo->n_allocated = 0; - sinfo->chunks = NULL; - /* figure cache colorization */ - n_chunks = ((guint8*) sinfo - mem) / chunk_size; - padding = ((guint8*) sinfo - mem) - n_chunks * chunk_size; - if (padding) - { - color = (local_allocator->color_accu * P2ALIGNMENT) % padding; - local_allocator->color_accu += local_allocator->config.color_increment; - } - /* add chunks to free list */ - chunk = (ChunkLink*) (mem + color); - sinfo->chunks = chunk; - for (i = 0; i < n_chunks - 1; i++) - { - chunk->next = (ChunkLink*) ((guint8*) chunk + chunk_size); - chunk = chunk->next; - } - chunk->next = NULL; /* last chunk */ - /* add slab to slab ring */ - allocator_slab_stack_push (local_allocator, ix, sinfo); -} - -static gpointer -slab_allocator_alloc_chunk (gsize chunk_size) -{ - ChunkLink *chunk; - guint ix = SLAB_INDEX (allocator, chunk_size); - /* ensure non-empty slab */ - if (!allocator->slab_stackix || !allocator->slab_stackix->chunks) - allocator_add_slab (allocator, ix, chunk_size); - /* allocate chunk */ - chunk = allocator->slab_stackix->chunks; - allocator->slab_stackix->chunks = chunk->next; - allocator->slab_stackix->n_allocated++; - /* rotate empty slabs */ - if (!allocator->slab_stackix->chunks) - allocator->slab_stackix = allocator->slab_stackix->next; - return chunk; -} - -static void -slab_allocator_free_chunk (gsize chunk_size, - gpointer mem) -{ - ChunkLink *chunk; - gboolean was_empty; - guint ix = SLAB_INDEX (allocator, chunk_size); - gsize page_size = allocator_aligned_page_size (allocator, SLAB_BPAGE_SIZE (allocator, chunk_size)); - gsize addr = ((gsize) mem / page_size) * page_size; - /* mask page address */ - guint8 *page = (guint8*) addr; - SlabInfo *sinfo = (SlabInfo*) (page + page_size - SLAB_INFO_SIZE); - /* assert valid chunk count */ - mem_assert (sinfo->n_allocated > 0); - /* add chunk to free list */ - was_empty = sinfo->chunks == NULL; - chunk = (ChunkLink*) mem; - chunk->next = sinfo->chunks; - sinfo->chunks = chunk; - sinfo->n_allocated--; - /* keep slab ring partially sorted, empty slabs at end */ - if (was_empty) - { - /* unlink slab */ - SlabInfo *next = sinfo->next, *prev = sinfo->prev; - next->prev = prev; - prev->next = next; - if (allocator->slab_stackix == sinfo) - allocator->slab_stackix = next == sinfo ? NULL : next; - /* insert slab at head */ - allocator_slab_stack_push (allocator, ix, sinfo); - } - /* eagerly free complete unused slabs */ - if (!sinfo->n_allocated) - { - /* unlink slab */ - SlabInfo *next = sinfo->next, *prev = sinfo->prev; - next->prev = prev; - prev->next = next; - if (allocator->slab_stackix == sinfo) - allocator->slab_stackix = next == sinfo ? NULL : next; - /* free slab */ - allocator_memfree (page_size, page); - } -} - -/* --- memalign implementation --- */ -#ifdef HAVE_MALLOC_H -#include <malloc.h> /* memalign() */ -#endif - -/* from config.h: - * define HAVE_POSIX_MEMALIGN 1 // if free(posix_memalign(3)) works, <stdlib.h> - * define HAVE_MEMALIGN 1 // if free(memalign(3)) works, <malloc.h> - * define HAVE_VALLOC 1 // if free(valloc(3)) works, <stdlib.h> or <malloc.h> - * if none is provided, we implement malloc(3)-based alloc-only page alignment - */ - -#if !(HAVE_POSIX_MEMALIGN || HAVE_MEMALIGN || HAVE_VALLOC) -G_GNUC_BEGIN_IGNORE_DEPRECATIONS -static GTrashStack *compat_valloc_trash = NULL; -G_GNUC_END_IGNORE_DEPRECATIONS -#endif - -static gpointer -allocator_memalign (gsize alignment, - gsize memsize) -{ - gpointer aligned_memory = NULL; - gint err = ENOMEM; -#if HAVE_POSIX_MEMALIGN - err = posix_memalign (&aligned_memory, alignment, memsize); -#elif HAVE_MEMALIGN - errno = 0; - aligned_memory = memalign (alignment, memsize); - err = errno; -#elif HAVE_VALLOC - errno = 0; - aligned_memory = valloc (memsize); - err = errno; -#else - /* simplistic non-freeing page allocator */ - mem_assert (alignment == sys_page_size); - mem_assert (memsize <= sys_page_size); - if (!compat_valloc_trash) - { - const guint n_pages = 16; - guint8 *mem = malloc (n_pages * sys_page_size); - err = errno; - if (mem) - { - gint i = n_pages; - guint8 *amem = (guint8*) ALIGN ((gsize) mem, sys_page_size); - if (amem != mem) - i--; /* mem wasn't page aligned */ - G_GNUC_BEGIN_IGNORE_DEPRECATIONS - while (--i >= 0) - g_trash_stack_push (&compat_valloc_trash, amem + i * sys_page_size); - G_GNUC_END_IGNORE_DEPRECATIONS - } - } - G_GNUC_BEGIN_IGNORE_DEPRECATIONS - aligned_memory = g_trash_stack_pop (&compat_valloc_trash); - G_GNUC_END_IGNORE_DEPRECATIONS -#endif - if (!aligned_memory) - errno = err; - return aligned_memory; -} - -static void -allocator_memfree (gsize memsize, - gpointer mem) -{ -#if HAVE_POSIX_MEMALIGN || HAVE_MEMALIGN || HAVE_VALLOC - free (mem); -#else - mem_assert (memsize <= sys_page_size); - G_GNUC_BEGIN_IGNORE_DEPRECATIONS - g_trash_stack_push (&compat_valloc_trash, mem); - G_GNUC_END_IGNORE_DEPRECATIONS -#endif -} - -static void -mem_error (const char *format, - ...) -{ - const char *pname; - va_list args; - /* at least, put out "MEMORY-ERROR", in case we segfault during the rest of the function */ - fputs ("\n***MEMORY-ERROR***: ", stderr); - pname = g_get_prgname(); - g_fprintf (stderr, "%s%ld: GSlice: ", pname ? pname : "", (long)getpid()); - va_start (args, format); - g_vfprintf (stderr, format, args); - va_end (args); - fputs ("\n", stderr); - abort(); - _exit (1); -} - -/* --- g-slice memory checker tree --- */ -typedef size_t SmcKType; /* key type */ -typedef size_t SmcVType; /* value type */ -typedef struct { - SmcKType key; - SmcVType value; -} SmcEntry; -static void smc_tree_insert (SmcKType key, - SmcVType value); -static gboolean smc_tree_lookup (SmcKType key, - SmcVType *value_p); -static gboolean smc_tree_remove (SmcKType key); - - -/* --- g-slice memory checker implementation --- */ -static void -smc_notify_alloc (void *pointer, - size_t size) -{ - size_t address = (size_t) pointer; - if (pointer) - smc_tree_insert (address, size); -} - -#if 0 -static void -smc_notify_ignore (void *pointer) -{ - size_t address = (size_t) pointer; - if (pointer) - smc_tree_remove (address); -} -#endif - -static int -smc_notify_free (void *pointer, - size_t size) -{ - size_t address = (size_t) pointer; - SmcVType real_size; - gboolean found_one; - - if (!pointer) - return 1; /* ignore */ - found_one = smc_tree_lookup (address, &real_size); - if (!found_one) - { - g_fprintf (stderr, "GSlice: MemChecker: attempt to release non-allocated block: %p size=%" G_GSIZE_FORMAT "\n", pointer, size); - return 0; - } - if (real_size != size && (real_size || size)) - { - g_fprintf (stderr, "GSlice: MemChecker: attempt to release block with invalid size: %p size=%" G_GSIZE_FORMAT " invalid-size=%" G_GSIZE_FORMAT "\n", pointer, real_size, size); - return 0; - } - if (!smc_tree_remove (address)) - { - g_fprintf (stderr, "GSlice: MemChecker: attempt to release non-allocated block: %p size=%" G_GSIZE_FORMAT "\n", pointer, size); - return 0; - } - return 1; /* all fine */ -} - -/* --- g-slice memory checker tree implementation --- */ -#define SMC_TRUNK_COUNT (4093 /* 16381 */) /* prime, to distribute trunk collisions (big, allocated just once) */ -#define SMC_BRANCH_COUNT (511) /* prime, to distribute branch collisions */ -#define SMC_TRUNK_EXTENT (SMC_BRANCH_COUNT * 2039) /* key address space per trunk, should distribute uniformly across BRANCH_COUNT */ -#define SMC_TRUNK_HASH(k) ((k / SMC_TRUNK_EXTENT) % SMC_TRUNK_COUNT) /* generate new trunk hash per megabyte (roughly) */ -#define SMC_BRANCH_HASH(k) (k % SMC_BRANCH_COUNT) - -typedef struct { - SmcEntry *entries; - unsigned int n_entries; -} SmcBranch; - -static SmcBranch **smc_tree_root = NULL; - -static void -smc_tree_abort (int errval) -{ - const char *syserr = strerror (errval); - mem_error ("MemChecker: failure in debugging tree: %s", syserr); -} - -static inline SmcEntry* -smc_tree_branch_grow_L (SmcBranch *branch, - unsigned int index) -{ - unsigned int old_size = branch->n_entries * sizeof (branch->entries0); - unsigned int new_size = old_size + sizeof (branch->entries0); - SmcEntry *entry; - mem_assert (index <= branch->n_entries); - branch->entries = (SmcEntry*) realloc (branch->entries, new_size); - if (!branch->entries) - smc_tree_abort (errno); - entry = branch->entries + index; - memmove (entry + 1, entry, (branch->n_entries - index) * sizeof (entry0)); - branch->n_entries += 1; - return entry; -} - -static inline SmcEntry* -smc_tree_branch_lookup_nearest_L (SmcBranch *branch, - SmcKType key) -{ - unsigned int n_nodes = branch->n_entries, offs = 0; - SmcEntry *check = branch->entries; - int cmp = 0; - while (offs < n_nodes) - { - unsigned int i = (offs + n_nodes) >> 1; - check = branch->entries + i; - cmp = key < check->key ? -1 : key != check->key; - if (cmp == 0) - return check; /* return exact match */ - else if (cmp < 0) - n_nodes = i; - else /* (cmp > 0) */ - offs = i + 1; - } - /* check points at last mismatch, cmp > 0 indicates greater key */ - return cmp > 0 ? check + 1 : check; /* return insertion position for inexact match */ -} - -static void -smc_tree_insert (SmcKType key, - SmcVType value) -{ - unsigned int ix0, ix1; - SmcEntry *entry; - - g_mutex_lock (&smc_tree_mutex); - ix0 = SMC_TRUNK_HASH (key); - ix1 = SMC_BRANCH_HASH (key); - if (!smc_tree_root) - { - smc_tree_root = calloc (SMC_TRUNK_COUNT, sizeof (smc_tree_root0)); - if (!smc_tree_root) - smc_tree_abort (errno); - } - if (!smc_tree_rootix0) - { - smc_tree_rootix0 = calloc (SMC_BRANCH_COUNT, sizeof (smc_tree_root00)); - if (!smc_tree_rootix0) - smc_tree_abort (errno); - } - entry = smc_tree_branch_lookup_nearest_L (&smc_tree_rootix0ix1, key); - if (!entry || /* need create */ - entry >= smc_tree_rootix0ix1.entries + smc_tree_rootix0ix1.n_entries || /* need append */ - entry->key != key) /* need insert */ - entry = smc_tree_branch_grow_L (&smc_tree_rootix0ix1, entry - smc_tree_rootix0ix1.entries); - entry->key = key; - entry->value = value; - g_mutex_unlock (&smc_tree_mutex); -} - -static gboolean -smc_tree_lookup (SmcKType key, - SmcVType *value_p) -{ - SmcEntry *entry = NULL; - unsigned int ix0 = SMC_TRUNK_HASH (key), ix1 = SMC_BRANCH_HASH (key); - gboolean found_one = FALSE; - *value_p = 0; - g_mutex_lock (&smc_tree_mutex); - if (smc_tree_root && smc_tree_rootix0) - { - entry = smc_tree_branch_lookup_nearest_L (&smc_tree_rootix0ix1, key); - if (entry && - entry < smc_tree_rootix0ix1.entries + smc_tree_rootix0ix1.n_entries && - entry->key == key) - { - found_one = TRUE; - *value_p = entry->value; - } - } - g_mutex_unlock (&smc_tree_mutex); - return found_one; -} - -static gboolean -smc_tree_remove (SmcKType key) -{ - unsigned int ix0 = SMC_TRUNK_HASH (key), ix1 = SMC_BRANCH_HASH (key); - gboolean found_one = FALSE; - g_mutex_lock (&smc_tree_mutex); - if (smc_tree_root && smc_tree_rootix0) - { - SmcEntry *entry = smc_tree_branch_lookup_nearest_L (&smc_tree_rootix0ix1, key); - if (entry && - entry < smc_tree_rootix0ix1.entries + smc_tree_rootix0ix1.n_entries && - entry->key == key) - { - unsigned int i = entry - smc_tree_rootix0ix1.entries; - smc_tree_rootix0ix1.n_entries -= 1; - memmove (entry, entry + 1, (smc_tree_rootix0ix1.n_entries - i) * sizeof (entry0)); - if (!smc_tree_rootix0ix1.n_entries) - { - /* avoid useless pressure on the memory system */ - free (smc_tree_rootix0ix1.entries); - smc_tree_rootix0ix1.entries = NULL; - } - found_one = TRUE; - } + guint8 *current = slice; + slice = *(gpointer *) (current + next_offset); + if (G_UNLIKELY (g_mem_gc_friendly)) + memset (current, 0, mem_size); + g_free_sized (current, mem_size); } - g_mutex_unlock (&smc_tree_mutex); - return found_one; } #ifdef G_ENABLE_DEBUG void g_slice_debug_tree_statistics (void) { - g_mutex_lock (&smc_tree_mutex); - if (smc_tree_root) - { - unsigned int i, j, t = 0, o = 0, b = 0, su = 0, ex = 0, en = 4294967295u; - double tf, bf; - for (i = 0; i < SMC_TRUNK_COUNT; i++) - if (smc_tree_rooti) - { - t++; - for (j = 0; j < SMC_BRANCH_COUNT; j++) - if (smc_tree_rootij.n_entries) - { - b++; - su += smc_tree_rootij.n_entries; - en = MIN (en, smc_tree_rootij.n_entries); - ex = MAX (ex, smc_tree_rootij.n_entries); - } - else if (smc_tree_rootij.entries) - o++; /* formerly used, now empty */ - } - en = b ? en : 0; - tf = MAX (t, 1.0); /* max(1) to be a valid divisor */ - bf = MAX (b, 1.0); /* max(1) to be a valid divisor */ - g_fprintf (stderr, "GSlice: MemChecker: %u trunks, %u branches, %u old branches\n", t, b, o); - g_fprintf (stderr, "GSlice: MemChecker: %f branches per trunk, %.2f%% utilization\n", - b / tf, - 100.0 - (SMC_BRANCH_COUNT - b / tf) / (0.01 * SMC_BRANCH_COUNT)); - g_fprintf (stderr, "GSlice: MemChecker: %f entries per branch, %u minimum, %u maximum\n", - su / bf, en, ex); - } - else - g_fprintf (stderr, "GSlice: MemChecker: root=NULL\n"); - g_mutex_unlock (&smc_tree_mutex); - - /* sample statistics (beast + GSLice + 24h scripted core & GUI activity): - * PID %CPU %MEM VSZ RSS COMMAND - * 8887 30.3 45.8 456068 414856 beast-0.7.1 empty.bse - * $ cat /proc/8887/statm # total-program-size resident-set-size shared-pages text/code data/stack library dirty-pages - * 114017 103714 2354 344 0 108676 0 - * $ cat /proc/8887/status - * Name: beast-0.7.1 - * VmSize: 456068 kB - * VmLck: 0 kB - * VmRSS: 414856 kB - * VmData: 434620 kB - * VmStk: 84 kB - * VmExe: 1376 kB - * VmLib: 13036 kB - * VmPTE: 456 kB - * Threads: 3 - * (gdb) print g_slice_debug_tree_statistics () - * GSlice: MemChecker: 422 trunks, 213068 branches, 0 old branches - * GSlice: MemChecker: 504.900474 branches per trunk, 98.81% utilization - * GSlice: MemChecker: 4.965039 entries per branch, 1 minimum, 37 maximum - */ + g_fprintf (stderr, "GSlice: Implementation dropped in GLib 2.76\n"); } #endif /* G_ENABLE_DEBUG */
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/gspawn-private.h -> _service:tar_scm:glib-2.76.4.tar.xz/glib/gspawn-private.h
Changed
@@ -24,6 +24,7 @@ #include <errno.h> +#include "glibintl.h" #include "gspawn.h" static inline gint @@ -115,3 +116,24 @@ return G_SPAWN_ERROR_FAILED; } } + +static inline gboolean +_g_spawn_invalid_source_fd (gint fd, + const gint *source_fds, + gsize n_fds, + GError **error) +{ + gsize i; + + for (i = 0; i < n_fds; i++) + if (fd == source_fdsi) + { + g_set_error (error, + G_SPAWN_ERROR, + G_SPAWN_ERROR_INVAL, + _("Invalid source FDs argument")); + return TRUE; + } + + return FALSE; +}
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/gspawn-win32-helper.c -> _service:tar_scm:glib-2.76.4.tar.xz/glib/gspawn-win32-helper.c
Changed
@@ -23,20 +23,6 @@ #include <fcntl.h> -/* For _CrtSetReportMode, we don't want Windows CRT (2005 and later) - * to terminate the process if a bad file descriptor is passed into - * _get_osfhandle(). This is necessary because we use _get_osfhandle() - * to check the validity of the fd before we try to call close() on - * it as attempting to close an invalid fd will cause the Windows CRT - * to abort() this program internally. - * - * Please see http://msdn.microsoft.com/zh-tw/library/ks2530z6%28v=vs.80%29.aspx - * for an explanation on this. - */ -#if (defined (_MSC_VER) && _MSC_VER >= 1400) -#include <crtdbg.h> -#endif - #undef G_LOG_DOMAIN #include "glib.h" #define GSPAWN_HELPER @@ -168,30 +154,6 @@ return newfd; } -#if (defined (_MSC_VER) && _MSC_VER >= 1400) -/* - * This is the (empty) invalid parameter handler - * that is used for Visual C++ 2005 (and later) builds - * so that we can use this instead of the system automatically - * aborting the process. - * - * This is necessary as we use _get_oshandle() to check the validity - * of the file descriptors as we close them, so when an invalid file - * descriptor is passed into that function as we check on it, we get - * -1 as the result, instead of the gspawn helper program aborting. - * - * Please see http://msdn.microsoft.com/zh-tw/library/ks2530z6%28v=vs.80%29.aspx - * for an explanation on this. - */ -extern void -myInvalidParameterHandler(const wchar_t *expression, - const wchar_t *function, - const wchar_t *file, - unsigned int line, - uintptr_t pReserved); -#endif - - #ifndef HELPER_CONSOLE int _stdcall WinMain (struct HINSTANCE__ *hInstance, @@ -220,16 +182,7 @@ char **argv; wchar_t **wargv; char c; - -#if (defined (_MSC_VER) && _MSC_VER >= 1400) - /* set up our empty invalid parameter handler */ - _invalid_parameter_handler oldHandler, newHandler; - newHandler = myInvalidParameterHandler; - oldHandler = _set_invalid_parameter_handler(newHandler); - - /* Disable the message box for assertions. */ - _CrtSetReportMode(_CRT_ASSERT, 0); -#endif + GWin32InvalidParameterHandler handler; /* Fetch the wide-char argument vector */ wargv = CommandLineToArgvW (GetCommandLineW(), &argc); @@ -398,11 +351,13 @@ /* argvARG_CLOSE_DESCRIPTORS is "y" if file descriptors from 3 * upwards should be closed */ + GLIB_PRIVATE_CALL (g_win32_push_empty_invalid_parameter_handler) (&handler); if (argvARG_CLOSE_DESCRIPTORS0 == 'y') for (i = 3; i < 1000; i++) /* FIXME real limit? */ if (!g_hash_table_contains (fds, GINT_TO_POINTER (i))) if (_get_osfhandle (i) != -1) close (i); + GLIB_PRIVATE_CALL (g_win32_pop_invalid_parameter_handler) (&handler); /* We don't want our child to inherit the error report and * helper sync fds.
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/gspawn-win32.c -> _service:tar_scm:glib-2.76.4.tar.xz/glib/gspawn-win32.c
Changed
@@ -163,7 +163,7 @@ #else -#define safe_wspawnve _spawnve +#define safe_wspawnve _wspawnve #define safe_wspawnvpe _wspawnvpe #endif /* _UCRT */ @@ -658,6 +658,9 @@ { if (!make_pipe (stdin_pipe, error)) goto cleanup_and_fail; + if (_g_spawn_invalid_source_fd (stdin_pipe0, source_fds, n_fds, error) || + _g_spawn_invalid_source_fd (stdin_pipe1, source_fds, n_fds, error)) + goto cleanup_and_fail; stdin_fd = stdin_pipe0; } @@ -665,6 +668,9 @@ { if (!make_pipe (stdout_pipe, error)) goto cleanup_and_fail; + if (_g_spawn_invalid_source_fd (stdout_pipe0, source_fds, n_fds, error) || + _g_spawn_invalid_source_fd (stdout_pipe1, source_fds, n_fds, error)) + goto cleanup_and_fail; stdout_fd = stdout_pipe1; } @@ -672,6 +678,9 @@ { if (!make_pipe (stderr_pipe, error)) goto cleanup_and_fail; + if (_g_spawn_invalid_source_fd (stderr_pipe0, source_fds, n_fds, error) || + _g_spawn_invalid_source_fd (stderr_pipe1, source_fds, n_fds, error)) + goto cleanup_and_fail; stderr_fd = stderr_pipe1; } @@ -703,9 +712,15 @@ if (!make_pipe (child_err_report_pipe, error)) goto cleanup_and_fail; + if (_g_spawn_invalid_source_fd (child_err_report_pipe0, source_fds, n_fds, error) || + _g_spawn_invalid_source_fd (child_err_report_pipe1, source_fds, n_fds, error)) + goto cleanup_and_fail; if (!make_pipe (helper_sync_pipe, error)) goto cleanup_and_fail; + if (_g_spawn_invalid_source_fd (helper_sync_pipe0, source_fds, n_fds, error) || + _g_spawn_invalid_source_fd (helper_sync_pipe1, source_fds, n_fds, error)) + goto cleanup_and_fail; new_argv = g_new (char *, argc + 1 + ARG_COUNT); if (might_be_console_process ())
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/gspawn.c -> _service:tar_scm:glib-2.76.4.tar.xz/glib/gspawn.c
Changed
@@ -32,6 +32,7 @@ #include <string.h> #include <stdlib.h> /* for fdwalk */ #include <dirent.h> +#include <unistd.h> #ifdef HAVE_SPAWN_H #include <spawn.h> @@ -69,10 +70,18 @@ #include "glibintl.h" #include "glib-unix.h" +#ifdef __APPLE__ +#include <libproc.h> +#include <sys/proc_info.h> +#endif + #define INHERITS_OR_NULL_STDIN (G_SPAWN_STDIN_FROM_DEV_NULL | G_SPAWN_CHILD_INHERITS_STDIN) #define INHERITS_OR_NULL_STDOUT (G_SPAWN_STDOUT_TO_DEV_NULL | G_SPAWN_CHILD_INHERITS_STDOUT) #define INHERITS_OR_NULL_STDERR (G_SPAWN_STDERR_TO_DEV_NULL | G_SPAWN_CHILD_INHERITS_STDERR) +#define IS_STD_FILENO(_fd) ((_fd >= STDIN_FILENO) && (_fd <= STDERR_FILENO)) +#define IS_VALID_FILENO(_fd) (_fd >= 0) + /* posix_spawn() is assumed the fastest way to spawn, but glibc's * implementation was buggy before glibc 2.24, so avoid it on old versions. */ @@ -1334,13 +1343,31 @@ return fd; } -/* This function is called between fork() and exec() and hence must be - * async-signal-safe (see signal-safety(7)). */ +/* fdwalk()-compatible callback to close a fd for non-compliant + * implementations of fdwalk() that potentially pass already + * closed fds. + * + * It is not an error to pass an invalid fd to this function. + * + * This function is called between fork() and exec() and hence must be + * async-signal-safe (see signal-safety(7)). + */ G_GNUC_UNUSED static int -close_func (void *data, int fd) +close_func_with_invalid_fds (void *data, int fd) { + /* We use close and not g_close here because on some platforms, we + * don't know how to close only valid, open file descriptors, so we + * have to pass bad fds to close too. g_close warns if given a bad + * fd. + * + * This function returns no error, because there is nothing that the caller + * could do with that information. That is even the case for EINTR. See + * g_close() about the specialty of EINTR and why that is correct. + * If g_close() ever gets extended to handle EINTR specially, then this place + * should get updated to do the same handling. + */ if (fd >= GPOINTER_TO_INT (data)) - g_close (fd, NULL); + close (fd); return 0; } @@ -1385,6 +1412,8 @@ } #endif +static int safe_fdwalk_with_invalid_fds (int (*cb)(void *data, int fd), void *data); + /* This function is called between fork() and exec() and hence must be * async-signal-safe (see signal-safety(7)). */ static int @@ -1400,18 +1429,14 @@ return fdwalk (cb, data); #else /* Fallback implementation of fdwalk. It should be async-signal safe, but it - * may be slow on non-Linux operating systems, especially on systems allowing - * very high number of open file descriptors. + * may fail on non-Linux operating systems. See safe_fdwalk_with_invalid_fds + * for a slower alternative. */ - gint open_max = -1; + +#ifdef __linux__ gint fd; gint res = 0; - -#if 0 && defined(HAVE_SYS_RESOURCE_H) - struct rlimit rl; -#endif -#ifdef __linux__ /* Avoid use of opendir/closedir since these are not async-signal-safe. */ int dir_fd = open ("/proc/self/fd", O_RDONLY | O_DIRECTORY); if (dir_fd >= 0) @@ -1439,7 +1464,8 @@ return res; } - /* If /proc is not mounted or not accessible we fall back to the old + /* If /proc is not mounted or not accessible we fail here and rely on + * safe_fdwalk_with_invalid_fds to fall back to the old * rlimit trick. */ #endif @@ -1455,6 +1481,8 @@ * fcntl(fd, F_PREVFD) * - return highest allocated file descriptor < fd. */ + gint fd; + gint res = 0; open_max = fcntl (INT_MAX, F_PREVFD); /* find the maximum fd */ if (open_max < 0) /* No open files */ @@ -1463,9 +1491,30 @@ for (fd = -1; (fd = fcntl (fd, F_NEXTFD, open_max)) != -1; ) if ((res = cb (data, fd)) != 0 || fd == open_max) break; -#else + + return res; +#endif + + return safe_fdwalk_with_invalid_fds (cb, data); +#endif +} + +/* This function is called between fork() and exec() and hence must be + * async-signal-safe (see signal-safety(7)). */ +static int +safe_fdwalk_with_invalid_fds (int (*cb)(void *data, int fd), void *data) +{ + /* Fallback implementation of fdwalk. It should be async-signal safe, but it + * may be slow, especially on systems allowing very high number of open file + * descriptors. + */ + gint open_max = -1; + gint fd; + gint res = 0; #if 0 && defined(HAVE_SYS_RESOURCE_H) + struct rlimit rl; + /* Use getrlimit() function provided by the system if it is known to be * async-signal safe. * @@ -1495,13 +1544,41 @@ if (open_max < 0) open_max = 4096; +#if defined(__APPLE__) + /* proc_pidinfo isn't documented as async-signal-safe but looking at the implementation + * in the darwin tree here: + * + * https://opensource.apple.com/source/Libc/Libc-498/darwin/libproc.c.auto.html + * + * It's just a thin wrapper around a syscall, so it's probably okay. + */ + { + char buffer4096 * PROC_PIDLISTFD_SIZE; + ssize_t buffer_size; + + buffer_size = proc_pidinfo (getpid (), PROC_PIDLISTFDS, 0, buffer, sizeof (buffer)); + + if (buffer_size > 0 && + sizeof (buffer) >= (size_t) buffer_size && + (buffer_size % PROC_PIDLISTFD_SIZE) == 0) + { + const struct proc_fdinfo *fd_info = (const struct proc_fdinfo *) buffer; + size_t number_of_fds = (size_t) buffer_size / PROC_PIDLISTFD_SIZE; + + for (size_t i = 0; i < number_of_fds; i++) + if ((res = cb (data, fd_infoi.proc_fd)) != 0) + break; + + return res; + } + } +#endif + for (fd = 0; fd < open_max; fd++) if ((res = cb (data, fd)) != 0) break; -#endif return res; -#endif } /* This function is called between fork() and exec() and hence must be @@ -1509,6 +1586,8 @@ static int safe_fdwalk_set_cloexec (int lowfd) { + int ret; + #if defined(HAVE_CLOSE_RANGE) && defined(CLOSE_RANGE_CLOEXEC) /* close_range() is available in Linux since kernel 5.9, and on FreeBSD at * around the same time. It was designed for use in async-signal-safe @@ -1520,11 +1599,14 @@ * Handle ENOSYS in case it’s supported in libc but not the kernel; if so, * fall back to safe_fdwalk(). Handle EINVAL in case `CLOSE_RANGE_CLOEXEC` * is not supported. */ - int ret = close_range (lowfd, G_MAXUINT, CLOSE_RANGE_CLOEXEC); + ret = close_range (lowfd, G_MAXUINT, CLOSE_RANGE_CLOEXEC); if (ret == 0 || !(errno == ENOSYS || errno == EINVAL)) return ret; #endif /* HAVE_CLOSE_RANGE */ - return safe_fdwalk (set_cloexec, GINT_TO_POINTER (lowfd)); + + ret = safe_fdwalk (set_cloexec, GINT_TO_POINTER (lowfd)); + + return ret; } /* This function is called between fork() and exec() and hence must be @@ -1534,6 +1616,20 @@ static int safe_closefrom (int lowfd) { + int ret; + +#if defined(HAVE_CLOSE_RANGE) + /* close_range() is available in Linux since kernel 5.9, and on FreeBSD at + * around the same time. It was designed for use in async-signal-safe + * situations: https://bugs.python.org/issue38061 + * + * Handle ENOSYS in case it’s supported in libc but not the kernel; if so, + * fall back to safe_fdwalk(). */ + ret = close_range (lowfd, G_MAXUINT, 0); + if (ret == 0 || errno != ENOSYS) + return ret; +#endif /* HAVE_CLOSE_RANGE */ + #if defined(__FreeBSD__) || defined(__OpenBSD__) || \ (defined(__sun__) && defined(F_CLOSEFROM)) /* Use closefrom function provided by the system if it is known to be @@ -1565,19 +1661,9 @@ */ return fcntl (lowfd, F_CLOSEM); #else + ret = safe_fdwalk (close_func_with_invalid_fds, GINT_TO_POINTER (lowfd)); -#if defined(HAVE_CLOSE_RANGE) - /* close_range() is available in Linux since kernel 5.9, and on FreeBSD at - * around the same time. It was designed for use in async-signal-safe - * situations: https://bugs.python.org/issue38061 - * - * Handle ENOSYS in case it’s supported in libc but not the kernel; if so, - * fall back to safe_fdwalk(). */ - int ret = close_range (lowfd, G_MAXUINT, 0); - if (ret == 0 || errno != ENOSYS) - return ret; -#endif /* HAVE_CLOSE_RANGE */ - return safe_fdwalk (close_func, GINT_TO_POINTER (lowfd)); + return ret; #endif } @@ -1597,6 +1683,30 @@ /* This function is called between fork() and exec() and hence must be * async-signal-safe (see signal-safety(7)). */ +static gboolean +relocate_fd_out_of_standard_range (gint *fd) +{ + gint ret = -1; + const int min_fileno = STDERR_FILENO + 1; + + do + ret = fcntl (*fd, F_DUPFD, min_fileno); + while (ret < 0 && errno == EINTR); + + /* Note we don't need to close the old fd, because the caller is expected + * to close fds in the standard range itself. + */ + if (ret >= min_fileno) + { + *fd = ret; + return TRUE; + } + + return FALSE; +} + +/* This function is called between fork() and exec() and hence must be + * async-signal-safe (see signal-safety(7)). */ static gint safe_open (const char *path, gint mode) { @@ -1614,7 +1724,7 @@ CHILD_CHDIR_FAILED, CHILD_EXEC_FAILED, CHILD_OPEN_FAILED, - CHILD_DUP2_FAILED, + CHILD_DUPFD_FAILED, CHILD_FORK_FAILED, CHILD_CLOSE_FAILED, }; @@ -1653,17 +1763,42 @@ if (working_directory && chdir (working_directory) < 0) write_err_and_exit (child_err_report_fd, CHILD_CHDIR_FAILED); - - /* Redirect pipes as required */ - if (stdin_fd >= 0) + + /* It's possible the caller assigned stdin to an fd with a + * file number that is supposed to be reserved for + * stdout or stderr. + * + * If so, move it up out of the standard range, so it doesn't + * cause a conflict. + */ + if (IS_STD_FILENO (stdin_fd) && stdin_fd != STDIN_FILENO) + { + int old_fd = stdin_fd; + + if (!relocate_fd_out_of_standard_range (&stdin_fd)) + write_err_and_exit (child_err_report_fd, CHILD_DUPFD_FAILED); + + if (stdout_fd == old_fd) + stdout_fd = stdin_fd; + + if (stderr_fd == old_fd) + stderr_fd = stdin_fd; + } + + /* Redirect pipes as required + * + * There are two cases where we don't need to do the redirection + * 1. Where the associated file descriptor is cleared/invalid + * 2. When the associated file descriptor is already given the + * correct file number. + */ + if (IS_VALID_FILENO (stdin_fd) && stdin_fd != STDIN_FILENO) { if (safe_dup2 (stdin_fd, 0) < 0) write_err_and_exit (child_err_report_fd, - CHILD_DUP2_FAILED); + CHILD_DUPFD_FAILED); - if (!((stdout_fd >= 0 || stdout_to_null) && stdin_fd == 1) && - !((stderr_fd >= 0 || stderr_to_null) && stdin_fd == 2)) - set_cloexec (GINT_TO_POINTER(0), stdin_fd); + set_cloexec (GINT_TO_POINTER(0), stdin_fd); } else if (!child_inherits_stdin) { @@ -1674,19 +1809,34 @@ CHILD_OPEN_FAILED); if (safe_dup2 (read_null, 0) < 0) write_err_and_exit (child_err_report_fd, - CHILD_DUP2_FAILED); + CHILD_DUPFD_FAILED); close_and_invalidate (&read_null); } - if (stdout_fd >= 0) + /* Like with stdin above, it's possible the caller assigned + * stdout to an fd with a file number that's intruding on the + * standard range. + * + * If so, move it out of the way, too. + */ + if (IS_STD_FILENO (stdout_fd) && stdout_fd != STDOUT_FILENO) + { + int old_fd = stdout_fd; + + if (!relocate_fd_out_of_standard_range (&stdout_fd)) + write_err_and_exit (child_err_report_fd, CHILD_DUPFD_FAILED); + + if (stderr_fd == old_fd) + stderr_fd = stdout_fd; + } + + if (IS_VALID_FILENO (stdout_fd) && stdout_fd != STDOUT_FILENO) { if (safe_dup2 (stdout_fd, 1) < 0) write_err_and_exit (child_err_report_fd, - CHILD_DUP2_FAILED); + CHILD_DUPFD_FAILED); - if (!((stdin_fd >= 0 || !child_inherits_stdin) && stdout_fd == 0) && - !((stderr_fd >= 0 || stderr_to_null) && stdout_fd == 2)) - set_cloexec (GINT_TO_POINTER(0), stdout_fd); + set_cloexec (GINT_TO_POINTER(0), stdout_fd); } else if (stdout_to_null) { @@ -1696,19 +1846,29 @@ CHILD_OPEN_FAILED); if (safe_dup2 (write_null, 1) < 0) write_err_and_exit (child_err_report_fd, - CHILD_DUP2_FAILED); + CHILD_DUPFD_FAILED); close_and_invalidate (&write_null); } - if (stderr_fd >= 0) + if (IS_STD_FILENO (stderr_fd) && stderr_fd != STDERR_FILENO) + { + if (!relocate_fd_out_of_standard_range (&stderr_fd)) + write_err_and_exit (child_err_report_fd, CHILD_DUPFD_FAILED); + } + + /* Like with stdin/stdout above, it's possible the caller assigned + * stderr to an fd with a file number that's intruding on the + * standard range. + * + * Make sure it's out of the way, also. + */ + if (IS_VALID_FILENO (stderr_fd) && stderr_fd != STDERR_FILENO) { if (safe_dup2 (stderr_fd, 2) < 0) write_err_and_exit (child_err_report_fd, - CHILD_DUP2_FAILED); + CHILD_DUPFD_FAILED); - if (!((stdin_fd >= 0 || !child_inherits_stdin) && stderr_fd == 0) && - !((stdout_fd >= 0 || stdout_to_null) && stderr_fd == 1)) - set_cloexec (GINT_TO_POINTER(0), stderr_fd); + set_cloexec (GINT_TO_POINTER(0), stderr_fd); } else if (stderr_to_null) { @@ -1718,7 +1878,7 @@ CHILD_OPEN_FAILED); if (safe_dup2 (write_null, 2) < 0) write_err_and_exit (child_err_report_fd, - CHILD_DUP2_FAILED); + CHILD_DUPFD_FAILED); close_and_invalidate (&write_null); } @@ -1732,7 +1892,7 @@ if (child_setup == NULL && n_fds == 0) { if (safe_dup2 (child_err_report_fd, 3) < 0) - write_err_and_exit (child_err_report_fd, CHILD_DUP2_FAILED); + write_err_and_exit (child_err_report_fd, CHILD_DUPFD_FAILED); set_cloexec (GINT_TO_POINTER (0), 3); if (safe_closefrom (4) < 0) write_err_and_exit (child_err_report_fd, CHILD_CLOSE_FAILED); @@ -1768,7 +1928,7 @@ if (max_target_fd == G_MAXINT) { errno = EINVAL; - write_err_and_exit (child_err_report_fd, CHILD_DUP2_FAILED); + write_err_and_exit (child_err_report_fd, CHILD_DUPFD_FAILED); } /* If we're doing remapping fd assignments, we need to handle @@ -1782,7 +1942,7 @@ { source_fdsi = dupfd_cloexec (source_fdsi, max_target_fd + 1); if (source_fdsi < 0) - write_err_and_exit (child_err_report_fd, CHILD_DUP2_FAILED); + write_err_and_exit (child_err_report_fd, CHILD_DUPFD_FAILED); } } @@ -1804,11 +1964,11 @@ { child_err_report_fd = dupfd_cloexec (child_err_report_fd, max_target_fd + 1); if (child_err_report_fd < 0) - write_err_and_exit (child_err_report_fd, CHILD_DUP2_FAILED); + write_err_and_exit (child_err_report_fd, CHILD_DUPFD_FAILED); } if (safe_dup2 (source_fdsi, target_fdsi) < 0) - write_err_and_exit (child_err_report_fd, CHILD_DUP2_FAILED); + write_err_and_exit (child_err_report_fd, CHILD_DUPFD_FAILED); close_and_invalidate (&source_fdsi); } @@ -2174,6 +2334,9 @@ { if (!g_unix_open_pipe (stdin_pipe, pipe_flags, error)) goto cleanup_and_fail; + if (_g_spawn_invalid_source_fd (stdin_pipe0, source_fds, n_fds, error) || + _g_spawn_invalid_source_fd (stdin_pipe1, source_fds, n_fds, error)) + goto cleanup_and_fail; child_close_fdsn_child_close_fds++ = stdin_pipe1; stdin_fd = stdin_pipe0; } @@ -2182,6 +2345,9 @@ { if (!g_unix_open_pipe (stdout_pipe, pipe_flags, error)) goto cleanup_and_fail; + if (_g_spawn_invalid_source_fd (stdout_pipe0, source_fds, n_fds, error) || + _g_spawn_invalid_source_fd (stdout_pipe1, source_fds, n_fds, error)) + goto cleanup_and_fail; child_close_fdsn_child_close_fds++ = stdout_pipe0; stdout_fd = stdout_pipe1; } @@ -2190,6 +2356,9 @@ { if (!g_unix_open_pipe (stderr_pipe, pipe_flags, error)) goto cleanup_and_fail; + if (_g_spawn_invalid_source_fd (stderr_pipe0, source_fds, n_fds, error) || + _g_spawn_invalid_source_fd (stderr_pipe1, source_fds, n_fds, error)) + goto cleanup_and_fail; child_close_fdsn_child_close_fds++ = stderr_pipe0; stderr_fd = stderr_pipe1; } @@ -2331,9 +2500,18 @@ if (!g_unix_open_pipe (child_err_report_pipe, pipe_flags, error)) goto cleanup_and_fail; - - if (intermediate_child && !g_unix_open_pipe (child_pid_report_pipe, pipe_flags, error)) + if (_g_spawn_invalid_source_fd (child_err_report_pipe0, source_fds, n_fds, error) || + _g_spawn_invalid_source_fd (child_err_report_pipe1, source_fds, n_fds, error)) goto cleanup_and_fail; + + if (intermediate_child) + { + if (!g_unix_open_pipe (child_pid_report_pipe, pipe_flags, error)) + goto cleanup_and_fail; + if (_g_spawn_invalid_source_fd (child_pid_report_pipe0, source_fds, n_fds, error) || + _g_spawn_invalid_source_fd (child_pid_report_pipe1, source_fds, n_fds, error)) + goto cleanup_and_fail; + } pid = fork (); @@ -2528,7 +2706,7 @@ g_strerror (buf1)); break; - case CHILD_DUP2_FAILED: + case CHILD_DUPFD_FAILED: g_set_error (error, G_SPAWN_ERROR, G_SPAWN_ERROR_FAILED,
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/gspawn.h -> _service:tar_scm:glib-2.76.4.tar.xz/glib/gspawn.h
Changed
@@ -104,7 +104,7 @@ /** * GSpawnChildSetupFunc: - * @user_data: user data to pass to the function. + * @data: user data passed to the function. * * Specifies the type of the setup function passed to g_spawn_async(), * g_spawn_sync() and g_spawn_async_with_pipes(), which can, in very @@ -137,7 +137,7 @@ * and g_environ_unsetenv(), and then pass the complete environment * list to the `g_spawn...` function. */ -typedef void (* GSpawnChildSetupFunc) (gpointer user_data); +typedef void (* GSpawnChildSetupFunc) (gpointer data); /** * GSpawnFlags:
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/gstdio.c -> _service:tar_scm:glib-2.76.4.tar.xz/glib/gstdio.c
Changed
@@ -1758,6 +1758,11 @@ * attempt to correctly handle %EINTR, which has platform-specific * semantics. * + * It is a bug to call this function with an invalid file descriptor. + * + * Since 2.76, this function is guaranteed to be async-signal-safe if (and only + * if) @error is %NULL and @fd is a valid open file descriptor. + * * Returns: %TRUE on success, %FALSE if there was an error. * * Since: 2.36 @@ -1783,11 +1788,16 @@ * on Linux at least. Anyone who wants to add a conditional check * for e.g. HP-UX is welcome to do so later... * + * close_func_with_invalid_fds() in gspawn.c has similar logic. + * * https://lwn.net/Articles/576478/ * http://lkml.indiana.edu/hypermail/linux/kernel/0509.1/0877.html * https://bugzilla.gnome.org/show_bug.cgi?id=682819 * http://utcc.utoronto.ca/~cks/space/blog/unix/CloseEINTR * https://sites.google.com/site/michaelsafyan/software-engineering/checkforeintrwheninvokingclosethinkagain + * + * `close$NOCANCEL()` in gstdioprivate.h, on macOS, ensures that the fd is + * closed even if it did return EINTR. */ return TRUE; } @@ -1799,8 +1809,140 @@ g_strerror (errsv)); } + if (errsv == EBADF) + { + /* There is a bug. Fail an assertion. Note that this function is supposed to be + * async-signal-safe, but in case an assertion fails, all bets are already off. */ + if (fd >= 0) + { + /* Closing an non-negative, invalid file descriptor is a bug. The bug is + * not necessarily in the caller of g_close(), but somebody else + * might have wrongly closed fd. In any case, there is a serious bug + * somewhere. */ + g_critical ("g_close(fd:%d) failed with EBADF. The tracking of file descriptors got messed up", fd); + } + else + { + /* Closing a negative "file descriptor" is less problematic. It's still a nonsensical action + * from the caller. Assert against that too. */ + g_critical ("g_close(fd:%d) failed with EBADF. This is not a valid file descriptor", fd); + } + } + errno = errsv; + return FALSE; } + return TRUE; } + +/** + * g_clear_fd: (skip) + * @fd_ptr: (not optional) (inout) (transfer full): a pointer to a file descriptor + * @error: Used to return an error on failure + * + * If @fd_ptr points to a file descriptor, close it and return + * whether closing it was successful, like g_close(). + * If @fd_ptr points to a negative number, return %TRUE without closing + * anything. + * In both cases, set @fd_ptr to `-1` before returning. + * + * Like g_close(), if closing the file descriptor fails, the error is + * stored in both %errno and @error. If this function succeeds, + * %errno is undefined. + * + * This function is async-signal-safe if @error is %NULL and @fd_ptr + * points to either a negative number or a valid file descriptor. + * + * It is a programming error for @fd_ptr to point to a non-negative + * number that is not a valid file descriptor. + * + * A typical use of this function is to clean up a file descriptor at + * the end of its scope, whether it has been set successfully or not: + * + * | + * gboolean + * operate_on_fd (GError **error) + * { + * gboolean ret = FALSE; + * int fd = -1; + * + * fd = open_a_fd (error); + * + * if (fd < 0) + * goto out; + * + * if (!do_something (fd, error)) + * goto out; + * + * if (!g_clear_fd (&fd, error)) + * goto out; + * + * ret = TRUE; + * + * out: + * // OK to call even if fd was never opened or was already closed + * g_clear_fd (&fd, NULL); + * return ret; + * } + * | + * + * This function is also useful in conjunction with #g_autofd. + * + * Returns: %TRUE on success + * Since: 2.76 + */ + +/** + * g_autofd: (skip) + * + * Macro to add an attribute to a file descriptor variable to ensure + * automatic cleanup using g_clear_fd(). + * + * This macro behaves like #g_autofree rather than g_autoptr(): it is + * an attribute supplied before the type name, rather than wrapping the + * type definition. + * + * Otherwise, this macro has similar constraints as g_autoptr(): it is + * only supported on GCC and clang, and the variable must be initialized + * (to either a valid file descriptor or a negative number). + * + * Using this macro is async-signal-safe if the constraints described above + * are met, so it can be used in a signal handler or after `fork()`. + * + * Any error from closing the file descriptor when it goes out of scope + * is ignored. Use g_clear_fd() if error-checking is required. + * + * | + * gboolean + * operate_on_fds (GError **error) + * { + * g_autofd int fd1 = open_a_fd (..., error); + * g_autofd int fd2 = -1; + * + * // it is safe to return early here, nothing will be closed + * if (fd1 < 0) + * return FALSE; + * + * fd2 = open_a_fd (..., error); + * + * // fd1 will be closed automatically if we return here + * if (fd2 < 0) + * return FALSE; + * + * // fd1 and fd2 will be closed automatically if we return here + * if (!do_something_useful (fd1, fd2, error)) + * return FALSE; + * + * // fd2 will be closed automatically if we return here + * if (!g_clear_fd (&fd1, error)) + * return FALSE; + * + * // fd2 will be automatically closed here if still open + * return TRUE; + * } + * | + * + * Since: 2.76 + */
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/gstdio.h -> _service:tar_scm:glib-2.76.4.tar.xz/glib/gstdio.h
Changed
@@ -23,6 +23,7 @@ #include <glib/gprintf.h> +#include <errno.h> #include <sys/stat.h> G_BEGIN_DECLS @@ -178,6 +179,53 @@ gboolean g_close (gint fd, GError **error); +GLIB_AVAILABLE_STATIC_INLINE_IN_2_76 +static inline gboolean +g_clear_fd (int *fd_ptr, + GError **error) +{ + int fd = *fd_ptr; + + *fd_ptr = -1; + + if (fd < 0) + return TRUE; + + /* Suppress "Not available before" warning */ + G_GNUC_BEGIN_IGNORE_DEPRECATIONS + return g_close (fd, error); + G_GNUC_END_IGNORE_DEPRECATIONS +} + +/* g_autofd should be defined on the same compilers where g_autofree is + * This avoids duplicating the feature-detection here. */ +#ifdef g_autofree +#ifndef __GTK_DOC_IGNORE__ +/* Not public API */ +static inline void +_g_clear_fd_ignore_error (int *fd_ptr) +{ + /* Don't overwrite thread-local errno if closing the fd fails */ + int errsv = errno; + + /* Suppress "Not available before" warning */ + G_GNUC_BEGIN_IGNORE_DEPRECATIONS + + if (!g_clear_fd (fd_ptr, NULL)) + { + /* Do nothing: we ignore all errors, except for EBADF which + * is a programming error, checked for by g_close(). */ + } + + G_GNUC_END_IGNORE_DEPRECATIONS + + errno = errsv; +} +#endif + +#define g_autofd _GLIB_CLEANUP(_g_clear_fd_ignore_error) GLIB_AVAILABLE_MACRO_IN_2_76 +#endif + G_END_DECLS #endif /* __G_STDIO_H__ */
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/gstdioprivate.h -> _service:tar_scm:glib-2.76.4.tar.xz/glib/gstdioprivate.h
Changed
@@ -68,7 +68,36 @@ GWin32PrivateStat *buf); #endif - +/* The POSIX standard specifies that if close() fails with EINTR the + * file descriptor may or may not be in fact closed. Since another + * thread might have already reused the FD if it was in fact closed + * either a test of FD to ensure that it's closed nor a second + * call to close() may indicate the wrong FD, so the error must be + * ignored. + * + * However, since Mac OS X 10.5 (Leopard) Apple provdes a hidden + * implementation of close that doesn't allow another thread + * to cancel the close so it never fails with EINTR. + * + * The official way to enable this is to set __DARWIN_NON_CANCELABLE + * in the build, but that applies to all system calls, not just + * close(). Following Chromium's example (see + * https://chromium.googlesource.com/chromium/src/base/+/refs/heads/main/mac/close_nocancel.cc ) + * we choose to expose and use the hidden close variant only. + */ +#ifdef __APPLE__ +#include <sys/cdefs.h> +#include <unistd.h> +# if !__DARWIN_NON_CANCELABLE +# if !__DARWIN_ONLY_UNIX_CONFORMANCE +# define close close$NOCANCEL$UNIX2003 +int close$NOCANCEL$UNIX2003 (int fd); +# else +# define close close$NOCANCEL +int close$NOCANCEL (int fd); +# endif +# endif +#endif G_END_DECLS #endif /* __G_STDIOPRIVATE_H__ */
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/gstrfuncs.c -> _service:tar_scm:glib-2.76.4.tar.xz/glib/gstrfuncs.c
Changed
@@ -352,12 +352,12 @@ * Returns: a newly-allocated copy of @str */ gchar* -g_strdup (const gchar *str) +(g_strdup) (const gchar *str) { gchar *new_str; gsize length; - if (str) + if G_LIKELY (str) { length = strlen (str) + 1; new_str = g_new (char, length); @@ -495,12 +495,12 @@ * @dest: destination buffer. * @src: source string. * - * Copies a nul-terminated string into the dest buffer, include the - * trailing nul, and return a pointer to the trailing nul byte. - * This is useful for concatenating multiple strings together - * without having to repeatedly scan for the end. + * Copies a nul-terminated string into the destination buffer, including + * the trailing nul byte, and returns a pointer to the trailing nul byte + * in `dest`. The return value is useful for concatenating multiple + * strings without having to repeatedly scan for the end. * - * Returns: a pointer to trailing nul byte. + * Returns: a pointer to the trailing nul byte in `dest`. **/ gchar * g_stpcpy (gchar *dest, @@ -1362,14 +1362,17 @@ G_UNLOCK (errors); errno = saved_errno; - return msg; + return NULL; } if (!g_get_console_charset (NULL)) { msg = g_locale_to_utf8 (msg, -1, NULL, NULL, &error); if (error) - g_print ("%s\n", error->message); + { + g_print ("%s\n", error->message); + g_error_free (error); + } } else if (msg == (const gchar *)buf) msg = g_strdup (buf); @@ -2765,7 +2768,7 @@ * * Searches the string @haystack for the first occurrence * of the string @needle, limiting the length of the search - * to @haystack_len. + * to @haystack_len or a nul terminator byte (whichever is reached first). * * Returns: a pointer to the found occurrence, or * %NULL if not found. @@ -2928,9 +2931,8 @@ * * Since: 2.2 */ -gboolean -g_str_has_suffix (const gchar *str, - const gchar *suffix) +gboolean (g_str_has_suffix) (const gchar *str, + const gchar *suffix) { gsize str_len; gsize suffix_len; @@ -2958,9 +2960,8 @@ * * Since: 2.2 */ -gboolean -g_str_has_prefix (const gchar *str, - const gchar *prefix) +gboolean (g_str_has_prefix) (const gchar *str, + const gchar *prefix) { g_return_val_if_fail (str != NULL, FALSE); g_return_val_if_fail (prefix != NULL, FALSE);
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/gstrfuncs.h -> _service:tar_scm:glib-2.76.4.tar.xz/glib/gstrfuncs.h
Changed
@@ -32,9 +32,12 @@ #endif #include <stdarg.h> +#include <string.h> + #include <glib/gmacros.h> #include <glib/gtypes.h> #include <glib/gerror.h> +#include <glib/gmem.h> G_BEGIN_DECLS @@ -137,11 +140,73 @@ const gchar *needle); GLIB_AVAILABLE_IN_ALL -gboolean g_str_has_suffix (const gchar *str, - const gchar *suffix); +gboolean (g_str_has_suffix) (const gchar *str, + const gchar *suffix); GLIB_AVAILABLE_IN_ALL -gboolean g_str_has_prefix (const gchar *str, - const gchar *prefix); +gboolean (g_str_has_prefix) (const gchar *str, + const gchar *prefix); + +#if G_GNUC_CHECK_VERSION (2, 0) +#ifndef __GTK_DOC_IGNORE__ +#ifndef __GI_SCANNER__ + +/* This macro is defeat a false -Wnonnull warning in GCC. + * Without it, it thinks strlen and memcmp may be getting passed NULL + * despite the explicit check for NULL right above the calls. + */ +#define _G_STR_NONNULL(x) ((x) + !(x)) + +#define g_str_has_prefix(STR, PREFIX) \ + (__builtin_constant_p (PREFIX)? \ + G_GNUC_EXTENSION ({ \ + const char * const __str = (STR); \ + const char * const __prefix = (PREFIX); \ + gboolean __result = FALSE; \ + \ + if G_UNLIKELY (__str == NULL || __prefix == NULL) \ + __result = (g_str_has_prefix) (__str, __prefix); \ + else \ + { \ + const size_t __str_len = strlen (_G_STR_NONNULL (__str)); \ + const size_t __prefix_len = strlen (_G_STR_NONNULL (__prefix)); \ + if (__str_len >= __prefix_len) \ + __result = memcmp (_G_STR_NONNULL (__str), \ + _G_STR_NONNULL (__prefix), \ + __prefix_len) == 0; \ + } \ + __result; \ + }) \ + : \ + (g_str_has_prefix) (STR, PREFIX) \ + ) + +#define g_str_has_suffix(STR, SUFFIX) \ + (__builtin_constant_p (SUFFIX)? \ + G_GNUC_EXTENSION ({ \ + const char * const __str = (STR); \ + const char * const __suffix = (SUFFIX); \ + gboolean __result = FALSE; \ + \ + if G_UNLIKELY (__str == NULL || __suffix == NULL) \ + __result = (g_str_has_suffix) (__str, __suffix); \ + else \ + { \ + const size_t __str_len = strlen (_G_STR_NONNULL (__str)); \ + const size_t __suffix_len = strlen (_G_STR_NONNULL (__suffix)); \ + if (__str_len >= __suffix_len) \ + __result = memcmp (__str + __str_len - __suffix_len, \ + _G_STR_NONNULL (__suffix), \ + __suffix_len) == 0; \ + } \ + __result; \ + }) \ + : \ + (g_str_has_suffix) (STR, SUFFIX) \ + ) + +#endif /* !defined (__GI_SCANNER__) */ +#endif /* !defined (__GTK_DOC_IGNORE__) */ +#endif /* G_GNUC_CHECK_VERSION (2, 0) */ /* String to/from double conversion functions */ @@ -216,7 +281,7 @@ * ought to be freed with g_free from the caller at some point. */ GLIB_AVAILABLE_IN_ALL -gchar* g_strdup (const gchar *str) G_GNUC_MALLOC; +gchar* (g_strdup) (const gchar *str) G_GNUC_MALLOC; GLIB_AVAILABLE_IN_ALL gchar* g_strdup_printf (const gchar *format, ...) G_GNUC_PRINTF (1, 2) G_GNUC_MALLOC; @@ -236,6 +301,32 @@ gchar* g_strjoin (const gchar *separator, ...) G_GNUC_MALLOC G_GNUC_NULL_TERMINATED; +#if G_GNUC_CHECK_VERSION(2, 0) +#ifndef __GTK_DOC_IGNORE__ +#ifndef __GI_SCANNER__ + +G_ALWAYS_INLINE static inline char * +g_strdup_inline (const char *str) +{ + if (__builtin_constant_p (!str) && !str) + return NULL; + + if (__builtin_constant_p (!!str) && !!str && __builtin_constant_p (strlen (str))) + { + const size_t len = strlen (str) + 1; + char *dup_str = (char *) g_malloc (len); + return (char *) memcpy (dup_str, str, len); + } + + return g_strdup (str); +} + +#define g_strdup(x) g_strdup_inline (x) + +#endif /* !defined (__GI_SCANNER__) */ +#endif /* !defined (__GTK_DOC_IGNORE__) */ +#endif /* G_GNUC_CHECK_VERSION (2, 0) */ + /* Make a copy of a string interpreting C string -style escape * sequences. Inverse of g_strescape. The recognized sequences are \b * \f \n \r \t \\ \" and the octal format. @@ -363,6 +454,51 @@ guint64 *out_num, GError **error); +/** + * g_set_str: (skip) + * @str_pointer: (inout) (not optional) (nullable): a pointer to either a string or %NULL + * @new_str: (nullable): a string to assign to @str_pointer, or %NULL + * + * Updates a pointer to a string to a copy of @new_str. The previous string + * pointed to by @str_pointer will be freed with g_free(). + * + * @str_pointer must not be %NULL, but can point to a %NULL value. + * + * One convenient usage of this function is in implementing property settings: + * | + * void + * foo_set_bar (Foo *foo, + * const char *new_bar) + * { + * g_return_if_fail (IS_FOO (foo)); + * + * if (g_set_str (&foo->bar, new_bar)) + * g_object_notify (foo, "bar"); + * } + * | + * + * Returns: %TRUE if the value of @str_pointer changed, %FALSE otherwise + * + * Since: 2.76 + */ +GLIB_AVAILABLE_STATIC_INLINE_IN_2_76 +static inline gboolean +g_set_str (char **str_pointer, + const char *new_str) +{ + char *copy; + + if (*str_pointer == new_str || + (*str_pointer && new_str && strcmp (*str_pointer, new_str) == 0)) + return FALSE; + + copy = g_strdup (new_str); + g_free (*str_pointer); + *str_pointer = copy; + + return TRUE; +} + G_END_DECLS #endif /* __G_STRFUNCS_H__ */
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/gstring.c -> _service:tar_scm:glib-2.76.4.tar.xz/glib/gstring.c
Changed
@@ -75,22 +75,29 @@ */ static void -g_string_maybe_expand (GString *string, - gsize len) +g_string_expand (GString *string, + gsize len) { /* Detect potential overflow */ if G_UNLIKELY ((G_MAXSIZE - string->len - 1) < len) g_error ("adding %" G_GSIZE_FORMAT " to string would overflow", len); - if (string->len + len >= string->allocated_len) - { - string->allocated_len = g_nearest_pow (string->len + len + 1); - /* If the new size is bigger than G_MAXSIZE / 2, only allocate enough - * memory for this string and don't over-allocate. */ - if (string->allocated_len == 0) - string->allocated_len = string->len + len + 1; - string->str = g_realloc (string->str, string->allocated_len); - } + string->allocated_len = g_nearest_pow (string->len + len + 1); + /* If the new size is bigger than G_MAXSIZE / 2, only allocate enough + * memory for this string and don't over-allocate. + */ + if (string->allocated_len == 0) + string->allocated_len = string->len + len + 1; + + string->str = g_realloc (string->str, string->allocated_len); +} + +static inline void +g_string_maybe_expand (GString *string, + gsize len) +{ + if (G_UNLIKELY (string->len + len >= string->allocated_len)) + g_string_expand (string, len); } /** @@ -113,7 +120,7 @@ string->len = 0; string->str = NULL; - g_string_maybe_expand (string, MAX (dfl_size, 64)); + g_string_expand (string, MAX (dfl_size, 64)); string->str0 = 0; return string; @@ -192,12 +199,15 @@ * it's %FALSE, the caller gains ownership of the buffer and must * free it after use with g_free(). * + * Instead of passing %FALSE to this function, consider using + * g_string_free_and_steal(). + * * Returns: (nullable): the character data of @string * (i.e. %NULL if @free_segment is %TRUE) */ gchar * -g_string_free (GString *string, - gboolean free_segment) +(g_string_free) (GString *string, + gboolean free_segment) { gchar *segment; @@ -217,6 +227,25 @@ } /** + * g_string_free_and_steal: + * @string: (transfer full): a #GString + * + * Frees the memory allocated for the #GString. + * + * The caller gains ownership of the buffer and + * must free it after use with g_free(). + * + * Returns: (transfer full): the character data of @string + * + * Since: 2.76 + */ +gchar * +g_string_free_and_steal (GString *string) +{ + return (g_string_free) (string, FALSE); +} + +/** * g_string_free_to_bytes: * @string: (transfer full): a #GString * @@ -351,8 +380,8 @@ * Returns: (transfer none): @string */ GString * -g_string_truncate (GString *string, - gsize len) +(g_string_truncate) (GString *string, + gsize len) { g_return_val_if_fail (string != NULL, NULL); @@ -532,8 +561,8 @@ * Returns: (transfer none): @string */ GString * -g_string_append (GString *string, - const gchar *val) +(g_string_append) (GString *string, + const gchar *val) { return g_string_insert_len (string, -1, val, -1); } @@ -557,9 +586,9 @@ * Returns: (transfer none): @string */ GString * -g_string_append_len (GString *string, - const gchar *val, - gssize len) +(g_string_append_len) (GString *string, + const gchar *val, + gssize len) { return g_string_insert_len (string, -1, val, len); } @@ -574,10 +603,9 @@ * * Returns: (transfer none): @string */ -#undef g_string_append_c GString * -g_string_append_c (GString *string, - gchar c) +(g_string_append_c) (GString *string, + gchar c) { g_return_val_if_fail (string != NULL, NULL);
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/gstring.h -> _service:tar_scm:glib-2.76.4.tar.xz/glib/gstring.h
Changed
@@ -34,7 +34,9 @@ #include <glib/gtypes.h> #include <glib/gunicode.h> #include <glib/gbytes.h> +#include <glib/gstrfuncs.h> #include <glib/gutils.h> /* for G_CAN_INLINE */ +#include <string.h> G_BEGIN_DECLS @@ -55,8 +57,23 @@ GLIB_AVAILABLE_IN_ALL GString* g_string_sized_new (gsize dfl_size); GLIB_AVAILABLE_IN_ALL -gchar* g_string_free (GString *string, +gchar* (g_string_free) (GString *string, gboolean free_segment); +GLIB_AVAILABLE_IN_2_76 +gchar* g_string_free_and_steal (GString *string) G_GNUC_WARN_UNUSED_RESULT; + +#if G_GNUC_CHECK_VERSION (2, 0) && (GLIB_VERSION_MIN_REQUIRED >= GLIB_VERSION_2_76) + +#define g_string_free(str, free_segment) \ + (__builtin_constant_p (free_segment) ? \ + ((free_segment) ? \ + (g_string_free) ((str), (free_segment)) : \ + g_string_free_and_steal (str)) \ + : \ + (g_string_free) ((str), (free_segment))) + +#endif /* G_GNUC_CHECK_VERSION (2, 0) && (GLIB_VERSION_MIN_REQUIRED >= GLIB_VERSION_2_76) */ + GLIB_AVAILABLE_IN_2_34 GBytes* g_string_free_to_bytes (GString *string); GLIB_AVAILABLE_IN_ALL @@ -162,13 +179,22 @@ const gchar *reserved_chars_allowed, gboolean allow_utf8); -/* -- optimize g_strig_append_c --- */ #ifdef G_CAN_INLINE + +#if defined (_MSC_VER) && !defined (__clang__) +#pragma warning (push) +#pragma warning (disable : 4141) /* silence "warning C4141: 'inline' used more than once" */ +#endif + +#ifndef __GTK_DOC_IGNORE__ + +G_ALWAYS_INLINE static inline GString* g_string_append_c_inline (GString *gstring, gchar c) { - if (gstring->len + 1 < gstring->allocated_len) + if (G_LIKELY (gstring != NULL && + gstring->len + 1 < gstring->allocated_len)) { gstring->strgstring->len++ = c; gstring->strgstring->len = 0; @@ -177,9 +203,83 @@ g_string_insert_c (gstring, -1, c); return gstring; } -#define g_string_append_c(gstr,c) g_string_append_c_inline (gstr, c) -#endif /* G_CAN_INLINE */ +#define g_string_append_c(gstr,c) \ + g_string_append_c_inline (gstr, c) + +G_ALWAYS_INLINE +static inline GString * +g_string_append_len_inline (GString *gstring, + const char *val, + gssize len) +{ + gsize len_unsigned; + + if G_UNLIKELY (gstring == NULL) + return g_string_append_len (gstring, val, len); + + if G_UNLIKELY (val == NULL) + return (len != 0) ? g_string_append_len (gstring, val, len) : gstring; + + if (len < 0) + len_unsigned = strlen (val); + else + len_unsigned = (gsize) len; + + if (G_LIKELY (gstring->len + len_unsigned < gstring->allocated_len)) + { + char *end = gstring->str + gstring->len; + if (G_LIKELY (val + len_unsigned <= end || val > end + len_unsigned)) + memcpy (end, val, len_unsigned); + else + memmove (end, val, len_unsigned); + gstring->len += len_unsigned; + gstring->strgstring->len = 0; + return gstring; + } + else + return g_string_insert_len (gstring, -1, val, len); +} + +#define g_string_append_len(gstr, val, len) \ + g_string_append_len_inline (gstr, val, len) + +G_ALWAYS_INLINE +static inline GString * +g_string_truncate_inline (GString *gstring, + gsize len) +{ + gstring->len = MIN (len, gstring->len); + gstring->strgstring->len = '\0'; + return gstring; +} + +#define g_string_truncate(gstr, len) \ + g_string_truncate_inline (gstr, len) + +#if G_GNUC_CHECK_VERSION (2, 0) + +#define g_string_append(gstr, val) \ + (__builtin_constant_p (val) ? \ + G_GNUC_EXTENSION ({ \ + const char * const __val = (val); \ + g_string_append_len (gstr, __val, \ + G_LIKELY (__val != NULL) ? \ + (gssize) strlen (_G_STR_NONNULL (__val)) \ + : (gssize) -1); \ + }) \ + : \ + g_string_append_len (gstr, val, (gssize) -1)) + +#endif /* G_GNUC_CHECK_VERSION (2, 0) */ + +#endif /* __GTK_DOC_IGNORE__ */ + +#if defined (_MSC_VER) && !defined (__clang__) +#pragma warning (pop) /* #pragma warning (disable : 4141) */ +#endif + +#endif /* G_CAN_INLINE */ GLIB_DEPRECATED GString *g_string_down (GString *string);
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/gtestutils.c -> _service:tar_scm:glib-2.76.4.tar.xz/glib/gtestutils.c
Changed
@@ -58,6 +58,10 @@ #include "glib-private.h" #include "gutilsprivate.h" +#define TAP_VERSION G_STRINGIFY (13) +/* FIXME: Remove '#' prefix when we'll depend on a meson version supporting TAP 14 + * See https://gitlab.gnome.org/GNOME/glib/-/issues/2885 */ +#define TAP_SUBTEST_PREFIX "# " /* a 4-space indented line */ /** * SECTION:testing @@ -85,11 +89,15 @@ * The API is designed to handle creation and registration of test suites * and test cases implicitly. A simple call like * |<!-- language="C" --> + * g_test_init (&argc, &argv, G_TEST_OPTION_ISOLATE_DIRS, NULL); + * * g_test_add_func ("/misc/assertions", test_assertions); * | * creates a test suite called "misc" with a single test case named * "assertions", which consists of running the test_assertions function. * + * g_test_init() should be called before calling any other test functions. + * * In addition to the traditional g_assert_true(), the test framework provides * an extended set of assertions for comparisons: g_assert_cmpfloat(), * g_assert_cmpfloat_with_epsilon(), g_assert_cmpint(), g_assert_cmpuint(), @@ -845,7 +853,10 @@ GLogLevelFlags log_level, const gchar *message, gpointer unused_data); - +static void g_test_tap_print (unsigned subtest_level, + gboolean commented, + const char *format, + ...) G_GNUC_PRINTF (3, 4); static const char * const g_test_result_names = { "OK", @@ -866,6 +877,7 @@ G_LOCK_DEFINE_STATIC (test_run_rand); static GRand *test_run_rand = NULL; static gchar *test_run_name = ""; +static gchar *test_run_name_path = ""; static GSList **test_filename_free_list; static guint test_run_forks = 0; static guint test_run_count = 0; @@ -900,6 +912,7 @@ static char *test_initial_cwd = NULL; static gboolean test_in_forked_child = FALSE; static gboolean test_in_subprocess = FALSE; +static gboolean test_is_subtest = FALSE; static GTestConfig mutable_test_config_vars = { FALSE, /* test_initialized */ TRUE, /* test_quick */ @@ -910,8 +923,90 @@ }; const GTestConfig * const g_test_config_vars = &mutable_test_config_vars; static gboolean no_g_set_prgname = FALSE; +static GPrintFunc g_default_print_func = NULL; + /* --- functions --- */ +static inline gboolean +is_subtest (void) +{ + return test_is_subtest || test_in_forked_child || test_in_subprocess; +} + +static void +g_test_print_handler_full (const gchar *string, + gboolean use_tap_format, + gboolean is_tap_comment, + unsigned subtest_level) +{ + g_assert (string != NULL); + + if (G_LIKELY (use_tap_format) && strchr (string, '\n') != NULL) + { + static gboolean last_had_final_newline = TRUE; + GString *output = g_string_new_len (NULL, strlen (string) + 2); + const char *line = string; + + do + { + const char *next = strchr (line, '\n'); + + if (last_had_final_newline && (next || *line != '\0')) + { + for (unsigned l = 0; l < subtest_level; ++l) + g_string_append (output, TAP_SUBTEST_PREFIX); + + if G_LIKELY (is_tap_comment) + g_string_append (output, "# "); + } + + if (next) + { + next += 1; /* Include the newline */ + g_string_append_len (output, line, next - line); + } + else + { + g_string_append (output, line); + last_had_final_newline = (*line == '\0'); + } + + line = next; + } + while (line != NULL); + + g_default_print_func (output->str); + g_string_free (g_steal_pointer (&output), TRUE); + } + else + { + g_default_print_func (string); + } +} + +static void +g_test_print_handler (const gchar *string) +{ + g_test_print_handler_full (string, test_tap_log, TRUE, is_subtest () ? 1 : 0); +} + +static void +g_test_tap_print (unsigned subtest_level, + gboolean commented, + const char *format, + ...) +{ + va_list args; + char *string; + + va_start (args, format); + string = g_strdup_vprintf (format, args); + va_end (args); + + g_test_print_handler_full (string, TRUE, commented, subtest_level); + g_free (string); +} + const char* g_test_log_type_name (GTestLogType log_type) { @@ -948,6 +1043,7 @@ { GTestLogBuffer *lbuffer = g_test_log_buffer_new (); GTestLogMsg *msg; + GString *output; guint ui; g_test_log_buffer_push (lbuffer, n_bytes, buffer); msg = g_test_log_buffer_pop (lbuffer); @@ -955,22 +1051,25 @@ g_warn_if_fail (lbuffer->data->len == 0); g_test_log_buffer_free (lbuffer); /* print message */ - g_printerr ("{*LOG(%s)", g_test_log_type_name (msg->log_type)); + output = g_string_new (NULL); + g_string_printf (output, "{*LOG(%s)", g_test_log_type_name (msg->log_type)); for (ui = 0; ui < msg->n_strings; ui++) - g_printerr (":{%s}", msg->stringsui); + g_string_append_printf (output, ":{%s}", msg->stringsui); if (msg->n_nums) { - g_printerr (":("); + g_string_append (output, ":("); for (ui = 0; ui < msg->n_nums; ui++) { if ((long double) (long) msg->numsui == msg->numsui) - g_printerr ("%s%ld", ui ? ";" : "", (long) msg->numsui); + g_string_append_printf (output, "%s%ld", ui ? ";" : "", (long) msg->numsui); else - g_printerr ("%s%.16g", ui ? ";" : "", (double) msg->numsui); + g_string_append_printf (output, "%s%.16g", ui ? ";" : "", (double) msg->numsui); } - g_printerr (")"); + g_string_append_c (output, ')'); } - g_printerr (":LOG*}\n"); + g_string_append (output, ":LOG*}"); + g_printerr ("%s\n", output->str); + g_string_free (output, TRUE); g_test_log_msg_free (msg); } } @@ -988,14 +1087,38 @@ gchar *astrings3 = { NULL, NULL, NULL }; guint8 *dbuffer; guint32 dbufferlen; + unsigned subtest_level; + + if (g_once_init_enter (&g_default_print_func)) + { + g_once_init_leave (&g_default_print_func, + g_set_print_handler (g_test_print_handler)); + g_assert_nonnull (g_default_print_func); + } + + subtest_level = is_subtest () ? 1 : 0; switch (lbit) { case G_TEST_LOG_START_BINARY: if (test_tap_log) - g_print ("# random seed: %s\n", string2); + { + if (!is_subtest ()) + { + g_test_tap_print (0, FALSE, "TAP version " TAP_VERSION "\n"); + } + else + { + g_test_tap_print (subtest_level > 0 ? subtest_level - 1 : 0, TRUE, + "Subtest: %s\n", test_argv0); + } + + g_print ("random seed: %s\n", string2); + } else if (g_test_verbose ()) - g_print ("GTest: random seed: %s\n", string2); + { + g_print ("GTest: random seed: %s\n", string2); + } break; case G_TEST_LOG_START_SUITE: if (test_tap_log) @@ -1003,9 +1126,9 @@ /* We only print the TAP "plan" (1..n) ahead of time if we did * not use the -p option to select specific tests to be run. */ if (string10 != 0) - g_print ("# Start of %s tests\n", string1); + g_print ("Start of %s tests\n", string1); else if (test_paths == NULL) - g_print ("1..%d\n", test_count); + g_test_tap_print (subtest_level, FALSE, "1..%d\n", test_count); } break; case G_TEST_LOG_STOP_SUITE: @@ -1015,9 +1138,9 @@ * we were using -p, we need to print how many tests we ran at * the end instead. */ if (string10 != 0) - g_print ("# End of %s tests\n", string1); + g_print ("End of %s tests\n", string1); else if (test_paths != NULL) - g_print ("1..%d\n", test_run_count); + g_test_tap_print (subtest_level, FALSE, "1..%d\n", test_run_count); } break; case G_TEST_LOG_STOP_CASE: @@ -1025,7 +1148,7 @@ fail = result == G_TEST_RUN_FAILURE; if (test_tap_log) { - const gchar *ok; + GString *tap_output; /* The TAP representation for an expected failure starts with * "not ok", even though it does not actually count as failing @@ -1034,28 +1157,33 @@ * for which GTestResult does not currently have a * representation. */ if (fail || result == G_TEST_RUN_INCOMPLETE) - ok = "not ok"; + tap_output = g_string_new ("not ok"); else - ok = "ok"; + tap_output = g_string_new ("ok"); - g_print ("%s %d %s", ok, test_run_count, string1); + if (is_subtest ()) + g_string_prepend (tap_output, TAP_SUBTEST_PREFIX); + + g_string_append_printf (tap_output, " %d %s", test_run_count, string1); if (result == G_TEST_RUN_INCOMPLETE) - g_print (" # TODO %s\n", string2 ? string2 : ""); + g_string_append_printf (tap_output, " # TODO %s", string2 ? string2 : ""); else if (result == G_TEST_RUN_SKIPPED) - g_print (" # SKIP %s\n", string2 ? string2 : ""); + g_string_append_printf (tap_output, " # SKIP %s", string2 ? string2 : ""); else if (result == G_TEST_RUN_FAILURE && string2 != NULL) - g_print (" - %s\n", string2); - else - g_print ("\n"); + g_string_append_printf (tap_output, " - %s", string2); + + g_string_append_c (tap_output, '\n'); + g_default_print_func (tap_output->str); + g_string_free (g_steal_pointer (&tap_output), TRUE); } else if (g_test_verbose ()) g_print ("GTest: result: %s\n", g_test_result_namesresult); - else if (!g_test_quiet ()) + else if (!g_test_quiet () && !test_in_subprocess) g_print ("%s\n", g_test_result_namesresult); if (fail && test_mode_fatal) { if (test_tap_log) - g_print ("Bail out!\n"); + g_test_tap_print (0, FALSE, "Bail out!\n"); g_abort (); } if (result == G_TEST_RUN_SKIPPED || result == G_TEST_RUN_INCOMPLETE) @@ -1063,44 +1191,67 @@ break; case G_TEST_LOG_SKIP_CASE: if (test_tap_log) - g_print ("ok %d %s # SKIP\n", test_run_count, string1); + { + g_test_tap_print (subtest_level, FALSE, "ok %d %s # SKIP\n", + test_run_count, string1); + } break; case G_TEST_LOG_MIN_RESULT: if (test_tap_log) - g_print ("# min perf: %s\n", string1); + g_print ("min perf: %s\n", string1); else if (g_test_verbose ()) g_print ("(MINPERF:%s)\n", string1); break; case G_TEST_LOG_MAX_RESULT: if (test_tap_log) - g_print ("# max perf: %s\n", string1); + g_print ("max perf: %s\n", string1); else if (g_test_verbose ()) g_print ("(MAXPERF:%s)\n", string1); break; case G_TEST_LOG_MESSAGE: if (test_tap_log) + g_print ("%s\n", string1); + else if (g_test_verbose ()) + g_print ("(MSG: %s)\n", string1); + break; + case G_TEST_LOG_ERROR: + if (test_tap_log) { - if (strstr (string1, "\n") == NULL) - g_print ("# %s\n", string1); - else + char *message = g_strdup (string1); + + if (message) { - char **lines = g_strsplit (string1, "\n", -1); - gsize i; + char *line = message; + + while ((line = strchr (line, '\n'))) + *(line++) = ' '; + + message = g_strstrip (message); + } - for (i = 0; linesi != NULL; i++) - g_print ("# %s\n", linesi); + if (test_run_name && *test_run_name != '\0') + { + if (message && *message != '\0') + g_test_tap_print (subtest_level, FALSE, "not ok %s - %s\n", + test_run_name, message); + else + g_test_tap_print (subtest_level, FALSE, "not ok %s\n", + test_run_name); - g_strfreev (lines); + g_clear_pointer (&message, g_free); } + + if (message && *message != '\0') + g_test_tap_print (subtest_level, FALSE, "Bail out! %s\n", message); + else + g_test_tap_print (subtest_level, FALSE, "Bail out!\n"); + + g_free (message); } else if (g_test_verbose ()) - g_print ("(MSG: %s)\n", string1); - break; - case G_TEST_LOG_ERROR: - if (test_tap_log) - g_print ("Bail out! %s\n", string1); - else if (g_test_verbose ()) - g_print ("(ERROR: %s)\n", string1); + { + g_print ("(ERROR: %s)\n", string1); + } break; default: ; } @@ -1448,7 +1599,7 @@ * deep. Add a `.dirs` directory to contain all the paths we create, and * guarantee none of them clash with test paths below the current one — test * paths may not contain components starting with `.`. */ - subdir = g_build_filename (test_tmpdir, test_run_name, ".dirs", NULL); + subdir = g_build_filename (test_tmpdir, test_run_name_path, ".dirs", NULL); /* We have to create the runtime directory (because it must be bound to * the session lifetime, which we consider to be the lifetime of the unit @@ -1520,7 +1671,7 @@ if (!test_isolate_dirs) return; - subdir = g_build_filename (test_tmpdir, test_run_name, NULL); + subdir = g_build_filename (test_tmpdir, test_run_name_path, NULL); rm_rf (subdir); g_free (subdir); } @@ -1537,6 +1688,8 @@ * test random number generator, the name for g_get_prgname() * and parsing test related command line args. * + * This should be called before calling any other `g_test_*()` functions. + * * So far, the following arguments are understood: * * - `-l`: List test cases available in a test executable. @@ -1633,16 +1786,31 @@ } va_end (args); - /* setup random seed string */ - g_snprintf (seedstr, sizeof (seedstr), "R02S%08x%08x%08x%08x", g_random_int(), g_random_int(), g_random_int(), g_random_int()); - test_run_seedstr = seedstr; - /* parse args, sets up mode, changes seed, etc. */ parse_args (argc, argv); + if (test_run_seedstr == NULL) + { + /* setup random seed string */ + g_snprintf (seedstr, sizeof (seedstr), "R02S%08x%08x%08x%08x", + g_random_int(), g_random_int(), g_random_int(), g_random_int()); + test_run_seedstr = seedstr; + } + if (!g_get_prgname() && !no_g_set_prgname) g_set_prgname ((*argv)0); + if (g_getenv ("G_TEST_ROOT_PROCESS")) + { + test_is_subtest = TRUE; + } + else if (!g_setenv ("G_TEST_ROOT_PROCESS", test_argv0 ? test_argv0 : "root", TRUE)) + { + g_printerr ("%s: Failed to set environment variable ‘%s’\n", + test_argv0, "G_TEST_ROOT_PROCESS"); + exit (1); + } + /* Set up the temporary directory for isolating the test. We have to do this * early, as we want the return values from g_get_user_data_dir() (and * friends) to return subdirectories of the temporary directory throughout @@ -1683,7 +1851,13 @@ g_free (tmpl); /* Propagate the temporary directory to subprocesses. */ - g_setenv ("G_TEST_TMPDIR", test_isolate_dirs_tmpdir, TRUE); + if (!g_setenv ("G_TEST_TMPDIR", test_isolate_dirs_tmpdir, TRUE)) + { + g_printerr ("%s: Failed to set environment variable ‘%s’\n", + (*argv)0, "G_TEST_TMPDIR"); + exit (1); + } + _g_unset_cached_tmp_dir (); /* And clear the traditional environment variables so subprocesses * spawned by the code under test can’t trash anything. If a test @@ -1709,7 +1883,14 @@ gsize i; for (i = 0; i < G_N_ELEMENTS (overridden_environment_variables); i++) - g_setenv (overridden_environment_variablesi, "/dev/null", TRUE); + { + if (!g_setenv (overridden_environment_variablesi, "/dev/null", TRUE)) + { + g_printerr ("%s: Failed to set environment variable ‘%s’\n", + (*argv)0, overridden_environment_variablesi); + exit (1); + } + } } } @@ -2989,7 +3170,12 @@ return TRUE; if (g_test_verbose ()) - g_print ("GTest: skipping: %s\n", test_run_name); + { + if (test_tap_log) + g_print ("skipping: %s\n", test_run_name); + else + g_print ("GTest: skipping: %s\n", test_run_name); + } return FALSE; } @@ -3005,6 +3191,7 @@ { guint n_bad = 0; gchar *old_name = test_run_name; + gchar *old_name_path = test_run_name_path; GSList *iter; g_return_val_if_fail (suite != NULL, -1); @@ -3016,12 +3203,14 @@ GTestCase *tc = iter->data; test_run_name = g_build_path ("/", old_name, tc->name, NULL); + test_run_name_path = g_build_path (G_DIR_SEPARATOR_S, old_name_path, tc->name, NULL); if (test_should_run (test_run_name, path)) { if (!test_case_run (tc)) n_bad++; } g_free (test_run_name); + g_free (test_run_name_path); } for (iter = suite->suites; iter; iter = iter->next) @@ -3029,6 +3218,7 @@ GTestSuite *ts = iter->data; test_run_name = g_build_path ("/", old_name, ts->name, NULL); + test_run_name_path = g_build_path (G_DIR_SEPARATOR_S, old_name_path, ts->name, NULL); if (test_prefix_extended) { if (!path || path_has_prefix (test_run_name, path)) n_bad += g_test_run_suite_internal (ts, test_run_name); @@ -3039,9 +3229,11 @@ } g_free (test_run_name); + g_free (test_run_name_path); } test_run_name = old_name; + test_run_name_path = old_name_path; g_test_log (G_TEST_LOG_STOP_SUITE, suite->name, NULL, 0, NULL); @@ -3103,6 +3295,7 @@ test_count = g_test_suite_count (suite); test_run_name = g_strdup_printf ("/%s", suite->name); + test_run_name_path = g_build_path (G_DIR_SEPARATOR_S, suite->name, NULL); if (test_paths) { @@ -3114,8 +3307,8 @@ else n_bad = g_test_run_suite_internal (suite, NULL); - g_free (test_run_name); - test_run_name = NULL; + g_clear_pointer (&test_run_name, g_free); + g_clear_pointer (&test_run_name_path, g_free); return n_bad; } @@ -3196,9 +3389,10 @@ msg = g_strjoinv ("", (gchar**) strv); g_test_log (fatal ? G_TEST_LOG_ERROR : G_TEST_LOG_MESSAGE, msg, NULL, 0, NULL); - g_log_default_handler (log_domain, log_level, message, unused_data); - g_free (msg); + + if (!test_tap_log) + g_log_default_handler (log_domain, log_level, message, unused_data); } void @@ -3522,7 +3716,10 @@ { g_string_append_len (data->stdout_str, buf, nread); if (data->echo_stdout) - echo_file = stdout; + { + if G_UNLIKELY (!test_tap_log) + echo_file = stdout; + } } else { @@ -3603,6 +3800,22 @@ g_main_loop_unref (data.loop); g_main_context_unref (context); + if (echo_stdout && test_tap_log && data.stdout_str->len > 0) + { + gboolean added_newline = FALSE; + + if (data.stdout_str->strdata.stdout_str->len - 1 != '\n') + { + g_string_append_c (data.stdout_str, '\n'); + added_newline = TRUE; + } + + g_test_print_handler_full (data.stdout_str->str, TRUE, TRUE, 1); + + if (added_newline) + g_string_truncate (data.stdout_str, data.stdout_str->len - 1); + } + test_trap_last_pid = pid; test_trap_last_status = data.child_status; test_trap_last_stdout = g_string_free (data.stdout_str, FALSE); @@ -3651,8 +3864,9 @@ * Since: 2.16 * * Deprecated: This function is implemented only on Unix platforms, - * and is not always reliable due to problems inherent in - * fork-without-exec. Use g_test_trap_subprocess() instead. + * is not always reliable due to problems inherent in fork-without-exec + * and doesn't set close-on-exec flag on its file descriptors. + * Use g_test_trap_subprocess() instead. */ G_GNUC_BEGIN_IGNORE_DEPRECATIONS gboolean @@ -3826,7 +4040,12 @@ } if (g_test_verbose ()) - g_print ("GTest: subprocess: %s\n", test_path); + { + if (test_tap_log) + g_print ("subprocess: %s\n", test_path); + else + g_print ("GTest: subprocess: %s\n", test_path); + } test_trap_clear (); test_trap_last_subprocess = g_strdup (test_path); @@ -4050,8 +4269,10 @@ logged_child_output = logged_child_output || log_child_output (process_id); - msg = g_strdup_printf ("stdout of child process (%s) %s: %s\nstdout was:\n%s", - process_id, match_error, stdout_pattern, test_trap_last_stdout); + g_test_message ("stdout was:\n%s", test_trap_last_stdout); + + msg = g_strdup_printf ("stdout of child process (%s) %s: %s", + process_id, match_error, stdout_pattern); g_assertion_message (domain, file, line, func, msg); g_free (msg); } @@ -4061,8 +4282,10 @@ logged_child_output = logged_child_output || log_child_output (process_id); - msg = g_strdup_printf ("stderr of child process (%s) %s: %s\nstderr was:\n%s", - process_id, match_error, stderr_pattern, test_trap_last_stderr); + g_test_message ("stderr was:\n%s", test_trap_last_stderr); + + msg = g_strdup_printf ("stderr of child process (%s) %s: %s", + process_id, match_error, stderr_pattern); g_assertion_message (domain, file, line, func, msg); g_free (msg); } @@ -4456,6 +4679,8 @@ * * This function returns a valid string only within a test function. * + * Note that this is a test path, not a file system path. + * * Returns: the test path for the test currently being run * * Since: 2.68
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/gtestutils.h -> _service:tar_scm:glib-2.76.4.tar.xz/glib/gtestutils.h
Changed
@@ -82,7 +82,7 @@ } G_STMT_END #define g_assert_cmpmem(m1, l1, m2, l2) G_STMT_START {\ gconstpointer __m1 = m1, __m2 = m2; \ - int __l1 = l1, __l2 = l2; \ + size_t __l1 = (size_t) l1, __l2 = (size_t) l2; \ if (__l1 != 0 && __m1 == NULL) \ g_assertion_message (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, \ "assertion failed (" #l1 " == 0 || " #m1 " != NULL)"); \ @@ -195,7 +195,7 @@ } G_STMT_END /* Use nullptr in C++ to catch misuse of these macros. */ -#if defined(__cplusplus) && __cplusplus >= 201100L +#if G_CXX_STD_CHECK_VERSION (11) #define g_assert_null(expr) G_STMT_START { if G_LIKELY ((expr) == nullptr) ; else \ g_assertion_message (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, \ "'" #expr "' should be nullptr"); \ @@ -541,8 +541,8 @@ int line, const char *func, const char *message) G_ANALYZER_NORETURN; -GLIB_AVAILABLE_IN_ALL G_NORETURN +GLIB_AVAILABLE_IN_ALL void g_assertion_message_expr (const char *domain, const char *file, int line,
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/gthread-posix.c -> _service:tar_scm:glib-2.76.4.tar.xz/glib/gthread-posix.c
Changed
@@ -1157,9 +1157,6 @@ GMutex lock; void *(*proxy) (void *); - - /* Must be statically allocated and valid forever */ - const GThreadSchedulerSettings *scheduler_settings; } GThreadPosix; void @@ -1175,106 +1172,9 @@ g_slice_free (GThreadPosix, pt); } -gboolean -g_system_thread_get_scheduler_settings (GThreadSchedulerSettings *scheduler_settings) -{ - /* FIXME: Implement the same for macOS and the BSDs so it doesn't go through - * the fallback code using an additional thread. */ -#if defined(HAVE_SYS_SCHED_GETATTR) - pid_t tid; - int res; - /* FIXME: The struct definition does not seem to be possible to pull in - * via any of the normal system headers and it's only declared in the - * kernel headers. That's why we hardcode 56 here right now. */ - guint size = 56; /* Size as of Linux 5.3.9 */ - guint flags = 0; - - tid = (pid_t) syscall (SYS_gettid); - - scheduler_settings->attr = g_malloc0 (size); - - do - { - int errsv; - - res = syscall (SYS_sched_getattr, tid, scheduler_settings->attr, size, flags); - errsv = errno; - if (res == -1) - { - if (errsv == EAGAIN) - { - continue; - } - else if (errsv == E2BIG) - { - g_assert (size < G_MAXINT); - size *= 2; - scheduler_settings->attr = g_realloc (scheduler_settings->attr, size); - /* Needs to be zero-initialized */ - memset (scheduler_settings->attr, 0, size); - } - else - { - g_debug ("Failed to get thread scheduler attributes: %s", g_strerror (errsv)); - g_free (scheduler_settings->attr); - - return FALSE; - } - } - } - while (res == -1); - - /* Try setting them on the current thread to see if any system policies are - * in place that would disallow doing so */ - res = syscall (SYS_sched_setattr, tid, scheduler_settings->attr, flags); - if (res == -1) - { - int errsv = errno; - - g_debug ("Failed to set thread scheduler attributes: %s", g_strerror (errsv)); - g_free (scheduler_settings->attr); - - return FALSE; - } - - return TRUE; -#else - return FALSE; -#endif -} - -#if defined(HAVE_SYS_SCHED_GETATTR) -static void * -linux_pthread_proxy (void *data) -{ - GThreadPosix *thread = data; - static gboolean printed_scheduler_warning = FALSE; /* (atomic) */ - - /* Set scheduler settings first if requested */ - if (thread->scheduler_settings) - { - pid_t tid = 0; - guint flags = 0; - int res; - int errsv; - - tid = (pid_t) syscall (SYS_gettid); - res = syscall (SYS_sched_setattr, tid, thread->scheduler_settings->attr, flags); - errsv = errno; - if (res == -1 && g_atomic_int_compare_and_exchange (&printed_scheduler_warning, FALSE, TRUE)) - g_critical ("Failed to set scheduler settings: %s", g_strerror (errsv)); - else if (res == -1) - g_debug ("Failed to set scheduler settings: %s", g_strerror (errsv)); - } - - return thread->proxy (data); -} -#endif - GRealThread * g_system_thread_new (GThreadFunc proxy, gulong stack_size, - const GThreadSchedulerSettings *scheduler_settings, const char *name, GThreadFunc func, gpointer data, @@ -1293,7 +1193,6 @@ base_thread->thread.func = func; base_thread->thread.data = data; base_thread->name = g_strdup (name); - thread->scheduler_settings = scheduler_settings; thread->proxy = proxy; posix_check_cmd (pthread_attr_init (&attr)); @@ -1313,18 +1212,13 @@ #endif /* HAVE_PTHREAD_ATTR_SETSTACKSIZE */ #ifdef HAVE_PTHREAD_ATTR_SETINHERITSCHED - if (!scheduler_settings) { /* While this is the default, better be explicit about it */ pthread_attr_setinheritsched (&attr, PTHREAD_INHERIT_SCHED); } #endif /* HAVE_PTHREAD_ATTR_SETINHERITSCHED */ -#if defined(HAVE_SYS_SCHED_GETATTR) - ret = pthread_create (&thread->system_thread, &attr, linux_pthread_proxy, thread); -#else ret = pthread_create (&thread->system_thread, &attr, (void* (*)(void*))proxy, thread); -#endif posix_check_cmd (pthread_attr_destroy (&attr)); @@ -1629,16 +1523,18 @@ * have any relation to the one used by the kernel for the `futex` syscall. * * Specifically, the libc headers might use 64-bit `time_t` while the kernel - * headers use 32-bit `__kernel_old_time_t` on certain systems. + * headers use 32-bit types on certain systems. * * To get around this problem we * a) check if `futex_time64` is available, which only exists on 32-bit * platforms and always uses 64-bit `time_t`. * b) otherwise (or if that returns `ENOSYS`), we call the normal `futex` - * syscall with the `struct timespec` used by the kernel, which uses - * `__kernel_long_t` for both its fields. We use that instead of - * `__kernel_old_time_t` because it is equivalent and available in the - * kernel headers for a longer time. + * syscall with the `struct timespec` used by the kernel. By default, we + * use `__kernel_long_t` for both its fields, which is equivalent to + * `__kernel_old_time_t` and is available in the kernel headers for a + * longer time. + * c) With very old headers (~2.6.x), `__kernel_long_t` is not available, and + * we use an older definition that uses `__kernel_time_t` and `long`. * * Also some 32-bit systems do not define `__NR_futex` at all and only * define `__NR_futex_time64`. @@ -1678,14 +1574,24 @@ #ifdef __NR_futex { +# ifdef __kernel_long_t +# define KERNEL_SPAN_SEC_TYPE __kernel_long_t struct { __kernel_long_t tv_sec; __kernel_long_t tv_nsec; } span_arg; - +# else + /* Very old kernel headers: version 2.6.32 and thereabouts */ +# define KERNEL_SPAN_SEC_TYPE __kernel_time_t + struct + { + __kernel_time_t tv_sec; + long tv_nsec; + } span_arg; +# endif /* Make sure to only ever call this if the end time actually fits into the target type */ - if (G_UNLIKELY (sizeof (__kernel_long_t) < 8 && span.tv_sec > G_MAXINT32)) + if (G_UNLIKELY (sizeof (KERNEL_SPAN_SEC_TYPE) < 8 && span.tv_sec > G_MAXINT32)) g_error ("%s: Can’t wait for more than %us", G_STRFUNC, G_MAXINT32); span_arg.tv_sec = span.tv_sec; @@ -1697,6 +1603,7 @@ return success; } +# undef KERNEL_SPAN_SEC_TYPE #endif /* defined(__NR_futex) */ /* We can't end up here because of the checks above */
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/gthread-win32.c -> _service:tar_scm:glib-2.76.4.tar.xz/glib/gthread-win32.c
Changed
@@ -463,19 +463,9 @@ return 0; } -gboolean -g_system_thread_get_scheduler_settings (GThreadSchedulerSettings *scheduler_settings) -{ - HANDLE current_thread = GetCurrentThread (); - scheduler_settings->thread_prio = GetThreadPriority (current_thread); - - return TRUE; -} - GRealThread * g_system_thread_new (GThreadFunc proxy, gulong stack_size, - const GThreadSchedulerSettings *scheduler_settings, const char *name, GThreadFunc func, gpointer data, @@ -515,16 +505,10 @@ * On Windows, by default all new threads are created with NORMAL thread * priority. */ - - if (scheduler_settings) - { - thread_prio = scheduler_settings->thread_prio; - } - else - { - HANDLE current_thread = GetCurrentThread (); - thread_prio = GetThreadPriority (current_thread); - } + { + HANDLE current_thread = GetCurrentThread (); + thread_prio = GetThreadPriority (current_thread); + } if (thread_prio == THREAD_PRIORITY_ERROR_RETURN) {
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/gthread.c -> _service:tar_scm:glib-2.76.4.tar.xz/glib/gthread.c
Changed
@@ -474,7 +474,7 @@ /** * GThreadFunc: - * @user_data: data passed to the thread + * @data: data passed to the thread * * Specifies the type of the @func functions passed to g_thread_new() * or g_thread_try_new(). @@ -885,7 +885,7 @@ GError *error = NULL; GThread *thread; - thread = g_thread_new_internal (name, g_thread_proxy, func, data, 0, NULL, &error); + thread = g_thread_new_internal (name, g_thread_proxy, func, data, 0, &error); if G_UNLIKELY (thread == NULL) g_error ("creating thread '%s': %s", name ? name : "", error->message); @@ -916,7 +916,7 @@ gpointer data, GError **error) { - return g_thread_new_internal (name, g_thread_proxy, func, data, 0, NULL, error); + return g_thread_new_internal (name, g_thread_proxy, func, data, 0, error); } GThread * @@ -925,7 +925,6 @@ GThreadFunc func, gpointer data, gsize stack_size, - const GThreadSchedulerSettings *scheduler_settings, GError **error) { g_return_val_if_fail (func != NULL, NULL); @@ -933,16 +932,7 @@ g_atomic_int_inc (&g_thread_n_created_counter); g_trace_mark (G_TRACE_CURRENT_TIME, 0, "GLib", "GThread created", "%s", name ? name : "(unnamed)"); - return (GThread *) g_system_thread_new (proxy, stack_size, scheduler_settings, - name, func, data, error); -} - -gboolean -g_thread_get_scheduler_settings (GThreadSchedulerSettings *scheduler_settings) -{ - g_return_val_if_fail (scheduler_settings != NULL, FALSE); - - return g_system_thread_get_scheduler_settings (scheduler_settings); + return (GThread *) g_system_thread_new (proxy, stack_size, name, func, data, error); } /**
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/gthread.h -> _service:tar_scm:glib-2.76.4.tar.xz/glib/gthread.h
Changed
@@ -46,7 +46,7 @@ G_THREAD_ERROR_AGAIN /* Resource temporarily unavailable */ } GThreadError; -typedef gpointer (*GThreadFunc) (gpointer user_data); +typedef gpointer (*GThreadFunc) (gpointer data); typedef struct _GThread GThread;
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/gthreadpool.c -> _service:tar_scm:glib-2.76.4.tar.xz/glib/gthreadpool.c
Changed
@@ -30,6 +30,7 @@ #include "gasyncqueue.h" #include "gasyncqueueprivate.h" +#include "glib-private.h" #include "gmain.h" #include "gtestutils.h" #include "gthreadprivate.h" @@ -116,9 +117,6 @@ static gint kill_unused_threads = 0; static guint max_idle_time = 15 * 1000; -static GThreadSchedulerSettings shared_thread_scheduler_settings; -static gboolean have_shared_thread_scheduler_settings = FALSE; - typedef struct { /* Either thread or error are set in the end. Both transfer-full. */ @@ -470,30 +468,22 @@ { /* For non-exclusive thread-pools this can be called at any time * when a new thread is needed. We make sure to create a new thread - * here with the correct scheduler settings: either by directly - * providing them if supported by the GThread implementation or by - * going via our helper thread. + * here with the correct scheduler settings by going via our helper + * thread. */ - if (have_shared_thread_scheduler_settings) - { - thread = g_thread_new_internal (name, g_thread_proxy, g_thread_pool_thread_proxy, pool, 0, &shared_thread_scheduler_settings, error); - } - else - { - SpawnThreadData spawn_thread_data = { (GThreadPool *) pool, NULL, NULL }; + SpawnThreadData spawn_thread_data = { (GThreadPool *) pool, NULL, NULL }; - g_async_queue_lock (spawn_thread_queue); + g_async_queue_lock (spawn_thread_queue); - g_async_queue_push_unlocked (spawn_thread_queue, &spawn_thread_data); + g_async_queue_push_unlocked (spawn_thread_queue, &spawn_thread_data); - while (!spawn_thread_data.thread && !spawn_thread_data.error) - g_cond_wait (&spawn_thread_cond, _g_async_queue_get_mutex (spawn_thread_queue)); + while (!spawn_thread_data.thread && !spawn_thread_data.error) + g_cond_wait (&spawn_thread_cond, _g_async_queue_get_mutex (spawn_thread_queue)); - thread = spawn_thread_data.thread; - if (!thread) - g_propagate_error (error, g_steal_pointer (&spawn_thread_data.error)); - g_async_queue_unlock (spawn_thread_queue); - } + thread = spawn_thread_data.thread; + if (!thread) + g_propagate_error (error, g_steal_pointer (&spawn_thread_data.error)); + g_async_queue_unlock (spawn_thread_queue); } if (thread == NULL) @@ -546,6 +536,11 @@ * since their threads are never considered idle and returned to the * global pool. * + * Note that the threads used by exclusive threadpools will all inherit the + * scheduler settings of the current thread while the threads used by + * non-exclusive threadpools will inherit the scheduler settings from the + * first thread that created such a threadpool. + * * @error can be %NULL to ignore errors, or non-%NULL to report * errors. An error can only occur when @exclusive is set to %TRUE * and not all @max_threads threads could be created. @@ -619,40 +614,31 @@ if (!unused_thread_queue) unused_thread_queue = g_async_queue_new (); - /* For the very first non-exclusive thread-pool we remember the thread - * scheduler settings of the thread creating the pool, if supported by - * the GThread implementation. This is then used for making sure that - * all threads created on the non-exclusive thread-pool have the same - * scheduler settings, and more importantly don't just inherit them - * from the thread that just happened to push a new task and caused - * a new thread to be created. + /* + * Spawn a helper thread that is only responsible for spawning new threads + * with the scheduler settings of the current thread. + * + * This is then used for making sure that all threads created on the + * non-exclusive thread-pool have the same scheduler settings, and more + * importantly don't just inherit them from the thread that just happened to + * push a new task and caused a new thread to be created. * * Not doing so could cause real-time priority threads or otherwise * threads with problematic scheduler settings to be part of the * non-exclusive thread-pools. * - * If this is not supported by the GThread implementation then we here - * start a thread that will inherit the scheduler settings from this - * very thread and whose only purpose is to spawn new threads with the - * same settings for use by the non-exclusive thread-pools. - * - * - * For non-exclusive thread-pools this is not required as all threads - * are created immediately below and are running forever, so they will + * For exclusive thread-pools this is not required as all threads are + * created immediately below and are running forever, so they will * automatically inherit the scheduler settings from this very thread. */ - if (!exclusive && !have_shared_thread_scheduler_settings && !spawn_thread_queue) + if (!exclusive && !spawn_thread_queue) { - if (g_thread_get_scheduler_settings (&shared_thread_scheduler_settings)) - { - have_shared_thread_scheduler_settings = TRUE; - } - else - { - spawn_thread_queue = g_async_queue_new (); - g_cond_init (&spawn_thread_cond); - g_thread_new ("pool-spawner", g_thread_pool_spawn_thread, NULL); - } + GThread *pool_spawner = NULL; + + spawn_thread_queue = g_async_queue_new (); + g_cond_init (&spawn_thread_cond); + pool_spawner = g_thread_new ("pool-spawner", g_thread_pool_spawn_thread, NULL); + g_ignore_leak (pool_spawner); } G_UNLOCK (init);
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/gthreadprivate.h -> _service:tar_scm:glib-2.76.4.tar.xz/glib/gthreadprivate.h
Changed
@@ -41,6 +41,7 @@ /* system thread implementation (gthread-posix.c, gthread-win32.c) */ #if defined(HAVE_FUTEX) || defined(HAVE_FUTEX_TIME64) +#include <errno.h> #include <linux/futex.h> #include <sys/syscall.h> #include <unistd.h> @@ -53,6 +54,12 @@ /* Wrapper macro to call `futex_time64` and/or `futex` with simple * parameters and without returning the return value. * + * We expect futex to sometimes return EAGAIN due to the race + * between the caller checking the current value and deciding to + * do the futex op. To avoid splattering errno on success, we + * restore the original errno if EAGAIN is seen. See also: + * https://gitlab.gnome.org/GNOME/glib/-/issues/3034 + * * If the `futex_time64` syscall does not exist (`ENOSYS`), we retry again * with the normal `futex` syscall. This can happen if newer kernel headers * are used than the kernel that is actually running. @@ -64,24 +71,42 @@ #define g_futex_simple(uaddr, futex_op, ...) \ G_STMT_START \ { \ + int saved_errno = errno; \ int res = syscall (__NR_futex_time64, uaddr, (gsize) futex_op, __VA_ARGS__); \ if (res < 0 && errno == ENOSYS) \ - syscall (__NR_futex, uaddr, (gsize) futex_op, __VA_ARGS__); \ + { \ + errno = saved_errno; \ + res = syscall (__NR_futex, uaddr, (gsize) futex_op, __VA_ARGS__); \ + } \ + if (res < 0 && errno == EAGAIN) \ + { \ + errno = saved_errno; \ + } \ } \ G_STMT_END #elif defined(__NR_futex_time64) -#define g_futex_simple(uaddr, futex_op, ...) \ - G_STMT_START \ - { \ - syscall (__NR_futex_time64, uaddr, (gsize) futex_op, __VA_ARGS__); \ - } \ +#define g_futex_simple(uaddr, futex_op, ...) \ + G_STMT_START \ + { \ + int saved_errno = errno; \ + int res = syscall (__NR_futex_time64, uaddr, (gsize) futex_op, __VA_ARGS__); \ + if (res < 0 && errno == EAGAIN) \ + { \ + errno = saved_errno; \ + } \ + } \ G_STMT_END #elif defined(__NR_futex) -#define g_futex_simple(uaddr, futex_op, ...) \ - G_STMT_START \ - { \ - syscall (__NR_futex, uaddr, (gsize) futex_op, __VA_ARGS__); \ - } \ +#define g_futex_simple(uaddr, futex_op, ...) \ + G_STMT_START \ + { \ + int saved_errno = errno; \ + int res = syscall (__NR_futex, uaddr, (gsize) futex_op, __VA_ARGS__); \ + if (res < 0 && errno == EAGAIN) \ + { \ + errno = saved_errno; \ + } \ + } \ G_STMT_END #else /* !defined(__NR_futex) && !defined(__NR_futex_time64) */ #error "Neither __NR_futex nor __NR_futex_time64 are defined but were found by meson" @@ -89,25 +114,10 @@ #endif -/* Platform-specific scheduler settings for a thread */ -typedef struct -{ -#if defined(HAVE_SYS_SCHED_GETATTR) - /* This is for modern Linux */ - struct sched_attr *attr; -#elif defined(G_OS_WIN32) - gint thread_prio; -#else - /* TODO: Add support for macOS and the BSDs */ - void *dummy; -#endif -} GThreadSchedulerSettings; - void g_system_thread_wait (GRealThread *thread); GRealThread *g_system_thread_new (GThreadFunc proxy, gulong stack_size, - const GThreadSchedulerSettings *scheduler_settings, const char *name, GThreadFunc func, gpointer data, @@ -117,19 +127,14 @@ void g_system_thread_exit (void); void g_system_thread_set_name (const gchar *name); -gboolean g_system_thread_get_scheduler_settings (GThreadSchedulerSettings *scheduler_settings); - /* gthread.c */ GThread *g_thread_new_internal (const gchar *name, GThreadFunc proxy, GThreadFunc func, gpointer data, gsize stack_size, - const GThreadSchedulerSettings *scheduler_settings, GError **error); -gboolean g_thread_get_scheduler_settings (GThreadSchedulerSettings *scheduler_settings); - gpointer g_thread_proxy (gpointer thread); guint g_thread_n_created (void);
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/gtimezone.c -> _service:tar_scm:glib-2.76.4.tar.xz/glib/gtimezone.c
Changed
@@ -445,9 +445,7 @@ gtz->transitions = NULL; } -#ifdef G_OS_UNIX - -#if defined(__sun) && defined(__SVR4) +#if defined(G_OS_UNIX) && defined(__sun) && defined(__SVR4) /* * only used by Illumos distros or Solaris < 11: parse the /etc/default/init * text file looking for TZ= followed by the timezone, possibly quoted @@ -513,6 +511,7 @@ } #endif /* defined(__sun) && defined(__SRVR) */ +#ifdef G_OS_UNIX /* * returns the path to the top of the Olson zoneinfo timezone hierarchy. */ @@ -709,7 +708,7 @@ const struct tzhead *header = header_data; GTimeZone *footertz = NULL; guint extra_time_count = 0, extra_type_count = 0; - gint64 last_explicit_transition_time; + gint64 last_explicit_transition_time = 0; g_return_if_fail (size >= sizeof (struct tzhead) && memcmp (header, "TZif", 4) == 0); @@ -2223,7 +2222,7 @@ * g_time_zone_adjust_time: * @tz: a #GTimeZone * @type: the #GTimeType of @time_ - * @time_: a pointer to a number of seconds since January 1, 1970 + * @time_: (inout): a pointer to a number of seconds since January 1, 1970 * * Finds an interval within @tz that corresponds to the given @time_, * possibly adjusting @time_ if required to fit into an interval.
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/gtree.c -> _service:tar_scm:glib-2.76.4.tar.xz/glib/gtree.c
Changed
@@ -1197,7 +1197,7 @@ * GTraverseFunc: * @key: a key of a #GTree node * @value: the value corresponding to the key - * @user_data: user data passed to g_tree_traverse() + * @data: user data passed to g_tree_traverse() * * Specifies the type of function passed to g_tree_traverse(). It is * passed the key and value of each node, together with the @user_data
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/gtree.h -> _service:tar_scm:glib-2.76.4.tar.xz/glib/gtree.h
Changed
@@ -50,12 +50,12 @@ typedef gboolean (*GTraverseFunc) (gpointer key, gpointer value, - gpointer user_data); + gpointer data); /** * GTraverseNodeFunc: * @node: a #GTreeNode - * @user_data: user data passed to g_tree_foreach_node() + * @data: user data passed to g_tree_foreach_node() * * Specifies the type of function passed to g_tree_foreach_node(). It is * passed each node, together with the @user_data parameter passed to @@ -66,7 +66,7 @@ * Since: 2.68 */ typedef gboolean (*GTraverseNodeFunc) (GTreeNode *node, - gpointer user_data); + gpointer data); /* Balanced binary trees */
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/gtypes.h -> _service:tar_scm:glib-2.76.4.tar.xz/glib/gtypes.h
Changed
@@ -34,6 +34,10 @@ #include <glibconfig.h> #include <glib/gmacros.h> #include <glib/gversionmacros.h> + +/* Must be included after the 3 headers above */ +#include <glib/glib-visibility.h> + #include <time.h> G_BEGIN_DECLS @@ -144,7 +148,7 @@ /** * GCopyFunc: * @src: (not nullable): A pointer to the data which should be copied - * @user_data: Additional data + * @data: Additional data * * A function of this signature is used to copy the node data * when doing a deep-copy of a tree. @@ -154,7 +158,7 @@ * Since: 2.4 */ typedef gpointer (*GCopyFunc) (gconstpointer src, - gpointer user_data); + gpointer data); /** * GFreeFunc: * @data: a data pointer @@ -168,7 +172,7 @@ /** * GTranslateFunc: * @str: the untranslated string - * @user_data: user data specified when installing the function, e.g. + * @data: user data specified when installing the function, e.g. * in g_option_group_set_translate_func() * * The type of functions which are used to translate user-visible @@ -178,7 +182,7 @@ * The returned string is owned by GLib and must not be freed. */ typedef const gchar * (*GTranslateFunc) (const gchar *str, - gpointer user_data); + gpointer data); /* Define some mathematical constants that aren't available @@ -584,27 +588,4 @@ G_END_DECLS -/* We prefix variable declarations so they can - * properly get exported in Windows DLLs. - */ -#ifndef GLIB_VAR -# ifdef G_PLATFORM_WIN32 -# ifdef GLIB_STATIC_COMPILATION -# define GLIB_VAR extern -# else /* !GLIB_STATIC_COMPILATION */ -# ifdef GLIB_COMPILATION -# ifdef DLL_EXPORT -# define GLIB_VAR extern __declspec(dllexport) -# else /* !DLL_EXPORT */ -# define GLIB_VAR extern -# endif /* !DLL_EXPORT */ -# else /* !GLIB_COMPILATION */ -# define GLIB_VAR extern __declspec(dllimport) -# endif /* !GLIB_COMPILATION */ -# endif /* !GLIB_STATIC_COMPILATION */ -# else /* !G_PLATFORM_WIN32 */ -# define GLIB_VAR _GLIB_EXTERN -# endif /* !G_PLATFORM_WIN32 */ -#endif /* GLIB_VAR */ - #endif /* __G_TYPES_H__ */
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/gunicode.h -> _service:tar_scm:glib-2.76.4.tar.xz/glib/gunicode.h
Changed
@@ -210,7 +210,7 @@ * Since new unicode versions may add new types here, applications should be ready * to handle unknown values. They may be regarded as %G_UNICODE_BREAK_UNKNOWN. * - * See Unicode Line Breaking Algorithm(http://www.unicode.org/unicode/reports/tr14/). + * See Unicode Line Breaking Algorithm(https://www.unicode.org/reports/tr14/). */ typedef enum {
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/gunidecomp.c -> _service:tar_scm:glib-2.76.4.tar.xz/glib/gunidecomp.c
Changed
@@ -113,7 +113,7 @@ /** * g_unicode_canonical_ordering: - * @string: a UCS-4 encoded string. + * @string: (array length=len) (element-type gunichar): a UCS-4 encoded string. * @len: the maximum length of @string to use. * * Computes the canonical ordering of a string in-place.
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/gutf8.c -> _service:tar_scm:glib-2.76.4.tar.xz/glib/gutf8.c
Changed
@@ -923,7 +923,7 @@ /** * g_ucs4_to_utf8: - * @str: a UCS-4 encoded string + * @str: (array length=len) (element-type gunichar): a UCS-4 encoded string * @len: the maximum length (number of characters) of @str to use. * If @len < 0, then the string is nul-terminated. * @items_read: (out) (optional): location to store number of @@ -997,7 +997,7 @@ /** * g_utf16_to_utf8: - * @str: a UTF-16 encoded string + * @str: (array length=len) (element-type guint16): a UTF-16 encoded string * @len: the maximum length (number of #gunichar2) of @str to use. * If @len < 0, then the string is nul-terminated. * @items_read: (out) (optional): location to store number of @@ -1153,7 +1153,7 @@ /** * g_utf16_to_ucs4: - * @str: a UTF-16 encoded string + * @str: (array length=len) (element-type guint16): a UTF-16 encoded string * @len: the maximum length (number of #gunichar2) of @str to use. * If @len < 0, then the string is nul-terminated. * @items_read: (out) (optional): location to store number of @@ -1408,7 +1408,7 @@ /** * g_ucs4_to_utf16: - * @str: a UCS-4 encoded string + * @str: (array length=len) (element-type gunichar): a UCS-4 encoded string * @len: the maximum length (number of characters) of @str to use. * If @len < 0, then the string is nul-terminated. * @items_read: (out) (optional): location to store number of
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/gutils.c -> _service:tar_scm:glib-2.76.4.tar.xz/glib/gutils.c
Changed
@@ -275,7 +275,44 @@ g_find_program_in_path (const gchar *program) #endif { - const gchar *path, *p; + return g_find_program_for_path (program, NULL, NULL); +} + +/** + * g_find_program_for_path: + * @program: (type filename): a program name in the GLib file name encoding + * @path: (type filename) (nullable): the current dir where to search program + * @working_dir: (type filename) (nullable): the working dir where to search + * program + * + * Locates the first executable named @program in @path, in the + * same way that execvp() would locate it. Returns an allocated string + * with the absolute path name (taking in account the @working_dir), or + * %NULL if the program is not found in @path. If @program is already an + * absolute path, returns a copy of @program if @program exists and is + * executable, and %NULL otherwise. + * + * On Windows, if @path is %NULL, it looks for the file in the same way as + * CreateProcess() would. This means first in the directory where the + * executing program was loaded from, then in the current directory, then in + * the Windows 32-bit system directory, then in the Windows directory, and + * finally in the directories in the `PATH` environment variable. If + * the program is found, the return value contains the full name + * including the type suffix. + * + * Returns: (type filename) (transfer full) (nullable): a newly-allocated + * string with the absolute path, or %NULL + * Since: 2.76 + **/ +char * +g_find_program_for_path (const char *program, + const char *path, + const char *working_dir) +{ + const char *original_path = path; + const char *original_program = program; + char *program_path = NULL; + const gchar *p; gchar *name, *freeme; #ifdef G_OS_WIN32 const gchar *path_copy; @@ -290,34 +327,59 @@ g_return_val_if_fail (program != NULL, NULL); + /* Use the working dir as program path if provided */ + if (working_dir && !g_path_is_absolute (program)) + { + program_path = g_build_filename (working_dir, program, NULL); + program = program_path; + } + /* If it is an absolute path, or a relative path including subdirectories, * don't look in PATH. */ if (g_path_is_absolute (program) - || strchr (program, G_DIR_SEPARATOR) != NULL + || strchr (original_program, G_DIR_SEPARATOR) != NULL #ifdef G_OS_WIN32 - || strchr (program, '/') != NULL + || strchr (original_program, '/') != NULL #endif ) { if (g_file_test (program, G_FILE_TEST_IS_EXECUTABLE) && !g_file_test (program, G_FILE_TEST_IS_DIR)) { - gchar *out = NULL, *cwd = NULL; + gchar *out = NULL; if (g_path_is_absolute (program)) - return g_strdup (program); + { + out = g_strdup (program); + } + else + { + char *cwd = g_get_current_dir (); + out = g_build_filename (cwd, program, NULL); + g_free (cwd); + } + + g_free (program_path); - cwd = g_get_current_dir (); - out = g_build_filename (cwd, program, NULL); - g_free (cwd); return g_steal_pointer (&out); } else - return NULL; + { + g_clear_pointer (&program_path, g_free); + + if (g_path_is_absolute (original_program)) + return NULL; + } } - - path = g_getenv ("PATH"); + + program = original_program; + + if G_LIKELY (original_path == NULL) + path = g_getenv ("PATH"); + else + path = original_path; + #if defined(G_OS_UNIX) if (path == NULL) { @@ -334,57 +396,65 @@ path = "/bin:/usr/bin:."; } #else - n = GetModuleFileNameW (NULL, wfilename, MAXPATHLEN); - if (n > 0 && n < MAXPATHLEN) - filename = g_utf16_to_utf8 (wfilename, -1, NULL, NULL, NULL); - - n = GetSystemDirectoryW (wsysdir, MAXPATHLEN); - if (n > 0 && n < MAXPATHLEN) - sysdir = g_utf16_to_utf8 (wsysdir, -1, NULL, NULL, NULL); - - n = GetWindowsDirectoryW (wwindir, MAXPATHLEN); - if (n > 0 && n < MAXPATHLEN) - windir = g_utf16_to_utf8 (wwindir, -1, NULL, NULL, NULL); - - if (filename) + if G_LIKELY (original_path == NULL) { - appdir = g_path_get_dirname (filename); - g_free (filename); - } - - path = g_strdup (path); + n = GetModuleFileNameW (NULL, wfilename, MAXPATHLEN); + if (n > 0 && n < MAXPATHLEN) + filename = g_utf16_to_utf8 (wfilename, -1, NULL, NULL, NULL); - if (windir) - { - const gchar *tem = path; - path = g_strconcat (windir, ";", path, NULL); - g_free ((gchar *) tem); - g_free (windir); - } - - if (sysdir) - { - const gchar *tem = path; - path = g_strconcat (sysdir, ";", path, NULL); - g_free ((gchar *) tem); - g_free (sysdir); + n = GetSystemDirectoryW (wsysdir, MAXPATHLEN); + if (n > 0 && n < MAXPATHLEN) + sysdir = g_utf16_to_utf8 (wsysdir, -1, NULL, NULL, NULL); + + n = GetWindowsDirectoryW (wwindir, MAXPATHLEN); + if (n > 0 && n < MAXPATHLEN) + windir = g_utf16_to_utf8 (wwindir, -1, NULL, NULL, NULL); + + if (filename) + { + appdir = g_path_get_dirname (filename); + g_free (filename); + } + + path = g_strdup (path); + + if (windir) + { + const gchar *tem = path; + path = g_strconcat (windir, ";", path, NULL); + g_free ((gchar *) tem); + g_free (windir); + } + + if (sysdir) + { + const gchar *tem = path; + path = g_strconcat (sysdir, ";", path, NULL); + g_free ((gchar *) tem); + g_free (sysdir); + } + + { + const gchar *tem = path; + path = g_strconcat (".;", path, NULL); + g_free ((gchar *) tem); + } + + if (appdir) + { + const gchar *tem = path; + path = g_strconcat (appdir, ";", path, NULL); + g_free ((gchar *) tem); + g_free (appdir); + } + + path_copy = path; } - - { - const gchar *tem = path; - path = g_strconcat (".;", path, NULL); - g_free ((gchar *) tem); - } - - if (appdir) + else { - const gchar *tem = path; - path = g_strconcat (appdir, ";", path, NULL); - g_free ((gchar *) tem); - g_free (appdir); + path_copy = g_strdup (path); } - path_copy = path; #endif len = strlen (program) + 1; @@ -401,6 +471,7 @@ do { char *startp; + char *startp_path = NULL; path = p; p = my_strchrnul (path, G_SEARCHPATH_SEPARATOR); @@ -413,6 +484,13 @@ else startp = memcpy (name - (p - path), path, p - path); + /* Use the working dir as program path if provided */ + if (working_dir && !g_path_is_absolute (startp)) + { + startp_path = g_build_filename (working_dir, startp, NULL); + startp = startp_path; + } + if (g_file_test (startp, G_FILE_TEST_IS_EXECUTABLE) && !g_file_test (startp, G_FILE_TEST_IS_DIR)) { @@ -425,15 +503,21 @@ ret = g_build_filename (cwd, startp, NULL); g_free (cwd); } + + g_free (program_path); + g_free (startp_path); g_free (freeme); #ifdef G_OS_WIN32 g_free ((gchar *) path_copy); #endif return ret; } + + g_free (startp_path); } while (*p++ != '\0'); - + + g_free (program_path); g_free (freeme); #ifdef G_OS_WIN32 g_free ((gchar *) path_copy); @@ -521,6 +605,7 @@ static gchar *g_user_runtime_dir = NULL; static gchar **g_system_config_dirs = NULL; static gchar **g_user_special_dirs = NULL; +static gchar *g_tmp_dir = NULL; /* fifteen minutes of fame for everybody */ #define G_USER_DIRS_EXPIRE 15 * 60 @@ -864,6 +949,17 @@ return home_dir; } +void +_g_unset_cached_tmp_dir (void) +{ + G_LOCK (g_utils_global); + /* We have to leak the old value, as user code could be retaining pointers + * to it. */ + g_ignore_leak (g_tmp_dir); + g_tmp_dir = NULL; + G_UNLOCK (g_utils_global); +} + /** * g_get_tmp_dir: * @@ -887,22 +983,33 @@ const gchar * g_get_tmp_dir (void) { - static gchar *tmp_dir; + G_LOCK (g_utils_global); - if (g_once_init_enter (&tmp_dir)) + if (g_tmp_dir == NULL) { gchar *tmp; + tmp = g_strdup (g_getenv ("G_TEST_TMPDIR")); + + if (tmp == NULL || *tmp == '\0') + { + g_free (tmp); + tmp = g_strdup (g_getenv ( #ifdef G_OS_WIN32 - tmp = g_strdup (g_getenv ("TEMP")); + "TEMP" +#else /* G_OS_WIN32 */ + "TMPDIR" +#endif /* G_OS_WIN32 */ + )); + } +#ifdef G_OS_WIN32 if (tmp == NULL || *tmp == '\0') { g_free (tmp); tmp = get_windows_directory_root (); } #else /* G_OS_WIN32 */ - tmp = g_strdup (g_getenv ("TMPDIR")); #ifdef P_tmpdir if (tmp == NULL || *tmp == '\0') @@ -923,10 +1030,12 @@ } #endif /* !G_OS_WIN32 */ - g_once_init_leave (&tmp_dir, tmp); + g_tmp_dir = g_steal_pointer (&tmp); } - return tmp_dir; + G_UNLOCK (g_utils_global); + + return g_tmp_dir; } /**
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/gutils.h -> _service:tar_scm:glib-2.76.4.tar.xz/glib/gutils.h
Changed
@@ -36,19 +36,6 @@ G_BEGIN_DECLS -/* Define G_VA_COPY() to do the right thing for copying va_list variables. - * glibconfig.h may have already defined G_VA_COPY as va_copy or __va_copy. - */ -#if !defined (G_VA_COPY) -# if defined (__GNUC__) && defined (__PPC__) && (defined (_CALL_SYSV) || defined (_WIN32)) -# define G_VA_COPY(ap1, ap2) (*(ap1) = *(ap2)) -# elif defined (G_VA_COPY_AS_ARRAY) -# define G_VA_COPY(ap1, ap2) memmove ((ap1), (ap2), sizeof (va_list)) -# else /* va_list is a pointer */ -# define G_VA_COPY(ap1, ap2) ((ap1) = (ap2)) -# endif /* va_list is a pointer */ -#endif /* !G_VA_COPY */ - GLIB_AVAILABLE_IN_ALL const gchar * g_get_user_name (void); GLIB_AVAILABLE_IN_ALL @@ -439,8 +426,7 @@ # include <stdlib.h> # define g_abort() abort () #else -GLIB_AVAILABLE_IN_2_50 -G_NORETURN void g_abort (void) G_ANALYZER_NORETURN; +G_NORETURN GLIB_AVAILABLE_IN_2_50 void g_abort (void) G_ANALYZER_NORETURN; #endif #endif
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/gutilsprivate.h -> _service:tar_scm:glib-2.76.4.tar.xz/glib/gutilsprivate.h
Changed
@@ -28,7 +28,6 @@ G_BEGIN_DECLS -GLIB_AVAILABLE_IN_2_60 void g_set_user_dirs (const gchar *first_dir_type, ...) G_GNUC_NULL_TERMINATED; @@ -54,6 +53,8 @@ return n + 1; } +void _g_unset_cached_tmp_dir (void); + G_END_DECLS #endif /* __G_UTILS_PRIVATE_H__ */
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/gvariant-core.c -> _service:tar_scm:glib-2.76.4.tar.xz/glib/gvariant-core.c
Changed
@@ -686,7 +686,7 @@ * @type: a #GVariantType * @children: an array of #GVariant pointers. Consumed. * @n_children: the length of @children - * @trusted: %TRUE if every child in @children in trusted + * @trusted: %TRUE if every child in @children is trusted * * Constructs a new tree-mode #GVariant instance. This is the inner * interface for creation of new serialized values that gets called from @@ -1138,11 +1138,13 @@ g_variant_get_child_value (GVariant *value, gsize index_) { - g_return_val_if_fail (index_ < g_variant_n_children (value), NULL); g_return_val_if_fail (value->depth < G_MAXSIZE, NULL); if (~g_atomic_int_get (&value->state) & STATE_SERIALISED) { + /* g_variant_serialised_get_child() does its own checks on index_ */ + g_return_val_if_fail (index_ < g_variant_n_children (value), NULL); + g_variant_lock (value); if (~value->state & STATE_SERIALISED) @@ -1233,11 +1235,13 @@ g_variant_maybe_get_child_value (GVariant *value, gsize index_) { - g_return_val_if_fail (index_ < g_variant_n_children (value), NULL); g_return_val_if_fail (value->depth < G_MAXSIZE, NULL); if (~g_atomic_int_get (&value->state) & STATE_SERIALISED) { + /* g_variant_serialised_get_child() does its own checks on index_ */ + g_return_val_if_fail (index_ < g_variant_n_children (value), NULL); + g_variant_lock (value); if (~value->state & STATE_SERIALISED)
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/gvariant-serialiser.c -> _service:tar_scm:glib-2.76.4.tar.xz/glib/gvariant-serialiser.c
Changed
@@ -1144,6 +1144,10 @@ offset = 0; + /* We must go through at least one iteration below. If the tuple had no + * children, it would have a fixed size. */ + g_assert (n_children > 0); + for (i = 0; i < n_children; i++) { guint alignment; @@ -1644,7 +1648,7 @@ * * Determines how much memory would be needed to serialize this value. * - * This function is only resonsible for performing calculations for the + * This function is only responsible for performing calculations for the * top-level container. @gvs_filler is called on each child of the * container in order to determine its size. */
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/gvariant.c -> _service:tar_scm:glib-2.76.4.tar.xz/glib/gvariant.c
Changed
@@ -2213,20 +2213,22 @@ GString *string, gboolean type_annotate) { + const gchar *value_type_string = g_variant_get_type_string (value); + if G_UNLIKELY (string == NULL) string = g_string_new (NULL); - switch (g_variant_classify (value)) + switch (value_type_string0) { case G_VARIANT_CLASS_MAYBE: if (type_annotate) - g_string_append_printf (string, "@%s ", - g_variant_get_type_string (value)); + g_string_append_printf (string, "@%s ", value_type_string); if (g_variant_n_children (value)) { - gchar *printed_child; - GVariant *element; + const GVariantType *base_type; + guint i, depth; + GVariant *element = NULL; /* Nested maybes: * @@ -2240,19 +2242,36 @@ * "just" is actually exactly the case where we have a nested * Nothing. * - * Instead of searching for that nested Nothing, we just print - * the contained value into a separate string and see if we - * end up with "nothing" at the end of it. If so, we need to - * add "just" at our level. + * Search for the nested Nothing, to save a lot of recursion if there + * are multiple levels of maybes. */ - element = g_variant_get_child_value (value, 0); - printed_child = g_variant_print (element, FALSE); - g_variant_unref (element); - - if (g_str_has_suffix (printed_child, "nothing")) - g_string_append (string, "just "); - g_string_append (string, printed_child); - g_free (printed_child); + for (depth = 0, base_type = g_variant_get_type (value); + g_variant_type_is_maybe (base_type); + depth++, base_type = g_variant_type_element (base_type)); + + element = g_variant_ref (value); + for (i = 0; i < depth && element != NULL; i++) + { + GVariant *new_element = g_variant_n_children (element) ? g_variant_get_child_value (element, 0) : NULL; + g_variant_unref (element); + element = g_steal_pointer (&new_element); + } + + if (element == NULL) + { + /* One of the maybes was Nothing, so print out the right number of + * justs. */ + for (; i > 1; i--) + g_string_append (string, "just "); + g_string_append (string, "nothing"); + } + else + { + /* There are no Nothings, so print out the child with no prefixes. */ + g_variant_print_string (element, string, FALSE); + } + + g_clear_pointer (&element, g_variant_unref); } else g_string_append (string, "nothing"); @@ -2265,7 +2284,7 @@ * if the first two characters are 'ay' then it's a bytestring. * under certain conditions we print those as strings. */ - if (g_variant_get_type_string (value)1 == 'y') + if (value_type_string1 == 'y') { const gchar *str; gsize size; @@ -2307,7 +2326,7 @@ * dictionary entries (ie: a dictionary) so we print that * differently. */ - if (g_variant_get_type_string (value)1 == '{') + if (value_type_string1 == '{') /* dictionary */ { const gchar *comma = ""; @@ -2316,8 +2335,7 @@ if ((n = g_variant_n_children (value)) == 0) { if (type_annotate) - g_string_append_printf (string, "@%s ", - g_variant_get_type_string (value)); + g_string_append_printf (string, "@%s ", value_type_string); g_string_append (string, "{}"); break; } @@ -2353,8 +2371,7 @@ if ((n = g_variant_n_children (value)) == 0) { if (type_annotate) - g_string_append_printf (string, "@%s ", - g_variant_get_type_string (value)); + g_string_append_printf (string, "@%s ", value_type_string); g_string_append (string, ""); break; } @@ -4019,7 +4036,8 @@ * * This function is a wrapper around g_variant_dict_lookup_value() and * g_variant_get(). In the case that %NULL would have been returned, - * this function returns %FALSE. Otherwise, it unpacks the returned + * this function returns %FALSE and does not modify the values of the arguments + * passed in to @.... Otherwise, it unpacks the returned * value and returns %TRUE. * * @format_string determines the C types that are used for unpacking the @@ -6088,6 +6106,7 @@ * application can be strict about what inputs it rejects. * * The returned value is always in normal form and is marked as trusted. + * A full, not floating, reference is returned. * * Returns: (transfer full): the byteswapped form of @value *
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/gvarianttypeinfo.c -> _service:tar_scm:glib-2.76.4.tar.xz/glib/gvarianttypeinfo.c
Changed
@@ -247,8 +247,6 @@ guint *alignment, gsize *fixed_size) { - g_variant_type_info_check (info, 0); - if (alignment) *alignment = info->alignment;
View file
_service:tar_scm:glib-2.76.4.tar.xz/glib/gversionmacros.h.in
Added
@@ -0,0 +1,140 @@ +/* GLIB - Library of useful routines for C programming + * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald + * + * SPDX-License-Identifier: LGPL-2.1-or-later + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, see <http://www.gnu.org/licenses/>. + */ + +/* + * Modified by the GLib Team and others 1997-2000. See the AUTHORS + * file for a list of people on the GLib Team. See the ChangeLog + * files for a list of changes. These files are distributed with + * GLib at ftp://ftp.gtk.org/pub/gtk/. + */ + +#ifndef __G_VERSION_MACROS_H__ +#define __G_VERSION_MACROS_H__ + +#if !defined(__GLIB_H_INSIDE__) && !defined(GLIB_COMPILATION) +#error "Only <glib.h> can be included directly." +#endif + +/* Version boundaries checks */ + +#define G_ENCODE_VERSION(major, minor) ((major) << 16 | (minor) << 8) + +@GLIB_VERSIONS@ + +/** + * GLIB_VERSION_CUR_STABLE: + * + * A macro that evaluates to the current stable version of GLib, in a format + * that can be used by the C pre-processor. + * + * During an unstable development cycle, this evaluates to the next stable + * (unreleased) version which will be the result of the development cycle. + * + * Since: 2.32 + */ +#if (GLIB_MINOR_VERSION % 2) +#define GLIB_VERSION_CUR_STABLE (G_ENCODE_VERSION (GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION + 1)) +#else +#define GLIB_VERSION_CUR_STABLE (G_ENCODE_VERSION (GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION)) +#endif + +/** + * GLIB_VERSION_PREV_STABLE: + * + * A macro that evaluates to the previous stable version of GLib, in a format + * that can be used by the C pre-processor. + * + * During an unstable development cycle, this evaluates to the most recent + * released stable release, which preceded this development cycle. + * + * Since: 2.32 + */ +#if (GLIB_MINOR_VERSION % 2) +#define GLIB_VERSION_PREV_STABLE (G_ENCODE_VERSION (GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION - 1)) +#else +#define GLIB_VERSION_PREV_STABLE (G_ENCODE_VERSION (GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION - 2)) +#endif + +/** + * GLIB_VERSION_MIN_REQUIRED: + * + * A macro that should be defined by the user prior to including + * the glib.h header. + * The definition should be one of the predefined GLib version + * macros: %GLIB_VERSION_2_26, %GLIB_VERSION_2_28,... + * + * This macro defines the earliest version of GLib that the package is + * required to be able to compile against. + * + * If the compiler is configured to warn about the use of deprecated + * functions, then using functions that were deprecated in version + * %GLIB_VERSION_MIN_REQUIRED or earlier will cause warnings (but + * using functions deprecated in later releases will not). + * + * Since: 2.32 + */ +/* If the package sets GLIB_VERSION_MIN_REQUIRED to some future + * GLIB_VERSION_X_Y value that we don't know about, it will compare as + * 0 in preprocessor tests. + */ +#ifndef GLIB_VERSION_MIN_REQUIRED +#define GLIB_VERSION_MIN_REQUIRED (GLIB_VERSION_CUR_STABLE) +#elif GLIB_VERSION_MIN_REQUIRED == 0 +#undef GLIB_VERSION_MIN_REQUIRED +#define GLIB_VERSION_MIN_REQUIRED (GLIB_VERSION_CUR_STABLE + 2) +#endif + +/** + * GLIB_VERSION_MAX_ALLOWED: + * + * A macro that should be defined by the user prior to including + * the glib.h header. + * The definition should be one of the predefined GLib version + * macros: %GLIB_VERSION_2_26, %GLIB_VERSION_2_28,... + * + * This macro defines the latest version of the GLib API that the + * package is allowed to make use of. + * + * If the compiler is configured to warn about the use of deprecated + * functions, then using functions added after version + * %GLIB_VERSION_MAX_ALLOWED will cause warnings. + * + * Unless you are using GLIB_CHECK_VERSION() or the like to compile + * different code depending on the GLib version, then this should be + * set to the same value as %GLIB_VERSION_MIN_REQUIRED. + * + * Since: 2.32 + */ +#if !defined(GLIB_VERSION_MAX_ALLOWED) || (GLIB_VERSION_MAX_ALLOWED == 0) +#undef GLIB_VERSION_MAX_ALLOWED +#define GLIB_VERSION_MAX_ALLOWED (GLIB_VERSION_CUR_STABLE) +#endif + +/* sanity checks */ +#if GLIB_VERSION_MIN_REQUIRED > GLIB_VERSION_CUR_STABLE +#error "GLIB_VERSION_MIN_REQUIRED must be <= GLIB_VERSION_CUR_STABLE" +#endif +#if GLIB_VERSION_MAX_ALLOWED < GLIB_VERSION_MIN_REQUIRED +#error "GLIB_VERSION_MAX_ALLOWED must be >= GLIB_VERSION_MIN_REQUIRED" +#endif +#if GLIB_VERSION_MIN_REQUIRED < GLIB_VERSION_2_26 +#error "GLIB_VERSION_MIN_REQUIRED must be >= GLIB_VERSION_2_26" +#endif + +#endif /* __G_VERSION_MACROS_H__ */
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/gwakeup.c -> _service:tar_scm:glib-2.76.4.tar.xz/glib/gwakeup.c
Changed
@@ -21,6 +21,7 @@ #include "config.h" +#include <stdint.h> /* gwakeup.c is special -- GIO and some test cases include it. As such, * it cannot include other glib headers without triggering the single @@ -206,10 +207,20 @@ void g_wakeup_acknowledge (GWakeup *wakeup) { - char buffer16; - /* read until it is empty */ - while (read (wakeup->fds0, buffer, sizeof buffer) == sizeof buffer); + + if (wakeup->fds1 == -1) + { + uint64_t value; + + while (read (wakeup->fds0, &value, sizeof (value)) == sizeof (value)); + } + else + { + uint8_t value; + + while (read (wakeup->fds0, &value, sizeof (value)) == sizeof (value)); + } } /** @@ -233,7 +244,7 @@ if (wakeup->fds1 == -1) { - guint64 one = 1; + uint64_t one = 1; /* eventfd() case. It requires a 64-bit counter increment value to be * written. */ @@ -243,7 +254,7 @@ } else { - guint8 one = 1; + uint8_t one = 1; /* Non-eventfd() case. Only a single byte needs to be written, and it can * have an arbitrary value. */
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/gwin32.c -> _service:tar_scm:glib-2.76.4.tar.xz/glib/gwin32.c
Changed
@@ -578,7 +578,9 @@ /* Check for Service Pack Version >= 0 */ g_return_val_if_fail (spver >= 0, FALSE); - g_return_val_if_fail (_g_win32_call_rtl_version (&osverinfo), FALSE); + + if (!_g_win32_call_rtl_version (&osverinfo)) + return FALSE; /* check the OS and Service Pack Versions */ if (osverinfo.dwMajorVersion > (DWORD) major)
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/libcharset/meson.build -> _service:tar_scm:glib-2.76.4.tar.xz/glib/libcharset/meson.build
Changed
@@ -1,4 +1,6 @@ charset_lib = static_library('charset', 'localcharset.c', include_directories : configinc, pic : true, - c_args : '-DGLIB_CHARSETALIAS_DIR="@0@"'.format(glib_charsetaliasdir) + glib_hidden_visibility_args) + c_args : '-DGLIB_CHARSETALIAS_DIR="@0@"'.format(glib_charsetaliasdir) , + gnu_symbol_visibility : 'hidden', +)
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/meson.build -> _service:tar_scm:glib-2.76.4.tar.xz/glib/meson.build
Changed
@@ -1,7 +1,36 @@ +glib_sources = +glib_sub_includedir = glib_includedir / 'glib' + glibconfig_h = configure_file(input : 'glibconfig.h.in', output : 'glibconfig.h', install_dir : join_paths(get_option('libdir'), 'glib-2.0/include'), install_tag : 'devel', configuration : glibconfig_conf) +glib_sources += glibconfig_h + +gversionmacros_h = custom_target( + input: 'gversionmacros.h.in', + output: 'gversionmacros.h', + command: gen_visibility_macros, meson.project_version(), 'versions-macros', '@INPUT@', '@OUTPUT@', + install: true, + install_dir: glib_sub_includedir, + # FIXME: Not needed with Meson >= 0.64.0 + install_tag: 'devel', +) + +glib_visibility_h = custom_target( + output: 'glib-visibility.h', + command: gen_visibility_macros, meson.project_version(), 'visibility-macros', 'GLIB', '@OUTPUT@', + install: true, + install_dir: glib_sub_includedir, + # FIXME: Not needed with Meson >= 0.64.0 + install_tag: 'devel', +) + +glib_built_headers = gversionmacros_h, glib_visibility_h +glib_sources += glib_built_headers +glib_c_args_internal = + '-DGLIB_COMPILATION', + subdir('libcharset') @@ -119,7 +148,7 @@ 'glib-unix.h', 'glib-object.h', ) -install_headers(glib_headers, subdir : 'glib-2.0') +install_headers(glib_headers, install_dir : glib_includedir) # Expose as variable to be used by gobject-introspection # when it includes GLib as a subproject @@ -133,7 +162,8 @@ 'deprecated/grel.h', 'deprecated/gthread.h', ) -install_headers(glib_deprecated_headers, subdir : 'glib-2.0/glib/deprecated') +install_headers(glib_deprecated_headers, + install_dir : glib_sub_includedir / 'deprecated') glib_sub_headers = files( 'glib-autocleanups.h', @@ -175,6 +205,7 @@ 'gmessages.h', 'gnode.h', 'goption.h', + 'gpathbuf.h', 'gpattern.h', 'gpoll.h', 'gprimes.h', @@ -212,11 +243,11 @@ 'gvarianttype.h', 'gvariant.h', 'gversion.h', - 'gversionmacros.h', 'gwin32.h', 'gprintf.h', ) -install_headers(glib_sub_headers, subdir : 'glib-2.0/glib') + +install_headers(glib_sub_headers, install_dir : glib_sub_includedir) deprecated_sources = files( 'deprecated/gallocator.c', @@ -226,7 +257,7 @@ 'deprecated/gthread-deprecated.c' ) -glib_sources = files( +glib_sources += files( 'garcbox.c', 'garray.c', 'gasyncqueue.c', @@ -263,6 +294,7 @@ 'gmessages.c', 'gnode.c', 'goption.c', + 'gpathbuf.c', 'gpattern.c', 'gpoll.c', 'gprimes.c', @@ -318,7 +350,7 @@ platform_deps = if host_system == 'windows' - if get_option('default_library') == 'shared' + if glib_build_shared glib_win_rc = configure_file( input: 'glib.rc.in', output: 'glib.rc', @@ -333,7 +365,7 @@ glib_sources += files('dirent/wdirent.c') endif else - glib_sources += files('glib-unix.c', 'gspawn.c', 'giounix.c') + glib_sources += files('glib-unix.c', 'glib-unixprivate.h', 'gspawn.c', 'giounix.c') platform_deps = endif @@ -368,7 +400,7 @@ pcre2_static_args = '-DPCRE2_STATIC' endif -glib_c_args = '-DG_LOG_DOMAIN="GLib"', '-DGLIB_COMPILATION' + pcre2_static_args + glib_hidden_visibility_args +glib_c_args = '-DG_LOG_DOMAIN="GLib"' + glib_c_args_internal + pcre2_static_args libglib = library('glib-2.0', glib_dtrace_obj, glib_dtrace_hdr, sources : deprecated_sources, glib_sources, @@ -380,14 +412,26 @@ link_args : noseh_link_args, glib_link_flags, win32_ldflags, include_directories : configinc, link_with: charset_lib, gnulib_lib, - dependencies : pcre2, thread_dep, librt + libintl_deps + libiconv + platform_deps + gnulib_libm_dependency, libm + libsysprof_capture_dep, + dependencies : + gnulib_libm_dependency, + libiconv, + libintl_deps, + libm, + librt, + libsysprof_capture_dep, + pcre2, + platform_deps, + thread_dep, + , c_args : glib_c_args, objc_args : glib_c_args, + gnu_symbol_visibility : 'hidden', ) libglib_dep = declare_dependency( link_with : libglib, dependencies : libintl_deps, + sources : glib_built_headers, # We sadly need to export configinc here because everyone includes <glib/*.h> include_directories : configinc, glibinc)
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/tests/NormalizationTest.txt -> _service:tar_scm:glib-2.76.4.tar.xz/glib/tests/NormalizationTest.txt
Changed
@@ -1,11 +1,11 @@ -# NormalizationTest-14.0.0.txt -# Date: 2021-05-28, 21:49:12 GMT -# © 2021 Unicode®, Inc. +# NormalizationTest-15.0.0.txt +# Date: 2022-04-02, 01:29:09 GMT +# © 2022 Unicode®, Inc. # Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries. -# For terms of use, see http://www.unicode.org/terms_of_use.html +# For terms of use, see https://www.unicode.org/terms_of_use.html # # Unicode Character Database -# For documentation, see http://www.unicode.org/reports/tr44/ +# For documentation, see https://www.unicode.org/reports/tr44/ # # Normalization Test Suite # Format: @@ -16208,6 +16208,68 @@ 1D7FD;1D7FD;1D7FD;0037;0037; # (𝟽; 𝟽; 𝟽; 7; 7; ) MATHEMATICAL MONOSPACE DIGIT SEVEN 1D7FE;1D7FE;1D7FE;0038;0038; # (𝟾; 𝟾; 𝟾; 8; 8; ) MATHEMATICAL MONOSPACE DIGIT EIGHT 1D7FF;1D7FF;1D7FF;0039;0039; # (𝟿; 𝟿; 𝟿; 9; 9; ) MATHEMATICAL MONOSPACE DIGIT NINE +1E030;1E030;1E030;0430;0430; # (𞀰; 𞀰; 𞀰; а; а; ) MODIFIER LETTER CYRILLIC SMALL A +1E031;1E031;1E031;0431;0431; # (𞀱; 𞀱; 𞀱; б; б; ) MODIFIER LETTER CYRILLIC SMALL BE +1E032;1E032;1E032;0432;0432; # (𞀲; 𞀲; 𞀲; в; в; ) MODIFIER LETTER CYRILLIC SMALL VE +1E033;1E033;1E033;0433;0433; # (𞀳; 𞀳; 𞀳; г; г; ) MODIFIER LETTER CYRILLIC SMALL GHE +1E034;1E034;1E034;0434;0434; # (𞀴; 𞀴; 𞀴; д; д; ) MODIFIER LETTER CYRILLIC SMALL DE +1E035;1E035;1E035;0435;0435; # (𞀵; 𞀵; 𞀵; е; е; ) MODIFIER LETTER CYRILLIC SMALL IE +1E036;1E036;1E036;0436;0436; # (𞀶; 𞀶; 𞀶; ж; ж; ) MODIFIER LETTER CYRILLIC SMALL ZHE +1E037;1E037;1E037;0437;0437; # (𞀷; 𞀷; 𞀷; з; з; ) MODIFIER LETTER CYRILLIC SMALL ZE +1E038;1E038;1E038;0438;0438; # (𞀸; 𞀸; 𞀸; и; и; ) MODIFIER LETTER CYRILLIC SMALL I +1E039;1E039;1E039;043A;043A; # (𞀹; 𞀹; 𞀹; к; к; ) MODIFIER LETTER CYRILLIC SMALL KA +1E03A;1E03A;1E03A;043B;043B; # (𞀺; 𞀺; 𞀺; л; л; ) MODIFIER LETTER CYRILLIC SMALL EL +1E03B;1E03B;1E03B;043C;043C; # (𞀻; 𞀻; 𞀻; м; м; ) MODIFIER LETTER CYRILLIC SMALL EM +1E03C;1E03C;1E03C;043E;043E; # (𞀼; 𞀼; 𞀼; о; о; ) MODIFIER LETTER CYRILLIC SMALL O +1E03D;1E03D;1E03D;043F;043F; # (𞀽; 𞀽; 𞀽; п; п; ) MODIFIER LETTER CYRILLIC SMALL PE +1E03E;1E03E;1E03E;0440;0440; # (𞀾; 𞀾; 𞀾; р; р; ) MODIFIER LETTER CYRILLIC SMALL ER +1E03F;1E03F;1E03F;0441;0441; # (𞀿; 𞀿; 𞀿; с; с; ) MODIFIER LETTER CYRILLIC SMALL ES +1E040;1E040;1E040;0442;0442; # (𞁀; 𞁀; 𞁀; т; т; ) MODIFIER LETTER CYRILLIC SMALL TE +1E041;1E041;1E041;0443;0443; # (𞁁; 𞁁; 𞁁; у; у; ) MODIFIER LETTER CYRILLIC SMALL U +1E042;1E042;1E042;0444;0444; # (𞁂; 𞁂; 𞁂; ф; ф; ) MODIFIER LETTER CYRILLIC SMALL EF +1E043;1E043;1E043;0445;0445; # (𞁃; 𞁃; 𞁃; х; х; ) MODIFIER LETTER CYRILLIC SMALL HA +1E044;1E044;1E044;0446;0446; # (𞁄; 𞁄; 𞁄; ц; ц; ) MODIFIER LETTER CYRILLIC SMALL TSE +1E045;1E045;1E045;0447;0447; # (𞁅; 𞁅; 𞁅; ч; ч; ) MODIFIER LETTER CYRILLIC SMALL CHE +1E046;1E046;1E046;0448;0448; # (𞁆; 𞁆; 𞁆; ш; ш; ) MODIFIER LETTER CYRILLIC SMALL SHA +1E047;1E047;1E047;044B;044B; # (𞁇; 𞁇; 𞁇; ы; ы; ) MODIFIER LETTER CYRILLIC SMALL YERU +1E048;1E048;1E048;044D;044D; # (𞁈; 𞁈; 𞁈; э; э; ) MODIFIER LETTER CYRILLIC SMALL E +1E049;1E049;1E049;044E;044E; # (𞁉; 𞁉; 𞁉; ю; ю; ) MODIFIER LETTER CYRILLIC SMALL YU +1E04A;1E04A;1E04A;A689;A689; # (𞁊; 𞁊; 𞁊; ꚉ; ꚉ; ) MODIFIER LETTER CYRILLIC SMALL DZZE +1E04B;1E04B;1E04B;04D9;04D9; # (𞁋; 𞁋; 𞁋; ә; ә; ) MODIFIER LETTER CYRILLIC SMALL SCHWA +1E04C;1E04C;1E04C;0456;0456; # (𞁌; 𞁌; 𞁌; і; і; ) MODIFIER LETTER CYRILLIC SMALL BYELORUSSIAN-UKRAINIAN I +1E04D;1E04D;1E04D;0458;0458; # (𞁍; 𞁍; 𞁍; ј; ј; ) MODIFIER LETTER CYRILLIC SMALL JE +1E04E;1E04E;1E04E;04E9;04E9; # (𞁎; 𞁎; 𞁎; ө; ө; ) MODIFIER LETTER CYRILLIC SMALL BARRED O +1E04F;1E04F;1E04F;04AF;04AF; # (𞁏; 𞁏; 𞁏; ү; ү; ) MODIFIER LETTER CYRILLIC SMALL STRAIGHT U +1E050;1E050;1E050;04CF;04CF; # (𞁐; 𞁐; 𞁐; ӏ; ӏ; ) MODIFIER LETTER CYRILLIC SMALL PALOCHKA +1E051;1E051;1E051;0430;0430; # (𞁑; 𞁑; 𞁑; а; а; ) CYRILLIC SUBSCRIPT SMALL LETTER A +1E052;1E052;1E052;0431;0431; # (𞁒; 𞁒; 𞁒; б; б; ) CYRILLIC SUBSCRIPT SMALL LETTER BE +1E053;1E053;1E053;0432;0432; # (𞁓; 𞁓; 𞁓; в; в; ) CYRILLIC SUBSCRIPT SMALL LETTER VE +1E054;1E054;1E054;0433;0433; # (𞁔; 𞁔; 𞁔; г; г; ) CYRILLIC SUBSCRIPT SMALL LETTER GHE +1E055;1E055;1E055;0434;0434; # (𞁕; 𞁕; 𞁕; д; д; ) CYRILLIC SUBSCRIPT SMALL LETTER DE +1E056;1E056;1E056;0435;0435; # (𞁖; 𞁖; 𞁖; е; е; ) CYRILLIC SUBSCRIPT SMALL LETTER IE +1E057;1E057;1E057;0436;0436; # (𞁗; 𞁗; 𞁗; ж; ж; ) CYRILLIC SUBSCRIPT SMALL LETTER ZHE +1E058;1E058;1E058;0437;0437; # (𞁘; 𞁘; 𞁘; з; з; ) CYRILLIC SUBSCRIPT SMALL LETTER ZE +1E059;1E059;1E059;0438;0438; # (𞁙; 𞁙; 𞁙; и; и; ) CYRILLIC SUBSCRIPT SMALL LETTER I +1E05A;1E05A;1E05A;043A;043A; # (𞁚; 𞁚; 𞁚; к; к; ) CYRILLIC SUBSCRIPT SMALL LETTER KA +1E05B;1E05B;1E05B;043B;043B; # (𞁛; 𞁛; 𞁛; л; л; ) CYRILLIC SUBSCRIPT SMALL LETTER EL +1E05C;1E05C;1E05C;043E;043E; # (𞁜; 𞁜; 𞁜; о; о; ) CYRILLIC SUBSCRIPT SMALL LETTER O +1E05D;1E05D;1E05D;043F;043F; # (𞁝; 𞁝; 𞁝; п; п; ) CYRILLIC SUBSCRIPT SMALL LETTER PE +1E05E;1E05E;1E05E;0441;0441; # (𞁞; 𞁞; 𞁞; с; с; ) CYRILLIC SUBSCRIPT SMALL LETTER ES +1E05F;1E05F;1E05F;0443;0443; # (𞁟; 𞁟; 𞁟; у; у; ) CYRILLIC SUBSCRIPT SMALL LETTER U +1E060;1E060;1E060;0444;0444; # (𞁠; 𞁠; 𞁠; ф; ф; ) CYRILLIC SUBSCRIPT SMALL LETTER EF +1E061;1E061;1E061;0445;0445; # (𞁡; 𞁡; 𞁡; х; х; ) CYRILLIC SUBSCRIPT SMALL LETTER HA +1E062;1E062;1E062;0446;0446; # (𞁢; 𞁢; 𞁢; ц; ц; ) CYRILLIC SUBSCRIPT SMALL LETTER TSE +1E063;1E063;1E063;0447;0447; # (𞁣; 𞁣; 𞁣; ч; ч; ) CYRILLIC SUBSCRIPT SMALL LETTER CHE +1E064;1E064;1E064;0448;0448; # (𞁤; 𞁤; 𞁤; ш; ш; ) CYRILLIC SUBSCRIPT SMALL LETTER SHA +1E065;1E065;1E065;044A;044A; # (𞁥; 𞁥; 𞁥; ъ; ъ; ) CYRILLIC SUBSCRIPT SMALL LETTER HARD SIGN +1E066;1E066;1E066;044B;044B; # (𞁦; 𞁦; 𞁦; ы; ы; ) CYRILLIC SUBSCRIPT SMALL LETTER YERU +1E067;1E067;1E067;0491;0491; # (𞁧; 𞁧; 𞁧; ґ; ґ; ) CYRILLIC SUBSCRIPT SMALL LETTER GHE WITH UPTURN +1E068;1E068;1E068;0456;0456; # (𞁨; 𞁨; 𞁨; і; і; ) CYRILLIC SUBSCRIPT SMALL LETTER BYELORUSSIAN-UKRAINIAN I +1E069;1E069;1E069;0455;0455; # (𞁩; 𞁩; 𞁩; ѕ; ѕ; ) CYRILLIC SUBSCRIPT SMALL LETTER DZE +1E06A;1E06A;1E06A;045F;045F; # (𞁪; 𞁪; 𞁪; џ; џ; ) CYRILLIC SUBSCRIPT SMALL LETTER DZHE +1E06B;1E06B;1E06B;04AB;04AB; # (𞁫; 𞁫; 𞁫; ҫ; ҫ; ) MODIFIER LETTER CYRILLIC SMALL ES WITH DESCENDER +1E06C;1E06C;1E06C;A651;A651; # (𞁬; 𞁬; 𞁬; ꙑ; ꙑ; ) MODIFIER LETTER CYRILLIC SMALL YERU WITH BACK YER +1E06D;1E06D;1E06D;04B1;04B1; # (𞁭; 𞁭; 𞁭; ұ; ұ; ) MODIFIER LETTER CYRILLIC SMALL STRAIGHT U WITH STROKE 1EE00;1EE00;1EE00;0627;0627; # (𞸀; 𞸀; 𞸀; ا; ا; ) ARABIC MATHEMATICAL ALEF 1EE01;1EE01;1EE01;0628;0628; # (𞸁; 𞸁; 𞸁; ب; ب; ) ARABIC MATHEMATICAL BEH 1EE02;1EE02;1EE02;062C;062C; # (𞸂; 𞸂; 𞸂; ج; ج; ) ARABIC MATHEMATICAL JEEM @@ -18496,6 +18558,12 @@ 0061 10EAB 0315 0300 05AE 0062;0061 05AE 10EAB 0300 0315 0062;0061 05AE 10EAB 0300 0315 0062;0061 05AE 10EAB 0300 0315 0062;0061 05AE 10EAB 0300 0315 0062; # (a◌𐺫◌̕◌̀◌֮b; a◌֮◌𐺫◌̀◌̕b; a◌֮◌𐺫◌̀◌̕b; a◌֮◌𐺫◌̀◌̕b; a◌֮◌𐺫◌̀◌̕b; ) LATIN SMALL LETTER A, YEZIDI COMBINING HAMZA MARK, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, LATIN SMALL LETTER B 0061 0315 0300 05AE 10EAC 0062;00E0 05AE 10EAC 0315 0062;0061 05AE 0300 10EAC 0315 0062;00E0 05AE 10EAC 0315 0062;0061 05AE 0300 10EAC 0315 0062; # (a◌̕◌̀◌֮◌𐺬b; à◌֮◌𐺬◌̕b; a◌֮◌̀◌𐺬◌̕b; à◌֮◌𐺬◌̕b; a◌֮◌̀◌𐺬◌̕b; ) LATIN SMALL LETTER A, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, YEZIDI COMBINING MADDA MARK, LATIN SMALL LETTER B 0061 10EAC 0315 0300 05AE 0062;0061 05AE 10EAC 0300 0315 0062;0061 05AE 10EAC 0300 0315 0062;0061 05AE 10EAC 0300 0315 0062;0061 05AE 10EAC 0300 0315 0062; # (a◌𐺬◌̕◌̀◌֮b; a◌֮◌𐺬◌̀◌̕b; a◌֮◌𐺬◌̀◌̕b; a◌֮◌𐺬◌̀◌̕b; a◌֮◌𐺬◌̀◌̕b; ) LATIN SMALL LETTER A, YEZIDI COMBINING MADDA MARK, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, LATIN SMALL LETTER B +0061 059A 0316 1DFA 10EFD 0062;0061 1DFA 0316 10EFD 059A 0062;0061 1DFA 0316 10EFD 059A 0062;0061 1DFA 0316 10EFD 059A 0062;0061 1DFA 0316 10EFD 059A 0062; # (a◌֚◌̖◌᷺◌𐻽b; a◌᷺◌̖◌𐻽◌֚b; a◌᷺◌̖◌𐻽◌֚b; a◌᷺◌̖◌𐻽◌֚b; a◌᷺◌̖◌𐻽◌֚b; ) LATIN SMALL LETTER A, HEBREW ACCENT YETIV, COMBINING GRAVE ACCENT BELOW, COMBINING DOT BELOW LEFT, ARABIC SMALL LOW WORD SAKTA, LATIN SMALL LETTER B +0061 10EFD 059A 0316 1DFA 0062;0061 1DFA 10EFD 0316 059A 0062;0061 1DFA 10EFD 0316 059A 0062;0061 1DFA 10EFD 0316 059A 0062;0061 1DFA 10EFD 0316 059A 0062; # (a◌𐻽◌֚◌̖◌᷺b; a◌᷺◌𐻽◌̖◌֚b; a◌᷺◌𐻽◌̖◌֚b; a◌᷺◌𐻽◌̖◌֚b; a◌᷺◌𐻽◌̖◌֚b; ) LATIN SMALL LETTER A, ARABIC SMALL LOW WORD SAKTA, HEBREW ACCENT YETIV, COMBINING GRAVE ACCENT BELOW, COMBINING DOT BELOW LEFT, LATIN SMALL LETTER B +0061 059A 0316 1DFA 10EFE 0062;0061 1DFA 0316 10EFE 059A 0062;0061 1DFA 0316 10EFE 059A 0062;0061 1DFA 0316 10EFE 059A 0062;0061 1DFA 0316 10EFE 059A 0062; # (a◌֚◌̖◌᷺◌𐻾b; a◌᷺◌̖◌𐻾◌֚b; a◌᷺◌̖◌𐻾◌֚b; a◌᷺◌̖◌𐻾◌֚b; a◌᷺◌̖◌𐻾◌֚b; ) LATIN SMALL LETTER A, HEBREW ACCENT YETIV, COMBINING GRAVE ACCENT BELOW, COMBINING DOT BELOW LEFT, ARABIC SMALL LOW WORD QASR, LATIN SMALL LETTER B +0061 10EFE 059A 0316 1DFA 0062;0061 1DFA 10EFE 0316 059A 0062;0061 1DFA 10EFE 0316 059A 0062;0061 1DFA 10EFE 0316 059A 0062;0061 1DFA 10EFE 0316 059A 0062; # (a◌𐻾◌֚◌̖◌᷺b; a◌᷺◌𐻾◌̖◌֚b; a◌᷺◌𐻾◌̖◌֚b; a◌᷺◌𐻾◌̖◌֚b; a◌᷺◌𐻾◌̖◌֚b; ) LATIN SMALL LETTER A, ARABIC SMALL LOW WORD QASR, HEBREW ACCENT YETIV, COMBINING GRAVE ACCENT BELOW, COMBINING DOT BELOW LEFT, LATIN SMALL LETTER B +0061 059A 0316 1DFA 10EFF 0062;0061 1DFA 0316 10EFF 059A 0062;0061 1DFA 0316 10EFF 059A 0062;0061 1DFA 0316 10EFF 059A 0062;0061 1DFA 0316 10EFF 059A 0062; # (a◌֚◌̖◌᷺◌𐻿b; a◌᷺◌̖◌𐻿◌֚b; a◌᷺◌̖◌𐻿◌֚b; a◌᷺◌̖◌𐻿◌֚b; a◌᷺◌̖◌𐻿◌֚b; ) LATIN SMALL LETTER A, HEBREW ACCENT YETIV, COMBINING GRAVE ACCENT BELOW, COMBINING DOT BELOW LEFT, ARABIC SMALL LOW WORD MADDA, LATIN SMALL LETTER B +0061 10EFF 059A 0316 1DFA 0062;0061 1DFA 10EFF 0316 059A 0062;0061 1DFA 10EFF 0316 059A 0062;0061 1DFA 10EFF 0316 059A 0062;0061 1DFA 10EFF 0316 059A 0062; # (a◌𐻿◌֚◌̖◌᷺b; a◌᷺◌𐻿◌̖◌֚b; a◌᷺◌𐻿◌̖◌֚b; a◌᷺◌𐻿◌̖◌֚b; a◌᷺◌𐻿◌̖◌֚b; ) LATIN SMALL LETTER A, ARABIC SMALL LOW WORD MADDA, HEBREW ACCENT YETIV, COMBINING GRAVE ACCENT BELOW, COMBINING DOT BELOW LEFT, LATIN SMALL LETTER B 0061 059A 0316 1DFA 10F46 0062;0061 1DFA 0316 10F46 059A 0062;0061 1DFA 0316 10F46 059A 0062;0061 1DFA 0316 10F46 059A 0062;0061 1DFA 0316 10F46 059A 0062; # (a◌֚◌̖◌᷺◌𐽆b; a◌᷺◌̖◌𐽆◌֚b; a◌᷺◌̖◌𐽆◌֚b; a◌᷺◌̖◌𐽆◌֚b; a◌᷺◌̖◌𐽆◌֚b; ) LATIN SMALL LETTER A, HEBREW ACCENT YETIV, COMBINING GRAVE ACCENT BELOW, COMBINING DOT BELOW LEFT, SOGDIAN COMBINING DOT BELOW, LATIN SMALL LETTER B 0061 10F46 059A 0316 1DFA 0062;0061 1DFA 10F46 0316 059A 0062;0061 1DFA 10F46 0316 059A 0062;0061 1DFA 10F46 0316 059A 0062;0061 1DFA 10F46 0316 059A 0062; # (a◌𐽆◌֚◌̖◌᷺b; a◌᷺◌𐽆◌̖◌֚b; a◌᷺◌𐽆◌̖◌֚b; a◌᷺◌𐽆◌̖◌֚b; a◌᷺◌𐽆◌̖◌֚b; ) LATIN SMALL LETTER A, SOGDIAN COMBINING DOT BELOW, HEBREW ACCENT YETIV, COMBINING GRAVE ACCENT BELOW, COMBINING DOT BELOW LEFT, LATIN SMALL LETTER B 0061 059A 0316 1DFA 10F47 0062;0061 1DFA 0316 10F47 059A 0062;0061 1DFA 0316 10F47 059A 0062;0061 1DFA 0316 10F47 059A 0062;0061 1DFA 0316 10F47 059A 0062; # (a◌֚◌̖◌᷺◌𐽇b; a◌᷺◌̖◌𐽇◌֚b; a◌᷺◌̖◌𐽇◌֚b; a◌᷺◌̖◌𐽇◌֚b; a◌᷺◌̖◌𐽇◌֚b; ) LATIN SMALL LETTER A, HEBREW ACCENT YETIV, COMBINING GRAVE ACCENT BELOW, COMBINING DOT BELOW LEFT, SOGDIAN COMBINING TWO DOTS BELOW, LATIN SMALL LETTER B @@ -18640,6 +18708,10 @@ 0061 11D45 05B0 094D 3099 0062;0061 3099 11D45 094D 05B0 0062;0061 3099 11D45 094D 05B0 0062;0061 3099 11D45 094D 05B0 0062;0061 3099 11D45 094D 05B0 0062; # (a◌𑵅◌ְ◌्◌゙b; a◌゙◌𑵅◌्◌ְb; a◌゙◌𑵅◌्◌ְb; a◌゙◌𑵅◌्◌ְb; a◌゙◌𑵅◌्◌ְb; ) LATIN SMALL LETTER A, MASARAM GONDI VIRAMA, HEBREW POINT SHEVA, DEVANAGARI SIGN VIRAMA, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, LATIN SMALL LETTER B 0061 05B0 094D 3099 11D97 0062;0061 3099 094D 11D97 05B0 0062;0061 3099 094D 11D97 05B0 0062;0061 3099 094D 11D97 05B0 0062;0061 3099 094D 11D97 05B0 0062; # (a◌ְ◌्◌゙◌𑶗b; a◌゙◌्◌𑶗◌ְb; a◌゙◌्◌𑶗◌ְb; a◌゙◌्◌𑶗◌ְb; a◌゙◌्◌𑶗◌ְb; ) LATIN SMALL LETTER A, HEBREW POINT SHEVA, DEVANAGARI SIGN VIRAMA, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, GUNJALA GONDI VIRAMA, LATIN SMALL LETTER B 0061 11D97 05B0 094D 3099 0062;0061 3099 11D97 094D 05B0 0062;0061 3099 11D97 094D 05B0 0062;0061 3099 11D97 094D 05B0 0062;0061 3099 11D97 094D 05B0 0062; # (a◌𑶗◌ְ◌्◌゙b; a◌゙◌𑶗◌्◌ְb; a◌゙◌𑶗◌्◌ְb; a◌゙◌𑶗◌्◌ְb; a◌゙◌𑶗◌्◌ְb; ) LATIN SMALL LETTER A, GUNJALA GONDI VIRAMA, HEBREW POINT SHEVA, DEVANAGARI SIGN VIRAMA, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, LATIN SMALL LETTER B +0061 05B0 094D 3099 11F41 0062;0061 3099 094D 11F41 05B0 0062;0061 3099 094D 11F41 05B0 0062;0061 3099 094D 11F41 05B0 0062;0061 3099 094D 11F41 05B0 0062; # (a◌ְ◌्◌゙𑽁b; a◌゙◌्𑽁◌ְb; a◌゙◌्𑽁◌ְb; a◌゙◌्𑽁◌ְb; a◌゙◌्𑽁◌ְb; ) LATIN SMALL LETTER A, HEBREW POINT SHEVA, DEVANAGARI SIGN VIRAMA, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, KAWI SIGN KILLER, LATIN SMALL LETTER B +0061 11F41 05B0 094D 3099 0062;0061 3099 11F41 094D 05B0 0062;0061 3099 11F41 094D 05B0 0062;0061 3099 11F41 094D 05B0 0062;0061 3099 11F41 094D 05B0 0062; # (a𑽁◌ְ◌्◌゙b; a◌゙𑽁◌्◌ְb; a◌゙𑽁◌्◌ְb; a◌゙𑽁◌्◌ְb; a◌゙𑽁◌्◌ְb; ) LATIN SMALL LETTER A, KAWI SIGN KILLER, HEBREW POINT SHEVA, DEVANAGARI SIGN VIRAMA, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, LATIN SMALL LETTER B +0061 05B0 094D 3099 11F42 0062;0061 3099 094D 11F42 05B0 0062;0061 3099 094D 11F42 05B0 0062;0061 3099 094D 11F42 05B0 0062;0061 3099 094D 11F42 05B0 0062; # (a◌ְ◌्◌゙◌𑽂b; a◌゙◌्◌𑽂◌ְb; a◌゙◌्◌𑽂◌ְb; a◌゙◌्◌𑽂◌ְb; a◌゙◌्◌𑽂◌ְb; ) LATIN SMALL LETTER A, HEBREW POINT SHEVA, DEVANAGARI SIGN VIRAMA, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, KAWI CONJOINER, LATIN SMALL LETTER B +0061 11F42 05B0 094D 3099 0062;0061 3099 11F42 094D 05B0 0062;0061 3099 11F42 094D 05B0 0062;0061 3099 11F42 094D 05B0 0062;0061 3099 11F42 094D 05B0 0062; # (a◌𑽂◌ְ◌्◌゙b; a◌゙◌𑽂◌्◌ְb; a◌゙◌𑽂◌्◌ְb; a◌゙◌𑽂◌्◌ְb; a◌゙◌𑽂◌्◌ְb; ) LATIN SMALL LETTER A, KAWI CONJOINER, HEBREW POINT SHEVA, DEVANAGARI SIGN VIRAMA, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, LATIN SMALL LETTER B 0061 16FF0 0334 16AF0 0062;0061 0334 16AF0 16FF0 0062;0061 0334 16AF0 16FF0 0062;0061 0334 16AF0 16FF0 0062;0061 0334 16AF0 16FF0 0062; # (a𖿰◌̴◌𖫰b; a◌̴◌𖫰𖿰b; a◌̴◌𖫰𖿰b; a◌̴◌𖫰𖿰b; a◌̴◌𖫰𖿰b; ) LATIN SMALL LETTER A, VIETNAMESE ALTERNATE READING MARK CA, COMBINING TILDE OVERLAY, BASSA VAH COMBINING HIGH TONE, LATIN SMALL LETTER B 0061 16AF0 16FF0 0334 0062;0061 16AF0 0334 16FF0 0062;0061 16AF0 0334 16FF0 0062;0061 16AF0 0334 16FF0 0062;0061 16AF0 0334 16FF0 0062; # (a◌𖫰𖿰◌̴b; a◌𖫰◌̴𖿰b; a◌𖫰◌̴𖿰b; a◌𖫰◌̴𖿰b; a◌𖫰◌̴𖿰b; ) LATIN SMALL LETTER A, BASSA VAH COMBINING HIGH TONE, VIETNAMESE ALTERNATE READING MARK CA, COMBINING TILDE OVERLAY, LATIN SMALL LETTER B 0061 16FF0 0334 16AF1 0062;0061 0334 16AF1 16FF0 0062;0061 0334 16AF1 16FF0 0062;0061 0334 16AF1 16FF0 0062;0061 0334 16AF1 16FF0 0062; # (a𖿰◌̴◌𖫱b; a◌̴◌𖫱𖿰b; a◌̴◌𖫱𖿰b; a◌̴◌𖫱𖿰b; a◌̴◌𖫱𖿰b; ) LATIN SMALL LETTER A, VIETNAMESE ALTERNATE READING MARK CA, COMBINING TILDE OVERLAY, BASSA VAH COMBINING LOW TONE, LATIN SMALL LETTER B @@ -18812,6 +18884,8 @@ 0061 1E029 0315 0300 05AE 0062;0061 05AE 1E029 0300 0315 0062;0061 05AE 1E029 0300 0315 0062;0061 05AE 1E029 0300 0315 0062;0061 05AE 1E029 0300 0315 0062; # (a◌𞀩◌̕◌̀◌֮b; a◌֮◌𞀩◌̀◌̕b; a◌֮◌𞀩◌̀◌̕b; a◌֮◌𞀩◌̀◌̕b; a◌֮◌𞀩◌̀◌̕b; ) LATIN SMALL LETTER A, COMBINING GLAGOLITIC LETTER IOTATED BIG YUS, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, LATIN SMALL LETTER B 0061 0315 0300 05AE 1E02A 0062;00E0 05AE 1E02A 0315 0062;0061 05AE 0300 1E02A 0315 0062;00E0 05AE 1E02A 0315 0062;0061 05AE 0300 1E02A 0315 0062; # (a◌̕◌̀◌֮◌𞀪b; à◌֮◌𞀪◌̕b; a◌֮◌̀◌𞀪◌̕b; à◌֮◌𞀪◌̕b; a◌֮◌̀◌𞀪◌̕b; ) LATIN SMALL LETTER A, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, COMBINING GLAGOLITIC LETTER FITA, LATIN SMALL LETTER B 0061 1E02A 0315 0300 05AE 0062;0061 05AE 1E02A 0300 0315 0062;0061 05AE 1E02A 0300 0315 0062;0061 05AE 1E02A 0300 0315 0062;0061 05AE 1E02A 0300 0315 0062; # (a◌𞀪◌̕◌̀◌֮b; a◌֮◌𞀪◌̀◌̕b; a◌֮◌𞀪◌̀◌̕b; a◌֮◌𞀪◌̀◌̕b; a◌֮◌𞀪◌̀◌̕b; ) LATIN SMALL LETTER A, COMBINING GLAGOLITIC LETTER FITA, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, LATIN SMALL LETTER B +0061 0315 0300 05AE 1E08F 0062;00E0 05AE 1E08F 0315 0062;0061 05AE 0300 1E08F 0315 0062;00E0 05AE 1E08F 0315 0062;0061 05AE 0300 1E08F 0315 0062; # (a◌̕◌̀◌֮◌𞂏b; à◌֮◌𞂏◌̕b; a◌֮◌̀◌𞂏◌̕b; à◌֮◌𞂏◌̕b; a◌֮◌̀◌𞂏◌̕b; ) LATIN SMALL LETTER A, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, COMBINING CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I, LATIN SMALL LETTER B +0061 1E08F 0315 0300 05AE 0062;0061 05AE 1E08F 0300 0315 0062;0061 05AE 1E08F 0300 0315 0062;0061 05AE 1E08F 0300 0315 0062;0061 05AE 1E08F 0300 0315 0062; # (a◌𞂏◌̕◌̀◌֮b; a◌֮◌𞂏◌̀◌̕b; a◌֮◌𞂏◌̀◌̕b; a◌֮◌𞂏◌̀◌̕b; a◌֮◌𞂏◌̀◌̕b; ) LATIN SMALL LETTER A, COMBINING CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, LATIN SMALL LETTER B 0061 0315 0300 05AE 1E130 0062;00E0 05AE 1E130 0315 0062;0061 05AE 0300 1E130 0315 0062;00E0 05AE 1E130 0315 0062;0061 05AE 0300 1E130 0315 0062; # (a◌̕◌̀◌֮◌𞄰b; à◌֮◌𞄰◌̕b; a◌֮◌̀◌𞄰◌̕b; à◌֮◌𞄰◌̕b; a◌֮◌̀◌𞄰◌̕b; ) LATIN SMALL LETTER A, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, NYIAKENG PUACHUE HMONG TONE-B, LATIN SMALL LETTER B 0061 1E130 0315 0300 05AE 0062;0061 05AE 1E130 0300 0315 0062;0061 05AE 1E130 0300 0315 0062;0061 05AE 1E130 0300 0315 0062;0061 05AE 1E130 0300 0315 0062; # (a◌𞄰◌̕◌̀◌֮b; a◌֮◌𞄰◌̀◌̕b; a◌֮◌𞄰◌̀◌̕b; a◌֮◌𞄰◌̀◌̕b; a◌֮◌𞄰◌̀◌̕b; ) LATIN SMALL LETTER A, NYIAKENG PUACHUE HMONG TONE-B, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, LATIN SMALL LETTER B 0061 0315 0300 05AE 1E131 0062;00E0 05AE 1E131 0315 0062;0061 05AE 0300 1E131 0315 0062;00E0 05AE 1E131 0315 0062;0061 05AE 0300 1E131 0315 0062; # (a◌̕◌̀◌֮◌𞄱b; à◌֮◌𞄱◌̕b; a◌֮◌̀◌𞄱◌̕b; à◌֮◌𞄱◌̕b; a◌֮◌̀◌𞄱◌̕b; ) LATIN SMALL LETTER A, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, NYIAKENG PUACHUE HMONG TONE-M, LATIN SMALL LETTER B @@ -18836,6 +18910,14 @@ 0061 1E2EE 0315 0300 05AE 0062;0061 05AE 1E2EE 0300 0315 0062;0061 05AE 1E2EE 0300 0315 0062;0061 05AE 1E2EE 0300 0315 0062;0061 05AE 1E2EE 0300 0315 0062; # (a◌𞋮◌̕◌̀◌֮b; a◌֮◌𞋮◌̀◌̕b; a◌֮◌𞋮◌̀◌̕b; a◌֮◌𞋮◌̀◌̕b; a◌֮◌𞋮◌̀◌̕b; ) LATIN SMALL LETTER A, WANCHO TONE KOI, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, LATIN SMALL LETTER B 0061 0315 0300 05AE 1E2EF 0062;00E0 05AE 1E2EF 0315 0062;0061 05AE 0300 1E2EF 0315 0062;00E0 05AE 1E2EF 0315 0062;0061 05AE 0300 1E2EF 0315 0062; # (a◌̕◌̀◌֮◌𞋯b; à◌֮◌𞋯◌̕b; a◌֮◌̀◌𞋯◌̕b; à◌֮◌𞋯◌̕b; a◌֮◌̀◌𞋯◌̕b; ) LATIN SMALL LETTER A, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, WANCHO TONE KOINI, LATIN SMALL LETTER B 0061 1E2EF 0315 0300 05AE 0062;0061 05AE 1E2EF 0300 0315 0062;0061 05AE 1E2EF 0300 0315 0062;0061 05AE 1E2EF 0300 0315 0062;0061 05AE 1E2EF 0300 0315 0062; # (a◌𞋯◌̕◌̀◌֮b; a◌֮◌𞋯◌̀◌̕b; a◌֮◌𞋯◌̀◌̕b; a◌֮◌𞋯◌̀◌̕b; a◌֮◌𞋯◌̀◌̕b; ) LATIN SMALL LETTER A, WANCHO TONE KOINI, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, LATIN SMALL LETTER B +0061 035C 0315 0300 1E4EC 0062;00E0 0315 1E4EC 035C 0062;0061 0300 0315 1E4EC 035C 0062;00E0 0315 1E4EC 035C 0062;0061 0300 0315 1E4EC 035C 0062; # (a◌͜◌̕◌̀◌𞓬b; à◌̕◌𞓬◌͜b; a◌̀◌̕◌𞓬◌͜b; à◌̕◌𞓬◌͜b; a◌̀◌̕◌𞓬◌͜b; ) LATIN SMALL LETTER A, COMBINING DOUBLE BREVE BELOW, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, NAG MUNDARI SIGN MUHOR, LATIN SMALL LETTER B +0061 1E4EC 035C 0315 0300 0062;00E0 1E4EC 0315 035C 0062;0061 0300 1E4EC 0315 035C 0062;00E0 1E4EC 0315 035C 0062;0061 0300 1E4EC 0315 035C 0062; # (a◌𞓬◌͜◌̕◌̀b; à◌𞓬◌̕◌͜b; a◌̀◌𞓬◌̕◌͜b; à◌𞓬◌̕◌͜b; a◌̀◌𞓬◌̕◌͜b; ) LATIN SMALL LETTER A, NAG MUNDARI SIGN MUHOR, COMBINING DOUBLE BREVE BELOW, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, LATIN SMALL LETTER B +0061 035C 0315 0300 1E4ED 0062;00E0 0315 1E4ED 035C 0062;0061 0300 0315 1E4ED 035C 0062;00E0 0315 1E4ED 035C 0062;0061 0300 0315 1E4ED 035C 0062; # (a◌͜◌̕◌̀◌𞓭b; à◌̕◌𞓭◌͜b; a◌̀◌̕◌𞓭◌͜b; à◌̕◌𞓭◌͜b; a◌̀◌̕◌𞓭◌͜b; ) LATIN SMALL LETTER A, COMBINING DOUBLE BREVE BELOW, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, NAG MUNDARI SIGN TOYOR, LATIN SMALL LETTER B +0061 1E4ED 035C 0315 0300 0062;00E0 1E4ED 0315 035C 0062;0061 0300 1E4ED 0315 035C 0062;00E0 1E4ED 0315 035C 0062;0061 0300 1E4ED 0315 035C 0062; # (a◌𞓭◌͜◌̕◌̀b; à◌𞓭◌̕◌͜b; a◌̀◌𞓭◌̕◌͜b; à◌𞓭◌̕◌͜b; a◌̀◌𞓭◌̕◌͜b; ) LATIN SMALL LETTER A, NAG MUNDARI SIGN TOYOR, COMBINING DOUBLE BREVE BELOW, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, LATIN SMALL LETTER B +0061 059A 0316 1DFA 1E4EE 0062;0061 1DFA 0316 1E4EE 059A 0062;0061 1DFA 0316 1E4EE 059A 0062;0061 1DFA 0316 1E4EE 059A 0062;0061 1DFA 0316 1E4EE 059A 0062; # (a◌֚◌̖◌᷺◌𞓮b; a◌᷺◌̖◌𞓮◌֚b; a◌᷺◌̖◌𞓮◌֚b; a◌᷺◌̖◌𞓮◌֚b; a◌᷺◌̖◌𞓮◌֚b; ) LATIN SMALL LETTER A, HEBREW ACCENT YETIV, COMBINING GRAVE ACCENT BELOW, COMBINING DOT BELOW LEFT, NAG MUNDARI SIGN IKIR, LATIN SMALL LETTER B +0061 1E4EE 059A 0316 1DFA 0062;0061 1DFA 1E4EE 0316 059A 0062;0061 1DFA 1E4EE 0316 059A 0062;0061 1DFA 1E4EE 0316 059A 0062;0061 1DFA 1E4EE 0316 059A 0062; # (a◌𞓮◌֚◌̖◌᷺b; a◌᷺◌𞓮◌̖◌֚b; a◌᷺◌𞓮◌̖◌֚b; a◌᷺◌𞓮◌̖◌֚b; a◌᷺◌𞓮◌̖◌֚b; ) LATIN SMALL LETTER A, NAG MUNDARI SIGN IKIR, HEBREW ACCENT YETIV, COMBINING GRAVE ACCENT BELOW, COMBINING DOT BELOW LEFT, LATIN SMALL LETTER B +0061 0315 0300 05AE 1E4EF 0062;00E0 05AE 1E4EF 0315 0062;0061 05AE 0300 1E4EF 0315 0062;00E0 05AE 1E4EF 0315 0062;0061 05AE 0300 1E4EF 0315 0062; # (a◌̕◌̀◌֮◌𞓯b; à◌֮◌𞓯◌̕b; a◌֮◌̀◌𞓯◌̕b; à◌֮◌𞓯◌̕b; a◌֮◌̀◌𞓯◌̕b; ) LATIN SMALL LETTER A, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, NAG MUNDARI SIGN SUTUH, LATIN SMALL LETTER B +0061 1E4EF 0315 0300 05AE 0062;0061 05AE 1E4EF 0300 0315 0062;0061 05AE 1E4EF 0300 0315 0062;0061 05AE 1E4EF 0300 0315 0062;0061 05AE 1E4EF 0300 0315 0062; # (a◌𞓯◌̕◌̀◌֮b; a◌֮◌𞓯◌̀◌̕b; a◌֮◌𞓯◌̀◌̕b; a◌֮◌𞓯◌̀◌̕b; a◌֮◌𞓯◌̀◌̕b; ) LATIN SMALL LETTER A, NAG MUNDARI SIGN SUTUH, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, LATIN SMALL LETTER B 0061 059A 0316 1DFA 1E8D0 0062;0061 1DFA 0316 1E8D0 059A 0062;0061 1DFA 0316 1E8D0 059A 0062;0061 1DFA 0316 1E8D0 059A 0062;0061 1DFA 0316 1E8D0 059A 0062; # (a◌֚◌̖◌᷺◌𞣐b; a◌᷺◌̖◌𞣐◌֚b; a◌᷺◌̖◌𞣐◌֚b; a◌᷺◌̖◌𞣐◌֚b; a◌᷺◌̖◌𞣐◌֚b; ) LATIN SMALL LETTER A, HEBREW ACCENT YETIV, COMBINING GRAVE ACCENT BELOW, COMBINING DOT BELOW LEFT, MENDE KIKAKUI COMBINING NUMBER TEENS, LATIN SMALL LETTER B 0061 1E8D0 059A 0316 1DFA 0062;0061 1DFA 1E8D0 0316 059A 0062;0061 1DFA 1E8D0 0316 059A 0062;0061 1DFA 1E8D0 0316 059A 0062;0061 1DFA 1E8D0 0316 059A 0062; # (a◌𞣐◌֚◌̖◌᷺b; a◌᷺◌𞣐◌̖◌֚b; a◌᷺◌𞣐◌̖◌֚b; a◌᷺◌𞣐◌̖◌֚b; a◌᷺◌𞣐◌̖◌֚b; ) LATIN SMALL LETTER A, MENDE KIKAKUI COMBINING NUMBER TEENS, HEBREW ACCENT YETIV, COMBINING GRAVE ACCENT BELOW, COMBINING DOT BELOW LEFT, LATIN SMALL LETTER B 0061 059A 0316 1DFA 1E8D1 0062;0061 1DFA 0316 1E8D1 059A 0062;0061 1DFA 0316 1E8D1 059A 0062;0061 1DFA 0316 1E8D1 059A 0062;0061 1DFA 0316 1E8D1 059A 0062; # (a◌֚◌̖◌᷺◌𞣑b; a◌᷺◌̖◌𞣑◌֚b; a◌᷺◌̖◌𞣑◌֚b; a◌᷺◌̖◌𞣑◌֚b; a◌᷺◌̖◌𞣑◌֚b; ) LATIN SMALL LETTER A, HEBREW ACCENT YETIV, COMBINING GRAVE ACCENT BELOW, COMBINING DOT BELOW LEFT, MENDE KIKAKUI COMBINING NUMBER TENS, LATIN SMALL LETTER B
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/tests/array-test.c -> _service:tar_scm:glib-2.76.4.tar.xz/glib/tests/array-test.c
Changed
@@ -142,6 +142,196 @@ g_free (out_str); } +static void +array_new_take (void) +{ + const size_t array_size = 10000; + GArray *garray; + gpointer *data; + gpointer *old_data_copy; + gsize len; + + garray = g_array_new (FALSE, FALSE, sizeof (size_t)); + for (size_t i = 0; i < array_size; i++) + g_array_append_val (garray, i); + + data = g_array_steal (garray, &len); + g_assert_cmpuint (array_size, ==, len); + g_assert_nonnull (data); + g_clear_pointer (&garray, g_array_unref); + + old_data_copy = g_memdup2 (data, len * sizeof (size_t)); + garray = g_array_new_take (g_steal_pointer (&data), len, FALSE, sizeof (size_t)); + g_assert_cmpuint (garray->len, ==, array_size); + + g_assert_cmpuint (g_array_index (garray, size_t, 0), ==, 0); + g_assert_cmpuint (g_array_index (garray, size_t, 10), ==, 10); + + g_assert_cmpmem (old_data_copy, array_size * sizeof (size_t), + garray->data, array_size * sizeof (size_t)); + + size_t val = 55; + g_array_append_val (garray, val); + val = 33; + g_array_prepend_val (garray, val); + + g_assert_cmpuint (garray->len, ==, array_size + 2); + g_assert_cmpuint (g_array_index (garray, size_t, 0), ==, 33); + g_assert_cmpuint (g_array_index (garray, size_t, garray->len - 1), ==, 55); + + g_array_remove_index (garray, 0); + g_assert_cmpuint (garray->len, ==, array_size + 1); + g_array_remove_index (garray, garray->len - 1); + g_assert_cmpuint (garray->len, ==, array_size); + + g_assert_cmpmem (old_data_copy, array_size * sizeof (size_t), + garray->data, array_size * sizeof (size_t)); + + g_array_unref (garray); + g_free (old_data_copy); +} + +static void +array_new_take_empty (void) +{ + GArray *garray; + size_t empty_array = {0}; + + garray = g_array_new_take ( + g_memdup2 (&empty_array, sizeof (size_t)), 0, FALSE, sizeof (size_t)); + g_assert_cmpuint (garray->len, ==, 0); + + g_clear_pointer (&garray, g_array_unref); + + garray = g_array_new_take (NULL, 0, FALSE, sizeof (size_t)); + g_assert_cmpuint (garray->len, ==, 0); + + g_clear_pointer (&garray, g_array_unref); +} + +static void +array_new_take_zero_terminated (void) +{ + size_t array_size = 10000; + GArray *garray; + gpointer *data; + gpointer *old_data_copy; + gsize len; + + garray = g_array_new (TRUE, FALSE, sizeof (size_t)); + for (size_t i = 1; i <= array_size; i++) + g_array_append_val (garray, i); + + data = g_array_steal (garray, &len); + g_assert_cmpuint (array_size, ==, len); + g_assert_nonnull (data); + g_clear_pointer (&garray, g_array_unref); + + old_data_copy = g_memdup2 (data, len * sizeof (size_t)); + garray = g_array_new_take_zero_terminated ( + g_steal_pointer (&data), FALSE, sizeof (size_t)); + g_assert_cmpuint (garray->len, ==, array_size); + g_assert_cmpuint (g_array_index (garray, size_t, garray->len), ==, 0); + + g_assert_cmpuint (g_array_index (garray, size_t, 0), ==, 1); + g_assert_cmpuint (g_array_index (garray, size_t, 10), ==, 11); + + g_assert_cmpmem (old_data_copy, array_size * sizeof (size_t), + garray->data, array_size * sizeof (size_t)); + + size_t val = 55; + g_array_append_val (garray, val); + val = 33; + g_array_prepend_val (garray, val); + + g_assert_cmpuint (garray->len, ==, array_size + 2); + g_assert_cmpuint (g_array_index (garray, size_t, 0), ==, 33); + g_assert_cmpuint (g_array_index (garray, size_t, garray->len - 1), ==, 55); + + g_array_remove_index (garray, 0); + g_assert_cmpuint (garray->len, ==, array_size + 1); + g_array_remove_index (garray, garray->len - 1); + g_assert_cmpuint (garray->len, ==, array_size); + g_assert_cmpuint (g_array_index (garray, size_t, garray->len), ==, 0); + + g_assert_cmpmem (old_data_copy, array_size * sizeof (size_t), + garray->data, array_size * sizeof (size_t)); + + g_clear_pointer (&garray, g_array_unref); + g_clear_pointer (&old_data_copy, g_free); + + array_size = G_MAXUINT8; + garray = g_array_new (TRUE, FALSE, sizeof (guint8)); + for (guint8 i = 1; i < array_size; i++) + g_array_append_val (garray, i); + + guint8 byte_val = G_MAXUINT8 / 2; + g_array_append_val (garray, byte_val); + + data = g_array_steal (garray, &len); + g_assert_cmpuint (array_size, ==, len); + g_assert_nonnull (data); + g_clear_pointer (&garray, g_array_unref); + + old_data_copy = g_memdup2 (data, len * sizeof (guint8)); + garray = g_array_new_take_zero_terminated ( + g_steal_pointer (&data), FALSE, sizeof (guint8)); + g_assert_cmpuint (garray->len, ==, array_size); + g_assert_cmpuint (g_array_index (garray, guint8, garray->len), ==, 0); + + g_assert_cmpuint (g_array_index (garray, guint8, 0), ==, 1); + g_assert_cmpuint (g_array_index (garray, guint8, 10), ==, 11); + + g_assert_cmpmem (old_data_copy, array_size * sizeof (guint8), + garray->data, array_size * sizeof (guint8)); + + byte_val = 55; + g_array_append_val (garray, byte_val); + byte_val = 33; + g_array_prepend_val (garray, byte_val); + + g_assert_cmpuint (garray->len, ==, array_size + 2); + g_assert_cmpuint (g_array_index (garray, guint8, 0), ==, 33); + g_assert_cmpuint (g_array_index (garray, guint8, garray->len - 1), ==, 55); + + g_array_remove_index (garray, 0); + g_assert_cmpuint (garray->len, ==, array_size + 1); + g_array_remove_index (garray, garray->len - 1); + g_assert_cmpuint (garray->len, ==, array_size); + g_assert_cmpuint (g_array_index (garray, guint8, garray->len), ==, 0); + + g_assert_cmpmem (old_data_copy, array_size * sizeof (guint8), + garray->data, array_size * sizeof (guint8)); + + g_clear_pointer (&garray, g_array_unref); + g_clear_pointer (&old_data_copy, g_free); +} + +static void +array_new_take_overflow (void) +{ +#if SIZE_WIDTH <= UINT_WIDTH + g_test_skip ("Overflow test requires UINT_WIDTH > SIZE_WIDTH."); +#else + if (!g_test_undefined ()) + return; + + /* Check for overflow should happen before data is accessed. */ + g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL, + "*assertion 'len <= G_MAXUINT' failed"); + g_assert_null ( + g_array_new_take ( + (gpointer) (int ) { 0 }, (gsize) G_MAXUINT + 1, FALSE, sizeof (int))); + g_test_assert_expected_messages (); + + g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL, + "*assertion 'element_size <= G_MAXUINT' failed"); + g_assert_null ( + g_array_new_take (NULL, 0, FALSE, (gsize) G_MAXUINT + 1)); + g_test_assert_expected_messages (); +#endif +} + /* Check g_array_steal() function */ static void array_steal (void) @@ -1014,6 +1204,638 @@ } static void +pointer_array_new_take (void) +{ + const size_t array_size = 10000; + GPtrArray *gparray; + gpointer *pdata; + gpointer *old_pdata_copy; + gsize len; + + gparray = g_ptr_array_new (); + for (size_t i = 0; i < array_size; i++) + g_ptr_array_add (gparray, GUINT_TO_POINTER (i)); + + pdata = g_ptr_array_steal (gparray, &len); + g_assert_cmpuint (array_size, ==, len); + g_assert_nonnull (pdata); + g_clear_pointer (&gparray, g_ptr_array_unref); + + old_pdata_copy = g_memdup2 (pdata, len * sizeof (gpointer)); + gparray = g_ptr_array_new_take (g_steal_pointer (&pdata), len, NULL); + g_assert_false (g_ptr_array_is_null_terminated (gparray)); + g_assert_cmpuint (gparray->len, ==, array_size); + + g_assert_cmpuint (GPOINTER_TO_UINT (g_ptr_array_index (gparray, 0)), ==, 0); + g_assert_cmpuint (GPOINTER_TO_UINT (g_ptr_array_index (gparray, 10)), ==, 10); + + g_assert_cmpmem (old_pdata_copy, array_size * sizeof (gpointer), + gparray->pdata, array_size * sizeof (gpointer)); + + g_ptr_array_add (gparray, GUINT_TO_POINTER (55)); + g_ptr_array_insert (gparray, 0, GUINT_TO_POINTER (33)); + + g_assert_cmpuint (gparray->len, ==, array_size + 2); + g_assert_cmpuint (GPOINTER_TO_UINT (g_ptr_array_index (gparray, 0)), ==, 33); + g_assert_cmpuint ( + GPOINTER_TO_UINT (g_ptr_array_index (gparray, gparray->len - 1)), ==, 55); + + g_ptr_array_remove_index (gparray, 0); + g_assert_cmpuint (gparray->len, ==, array_size + 1); + g_ptr_array_remove_index (gparray, gparray->len - 1); + g_assert_cmpuint (gparray->len, ==, array_size); + + g_assert_cmpmem (old_pdata_copy, array_size * sizeof (gpointer), + gparray->pdata, array_size * sizeof (gpointer)); + + g_ptr_array_unref (gparray); + g_free (old_pdata_copy); +} + +static void +pointer_array_new_take_empty (void) +{ + GPtrArray *gparray; + gpointer empty_array = {0}; + + gparray = g_ptr_array_new_take ( + g_memdup2 (&empty_array, sizeof (gpointer)), 0, NULL); + g_assert_false (g_ptr_array_is_null_terminated (gparray)); + g_assert_cmpuint (gparray->len, ==, 0); + + g_clear_pointer (&gparray, g_ptr_array_unref); + + gparray = g_ptr_array_new_take (NULL, 0, NULL); + g_assert_false (g_ptr_array_is_null_terminated (gparray)); + g_assert_cmpuint (gparray->len, ==, 0); + + g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL, + "*data*!=*NULL*||*len*==*0*"); + g_assert_null (g_ptr_array_new_take (NULL, 10, NULL)); + g_test_assert_expected_messages (); + + g_clear_pointer (&gparray, g_ptr_array_unref); +} + +static void +pointer_array_new_take_overflow (void) +{ +#if SIZE_WIDTH <= UINT_WIDTH + g_test_skip ("Overflow test requires UINT_WIDTH > SIZE_WIDTH."); +#else + if (!g_test_undefined ()) + return; + + /* Check for overflow should happen before data is accessed. */ + g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL, + "*assertion 'len <= G_MAXUINT' failed"); + g_assert_null (g_ptr_array_new_take ( + (gpointer ) { NULL }, (gsize) G_MAXUINT + 1, NULL)); + g_test_assert_expected_messages (); +#endif +} + +static void +pointer_array_new_take_with_free_func (void) +{ + const size_t array_size = 10000; + GPtrArray *gparray; + gpointer *pdata; + gpointer *old_pdata_copy; + gsize len; + + gparray = g_ptr_array_new_with_free_func (g_free); + for (size_t i = 0; i < array_size; i++) + g_ptr_array_add (gparray, g_strdup_printf ("%" G_GSIZE_FORMAT, i)); + + pdata = g_ptr_array_steal (gparray, &len); + g_assert_cmpuint (array_size, ==, len); + g_assert_nonnull (pdata); + g_clear_pointer (&gparray, g_ptr_array_unref); + + old_pdata_copy = g_memdup2 (pdata, len * sizeof (gpointer)); + gparray = g_ptr_array_new_take (g_steal_pointer (&pdata), len, g_free); + g_assert_false (g_ptr_array_is_null_terminated (gparray)); + g_assert_cmpuint (gparray->len, ==, array_size); + + g_assert_cmpstr ((const char *) g_ptr_array_index (gparray, 0), ==, "0"); + g_assert_cmpstr ((const char *) g_ptr_array_index (gparray, 101), ==, "101"); + + g_assert_cmpmem (old_pdata_copy, array_size * sizeof (gpointer), + gparray->pdata, array_size * sizeof (gpointer)); + + g_ptr_array_add (gparray, g_strdup_printf ("%d", 55)); + g_ptr_array_insert (gparray, 0, g_strdup_printf ("%d", 33)); + + g_assert_cmpuint (gparray->len, ==, array_size + 2); + g_assert_cmpstr ((const char *) g_ptr_array_index (gparray, 0), ==, "33"); + g_assert_cmpstr ( + (const char *) g_ptr_array_index (gparray, gparray->len - 1), ==, "55"); + + g_ptr_array_remove_index (gparray, 0); + g_assert_cmpuint (gparray->len, ==, array_size + 1); + g_ptr_array_remove_index (gparray, gparray->len - 1); + g_assert_cmpuint (gparray->len, ==, array_size); + + g_assert_cmpmem (old_pdata_copy, array_size * sizeof (gpointer), + gparray->pdata, array_size * sizeof (gpointer)); + + g_ptr_array_unref (gparray); + g_free (old_pdata_copy); +} + +static void +pointer_array_new_take_null_terminated (void) +{ + const size_t array_size = 10000; + GPtrArray *gparray; + gpointer *pdata; + gpointer *old_pdata_copy; + gsize len; + + gparray = g_ptr_array_new_null_terminated (array_size, NULL, TRUE); + g_assert_true (g_ptr_array_is_null_terminated (gparray)); + + for (size_t i = 0; i < array_size; i++) + g_ptr_array_add (gparray, GUINT_TO_POINTER (i + 1)); + + assert_ptr_array_null_terminated (gparray, TRUE); + pdata = g_ptr_array_steal (gparray, &len); + g_assert_cmpuint (array_size, ==, len); + g_assert_nonnull (pdata); + g_clear_pointer (&gparray, g_ptr_array_unref); + + old_pdata_copy = g_memdup2 (pdata, len * sizeof (gpointer)); + gparray = g_ptr_array_new_take_null_terminated (g_steal_pointer (&pdata), NULL); + g_assert_true (g_ptr_array_is_null_terminated (gparray)); + assert_ptr_array_null_terminated (gparray, TRUE); + g_assert_cmpuint (gparray->len, ==, array_size); + + g_assert_cmpuint (GPOINTER_TO_UINT (g_ptr_array_index (gparray, 0)), ==, 1); + g_assert_cmpuint (GPOINTER_TO_UINT (g_ptr_array_index (gparray, 10)), ==, 11); + + g_assert_cmpmem (old_pdata_copy, array_size * sizeof (gpointer), + gparray->pdata, array_size * sizeof (gpointer)); + + g_ptr_array_add (gparray, GUINT_TO_POINTER (55)); + assert_ptr_array_null_terminated (gparray, TRUE); + + g_ptr_array_insert (gparray, 0, GUINT_TO_POINTER (33)); + assert_ptr_array_null_terminated (gparray, TRUE); + + g_assert_cmpuint (gparray->len, ==, array_size + 2); + g_assert_cmpuint (GPOINTER_TO_UINT (g_ptr_array_index (gparray, 0)), ==, 33); + g_assert_cmpuint ( + GPOINTER_TO_UINT (g_ptr_array_index (gparray, gparray->len - 1)), ==, 55); + + g_ptr_array_remove_index (gparray, 0); + g_assert_cmpuint (gparray->len, ==, array_size + 1); + assert_ptr_array_null_terminated (gparray, TRUE); + + g_ptr_array_remove_index (gparray, gparray->len - 1); + g_assert_cmpuint (gparray->len, ==, array_size); + assert_ptr_array_null_terminated (gparray, TRUE); + + g_assert_cmpmem (old_pdata_copy, array_size * sizeof (gpointer), + gparray->pdata, array_size * sizeof (gpointer)); + + g_ptr_array_unref (gparray); + g_free (old_pdata_copy); +} + +static void +pointer_array_new_take_null_terminated_empty (void) +{ + GPtrArray *gparray; + const gpointer *data = (gpointer ) { NULL }; + + gparray = g_ptr_array_new_take_null_terminated ( + g_memdup2 (data, sizeof (gpointer)), NULL); + g_assert_true (g_ptr_array_is_null_terminated (gparray)); + assert_ptr_array_null_terminated (gparray, TRUE); + g_assert_cmpuint (gparray->len, ==, 0); + + g_clear_pointer (&gparray, g_ptr_array_unref); + + gparray = g_ptr_array_new_take_null_terminated (NULL, NULL); + g_assert_true (g_ptr_array_is_null_terminated (gparray)); + assert_ptr_array_null_terminated (gparray, TRUE); + g_assert_cmpuint (gparray->len, ==, 0); + + g_clear_pointer (&gparray, g_ptr_array_unref); +} + +static void +pointer_array_new_take_null_terminated_with_free_func (void) +{ + const size_t array_size = 10000; + GPtrArray *gparray; + gpointer *pdata; + gpointer *old_pdata_copy; + gsize len; + + gparray = g_ptr_array_new_null_terminated (array_size, g_free, TRUE); + g_assert_true (g_ptr_array_is_null_terminated (gparray)); + + for (size_t i = 0; i < array_size; i++) + g_ptr_array_add (gparray, g_strdup_printf ("%" G_GSIZE_FORMAT, i)); + + assert_ptr_array_null_terminated (gparray, TRUE); + + pdata = g_ptr_array_steal (gparray, &len); + g_assert_cmpuint (array_size, ==, len); + g_assert_nonnull (pdata); + g_clear_pointer (&gparray, g_ptr_array_unref); + + old_pdata_copy = g_memdup2 (pdata, len * sizeof (gpointer)); + gparray = g_ptr_array_new_take_null_terminated (g_steal_pointer (&pdata), g_free); + g_assert_true (g_ptr_array_is_null_terminated (gparray)); + assert_ptr_array_null_terminated (gparray, TRUE); + g_assert_cmpuint (gparray->len, ==, array_size); + + g_assert_cmpstr ((const char *) g_ptr_array_index (gparray, 0), ==, "0"); + g_assert_cmpstr ((const char *) g_ptr_array_index (gparray, 101), ==, "101"); + + g_assert_cmpmem (old_pdata_copy, array_size * sizeof (gpointer), + gparray->pdata, array_size * sizeof (gpointer)); + + g_ptr_array_add (gparray, g_strdup_printf ("%d", 55)); + assert_ptr_array_null_terminated (gparray, TRUE); + + g_ptr_array_insert (gparray, 0, g_strdup_printf ("%d", 33)); + assert_ptr_array_null_terminated (gparray, TRUE); + + g_assert_cmpuint (gparray->len, ==, array_size + 2); + g_assert_cmpstr ((const char *) g_ptr_array_index (gparray, 0), ==, "33"); + g_assert_cmpstr ( + (const char *) g_ptr_array_index (gparray, gparray->len - 1), ==, "55"); + + g_ptr_array_remove_index (gparray, 0); + g_assert_cmpuint (gparray->len, ==, array_size + 1); + assert_ptr_array_null_terminated (gparray, TRUE); + + g_ptr_array_remove_index (gparray, gparray->len - 1); + g_assert_cmpuint (gparray->len, ==, array_size); + assert_ptr_array_null_terminated (gparray, TRUE); + + g_assert_cmpmem (old_pdata_copy, array_size * sizeof (gpointer), + gparray->pdata, array_size * sizeof (gpointer)); + + g_ptr_array_unref (gparray); + g_free (old_pdata_copy); +} + +static void +pointer_array_new_take_null_terminated_from_gstrv (void) +{ + GPtrArray *gparray; + char *joined; + + gparray = g_ptr_array_new_take_null_terminated ( + (gpointer) g_strsplit ("A.dot.separated.string", ".", -1), g_free); + + g_assert_cmpstr ( + (const char *) g_ptr_array_index (gparray, 0), ==, "A"); + g_assert_cmpstr ( + (const char *) g_ptr_array_index (gparray, 1), ==, "dot"); + g_assert_cmpstr ( + (const char *) g_ptr_array_index (gparray, 2), ==, "separated"); + g_assert_cmpstr ( + (const char *) g_ptr_array_index (gparray, 3), ==, "string"); + + g_assert_null (g_ptr_array_index (gparray, 4)); + + joined = g_strjoinv (".", (char **) gparray->pdata); + g_assert_cmpstr (joined, ==, "A.dot.separated.string"); + + g_ptr_array_unref (gparray); + g_free (joined); +} + +static void +pointer_array_new_from_array (void) +{ + const size_t array_size = 10000; + GPtrArray *source_array; + GPtrArray *gparray; + gpointer *old_pdata_copy; + + source_array = g_ptr_array_new (); + for (size_t i = 0; i < array_size; i++) + g_ptr_array_add (source_array, GUINT_TO_POINTER (i)); + + g_assert_cmpuint (array_size, ==, source_array->len); + g_assert_nonnull (source_array->pdata); + + gparray = g_ptr_array_new_from_array (source_array->pdata, source_array->len, + NULL, NULL, NULL); + + old_pdata_copy = + g_memdup2 (source_array->pdata, source_array->len * sizeof (gpointer)); + g_assert_nonnull (old_pdata_copy); + g_clear_pointer (&source_array, g_ptr_array_unref); + + g_assert_false (g_ptr_array_is_null_terminated (gparray)); + g_assert_cmpuint (gparray->len, ==, array_size); + + g_assert_cmpuint (GPOINTER_TO_UINT (g_ptr_array_index (gparray, 0)), ==, 0); + g_assert_cmpuint (GPOINTER_TO_UINT (g_ptr_array_index (gparray, 10)), ==, 10); + + g_assert_cmpmem (old_pdata_copy, array_size * sizeof (gpointer), + gparray->pdata, array_size * sizeof (gpointer)); + + g_ptr_array_add (gparray, GUINT_TO_POINTER (55)); + g_ptr_array_insert (gparray, 0, GUINT_TO_POINTER (33)); + + g_assert_cmpuint (gparray->len, ==, array_size + 2); + g_assert_cmpuint (GPOINTER_TO_UINT (g_ptr_array_index (gparray, 0)), ==, 33); + g_assert_cmpuint ( + GPOINTER_TO_UINT (g_ptr_array_index (gparray, gparray->len - 1)), ==, 55); + + g_ptr_array_remove_index (gparray, 0); + g_assert_cmpuint (gparray->len, ==, array_size + 1); + g_ptr_array_remove_index (gparray, gparray->len - 1); + g_assert_cmpuint (gparray->len, ==, array_size); + + g_assert_cmpmem (old_pdata_copy, array_size * sizeof (gpointer), + gparray->pdata, array_size * sizeof (gpointer)); + + g_ptr_array_unref (gparray); + g_free (old_pdata_copy); +} + +static void +pointer_array_new_from_array_empty (void) +{ + GPtrArray *gparray; + gpointer empty_array = {0}; + + gparray = g_ptr_array_new_from_array (empty_array, 0, NULL, NULL, NULL); + g_assert_false (g_ptr_array_is_null_terminated (gparray)); + g_assert_cmpuint (gparray->len, ==, 0); + + g_clear_pointer (&gparray, g_ptr_array_unref); + + g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL, + "*data*!=*NULL*||*len*==*0*"); + g_assert_null (g_ptr_array_new_from_array (NULL, 10, NULL, NULL, NULL)); + g_test_assert_expected_messages (); +} + +static void +pointer_array_new_from_array_overflow (void) +{ +#if SIZE_WIDTH <= UINT_WIDTH + g_test_skip ("Overflow test requires UINT_WIDTH > SIZE_WIDTH."); +#else + if (!g_test_undefined ()) + return; + + /* Check for overflow should happen before data is accessed. */ + g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL, + "*assertion 'len <= G_MAXUINT' failed"); + g_assert_null (g_ptr_array_new_from_array ( + (gpointer ) { NULL }, (gsize) G_MAXUINT + 1, NULL, NULL, NULL)); + g_test_assert_expected_messages (); +#endif +} + +static void +pointer_array_new_from_array_with_copy_and_free_func (void) +{ + const size_t array_size = 10000; + GPtrArray *source_array; + GPtrArray *gparray; + gpointer *old_pdata_copy; + + source_array = g_ptr_array_new_with_free_func (g_free); + for (size_t i = 0; i < array_size; i++) + g_ptr_array_add (source_array, g_strdup_printf ("%" G_GSIZE_FORMAT, i)); + + g_assert_cmpuint (array_size, ==, source_array->len); + g_assert_nonnull (source_array->pdata); + + gparray = g_ptr_array_new_from_array (source_array->pdata, source_array->len, + (GCopyFunc) g_strdup, NULL, g_free); + + old_pdata_copy = + g_memdup2 (source_array->pdata, source_array->len * sizeof (gpointer)); + g_assert_nonnull (old_pdata_copy); + + for (size_t i = 0; i < gparray->len; i++) + { + g_assert_cmpstr ((const char *) g_ptr_array_index (gparray, i), ==, + (const char *) old_pdata_copyi); + } + + g_clear_pointer (&source_array, g_ptr_array_unref); + + g_assert_cmpstr ((const char *) g_ptr_array_index (gparray, 0), ==, "0"); + g_assert_cmpstr ((const char *) g_ptr_array_index (gparray, 101), ==, "101"); + + g_ptr_array_add (gparray, g_strdup_printf ("%d", 55)); + g_ptr_array_insert (gparray, 0, g_strdup_printf ("%d", 33)); + + g_assert_cmpuint (gparray->len, ==, array_size + 2); + g_assert_cmpstr ((const char *) g_ptr_array_index (gparray, 0), ==, "33"); + g_assert_cmpstr ( + (const char *) g_ptr_array_index (gparray, gparray->len - 1), ==, "55"); + + g_ptr_array_remove_index (gparray, 0); + g_assert_cmpuint (gparray->len, ==, array_size + 1); + g_ptr_array_remove_index (gparray, gparray->len - 1); + g_assert_cmpuint (gparray->len, ==, array_size); + + g_ptr_array_unref (gparray); + g_free (old_pdata_copy); +} + +static void +pointer_array_new_from_null_terminated_array (void) +{ + const size_t array_size = 10000; + GPtrArray *source_array; + GPtrArray *gparray; + gpointer *old_pdata_copy; + + source_array = g_ptr_array_new_null_terminated (array_size, NULL, TRUE); + g_assert_true (g_ptr_array_is_null_terminated (source_array)); + + for (size_t i = 0; i < array_size; i++) + g_ptr_array_add (source_array, GUINT_TO_POINTER (i + 1)); + + g_assert_cmpuint (array_size, ==, source_array->len); + g_assert_nonnull (source_array->pdata); + + old_pdata_copy = + g_memdup2 (source_array->pdata, source_array->len * sizeof (gpointer)); + g_assert_nonnull (old_pdata_copy); + + gparray = g_ptr_array_new_from_null_terminated_array (source_array->pdata, + NULL, NULL, NULL); + g_assert_true (g_ptr_array_is_null_terminated (source_array)); + assert_ptr_array_null_terminated (gparray, TRUE); + + g_clear_pointer (&source_array, g_ptr_array_unref); + + g_assert_true (g_ptr_array_is_null_terminated (gparray)); + g_assert_cmpuint (gparray->len, ==, array_size); + + g_assert_cmpuint (GPOINTER_TO_UINT (g_ptr_array_index (gparray, 0)), ==, 1); + g_assert_cmpuint (GPOINTER_TO_UINT (g_ptr_array_index (gparray, 10)), ==, 11); + + g_assert_cmpmem (old_pdata_copy, array_size * sizeof (gpointer), + gparray->pdata, array_size * sizeof (gpointer)); + + g_ptr_array_add (gparray, GUINT_TO_POINTER (55)); + assert_ptr_array_null_terminated (gparray, TRUE); + + g_ptr_array_insert (gparray, 0, GUINT_TO_POINTER (33)); + assert_ptr_array_null_terminated (gparray, TRUE); + + g_assert_cmpuint (gparray->len, ==, array_size + 2); + g_assert_cmpuint (GPOINTER_TO_UINT (g_ptr_array_index (gparray, 0)), ==, 33); + g_assert_cmpuint ( + GPOINTER_TO_UINT (g_ptr_array_index (gparray, gparray->len - 1)), ==, 55); + + g_ptr_array_remove_index (gparray, 0); + g_assert_cmpuint (gparray->len, ==, array_size + 1); + assert_ptr_array_null_terminated (gparray, TRUE); + + g_ptr_array_remove_index (gparray, gparray->len - 1); + g_assert_cmpuint (gparray->len, ==, array_size); + assert_ptr_array_null_terminated (gparray, TRUE); + + g_assert_cmpmem (old_pdata_copy, array_size * sizeof (gpointer), + gparray->pdata, array_size * sizeof (gpointer)); + + g_ptr_array_unref (gparray); + g_free (old_pdata_copy); +} + +static void +pointer_array_new_from_null_terminated_array_empty (void) +{ + GPtrArray *gparray; + + gparray = g_ptr_array_new_from_null_terminated_array ( + (gpointer ) { NULL }, NULL, NULL, NULL); + g_assert_true (g_ptr_array_is_null_terminated (gparray)); + assert_ptr_array_null_terminated (gparray, TRUE); + g_assert_cmpuint (gparray->len, ==, 0); + + g_clear_pointer (&gparray, g_ptr_array_unref); + + gparray = g_ptr_array_new_from_null_terminated_array ( + NULL, NULL, NULL, NULL); + g_assert_true (g_ptr_array_is_null_terminated (gparray)); + assert_ptr_array_null_terminated (gparray, TRUE); + g_assert_cmpuint (gparray->len, ==, 0); + + g_clear_pointer (&gparray, g_ptr_array_unref); +} + +static void +pointer_array_new_from_null_terminated_array_with_copy_and_free_func (void) +{ + const size_t array_size = 10000; + GPtrArray *source_array; + GPtrArray *gparray; + GStrv old_pdata_copy; + + source_array = g_ptr_array_new_null_terminated (array_size, g_free, TRUE); + g_assert_true (g_ptr_array_is_null_terminated (source_array)); + + for (size_t i = 0; i < array_size; i++) + g_ptr_array_add (source_array, g_strdup_printf ("%" G_GSIZE_FORMAT, i)); + + g_assert_cmpuint (array_size, ==, source_array->len); + g_assert_nonnull (source_array->pdata); + + old_pdata_copy = g_strdupv ((char **) source_array->pdata); + g_assert_cmpuint (g_strv_length (old_pdata_copy), ==, array_size); + g_assert_nonnull (old_pdata_copy); + g_clear_pointer (&source_array, g_ptr_array_unref); + + gparray = g_ptr_array_new_from_null_terminated_array ( + (gpointer* ) old_pdata_copy, (GCopyFunc) g_strdup, NULL, g_free); + g_assert_true (g_ptr_array_is_null_terminated (gparray)); + assert_ptr_array_null_terminated (gparray, TRUE); + + for (size_t i = 0; i < gparray->len; i++) + { + g_assert_cmpstr ((const char *) g_ptr_array_index (gparray, i), ==, + (const char *) old_pdata_copyi); + } + + g_assert_cmpstr ((const char *) g_ptr_array_index (gparray, 0), ==, "0"); + g_assert_cmpstr ((const char *) g_ptr_array_index (gparray, 101), ==, "101"); + + g_ptr_array_add (gparray, g_strdup_printf ("%d", 55)); + assert_ptr_array_null_terminated (gparray, TRUE); + + g_ptr_array_insert (gparray, 0, g_strdup_printf ("%d", 33)); + assert_ptr_array_null_terminated (gparray, TRUE); + + g_assert_cmpuint (gparray->len, ==, array_size + 2); + g_assert_cmpstr ((const char *) g_ptr_array_index (gparray, 0), ==, "33"); + g_assert_cmpstr ( + (const char *) g_ptr_array_index (gparray, gparray->len - 1), ==, "55"); + + g_ptr_array_remove_index (gparray, 0); + assert_ptr_array_null_terminated (gparray, TRUE); + g_assert_cmpuint (gparray->len, ==, array_size + 1); + + g_ptr_array_remove_index (gparray, gparray->len - 1); + assert_ptr_array_null_terminated (gparray, TRUE); + g_assert_cmpuint (gparray->len, ==, array_size); + + for (size_t i = 0; i < gparray->len; i++) + { + g_assert_cmpstr ((const char *) g_ptr_array_index (gparray, i), ==, + (const char *) old_pdata_copyi); + } + + g_ptr_array_unref (gparray); + g_strfreev (old_pdata_copy); +} + +static void +pointer_array_new_from_null_terminated_array_from_gstrv (void) +{ + GPtrArray *gparray; + GStrv strv; + char *joined; + + strv = g_strsplit ("A.dot.separated.string", ".", -1); + gparray = g_ptr_array_new_from_null_terminated_array ( + (gpointer) strv, NULL, NULL, NULL); + + g_assert_cmpstr ( + (const char *) g_ptr_array_index (gparray, 0), ==, "A"); + g_assert_true (g_ptr_array_index (gparray, 0) == strv0); + g_assert_cmpstr ( + (const char *) g_ptr_array_index (gparray, 1), ==, "dot"); + g_assert_true (g_ptr_array_index (gparray, 1) == strv1); + g_assert_cmpstr ( + (const char *) g_ptr_array_index (gparray, 2), ==, "separated"); + g_assert_true (g_ptr_array_index (gparray, 2) == strv2); + g_assert_cmpstr ( + (const char *) g_ptr_array_index (gparray, 3), ==, "string"); + g_assert_true (g_ptr_array_index (gparray, 3) == strv3); + + g_assert_null (strv4); + g_assert_null (g_ptr_array_index (gparray, 4)); + + joined = g_strjoinv (".", (char **) gparray->pdata); + g_assert_cmpstr (joined, ==, "A.dot.separated.string"); + + g_ptr_array_unref (gparray); + g_strfreev (strv); + g_free (joined); +} + +static void pointer_array_ref_count (gconstpointer test_data) { const gboolean null_terminated = GPOINTER_TO_INT (test_data); @@ -1433,12 +2255,24 @@ } static gint +ptr_compare_values (gconstpointer p1, gconstpointer p2) +{ + return GPOINTER_TO_INT (p1) - GPOINTER_TO_INT (p2); +} + +static gint ptr_compare (gconstpointer p1, gconstpointer p2) { gpointer i1 = *(gpointer*)p1; gpointer i2 = *(gpointer*)p2; - return GPOINTER_TO_INT (i1) - GPOINTER_TO_INT (i2); + return ptr_compare_values (i1, i2); +} + +static gint +ptr_compare_values_data (gconstpointer p1, gconstpointer p2, gpointer data) +{ + return GPOINTER_TO_INT (p1) - GPOINTER_TO_INT (p2); } static gint @@ -1447,7 +2281,7 @@ gpointer i1 = *(gpointer*)p1; gpointer i2 = *(gpointer*)p2; - return GPOINTER_TO_INT (i1) - GPOINTER_TO_INT (i2); + return ptr_compare_values_data (i1, i2, data); } static void @@ -1655,6 +2489,204 @@ } static void +pointer_array_sort_values (void) +{ + GPtrArray *gparray; + gint i; + gint val; + gint prev, cur; + + gparray = g_ptr_array_new (); + + /* Sort empty array */ + g_ptr_array_sort_values (gparray, ptr_compare_values); + + for (i = 0; i < 10000; i++) + { + val = g_random_int_range (0, 10000); + g_ptr_array_add (gparray, GINT_TO_POINTER (val)); + } + + g_ptr_array_sort_values (gparray, ptr_compare_values); + + prev = -1; + for (i = 0; i < 10000; i++) + { + cur = GPOINTER_TO_INT (g_ptr_array_index (gparray, i)); + g_assert_cmpint (prev, <=, cur); + prev = cur; + } + + g_clear_pointer (&gparray, g_ptr_array_unref); + + gparray = g_ptr_array_new (); + + g_ptr_array_add (gparray, "dddd"); + g_ptr_array_add (gparray, "cccc"); + g_ptr_array_add (gparray, NULL); + g_ptr_array_add (gparray, "bbbb"); + g_ptr_array_add (gparray, "aaaa"); + + g_ptr_array_sort_values (gparray, (GCompareFunc) g_strcmp0); + + i = 0; + g_assert_cmpstr (g_ptr_array_index (gparray, i++), ==, NULL); + g_assert_cmpstr (g_ptr_array_index (gparray, i++), ==, "aaaa"); + g_assert_cmpstr (g_ptr_array_index (gparray, i++), ==, "bbbb"); + g_assert_cmpstr (g_ptr_array_index (gparray, i++), ==, "cccc"); + g_assert_cmpstr (g_ptr_array_index (gparray, i++), ==, "dddd"); + + g_clear_pointer (&gparray, g_ptr_array_unref); +} + +static gint +sort_filelist_values (gconstpointer a, gconstpointer b) +{ + const FileListEntry *entry1 = a; + const FileListEntry *entry2 = b; + + return g_ascii_strcasecmp (entry1->name, entry2->name); +} + +static void +pointer_array_sort_values_example (void) +{ + GPtrArray *file_list = NULL; + FileListEntry *entry; + + file_list = g_ptr_array_new_with_free_func (file_list_entry_free); + + entry = g_new0 (FileListEntry, 1); + entry->name = g_strdup ("README"); + entry->size = 42; + g_ptr_array_add (file_list, g_steal_pointer (&entry)); + + entry = g_new0 (FileListEntry, 1); + entry->name = g_strdup ("empty"); + entry->size = 0; + g_ptr_array_add (file_list, g_steal_pointer (&entry)); + + entry = g_new0 (FileListEntry, 1); + entry->name = g_strdup ("aardvark"); + entry->size = 23; + g_ptr_array_add (file_list, g_steal_pointer (&entry)); + + g_ptr_array_sort_values (file_list, sort_filelist_values); + + g_assert_cmpuint (file_list->len, ==, 3); + entry = g_ptr_array_index (file_list, 0); + g_assert_cmpstr (entry->name, ==, "aardvark"); + entry = g_ptr_array_index (file_list, 1); + g_assert_cmpstr (entry->name, ==, "empty"); + entry = g_ptr_array_index (file_list, 2); + g_assert_cmpstr (entry->name, ==, "README"); + + g_ptr_array_unref (file_list); +} + +static gint +sort_filelist_how_values (gconstpointer a, gconstpointer b, gpointer user_data) +{ + gint order; + const SortMode sort_mode = GPOINTER_TO_INT (user_data); + const FileListEntry *entry1 = a; + const FileListEntry *entry2 = b; + + switch (sort_mode) + { + case SORT_NAME: + order = g_ascii_strcasecmp (entry1->name, entry2->name); + break; + case SORT_SIZE: + order = entry1->size - entry2->size; + break; + default: + order = 0; + break; + } + return order; +} + +static void +pointer_array_sort_values_with_data_example (void) +{ + GPtrArray *file_list = NULL; + FileListEntry *entry; + SortMode sort_mode; + + file_list = g_ptr_array_new_with_free_func (file_list_entry_free); + + entry = g_new0 (FileListEntry, 1); + entry->name = g_strdup ("README"); + entry->size = 42; + g_ptr_array_add (file_list, g_steal_pointer (&entry)); + + entry = g_new0 (FileListEntry, 1); + entry->name = g_strdup ("empty"); + entry->size = 0; + g_ptr_array_add (file_list, g_steal_pointer (&entry)); + + entry = g_new0 (FileListEntry, 1); + entry->name = g_strdup ("aardvark"); + entry->size = 23; + g_ptr_array_add (file_list, g_steal_pointer (&entry)); + + sort_mode = SORT_NAME; + g_ptr_array_sort_values_with_data (file_list, sort_filelist_how_values, + GINT_TO_POINTER (sort_mode)); + + g_assert_cmpuint (file_list->len, ==, 3); + entry = g_ptr_array_index (file_list, 0); + g_assert_cmpstr (entry->name, ==, "aardvark"); + entry = g_ptr_array_index (file_list, 1); + g_assert_cmpstr (entry->name, ==, "empty"); + entry = g_ptr_array_index (file_list, 2); + g_assert_cmpstr (entry->name, ==, "README"); + + sort_mode = SORT_SIZE; + g_ptr_array_sort_values_with_data (file_list, sort_filelist_how_values, + GINT_TO_POINTER (sort_mode)); + + g_assert_cmpuint (file_list->len, ==, 3); + entry = g_ptr_array_index (file_list, 0); + g_assert_cmpstr (entry->name, ==, "empty"); + entry = g_ptr_array_index (file_list, 1); + g_assert_cmpstr (entry->name, ==, "aardvark"); + entry = g_ptr_array_index (file_list, 2); + g_assert_cmpstr (entry->name, ==, "README"); + + g_ptr_array_unref (file_list); +} + +static void +pointer_array_sort_values_with_data (void) +{ + GPtrArray *gparray; + gint i; + gint prev, cur; + + gparray = g_ptr_array_new (); + + /* Sort empty array */ + g_ptr_array_sort_values_with_data (gparray, ptr_compare_values_data, NULL); + + for (i = 0; i < 10000; i++) + g_ptr_array_add (gparray, GINT_TO_POINTER (g_random_int_range (0, 10000))); + + g_ptr_array_sort_values_with_data (gparray, ptr_compare_values_data, NULL); + + prev = -1; + for (i = 0; i < 10000; i++) + { + cur = GPOINTER_TO_INT (g_ptr_array_index (gparray, i)); + g_assert_cmpint (prev, <=, cur); + prev = cur; + } + + g_ptr_array_free (gparray, TRUE); +} + +static void pointer_array_find_empty (void) { GPtrArray *array; @@ -2158,6 +3190,10 @@ /* array tests */ g_test_add_func ("/array/new/zero-terminated", array_new_zero_terminated); + g_test_add_func ("/array/new/take", array_new_take); + g_test_add_func ("/array/new/take/empty", array_new_take_empty); + g_test_add_func ("/array/new/take/overflow", array_new_take_overflow); + g_test_add_func ("/array/new/take-zero-terminated", array_new_take_zero_terminated); g_test_add_func ("/array/ref-count", array_ref_count); g_test_add_func ("/array/steal", array_steal); g_test_add_func ("/array/clear-func", array_clear_func); @@ -2186,6 +3222,22 @@ g_test_add_func ("/pointerarray/free/null-terminated", pointer_array_free_null_terminated); g_test_add_func ("/pointerarray/add", pointer_array_add); g_test_add_func ("/pointerarray/insert", pointer_array_insert); + g_test_add_func ("/pointerarray/new-take", pointer_array_new_take); + g_test_add_func ("/pointerarray/new-take/empty", pointer_array_new_take_empty); + g_test_add_func ("/pointerarray/new-take/overflow", pointer_array_new_take_overflow); + g_test_add_func ("/pointerarray/new-take/with-free-func", pointer_array_new_take_with_free_func); + g_test_add_func ("/pointerarray/new-take-null-terminated", pointer_array_new_take_null_terminated); + g_test_add_func ("/pointerarray/new-take-null-terminated/empty", pointer_array_new_take_null_terminated_empty); + g_test_add_func ("/pointerarray/new-take-null-terminated/with-free-func", pointer_array_new_take_null_terminated_with_free_func); + g_test_add_func ("/pointerarray/new-take-null-terminated/from-gstrv", pointer_array_new_take_null_terminated_from_gstrv); + g_test_add_func ("/pointerarray/new-from-array", pointer_array_new_from_array); + g_test_add_func ("/pointerarray/new-from-array/empty", pointer_array_new_from_array_empty); + g_test_add_func ("/pointerarray/new-from-array/overflow", pointer_array_new_from_array_overflow); + g_test_add_func ("/pointerarray/new-from-array/with-copy-and-free-func", pointer_array_new_from_array_with_copy_and_free_func); + g_test_add_func ("/pointerarray/new-from-null-terminated-array", pointer_array_new_from_null_terminated_array); + g_test_add_func ("/pointerarray/new-from-null-terminated-array/empty", pointer_array_new_from_null_terminated_array_empty); + g_test_add_func ("/pointerarray/new-from-null-terminated-array/with-copy-and-free-func", pointer_array_new_from_null_terminated_array_with_copy_and_free_func); + g_test_add_func ("/pointerarray/new-from-null-terminated-array/from-gstrv", pointer_array_new_from_null_terminated_array_from_gstrv); g_test_add_data_func ("/pointerarray/ref-count/not-null-terminated", GINT_TO_POINTER (0), pointer_array_ref_count); g_test_add_data_func ("/pointerarray/ref-count/null-terminated", GINT_TO_POINTER (1), pointer_array_ref_count); g_test_add_func ("/pointerarray/free-func", pointer_array_free_func); @@ -2198,6 +3250,10 @@ g_test_add_func ("/pointerarray/sort/example", pointer_array_sort_example); g_test_add_func ("/pointerarray/sort-with-data", pointer_array_sort_with_data); g_test_add_func ("/pointerarray/sort-with-data/example", pointer_array_sort_with_data_example); + g_test_add_func ("/pointerarray/sort-values", pointer_array_sort_values); + g_test_add_func ("/pointerarray/sort-values/example", pointer_array_sort_values_example); + g_test_add_func ("/pointerarray/sort-values-with-data", pointer_array_sort_values_with_data); + g_test_add_func ("/pointerarray/sort-values-with-data/example", pointer_array_sort_values_with_data_example); g_test_add_func ("/pointerarray/find/empty", pointer_array_find_empty); g_test_add_func ("/pointerarray/find/non-empty", pointer_array_find_non_empty); g_test_add_func ("/pointerarray/remove-range", pointer_array_remove_range);
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/tests/assert-msg-test.py -> _service:tar_scm:glib-2.76.4.tar.xz/glib/tests/assert-msg-test.py
Changed
@@ -24,7 +24,6 @@ import os import shutil import subprocess -import sys import tempfile import unittest @@ -103,7 +102,7 @@ if self.__gdb is None: return Result(None, "", "") - argv = "gdb", "--batch" + argv = "gdb", "-n", "--batch" argv.extend(args) print("Running:", argv) @@ -151,15 +150,17 @@ try: tmp.write(GDB_SCRIPT) tmp.close() - result = self.runGdbAssertMessage("-x", tmp.name, self.__assert_msg_test) + result = self.runGdbAssertMessage( + "-x", tmp.name, self.__assert_msg_test + ) finally: os.unlink(tmp.name) # Some CI environments disable ptrace (as they’re running in a # container). If so, skip the test as there’s nothing we can do. - if ( - result.info.returncode != 0 - and "ptrace: Operation not permitted" in result.err + if result.info.returncode != 0 and ( + "ptrace: Operation not permitted" in result.err + or "warning: opening /proc/PID/mem file for lwp" in result.err ): self.skipTest("GDB is not functional due to ptrace being disabled")
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/tests/asyncqueue.c -> _service:tar_scm:glib-2.76.4.tar.xz/glib/tests/asyncqueue.c
Changed
@@ -2,6 +2,8 @@ * Copyright (C) 2011 Red Hat, Inc * Author: Matthias Clasen * + * SPDX-License-Identifier: LicenseRef-old-glib-tests + * * This work is provided "as is"; redistribution and modification * in whole or in part, in any medium, physical or electronic is * permitted without restriction.
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/tests/autoptr.c -> _service:tar_scm:glib-2.76.4.tar.xz/glib/tests/autoptr.c
Changed
@@ -619,6 +619,30 @@ } static void +test_pathbuf (void) +{ +#if defined(G_OS_UNIX) + g_autoptr(GPathBuf) buf1 = g_path_buf_new_from_path ("/bin/sh"); + g_auto(GPathBuf) buf2 = G_PATH_BUF_INIT; + + g_path_buf_push (&buf2, "/bin/sh"); +#elif defined(G_OS_WIN32) + g_autoptr(GPathBuf) buf1 = g_path_buf_new_from_path ("C:\\windows\\system32.dll"); + g_auto(GPathBuf) buf2 = G_PATH_BUF_INIT; + + g_path_buf_push (&buf2, "C:\\windows\\system32.dll"); +#else + g_test_skip ("Unsupported platform"); + return; +#endif + + g_autofree char *path1 = g_path_buf_to_path (buf1); + g_autofree char *path2 = g_path_buf_to_path (&buf2); + + g_assert_cmpstr (path1, ==, path2); +} + +static void mark_freed (gpointer ptr) { gboolean *freed = ptr; @@ -772,6 +796,7 @@ g_test_add_func ("/autoptr/g_variant_type", test_g_variant_type); g_test_add_func ("/autoptr/strv", test_strv); g_test_add_func ("/autoptr/refstring", test_refstring); + g_test_add_func ("/autoptr/pathbuf", test_pathbuf); g_test_add_func ("/autoptr/autolist", test_autolist); g_test_add_func ("/autoptr/autoslist", test_autoslist); g_test_add_func ("/autoptr/autoqueue", test_autoqueue);
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/tests/bookmarkfile.c -> _service:tar_scm:glib-2.76.4.tar.xz/glib/tests/bookmarkfile.c
Changed
@@ -911,7 +911,7 @@ G_GNUC_BEGIN_IGNORE_DEPRECATIONS - now = time (NULL); + now = g_get_real_time () / G_USEC_PER_SEC; file = g_bookmark_file_new (); /* added */ @@ -1245,6 +1245,99 @@ g_assert_true (success == (strstr (filename, "fail") == NULL)); } +static void +test_file_copy (gconstpointer d) +{ + const gchar *filename = d; + GBookmarkFile *bookmark_file; + GBookmarkFile *copy; + gboolean success; + gchar *data; + gchar *copy_data; + gsize length; + gsize copy_length; + GError *error = NULL; + + bookmark_file = g_bookmark_file_new (); + g_assert_nonnull (bookmark_file); + + success = test_load (bookmark_file, filename); + g_assert_true (success == (strstr (filename, "fail") == NULL)); + + copy = g_bookmark_file_copy (bookmark_file); + g_assert_nonnull (copy); + + if (g_str_has_suffix (filename, "fail-08.xbel") || + g_str_has_suffix (filename, "fail-06.xbel") || + g_str_has_suffix (filename, "fail-07.xbel") || + g_str_has_suffix (filename, "fail-09.xbel") || + g_str_has_suffix (filename, "fail-10.xbel") || + g_str_has_suffix (filename, "fail-11.xbel") || + g_str_has_suffix (filename, "fail-39.xbel")) + { + g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_WARNING, + "*no registered applications*skipping*"); + g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_WARNING, + "*no registered applications*skipping*"); + } + + data = g_bookmark_file_to_data (bookmark_file, &length, &error); + g_assert_no_error (error); + + copy_data = g_bookmark_file_to_data (copy, ©_length, &error); + g_assert_no_error (error); + + g_test_assert_expected_messages (); + + g_assert_cmpuint (length, ==, copy_length); + g_assert_cmpstr (data, ==, copy_data); + + if (success) + { + GBookmarkFile *modified_copy; + gchar *modified_data; + gchar *modified_copy_data; + gsize modified_length; + gsize modified_copy_length; + + test_modify (bookmark_file); + test_modify (copy); + + modified_data = g_bookmark_file_to_data (bookmark_file, + &modified_length, + &error); + g_assert_no_error (error); + + modified_copy_data = g_bookmark_file_to_data (copy, + &modified_copy_length, + &error); + g_assert_no_error (error); + + g_assert_cmpstr (data, !=, modified_data); + g_assert_cmpstr (copy_data, !=, modified_copy_data); + + g_free (modified_copy_data); + modified_copy = g_bookmark_file_copy (bookmark_file); + modified_copy_data = g_bookmark_file_to_data (modified_copy, + &modified_copy_length, + &error); + g_assert_no_error (error); + + g_assert_cmpuint (modified_length, ==, modified_copy_length); + g_assert_cmpstr (modified_data, ==, modified_copy_data); + + g_free (modified_data); + g_free (modified_copy_data); + g_bookmark_file_free (modified_copy); + } + + g_bookmark_file_free (bookmark_file); + g_bookmark_file_free (copy); + + g_free (data); + g_free (copy_data); +} + int main (int argc, char *argv) { @@ -1275,12 +1368,17 @@ g_assert_no_error (error); while ((name = g_dir_read_name (dir)) != NULL) { + gchar *filename; if (!g_str_has_suffix (name, ".xbel")) continue; + filename = g_test_build_filename (G_TEST_DIST, "bookmarks", name, NULL); + path = g_strdup_printf ("/bookmarks/parse/%s", name); - g_test_add_data_func_full (path, g_test_build_filename (G_TEST_DIST, "bookmarks", name, NULL), - test_file, g_free); + g_test_add_data_func_full (path, filename, test_file, g_free); + g_free (path); + path = g_strdup_printf ("/bookmarks/copy/%s", name); + g_test_add_data_func_full (path, g_strdup (filename), test_file_copy, g_free); g_free (path); } g_dir_close (dir);
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/tests/cond.c -> _service:tar_scm:glib-2.76.4.tar.xz/glib/tests/cond.c
Changed
@@ -2,6 +2,8 @@ * Copyright (C) 2011 Red Hat, Inc * Author: Matthias Clasen * + * SPDX-License-Identifier: LicenseRef-old-glib-tests + * * This work is provided "as is"; redistribution and modification * in whole or in part, in any medium, physical or electronic is * permitted without restriction.
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/tests/cxx.cpp -> _service:tar_scm:glib-2.76.4.tar.xz/glib/tests/cxx.cpp
Changed
@@ -19,6 +19,120 @@ #include <glib.h> +#if !defined (G_CXX_STD_VERSION) || !defined (G_CXX_STD_CHECK_VERSION) +#error G_CXX_STD_VERSION is not defined +#endif + +#ifdef G_C_STD_VERSION +#error G_C_STD_VERSION should be undefined in C programs +#endif + +G_STATIC_ASSERT (G_CXX_STD_VERSION); +G_STATIC_ASSERT (!G_C_STD_CHECK_VERSION (99)); + +#if G_CXX_STD_VERSION >= 199711L + G_STATIC_ASSERT (G_CXX_STD_CHECK_VERSION (98)); + G_STATIC_ASSERT (G_CXX_STD_CHECK_VERSION (199711L)); + G_STATIC_ASSERT (G_CXX_STD_CHECK_VERSION (03)); +#endif + +#if G_CXX_STD_VERSION == 199711L + G_STATIC_ASSERT (!G_CXX_STD_CHECK_VERSION (11)); + G_STATIC_ASSERT (!G_CXX_STD_CHECK_VERSION (201103L)); + G_STATIC_ASSERT (!G_CXX_STD_CHECK_VERSION (14)); + G_STATIC_ASSERT (!G_CXX_STD_CHECK_VERSION (201402L)); + G_STATIC_ASSERT (!G_CXX_STD_CHECK_VERSION (17)); + G_STATIC_ASSERT (!G_CXX_STD_CHECK_VERSION (201703L)); + G_STATIC_ASSERT (!G_CXX_STD_CHECK_VERSION (20)); + G_STATIC_ASSERT (!G_CXX_STD_CHECK_VERSION (202002L)); +#endif + +#if G_CXX_STD_VERSION >= 201103L + G_STATIC_ASSERT (G_CXX_STD_CHECK_VERSION (98)); + G_STATIC_ASSERT (G_CXX_STD_CHECK_VERSION (199711L)); + G_STATIC_ASSERT (G_CXX_STD_CHECK_VERSION (03)); + G_STATIC_ASSERT (G_CXX_STD_CHECK_VERSION (11)); + G_STATIC_ASSERT (G_CXX_STD_CHECK_VERSION (201103L)); +#endif + +#if G_CXX_STD_VERSION == 201103L + G_STATIC_ASSERT (!G_CXX_STD_CHECK_VERSION (14)); + G_STATIC_ASSERT (!G_CXX_STD_CHECK_VERSION (201402L)); + G_STATIC_ASSERT (!G_CXX_STD_CHECK_VERSION (17)); + G_STATIC_ASSERT (!G_CXX_STD_CHECK_VERSION (201703L)); + G_STATIC_ASSERT (!G_CXX_STD_CHECK_VERSION (20)); + G_STATIC_ASSERT (!G_CXX_STD_CHECK_VERSION (202002L)); +#endif + +#if G_CXX_STD_VERSION >= 201402L + G_STATIC_ASSERT (G_CXX_STD_CHECK_VERSION (14)); + G_STATIC_ASSERT (G_CXX_STD_CHECK_VERSION (201402L)); +#endif + +#if G_CXX_STD_VERSION == 201402L + G_STATIC_ASSERT (!G_CXX_STD_CHECK_VERSION (17)); + G_STATIC_ASSERT (!G_CXX_STD_CHECK_VERSION (201703L)); + G_STATIC_ASSERT (!G_CXX_STD_CHECK_VERSION (20)); + G_STATIC_ASSERT (!G_CXX_STD_CHECK_VERSION (202002L)); +#endif + +#if G_CXX_STD_VERSION >= 201703L + G_STATIC_ASSERT (G_CXX_STD_CHECK_VERSION (17)); + G_STATIC_ASSERT (G_CXX_STD_CHECK_VERSION (201703L)); +#endif + +#if G_CXX_STD_VERSION == 201703L + G_STATIC_ASSERT (!G_CXX_STD_CHECK_VERSION (20)); + G_STATIC_ASSERT (!G_CXX_STD_CHECK_VERSION (202002L)); +#endif + +#if G_CXX_STD_VERSION >= 202002L + G_STATIC_ASSERT (G_CXX_STD_CHECK_VERSION (20)); + G_STATIC_ASSERT (G_CXX_STD_CHECK_VERSION (202002L)); +#endif + +#if G_CXX_STD_VERSION == 202002L + G_STATIC_ASSERT (!G_CXX_STD_CHECK_VERSION (23)); + G_STATIC_ASSERT (!G_CXX_STD_CHECK_VERSION (202300L)); +#endif + +#ifdef _G_EXPECTED_CXX_STANDARD +static void +test_cpp_standard (void) +{ + guint64 std_version = 0; + + if (!g_ascii_string_to_unsigned (_G_EXPECTED_CXX_STANDARD, 10, 0, G_MAXUINT64, + &std_version, NULL)) + { + g_test_skip ("Expected standard value is non-numeric: " + _G_EXPECTED_CXX_STANDARD); + return; + } + +#if !G_GNUC_CHECK_VERSION (11, 0) + if (std_version >= 20) + { + // See: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=93821 + g_test_skip ("Expected standard version is not properly supported by compiler"); + return; + } +#endif + + g_test_message ("Checking if '" G_STRINGIFY (G_CXX_STD_VERSION) "' respects " + "the expected standard version '" _G_EXPECTED_CXX_STANDARD "'"); + g_assert_true (G_CXX_STD_CHECK_VERSION (std_version)); + + if (std_version < 10 || std_version > 90) + std_version = 97; + + if (std_version >= 90) + g_assert_cmpuint (G_CXX_STD_VERSION, >=, (std_version + 1900) * 100); + else + g_assert_cmpuint (G_CXX_STD_VERSION, >=, (std_version + 2000) * 100); +} +#endif + typedef struct { int dummy; @@ -31,24 +145,17 @@ MyObject *obj2 = g_rc_box_acquire (obj); g_assert_true (obj2 == obj); + G_STATIC_ASSERT (sizeof (glib_typeof (*obj)) == sizeof (glib_typeof (*obj2))); + MyObject *obj3 = g_atomic_pointer_get (&obj2); g_assert_true (obj3 == obj); -#if __cplusplus >= 201103L - MyObject *obj4 = nullptr; -#else MyObject *obj4 = NULL; -#endif g_atomic_pointer_set (&obj4, obj3); g_assert_true (obj4 == obj); -#if __cplusplus >= 201103L - MyObject *obj5 = nullptr; - g_atomic_pointer_compare_and_exchange (&obj5, nullptr, obj4); -#else MyObject *obj5 = NULL; g_atomic_pointer_compare_and_exchange (&obj5, NULL, obj4); -#endif g_assert_true (obj5 == obj); MyObject *obj6 = g_steal_pointer (&obj5); @@ -197,6 +304,7 @@ { const char *str_a = "a"; char *str_b = g_strdup ("b"); + char *str_null = g_strdup (NULL); gconstpointer str_a_ptr = str_a, str_b_ptr = str_b; const unsigned char *str_c = (const unsigned char *) "c"; @@ -210,19 +318,232 @@ g_assert_true (g_str_equal (str_a, str_a_ptr)); g_assert_false (g_str_equal (str_a_ptr, str_b_ptr)); g_assert_false (g_str_equal (str_c, str_b)); + g_assert_cmpstr (str_b, !=, str_null); g_free (str_b); } +static void +test_strdup (void) +{ + gchar *str; + + g_assert_null ((g_strdup) (NULL)); + + str = (g_strdup) ("C++ is cool too!"); + g_assert_nonnull (str); + g_assert_cmpstr (str, ==, "C++ is cool too!"); + g_free (str); +} + +static void +test_strdup_macro (void) +{ + gchar *str; + + g_assert_null (g_strdup (NULL)); + + str = g_strdup ("C++ is cool too!"); + g_assert_nonnull (str); + g_assert_cmpstr (str, ==, "C++ is cool too!"); + g_free (str); +} + +static void +test_strdup_macro_qualified (void) +{ + gchar *str; + + g_assert_null (::g_strdup (NULL)); + + str = ::g_strdup ("C++ is cool too!"); + g_assert_nonnull (str); + g_assert_cmpstr (str, ==, "C++ is cool too!"); + g_free (str); +} + +static void +test_strdup_macro_nested_initializer (void) +{ + struct + { + char *p, *q; + } strings = { + g_strdup (NULL), + g_strdup ("C++ is cool too!"), + }; + + g_assert_null (strings.p); + g_assert_nonnull (strings.q); + g_assert_cmpstr (strings.q, ==, "C++ is cool too!"); + g_free (strings.q); +} + +static void +test_str_has_prefix (void) +{ + g_assert_true ((g_str_has_prefix) ("C++ is cool!", "C++")); +} + +static void +test_str_has_prefix_macro (void) +{ + g_assert_true (g_str_has_prefix ("C++ is cool!", "C++")); +} + +static void +test_str_has_suffix (void) +{ + g_assert_true ((g_str_has_suffix) ("C++ is cool!", "cool!")); +} + +static void +test_str_has_suffix_macro (void) +{ + g_assert_true (g_str_has_suffix ("C++ is cool!", "cool!")); +} + +static void +test_string_append (void) +{ + GString *string; + char *tmp; + int i; + + tmp = g_strdup ("more"); + + /* append */ + string = g_string_new ("firsthalf"); + g_string_append (string, "last"); + (g_string_append) (string, "half"); + + g_assert_cmpstr (string->str, ==, "firsthalflasthalf"); + + i = 0; + g_string_append (string, &tmpi++); + (g_string_append) (string, &tmpi++); + g_assert_true (i == 2); + g_assert_cmpstr (string->str, ==, "firsthalflasthalfmoreore"); + + g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL, + "*assertion*string != NULL*failed*"); + g_assert_null (g_string_append (NULL, NULL)); + g_test_assert_expected_messages (); + + g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL, + "*assertion*string != NULL*failed*"); + g_assert_null ((g_string_append) (NULL, NULL)); + g_test_assert_expected_messages (); + + g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL, + "*assertion*val != NULL*failed*"); + g_assert_true (g_string_append (string, NULL) == string); + g_test_assert_expected_messages (); + + g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL, + "*assertion*val != NULL*failed*"); + g_assert_true ((g_string_append) (string, NULL) == string); + g_test_assert_expected_messages (); + + g_string_free (string, TRUE); + + /* append_len */ + string = g_string_new ("firsthalf"); + g_string_append_len (string, "lasthalfjunkjunk", strlen ("last")); + (g_string_append_len) (string, "halfjunkjunk", strlen ("half")); + g_string_append_len (string, "more", -1); + (g_string_append_len) (string, "ore", -1); + + g_assert_true (g_string_append_len (string, NULL, 0) == string); + g_assert_true ((g_string_append_len) (string, NULL, 0) == string); + + g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL, + "*assertion*string != NULL*failed*"); + g_assert_null (g_string_append_len (NULL, NULL, -1)); + g_test_assert_expected_messages (); + + g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL, + "*assertion*string != NULL*failed*"); + g_assert_null ((g_string_append_len) (NULL, NULL, -1)); + g_test_assert_expected_messages (); + + g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL, + "*assertion*val != NULL*failed*"); + g_assert_true (g_string_append_len (string, NULL, -1) == string); + g_test_assert_expected_messages (); + + g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL, + "*assertion*val != NULL*failed*"); + g_assert_true ((g_string_append_len) (string, NULL, -1) == string); + g_test_assert_expected_messages (); + + g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL, + "*assertion*val != NULL*failed*"); + g_assert_true (g_string_append_len (string, NULL, 1) == string); + g_test_assert_expected_messages (); + + g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL, + "*assertion*val != NULL*failed*"); + g_assert_true ((g_string_append_len) (string, NULL, 1) == string); + g_test_assert_expected_messages (); + + g_assert_cmpstr (string->str, ==, "firsthalflasthalfmoreore"); + + char c = 'A'; + g_string_append_c (string, c++); + (g_string_append_c) (string, c++); + g_assert_cmpstr (string->str, ==, "firsthalflasthalfmoreoreAB"); + + i = string->len; + g_string_truncate (string, --i); + (g_string_truncate) (string, --i); + g_assert_cmpstr (string->str, ==, "firsthalflasthalfmoreore"); + + g_string_free (string, TRUE); + g_free (tmp); +} + +static void +test_string_free (void) +{ + GString *str; + gchar *data; + + g_test_message ("Test that g_string_free() macro compiles and doesn’t " + "cause any compiler warnings in C++ mode"); + + /* Test that g_string_free (_, TRUE) does not cause a warning if + * its return value is unused. */ + str = g_string_new ("test"); + g_string_free (str, TRUE); + + /* Test that g_string_free (_, FALSE) does not emit a warning if + * its return value is used. */ + str = g_string_new ("test"); + data = g_string_free (str, FALSE); + g_free (data); + + /* Test that g_string_free () with an expression that is always FALSE + * at runtime, but the compiler can't know it, does not cause any + * warnings if its return value is unused. */ + str = g_string_new ("test"); + data = str->str; + g_string_free (str, g_test_get_path ()0 == 0); + g_free (data); +} + int main (int argc, char *argv) { -#if __cplusplus >= 201103L - g_test_init (&argc, &argv, nullptr); -#else +#if G_CXX_STD_CHECK_VERSION (11) g_test_init (&argc, &argv, NULL); +#else + g_test_init (&argc, &argv, static_cast<void *>(NULL)); #endif +#ifdef _G_EXPECTED_CXX_STANDARD + g_test_add_func ("/C++/check-standard-" _G_EXPECTED_CXX_STANDARD, test_cpp_standard); +#endif g_test_add_func ("/C++/typeof", test_typeof); g_test_add_func ("/C++/atomic-pointer-compare-and-exchange", test_atomic_pointer_compare_and_exchange); g_test_add_func ("/C++/atomic-pointer-compare-and-exchange-full", test_atomic_pointer_compare_and_exchange_full); @@ -234,6 +555,16 @@ g_test_add_func ("/C++/clear-pointer", test_clear_pointer); g_test_add_func ("/C++/steal-pointer", test_steal_pointer); g_test_add_func ("/C++/str-equal", test_str_equal); + g_test_add_func ("/C++/strdup", test_strdup); + g_test_add_func ("/C++/strdup/macro", test_strdup_macro); + g_test_add_func ("/C++/strdup/macro/qualified", test_strdup_macro_qualified); + g_test_add_func ("/C++/strdup/macro/nested-initializer", test_strdup_macro_nested_initializer); + g_test_add_func ("/C++/str-has-prefix", test_str_has_prefix); + g_test_add_func ("/C++/str-has-prefix/macro", test_str_has_prefix_macro); + g_test_add_func ("/C++/str-has-suffix", test_str_has_suffix); + g_test_add_func ("/C++/str-has-suffix/macro", test_str_has_suffix_macro); + g_test_add_func ("/C++/string-append", test_string_append); + g_test_add_func ("/C++/string-free", test_string_free); return g_test_run (); }
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/tests/error.c -> _service:tar_scm:glib-2.76.4.tar.xz/glib/tests/error.c
Changed
@@ -129,17 +129,6 @@ * g_error_new_valist() with a %NULL format will crash on FreeBSD as its * implementation of vasprintf() is less forgiving than Linux’s. That’s * fine: it’s a programmer error in either case. */ - const struct - { - GQuark domain; - const gchar *format; - } - tests = - { - { G_MARKUP_ERROR, NULL }, - { 0, "Message" }, - }; - gsize i; g_test_summary ("Test that g_error_new_valist() rejects invalid input"); @@ -149,12 +138,31 @@ return; } - for (i = 0; i < G_N_ELEMENTS (tests); i++) { - GError *error = NULL, *error_copy = NULL; + GError *error = NULL; va_list ap; - g_test_message ("Test %" G_GSIZE_FORMAT, i); + va_start (ap, dummy); + +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wformat-nonliteral" +#pragma GCC diagnostic ignored "-Wformat-extra-args" + + g_test_expect_message (G_LOG_DOMAIN, + G_LOG_LEVEL_CRITICAL, + "*g_error_new_valist: assertion 'format != NULL' failed*"); + error = g_error_new_valist (G_MARKUP_ERROR, G_MARKUP_ERROR_EMPTY, NULL, ap); + g_test_assert_expected_messages (); + g_assert_null (error); + +#pragma GCC diagnostic pop + + va_end (ap); + } + + { + GError *error = NULL, *error_copy = NULL; + va_list ap; va_start (ap, dummy); @@ -164,7 +172,7 @@ g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_WARNING, "*g_error_new_valist: runtime check failed*"); - error = g_error_new_valist (testsi.domain, G_MARKUP_ERROR_EMPTY, testsi.format, ap); + error = g_error_new_valist (0, G_MARKUP_ERROR_EMPTY, "Message", ap); g_test_assert_expected_messages (); g_assert_nonnull (error);
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/tests/fileutils.c -> _service:tar_scm:glib-2.76.4.tar.xz/glib/tests/fileutils.c
Changed
@@ -1,6 +1,8 @@ /* Unit tests for gfileutils * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald * + * SPDX-License-Identifier: LicenseRef-old-glib-tests + * * This work is provided "as is"; redistribution and modification * in whole or in part, in any medium, physical or electronic is * permitted without restriction. @@ -33,6 +35,7 @@ /* Test our stdio wrappers here; this disables redefining (e.g.) g_open() to open() */ #define G_STDIO_WRAP_ON_UNIX #include <glib/gstdio.h> +#include "glib-private.h" #ifdef G_OS_UNIX #include <unistd.h> @@ -751,8 +754,8 @@ #ifndef G_OS_WIN32 g_assert_cmpint (g_mkdir_with_parents ("/usr/b/c", 0), ==, -1); - /* EPERM may be returned if the filesystem as a whole is read-only */ - if (errno != EPERM) + /* EPERM or EROFS may be returned if the filesystem as a whole is read-only */ + if (errno != EPERM && errno != EROFS) g_assert_cmpint (errno, ==, EACCES); #endif @@ -1202,6 +1205,7 @@ name = g_dir_make_tmp ("testXXXXXXtest", &error); g_assert_no_error (error); g_assert_true (g_file_test (name, G_FILE_TEST_IS_DIR)); + g_assert_true (g_str_has_prefix (name, g_getenv ("G_TEST_TMPDIR"))); ret = g_rmdir (name); g_assert_cmpint (ret, ==, 0); g_free (name); @@ -1209,6 +1213,7 @@ name = g_dir_make_tmp (NULL, &error); g_assert_no_error (error); g_assert_true (g_file_test (name, G_FILE_TEST_IS_DIR)); + g_assert_true (g_str_has_prefix (name, g_getenv ("G_TEST_TMPDIR"))); ret = g_rmdir (name); g_assert_cmpint (ret, ==, 0); g_free (name); @@ -1235,6 +1240,7 @@ g_assert_cmpint (fd, !=, -1); g_assert_no_error (error); g_assert_nonnull (name); + g_assert_true (g_str_has_prefix (name, g_getenv ("G_TEST_TMPDIR"))); unlink (name); g_free (name); close (fd); @@ -1243,6 +1249,7 @@ g_assert_cmpint (fd, !=, -1); g_assert_no_error (error); g_assert_nonnull (name); + g_assert_true (g_str_has_prefix (name, g_getenv ("G_TEST_TMPDIR"))); g_unlink (name); g_free (name); close (fd); @@ -2453,6 +2460,168 @@ #endif +static void +assert_fd_was_closed (int fd) +{ + /* We can't tell a fd was really closed without behaving as though it + * was still valid */ + if (g_test_undefined ()) + { + int result, errsv; + GWin32InvalidParameterHandler handler; + + GLIB_PRIVATE_CALL (g_win32_push_empty_invalid_parameter_handler) (&handler); + result = g_fsync (fd); + errsv = errno; + GLIB_PRIVATE_CALL (g_win32_pop_invalid_parameter_handler) (&handler); + + g_assert_cmpint (result, !=, 0); + g_assert_cmpint (errsv, ==, EBADF); + } +} + +static void +test_clear_fd_ebadf (void) +{ + char *name = NULL; + GError *error = NULL; + int fd; + int copy_of_fd; + int errsv; + gboolean ret; + GWin32InvalidParameterHandler handler; + + /* We're going to trigger a programming error: attmpting to close a + * fd that was already closed. Make criticals non-fatal. */ + g_assert_true (g_test_undefined ()); + g_log_set_always_fatal (G_LOG_FATAL_MASK); + g_log_set_fatal_mask ("GLib", G_LOG_FATAL_MASK); + GLIB_PRIVATE_CALL (g_win32_push_empty_invalid_parameter_handler) (&handler); + + fd = g_file_open_tmp (NULL, &name, &error); + g_assert_cmpint (fd, !=, -1); + g_assert_no_error (error); + g_assert_nonnull (name); + ret = g_close (fd, &error); + g_assert_no_error (error); + assert_fd_was_closed (fd); + g_assert_true (ret); + g_unlink (name); + g_free (name); + + /* Try to close it again with g_close() */ + ret = g_close (fd, NULL); + errsv = errno; + g_assert_cmpint (errsv, ==, EBADF); + assert_fd_was_closed (fd); + g_assert_false (ret); + + /* Try to close it again with g_clear_fd() */ + copy_of_fd = fd; + errno = EILSEQ; + ret = g_clear_fd (©_of_fd, NULL); + errsv = errno; + g_assert_cmpint (errsv, ==, EBADF); + assert_fd_was_closed (fd); + g_assert_false (ret); + +#ifdef g_autofree + { + g_autofd int close_me = fd; + + /* This avoids clang warnings about the variables being unused */ + g_test_message ("Invalid fd will be closed by autocleanup: %d", + close_me); + errno = EILSEQ; + } + + errsv = errno; + g_assert_cmpint (errsv, ==, EILSEQ); +#endif + + GLIB_PRIVATE_CALL (g_win32_pop_invalid_parameter_handler) (&handler); +} + +static void +test_clear_fd (void) +{ + char *name = NULL; + GError *error = NULL; + int fd; + int copy_of_fd; + int errsv; + +#ifdef g_autofree + g_test_summary ("Test g_clear_fd() and g_autofd"); +#else + g_test_summary ("Test g_clear_fd() (g_autofd unsupported by this compiler)"); +#endif + + /* g_clear_fd() normalizes any negative number to -1 */ + fd = -23; + g_clear_fd (&fd, &error); + g_assert_cmpint (fd, ==, -1); + g_assert_no_error (error); + + /* Nothing special about g_file_open_tmp, it's just a convenient way + * to get an open fd */ + fd = g_file_open_tmp (NULL, &name, &error); + g_assert_cmpint (fd, !=, -1); + g_assert_no_error (error); + g_assert_nonnull (name); + copy_of_fd = fd; + g_clear_fd (&fd, &error); + g_assert_cmpint (fd, ==, -1); + g_assert_no_error (error); + assert_fd_was_closed (copy_of_fd); + g_unlink (name); + g_free (name); + + /* g_clear_fd() is idempotent */ + g_clear_fd (&fd, &error); + g_assert_cmpint (fd, ==, -1); + g_assert_no_error (error); + +#ifdef g_autofree + fd = g_file_open_tmp (NULL, &name, &error); + g_assert_cmpint (fd, !=, -1); + g_assert_no_error (error); + g_assert_nonnull (name); + + { + g_autofd int close_me = fd; + g_autofd int was_never_set = -42; + + /* This avoids clang warnings about the variables being unused */ + g_test_message ("Will be closed by autocleanup: %d, %d", + close_me, was_never_set); + /* This is one of the few errno values guaranteed by Standard C. + * We set it here to check that a successful g_autofd close doesn't + * alter errno. */ + errno = EILSEQ; + } + + errsv = errno; + g_assert_cmpint (errsv, ==, EILSEQ); + assert_fd_was_closed (fd); + g_unlink (name); + g_free (name); +#endif + + if (g_test_undefined ()) + { + g_test_message ("Testing error handling"); + g_test_trap_subprocess ("/fileutils/clear-fd/subprocess/ebadf", + 0, G_TEST_SUBPROCESS_DEFAULT); +#ifdef g_autofree + g_test_trap_assert_stderr ("*failed with EBADF*failed with EBADF*failed with EBADF*"); +#else + g_test_trap_assert_stderr ("*failed with EBADF*failed with EBADF*"); +#endif + g_test_trap_assert_passed (); + } +} + int main (int argc, char *argv) @@ -2489,6 +2658,8 @@ g_test_add_func ("/fileutils/read-link", test_read_link); g_test_add_func ("/fileutils/stdio-wrappers", test_stdio_wrappers); g_test_add_func ("/fileutils/fopen-modes", test_fopen_modes); + g_test_add_func ("/fileutils/clear-fd", test_clear_fd); + g_test_add_func ("/fileutils/clear-fd/subprocess/ebadf", test_clear_fd_ebadf); return g_test_run (); }
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/tests/gdatetime.c -> _service:tar_scm:glib-2.76.4.tar.xz/glib/tests/gdatetime.c
Changed
@@ -403,7 +403,7 @@ dt = g_date_time_new_from_timeval_local (&tv); if (g_test_verbose ()) - g_printerr ("\nDT%04d-%02d-%02dT%02d:%02d:%02d%s\n", + g_test_message ("DT%04d-%02d-%02dT%02d:%02d:%02d%s", g_date_time_get_year (dt), g_date_time_get_month (dt), g_date_time_get_day_of_month (dt), @@ -501,7 +501,7 @@ dt = g_date_time_new_from_timeval_utc (&tv); if (g_test_verbose ()) - g_printerr ("\nDT%04d-%02d-%02dT%02d:%02d:%02d%s\n", + g_test_message ("DT%04d-%02d-%02dT%02d:%02d:%02d%s", g_date_time_get_year (dt), g_date_time_get_month (dt), g_date_time_get_day_of_month (dt), @@ -2097,7 +2097,7 @@ dt = g_date_time_new (timezone, year, month, day, 0, 0, 0); #if 0 - g_printerr ("%04d-%02d-%02d = %04d-W%02d-%d = %04d-%03d\n", + g_test_message ("%04d-%02d-%02d = %04d-W%02d-%d = %04d-%03d", year, month, day, week_year, week_num, weekday, year, day_of_year); @@ -2384,7 +2384,7 @@ setlocale (category, name); if (strstr (setlocale (category, NULL), name) == NULL) { - g_print ("Unavailable '%s' locale\n", name); + g_test_message ("Unavailable '%s' locale", name); g_test_skip ("required locale not available, skipping tests"); return FALSE; }
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/tests/gpoll.c -> _service:tar_scm:glib-2.76.4.tar.xz/glib/tests/gpoll.c
Changed
@@ -204,11 +204,11 @@ for (i = 0; i < count; i++) if (i < count - 1) - g_print ("%-4lld-%4lld|", i == 0 ? 0 : bucket_limitsi - 1, bucket_limitsi - 1); + g_printerr ("%-4lld-%4lld|", i == 0 ? 0 : bucket_limitsi - 1, bucket_limitsi - 1); else - g_print (" >= %-4lld|", bucket_limitsi - 1); + g_printerr (" >= %-4lld|", bucket_limitsi - 1); - g_print ("\n"); + g_printerr ("\n"); for (i = 0; i < count; i++) { @@ -225,17 +225,17 @@ len = 4; padding = 9 - len; for (j = 0; j < padding / 2; j++) - g_print (" "); + g_printerr (" "); if (bucketsi != 0) - g_print ("%*d", len, bucketsi); + g_printerr ("%*d", len, bucketsi); else - g_print (" "); + g_printerr (" "); for (j = padding / 2; j < padding; j++) - g_print (" "); - g_print (" "); + g_printerr (" "); + g_printerr (" "); } - g_print ("\n\n"); + g_printerr ("\n\n"); } static void @@ -281,7 +281,7 @@ } times_avg /= NUM_POLLEES; - g_print ("\nempty poll time:\n%4lldns - %4lldns, average %4lldns\n", times_min, times_max, times_avg); + g_printerr ("\nempty poll time:\n%4lldns - %4lldns, average %4lldns\n", times_min, times_max, times_avg); print_buckets (buckets, bucket_limits, BUCKET_COUNT); times_avg = 0; @@ -336,7 +336,7 @@ } times_avg /= NUM_POLLEES; - g_print ("1-socket + msg poll time:\n%4lldns - %4lldns, average %4lldns\n", times_min, times_max, times_avg); + g_printerr ("1-socket + msg poll time:\n%4lldns - %4lldns, average %4lldns\n", times_min, times_max, times_avg); print_buckets (buckets, bucket_limits, BUCKET_COUNT); times_avg = 0; @@ -384,7 +384,7 @@ } times_avg /= NUM_POLLEES; - g_print ("1-socket poll time:\n%4lldns - %4lldns, average %4lldns\n", times_min, times_max, times_avg); + g_printerr ("1-socket poll time:\n%4lldns - %4lldns, average %4lldns\n", times_min, times_max, times_avg); print_buckets (buckets, bucket_limits, BUCKET_COUNT); times_avg = 0; @@ -433,7 +433,7 @@ } times_avg /= NUM_POLLEES; - g_print ("half-socket poll time:\n%4lldns - %4lldns, average %4lldns\n", times_min, times_max, times_avg); + g_printerr ("half-socket poll time:\n%4lldns - %4lldns, average %4lldns\n", times_min, times_max, times_avg); print_buckets (buckets, bucket_limits, BUCKET_COUNT); times_avg = 0; @@ -491,7 +491,7 @@ } times_avg /= NUM_POLLEES; - g_print ("half-socket + msg poll time:\n%4lldns - %4lldns, average %4lldns\n", times_min, times_max, times_avg); + g_printerr ("half-socket + msg poll time:\n%4lldns - %4lldns, average %4lldns\n", times_min, times_max, times_avg); print_buckets (buckets, bucket_limits, BUCKET_COUNT); times_avg = 0; @@ -540,7 +540,7 @@ } times_avg /= NUM_POLLEES; - g_print ("%d-socket poll time: \n%4lldns - %4lldns, average %4lldns\n", NUM_POLLEES, times_min, times_max, times_avg); + g_printerr ("%d-socket poll time: \n%4lldns - %4lldns, average %4lldns\n", NUM_POLLEES, times_min, times_max, times_avg); print_buckets (buckets, bucket_limits, BUCKET_COUNT); activatable = 0; @@ -599,7 +599,7 @@ } times_avg /= NUM_POLLEES; - g_print ("variable socket number + msg poll time: \n%4lldns - %4lldns, average %4lldns\n", times_min, times_max, times_avg); + g_printerr ("variable socket number + msg poll time: \n%4lldns - %4lldns, average %4lldns\n", times_min, times_max, times_avg); print_buckets (buckets, bucket_limits, BUCKET_COUNT); cleanup_sockets (sockets, opp_sockets, NUM_POLLEES);
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/tests/gvariant.c -> _service:tar_scm:glib-2.76.4.tar.xz/glib/tests/gvariant.c
Changed
@@ -1340,7 +1340,9 @@ gpointer mem; #ifdef HAVE_POSIX_MEMALIGN - if (posix_memalign (&mem, 8, size)) + /* posix_memalign() requires the alignment to be a multiple of + * sizeof(void*), and a power of 2. */ + if (posix_memalign (&mem, MAX (sizeof (void *), 8), size)) g_error ("posix_memalign failed"); #else /* NOTE: there may be platforms that lack posix_memalign() and also @@ -4301,6 +4303,7 @@ g_assert_null (value); g_error_free (local_error); g_free (silly_array); + g_free (silly_type); } static void @@ -5040,10 +5043,21 @@ GVariantIter iter; gchar *key; GVariant *value; + const gchar *str_value; + + g_assert_true (g_variant_dict_lookup (&dict, "foo", "&s", &str_value, NULL)); + g_assert_cmpstr (str_value, ==, "FOO"); + g_assert_true (g_variant_dict_lookup (&dict, "bar", "&s", &str_value, NULL)); + g_assert_cmpstr (str_value, ==, "BAR"); g_variant_dict_insert_value (&dict, "baz", g_variant_new_string ("BAZ")); g_variant_dict_insert_value (&dict, "quux", g_variant_new_string ("QUUX")); + g_assert_true (g_variant_dict_lookup (&dict, "baz", "&s", &str_value, NULL)); + g_assert_cmpstr (str_value, ==, "BAZ"); + g_assert_true (g_variant_dict_lookup (&dict, "quux", "&s", &str_value, NULL)); + g_assert_cmpstr (str_value, ==, "QUUX"); + variant = g_variant_ref_sink (g_variant_dict_end (&dict)); g_assert_nonnull (variant); g_assert_true (g_variant_type_equal (g_variant_get_type (variant),
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/tests/gwakeuptest.c -> _service:tar_scm:glib-2.76.4.tar.xz/glib/tests/gwakeuptest.c
Changed
@@ -1,12 +1,5 @@ #include <glib.h> #include <glib/gwakeup.h> -#ifdef G_OS_UNIX -#include <unistd.h> -#endif - -#ifdef _WIN32 -static void alarm (int sec) { } -#endif static gboolean check_signaled (GWakeup *wakeup) @@ -32,9 +25,6 @@ GWakeup *wakeup; gint i; - /* prevent the test from deadlocking */ - alarm (60); - wakeup = g_wakeup_new (); g_assert (!check_signaled (wakeup)); @@ -66,9 +56,6 @@ g_assert (!check_signaled (wakeup)); g_wakeup_free (wakeup); - - /* cancel the alarm */ - alarm (0); } struct token @@ -213,9 +200,6 @@ { gint i; - /* make sure we don't block forever */ - alarm (60); - /* simple mainloop test based on GWakeup. * * create a bunch of contexts and a thread to 'run' each one. create @@ -252,9 +236,6 @@ } g_wakeup_free (last_token_wakeup); - - /* cancel alarm */ - alarm (0); } int
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/tests/hash.c -> _service:tar_scm:glib-2.76.4.tar.xz/glib/tests/hash.c
Changed
@@ -460,6 +460,19 @@ } static void +int64_hash_collision_test (void) +{ + gint64 m; + gint64 n; + + g_test_summary ("Check int64 Hash collisions caused by ignoring high word"); + + m = 722; + n = ((gint64) 2003 << 32) + 722; + g_assert_cmpuint (g_int64_hash (&m), !=, g_int64_hash (&n)); +} + +static void double_hash_test (void) { gint i, rc; @@ -489,6 +502,27 @@ } static void +double_hash_collision_test (void) +{ + gdouble m; + gdouble n; + + g_test_summary ("Check double Hash collisions caused by int conversion " \ + "and by numbers larger than 2^64-1 (G_MAXUINT64)"); + g_test_bug ("https://gitlab.gnome.org/GNOME/glib/-/issues/2771"); + + /* Equal when directly converted to integers */ + m = 0.1; + n = 0.2; + g_assert_cmpuint (g_double_hash (&m), !=, g_double_hash (&n)); + + /* Numbers larger than 2^64-1 (G_MAXUINT64) */ + m = 1e100; + n = 1e200; + g_assert_cmpuint (g_double_hash (&m), !=, g_double_hash (&n)); +} + +static void string_free (gpointer data) { GString *s = data; @@ -1658,6 +1692,163 @@ g_strfreev (strv); } +static void +test_set_get_keys_as_ptr_array (void) +{ + GHashTable *set; + GPtrArray *array; + + set = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL); + g_hash_table_add (set, g_strdup ("xyz")); + g_hash_table_add (set, g_strdup ("xyz")); + g_hash_table_add (set, g_strdup ("abc")); + + array = g_hash_table_get_keys_as_ptr_array (set); + g_hash_table_steal_all (set); + g_hash_table_unref (set); + g_ptr_array_set_free_func (array, g_free); + + g_assert_cmpint (array->len, ==, 2); + g_ptr_array_add (array, NULL); + + g_assert_true ( + g_strv_equal ((const gchar * const) { "xyz", "abc", NULL }, + (const gchar * const*) array->pdata) || + g_strv_equal ((const gchar * const) { "abc", "xyz", NULL }, + (const gchar * const*) array->pdata) + ); + + g_clear_pointer (&array, g_ptr_array_unref); +} + +static void +test_set_get_values_as_ptr_array (void) +{ + GHashTable *table; + GPtrArray *array; + + table = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL); + g_hash_table_insert (table, g_strdup ("xyz"), GUINT_TO_POINTER (0)); + g_hash_table_insert (table, g_strdup ("xyz"), GUINT_TO_POINTER (1)); + g_hash_table_insert (table, g_strdup ("abc"), GUINT_TO_POINTER (2)); + + array = g_hash_table_get_values_as_ptr_array (table); + g_clear_pointer (&table, g_hash_table_unref); + + g_assert_cmpint (array->len, ==, 2); + g_assert_true (g_ptr_array_find (array, GUINT_TO_POINTER (1), NULL)); + g_assert_true (g_ptr_array_find (array, GUINT_TO_POINTER (2), NULL)); + + g_assert_true ( + memcmp ((gpointer ) { GUINT_TO_POINTER (1), GUINT_TO_POINTER (2) }, + array->pdata, array->len * sizeof (gpointer)) == 0 || + memcmp ((gpointer ) { GUINT_TO_POINTER (2), GUINT_TO_POINTER (1) }, + array->pdata, array->len * sizeof (gpointer)) == 0 + ); + + g_clear_pointer (&array, g_ptr_array_unref); +} + +static void +test_steal_all_keys (void) +{ + GHashTable *table; + GPtrArray *array; + + table = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL); + g_hash_table_insert (table, g_strdup ("xyz"), GUINT_TO_POINTER (0)); + g_hash_table_insert (table, g_strdup ("xyz"), GUINT_TO_POINTER (1)); + g_hash_table_insert (table, g_strdup ("abc"), GUINT_TO_POINTER (2)); + + array = g_hash_table_steal_all_keys (table); + g_assert_cmpuint (g_hash_table_size (table), ==, 0); + + g_hash_table_insert (table, g_strdup ("do-not-leak-me"), GUINT_TO_POINTER (5)); + g_clear_pointer (&table, g_hash_table_unref); + + g_assert_cmpint (array->len, ==, 2); + g_ptr_array_add (array, NULL); + + g_assert_true ( + g_strv_equal ((const gchar * const) { "xyz", "abc", NULL }, + (const gchar * const*) array->pdata) || + g_strv_equal ((const gchar * const) { "abc", "xyz", NULL }, + (const gchar * const*) array->pdata) + ); + + g_clear_pointer (&array, g_ptr_array_unref); + + table = g_hash_table_new_full (g_direct_hash, g_direct_equal, NULL, g_free); + g_hash_table_insert (table, GUINT_TO_POINTER (0), g_strdup ("xyz")); + g_hash_table_insert (table, GUINT_TO_POINTER (1), g_strdup ("xyz")); + g_hash_table_insert (table, GUINT_TO_POINTER (2), g_strdup ("abc")); + + array = g_hash_table_steal_all_keys (table); + g_assert_cmpuint (g_hash_table_size (table), ==, 0); + + g_hash_table_insert (table, GUINT_TO_POINTER (5), g_strdup ("do-not-leak-me")); + g_clear_pointer (&table, g_hash_table_unref); + + g_assert_cmpint (array->len, ==, 3); + g_assert_true (g_ptr_array_find (array, GUINT_TO_POINTER (0), NULL)); + g_assert_true (g_ptr_array_find (array, GUINT_TO_POINTER (1), NULL)); + g_assert_true (g_ptr_array_find (array, GUINT_TO_POINTER (2), NULL)); + + g_clear_pointer (&array, g_ptr_array_unref); +} + +static void +test_steal_all_values (void) +{ + GHashTable *table; + GPtrArray *array; + + table = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL); + g_hash_table_insert (table, g_strdup ("xyz"), GUINT_TO_POINTER (0)); + g_hash_table_insert (table, g_strdup ("xyz"), GUINT_TO_POINTER (1)); + g_hash_table_insert (table, g_strdup ("abc"), GUINT_TO_POINTER (2)); + + array = g_hash_table_steal_all_values (table); + g_assert_cmpuint (g_hash_table_size (table), ==, 0); + + g_hash_table_insert (table, g_strdup ("do-not-leak-me"), GUINT_TO_POINTER (5)); + g_clear_pointer (&table, g_hash_table_unref); + + g_assert_cmpint (array->len, ==, 2); + g_assert_true (g_ptr_array_find (array, GUINT_TO_POINTER (1), NULL)); + g_assert_true (g_ptr_array_find (array, GUINT_TO_POINTER (2), NULL)); + + g_assert_true ( + memcmp ((gpointer ) { GUINT_TO_POINTER (1), GUINT_TO_POINTER (2) }, + array->pdata, array->len * sizeof (gpointer)) == 0 || + memcmp ((gpointer ) { GUINT_TO_POINTER (2), GUINT_TO_POINTER (1) }, + array->pdata, array->len * sizeof (gpointer)) == 0 + ); + + g_clear_pointer (&array, g_ptr_array_unref); + + table = g_hash_table_new_full (g_direct_hash, g_direct_equal, NULL, g_free); + g_hash_table_insert (table, GUINT_TO_POINTER (0), g_strdup ("xyz")); + g_hash_table_insert (table, GUINT_TO_POINTER (1), g_strdup ("foo")); + g_hash_table_insert (table, GUINT_TO_POINTER (2), g_strdup ("abc")); + + array = g_hash_table_steal_all_values (table); + g_assert_cmpuint (g_hash_table_size (table), ==, 0); + + g_hash_table_insert (table, GUINT_TO_POINTER (5), g_strdup ("do-not-leak-me")); + g_clear_pointer (&table, g_hash_table_unref); + + g_assert_cmpint (array->len, ==, 3); + g_assert_true ( + g_ptr_array_find_with_equal_func (array, "xyz", g_str_equal, NULL)); + g_assert_true ( + g_ptr_array_find_with_equal_func (array, "foo", g_str_equal, NULL)); + g_assert_true ( + g_ptr_array_find_with_equal_func (array, "abc", g_str_equal, NULL)); + + g_clear_pointer (&array, g_ptr_array_unref); +} + static gboolean is_prime (guint p) { @@ -1715,7 +1906,9 @@ g_test_add_func ("/hash/direct2", direct_hash_test2); g_test_add_func ("/hash/int", int_hash_test); g_test_add_func ("/hash/int64", int64_hash_test); + g_test_add_func ("/hash/int64/collisions", int64_hash_collision_test); g_test_add_func ("/hash/double", double_hash_test); + g_test_add_func ("/hash/double/collisions", double_hash_collision_test); g_test_add_func ("/hash/string", string_hash_test); g_test_add_func ("/hash/set", set_hash_test); g_test_add_func ("/hash/set-ref", set_ref_hash_test); @@ -1728,6 +1921,8 @@ g_test_add_func ("/hash/foreach-steal", test_foreach_steal); g_test_add_func ("/hash/steal-extended", test_steal_extended); g_test_add_func ("/hash/steal-extended/optional", test_steal_extended_optional); + g_test_add_func ("/hash/steal-all-keys", test_steal_all_keys); + g_test_add_func ("/hash/steal-all-values", test_steal_all_values); g_test_add_func ("/hash/lookup-extended", test_lookup_extended); g_test_add_func ("/hash/new-similar", test_new_similar); @@ -1738,6 +1933,8 @@ g_test_add_func ("/hash/iter-replace", test_iter_replace); g_test_add_func ("/hash/set-insert-corruption", test_set_insert_corruption); g_test_add_func ("/hash/set-to-strv", test_set_to_strv); + g_test_add_func ("/hash/get-keys-as-ptr-array", test_set_get_keys_as_ptr_array); + g_test_add_func ("/hash/get-values-as-ptr-array", test_set_get_values_as_ptr_array); g_test_add_func ("/hash/primes", test_primes); return g_test_run ();
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/tests/hook.c -> _service:tar_scm:glib-2.76.4.tar.xz/glib/tests/hook.c
Changed
@@ -1,6 +1,8 @@ /* Unit tests for hook lists * Copyright (C) 2011 Red Hat, Inc. * + * SPDX-License-Identifier: LicenseRef-old-glib-tests + * * This work is provided "as is"; redistribution and modification * in whole or in part, in any medium, physical or electronic is * permitted without restriction.
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/tests/logging.c -> _service:tar_scm:glib-2.76.4.tar.xz/glib/tests/logging.c
Changed
@@ -3,6 +3,12 @@ #define G_LOG_USE_STRUCTURED 1 #include <glib.h> +#ifdef G_OS_WIN32 +#define LINE_END "\r\n" +#else +#define LINE_END "\n" +#endif + /* Test g_warn macros */ static void test_warnings (void) @@ -61,16 +67,45 @@ } static void +test_default_handler_error_stderr (void) +{ + g_log_writer_default_set_use_stderr (FALSE); + g_log_set_default_handler (g_log_default_handler, NULL); + g_error ("message1"); + exit (0); +} + +static void +test_default_handler_critical_stderr (void) +{ + g_log_writer_default_set_use_stderr (TRUE); + g_log_set_default_handler (g_log_default_handler, NULL); + g_critical ("message2"); + exit (0); +} + +static void test_default_handler_critical (void) { + g_log_writer_default_set_use_stderr (FALSE); g_log_set_default_handler (g_log_default_handler, NULL); g_critical ("message2"); exit (0); } static void +test_default_handler_warning_stderr (void) +{ + g_log_writer_default_set_use_stderr (TRUE); + g_log_set_default_handler (g_log_default_handler, NULL); + g_warning ("message3"); + exit (0); +} + +static void test_default_handler_warning (void) { + g_log_writer_default_set_use_stderr (FALSE); g_log_set_default_handler (g_log_default_handler, NULL); g_warning ("message3"); exit (0); @@ -79,6 +114,16 @@ static void test_default_handler_message (void) { + g_log_writer_default_set_use_stderr (FALSE); + g_log_set_default_handler (g_log_default_handler, NULL); + g_message ("message4"); + exit (0); +} + +static void +test_default_handler_message_stderr (void) +{ + g_log_writer_default_set_use_stderr (TRUE); g_log_set_default_handler (g_log_default_handler, NULL); g_message ("message4"); exit (0); @@ -87,6 +132,16 @@ static void test_default_handler_info (void) { + g_log_writer_default_set_use_stderr (FALSE); + g_log_set_default_handler (g_log_default_handler, NULL); + g_log (G_LOG_DOMAIN, G_LOG_LEVEL_INFO, "message5"); + exit (0); +} + +static void +test_default_handler_info_stderr (void) +{ + g_log_writer_default_set_use_stderr (TRUE); g_log_set_default_handler (g_log_default_handler, NULL); g_log (G_LOG_DOMAIN, G_LOG_LEVEL_INFO, "message5"); exit (0); @@ -95,6 +150,7 @@ static void test_default_handler_bar_info (void) { + g_log_writer_default_set_use_stderr (FALSE); g_log_set_default_handler (g_log_default_handler, NULL); g_setenv ("G_MESSAGES_DEBUG", "foo bar baz", TRUE); @@ -106,6 +162,7 @@ static void test_default_handler_baz_debug (void) { + g_log_writer_default_set_use_stderr (FALSE); g_log_set_default_handler (g_log_default_handler, NULL); g_setenv ("G_MESSAGES_DEBUG", "foo bar baz", TRUE); @@ -117,6 +174,7 @@ static void test_default_handler_debug (void) { + g_log_writer_default_set_use_stderr (FALSE); g_log_set_default_handler (g_log_default_handler, NULL); g_setenv ("G_MESSAGES_DEBUG", "all", TRUE); @@ -192,6 +250,7 @@ static void test_default_handler_0x400 (void) { + g_log_writer_default_set_use_stderr (FALSE); g_log_set_default_handler (g_log_default_handler, NULL); g_log (G_LOG_DOMAIN, 1<<10, "message7"); exit (0); @@ -205,26 +264,51 @@ g_test_trap_assert_failed (); g_test_trap_assert_stderr ("*ERROR*message1*"); + g_test_trap_subprocess ("/logging/default-handler/subprocess/error-stderr", 0, + G_TEST_SUBPROCESS_DEFAULT); + g_test_trap_assert_failed (); + g_test_trap_assert_stderr ("*ERROR*message1*"); + g_test_trap_subprocess ("/logging/default-handler/subprocess/critical", 0, G_TEST_SUBPROCESS_DEFAULT); g_test_trap_assert_failed (); g_test_trap_assert_stderr ("*CRITICAL*message2*"); + g_test_trap_subprocess ("/logging/default-handler/subprocess/critical-stderr", 0, + G_TEST_SUBPROCESS_DEFAULT); + g_test_trap_assert_failed (); + g_test_trap_assert_stderr ("*CRITICAL*message2*"); + g_test_trap_subprocess ("/logging/default-handler/subprocess/warning", 0, G_TEST_SUBPROCESS_DEFAULT); g_test_trap_assert_failed (); g_test_trap_assert_stderr ("*WARNING*message3*"); + g_test_trap_subprocess ("/logging/default-handler/subprocess/warning-stderr", 0, + G_TEST_SUBPROCESS_DEFAULT); + g_test_trap_assert_failed (); + g_test_trap_assert_stderr ("*WARNING*message3*"); + g_test_trap_subprocess ("/logging/default-handler/subprocess/message", 0, G_TEST_SUBPROCESS_DEFAULT); g_test_trap_assert_passed (); g_test_trap_assert_stderr ("*Message*message4*"); + g_test_trap_subprocess ("/logging/default-handler/subprocess/message-stderr", 0, + G_TEST_SUBPROCESS_DEFAULT); + g_test_trap_assert_passed (); + g_test_trap_assert_stderr ("*Message*message4*"); + g_test_trap_subprocess ("/logging/default-handler/subprocess/info", 0, G_TEST_SUBPROCESS_DEFAULT); g_test_trap_assert_passed (); g_test_trap_assert_stdout_unmatched ("*INFO*message5*"); + g_test_trap_subprocess ("/logging/default-handler/subprocess/info-stderr", 0, + G_TEST_SUBPROCESS_DEFAULT); + g_test_trap_assert_passed (); + g_test_trap_assert_stderr_unmatched ("*INFO*message5*"); + g_test_trap_subprocess ("/logging/default-handler/subprocess/bar-info", 0, G_TEST_SUBPROCESS_DEFAULT); g_test_trap_assert_passed (); @@ -284,13 +368,27 @@ GPrintFunc old_print_handler; old_print_handler = g_set_print_handler (my_print_handler); - g_assert (old_print_handler == NULL); + g_assert_nonnull (old_print_handler); my_print_count = 0; g_print ("bu ba"); g_assert_cmpint (my_print_count, ==, 1); - g_set_print_handler (NULL); + if (g_test_subprocess ()) + { + g_set_print_handler (NULL); + old_print_handler ("default handler\n"); + g_print ("bu ba\n"); + return; + } + + g_set_print_handler (old_print_handler); + g_test_trap_subprocess (NULL, 0, G_TEST_SUBPROCESS_DEFAULT); + g_test_trap_assert_stdout ("*default handler" LINE_END "*"); + g_test_trap_assert_stdout ("*bu ba" LINE_END "*"); + g_test_trap_assert_stdout_unmatched ("*# default handler" LINE_END "*"); + g_test_trap_assert_stdout_unmatched ("*# bu ba" LINE_END "*"); + g_test_trap_has_passed (); } static void @@ -299,13 +397,25 @@ GPrintFunc old_printerr_handler; old_printerr_handler = g_set_printerr_handler (my_print_handler); - g_assert (old_printerr_handler == NULL); + g_assert_nonnull (old_printerr_handler); my_print_count = 0; g_printerr ("bu ba"); g_assert_cmpint (my_print_count, ==, 1); - g_set_printerr_handler (NULL); + if (g_test_subprocess ()) + { + g_set_printerr_handler (NULL); + old_printerr_handler ("default handler\n"); + g_printerr ("bu ba\n"); + return; + } + + g_set_printerr_handler (old_printerr_handler); + g_test_trap_subprocess (NULL, 0, G_TEST_SUBPROCESS_DEFAULT); + g_test_trap_assert_stderr ("*default handler" LINE_END "*"); + g_test_trap_assert_stderr ("*bu ba" LINE_END "*"); + g_test_trap_has_passed (); } static char *fail_str = "foo"; @@ -746,10 +856,15 @@ g_test_add_func ("/logging/default-handler", test_default_handler); g_test_add_func ("/logging/default-handler/subprocess/error", test_default_handler_error); + g_test_add_func ("/logging/default-handler/subprocess/error-stderr", test_default_handler_error_stderr); g_test_add_func ("/logging/default-handler/subprocess/critical", test_default_handler_critical); + g_test_add_func ("/logging/default-handler/subprocess/critical-stderr", test_default_handler_critical_stderr); g_test_add_func ("/logging/default-handler/subprocess/warning", test_default_handler_warning); + g_test_add_func ("/logging/default-handler/subprocess/warning-stderr", test_default_handler_warning_stderr); g_test_add_func ("/logging/default-handler/subprocess/message", test_default_handler_message); + g_test_add_func ("/logging/default-handler/subprocess/message-stderr", test_default_handler_message_stderr); g_test_add_func ("/logging/default-handler/subprocess/info", test_default_handler_info); + g_test_add_func ("/logging/default-handler/subprocess/info-stderr", test_default_handler_info_stderr); g_test_add_func ("/logging/default-handler/subprocess/bar-info", test_default_handler_bar_info); g_test_add_func ("/logging/default-handler/subprocess/baz-debug", test_default_handler_baz_debug); g_test_add_func ("/logging/default-handler/subprocess/debug", test_default_handler_debug);
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/tests/macros.c -> _service:tar_scm:glib-2.76.4.tar.xz/glib/tests/macros.c
Changed
@@ -22,6 +22,87 @@ #include <glib.h> +#ifdef G_CXX_STD_VERSION +#error G_CXX_STD_VERSION should be undefined in C programs +#endif + +G_STATIC_ASSERT (!G_CXX_STD_CHECK_VERSION (98)); +G_STATIC_ASSERT (G_C_STD_CHECK_VERSION (89)); +G_STATIC_ASSERT (G_C_STD_CHECK_VERSION (90)); + +#if G_C_STD_VERSION >= 199000L + G_STATIC_ASSERT (G_C_STD_CHECK_VERSION (89)); + G_STATIC_ASSERT (G_C_STD_CHECK_VERSION (90)); + G_STATIC_ASSERT (G_C_STD_CHECK_VERSION (199000L)); +#endif + +#if G_C_STD_VERSION == 198900L + G_STATIC_ASSERT (!G_C_STD_CHECK_VERSION (99)); + G_STATIC_ASSERT (!G_C_STD_CHECK_VERSION (199901L)); + G_STATIC_ASSERT (!G_C_STD_CHECK_VERSION (11)); + G_STATIC_ASSERT (!G_C_STD_CHECK_VERSION (201112L)); + G_STATIC_ASSERT (!G_C_STD_CHECK_VERSION (17)); + G_STATIC_ASSERT (!G_C_STD_CHECK_VERSION (201710L)); +#endif + +#if G_C_STD_VERSION >= 199901L + G_STATIC_ASSERT (G_C_STD_CHECK_VERSION (99)); + G_STATIC_ASSERT (G_C_STD_CHECK_VERSION (199901L)); +#endif + +#if G_C_STD_VERSION == 199901L + G_STATIC_ASSERT (!G_C_STD_CHECK_VERSION (11)); + G_STATIC_ASSERT (!G_C_STD_CHECK_VERSION (201112L)); + G_STATIC_ASSERT (!G_C_STD_CHECK_VERSION (17)); + G_STATIC_ASSERT (!G_C_STD_CHECK_VERSION (201710L)); +#endif + +#if G_C_STD_VERSION >= 201112L + G_STATIC_ASSERT (G_C_STD_CHECK_VERSION (11)); + G_STATIC_ASSERT (G_C_STD_CHECK_VERSION (201112L)); +#endif + +#if G_C_STD_VERSION == 201112L + G_STATIC_ASSERT (!G_C_STD_CHECK_VERSION (17)); + G_STATIC_ASSERT (!G_C_STD_CHECK_VERSION (201710L)); +#endif + +#if G_C_STD_VERSION >= 201710L + G_STATIC_ASSERT (G_C_STD_CHECK_VERSION (17)); + G_STATIC_ASSERT (G_C_STD_CHECK_VERSION (201710L)); +#endif + +#if G_C_STD_VERSION == 201710L + G_STATIC_ASSERT (!G_C_STD_CHECK_VERSION (23)); + G_STATIC_ASSERT (!G_C_STD_CHECK_VERSION (202300L)); +#endif + +#ifdef _G_EXPECTED_C_STANDARD +static void +test_c_standard (void) +{ + guint64 std_version = 0; + + if (!g_ascii_string_to_unsigned (_G_EXPECTED_C_STANDARD, 10, 0, G_MAXUINT64, + &std_version, NULL)) + { + g_test_skip ("Expected standard value is non-numeric: " + _G_EXPECTED_C_STANDARD); + return; + } + + g_assert_true (G_C_STD_CHECK_VERSION (std_version)); + + if (std_version > 80 && std_version < 99) + std_version = 90; + + if (std_version >= 90) + g_assert_cmpuint (G_C_STD_VERSION, >=, (std_version + 1900) * 100); + else + g_assert_cmpuint (G_C_STD_VERSION, >=, (std_version + 2000) * 100); +} +#endif + /* Test that G_STATIC_ASSERT_EXPR can be used as an expression */ static void test_assert_static (void) @@ -65,6 +146,10 @@ { g_test_init (&argc, &argv, NULL); +#ifdef _G_EXPECTED_C_STANDARD + g_test_add_func ("/C/standard-" _G_EXPECTED_C_STANDARD, test_c_standard); +#endif + g_test_add_func ("/alignof/fallback", test_alignof_fallback); g_test_add_func ("/assert/static", test_assert_static); g_test_add_func ("/struct/sizeof_member", test_struct_sizeof_member);
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/tests/mainloop.c -> _service:tar_scm:glib-2.76.4.tar.xz/glib/tests/mainloop.c
Changed
@@ -2,6 +2,8 @@ * Copyright (C) 2011 Red Hat, Inc * Author: Matthias Clasen * + * SPDX-License-Identifier: LicenseRef-old-glib-tests + * * This work is provided "as is"; redistribution and modification * in whole or in part, in any medium, physical or electronic is * permitted without restriction.
View file
_service:tar_scm:glib-2.76.4.tar.xz/glib/tests/markup-example.c
Added
@@ -0,0 +1,168 @@ +/* Copyright (C) 2008 Luc Pionchon + * Copyright (C) 2012 David King + * + * SPDX-License-Identifier: LGPL-2.1-or-later + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, see <http://www.gnu.org/licenses/>. + */ + +#include <glib.h> + +static void foo_parser_start_element (GMarkupParseContext *context, + const gchar *element_name, + const gchar **attribute_names, + const gchar **attribute_values, + gpointer user_data, + GError **error); +static void foo_parser_end_element (GMarkupParseContext *context, + const gchar *element_name, + gpointer user_data, + GError **error); +static void foo_parser_characters (GMarkupParseContext *context, + const gchar *text, + gsize text_len, + gpointer user_data, + GError **error); +static void foo_parser_passthrough (GMarkupParseContext *context, + const gchar *passthrough_text, + gsize text_len, + gpointer user_data, + GError **error); +static void foo_parser_error (GMarkupParseContext *context, + GError *error, + gpointer user_data); + +/* + * Parser + */ +static const GMarkupParser foo_xml_parser = { + foo_parser_start_element, + foo_parser_end_element, + foo_parser_characters, + foo_parser_passthrough, + foo_parser_error +}; + +/* + * Called for opening tags like <foo bar="baz"> + */ +static void +foo_parser_start_element (GMarkupParseContext *context, + const gchar *element_name, + const gchar **attribute_names, + const gchar **attribute_values, + gpointer user_data, + GError **error) +{ + g_print ("element: <%s>\n", element_name); + + for (gsize i = 0; attribute_namesi; i++) + { + g_print ("attribute: %s = \"%s\"\n", attribute_namesi, + attribute_valuesi); + } +} + +/* + * Called for closing tags like </foo> + */ +static void +foo_parser_end_element (GMarkupParseContext *context, + const gchar *element_name, + gpointer user_data, + GError **error) +{ + g_print ("element: </%s>\n", element_name); +} + +/* + * Called for character data. Text is not nul-terminated + */ +static void +foo_parser_characters (GMarkupParseContext *context, + const gchar *text, + gsize text_len, + gpointer user_data, + GError **error) +{ + g_print ("text: %s\n", text); +} + +/* + * Called for strings that should be re-saved verbatim in this same + * position, but are not otherwise interpretable. At the moment this + * includes comments and processing instructions. Text is not + * nul-terminated. + */ +static void +foo_parser_passthrough (GMarkupParseContext *context, + const gchar *passthrough_text, + gsize text_len, + gpointer user_data, + GError **error) +{ + g_print ("passthrough: %s\n", passthrough_text); +} + +/* + * Called when any parsing method encounters an error. The GError should not be + * freed. + */ +static void +foo_parser_error (GMarkupParseContext *context, + GError *error, + gpointer user_data) +{ + g_printerr ("ERROR: %s\n", error->message); +} + +int +main (void) +{ + GMarkupParseContext *context; + gboolean success = FALSE; + glong len; + + /* + * Example XML for the parser. + */ + const gchar foo_xml_example = + "<foo bar='baz' bir='boz'>" + " <bar>bar text 1</bar> " + " <bar>bar text 2</bar> " + " foo text " + "<!-- nothing --> " + "</foo> "; + + len = g_utf8_strlen (foo_xml_example, -1); + g_print ("Parsing: %s\n", foo_xml_example); + g_print ("(%ld UTF-8 characters)\n", len); + + context = g_markup_parse_context_new (&foo_xml_parser, G_MARKUP_DEFAULT_FLAGS, NULL, NULL); + + success = g_markup_parse_context_parse (context, foo_xml_example, len, NULL); + + g_markup_parse_context_free (context); + + if (success) + { + g_print ("DONE\n"); + return 0; + } + else + { + g_printerr ("ERROR\n"); + return 1; + } +}
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/tests/markup-subparser.c -> _service:tar_scm:glib-2.76.4.tar.xz/glib/tests/markup-subparser.c
Changed
@@ -83,9 +83,7 @@ char *result; string = g_markup_parse_context_pop (ctx); - result = string->str; - - g_string_free (string, FALSE); + result = g_string_free_and_steal (g_steal_pointer (&string)); strings_allocated--; if (result == NULL || result0 == '\0') @@ -156,9 +154,7 @@ return NULL; } - result = string->str; - - g_string_free (string, FALSE); + result = g_string_free_and_steal (g_steal_pointer (&string)); strings_allocated--; if (result == NULL || result0 == '\0')
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/tests/markup.c -> _service:tar_scm:glib-2.76.4.tar.xz/glib/tests/markup.c
Changed
@@ -1,6 +1,8 @@ /* Unit tests for GMarkup * Copyright (C) 2013 Red Hat, Inc. * + * SPDX-License-Identifier: LicenseRef-old-glib-tests + * * This work is provided "as is"; redistribution and modification * in whole or in part, in any medium, physical or electronic is * permitted without restriction.
View file
_service:tar_scm:glib-2.76.4.tar.xz/glib/tests/max-version.c
Added
@@ -0,0 +1,50 @@ +/* + * Copyright 2022 Collabora Ltd. + * SPDX-License-Identifier: LGPL-2.1-or-later + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General + * Public License along with this library; if not, see + * <http://www.gnu.org/licenses/>. + */ + +#ifndef GLIB_VERSION_MAX_ALLOWED +/* This is the oldest version macro available */ +#define GLIB_VERSION_MIN_REQUIRED GLIB_VERSION_2_26 +#define GLIB_VERSION_MAX_ALLOWED GLIB_VERSION_2_26 +#endif + +/* All the headers that can validly be included in third-party code */ +#include <glib.h> +#include <glib/gi18n.h> +#include <glib/gprintf.h> +#include <glib/gstdio.h> + +#ifdef G_OS_UNIX +#include <glib-unix.h> +#endif + +static void +nothing (void) +{ + /* This doesn't really do anything: the real "test" is at compile time. */ +} + +int +main (int argc, + char *argv) +{ + g_test_init (&argc, &argv, NULL); + + g_test_add_func ("/max-version/tested-at-compile-time", nothing); + return g_test_run (); +}
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/tests/mem-overflow.c -> _service:tar_scm:glib-2.76.4.tar.xz/glib/tests/mem-overflow.c
Changed
@@ -1,6 +1,8 @@ /* Unit tests for g * Copyright (C) 2010 Red Hat, Inc. * + * SPDX-License-Identifier: LicenseRef-old-glib-tests + * * This work is provided "as is"; redistribution and modification * in whole or in part, in any medium, physical or electronic is * permitted without restriction.
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/tests/meson.build -> _service:tar_scm:glib-2.76.4.tar.xz/glib/tests/meson.build
Changed
@@ -3,6 +3,7 @@ 'asyncqueue' : {}, 'atomic' : { 'c_args' : cc.get_id() == 'gcc' ? '-Wstrict-aliasing=2' : , + 'c_standards': c_standards.keys(), }, 'base64' : {}, 'bitlock' : {}, @@ -18,17 +19,18 @@ 'dataset' : {}, 'date' : { # FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392 - 'should_fail' : host_system == 'darwin', + 'can_fail' : host_system == 'darwin', }, 'dir' : {}, 'environment' : { # FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392 - 'should_fail' : host_system == 'darwin', + 'can_fail' : host_system == 'darwin', }, 'error' : {}, 'fileutils' : {}, 'gdatetime' : { 'suite' : 'slow', + 'can_fail' : host_system == 'windows', }, 'guuid' : {}, 'gvariant' : { @@ -47,7 +49,9 @@ 'keyfile' : {}, 'list' : {}, 'logging' : {}, - 'macros' : {}, + 'macros' : { + 'c_standards': c_standards.keys(), + }, 'mainloop' : {}, 'mappedfile' : {}, 'mapping' : {}, @@ -56,6 +60,7 @@ 'markup-collect' : {}, 'markup-escape' : {}, 'markup-subparser' : {}, + 'max-version' : {'install' : false}, 'memchunk' : {}, 'mem-overflow' : { 'link_args' : cc.get_id() == 'gcc' and cc.version().version_compare('> 6') @@ -72,6 +77,7 @@ 'source' : 'overflow.c', 'c_args' : '-D_GLIB_TEST_OVERFLOW_FALLBACK', }, + 'pathbuf' : {}, 'pattern' : {}, 'private' : {}, 'protocol' : {}, @@ -98,28 +104,40 @@ }, 'shell' : {}, 'slice' : {}, - 'slice-color' : {}, - 'slice-concurrent' : {}, - 'slice-known-pages' : {'suite' : 'no-valgrind'}, - 'slice-glib' : {}, - 'slice-slab' : {}, - 'slice-malloc' : {}, - 'slice-memchunk' : { - 'source' : 'slice-memchunk.c', 'memchunks.c', - }, - 'slice-eager-freeing' : {}, 'slist' : {}, 'sort' : {}, - 'spawn-multithreaded' : {}, - 'spawn-path-search' : {}, + 'spawn-multithreaded' : { + 'can_fail': glib_build_static and host_system == 'windows', + 'suite': host_system == 'windows' ? 'flaky' : , + 'extra_programs' : 'test-spawn-echo' + ( + host_machine.system() == 'windows' ? 'test-spawn-sleep' : ), + }, + 'spawn-path-search' : { + 'extra_programs' : + 'spawn-path-search-helper', + 'spawn-test-helper', + 'spawn-test-helper-subdir', + , + }, 'spawn-singlethread' : { 'dependencies' : winsock2, + 'extra_programs' : 'test-spawn-echo', + }, + 'spawn-test' : { + 'extra_programs' : host_machine.system() == 'windows' ? 'spawn-test-win32-gui' : , }, - 'spawn-test' : {}, 'strfuncs' : {}, 'string' : {}, + 'string-macro' : { + 'source' : 'string.c', + 'c_args' : cc.get_id() == 'gcc' ? '-Werror=sign-conversion' : , + 'install' : false, + }, 'strvbuilder' : {}, - 'testing' : {}, + 'testing' : { + 'args': '--verbose' , + 'extra_programs' : 'testing-helper', + }, 'test-printf' : {}, 'thread' : {}, 'thread-deprecated' : {}, @@ -133,7 +151,10 @@ 'utf8-pointer' : {}, 'utf8-validate' : {}, 'utf8-misc' : {}, - 'utils' : {}, + 'utils' : { + 'c_standards': c_standards.keys(), + }, + 'utils-isolated' : {}, 'unicode' : {}, 'unicode-encoding' : {}, 'unicode-normalize': {}, @@ -168,7 +189,7 @@ 'cxx-@0@'.format(std) : { 'source' : 'cxx.cpp', 'suite' : 'cpp', - 'cpp_args' : arg, + 'cpp_args' : arg, '-D_G_EXPECTED_CXX_STANDARD="@0@"'.format(std), }, } endforeach @@ -204,7 +225,7 @@ 'include' : {}, 'unix' : {}, } - if have_rtld_next and get_option('default_library') != 'static' + if have_rtld_next and glib_build_shared glib_tests += { 'gutils-user-database' : { 'depends' : @@ -258,16 +279,80 @@ ) endif +test_extra_programs = { + 'assert-msg-test' : {}, + 'markup-example' : {'install' : false}, + 'spawn-path-search-helper' : {}, + 'spawn-test-helper' : {}, + 'testing-helper' : {}, + # test-spawn-echo helper binary required by the spawn tests above + 'test-spawn-echo' : {}, +} + +if have_dlopen_dlsym and have_rtld_next + test_extra_programs += { + 'messages-low-memory' : { + 'dependencies' : libdl_dep, + 'override_options' : 'b_asneeded=false', + }, + } +endif + +if host_machine.system() == 'windows' + # test-spawn-sleep helper binary required by the spawn tests above + test_extra_programs += { + 'test-spawn-sleep' : {}, + 'spawn-test-win32-gui' : { 'win_subsystem': 'windows' }, + } +endif + +foreach test_name, extra_args : glib_tests + foreach std: extra_args.get('c_standards', ) + if c_standards.has_key(std) + glib_tests += { + '@0@-c-@1@'.format(test_name, std) : extra_args + { + 'source' : extra_args.get('source', test_name + '.c'), + 'suite' : 'cc' + extra_args.get('suite', ), + 'c_args' : + c_standards.get(std), + '-D_G_EXPECTED_C_STANDARD="@0@"'.format(std) + + extra_args.get('c_args', ), + } + } + endif + endforeach +endforeach + test_env = environment() test_env.set('G_TEST_SRCDIR', meson.current_source_dir()) test_env.set('G_TEST_BUILDDIR', meson.current_build_dir()) -test_env.set('G_DEBUG', 'gc-friendly') -test_env.set('MALLOC_CHECK_', '2') test_deps = libm, thread_dep, libglib_dep test_cargs = '-DG_LOG_DOMAIN="GLib"', '-UG_DISABLE_ASSERT' test_cpp_args = test_cargs +test_extra_programs_targets = {} +foreach program_name, extra_args : test_extra_programs + source = extra_args.get('source', program_name + '.c') + extra_sources = extra_args.get('extra_sources', ) + install = installed_tests_enabled and extra_args.get('install', true) + test_extra_programs_targets += { + program_name : executable(program_name, + sources: source, extra_sources, + c_args : test_cargs, + cpp_args: test_cpp_args, + override_options : extra_args.get('override_options', ), + dependencies : test_deps + extra_args.get('dependencies', ), + install_dir : installed_tests_execdir, + install_tag : 'tests', + install : install, + win_subsystem : extra_args.get('win_subsystem', 'console'), + ) + } +endforeach + +subdir('path-test-subdir') + foreach test_name, extra_args : glib_tests source = extra_args.get('source', test_name + '.c') install = installed_tests_enabled and extra_args.get('install', true) @@ -290,15 +375,29 @@ c_args : test_cargs + extra_args.get('c_args', ), cpp_args : test_cpp_args + extra_args.get('cpp_args', ), link_args : extra_args.get('link_args', ), + override_options : extra_args.get('override_options', ), dependencies : test_deps + extra_args.get('dependencies', ), install_dir: installed_tests_execdir, install_tag: 'tests', install: install, ) - suite = 'glib' + extra_args.get('suite', ) + depends = extra_args.get('depends', ) + suite = 'glib', 'core' + extra_args.get('suite', ) timeout = suite.contains('slow') ? test_timeout_slow : test_timeout + + if extra_args.get('can_fail', false) + suite += 'failing' + endif + + foreach program : extra_args.get('extra_programs', ) + depends += test_extra_programs_targetsprogram + endforeach + test(test_name, exe, + args: extra_args.get('args', ), + protocol : extra_args.get('protocol', test_protocol), + depends : depends, env : test_env, timeout : timeout, suite : suite, @@ -314,26 +413,41 @@ ) endif -python_tests = - 'assert-msg-test.py', - +python_tests = { + 'assert-msg-test.py' : { + 'can_fail' : host_system == 'windows', + 'extra_programs': 'assert-msg-test', + }, +} -executable('assert-msg-test', 'assert-msg-test.c', - c_args : test_cargs, - dependencies : test_deps, - install_dir : installed_tests_execdir, - install_tag : 'tests', - install : installed_tests_enabled, - win_subsystem : extra_args.get('win_subsystem', 'console'), -) +if 'messages-low-memory' in test_extra_programs + python_tests += { + 'messages-low-memory.py' : { + 'extra_programs': 'messages-low-memory', + }, + } +endif + +foreach test_name, extra_args : python_tests + depends = extra_args.get('depends', ) + suite = 'glib', 'core', 'no-valgrind' + + if extra_args.get('can_fail', false) + suite += 'failing' + endif + + foreach program : extra_args.get('extra_programs', ) + depends += test_extra_programs_targetsprogram + endforeach -foreach test_name : python_tests test( test_name, python, + protocol : extra_args.get('protocol', test_protocol), + depends: depends, args: '-B', files(test_name), env: test_env, - suite: 'glib', 'no-valgrind', + suite: suite, ) if installed_tests_enabled @@ -358,60 +472,10 @@ endif endforeach -executable('spawn-path-search-helper', 'spawn-path-search-helper.c', - c_args : test_cargs, - dependencies : test_deps, - install_dir: installed_tests_execdir, - install_tag: 'tests', - install: installed_tests_enabled, -) - -executable('spawn-test-helper', 'spawn-test-helper.c', - c_args : test_cargs, - dependencies : test_deps, - install_dir: installed_tests_execdir, - install_tag: 'tests', - install: installed_tests_enabled, -) - -# test-spawn-echo helper binary required by the spawn tests above -executable('test-spawn-echo', 'test-spawn-echo.c', - c_args : test_cargs, - dependencies : test_deps, - install_dir: installed_tests_execdir, - install_tag: 'tests', - install: installed_tests_enabled, -) - -if host_machine.system() == 'windows' - # test-spawn-sleep helper binary required by the spawn tests above - executable('test-spawn-sleep', 'test-spawn-sleep.c', - c_args : test_cargs, - dependencies : test_deps, - install_dir: installed_tests_execdir, - install_tag: 'tests', - install: installed_tests_enabled, - ) - executable('spawn-test-win32-gui', 'spawn-test-win32-gui.c', - c_args : test_cargs, - dependencies : test_deps, - install_dir: installed_tests_execdir, - install_tag: 'tests', - install: installed_tests_enabled, - win_subsystem: 'windows', - ) -endif - -executable('testing-helper', 'testing-helper.c', - c_args : test_cargs, - dependencies : test_deps, - install_dir: installed_tests_execdir, - install_tag: 'tests', - install: installed_tests_enabled, -) - # some testing of gtester functionality -if meson.can_run_host_binaries() and host_system != 'windows' +# FIXME: Work around Meson not automatically using exe_wrapper around gtester +# https://github.com/mesonbuild/meson/issues/11029 +if not meson.is_cross_build() and host_system != 'windows' xmllint = find_program('xmllint', required: false) if xmllint.found() tmpsample_xml = custom_target('tmpsample.xml', @@ -422,9 +486,8 @@ test('gtester-xmllint-check', xmllint, args : '--noout', tmpsample_xml, env : test_env, - suite : 'glib', + suite : 'glib', 'core', ) endif endif -subdir('path-test-subdir')
View file
_service:tar_scm:glib-2.76.4.tar.xz/glib/tests/messages-low-memory.c
Added
@@ -0,0 +1,88 @@ +/* Unit tests for gmessages on low-memory + * + * Copyright (C) 2022 Marco Trevisan + * + * SPDX-License-Identifier: LGPL-2.1-or-later + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General + * Public License along with this library; if not, see <http://www.gnu.org/licenses/>. + * + * Author: Marco Trevisan <marco.trevisan@canonical.com> + */ + +#include "config.h" + +#include <dlfcn.h> +#include <glib.h> + +static gboolean malloc_eom = FALSE; +static gboolean our_malloc_called = FALSE; + +#ifdef ENOMEM +/* Wrapper around malloc() which returns `ENOMEM` if the test variable + * `malloc_eom` is set. + * Otherwise passes through to the normal malloc() in libc. + */ + +void * +malloc (size_t size) +{ + static void *(*real_malloc)(size_t); + if (!real_malloc) + real_malloc = dlsym (RTLD_NEXT, "malloc"); + + if (malloc_eom) + { + our_malloc_called = TRUE; + errno = ENOMEM; + return NULL; + } + + return real_malloc (size); +} +#endif + +int +main (int argc, + char *argv) +{ + g_setenv ("LC_ALL", "C", TRUE); + +#ifndef ENOMEM + g_message ("ENOMEM Not defined, test skipped"); + return 77; +#endif + + g_message ("Simulates a situation in which we were crashing because " + "of low-memory, leading malloc to fail instead of aborting"); + g_message ("bug: https://gitlab.gnome.org/GNOME/glib/-/issues/2753"); + + /* Setting `malloc_eom` to true should cause the override `malloc()` + * in this file to fail on the allocation on the next line. */ + malloc_eom = TRUE; + g_message ("Memory is exhausted, but we'll write anyway: %u", 123); + +#ifndef __linux__ + if (!our_malloc_called) + { + /* For some reasons this doesn't work darwin systems, so ignore the result + * for non-linux, while we want to ensure the test is valid at least there + */ + g_message ("Our malloc implementation has not been called, the test " + "has not been performed"); + return 77; + } +#endif + + return 0; +}
View file
_service:tar_scm:glib-2.76.4.tar.xz/glib/tests/messages-low-memory.py
Added
@@ -0,0 +1,101 @@ +#!/usr/bin/env python3 +# -*- coding: utf-8 -*- +# +# Copyright © 2022 Emmanuel Fleury <emmanuel.fleury@gmail.com> +# Copyright © 2022 Marco Trevisan <mail@3v1n0.net> +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +# MA 02110-1301 USA + +""" Integration tests for g_message functions on low-memory. """ + +import collections +import os +import subprocess +import unittest + +import taptestrunner + +Result = collections.namedtuple("Result", ("info", "out", "err")) + + +class TestMessagesLowMemory(unittest.TestCase): + """Integration test for checking g_message()’s behavior on low memory. + + This can be run when installed or uninstalled. When uninstalled, + it requires G_TEST_BUILDDIR and G_TEST_SRCDIR to be set. + + The idea with this test harness is to test if g_message and friends + assert instead of crashing if memory is exhausted, printing the expected + error message. + """ + + test_binary = "messages-low-memory" + + def setUp(self): + ext = "" + if os.name == "nt": + ext = ".exe" + if "G_TEST_BUILDDIR" in os.environ: + self._test_binary = os.path.join( + os.environ"G_TEST_BUILDDIR", self.test_binary + ext + ) + else: + self._test_binary = os.path.join( + os.path.dirname(__file__), self.test_binary + ext + ) + print("messages-low-memory:", self._test_binary) + + def runTestBinary(self, *args): + print("Running:", *args) + + env = os.environ.copy() + env"LC_ALL" = "C.UTF-8" + print("Environment:", env) + + # We want to ensure consistent line endings... + info = subprocess.run( + *args, + stdout=subprocess.PIPE, + stderr=subprocess.PIPE, + env=env, + universal_newlines=True, + ) + out = info.stdout.strip() + err = info.stderr.strip() + + result = Result(info, out, err) + + print("Return code:", result.info.returncode) + print("Output:", result.out) + print("Error:", result.err) + return result + + def test_message_memory_allocation_failure(self): + """Test running g_message() when memory is exhausted.""" + result = self.runTestBinary(self._test_binary) + + if result.info.returncode == 77: + self.skipTest("Not supported") + + if os.name == "nt": + self.assertEqual(result.info.returncode, 3) + else: + self.assertEqual(result.info.returncode, -6) + self.assertIn("failed to allocate memory", result.err) + + +if __name__ == "__main__": + unittest.main(testRunner=taptestrunner.TAPTestRunner())
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/tests/mutex.c -> _service:tar_scm:glib-2.76.4.tar.xz/glib/tests/mutex.c
Changed
@@ -2,6 +2,8 @@ * Copyright (C) 2011 Red Hat, Inc * Author: Matthias Clasen * + * SPDX-License-Identifier: LicenseRef-old-glib-tests + * * This work is provided "as is"; redistribution and modification * in whole or in part, in any medium, physical or electronic is * permitted without restriction. @@ -157,6 +159,63 @@ g_assert (ownersi == NULL); } +static gpointer +test_mutex_errno_func (gpointer data) +{ + GMutex *m = data; + + g_test_summary ("Validates that errno is not touched upon return"); + g_test_bug ("https://gitlab.gnome.org/GNOME/glib/-/issues/3034"); + + for (unsigned int i = 0; i < 1000; i++) + { + errno = 0; + g_mutex_lock (m); + g_assert_cmpint (errno, ==, 0); + + g_thread_yield (); + + errno = 0; + g_mutex_unlock (m); + g_assert_cmpint (errno, ==, 0); + + errno = 0; + if (g_mutex_trylock (m)) + { + g_assert_cmpint (errno, ==, 0); + + g_thread_yield (); + + errno = 0; + g_mutex_unlock (m); + g_assert_cmpint (errno, ==, 0); + } + } + + return NULL; +} + +static void +test_mutex_errno (void) +{ + gsize i; + GThread *threadsTHREADS; + GMutex m; + + g_mutex_init (&m); + + for (i = 0; i < G_N_ELEMENTS (threads); i++) + { + threadsi = g_thread_new ("test_mutex_errno", + test_mutex_errno_func, &m); + } + + for (i = 0; i < G_N_ELEMENTS (threads); i++) + { + g_thread_join (threadsi); + } +} + static gint count_to = 0; static gboolean @@ -224,6 +283,7 @@ g_test_add_func ("/thread/mutex3", test_mutex3); g_test_add_func ("/thread/mutex4", test_mutex4); g_test_add_func ("/thread/mutex5", test_mutex5); + g_test_add_func ("/thread/mutex/errno", test_mutex_errno); { guint i;
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/tests/once.c -> _service:tar_scm:glib-2.76.4.tar.xz/glib/tests/once.c
Changed
@@ -3,6 +3,8 @@ * Copyright (C) 2011 Red Hat, Inc * Author: Matthias Clasen * + * SPDX-License-Identifier: LicenseRef-old-glib-tests + * * This work is provided "as is"; redistribution and modification * in whole or in part, in any medium, physical or electronic is * permitted without restriction.
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/tests/onceinit.c -> _service:tar_scm:glib-2.76.4.tar.xz/glib/tests/onceinit.c
Changed
@@ -1,6 +1,8 @@ /* g_once_init_*() test * Copyright (C) 2007 Tim Janik * + * SPDX-License-Identifier: LicenseRef-old-glib-tests + * * This work is provided "as is"; redistribution and modification * in whole or in part, in any medium, physical or electronic is * permitted without restriction. @@ -264,16 +266,22 @@ g_cond_broadcast (&tcond); } + for (i = 0; i < N_THREADS; i++) + g_thread_join (threadsi); + /* call multiple (unoptimized) initializers from multiple threads */ g_mutex_lock (&tmutex); g_atomic_int_set (&thread_call_count, 0); for (i = 0; i < N_THREADS; i++) - g_thread_new (NULL, stress_concurrent_initializers, NULL); + threadsi = g_thread_new (NULL, stress_concurrent_initializers, NULL); g_mutex_unlock (&tmutex); while (g_atomic_int_get (&thread_call_count) < 256 * 4 * N_THREADS) g_usleep (50 * 1000); /* wait for all 5 threads to complete */ + + for (i = 0; i < N_THREADS; i++) + g_thread_join (threadsi); } int
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/tests/option-argv0.c -> _service:tar_scm:glib-2.76.4.tar.xz/glib/tests/option-argv0.c
Changed
@@ -1,6 +1,8 @@ /* * Copyright (C) 2011 Red Hat, Inc. * + * SPDX-License-Identifier: LicenseRef-old-glib-tests + * * This work is provided "as is"; redistribution and modification * in whole or in part, in any medium, physical or electronic is * permitted without restriction.
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/tests/option-context.c -> _service:tar_scm:glib-2.76.4.tar.xz/glib/tests/option-context.c
Changed
@@ -2,6 +2,8 @@ * Copyright (C) 2007 Openismus GmbH * Authors: Mathias Hasselmann * + * SPDX-License-Identifier: LicenseRef-old-glib-tests + * * This work is provided "as is"; redistribution and modification * in whole or in part, in any medium, physical or electronic is * permitted without restriction.
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/tests/path-test-subdir/meson.build -> _service:tar_scm:glib-2.76.4.tar.xz/glib/tests/path-test-subdir/meson.build
Changed
@@ -1,7 +1,10 @@ -executable('spawn-test-helper', 'spawn-test-helper.c', - c_args : test_cargs, - dependencies : test_deps, - install_dir: join_paths(installed_tests_execdir, 'path-test-subdir'), - install_tag: 'tests', - install: installed_tests_enabled, -) +test_extra_programs_targets += { + 'spawn-test-helper-subdir' : executable('spawn-test-helper', + sources: 'spawn-test-helper.c', + c_args : test_cargs, + dependencies : test_deps, + install_dir: installed_tests_execdir / 'path-test-subdir', + install_tag: 'tests', + install: installed_tests_enabled, + ), +}
View file
_service:tar_scm:glib-2.76.4.tar.xz/glib/tests/pathbuf.c
Added
@@ -0,0 +1,258 @@ +/* Unit tests for GPathBuf + * + * SPDX-FileCopyrightText: 2023 Emmanuele Bassi + * SPDX-License-Identifier: LGPL-2.1-or-later + */ + +#include "config.h" +#include <string.h> +#include <errno.h> + +#include <glib.h> + +#ifndef g_assert_path_buf_equal +#define g_assert_path_buf_equal(p1,p2) \ + G_STMT_START { \ + if (g_path_buf_equal ((p1), (p2))) ; else { \ + char *__p1 = g_path_buf_to_path ((p1)); \ + char *__p2 = g_path_buf_to_path ((p2)); \ + g_assertion_message_cmpstr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, \ + #p1 " == " #p2, __p1, "==", __p2); \ + g_free (__p1); \ + g_free (__p2); \ + } \ + } G_STMT_END +#endif + +static void +test_pathbuf_init (void) +{ +#ifdef G_OS_UNIX + GPathBuf buf, cmp; + char *path; + + g_test_message ("Initializing empty path buf"); + g_path_buf_init (&buf); + g_assert_null (g_path_buf_to_path (&buf)); + g_path_buf_clear (&buf); + + g_test_message ("Initializing with empty path"); + g_path_buf_init_from_path (&buf, NULL); + g_assert_null (g_path_buf_to_path (&buf)); + g_path_buf_clear (&buf); + + g_test_message ("Initializing with full path"); + g_path_buf_init_from_path (&buf, "/usr/bin/echo"); + path = g_path_buf_clear_to_path (&buf); + g_assert_nonnull (path); + g_assert_cmpstr (path, ==, "/usr/bin/echo"); + g_free (path); + + g_test_message ("Initializing with no path"); + g_path_buf_init (&buf); + g_assert_null (g_path_buf_to_path (&buf)); + g_path_buf_clear (&buf); + + g_test_message ("Allocating GPathBuf on the heap"); + GPathBuf *allocated = g_path_buf_new (); + g_assert_null (g_path_buf_to_path (allocated)); + g_path_buf_clear (allocated); + + g_path_buf_init_from_path (allocated, "/bin/sh"); + path = g_path_buf_to_path (allocated); + g_assert_cmpstr (path, ==, "/bin/sh"); + g_free (path); + + g_path_buf_clear (allocated); + g_assert_null (g_path_buf_to_path (allocated)); + g_assert_null (g_path_buf_free_to_path (allocated)); + + allocated = g_path_buf_new_from_path ("/bin/sh"); + g_path_buf_init_from_path (&cmp, "/bin/sh"); + g_assert_path_buf_equal (allocated, &cmp); + g_path_buf_clear (&cmp); + g_path_buf_free (allocated); + + g_path_buf_init_from_path (&buf, "/usr/bin/bash"); + allocated = g_path_buf_copy (&buf); + g_assert_path_buf_equal (allocated, allocated); + g_assert_path_buf_equal (allocated, &buf); + g_path_buf_clear (&buf); + + g_path_buf_init_from_path (&cmp, "/usr/bin/bash"); + g_assert_path_buf_equal (allocated, &cmp); + g_path_buf_clear (&cmp); + + g_path_buf_free (allocated); +#elif defined(G_OS_WIN32) + GPathBuf buf; + char *path; + + /* Forward slashes and backslashes are treated as interchangeable + * on input... */ + g_path_buf_init_from_path (&buf, "C:\\windows/system32.dll"); + path = g_path_buf_clear_to_path (&buf); + g_assert_nonnull (path); + /* ... and normalized to backslashes on output */ + g_assert_cmpstr (path, ==, "C:\\windows\\system32.dll"); + g_free (path); + + g_path_buf_init (&buf); + g_assert_null (g_path_buf_to_path (&buf)); + g_path_buf_clear (&buf); + + g_test_message ("Allocating GPathBuf on the heap"); + GPathBuf *allocated = g_path_buf_new (); + g_assert_null (g_path_buf_to_path (allocated)); + g_path_buf_clear (allocated); + + g_path_buf_init_from_path (allocated, "C:\\does-not-exist.txt"); + path = g_path_buf_to_path (allocated); + g_assert_cmpstr (path, ==, "C:\\does-not-exist.txt"); + g_free (path); + + g_path_buf_clear (allocated); + g_assert_null (g_path_buf_to_path (allocated)); + g_assert_null (g_path_buf_free_to_path (allocated)); +#else + g_test_skip ("Unsupported platform"): +#endif +} + +static void +test_pathbuf_push_pop (void) +{ +#ifdef G_OS_UNIX + GPathBuf buf, cmp; + + g_test_message ("Pushing relative path component"); + g_path_buf_init_from_path (&buf, "/tmp"); + g_path_buf_push (&buf, ".X11-unix/X0"); + + g_path_buf_init_from_path (&cmp, "/tmp/.X11-unix/X0"); + g_assert_path_buf_equal (&buf, &cmp); + g_path_buf_clear (&cmp); + + g_test_message ("Pushing absolute path component"); + g_path_buf_push (&buf, "/etc/locale.conf"); + g_path_buf_init_from_path (&cmp, "/etc/locale.conf"); + g_assert_path_buf_equal (&buf, &cmp); + g_path_buf_clear (&cmp); + g_path_buf_clear (&buf); + + g_test_message ("Popping a path component"); + g_path_buf_init_from_path (&buf, "/bin/sh"); + + g_assert_true (g_path_buf_pop (&buf)); + g_path_buf_init_from_path (&cmp, "/bin"); + g_assert_path_buf_equal (&buf, &cmp); + g_path_buf_clear (&cmp); + + g_assert_true (g_path_buf_pop (&buf)); + g_path_buf_init_from_path (&cmp, "/"); + g_assert_path_buf_equal (&buf, &cmp); + g_path_buf_clear (&cmp); + + g_test_message ("Can't pop the last element of a path buffer"); + g_assert_false (g_path_buf_pop (&buf)); + + g_path_buf_clear (&buf); + g_path_buf_clear (&cmp); +#elif defined(G_OS_WIN32) + GPathBuf buf, cmp; + + g_test_message ("Pushing relative path component"); + g_path_buf_init_from_path (&buf, "C:\\"); + g_path_buf_push (&buf, "windows"); + g_path_buf_push (&buf, "system32.dll"); + + g_test_message ("Popping a path component"); + g_path_buf_init_from_path (&cmp, "C:\\windows/system32.dll"); + g_assert_path_buf_equal (&buf, &cmp); + g_path_buf_clear (&cmp); + + g_assert_true (g_path_buf_pop (&buf)); + g_path_buf_init_from_path (&cmp, "C:\\windows"); + g_assert_path_buf_equal (&buf, &cmp); + g_path_buf_clear (&cmp); + + g_assert_true (g_path_buf_pop (&buf)); + g_path_buf_init_from_path (&cmp, "C:"); + g_assert_path_buf_equal (&buf, &cmp); + g_path_buf_clear (&cmp); + + g_test_message ("Can't pop the last element of a path buffer"); + g_assert_false (g_path_buf_pop (&buf)); + + g_path_buf_clear (&buf); + g_path_buf_clear (&cmp); +#else + g_test_skip ("Unsupported platform"): +#endif +} + +static void +test_pathbuf_filename_extension (void) +{ +#ifdef G_OS_UNIX + GPathBuf buf, cmp; + + g_path_buf_init (&buf); + g_assert_false (g_path_buf_set_filename (&buf, "foo")); + g_assert_false (g_path_buf_set_extension (&buf, "txt")); + g_assert_null (g_path_buf_to_path (&buf)); + g_path_buf_clear (&buf); + + g_path_buf_init_from_path (&buf, "/"); + g_path_buf_set_filename (&buf, "bar"); + + g_path_buf_init_from_path (&cmp, "/bar"); + g_assert_path_buf_equal (&buf, &cmp); + g_path_buf_clear (&cmp); + + g_path_buf_set_filename (&buf, "baz.txt"); + g_path_buf_init_from_path (&cmp, "/baz.txt"); + g_assert_path_buf_equal (&buf, &cmp); + g_path_buf_clear (&cmp); + + g_path_buf_push (&buf, "/usr"); + g_path_buf_push (&buf, "lib64"); + g_path_buf_push (&buf, "libc"); + g_assert_true (g_path_buf_set_extension (&buf, "so.6")); + + g_path_buf_init_from_path (&cmp, "/usr/lib64/libc.so.6"); + g_assert_path_buf_equal (&buf, &cmp); + g_path_buf_clear (&cmp); + + g_path_buf_clear (&buf); +#elif defined(G_OS_WIN32) + GPathBuf buf, cmp; + + g_path_buf_init_from_path (&buf, "C:\\"); + g_path_buf_push (&buf, "windows"); + g_path_buf_push (&buf, "system32"); + g_assert_true (g_path_buf_set_extension (&buf, "dll")); + + g_path_buf_init_from_path (&cmp, "C:\\windows\\system32.dll"); + g_assert_path_buf_equal (&buf, &cmp); + g_path_buf_clear (&cmp); + + g_path_buf_clear (&buf); +#else + g_test_skip ("Unsupported platform"): +#endif +} + +int +main (int argc, + char *argv) +{ + g_setenv ("LC_ALL", "C", TRUE); + g_test_init (&argc, &argv, G_TEST_OPTION_ISOLATE_DIRS, NULL); + + g_test_add_func ("/pathbuf/init", test_pathbuf_init); + g_test_add_func ("/pathbuf/push-pop", test_pathbuf_push_pop); + g_test_add_func ("/pathbuf/filename-extension", test_pathbuf_filename_extension); + + return g_test_run (); +}
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/tests/private.c -> _service:tar_scm:glib-2.76.4.tar.xz/glib/tests/private.c
Changed
@@ -2,6 +2,8 @@ * Copyright (C) 2011 Red Hat, Inc * Author: Matthias Clasen * + * SPDX-License-Identifier: LicenseRef-old-glib-tests + * * This work is provided "as is"; redistribution and modification * in whole or in part, in any medium, physical or electronic is * permitted without restriction.
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/tests/protocol.c -> _service:tar_scm:glib-2.76.4.tar.xz/glib/tests/protocol.c
Changed
@@ -2,6 +2,8 @@ * * Copyright (C) 2010 Sven Herzberg * + * SPDX-License-Identifier: LicenseRef-old-glib-tests + * * This work is provided "as is"; redistribution and modification * in whole or in part, in any medium, physical or electronic is * permitted without restriction.
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/tests/queue.c -> _service:tar_scm:glib-2.76.4.tar.xz/glib/tests/queue.c
Changed
@@ -1,3 +1,24 @@ +/* + * Copyright 1999 Jeff Garzik + * Copyright 1999 Tim Janik + * Copyright 2004 Soeren Sandmann + * Copyright 2006 Martyn James Russell + * Copyright 2004, 2005, 2010, 2019 Red Hat, Inc. + * Copyright 2011 Samsung + * Copyright 2018 Tapasweni Pathak + * Copyright 2019 Endless Mobile, Inc. + * Copyright 2020 Emmanuel Fleury + * + * SPDX-License-Identifier: LGPL-2.1-or-later + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * See the included COPYING file for more information. + */ + #undef G_DISABLE_ASSERT #undef G_LOG_DOMAIN @@ -16,14 +37,14 @@ GList *link; guint n; - g_assert (queue->length < 4000000000u); + g_assert_cmpuint (queue->length, <, 4000000000u); - g_assert (g_queue_get_length (queue) == queue->length); + g_assert_cmpuint (g_queue_get_length (queue), ==, queue->length); if (!queue->head) - g_assert (!queue->tail); + g_assert_null (queue->tail); if (!queue->tail) - g_assert (!queue->head); + g_assert_null (queue->head); n = 0; last = NULL; @@ -33,8 +54,8 @@ last = list; ++n; } - g_assert (n == queue->length); - g_assert (last == queue->tail); + g_assert_cmpuint (n, ==, queue->length); + g_assert_true (last == queue->tail); n = 0; last = NULL; @@ -44,8 +65,8 @@ last = list; ++n; } - g_assert (n == queue->length); - g_assert (last == queue->head); + g_assert_cmpuint (n, ==, queue->length); + g_assert_true (last == queue->head); links = NULL; for (list = queue->head; list != NULL; list = list->next) @@ -54,7 +75,7 @@ link = links; for (list = queue->tail; list != NULL; list = list->prev) { - g_assert (list == link->data); + g_assert_true (list == link->data); link = link->next; } g_list_free (links); @@ -66,7 +87,7 @@ link = links; for (list = queue->head; list != NULL; list = list->next) { - g_assert (list == link->data); + g_assert_true (list == link->data); link = link->next; } g_list_free (links); @@ -145,10 +166,9 @@ return -1; } -static gint +static guint get_random_position (GQueue *queue, gboolean allow_offlist) { - int n; enum { OFF_QUEUE, HEAD, TAIL, MIDDLE, LAST } where; if (allow_offlist) @@ -159,35 +179,28 @@ switch (where) { case OFF_QUEUE: - n = g_random_int (); - break; + return g_random_int (); case HEAD: - n = 0; - break; + return 0; case TAIL: if (allow_offlist) - n = queue->length; + return queue->length; + else if (queue->length > 0) + return queue->length - 1; else - n = queue->length - 1; - break; + return 0; case MIDDLE: if (queue->length == 0) - n = 0; + return 0; else - n = g_random_int_range (0, queue->length); - break; + return g_random_int_range (0, queue->length); default: - g_assert_not_reached(); - n = 100; - break; - + g_assert_not_reached (); } - - return n; } static void @@ -207,10 +220,9 @@ LINK_INDEX, UNLINK, DELETE_LINK, LAST_OP } QueueOp; -#define N_ITERATIONS 500000 -#define N_QUEUES 3 + const guint n_iterations = g_test_thorough () ? 500000 : 100000; -#define RANDOM_QUEUE() &(queuesg_random_int_range(0, N_QUEUES)) +#define RANDOM_QUEUE() &(queuesg_random_int_range(0, G_N_ELEMENTS (queues))) typedef struct QueueInfo QueueInfo; struct QueueInfo @@ -221,13 +233,13 @@ guint length; }; - gint i; + guint i; QueueOp op; - QueueInfo queuesN_QUEUES; + QueueInfo queues3; g_random_set_seed (seed); - for (i = 0; i < N_QUEUES; ++i) + for (i = 0; i < G_N_ELEMENTS (queues); ++i) { queuesi.queue = g_queue_new (); queuesi.head = NULL; @@ -235,16 +247,16 @@ queuesi.length = 0; } - for (i = 0; i < N_ITERATIONS; ++i) + for (i = 0; i < n_iterations; ++i) { - int j; + guint j; QueueInfo *qinf = RANDOM_QUEUE(); GQueue *q = qinf->queue; op = g_random_int_range (IS_EMPTY, LAST_OP); - g_assert (qinf->head == q->head); - g_assert (qinf->tail == q->tail); - g_assert (qinf->length == q->length); + g_assert_true (qinf->head == q->head); + g_assert_true (qinf->tail == q->tail); + g_assert_cmpuint (qinf->length, ==, q->length); switch (op) { @@ -252,15 +264,15 @@ { if (g_queue_is_empty (qinf->queue)) { - g_assert (q->head == NULL); - g_assert (q->tail == NULL); - g_assert (q->length == 0); + g_assert_null (q->head); + g_assert_null (q->tail); + g_assert_cmpuint (q->length, ==, 0); } else { - g_assert (q->head); - g_assert (q->tail); - g_assert (q->length > 0); + g_assert_nonnull (q->head); + g_assert_nonnull (q->tail); + g_assert_cmpuint (q->length, >, 0); } } break; @@ -270,15 +282,15 @@ l = g_queue_get_length (q); - g_assert (qinf->length == q->length); - g_assert (qinf->length == l); + g_assert_cmpuint (qinf->length, ==, q->length); + g_assert_cmpuint (qinf->length, ==, l); } break; case REVERSE: g_queue_reverse (q); - g_assert (qinf->tail == q->head); - g_assert (qinf->head == q->tail); - g_assert (qinf->length == q->length); + g_assert_true (qinf->tail == q->head); + g_assert_true (qinf->head == q->tail); + g_assert_cmpuint (qinf->length, ==, q->length); qinf->tail = q->tail; qinf->head = q->head; break; @@ -316,13 +328,13 @@ if (find_existing) { - g_assert (g_queue_find (q, GINT_TO_POINTER (first))); - g_assert (g_queue_find (q, GINT_TO_POINTER (second))); + g_assert_nonnull (g_queue_find (q, GINT_TO_POINTER (first))); + g_assert_nonnull (g_queue_find (q, GINT_TO_POINTER (second))); } else { - g_assert (!g_queue_find (q, GINT_TO_POINTER (first))); - g_assert (!g_queue_find (q, GINT_TO_POINTER (second))); + g_assert_null (g_queue_find (q, GINT_TO_POINTER (first))); + g_assert_null (g_queue_find (q, GINT_TO_POINTER (second))); } } break; @@ -353,7 +365,7 @@ qinf->head = g_queue_find (q, GINT_TO_POINTER (find_min(q))); qinf->tail = g_queue_find (q, GINT_TO_POINTER (find_max(q))); - g_assert (qinf->tail == q->tail); + g_assert_true (qinf->tail == q->tail); } break; case PUSH_HEAD: @@ -380,7 +392,7 @@ break; case PUSH_NTH: { - int pos = get_random_position (q, TRUE); + guint pos = get_random_position (q, TRUE); int x = g_random_int_range (0, 236546); g_queue_push_nth (q, GINT_TO_POINTER (x), pos); if (qinf->head && qinf->head->prev) @@ -413,46 +425,47 @@ case POP_NTH: if (!g_queue_is_empty (q)) { - int n = get_random_position (q, TRUE); + guint n = get_random_position (q, TRUE); gpointer elm = g_queue_peek_nth (q, n); - if (n == (int) (q->length - 1)) + if (n == q->length - 1) qinf->tail = qinf->tail->prev; if (n == 0) qinf->head = qinf->head->next; - if (n >= 0 && (guint) n < q->length) + if (n < q->length) qinf->length--; - g_assert (elm == g_queue_pop_nth (q, n)); + g_assert_true (elm == g_queue_pop_nth (q, n)); } break; case PEEK_HEAD: if (qinf->head) - g_assert (qinf->head->data == g_queue_peek_head (q)); + g_assert_true (qinf->head->data == g_queue_peek_head (q)); else - g_assert (g_queue_peek_head (q) == NULL); + g_assert_null (g_queue_peek_head (q)); break; case PEEK_TAIL: if (qinf->tail) - g_assert (qinf->tail->data == g_queue_peek_tail (q)); + g_assert_true (qinf->tail->data == g_queue_peek_tail (q)); else - g_assert (g_queue_peek_tail (q) == NULL); + g_assert_null (g_queue_peek_tail (q)); break; case PEEK_NTH: if (g_queue_is_empty (q)) { - for (j = -10; j < 10; ++j) - g_assert (g_queue_peek_nth (q, j) == NULL); + int k; + for (k = -10; k < 10; ++k) + g_assert_null (g_queue_peek_nth (q, (guint) k)); } else { GList *list; - int n = get_random_position (q, TRUE); - if (n < 0 || (guint) n >= q->length) + guint n = get_random_position (q, TRUE); + if (n >= q->length) { - g_assert (g_queue_peek_nth (q, n) == NULL); + g_assert_null (g_queue_peek_nth (q, n)); } else { @@ -460,7 +473,7 @@ for (j = 0; j < n; ++j) list = list->next; - g_assert (list->data == g_queue_peek_nth (q, n)); + g_assert_true (list->data == g_queue_peek_nth (q, n)); } } break; @@ -485,10 +498,10 @@ break; n++; } - g_assert (list); - g_assert (g_queue_index (q, GINT_TO_POINTER (x)) == - g_queue_link_index (q, list)); - g_assert (g_queue_link_index (q, list) == n); + g_assert_nonnull (list); + g_assert_cmpint (g_queue_index (q, GINT_TO_POINTER (x)), ==, + g_queue_link_index (q, list)); + g_assert_cmpint (g_queue_link_index (q, list), ==, n); qinf->head = q->head; qinf->tail = q->tail; @@ -564,10 +577,10 @@ check_integrity (q); g_queue_insert_sorted (q, GINT_TO_POINTER (max + 1), compare_int, NULL); check_integrity (q); - g_assert (GPOINTER_TO_INT (q->tail->data) == max + 1); + g_assert_cmpint (GPOINTER_TO_INT (q->tail->data), ==, max + 1); g_queue_insert_sorted (q, GINT_TO_POINTER (min - 1), compare_int, NULL); check_integrity (q); - g_assert (GPOINTER_TO_INT (q->head->data) == min - 1); + g_assert_cmpint (GPOINTER_TO_INT (q->head->data), ==, min - 1); qinf->head = q->head; qinf->tail = q->tail; qinf->length = q->length; @@ -596,7 +609,7 @@ case PUSH_NTH_LINK: { GList *link = g_list_prepend (NULL, GINT_TO_POINTER (i)); - gint n = get_random_position (q, TRUE); + guint n = get_random_position (q, TRUE); g_queue_push_nth_link (q, n, link); if (qinf->head && qinf->head->prev) @@ -632,12 +645,12 @@ break; case POP_NTH_LINK: if (g_queue_is_empty (q)) - g_assert (g_queue_pop_nth_link (q, 200) == NULL); + g_assert_null (g_queue_pop_nth_link (q, 200)); else { - int n = get_random_position (q, FALSE); + guint n = get_random_position (q, FALSE); - if (n == (int) (g_queue_get_length (q) - 1)) + if (n == g_queue_get_length (q) - 1) qinf->tail = qinf->tail->prev; if (n == 0) @@ -650,35 +663,35 @@ break; case PEEK_HEAD_LINK: if (g_queue_is_empty (q)) - g_assert (g_queue_peek_head_link (q) == NULL); + g_assert_null (g_queue_peek_head_link (q)); else - g_assert (g_queue_peek_head_link (q) == qinf->head); + g_assert_true (g_queue_peek_head_link (q) == qinf->head); break; case PEEK_TAIL_LINK: if (g_queue_is_empty (q)) - g_assert (g_queue_peek_tail_link (q) == NULL); + g_assert_null (g_queue_peek_tail_link (q)); else - g_assert (g_queue_peek_tail_link (q) == qinf->tail); + g_assert_true (g_queue_peek_tail_link (q) == qinf->tail); break; case PEEK_NTH_LINK: if (g_queue_is_empty(q)) - g_assert (g_queue_peek_nth_link (q, 1000) == NULL); + g_assert_null (g_queue_peek_nth_link (q, 1000)); else { - gint n = get_random_position (q, FALSE); + guint n = get_random_position (q, FALSE); GList *link; link = q->head; for (j = 0; j < n; ++j) link = link->next; - g_assert (g_queue_peek_nth_link (q, n) == link); + g_assert_true (g_queue_peek_nth_link (q, n) == link); } break; case UNLINK: if (!g_queue_is_empty (q)) { - gint n = g_random_int_range (0, g_queue_get_length (q)); + guint n = g_random_int_range (0, g_queue_get_length (q)); GList *link; link = q->head; @@ -698,7 +711,7 @@ case DELETE_LINK: if (!g_queue_is_empty (q)) { - gint n = g_random_int_range (0, g_queue_get_length (q)); + guint n = g_random_int_range (0, g_queue_get_length (q)); GList *link; link = q->head; @@ -724,15 +737,15 @@ qinf->length != q->length) g_printerr ("op: %d\n", op); - g_assert (qinf->head == q->head); - g_assert (qinf->tail == q->tail); - g_assert (qinf->length == q->length); + g_assert_true (qinf->head == q->head); + g_assert_true (qinf->tail == q->tail); + g_assert_cmpuint (qinf->length, ==, q->length); - for (j = 0; j < N_QUEUES; ++j) + for (j = 0; j < G_N_ELEMENTS (queues); ++j) check_integrity (queuesj.queue); } - for (i = 0; i < N_QUEUES; ++i) + for (i = 0; i < G_N_ELEMENTS (queues); ++i) g_queue_free (queuesi.queue); } @@ -753,88 +766,88 @@ q = g_queue_new (); - g_assert (g_queue_is_empty (q)); + g_assert_true (g_queue_is_empty (q)); g_queue_push_head (q, GINT_TO_POINTER (2)); check_integrity (q); - g_assert (g_queue_peek_head (q) == GINT_TO_POINTER (2)); + g_assert_cmpint (GPOINTER_TO_INT (g_queue_peek_head (q)), ==, 2); check_integrity (q); - g_assert (!g_queue_is_empty (q)); + g_assert_false (g_queue_is_empty (q)); check_integrity (q); g_assert_cmpint (g_list_length (q->head), ==, 1); - g_assert (q->head == q->tail); + g_assert_true (q->head == q->tail); g_queue_push_head (q, GINT_TO_POINTER (1)); check_integrity (q); - g_assert (q->head->next == q->tail); - g_assert (q->tail->prev == q->head); + g_assert_true (q->head->next == q->tail); + g_assert_true (q->tail->prev == q->head); g_assert_cmpint (g_list_length (q->head), ==, 2); check_integrity (q); - g_assert (q->tail->data == GINT_TO_POINTER (2)); - g_assert (q->head->data == GINT_TO_POINTER (1)); + g_assert_cmpint (GPOINTER_TO_INT (q->tail->data), ==, 2); + g_assert_cmpint (GPOINTER_TO_INT (q->head->data), ==, 1); check_integrity (q); g_queue_push_tail (q, GINT_TO_POINTER (3)); g_assert_cmpint (g_list_length (q->head), ==, 3); - g_assert (q->head->data == GINT_TO_POINTER (1)); - g_assert (q->head->next->data == GINT_TO_POINTER (2)); - g_assert (q->head->next->next == q->tail); - g_assert (q->head->next == q->tail->prev); - g_assert (q->tail->data == GINT_TO_POINTER (3)); + g_assert_cmpint (GPOINTER_TO_INT (q->head->data), ==, 1); + g_assert_cmpint (GPOINTER_TO_INT (q->head->next->data), ==, 2); + g_assert_true (q->head->next->next == q->tail); + g_assert_true (q->head->next == q->tail->prev); + g_assert_cmpint (GPOINTER_TO_INT (q->tail->data), ==, 3); g_queue_push_tail (q, GINT_TO_POINTER (4)); check_integrity (q); g_assert_cmpint (g_list_length (q->head), ==, 4); - g_assert (q->head->data == GINT_TO_POINTER (1)); - g_assert (g_queue_peek_tail (q) == GINT_TO_POINTER (4)); + g_assert_cmpint (GPOINTER_TO_INT (q->head->data), ==, 1); + g_assert_cmpint (GPOINTER_TO_INT (g_queue_peek_tail (q)), ==, 4); g_queue_push_tail (q, GINT_TO_POINTER (5)); check_integrity (q); g_assert_cmpint (g_list_length (q->head), ==, 5); - g_assert (g_queue_is_empty (q) == FALSE); + g_assert_false (g_queue_is_empty (q)); check_integrity (q); g_assert_cmpint (q->length, ==, 5); - g_assert (q->head->prev == NULL); - g_assert (q->head->data == GINT_TO_POINTER (1)); - g_assert (q->head->next->data == GINT_TO_POINTER (2)); - g_assert (q->head->next->next->data == GINT_TO_POINTER (3)); - g_assert (q->head->next->next->next->data == GINT_TO_POINTER (4)); - g_assert (q->head->next->next->next->next->data == GINT_TO_POINTER (5)); - g_assert (q->head->next->next->next->next->next == NULL); - g_assert (q->head->next->next->next->next == q->tail); - g_assert (q->tail->data == GINT_TO_POINTER (5)); - g_assert (q->tail->prev->data == GINT_TO_POINTER (4)); - g_assert (q->tail->prev->prev->data == GINT_TO_POINTER (3)); - g_assert (q->tail->prev->prev->prev->data == GINT_TO_POINTER (2)); - g_assert (q->tail->prev->prev->prev->prev->data == GINT_TO_POINTER (1)); - g_assert (q->tail->prev->prev->prev->prev->prev == NULL); - g_assert (q->tail->prev->prev->prev->prev == q->head); - g_assert (g_queue_peek_tail (q) == GINT_TO_POINTER (5)); - g_assert (g_queue_peek_head (q) == GINT_TO_POINTER (1)); - g_assert (g_queue_pop_head (q) == GINT_TO_POINTER (1)); + g_assert_null (q->head->prev); + g_assert_cmpint (GPOINTER_TO_INT (q->head->data), ==, 1); + g_assert_cmpint (GPOINTER_TO_INT (q->head->next->data), ==, 2); + g_assert_cmpint (GPOINTER_TO_INT (q->head->next->next->data), ==, 3); + g_assert_cmpint (GPOINTER_TO_INT (q->head->next->next->next->data), ==, 4); + g_assert_cmpint (GPOINTER_TO_INT (q->head->next->next->next->next->data), ==, 5); + g_assert_null (q->head->next->next->next->next->next); + g_assert_true (q->head->next->next->next->next == q->tail); + g_assert_cmpint (GPOINTER_TO_INT (q->tail->data), ==, 5); + g_assert_cmpint (GPOINTER_TO_INT (q->tail->prev->data), ==, 4); + g_assert_cmpint (GPOINTER_TO_INT (q->tail->prev->prev->data), ==, 3); + g_assert_cmpint (GPOINTER_TO_INT (q->tail->prev->prev->prev->data), ==, 2); + g_assert_cmpint (GPOINTER_TO_INT (q->tail->prev->prev->prev->prev->data), ==, 1); + g_assert_null (q->tail->prev->prev->prev->prev->prev); + g_assert_true (q->tail->prev->prev->prev->prev == q->head); + g_assert_cmpint (GPOINTER_TO_INT (g_queue_peek_tail (q)), ==, 5); + g_assert_cmpint (GPOINTER_TO_INT (g_queue_peek_head (q)), ==, 1); + g_assert_cmpint (GPOINTER_TO_INT (g_queue_pop_head (q)), ==, 1); check_integrity (q); g_assert_cmpint (g_list_length (q->head), ==, 4); g_assert_cmpint (q->length, ==, 4); - g_assert (g_queue_pop_tail (q) == GINT_TO_POINTER (5)); + g_assert_cmpint (GPOINTER_TO_INT (g_queue_pop_tail (q)), ==, 5); check_integrity (q); g_assert_cmpint (g_list_length (q->head), ==, 3); node = g_queue_pop_head_link (q); - g_assert (node->data == GINT_TO_POINTER (2)); + g_assert_cmpint (GPOINTER_TO_INT (node->data), ==, 2); g_list_free_1 (node); check_integrity (q); g_assert_cmpint (g_list_length (q->head), ==, 2); - g_assert (g_queue_pop_tail (q) == GINT_TO_POINTER (4)); + g_assert_cmpint (GPOINTER_TO_INT (g_queue_pop_tail (q)), ==, 4); check_integrity (q); g_assert_cmpint (g_list_length (q->head), ==, 1); node = g_queue_pop_head_link (q); - g_assert (node->data == GINT_TO_POINTER (3)); + g_assert_cmpint (GPOINTER_TO_INT (node->data), ==, 3); g_list_free_1 (node); check_integrity (q); g_assert_cmpint (g_list_length (q->head), ==, 0); - g_assert (g_queue_pop_tail (q) == NULL); + g_assert_null (g_queue_pop_tail (q)); check_integrity (q); g_assert_cmpint (g_list_length (q->head), ==, 0); - g_assert (g_queue_pop_head (q) == NULL); + g_assert_null (g_queue_pop_head (q)); check_integrity (q); g_assert_cmpint (g_list_length (q->head), ==, 0); - g_assert (g_queue_is_empty (q)); + g_assert_true (g_queue_is_empty (q)); check_integrity (q); g_queue_push_head (q, GINT_TO_POINTER (1)); @@ -857,31 +870,31 @@ check_integrity (q); g_assert_cmpint (g_list_length (q->head), ==, 5); g_assert_cmpint (q->length, ==, 5); - g_assert (g_queue_pop_head (q) == GINT_TO_POINTER (5)); + g_assert_cmpint (GPOINTER_TO_INT (g_queue_pop_head (q)), ==, 5); check_integrity (q); g_assert_cmpint (g_list_length (q->head), ==, 4); node = q->tail; - g_assert (node == g_queue_pop_tail_link (q)); + g_assert_true (node == g_queue_pop_tail_link (q)); check_integrity (q); g_list_free_1 (node); g_assert_cmpint (g_list_length (q->head), ==, 3); data = q->head->data; - g_assert (data == g_queue_pop_head (q)); + g_assert_true (data == g_queue_pop_head (q)); check_integrity (q); g_assert_cmpint (g_list_length (q->head), ==, 2); - g_assert (g_queue_pop_tail (q) == GINT_TO_POINTER (2)); + g_assert_cmpint (GPOINTER_TO_INT (g_queue_pop_tail (q)), ==, 2); check_integrity (q); g_assert_cmpint (g_list_length (q->head), ==, 1); - g_assert (q->head == q->tail); - g_assert (g_queue_pop_tail (q) == GINT_TO_POINTER (3)); + g_assert_true (q->head == q->tail); + g_assert_cmpint (GPOINTER_TO_INT (g_queue_pop_tail (q)), ==, 3); check_integrity (q); g_assert_cmpint (g_list_length (q->head), ==, 0); - g_assert (g_queue_pop_head (q) == NULL); + g_assert_null (g_queue_pop_head (q)); check_integrity (q); - g_assert (g_queue_pop_head_link (q) == NULL); + g_assert_null (g_queue_pop_head_link (q)); check_integrity (q); g_assert_cmpint (g_list_length (q->head), ==, 0); - g_assert (g_queue_pop_tail_link (q) == NULL); + g_assert_null (g_queue_pop_tail_link (q)); check_integrity (q); g_assert_cmpint (g_list_length (q->head), ==, 0); @@ -913,7 +926,7 @@ for (i = 0; i < 200; ++i) { g_queue_push_nth (q, GINT_TO_POINTER (i), i); - g_assert (g_queue_find (q, GINT_TO_POINTER (i))); + g_assert_nonnull (g_queue_find (q, GINT_TO_POINTER (i))); check_integrity (q); check_integrity (q2); } @@ -959,15 +972,22 @@ g_queue_push_tail (q, GINT_TO_POINTER (1234)); check_integrity (q); node = g_queue_peek_tail_link (q); - g_assert (node != NULL && node->data == GINT_TO_POINTER (1234)); + g_assert_nonnull (node); + g_assert_cmpint (GPOINTER_TO_INT (node->data), ==, 1234); + node = g_queue_peek_nth_link (q, g_queue_get_length (q)); - g_assert (node == NULL); + g_assert_null (node); + node = g_queue_peek_nth_link (q, g_queue_get_length (q) - 1); - g_assert (node->data == GINT_TO_POINTER (1234)); + g_assert_cmpint (GPOINTER_TO_INT (node->data), ==, 1234); + node = g_queue_pop_nth_link (q, g_queue_get_length (q)); - g_assert (node == NULL); + g_assert_null (node); + node = g_queue_pop_nth_link (q, g_queue_get_length (q) - 1); - g_assert (node != NULL && node->data == GINT_TO_POINTER (1234)); + g_assert_nonnull (node); + g_assert_cmpint (GPOINTER_TO_INT (node->data), ==, 1234); + g_list_free_1 (node); g_queue_free (q); @@ -990,11 +1010,11 @@ g_queue_push_tail (q, GINT_TO_POINTER (1)); g_queue_push_tail (q, GINT_TO_POINTER (2)); node = g_queue_find_custom (q, GINT_TO_POINTER (1), find_custom); - g_assert (node != NULL); + g_assert_nonnull (node); node = g_queue_find_custom (q, GINT_TO_POINTER (2), find_custom); - g_assert (node != NULL); + g_assert_nonnull (node); node = g_queue_find_custom (q, GINT_TO_POINTER (3), find_custom); - g_assert (node == NULL); + g_assert_null (node); g_queue_free (q); } @@ -1008,10 +1028,10 @@ g_queue_init (&q); check_integrity (&q); - g_assert (g_queue_is_empty (&q)); + g_assert_true (g_queue_is_empty (&q)); check_integrity (&q2); - g_assert (g_queue_is_empty (&q2)); + g_assert_true (g_queue_is_empty (&q2)); } static void @@ -1027,7 +1047,7 @@ g_queue_clear (q); check_integrity (q); - g_assert (g_queue_is_empty (q)); + g_assert_true (g_queue_is_empty (q)); g_queue_free (q); } @@ -1223,13 +1243,13 @@ g_queue_push_tail (queue, one = new_item (1)); g_queue_push_tail (queue, two = new_item (2)); g_queue_push_tail (queue, three = new_item (3)); - g_assert (!one->freed); - g_assert (!two->freed); - g_assert (!three->freed); + g_assert_false (one->freed); + g_assert_false (two->freed); + g_assert_false (three->freed); g_queue_free_full (queue, free_func); - g_assert (one->freed); - g_assert (two->freed); - g_assert (three->freed); + g_assert_true (one->freed); + g_assert_true (two->freed); + g_assert_true (three->freed); g_slice_free (QueueItem, one); g_slice_free (QueueItem, two); g_slice_free (QueueItem, three);
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/tests/rand.c -> _service:tar_scm:glib-2.76.4.tar.xz/glib/tests/rand.c
Changed
@@ -1,6 +1,8 @@ /* Unit tests for grand * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald * + * SPDX-License-Identifier: LicenseRef-old-glib-tests + * * This work is provided "as is"; redistribution and modification * in whole or in part, in any medium, physical or electronic is * permitted without restriction.
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/tests/rec-mutex.c -> _service:tar_scm:glib-2.76.4.tar.xz/glib/tests/rec-mutex.c
Changed
@@ -2,6 +2,8 @@ * Copyright (C) 2011 Red Hat, Inc * Author: Matthias Clasen * + * SPDX-License-Identifier: LicenseRef-old-glib-tests + * * This work is provided "as is"; redistribution and modification * in whole or in part, in any medium, physical or electronic is * permitted without restriction.
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/tests/regex.c -> _service:tar_scm:glib-2.76.4.tar.xz/glib/tests/regex.c
Changed
@@ -2480,6 +2480,39 @@ g_regex_unref (regex); } +static void +test_unmatched_named_subpattern (void) +{ + GRegex *regex = NULL; + GMatchInfo *match_info = NULL; + const char *string = "Test"; + + g_test_summary ("Test that unmatched subpatterns can still be queried"); + g_test_bug ("https://gitlab.gnome.org/GNOME/glib/-/issues/2881"); + + regex = g_regex_new ("((?<Key>^\\s\"'\\=+)|\"(?<Key>^\"*)\"|'(?<Key>^'*)')" + "(?:\\=((?<Value>^\\s\"'+)|\"(?<Value>^\"*)\"|'(?<Value>^'*)'))?", + G_REGEX_DUPNAMES, 0, NULL); + + g_assert_true (g_regex_match (regex, string, 0, &match_info)); + + while (g_match_info_matches (match_info)) + { + char *key = g_match_info_fetch_named (match_info, "Key"); + char *value = g_match_info_fetch_named (match_info, "Value"); + + g_assert_cmpstr (key, ==, "Test"); + g_assert_cmpstr (value, ==, ""); + + g_free (key); + g_free (value); + g_match_info_next (match_info, NULL); + } + + g_match_info_unref (match_info); + g_regex_unref (regex); +} + int main (int argc, char *argv) { @@ -2499,6 +2532,7 @@ g_test_add_func ("/regex/max-lookbehind", test_max_lookbehind); g_test_add_func ("/regex/compile-errors", test_compile_errors); g_test_add_func ("/regex/jit-unsupported-matching", test_jit_unsupported_matching_options); + g_test_add_func ("/regex/unmatched-named-subpattern", test_unmatched_named_subpattern); /* TEST_NEW(pattern, compile_opts, match_opts) */ TEST_NEW("A-Z+", G_REGEX_CASELESS | G_REGEX_EXTENDED | G_REGEX_OPTIMIZE, G_REGEX_MATCH_NOTBOL | G_REGEX_MATCH_PARTIAL);
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/tests/rwlock.c -> _service:tar_scm:glib-2.76.4.tar.xz/glib/tests/rwlock.c
Changed
@@ -2,6 +2,8 @@ * Copyright (C) 2011 Red Hat, Inc * Author: Matthias Clasen * + * SPDX-License-Identifier: LicenseRef-old-glib-tests + * * This work is provided "as is"; redistribution and modification * in whole or in part, in any medium, physical or electronic is * permitted without restriction.
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/tests/sequence.c -> _service:tar_scm:glib-2.76.4.tar.xz/glib/tests/sequence.c
Changed
@@ -122,7 +122,7 @@ { GList *list; GSequenceIter *iter; - int i; + unsigned int i; g_sequence_check (info->sequence); @@ -149,6 +149,7 @@ i++; } + g_assert_cmpuint (i, ==, info->n_items); g_assert (info->n_items == g_queue_get_length (info->queue)); g_assert ((guint) g_sequence_get_length (info->sequence) == info->n_items); }
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/tests/slice.c -> _service:tar_scm:glib-2.76.4.tar.xz/glib/tests/slice.c
Changed
@@ -4,66 +4,6 @@ /* We test deprecated functionality here */ G_GNUC_BEGIN_IGNORE_DEPRECATIONS -#ifdef G_ENABLE_DEBUG -static void -test_slice_nodebug (void) -{ - const gchar *oldval; - - oldval = g_getenv ("G_SLICE"); - g_unsetenv ("G_SLICE"); - - if (g_test_subprocess ()) - { - gpointer p, q; - - p = g_slice_alloc (237); - q = g_slice_alloc (259); - g_slice_free1 (237, p); - g_slice_free1 (259, q); - - g_slice_debug_tree_statistics (); - return; - } - g_test_trap_subprocess (NULL, 1000000, G_TEST_SUBPROCESS_DEFAULT); - g_test_trap_assert_passed (); - g_test_trap_assert_stderr ("*GSlice: MemChecker: root=NULL*"); - - if (oldval) - g_setenv ("G_SLICE", oldval, TRUE); -} - -static void -test_slice_debug (void) -{ - const gchar *oldval; - - oldval = g_getenv ("G_SLICE"); - g_setenv ("G_SLICE", "debug-blocks:always-malloc", TRUE); - - if (g_test_subprocess ()) - { - gpointer p, q; - - p = g_slice_alloc (237); - q = g_slice_alloc (259); - g_slice_free1 (237, p); - g_slice_free1 (259, q); - - g_slice_debug_tree_statistics (); - return; - } - g_test_trap_subprocess (NULL, 1000000, G_TEST_SUBPROCESS_DEFAULT); - g_test_trap_assert_passed (); - g_test_trap_assert_stderr ("*GSlice: MemChecker: * trunks, * branches, * old branches*"); - - if (oldval) - g_setenv ("G_SLICE", oldval, TRUE); - else - g_unsetenv ("G_SLICE"); -} -#endif - static void test_slice_copy (void) { @@ -155,10 +95,6 @@ { g_test_init (&argc, &argv, NULL); -#ifdef G_ENABLE_DEBUG - g_test_add_func ("/slice/nodebug", test_slice_nodebug); - g_test_add_func ("/slice/debug", test_slice_debug); -#endif g_test_add_func ("/slice/copy", test_slice_copy); g_test_add_func ("/slice/chain", test_chain); g_test_add_func ("/slice/allocate", test_allocate);
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/tests/spawn-multithreaded.c -> _service:tar_scm:glib-2.76.4.tar.xz/glib/tests/spawn-multithreaded.c
Changed
@@ -1,6 +1,8 @@ /* * Copyright (C) 2011 Red Hat, Inc. * + * SPDX-License-Identifier: LicenseRef-old-glib-tests + * * This work is provided "as is"; redistribution and modification * in whole or in part, in any medium, physical or electronic is * permitted without restriction. @@ -31,7 +33,10 @@ #include <sys/types.h> static char *echo_prog_path; + +#ifdef G_OS_WIN32 static char *sleep_prog_path; +#endif #ifdef G_OS_UNIX #include <unistd.h> @@ -423,14 +428,15 @@ dirname = g_path_get_dirname (argv0); echo_prog_path = g_build_filename (dirname, "test-spawn-echo" EXEEXT, NULL); - sleep_prog_path = g_build_filename (dirname, "test-spawn-sleep" EXEEXT, NULL); - g_free (dirname); g_assert (g_file_test (echo_prog_path, G_FILE_TEST_EXISTS)); #ifdef G_OS_WIN32 + sleep_prog_path = g_build_filename (dirname, "test-spawn-sleep" EXEEXT, NULL); g_assert (g_file_test (sleep_prog_path, G_FILE_TEST_EXISTS)); #endif + g_clear_pointer (&dirname, g_free); + g_test_add_func ("/gthread/spawn-childs", test_spawn_childs); g_test_add_func ("/gthread/spawn-childs-threads", test_spawn_childs_threads); g_test_add_func ("/gthread/spawn-sync", test_spawn_sync_multithreaded); @@ -439,7 +445,10 @@ ret = g_test_run(); g_free (echo_prog_path); + +#ifdef G_OS_WIN32 g_free (sleep_prog_path); +#endif return ret; }
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/tests/spawn-singlethread.c -> _service:tar_scm:glib-2.76.4.tar.xz/glib/tests/spawn-singlethread.c
Changed
@@ -1,6 +1,8 @@ /* * Copyright (C) 2011 Red Hat, Inc. * + * SPDX-License-Identifier: LicenseRef-old-glib-tests + * * This work is provided "as is"; redistribution and modification * in whole or in part, in any medium, physical or electronic is * permitted without restriction. @@ -317,6 +319,39 @@ } static void +test_spawn_async_with_invalid_fds (void) +{ + const gchar *argv = { echo_prog_path, "thread 0", NULL }; + gint source_fds1000; + GError *local_error = NULL; + gboolean retval; + gsize i; + + /* Create an identity mapping from 0, …, 999. This is very likely going to + * conflict with the internal FDs, as it covers a lot of the FD space + * (including stdin, stdout and stderr, though we don’t care about them in + * this test). + * + * Skip the test if we somehow avoid a collision. */ + for (i = 0; i < G_N_ELEMENTS (source_fds); i++) + source_fdsi = i; + + retval = g_spawn_async_with_pipes_and_fds (NULL, argv, NULL, G_SPAWN_DEFAULT, + NULL, NULL, -1, -1, -1, + source_fds, source_fds, G_N_ELEMENTS (source_fds), + NULL, NULL, NULL, NULL, + &local_error); + if (retval) + { + g_test_skip ("Skipping internal FDs check as test didn’t manage to trigger a collision"); + return; + } + g_assert_false (retval); + g_assert_error (local_error, G_SPAWN_ERROR, G_SPAWN_ERROR_INVAL); + g_error_free (local_error); +} + +static void test_spawn_sync (void) { int tnum = 1; @@ -574,6 +609,7 @@ g_test_add_func ("/gthread/spawn-stderr-socket", test_spawn_stderr_socket); g_test_add_func ("/gthread/spawn-single-async", test_spawn_async); g_test_add_func ("/gthread/spawn-single-async-with-fds", test_spawn_async_with_fds); + g_test_add_func ("/gthread/spawn-async-with-invalid-fds", test_spawn_async_with_invalid_fds); g_test_add_func ("/gthread/spawn-script", test_spawn_script); g_test_add_func ("/gthread/spawn/nonexistent", test_spawn_nonexistent); g_test_add_func ("/gthread/spawn-posix-spawn", test_posix_spawn);
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/tests/spawn-test-win32-gui.c -> _service:tar_scm:glib-2.76.4.tar.xz/glib/tests/spawn-test-win32-gui.c
Changed
@@ -26,7 +26,7 @@ } else if (__argc <= 2) { - printf ("This is stdout\n"); + printf ("# This is stdout\n"); fflush (stdout); fprintf (stderr, "This is stderr\n"); @@ -41,36 +41,36 @@ if (infd < 0 || outfd < 0) { - printf ("spawn-test-win32-gui: illegal fds on command line %s", + fprintf (stderr, "spawn-test-win32-gui: illegal fds on command line %s\n", lpszCmdLine); exit (1); } n = strlen ("Hello there"); if (write (outfd, &n, sizeof (n)) == -1 || - write (outfd, "Hello there", n) == -1) + write (outfd, "Hello there\n", n) == -1) { int errsv = errno; - printf ("spawn-test-win32-gui: Write error: %s", strerror (errsv)); + fprintf (stderr, "spawn-test-win32-gui: Write error: %s\n", strerror (errsv)); exit (1); } if ((k = read (infd, &n, sizeof (n))) != sizeof (n)) { - printf ("spawn-test-win32-gui: Got only %d bytes, wanted %d", + fprintf (stderr, "spawn-test-win32-gui: Got only %d bytes, wanted %d\n", k, (int)sizeof (n)); exit (1); } - printf ("spawn-test-win32-gui: Parent says %d bytes to read", n); + fprintf (stderr, "spawn-test-win32-gui: Parent says %d bytes to read\n", n); if ((k = read (infd, buf, n)) != n) { int errsv = errno; if (k == -1) - printf ("spawn-test-win32-gui: Read error: %s", strerror (errsv)); + fprintf (stderr, "spawn-test-win32-gui: Read error: %s\n", strerror (errsv)); else - printf ("spawn-test-win32-gui: Got only %d bytes", k); + fprintf (stderr, "spawn-test-win32-gui: Got only %d bytes\n", k); exit (1); } @@ -79,7 +79,7 @@ write (outfd, "See ya", n) == -1) { int errsv = errno; - printf ("spawn-test-win32-gui: Write error: %s", strerror (errsv)); + fprintf (stderr, "spawn-test-win32-gui: Write error: %s\n", strerror (errsv)); exit (1); } }
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/tests/spawn-test.c -> _service:tar_scm:glib-2.76.4.tar.xz/glib/tests/spawn-test.c
Changed
@@ -27,7 +27,13 @@ #include <glib.h> #include <glib/gstdio.h> +#ifdef G_OS_UNIX +#include <unistd.h> +#endif + #ifdef G_OS_WIN32 +#define WIN32_LEAN_AND_MEAN +#include <windows.h> #include <fcntl.h> #include <io.h> #define pipe(fds) _pipe(fds, 4096, _O_BINARY) @@ -37,6 +43,24 @@ static gchar *dirname = NULL; #endif +#ifdef G_OS_WIN32 +static char * +get_system_directory (void) +{ + wchar_t path_utf16MAX_PATH = {0}; + char *path = NULL; + + if (!GetSystemDirectoryW (path_utf16, G_N_ELEMENTS (path_utf16))) + g_error ("%s failed with error code %u", "GetSystemWindowsDirectory", + (unsigned int) GetLastError ()); + + path = g_utf16_to_utf8 (path_utf16, -1, NULL, NULL, NULL); + g_assert_nonnull (path); + + return path; +} +#endif + static void test_spawn_basics (void) { @@ -49,12 +73,18 @@ char buf100; int pipedown2, pipeup2; gchar **argv = NULL; + gchar *system_directory; gchar spawn_binary1000 = {0}; gchar full_cmdline1000 = {0}; + const LCID old_lcid = GetThreadUILanguage (); + const unsigned int initial_cp = GetConsoleOutputCP (); + + SetConsoleOutputCP (437); /* 437 means en-US codepage */ + SetThreadUILanguage (MAKELCID (MAKELANGID (LANG_ENGLISH, SUBLANG_ENGLISH_US), SORT_DEFAULT)); + system_directory = get_system_directory (); g_snprintf (spawn_binary, sizeof (spawn_binary), "%s\\spawn-test-win32-gui.exe", dirname); - g_free (dirname); #endif err = NULL; @@ -88,16 +118,30 @@ /* Running sort synchronously, collecting its output. 'sort' command * is selected because it is non-builtin command on both unix and * win32 with well-defined stdout behaviour. + * On win32 we use an absolute path to the system-provided sort.exe + * because a different sort.exe may be available in PATH. This is + * important e.g for the MSYS2 environment, which provides coreutils + * sort.exe */ g_file_set_contents ("spawn-test-created-file.txt", "line first\nline 2\nline last\n", -1, &err); g_assert_no_error(err); +#ifndef G_OS_WIN32 result = g_spawn_command_line_sync ("sort spawn-test-created-file.txt", &output, &erroutput, NULL, &err); +#else + g_snprintf (full_cmdline, sizeof (full_cmdline), + "'%s\\sort.exe' spawn-test-created-file.txt", system_directory); + result = g_spawn_command_line_sync (full_cmdline, &output, &erroutput, NULL, &err); +#endif g_assert_no_error (err); g_assert_true (result); - g_assert_cmpstr (output, ==, "line 2\nline first\nline last\n"); + g_assert_nonnull (output); + if (strchr (output, '\r') != NULL) + g_assert_cmpstr (output, ==, "line 2\r\nline first\r\nline last\r\n"); + else + g_assert_cmpstr (output, ==, "line 2\nline first\nline last\n"); g_assert_cmpstr (erroutput, ==, ""); g_free (output); @@ -105,13 +149,29 @@ g_free (erroutput); erroutput = NULL; +#ifndef G_OS_WIN32 result = g_spawn_command_line_sync ("sort non-existing-file.txt", NULL, &erroutput, NULL, &err); +#else + g_snprintf (full_cmdline, sizeof (full_cmdline), + "'%s\\sort.exe' non-existing-file.txt", system_directory); + result = g_spawn_command_line_sync (full_cmdline, NULL, &erroutput, NULL, &err); +#endif g_assert_no_error (err); g_assert_true (result); +#ifndef G_OS_WIN32 + /* Test against output of coreutils sort */ g_assert_true (g_str_has_prefix (erroutput, "sort: ")); - g_assert_nonnull (strstr (erroutput, "No such file or directory")); - + g_assert_nonnull (strstr (erroutput, g_strerror (ENOENT))); +#else + /* Test against output of windows sort */ + { + gchar *file_not_found_message = g_win32_error_message (ERROR_FILE_NOT_FOUND); + g_test_message ("sort output: %s\nExpected message: %s", erroutput, file_not_found_message); + g_assert_nonnull (strstr (erroutput, file_not_found_message)); + g_free (file_not_found_message); + } +#endif g_free (erroutput); erroutput = NULL; g_unlink ("spawn-test-created-file.txt"); @@ -132,7 +192,7 @@ g_assert_no_error (err); g_assert_true (result); - g_assert_cmpstr (output, ==, "This is stdout\r\n"); + g_assert_cmpstr (output, ==, "# This is stdout\r\n"); g_assert_cmpstr (erroutput, ==, "This is stderr\r\n"); g_free (output); @@ -194,12 +254,132 @@ bufn = '\0'; g_assert_cmpstr (buf, ==, "See ya"); #endif + +#ifdef G_OS_WIN32 + SetThreadUILanguage (old_lcid); + SetConsoleOutputCP (initial_cp); /* 437 means en-US codepage */ + g_free (system_directory); +#endif +} + +#ifdef G_OS_UNIX +static void +test_spawn_stdio_overwrite (void) +{ + gboolean result; + int ret; + GError *error = NULL; + int old_stdin_fd = -1; + int old_stdout_fd = -1; + int old_stderr_fd = -1; + char **envp = g_get_environ (); + enum OpenState { OPENED = 0, CLOSED = 1, DONE = 2 } stdin_state, stdout_state, stderr_state, output_return_state, error_return_state; + + g_test_bug ("https://gitlab.gnome.org/GNOME/glib/-/issues/16"); + + old_stdin_fd = dup (STDIN_FILENO); + old_stdout_fd = dup (STDOUT_FILENO); + old_stderr_fd = dup (STDERR_FILENO); + + for (output_return_state = OPENED; output_return_state != DONE; output_return_state++) + for (error_return_state = OPENED; error_return_state != DONE; error_return_state++) + for (stdin_state = OPENED; stdin_state != DONE; stdin_state++) + for (stdout_state = OPENED; stdout_state != DONE; stdout_state++) + for (stderr_state = OPENED; stderr_state != DONE; stderr_state++) + { + char *command_line = NULL; + char **argv = NULL; + gchar *standard_output = NULL; + gchar *standard_error = NULL; + + g_test_message ("Fetching GSpawn result %s%s%s with stdin %s, stdout %s, stderr %s", + output_return_state == OPENED? "output" : "", + output_return_state == OPENED && error_return_state == OPENED? " and " : "", + error_return_state == OPENED? "error output" : "", + stdin_state == CLOSED? "already closed" : "open", + stdout_state == CLOSED? "already closed" : "open", + stderr_state == CLOSED? "already closed" : "open"); + + if (stdin_state == CLOSED) + { + g_close (STDIN_FILENO, &error); + g_assert_no_error (error); + } + + if (stdout_state == CLOSED) + { + g_close (STDOUT_FILENO, &error); + g_assert_no_error (error); + } + + if (stderr_state == CLOSED) + { + g_close (STDERR_FILENO, &error); + g_assert_no_error (error); + } + + command_line = g_strdup_printf ("/bin/sh -c '%s%s%s'", + output_return_state == OPENED? "echo stdout": "", + output_return_state == OPENED && error_return_state == OPENED? ";" : "", + error_return_state == OPENED? "echo stderr >&2": ""); + g_shell_parse_argv (command_line, NULL, &argv, &error); + g_assert_no_error (error); + + g_clear_pointer (&command_line, g_free); + + result = g_spawn_sync (NULL, + argv, envp, G_SPAWN_SEARCH_PATH_FROM_ENVP, + NULL, NULL, + output_return_state == OPENED? &standard_output : NULL, + error_return_state == OPENED? &standard_error: NULL, + NULL, + &error); + g_clear_pointer (&argv, g_strfreev); + + ret = dup2 (old_stderr_fd, STDERR_FILENO); + g_assert_cmpint (ret, ==, STDERR_FILENO); + + ret = dup2 (old_stdout_fd, STDOUT_FILENO); + g_assert_cmpint (ret, ==, STDOUT_FILENO); + + ret = dup2 (old_stdin_fd, STDIN_FILENO); + g_assert_cmpint (ret, ==, STDIN_FILENO); + + g_assert_no_error (error); + g_assert_true (result); + + if (output_return_state == OPENED) + { + g_assert_cmpstr (standard_output, ==, "stdout\n"); + g_clear_pointer (&standard_output, g_free); + } + + if (error_return_state == OPENED) + { + g_assert_cmpstr (standard_error, ==, "stderr\n"); + g_clear_pointer (&standard_error, g_free); + } + } + + g_clear_fd (&old_stdin_fd, &error); + g_assert_no_error (error); + + g_clear_fd (&old_stdout_fd, &error); + g_assert_no_error (error); + + g_clear_fd (&old_stderr_fd, &error); + g_assert_no_error (error); + + g_clear_pointer (&envp, g_strfreev); } +#endif int main (int argc, char *argv) { + int ret_val; + #ifdef G_OS_WIN32 dirname = g_path_get_dirname (argv0); #endif @@ -207,6 +387,14 @@ g_test_init (&argc, &argv, NULL); g_test_add_func ("/spawn/basics", test_spawn_basics); +#ifdef G_OS_UNIX + g_test_add_func ("/spawn/stdio-overwrite", test_spawn_stdio_overwrite); +#endif - return g_test_run (); + ret_val = g_test_run (); + +#ifdef G_OS_WIN32 + g_free (dirname); +#endif + return ret_val; }
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/tests/strfuncs.c -> _service:tar_scm:glib-2.76.4.tar.xz/glib/tests/strfuncs.c
Changed
@@ -1,6 +1,8 @@ /* Unit tests for gstrfuncs * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald * + * SPDX-License-Identifier: LicenseRef-old-glib-tests + * * This work is provided "as is"; redistribution and modification * in whole or in part, in any medium, physical or electronic is * permitted without restriction. @@ -497,12 +499,58 @@ { gchar *str; + g_assert_null ((g_strdup) (NULL)); + + str = (g_strdup) (GLIB_TEST_STRING); + g_assert_nonnull (str); + g_assert_cmpstr (str, ==, GLIB_TEST_STRING); + + char *other_str = (g_strdup) (str); + g_free (str); + + g_assert_nonnull (other_str); + g_assert_cmpstr (other_str, ==, GLIB_TEST_STRING); + g_clear_pointer (&other_str, g_free); + + str = (g_strdup) (""); + g_assert_cmpint (str0, ==, '\0'); + g_assert_cmpstr (str, ==, ""); + g_clear_pointer (&str, g_free); +} + +static void +test_strdup_inline (void) +{ + gchar *str; + + #if G_GNUC_CHECK_VERSION (2, 0) + #ifndef g_strdup + #error g_strdup() should be defined as a macro in this platform! + #endif + #else + g_test_incomplete ("g_strdup() is not inlined in this platform"); + #endif + + /* Testing inline version of g_strdup() function with various positive and + * negative cases */ + g_assert_null (g_strdup (NULL)); str = g_strdup (GLIB_TEST_STRING); g_assert_nonnull (str); g_assert_cmpstr (str, ==, GLIB_TEST_STRING); - g_free (str); + + char *other_str = g_strdup (str); + g_clear_pointer (&str, g_free); + + g_assert_nonnull (other_str); + g_assert_cmpstr (other_str, ==, GLIB_TEST_STRING); + g_clear_pointer (&other_str, g_free); + + str = g_strdup (""); + g_assert_cmpint (str0, ==, '\0'); + g_assert_cmpstr (str, ==, ""); + g_clear_pointer (&str, g_free); } /* Testing g_strndup() function with various positive and negative cases */ @@ -1200,89 +1248,151 @@ g_free (string); } -/* Testing g_str_has_prefix() */ +/* Testing g_str_has_prefix() function avoiding the optimizing macro */ static void test_has_prefix (void) { - gboolean res; - if (g_test_undefined ()) { g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL, "*assertion*!= NULL*"); - res = g_str_has_prefix ("foo", NULL); + g_assert_false ((g_str_has_prefix) ("foo", NULL)); g_test_assert_expected_messages (); - g_assert_false (res); g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL, "*assertion*!= NULL*"); - res = g_str_has_prefix (NULL, "foo"); + g_assert_false ((g_str_has_prefix) (NULL, "foo")); g_test_assert_expected_messages (); - g_assert_false (res); } - res = g_str_has_prefix ("foo", "bar"); - g_assert_cmpint (res, ==, FALSE); + /* Having a string smaller than the prefix */ + g_assert_false ((g_str_has_prefix) ("aa", "aaa")); - res = g_str_has_prefix ("foo", "foobar"); - g_assert_cmpint (res, ==, FALSE); + /* Negative tests */ + g_assert_false ((g_str_has_prefix) ("foo", "bar")); + g_assert_false ((g_str_has_prefix) ("foo", "foobar")); + g_assert_false ((g_str_has_prefix) ("foobar", "bar")); - res = g_str_has_prefix ("foobar", "bar"); - g_assert_cmpint (res, ==, FALSE); + /* Positive tests */ + g_assert_true ((g_str_has_prefix) ("foobar", "foo")); + g_assert_true ((g_str_has_prefix) ("foo", "")); + g_assert_true ((g_str_has_prefix) ("foo", "foo")); + g_assert_true ((g_str_has_prefix) ("", "")); +} - res = g_str_has_prefix ("foobar", "foo"); - g_assert_cmpint (res, ==, TRUE); +/* Testing g_str_has_prefix() optimized macro */ +static void +test_has_prefix_macro (void) +{ + #if G_GNUC_CHECK_VERSION (2, 0) + #ifndef g_str_has_prefix + #error g_str_has_prefix() should be defined as a macro in this platform! + #endif + #else + g_test_incomplete ("g_str_has_prefix() is not inlined in this platform"); + #endif - res = g_str_has_prefix ("foo", ""); - g_assert_cmpint (res, ==, TRUE); + if (g_test_undefined ()) + { + g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL, + "*assertion*!= NULL*"); + g_assert_false (g_str_has_prefix ("foo", NULL)); + g_test_assert_expected_messages (); - res = g_str_has_prefix ("foo", "foo"); - g_assert_cmpint (res, ==, TRUE); + g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL, + "*assertion*!= NULL*"); + g_assert_false (g_str_has_prefix (NULL, "foo")); + g_test_assert_expected_messages (); + } - res = g_str_has_prefix ("", ""); - g_assert_cmpint (res, ==, TRUE); + /* Having a string smaller than the prefix */ + g_assert_false (g_str_has_prefix ("aa", "aaa")); + + /* Negative tests */ + g_assert_false (g_str_has_prefix ("foo", "bar")); + g_assert_false (g_str_has_prefix ("foo", "foobar")); + g_assert_false (g_str_has_prefix ("foobar", "bar")); + + /* Positive tests */ + g_assert_true (g_str_has_prefix ("foobar", "foo")); + g_assert_true (g_str_has_prefix ("foo", "")); + g_assert_true (g_str_has_prefix ("foo", "foo")); + g_assert_true (g_str_has_prefix ("", "")); + + /* Testing the nested G_UNLIKELY */ + g_assert_false (G_UNLIKELY (g_str_has_prefix ("foo", "aaa"))); } +/* Testing g_str_has_suffix() function avoiding the optimizing macro */ static void test_has_suffix (void) { - gboolean res; - if (g_test_undefined ()) { g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL, "*assertion*!= NULL*"); - res = g_str_has_suffix ("foo", NULL); + g_assert_false ((g_str_has_suffix) ("foo", NULL)); g_test_assert_expected_messages (); - g_assert_false (res); g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL, "*assertion*!= NULL*"); - res = g_str_has_suffix (NULL, "foo"); + g_assert_false ((g_str_has_suffix) (NULL, "foo")); g_test_assert_expected_messages (); - g_assert_false (res); } - res = g_str_has_suffix ("foo", "bar"); - g_assert_false (res); + /* Having a string smaller than the suffix */ + g_assert_false ((g_str_has_suffix) ("aa", "aaa")); - res = g_str_has_suffix ("bar", "foobar"); - g_assert_false (res); + /* Negative tests */ + g_assert_false ((g_str_has_suffix) ("foo", "bar")); + g_assert_false ((g_str_has_suffix) ("bar", "foobar")); + g_assert_false ((g_str_has_suffix) ("foobar", "foo")); - res = g_str_has_suffix ("foobar", "foo"); - g_assert_false (res); + /* Positive tests */ + g_assert_true ((g_str_has_suffix) ("foobar", "bar")); + g_assert_true ((g_str_has_suffix) ("foo", "")); + g_assert_true ((g_str_has_suffix) ("foo", "foo")); + g_assert_true ((g_str_has_suffix) ("", "")); +} - res = g_str_has_suffix ("foobar", "bar"); - g_assert_true (res); +/* Testing g_str_has_prefix() optimized macro */ +static void +test_has_suffix_macro (void) +{ + #if G_GNUC_CHECK_VERSION (2, 0) + #ifndef g_str_has_suffix + #error g_str_has_suffix() should be defined as a macro in this platform! + #endif + #else + g_test_incomplete ("g_str_has_suffix() is not inlined in this platform"); + #endif - res = g_str_has_suffix ("foo", ""); - g_assert_true (res); + if (g_test_undefined ()) + { + g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL, + "*assertion*!= NULL*"); + g_assert_false (g_str_has_suffix ("foo", NULL)); + g_test_assert_expected_messages (); + + g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL, + "*assertion*!= NULL*"); + g_assert_false (g_str_has_suffix (NULL, "foo")); + g_test_assert_expected_messages (); + } - res = g_str_has_suffix ("foo", "foo"); - g_assert_true (res); + /* Having a string smaller than the suffix */ + g_assert_false (g_str_has_suffix ("aa", "aaa")); - res = g_str_has_suffix ("", ""); - g_assert_true (res); + /* Negative tests */ + g_assert_false (g_str_has_suffix ("foo", "bar")); + g_assert_false (g_str_has_suffix ("bar", "foobar")); + g_assert_false (g_str_has_suffix ("foobar", "foo")); + + /* Positive tests */ + g_assert_true (g_str_has_suffix ("foobar", "bar")); + g_assert_true (g_str_has_suffix ("foo", "")); + g_assert_true (g_str_has_suffix ("foo", "foo")); + g_assert_true (g_str_has_suffix ("", "")); } static void @@ -2349,6 +2459,7 @@ &value64, &error); g_test_assert_expected_messages (); + g_assert_false (result); g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL, "*assertion \'base >= 2 && base <= 36\'*"); @@ -2359,6 +2470,7 @@ &value64, &error); g_test_assert_expected_messages (); + g_assert_false (result); g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL, "*assertion \'base >= 2 && base <= 36\'*"); @@ -2369,6 +2481,7 @@ &value64, &error); g_test_assert_expected_messages (); + g_assert_false (result); g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL, "*assertion \'min <= max\'*"); @@ -2379,6 +2492,7 @@ &value64, &error); g_test_assert_expected_messages (); + g_assert_false (result); } /* Catching first part of (error == NULL || *error == NULL) */ @@ -2388,6 +2502,7 @@ data->max, &value64, NULL); + g_assert_true (result); /*** g_ascii_string_to_unsigned() ***/ data = &test_data12; /* Setting data to unsigned data */ @@ -2403,6 +2518,7 @@ &valueu64, &error); g_test_assert_expected_messages (); + g_assert_false (result); g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL, "*assertion \'base >= 2 && base <= 36\'*"); @@ -2413,6 +2529,7 @@ &valueu64, &error); g_test_assert_expected_messages (); + g_assert_false (result); g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL, "*assertion \'base >= 2 && base <= 36\'*"); @@ -2423,6 +2540,7 @@ &valueu64, &error); g_test_assert_expected_messages (); + g_assert_false (result); g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL, "*assertion \'min <= max\'*"); @@ -2433,6 +2551,7 @@ &valueu64, &error); g_test_assert_expected_messages (); + g_assert_false (result); } /* Catching first part of (error == NULL || *error == NULL) */ @@ -2442,6 +2561,7 @@ data->max, &valueu64, NULL); + g_assert_false (result); /* Testing usual cases */ for (idx = 0; idx < G_N_ELEMENTS (test_data); ++idx) @@ -2571,6 +2691,34 @@ g_assert_cmpint (svalue, ==, G_MININT64); } +static void +test_set_str (void) +{ + char *str = NULL; + const char *empty_str = ""; + + g_assert_false (g_set_str (&str, NULL)); + g_assert_null (str); + + g_assert_true (g_set_str (&str, empty_str)); + g_assert_false (g_set_str (&str, empty_str)); + g_assert_nonnull (str); + g_assert_true ((gpointer)str != (gpointer)empty_str); + g_assert_cmpstr (str, ==, empty_str); + + g_assert_true (g_set_str (&str, NULL)); + g_assert_null (str); + + g_assert_true (g_set_str (&str, empty_str)); + g_assert_true (g_set_str (&str, "test")); + g_assert_cmpstr (str, ==, "test"); + + g_assert_true (g_set_str (&str, &str2)); + g_assert_cmpstr (str, ==, "st"); + + g_free (str); +} + int main (int argc, char *argv) @@ -2585,9 +2733,12 @@ g_test_add_func ("/strfuncs/ascii_strtod", test_ascii_strtod); g_test_add_func ("/strfuncs/bounds-check", test_bounds); g_test_add_func ("/strfuncs/has-prefix", test_has_prefix); + g_test_add_func ("/strfuncs/has-prefix-macro", test_has_prefix_macro); g_test_add_func ("/strfuncs/has-suffix", test_has_suffix); + g_test_add_func ("/strfuncs/has-suffix-macro", test_has_suffix_macro); g_test_add_func ("/strfuncs/memdup", test_memdup); g_test_add_func ("/strfuncs/memdup2", test_memdup2); + g_test_add_func ("/strfuncs/set_str", test_set_str); g_test_add_func ("/strfuncs/stpcpy", test_stpcpy); g_test_add_func ("/strfuncs/str_match_string", test_str_match_string); g_test_add_func ("/strfuncs/str_tokenize_and_fold", test_str_tokenize_and_fold); @@ -2598,6 +2749,7 @@ g_test_add_func ("/strfuncs/strconcat", test_strconcat); g_test_add_func ("/strfuncs/strdelimit", test_strdelimit); g_test_add_func ("/strfuncs/strdup", test_strdup); + g_test_add_func ("/strfuncs/strdup/inline", test_strdup_inline); g_test_add_func ("/strfuncs/strdup-printf", test_strdup_printf); g_test_add_func ("/strfuncs/strdupv", test_strdupv); g_test_add_func ("/strfuncs/strerror", test_strerror);
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/tests/string.c -> _service:tar_scm:glib-2.76.4.tar.xz/glib/tests/string.c
Changed
@@ -1,6 +1,8 @@ /* Unit tests for gstring * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald * + * SPDX-License-Identifier: LicenseRef-old-glib-tests + * * This work is provided "as is"; redistribution and modification * in whole or in part, in any medium, physical or electronic is * permitted without restriction. @@ -45,7 +47,7 @@ } tmp_string_2 = g_string_chunk_insert_const (string_chunk, tmp_string); - g_assert (tmp_string_2 != tmp_string); + g_assert_true (tmp_string_2 != tmp_string); g_assert_cmpstr (tmp_string_2, ==, tmp_string); tmp_string = g_string_chunk_insert_const (string_chunk, tmp_string); @@ -70,9 +72,9 @@ str1 = g_string_chunk_insert_len (chunk, s1, 8); str2 = g_string_chunk_insert (chunk, s2); - g_assert (memcmp (s0, str0, sizeof s0) == 0); - g_assert (memcmp (s1, str1, sizeof s1) == 0); - g_assert (memcmp (s2, str2, sizeof s2) == 0); + g_assert_cmpmem (s0, sizeof s0, str0, sizeof s0); + g_assert_cmpmem (s1, sizeof s1, str1, sizeof s1); + g_assert_cmpmem (s2, sizeof s2, str2, sizeof s2); g_string_chunk_free (chunk); } @@ -85,11 +87,11 @@ string1 = g_string_new ("hi pete!"); string2 = g_string_new (NULL); - g_assert (string1 != NULL); - g_assert (string2 != NULL); - g_assert (strlen (string1->str) == string1->len); - g_assert (strlen (string2->str) == string2->len); - g_assert (string2->len == 0); + g_assert_nonnull (string1); + g_assert_nonnull (string2); + g_assert_cmpuint (strlen (string1->str), ==, string1->len); + g_assert_cmpuint (strlen (string2->str), ==, string2->len); + g_assert_cmpuint (string2->len, ==, 0); g_assert_cmpstr ("hi pete!", ==, string1->str); g_assert_cmpstr ("", ==, string2->str); @@ -100,9 +102,9 @@ string2 = g_string_new_len ("foobar", 3); g_assert_cmpstr (string1->str, ==, "foo"); - g_assert_cmpint (string1->len, ==, 3); + g_assert_cmpuint (string1->len, ==, 3); g_assert_cmpstr (string2->str, ==, "foo"); - g_assert_cmpint (string2->len, ==, 3); + g_assert_cmpuint (string2->len, ==, 3); g_string_free (string1, TRUE); g_string_free (string2, TRUE); @@ -181,7 +183,7 @@ test_string_append_c (void) { GString *string; - gint i; + guint i; string = g_string_new ("hi pete!"); @@ -191,8 +193,11 @@ else (g_string_append_c) (string, 'a'+(i%26)); - g_assert((strlen("hi pete!") + 10000) == string->len); - g_assert((strlen("hi pete!") + 10000) == strlen(string->str)); + g_assert_true ((strlen("hi pete!") + 10000) == string->len); + g_assert_true ((strlen("hi pete!") + 10000) == strlen(string->str)); + + for (i = 0; i < 10000; i++) + g_assert_true (string->strstrlen ("Hi pete!") + i == 'a' + (gchar) (i%26)); g_string_free (string, TRUE); } @@ -201,17 +206,89 @@ test_string_append (void) { GString *string; + char *tmp; + int i; + + tmp = g_strdup ("more"); /* append */ string = g_string_new ("firsthalf"); - g_string_append (string, "lasthalf"); + g_string_append (string, "last"); + (g_string_append) (string, "half"); + g_assert_cmpstr (string->str, ==, "firsthalflasthalf"); + + i = 0; + g_string_append (string, &tmpi++); + (g_string_append) (string, &tmpi++); + g_assert_true (i == 2); + + g_assert_cmpstr (string->str, ==, "firsthalflasthalfmoreore"); + + g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL, + "*assertion*string != NULL*failed*"); + g_assert_null (g_string_append (NULL, NULL)); + g_test_assert_expected_messages (); + + g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL, + "*assertion*string != NULL*failed*"); + g_assert_null ((g_string_append) (NULL, NULL)); + g_test_assert_expected_messages (); + + g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL, + "*assertion*val != NULL*failed*"); + g_assert_true (g_string_append (string, NULL) == string); + g_test_assert_expected_messages (); + + g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL, + "*assertion*val != NULL*failed*"); + g_assert_true ((g_string_append) (string, NULL) == string); + g_test_assert_expected_messages (); + g_string_free (string, TRUE); + g_free (tmp); /* append_len */ string = g_string_new ("firsthalf"); - g_string_append_len (string, "lasthalfjunkjunk", strlen ("lasthalf")); - g_assert_cmpstr (string->str, ==, "firsthalflasthalf"); + g_string_append_len (string, "lasthalfjunkjunk", strlen ("last")); + (g_string_append_len) (string, "halfjunkjunk", strlen ("half")); + g_string_append_len (string, "more", -1); + (g_string_append_len) (string, "ore", -1); + + g_assert_true (g_string_append_len (string, NULL, 0) == string); + g_assert_true ((g_string_append_len) (string, NULL, 0) == string); + + g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL, + "*assertion*string != NULL*failed*"); + g_assert_null (g_string_append_len (NULL, NULL, -1)); + g_test_assert_expected_messages (); + + g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL, + "*assertion*string != NULL*failed*"); + g_assert_null ((g_string_append_len) (NULL, NULL, -1)); + g_test_assert_expected_messages (); + + g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL, + "*assertion*val != NULL*failed*"); + g_assert_true (g_string_append_len (string, NULL, -1) == string); + g_test_assert_expected_messages (); + + g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL, + "*assertion*val != NULL*failed*"); + g_assert_true ((g_string_append_len) (string, NULL, -1) == string); + g_test_assert_expected_messages (); + + g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL, + "*assertion*val != NULL*failed*"); + g_assert_true (g_string_append_len (string, NULL, 1) == string); + g_test_assert_expected_messages (); + + g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL, + "*assertion*val != NULL*failed*"); + g_assert_true ((g_string_append_len) (string, NULL, 1) == string); + g_test_assert_expected_messages (); + + g_assert_cmpstr (string->str, ==, "firsthalflasthalfmoreore"); g_string_free (string, TRUE); } @@ -395,9 +472,9 @@ string1 = g_string_new ("test"); string2 = g_string_new ("te"); - g_assert (!g_string_equal(string1, string2)); + g_assert_false (g_string_equal (string1, string2)); g_string_append (string2, "st"); - g_assert (g_string_equal(string1, string2)); + g_assert_true (g_string_equal (string1, string2)); g_string_free (string1, TRUE); g_string_free (string2, TRUE); } @@ -410,15 +487,15 @@ string = g_string_new ("testing"); g_string_truncate (string, 1000); - g_assert (string->len == strlen("testing")); + g_assert_cmpuint (string->len, ==, strlen("testing")); g_assert_cmpstr (string->str, ==, "testing"); - g_string_truncate (string, 4); - g_assert (string->len == 4); + (g_string_truncate) (string, 4); + g_assert_cmpuint (string->len, ==, 4); g_assert_cmpstr (string->str, ==, "test"); g_string_truncate (string, 0); - g_assert (string->len == 0); + g_assert_cmpuint (string->len, ==, 0); g_assert_cmpstr (string->str, ==, ""); g_string_free (string, TRUE); @@ -433,24 +510,24 @@ string = g_string_new ("testing"); g_string_overwrite (string, 4, " and expand"); - g_assert (15 == string->len); - g_assert ('\0' == string->str15); - g_assert (g_str_equal ("test and expand", string->str)); + g_assert_cmpuint (15, ==, string->len); + g_assert_true ('\0' == string->str15); + g_assert_true (g_str_equal ("test and expand", string->str)); g_string_overwrite (string, 5, "NOT-"); - g_assert (15 == string->len); - g_assert ('\0' == string->str15); - g_assert (g_str_equal ("test NOT-expand", string->str)); + g_assert_cmpuint (15, ==, string->len); + g_assert_true ('\0' == string->str15); + g_assert_true (g_str_equal ("test NOT-expand", string->str)); g_string_overwrite_len (string, 9, "blablabla", 6); - g_assert (15 == string->len); - g_assert ('\0' == string->str15); - g_assert (g_str_equal ("test NOT-blabla", string->str)); + g_assert_cmpuint (15, ==, string->len); + g_assert_true ('\0' == string->str15); + g_assert_true (g_str_equal ("test NOT-blabla", string->str)); g_string_overwrite_len (string, 4, "BLABL", 0); - g_assert (g_str_equal ("test NOT-blabla", string->str)); + g_assert_true (g_str_equal ("test NOT-blabla", string->str)); g_string_overwrite_len (string, 4, "BLABL", -1); - g_assert (g_str_equal ("testBLABLblabla", string->str)); + g_assert_true (g_str_equal ("testBLABLblabla", string->str)); g_string_free (string, TRUE); } @@ -463,15 +540,15 @@ /* Check handling of embedded ASCII 0 (NUL) characters in GString. */ string1 = g_string_new ("fiddle"); string2 = g_string_new ("fiddle"); - g_assert (g_string_equal (string1, string2)); + g_assert_true (g_string_equal (string1, string2)); g_string_append_c (string1, '\0'); - g_assert (!g_string_equal (string1, string2)); + g_assert_false (g_string_equal (string1, string2)); g_string_append_c (string2, '\0'); - g_assert (g_string_equal (string1, string2)); + g_assert_true (g_string_equal (string1, string2)); g_string_append_c (string1, 'x'); g_string_append_c (string2, 'y'); - g_assert (!g_string_equal (string1, string2)); - g_assert (string1->len == 8); + g_assert_false (g_string_equal (string1, string2)); + g_assert_cmpuint (string1->len, ==, 8); g_string_append (string1, "yzzy"); g_assert_cmpmem (string1->str, string1->len + 1, "fiddle\0xyzzy", 13); g_string_insert (string1, 1, "QED"); @@ -516,7 +593,7 @@ g_string_set_size (s, 30); g_assert_cmpstr (s->str, ==, "foo"); - g_assert_cmpint (s->len, ==, 30); + g_assert_cmpuint (s->len, ==, 30); g_string_free (s, TRUE); } @@ -536,7 +613,7 @@ byte_data = g_bytes_get_data (bytes, &byte_len); - g_assert_cmpint (byte_len, ==, 7); + g_assert_cmpuint (byte_len, ==, 7); g_assert_cmpmem (byte_data, byte_len, "foo-bar", 7); @@ -606,6 +683,32 @@ } } +static void +test_string_steal (void) +{ + GString *string; + char *str; + + string = g_string_new ("One"); + g_string_append (string, ", two"); + g_string_append (string, ", three"); + g_string_append_c (string, '.'); + + str = g_string_free (string, FALSE); + + g_assert_cmpstr (str, ==, "One, two, three."); + g_free (str); + + string = g_string_new ("1"); + g_string_append (string, " 2"); + g_string_append (string, " 3"); + + str = g_string_free_and_steal (string); + + g_assert_cmpstr (str, ==, "1 2 3"); + g_free (str); +} + int main (int argc, char *argv) @@ -632,6 +735,7 @@ g_test_add_func ("/string/test-string-set-size", test_string_set_size); g_test_add_func ("/string/test-string-to-bytes", test_string_to_bytes); g_test_add_func ("/string/test-string-replace", test_string_replace); + g_test_add_func ("/string/test-string-steal", test_string_steal); return g_test_run(); }
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/tests/strvbuilder.c -> _service:tar_scm:glib-2.76.4.tar.xz/glib/tests/strvbuilder.c
Changed
@@ -2,6 +2,8 @@ * Copyright © 2020 Canonical Ltd. * Copyright © 2021 Alexandros Theodotou * + * SPDX-License-Identifier: LicenseRef-old-glib-tests + * * This work is provided "as is"; redistribution and modification * in whole or in part, in any medium, physical or electronic is * permitted without restriction.
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/tests/test-printf.c -> _service:tar_scm:glib-2.76.4.tar.xz/glib/tests/test-printf.c
Changed
@@ -1,6 +1,8 @@ /* Unit tests for gprintf * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald * + * SPDX-License-Identifier: LicenseRef-old-glib-tests + * * This work is provided "as is"; redistribution and modification * in whole or in part, in any medium, physical or electronic is * permitted without restriction.
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/tests/test-spawn-echo.c -> _service:tar_scm:glib-2.76.4.tar.xz/glib/tests/test-spawn-echo.c
Changed
@@ -1,6 +1,8 @@ /* * Copyright (C) 2011 Red Hat, Inc. * + * SPDX-License-Identifier: LicenseRef-old-glib-tests + * * This work is provided "as is"; redistribution and modification * in whole or in part, in any medium, physical or electronic is * permitted without restriction.
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/tests/test-spawn-sleep.c -> _service:tar_scm:glib-2.76.4.tar.xz/glib/tests/test-spawn-sleep.c
Changed
@@ -1,6 +1,8 @@ /* * Copyright (C) 2022 Red Hat, Inc. * + * SPDX-License-Identifier: LicenseRef-old-glib-tests + * * This work is provided "as is"; redistribution and modification * in whole or in part, in any medium, physical or electronic is * permitted without restriction.
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/tests/testing-helper.c -> _service:tar_scm:glib-2.76.4.tar.xz/glib/tests/testing-helper.c
Changed
@@ -20,6 +20,7 @@ #include <glib.h> #include <locale.h> +#include <stdio.h> #ifdef G_OS_WIN32 #include <fcntl.h> #include <io.h> @@ -52,6 +53,12 @@ } static void +test_error (void) +{ + g_error ("This should error out\nBecause it's just\nwrong!"); +} + +static void test_fail_printf (void) { g_test_fail_printf ("this test intentionally left failing"); @@ -79,6 +86,63 @@ "it in the TAP output later."); } +static void +test_message (void) +{ + g_test_message ("Tests that single line message works"); + g_test_message ("Tests that multi\n\nline\nmessage\nworks"); + g_test_message ("\nTests that multi\nline\nmessage\nworks with leading and trailing too\n"); +} + +static void +test_print (void) +{ + g_print ("Tests that single line message works\n"); + g_print ("test that multiple\nlines "); + g_print ("can be "); + g_print ("written "); + g_print ("separately\n"); +} + +static void +test_subprocess_stdout (void) +{ + if (g_test_subprocess ()) + { + printf ("Tests that single line message works\n"); + printf ("test that multiple\nlines "); + printf ("can be "); + printf ("written "); + printf ("separately\n"); + + puts ("And another line has been put"); + + return; + } + + g_test_trap_subprocess (NULL, 0, G_TEST_SUBPROCESS_INHERIT_STDOUT); + g_test_trap_has_passed (); + + g_test_trap_assert_stdout ("/sub-stdout: Tests that single line message works\n*"); + g_test_trap_assert_stdout ("*\ntest that multiple\nlines can be written separately\n*"); + g_test_trap_assert_stdout ("*\nAnd another line has been put\n*"); +} + +static void +test_subprocess_stdout_no_nl (void) +{ + if (g_test_subprocess ()) + { + printf ("A message without trailing new line"); + return; + } + + g_test_trap_subprocess (NULL, 0, G_TEST_SUBPROCESS_INHERIT_STDOUT); + g_test_trap_has_passed (); + + g_test_trap_assert_stdout ("/sub-stdout-no-nl: A message without trailing new line"); +} + int main (int argc, char *argv) @@ -149,6 +213,15 @@ { g_test_add_func ("/fail", test_fail); } + else if (g_strcmp0 (argv1, "error") == 0) + { + g_test_add_func ("/error", test_error); + } + else if (g_strcmp0 (argv1, "error-and-pass") == 0) + { + g_test_add_func ("/error", test_error); + g_test_add_func ("/pass", test_pass); + } else if (g_strcmp0 (argv1, "fail-printf") == 0) { g_test_add_func ("/fail-printf", test_fail_printf); @@ -185,9 +258,33 @@ { g_test_add_func ("/summary", test_summary); } + else if (g_strcmp0 (argv1, "message") == 0) + { + g_test_add_func ("/message", test_message); + } + else if (g_strcmp0 (argv1, "print") == 0) + { + g_test_add_func ("/print", test_print); + } + else if (g_strcmp0 (argv1, "subprocess-stdout") == 0) + { + g_test_add_func ("/sub-stdout", test_subprocess_stdout); + } + else if (g_strcmp0 (argv1, "subprocess-stdout-no-nl") == 0) + { + g_test_add_func ("/sub-stdout-no-nl", test_subprocess_stdout_no_nl); + } else { - g_assert_not_reached (); + if (g_test_subprocess ()) + { + g_test_add_func ("/sub-stdout", test_subprocess_stdout); + g_test_add_func ("/sub-stdout-no-nl", test_subprocess_stdout_no_nl); + } + else + { + g_assert_not_reached (); + } } return g_test_run ();
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/tests/testing.c -> _service:tar_scm:glib-2.76.4.tar.xz/glib/tests/testing.c
Changed
@@ -2,6 +2,8 @@ * Copyright (C) 2007 Imendio AB * Authors: Tim Janik * + * SPDX-License-Identifier: LicenseRef-old-glib-tests + * * This work is provided "as is"; redistribution and modification * in whole or in part, in any medium, physical or electronic is * permitted without restriction. @@ -33,6 +35,9 @@ #include <stdlib.h> #include <string.h> +#define TAP_VERSION G_STRINGIFY (13) +#define TAP_SUBTEST_PREFIX "# " + /* test assertion variants */ static void test_assertions_bad_cmpvariant_types (void) @@ -669,6 +674,23 @@ } static void +test_messages (void) +{ + g_test_trap_subprocess ("/misc/messages/subprocess/use-stderr", 0, + G_TEST_SUBPROCESS_DEFAULT); + g_test_trap_assert_stderr ("*message is in stderr*"); + g_test_trap_assert_stderr ("*warning is in stderr*"); + g_test_trap_has_passed (); +} + +static void +test_messages_use_stderr (void) +{ + g_message ("message is in stderr"); + g_warning ("warning is in stderr"); +} + +static void test_expected_messages_debug (void) { g_test_expect_message ("Test", G_LOG_LEVEL_WARNING, "warning message"); @@ -1087,6 +1109,7 @@ GError *error = NULL; int status; gchar *output; + char **envp; testing_helper = g_test_get_filename (G_TEST_BUILT, "testing-helper" EXEEXT, NULL); @@ -1097,7 +1120,12 @@ g_ptr_array_add (argv, "--tap"); g_ptr_array_add (argv, NULL); - g_spawn_sync (NULL, (char **) argv->pdata, NULL, + /* Remove the G_TEST_ROOT_PROCESS env so it will be considered a standalone test */ + envp = g_get_environ (); + g_assert_nonnull (g_environ_getenv (envp, "G_TEST_ROOT_PROCESS")); + envp = g_environ_unsetenv (g_steal_pointer (&envp), "G_TEST_ROOT_PROCESS"); + + g_spawn_sync (NULL, (char **) argv->pdata, envp, G_SPAWN_STDERR_TO_DEV_NULL, NULL, NULL, &output, NULL, &status, &error); @@ -1105,6 +1133,8 @@ g_spawn_check_wait_status (status, &error); g_assert_no_error (error); + g_assert_true (g_str_has_prefix (output, "TAP version " TAP_VERSION)); + g_assert_null (strstr (output, "# Subtest: ")); g_assert_nonnull (strstr (output, "\nok 1 /pass\n")); g_free (output); g_ptr_array_unref (argv); @@ -1116,7 +1146,7 @@ g_ptr_array_add (argv, "--tap"); g_ptr_array_add (argv, NULL); - g_spawn_sync (NULL, (char **) argv->pdata, NULL, + g_spawn_sync (NULL, (char **) argv->pdata, envp, G_SPAWN_STDERR_TO_DEV_NULL, NULL, NULL, &output, NULL, &status, &error); @@ -1124,6 +1154,8 @@ g_spawn_check_wait_status (status, &error); g_assert_no_error (error); + g_assert_true (g_str_has_prefix (output, "TAP version " TAP_VERSION)); + g_assert_null (strstr (output, "# Subtest: ")); g_assert_nonnull (strstr (output, "\nok 1 /skip # SKIP not enough tea\n")); g_free (output); g_ptr_array_unref (argv); @@ -1135,7 +1167,7 @@ g_ptr_array_add (argv, "--tap"); g_ptr_array_add (argv, NULL); - g_spawn_sync (NULL, (char **) argv->pdata, NULL, + g_spawn_sync (NULL, (char **) argv->pdata, envp, G_SPAWN_STDERR_TO_DEV_NULL, NULL, NULL, &output, NULL, &status, &error); @@ -1143,6 +1175,8 @@ g_spawn_check_wait_status (status, &error); g_assert_no_error (error); + g_assert_true (g_str_has_prefix (output, "TAP version " TAP_VERSION)); + g_assert_null (strstr (output, "# Subtest: ")); g_assert_nonnull (strstr (output, "\nok 1 /skip-printf # SKIP not enough coffee\n")); g_free (output); g_ptr_array_unref (argv); @@ -1154,7 +1188,7 @@ g_ptr_array_add (argv, "--tap"); g_ptr_array_add (argv, NULL); - g_spawn_sync (NULL, (char **) argv->pdata, NULL, + g_spawn_sync (NULL, (char **) argv->pdata, envp, G_SPAWN_STDERR_TO_DEV_NULL, NULL, NULL, &output, NULL, &status, &error); @@ -1162,6 +1196,8 @@ g_spawn_check_wait_status (status, &error); g_assert_no_error (error); + g_assert_true (g_str_has_prefix (output, "TAP version " TAP_VERSION)); + g_assert_null (strstr (output, "# Subtest: ")); g_assert_nonnull (strstr (output, "\nnot ok 1 /incomplete # TODO mind reading not implemented yet\n")); g_free (output); g_ptr_array_unref (argv); @@ -1173,7 +1209,7 @@ g_ptr_array_add (argv, "--tap"); g_ptr_array_add (argv, NULL); - g_spawn_sync (NULL, (char **) argv->pdata, NULL, + g_spawn_sync (NULL, (char **) argv->pdata, envp, G_SPAWN_STDERR_TO_DEV_NULL, NULL, NULL, &output, NULL, &status, &error); @@ -1181,6 +1217,8 @@ g_spawn_check_wait_status (status, &error); g_assert_no_error (error); + g_assert_true (g_str_has_prefix (output, "TAP version " TAP_VERSION)); + g_assert_null (strstr (output, "# Subtest: ")); g_assert_nonnull (strstr (output, "\nnot ok 1 /incomplete-printf # TODO telekinesis not implemented yet\n")); g_free (output); g_ptr_array_unref (argv); @@ -1192,7 +1230,7 @@ g_ptr_array_add (argv, "--tap"); g_ptr_array_add (argv, NULL); - g_spawn_sync (NULL, (char **) argv->pdata, NULL, + g_spawn_sync (NULL, (char **) argv->pdata, envp, G_SPAWN_STDERR_TO_DEV_NULL, NULL, NULL, &output, NULL, &status, &error); @@ -1200,6 +1238,8 @@ g_spawn_check_wait_status (status, &error); g_assert_error (error, G_SPAWN_EXIT_ERROR, 1); + g_assert_true (g_str_has_prefix (output, "TAP version " TAP_VERSION)); + g_assert_null (strstr (output, "# Subtest: ")); g_assert_nonnull (strstr (output, "\nnot ok 1 /fail\n")); g_free (output); g_clear_error (&error); @@ -1212,7 +1252,7 @@ g_ptr_array_add (argv, "--tap"); g_ptr_array_add (argv, NULL); - g_spawn_sync (NULL, (char **) argv->pdata, NULL, + g_spawn_sync (NULL, (char **) argv->pdata, envp, G_SPAWN_STDERR_TO_DEV_NULL, NULL, NULL, &output, NULL, &status, &error); @@ -1220,6 +1260,8 @@ g_spawn_check_wait_status (status, &error); g_assert_error (error, G_SPAWN_EXIT_ERROR, 1); + g_assert_true (g_str_has_prefix (output, "TAP version " TAP_VERSION)); + g_assert_null (strstr (output, "# Subtest: ")); g_assert_nonnull (strstr (output, "\nnot ok 1 /fail-printf - this test intentionally left failing\n")); g_free (output); g_clear_error (&error); @@ -1232,7 +1274,7 @@ g_ptr_array_add (argv, "--tap"); g_ptr_array_add (argv, NULL); - g_spawn_sync (NULL, (char **) argv->pdata, NULL, + g_spawn_sync (NULL, (char **) argv->pdata, envp, G_SPAWN_STDOUT_TO_DEV_NULL | G_SPAWN_STDERR_TO_DEV_NULL, NULL, NULL, NULL, NULL, &status, &error); @@ -1250,7 +1292,7 @@ g_ptr_array_add (argv, "--tap"); g_ptr_array_add (argv, NULL); - g_spawn_sync (NULL, (char **) argv->pdata, NULL, + g_spawn_sync (NULL, (char **) argv->pdata, envp, G_SPAWN_STDOUT_TO_DEV_NULL | G_SPAWN_STDERR_TO_DEV_NULL, NULL, NULL, NULL, NULL, &status, &error); @@ -1270,11 +1312,13 @@ g_ptr_array_add (argv, "2"); g_ptr_array_add (argv, NULL); - g_spawn_sync (NULL, (char **) argv->pdata, NULL, + g_spawn_sync (NULL, (char **) argv->pdata, envp, G_SPAWN_STDERR_TO_DEV_NULL, NULL, NULL, &output, NULL, &status, &error); g_assert_no_error (error); + g_assert_true (g_str_has_prefix (output, "TAP version " TAP_VERSION)); + g_assert_null (strstr (output, "# Subtest: ")); g_assert_nonnull (strstr (output, "1..10\n")); g_assert_nonnull (strstr (output, "\nok 1 /a # SKIP\n")); g_assert_nonnull (strstr (output, "\nok 2 /b # SKIP\n")); @@ -1302,11 +1346,13 @@ g_ptr_array_add (argv, "0"); g_ptr_array_add (argv, NULL); - g_spawn_sync (NULL, (char **) argv->pdata, NULL, + g_spawn_sync (NULL, (char **) argv->pdata, envp, G_SPAWN_STDERR_TO_DEV_NULL, NULL, NULL, &output, NULL, &status, &error); g_assert_no_error (error); + g_assert_true (g_str_has_prefix (output, "TAP version " TAP_VERSION)); + g_assert_null (strstr (output, "# Subtest: ")); g_assert_nonnull (strstr (output, "1..10\n")); g_assert_nonnull (strstr (output, "\nok 1 /a\n")); g_assert_nonnull (strstr (output, "\nok 2 /b\n")); @@ -1334,11 +1380,13 @@ g_ptr_array_add (argv, "11"); g_ptr_array_add (argv, NULL); - g_spawn_sync (NULL, (char **) argv->pdata, NULL, + g_spawn_sync (NULL, (char **) argv->pdata, envp, G_SPAWN_STDERR_TO_DEV_NULL, NULL, NULL, &output, NULL, &status, &error); g_assert_no_error (error); + g_assert_true (g_str_has_prefix (output, "TAP version " TAP_VERSION)); + g_assert_null (strstr (output, "# Subtest: ")); g_assert_nonnull (strstr (output, "1..10\n")); g_assert_nonnull (strstr (output, "\nok 1 /a # SKIP\n")); g_assert_nonnull (strstr (output, "\nok 2 /b # SKIP\n")); @@ -1370,11 +1418,13 @@ g_ptr_array_add (argv, "/b"); g_ptr_array_add (argv, NULL); - g_spawn_sync (NULL, (char **) argv->pdata, NULL, + g_spawn_sync (NULL, (char **) argv->pdata, envp, G_SPAWN_STDERR_TO_DEV_NULL, NULL, NULL, &output, NULL, &status, &error); g_assert_no_error (error); + g_assert_true (g_str_has_prefix (output, "TAP version " TAP_VERSION)); + g_assert_null (strstr (output, "# Subtest: ")); g_assert_nonnull (strstr (output, "\nok 1 /c/a\n")); g_assert_nonnull (strstr (output, "\nok 2 /c/a\n")); g_assert_nonnull (strstr (output, "\nok 3 /b\n")); @@ -1401,11 +1451,13 @@ g_ptr_array_add (argv, "/b"); g_ptr_array_add (argv, NULL); - g_spawn_sync (NULL, (char **) argv->pdata, NULL, + g_spawn_sync (NULL, (char **) argv->pdata, envp, G_SPAWN_STDERR_TO_DEV_NULL, NULL, NULL, &output, NULL, &status, &error); g_assert_no_error (error); + g_assert_true (g_str_has_prefix (output, "TAP version " TAP_VERSION)); + g_assert_null (strstr (output, "# Subtest: ")); g_assert_nonnull (strstr (output, "\nok 1 /c/a\n")); g_assert_nonnull (strstr (output, "\nok 2 /c/a\n")); g_assert_nonnull (strstr (output, "\nok 3 /b\n")); @@ -1431,11 +1483,13 @@ g_ptr_array_add (argv, "/b/b"); g_ptr_array_add (argv, NULL); - g_spawn_sync (NULL, (char **) argv->pdata, NULL, + g_spawn_sync (NULL, (char **) argv->pdata, envp, G_SPAWN_STDERR_TO_DEV_NULL, NULL, NULL, &output, NULL, &status, &error); g_assert_no_error (error); + g_assert_true (g_str_has_prefix (output, "TAP version " TAP_VERSION)); + g_assert_null (strstr (output, "# Subtest: ")); g_assert_nonnull (strstr (output, "\nok 1 /b/b\n")); g_assert_nonnull (strstr (output, "\nok 2 /b/b/a\n")); g_assert_nonnull (strstr (output, "\n1..2\n")); @@ -1459,13 +1513,14 @@ g_ptr_array_add (argv, "/b"); g_ptr_array_add (argv, NULL); - g_spawn_sync (NULL, (char **) argv->pdata, NULL, + g_spawn_sync (NULL, (char **) argv->pdata, envp, G_SPAWN_STDERR_TO_DEV_NULL, NULL, NULL, &output, NULL, &status, &error); g_assert_no_error (error); g_spawn_check_wait_status (status, &error); g_assert_nonnull (error); + g_assert_false (g_str_has_prefix (output, "TAP version " TAP_VERSION)); g_assert_nonnull (strstr (output, "do not mix -r | --run-prefix with '-p'\n")); g_clear_error (&error); @@ -1487,11 +1542,13 @@ g_ptr_array_add (argv, "/c/a"); g_ptr_array_add (argv, NULL); - g_spawn_sync (NULL, (char **) argv->pdata, NULL, + g_spawn_sync (NULL, (char **) argv->pdata, envp, G_SPAWN_STDERR_TO_DEV_NULL, NULL, NULL, &output, NULL, &status, &error); g_assert_no_error (error); + g_assert_true (g_str_has_prefix (output, "TAP version " TAP_VERSION)); + g_assert_null (strstr (output, "# Subtest: ")); g_assert_nonnull (strstr (output, "1..10\n")); g_assert_nonnull (strstr (output, "\nok 1 /a # SKIP by request")); g_assert_nonnull (strstr (output, "\nok 2 /b # SKIP by request")); @@ -1525,11 +1582,13 @@ g_ptr_array_add (argv, "/c/a"); g_ptr_array_add (argv, NULL); - g_spawn_sync (NULL, (char **) argv->pdata, NULL, + g_spawn_sync (NULL, (char **) argv->pdata, envp, G_SPAWN_STDERR_TO_DEV_NULL, NULL, NULL, &output, NULL, &status, &error); g_assert_no_error (error); + g_assert_true (g_str_has_prefix (output, "TAP version " TAP_VERSION)); + g_assert_null (strstr (output, "# Subtest: ")); g_assert_nonnull (strstr (output, "1..10\n")); g_assert_nonnull (strstr (output, "\nok 1 /a # SKIP by request")); g_assert_nonnull (strstr (output, "\nok 2 /b\n")); @@ -1562,18 +1621,602 @@ g_ptr_array_add (argv, "/c/a"); g_ptr_array_add (argv, NULL); - g_spawn_sync (NULL, (char **) argv->pdata, NULL, + g_spawn_sync (NULL, (char **) argv->pdata, envp, G_SPAWN_STDERR_TO_DEV_NULL, NULL, NULL, &output, NULL, &status, &error); g_assert_no_error (error); g_spawn_check_wait_status (status, &error); g_assert_nonnull (error); + g_assert_false (g_str_has_prefix (output, "TAP version " TAP_VERSION)); g_assert_nonnull (strstr (output, "do not mix -x | --skip-prefix with '-s'\n")); g_clear_error (&error); g_free (output); g_ptr_array_unref (argv); + g_strfreev (envp); +} + +/* Test the TAP output when a test suite is run with --tap. */ +static void +test_tap_subtest (void) +{ + const char *testing_helper; + GPtrArray *argv; + GError *error = NULL; + int status; + gchar *output; + char** envp = NULL; + + testing_helper = g_test_get_filename (G_TEST_BUILT, "testing-helper" EXEEXT, NULL); + + g_test_message ("pass"); + argv = g_ptr_array_new (); + g_ptr_array_add (argv, (char *) testing_helper); + g_ptr_array_add (argv, "pass"); + g_ptr_array_add (argv, "--tap"); + g_ptr_array_add (argv, NULL); + + envp = g_get_environ (); + g_assert_nonnull (g_environ_getenv (envp, "G_TEST_ROOT_PROCESS")); + g_clear_pointer (&envp, g_strfreev); + + g_spawn_sync (NULL, (char **) argv->pdata, envp, + G_SPAWN_STDERR_TO_DEV_NULL, + NULL, NULL, &output, NULL, &status, + &error); + g_assert_no_error (error); + + g_spawn_check_wait_status (status, &error); + g_assert_no_error (error); + g_assert_null (strstr (output, "TAP version " TAP_VERSION)); + g_assert_true (g_str_has_prefix (output, "# Subtest: ")); + g_assert_nonnull (strstr (output, + "\n" TAP_SUBTEST_PREFIX "ok 1 /pass\n")); + g_free (output); + g_ptr_array_unref (argv); + + g_test_message ("skip"); + argv = g_ptr_array_new (); + g_ptr_array_add (argv, (char *) testing_helper); + g_ptr_array_add (argv, "skip"); + g_ptr_array_add (argv, "--tap"); + g_ptr_array_add (argv, NULL); + + g_spawn_sync (NULL, (char **) argv->pdata, envp, + G_SPAWN_STDERR_TO_DEV_NULL, + NULL, NULL, &output, NULL, &status, + &error); + g_assert_no_error (error); + + g_spawn_check_wait_status (status, &error); + g_assert_no_error (error); + g_assert_null (strstr (output, "TAP version " TAP_VERSION)); + g_assert_true (g_str_has_prefix (output, "# Subtest: ")); + g_assert_nonnull (strstr (output, + "\n" TAP_SUBTEST_PREFIX "ok 1 /skip # SKIP not enough tea\n")); + g_free (output); + g_ptr_array_unref (argv); + + g_test_message ("skip with printf format"); + argv = g_ptr_array_new (); + g_ptr_array_add (argv, (char *) testing_helper); + g_ptr_array_add (argv, "skip-printf"); + g_ptr_array_add (argv, "--tap"); + g_ptr_array_add (argv, NULL); + + g_spawn_sync (NULL, (char **) argv->pdata, envp, + G_SPAWN_STDERR_TO_DEV_NULL, + NULL, NULL, &output, NULL, &status, + &error); + g_assert_no_error (error); + + g_spawn_check_wait_status (status, &error); + g_assert_no_error (error); + g_assert_null (strstr (output, "TAP version " TAP_VERSION)); + g_assert_true (g_str_has_prefix (output, "# Subtest: ")); + g_assert_nonnull (strstr (output, + "\n" TAP_SUBTEST_PREFIX "ok 1 /skip-printf # SKIP not enough coffee\n")); + g_free (output); + g_ptr_array_unref (argv); + + g_test_message ("incomplete"); + argv = g_ptr_array_new (); + g_ptr_array_add (argv, (char *) testing_helper); + g_ptr_array_add (argv, "incomplete"); + g_ptr_array_add (argv, "--tap"); + g_ptr_array_add (argv, NULL); + + g_spawn_sync (NULL, (char **) argv->pdata, envp, + G_SPAWN_STDERR_TO_DEV_NULL, + NULL, NULL, &output, NULL, &status, + &error); + g_assert_no_error (error); + + g_spawn_check_wait_status (status, &error); + g_assert_no_error (error); + g_assert_null (strstr (output, "TAP version " TAP_VERSION)); + g_assert_null (strstr (output, "\n# Subtest: ")); + g_assert_nonnull (strstr (output, + "\n" TAP_SUBTEST_PREFIX "not ok 1 /incomplete # TODO mind reading not implemented yet\n")); + g_free (output); + g_ptr_array_unref (argv); + + g_test_message ("incomplete with printf format"); + argv = g_ptr_array_new (); + g_ptr_array_add (argv, (char *) testing_helper); + g_ptr_array_add (argv, "incomplete-printf"); + g_ptr_array_add (argv, "--tap"); + g_ptr_array_add (argv, NULL); + + g_spawn_sync (NULL, (char **) argv->pdata, envp, + G_SPAWN_STDERR_TO_DEV_NULL, + NULL, NULL, &output, NULL, &status, + &error); + g_assert_no_error (error); + + g_spawn_check_wait_status (status, &error); + g_assert_no_error (error); + g_assert_null (strstr (output, "TAP version " TAP_VERSION)); + g_assert_null( strstr (output, "\n# Subtest: ")); + g_assert_nonnull (strstr (output, + "\n" TAP_SUBTEST_PREFIX "not ok 1 /incomplete-printf # TODO telekinesis not implemented yet\n")); + g_free (output); + g_ptr_array_unref (argv); + + g_test_message ("fail"); + argv = g_ptr_array_new (); + g_ptr_array_add (argv, (char *) testing_helper); + g_ptr_array_add (argv, "fail"); + g_ptr_array_add (argv, "--tap"); + g_ptr_array_add (argv, NULL); + + g_spawn_sync (NULL, (char **) argv->pdata, envp, + G_SPAWN_STDERR_TO_DEV_NULL, + NULL, NULL, &output, NULL, &status, + &error); + g_assert_no_error (error); + + g_spawn_check_wait_status (status, &error); + g_assert_error (error, G_SPAWN_EXIT_ERROR, 1); + g_assert_null (strstr (output, "TAP version " TAP_VERSION)); + g_assert_null( strstr (output, "\n# Subtest: ")); + g_assert_nonnull (strstr (output, + "\n" TAP_SUBTEST_PREFIX "not ok 1 /fail\n")); + g_free (output); + g_clear_error (&error); + g_ptr_array_unref (argv); + + g_test_message ("fail with message"); + argv = g_ptr_array_new (); + g_ptr_array_add (argv, (char *) testing_helper); + g_ptr_array_add (argv, "fail-printf"); + g_ptr_array_add (argv, "--tap"); + g_ptr_array_add (argv, NULL); + + g_spawn_sync (NULL, (char **) argv->pdata, envp, + G_SPAWN_STDERR_TO_DEV_NULL, + NULL, NULL, &output, NULL, &status, + &error); + g_assert_no_error (error); + + g_spawn_check_wait_status (status, &error); + g_assert_error (error, G_SPAWN_EXIT_ERROR, 1); + g_assert_null (strstr (output, "TAP version " TAP_VERSION)); + g_assert_null( strstr (output, "\n# Subtest: ")); + g_assert_nonnull (strstr (output, + "\n" TAP_SUBTEST_PREFIX "not ok 1 /fail-printf - this test intentionally left failing\n")); + g_free (output); + g_clear_error (&error); + g_ptr_array_unref (argv); + + g_test_message ("all"); + argv = g_ptr_array_new (); + g_ptr_array_add (argv, (char *) testing_helper); + g_ptr_array_add (argv, "all"); + g_ptr_array_add (argv, "--tap"); + g_ptr_array_add (argv, NULL); + + g_spawn_sync (NULL, (char **) argv->pdata, envp, + G_SPAWN_STDOUT_TO_DEV_NULL | G_SPAWN_STDERR_TO_DEV_NULL, + NULL, NULL, NULL, NULL, &status, + &error); + g_assert_no_error (error); + + g_spawn_check_wait_status (status, &error); + g_assert_error (error, G_SPAWN_EXIT_ERROR, 1); + g_clear_error (&error); + g_ptr_array_unref (argv); + + g_test_message ("all-non-failures"); + argv = g_ptr_array_new (); + g_ptr_array_add (argv, (char *) testing_helper); + g_ptr_array_add (argv, "all-non-failures"); + g_ptr_array_add (argv, "--tap"); + g_ptr_array_add (argv, NULL); + + g_spawn_sync (NULL, (char **) argv->pdata, envp, + G_SPAWN_STDOUT_TO_DEV_NULL | G_SPAWN_STDERR_TO_DEV_NULL, + NULL, NULL, NULL, NULL, &status, + &error); + g_assert_no_error (error); + + g_spawn_check_wait_status (status, &error); + g_assert_no_error (error); + + g_ptr_array_unref (argv); + + g_test_message ("--GTestSkipCount"); + argv = g_ptr_array_new (); + g_ptr_array_add (argv, (char *) testing_helper); + g_ptr_array_add (argv, "skip-options"); + g_ptr_array_add (argv, "--tap"); + g_ptr_array_add (argv, "--GTestSkipCount"); + g_ptr_array_add (argv, "2"); + g_ptr_array_add (argv, NULL); + + g_spawn_sync (NULL, (char **) argv->pdata, envp, + G_SPAWN_STDERR_TO_DEV_NULL, + NULL, NULL, &output, NULL, &status, + &error); + g_assert_no_error (error); + g_assert_null (strstr (output, "TAP version " TAP_VERSION)); + g_assert_null( strstr (output, "\n# Subtest: ")); + g_assert_nonnull (strstr (output, TAP_SUBTEST_PREFIX "1..10\n")); + g_assert_nonnull (strstr (output, + "\n" TAP_SUBTEST_PREFIX "ok 1 /a # SKIP\n")); + g_assert_nonnull (strstr (output, + "\n" TAP_SUBTEST_PREFIX "ok 2 /b # SKIP\n")); + g_assert_nonnull (strstr (output, + "\n" TAP_SUBTEST_PREFIX "ok 3 /b/a\n")); + g_assert_nonnull (strstr (output, + "\n" TAP_SUBTEST_PREFIX "ok 4 /b/b\n")); + g_assert_nonnull (strstr (output, + "\n" TAP_SUBTEST_PREFIX "ok 5 /b/b/a\n")); + g_assert_nonnull (strstr (output, + "\n" TAP_SUBTEST_PREFIX "ok 6 /prefix/a\n")); + g_assert_nonnull (strstr (output, + "\n" TAP_SUBTEST_PREFIX "ok 7 /prefix/b/b\n")); + g_assert_nonnull (strstr (output, + "\n" TAP_SUBTEST_PREFIX "ok 8 /prefix-long/a\n")); + g_assert_nonnull (strstr (output, + "\n" TAP_SUBTEST_PREFIX "ok 9 /c/a\n")); + g_assert_nonnull (strstr (output, + "\n" TAP_SUBTEST_PREFIX "ok 10 /d/a\n")); + + g_spawn_check_wait_status (status, &error); + g_assert_no_error (error); + + g_free (output); + g_ptr_array_unref (argv); + + g_test_message ("--GTestSkipCount=0 is the same as omitting it"); + argv = g_ptr_array_new (); + g_ptr_array_add (argv, (char *) testing_helper); + g_ptr_array_add (argv, "skip-options"); + g_ptr_array_add (argv, "--tap"); + g_ptr_array_add (argv, "--GTestSkipCount"); + g_ptr_array_add (argv, "0"); + g_ptr_array_add (argv, NULL); + + g_spawn_sync (NULL, (char **) argv->pdata, envp, + G_SPAWN_STDERR_TO_DEV_NULL, + NULL, NULL, &output, NULL, &status, + &error); + g_assert_no_error (error); + g_assert_null (strstr (output, "TAP version " TAP_VERSION)); + g_assert_null( strstr (output, "\n# Subtest: ")); + g_assert_nonnull (strstr (output, TAP_SUBTEST_PREFIX "1..10\n")); + g_assert_nonnull (strstr (output, + "\n" TAP_SUBTEST_PREFIX "ok 1 /a\n")); + g_assert_nonnull (strstr (output, + "\n" TAP_SUBTEST_PREFIX "ok 2 /b\n")); + g_assert_nonnull (strstr (output, + "\n" TAP_SUBTEST_PREFIX "ok 3 /b/a\n")); + g_assert_nonnull (strstr (output, + "\n" TAP_SUBTEST_PREFIX "ok 4 /b/b\n")); + g_assert_nonnull (strstr (output, + "\n" TAP_SUBTEST_PREFIX "ok 5 /b/b/a\n")); + g_assert_nonnull (strstr (output, + "\n" TAP_SUBTEST_PREFIX "ok 6 /prefix/a\n")); + g_assert_nonnull (strstr (output, + "\n" TAP_SUBTEST_PREFIX "ok 7 /prefix/b/b\n")); + g_assert_nonnull (strstr (output, + "\n" TAP_SUBTEST_PREFIX "ok 8 /prefix-long/a\n")); + g_assert_nonnull (strstr (output, + "\n" TAP_SUBTEST_PREFIX "ok 9 /c/a\n")); + g_assert_nonnull (strstr (output, + "\n" TAP_SUBTEST_PREFIX "ok 10 /d/a\n")); + + g_spawn_check_wait_status (status, &error); + g_assert_no_error (error); + + g_free (output); + g_ptr_array_unref (argv); + + g_test_message ("--GTestSkipCount > number of tests skips all"); + argv = g_ptr_array_new (); + g_ptr_array_add (argv, (char *) testing_helper); + g_ptr_array_add (argv, "skip-options"); + g_ptr_array_add (argv, "--tap"); + g_ptr_array_add (argv, "--GTestSkipCount"); + g_ptr_array_add (argv, "11"); + g_ptr_array_add (argv, NULL); + + g_spawn_sync (NULL, (char **) argv->pdata, envp, + G_SPAWN_STDERR_TO_DEV_NULL, + NULL, NULL, &output, NULL, &status, + &error); + g_assert_no_error (error); + g_assert_null (strstr (output, "TAP version " TAP_VERSION)); + g_assert_null( strstr (output, "\n# Subtest: ")); + g_assert_nonnull (strstr (output, TAP_SUBTEST_PREFIX "1..10\n")); + g_assert_nonnull (strstr (output, + "\n" TAP_SUBTEST_PREFIX "ok 1 /a # SKIP\n")); + g_assert_nonnull (strstr (output, + "\n" TAP_SUBTEST_PREFIX "ok 2 /b # SKIP\n")); + g_assert_nonnull (strstr (output, + "\n" TAP_SUBTEST_PREFIX "ok 3 /b/a # SKIP\n")); + g_assert_nonnull (strstr (output, + "\n" TAP_SUBTEST_PREFIX "ok 4 /b/b # SKIP\n")); + g_assert_nonnull (strstr (output, + "\n" TAP_SUBTEST_PREFIX "ok 5 /b/b/a # SKIP\n")); + g_assert_nonnull (strstr (output, + "\n" TAP_SUBTEST_PREFIX "ok 6 /prefix/a # SKIP\n")); + g_assert_nonnull (strstr (output, + "\n" TAP_SUBTEST_PREFIX "ok 7 /prefix/b/b # SKIP\n")); + g_assert_nonnull (strstr (output, + "\n" TAP_SUBTEST_PREFIX "ok 8 /prefix-long/a # SKIP\n")); + g_assert_nonnull (strstr (output, + "\n" TAP_SUBTEST_PREFIX "ok 9 /c/a # SKIP\n")); + g_assert_nonnull (strstr (output, + "\n" TAP_SUBTEST_PREFIX "ok 10 /d/a # SKIP\n")); + + g_spawn_check_wait_status (status, &error); + g_assert_no_error (error); + + g_free (output); + g_ptr_array_unref (argv); + + g_test_message ("-p"); + argv = g_ptr_array_new (); + g_ptr_array_add (argv, (char *) testing_helper); + g_ptr_array_add (argv, "skip-options"); + g_ptr_array_add (argv, "--tap"); + g_ptr_array_add (argv, "-p"); + g_ptr_array_add (argv, "/c/a"); + g_ptr_array_add (argv, "-p"); + g_ptr_array_add (argv, "/c/a"); + g_ptr_array_add (argv, "-p"); + g_ptr_array_add (argv, "/b"); + g_ptr_array_add (argv, NULL); + + g_spawn_sync (NULL, (char **) argv->pdata, envp, + G_SPAWN_STDERR_TO_DEV_NULL, + NULL, NULL, &output, NULL, &status, + &error); + g_assert_no_error (error); + g_assert_null (strstr (output, "TAP version " TAP_VERSION)); + g_assert_null( strstr (output, "\n# Subtest: ")); + g_assert_nonnull (strstr (output, + "\n" TAP_SUBTEST_PREFIX "ok 1 /c/a\n")); + g_assert_nonnull (strstr (output, + "\n" TAP_SUBTEST_PREFIX "ok 2 /c/a\n")); + g_assert_nonnull (strstr (output, + "\n" TAP_SUBTEST_PREFIX "ok 3 /b\n")); + g_assert_nonnull (strstr (output, + "\n" TAP_SUBTEST_PREFIX "ok 4 /b/a\n")); + g_assert_nonnull (strstr (output, + "\n" TAP_SUBTEST_PREFIX "ok 5 /b/b\n")); + g_assert_nonnull (strstr (output, + "\n" TAP_SUBTEST_PREFIX "1..5\n")); + + g_spawn_check_wait_status (status, &error); + g_assert_no_error (error); + + g_free (output); + g_ptr_array_unref (argv); + + g_test_message ("--run-prefix"); + argv = g_ptr_array_new (); + g_ptr_array_add (argv, (char *) testing_helper); + g_ptr_array_add (argv, "skip-options"); + g_ptr_array_add (argv, "--tap"); + g_ptr_array_add (argv, "-r"); + g_ptr_array_add (argv, "/c/a"); + g_ptr_array_add (argv, "-r"); + g_ptr_array_add (argv, "/c/a"); + g_ptr_array_add (argv, "--run-prefix"); + g_ptr_array_add (argv, "/b"); + g_ptr_array_add (argv, NULL); + + g_spawn_sync (NULL, (char **) argv->pdata, envp, + G_SPAWN_STDERR_TO_DEV_NULL, + NULL, NULL, &output, NULL, &status, + &error); + g_assert_no_error (error); + g_assert_null (strstr (output, "TAP version " TAP_VERSION)); + g_assert_null( strstr (output, "\n# Subtest: ")); + g_assert_nonnull (strstr (output, + "\n" TAP_SUBTEST_PREFIX "ok 1 /c/a\n")); + g_assert_nonnull (strstr (output, + "\n" TAP_SUBTEST_PREFIX "ok 2 /c/a\n")); + g_assert_nonnull (strstr (output, + "\n" TAP_SUBTEST_PREFIX "ok 3 /b\n")); + g_assert_nonnull (strstr (output, + "\n" TAP_SUBTEST_PREFIX "ok 4 /b/a\n")); + g_assert_nonnull (strstr (output, + "\n" TAP_SUBTEST_PREFIX "ok 5 /b/b\n")); + g_assert_nonnull (strstr (output, + "\n" TAP_SUBTEST_PREFIX "ok 6 /b/b/a\n")); + g_assert_nonnull (strstr (output, + "\n" TAP_SUBTEST_PREFIX "1..6\n")); + + g_spawn_check_wait_status (status, &error); + g_assert_no_error (error); + + g_free (output); + g_ptr_array_unref (argv); + + g_test_message ("--run-prefix 2"); + argv = g_ptr_array_new (); + g_ptr_array_add (argv, (char *) testing_helper); + g_ptr_array_add (argv, "skip-options"); + g_ptr_array_add (argv, "--tap"); + g_ptr_array_add (argv, "-r"); + g_ptr_array_add (argv, "/pre"); + g_ptr_array_add (argv, "--run-prefix"); + g_ptr_array_add (argv, "/b/b"); + g_ptr_array_add (argv, NULL); + + g_spawn_sync (NULL, (char **) argv->pdata, envp, + G_SPAWN_STDERR_TO_DEV_NULL, + NULL, NULL, &output, NULL, &status, + &error); + g_assert_no_error (error); + g_assert_null (strstr (output, "TAP version " TAP_VERSION)); + g_assert_null( strstr (output, "\n# Subtest: ")); + g_assert_nonnull (strstr (output, + "\n" TAP_SUBTEST_PREFIX "ok 1 /b/b\n")); + g_assert_nonnull (strstr (output, + "\n" TAP_SUBTEST_PREFIX "ok 2 /b/b/a\n")); + g_assert_nonnull (strstr (output, + "\n" TAP_SUBTEST_PREFIX "1..2\n")); + + g_spawn_check_wait_status (status, &error); + g_assert_no_error (error); + + g_free (output); + g_ptr_array_unref (argv); + + g_test_message ("--run-prefix conflict"); + argv = g_ptr_array_new (); + g_ptr_array_add (argv, (char *) testing_helper); + g_ptr_array_add (argv, "skip-options"); + g_ptr_array_add (argv, "--tap"); + g_ptr_array_add (argv, "-r"); + g_ptr_array_add (argv, "/c/a"); + g_ptr_array_add (argv, "-p"); + g_ptr_array_add (argv, "/c/a"); + g_ptr_array_add (argv, "--run-prefix"); + g_ptr_array_add (argv, "/b"); + g_ptr_array_add (argv, NULL); + + g_spawn_sync (NULL, (char **) argv->pdata, envp, + G_SPAWN_STDERR_TO_DEV_NULL, + NULL, NULL, &output, NULL, &status, + &error); + g_assert_no_error (error); + g_spawn_check_wait_status (status, &error); + g_assert_nonnull (error); + g_assert_null (strstr (output, "TAP version " TAP_VERSION)); + g_assert_null( strstr (output, "\n# Subtest: ")); + g_assert_nonnull (strstr (output, "do not mix -r | --run-prefix with '-p'\n")); + g_clear_error (&error); + + g_free (output); + g_ptr_array_unref (argv); + + g_test_message ("-s"); + argv = g_ptr_array_new (); + g_ptr_array_add (argv, (char *) testing_helper); + g_ptr_array_add (argv, "skip-options"); + g_ptr_array_add (argv, "--tap"); + g_ptr_array_add (argv, "-s"); + g_ptr_array_add (argv, "/a"); + g_ptr_array_add (argv, "-s"); + g_ptr_array_add (argv, "/b"); + g_ptr_array_add (argv, "-s"); + g_ptr_array_add (argv, "/pre"); + g_ptr_array_add (argv, "-s"); + g_ptr_array_add (argv, "/c/a"); + g_ptr_array_add (argv, NULL); + + g_spawn_sync (NULL, (char **) argv->pdata, envp, + G_SPAWN_STDERR_TO_DEV_NULL, + NULL, NULL, &output, NULL, &status, + &error); + g_assert_no_error (error); + g_assert_null (strstr (output, "TAP version " TAP_VERSION)); + g_assert_null( strstr (output, "\n# Subtest: ")); + g_assert_nonnull (strstr (output, TAP_SUBTEST_PREFIX "1..10\n")); + g_assert_nonnull (strstr (output, + "\n" TAP_SUBTEST_PREFIX "ok 1 /a # SKIP by request")); + g_assert_nonnull (strstr (output, + "\n" TAP_SUBTEST_PREFIX "ok 2 /b # SKIP by request")); + /* "-s /b" would skip a test named exactly /b, but not a test named + * /b/anything */ + g_assert_nonnull (strstr (output, + "\n" TAP_SUBTEST_PREFIX "ok 3 /b/a\n")); + g_assert_nonnull (strstr (output, + "\n" TAP_SUBTEST_PREFIX "ok 4 /b/b\n")); + g_assert_nonnull (strstr (output, + "\n" TAP_SUBTEST_PREFIX "ok 5 /b/b/a\n")); + g_assert_nonnull (strstr (output, + "\n" TAP_SUBTEST_PREFIX "ok 6 /prefix/a\n")); + g_assert_nonnull (strstr (output, + "\n" TAP_SUBTEST_PREFIX "ok 7 /prefix/b/b\n")); + g_assert_nonnull (strstr (output, + "\n" TAP_SUBTEST_PREFIX "ok 8 /prefix-long/a\n")); + g_assert_nonnull (strstr (output, + "\n" TAP_SUBTEST_PREFIX "ok 9 /c/a # SKIP by request")); + g_assert_nonnull (strstr (output, + "\n" TAP_SUBTEST_PREFIX "ok 10 /d/a\n")); + + g_spawn_check_wait_status (status, &error); + g_assert_no_error (error); + + g_free (output); + g_ptr_array_unref (argv); + + g_test_message ("--skip-prefix"); + argv = g_ptr_array_new (); + g_ptr_array_add (argv, (char *) testing_helper); + g_ptr_array_add (argv, "skip-options"); + g_ptr_array_add (argv, "--tap"); + g_ptr_array_add (argv, "-x"); + g_ptr_array_add (argv, "/a"); + g_ptr_array_add (argv, "--skip-prefix"); + g_ptr_array_add (argv, "/pre"); + g_ptr_array_add (argv, "-x"); + g_ptr_array_add (argv, "/c/a"); + g_ptr_array_add (argv, NULL); + + g_spawn_sync (NULL, (char **) argv->pdata, envp, + G_SPAWN_STDERR_TO_DEV_NULL, + NULL, NULL, &output, NULL, &status, + &error); + g_assert_no_error (error); + g_assert_null (strstr (output, "TAP version " TAP_VERSION)); + g_assert_true (g_str_has_prefix (output, "# Subtest: ")); + g_assert_nonnull (strstr (output, TAP_SUBTEST_PREFIX "1..10\n")); + g_assert_nonnull (strstr (output, + "\n" TAP_SUBTEST_PREFIX "ok 1 /a # SKIP by request")); + g_assert_nonnull (strstr (output, + "\n" TAP_SUBTEST_PREFIX "ok 2 /b\n")); + g_assert_nonnull (strstr (output, + "\n" TAP_SUBTEST_PREFIX "ok 3 /b/a\n")); + g_assert_nonnull (strstr (output, + "\n" TAP_SUBTEST_PREFIX "ok 4 /b/b\n")); + g_assert_nonnull (strstr (output, + "\n" TAP_SUBTEST_PREFIX "ok 5 /b/b/a\n")); + /* "--skip-prefix /pre" will skip all test path which begins with /pre */ + g_assert_nonnull (strstr (output, + "\n" TAP_SUBTEST_PREFIX "ok 6 /prefix/a # SKIP by request")); + g_assert_nonnull (strstr (output, + "\n" TAP_SUBTEST_PREFIX "ok 7 /prefix/b/b # SKIP by request")); + g_assert_nonnull (strstr (output, + "\n" TAP_SUBTEST_PREFIX "ok 8 /prefix-long/a # SKIP by request")); + g_assert_nonnull (strstr (output, + "\n" TAP_SUBTEST_PREFIX "ok 9 /c/a # SKIP by request")); + g_assert_nonnull (strstr (output, + "\n" TAP_SUBTEST_PREFIX "ok 10 /d/a\n")); + + g_spawn_check_wait_status (status, &error); + g_assert_no_error (error); + + g_free (output); + g_ptr_array_unref (argv); } static void @@ -1584,6 +2227,7 @@ GError *error = NULL; int status; gchar *output; + char **envp; g_test_summary ("Test the output of g_test_summary() from the TAP output of a test."); @@ -1595,7 +2239,12 @@ g_ptr_array_add (argv, "--tap"); g_ptr_array_add (argv, NULL); - g_spawn_sync (NULL, (char **) argv->pdata, NULL, + /* Remove the G_TEST_ROOT_PROCESS env so it will be considered a standalone test */ + envp = g_get_environ (); + g_assert_nonnull (g_environ_getenv (envp, "G_TEST_ROOT_PROCESS")); + envp = g_environ_unsetenv (g_steal_pointer (&envp), "G_TEST_ROOT_PROCESS"); + + g_spawn_sync (NULL, (char **) argv->pdata, envp, G_SPAWN_STDERR_TO_DEV_NULL, NULL, NULL, &output, NULL, &status, &error); @@ -1603,14 +2252,577 @@ g_spawn_check_wait_status (status, &error); g_assert_no_error (error); + g_assert_null (strstr (output, "# Subtest: ")); + /* Note: The test path in the output is not `/tap/summary` because it’s the - * test path from testing-helper, not from this function. */ + * test path from testing-helper, not from this function. */g_assert_null (strstr (output, "# Subtest: ")); g_assert_nonnull (strstr (output, "\n# /summary summary: Tests that g_test_summary() " "works with TAP, by outputting a known " "summary message in testing-helper, and " "checking for it in the TAP output later.\n")); g_free (output); g_ptr_array_unref (argv); + g_strfreev (envp); +} + +static void +test_tap_subtest_summary (void) +{ + const char *testing_helper; + GPtrArray *argv; + GError *error = NULL; + int status; + gchar *output; + + g_test_summary ("Test the output of g_test_summary() from the TAP output of a test."); + + testing_helper = g_test_get_filename (G_TEST_BUILT, "testing-helper" EXEEXT, NULL); + + argv = g_ptr_array_new (); + g_ptr_array_add (argv, (char *) testing_helper); + g_ptr_array_add (argv, "summary"); + g_ptr_array_add (argv, "--tap"); + g_ptr_array_add (argv, NULL); + + g_spawn_sync (NULL, (char **) argv->pdata, NULL, + G_SPAWN_STDERR_TO_DEV_NULL, + NULL, NULL, &output, NULL, &status, + &error); + g_assert_no_error (error); + + g_spawn_check_wait_status (status, &error); + g_assert_no_error (error); + /* Note: The test path in the output is not `/tap/summary` because it’s the + * test path from testing-helper, not from this function. */ + g_assert_true (g_str_has_prefix (output, "# Subtest: ")); + g_assert_nonnull (strstr (output, + "\n" TAP_SUBTEST_PREFIX + "# /summary summary: Tests that g_test_summary() " + "works with TAP, by outputting a known " + "summary message in testing-helper, and " + "checking for it in the TAP output later.\n")); + g_free (output); + g_ptr_array_unref (argv); +} + +static void +test_tap_message (void) +{ + const char *testing_helper; + GPtrArray *argv; + GError *error = NULL; + int status; + gchar *output; + char **output_lines; + char **envp; + + g_test_summary ("Test the output of g_test_message() from the TAP output of a test."); + + testing_helper = g_test_get_filename (G_TEST_BUILT, "testing-helper" EXEEXT, NULL); + + argv = g_ptr_array_new (); + g_ptr_array_add (argv, (char *) testing_helper); + g_ptr_array_add (argv, "message"); + g_ptr_array_add (argv, "--tap"); + g_ptr_array_add (argv, NULL); + + /* Remove the G_TEST_ROOT_PROCESS env so it will be considered a standalone test */ + envp = g_get_environ (); + g_assert_nonnull (g_environ_getenv (envp, "G_TEST_ROOT_PROCESS")); + envp = g_environ_unsetenv (g_steal_pointer (&envp), "G_TEST_ROOT_PROCESS"); + + g_spawn_sync (NULL, (char **) argv->pdata, envp, + G_SPAWN_STDERR_TO_DEV_NULL, + NULL, NULL, &output, NULL, &status, + &error); + g_assert_no_error (error); + + g_spawn_check_wait_status (status, &error); + g_assert_no_error (error); + + g_assert_null (strstr (output, "# Subtest: ")); + + const char *expected_tap_header = "\n1..1\n"; + const char *interesting_lines = strstr (output, expected_tap_header); + g_assert_nonnull (interesting_lines); + interesting_lines += strlen (expected_tap_header); + + output_lines = g_strsplit (interesting_lines, "\n", -1); + g_assert_cmpuint (g_strv_length (output_lines), >=, 12); + + guint i = 0; + g_assert_cmpstr (output_linesi++, ==, "# Tests that single line message works"); + g_assert_cmpstr (output_linesi++, ==, "# Tests that multi"); + g_assert_cmpstr (output_linesi++, ==, "# "); + g_assert_cmpstr (output_linesi++, ==, "# line"); + g_assert_cmpstr (output_linesi++, ==, "# message"); + g_assert_cmpstr (output_linesi++, ==, "# works"); + g_assert_cmpstr (output_linesi++, ==, "# "); + g_assert_cmpstr (output_linesi++, ==, "# Tests that multi"); + g_assert_cmpstr (output_linesi++, ==, "# line"); + g_assert_cmpstr (output_linesi++, ==, "# message"); + g_assert_cmpstr (output_linesi++, ==, "# works with leading and trailing too"); + g_assert_cmpstr (output_linesi++, ==, "# "); + + g_free (output); + g_strfreev (output_lines); + g_strfreev (envp); + g_ptr_array_unref (argv); +} + +static void +test_tap_subtest_message (void) +{ + const char *testing_helper; + GPtrArray *argv; + GError *error = NULL; + int status; + gchar *output; + char **output_lines; + + g_test_summary ("Test the output of g_test_message() from the TAP output of a sub-test."); + + testing_helper = g_test_get_filename (G_TEST_BUILT, "testing-helper" EXEEXT, NULL); + + argv = g_ptr_array_new (); + g_ptr_array_add (argv, (char *) testing_helper); + g_ptr_array_add (argv, "message"); + g_ptr_array_add (argv, "--tap"); + g_ptr_array_add (argv, NULL); + + g_spawn_sync (NULL, (char **) argv->pdata, NULL, + G_SPAWN_STDERR_TO_DEV_NULL, + NULL, NULL, &output, NULL, &status, + &error); + g_assert_no_error (error); + + g_spawn_check_wait_status (status, &error); + g_assert_no_error (error); + + g_assert_true (g_str_has_prefix (output, "# Subtest: ")); + + const char *expected_tap_header = "\n" TAP_SUBTEST_PREFIX "1..1\n"; + const char *interesting_lines = strstr (output, expected_tap_header); + g_assert_nonnull (interesting_lines); + interesting_lines += strlen (expected_tap_header); + + output_lines = g_strsplit (interesting_lines, "\n", -1); + g_assert_cmpuint (g_strv_length (output_lines), >=, 12); + + guint i = 0; + g_assert_cmpstr (output_linesi++, ==, TAP_SUBTEST_PREFIX "# Tests that single line message works"); + g_assert_cmpstr (output_linesi++, ==, TAP_SUBTEST_PREFIX "# Tests that multi"); + g_assert_cmpstr (output_linesi++, ==, TAP_SUBTEST_PREFIX "# "); + g_assert_cmpstr (output_linesi++, ==, TAP_SUBTEST_PREFIX "# line"); + g_assert_cmpstr (output_linesi++, ==, TAP_SUBTEST_PREFIX "# message"); + g_assert_cmpstr (output_linesi++, ==, TAP_SUBTEST_PREFIX "# works"); + g_assert_cmpstr (output_linesi++, ==, TAP_SUBTEST_PREFIX "# "); + g_assert_cmpstr (output_linesi++, ==, TAP_SUBTEST_PREFIX "# Tests that multi"); + g_assert_cmpstr (output_linesi++, ==, TAP_SUBTEST_PREFIX "# line"); + g_assert_cmpstr (output_linesi++, ==, TAP_SUBTEST_PREFIX "# message"); + g_assert_cmpstr (output_linesi++, ==, TAP_SUBTEST_PREFIX "# works with leading and trailing too"); + g_assert_cmpstr (output_linesi++, ==, TAP_SUBTEST_PREFIX "# "); + + g_free (output); + g_strfreev (output_lines); + g_ptr_array_unref (argv); +} + +static void +test_tap_print (void) +{ + const char *testing_helper; + GPtrArray *argv; + GError *error = NULL; + int status; + gchar *output; + char **output_lines; + char **envp; + + g_test_summary ("Test the output of g_print() from the TAP output of a test."); + + testing_helper = g_test_get_filename (G_TEST_BUILT, "testing-helper" EXEEXT, NULL); + + argv = g_ptr_array_new (); + g_ptr_array_add (argv, (char *) testing_helper); + g_ptr_array_add (argv, "print"); + g_ptr_array_add (argv, "--tap"); + g_ptr_array_add (argv, NULL); + + /* Remove the G_TEST_ROOT_PROCESS env so it will be considered a standalone test */ + envp = g_get_environ (); + g_assert_nonnull (g_environ_getenv (envp, "G_TEST_ROOT_PROCESS")); + envp = g_environ_unsetenv (g_steal_pointer (&envp), "G_TEST_ROOT_PROCESS"); + + g_spawn_sync (NULL, (char **) argv->pdata, envp, + G_SPAWN_STDERR_TO_DEV_NULL, + NULL, NULL, &output, NULL, &status, + &error); + g_assert_no_error (error); + + g_spawn_check_wait_status (status, &error); + g_assert_no_error (error); + + const char *expected_tap_header = "\n1..1\n"; + const char *interesting_lines = strstr (output, expected_tap_header); + g_assert_nonnull (interesting_lines); + interesting_lines += strlen (expected_tap_header); + + output_lines = g_strsplit (interesting_lines, "\n", -1); + g_assert_cmpuint (g_strv_length (output_lines), >=, 3); + + guint i = 0; + g_assert_cmpstr (output_linesi++, ==, "# Tests that single line message works"); + g_assert_cmpstr (output_linesi++, ==, "# test that multiple"); + g_assert_cmpstr (output_linesi++, ==, "# lines can be written separately"); + + g_free (output); + g_strfreev (envp); + g_strfreev (output_lines); + g_ptr_array_unref (argv); +} + +static void +test_tap_subtest_print (void) +{ + const char *testing_helper; + GPtrArray *argv; + GError *error = NULL; + int status; + gchar *output; + char **output_lines; + + g_test_summary ("Test the output of g_test_print() from the TAP output of a sub-test."); + + testing_helper = g_test_get_filename (G_TEST_BUILT, "testing-helper" EXEEXT, NULL); + + argv = g_ptr_array_new (); + g_ptr_array_add (argv, (char *) testing_helper); + g_ptr_array_add (argv, "print"); + g_ptr_array_add (argv, "--tap"); + g_ptr_array_add (argv, NULL); + + g_spawn_sync (NULL, (char **) argv->pdata, NULL, + G_SPAWN_STDERR_TO_DEV_NULL, + NULL, NULL, &output, NULL, &status, + &error); + g_assert_no_error (error); + + g_spawn_check_wait_status (status, &error); + g_assert_no_error (error); + + const char *expected_tap_header = "\n" TAP_SUBTEST_PREFIX "1..1\n"; + const char *interesting_lines = strstr (output, expected_tap_header); + g_assert_nonnull (interesting_lines); + interesting_lines += strlen (expected_tap_header); + + output_lines = g_strsplit (interesting_lines, "\n", -1); + g_assert_cmpuint (g_strv_length (output_lines), >=, 3); + + guint i = 0; + g_assert_cmpstr (output_linesi++, ==, TAP_SUBTEST_PREFIX "# Tests that single line message works"); + g_assert_cmpstr (output_linesi++, ==, TAP_SUBTEST_PREFIX "# test that multiple"); + g_assert_cmpstr (output_linesi++, ==, TAP_SUBTEST_PREFIX "# lines can be written separately"); + + g_free (output); + g_strfreev (output_lines); + g_ptr_array_unref (argv); +} + +static void +test_tap_subtest_stdout (void) +{ + const char *testing_helper; + GPtrArray *argv; + GError *error = NULL; + int status; + gchar *output; + char **output_lines; + + g_test_summary ("Test the stdout from the TAP output of a sub-test."); + + testing_helper = g_test_get_filename (G_TEST_BUILT, "testing-helper" EXEEXT, NULL); + + argv = g_ptr_array_new (); + g_ptr_array_add (argv, (char *) testing_helper); + g_ptr_array_add (argv, "subprocess-stdout"); + g_ptr_array_add (argv, "--tap"); + g_ptr_array_add (argv, NULL); + + g_spawn_sync (NULL, (char **) argv->pdata, NULL, + G_SPAWN_STDERR_TO_DEV_NULL, + NULL, NULL, &output, NULL, &status, + &error); + g_assert_no_error (error); + + g_spawn_check_wait_status (status, &error); + g_assert_no_error (error); + + const char *expected_tap_header = "\n" TAP_SUBTEST_PREFIX "1..1\n"; + const char *interesting_lines = strstr (output, expected_tap_header); + g_assert_nonnull (interesting_lines); + + interesting_lines = strstr (interesting_lines, TAP_SUBTEST_PREFIX "# /sub-stdout"); + g_assert_nonnull (interesting_lines); + + output_lines = g_strsplit (interesting_lines, "\n", -1); + g_assert_cmpuint (g_strv_length (output_lines), >=, 5); + + guint i = 0; + g_assert_cmpstr (output_linesi++, ==, + TAP_SUBTEST_PREFIX "# /sub-stdout: Tests that single line message works"); + g_assert_cmpstr (output_linesi++, ==, + TAP_SUBTEST_PREFIX "# test that multiple"); + g_assert_cmpstr (output_linesi++, ==, + TAP_SUBTEST_PREFIX "# lines can be written separately"); + g_assert_cmpstr (output_linesi++, ==, + TAP_SUBTEST_PREFIX "# And another line has been put"); + g_assert_cmpstr (output_linesi++, ==, + TAP_SUBTEST_PREFIX "ok 1 /sub-stdout"); + + g_free (output); + g_strfreev (output_lines); + g_ptr_array_unref (argv); +} + +static void +test_tap_subtest_stdout_no_new_line (void) +{ + const char *testing_helper; + GPtrArray *argv; + GError *error = NULL; + int status; + gchar *output; + char **output_lines; + + g_test_summary ("Test the stdout from the TAP output of a sub-test."); + + testing_helper = g_test_get_filename (G_TEST_BUILT, "testing-helper" EXEEXT, NULL); + + argv = g_ptr_array_new (); + g_ptr_array_add (argv, (char *) testing_helper); + g_ptr_array_add (argv, "subprocess-stdout-no-nl"); + g_ptr_array_add (argv, "--tap"); + g_ptr_array_add (argv, NULL); + + g_spawn_sync (NULL, (char **) argv->pdata, NULL, + G_SPAWN_STDERR_TO_DEV_NULL, + NULL, NULL, &output, NULL, &status, + &error); + g_assert_no_error (error); + + g_spawn_check_wait_status (status, &error); + g_assert_no_error (error); + + const char *expected_tap_header = "\n" TAP_SUBTEST_PREFIX "1..1\n"; + const char *interesting_lines = strstr (output, expected_tap_header); + g_assert_nonnull (interesting_lines); + + interesting_lines = strstr (interesting_lines, TAP_SUBTEST_PREFIX "# /sub-stdout-no-nl"); + g_assert_nonnull (interesting_lines); + + output_lines = g_strsplit (interesting_lines, "\n", -1); + g_assert_cmpuint (g_strv_length (output_lines), >=, 2); + + guint i = 0; + g_assert_cmpstr (output_linesi++, ==, + TAP_SUBTEST_PREFIX "# /sub-stdout-no-nl: A message without trailing new line"); + g_assert_cmpstr (output_linesi++, ==, + TAP_SUBTEST_PREFIX "ok 1 /sub-stdout-no-nl"); + + g_free (output); + g_strfreev (output_lines); + g_ptr_array_unref (argv); +} + +static void +test_tap_error (void) +{ + const char *testing_helper; + GPtrArray *argv; + GError *error = NULL; + int status; + gchar *output; + char **envp; + + g_test_summary ("Test that g_error() generates Bail out TAP output of a test."); + + testing_helper = g_test_get_filename (G_TEST_BUILT, "testing-helper" EXEEXT, NULL); + + argv = g_ptr_array_new (); + g_ptr_array_add (argv, (char *) testing_helper); + g_ptr_array_add (argv, "error"); + g_ptr_array_add (argv, "--tap"); + g_ptr_array_add (argv, NULL); + + /* Remove the G_TEST_ROOT_PROCESS env so it will be considered a standalone test */ + envp = g_get_environ (); + g_assert_nonnull (g_environ_getenv (envp, "G_TEST_ROOT_PROCESS")); + envp = g_environ_unsetenv (g_steal_pointer (&envp), "G_TEST_ROOT_PROCESS"); + + g_spawn_sync (NULL, (char **) argv->pdata, envp, + G_SPAWN_STDERR_TO_DEV_NULL, + NULL, NULL, &output, NULL, &status, + &error); + g_assert_no_error (error); + + g_spawn_check_wait_status (status, &error); + g_assert_nonnull (error); + + g_assert_false (g_str_has_prefix (output, "# Subtest: ")); + + const char *expected_tap_header = "\n1..1\n"; + const char *interesting_lines = strstr (output, expected_tap_header); + g_assert_nonnull (interesting_lines); + interesting_lines += strlen (expected_tap_header); + + g_assert_cmpstr (interesting_lines, ==, "not ok /error - GLib-FATAL-ERROR: This should error out " + "Because it's just wrong!\n" + "Bail out!\n"); + + g_free (output); + g_strfreev (envp); + g_ptr_array_unref (argv); + g_clear_error (&error); +} + +static void +test_tap_subtest_error (void) +{ + const char *testing_helper; + GPtrArray *argv; + GError *error = NULL; + int status; + gchar *output; + + g_test_summary ("Test that g_error() generates Bail out TAP output of a test."); + + testing_helper = g_test_get_filename (G_TEST_BUILT, "testing-helper" EXEEXT, NULL); + + argv = g_ptr_array_new (); + g_ptr_array_add (argv, (char *) testing_helper); + g_ptr_array_add (argv, "error"); + g_ptr_array_add (argv, "--tap"); + g_ptr_array_add (argv, NULL); + + g_spawn_sync (NULL, (char **) argv->pdata, NULL, + G_SPAWN_STDERR_TO_DEV_NULL, + NULL, NULL, &output, NULL, &status, + &error); + g_assert_no_error (error); + + g_spawn_check_wait_status (status, &error); + g_assert_nonnull (error); + + g_assert_true (g_str_has_prefix (output, "# Subtest: ")); + + const char *expected_tap_header = "\n" TAP_SUBTEST_PREFIX "1..1\n"; + const char *interesting_lines = strstr (output, expected_tap_header); + g_assert_nonnull (interesting_lines); + interesting_lines += strlen (expected_tap_header); + + g_assert_cmpstr (interesting_lines, ==, + TAP_SUBTEST_PREFIX "not ok /error - GLib-FATAL-ERROR: This should error out " + "Because it's just wrong!\n" + TAP_SUBTEST_PREFIX "Bail out!\n"); + + g_free (output); + g_ptr_array_unref (argv); + g_clear_error (&error); +} + +static void +test_tap_error_and_pass (void) +{ + const char *testing_helper; + GPtrArray *argv; + GError *error = NULL; + int status; + gchar *output; + char **envp; + + g_test_summary ("Test that g_error() generates Bail out TAP output of a test."); + + testing_helper = g_test_get_filename (G_TEST_BUILT, "testing-helper" EXEEXT, NULL); + + /* Remove the G_TEST_ROOT_PROCESS env so it will be considered a standalone test */ + envp = g_get_environ (); + g_assert_nonnull (g_environ_getenv (envp, "G_TEST_ROOT_PROCESS")); + envp = g_environ_unsetenv (g_steal_pointer (&envp), "G_TEST_ROOT_PROCESS"); + + argv = g_ptr_array_new (); + g_ptr_array_add (argv, (char *) testing_helper); + g_ptr_array_add (argv, "error-and-pass"); + g_ptr_array_add (argv, "--tap"); + g_ptr_array_add (argv, NULL); + + g_spawn_sync (NULL, (char **) argv->pdata, envp, + G_SPAWN_STDERR_TO_DEV_NULL, + NULL, NULL, &output, NULL, &status, + &error); + g_assert_no_error (error); + + g_spawn_check_wait_status (status, &error); + g_assert_nonnull (error); + + const char *expected_tap_header = "\n1..2\n"; + const char *interesting_lines = strstr (output, expected_tap_header); + g_assert_nonnull (interesting_lines); + interesting_lines += strlen (expected_tap_header); + + g_assert_cmpstr (interesting_lines, ==, "not ok /error - GLib-FATAL-ERROR: This should error out " + "Because it's just wrong!\n" + "Bail out!\n"); + + g_free (output); + g_strfreev (envp); + g_ptr_array_unref (argv); + g_clear_error (&error); +} + +static void +test_tap_subtest_error_and_pass (void) +{ + const char *testing_helper; + GPtrArray *argv; + GError *error = NULL; + int status; + gchar *output; + + g_test_summary ("Test that g_error() generates Bail out TAP output of a test."); + + testing_helper = g_test_get_filename (G_TEST_BUILT, "testing-helper" EXEEXT, NULL); + + argv = g_ptr_array_new (); + g_ptr_array_add (argv, (char *) testing_helper); + g_ptr_array_add (argv, "error-and-pass"); + g_ptr_array_add (argv, "--tap"); + g_ptr_array_add (argv, NULL); + + g_spawn_sync (NULL, (char **) argv->pdata, NULL, + G_SPAWN_STDERR_TO_DEV_NULL, + NULL, NULL, &output, NULL, &status, + &error); + g_assert_no_error (error); + + g_spawn_check_wait_status (status, &error); + g_assert_nonnull (error); + + g_assert_true (g_str_has_prefix (output, "# Subtest: ")); + + const char *expected_tap_header = "\n" TAP_SUBTEST_PREFIX "1..2\n"; + const char *interesting_lines = strstr (output, expected_tap_header); + g_assert_nonnull (interesting_lines); + interesting_lines += strlen (expected_tap_header); + + g_assert_cmpstr (interesting_lines, ==, + TAP_SUBTEST_PREFIX "not ok /error - GLib-FATAL-ERROR: This should error out " + "Because it's just wrong!\n" + TAP_SUBTEST_PREFIX "Bail out!\n"); + + g_free (output); + g_ptr_array_unref (argv); + g_clear_error (&error); } static void @@ -1716,6 +2928,9 @@ g_test_add_func ("/misc/expected-messages/expect-error", test_expected_messages_expect_error); g_test_add_func ("/misc/expected-messages/skip-debug", test_expected_messages_debug); + g_test_add_func ("/misc/messages", test_messages); + g_test_add_func ("/misc/messages/subprocess/use-stderr", test_messages_use_stderr); + g_test_add_func ("/misc/dash-p", test_dash_p); g_test_add_func ("/misc/dash-p/child", test_dash_p_child); g_test_add_func ("/misc/dash-p/child/sub", test_dash_p_child_sub); @@ -1742,7 +2957,19 @@ g_test_add_func ("/misc/path/second", test_path_second); g_test_add_func ("/tap", test_tap); + g_test_add_func ("/tap/subtest", test_tap_subtest); g_test_add_func ("/tap/summary", test_tap_summary); + g_test_add_func ("/tap/subtest/summary", test_tap_subtest_summary); + g_test_add_func ("/tap/message", test_tap_message); + g_test_add_func ("/tap/subtest/message", test_tap_subtest_message); + g_test_add_func ("/tap/print", test_tap_print); + g_test_add_func ("/tap/subtest/print", test_tap_subtest_print); + g_test_add_func ("/tap/subtest/stdout", test_tap_subtest_stdout); + g_test_add_func ("/tap/subtest/stdout-no-new-line", test_tap_subtest_stdout_no_new_line); + g_test_add_func ("/tap/error", test_tap_error); + g_test_add_func ("/tap/subtest/error", test_tap_subtest_error); + g_test_add_func ("/tap/error-and-pass", test_tap_error_and_pass); + g_test_add_func ("/tap/subtest/error-and-pass", test_tap_subtest_error_and_pass); g_test_add_func ("/init/no_argv0", test_init_no_argv0);
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/tests/thread-pool.c -> _service:tar_scm:glib-2.76.4.tar.xz/glib/tests/thread-pool.c
Changed
@@ -1,6 +1,8 @@ /* Unit tests for GThreadPool * Copyright (C) 2020 Sebastian Dröge <sebastian@centricular.com> * + * SPDX-License-Identifier: LicenseRef-old-glib-tests + * * This work is provided "as is"; redistribution and modification * in whole or in part, in any medium, physical or electronic is * permitted without restriction.
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/tests/thread.c -> _service:tar_scm:glib-2.76.4.tar.xz/glib/tests/thread.c
Changed
@@ -2,6 +2,8 @@ * Copyright (C) 2011 Red Hat, Inc * Author: Matthias Clasen * + * SPDX-License-Identifier: LicenseRef-old-glib-tests + * * This work is provided "as is"; redistribution and modification * in whole or in part, in any medium, physical or electronic is * permitted without restriction. @@ -145,7 +147,8 @@ nl.rlim_cur = 1; if (prlimit (getpid (), RLIMIT_NPROC, &nl, &ol) != 0) - g_error ("prlimit failed: %s", g_strerror (errno)); + g_error ("setting RLIMIT_NPROC to {cur=%ld,max=%ld} failed: %s", + (long) nl.rlim_cur, (long) nl.rlim_max, g_strerror (errno)); error = NULL; thread = g_thread_try_new ("a", thread1_func, NULL, &error);
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/tests/timer.c -> _service:tar_scm:glib-2.76.4.tar.xz/glib/tests/timer.c
Changed
@@ -1,6 +1,8 @@ /* Unit tests for GTimer * Copyright (C) 2013 Red Hat, Inc. * + * SPDX-License-Identifier: LicenseRef-old-glib-tests + * * This work is provided "as is"; redistribution and modification * in whole or in part, in any medium, physical or electronic is * permitted without restriction.
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/tests/unicode.c -> _service:tar_scm:glib-2.76.4.tar.xz/glib/tests/unicode.c
Changed
@@ -2,6 +2,8 @@ * Copyright (C) 2010 Red Hat, Inc. * Copyright (C) 2011 Google, Inc. * + * SPDX-License-Identifier: LicenseRef-old-glib-tests + * * This work is provided "as is"; redistribution and modification * in whole or in part, in any medium, physical or electronic is * permitted without restriction. @@ -457,6 +459,10 @@ /* Tricky, comparing two unicode strings with an ASCII function */ g_assert_cmpstr (str_up, ==, "AAZZ09X;\003E\357\274\241\357\274\241"); g_free (str_up); + + str_up = g_utf8_strup ("", 0); + g_assert_cmpstr (str_up, ==, ""); + g_free (str_up); } /* Test that g_utf8_strdown() returns the correct value for various @@ -482,6 +488,10 @@ /* Tricky, comparing two unicode strings with an ASCII function */ g_assert_cmpstr (str_down, ==, "aazz09x;\003\007\357\275\201\357\275\201"); g_free (str_down); + + str_down = g_utf8_strdown ("", 0); + g_assert_cmpstr (str_down, ==, ""); + g_free (str_down); } /* Test that g_utf8_strup() and g_utf8_strdown() return the correct @@ -574,6 +584,10 @@ /* Tricky, comparing two unicode strings with an ASCII function */ g_assert_cmpstr (str_casefold, ==, "aazz09x;\357\275\201\357\275\201"); g_free (str_casefold); + + str_casefold = g_utf8_casefold ("", 0); + g_assert_cmpstr (str_casefold, ==, ""); + g_free (str_casefold); } static void @@ -1887,6 +1901,45 @@ #undef PACK } +static void +test_normalize (void) +{ + guint i; + typedef struct + { + const gchar *str; + const gchar *nfd; + const gchar *nfc; + const gchar *nfkd; + const gchar *nfkc; + } Test; + Test tests = { + { "Äffin", "A\u0308ffin", "Äffin", "A\u0308ffin", "Äffin" }, + { "Ä\uFB03n", "A\u0308\uFB03n", "Ä\uFB03n", "A\u0308ffin", "Äffin" }, + { "Henry IV", "Henry IV", "Henry IV", "Henry IV", "Henry IV" }, + { "Henry \u2163", "Henry \u2163", "Henry \u2163", "Henry IV", "Henry IV" }, + { "non-utf\x88", NULL, NULL, NULL, NULL }, + { "", "", "", "", "" }, + }; + +#define TEST(str, mode, expected) \ + { \ + gchar *normalized = g_utf8_normalize (str, -1, mode); \ + g_assert_cmpstr (normalized, ==, expected); \ + g_free (normalized); \ + } + + for (i = 0; i < G_N_ELEMENTS (tests); i++) + { + TEST (testsi.str, G_NORMALIZE_NFD, testsi.nfd); + TEST (testsi.str, G_NORMALIZE_NFC, testsi.nfc); + TEST (testsi.str, G_NORMALIZE_NFKD, testsi.nfkd); + TEST (testsi.str, G_NORMALIZE_NFKC, testsi.nfkc); + } + +#undef TEST +} + int main (int argc, char *argv) @@ -1931,6 +1984,7 @@ g_test_add_func ("/unicode/xdigit", test_xdigit); g_test_add_func ("/unicode/xdigit-value", test_xdigit_value); g_test_add_func ("/unicode/zero-width", test_zerowidth); + g_test_add_func ("/unicode/normalize", test_normalize); return g_test_run(); }
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/tests/unix.c -> _service:tar_scm:glib-2.76.4.tar.xz/glib/tests/unix.c
Changed
@@ -1,6 +1,8 @@ /* * Copyright (C) 2011 Red Hat, Inc. * + * SPDX-License-Identifier: LicenseRef-old-glib-tests + * * This work is provided "as is"; redistribution and modification * in whole or in part, in any medium, physical or electronic is * permitted without restriction.
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/tests/utf8-misc.c -> _service:tar_scm:glib-2.76.4.tar.xz/glib/tests/utf8-misc.c
Changed
@@ -1,6 +1,8 @@ /* Unit tests for utilities * Copyright (C) 2010 Red Hat, Inc. * + * SPDX-License-Identifier: LicenseRef-old-glib-tests + * * This work is provided "as is"; redistribution and modification * in whole or in part, in any medium, physical or electronic is * permitted without restriction.
View file
_service:tar_scm:glib-2.76.4.tar.xz/glib/tests/utils-isolated.c
Added
@@ -0,0 +1,114 @@ +/* Copyright (C) 2022 Marco Trevisan + * + * SPDX-License-Identifier: LGPL-2.1-or-later + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General + * Public License along with this library; if not, see <http://www.gnu.org/licenses/>. + * + * Author: Marco Trevisan <marco.trevisan@canonical.com> + */ + +#include "config.h" + +#include <glib/glib.h> + +/* Test that all of the well-known directories returned by GLib + * are returned as children of test_tmpdir when running with + * %G_TEST_OPTION_ISOLATE_DIRS. This ensures that tests should + * not interfere with each other in `/tmp` while running. + */ + +const char *test_tmpdir; + +static void +test_tmp_dir (void) +{ + g_assert_cmpstr (g_get_tmp_dir (), ==, test_tmpdir); +} + +static void +test_home_dir (void) +{ + g_assert_true (g_str_has_prefix (g_get_home_dir (), test_tmpdir)); +} + +static void +test_user_cache_dir (void) +{ + g_assert_true (g_str_has_prefix (g_get_user_cache_dir (), test_tmpdir)); +} + +static void +test_system_config_dirs (void) +{ + const char *const *dir; + + for (dir = g_get_system_config_dirs (); *dir != NULL; dir++) + g_assert_true (g_str_has_prefix (*dir, test_tmpdir)); +} + +static void +test_user_config_dir (void) +{ + g_assert_true (g_str_has_prefix (g_get_user_config_dir (), test_tmpdir)); +} + +static void +test_system_data_dirs (void) +{ + const char *const *dir; + + for (dir = g_get_system_data_dirs (); *dir != NULL; dir++) + g_assert_true (g_str_has_prefix (*dir, test_tmpdir)); +} + +static void +test_user_data_dir (void) +{ + g_assert_true (g_str_has_prefix (g_get_user_data_dir (), test_tmpdir)); +} + +static void +test_user_state_dir (void) +{ + g_assert_true (g_str_has_prefix (g_get_user_state_dir (), test_tmpdir)); +} + +static void +test_user_runtime_dir (void) +{ + g_assert_true (g_str_has_prefix (g_get_user_runtime_dir (), test_tmpdir)); +} + + +int +main (int argc, + char *argv) +{ + g_setenv ("LC_ALL", "C", TRUE); + g_test_init (&argc, &argv, G_TEST_OPTION_ISOLATE_DIRS, NULL); + + test_tmpdir = g_getenv ("G_TEST_TMPDIR"); + g_assert_nonnull (test_tmpdir); + + g_test_add_func ("/utils-isolated/tmp-dir", test_tmp_dir); + g_test_add_func ("/utils-isolated/home-dir", test_home_dir); + g_test_add_func ("/utils-isolated/user-cache-dir", test_user_cache_dir); + g_test_add_func ("/utils-isolated/system-config-dirs", test_system_config_dirs); + g_test_add_func ("/utils-isolated/user-config-dir", test_user_config_dir); + g_test_add_func ("/utils-isolated/system-data-dirs", test_system_data_dirs); + g_test_add_func ("/utils-isolated/user-data-dir", test_user_data_dir); + g_test_add_func ("/utils-isolated/user-state-dir", test_user_state_dir); + g_test_add_func ("/utils-isolated/user-runtime-dir", test_user_runtime_dir); + return g_test_run (); +}
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/tests/utils.c -> _service:tar_scm:glib-2.76.4.tar.xz/glib/tests/utils.c
Changed
@@ -1,6 +1,8 @@ /* Unit tests for utilities * Copyright (C) 2010 Red Hat, Inc. * + * SPDX-License-Identifier: LicenseRef-old-glib-tests + * * This work is provided "as is"; redistribution and modification * in whole or in part, in any medium, physical or electronic is * permitted without restriction. @@ -27,6 +29,8 @@ #include "glib.h" #include "glib-private.h" +#include "gutilsprivate.h" +#include "glib/gstdio.h" #include <stdlib.h> #include <string.h> @@ -483,6 +487,153 @@ g_assert (res == NULL); } +static char * +find_program_for_path (const char *program, + const char *path, + const char *working_dir) +{ + return GLIB_PRIVATE_CALL(g_find_program_for_path) (program, path, working_dir); +} + +static void +test_find_program_for_path (void) +{ + GError *error = NULL; + /* Using .cmd extension to make windows to consider it an executable */ + const char *command_to_find = "just-an-exe-file.cmd"; + char *path; + char *exe_path; + char *found_path; + char *old_cwd; + char *tmp; + + tmp = g_dir_make_tmp ("find_program_for_path_XXXXXXX", &error); + g_assert_no_error (error); + + path = g_build_filename (tmp, "sub-path", NULL); + g_mkdir (path, 0700); + g_assert_true (g_file_test (path, G_FILE_TEST_IS_DIR)); + + exe_path = g_build_filename (path, command_to_find, NULL); + g_file_set_contents (exe_path, "", -1, &error); + g_assert_no_error (error); + g_assert_true (g_file_test (exe_path, G_FILE_TEST_EXISTS)); + +#ifdef G_OS_UNIX + g_assert_no_errno (g_chmod (exe_path, 0500)); +#endif + g_assert_true (g_file_test (exe_path, G_FILE_TEST_IS_EXECUTABLE)); + + g_assert_null (g_find_program_in_path (command_to_find)); + g_assert_null (find_program_for_path (command_to_find, NULL, NULL)); + + found_path = find_program_for_path (command_to_find, path, NULL); +#ifdef __APPLE__ + g_assert_nonnull (found_path); + g_assert_true (g_str_has_suffix (found_path, exe_path)); +#else + g_assert_cmpstr (exe_path, ==, found_path); +#endif + g_clear_pointer (&found_path, g_free); + + found_path = find_program_for_path (command_to_find, path, path); +#ifdef __APPLE__ + g_assert_nonnull (found_path); + g_assert_true (g_str_has_suffix (found_path, exe_path)); +#else + g_assert_cmpstr (exe_path, ==, found_path); +#endif + g_clear_pointer (&found_path, g_free); + + found_path = find_program_for_path (command_to_find, NULL, path); +#ifdef __APPLE__ + g_assert_nonnull (found_path); + g_assert_true (g_str_has_suffix (found_path, exe_path)); +#else + g_assert_cmpstr (exe_path, ==, found_path); +#endif + g_clear_pointer (&found_path, g_free); + + found_path = find_program_for_path (command_to_find, "::", path); +#ifdef __APPLE__ + g_assert_nonnull (found_path); + g_assert_true (g_str_has_suffix (found_path, exe_path)); +#else + g_assert_cmpstr (exe_path, ==, found_path); +#endif + g_clear_pointer (&found_path, g_free); + + old_cwd = g_get_current_dir (); + g_chdir (path); + found_path = + find_program_for_path (command_to_find, + G_SEARCHPATH_SEPARATOR_S G_SEARCHPATH_SEPARATOR_S, NULL); + g_chdir (old_cwd); + g_clear_pointer (&old_cwd, g_free); +#ifdef __APPLE__ + g_assert_nonnull (found_path); + g_assert_true (g_str_has_suffix (found_path, exe_path)); +#else + g_assert_cmpstr (exe_path, ==, found_path); +#endif + g_clear_pointer (&found_path, g_free); + + old_cwd = g_get_current_dir (); + g_chdir (tmp); + found_path = + find_program_for_path (command_to_find, + G_SEARCHPATH_SEPARATOR_S G_SEARCHPATH_SEPARATOR_S, "sub-path"); + g_chdir (old_cwd); + g_clear_pointer (&old_cwd, g_free); +#ifdef __APPLE__ + g_assert_nonnull (found_path); + g_assert_true (g_str_has_suffix (found_path, exe_path)); +#else + g_assert_cmpstr (exe_path, ==, found_path); +#endif + g_clear_pointer (&found_path, g_free); + + g_assert_null ( + find_program_for_path (command_to_find, + G_SEARCHPATH_SEPARATOR_S G_SEARCHPATH_SEPARATOR_S, "other-sub-path")); + + found_path = find_program_for_path (command_to_find, + G_SEARCHPATH_SEPARATOR_S "sub-path" G_SEARCHPATH_SEPARATOR_S, tmp); +#ifdef __APPLE__ + g_assert_nonnull (found_path); + g_assert_true (g_str_has_suffix (found_path, exe_path)); +#else + g_assert_cmpstr (exe_path, ==, found_path); +#endif + g_clear_pointer (&found_path, g_free); + + g_assert_null (find_program_for_path (command_to_find, + G_SEARCHPATH_SEPARATOR_S "other-sub-path" G_SEARCHPATH_SEPARATOR_S, tmp)); + +#ifdef G_OS_UNIX + found_path = find_program_for_path ("sh", NULL, tmp); + g_assert_nonnull (found_path); + g_clear_pointer (&found_path, g_free); + + old_cwd = g_get_current_dir (); + g_chdir ("/"); + found_path = find_program_for_path ("sh", "sbin:bin:usr/bin:usr/sbin", NULL); + g_chdir (old_cwd); + g_clear_pointer (&old_cwd, g_free); + g_assert_nonnull (found_path); + g_clear_pointer (&found_path, g_free); + + found_path = find_program_for_path ("sh", "sbin:bin:usr/bin:usr/sbin", "/"); + g_assert_nonnull (found_path); + g_clear_pointer (&found_path, g_free); +#endif /* G_OS_UNIX */ + + g_clear_pointer (&exe_path, g_free); + g_clear_pointer (&path, g_free); + g_clear_pointer (&tmp, g_free); + g_clear_error (&error); +} + static void test_debug (void) { @@ -943,13 +1094,13 @@ g_test_summary ("Aligned memory allocator"); - a = g_aligned_alloc (0, sizeof(int), 8); + a = g_aligned_alloc (0, sizeof (int), MAX (sizeof (void *), 8)); g_assert_null (a); - a = g_aligned_alloc0 (0, sizeof(int), 8); + a = g_aligned_alloc0 (0, sizeof (int), MAX (sizeof (void *), 8)); g_assert_null (a); - a = g_aligned_alloc (16, 0, 8); + a = g_aligned_alloc (16, 0, MAX (sizeof (void *), 8)); g_assert_null (a); #define CHECK_SUBPROCESS_FAIL(name,msg) do { \ @@ -1000,6 +1151,39 @@ } static void +test_aligned_mem_free_sized (void) +{ + gsize n_blocks = 10; + guint *p; + + g_test_summary ("Check that g_aligned_free_sized() works"); + + p = g_aligned_alloc (n_blocks, sizeof (*p), 16); + g_assert_nonnull (p); + + g_aligned_free_sized (p, sizeof (*p), n_blocks * 16); + + /* NULL should be ignored */ + g_aligned_free_sized (NULL, sizeof (*p), n_blocks * 16); +} + +static void +test_free_sized (void) +{ + gpointer p; + + g_test_summary ("Check that g_free_sized() works"); + + p = g_malloc (123); + g_assert_nonnull (p); + + g_free_sized (p, 123); + + /* NULL should be ignored */ + g_free_sized (NULL, 123); +} + +static void test_nullify (void) { gpointer p = &test_nullify; @@ -1147,6 +1331,7 @@ g_test_add_func ("/utils/bits", test_bits); g_test_add_func ("/utils/swap", test_swap); g_test_add_func ("/utils/find-program", test_find_program); + g_test_add_func ("/utils/find-program-for-path", test_find_program_for_path); g_test_add_func ("/utils/debug", test_debug); g_test_add_func ("/utils/codeset", test_codeset); g_test_add_func ("/utils/codeset2", test_codeset2); @@ -1173,6 +1358,8 @@ g_test_add_func ("/utils/aligned-mem/subprocess/aligned_alloc_nmov", aligned_alloc_nmov); g_test_add_func ("/utils/aligned-mem/alignment", test_aligned_mem_alignment); g_test_add_func ("/utils/aligned-mem/zeroed", test_aligned_mem_zeroed); + g_test_add_func ("/utils/aligned-mem/free-sized", test_aligned_mem_free_sized); + g_test_add_func ("/utils/free-sized", test_free_sized); g_test_add_func ("/utils/nullify", test_nullify); g_test_add_func ("/utils/atexit", test_atexit); g_test_add_func ("/utils/check-setuid", test_check_setuid);
View file
_service:tar_scm:glib-2.74.4.tar.xz/glib/tests/win32.c -> _service:tar_scm:glib-2.76.4.tar.xz/glib/tests/win32.c
Changed
@@ -1,6 +1,8 @@ /* Unit test for VEH on Windows * Copyright (C) 2019 Руслан Ижбулатов * + * SPDX-License-Identifier: LicenseRef-old-glib-tests + * * This work is provided "as is"; redistribution and modification * in whole or in part, in any medium, physical or electronic is * permitted without restriction.
View file
_service:tar_scm:glib-2.74.4.tar.xz/gmodule/COPYING -> _service:tar_scm:glib-2.76.4.tar.xz/gmodule/COPYING
Changed
-(symlink to LICENSES/LGPL-2.1-or-later.txt) +(symlink to ../LICENSES/LGPL-2.1-or-later.txt)
View file
_service:tar_scm:glib-2.74.4.tar.xz/gmodule/gmodule-ar.c -> _service:tar_scm:glib-2.76.4.tar.xz/gmodule/gmodule-ar.c
Changed
@@ -167,18 +167,3 @@ return p; } - -static gchar* -_g_module_build_path (const gchar *directory, - const gchar *module_name) -{ - if (directory && *directory) { - if (strncmp (module_name, "lib", 3) == 0) - return g_strconcat (directory, "/", module_name, NULL); - else - return g_strconcat (directory, "/lib", module_name, "." G_MODULE_SUFFIX, NULL); - } else if (strncmp (module_name, "lib", 3) == 0) - return g_strdup (module_name); - else - return g_strconcat ("lib", module_name, "." G_MODULE_SUFFIX, NULL); -}
View file
_service:tar_scm:glib-2.76.4.tar.xz/gmodule/gmodule-deprecated.c
Added
@@ -0,0 +1,32 @@ +#include "config.h" + +/* + * This is the only way to disable deprecation warnings for macros, and we need + * to continue using G_MODULE_SUFFIX in the implementation of + * g_module_build_path() which is also deprecated API. + */ +#ifndef GLIB_DISABLE_DEPRECATION_WARNINGS +#define GLIB_DISABLE_DEPRECATION_WARNINGS +#endif + +#include <glib.h> + +#if (G_MODULE_IMPL == G_MODULE_IMPL_AR) || (G_MODULE_IMPL == G_MODULE_IMPL_DL) +G_GNUC_INTERNAL gchar* _g_module_build_path (const gchar *directory, + const gchar *module_name); + +gchar* +_g_module_build_path (const gchar *directory, + const gchar *module_name) +{ + if (directory && *directory) { + if (strncmp (module_name, "lib", 3) == 0) + return g_strconcat (directory, "/", module_name, NULL); + else + return g_strconcat (directory, "/lib", module_name, "." G_MODULE_SUFFIX, NULL); + } else if (strncmp (module_name, "lib", 3) == 0) + return g_strdup (module_name); + else + return g_strconcat ("lib", module_name, "." G_MODULE_SUFFIX, NULL); +} +#endif
View file
_service:tar_scm:glib-2.74.4.tar.xz/gmodule/gmodule-dl.c -> _service:tar_scm:glib-2.76.4.tar.xz/gmodule/gmodule-dl.c
Changed
@@ -167,7 +167,7 @@ * NULL is given, dlsym returns an appropriate pointer. */ lock_dlerror (); -#if defined(__BIONIC__) +#if defined(__BIONIC__) || defined(__NetBSD__) handle = RTLD_DEFAULT; #else handle = dlopen (NULL, RTLD_GLOBAL | RTLD_LAZY); @@ -182,7 +182,7 @@ static void _g_module_close (gpointer handle) { -#if defined(__BIONIC__) +#if defined(__BIONIC__) || defined(__NetBSD__) if (handle != RTLD_DEFAULT) #endif { @@ -210,18 +210,3 @@ return p; } - -static gchar* -_g_module_build_path (const gchar *directory, - const gchar *module_name) -{ - if (directory && *directory) { - if (strncmp (module_name, "lib", 3) == 0) - return g_strconcat (directory, "/", module_name, NULL); - else - return g_strconcat (directory, "/lib", module_name, "." G_MODULE_SUFFIX, NULL); - } else if (strncmp (module_name, "lib", 3) == 0) - return g_strdup (module_name); - else - return g_strconcat ("lib", module_name, "." G_MODULE_SUFFIX, NULL); -}
View file
_service:tar_scm:glib-2.74.4.tar.xz/gmodule/gmodule.c -> _service:tar_scm:glib-2.76.4.tar.xz/gmodule/gmodule.c
Changed
@@ -45,6 +45,10 @@ #include <io.h> /* For open() and close() prototypes. */ #endif +#ifndef O_CLOEXEC +#define O_CLOEXEC 0 +#endif + #include "gmoduleconf.h" #include "gstdio.h" @@ -161,9 +165,24 @@ /** * G_MODULE_SUFFIX: * - * Expands to the proper shared library suffix for the current platform - * without the leading dot. For most Unices and Linux this is "so", and - * for Windows this is "dll". + * Expands to a shared library suffix for the current platform without the + * leading dot. On Unixes this is "so", and on Windows this is "dll". + * + * Deprecated: 2.76: Use g_module_open() instead with @module_name as the + * basename of the file_name argument. You will get the wrong results using + * this macro most of the time: + * + * 1. The suffix on macOS is usually 'dylib', but it's 'so' when using + * Autotools, so there's no way to get the suffix correct using + * a pre-processor macro. + * 2. Prefixes also vary in a platform-specific way. You may or may not have + * a 'lib' prefix for the name on Windows and on Cygwin the prefix is + * 'cyg'. + * 3. The library name itself can vary per platform. For instance, you may + * want to load foo-1.dll on Windows and libfoo.1.dylib on macOS. + * + * g_module_open() takes care of all this by searching the filesystem for + * combinations of possible suffixes and prefixes. */ /** @@ -178,6 +197,11 @@ * non-default * visibility flag(https://gcc.gnu.org/onlinedocs/gcc/Code-Gen-Options.html#index-fvisibility-1260) * such as `hidden`. + * + * This macro must only be used when compiling a shared module. Modules that + * support both shared and static linking should define their own macro that + * expands to %G_MODULE_EXPORT when compiling the shared module, but is empty + * when compiling the static module on Windows. */ /** @@ -214,8 +238,14 @@ static gpointer _g_module_self (void); static gpointer _g_module_symbol (gpointer handle, const gchar *symbol_name); +#if (G_MODULE_IMPL != G_MODULE_IMPL_DL) && (G_MODULE_IMPL != G_MODULE_IMPL_AR) static gchar* _g_module_build_path (const gchar *directory, const gchar *module_name); +#else +/* Implementation is in gmodule-deprecated.c */ +gchar* _g_module_build_path (const gchar *directory, + const gchar *module_name); +#endif static inline void g_module_set_error (const gchar *error); static inline GModule* g_module_find_by_handle (gpointer handle); static inline GModule* g_module_find_by_name (const gchar *name); @@ -362,7 +392,7 @@ GTokenType token; GScanner *scanner; - int fd = g_open (libtool_name, O_RDONLY, 0); + int fd = g_open (libtool_name, O_RDONLY | O_CLOEXEC, 0); if (fd < 0) { gchar *display_libtool_name = g_filename_display_name (libtool_name); @@ -476,24 +506,28 @@ /** * g_module_open_full: - * @file_name: (nullable): the name of the file containing the module, or %NULL - * to obtain a #GModule representing the main program itself + * @file_name: (nullable): the name or path to the file containing the module, + * or %NULL to obtain a #GModule representing the main program itself * @flags: the flags used for opening the module. This can be the * logical OR of any of the #GModuleFlags * @error: #GError. * - * Opens a module. If the module has already been opened, - * its reference count is incremented. + * Opens a module. If the module has already been opened, its reference count + * is incremented. If not, the module is searched in the following order: * - * First of all g_module_open_full() tries to open @file_name as a module. - * If that fails and @file_name has the ".la"-suffix (and is a libtool - * archive) it tries to open the corresponding module. If that fails - * and it doesn't have the proper module suffix for the platform - * (%G_MODULE_SUFFIX), this suffix will be appended and the corresponding - * module will be opened. If that fails and @file_name doesn't have the - * ".la"-suffix, this suffix is appended and g_module_open_full() tries to open - * the corresponding module. If eventually that fails as well, %NULL is - * returned. + * 1. If @file_name exists as a regular file, it is used as-is; else + * 2. If @file_name doesn't have the correct suffix and/or prefix for the + * platform, then possible suffixes and prefixes will be added to the + * basename till a file is found and whatever is found will be used; else + * 3. If @file_name doesn't have the ".la"-suffix, ".la" is appended. Either + * way, if a matching .la file exists (and is a libtool archive) the + * libtool archive is parsed to find the actual file name, and that is + * used. + * + * At the end of all this, we would have a file path that we can access on + * disk, and it is opened as a module. If not, @file_name is opened as + * a module verbatim in the hopes that the system implementation will somehow + * be able to access it. * * Returns: a #GModule on success, or %NULL on failure * @@ -563,12 +597,58 @@ /* try completing file name with standard library suffix */ if (!name) { - name = g_strconcat (file_name, "." G_MODULE_SUFFIX, NULL); - if (!g_file_test (name, G_FILE_TEST_IS_REGULAR)) - { - g_free (name); - name = NULL; - } + char *basename, *dirname; + size_t prefix_idx = 0, suffix_idx = 0; + const char *prefixes2 = {0}, *suffixes2 = {0}; + + basename = g_path_get_basename (file_name); + dirname = g_path_get_dirname (file_name); +#ifdef G_OS_WIN32 + if (!g_str_has_prefix (basename, "lib")) + prefixesprefix_idx++ = "lib"; + prefixesprefix_idx++ = ""; + if (!g_str_has_suffix (basename, ".dll")) + suffixessuffix_idx++ = ".dll"; +#else + #ifdef __CYGWIN__ + if (!g_str_has_prefix (basename, "cyg")) + prefixesprefix_idx++ = "cyg"; + #else + if (!g_str_has_prefix (basename, "lib")) + prefixesprefix_idx++ = "lib"; + else + /* People commonly pass `libfoo` as the file_name and want us to + * auto-detect the suffix as .la or .so, etc. We need to also find + * .dylib and .dll in those cases. */ + prefixesprefix_idx++ = ""; + #endif + #ifdef __APPLE__ + if (!g_str_has_suffix (basename, ".dylib") && + !g_str_has_suffix (basename, ".so")) + { + suffixessuffix_idx++ = ".dylib"; + suffixessuffix_idx++ = ".so"; + } + #else + if (!g_str_has_suffix (basename, ".so")) + suffixessuffix_idx++ = ".so"; + #endif +#endif + for (guint i = 0; i < prefix_idx; i++) + { + for (guint j = 0; j < suffix_idx; j++) + { + name = g_strconcat (dirname, G_DIR_SEPARATOR_S, prefixesi, + basename, suffixesj, NULL); + if (g_file_test (name, G_FILE_TEST_IS_REGULAR)) + goto name_found; + g_free (name); + name = NULL; + } + } + name_found: + g_free (basename); + g_free (dirname); } /* try completing by appending libtool suffix */ if (!name) @@ -587,8 +667,9 @@ { gchar *dot = strrchr (file_name, '.'); gchar *slash = strrchr (file_name, G_DIR_SEPARATOR); - - /* make sure the name has a suffix */ + + /* we make sure the name has a suffix using the deprecated + * G_MODULE_SUFFIX for backward-compat */ if (!dot || dot < slash) name = g_strconcat (file_name, "." G_MODULE_SUFFIX, NULL); else @@ -682,8 +763,8 @@ /** * g_module_open: - * @file_name: (nullable): the name of the file containing the module, or %NULL - * to obtain a #GModule representing the main program itself + * @file_name: (nullable): the name or path to the file containing the module, + * or %NULL to obtain a #GModule representing the main program itself * @flags: the flags used for opening the module. This can be the * logical OR of any of the #GModuleFlags. * @@ -886,6 +967,9 @@ * * Returns: the complete path of the module, including the standard library * prefix and suffix. This should be freed when no longer needed + * + * Deprecated: 2.76: Use g_module_open() instead with @module_name as the + * basename of the file_name argument. See %G_MODULE_SUFFIX for why. */ gchar * g_module_build_path (const gchar *directory, @@ -901,10 +985,10 @@ /* Binary compatibility versions. Not for newly compiled code. */ -_GLIB_EXTERN GModule * g_module_open_utf8 (const gchar *file_name, - GModuleFlags flags); +_GMODULE_EXTERN GModule * g_module_open_utf8 (const gchar *file_name, + GModuleFlags flags); -_GLIB_EXTERN const gchar *g_module_name_utf8 (GModule *module); +_GMODULE_EXTERN const gchar *g_module_name_utf8 (GModule *module); GModule* g_module_open_utf8 (const gchar *file_name,
View file
_service:tar_scm:glib-2.74.4.tar.xz/gmodule/gmodule.h -> _service:tar_scm:glib-2.76.4.tar.xz/gmodule/gmodule.h
Changed
@@ -28,20 +28,23 @@ #define __GMODULE_H__ #include <glib.h> +#include <gmodule/gmodule-visibility.h> G_BEGIN_DECLS /* exporting and importing functions, this is special cased * to feature Windows dll stubs. */ -#define G_MODULE_IMPORT extern -#ifdef G_PLATFORM_WIN32 -# define G_MODULE_EXPORT __declspec(dllexport) +#if defined(_WIN32) || defined(__CYGWIN__) +# define G_MODULE_EXPORT __declspec(dllexport) +# define G_MODULE_IMPORT __declspec(dllimport) extern #elif __GNUC__ >= 4 -# define G_MODULE_EXPORT __attribute__((visibility("default"))) -#else /* !G_PLATFORM_WIN32 && __GNUC__ < 4 */ -# define G_MODULE_EXPORT -#endif /* !G_PLATFORM_WIN32 */ +# define G_MODULE_EXPORT __attribute__((visibility("default"))) +# define G_MODULE_IMPORT extern +#else /* !defined(_WIN32) && !defined(__CYGWIN__) && __GNUC__ < 4 */ +# define G_MODULE_EXPORT +# define G_MODULE_IMPORT extern +#endif /** * GModuleFlags: @@ -68,8 +71,8 @@ typedef const gchar* (*GModuleCheckInit) (GModule *module); typedef void (*GModuleUnload) (GModule *module); -#define G_MODULE_ERROR g_module_error_quark () GLIB_AVAILABLE_MACRO_IN_2_70 -GLIB_AVAILABLE_IN_2_70 +#define G_MODULE_ERROR g_module_error_quark () GMODULE_AVAILABLE_MACRO_IN_2_70 +GMODULE_AVAILABLE_IN_2_70 GQuark g_module_error_quark (void); /** @@ -86,42 +89,42 @@ G_MODULE_ERROR_FAILED, G_MODULE_ERROR_CHECK_FAILED, } GModuleError -GLIB_AVAILABLE_ENUMERATOR_IN_2_70; +GMODULE_AVAILABLE_ENUMERATOR_IN_2_70; /* return TRUE if dynamic module loading is supported */ -GLIB_AVAILABLE_IN_ALL +GMODULE_AVAILABLE_IN_ALL gboolean g_module_supported (void) G_GNUC_CONST; /* open a module 'file_name' and return handle, which is NULL on error */ -GLIB_AVAILABLE_IN_ALL +GMODULE_AVAILABLE_IN_ALL GModule* g_module_open (const gchar *file_name, GModuleFlags flags); -GLIB_AVAILABLE_IN_2_70 +GMODULE_AVAILABLE_IN_2_70 GModule *g_module_open_full (const gchar *file_name, GModuleFlags flags, GError **error); /* close a previously opened module, returns TRUE on success */ -GLIB_AVAILABLE_IN_ALL +GMODULE_AVAILABLE_IN_ALL gboolean g_module_close (GModule *module); /* make a module resident so g_module_close on it will be ignored */ -GLIB_AVAILABLE_IN_ALL +GMODULE_AVAILABLE_IN_ALL void g_module_make_resident (GModule *module); /* query the last module error as a string */ -GLIB_AVAILABLE_IN_ALL +GMODULE_AVAILABLE_IN_ALL const gchar * g_module_error (void); /* retrieve a symbol pointer from 'module', returns TRUE on success */ -GLIB_AVAILABLE_IN_ALL +GMODULE_AVAILABLE_IN_ALL gboolean g_module_symbol (GModule *module, const gchar *symbol_name, gpointer *symbol); /* retrieve the file name from an existing module */ -GLIB_AVAILABLE_IN_ALL +GMODULE_AVAILABLE_IN_ALL const gchar * g_module_name (GModule *module); /* Build the actual file name containing a module. 'directory' is the @@ -135,7 +138,7 @@ * * No checks are made that the file exists, or is of correct type. */ -GLIB_AVAILABLE_IN_ALL +GMODULE_DEPRECATED_IN_2_76 gchar* g_module_build_path (const gchar *directory, const gchar *module_name);
View file
_service:tar_scm:glib-2.74.4.tar.xz/gmodule/meson.build -> _service:tar_scm:glib-2.76.4.tar.xz/gmodule/meson.build
Changed
@@ -6,6 +6,8 @@ g_module_impl = '' +g_module_includedir = glib_includedir / 'gmodule' + # On Windows force native WIN32 shared lib loader if host_system == 'windows' g_module_impl = 'G_MODULE_IMPL_WIN32' @@ -26,11 +28,11 @@ message('Building for MSVC: assuming that symbols are prefixed with underscore') g_module_need_uscore = 1 elif meson.can_run_host_binaries() - # FIXME: communicate result via stdout instead of return value, so non-0 return is not printed in bold red rres = cc.run(dlopen_dlsym_test_code, dependencies : libdl_dep, name : 'dlsym() preceding underscores') - if host_system == 'windows' or (rres.compiled() and rres.returncode() == 0) + if host_system == 'windows' or (rres.compiled() and + rres.returncode() == 0 and rres.stdout().to_int() == 0) g_module_need_uscore = 1 endif else @@ -64,9 +66,19 @@ gmodule_h = files('gmodule.h') gmodule_c = files('gmodule.c') -install_headers(gmodule_h, subdir : 'glib-2.0') +install_headers(gmodule_h, install_dir : glib_includedir) + +gmodule_visibility_h = custom_target( + output: 'gmodule-visibility.h', + command: gen_visibility_macros, meson.project_version(), 'visibility-macros', 'GMODULE', '@OUTPUT@', + install: true, + install_dir: g_module_includedir, + # FIXME: Not needed with Meson >= 0.64.0 + install_tag: 'devel', +) + +gmodule_sources = gmodule_c, gmodule_visibility_h, 'gmodule-deprecated.c' -gmodule_sources = gmodule_c if host_system == 'windows' gmodule_win_rc = configure_file( input: 'gmodule.rc.in', @@ -85,7 +97,8 @@ install : true, include_directories : configinc, gmoduleinc, dependencies : libdl_dep, libglib_dep, - c_args : '-DG_LOG_DOMAIN="GModule"' + glib_hidden_visibility_args, + c_args : '-DG_LOG_DOMAIN="GModule"', '-DGMODULE_COMPILATION', + gnu_symbol_visibility : 'hidden', link_args : glib_link_flags, ) @@ -122,9 +135,13 @@ description : 'Dynamic module loader for GLib', ) +gmodule_inc_dep = declare_dependency( + include_directories: gmoduleinc, + sources: gmodule_visibility_h, +) + libgmodule_dep = declare_dependency(link_with : libgmodule, - include_directories : gmoduleinc, - dependencies : libglib_dep) + dependencies : libglib_dep, gmodule_inc_dep) meson.override_dependency('gmodule-no-export-2.0', libgmodule_dep) meson.override_dependency('gmodule-export-2.0', libgmodule_dep)
View file
_service:tar_scm:glib-2.76.4.tar.xz/gmodule/tests/max-version.c
Added
@@ -0,0 +1,46 @@ +/* + * Copyright 2022 Collabora Ltd. + * SPDX-License-Identifier: LGPL-2.1-or-later + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General + * Public License along with this library; if not, see + * <http://www.gnu.org/licenses/>. + */ + +#ifndef GLIB_VERSION_MAX_ALLOWED +/* This is the oldest version macro available */ +#define GLIB_VERSION_MIN_REQUIRED GLIB_VERSION_2_26 +#define GLIB_VERSION_MAX_ALLOWED GLIB_VERSION_2_26 +#endif + +#include <glib.h> + +#include <gmodule.h> + +static void +nothing (void) +{ + /* This doesn't really do anything: the real "test" is at compile time. + * Just make sure the GModule library gets linked. */ + g_debug ("GModule supported: %s", g_module_supported () ? "yes" : "no"); +} + +int +main (int argc, + char *argv) +{ + g_test_init (&argc, &argv, NULL); + + g_test_add_func ("/max-version/tested-at-compile-time", nothing); + return g_test_run (); +}
View file
_service:tar_scm:glib-2.74.4.tar.xz/gmodule/tests/meson.build -> _service:tar_scm:glib-2.76.4.tar.xz/gmodule/tests/meson.build
Changed
@@ -1,19 +1,11 @@ gmodule_tests = { - 'module-test-library' : { - 'export_dynamic' : true, - 'source': 'module-test.c', - 'c_args': '-DMODULE_TYPE="library"', - }, - 'module-test-plugin' : { - 'export_dynamic' : true, - 'source': 'module-test.c', - 'c_args': '-DMODULE_TYPE="plugin"', - }, + 'max-version' : {'install': false}, } if have_cxx gmodule_tests += { 'cxx' : { + 'protocol': 'exitcode', 'source' : 'cxx.cpp', 'suite' : 'cpp', } @@ -22,6 +14,7 @@ foreach std, arg: cxx_standards gmodule_tests += { 'cxx-@0@'.format(std) : { + 'protocol': 'exitcode', 'source' : 'cxx.cpp', 'suite' : 'cpp', 'cpp_args' : arg, @@ -37,16 +30,20 @@ module_suffix = 'so' endif -if get_option('default_library') != 'static' +gmodule_test_modules = +gmodule_test_libraries = +if glib_build_shared foreach module : 'moduletestplugin_a', 'moduletestplugin_b' - shared_module(module + '_plugin', 'lib@0@.c'.format(module), + gmodule_test_modules += shared_module(module + '_plugin', + 'lib@0@.c'.format(module), dependencies : libglib_dep, libgmodule_dep, install_dir : installed_tests_execdir, install_tag : 'tests', install : installed_tests_enabled, name_suffix : module_suffix ) - shared_library(module + '_library', 'lib@0@.c'.format(module), + gmodule_test_libraries += shared_library(module + '_library', + 'lib@0@.c'.format(module), dependencies : libglib_dep, libgmodule_dep, install_dir : installed_tests_execdir, install_tag : 'tests', @@ -56,11 +53,26 @@ endforeach endif +gmodule_tests += { + 'module-test-library' : { + 'export_dynamic' : true, + 'source': 'module-test.c', + 'depends': gmodule_test_libraries, + 'c_args': '-DMODULE_TYPE="library"', + 'can_fail': glib_build_static_only, + }, + 'module-test-plugin' : { + 'export_dynamic' : true, + 'source': 'module-test.c', + 'depends': gmodule_test_modules, + 'c_args': '-DMODULE_TYPE="plugin"', + 'can_fail': glib_build_static_only, + }, +} + test_env = environment() test_env.set('G_TEST_SRCDIR', meson.current_source_dir()) test_env.set('G_TEST_BUILDDIR', meson.current_build_dir()) -test_env.set('G_DEBUG', 'gc-friendly') -test_env.set('MALLOC_CHECK_', '2') test_deps = libm, thread_dep, libglib_dep, libgmodule_dep test_cargs = '-DG_LOG_DOMAIN="GModule"', '-UG_DISABLE_ASSERT' @@ -97,5 +109,18 @@ suite = 'gmodule' + extra_args.get('suite', ) timeout = suite.contains('slow') ? test_timeout_slow : test_timeout - test(test_name, exe, env : test_env, timeout : timeout, suite : suite) + depends = extra_args.get('depends', ) + + if extra_args.get('can_fail', false) + suite += 'failing' + endif + + test(test_name, + exe, + protocol : extra_args.get('protocol', test_protocol), + depends : depends, + env : test_env, + timeout : timeout, + suite : suite, + ) endforeach
View file
_service:tar_scm:glib-2.74.4.tar.xz/gobject/gatomicarray.c -> _service:tar_scm:glib-2.76.4.tar.xz/gobject/gatomicarray.c
Changed
@@ -76,13 +76,14 @@ } } - real_size = sizeof (gsize) + MAX (size, sizeof (FreeListNode)); + real_size = sizeof (GAtomicArrayMetadata) + MAX (size, sizeof (FreeListNode)); mem = g_slice_alloc (real_size); - mem = ((char *) mem) + sizeof (gsize); + mem = ((char *) mem) + sizeof (GAtomicArrayMetadata); G_ATOMIC_ARRAY_DATA_SIZE (mem) = size; #if ENABLE_VALGRIND - VALGRIND_MALLOCLIKE_BLOCK (mem, real_size - sizeof (gsize), FALSE, FALSE); + VALGRIND_MALLOCLIKE_BLOCK (mem, real_size - sizeof (GAtomicArrayMetadata), + FALSE, FALSE); #endif return mem;
View file
_service:tar_scm:glib-2.74.4.tar.xz/gobject/gatomicarray.h -> _service:tar_scm:glib-2.76.4.tar.xz/gobject/gatomicarray.h
Changed
@@ -27,7 +27,16 @@ G_BEGIN_DECLS -#define G_ATOMIC_ARRAY_DATA_SIZE(mem) (*((gsize *) (mem) - 1)) +typedef union _GAtomicArrayMetadata +{ + gsize size; + /* We have to ensure that the memory location is sufficiently aligned to + * store any object. With C11 this would be max_align_t, but in practise + * gpointer is sufficient for all known architectures. We could change + * this to `_Alignas(max_align_t) char pad` once we depend on C11. */ + gpointer _alignment_padding; +} GAtomicArrayMetadata; +#define G_ATOMIC_ARRAY_DATA_SIZE(mem) (((GAtomicArrayMetadata *) (mem) - 1)->size) typedef struct _GAtomicArray GAtomicArray; struct _GAtomicArray {
View file
_service:tar_scm:glib-2.74.4.tar.xz/gobject/gbinding.c -> _service:tar_scm:glib-2.76.4.tar.xz/gobject/gbinding.c
Changed
@@ -464,11 +464,11 @@ return TRUE; } - g_warning ("%s: Unable to convert a value of type %s to a " - "value of type %s", - G_STRLOC, - g_type_name (G_VALUE_TYPE (value_a)), - g_type_name (G_VALUE_TYPE (value_b))); + g_critical ("%s: Unable to convert a value of type %s to a " + "value of type %s", + G_STRLOC, + g_type_name (G_VALUE_TYPE (value_a)), + g_type_name (G_VALUE_TYPE (value_b))); return FALSE; } @@ -552,7 +552,7 @@ { binding->is_frozen = TRUE; - g_param_value_validate (binding->target_pspec, &to_value); + (void) g_param_value_validate (binding->target_pspec, &to_value); g_object_set_property (target, binding->target_pspec->name, &to_value); binding->is_frozen = FALSE; @@ -620,7 +620,7 @@ { binding->is_frozen = TRUE; - g_param_value_validate (binding->source_pspec, &to_value); + (void) g_param_value_validate (binding->source_pspec, &to_value); g_object_set_property (source, binding->source_pspec->name, &to_value); binding->is_frozen = FALSE; @@ -1253,7 +1253,7 @@ if (source == target && g_strcmp0 (source_property, target_property) == 0) { - g_warning ("Unable to bind the same property on the same instance"); + g_critical ("Unable to bind the same property on the same instance"); return NULL; } @@ -1269,82 +1269,82 @@ pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (source), source_property); if (pspec == NULL) { - g_warning ("%s: The source object of type %s has no property called '%s'", - G_STRLOC, - G_OBJECT_TYPE_NAME (source), - source_property); + g_critical ("%s: The source object of type %s has no property called '%s'", + G_STRLOC, + G_OBJECT_TYPE_NAME (source), + source_property); return NULL; } if (!(pspec->flags & G_PARAM_READABLE)) { - g_warning ("%s: The source object of type %s has no readable property called '%s'", - G_STRLOC, - G_OBJECT_TYPE_NAME (source), - source_property); + g_critical ("%s: The source object of type %s has no readable property called '%s'", + G_STRLOC, + G_OBJECT_TYPE_NAME (source), + source_property); return NULL; } if ((flags & G_BINDING_BIDIRECTIONAL) && ((pspec->flags & G_PARAM_CONSTRUCT_ONLY) || !(pspec->flags & G_PARAM_WRITABLE))) { - g_warning ("%s: The source object of type %s has no writable property called '%s'", - G_STRLOC, - G_OBJECT_TYPE_NAME (source), - source_property); + g_critical ("%s: The source object of type %s has no writable property called '%s'", + G_STRLOC, + G_OBJECT_TYPE_NAME (source), + source_property); return NULL; } if ((flags & G_BINDING_INVERT_BOOLEAN) && !(G_PARAM_SPEC_VALUE_TYPE (pspec) == G_TYPE_BOOLEAN)) { - g_warning ("%s: The G_BINDING_INVERT_BOOLEAN flag can only be used " - "when binding boolean properties; the source property '%s' " - "is of type '%s'", - G_STRLOC, - source_property, - g_type_name (G_PARAM_SPEC_VALUE_TYPE (pspec))); + g_critical ("%s: The G_BINDING_INVERT_BOOLEAN flag can only be used " + "when binding boolean properties; the source property '%s' " + "is of type '%s'", + G_STRLOC, + source_property, + g_type_name (G_PARAM_SPEC_VALUE_TYPE (pspec))); return NULL; } pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (target), target_property); if (pspec == NULL) { - g_warning ("%s: The target object of type %s has no property called '%s'", - G_STRLOC, - G_OBJECT_TYPE_NAME (target), - target_property); + g_critical ("%s: The target object of type %s has no property called '%s'", + G_STRLOC, + G_OBJECT_TYPE_NAME (target), + target_property); return NULL; } if ((pspec->flags & G_PARAM_CONSTRUCT_ONLY) || !(pspec->flags & G_PARAM_WRITABLE)) { - g_warning ("%s: The target object of type %s has no writable property called '%s'", - G_STRLOC, - G_OBJECT_TYPE_NAME (target), - target_property); + g_critical ("%s: The target object of type %s has no writable property called '%s'", + G_STRLOC, + G_OBJECT_TYPE_NAME (target), + target_property); return NULL; } if ((flags & G_BINDING_BIDIRECTIONAL) && !(pspec->flags & G_PARAM_READABLE)) { - g_warning ("%s: The target object of type %s has no readable property called '%s'", - G_STRLOC, - G_OBJECT_TYPE_NAME (target), - target_property); + g_critical ("%s: The target object of type %s has no readable property called '%s'", + G_STRLOC, + G_OBJECT_TYPE_NAME (target), + target_property); return NULL; } if ((flags & G_BINDING_INVERT_BOOLEAN) && !(G_PARAM_SPEC_VALUE_TYPE (pspec) == G_TYPE_BOOLEAN)) { - g_warning ("%s: The G_BINDING_INVERT_BOOLEAN flag can only be used " - "when binding boolean properties; the target property '%s' " - "is of type '%s'", - G_STRLOC, - target_property, - g_type_name (G_PARAM_SPEC_VALUE_TYPE (pspec))); + g_critical ("%s: The G_BINDING_INVERT_BOOLEAN flag can only be used " + "when binding boolean properties; the target property '%s' " + "is of type '%s'", + G_STRLOC, + target_property, + g_type_name (G_PARAM_SPEC_VALUE_TYPE (pspec))); return NULL; }
View file
_service:tar_scm:glib-2.74.4.tar.xz/gobject/gbinding.h -> _service:tar_scm:glib-2.76.4.tar.xz/gobject/gbinding.h
Changed
@@ -104,35 +104,35 @@ G_BINDING_INVERT_BOOLEAN = 1 << 2 } GBindingFlags; -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL GType g_binding_flags_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL GType g_binding_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL GBindingFlags g_binding_get_flags (GBinding *binding); -GLIB_DEPRECATED_IN_2_68_FOR(g_binding_dup_source) +GOBJECT_DEPRECATED_IN_2_68_FOR(g_binding_dup_source) GObject * g_binding_get_source (GBinding *binding); -GLIB_AVAILABLE_IN_2_68 +GOBJECT_AVAILABLE_IN_2_68 GObject * g_binding_dup_source (GBinding *binding); -GLIB_DEPRECATED_IN_2_68_FOR(g_binding_dup_target) +GOBJECT_DEPRECATED_IN_2_68_FOR(g_binding_dup_target) GObject * g_binding_get_target (GBinding *binding); -GLIB_AVAILABLE_IN_2_68 +GOBJECT_AVAILABLE_IN_2_68 GObject * g_binding_dup_target (GBinding *binding); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL const gchar * g_binding_get_source_property (GBinding *binding); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL const gchar * g_binding_get_target_property (GBinding *binding); -GLIB_AVAILABLE_IN_2_38 +GOBJECT_AVAILABLE_IN_2_38 void g_binding_unbind (GBinding *binding); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL GBinding *g_object_bind_property (gpointer source, const gchar *source_property, gpointer target, const gchar *target_property, GBindingFlags flags); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL GBinding *g_object_bind_property_full (gpointer source, const gchar *source_property, gpointer target, @@ -142,7 +142,7 @@ GBindingTransformFunc transform_from, gpointer user_data, GDestroyNotify notify); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL GBinding *g_object_bind_property_with_closures (gpointer source, const gchar *source_property, gpointer target,
View file
_service:tar_scm:glib-2.74.4.tar.xz/gobject/gbindinggroup.h -> _service:tar_scm:glib-2.76.4.tar.xz/gobject/gbindinggroup.h
Changed
@@ -46,22 +46,22 @@ */ typedef struct _GBindingGroup GBindingGroup; -GLIB_AVAILABLE_IN_2_72 +GOBJECT_AVAILABLE_IN_2_72 GType g_binding_group_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_2_72 +GOBJECT_AVAILABLE_IN_2_72 GBindingGroup *g_binding_group_new (void); -GLIB_AVAILABLE_IN_2_72 +GOBJECT_AVAILABLE_IN_2_72 gpointer g_binding_group_dup_source (GBindingGroup *self); -GLIB_AVAILABLE_IN_2_72 +GOBJECT_AVAILABLE_IN_2_72 void g_binding_group_set_source (GBindingGroup *self, gpointer source); -GLIB_AVAILABLE_IN_2_72 +GOBJECT_AVAILABLE_IN_2_72 void g_binding_group_bind (GBindingGroup *self, const gchar *source_property, gpointer target, const gchar *target_property, GBindingFlags flags); -GLIB_AVAILABLE_IN_2_72 +GOBJECT_AVAILABLE_IN_2_72 void g_binding_group_bind_full (GBindingGroup *self, const gchar *source_property, gpointer target, @@ -71,7 +71,7 @@ GBindingTransformFunc transform_from, gpointer user_data, GDestroyNotify user_data_destroy); -GLIB_AVAILABLE_IN_2_72 +GOBJECT_AVAILABLE_IN_2_72 void g_binding_group_bind_with_closures (GBindingGroup *self, const gchar *source_property, gpointer target,
View file
_service:tar_scm:glib-2.74.4.tar.xz/gobject/gboxed.c -> _service:tar_scm:glib-2.76.4.tar.xz/gobject/gboxed.c
Changed
@@ -166,6 +166,7 @@ G_DEFINE_BOXED_TYPE (GTimeZone, g_time_zone, g_time_zone_ref, g_time_zone_unref) G_DEFINE_BOXED_TYPE (GKeyFile, g_key_file, g_key_file_ref, g_key_file_unref) G_DEFINE_BOXED_TYPE (GMappedFile, g_mapped_file, g_mapped_file_ref, g_mapped_file_unref) +G_DEFINE_BOXED_TYPE (GBookmarkFile, g_bookmark_file, g_bookmark_file_copy, g_bookmark_file_free) G_DEFINE_BOXED_TYPE (GMainLoop, g_main_loop, g_main_loop_ref, g_main_loop_unref) G_DEFINE_BOXED_TYPE (GMainContext, g_main_context, g_main_context_ref, g_main_context_unref) @@ -438,7 +439,7 @@ * * Get the contents of a %G_TYPE_BOXED derived #GValue. * - * Returns: (transfer none): boxed contents of @value + * Returns: (transfer none) (nullable): boxed contents of @value */ gpointer g_value_get_boxed (const GValue *value) @@ -458,7 +459,7 @@ * g_boxed_free(), e.g. like: g_boxed_free (G_VALUE_TYPE (@value), * return_value); * - * Returns: boxed contents of @value + * Returns: (transfer full) (nullable): boxed contents of @value */ gpointer g_value_dup_boxed (const GValue *value)
View file
_service:tar_scm:glib-2.74.4.tar.xz/gobject/gboxed.h -> _service:tar_scm:glib-2.76.4.tar.xz/gobject/gboxed.h
Changed
@@ -68,32 +68,32 @@ /* --- prototypes --- */ -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL gpointer g_boxed_copy (GType boxed_type, gconstpointer src_boxed); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_boxed_free (GType boxed_type, gpointer boxed); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_value_set_boxed (GValue *value, gconstpointer v_boxed); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_value_set_static_boxed (GValue *value, gconstpointer v_boxed); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_value_take_boxed (GValue *value, gconstpointer v_boxed); -GLIB_DEPRECATED_FOR(g_value_take_boxed) +GOBJECT_DEPRECATED_FOR(g_value_take_boxed) void g_value_set_boxed_take_ownership (GValue *value, gconstpointer v_boxed); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL gpointer g_value_get_boxed (const GValue *value); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL gpointer g_value_dup_boxed (const GValue *value); /* --- convenience --- */ -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL GType g_boxed_type_register_static (const gchar *name, GBoxedCopyFunc boxed_copy, GBoxedFreeFunc boxed_free); @@ -114,9 +114,9 @@ */ #define G_TYPE_VALUE (g_value_get_type ()) -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL GType g_closure_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL GType g_value_get_type (void) G_GNUC_CONST; G_END_DECLS
View file
_service:tar_scm:glib-2.74.4.tar.xz/gobject/gclosure.c -> _service:tar_scm:glib-2.76.4.tar.xz/gobject/gclosure.c
Changed
@@ -190,7 +190,7 @@ * } * | * - * Returns: (transfer none): a floating reference to a new #GClosure + * Returns: (transfer floating): a floating reference to a new #GClosure */ GClosure* g_closure_new_simple (guint sizeof_closure, @@ -748,8 +748,8 @@ closure->data == notify_data) closure->marshal = NULL; else if (!closure_try_remove_inotify (closure, notify_data, notify_func)) - g_warning (G_STRLOC ": unable to remove uninstalled invalidation notifier: %p (%p)", - notify_func, notify_data); + g_critical (G_STRLOC ": unable to remove uninstalled invalidation notifier: %p (%p)", + notify_func, notify_data); } /** @@ -776,8 +776,8 @@ closure->data == notify_data) closure->marshal = NULL; else if (!closure_try_remove_fnotify (closure, notify_data, notify_func)) - g_warning (G_STRLOC ": unable to remove uninstalled finalization notifier: %p (%p)", - notify_func, notify_data); + g_critical (G_STRLOC ": unable to remove uninstalled finalization notifier: %p (%p)", + notify_func, notify_data); } /** @@ -929,8 +929,8 @@ g_return_if_fail (marshal != NULL); if (closure->marshal && closure->marshal != marshal) - g_warning ("attempt to override closure->marshal (%p) with new marshal (%p)", - closure->marshal, marshal); + g_critical ("attempt to override closure->marshal (%p) with new marshal (%p)", + closure->marshal, marshal); else closure->marshal = marshal; } @@ -947,8 +947,8 @@ real_closure = G_REAL_CLOSURE (closure); if (real_closure->va_marshal && real_closure->va_marshal != marshal) - g_warning ("attempt to override closure->va_marshal (%p) with new marshal (%p)", - real_closure->va_marshal, marshal); + g_critical ("attempt to override closure->va_marshal (%p) with new marshal (%p)", + real_closure->va_marshal, marshal); else real_closure->va_marshal = marshal; } @@ -964,7 +964,7 @@ * * @destroy_data will be called as a finalize notifier on the #GClosure. * - * Returns: (transfer none): a floating reference to a new #GCClosure + * Returns: (transfer floating): a floating reference to a new #GCClosure */ GClosure* g_cclosure_new (GCallback callback_func, @@ -994,7 +994,7 @@ * * @destroy_data will be called as a finalize notifier on the #GClosure. * - * Returns: (transfer none): a floating reference to a new #GCClosure + * Returns: (transfer floating): a floating reference to a new #GCClosure */ GClosure* g_cclosure_new_swap (GCallback callback_func, @@ -1162,7 +1162,7 @@ * @struct_offset in the class structure of the interface or classed type * identified by @itype. * - * Returns: (transfer none): a floating reference to a new #GCClosure + * Returns: (transfer floating): a floating reference to a new #GCClosure */ GClosure* g_signal_type_cclosure_new (GType itype, @@ -1274,7 +1274,7 @@ default: rettype = &ffi_type_pointer; *value = NULL; - g_warning ("value_to_ffi_type: Unsupported fundamental type: %s", g_type_name (type)); + g_critical ("value_to_ffi_type: Unsupported fundamental type: %s", g_type_name (type)); break; } return rettype; @@ -1354,9 +1354,9 @@ goto restart; G_GNUC_FALLTHROUGH; default: - g_warning ("value_from_ffi_type: Unsupported fundamental type %s for type %s", - g_type_name (g_type_fundamental (G_VALUE_TYPE (gvalue))), - g_type_name (G_VALUE_TYPE (gvalue))); + g_critical ("value_from_ffi_type: Unsupported fundamental type %s for type %s", + g_type_name (g_type_fundamental (G_VALUE_TYPE (gvalue))), + g_type_name (G_VALUE_TYPE (gvalue))); } } @@ -1434,7 +1434,7 @@ default: rettype = &ffi_type_pointer; storage->_guint64 = 0; - g_warning ("va_to_ffi_type: Unsupported fundamental type: %s", g_type_name (type)); + g_critical ("va_to_ffi_type: Unsupported fundamental type: %s", g_type_name (type)); break; } return rettype; @@ -1614,7 +1614,7 @@ argsn_args-1 = &closure->data; } - G_VA_COPY (args_copy, args_list); + va_copy (args_copy, args_list); /* Box non-primitive arguments */ for (i = 0; i < n_params; i++)
View file
_service:tar_scm:glib-2.74.4.tar.xz/gobject/gclosure.h -> _service:tar_scm:glib-2.76.4.tar.xz/gobject/gclosure.h
Changed
@@ -112,7 +112,7 @@ * callback of @closure * @invocation_hint: (nullable): the invocation hint given as the * last argument to g_closure_invoke() - * @user_data: (nullable): additional data specified when + * @marshal_data: (nullable): additional data specified when * registering the marshaller, see g_closure_set_marshal() and * g_closure_set_meta_marshal() * @@ -123,7 +123,7 @@ guint n_param_values, const GValue *param_values, gpointer invocation_hint, - gpointer user_data); + gpointer marshal_data); /** * GVaClosureMarshal: @@ -227,62 +227,62 @@ /* --- prototypes --- */ -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL GClosure* g_cclosure_new (GCallback callback_func, gpointer user_data, GClosureNotify destroy_data); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL GClosure* g_cclosure_new_swap (GCallback callback_func, gpointer user_data, GClosureNotify destroy_data); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL GClosure* g_signal_type_cclosure_new (GType itype, guint struct_offset); /* --- prototypes --- */ -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL GClosure* g_closure_ref (GClosure *closure); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_closure_sink (GClosure *closure); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_closure_unref (GClosure *closure); /* intimidating */ -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL GClosure* g_closure_new_simple (guint sizeof_closure, gpointer data); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_closure_add_finalize_notifier (GClosure *closure, gpointer notify_data, GClosureNotify notify_func); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_closure_remove_finalize_notifier (GClosure *closure, gpointer notify_data, GClosureNotify notify_func); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_closure_add_invalidate_notifier (GClosure *closure, gpointer notify_data, GClosureNotify notify_func); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_closure_remove_invalidate_notifier (GClosure *closure, gpointer notify_data, GClosureNotify notify_func); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_closure_add_marshal_guards (GClosure *closure, gpointer pre_marshal_data, GClosureNotify pre_marshal_notify, gpointer post_marshal_data, GClosureNotify post_marshal_notify); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_closure_set_marshal (GClosure *closure, GClosureMarshal marshal); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_closure_set_meta_marshal (GClosure *closure, gpointer marshal_data, GClosureMarshal meta_marshal); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_closure_invalidate (GClosure *closure); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_closure_invoke (GClosure *closure, GValue /*out*/ *return_value, guint n_param_values, @@ -300,7 +300,7 @@ - provide marshaller collection, virtually covering anything out there */ -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_cclosure_marshal_generic (GClosure *closure, GValue *return_gvalue, guint n_param_values, @@ -308,7 +308,7 @@ gpointer invocation_hint, gpointer marshal_data); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_cclosure_marshal_generic_va (GClosure *closure, GValue *return_value, gpointer instance,
View file
_service:tar_scm:glib-2.74.4.tar.xz/gobject/genums.h -> _service:tar_scm:glib-2.76.4.tar.xz/gobject/genums.h
Changed
@@ -217,39 +217,39 @@ /* --- prototypes --- */ -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL GEnumValue* g_enum_get_value (GEnumClass *enum_class, gint value); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL GEnumValue* g_enum_get_value_by_name (GEnumClass *enum_class, const gchar *name); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL GEnumValue* g_enum_get_value_by_nick (GEnumClass *enum_class, const gchar *nick); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL GFlagsValue* g_flags_get_first_value (GFlagsClass *flags_class, guint value); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL GFlagsValue* g_flags_get_value_by_name (GFlagsClass *flags_class, const gchar *name); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL GFlagsValue* g_flags_get_value_by_nick (GFlagsClass *flags_class, const gchar *nick); -GLIB_AVAILABLE_IN_2_54 +GOBJECT_AVAILABLE_IN_2_54 gchar *g_enum_to_string (GType g_enum_type, gint value); -GLIB_AVAILABLE_IN_2_54 +GOBJECT_AVAILABLE_IN_2_54 gchar *g_flags_to_string (GType flags_type, guint value); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_value_set_enum (GValue *value, gint v_enum); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL gint g_value_get_enum (const GValue *value); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_value_set_flags (GValue *value, guint v_flags); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL guint g_value_get_flags (const GValue *value); @@ -258,20 +258,20 @@ /* const_static_values is a NULL terminated array of enum/flags * values that is taken over! */ -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL GType g_enum_register_static (const gchar *name, const GEnumValue *const_static_values); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL GType g_flags_register_static (const gchar *name, const GFlagsValue *const_static_values); /* functions to complete the type information * for enums/flags implemented by plugins */ -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_enum_complete_type_info (GType g_enum_type, GTypeInfo *info, const GEnumValue *const_values); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_flags_complete_type_info (GType g_flags_type, GTypeInfo *info, const GFlagsValue *const_values); @@ -292,7 +292,7 @@ */ #define G_DEFINE_ENUM_VALUE(EnumValue, EnumNick) \ { EnumValue, #EnumValue, EnumNick } \ - GLIB_AVAILABLE_MACRO_IN_2_74 + GOBJECT_AVAILABLE_MACRO_IN_2_74 /** * G_DEFINE_ENUM_TYPE: @@ -331,7 +331,7 @@ } \ return g_define_type__static; \ } \ - GLIB_AVAILABLE_MACRO_IN_2_74 + GOBJECT_AVAILABLE_MACRO_IN_2_74 /** * G_DEFINE_FLAGS_TYPE: @@ -374,7 +374,7 @@ } \ return g_define_type__static; \ } \ - GLIB_AVAILABLE_MACRO_IN_2_74 + GOBJECT_AVAILABLE_MACRO_IN_2_74 G_END_DECLS
View file
_service:tar_scm:glib-2.74.4.tar.xz/gobject/glib-enumtypes.h.template -> _service:tar_scm:glib-2.76.4.tar.xz/gobject/glib-enumtypes.h.template
Changed
@@ -13,7 +13,7 @@ /*** END file-production ***/ /*** BEGIN value-header ***/ -GLIB_AVAILABLE_IN_2_60 GType @enum_name@_get_type (void) G_GNUC_CONST; +GOBJECT_AVAILABLE_IN_2_60 GType @enum_name@_get_type (void) G_GNUC_CONST; #define @ENUMPREFIX@_TYPE_@ENUMSHORT@ (@enum_name@_get_type ()) /*** END value-header ***/
View file
_service:tar_scm:glib-2.74.4.tar.xz/gobject/glib-genmarshal.in -> _service:tar_scm:glib-2.76.4.tar.xz/gobject/glib-genmarshal.in
Changed
@@ -671,7 +671,7 @@ body += ' va_list args_copy;' body += '' - body += ' G_VA_COPY (args_copy, args);' + body += ' va_copy (args_copy, args);' for idx, arg in enumerate(get_args): ctype = IN_ARGSarg'ctype'
View file
_service:tar_scm:glib-2.74.4.tar.xz/gobject/glib-mkenums.in -> _service:tar_scm:glib-2.76.4.tar.xz/gobject/glib-mkenums.in
Changed
@@ -143,7 +143,7 @@ enumindex = 0 # Global enum counter firstenum = 1 # Is this the first enumeration per file? entries = # name, val for each entry -sandbox = None # sandbox for safe evaluation of expressions +c_namespace = {} # C symbols namespace. output = '' # Filename to write result into @@ -247,15 +247,12 @@ if flags is None and value is not None and '<<' in value: seenbitshift = 1 - if seenprivate: - continue - if options is not None: options = parse_trigraph(options) if 'skip' not in options: - entries.append((name, value, options.get('nick'))) + entries.append((name, value, seenprivate, options.get('nick'))) else: - entries.append((name, value)) + entries.append((name, value, seenprivate)) else: m = re.match(r'''\s* /\*< ((^*|\*(?!/))*) >\s*\*/ @@ -489,7 +486,7 @@ write_output(prod) def process_file(curfilename): - global entries, flags, seenbitshift, seenprivate, enum_prefix + global entries, flags, seenbitshift, seenprivate, enum_prefix, c_namespace firstenum = True try: @@ -580,7 +577,7 @@ # Autogenerate a prefix if enum_prefix is None: for entry in entries: - if len(entry) < 3 or entry2 is None: + if not entry2 and (len(entry) < 4 or entry3 is None): name = entry0 if enum_prefix is not None: enum_prefix = os.path.commonprefix(name, enum_prefix) @@ -601,10 +598,11 @@ for e in entries: name = e0 num = e1 - if len(e) < 3 or e2 is None: + private = e2 + if len(e) < 4 or e3 is None: nick = re.sub(r'^' + enum_prefix, '', name) nick = nick.replace('_', '-').lower() - e = (name, num, nick) + e = (name, num, private, nick) fixed_entries.append(e) entries = fixed_entries @@ -720,7 +718,7 @@ next_num = 0 prod = replace_specials(prod) - for name, num, nick in entries: + for name, num, private, nick in entries: tmp_prod = prod if '\u0040valuenum\u0040' in prod: @@ -729,7 +727,7 @@ if num is not None: # use sandboxed evaluation as a reasonable # approximation to C constant folding - inum = eval(num, {}, {}) + inum = eval(num, {}, c_namespace) # make sure it parsed to an integer if not isinstance(inum, int): @@ -738,9 +736,13 @@ else: num = next_num + c_namespacename = num tmp_prod = tmp_prod.replace('\u0040valuenum\u0040', str(num)) next_num = int(num) + 1 + if private: + continue + tmp_prod = tmp_prod.replace('\u0040VALUENAME\u0040', name) tmp_prod = tmp_prod.replace('\u0040valuenick\u0040', nick) if flags:
View file
_service:tar_scm:glib-2.74.4.tar.xz/gobject/glib-types.h -> _service:tar_scm:glib-2.76.4.tar.xz/gobject/glib-types.h
Changed
@@ -24,6 +24,7 @@ #endif #include <glib.h> +#include <gobject/gobject-visibility.h> G_BEGIN_DECLS @@ -326,70 +327,81 @@ */ #define G_TYPE_PATTERN_SPEC (g_pattern_spec_get_type ()) -GLIB_AVAILABLE_IN_ALL +/** + * G_TYPE_BOOKMARK_FILE: + * + * The #GType for a boxed type holding a #GBookmarkFile. + * + * Since: 2.76 + */ +#define G_TYPE_BOOKMARK_FILE (g_bookmark_file_get_type ()) + +GOBJECT_AVAILABLE_IN_ALL GType g_date_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL GType g_strv_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL GType g_gstring_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL GType g_hash_table_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL GType g_array_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL GType g_byte_array_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL GType g_ptr_array_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL GType g_bytes_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL GType g_variant_type_get_gtype (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL GType g_regex_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_2_30 +GOBJECT_AVAILABLE_IN_2_30 GType g_match_info_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL GType g_error_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL GType g_date_time_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL GType g_time_zone_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL GType g_io_channel_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL GType g_io_condition_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL GType g_variant_builder_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_2_40 +GOBJECT_AVAILABLE_IN_2_40 GType g_variant_dict_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL GType g_key_file_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_2_30 +GOBJECT_AVAILABLE_IN_2_30 GType g_main_loop_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_2_30 +GOBJECT_AVAILABLE_IN_2_30 GType g_main_context_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_2_30 +GOBJECT_AVAILABLE_IN_2_30 GType g_source_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_2_36 +GOBJECT_AVAILABLE_IN_2_36 GType g_pollfd_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_2_36 +GOBJECT_AVAILABLE_IN_2_36 GType g_thread_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_2_36 +GOBJECT_AVAILABLE_IN_2_36 GType g_checksum_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_2_36 +GOBJECT_AVAILABLE_IN_2_36 GType g_markup_parse_context_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_2_40 +GOBJECT_AVAILABLE_IN_2_40 GType g_mapped_file_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_2_44 +GOBJECT_AVAILABLE_IN_2_44 GType g_option_group_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_2_66 +GOBJECT_AVAILABLE_IN_2_66 GType g_uri_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_2_68 +GOBJECT_AVAILABLE_IN_2_68 GType g_tree_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_2_70 +GOBJECT_AVAILABLE_IN_2_70 GType g_pattern_spec_get_type (void) G_GNUC_CONST; +GOBJECT_AVAILABLE_IN_2_76 +GType g_bookmark_file_get_type (void) G_GNUC_CONST; -GLIB_DEPRECATED_FOR('G_TYPE_VARIANT') +GOBJECT_DEPRECATED_FOR('G_TYPE_VARIANT') GType g_variant_get_gtype (void) G_GNUC_CONST; G_END_DECLS
View file
_service:tar_scm:glib-2.74.4.tar.xz/gobject/gmarshal.c -> _service:tar_scm:glib-2.76.4.tar.xz/gobject/gmarshal.c
Changed
@@ -253,7 +253,7 @@ gboolean arg0; va_list args_copy; - G_VA_COPY (args_copy, args); + va_copy (args_copy, args); arg0 = (gboolean) va_arg (args_copy, gboolean); va_end (args_copy); @@ -361,7 +361,7 @@ gchar arg0; va_list args_copy; - G_VA_COPY (args_copy, args); + va_copy (args_copy, args); arg0 = (gchar) va_arg (args_copy, gint); va_end (args_copy); @@ -469,7 +469,7 @@ guchar arg0; va_list args_copy; - G_VA_COPY (args_copy, args); + va_copy (args_copy, args); arg0 = (guchar) va_arg (args_copy, guint); va_end (args_copy); @@ -577,7 +577,7 @@ gint arg0; va_list args_copy; - G_VA_COPY (args_copy, args); + va_copy (args_copy, args); arg0 = (gint) va_arg (args_copy, gint); va_end (args_copy); @@ -685,7 +685,7 @@ guint arg0; va_list args_copy; - G_VA_COPY (args_copy, args); + va_copy (args_copy, args); arg0 = (guint) va_arg (args_copy, guint); va_end (args_copy); @@ -793,7 +793,7 @@ glong arg0; va_list args_copy; - G_VA_COPY (args_copy, args); + va_copy (args_copy, args); arg0 = (glong) va_arg (args_copy, glong); va_end (args_copy); @@ -901,7 +901,7 @@ gulong arg0; va_list args_copy; - G_VA_COPY (args_copy, args); + va_copy (args_copy, args); arg0 = (gulong) va_arg (args_copy, gulong); va_end (args_copy); @@ -1009,7 +1009,7 @@ gint arg0; va_list args_copy; - G_VA_COPY (args_copy, args); + va_copy (args_copy, args); arg0 = (gint) va_arg (args_copy, gint); va_end (args_copy); @@ -1117,7 +1117,7 @@ guint arg0; va_list args_copy; - G_VA_COPY (args_copy, args); + va_copy (args_copy, args); arg0 = (guint) va_arg (args_copy, guint); va_end (args_copy); @@ -1225,7 +1225,7 @@ gfloat arg0; va_list args_copy; - G_VA_COPY (args_copy, args); + va_copy (args_copy, args); arg0 = (gfloat) va_arg (args_copy, gdouble); va_end (args_copy); @@ -1333,7 +1333,7 @@ gdouble arg0; va_list args_copy; - G_VA_COPY (args_copy, args); + va_copy (args_copy, args); arg0 = (gdouble) va_arg (args_copy, gdouble); va_end (args_copy); @@ -1441,7 +1441,7 @@ gpointer arg0; va_list args_copy; - G_VA_COPY (args_copy, args); + va_copy (args_copy, args); arg0 = (gpointer) va_arg (args_copy, gpointer); if ((param_types0 & G_SIGNAL_TYPE_STATIC_SCOPE) == 0 && arg0 != NULL) arg0 = g_strdup (arg0); @@ -1553,7 +1553,7 @@ gpointer arg0; va_list args_copy; - G_VA_COPY (args_copy, args); + va_copy (args_copy, args); arg0 = (gpointer) va_arg (args_copy, gpointer); if ((param_types0 & G_SIGNAL_TYPE_STATIC_SCOPE) == 0 && arg0 != NULL) arg0 = g_param_spec_ref (arg0); @@ -1665,7 +1665,7 @@ gpointer arg0; va_list args_copy; - G_VA_COPY (args_copy, args); + va_copy (args_copy, args); arg0 = (gpointer) va_arg (args_copy, gpointer); if ((param_types0 & G_SIGNAL_TYPE_STATIC_SCOPE) == 0 && arg0 != NULL) arg0 = g_boxed_copy (param_types0 & ~G_SIGNAL_TYPE_STATIC_SCOPE, arg0); @@ -1781,7 +1781,7 @@ gpointer arg0; va_list args_copy; - G_VA_COPY (args_copy, args); + va_copy (args_copy, args); arg0 = (gpointer) va_arg (args_copy, gpointer); va_end (args_copy); @@ -1889,7 +1889,7 @@ gpointer arg0; va_list args_copy; - G_VA_COPY (args_copy, args); + va_copy (args_copy, args); arg0 = (gpointer) va_arg (args_copy, gpointer); if (arg0 != NULL) arg0 = g_object_ref (arg0); @@ -2001,7 +2001,7 @@ gpointer arg0; va_list args_copy; - G_VA_COPY (args_copy, args); + va_copy (args_copy, args); arg0 = (gpointer) va_arg (args_copy, gpointer); if ((param_types0 & G_SIGNAL_TYPE_STATIC_SCOPE) == 0 && arg0 != NULL) arg0 = g_variant_ref_sink (arg0); @@ -2117,7 +2117,7 @@ gpointer arg1; va_list args_copy; - G_VA_COPY (args_copy, args); + va_copy (args_copy, args); arg0 = (guint) va_arg (args_copy, guint); arg1 = (gpointer) va_arg (args_copy, gpointer); va_end (args_copy); @@ -2236,7 +2236,7 @@ g_return_if_fail (return_value != NULL); - G_VA_COPY (args_copy, args); + va_copy (args_copy, args); arg0 = (guint) va_arg (args_copy, guint); va_end (args_copy); @@ -2358,7 +2358,7 @@ g_return_if_fail (return_value != NULL); - G_VA_COPY (args_copy, args); + va_copy (args_copy, args); arg0 = (gpointer) va_arg (args_copy, gpointer); if (arg0 != NULL) arg0 = g_object_ref (arg0); @@ -2487,7 +2487,7 @@ g_return_if_fail (return_value != NULL); - G_VA_COPY (args_copy, args); + va_copy (args_copy, args); arg0 = (gpointer) va_arg (args_copy, gpointer); if ((param_types0 & G_SIGNAL_TYPE_STATIC_SCOPE) == 0 && arg0 != NULL) arg0 = g_boxed_copy (param_types0 & ~G_SIGNAL_TYPE_STATIC_SCOPE, arg0);
View file
_service:tar_scm:glib-2.74.4.tar.xz/gobject/gmarshal.h -> _service:tar_scm:glib-2.76.4.tar.xz/gobject/gmarshal.h
Changed
@@ -20,14 +20,14 @@ G_BEGIN_DECLS /* VOID:VOID */ -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_cclosure_marshal_VOID__VOID (GClosure *closure, GValue *return_value, guint n_param_values, const GValue *param_values, gpointer invocation_hint, gpointer marshal_data); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_cclosure_marshal_VOID__VOIDv (GClosure *closure, GValue *return_value, gpointer instance, @@ -37,14 +37,14 @@ GType *param_types); /* VOID:BOOLEAN */ -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_cclosure_marshal_VOID__BOOLEAN (GClosure *closure, GValue *return_value, guint n_param_values, const GValue *param_values, gpointer invocation_hint, gpointer marshal_data); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_cclosure_marshal_VOID__BOOLEANv (GClosure *closure, GValue *return_value, gpointer instance, @@ -54,14 +54,14 @@ GType *param_types); /* VOID:CHAR */ -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_cclosure_marshal_VOID__CHAR (GClosure *closure, GValue *return_value, guint n_param_values, const GValue *param_values, gpointer invocation_hint, gpointer marshal_data); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_cclosure_marshal_VOID__CHARv (GClosure *closure, GValue *return_value, gpointer instance, @@ -71,14 +71,14 @@ GType *param_types); /* VOID:UCHAR */ -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_cclosure_marshal_VOID__UCHAR (GClosure *closure, GValue *return_value, guint n_param_values, const GValue *param_values, gpointer invocation_hint, gpointer marshal_data); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_cclosure_marshal_VOID__UCHARv (GClosure *closure, GValue *return_value, gpointer instance, @@ -88,14 +88,14 @@ GType *param_types); /* VOID:INT */ -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_cclosure_marshal_VOID__INT (GClosure *closure, GValue *return_value, guint n_param_values, const GValue *param_values, gpointer invocation_hint, gpointer marshal_data); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_cclosure_marshal_VOID__INTv (GClosure *closure, GValue *return_value, gpointer instance, @@ -105,14 +105,14 @@ GType *param_types); /* VOID:UINT */ -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_cclosure_marshal_VOID__UINT (GClosure *closure, GValue *return_value, guint n_param_values, const GValue *param_values, gpointer invocation_hint, gpointer marshal_data); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_cclosure_marshal_VOID__UINTv (GClosure *closure, GValue *return_value, gpointer instance, @@ -122,14 +122,14 @@ GType *param_types); /* VOID:LONG */ -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_cclosure_marshal_VOID__LONG (GClosure *closure, GValue *return_value, guint n_param_values, const GValue *param_values, gpointer invocation_hint, gpointer marshal_data); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_cclosure_marshal_VOID__LONGv (GClosure *closure, GValue *return_value, gpointer instance, @@ -139,14 +139,14 @@ GType *param_types); /* VOID:ULONG */ -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_cclosure_marshal_VOID__ULONG (GClosure *closure, GValue *return_value, guint n_param_values, const GValue *param_values, gpointer invocation_hint, gpointer marshal_data); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_cclosure_marshal_VOID__ULONGv (GClosure *closure, GValue *return_value, gpointer instance, @@ -156,14 +156,14 @@ GType *param_types); /* VOID:ENUM */ -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_cclosure_marshal_VOID__ENUM (GClosure *closure, GValue *return_value, guint n_param_values, const GValue *param_values, gpointer invocation_hint, gpointer marshal_data); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_cclosure_marshal_VOID__ENUMv (GClosure *closure, GValue *return_value, gpointer instance, @@ -173,14 +173,14 @@ GType *param_types); /* VOID:FLAGS */ -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_cclosure_marshal_VOID__FLAGS (GClosure *closure, GValue *return_value, guint n_param_values, const GValue *param_values, gpointer invocation_hint, gpointer marshal_data); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_cclosure_marshal_VOID__FLAGSv (GClosure *closure, GValue *return_value, gpointer instance, @@ -190,14 +190,14 @@ GType *param_types); /* VOID:FLOAT */ -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_cclosure_marshal_VOID__FLOAT (GClosure *closure, GValue *return_value, guint n_param_values, const GValue *param_values, gpointer invocation_hint, gpointer marshal_data); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_cclosure_marshal_VOID__FLOATv (GClosure *closure, GValue *return_value, gpointer instance, @@ -207,14 +207,14 @@ GType *param_types); /* VOID:DOUBLE */ -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_cclosure_marshal_VOID__DOUBLE (GClosure *closure, GValue *return_value, guint n_param_values, const GValue *param_values, gpointer invocation_hint, gpointer marshal_data); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_cclosure_marshal_VOID__DOUBLEv (GClosure *closure, GValue *return_value, gpointer instance, @@ -224,14 +224,14 @@ GType *param_types); /* VOID:STRING */ -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_cclosure_marshal_VOID__STRING (GClosure *closure, GValue *return_value, guint n_param_values, const GValue *param_values, gpointer invocation_hint, gpointer marshal_data); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_cclosure_marshal_VOID__STRINGv (GClosure *closure, GValue *return_value, gpointer instance, @@ -241,14 +241,14 @@ GType *param_types); /* VOID:PARAM */ -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_cclosure_marshal_VOID__PARAM (GClosure *closure, GValue *return_value, guint n_param_values, const GValue *param_values, gpointer invocation_hint, gpointer marshal_data); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_cclosure_marshal_VOID__PARAMv (GClosure *closure, GValue *return_value, gpointer instance, @@ -258,14 +258,14 @@ GType *param_types); /* VOID:BOXED */ -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_cclosure_marshal_VOID__BOXED (GClosure *closure, GValue *return_value, guint n_param_values, const GValue *param_values, gpointer invocation_hint, gpointer marshal_data); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_cclosure_marshal_VOID__BOXEDv (GClosure *closure, GValue *return_value, gpointer instance, @@ -275,14 +275,14 @@ GType *param_types); /* VOID:POINTER */ -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_cclosure_marshal_VOID__POINTER (GClosure *closure, GValue *return_value, guint n_param_values, const GValue *param_values, gpointer invocation_hint, gpointer marshal_data); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_cclosure_marshal_VOID__POINTERv (GClosure *closure, GValue *return_value, gpointer instance, @@ -292,14 +292,14 @@ GType *param_types); /* VOID:OBJECT */ -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_cclosure_marshal_VOID__OBJECT (GClosure *closure, GValue *return_value, guint n_param_values, const GValue *param_values, gpointer invocation_hint, gpointer marshal_data); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_cclosure_marshal_VOID__OBJECTv (GClosure *closure, GValue *return_value, gpointer instance, @@ -309,14 +309,14 @@ GType *param_types); /* VOID:VARIANT */ -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_cclosure_marshal_VOID__VARIANT (GClosure *closure, GValue *return_value, guint n_param_values, const GValue *param_values, gpointer invocation_hint, gpointer marshal_data); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_cclosure_marshal_VOID__VARIANTv (GClosure *closure, GValue *return_value, gpointer instance, @@ -326,14 +326,14 @@ GType *param_types); /* VOID:UINT,POINTER */ -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_cclosure_marshal_VOID__UINT_POINTER (GClosure *closure, GValue *return_value, guint n_param_values, const GValue *param_values, gpointer invocation_hint, gpointer marshal_data); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_cclosure_marshal_VOID__UINT_POINTERv (GClosure *closure, GValue *return_value, gpointer instance, @@ -343,14 +343,14 @@ GType *param_types); /* BOOL:FLAGS */ -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_cclosure_marshal_BOOLEAN__FLAGS (GClosure *closure, GValue *return_value, guint n_param_values, const GValue *param_values, gpointer invocation_hint, gpointer marshal_data); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_cclosure_marshal_BOOLEAN__FLAGSv (GClosure *closure, GValue *return_value, gpointer instance, @@ -378,14 +378,14 @@ #define g_cclosure_marshal_BOOL__FLAGS g_cclosure_marshal_BOOLEAN__FLAGS /* STRING:OBJECT,POINTER */ -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_cclosure_marshal_STRING__OBJECT_POINTER (GClosure *closure, GValue *return_value, guint n_param_values, const GValue *param_values, gpointer invocation_hint, gpointer marshal_data); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_cclosure_marshal_STRING__OBJECT_POINTERv (GClosure *closure, GValue *return_value, gpointer instance, @@ -395,14 +395,14 @@ GType *param_types); /* BOOL:BOXED,BOXED */ -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_cclosure_marshal_BOOLEAN__BOXED_BOXED (GClosure *closure, GValue *return_value, guint n_param_values, const GValue *param_values, gpointer invocation_hint, gpointer marshal_data); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_cclosure_marshal_BOOLEAN__BOXED_BOXEDv (GClosure *closure, GValue *return_value, gpointer instance,
View file
_service:tar_scm:glib-2.74.4.tar.xz/gobject/gobject.c -> _service:tar_scm:glib-2.76.4.tar.xz/gobject/gobject.c
Changed
@@ -333,8 +333,8 @@ if (G_UNLIKELY (nqueue->freeze_count == 0)) { G_UNLOCK (notify_lock); - g_warning ("%s: property-changed notification for %s(%p) is not frozen", - G_STRFUNC, G_OBJECT_TYPE_NAME (object), object); + g_critical ("%s: property-changed notification for %s(%p) is not frozen", + G_STRFUNC, G_OBJECT_TYPE_NAME (object), object); return; } @@ -598,9 +598,9 @@ if (g_param_spec_pool_lookup (pspec_pool, pspec->name, g_type, FALSE)) { - g_warning ("When installing property: type '%s' already has a property named '%s'", - g_type_name (g_type), - pspec->name); + g_critical ("When installing property: type '%s' already has a property named '%s'", + g_type_name (g_type), + pspec->name); g_param_spec_unref (pspec); return FALSE; } @@ -1096,8 +1096,8 @@ if (!overridden) { - g_warning ("%s: Can't find property to override for '%s::%s'", - G_STRFUNC, G_OBJECT_CLASS_NAME (oclass), name); + g_critical ("%s: Can't find property to override for '%s::%s'", + G_STRFUNC, G_OBJECT_CLASS_NAME (oclass), name); return; } @@ -1469,8 +1469,16 @@ { g_return_if_fail (G_IS_OBJECT (object)); - if (g_atomic_int_get (&object->ref_count) == 0) - return; +#ifndef G_DISABLE_CHECKS + if (G_UNLIKELY (g_atomic_int_get (&object->ref_count) == 0)) + { + g_critical ("Attempting to freeze the notification queue for object %s%p; " + "Property notification does not work during instance finalization.", + G_OBJECT_TYPE_NAME (object), + object); + return; + } +#endif g_object_ref (object); g_object_notify_queue_freeze (object, FALSE); @@ -1586,10 +1594,10 @@ TRUE); if (!pspec) - g_warning ("%s: object class '%s' has no property named '%s'", - G_STRFUNC, - G_OBJECT_TYPE_NAME (object), - property_name); + g_critical ("%s: object class '%s' has no property named '%s'", + G_STRFUNC, + G_OBJECT_TYPE_NAME (object), + property_name); else g_object_notify_by_spec_internal (object, pspec); } @@ -1670,9 +1678,19 @@ GObjectNotifyQueue *nqueue; g_return_if_fail (G_IS_OBJECT (object)); - if (g_atomic_int_get (&object->ref_count) == 0) - return; - + +#ifndef G_DISABLE_CHECKS + if (G_UNLIKELY (g_atomic_int_get (&object->ref_count) == 0)) + { + g_critical ("Attempting to thaw the notification queue for object %s%p; " + "Property notification does not work during instance finalization.", + G_OBJECT_TYPE_NAME (object), + object); + return; + } +#endif + + g_object_ref (object); /* FIXME: Freezing is the only way to get at the notify queue. @@ -1801,19 +1819,19 @@ g_value_init (&tmp_value, pspec->value_type); if (!g_value_transform (value, &tmp_value)) - g_warning ("unable to set property '%s' of type '%s' from value of type '%s'", - pspec->name, - g_type_name (pspec->value_type), - G_VALUE_TYPE_NAME (value)); + g_critical ("unable to set property '%s' of type '%s' from value of type '%s'", + pspec->name, + g_type_name (pspec->value_type), + G_VALUE_TYPE_NAME (value)); else if (g_param_value_validate (pspec, &tmp_value) && !(pspec->flags & G_PARAM_LAX_VALIDATION)) { gchar *contents = g_strdup_value_contents (value); - g_warning ("value \"%s\" of type '%s' is invalid or out of range for property '%s' of type '%s'", - contents, - G_VALUE_TYPE_NAME (value), - pspec->name, - g_type_name (pspec->value_type)); + g_critical ("value \"%s\" of type '%s' is invalid or out of range for property '%s' of type '%s'", + contents, + G_VALUE_TYPE_NAME (value), + pspec->name, + g_type_name (pspec->value_type)); g_free (contents); } else @@ -1992,7 +2010,7 @@ * @object_type: the type id of the #GObject subtype to instantiate * @first_property_name: the name of the first property * @...: the value of the first property, followed optionally by more - * name/value pairs, followed by %NULL + * name/value pairs, followed by %NULL * * Creates a new instance of a #GObject subtype and sets its properties. * @@ -2002,22 +2020,22 @@ * per g_type_create_instance(). * * Note that in C, small integer types in variable argument lists are promoted - * up to #gint or #guint as appropriate, and read back accordingly. #gint is 32 - * bits on every platform on which GLib is currently supported. This means that - * you can use C expressions of type #gint with g_object_new() and properties of - * type #gint or #guint or smaller. Specifically, you can use integer literals + * up to `gint` or `guint` as appropriate, and read back accordingly. `gint` is + * 32 bits on every platform on which GLib is currently supported. This means that + * you can use C expressions of type `gint` with g_object_new() and properties of + * type `gint` or `guint` or smaller. Specifically, you can use integer literals * with these property types. * - * When using property types of #gint64 or #guint64, you must ensure that the + * When using property types of `gint64` or `guint64`, you must ensure that the * value that you provide is 64 bit. This means that you should use a cast or * make use of the %G_GINT64_CONSTANT or %G_GUINT64_CONSTANT macros. * - * Similarly, #gfloat is promoted to #gdouble, so you must ensure that the value - * you provide is a #gdouble, even for a property of type #gfloat. + * Similarly, `gfloat` is promoted to `gdouble`, so you must ensure that the value + * you provide is a `gdouble`, even for a property of type `gfloat`. * * Since GLib 2.72, all #GObjects are guaranteed to be aligned to at least the - * alignment of the largest basic GLib type (typically this is #guint64 or - * #gdouble). If you need larger alignment for an element in a #GObject, you + * alignment of the largest basic GLib type (typically this is `guint64` or + * `gdouble`). If you need larger alignment for an element in a #GObject, you * should allocate it on the heap (aligned), or arrange for your #GObject to be * appropriately padded. * @@ -2639,20 +2657,20 @@ { if (G_UNLIKELY (pspec == NULL)) { - g_warning ("%s: object class '%s' has no property named '%s'", - G_STRFUNC, G_OBJECT_TYPE_NAME (object), property_name); + g_critical ("%s: object class '%s' has no property named '%s'", + G_STRFUNC, G_OBJECT_TYPE_NAME (object), property_name); return FALSE; } if (G_UNLIKELY (!(pspec->flags & G_PARAM_WRITABLE))) { - g_warning ("%s: property '%s' of object class '%s' is not writable", - G_STRFUNC, pspec->name, G_OBJECT_TYPE_NAME (object)); + g_critical ("%s: property '%s' of object class '%s' is not writable", + G_STRFUNC, pspec->name, G_OBJECT_TYPE_NAME (object)); return FALSE; } if (G_UNLIKELY (((pspec->flags & G_PARAM_CONSTRUCT_ONLY) && !object_in_construction (object)))) { - g_warning ("%s: construct property \"%s\" for object '%s' can't be set after construction", - G_STRFUNC, pspec->name, G_OBJECT_TYPE_NAME (object)); + g_critical ("%s: construct property \"%s\" for object '%s' can't be set after construction", + G_STRFUNC, pspec->name, G_OBJECT_TYPE_NAME (object)); return FALSE; } return TRUE; @@ -2754,7 +2772,7 @@ G_VALUE_COLLECT_INIT2 (&value, vtab, pspec->value_type, var_args, G_VALUE_NOCOPY_CONTENTS, &error); if (error) { - g_warning ("%s: %s", G_STRFUNC, error); + g_critical ("%s: %s", G_STRFUNC, error); g_free (error); g_value_unset (&value); break; @@ -2784,14 +2802,14 @@ { if (G_UNLIKELY (pspec == NULL)) { - g_warning ("%s: object class '%s' has no property named '%s'", - G_STRFUNC, G_OBJECT_TYPE_NAME (object), property_name); + g_critical ("%s: object class '%s' has no property named '%s'", + G_STRFUNC, G_OBJECT_TYPE_NAME (object), property_name); return FALSE; } if (G_UNLIKELY (!(pspec->flags & G_PARAM_READABLE))) { - g_warning ("%s: property '%s' of object class '%s' is not readable", - G_STRFUNC, pspec->name, G_OBJECT_TYPE_NAME (object)); + g_critical ("%s: property '%s' of object class '%s' is not readable", + G_STRFUNC, pspec->name, G_OBJECT_TYPE_NAME (object)); return FALSE; } return TRUE; @@ -2893,7 +2911,7 @@ G_VALUE_LCOPY (&value, var_args, 0, &error); if (error) { - g_warning ("%s: %s", G_STRFUNC, error); + g_critical ("%s: %s", G_STRFUNC, error); g_free (error); g_value_unset (&value); break; @@ -3061,10 +3079,10 @@ } else if (!g_value_type_transformable (pspec->value_type, G_VALUE_TYPE (value))) { - g_warning ("%s: can't retrieve property '%s' of type '%s' as value of type '%s'", - G_STRFUNC, pspec->name, - g_type_name (pspec->value_type), - G_VALUE_TYPE_NAME (value)); + g_critical ("%s: can't retrieve property '%s' of type '%s' as value of type '%s'", + G_STRFUNC, pspec->name, + g_type_name (pspec->value_type), + G_VALUE_TYPE_NAME (value)); g_object_unref (object); return; } @@ -3176,7 +3194,7 @@ G_CONNECT_SWAPPED | G_CONNECT_AFTER); else { - g_warning ("%s: invalid signal spec \"%s\"", G_STRFUNC, signal_spec); + g_critical ("%s: invalid signal spec \"%s\"", G_STRFUNC, signal_spec); break; } signal_spec = va_arg (var_args, gchar*); @@ -3233,17 +3251,17 @@ } else { - g_warning ("%s: invalid signal spec \"%s\"", G_STRFUNC, signal_spec); + g_critical ("%s: invalid signal spec \"%s\"", G_STRFUNC, signal_spec); break; } if ((mask & G_SIGNAL_MATCH_ID) && !g_signal_parse_name (signal_spec, G_OBJECT_TYPE (object), &sid, &detail, FALSE)) - g_warning ("%s: invalid signal name \"%s\"", G_STRFUNC, signal_spec); + g_critical ("%s: invalid signal name \"%s\"", G_STRFUNC, signal_spec); else if (!g_signal_handlers_disconnect_matched (object, mask | (detail ? G_SIGNAL_MATCH_DETAIL : 0), sid, detail, NULL, (gpointer)callback, data)) - g_warning ("%s: signal handler %p(%p) is not connected", G_STRFUNC, callback, data); + g_critical ("%s: signal handler %p(%p) is not connected", G_STRFUNC, callback, data); signal_spec = va_arg (var_args, gchar*); } va_end (var_args); @@ -3357,7 +3375,7 @@ } G_UNLOCK (weak_refs_mutex); if (!found_one) - g_warning ("%s: couldn't find weak ref %p(%p)", G_STRFUNC, notify, data); + g_critical ("%s: couldn't find weak ref %p(%p)", G_STRFUNC, notify, data); } /** @@ -3731,7 +3749,7 @@ if (found_one) g_object_unref (object); else - g_warning ("%s: couldn't find toggle ref %p(%p)", G_STRFUNC, notify, data); + g_critical ("%s: couldn't find toggle ref %p(%p)", G_STRFUNC, notify, data); } /** @@ -3789,23 +3807,29 @@ g_return_if_fail (G_IS_OBJECT (object)); /* here we want to atomically do: if (ref_count>1) { ref_count--; return; } */ - retry_atomic_decrement1: old_ref = g_atomic_int_get (&object->ref_count); - if (old_ref > 1) + retry_atomic_decrement1: + while (old_ref > 1) { /* valid if last 2 refs are owned by this call to unref and the toggle_ref */ - gboolean has_toggle_ref = OBJECT_HAS_TOGGLE_REF (object); - if (!g_atomic_int_compare_and_exchange ((int *)&object->ref_count, old_ref, old_ref - 1)) - goto retry_atomic_decrement1; + if (!g_atomic_int_compare_and_exchange_full ((int *)&object->ref_count, + old_ref, old_ref - 1, + &old_ref)) + continue; TRACE (GOBJECT_OBJECT_UNREF(object,G_TYPE_FROM_INSTANCE(object),old_ref)); /* if we went from 2->1 we need to notify toggle refs if any */ - if (old_ref == 2 && has_toggle_ref) /* The last ref being held in this case is owned by the toggle_ref */ - toggle_refs_notify (object, TRUE); + if (old_ref == 2 && OBJECT_HAS_TOGGLE_REF (object)) + { + /* The last ref being held in this case is owned by the toggle_ref */ + toggle_refs_notify (object, TRUE); + } + + return; } - else + { GSList **weak_locations; GObjectNotifyQueue *nqueue; @@ -3868,24 +3892,29 @@ TRACE (GOBJECT_OBJECT_DISPOSE_END(object,G_TYPE_FROM_INSTANCE(object), 1)); /* may have been re-referenced meanwhile */ - retry_atomic_decrement2: old_ref = g_atomic_int_get ((int *)&object->ref_count); - if (old_ref > 1) + + while (old_ref > 1) { /* valid if last 2 refs are owned by this call to unref and the toggle_ref */ - gboolean has_toggle_ref = OBJECT_HAS_TOGGLE_REF (object); - if (!g_atomic_int_compare_and_exchange ((int *)&object->ref_count, old_ref, old_ref - 1)) - goto retry_atomic_decrement2; + if (!g_atomic_int_compare_and_exchange_full ((int *)&object->ref_count, + old_ref, old_ref - 1, + &old_ref)) + continue; + + TRACE (GOBJECT_OBJECT_UNREF (object, G_TYPE_FROM_INSTANCE (object), old_ref)); /* emit all notifications that have been queued during dispose() */ g_object_notify_queue_thaw (object, nqueue); - TRACE (GOBJECT_OBJECT_UNREF(object,G_TYPE_FROM_INSTANCE(object),old_ref)); - /* if we went from 2->1 we need to notify toggle refs if any */ - if (old_ref == 2 && has_toggle_ref) /* The last ref being held in this case is owned by the toggle_ref */ - toggle_refs_notify (object, TRUE); + if (old_ref == 2 && OBJECT_HAS_TOGGLE_REF (object) && + g_atomic_int_get ((int *)&object->ref_count) == 1) + { + /* The last ref being held in this case is owned by the toggle_ref */ + toggle_refs_notify (object, TRUE); + } return; } @@ -4367,18 +4396,15 @@ static void g_value_object_free_value (GValue *value) { - if (value->data0.v_pointer) - g_object_unref (value->data0.v_pointer); + g_clear_object ((GObject**) &value->data0.v_pointer); } static void g_value_object_copy_value (const GValue *src_value, GValue *dest_value) { - if (src_value->data0.v_pointer) - dest_value->data0.v_pointer = g_object_ref (src_value->data0.v_pointer); - else - dest_value->data0.v_pointer = NULL; + g_set_object ((GObject**) &dest_value->data0.v_pointer, + src_value->data0.v_pointer); } static void @@ -4470,24 +4496,23 @@ gpointer v_object) { GObject *old; - + g_return_if_fail (G_VALUE_HOLDS_OBJECT (value)); - old = value->data0.v_pointer; - + if G_UNLIKELY (value->data0.v_pointer == v_object) + return; + + old = g_steal_pointer (&value->data0.v_pointer); + if (v_object) { g_return_if_fail (G_IS_OBJECT (v_object)); g_return_if_fail (g_value_type_compatible (G_OBJECT_TYPE (v_object), G_VALUE_TYPE (value))); - value->data0.v_pointer = v_object; - g_object_ref (value->data0.v_pointer); + value->data0.v_pointer = g_object_ref (v_object); } - else - value->data0.v_pointer = NULL; - - if (old) - g_object_unref (old); + + g_clear_object (&old); } /** @@ -4527,18 +4552,14 @@ { g_return_if_fail (G_VALUE_HOLDS_OBJECT (value)); - if (value->data0.v_pointer) - { - g_object_unref (value->data0.v_pointer); - value->data0.v_pointer = NULL; - } + g_clear_object ((GObject **) &value->data0.v_pointer); if (v_object) { g_return_if_fail (G_IS_OBJECT (v_object)); g_return_if_fail (g_value_type_compatible (G_OBJECT_TYPE (v_object), G_VALUE_TYPE (value))); - value->data0.v_pointer = v_object; /* we take over the reference count */ + value->data0.v_pointer = g_steal_pointer (&v_object); } } @@ -4548,7 +4569,7 @@ * * Get the contents of a %G_TYPE_OBJECT derived #GValue. * - * Returns: (type GObject.Object) (transfer none): object contents of @value + * Returns: (type GObject.Object) (transfer none) (nullable): object contents of @value */ gpointer g_value_get_object (const GValue *value) @@ -4566,7 +4587,7 @@ * its reference count. If the contents of the #GValue are %NULL, then * %NULL will be returned. * - * Returns: (type GObject.Object) (transfer full): object content of @value, + * Returns: (type GObject.Object) (transfer full) (nullable): object content of @value, * should be unreferenced when no longer needed. */ gpointer
View file
_service:tar_scm:glib-2.74.4.tar.xz/gobject/gobject.h -> _service:tar_scm:glib-2.76.4.tar.xz/gobject/gobject.h
Changed
@@ -410,44 +410,44 @@ /* --- prototypes --- */ -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL GType g_initially_unowned_get_type (void); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_object_class_install_property (GObjectClass *oclass, guint property_id, GParamSpec *pspec); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL GParamSpec* g_object_class_find_property (GObjectClass *oclass, const gchar *property_name); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL GParamSpec**g_object_class_list_properties (GObjectClass *oclass, guint *n_properties); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_object_class_override_property (GObjectClass *oclass, guint property_id, const gchar *name); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_object_class_install_properties (GObjectClass *oclass, guint n_pspecs, GParamSpec **pspecs); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_object_interface_install_property (gpointer g_iface, GParamSpec *pspec); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL GParamSpec* g_object_interface_find_property (gpointer g_iface, const gchar *property_name); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL GParamSpec**g_object_interface_list_properties (gpointer g_iface, guint *n_properties_p); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL GType g_object_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL gpointer g_object_new (GType object_type, const gchar *first_property_name, ...); -GLIB_AVAILABLE_IN_2_54 +GOBJECT_AVAILABLE_IN_2_54 GObject* g_object_new_with_properties (GType object_type, guint n_properties, const char *names, @@ -455,91 +455,91 @@ G_GNUC_BEGIN_IGNORE_DEPRECATIONS -GLIB_DEPRECATED_IN_2_54_FOR(g_object_new_with_properties) +GOBJECT_DEPRECATED_IN_2_54_FOR(g_object_new_with_properties) gpointer g_object_newv (GType object_type, guint n_parameters, GParameter *parameters); G_GNUC_END_IGNORE_DEPRECATIONS -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL GObject* g_object_new_valist (GType object_type, const gchar *first_property_name, va_list var_args); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_object_set (gpointer object, const gchar *first_property_name, ...) G_GNUC_NULL_TERMINATED; -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_object_get (gpointer object, const gchar *first_property_name, ...) G_GNUC_NULL_TERMINATED; -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL gpointer g_object_connect (gpointer object, const gchar *signal_spec, ...) G_GNUC_NULL_TERMINATED; -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_object_disconnect (gpointer object, const gchar *signal_spec, ...) G_GNUC_NULL_TERMINATED; -GLIB_AVAILABLE_IN_2_54 +GOBJECT_AVAILABLE_IN_2_54 void g_object_setv (GObject *object, guint n_properties, const gchar *names, const GValue values); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_object_set_valist (GObject *object, const gchar *first_property_name, va_list var_args); -GLIB_AVAILABLE_IN_2_54 +GOBJECT_AVAILABLE_IN_2_54 void g_object_getv (GObject *object, guint n_properties, const gchar *names, GValue values); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_object_get_valist (GObject *object, const gchar *first_property_name, va_list var_args); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_object_set_property (GObject *object, const gchar *property_name, const GValue *value); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_object_get_property (GObject *object, const gchar *property_name, GValue *value); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_object_freeze_notify (GObject *object); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_object_notify (GObject *object, const gchar *property_name); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_object_notify_by_pspec (GObject *object, GParamSpec *pspec); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_object_thaw_notify (GObject *object); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL gboolean g_object_is_floating (gpointer object); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL gpointer g_object_ref_sink (gpointer object); -GLIB_AVAILABLE_IN_2_70 +GOBJECT_AVAILABLE_IN_2_70 gpointer g_object_take_ref (gpointer object); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL gpointer g_object_ref (gpointer object); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_object_unref (gpointer object); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_object_weak_ref (GObject *object, GWeakNotify notify, gpointer data); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_object_weak_unref (GObject *object, GWeakNotify notify, gpointer data); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_object_add_weak_pointer (GObject *object, gpointer *weak_pointer_location); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_object_remove_weak_pointer (GObject *object, gpointer *weak_pointer_location); @@ -567,37 +567,37 @@ GObject *object, gboolean is_last_ref); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_object_add_toggle_ref (GObject *object, GToggleNotify notify, gpointer data); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_object_remove_toggle_ref (GObject *object, GToggleNotify notify, gpointer data); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL gpointer g_object_get_qdata (GObject *object, GQuark quark); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_object_set_qdata (GObject *object, GQuark quark, gpointer data); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_object_set_qdata_full (GObject *object, GQuark quark, gpointer data, GDestroyNotify destroy); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL gpointer g_object_steal_qdata (GObject *object, GQuark quark); -GLIB_AVAILABLE_IN_2_34 +GOBJECT_AVAILABLE_IN_2_34 gpointer g_object_dup_qdata (GObject *object, GQuark quark, GDuplicateFunc dup_func, gpointer user_data); -GLIB_AVAILABLE_IN_2_34 +GOBJECT_AVAILABLE_IN_2_34 gboolean g_object_replace_qdata (GObject *object, GQuark quark, gpointer oldval, @@ -605,28 +605,28 @@ GDestroyNotify destroy, GDestroyNotify *old_destroy); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL gpointer g_object_get_data (GObject *object, const gchar *key); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_object_set_data (GObject *object, const gchar *key, gpointer data); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_object_set_data_full (GObject *object, const gchar *key, gpointer data, GDestroyNotify destroy); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL gpointer g_object_steal_data (GObject *object, const gchar *key); -GLIB_AVAILABLE_IN_2_34 +GOBJECT_AVAILABLE_IN_2_34 gpointer g_object_dup_data (GObject *object, const gchar *key, GDuplicateFunc dup_func, gpointer user_data); -GLIB_AVAILABLE_IN_2_34 +GOBJECT_AVAILABLE_IN_2_34 gboolean g_object_replace_data (GObject *object, const gchar *key, gpointer oldval, @@ -635,26 +635,26 @@ GDestroyNotify *old_destroy); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_object_watch_closure (GObject *object, GClosure *closure); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL GClosure* g_cclosure_new_object (GCallback callback_func, GObject *object); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL GClosure* g_cclosure_new_object_swap (GCallback callback_func, GObject *object); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL GClosure* g_closure_new_object (guint sizeof_closure, GObject *object); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_value_set_object (GValue *value, gpointer v_object); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL gpointer g_value_get_object (const GValue *value); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL gpointer g_value_dup_object (const GValue *value); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL gulong g_signal_connect_object (gpointer instance, const gchar *detailed_signal, GCallback c_handler, @@ -662,20 +662,20 @@ GConnectFlags connect_flags); /*< protected >*/ -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_object_force_floating (GObject *object); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_object_run_dispose (GObject *object); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_value_take_object (GValue *value, gpointer v_object); -GLIB_DEPRECATED_FOR(g_value_take_object) +GOBJECT_DEPRECATED_FOR(g_value_take_object) void g_value_set_object_take_ownership (GValue *value, gpointer v_object); -GLIB_DEPRECATED +GOBJECT_DEPRECATED gsize g_object_compat_control (gsize what, gpointer data); @@ -705,7 +705,7 @@ #define G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec) \ G_OBJECT_WARN_INVALID_PSPEC ((object), "property", (property_id), (pspec)) -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_clear_object (GObject **object_ptr); #define g_clear_object(object_ptr) g_clear_pointer ((object_ptr), g_object_unref) @@ -784,7 +784,7 @@ (void) (0 ? *(object_ptr) = (new_object), FALSE : FALSE); \ (g_set_object) (_object_ptr.out, (GObject *) new_object); \ })) \ - GLIB_AVAILABLE_MACRO_IN_2_44 + GOBJECT_AVAILABLE_MACRO_IN_2_44 #else /* if !defined(__GNUC__) */ @@ -937,14 +937,14 @@ union { gpointer p; } priv; } GWeakRef; -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_weak_ref_init (GWeakRef *weak_ref, gpointer object); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_weak_ref_clear (GWeakRef *weak_ref); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL gpointer g_weak_ref_get (GWeakRef *weak_ref); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_weak_ref_set (GWeakRef *weak_ref, gpointer object);
View file
_service:tar_scm:glib-2.74.4.tar.xz/gobject/gobject_gdb.py -> _service:tar_scm:glib-2.76.4.tar.xz/gobject/gobject_gdb.py
Changed
@@ -215,7 +215,7 @@ if detail is not None: return signal + ":" + detail else: - return detail + return signal def function(self): instances =
View file
_service:tar_scm:glib-2.74.4.tar.xz/gobject/gobjectnotifyqueue.c -> _service:tar_scm:glib-2.76.4.tar.xz/gobject/gobjectnotifyqueue.c
Changed
@@ -113,8 +113,8 @@ /* Just make sure we never get into some nasty race condition */ if (G_UNLIKELY(nqueue->freeze_count == 0)) { G_UNLOCK(notify_lock); - g_warning ("%s: property-changed notification for %s(%p) is not frozen", - G_STRFUNC, G_OBJECT_TYPE_NAME (object), object); + g_critical ("%s: property-changed notification for %s(%p) is not frozen", + G_STRFUNC, G_OBJECT_TYPE_NAME (object), object); return; }
View file
_service:tar_scm:glib-2.74.4.tar.xz/gobject/gparam.c -> _service:tar_scm:glib-2.76.4.tar.xz/gobject/gparam.c
Changed
@@ -1022,7 +1022,7 @@ { if (!strchr (G_CSET_A_2_Z G_CSET_a_2_z G_CSET_DIGITS "-_", *p)) { - g_warning (G_STRLOC ": pspec name \"%s\" contains invalid characters", pspec->name); + g_critical (G_STRLOC ": pspec name \"%s\" contains invalid characters", pspec->name); return; } } @@ -1058,7 +1058,7 @@ if (g_hash_table_remove (pool->hash_table, pspec)) g_param_spec_unref (pspec); else - g_warning (G_STRLOC ": attempt to remove unknown pspec '%s' from pool", pspec->name); + g_critical (G_STRLOC ": attempt to remove unknown pspec '%s' from pool", pspec->name); g_mutex_unlock (&pool->mutex); } else
View file
_service:tar_scm:glib-2.74.4.tar.xz/gobject/gparam.h -> _service:tar_scm:glib-2.76.4.tar.xz/gobject/gparam.h
Changed
@@ -160,7 +160,7 @@ G_PARAM_CONSTRUCT_ONLY = 1 << 3, G_PARAM_LAX_VALIDATION = 1 << 4, G_PARAM_STATIC_NAME = 1 << 5, - G_PARAM_PRIVATE GLIB_DEPRECATED_ENUMERATOR_IN_2_26 = G_PARAM_STATIC_NAME, + G_PARAM_PRIVATE GOBJECT_DEPRECATED_ENUMERATOR_IN_2_26 = G_PARAM_STATIC_NAME, G_PARAM_STATIC_NICK = 1 << 6, G_PARAM_STATIC_BLURB = 1 << 7, /* User defined flags go here */ @@ -201,7 +201,7 @@ /* --- typedefs & structures --- */ typedef struct _GParamSpec GParamSpec; typedef struct _GParamSpecClass GParamSpecClass; -typedef struct _GParameter GParameter GLIB_DEPRECATED_TYPE_IN_2_54; +typedef struct _GParameter GParameter GOBJECT_DEPRECATED_TYPE_IN_2_54; typedef struct _GParamSpecPool GParamSpecPool; /** * GParamSpec: (ref-func g_param_spec_ref_sink) (unref-func g_param_spec_unref) (set-value-func g_value_set_param) (get-value-func g_value_get_param) @@ -289,82 +289,82 @@ { const gchar *name; GValue value; -} GLIB_DEPRECATED_TYPE_IN_2_54; +} GOBJECT_DEPRECATED_TYPE_IN_2_54; /* --- prototypes --- */ -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL GParamSpec* g_param_spec_ref (GParamSpec *pspec); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_param_spec_unref (GParamSpec *pspec); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_param_spec_sink (GParamSpec *pspec); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL GParamSpec* g_param_spec_ref_sink (GParamSpec *pspec); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL gpointer g_param_spec_get_qdata (GParamSpec *pspec, GQuark quark); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_param_spec_set_qdata (GParamSpec *pspec, GQuark quark, gpointer data); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_param_spec_set_qdata_full (GParamSpec *pspec, GQuark quark, gpointer data, GDestroyNotify destroy); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL gpointer g_param_spec_steal_qdata (GParamSpec *pspec, GQuark quark); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL GParamSpec* g_param_spec_get_redirect_target (GParamSpec *pspec); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_param_value_set_default (GParamSpec *pspec, GValue *value); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL gboolean g_param_value_defaults (GParamSpec *pspec, const GValue *value); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL gboolean g_param_value_validate (GParamSpec *pspec, GValue *value); -GLIB_AVAILABLE_IN_2_74 +GOBJECT_AVAILABLE_IN_2_74 gboolean g_param_value_is_valid (GParamSpec *pspec, const GValue *value); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL gboolean g_param_value_convert (GParamSpec *pspec, const GValue *src_value, GValue *dest_value, gboolean strict_validation); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL gint g_param_values_cmp (GParamSpec *pspec, const GValue *value1, const GValue *value2); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL const gchar * g_param_spec_get_name (GParamSpec *pspec); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL const gchar * g_param_spec_get_nick (GParamSpec *pspec); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL const gchar * g_param_spec_get_blurb (GParamSpec *pspec); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_value_set_param (GValue *value, GParamSpec *param); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL GParamSpec* g_value_get_param (const GValue *value); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL GParamSpec* g_value_dup_param (const GValue *value); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_value_take_param (GValue *value, GParamSpec *param); -GLIB_DEPRECATED_FOR(g_value_take_param) +GOBJECT_DEPRECATED_FOR(g_value_take_param) void g_value_set_param_take_ownership (GValue *value, GParamSpec *param); -GLIB_AVAILABLE_IN_2_36 +GOBJECT_AVAILABLE_IN_2_36 const GValue * g_param_spec_get_default_value (GParamSpec *pspec); -GLIB_AVAILABLE_IN_2_46 +GOBJECT_AVAILABLE_IN_2_46 GQuark g_param_spec_get_name_quark (GParamSpec *pspec); /* --- convenience functions --- */ @@ -412,11 +412,11 @@ const GValue *value1, const GValue *value2); }; -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL GType g_param_type_register_static (const gchar *name, const GParamSpecTypeInfo *pspec_info); -GLIB_AVAILABLE_IN_2_66 +GOBJECT_AVAILABLE_IN_2_66 gboolean g_param_spec_is_valid_name (const gchar *name); /* For registering builting types */ @@ -426,30 +426,30 @@ /* --- protected --- */ -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL gpointer g_param_spec_internal (GType param_type, const gchar *name, const gchar *nick, const gchar *blurb, GParamFlags flags); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL GParamSpecPool* g_param_spec_pool_new (gboolean type_prefixing); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_param_spec_pool_insert (GParamSpecPool *pool, GParamSpec *pspec, GType owner_type); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_param_spec_pool_remove (GParamSpecPool *pool, GParamSpec *pspec); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL GParamSpec* g_param_spec_pool_lookup (GParamSpecPool *pool, const gchar *param_name, GType owner_type, gboolean walk_ancestors); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL GList* g_param_spec_pool_list_owned (GParamSpecPool *pool, GType owner_type); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL GParamSpec** g_param_spec_pool_list (GParamSpecPool *pool, GType owner_type, guint *n_pspecs_p);
View file
_service:tar_scm:glib-2.74.4.tar.xz/gobject/gparamspecs.h -> _service:tar_scm:glib-2.76.4.tar.xz/gobject/gparamspecs.h
Changed
@@ -454,7 +454,7 @@ * * Deprecated: 2.32: Use #GArray instead of #GValueArray */ -#define G_TYPE_PARAM_VALUE_ARRAY (g_param_spec_types18) GLIB_DEPRECATED_MACRO_IN_2_32 +#define G_TYPE_PARAM_VALUE_ARRAY (g_param_spec_types18) GOBJECT_DEPRECATED_MACRO_IN_2_32 /** * G_IS_PARAM_SPEC_VALUE_ARRAY: * @pspec: a valid #GParamSpec instance @@ -465,7 +465,7 @@ * * Deprecated: 2.32: Use #GArray instead of #GValueArray */ -#define G_IS_PARAM_SPEC_VALUE_ARRAY(pspec) (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), G_TYPE_PARAM_VALUE_ARRAY)) GLIB_DEPRECATED_MACRO_IN_2_32 +#define G_IS_PARAM_SPEC_VALUE_ARRAY(pspec) (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), G_TYPE_PARAM_VALUE_ARRAY)) GOBJECT_DEPRECATED_MACRO_IN_2_32 /** * G_PARAM_SPEC_VALUE_ARRAY: * @pspec: a valid #GParamSpec instance @@ -474,7 +474,7 @@ * * Deprecated: 2.32: Use #GArray instead of #GValueArray */ -#define G_PARAM_SPEC_VALUE_ARRAY(pspec) (G_TYPE_CHECK_INSTANCE_CAST ((pspec), G_TYPE_PARAM_VALUE_ARRAY, GParamSpecValueArray)) GLIB_DEPRECATED_MACRO_IN_2_32 +#define G_PARAM_SPEC_VALUE_ARRAY(pspec) (G_TYPE_CHECK_INSTANCE_CAST ((pspec), G_TYPE_PARAM_VALUE_ARRAY, GParamSpecValueArray)) GOBJECT_DEPRECATED_MACRO_IN_2_32 /** * G_TYPE_PARAM_OBJECT: @@ -986,7 +986,7 @@ }; /* --- GParamSpec prototypes --- */ -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL GParamSpec* g_param_spec_char (const gchar *name, const gchar *nick, const gchar *blurb, @@ -994,7 +994,7 @@ gint8 maximum, gint8 default_value, GParamFlags flags); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL GParamSpec* g_param_spec_uchar (const gchar *name, const gchar *nick, const gchar *blurb, @@ -1002,13 +1002,13 @@ guint8 maximum, guint8 default_value, GParamFlags flags); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL GParamSpec* g_param_spec_boolean (const gchar *name, const gchar *nick, const gchar *blurb, gboolean default_value, GParamFlags flags); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL GParamSpec* g_param_spec_int (const gchar *name, const gchar *nick, const gchar *blurb, @@ -1016,7 +1016,7 @@ gint maximum, gint default_value, GParamFlags flags); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL GParamSpec* g_param_spec_uint (const gchar *name, const gchar *nick, const gchar *blurb, @@ -1024,7 +1024,7 @@ guint maximum, guint default_value, GParamFlags flags); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL GParamSpec* g_param_spec_long (const gchar *name, const gchar *nick, const gchar *blurb, @@ -1032,7 +1032,7 @@ glong maximum, glong default_value, GParamFlags flags); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL GParamSpec* g_param_spec_ulong (const gchar *name, const gchar *nick, const gchar *blurb, @@ -1040,7 +1040,7 @@ gulong maximum, gulong default_value, GParamFlags flags); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL GParamSpec* g_param_spec_int64 (const gchar *name, const gchar *nick, const gchar *blurb, @@ -1048,7 +1048,7 @@ gint64 maximum, gint64 default_value, GParamFlags flags); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL GParamSpec* g_param_spec_uint64 (const gchar *name, const gchar *nick, const gchar *blurb, @@ -1056,27 +1056,27 @@ guint64 maximum, guint64 default_value, GParamFlags flags); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL GParamSpec* g_param_spec_unichar (const gchar *name, const gchar *nick, const gchar *blurb, gunichar default_value, GParamFlags flags); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL GParamSpec* g_param_spec_enum (const gchar *name, const gchar *nick, const gchar *blurb, GType enum_type, gint default_value, GParamFlags flags); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL GParamSpec* g_param_spec_flags (const gchar *name, const gchar *nick, const gchar *blurb, GType flags_type, guint default_value, GParamFlags flags); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL GParamSpec* g_param_spec_float (const gchar *name, const gchar *nick, const gchar *blurb, @@ -1084,7 +1084,7 @@ gfloat maximum, gfloat default_value, GParamFlags flags); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL GParamSpec* g_param_spec_double (const gchar *name, const gchar *nick, const gchar *blurb, @@ -1092,51 +1092,51 @@ gdouble maximum, gdouble default_value, GParamFlags flags); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL GParamSpec* g_param_spec_string (const gchar *name, const gchar *nick, const gchar *blurb, const gchar *default_value, GParamFlags flags); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL GParamSpec* g_param_spec_param (const gchar *name, const gchar *nick, const gchar *blurb, GType param_type, GParamFlags flags); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL GParamSpec* g_param_spec_boxed (const gchar *name, const gchar *nick, const gchar *blurb, GType boxed_type, GParamFlags flags); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL GParamSpec* g_param_spec_pointer (const gchar *name, const gchar *nick, const gchar *blurb, GParamFlags flags); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL GParamSpec* g_param_spec_value_array (const gchar *name, const gchar *nick, const gchar *blurb, GParamSpec *element_spec, GParamFlags flags); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL GParamSpec* g_param_spec_object (const gchar *name, const gchar *nick, const gchar *blurb, GType object_type, GParamFlags flags); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL GParamSpec* g_param_spec_override (const gchar *name, GParamSpec *overridden); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL GParamSpec* g_param_spec_gtype (const gchar *name, const gchar *nick, const gchar *blurb, GType is_a_type, GParamFlags flags); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL GParamSpec* g_param_spec_variant (const gchar *name, const gchar *nick, const gchar *blurb, @@ -1144,30 +1144,6 @@ GVariant *default_value, GParamFlags flags); -/* --- internal --- */ -/* We prefix variable declarations so they can - * properly get exported in windows dlls. - */ -#ifndef GOBJECT_VAR -# ifdef G_PLATFORM_WIN32 -# ifdef GOBJECT_STATIC_COMPILATION -# define GOBJECT_VAR extern -# else /* !GOBJECT_STATIC_COMPILATION */ -# ifdef GOBJECT_COMPILATION -# ifdef DLL_EXPORT -# define GOBJECT_VAR extern __declspec(dllexport) -# else /* !DLL_EXPORT */ -# define GOBJECT_VAR extern -# endif /* !DLL_EXPORT */ -# else /* !GOBJECT_COMPILATION */ -# define GOBJECT_VAR extern __declspec(dllimport) -# endif /* !GOBJECT_COMPILATION */ -# endif /* !GOBJECT_STATIC_COMPILATION */ -# else /* !G_PLATFORM_WIN32 */ -# define GOBJECT_VAR _GLIB_EXTERN -# endif /* !G_PLATFORM_WIN32 */ -#endif /* GOBJECT_VAR */ - GOBJECT_VAR GType *g_param_spec_types; G_END_DECLS
View file
_service:tar_scm:glib-2.74.4.tar.xz/gobject/gsignal.c -> _service:tar_scm:glib-2.76.4.tar.xz/gobject/gsignal.c
Changed
@@ -955,9 +955,9 @@ if (node->itype == itype) { if (node->destroyed) - g_warning (G_STRLOC ": signal \"%s\" of type '%s' already destroyed", - node->name, - type_debug_name (node->itype)); + g_critical (G_STRLOC ": signal \"%s\" of type '%s' already destroyed", + node->name, + type_debug_name (node->itype)); else signal_destroy_R (node); } @@ -993,7 +993,7 @@ node = LOOKUP_SIGNAL_NODE (signal_id); if (node && detail && !(node->flags & G_SIGNAL_DETAILED)) { - g_warning ("%s: signal id '%u' does not support detail (%u)", G_STRLOC, signal_id, detail); + g_critical ("%s: signal id '%u' does not support detail (%u)", G_STRLOC, signal_id, detail); SIGNAL_UNLOCK (); return; } @@ -1004,17 +1004,17 @@ if (emission) { if (emission->state == EMISSION_HOOK) - g_warning (G_STRLOC ": emission of signal \"%s\" for instance '%p' cannot be stopped from emission hook", - node->name, instance); + g_critical (G_STRLOC ": emission of signal \"%s\" for instance '%p' cannot be stopped from emission hook", + node->name, instance); else if (emission->state == EMISSION_RUN) emission->state = EMISSION_STOP; } else - g_warning (G_STRLOC ": no emission of signal \"%s\" to stop for instance '%p'", - node->name, instance); + g_critical (G_STRLOC ": no emission of signal \"%s\" to stop for instance '%p'", + node->name, instance); } else - g_warning ("%s: signal id '%u' is invalid for instance '%p'", G_STRLOC, signal_id, instance); + g_critical ("%s: signal id '%u' is invalid for instance '%p'", G_STRLOC, signal_id, instance); SIGNAL_UNLOCK (); } @@ -1066,19 +1066,19 @@ node = LOOKUP_SIGNAL_NODE (signal_id); if (!node || node->destroyed) { - g_warning ("%s: invalid signal id '%u'", G_STRLOC, signal_id); + g_critical ("%s: invalid signal id '%u'", G_STRLOC, signal_id); SIGNAL_UNLOCK (); return 0; } if (node->flags & G_SIGNAL_NO_HOOKS) { - g_warning ("%s: signal id '%u' does not support emission hooks (G_SIGNAL_NO_HOOKS flag set)", G_STRLOC, signal_id); + g_critical ("%s: signal id '%u' does not support emission hooks (G_SIGNAL_NO_HOOKS flag set)", G_STRLOC, signal_id); SIGNAL_UNLOCK (); return 0; } if (detail && !(node->flags & G_SIGNAL_DETAILED)) { - g_warning ("%s: signal id '%u' does not support detail (%u)", G_STRLOC, signal_id, detail); + g_critical ("%s: signal id '%u' does not support detail (%u)", G_STRLOC, signal_id, detail); SIGNAL_UNLOCK (); return 0; } @@ -1128,11 +1128,11 @@ node = LOOKUP_SIGNAL_NODE (signal_id); if (!node || node->destroyed) { - g_warning ("%s: invalid signal id '%u'", G_STRLOC, signal_id); + g_critical ("%s: invalid signal id '%u'", G_STRLOC, signal_id); goto out; } else if (!node->emission_hooks || !g_hook_destroy (node->emission_hooks, hook_id)) - g_warning ("%s: signal \"%s\" had no hook (%lu) to remove", G_STRLOC, node->name, hook_id); + g_critical ("%s: signal \"%s\" had no hook (%lu) to remove", G_STRLOC, node->name, hook_id); node->single_va_closure_is_valid = FALSE; @@ -1265,10 +1265,10 @@ SignalNode *node = LOOKUP_SIGNAL_NODE (signal_id); if (detail && !(node->flags & G_SIGNAL_DETAILED)) - g_warning ("%s: signal '%s' does not support details", G_STRLOC, detailed_signal); + g_critical ("%s: signal '%s' does not support details", G_STRLOC, detailed_signal); else if (!g_type_is_a (itype, node->itype)) - g_warning ("%s: signal '%s' is invalid for instance '%p' of type '%s'", - G_STRLOC, detailed_signal, instance, g_type_name (itype)); + g_critical ("%s: signal '%s' is invalid for instance '%p' of type '%s'", + G_STRLOC, detailed_signal, instance, g_type_name (itype)); else { Emission *emission = emission_find (signal_id, detail, instance); @@ -1276,19 +1276,19 @@ if (emission) { if (emission->state == EMISSION_HOOK) - g_warning (G_STRLOC ": emission of signal \"%s\" for instance '%p' cannot be stopped from emission hook", - node->name, instance); + g_critical (G_STRLOC ": emission of signal \"%s\" for instance '%p' cannot be stopped from emission hook", + node->name, instance); else if (emission->state == EMISSION_RUN) emission->state = EMISSION_STOP; } else - g_warning (G_STRLOC ": no emission of signal \"%s\" to stop for instance '%p'", - node->name, instance); + g_critical (G_STRLOC ": no emission of signal \"%s\" to stop for instance '%p'", + node->name, instance); } } else - g_warning ("%s: signal '%s' is invalid for instance '%p' of type '%s'", - G_STRLOC, detailed_signal, instance, g_type_name (itype)); + g_critical ("%s: signal '%s' is invalid for instance '%p' of type '%s'", + G_STRLOC, detailed_signal, instance, g_type_name (itype)); SIGNAL_UNLOCK (); } @@ -1326,11 +1326,11 @@ { /* give elaborate warnings */ if (!g_type_name (itype)) - g_warning (G_STRLOC ": unable to look up signal \"%s\" for invalid type id '%"G_GSIZE_FORMAT"'", - name, itype); + g_critical (G_STRLOC ": unable to look up signal \"%s\" for invalid type id '%"G_GSIZE_FORMAT"'", + name, itype); else if (!g_signal_is_valid_name (name)) - g_warning (G_STRLOC ": unable to look up invalid signal name \"%s\" on type '%s'", - name, g_type_name (itype)); + g_critical (G_STRLOC ": unable to look up invalid signal name \"%s\" on type '%s'", + name, g_type_name (itype)); } return signal_id; @@ -1375,14 +1375,14 @@ { /* give elaborate warnings */ if (!g_type_name (itype)) - g_warning (G_STRLOC ": unable to list signals for invalid type id '%"G_GSIZE_FORMAT"'", - itype); + g_critical (G_STRLOC ": unable to list signals for invalid type id '%"G_GSIZE_FORMAT"'", + itype); else if (!G_TYPE_IS_INSTANTIATABLE (itype) && !G_TYPE_IS_INTERFACE (itype)) - g_warning (G_STRLOC ": unable to list signals of non instantiatable type '%s'", - g_type_name (itype)); + g_critical (G_STRLOC ": unable to list signals of non instantiatable type '%s'", + g_type_name (itype)); else if (!g_type_class_peek (itype) && !G_TYPE_IS_INTERFACE (itype)) - g_warning (G_STRLOC ": unable to list signals of unloaded type '%s'", - g_type_name (itype)); + g_critical (G_STRLOC ": unable to list signals of unloaded type '%s'", + g_type_name (itype)); } return (guint*) g_array_free (result, FALSE); @@ -1743,20 +1743,20 @@ node = LOOKUP_SIGNAL_NODE (signal_id); if (node && !node->destroyed) { - g_warning (G_STRLOC ": signal \"%s\" already exists in the '%s' %s", - name, - type_debug_name (node->itype), - G_TYPE_IS_INTERFACE (node->itype) ? "interface" : "class ancestry"); + g_critical (G_STRLOC ": signal \"%s\" already exists in the '%s' %s", + name, + type_debug_name (node->itype), + G_TYPE_IS_INTERFACE (node->itype) ? "interface" : "class ancestry"); g_free (signal_name_copy); SIGNAL_UNLOCK (); return 0; } if (node && node->itype != itype) { - g_warning (G_STRLOC ": signal \"%s\" for type '%s' was previously created for type '%s'", - name, - type_debug_name (itype), - type_debug_name (node->itype)); + g_critical (G_STRLOC ": signal \"%s\" for type '%s' was previously created for type '%s'", + name, + type_debug_name (itype), + type_debug_name (node->itype)); g_free (signal_name_copy); SIGNAL_UNLOCK (); return 0; @@ -1764,16 +1764,16 @@ for (i = 0; i < n_params; i++) if (!G_TYPE_IS_VALUE (param_typesi & ~G_SIGNAL_TYPE_STATIC_SCOPE)) { - g_warning (G_STRLOC ": parameter %d of type '%s' for signal \"%s::%s\" is not a value type", - i + 1, type_debug_name (param_typesi), type_debug_name (itype), name); + g_critical (G_STRLOC ": parameter %d of type '%s' for signal \"%s::%s\" is not a value type", + i + 1, type_debug_name (param_typesi), type_debug_name (itype), name); g_free (signal_name_copy); SIGNAL_UNLOCK (); return 0; } if (return_type != G_TYPE_NONE && !G_TYPE_IS_VALUE (return_type & ~G_SIGNAL_TYPE_STATIC_SCOPE)) { - g_warning (G_STRLOC ": return value of type '%s' for signal \"%s::%s\" is not a value type", - type_debug_name (return_type), type_debug_name (itype), name); + g_critical (G_STRLOC ": return value of type '%s' for signal \"%s::%s\" is not a value type", + type_debug_name (return_type), type_debug_name (itype), name); g_free (signal_name_copy); SIGNAL_UNLOCK (); return 0; @@ -2079,13 +2079,13 @@ node = LOOKUP_SIGNAL_NODE (signal_id); node_check_deprecated (node); if (!g_type_is_a (instance_type, node->itype)) - g_warning ("%s: type '%s' cannot be overridden for signal id '%u'", G_STRLOC, type_debug_name (instance_type), signal_id); + g_critical ("%s: type '%s' cannot be overridden for signal id '%u'", G_STRLOC, type_debug_name (instance_type), signal_id); else { ClassClosure *cc = signal_find_class_closure (node, instance_type); if (cc && cc->instance_type == instance_type) - g_warning ("%s: type '%s' is already overridden for signal id '%u'", G_STRLOC, type_debug_name (instance_type), signal_id); + g_critical ("%s: type '%s' is already overridden for signal id '%u'", G_STRLOC, type_debug_name (instance_type), signal_id); else signal_add_class_closure (node, instance_type, class_closure); } @@ -2127,8 +2127,8 @@ g_signal_override_class_closure (signal_id, instance_type, g_cclosure_new (class_handler, NULL, NULL)); else - g_warning ("%s: signal name '%s' is invalid for type id '%"G_GSIZE_FORMAT"'", - G_STRLOC, signal_name, instance_type); + g_critical ("%s: signal name '%s' is invalid for type id '%"G_GSIZE_FORMAT"'", + G_STRLOC, signal_name, instance_type); } @@ -2184,10 +2184,10 @@ } } else - g_warning ("%s: signal id '%u' cannot be chained from current emission stage for instance '%p'", G_STRLOC, node->signal_id, instance); + g_critical ("%s: signal id '%u' cannot be chained from current emission stage for instance '%p'", G_STRLOC, node->signal_id, instance); } else - g_warning ("%s: no signal is currently being emitted for instance '%p'", G_STRLOC, instance); + g_critical ("%s: no signal is currently being emitted for instance '%p'", G_STRLOC, instance); if (closure) { @@ -2257,10 +2257,10 @@ } } else - g_warning ("%s: signal id '%u' cannot be chained from current emission stage for instance '%p'", G_STRLOC, node->signal_id, instance); + g_critical ("%s: signal id '%u' cannot be chained from current emission stage for instance '%p'", G_STRLOC, node->signal_id, instance); } else - g_warning ("%s: no signal is currently being emitted for instance '%p'", G_STRLOC, instance); + g_critical ("%s: no signal is currently being emitted for instance '%p'", G_STRLOC, instance); if (closure) { @@ -2289,7 +2289,7 @@ &error); if (error) { - g_warning ("%s: %s", G_STRLOC, error); + g_critical ("%s: %s", G_STRLOC, error); g_free (error); /* we purposely leak the value here, it might not be @@ -2345,7 +2345,7 @@ } else { - g_warning ("%s: %s", G_STRLOC, error); + g_critical ("%s: %s", G_STRLOC, error); g_free (error); /* we purposely leak the value here, it might not be @@ -2400,6 +2400,9 @@ * * Connects a closure to a signal for a particular object. * + * If @closure is a floating reference (see g_closure_sink()), this function + * takes ownership of @closure. + * * Returns: the handler ID (always greater than 0 for successful connections) */ gulong @@ -2421,9 +2424,9 @@ if (node) { if (detail && !(node->flags & G_SIGNAL_DETAILED)) - g_warning ("%s: signal id '%u' does not support detail (%u)", G_STRLOC, signal_id, detail); + g_critical ("%s: signal id '%u' does not support detail (%u)", G_STRLOC, signal_id, detail); else if (!g_type_is_a (G_TYPE_FROM_INSTANCE (instance), node->itype)) - g_warning ("%s: signal id '%u' is invalid for instance '%p'", G_STRLOC, signal_id, instance); + g_critical ("%s: signal id '%u' is invalid for instance '%p'", G_STRLOC, signal_id, instance); else { Handler *handler = handler_new (signal_id, instance, after); @@ -2446,7 +2449,7 @@ } } else - g_warning ("%s: signal id '%u' is invalid for instance '%p'", G_STRLOC, signal_id, instance); + g_critical ("%s: signal id '%u' is invalid for instance '%p'", G_STRLOC, signal_id, instance); SIGNAL_UNLOCK (); return handler_seq_no; @@ -2462,6 +2465,9 @@ * * Connects a closure to a signal for a particular object. * + * If @closure is a floating reference (see g_closure_sink()), this function + * takes ownership of @closure. + * * Returns: the handler ID (always greater than 0 for successful connections) */ gulong @@ -2487,10 +2493,10 @@ SignalNode *node = LOOKUP_SIGNAL_NODE (signal_id); if (detail && !(node->flags & G_SIGNAL_DETAILED)) - g_warning ("%s: signal '%s' does not support details", G_STRLOC, detailed_signal); + g_critical ("%s: signal '%s' does not support details", G_STRLOC, detailed_signal); else if (!g_type_is_a (itype, node->itype)) - g_warning ("%s: signal '%s' is invalid for instance '%p' of type '%s'", - G_STRLOC, detailed_signal, instance, g_type_name (itype)); + g_critical ("%s: signal '%s' is invalid for instance '%p' of type '%s'", + G_STRLOC, detailed_signal, instance, g_type_name (itype)); else { Handler *handler = handler_new (signal_id, instance, after); @@ -2513,8 +2519,8 @@ } } else - g_warning ("%s: signal '%s' is invalid for instance '%p' of type '%s'", - G_STRLOC, detailed_signal, instance, g_type_name (itype)); + g_critical ("%s: signal '%s' is invalid for instance '%p' of type '%s'", + G_STRLOC, detailed_signal, instance, g_type_name (itype)); SIGNAL_UNLOCK (); return handler_seq_no; @@ -2591,10 +2597,10 @@ node_check_deprecated (node); if (detail && !(node->flags & G_SIGNAL_DETAILED)) - g_warning ("%s: signal '%s' does not support details", G_STRLOC, detailed_signal); + g_critical ("%s: signal '%s' does not support details", G_STRLOC, detailed_signal); else if (!g_type_is_a (itype, node->itype)) - g_warning ("%s: signal '%s' is invalid for instance '%p' of type '%s'", - G_STRLOC, detailed_signal, instance, g_type_name (itype)); + g_critical ("%s: signal '%s' is invalid for instance '%p' of type '%s'", + G_STRLOC, detailed_signal, instance, g_type_name (itype)); else { Handler *handler = handler_new (signal_id, instance, after); @@ -2616,8 +2622,8 @@ } } else - g_warning ("%s: signal '%s' is invalid for instance '%p' of type '%s'", - G_STRLOC, detailed_signal, instance, g_type_name (itype)); + g_critical ("%s: signal '%s' is invalid for instance '%p' of type '%s'", + G_STRLOC, detailed_signal, instance, g_type_name (itype)); SIGNAL_UNLOCK (); return handler_seq_no; @@ -2669,7 +2675,7 @@ handler->block_count += 1; } else - g_warning ("%s: instance '%p' has no handler with id '%lu'", G_STRLOC, instance, handler_id); + g_critical ("%s: instance '%p' has no handler with id '%lu'", G_STRLOC, instance, handler_id); } static void @@ -2719,10 +2725,10 @@ if (handler->block_count) handler->block_count -= 1; else - g_warning (G_STRLOC ": handler '%lu' of instance '%p' is not blocked", handler_id, instance); + g_critical (G_STRLOC ": handler '%lu' of instance '%p' is not blocked", handler_id, instance); } else - g_warning ("%s: instance '%p' has no handler with id '%lu'", G_STRLOC, instance, handler_id); + g_critical ("%s: instance '%p' has no handler with id '%lu'", G_STRLOC, instance, handler_id); } static void @@ -2769,7 +2775,7 @@ handler_unref_R (handler->signal_id, instance, handler); } else - g_warning ("%s: instance '%p' has no handler with id '%lu'", G_STRLOC, instance, handler_id); + g_critical ("%s: instance '%p' has no handler with id '%lu'", G_STRLOC, instance, handler_id); } /** @@ -2940,8 +2946,11 @@ * @data: (nullable) (closure closure): The closure data of the handlers' closures. * * Blocks all handlers on an instance that match a certain selection criteria. - * The criteria mask is passed as an OR-ed combination of #GSignalMatchType - * flags, and the criteria values are passed as arguments. + * + * The criteria mask is passed as a combination of #GSignalMatchType flags, and + * the criteria values are passed as arguments. A handler must match on all + * flags set in @mask to be blocked (i.e. the match is conjunctive). + * * Passing at least one of the %G_SIGNAL_MATCH_CLOSURE, %G_SIGNAL_MATCH_FUNC * or %G_SIGNAL_MATCH_DATA match flags is required for successful matches. * If no handlers were found, 0 is returned, the number of blocked handlers @@ -2988,8 +2997,12 @@ * @data: (nullable) (closure closure): The closure data of the handlers' closures. * * Unblocks all handlers on an instance that match a certain selection - * criteria. The criteria mask is passed as an OR-ed combination of - * #GSignalMatchType flags, and the criteria values are passed as arguments. + * criteria. + * + * The criteria mask is passed as a combination of #GSignalMatchType flags, and + * the criteria values are passed as arguments. A handler must match on all + * flags set in @mask to be unblocked (i.e. the match is conjunctive). + * * Passing at least one of the %G_SIGNAL_MATCH_CLOSURE, %G_SIGNAL_MATCH_FUNC * or %G_SIGNAL_MATCH_DATA match flags is required for successful matches. * If no handlers were found, 0 is returned, the number of unblocked handlers @@ -3037,10 +3050,13 @@ * @data: (nullable) (closure closure): The closure data of the handlers' closures. * * Disconnects all handlers on an instance that match a certain - * selection criteria. The criteria mask is passed as an OR-ed - * combination of #GSignalMatchType flags, and the criteria values are - * passed as arguments. Passing at least one of the - * %G_SIGNAL_MATCH_CLOSURE, %G_SIGNAL_MATCH_FUNC or + * selection criteria. + * + * The criteria mask is passed as a combination of #GSignalMatchType flags, and + * the criteria values are passed as arguments. A handler must match on all + * flags set in @mask to be disconnected (i.e. the match is conjunctive). + * + * Passing at least one of the %G_SIGNAL_MATCH_CLOSURE, %G_SIGNAL_MATCH_FUNC or * %G_SIGNAL_MATCH_DATA match flags is required for successful * matches. If no handlers were found, 0 is returned, the number of * disconnected handlers otherwise. @@ -3121,7 +3137,7 @@ { if (!(node->flags & G_SIGNAL_DETAILED)) { - g_warning ("%s: signal id '%u' does not support detail (%u)", G_STRLOC, signal_id, detail); + g_critical ("%s: signal id '%u' does not support detail (%u)", G_STRLOC, signal_id, detail); SIGNAL_UNLOCK (); return FALSE; } @@ -3190,14 +3206,14 @@ node = LOOKUP_SIGNAL_NODE (signal_id); if (!node || !g_type_is_a (G_TYPE_FROM_INSTANCE (instance), node->itype)) { - g_warning ("%s: signal id '%u' is invalid for instance '%p'", G_STRLOC, signal_id, instance); + g_critical ("%s: signal id '%u' is invalid for instance '%p'", G_STRLOC, signal_id, instance); SIGNAL_UNLOCK (); return; } #ifdef G_ENABLE_DEBUG if (detail && !(node->flags & G_SIGNAL_DETAILED)) { - g_warning ("%s: signal id '%u' does not support detail (%u)", G_STRLOC, signal_id, detail); + g_critical ("%s: signal id '%u' does not support detail (%u)", G_STRLOC, signal_id, detail); SIGNAL_UNLOCK (); return; } @@ -3322,14 +3338,14 @@ node = LOOKUP_SIGNAL_NODE (signal_id); if (!node || !g_type_is_a (G_TYPE_FROM_INSTANCE (instance), node->itype)) { - g_warning ("%s: signal id '%u' is invalid for instance '%p'", G_STRLOC, signal_id, instance); + g_critical ("%s: signal id '%u' is invalid for instance '%p'", G_STRLOC, signal_id, instance); SIGNAL_UNLOCK (); return; } #ifndef G_DISABLE_CHECKS if (detail && !(node->flags & G_SIGNAL_DETAILED)) { - g_warning ("%s: signal id '%u' does not support detail (%u)", G_STRLOC, signal_id, detail); + g_critical ("%s: signal id '%u' does not support detail (%u)", G_STRLOC, signal_id, detail); SIGNAL_UNLOCK (); return; } @@ -3492,7 +3508,7 @@ g_value_unset (&emission_return); else { - g_warning ("%s: %s", G_STRLOC, error); + g_critical ("%s: %s", G_STRLOC, error); g_free (error); /* we purposely leak the value here, it might not be * in a correct state if an error condition occurred @@ -3530,7 +3546,7 @@ &error); if (error) { - g_warning ("%s: %s", G_STRLOC, error); + g_critical ("%s: %s", G_STRLOC, error); g_free (error); /* we purposely leak the value here, it might not be @@ -3566,7 +3582,7 @@ g_value_unset (&return_value); else { - g_warning ("%s: %s", G_STRLOC, error); + g_critical ("%s: %s", G_STRLOC, error); g_free (error); /* we purposely leak the value here, it might not be @@ -3649,8 +3665,8 @@ va_end (var_args); } else - g_warning ("%s: signal name '%s' is invalid for instance '%p' of type '%s'", - G_STRLOC, detailed_signal, instance, g_type_name (itype)); + g_critical ("%s: signal name '%s' is invalid for instance '%p' of type '%s'", + G_STRLOC, detailed_signal, instance, g_type_name (itype)); } static gboolean
View file
_service:tar_scm:glib-2.74.4.tar.xz/gobject/gsignal.h -> _service:tar_scm:glib-2.76.4.tar.xz/gobject/gsignal.h
Changed
@@ -60,7 +60,7 @@ * the instance on which the signal was emitted. * @param_values: (array length=n_param_values): the instance on which * the signal was emitted, followed by the parameters of the emission. - * @user_data: user data associated with the hook. + * @data: user data associated with the hook. * * A simple function pointer to get invoked when the signal is emitted. * @@ -75,14 +75,14 @@ typedef gboolean (*GSignalEmissionHook) (GSignalInvocationHint *ihint, guint n_param_values, const GValue *param_values, - gpointer user_data); + gpointer data); /** * GSignalAccumulator: * @ihint: Signal invocation hint, see #GSignalInvocationHint. * @return_accu: Accumulator to collect callback return values in, this * is the return value of the current signal emission. * @handler_return: A #GValue holding the return value of the signal handler. - * @user_data: Callback data that was specified when creating the signal. + * @data: Callback data that was specified when creating the signal. * * The signal accumulator is a special callback function that can be used * to collect return values of the various callbacks that are called @@ -103,7 +103,7 @@ typedef gboolean (*GSignalAccumulator) (GSignalInvocationHint *ihint, GValue *return_accu, const GValue *handler_return, - gpointer user_data); + gpointer data); /* --- run, match and connect types --- */ @@ -169,7 +169,7 @@ */ typedef enum { - G_CONNECT_DEFAULT GLIB_AVAILABLE_ENUMERATOR_IN_2_74 = 0, + G_CONNECT_DEFAULT GOBJECT_AVAILABLE_ENUMERATOR_IN_2_74 = 0, G_CONNECT_AFTER = 1 << 0, G_CONNECT_SWAPPED = 1 << 1 } GConnectFlags; @@ -278,7 +278,7 @@ /* --- signals --- */ -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL guint g_signal_newv (const gchar *signal_name, GType itype, GSignalFlags signal_flags, @@ -289,7 +289,7 @@ GType return_type, guint n_params, GType *param_types); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL guint g_signal_new_valist (const gchar *signal_name, GType itype, GSignalFlags signal_flags, @@ -300,7 +300,7 @@ GType return_type, guint n_params, va_list args); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL guint g_signal_new (const gchar *signal_name, GType itype, GSignalFlags signal_flags, @@ -311,7 +311,7 @@ GType return_type, guint n_params, ...); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL guint g_signal_new_class_handler (const gchar *signal_name, GType itype, GSignalFlags signal_flags, @@ -322,109 +322,109 @@ GType return_type, guint n_params, ...); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_signal_set_va_marshaller (guint signal_id, GType instance_type, GSignalCVaMarshaller va_marshaller); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_signal_emitv (const GValue *instance_and_params, guint signal_id, GQuark detail, GValue *return_value); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_signal_emit_valist (gpointer instance, guint signal_id, GQuark detail, va_list var_args); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_signal_emit (gpointer instance, guint signal_id, GQuark detail, ...); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_signal_emit_by_name (gpointer instance, const gchar *detailed_signal, ...); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL guint g_signal_lookup (const gchar *name, GType itype); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL const gchar * g_signal_name (guint signal_id); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_signal_query (guint signal_id, GSignalQuery *query); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL guint* g_signal_list_ids (GType itype, guint *n_ids); -GLIB_AVAILABLE_IN_2_66 +GOBJECT_AVAILABLE_IN_2_66 gboolean g_signal_is_valid_name (const gchar *name); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL gboolean g_signal_parse_name (const gchar *detailed_signal, GType itype, guint *signal_id_p, GQuark *detail_p, gboolean force_detail_quark); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL GSignalInvocationHint* g_signal_get_invocation_hint (gpointer instance); /* --- signal emissions --- */ -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_signal_stop_emission (gpointer instance, guint signal_id, GQuark detail); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_signal_stop_emission_by_name (gpointer instance, const gchar *detailed_signal); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL gulong g_signal_add_emission_hook (guint signal_id, GQuark detail, GSignalEmissionHook hook_func, gpointer hook_data, GDestroyNotify data_destroy); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_signal_remove_emission_hook (guint signal_id, gulong hook_id); /* --- signal handlers --- */ -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL gboolean g_signal_has_handler_pending (gpointer instance, guint signal_id, GQuark detail, gboolean may_be_blocked); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL gulong g_signal_connect_closure_by_id (gpointer instance, guint signal_id, GQuark detail, GClosure *closure, gboolean after); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL gulong g_signal_connect_closure (gpointer instance, const gchar *detailed_signal, GClosure *closure, gboolean after); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL gulong g_signal_connect_data (gpointer instance, const gchar *detailed_signal, GCallback c_handler, gpointer data, GClosureNotify destroy_data, GConnectFlags connect_flags); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_signal_handler_block (gpointer instance, gulong handler_id); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_signal_handler_unblock (gpointer instance, gulong handler_id); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_signal_handler_disconnect (gpointer instance, gulong handler_id); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL gboolean g_signal_handler_is_connected (gpointer instance, gulong handler_id); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL gulong g_signal_handler_find (gpointer instance, GSignalMatchType mask, guint signal_id, @@ -432,7 +432,7 @@ GClosure *closure, gpointer func, gpointer data); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL guint g_signal_handlers_block_matched (gpointer instance, GSignalMatchType mask, guint signal_id, @@ -440,7 +440,7 @@ GClosure *closure, gpointer func, gpointer data); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL guint g_signal_handlers_unblock_matched (gpointer instance, GSignalMatchType mask, guint signal_id, @@ -448,7 +448,7 @@ GClosure *closure, gpointer func, gpointer data); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL guint g_signal_handlers_disconnect_matched (gpointer instance, GSignalMatchType mask, guint signal_id, @@ -457,7 +457,7 @@ gpointer func, gpointer data); -GLIB_AVAILABLE_IN_2_62 +GOBJECT_AVAILABLE_IN_2_62 void g_clear_signal_handler (gulong *handler_id_ptr, gpointer instance); @@ -473,21 +473,21 @@ g_signal_handler_disconnect (_instance, _handler_id); \ } \ } G_STMT_END \ - GLIB_AVAILABLE_MACRO_IN_2_62 + GOBJECT_AVAILABLE_MACRO_IN_2_62 /* --- overriding and chaining --- */ -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_signal_override_class_closure (guint signal_id, GType instance_type, GClosure *class_closure); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_signal_override_class_handler (const gchar *signal_name, GType instance_type, GCallback class_handler); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_signal_chain_from_overridden (const GValue *instance_and_params, GValue *return_value); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_signal_chain_from_overridden_handler (gpointer instance, ...); @@ -625,20 +625,20 @@ 0, 0, NULL, (func), (data)) -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL gboolean g_signal_accumulator_true_handled (GSignalInvocationHint *ihint, GValue *return_accu, const GValue *handler_return, gpointer dummy); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL gboolean g_signal_accumulator_first_wins (GSignalInvocationHint *ihint, GValue *return_accu, const GValue *handler_return, gpointer dummy); /*< private >*/ -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_signal_handlers_destroy (gpointer instance); void _g_signals_destroy (GType itype);
View file
_service:tar_scm:glib-2.74.4.tar.xz/gobject/gsignalgroup.h -> _service:tar_scm:glib-2.76.4.tar.xz/gobject/gsignalgroup.h
Changed
@@ -46,48 +46,48 @@ */ typedef struct _GSignalGroup GSignalGroup; -GLIB_AVAILABLE_IN_2_72 +GOBJECT_AVAILABLE_IN_2_72 GType g_signal_group_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_2_72 +GOBJECT_AVAILABLE_IN_2_72 GSignalGroup *g_signal_group_new (GType target_type); -GLIB_AVAILABLE_IN_2_72 +GOBJECT_AVAILABLE_IN_2_72 void g_signal_group_set_target (GSignalGroup *self, gpointer target); -GLIB_AVAILABLE_IN_2_72 +GOBJECT_AVAILABLE_IN_2_72 gpointer g_signal_group_dup_target (GSignalGroup *self); -GLIB_AVAILABLE_IN_2_72 +GOBJECT_AVAILABLE_IN_2_72 void g_signal_group_block (GSignalGroup *self); -GLIB_AVAILABLE_IN_2_72 +GOBJECT_AVAILABLE_IN_2_72 void g_signal_group_unblock (GSignalGroup *self); -GLIB_AVAILABLE_IN_2_74 +GOBJECT_AVAILABLE_IN_2_74 void g_signal_group_connect_closure (GSignalGroup *self, const gchar *detailed_signal, GClosure *closure, gboolean after); -GLIB_AVAILABLE_IN_2_72 +GOBJECT_AVAILABLE_IN_2_72 void g_signal_group_connect_object (GSignalGroup *self, const gchar *detailed_signal, GCallback c_handler, gpointer object, GConnectFlags flags); -GLIB_AVAILABLE_IN_2_72 +GOBJECT_AVAILABLE_IN_2_72 void g_signal_group_connect_data (GSignalGroup *self, const gchar *detailed_signal, GCallback c_handler, gpointer data, GClosureNotify notify, GConnectFlags flags); -GLIB_AVAILABLE_IN_2_72 +GOBJECT_AVAILABLE_IN_2_72 void g_signal_group_connect (GSignalGroup *self, const gchar *detailed_signal, GCallback c_handler, gpointer data); -GLIB_AVAILABLE_IN_2_72 +GOBJECT_AVAILABLE_IN_2_72 void g_signal_group_connect_after (GSignalGroup *self, const gchar *detailed_signal, GCallback c_handler, gpointer data); -GLIB_AVAILABLE_IN_2_72 +GOBJECT_AVAILABLE_IN_2_72 void g_signal_group_connect_swapped (GSignalGroup *self, const gchar *detailed_signal, GCallback c_handler,
View file
_service:tar_scm:glib-2.74.4.tar.xz/gobject/gsourceclosure.h -> _service:tar_scm:glib-2.76.4.tar.xz/gobject/gsourceclosure.h
Changed
@@ -28,11 +28,11 @@ G_BEGIN_DECLS -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_source_set_closure (GSource *source, GClosure *closure); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_source_set_dummy_callback (GSource *source); G_END_DECLS
View file
_service:tar_scm:glib-2.74.4.tar.xz/gobject/gtype.c -> _service:tar_scm:glib-2.76.4.tar.xz/gobject/gtype.c
Changed
@@ -145,7 +145,14 @@ G_TYPE_FLAG_INSTANTIATABLE | \ G_TYPE_FLAG_DERIVABLE | \ G_TYPE_FLAG_DEEP_DERIVABLE) -#define TYPE_FLAG_MASK (G_TYPE_FLAG_ABSTRACT | G_TYPE_FLAG_VALUE_ABSTRACT | G_TYPE_FLAG_FINAL) +#define TYPE_FLAG_MASK (G_TYPE_FLAG_ABSTRACT | G_TYPE_FLAG_VALUE_ABSTRACT | G_TYPE_FLAG_FINAL | G_TYPE_FLAG_DEPRECATED) + +/* List the flags that are directly accessible via the TypeNode struct flags */ +#define NODE_FLAG_MASK ( \ + G_TYPE_FLAG_CLASSED | \ + G_TYPE_FLAG_INSTANTIATABLE | \ + G_TYPE_FLAG_FINAL) + #define SIZEOF_FUNDAMENTAL_INFO ((gssize) MAX (MAX (sizeof (GTypeFundamentalInfo), \ sizeof (gpointer)), \ sizeof (glong))) @@ -233,7 +240,9 @@ guint n_prerequisites : 9; guint is_classed : 1; guint is_instantiatable : 1; + guint is_final : 1; guint mutatable_check_cache : 1; /* combines some common path checks */ + GType *children; /* writable with lock */ TypeData *data; GQuark qname; @@ -347,7 +356,6 @@ gpointer class; guint16 instance_size; guint16 private_size; - guint16 n_preallocs; GInstanceInitFunc instance_init; }; @@ -715,26 +723,26 @@ */ if (!plugin) { - g_warning ("plugin handle for type '%s' is NULL", - type_name); + g_critical ("plugin handle for type '%s' is NULL", + type_name); return FALSE; } if (!G_IS_TYPE_PLUGIN (plugin)) { - g_warning ("plugin pointer (%p) for type '%s' is invalid", - plugin, type_name); + g_critical ("plugin pointer (%p) for type '%s' is invalid", + plugin, type_name); return FALSE; } if (need_complete_type_info && !G_TYPE_PLUGIN_GET_CLASS (plugin)->complete_type_info) { - g_warning ("plugin for type '%s' has no complete_type_info() implementation", - type_name); + g_critical ("plugin for type '%s' has no complete_type_info() implementation", + type_name); return FALSE; } if (need_complete_interface_info && !G_TYPE_PLUGIN_GET_CLASS (plugin)->complete_interface_info) { - g_warning ("plugin for type '%s' has no complete_interface_info() implementation", - type_name); + g_critical ("plugin for type '%s' has no complete_interface_info() implementation", + type_name); return FALSE; } return TRUE; @@ -749,7 +757,7 @@ if (!type_name0 || !type_name1 || !type_name2) { - g_warning ("type name '%s' is too short", type_name); + g_critical ("type name '%s' is too short", type_name); return FALSE; } /* check the first letter */ @@ -761,12 +769,12 @@ strchr (extra_chars, p0)); if (!name_valid) { - g_warning ("type name '%s' contains invalid characters", type_name); + g_critical ("type name '%s' contains invalid characters", type_name); return FALSE; } if (g_type_from_name (type_name)) { - g_warning ("cannot register existing type '%s'", type_name); + g_critical ("cannot register existing type '%s'", type_name); return FALSE; } @@ -783,34 +791,34 @@ pnode = lookup_type_node_I (parent_type); if (!pnode) { - g_warning ("cannot derive type '%s' from invalid parent type '%s'", - type_name, - type_descriptive_name_I (parent_type)); + g_critical ("cannot derive type '%s' from invalid parent type '%s'", + type_name, + type_descriptive_name_I (parent_type)); + return FALSE; + } + if (pnode->is_final) + { + g_critical ("cannot derive '%s' from final parent type '%s'", + type_name, + NODE_NAME (pnode)); return FALSE; } finfo = type_node_fundamental_info_I (pnode); /* ensure flat derivability */ if (!(finfo->type_flags & G_TYPE_FLAG_DERIVABLE)) { - g_warning ("cannot derive '%s' from non-derivable parent type '%s'", - type_name, - NODE_NAME (pnode)); + g_critical ("cannot derive '%s' from non-derivable parent type '%s'", + type_name, + NODE_NAME (pnode)); return FALSE; } /* ensure deep derivability */ if (parent_type != NODE_FUNDAMENTAL_TYPE (pnode) && !(finfo->type_flags & G_TYPE_FLAG_DEEP_DERIVABLE)) { - g_warning ("cannot derive '%s' from non-fundamental parent type '%s'", - type_name, - NODE_NAME (pnode)); - return FALSE; - } - if ((G_TYPE_FLAG_FINAL & GPOINTER_TO_UINT (type_get_qdata_L (pnode, static_quark_type_flags))) == G_TYPE_FLAG_FINAL) - { - g_warning ("cannot derive '%s' from final parent type '%s'", - type_name, - NODE_NAME (pnode)); + g_critical ("cannot derive '%s' from non-fundamental parent type '%s'", + type_name, + NODE_NAME (pnode)); return FALSE; } @@ -843,8 +851,8 @@ value_table->value_peek_pointer || value_table->collect_format || value_table->collect_value || value_table->lcopy_format || value_table->lcopy_value) - g_warning ("cannot handle uninitializable values of type '%s'", - type_name); + g_critical ("cannot handle uninitializable values of type '%s'", + type_name); return FALSE; } else /* value_table->value_init != NULL */ @@ -852,41 +860,41 @@ if (!value_table->value_free) { /* +++ optional +++ - * g_warning ("missing 'value_free()' for type '%s'", type_name); + * g_critical ("missing 'value_free()' for type '%s'", type_name); * return FALSE; */ } if (!value_table->value_copy) { - g_warning ("missing 'value_copy()' for type '%s'", type_name); + g_critical ("missing 'value_copy()' for type '%s'", type_name); return FALSE; } if ((value_table->collect_format || value_table->collect_value) && (!value_table->collect_format || !value_table->collect_value)) { - g_warning ("one of 'collect_format' and 'collect_value()' is unspecified for type '%s'", - type_name); + g_critical ("one of 'collect_format' and 'collect_value()' is unspecified for type '%s'", + type_name); return FALSE; } if (value_table->collect_format && !check_collect_format_I (value_table->collect_format)) { - g_warning ("the '%s' specification for type '%s' is too long or invalid", - "collect_format", - type_name); + g_critical ("the '%s' specification for type '%s' is too long or invalid", + "collect_format", + type_name); return FALSE; } if ((value_table->lcopy_format || value_table->lcopy_value) && (!value_table->lcopy_format || !value_table->lcopy_value)) { - g_warning ("one of 'lcopy_format' and 'lcopy_value()' is unspecified for type '%s'", - type_name); + g_critical ("one of 'lcopy_format' and 'lcopy_value()' is unspecified for type '%s'", + type_name); return FALSE; } if (value_table->lcopy_format && !check_collect_format_I (value_table->lcopy_format)) { - g_warning ("the '%s' specification for type '%s' is too long or invalid", - "lcopy_format", - type_name); + g_critical ("the '%s' specification for type '%s' is too long or invalid", + "lcopy_format", + type_name); return FALSE; } } @@ -906,15 +914,15 @@ /* check instance members */ if (!(finfo->type_flags & G_TYPE_FLAG_INSTANTIATABLE) && - (info->instance_size || info->n_preallocs || info->instance_init)) + (info->instance_size || info->instance_init)) { if (pnode) - g_warning ("cannot instantiate '%s', derived from non-instantiatable parent type '%s'", - type_name, - NODE_NAME (pnode)); + g_critical ("cannot instantiate '%s', derived from non-instantiatable parent type '%s'", + type_name, + NODE_NAME (pnode)); else - g_warning ("cannot instantiate '%s' as non-instantiatable fundamental", - type_name); + g_critical ("cannot instantiate '%s' as non-instantiatable fundamental", + type_name); return FALSE; } /* check class & interface members */ @@ -923,19 +931,19 @@ info->class_size || info->base_init || info->base_finalize)) { if (pnode) - g_warning ("cannot create class for '%s', derived from non-classed parent type '%s'", - type_name, - NODE_NAME (pnode)); + g_critical ("cannot create class for '%s', derived from non-classed parent type '%s'", + type_name, + NODE_NAME (pnode)); else - g_warning ("cannot create class for '%s' as non-classed fundamental", - type_name); + g_critical ("cannot create class for '%s' as non-classed fundamental", + type_name); return FALSE; } /* check interface size */ if (is_interface && info->class_size < sizeof (GTypeInterface)) { - g_warning ("specified interface size for type '%s' is smaller than 'GTypeInterface' size", - type_name); + g_critical ("specified interface size for type '%s' is smaller than 'GTypeInterface' size", + type_name); return FALSE; } /* check class size */ @@ -943,16 +951,16 @@ { if (info->class_size < sizeof (GTypeClass)) { - g_warning ("specified class size for type '%s' is smaller than 'GTypeClass' size", - type_name); + g_critical ("specified class size for type '%s' is smaller than 'GTypeClass' size", + type_name); return FALSE; } if (pnode && info->class_size < pnode->data->class.class_size) { - g_warning ("specified class size for type '%s' is smaller " - "than the parent type's '%s' class size", - type_name, - NODE_NAME (pnode)); + g_critical ("specified class size for type '%s' is smaller " + "than the parent type's '%s' class size", + type_name, + NODE_NAME (pnode)); return FALSE; } } @@ -961,16 +969,16 @@ { if (info->instance_size < sizeof (GTypeInstance)) { - g_warning ("specified instance size for type '%s' is smaller than 'GTypeInstance' size", - type_name); + g_critical ("specified instance size for type '%s' is smaller than 'GTypeInstance' size", + type_name); return FALSE; } if (pnode && info->instance_size < pnode->data->instance.instance_size) { - g_warning ("specified instance size for type '%s' is smaller " - "than the parent type's '%s' instance size", - type_name, - NODE_NAME (pnode)); + g_critical ("specified instance size for type '%s' is smaller " + "than the parent type's '%s' instance size", + type_name, + NODE_NAME (pnode)); return FALSE; } } @@ -1008,31 +1016,31 @@ if (!node || !node->is_instantiatable) { - g_warning ("cannot add interfaces to invalid (non-instantiatable) type '%s'", - type_descriptive_name_I (instance_type)); + g_critical ("cannot add interfaces to invalid (non-instantiatable) type '%s'", + type_descriptive_name_I (instance_type)); return FALSE; } if (!iface || !NODE_IS_IFACE (iface)) { - g_warning ("cannot add invalid (non-interface) type '%s' to type '%s'", - type_descriptive_name_I (iface_type), - NODE_NAME (node)); + g_critical ("cannot add invalid (non-interface) type '%s' to type '%s'", + type_descriptive_name_I (iface_type), + NODE_NAME (node)); return FALSE; } if (node->data && node->data->class.class) { - g_warning ("attempting to add an interface (%s) to class (%s) after class_init", - NODE_NAME (iface), NODE_NAME (node)); + g_critical ("attempting to add an interface (%s) to class (%s) after class_init", + NODE_NAME (iface), NODE_NAME (node)); return FALSE; } tnode = lookup_type_node_I (NODE_PARENT_TYPE (iface)); if (NODE_PARENT_TYPE (tnode) && !type_lookup_iface_entry_L (node, tnode)) { /* 2001/7/31:timj: erk, i guess this warning is junk as interface derivation is flat */ - g_warning ("cannot add sub-interface '%s' to type '%s' which does not conform to super-interface '%s'", - NODE_NAME (iface), - NODE_NAME (node), - NODE_NAME (tnode)); + g_critical ("cannot add sub-interface '%s' to type '%s' which does not conform to super-interface '%s'", + NODE_NAME (iface), + NODE_NAME (node), + NODE_NAME (tnode)); return FALSE; } /* allow overriding of interface type introduced for parent type */ @@ -1051,10 +1059,10 @@ tnode = find_conforming_child_type_L (node, iface); /* tnode is_a node */ if (tnode) { - g_warning ("cannot add interface type '%s' to type '%s', since type '%s' already conforms to interface", - NODE_NAME (iface), - NODE_NAME (node), - NODE_NAME (tnode)); + g_critical ("cannot add interface type '%s' to type '%s', since type '%s' already conforms to interface", + NODE_NAME (iface), + NODE_NAME (node), + NODE_NAME (tnode)); return FALSE; } prerequisites = IFACE_NODE_PREREQUISITES (iface); @@ -1063,10 +1071,10 @@ tnode = lookup_type_node_I (prerequisitesi); if (!type_node_is_a_L (node, tnode)) { - g_warning ("cannot add interface type '%s' to type '%s' which does not conform to prerequisite '%s'", - NODE_NAME (iface), - NODE_NAME (node), - NODE_NAME (tnode)); + g_critical ("cannot add interface type '%s' to type '%s' which does not conform to prerequisite '%s'", + NODE_NAME (iface), + NODE_NAME (node), + NODE_NAME (tnode)); return FALSE; } } @@ -1080,9 +1088,9 @@ { if ((info->interface_finalize || info->interface_data) && !info->interface_init) { - g_warning ("interface type '%s' for type '%s' comes without initializer", - NODE_NAME (iface), - type_descriptive_name_I (instance_type)); + g_critical ("interface type '%s' for type '%s' comes without initializer", + NODE_NAME (iface), + type_descriptive_name_I (instance_type)); return FALSE; } @@ -1149,7 +1157,6 @@ data->instance.class_private_size = 0; if (pnode) data->instance.class_private_size = pnode->data->instance.class_private_size; - data->instance.n_preallocs = MIN (info->n_preallocs, 1024); data->instance.instance_init = info->instance_init; } else if (node->is_classed) /* only classed */ @@ -1584,9 +1591,9 @@ prerequisite_node = lookup_type_node_I (prerequisite_type); if (!iface || !prerequisite_node || !NODE_IS_IFACE (iface)) { - g_warning ("interface type '%s' or prerequisite type '%s' invalid", - type_descriptive_name_I (interface_type), - type_descriptive_name_I (prerequisite_type)); + g_critical ("interface type '%s' or prerequisite type '%s' invalid", + type_descriptive_name_I (interface_type), + type_descriptive_name_I (prerequisite_type)); return; } G_WRITE_LOCK (&type_rw_lock); @@ -1594,10 +1601,10 @@ if (holders) { G_WRITE_UNLOCK (&type_rw_lock); - g_warning ("unable to add prerequisite '%s' to interface '%s' which is already in use for '%s'", - type_descriptive_name_I (prerequisite_type), - type_descriptive_name_I (interface_type), - type_descriptive_name_I (holders->instance_type)); + g_critical ("unable to add prerequisite '%s' to interface '%s' which is already in use for '%s'", + type_descriptive_name_I (prerequisite_type), + type_descriptive_name_I (interface_type), + type_descriptive_name_I (holders->instance_type)); return; } if (prerequisite_node->is_instantiatable) @@ -1612,10 +1619,10 @@ if (prnode->is_instantiatable) { G_WRITE_UNLOCK (&type_rw_lock); - g_warning ("adding prerequisite '%s' to interface '%s' conflicts with existing prerequisite '%s'", - type_descriptive_name_I (prerequisite_type), - type_descriptive_name_I (interface_type), - type_descriptive_name_I (NODE_TYPE (prnode))); + g_critical ("adding prerequisite '%s' to interface '%s' conflicts with existing prerequisite '%s'", + type_descriptive_name_I (prerequisite_type), + type_descriptive_name_I (interface_type), + type_descriptive_name_I (NODE_TYPE (prnode))); return; } } @@ -1638,9 +1645,9 @@ else { G_WRITE_UNLOCK (&type_rw_lock); - g_warning ("prerequisite '%s' for interface '%s' is neither instantiatable nor interface", - type_descriptive_name_I (prerequisite_type), - type_descriptive_name_I (interface_type)); + g_critical ("prerequisite '%s' for interface '%s' is neither instantiatable nor interface", + type_descriptive_name_I (prerequisite_type), + type_descriptive_name_I (interface_type)); } } @@ -1824,6 +1831,47 @@ } } +static void +maybe_issue_deprecation_warning (GType type) +{ + static GHashTable *already_warned_table; + static const gchar *enable_diagnostic; + static GMutex already_warned_lock; + gboolean already; + const char *name; + + if (g_once_init_enter (&enable_diagnostic)) + { + const gchar *value = g_getenv ("G_ENABLE_DIAGNOSTIC"); + + if (!value) + value = "0"; + + g_once_init_leave (&enable_diagnostic, value); + } + + if (enable_diagnostic0 == '0') + return; + + g_mutex_lock (&already_warned_lock); + + if (already_warned_table == NULL) + already_warned_table = g_hash_table_new (NULL, NULL); + + name = g_type_name (type); + + already = g_hash_table_contains (already_warned_table, (gpointer) name); + if (!already) + g_hash_table_add (already_warned_table, (gpointer) name); + + g_mutex_unlock (&already_warned_lock); + + if (!already) + g_warning ("The type %s is deprecated and shouldn’t be used " + "any more. It may be removed in a future version.", + name); +} + /** * g_type_create_instance: (skip) * @type: an instantiatable type to create an instance for @@ -1871,7 +1919,11 @@ g_error ("cannot create instance of abstract (non-instantiatable) type '%s'", type_descriptive_name_I (type)); } - + if (G_UNLIKELY (G_TYPE_IS_DEPRECATED (type))) + { + maybe_issue_deprecation_warning (type); + } + class = g_type_class_ref (type); /* We allocate the 'private' areas before the normal instance data, in @@ -1900,7 +1952,7 @@ private_size += ALIGN_STRUCT (1); /* Allocate one extra pointer size... */ - allocated = g_slice_alloc0 (private_size + ivar_size + sizeof (gpointer)); + allocated = g_malloc0 (private_size + ivar_size + sizeof (gpointer)); /* ... and point it back to the start of the private data. */ *(gpointer *) (allocated + private_size + ivar_size) = allocated + ALIGN_STRUCT (1); @@ -1910,7 +1962,7 @@ } else #endif - allocated = g_slice_alloc0 (private_size + ivar_size); + allocated = g_malloc0 (private_size + ivar_size); instance = (GTypeInstance *) (allocated + private_size); @@ -1967,15 +2019,15 @@ node = lookup_type_node_I (class->g_type); if (G_UNLIKELY (!node || !node->is_instantiatable || !node->data || node->data->class.class != (gpointer) class)) { - g_warning ("cannot free instance of invalid (non-instantiatable) type '%s'", - type_descriptive_name_I (class->g_type)); + g_critical ("cannot free instance of invalid (non-instantiatable) type '%s'", + type_descriptive_name_I (class->g_type)); return; } /* G_TYPE_IS_ABSTRACT() is an external call: _U */ if (G_UNLIKELY (!node->mutatable_check_cache && G_TYPE_IS_ABSTRACT (NODE_TYPE (node)))) { - g_warning ("cannot free instance of abstract (non-instantiatable) type '%s'", - NODE_NAME (node)); + g_critical ("cannot free instance of abstract (non-instantiatable) type '%s'", + NODE_NAME (node)); return; } @@ -2000,14 +2052,14 @@ /* Clear out the extra pointer... */ *(gpointer *) (allocated + private_size + ivar_size) = NULL; /* ... and ensure we include it in the size we free. */ - g_slice_free1 (private_size + ivar_size + sizeof (gpointer), allocated); + g_free_sized (allocated, private_size + ivar_size + sizeof (gpointer)); VALGRIND_FREELIKE_BLOCK (allocated + ALIGN_STRUCT (1), 0); VALGRIND_FREELIKE_BLOCK (instance, 0); } else #endif - g_slice_free1 (private_size + ivar_size, allocated); + g_free_sized (allocated, private_size + ivar_size); #ifdef G_ENABLE_DEBUG IF_DEBUG (INSTANCE_COUNT) @@ -2397,8 +2449,8 @@ if (!node->data || NODE_REFCOUNT (node) == 0) { - g_warning ("cannot drop last reference to unreferenced type '%s'", - NODE_NAME (node)); + g_critical ("cannot drop last reference to unreferenced type '%s'", + NODE_NAME (node)); return; } @@ -2496,8 +2548,8 @@ { if (!node->plugin) { - g_warning ("static type '%s' unreferenced too often", - NODE_NAME (node)); + g_critical ("static type '%s' unreferenced too often", + NODE_NAME (node)); return; } else @@ -2584,8 +2636,8 @@ G_WRITE_UNLOCK (&type_rw_lock); if (!found_it) - g_warning (G_STRLOC ": cannot remove unregistered class cache func %p with data %p", - cache_func, cache_data); + g_critical (G_STRLOC ": cannot remove unregistered class cache func %p with data %p", + cache_func, cache_data); } @@ -2658,8 +2710,8 @@ G_WRITE_UNLOCK (&type_rw_lock); if (!found_it) - g_warning (G_STRLOC ": cannot remove unregistered class check func %p with data %p", - check_func, check_data); + g_critical (G_STRLOC ": cannot remove unregistered class check func %p with data %p", + check_func, check_data); } /* --- type registration --- */ @@ -2701,23 +2753,23 @@ if ((type_id & TYPE_ID_MASK) || type_id > G_TYPE_FUNDAMENTAL_MAX) { - g_warning ("attempt to register fundamental type '%s' with invalid type id (%" G_GSIZE_FORMAT ")", - type_name, - type_id); + g_critical ("attempt to register fundamental type '%s' with invalid type id (%" G_GSIZE_FORMAT ")", + type_name, + type_id); return 0; } if ((finfo->type_flags & G_TYPE_FLAG_INSTANTIATABLE) && !(finfo->type_flags & G_TYPE_FLAG_CLASSED)) { - g_warning ("cannot register instantiatable fundamental type '%s' as non-classed", - type_name); + g_critical ("cannot register instantiatable fundamental type '%s' as non-classed", + type_name); return 0; } if (lookup_type_node_I (type_id)) { - g_warning ("cannot register existing fundamental type '%s' (as '%s')", - type_descriptive_name_I (type_id), - type_name); + g_critical ("cannot register existing fundamental type '%s' (as '%s')", + type_descriptive_name_I (type_id), + type_name); return 0; } @@ -2817,8 +2869,8 @@ return 0; if (info->class_finalize) { - g_warning ("class finalizer specified for static type '%s'", - type_name); + g_critical ("class finalizer specified for static type '%s'", + type_name); return 0; } @@ -2980,8 +3032,8 @@ node = lookup_type_node_I (type); if (!node || !node->is_classed) { - g_warning ("cannot retrieve class for invalid (unclassed) type '%s'", - type_descriptive_name_I (type)); + g_critical ("cannot retrieve class for invalid (unclassed) type '%s'", + type_descriptive_name_I (type)); return NULL; } @@ -3044,8 +3096,8 @@ if (node && node->is_classed && NODE_REFCOUNT (node)) type_data_unref_U (node, FALSE); else - g_warning ("cannot unreference class of invalid (unclassed) type '%s'", - type_descriptive_name_I (class->g_type)); + g_critical ("cannot unreference class of invalid (unclassed) type '%s'", + type_descriptive_name_I (class->g_type)); } /** @@ -3069,8 +3121,8 @@ if (node && node->is_classed && NODE_REFCOUNT (node)) type_data_unref_U (node, TRUE); else - g_warning ("cannot unreference class of invalid (unclassed) type '%s'", - type_descriptive_name_I (class->g_type)); + g_critical ("cannot unreference class of invalid (unclassed) type '%s'", + type_descriptive_name_I (class->g_type)); } /** @@ -3174,7 +3226,7 @@ class = node->data->class.class; } else if (NODE_PARENT_TYPE (node)) - g_warning (G_STRLOC ": invalid class pointer '%p'", g_class); + g_critical (G_STRLOC ": invalid class pointer '%p'", g_class); return class; } @@ -3207,7 +3259,7 @@ if (node && node->is_instantiatable && iface) type_lookup_iface_vtable_I (node, iface, &vtable); else - g_warning (G_STRLOC ": invalid class pointer '%p'", class); + g_critical (G_STRLOC ": invalid class pointer '%p'", class); return vtable; } @@ -3243,7 +3295,7 @@ if (node && node->is_instantiatable && iface) type_lookup_iface_vtable_I (node, iface, &vtable); else if (node) - g_warning (G_STRLOC ": invalid interface pointer '%p'", g_iface); + g_critical (G_STRLOC ": invalid interface pointer '%p'", g_iface); return vtable; } @@ -3282,8 +3334,8 @@ (node->data && NODE_REFCOUNT (node) == 0)) { G_WRITE_UNLOCK (&type_rw_lock); - g_warning ("cannot retrieve default vtable for invalid or non-interface type '%s'", - type_descriptive_name_I (g_type)); + g_critical ("cannot retrieve default vtable for invalid or non-interface type '%s'", + type_descriptive_name_I (g_type)); return NULL; } @@ -3359,8 +3411,8 @@ if (node && NODE_IS_IFACE (node)) type_data_unref_U (node, FALSE); else - g_warning ("cannot unreference invalid interface default vtable for '%s'", - type_descriptive_name_I (vtable->g_type)); + g_critical ("cannot unreference invalid interface default vtable for '%s'", + type_descriptive_name_I (vtable->g_type)); } /** @@ -3373,7 +3425,7 @@ * other validly registered type ID, but randomized type IDs should * not be passed in and will most likely lead to a crash. * - * Returns: static type name or %NULL + * Returns: (nullable): static type name or %NULL */ const gchar * g_type_name (GType type) @@ -3848,10 +3900,12 @@ g_return_if_fail (node != NULL); if ((flags & TYPE_FLAG_MASK) && node->is_classed && node->data && node->data->class.class) - g_warning ("tagging type '%s' as abstract after class initialization", NODE_NAME (node)); + g_critical ("tagging type '%s' as abstract after class initialization", NODE_NAME (node)); dflags = GPOINTER_TO_UINT (type_get_qdata_L (node, static_quark_type_flags)); dflags |= flags; type_set_qdata_W (node, static_quark_type_flags, GUINT_TO_POINTER (dflags)); + + node->is_final = (flags & G_TYPE_FLAG_FINAL) != 0; } /** @@ -3933,6 +3987,20 @@ node = lookup_type_node_I (type); if (node) { + if ((flags & ~NODE_FLAG_MASK) == 0) + { + if (flags & G_TYPE_FLAG_CLASSED) + result |= node->is_classed; + + if (flags & G_TYPE_FLAG_INSTANTIATABLE) + result |= node->is_instantiatable; + + if (flags & G_TYPE_FLAG_FINAL) + result |= node->is_final; + + return result; + } + guint fflags = flags & TYPE_FUNDAMENTAL_FLAG_MASK; guint tflags = flags & TYPE_FLAG_MASK; @@ -4023,7 +4091,7 @@ g_return_val_if_fail (node == NULL, NULL); g_return_val_if_fail (iface == NULL, NULL); - g_warning (G_STRLOC ": attempt to look up plugin for invalid instance/interface type pair."); + g_critical (G_STRLOC ": attempt to look up plugin for invalid instance/interface type pair."); return NULL; } @@ -4077,9 +4145,12 @@ if (!type_instance || !type_instance->g_class) return FALSE; - - node = lookup_type_node_I (type_instance->g_class->g_type); + iface = lookup_type_node_I (iface_type); + if (iface && iface->is_final) + return type_instance->g_class->g_type == iface_type; + + node = lookup_type_node_I (type_instance->g_class->g_type); check = node && node->is_instantiatable && iface && type_node_conforms_to_U (node, iface, TRUE, FALSE); return check; @@ -4132,17 +4203,17 @@ return type_instance; if (is_instantiatable) - g_warning ("invalid cast from '%s' to '%s'", - type_descriptive_name_I (type_instance->g_class->g_type), - type_descriptive_name_I (iface_type)); + g_critical ("invalid cast from '%s' to '%s'", + type_descriptive_name_I (type_instance->g_class->g_type), + type_descriptive_name_I (iface_type)); else - g_warning ("invalid uninstantiatable type '%s' in cast to '%s'", - type_descriptive_name_I (type_instance->g_class->g_type), - type_descriptive_name_I (iface_type)); + g_critical ("invalid uninstantiatable type '%s' in cast to '%s'", + type_descriptive_name_I (type_instance->g_class->g_type), + type_descriptive_name_I (iface_type)); } else - g_warning ("invalid unclassed pointer in cast to '%s'", - type_descriptive_name_I (iface_type)); + g_critical ("invalid unclassed pointer in cast to '%s'", + type_descriptive_name_I (iface_type)); } return type_instance; @@ -4165,17 +4236,17 @@ return type_class; if (is_classed) - g_warning ("invalid class cast from '%s' to '%s'", - type_descriptive_name_I (type_class->g_type), - type_descriptive_name_I (is_a_type)); + g_critical ("invalid class cast from '%s' to '%s'", + type_descriptive_name_I (type_class->g_type), + type_descriptive_name_I (is_a_type)); else - g_warning ("invalid unclassed type '%s' in class cast to '%s'", - type_descriptive_name_I (type_class->g_type), - type_descriptive_name_I (is_a_type)); + g_critical ("invalid unclassed type '%s' in class cast to '%s'", + type_descriptive_name_I (type_class->g_type), + type_descriptive_name_I (is_a_type)); } else - g_warning ("invalid class cast from (NULL) pointer to '%s'", - type_descriptive_name_I (is_a_type)); + g_critical ("invalid class cast from (NULL) pointer to '%s'", + type_descriptive_name_I (is_a_type)); return type_class; } @@ -4203,14 +4274,14 @@ if (node && node->is_instantiatable) return TRUE; - g_warning ("instance of invalid non-instantiatable type '%s'", - type_descriptive_name_I (type_instance->g_class->g_type)); + g_critical ("instance of invalid non-instantiatable type '%s'", + type_descriptive_name_I (type_instance->g_class->g_type)); } else - g_warning ("instance with invalid (NULL) class pointer"); + g_critical ("instance with invalid (NULL) class pointer"); } else - g_warning ("invalid (NULL) pointer instance"); + g_critical ("invalid (NULL) pointer instance"); return FALSE; } @@ -4332,10 +4403,10 @@ return vtable; if (!node) - g_warning (G_STRLOC ": type id '%" G_GSIZE_FORMAT "' is invalid", type); + g_critical (G_STRLOC ": type id '%" G_GSIZE_FORMAT "' is invalid", type); if (!has_refed_data) - g_warning ("can't peek value table for type '%s' which is not currently referenced", - type_descriptive_name_I (type)); + g_critical ("can't peek value table for type '%s' which is not currently referenced", + type_descriptive_name_I (type)); return NULL; } @@ -4699,8 +4770,8 @@ if (!node || !node->is_instantiatable || !node->data || node->data->class.class != g_class) { - g_warning ("cannot add private field to invalid (non-instantiatable) type '%s'", - type_descriptive_name_I (instance_type)); + g_critical ("cannot add private field to invalid (non-instantiatable) type '%s'", + type_descriptive_name_I (instance_type)); return; } @@ -4709,7 +4780,7 @@ TypeNode *pnode = lookup_type_node_I (NODE_PARENT_TYPE (node)); if (node->data->instance.private_size != pnode->data->instance.private_size) { - g_warning ("g_type_class_add_private() called multiple times for the same type"); + g_critical ("g_type_class_add_private() called multiple times for the same type"); return; } } @@ -4735,15 +4806,15 @@ if (!node || !node->is_classed || !node->is_instantiatable || !node->data) { - g_warning ("cannot add private field to invalid (non-instantiatable) type '%s'", - type_descriptive_name_I (class_gtype)); + g_critical ("cannot add private field to invalid (non-instantiatable) type '%s'", + type_descriptive_name_I (class_gtype)); return 0; } if (node->plugin != NULL) { - g_warning ("cannot use g_type_add_instance_private() with dynamic type '%s'", - type_descriptive_name_I (class_gtype)); + g_critical ("cannot use g_type_add_instance_private() with dynamic type '%s'", + type_descriptive_name_I (class_gtype)); return 0; } @@ -4762,7 +4833,7 @@ * hide it behind a macro. the function will return the private size, instead * of the offset, which will be stored inside a static variable defined by * the G_DEFINE_TYPE_EXTENDED() macro. the G_DEFINE_TYPE_EXTENDED() macro will - * check the variable and call g_type_class_add_instance_private(), which + * check the variable and call g_type_class_adjust_private_offset(), which * will use the data size and actually register the private data, then * return the computed offset of the private data, which will be stored * inside the static variable, so we can use it to retrieve the pointer @@ -4771,7 +4842,7 @@ * once all our code has been migrated to the new idiomatic form of private * data registration, we will change the g_type_add_instance_private() * function to actually perform the registration and return the offset - * of the private data; g_type_class_add_instance_private() already checks + * of the private data; g_type_class_adjust_private_offset() already checks * if the passed argument is negative (meaning that it's an offset in the * GTypeInstance allocation) and becomes a no-op if that's the case. this * should make the migration fully transparent even if we're effectively @@ -4802,8 +4873,8 @@ if (!node || !node->is_classed || !node->is_instantiatable || !node->data) { - g_warning ("cannot add private field to invalid (non-instantiatable) type '%s'", - type_descriptive_name_I (class_gtype)); + g_critical ("cannot add private field to invalid (non-instantiatable) type '%s'", + type_descriptive_name_I (class_gtype)); *private_size_or_offset = 0; return; } @@ -4813,7 +4884,7 @@ TypeNode *pnode = lookup_type_node_I (NODE_PARENT_TYPE (node)); if (node->data->instance.private_size != pnode->data->instance.private_size) { - g_warning ("g_type_add_instance_private() called multiple times for the same type"); + g_critical ("g_type_add_instance_private() called multiple times for the same type"); *private_size_or_offset = 0; return; } @@ -4841,8 +4912,8 @@ node = lookup_type_node_I (private_type); if (G_UNLIKELY (!node || !node->is_instantiatable)) { - g_warning ("instance of invalid non-instantiatable type '%s'", - type_descriptive_name_I (instance->g_class->g_type)); + g_critical ("instance of invalid non-instantiatable type '%s'", + type_descriptive_name_I (instance->g_class->g_type)); return NULL; } @@ -4926,8 +4997,8 @@ if (!node || !node->is_classed || !node->data) { - g_warning ("cannot add class private field to invalid type '%s'", - type_descriptive_name_I (class_type)); + g_critical ("cannot add class private field to invalid type '%s'", + type_descriptive_name_I (class_type)); return; } @@ -4936,7 +5007,7 @@ TypeNode *pnode = lookup_type_node_I (NODE_PARENT_TYPE (node)); if (node->data->class.class_private_size != pnode->data->class.class_private_size) { - g_warning ("g_type_add_class_private() called multiple times for the same type"); + g_critical ("g_type_add_class_private() called multiple times for the same type"); return; } } @@ -4963,16 +5034,16 @@ class_node = lookup_type_node_I (klass->g_type); if (G_UNLIKELY (!class_node || !class_node->is_classed)) { - g_warning ("class of invalid type '%s'", - type_descriptive_name_I (klass->g_type)); + g_critical ("class of invalid type '%s'", + type_descriptive_name_I (klass->g_type)); return NULL; } private_node = lookup_type_node_I (private_type); if (G_UNLIKELY (!private_node || !NODE_IS_ANCESTOR (private_node, class_node))) { - g_warning ("attempt to retrieve private data for invalid type '%s'", - type_descriptive_name_I (private_type)); + g_critical ("attempt to retrieve private data for invalid type '%s'", + type_descriptive_name_I (private_type)); return NULL; } @@ -4985,7 +5056,7 @@ if (G_UNLIKELY (private_node->data->class.class_private_size == parent_node->data->class.class_private_size)) { - g_warning ("g_type_instance_get_class_private() requires a prior call to g_type_add_class_private()"); + g_critical ("g_type_instance_get_class_private() requires a prior call to g_type_add_class_private()"); return NULL; }
View file
_service:tar_scm:glib-2.74.4.tar.xz/gobject/gtype.h -> _service:tar_scm:glib-2.76.4.tar.xz/gobject/gtype.h
Changed
@@ -23,7 +23,8 @@ #error "Only <glib-object.h> can be included directly." #endif -#include <glib.h> +#include <glib.h> +#include <gobject/gobject-visibility.h> G_BEGIN_DECLS @@ -267,7 +268,7 @@ * * Checks if @type is a fundamental type. * - * Returns: %TRUE on success + * Returns: %TRUE is @type is fundamental */ #define G_TYPE_IS_FUNDAMENTAL(type) ((type) <= G_TYPE_FUNDAMENTAL_MAX) /** @@ -278,7 +279,7 @@ * inherited) from another type (this holds true for all non-fundamental * types). * - * Returns: %TRUE on success + * Returns: %TRUE if @type is derived */ #define G_TYPE_IS_DERIVED(type) ((type) > G_TYPE_FUNDAMENTAL_MAX) /** @@ -294,7 +295,7 @@ * with the difference that GType interfaces are not derivable (but see * g_type_interface_add_prerequisite() for an alternative). * - * Returns: %TRUE on success + * Returns: %TRUE if @type is an interface */ #define G_TYPE_IS_INTERFACE(type) (G_TYPE_FUNDAMENTAL (type) == G_TYPE_INTERFACE) /** @@ -303,7 +304,16 @@ * * Checks if @type is a classed type. * - * Returns: %TRUE on success + * A classed type has an associated #GTypeClass which can be derived to store + * class-wide virtual function pointers and data for all instances of the type. + * This allows for subclassing. All #GObjects are classed; none of the scalar + * fundamental types built into GLib are classed. + * + * Interfaces are not classed: while their #GTypeInterface struct could be + * considered similar to #GTypeClass, and classes can derive interfaces, + * #GTypeInterface doesn’t allow for subclassing. + * + * Returns: %TRUE if @type is classed */ #define G_TYPE_IS_CLASSED(type) (g_type_test_flags ((type), G_TYPE_FLAG_CLASSED)) /** @@ -313,7 +323,7 @@ * Checks if @type can be instantiated. Instantiation is the * process of creating an instance (object) of this type. * - * Returns: %TRUE on success + * Returns: %TRUE if @type is instantiatable */ #define G_TYPE_IS_INSTANTIATABLE(type) (g_type_test_flags ((type), G_TYPE_FLAG_INSTANTIATABLE)) /** @@ -323,7 +333,7 @@ * Checks if @type is a derivable type. A derivable type can * be used as the base class of a flat (single-level) class hierarchy. * - * Returns: %TRUE on success + * Returns: %TRUE if @type is derivable */ #define G_TYPE_IS_DERIVABLE(type) (g_type_test_flags ((type), G_TYPE_FLAG_DERIVABLE)) /** @@ -333,7 +343,7 @@ * Checks if @type is a deep derivable type. A deep derivable type * can be used as the base class of a deep (multi-level) class hierarchy. * - * Returns: %TRUE on success + * Returns: %TRUE if @type is deep derivable */ #define G_TYPE_IS_DEEP_DERIVABLE(type) (g_type_test_flags ((type), G_TYPE_FLAG_DEEP_DERIVABLE)) /** @@ -344,7 +354,7 @@ * instantiated and is normally used as an abstract base class for * derived classes. * - * Returns: %TRUE on success + * Returns: %TRUE if @type is abstract */ #define G_TYPE_IS_ABSTRACT(type) (g_type_test_flags ((type), G_TYPE_FLAG_ABSTRACT)) /** @@ -355,7 +365,7 @@ * a value table, but can't be used for g_value_init() and is normally used as * an abstract base type for derived value types. * - * Returns: %TRUE on success + * Returns: %TRUE if @type is an abstract value type */ #define G_TYPE_IS_VALUE_ABSTRACT(type) (g_type_test_flags ((type), G_TYPE_FLAG_VALUE_ABSTRACT)) /** @@ -364,7 +374,7 @@ * * Checks if @type is a value type and can be used with g_value_init(). * - * Returns: %TRUE on success + * Returns: %TRUE if @type is a value type */ #define G_TYPE_IS_VALUE_TYPE(type) (g_type_check_is_value_type (type)) /** @@ -373,7 +383,7 @@ * * Checks if @type has a #GTypeValueTable. * - * Returns: %TRUE on success + * Returns: %TRUE if @type has a value table */ #define G_TYPE_HAS_VALUE_TABLE(type) (g_type_value_table_peek (type) != NULL) /** @@ -383,11 +393,24 @@ * Checks if @type is a final type. A final type cannot be derived any * further. * - * Returns: %TRUE on success + * Returns: %TRUE if @type is final * * Since: 2.70 */ -#define G_TYPE_IS_FINAL(type) (g_type_test_flags ((type), G_TYPE_FLAG_FINAL)) GLIB_AVAILABLE_MACRO_IN_2_70 +#define G_TYPE_IS_FINAL(type) (g_type_test_flags ((type), G_TYPE_FLAG_FINAL)) GOBJECT_AVAILABLE_MACRO_IN_2_70 + +/** + * G_TYPE_IS_DEPRECATED: + * @type: a #GType value + * + * Checks if @type is deprecated. Instantiating a deprecated type will + * trigger a warning if running with `G_ENABLE_DIAGNOSTIC=1`. + * + * Returns: %TRUE if the type is deprecated + * + * Since: 2.76 + */ +#define G_TYPE_IS_DEPRECATED(type) (g_type_test_flags ((type), G_TYPE_FLAG_DEPRECATED)) GOBJECT_AVAILABLE_MACRO_IN_2_76 /* Typedefs @@ -398,7 +421,7 @@ * A numerical value which represents the unique identifier of a registered * type. */ -#if GLIB_SIZEOF_SIZE_T != GLIB_SIZEOF_LONG || !defined __cplusplus +#if GLIB_SIZEOF_SIZE_T != GLIB_SIZEOF_LONG || !defined (G_CXX_STD_VERSION) typedef gsize GType; #else /* for historic reasons, C++ links against gulong GTypes */ typedef gulong GType; @@ -483,7 +506,7 @@ * * This macro should only be used in type implementations. * - * Returns: %TRUE on success + * Returns: %TRUE if @instance is valid */ #define G_TYPE_CHECK_INSTANCE(instance) (_G_TYPE_CHI ((GTypeInstance*) (instance))) /** @@ -511,7 +534,7 @@ * * This macro should only be used in type implementations. * - * Returns: %TRUE on success + * Returns: %TRUE if @instance is an instance of @g_type */ #define G_TYPE_CHECK_INSTANCE_TYPE(instance, g_type) (_G_TYPE_CIT ((instance), (g_type))) /** @@ -524,7 +547,7 @@ * * This macro should only be used in type implementations. * - * Returns: %TRUE on success + * Returns: %TRUE if @instance is an instance of @g_type */ #define G_TYPE_CHECK_INSTANCE_FUNDAMENTAL_TYPE(instance, g_type) (_G_TYPE_CIFT ((instance), (g_type))) /** @@ -580,7 +603,7 @@ * * This macro should only be used in type implementations. * - * Returns: %TRUE on success + * Returns: %TRUE if @g_class is a class structure of @g_type */ #define G_TYPE_CHECK_CLASS_TYPE(g_class, g_type) (_G_TYPE_CCT ((g_class), (g_type))) /** @@ -592,7 +615,7 @@ * * This macro should only be used in type implementations. * - * Returns: %TRUE on success + * Returns: %TRUE if @value is initialized */ #define G_TYPE_CHECK_VALUE(value) (_G_TYPE_CHV ((value))) /** @@ -605,7 +628,7 @@ * * This macro should only be used in type implementations. * - * Returns: %TRUE on success + * Returns: %TRUE if @value has been initialized to hold values of type @g_type */ #define G_TYPE_CHECK_VALUE_TYPE(value, g_type) (_G_TYPE_CVH ((value), (g_type))) /** @@ -660,7 +683,7 @@ * `your_type_get_instance_private()` function instead * Returns: (not nullable): a pointer to the private data structure */ -#define G_TYPE_INSTANCE_GET_PRIVATE(instance, g_type, c_type) ((c_type*) g_type_instance_get_private ((GTypeInstance*) (instance), (g_type))) GLIB_DEPRECATED_MACRO_IN_2_58_FOR(G_ADD_PRIVATE) +#define G_TYPE_INSTANCE_GET_PRIVATE(instance, g_type, c_type) ((c_type*) g_type_instance_get_private ((GTypeInstance*) (instance), (g_type))) GOBJECT_DEPRECATED_MACRO_IN_2_58_FOR(G_ADD_PRIVATE) /** * G_TYPE_CLASS_GET_PRIVATE: @@ -703,81 +726,81 @@ G_TYPE_DEBUG_SIGNALS = 1 << 1, G_TYPE_DEBUG_INSTANCE_COUNT = 1 << 2, G_TYPE_DEBUG_MASK = 0x07 -} GTypeDebugFlags GLIB_DEPRECATED_TYPE_IN_2_36; +} GTypeDebugFlags GOBJECT_DEPRECATED_TYPE_IN_2_36; /* --- prototypes --- */ G_GNUC_BEGIN_IGNORE_DEPRECATIONS -GLIB_DEPRECATED_IN_2_36 +GOBJECT_DEPRECATED_IN_2_36 void g_type_init (void); -GLIB_DEPRECATED_IN_2_36 +GOBJECT_DEPRECATED_IN_2_36 void g_type_init_with_debug_flags (GTypeDebugFlags debug_flags); G_GNUC_END_IGNORE_DEPRECATIONS -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL const gchar * g_type_name (GType type); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL GQuark g_type_qname (GType type); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL GType g_type_from_name (const gchar *name); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL GType g_type_parent (GType type); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL guint g_type_depth (GType type); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL GType g_type_next_base (GType leaf_type, GType root_type); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL gboolean g_type_is_a (GType type, GType is_a_type); /* Hoist exact GType comparisons into the caller */ #define g_type_is_a(a,b) ((a) == (b) || (g_type_is_a) ((a), (b))) -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL gpointer g_type_class_ref (GType type); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL gpointer g_type_class_peek (GType type); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL gpointer g_type_class_peek_static (GType type); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_type_class_unref (gpointer g_class); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL gpointer g_type_class_peek_parent (gpointer g_class); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL gpointer g_type_interface_peek (gpointer instance_class, GType iface_type); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL gpointer g_type_interface_peek_parent (gpointer g_iface); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL gpointer g_type_default_interface_ref (GType g_type); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL gpointer g_type_default_interface_peek (GType g_type); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_type_default_interface_unref (gpointer g_iface); /* g_free() the returned arrays */ -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL GType* g_type_children (GType type, guint *n_children); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL GType* g_type_interfaces (GType type, guint *n_interfaces); /* per-type _static_ data */ -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_type_set_qdata (GType type, GQuark quark, gpointer data); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL gpointer g_type_get_qdata (GType type, GQuark quark); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_type_query (GType type, GTypeQuery *query); -GLIB_AVAILABLE_IN_2_44 +GOBJECT_AVAILABLE_IN_2_44 int g_type_get_instance_count (GType type); /* --- type registration --- */ @@ -1049,15 +1072,19 @@ * g_value_init() * @G_TYPE_FLAG_FINAL: Indicates a final type. A final type is a non-derivable * leaf node in a deep derivable type hierarchy tree. Since: 2.70 + * @G_TYPE_FLAG_DEPRECATED: The type is deprecated and may be removed in a + * future version. A warning will be emitted if it is instantiated while + * running with `G_ENABLE_DIAGNOSTIC=1`. Since 2.76 * * Bit masks used to check or determine characteristics of a type. */ typedef enum /*< skip >*/ { - G_TYPE_FLAG_NONE GLIB_AVAILABLE_ENUMERATOR_IN_2_74 = 0, + G_TYPE_FLAG_NONE GOBJECT_AVAILABLE_ENUMERATOR_IN_2_74 = 0, G_TYPE_FLAG_ABSTRACT = (1 << 4), G_TYPE_FLAG_VALUE_ABSTRACT = (1 << 5), - G_TYPE_FLAG_FINAL GLIB_AVAILABLE_ENUMERATOR_IN_2_70 = (1 << 6) + G_TYPE_FLAG_FINAL GOBJECT_AVAILABLE_ENUMERATOR_IN_2_70 = (1 << 6), + G_TYPE_FLAG_DEPRECATED GOBJECT_AVAILABLE_ENUMERATOR_IN_2_76 = (1 << 7) } GTypeFlags; /** * GTypeInfo: @@ -1075,7 +1102,7 @@ * finalization function for interface types. (optional) * @class_data: User-supplied data passed to the class init/finalize functions * @instance_size: Size of the instance (object) structure (required for instantiatable types only) - * @n_preallocs: Prior to GLib 2.10, it specified the number of pre-allocated (cached) instances to reserve memory for (0 indicates no caching). Since GLib 2.10, it is ignored, since instances are allocated with the slice allocatorglib-Memory-Slices now. + * @n_preallocs: Prior to GLib 2.10, it specified the number of pre-allocated (cached) instances to reserve memory for (0 indicates no caching). Since GLib 2.10 this field is ignored. * @instance_init: Location of the instance initialization function (optional, for instantiatable types only) * @value_table: A #GTypeValueTable function table for generic handling of GValues * of this type (usually only useful for fundamental types) @@ -1310,12 +1337,12 @@ GTypeCValue *collect_values, guint collect_flags); }; -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL GType g_type_register_static (GType parent_type, const gchar *type_name, const GTypeInfo *info, GTypeFlags flags); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL GType g_type_register_static_simple (GType parent_type, const gchar *type_name, guint class_size, @@ -1324,59 +1351,59 @@ GInstanceInitFunc instance_init, GTypeFlags flags); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL GType g_type_register_dynamic (GType parent_type, const gchar *type_name, GTypePlugin *plugin, GTypeFlags flags); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL GType g_type_register_fundamental (GType type_id, const gchar *type_name, const GTypeInfo *info, const GTypeFundamentalInfo *finfo, GTypeFlags flags); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_type_add_interface_static (GType instance_type, GType interface_type, const GInterfaceInfo *info); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_type_add_interface_dynamic (GType instance_type, GType interface_type, GTypePlugin *plugin); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_type_interface_add_prerequisite (GType interface_type, GType prerequisite_type); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL GType*g_type_interface_prerequisites (GType interface_type, guint *n_prerequisites); -GLIB_AVAILABLE_IN_2_68 +GOBJECT_AVAILABLE_IN_2_68 GType g_type_interface_instantiatable_prerequisite (GType interface_type); -GLIB_DEPRECATED_IN_2_58 +GOBJECT_DEPRECATED_IN_2_58 void g_type_class_add_private (gpointer g_class, gsize private_size); -GLIB_AVAILABLE_IN_2_38 +GOBJECT_AVAILABLE_IN_2_38 gint g_type_add_instance_private (GType class_type, gsize private_size); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL gpointer g_type_instance_get_private (GTypeInstance *instance, GType private_type); -GLIB_AVAILABLE_IN_2_38 +GOBJECT_AVAILABLE_IN_2_38 void g_type_class_adjust_private_offset (gpointer g_class, gint *private_size_or_offset); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_type_add_class_private (GType class_type, gsize private_size); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL gpointer g_type_class_get_private (GTypeClass *klass, GType private_type); -GLIB_AVAILABLE_IN_2_38 +GOBJECT_AVAILABLE_IN_2_38 gint g_type_class_get_instance_private_offset (gpointer g_class); -GLIB_AVAILABLE_IN_2_34 +GOBJECT_AVAILABLE_IN_2_34 void g_type_ensure (GType type); -GLIB_AVAILABLE_IN_2_36 +GOBJECT_AVAILABLE_IN_2_36 guint g_type_get_type_registration_serial (void); @@ -1790,7 +1817,7 @@ * * Since: 2.70 */ -#define G_DEFINE_FINAL_TYPE(TN, t_n, T_P) G_DEFINE_TYPE_EXTENDED (TN, t_n, T_P, G_TYPE_FLAG_FINAL, {}) GLIB_AVAILABLE_MACRO_IN_2_70 +#define G_DEFINE_FINAL_TYPE(TN, t_n, T_P) G_DEFINE_TYPE_EXTENDED (TN, t_n, T_P, G_TYPE_FLAG_FINAL, {}) GOBJECT_AVAILABLE_MACRO_IN_2_70 /** * G_DEFINE_FINAL_TYPE_WITH_CODE: * @TN: the name of the new type, in Camel case @@ -1809,7 +1836,7 @@ * * Since: 2.70 */ -#define G_DEFINE_FINAL_TYPE_WITH_CODE(TN, t_n, T_P, _C_) _G_DEFINE_TYPE_EXTENDED_BEGIN (TN, t_n, T_P, G_TYPE_FLAG_FINAL) {_C_;} _G_DEFINE_TYPE_EXTENDED_END() GLIB_AVAILABLE_MACRO_IN_2_70 +#define G_DEFINE_FINAL_TYPE_WITH_CODE(TN, t_n, T_P, _C_) _G_DEFINE_TYPE_EXTENDED_BEGIN (TN, t_n, T_P, G_TYPE_FLAG_FINAL) {_C_;} _G_DEFINE_TYPE_EXTENDED_END() GOBJECT_AVAILABLE_MACRO_IN_2_70 /** * G_DEFINE_FINAL_TYPE_WITH_PRIVATE: * @TN: the name of the new type, in Camel case @@ -1825,7 +1852,7 @@ * * Since: 2.70 */ -#define G_DEFINE_FINAL_TYPE_WITH_PRIVATE(TN, t_n, T_P) G_DEFINE_TYPE_EXTENDED (TN, t_n, T_P, G_TYPE_FLAG_FINAL, G_ADD_PRIVATE (TN)) GLIB_AVAILABLE_MACRO_IN_2_70 +#define G_DEFINE_FINAL_TYPE_WITH_PRIVATE(TN, t_n, T_P) G_DEFINE_TYPE_EXTENDED (TN, t_n, T_P, G_TYPE_FLAG_FINAL, G_ADD_PRIVATE (TN)) GOBJECT_AVAILABLE_MACRO_IN_2_70 /** * G_DEFINE_TYPE_EXTENDED: * @TN: The name of the new type, in Camel case. @@ -2313,7 +2340,8 @@ /* Only use this in non-C++ on GCC >= 2.7, except for Darwin/ppc64. * See https://bugzilla.gnome.org/show_bug.cgi?id=647145 */ -#if !defined (__cplusplus) && (G_GNUC_CHECK_VERSION(2, 7)) && !(defined (__APPLE__) && defined (__ppc64__)) +#if !defined (G_CXX_STD_VERSION) && (G_GNUC_CHECK_VERSION(2, 7)) && \ + !(defined (__APPLE__) && defined (__ppc64__)) #define _G_DEFINE_BOXED_TYPE_BEGIN(TypeName, type_name, copy_func, free_func) \ static GType type_name##_get_type_once (void); \ \ @@ -2428,87 +2456,88 @@ { /* custom code follows */ /* --- protected (for fundamental type implementations) --- */ -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL GTypePlugin* g_type_get_plugin (GType type); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL GTypePlugin* g_type_interface_get_plugin (GType instance_type, GType interface_type); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL GType g_type_fundamental_next (void); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL GType g_type_fundamental (GType type_id); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL GTypeInstance* g_type_create_instance (GType type); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_type_free_instance (GTypeInstance *instance); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_type_add_class_cache_func (gpointer cache_data, GTypeClassCacheFunc cache_func); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_type_remove_class_cache_func (gpointer cache_data, GTypeClassCacheFunc cache_func); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_type_class_unref_uncached (gpointer g_class); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_type_add_interface_check (gpointer check_data, GTypeInterfaceCheckFunc check_func); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_type_remove_interface_check (gpointer check_data, GTypeInterfaceCheckFunc check_func); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL GTypeValueTable* g_type_value_table_peek (GType type); /*< private >*/ -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL gboolean g_type_check_instance (GTypeInstance *instance) G_GNUC_PURE; -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL GTypeInstance* g_type_check_instance_cast (GTypeInstance *instance, GType iface_type); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL gboolean g_type_check_instance_is_a (GTypeInstance *instance, GType iface_type) G_GNUC_PURE; -GLIB_AVAILABLE_IN_2_42 +GOBJECT_AVAILABLE_IN_2_42 gboolean g_type_check_instance_is_fundamentally_a (GTypeInstance *instance, GType fundamental_type) G_GNUC_PURE; -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL GTypeClass* g_type_check_class_cast (GTypeClass *g_class, GType is_a_type); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL gboolean g_type_check_class_is_a (GTypeClass *g_class, GType is_a_type) G_GNUC_PURE; -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL gboolean g_type_check_is_value_type (GType type) G_GNUC_CONST; -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL gboolean g_type_check_value (const GValue *value) G_GNUC_PURE; -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL gboolean g_type_check_value_holds (const GValue *value, GType type) G_GNUC_PURE; -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL gboolean g_type_test_flags (GType type, guint flags) G_GNUC_CONST; /* --- debugging functions --- */ -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL const gchar * g_type_name_from_instance (GTypeInstance *instance); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL const gchar * g_type_name_from_class (GTypeClass *g_class); /* --- implementation bits --- */ -#ifndef G_DISABLE_CAST_CHECKS +#if defined(G_DISABLE_CAST_CHECKS) || defined(__OPTIMIZE__) +# define _G_TYPE_CIC(ip, gt, ct) ((ct*) (void *) ip) +# define _G_TYPE_CCC(cp, gt, ct) ((ct*) (void *) cp) +#else # define _G_TYPE_CIC(ip, gt, ct) \ ((ct*) (void *) g_type_check_instance_cast ((GTypeInstance*) ip, gt)) # define _G_TYPE_CCC(cp, gt, ct) \ ((ct*) (void *) g_type_check_class_cast ((GTypeClass*) cp, gt)) -#else /* G_DISABLE_CAST_CHECKS */ -# define _G_TYPE_CIC(ip, gt, ct) ((ct*) ip) -# define _G_TYPE_CCC(cp, gt, ct) ((ct*) cp) -#endif /* G_DISABLE_CAST_CHECKS */ +#endif + #define _G_TYPE_CHI(ip) (g_type_check_instance ((GTypeInstance*) ip)) #define _G_TYPE_CHV(vl) (g_type_check_value ((GValue*) vl)) #define _G_TYPE_IGC(ip, gt, ct) ((ct*) (((GTypeInstance*) ip)->g_class))
View file
_service:tar_scm:glib-2.74.4.tar.xz/gobject/gtypemodule.c -> _service:tar_scm:glib-2.76.4.tar.xz/gobject/gtypemodule.c
Changed
@@ -101,7 +101,7 @@ if (module->type_infos || module->interface_infos) { - g_warning (G_STRLOC ": unsolicitated invocation of g_object_run_dispose() on GTypeModule"); + g_critical (G_STRLOC ": unsolicitated invocation of g_object_run_dispose() on GTypeModule"); g_object_ref (object); } @@ -259,9 +259,9 @@ ModuleTypeInfo *type_info = tmp_list->data; if (!type_info->loaded) { - g_warning ("plugin '%s' failed to register type '%s'", - module->name ? module->name : "(unknown)", - g_type_name (type_info->type)); + g_critical ("plugin '%s' failed to register type '%s'", + module->name ? module->name : "(unknown)", + g_type_name (type_info->type)); module->use_count--; return FALSE; } @@ -315,9 +315,8 @@ if (!g_type_module_use (module)) { - g_warning ("Fatal error - Could not reload previously loaded plugin '%s'", - module->name ? module->name : "(unknown)"); - exit (1); + g_error ("Fatal error - Could not reload previously loaded plugin '%s'", + module->name ? module->name : "(unknown)"); } } @@ -406,7 +405,7 @@ if (old_plugin != G_TYPE_PLUGIN (module)) { - g_warning ("Two different plugins tried to register '%s'.", type_name); + g_critical ("Two different plugins tried to register '%s'.", type_name); return 0; } } @@ -419,10 +418,10 @@ { const gchar *parent_type_name = g_type_name (parent_type); - g_warning ("Type '%s' recreated with different parent type." - "(was '%s', now '%s')", type_name, - g_type_name (module_type_info->parent_type), - parent_type_name ? parent_type_name : "(unknown)"); + g_critical ("Type '%s' recreated with different parent type." + "(was '%s', now '%s')", type_name, + g_type_name (module_type_info->parent_type), + parent_type_name ? parent_type_name : "(unknown)"); return 0; } @@ -488,14 +487,14 @@ if (!old_plugin) { - g_warning ("Interface '%s' for '%s' was previously registered statically or for a parent type.", - g_type_name (interface_type), g_type_name (instance_type)); + g_critical ("Interface '%s' for '%s' was previously registered statically or for a parent type.", + g_type_name (interface_type), g_type_name (instance_type)); return; } else if (old_plugin != G_TYPE_PLUGIN (module)) { - g_warning ("Two different plugins tried to register interface '%s' for '%s'.", - g_type_name (interface_type), g_type_name (instance_type)); + g_critical ("Two different plugins tried to register interface '%s' for '%s'.", + g_type_name (interface_type), g_type_name (instance_type)); return; }
View file
_service:tar_scm:glib-2.74.4.tar.xz/gobject/gtypemodule.h -> _service:tar_scm:glib-2.76.4.tar.xz/gobject/gtypemodule.h
Changed
@@ -268,31 +268,31 @@ TypeName##_private_offset = sizeof (TypeName##Private); \ } -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL GType g_type_module_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL gboolean g_type_module_use (GTypeModule *module); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_type_module_unuse (GTypeModule *module); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_type_module_set_name (GTypeModule *module, const gchar *name); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL GType g_type_module_register_type (GTypeModule *module, GType parent_type, const gchar *type_name, const GTypeInfo *type_info, GTypeFlags flags); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_type_module_add_interface (GTypeModule *module, GType instance_type, GType interface_type, const GInterfaceInfo *interface_info); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL GType g_type_module_register_enum (GTypeModule *module, const gchar *name, const GEnumValue *const_static_values); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL GType g_type_module_register_flags (GTypeModule *module, const gchar *name, const GFlagsValue *const_static_values);
View file
_service:tar_scm:glib-2.74.4.tar.xz/gobject/gtypeplugin.h -> _service:tar_scm:glib-2.76.4.tar.xz/gobject/gtypeplugin.h
Changed
@@ -114,18 +114,18 @@ /* --- prototypes --- */ -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL GType g_type_plugin_get_type (void) G_GNUC_CONST; -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_type_plugin_use (GTypePlugin *plugin); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_type_plugin_unuse (GTypePlugin *plugin); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_type_plugin_complete_type_info (GTypePlugin *plugin, GType g_type, GTypeInfo *info, GTypeValueTable *value_table); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_type_plugin_complete_interface_info (GTypePlugin *plugin, GType instance_type, GType interface_type,
View file
_service:tar_scm:glib-2.74.4.tar.xz/gobject/gvalue.c -> _service:tar_scm:glib-2.76.4.tar.xz/gobject/gvalue.c
Changed
@@ -141,7 +141,7 @@ * g_value_set_boxed (value, mystruct); * // ... your code .... * g_value_unset (value); - * g_value_free (value); + * g_free (value); * } * | */ @@ -211,15 +211,15 @@ value_table->value_init (value); } else if (G_VALUE_TYPE (value)) - g_warning ("%s: cannot initialize GValue with type '%s', the value has already been initialized as '%s'", - G_STRLOC, - g_type_name (g_type), - g_type_name (G_VALUE_TYPE (value))); + g_critical ("%s: cannot initialize GValue with type '%s', the value has already been initialized as '%s'", + G_STRLOC, + g_type_name (g_type), + g_type_name (G_VALUE_TYPE (value))); else /* !G_TYPE_IS_VALUE (g_type) */ - g_warning ("%s: cannot initialize GValue with type '%s', %s", - G_STRLOC, - g_type_name (g_type), - value_table ? "this type is abstract with regards to GValue use, use a more specific (derived) type" : "this type has no GTypeValueTable implementation"); + g_critical ("%s: cannot initialize GValue with type '%s', %s", + G_STRLOC, + g_type_name (g_type), + value_table ? "this type is abstract with regards to GValue use, use a more specific (derived) type" : "this type has no GTypeValueTable implementation"); return value; } @@ -407,7 +407,7 @@ error_msg = value_table->collect_value (value, 1, &cvalue, 0); if (error_msg) { - g_warning ("%s: %s", G_STRLOC, error_msg); + g_critical ("%s: %s", G_STRLOC, error_msg); g_free (error_msg); /* we purposely leak the value here, it might not be @@ -471,7 +471,7 @@ error_msg = value_table->collect_value (value, 1, &cvalue, 0); if (error_msg) { - g_warning ("%s: %s", G_STRLOC, error_msg); + g_critical ("%s: %s", G_STRLOC, error_msg); g_free (error_msg); /* we purposely leak the value here, it might not be
View file
_service:tar_scm:glib-2.74.4.tar.xz/gobject/gvalue.h -> _service:tar_scm:glib-2.76.4.tar.xz/gobject/gvalue.h
Changed
@@ -131,42 +131,42 @@ /* --- prototypes --- */ -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL GValue* g_value_init (GValue *value, GType g_type); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_value_copy (const GValue *src_value, GValue *dest_value); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL GValue* g_value_reset (GValue *value); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_value_unset (GValue *value); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_value_set_instance (GValue *value, gpointer instance); -GLIB_AVAILABLE_IN_2_42 +GOBJECT_AVAILABLE_IN_2_42 void g_value_init_from_instance (GValue *value, gpointer instance); /* --- private --- */ -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL gboolean g_value_fits_pointer (const GValue *value); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL gpointer g_value_peek_pointer (const GValue *value); /* --- implementation details --- */ -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL gboolean g_value_type_compatible (GType src_type, GType dest_type); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL gboolean g_value_type_transformable (GType src_type, GType dest_type); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL gboolean g_value_transform (const GValue *src_value, GValue *dest_value); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_value_register_transform_func (GType src_type, GType dest_type, GValueTransform transform_func); @@ -189,7 +189,7 @@ * * Since: 2.66 */ -#define G_VALUE_INTERNED_STRING (1 << 28) GLIB_AVAILABLE_MACRO_IN_2_66 +#define G_VALUE_INTERNED_STRING (1 << 28) GOBJECT_AVAILABLE_MACRO_IN_2_66 /** * G_VALUE_INIT:
View file
_service:tar_scm:glib-2.74.4.tar.xz/gobject/gvaluearray.h -> _service:tar_scm:glib-2.76.4.tar.xz/gobject/gvaluearray.h
Changed
@@ -37,7 +37,7 @@ * * Deprecated: 2.32: Use #GArray instead of #GValueArray */ -#define G_TYPE_VALUE_ARRAY (g_value_array_get_type ()) GLIB_DEPRECATED_MACRO_IN_2_32_FOR(G_TYPE_ARRAY) +#define G_TYPE_VALUE_ARRAY (g_value_array_get_type ()) GOBJECT_DEPRECATED_MACRO_IN_2_32_FOR(G_TYPE_ARRAY) /* --- typedefs & structs --- */ typedef struct _GValueArray GValueArray; @@ -58,44 +58,44 @@ }; /* --- prototypes --- */ -GLIB_DEPRECATED_IN_2_32_FOR(GArray) +GOBJECT_DEPRECATED_IN_2_32_FOR(GArray) GType g_value_array_get_type (void) G_GNUC_CONST; -GLIB_DEPRECATED_IN_2_32_FOR(GArray) +GOBJECT_DEPRECATED_IN_2_32_FOR(GArray) GValue* g_value_array_get_nth (GValueArray *value_array, guint index_); -GLIB_DEPRECATED_IN_2_32_FOR(GArray) +GOBJECT_DEPRECATED_IN_2_32_FOR(GArray) GValueArray* g_value_array_new (guint n_prealloced); -GLIB_DEPRECATED_IN_2_32_FOR(GArray) +GOBJECT_DEPRECATED_IN_2_32_FOR(GArray) void g_value_array_free (GValueArray *value_array); -GLIB_DEPRECATED_IN_2_32_FOR(GArray) +GOBJECT_DEPRECATED_IN_2_32_FOR(GArray) GValueArray* g_value_array_copy (const GValueArray *value_array); -GLIB_DEPRECATED_IN_2_32_FOR(GArray) +GOBJECT_DEPRECATED_IN_2_32_FOR(GArray) GValueArray* g_value_array_prepend (GValueArray *value_array, const GValue *value); -GLIB_DEPRECATED_IN_2_32_FOR(GArray) +GOBJECT_DEPRECATED_IN_2_32_FOR(GArray) GValueArray* g_value_array_append (GValueArray *value_array, const GValue *value); -GLIB_DEPRECATED_IN_2_32_FOR(GArray) +GOBJECT_DEPRECATED_IN_2_32_FOR(GArray) GValueArray* g_value_array_insert (GValueArray *value_array, guint index_, const GValue *value); -GLIB_DEPRECATED_IN_2_32_FOR(GArray) +GOBJECT_DEPRECATED_IN_2_32_FOR(GArray) GValueArray* g_value_array_remove (GValueArray *value_array, guint index_); -GLIB_DEPRECATED_IN_2_32_FOR(GArray) +GOBJECT_DEPRECATED_IN_2_32_FOR(GArray) GValueArray* g_value_array_sort (GValueArray *value_array, GCompareFunc compare_func); -GLIB_DEPRECATED_IN_2_32_FOR(GArray) +GOBJECT_DEPRECATED_IN_2_32_FOR(GArray) GValueArray* g_value_array_sort_with_data (GValueArray *value_array, GCompareDataFunc compare_func, gpointer user_data);
View file
_service:tar_scm:glib-2.74.4.tar.xz/gobject/gvaluetypes.c -> _service:tar_scm:glib-2.76.4.tar.xz/gobject/gvaluetypes.c
Changed
@@ -1108,7 +1108,7 @@ /** * g_value_take_string: * @value: a valid #GValue of type %G_TYPE_STRING - * @v_string: (nullable): string to take ownership of + * @v_string: (nullable) (transfer full): string to take ownership of * * Sets the contents of a %G_TYPE_STRING #GValue to @v_string. * @@ -1133,7 +1133,7 @@ * * Get the contents of a %G_TYPE_STRING #GValue. * - * Returns: string content of @value + * Returns: (nullable) (transfer none): string content of @value */ const gchar* g_value_get_string (const GValue *value) @@ -1149,7 +1149,7 @@ * * Get a copy the contents of a %G_TYPE_STRING #GValue. * - * Returns: a newly allocated copy of the string content of @value + * Returns: (nullable) (transfer full): a newly allocated copy of the string content of @value */ gchar* g_value_dup_string (const GValue *value)
View file
_service:tar_scm:glib-2.74.4.tar.xz/gobject/gvaluetypes.h -> _service:tar_scm:glib-2.76.4.tar.xz/gobject/gvaluetypes.h
Changed
@@ -150,7 +150,7 @@ * * Since: 2.66 */ -#define G_VALUE_IS_INTERNED_STRING(value) (G_VALUE_HOLDS_STRING (value) && ((value)->data1.v_uint & G_VALUE_INTERNED_STRING)) GLIB_AVAILABLE_MACRO_IN_2_66 +#define G_VALUE_IS_INTERNED_STRING(value) (G_VALUE_HOLDS_STRING (value) && ((value)->data1.v_uint & G_VALUE_INTERNED_STRING)) GOBJECT_AVAILABLE_MACRO_IN_2_66 /** * G_VALUE_HOLDS_POINTER: * @value: a valid #GValue structure @@ -190,116 +190,116 @@ /* --- prototypes --- */ -GLIB_DEPRECATED_IN_2_32_FOR(g_value_set_schar) +GOBJECT_DEPRECATED_IN_2_32_FOR(g_value_set_schar) void g_value_set_char (GValue *value, gchar v_char); -GLIB_DEPRECATED_IN_2_32_FOR(g_value_get_schar) +GOBJECT_DEPRECATED_IN_2_32_FOR(g_value_get_schar) gchar g_value_get_char (const GValue *value); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_value_set_schar (GValue *value, gint8 v_char); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL gint8 g_value_get_schar (const GValue *value); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_value_set_uchar (GValue *value, guchar v_uchar); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL guchar g_value_get_uchar (const GValue *value); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_value_set_boolean (GValue *value, gboolean v_boolean); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL gboolean g_value_get_boolean (const GValue *value); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_value_set_int (GValue *value, gint v_int); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL gint g_value_get_int (const GValue *value); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_value_set_uint (GValue *value, guint v_uint); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL guint g_value_get_uint (const GValue *value); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_value_set_long (GValue *value, glong v_long); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL glong g_value_get_long (const GValue *value); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_value_set_ulong (GValue *value, gulong v_ulong); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL gulong g_value_get_ulong (const GValue *value); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_value_set_int64 (GValue *value, gint64 v_int64); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL gint64 g_value_get_int64 (const GValue *value); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_value_set_uint64 (GValue *value, guint64 v_uint64); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL guint64 g_value_get_uint64 (const GValue *value); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_value_set_float (GValue *value, gfloat v_float); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL gfloat g_value_get_float (const GValue *value); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_value_set_double (GValue *value, gdouble v_double); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL gdouble g_value_get_double (const GValue *value); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_value_set_string (GValue *value, const gchar *v_string); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_value_set_static_string (GValue *value, const gchar *v_string); -GLIB_AVAILABLE_IN_2_66 +GOBJECT_AVAILABLE_IN_2_66 void g_value_set_interned_string (GValue *value, const gchar *v_string); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL const gchar * g_value_get_string (const GValue *value); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL gchar* g_value_dup_string (const GValue *value); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_value_set_pointer (GValue *value, gpointer v_pointer); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL gpointer g_value_get_pointer (const GValue *value); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL GType g_gtype_get_type (void); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_value_set_gtype (GValue *value, GType v_gtype); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL GType g_value_get_gtype (const GValue *value); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_value_set_variant (GValue *value, GVariant *variant); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_value_take_variant (GValue *value, GVariant *variant); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL GVariant* g_value_get_variant (const GValue *value); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL GVariant* g_value_dup_variant (const GValue *value); /* Convenience for registering new pointer types */ -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL GType g_pointer_type_register_static (const gchar *name); /* debugging aid, describe value contents as string */ -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL gchar* g_strdup_value_contents (const GValue *value); -GLIB_AVAILABLE_IN_ALL +GOBJECT_AVAILABLE_IN_ALL void g_value_take_string (GValue *value, gchar *v_string); -GLIB_DEPRECATED_FOR(g_value_take_string) +GOBJECT_DEPRECATED_FOR(g_value_take_string) void g_value_set_string_take_ownership (GValue *value, gchar *v_string);
View file
_service:tar_scm:glib-2.74.4.tar.xz/gobject/meson.build -> _service:tar_scm:glib-2.76.4.tar.xz/gobject/meson.build
Changed
@@ -1,3 +1,5 @@ +gobject_includedir = glib_includedir / 'gobject' + gobject_install_headers = files( 'gobject-autocleanups.h', 'glib-types.h', @@ -22,9 +24,22 @@ 'gvaluetypes.h', 'gobjectnotifyqueue.c', # sic ) -install_headers(gobject_install_headers, subdir : 'glib-2.0/gobject') -gobject_sources = files( +gobject_sources = + +gobject_visibility_h = custom_target( + output: 'gobject-visibility.h', + command: gen_visibility_macros, meson.project_version(), 'visibility-macros', 'GOBJECT', '@OUTPUT@', + install: true, + install_dir: gobject_includedir, + # FIXME: Not needed with Meson >= 0.64.0 + install_tag: 'devel', +) +gobject_sources += gobject_visibility_h + +install_headers(gobject_install_headers, install_dir : gobject_includedir) + +gobject_sources += files( 'gatomicarray.c', 'gbinding.c', 'gbindinggroup.c', @@ -47,7 +62,7 @@ 'gvaluetypes.c', ) -if host_system == 'windows' and get_option('default_library') == 'shared' +if host_system == 'windows' and glib_build_shared gobject_win_rc = configure_file( input: 'gobject.rc.in', output: 'gobject.rc', @@ -107,6 +122,7 @@ input : glib_enumtypes_input_headers, install : true, install_dir : join_paths(get_option('includedir'), 'glib-2.0/gobject'), + install_tag: 'devel', command : python, glib_mkenums, '--template', files('glib-enumtypes.h.template'), '@INPUT@') @@ -120,8 +136,6 @@ '--template', files('glib-enumtypes.c.template'), '@INPUT@') -glib_enumtypes_dep = declare_dependency(sources : glib_enumtypes_h) - # Expose as variable to be used by gobject-introspection # when it includes GLib as a subproject glib_types_h = files('glib-types.h') @@ -135,7 +149,8 @@ install : true, include_directories : configinc, dependencies : libffi_dep, libglib_dep, - c_args : '-DG_LOG_DOMAIN="GLib-GObject"', '-DGOBJECT_COMPILATION' + glib_hidden_visibility_args, + c_args : '-DG_LOG_DOMAIN="GLib-GObject"', '-DGOBJECT_COMPILATION', + gnu_symbol_visibility : 'hidden', link_args : glib_link_flags, ) @@ -150,10 +165,12 @@ libgobject_dep = declare_dependency(link_with : libgobject, include_directories : gobjectinc, - dependencies : libglib_dep, glib_enumtypes_dep) + sources : gobject_visibility_h, glib_enumtypes_h, + dependencies : libglib_dep, +) meson.override_dependency('gobject-2.0', libgobject_dep) -executable('gobject-query', 'gobject-query.c', +gobject_query = executable('gobject-query', 'gobject-query.c', install : true, install_tag : 'bin-devel', dependencies : libglib_dep, libgobject_dep)
View file
_service:tar_scm:glib-2.74.4.tar.xz/gobject/tests/autoptr.c -> _service:tar_scm:glib-2.76.4.tar.xz/gobject/tests/autoptr.c
Changed
@@ -2,6 +2,8 @@ * Copyright (C) 2018 Canonical Ltd * Authors: Marco Trevisan <marco@ubuntu.com> * + * SPDX-License-Identifier: LicenseRef-old-glib-tests + * * This work is provided "as is"; redistribution and modification * in whole or in part, in any medium, physical or electronic is * permitted without restriction.
View file
_service:tar_scm:glib-2.74.4.tar.xz/gobject/tests/binding.c -> _service:tar_scm:glib-2.76.4.tar.xz/gobject/tests/binding.c
Changed
@@ -843,7 +843,7 @@ G_BINDING_DEFAULT); g_object_add_weak_pointer (G_OBJECT (binding), (gpointer *) &binding); - g_test_expect_message ("GLib-GObject", G_LOG_LEVEL_WARNING, + g_test_expect_message ("GLib-GObject", G_LOG_LEVEL_CRITICAL, "*Unable to convert*double*boolean*"); g_object_set (source, "double-value", 1.0, NULL); g_test_assert_expected_messages ();
View file
_service:tar_scm:glib-2.74.4.tar.xz/gobject/tests/closure-refcount.c -> _service:tar_scm:glib-2.76.4.tar.xz/gobject/tests/closure-refcount.c
Changed
@@ -1,5 +1,7 @@ /* Copyright (C) 2005 Imendio AB * + * SPDX-License-Identifier: LicenseRef-old-glib-tests + * * This software is provided "as is"; redistribution and modification * is permitted, provided that the following disclaimer is retained. *
View file
_service:tar_scm:glib-2.74.4.tar.xz/gobject/tests/custom-dispatch.c -> _service:tar_scm:glib-2.76.4.tar.xz/gobject/tests/custom-dispatch.c
Changed
@@ -1,7 +1,7 @@ /* custom-dispatch.c: Test GObjectClass.dispatch_properties_changed * Copyright (C) 2022 Red Hat, Inc. * - * SPDX-License-Identifier: LGPL-2.1-or-later + * SPDX-License-Identifier: LicenseRef-old-glib-tests * * This work is provided "as is"; redistribution and modification * in whole or in part, in any medium, physical or electronic is
View file
_service:tar_scm:glib-2.74.4.tar.xz/gobject/tests/dynamictests.c -> _service:tar_scm:glib-2.76.4.tar.xz/gobject/tests/dynamictests.c
Changed
@@ -2,6 +2,8 @@ * Copyright (C) 2008 Imendio AB * Authors: Tim Janik * + * SPDX-License-Identifier: LicenseRef-old-glib-tests + * * This work is provided "as is"; redistribution and modification * in whole or in part, in any medium, physical or electronic is * permitted without restriction.
View file
_service:tar_scm:glib-2.74.4.tar.xz/gobject/tests/genmarshal.py -> _service:tar_scm:glib-2.76.4.tar.xz/gobject/tests/genmarshal.py
Changed
@@ -497,7 +497,7 @@ gpointer arg0; va_list args_copy; - G_VA_COPY (args_copy, args); + va_copy (args_copy, args); arg0 = (gpointer) va_arg (args_copy, gpointer); if ((param_types0 & G_SIGNAL_TYPE_STATIC_SCOPE) == 0 && arg0 != NULL) arg0 = g_variant_ref_sink (arg0); @@ -639,7 +639,7 @@ gpointer arg0; va_list args_copy; - G_VA_COPY (args_copy, args); + va_copy (args_copy, args); arg0 = (gpointer) va_arg (args_copy, gpointer); if ((param_types0 & G_SIGNAL_TYPE_STATIC_SCOPE) == 0 && arg0 != NULL) arg0 = g_strdup (arg0); @@ -782,7 +782,7 @@ gpointer arg0; va_list args_copy; - G_VA_COPY (args_copy, args); + va_copy (args_copy, args); arg0 = (gpointer) va_arg (args_copy, gpointer); if ((param_types0 & G_SIGNAL_TYPE_STATIC_SCOPE) == 0 && arg0 != NULL) arg0 = g_param_spec_ref (arg0);
View file
_service:tar_scm:glib-2.74.4.tar.xz/gobject/tests/gobject-query.py -> _service:tar_scm:glib-2.76.4.tar.xz/gobject/tests/gobject-query.py
Changed
@@ -24,7 +24,6 @@ import os import shutil import subprocess -import sys import unittest import taptestrunner @@ -70,7 +69,7 @@ stderr=subprocess.PIPE, env=env, text=True, - encoding='utf-8', + encoding="utf-8", ) info.check_returncode() out = info.stdout.strip()
View file
_service:tar_scm:glib-2.76.4.tar.xz/gobject/tests/max-version.c
Added
@@ -0,0 +1,48 @@ +/* + * Copyright 2022 Collabora Ltd. + * SPDX-License-Identifier: LGPL-2.1-or-later + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General + * Public License along with this library; if not, see + * <http://www.gnu.org/licenses/>. + */ + +#ifndef GLIB_VERSION_MAX_ALLOWED +/* This is the oldest version macro available */ +#define GLIB_VERSION_MIN_REQUIRED GLIB_VERSION_2_26 +#define GLIB_VERSION_MAX_ALLOWED GLIB_VERSION_2_26 +#endif + +#include <glib.h> + +/* All the headers that can validly be included in third-party code */ +#include <glib-object.h> +#include <gobject/gvaluecollector.h> + +static void +nothing (void) +{ + /* This doesn't really do anything: the real "test" is at compile time. + * Just make sure the GObject library gets linked. */ + g_debug ("Loaded %s", g_type_name (G_TYPE_OBJECT)); +} + +int +main (int argc, + char *argv) +{ + g_test_init (&argc, &argv, NULL); + + g_test_add_func ("/max-version/tested-at-compile-time", nothing); + return g_test_run (); +}
View file
_service:tar_scm:glib-2.74.4.tar.xz/gobject/tests/meson.build -> _service:tar_scm:glib-2.76.4.tar.xz/gobject/tests/meson.build
Changed
@@ -41,12 +41,13 @@ 'defaultiface' : { 'source' : 'defaultiface.c', 'testmodule.c', }, - 'deftype' : {}, + 'deftype' : { 'protocol': 'exitcode' }, 'deprecated-properties' : {}, 'dynamictype' : { 'source' : 'dynamictype.c', 'testmodule.c', }, 'enums' : {}, + 'max-version' : {'install': false}, 'override' : {}, 'param' : {}, 'references' : {}, @@ -75,7 +76,13 @@ 'signalgroup' : {}, 'testing' : {}, 'type-flags' : {}, - 'objects-refcount1' : {}, + 'objects-refcount1' : { + 'c_args': cc.get_supported_arguments( + '-DG_DISABLE_CAST_CHECKS', + '-Werror', + '-Wcast-align=strict', + ), + }, 'objects-refcount2' : {'suite' : 'slow'}, 'properties-refcount1' : {}, 'properties-refcount2' : {'suite' : 'slow'}, @@ -102,6 +109,7 @@ if have_cxx gobject_tests += { 'cxx' : { + 'protocol': 'exitcode', 'source' : 'cxx.cpp', 'suite' : 'cpp', }, @@ -110,6 +118,7 @@ foreach std, arg: cxx_standards gobject_tests += { 'cxx-@0@'.format(std) : { + 'protocol': 'exitcode', 'source' : 'cxx.cpp', 'suite' : 'cpp', 'cpp_args' : arg, @@ -122,18 +131,18 @@ gobject_tests += {'autoptr' : {}} endif -python_tests = - 'genmarshal.py', - 'gobject-query.py', - 'mkenums.py', - +python_tests = { + 'genmarshal.py' : {}, + 'gobject-query.py' : { + 'depends' : gobject_query, + 'can_fail' : host_system == 'windows', + }, + 'mkenums.py' : {}, +} -# FIXME: put common bits of test environment() in one location test_env = environment() test_env.set('G_TEST_SRCDIR', meson.current_source_dir()) test_env.set('G_TEST_BUILDDIR', meson.current_build_dir()) -test_env.set('G_DEBUG', 'gc-friendly') -test_env.set('MALLOC_CHECK_', '2') test_deps = libm, thread_dep, libglib_dep, libgobject_dep test_cargs = '-DG_LOG_DOMAIN="GLib-GObject"', '-UG_DISABLE_ASSERT' @@ -169,22 +178,41 @@ suite = 'gobject' + extra_args.get('suite', ) timeout = suite.contains('slow') ? test_timeout_slow : test_timeout + if extra_args.get('can_fail', false) + suite += 'failing' + endif + # FIXME: https://gitlab.gnome.org/GNOME/glib/issues/1316 # aka https://bugs.debian.org/880883 if test_name == 'closure-refcount' and 'arm', 'aarch64'.contains(host_machine.cpu_family()) timeout = timeout * 10 endif - test(test_name, exe, env : test_env, timeout : timeout, suite : suite) + test(test_name, + exe, + protocol : extra_args.get('protocol', test_protocol), + env : test_env, + timeout : timeout, + suite : suite, + ) endforeach -foreach test_name : python_tests +foreach test_name, extra_args : python_tests + depends = extra_args.get('depends', ) + suite = 'gobject', 'no-valgrind' + + if extra_args.get('can_fail', false) + suite += 'failing' + endif + test( test_name, python, + protocol : extra_args.get('protocol', test_protocol), + depends: depends, args: '-B', files(test_name), env: test_env, - suite: 'gobject', 'no-valgrind', + suite: suite, ) if installed_tests_enabled
View file
_service:tar_scm:glib-2.74.4.tar.xz/gobject/tests/mkenums.py -> _service:tar_scm:glib-2.76.4.tar.xz/gobject/tests/mkenums.py
Changed
@@ -649,7 +649,7 @@ "ENUM", "ENUM_VALUE_PUBLIC2", "public2", - "0", + "1", ) def test_available_in(self): @@ -730,6 +730,35 @@ "4", ) + def test_enum_symbolic_expression(self): + """Test use of symbol in value expression.""" + h_contents = """ + typedef enum { + /*< private >*/ + ENUM_VALUE_PRIVATE = 5, + /*< public >*/ + ENUM_VALUE_PUBLIC = ENUM_VALUE_PRIVATE + 2, + } TestSymbolicEnum; + """ + + result = self.runMkenumsWithHeader(h_contents) + self.assertEqual("", result.err) + self.assertSingleEnum( + result, + "TestSymbolicEnum", + "test_symbolic_enum", + "TEST_SYMBOLIC_ENUM", + "SYMBOLIC_ENUM", + "TEST", + "", + "enum", + "Enum", + "ENUM", + "ENUM_VALUE_PUBLIC", + "public", + "7", + ) + class TestRspMkenums(TestMkenums): """Run all tests again in @rspfile mode"""
View file
_service:tar_scm:glib-2.74.4.tar.xz/gobject/tests/notify-init.c -> _service:tar_scm:glib-2.76.4.tar.xz/gobject/tests/notify-init.c
Changed
@@ -1,6 +1,8 @@ /* GLib testing framework examples and tests * Copyright (C) 2022 Red Hat, Inc. * + * SPDX-License-Identifier: LicenseRef-old-glib-tests + * * This work is provided "as is"; redistribution and modification * in whole or in part, in any medium, physical or electronic is * permitted without restriction.
View file
_service:tar_scm:glib-2.74.4.tar.xz/gobject/tests/notify-init2.c -> _service:tar_scm:glib-2.76.4.tar.xz/gobject/tests/notify-init2.c
Changed
@@ -1,6 +1,8 @@ /* GLib testing framework examples and tests * Copyright (C) 2022 Red Hat, Inc. * + * SPDX-License-Identifier: LicenseRef-old-glib-tests + * * This work is provided "as is"; redistribution and modification * in whole or in part, in any medium, physical or electronic is * permitted without restriction.
View file
_service:tar_scm:glib-2.74.4.tar.xz/gobject/tests/objects-refcount1.c -> _service:tar_scm:glib-2.76.4.tar.xz/gobject/tests/objects-refcount1.c
Changed
@@ -15,10 +15,27 @@ typedef struct _GTest GTest; typedef struct _GTestClass GTestClass; +#if G_GNUC_CHECK_VERSION (4, 0) +/* Increase the alignment of GTest to check whether + * G_TYPE_CHECK_INSTANCE_CAST() would trigger a "-Wcast-align=strict" warning. + * That would happen, when trying to cast a "GObject*" to "GTest*", if latter + * has larger alignment. + * + * Note that merely adding a int64 field to GTest does not increase the + * alignment above 4 bytes on i386, hence use the __attribute__((__aligned__())). + */ +#define _GTest_increase_alignment __attribute__((__aligned__(__alignof(gint64)))) +#else +#define _GTest_increase_alignment +#endif + struct _GTest { GObject object; -}; + + /* See _GTest_increase_alignment. */ + long double increase_alignment2; +} _GTest_increase_alignment; struct _GTestClass {
View file
_service:tar_scm:glib-2.74.4.tar.xz/gobject/tests/performance/meson.build -> _service:tar_scm:glib-2.76.4.tar.xz/gobject/tests/performance/meson.build
Changed
@@ -3,12 +3,9 @@ 'performance-threaded' : { 'args' : '--seconds', '0' }, } -# FIXME: put common bits of test environment() in one location test_env = environment() test_env.set('G_TEST_SRCDIR', meson.current_source_dir()) test_env.set('G_TEST_BUILDDIR', meson.current_build_dir()) -test_env.set('G_DEBUG', 'gc-friendly') -test_env.set('MALLOC_CHECK_', '2') test_deps = libm, thread_dep, libglib_dep, libgobject_dep test_cargs = '-DG_LOG_DOMAIN="GLib-GObject"', '-UG_DISABLE_ASSERT' @@ -39,10 +36,14 @@ install: install, ) - suite = 'gobject', 'performance' + extra_args.get('suite', ) + suite = 'gobject', 'performance', 'no-valgrind' + extra_args.get('suite', ) timeout = suite.contains('slow') ? test_timeout_slow : test_timeout args = extra_args.get('args', ) + if extra_args.get('can_fail', false) + suite += 'failing' + endif + test(test_name, exe, env : test_env, timeout : timeout,
View file
_service:tar_scm:glib-2.74.4.tar.xz/gobject/tests/performance/performance.c -> _service:tar_scm:glib-2.76.4.tar.xz/gobject/tests/performance/performance.c
Changed
@@ -1,5 +1,6 @@ /* GObject - GLib Type, Object, Parameter and Signal Library * Copyright (C) 2009 Red Hat, Inc. + * Copyright (C) 2022 Canonical Ltd. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -907,6 +908,297 @@ } /************************************************************* + * Test object notify performance (common code) + *************************************************************/ + +#define NUM_NOTIFY_PER_ROUND 10000 + +struct NotifyTest { + GObject *object; + unsigned n_checks; +}; + +static void +test_notify_run (PerformanceTest *test, + void *_data) +{ + struct NotifyTest *data = _data; + GObject *object = data->object; + + for (unsigned i = 0; i < data->n_checks; i++) + g_object_notify (object, "val1"); +} + +static void +test_notify_by_pspec_run (PerformanceTest *test, + void *_data) +{ + struct NotifyTest *data = _data; + GObject *object = data->object; + + for (unsigned i = 0; i < data->n_checks; i++) + g_object_notify_by_pspec (object, pspecsPROP_VAL1); +} + +/************************************************************* + * Test notify unhandled performance + *************************************************************/ + +static void * +test_notify_unhandled_setup (PerformanceTest *test) +{ + struct NotifyTest *data; + + data = g_new0 (struct NotifyTest, 1); + data->object = g_object_new (COMPLEX_TYPE_OBJECT, NULL); + return data; +} + +static void +test_notify_unhandled_init (PerformanceTest *test, + void *_data, + double factor) +{ + struct NotifyTest *data = _data; + + data->n_checks = factor * NUM_NOTIFY_PER_ROUND; +} + +static void +test_notify_unhandled_finish (PerformanceTest *test, + void *data) +{ +} + +static void +test_notify_unhandled_print_result (PerformanceTest *test, + void *_data, + double time) +{ + struct NotifyTest *data = _data; + + g_print ("Notify (unhandled) per second: %.0f\n", + data->n_checks / time); +} + +static void +test_notify_unhandled_teardown (PerformanceTest *test, + void *_data) +{ + struct NotifyTest *data = _data; + + g_object_unref (data->object); + g_free (data); +} + +/************************************************************* + * Test notify handled performance + *************************************************************/ + +static void +test_notify_handled_handler (ComplexObject *obj, GParamSpec *pspec, void *data) +{ +} + +static void * +test_notify_handled_setup (PerformanceTest *test) +{ + struct NotifyTest *data; + + data = g_new0 (struct NotifyTest, 1); + data->object = g_object_new (COMPLEX_TYPE_OBJECT, NULL); + + g_signal_connect (data->object, "notify::val1", + G_CALLBACK (test_notify_handled_handler), data); + g_signal_connect (data->object, "notify::val2", + G_CALLBACK (test_notify_handled_handler), data); + + return data; +} + +static void +test_notify_handled_init (PerformanceTest *test, + void *_data, + double factor) +{ + struct NotifyTest *data = _data; + + data->n_checks = factor * NUM_NOTIFY_PER_ROUND; +} + +static void +test_notify_handled_finish (PerformanceTest *test, + void *data) +{ +} + +static void +test_notify_handled_print_result (PerformanceTest *test, + void *_data, + double time) +{ + struct NotifyTest *data = _data; + + g_print ("Notify per second: %.0f\n", + data->n_checks / time); +} + +static void +test_notify_handled_teardown (PerformanceTest *test, + void *_data) +{ + struct NotifyTest *data = _data; + + g_assert_cmpuint ( + g_signal_handlers_disconnect_by_func (data->object, + test_notify_handled_handler, + data), ==, 2); + g_object_unref (data->object); + g_free (data); +} + +/************************************************************* + * Test object set performance + *************************************************************/ + +#define NUM_SET_PER_ROUND 10000 + +struct SetTest { + GObject *object; + unsigned n_checks; +}; + +static void +test_set_run (PerformanceTest *test, + void *_data) +{ + struct SetTest *data = _data; + GObject *object = data->object; + + for (unsigned i = 0; i < data->n_checks; i++) + g_object_set (object, "val1", i, NULL); +} + +static void * +test_set_setup (PerformanceTest *test) +{ + struct SetTest *data; + + data = g_new0 (struct SetTest, 1); + data->object = g_object_new (COMPLEX_TYPE_OBJECT, NULL); + + return data; +} + +static void +test_set_init (PerformanceTest *test, + void *_data, + double factor) +{ + struct SetTest *data = _data; + + data->n_checks = factor * NUM_SET_PER_ROUND; +} + +static void +test_set_finish (PerformanceTest *test, + void *data) +{ +} + +static void +test_set_print_result (PerformanceTest *test, + void *_data, + double time) +{ + struct SetTest *data = _data; + + g_print ("Property set per second: %.0f\n", + data->n_checks / time); +} + +static void +test_set_teardown (PerformanceTest *test, + void *_data) +{ + struct SetTest *data = _data; + + g_object_unref (data->object); + g_free (data); +} + +/************************************************************* + * Test object get performance + *************************************************************/ + +#define NUM_GET_PER_ROUND 10000 + +struct GetTest { + GObject *object; + unsigned n_checks; +}; + +static void +test_get_run (PerformanceTest *test, + void *_data) +{ + struct GetTest *data = _data; + GObject *object = data->object; + int val; + + for (unsigned i = 0; i < data->n_checks; i++) + g_object_get (object, "val1", &val, NULL); +} + +static void * +test_get_setup (PerformanceTest *test) +{ + struct GetTest *data; + + data = g_new0 (struct GetTest, 1); + data->object = g_object_new (COMPLEX_TYPE_OBJECT, NULL); + + return data; +} + +static void +test_get_init (PerformanceTest *test, + void *_data, + double factor) +{ + struct GetTest *data = _data; + + data->n_checks = factor * NUM_GET_PER_ROUND; +} + +static void +test_get_finish (PerformanceTest *test, + void *data) +{ +} + +static void +test_get_print_result (PerformanceTest *test, + void *_data, + double time) +{ + struct GetTest *data = _data; + + g_print ("Property get per second: %.0f\n", + data->n_checks / time); +} + +static void +test_get_teardown (PerformanceTest *test, + gpointer _data) +{ + struct GetTest *data = _data; + + g_object_unref (data->object); + g_free (data); +} + +/************************************************************* * Test object refcount performance *************************************************************/ @@ -1164,6 +1456,66 @@ test_emission_handled_print_result }, { + "notify-unhandled", + complex_object_get_type, + test_notify_unhandled_setup, + test_notify_unhandled_init, + test_notify_run, + test_notify_unhandled_finish, + test_notify_unhandled_teardown, + test_notify_unhandled_print_result + }, + { + "notify-by-pspec-unhandled", + complex_object_get_type, + test_notify_unhandled_setup, + test_notify_unhandled_init, + test_notify_by_pspec_run, + test_notify_unhandled_finish, + test_notify_unhandled_teardown, + test_notify_unhandled_print_result + }, + { + "notify-handled", + complex_object_get_type, + test_notify_handled_setup, + test_notify_handled_init, + test_notify_run, + test_notify_handled_finish, + test_notify_handled_teardown, + test_notify_handled_print_result + }, + { + "notify-by-pspec-handled", + complex_object_get_type, + test_notify_handled_setup, + test_notify_handled_init, + test_notify_by_pspec_run, + test_notify_handled_finish, + test_notify_handled_teardown, + test_notify_handled_print_result + }, + { + "property-set", + complex_object_get_type, + test_set_setup, + test_set_init, + test_set_run, + test_set_finish, + test_set_teardown, + test_set_print_result + }, + { + "property-get", + complex_object_get_type, + test_get_setup, + test_get_init, + test_get_run, + test_get_finish, + test_get_teardown, + test_get_print_result + }, + { "refcount", NULL, test_refcount_setup,
View file
_service:tar_scm:glib-2.74.4.tar.xz/gobject/tests/properties.c -> _service:tar_scm:glib-2.76.4.tar.xz/gobject/tests/properties.c
Changed
@@ -619,7 +619,7 @@ } g_test_trap_subprocess (NULL, 0, G_TEST_SUBPROCESS_DEFAULT); g_test_trap_assert_failed (); - g_test_trap_assert_stderr ("*WARNING*foo*gint*gchararray*"); + g_test_trap_assert_stderr ("*CRITICAL*foo*gint*gchararray*"); }
View file
_service:tar_scm:glib-2.74.4.tar.xz/gobject/tests/reference.c -> _service:tar_scm:glib-2.76.4.tar.xz/gobject/tests/reference.c
Changed
@@ -336,6 +336,20 @@ g_assert_cmpint (obj->ref_count, ==, 1); g_object_unref (obj); + + if (g_test_undefined ()) + { + obj = g_object_new (G_TYPE_INITIALLY_UNOWNED, NULL); + +#ifdef G_ENABLE_DEBUG + g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL, + "A floating object GInitiallyUnowned * was finalized*"); +#endif + g_object_unref (obj); +#ifdef G_ENABLE_DEBUG + g_test_assert_expected_messages (); +#endif + } } static void @@ -717,6 +731,11 @@ g_assert (is_last == c->should_be_last); + if (is_last) + g_assert_cmpint (g_atomic_int_get (&obj->ref_count), ==, 1); + else + g_assert_cmpint (g_atomic_int_get (&obj->ref_count), ==, 2); + c->count++; } @@ -765,6 +784,383 @@ g_object_remove_toggle_ref (obj, toggle_notify, &c); } +G_DECLARE_FINAL_TYPE (DisposeReffingObject, dispose_reffing_object, + DISPOSE, REFFING_OBJECT, GObject) + +typedef enum +{ + PROP_INT_PROP = 1, + N_PROPS, +} DisposeReffingObjectProperty; + +static GParamSpec *dispose_reffing_object_propertiesN_PROPS = {0}; + +struct _DisposeReffingObject +{ + GObject parent; + + GToggleNotify toggle_notify; + Count actual; + Count expected; + unsigned disposing_refs; + gboolean disposing_refs_all_normal; + + GCallback notify_handler; + unsigned notify_called; + + int int_prop; + + GWeakRef *weak_ref; +}; + +G_DEFINE_TYPE (DisposeReffingObject, dispose_reffing_object, G_TYPE_OBJECT) + +static void +on_object_notify (GObject *object, + GParamSpec *pspec, + void *data) +{ + DisposeReffingObject *obj = DISPOSE_REFFING_OBJECT (object); + + obj->notify_called++; +} + +static void +dispose_reffing_object_dispose (GObject *object) +{ + DisposeReffingObject *obj = DISPOSE_REFFING_OBJECT (object); + + g_assert_cmpint (object->ref_count, ==, 1); + g_assert_cmpint (obj->actual.count, ==, obj->expected.count); + + for (unsigned i = 0; i < obj->disposing_refs; ++i) + { + if (i == 0 && !obj->disposing_refs_all_normal) + { + g_object_add_toggle_ref (object, obj->toggle_notify, &obj->actual); + } + else + { + obj->actual.should_be_last = FALSE; + g_object_ref (obj); + g_assert_cmpint (obj->actual.count, ==, obj->expected.count); + } + + obj->actual.should_be_last = TRUE; + } + + G_OBJECT_CLASS (dispose_reffing_object_parent_class)->dispose (object); + + if (obj->notify_handler) + { + unsigned old_notify_called = obj->notify_called; + + g_assert_cmpuint (g_signal_handler_find (object, G_SIGNAL_MATCH_FUNC, + 0, 0, NULL, obj->notify_handler, NULL), ==, 0); + + g_signal_connect (object, "notify", G_CALLBACK (obj->notify_handler), NULL); + + /* This would trigger a toggle notification, but is not something we may + * want with https://gitlab.gnome.org/GNOME/glib/-/merge_requests/2377 + * so, we only test this in case we have more than one ref + */ + if (obj->toggle_notify == toggle_notify) + g_assert_cmpint (obj->disposing_refs, >, 1); + + g_object_notify (object, "int-prop"); + g_assert_cmpuint (obj->notify_called, ==, old_notify_called); + } + + g_assert_cmpint (obj->actual.count, ==, obj->expected.count); +} + +static void +dispose_reffing_object_init (DisposeReffingObject *connector) +{ +} + +static void +dispose_reffing_object_set_property (GObject *object, + guint property_id, + const GValue *value, + GParamSpec *pspec) +{ + DisposeReffingObject *obj = DISPOSE_REFFING_OBJECT (object); + + switch ((DisposeReffingObjectProperty) property_id) + { + case PROP_INT_PROP: + obj->int_prop = g_value_get_int (value); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); + break; + } +} + +static void +dispose_reffing_object_get_property (GObject *object, + guint property_id, + GValue *value, + GParamSpec *pspec) +{ + DisposeReffingObject *obj = DISPOSE_REFFING_OBJECT (object); + + switch ((DisposeReffingObjectProperty) property_id) + { + case PROP_INT_PROP: + g_value_set_int (value, obj->int_prop); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); + break; + } +} + +static void +dispose_reffing_object_class_init (DisposeReffingObjectClass *klass) +{ + GObjectClass *object_class = G_OBJECT_CLASS (klass); + + dispose_reffing_object_propertiesPROP_INT_PROP = + g_param_spec_int ("int-prop", "int-prop", "int-prop", + G_MININT, G_MAXINT, + 0, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); + + object_class->dispose = dispose_reffing_object_dispose; + object_class->set_property = dispose_reffing_object_set_property; + object_class->get_property = dispose_reffing_object_get_property; + + g_object_class_install_properties (object_class, N_PROPS, + dispose_reffing_object_properties); +} + +static void +test_toggle_ref_on_dispose (void) +{ + DisposeReffingObject *obj; + gpointer disposed_checker = &obj; + + /* This tests wants to ensure that an object that gets re-referenced + * (one or multiple times) during its dispose virtual function: + * - Notifies all the queued "notify" signal handlers + * - Notifies toggle notifications if any + * - It does not get finalized + */ + + obj = g_object_new (dispose_reffing_object_get_type (), NULL); + obj->toggle_notify = toggle_notify; + obj->notify_handler = G_CALLBACK (on_object_notify); + g_object_add_weak_pointer (G_OBJECT (obj), &disposed_checker); + + /* Convert to toggle notification */ + g_object_add_toggle_ref (G_OBJECT (obj), obj->toggle_notify, &obj->actual); + g_assert_cmpint (obj->actual.count, ==, 0); + + obj->actual.should_be_last = TRUE; + obj->notify_handler = G_CALLBACK (on_object_notify); + g_object_unref (obj); + g_assert_cmpint (obj->actual.count, ==, 1); + g_assert_cmpuint (obj->notify_called, ==, 0); + + /* Remove the toggle reference, making it to dispose and resurrect again */ + obj->disposing_refs = 1; + obj->expected.count = 1; + obj->notify_handler = NULL; /* FIXME: enable it when !2377 is in */ + g_object_remove_toggle_ref (G_OBJECT (obj), obj->toggle_notify, NULL); + g_assert_cmpint (obj->actual.count, ==, 2); + g_assert_cmpuint (obj->notify_called, ==, 0); + + g_assert_null (disposed_checker); + g_assert_cmpint (g_atomic_int_get (&G_OBJECT (obj)->ref_count), ==, + obj->disposing_refs); + + /* Object has been disposed, but is still alive, so add another weak pointer */ + disposed_checker = &obj; + g_object_add_weak_pointer (G_OBJECT (obj), &disposed_checker); + + /* Remove the toggle reference, making it to dispose and resurrect with + * more references than before, so that no toggle notify is called + */ + obj->disposing_refs = 3; + obj->expected.count = 2; + obj->notify_handler = G_CALLBACK (on_object_notify); + g_object_remove_toggle_ref (G_OBJECT (obj), obj->toggle_notify, NULL); + g_assert_cmpint (obj->actual.count, ==, 2); + g_assert_cmpint (obj->notify_called, ==, 1); + obj->expected.count = obj->actual.count; + + g_assert_null (disposed_checker); + g_assert_cmpint (g_atomic_int_get (&G_OBJECT (obj)->ref_count), ==, + obj->disposing_refs); + + disposed_checker = &obj; + g_object_add_weak_pointer (G_OBJECT (obj), &disposed_checker); + + /* Now remove the first added reference */ + obj->disposing_refs = 0; + g_object_unref (obj); + g_assert_nonnull (disposed_checker); + g_assert_cmpint (g_atomic_int_get (&G_OBJECT (obj)->ref_count), ==, 2); + g_assert_cmpint (obj->actual.count, ==, 2); + g_assert_cmpint (obj->notify_called, ==, 1); + + /* And the toggle one */ + obj->actual.should_be_last = TRUE; + obj->notify_handler = NULL; + g_object_remove_toggle_ref (G_OBJECT (obj), obj->toggle_notify, NULL); + g_assert_nonnull (disposed_checker); + g_assert_cmpint (g_atomic_int_get (&G_OBJECT (obj)->ref_count), ==, 1); + g_assert_cmpint (obj->actual.count, ==, 2); + obj->expected.count = obj->actual.count; + + g_clear_object (&obj); + g_assert_null (disposed_checker); +} + +static void +toggle_notify_counter (gpointer data, + GObject *obj, + gboolean is_last) +{ + Count *c = data; + c->count++; + + if (is_last) + g_assert_cmpint (g_atomic_int_get (&obj->ref_count), ==, 1); + else + g_assert_cmpint (g_atomic_int_get (&obj->ref_count), ==, 2); +} + +static void +on_object_notify_switch_to_normal_ref (GObject *object, + GParamSpec *pspec, + void *data) +{ + DisposeReffingObject *obj = DISPOSE_REFFING_OBJECT (object); + + obj->notify_called++; + + g_object_ref (object); + g_object_remove_toggle_ref (object, obj->toggle_notify, NULL); +} + +static void +on_object_notify_switch_to_toggle_ref (GObject *object, + GParamSpec *pspec, + void *data) +{ + DisposeReffingObject *obj = DISPOSE_REFFING_OBJECT (object); + + obj->notify_called++; + + g_object_add_toggle_ref (object, obj->toggle_notify, &obj->actual); + g_object_unref (object); +} + +static void +on_object_notify_add_ref (GObject *object, + GParamSpec *pspec, + void *data) +{ + DisposeReffingObject *obj = DISPOSE_REFFING_OBJECT (object); + int old_toggle_cout = obj->actual.count; + + obj->notify_called++; + + g_object_ref (object); + g_assert_cmpint (obj->actual.count, ==, old_toggle_cout); +} + +static void +test_toggle_ref_and_notify_on_dispose (void) +{ + DisposeReffingObject *obj; + gpointer disposed_checker = &obj; + + /* This tests wants to ensure that toggle signal emission during dispose + * is properly working if the object is revitalized by adding new references. + * It also wants to check that toggle notifications are not happening if a + * notify handler is removing them at this phase. + */ + + obj = g_object_new (dispose_reffing_object_get_type (), NULL); + obj->toggle_notify = toggle_notify_counter; + g_object_add_weak_pointer (G_OBJECT (obj), &disposed_checker); + + /* Convert to toggle notification */ + g_object_add_toggle_ref (G_OBJECT (obj), obj->toggle_notify, &obj->actual); + g_assert_cmpint (obj->actual.count, ==, 0); + + obj->notify_handler = G_CALLBACK (on_object_notify); + g_object_unref (obj); + g_assert_cmpint (obj->actual.count, ==, 1); + g_assert_cmpuint (obj->notify_called, ==, 0); + + disposed_checker = &obj; + g_object_add_weak_pointer (G_OBJECT (obj), &disposed_checker); + + /* Check that notification is triggered after being queued */ + obj->disposing_refs = 1; + obj->expected.count = 1; + obj->notify_handler = G_CALLBACK (on_object_notify); + g_object_remove_toggle_ref (G_OBJECT (obj), obj->toggle_notify, NULL); + /* FIXME: adjust the count to 1 when !2377 is in */ + g_assert_cmpint (obj->actual.count, ==, 4); + g_assert_cmpuint (obj->notify_called, ==, 1); + + disposed_checker = &obj; + g_object_add_weak_pointer (G_OBJECT (obj), &disposed_checker); + + /* Check that notification is triggered after being queued, but no toggle + * notification is happening if notify handler switches to normal reference + */ + obj->disposing_refs = 1; + obj->expected.count = 4; + obj->notify_handler = G_CALLBACK (on_object_notify_switch_to_normal_ref); + g_object_remove_toggle_ref (G_OBJECT (obj), obj->toggle_notify, NULL); + g_assert_cmpint (obj->actual.count, ==, 5); + g_assert_cmpuint (obj->notify_called, ==, 2); + + disposed_checker = &obj; + g_object_add_weak_pointer (G_OBJECT (obj), &disposed_checker); + + /* Check that notification is triggered after being queued, but that toggle + * is happening if notify handler switched to toggle reference + */ + obj->disposing_refs = 1; + obj->disposing_refs_all_normal = TRUE; + obj->expected.count = 5; + obj->notify_handler = G_CALLBACK (on_object_notify_switch_to_toggle_ref); + g_object_unref (obj); + g_assert_cmpint (obj->actual.count, ==, 7); + g_assert_cmpuint (obj->notify_called, ==, 3); + + disposed_checker = &obj; + g_object_add_weak_pointer (G_OBJECT (obj), &disposed_checker); + + /* Check that notification is triggered after being queued, but that toggle + * is not happening if current refcount changed. + */ + obj->disposing_refs = 1; + obj->disposing_refs_all_normal = FALSE; + obj->expected.count = 7; + obj->notify_handler = G_CALLBACK (on_object_notify_add_ref); + g_object_remove_toggle_ref (G_OBJECT (obj), obj->toggle_notify, NULL); + g_assert_cmpint (obj->actual.count, ==, 8); + g_assert_cmpuint (obj->notify_called, ==, 4); + g_object_unref (obj); + + disposed_checker = &obj; + g_object_add_weak_pointer (G_OBJECT (obj), &disposed_checker); + + obj->disposing_refs = 0; + obj->expected.count = 9; + g_clear_object (&obj); + g_assert_null (disposed_checker); +} + static gboolean global_destroyed; static gint global_value; @@ -945,6 +1341,8 @@ { g_test_init (&argc, &argv, NULL); + g_setenv ("G_ENABLE_DIAGNOSTIC", "1", TRUE); + g_test_add_func ("/type/fundamentals", test_fundamentals); g_test_add_func ("/type/qdata", test_type_qdata); g_test_add_func ("/type/query", test_type_query); @@ -966,6 +1364,8 @@ g_test_add_func ("/object/weak-ref/on-run-dispose", test_weak_ref_on_run_dispose); g_test_add_func ("/object/weak-ref/on-toggle-notify", test_weak_ref_on_toggle_notify); g_test_add_func ("/object/toggle-ref", test_toggle_ref); + g_test_add_func ("/object/toggle-ref/ref-on-dispose", test_toggle_ref_on_dispose); + g_test_add_func ("/object/toggle-ref/ref-and-notify-on-dispose", test_toggle_ref_and_notify_on_dispose); g_test_add_func ("/object/qdata", test_object_qdata); g_test_add_func ("/object/qdata2", test_object_qdata2);
View file
_service:tar_scm:glib-2.74.4.tar.xz/gobject/tests/signals.c -> _service:tar_scm:glib-2.76.4.tar.xz/gobject/tests/signals.c
Changed
@@ -1487,6 +1487,11 @@ g_signal_handlers_unblock_matched (test2, G_SIGNAL_MATCH_FUNC, 0, 0, NULL, test_handler, NULL); + /* Match types are conjunctive */ + g_assert_cmpuint (g_signal_handlers_block_matched (test1, G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, 0, 0, NULL, test_handler, "will not match"), ==, 0); + g_assert_cmpuint (g_signal_handlers_block_matched (test1, G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, 0, 0, NULL, test_handler, &count1), ==, 1); + g_assert_cmpuint (g_signal_handlers_unblock_matched (test1, G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, 0, 0, NULL, test_handler, &count1), ==, 1); + g_object_unref (test1); g_object_unref (test2); } @@ -1546,13 +1551,13 @@ NULL); /* disconnect from the wrong object (same type), should warn */ - g_test_expect_message ("GLib-GObject", G_LOG_LEVEL_WARNING, + g_test_expect_message ("GLib-GObject", G_LOG_LEVEL_CRITICAL, "*: instance '*' has no handler with id '*'"); g_signal_handler_disconnect (object2, signal_id); g_test_assert_expected_messages (); /* and from an object of the wrong type */ - g_test_expect_message ("GLib-GObject", G_LOG_LEVEL_WARNING, + g_test_expect_message ("GLib-GObject", G_LOG_LEVEL_CRITICAL, "*: instance '*' has no handler with id '*'"); g_signal_handler_disconnect (object3, signal_id); g_test_assert_expected_messages (); @@ -1586,7 +1591,7 @@ if (g_test_undefined ()) { handler = g_random_int_range (0x01, 0xFF); - g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_WARNING, + g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL, "*instance '* has no handler with id *'"); g_clear_signal_handler (&handler, test_obj); g_assert_cmpuint (handler, ==, 0); @@ -1642,7 +1647,7 @@ g_test_trap_subprocess (NULL, 0, G_TEST_SUBPROCESS_DEFAULT); g_test_trap_assert_failed (); - g_test_trap_assert_stderr ("*WARNING*unable to look up invalid signal name*"); + g_test_trap_assert_stderr ("*CRITICAL*unable to look up invalid signal name*"); } static void
View file
_service:tar_scm:glib-2.74.4.tar.xz/gobject/tests/threadtests.c -> _service:tar_scm:glib-2.76.4.tar.xz/gobject/tests/threadtests.c
Changed
@@ -2,6 +2,8 @@ * Copyright (C) 2008 Imendio AB * Authors: Tim Janik * + * SPDX-License-Identifier: LicenseRef-old-glib-tests + * * This work is provided "as is"; redistribution and modification * in whole or in part, in any medium, physical or electronic is * permitted without restriction.
View file
_service:tar_scm:glib-2.74.4.tar.xz/gobject/tests/type-flags.c -> _service:tar_scm:glib-2.76.4.tar.xz/gobject/tests/type-flags.c
Changed
@@ -3,6 +3,42 @@ #include <glib-object.h> +typedef struct +{ + GTypeInterface g_iface; +} TestInterfaceInterface; + +GType test_interface_get_type (void); +#define TEST_TYPE_INTERFACE test_interface_get_type () +G_DEFINE_INTERFACE (TestInterface, test_interface, G_TYPE_INVALID) + +static void +test_interface_default_init (TestInterfaceInterface *iface) +{ +} + +static void +test_type_flags_interface (void) +{ + g_assert_false (G_TYPE_IS_ABSTRACT (TEST_TYPE_INTERFACE)); + g_assert_false (g_type_test_flags (TEST_TYPE_INTERFACE, G_TYPE_FLAG_ABSTRACT)); + + g_assert_false (G_TYPE_IS_CLASSED (TEST_TYPE_INTERFACE)); + g_assert_false (g_type_test_flags (TEST_TYPE_INTERFACE, G_TYPE_FLAG_CLASSED)); + + g_assert_false (G_TYPE_IS_DEEP_DERIVABLE (TEST_TYPE_INTERFACE)); + g_assert_false (g_type_test_flags (TEST_TYPE_INTERFACE, G_TYPE_FLAG_DEEP_DERIVABLE)); + + g_assert_true (G_TYPE_IS_DERIVABLE (TEST_TYPE_INTERFACE)); + g_assert_true (g_type_test_flags (TEST_TYPE_INTERFACE, G_TYPE_FLAG_DERIVABLE)); + + g_assert_false (G_TYPE_IS_FINAL (TEST_TYPE_INTERFACE)); + g_assert_false (g_type_test_flags (TEST_TYPE_INTERFACE, G_TYPE_FLAG_FINAL)); + + g_assert_false (G_TYPE_IS_INSTANTIATABLE (TEST_TYPE_INTERFACE)); + g_assert_false (g_type_test_flags (TEST_TYPE_INTERFACE, G_TYPE_FLAG_INSTANTIATABLE)); +} + #define TEST_TYPE_FINAL (test_final_get_type()) G_DECLARE_FINAL_TYPE (TestFinal, test_final, TEST, FINAL, GObject) @@ -61,8 +97,24 @@ { GType final2_type; + g_assert_true (G_TYPE_IS_FINAL (TEST_TYPE_FINAL)); + g_assert_true (g_type_test_flags (TEST_TYPE_FINAL, G_TYPE_FLAG_FINAL)); + g_assert_true (G_TYPE_IS_CLASSED (TEST_TYPE_FINAL)); + g_assert_true (g_type_test_flags (TEST_TYPE_FINAL, G_TYPE_FLAG_CLASSED)); + g_assert_true (G_TYPE_IS_INSTANTIATABLE (TEST_TYPE_FINAL)); + g_assert_true (g_type_test_flags (TEST_TYPE_FINAL, G_TYPE_FLAG_INSTANTIATABLE)); + g_assert_true (g_type_test_flags (TEST_TYPE_FINAL, + G_TYPE_FLAG_FINAL | + G_TYPE_FLAG_CLASSED | + G_TYPE_FLAG_INSTANTIATABLE)); + g_assert_false (g_type_test_flags (TEST_TYPE_FINAL, + G_TYPE_FLAG_FINAL | + G_TYPE_FLAG_CLASSED | + G_TYPE_FLAG_DEPRECATED | + G_TYPE_FLAG_INSTANTIATABLE)); + /* This is the message we print out when registering the type */ - g_test_expect_message ("GLib-GObject", G_LOG_LEVEL_WARNING, + g_test_expect_message ("GLib-GObject", G_LOG_LEVEL_CRITICAL, "*cannot derive*"); /* This is the message when we fail to return from the GOnce init @@ -77,12 +129,118 @@ g_test_assert_expected_messages (); } +#define TEST_TYPE_DEPRECATED (test_deprecated_get_type()) +G_DECLARE_FINAL_TYPE (TestDeprecated, test_deprecated, TEST, DEPRECATED, GObject) + +struct _TestDeprecated +{ + GObject parent_instance; +}; + +struct _TestDeprecatedClass +{ + GObjectClass parent_class; +}; + +G_DEFINE_TYPE_EXTENDED (TestDeprecated, test_deprecated, G_TYPE_OBJECT, G_TYPE_FLAG_FINAL | G_TYPE_FLAG_DEPRECATED, {}) + +static void +test_deprecated_class_init (TestDeprecatedClass *klass) +{ +} + +static void +test_deprecated_init (TestDeprecated *self) +{ +} + +static void +test_type_flags_final_instance_check (void) +{ + TestFinal *final; + + final = g_object_new (TEST_TYPE_FINAL, NULL); + g_assert_true (g_type_check_instance_is_a ((GTypeInstance *) final, + TEST_TYPE_FINAL)); + g_assert_false (g_type_check_instance_is_a ((GTypeInstance *) final, + TEST_TYPE_DEPRECATED)); + g_assert_true (g_type_check_instance_is_a ((GTypeInstance *) final, + G_TYPE_OBJECT)); + g_assert_false (g_type_check_instance_is_a ((GTypeInstance *) final, + G_TYPE_INVALID)); + + g_clear_object (&final); +} + +static void +test_type_flags_deprecated (void) +{ + GType deprecated_type; + GObject *deprecated_object = NULL; + + g_test_summary ("Test that trying to instantiate a deprecated type results in a warning."); + + /* This is the message we print out when registering the type */ + g_test_expect_message ("GLib-GObject", G_LOG_LEVEL_WARNING, + "*The type TestDeprecated is deprecated and shouldn’t be used any more*"); + + /* The type itself should not be considered invalid. */ + deprecated_type = TEST_TYPE_DEPRECATED; + g_assert_false (deprecated_type == G_TYPE_INVALID); + g_assert_true (G_TYPE_IS_DEPRECATED (deprecated_type)); + + g_assert_true (G_TYPE_IS_FINAL (deprecated_type)); + g_assert_true (g_type_test_flags (deprecated_type, G_TYPE_FLAG_FINAL)); + + g_assert_true (g_type_test_flags (deprecated_type, + G_TYPE_FLAG_DEPRECATED | + G_TYPE_FLAG_CLASSED | + G_TYPE_FLAG_FINAL | + G_TYPE_FLAG_INSTANTIATABLE)); + g_assert_false (g_type_test_flags (deprecated_type, + G_TYPE_FLAG_DEPRECATED | + G_TYPE_FLAG_CLASSED | + G_TYPE_FLAG_FINAL | + G_TYPE_FLAG_ABSTRACT | + G_TYPE_FLAG_INSTANTIATABLE)); + + /* Instantiating it should work, but emit a warning. */ + deprecated_object = g_object_new (deprecated_type, NULL); + g_assert_nonnull (deprecated_object); + + g_test_assert_expected_messages (); + + g_object_unref (deprecated_object); + + /* Instantiating it again should not emit a second warning. */ + deprecated_object = g_object_new (deprecated_type, NULL); + g_assert_nonnull (deprecated_object); + + g_assert_true (g_type_check_instance_is_a ((GTypeInstance *) deprecated_object, + TEST_TYPE_DEPRECATED)); + g_assert_true (g_type_check_instance_is_a ((GTypeInstance *) deprecated_object, + G_TYPE_OBJECT)); + g_assert_false (g_type_check_instance_is_a ((GTypeInstance *) deprecated_object, + TEST_TYPE_FINAL)); + g_assert_false (g_type_check_instance_is_a ((GTypeInstance *) deprecated_object, + G_TYPE_INVALID)); + + g_test_assert_expected_messages (); + + g_object_unref (deprecated_object); +} + int main (int argc, char *argv) { g_test_init (&argc, &argv, NULL); + g_setenv ("G_ENABLE_DIAGNOSTIC", "1", TRUE); + + g_test_add_func ("/type/flags/interface", test_type_flags_interface); g_test_add_func ("/type/flags/final", test_type_flags_final); + g_test_add_func ("/type/flags/final/instance-check", test_type_flags_final_instance_check); + g_test_add_func ("/type/flags/deprecated", test_type_flags_deprecated); return g_test_run (); }
View file
_service:tar_scm:glib-2.74.4.tar.xz/gobject/tests/type.c -> _service:tar_scm:glib-2.76.4.tar.xz/gobject/tests/type.c
Changed
@@ -185,7 +185,7 @@ check_called = 0; g_type_add_interface_check (&check_called, check_func); - o = g_object_new (bazo_get_type (), NULL); + o = g_object_ref_sink (g_object_new (bazo_get_type (), NULL)); g_object_unref (o); g_assert_cmpint (check_called, ==, 1); g_type_remove_interface_check (&check_called, check_func);
View file
_service:tar_scm:glib-2.74.4.tar.xz/gobject/tests/value.c -> _service:tar_scm:glib-2.76.4.tar.xz/gobject/tests/value.c
Changed
@@ -719,6 +719,7 @@ g_value_init (&src, typess); g_value_set_object (&src, object); + g_value_set_object (&src, g_value_get_object (&src)); for (d = 0; d < G_N_ELEMENTS (types); d++) {
View file
_service:tar_scm:glib-2.74.4.tar.xz/gthread/meson.build -> _service:tar_scm:glib-2.76.4.tar.xz/gthread/meson.build
Changed
@@ -19,7 +19,8 @@ darwin_versions : darwin_versions, install : true, dependencies : libglib_dep, - c_args : '-DG_LOG_DOMAIN="GThread"' + glib_hidden_visibility_args, + c_args : '-DG_LOG_DOMAIN="GThread"', glib_c_args_internal, + gnu_symbol_visibility : 'hidden', link_args : glib_link_flags, ) @@ -35,3 +36,7 @@ libgthread_dep = declare_dependency(link_with : libgthread) meson.override_dependency('gthread-2.0', libgthread_dep) + +if build_tests + subdir('tests') +endif
View file
_service:tar_scm:glib-2.76.4.tar.xz/gthread/tests
Added
+(directory)
View file
_service:tar_scm:glib-2.76.4.tar.xz/gthread/tests/init.c
Added
@@ -0,0 +1,75 @@ +/* GLib testing framework examples and tests + * + * Copyright © 2022 Endless OS Foundation, LLC + * + * SPDX-License-Identifier: LGPL-2.1-or-later + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General + * Public License along with this library; if not, see <http://www.gnu.org/licenses/>. + * + * Author: Philip Withnall <pwithnall@endlessos.org> + */ + +#include <glib.h> +#include <locale.h> + + +/* All of GThread is deprecated, but that’s OK */ +G_GNUC_BEGIN_IGNORE_DEPRECATIONS + +static void +test_thread_deprecated_init (void) +{ + const GThreadFunctions functions = { + NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, + NULL + }; + + /* Should be a no-op. */ + g_thread_init (NULL); + + /* Should emit a warning. */ + g_test_expect_message ("GThread", G_LOG_LEVEL_WARNING, + "GThread system no longer supports custom thread implementations."); + g_thread_init ((gpointer) &functions); + g_test_assert_expected_messages (); +} + +static void +test_thread_deprecated_init_with_errorcheck_mutexes (void) +{ + /* Should warn. */ + g_test_expect_message ("GThread", G_LOG_LEVEL_WARNING, + "GThread system no longer supports errorcheck mutexes."); + g_thread_init_with_errorcheck_mutexes (NULL); + g_test_assert_expected_messages (); +} + +int +main (int argc, + char *argv) +{ + setlocale (LC_ALL, ""); + g_test_init (&argc, &argv, G_TEST_OPTION_ISOLATE_DIRS, NULL); + + g_test_add_func ("/thread/deprecated/init", test_thread_deprecated_init); + g_test_add_func ("/thread/deprecated/init-with-errorcheck-mutexes", test_thread_deprecated_init_with_errorcheck_mutexes); + + return g_test_run (); +} + +G_GNUC_END_IGNORE_DEPRECATIONS
View file
_service:tar_scm:glib-2.76.4.tar.xz/gthread/tests/meson.build
Added
@@ -0,0 +1,54 @@ +gthread_tests = { + 'init' : {}, +} + +test_env = environment() +test_env.set('G_TEST_SRCDIR', meson.current_source_dir()) +test_env.set('G_TEST_BUILDDIR', meson.current_build_dir()) + +test_deps = thread_dep, libglib_dep, libgthread_dep +test_cargs = '-DG_LOG_DOMAIN="GLib-GThread"', '-UG_DISABLE_ASSERT' +test_cpp_args = test_cargs + +foreach test_name, extra_args : gthread_tests + source = extra_args.get('source', test_name + '.c') + install = installed_tests_enabled and extra_args.get('install', true) + + if install + test_conf = configuration_data() + test_conf.set('installed_tests_dir', installed_tests_execdir) + test_conf.set('program', test_name) + test_conf.set('env', '') + configure_file( + input: installed_tests_template_tap, + output: test_name + '.test', + install_dir: installed_tests_metadir, + install_tag: 'tests', + configuration: test_conf + ) + endif + + exe = executable(test_name, source, + c_args : test_cargs + extra_args.get('c_args', ), + cpp_args : test_cpp_args + extra_args.get('cpp_args', ), + dependencies : test_deps + extra_args.get('dependencies', ), + install_dir: installed_tests_execdir, + install_tag: 'tests', + install: install, + ) + + suite = 'gthread' + extra_args.get('suite', ) + timeout = suite.contains('slow') ? test_timeout_slow : test_timeout + + if extra_args.get('can_fail', false) + suite += 'failing' + endif + + test(test_name, + exe, + protocol : extra_args.get('protocol', test_protocol), + env : test_env, + timeout : timeout, + suite : suite, + ) +endforeach
View file
_service:tar_scm:glib-2.74.4.tar.xz/meson.build -> _service:tar_scm:glib-2.76.4.tar.xz/meson.build
Changed
@@ -1,5 +1,5 @@ project('glib', 'c', - version : '2.74.4', + version : '2.76.4', # NOTE: See the policy in docs/meson-version.md before changing the Meson dependency meson_version : '>= 0.60.0', default_options : @@ -10,6 +10,15 @@ ) cc = meson.get_compiler('c') +c_standards = {} + +foreach std : '90', '99', '11', '17' + arg = (cc.get_id() == 'msvc' ? '/std:' : '-std=') + 'c' + std + if cc.has_argument(arg) + c_standards += { std: arg } + endif +endforeach + have_cxx = add_languages('cpp', native: false, required: get_option('oss_fuzz').enabled()) if have_cxx cxx = meson.get_compiler('cpp') @@ -83,7 +92,7 @@ glib_libexecdir = join_paths(glib_prefix, get_option('libexecdir')) glib_datadir = join_paths(glib_prefix, get_option('datadir')) glib_pkgdatadir = join_paths(glib_datadir, 'glib-2.0') -glib_includedir = join_paths(glib_prefix, get_option('includedir')) +glib_includedir = join_paths(glib_prefix, get_option('includedir'), 'glib-2.0') if get_option('gio_module_dir') != '' glib_giomodulesdir = join_paths(glib_prefix, get_option('gio_module_dir')) else @@ -114,10 +123,17 @@ glib_charsetaliasdir = glib_libdir endif -glib_localstatedir = get_option('localstatedir') -if not glib_localstatedir.startswith('/') - # See https://mesonbuild.com/Builtin-options.html#directories - glib_localstatedir = join_paths(glib_prefix, glib_localstatedir) +glib_localstatedir = glib_prefix / get_option('localstatedir') + +if get_option('runtime_dir') != '' + glib_runstatedir = glib_prefix / get_option('runtime_dir') +else + # While we’d normally prefix directories like this with, for example, + # glib_localstatedir, `/run` is a bit different in that it’s for runtime state + # rather than data files, so it’s typically functionally useless to use a + # prefixed version. No other processes will be using it. So we default to the + # unprefixed system `/run` directory. + glib_runstatedir = '/run' endif installed_tests_metadir = join_paths(glib_datadir, 'installed-tests', meson.project_name()) @@ -129,13 +145,41 @@ # Don’t build the tests unless we can run them (either natively, in an exe wrapper, or by installing them for later use) build_tests = get_option('tests') and (meson.can_run_host_binaries() or installed_tests_enabled) +common_test_env = + 'G_DEBUG=gc-friendly', + 'G_ENABLE_DIAGNOSTIC=1', + 'MALLOC_CHECK_=2', + + +# Note: this may cause the tests output not to be printed when running in +# verbose mode, see https://github.com/mesonbuild/meson/issues/11185 +# Can be changed it to 'exitcode' if required during development. +test_protocol = 'tap' +test_timeout = 30 +test_timeout_slow = 90 + +add_test_setup('default', + is_default: true, + exclude_suites: 'flaky', 'failing', + env: common_test_env, + timeout_multiplier: 2, +) + +add_test_setup('unstable_tests', + env: common_test_env, + timeout_multiplier: 2, + # Empty test setup, used for having different results set for flaky tests + # Sadly we can't use (https://github.com/mesonbuild/meson/issues/10934): + #suites: 'flaky', 'unstable' +) + # Allow the tests to be easily run under valgrind using --setup=valgrind valgrind = find_program('valgrind', required: false) if valgrind.found() suppression_file = files('tools' / 'glib.supp') add_test_setup('valgrind', - exclude_suites: 'no-valgrind' , + exclude_suites: 'no-valgrind', 'flaky' , exe_wrapper: valgrind, '--tool=memcheck', @@ -149,7 +193,8 @@ '--suppressions=@0@'.format(meson.project_source_root() / '@0@'.format(suppression_file0)), , - timeout_multiplier: 10, + env: common_test_env, + timeout_multiplier: 20, ) endif @@ -210,64 +255,31 @@ glib_conf.set('_FILE_OFFSET_BITS', 64) endif -# Check for GNU visibility attributes -g_have_gnuc_visibility = cc.compiles(''' - void - __attribute__ ((visibility ("hidden"))) - f_hidden (void) - { - } - void - __attribute__ ((visibility ("internal"))) - f_internal (void) - { - } - void - __attribute__ ((visibility ("default"))) - f_default (void) - { - } - int main (void) - { - f_hidden(); - f_internal(); - f_default(); - return 0; - } - ''', - # Not supported by MSVC, but MSVC also won't support visibility, - # so it's OK to pass -Werror explicitly. Replace with - # override_options : 'werror=true' once that is supported - args: '-Werror', - name : 'GNU C visibility attributes test') - -if g_have_gnuc_visibility - glibconfig_conf.set('G_HAVE_GNUC_VISIBILITY', '1') -endif - -# Detect and set symbol visibility -glib_hidden_visibility_args = -if get_option('default_library') != 'static' - if host_system == 'windows' or host_system == 'cygwin' - if get_option('default_library') != 'shared' - error('On Windows default_library must be "shared" or "static" but not "both"') - endif - glib_conf.set('DLL_EXPORT', true) - if cc.get_id() == 'msvc' or cc.get_id() == 'clang-cl' - glib_conf.set('_GLIB_EXTERN', '__declspec(dllexport) extern') - elif cc.has_argument('-fvisibility=hidden') - glib_conf.set('_GLIB_EXTERN', '__attribute__((visibility("default"))) __declspec(dllexport) extern') - glib_hidden_visibility_args = '-fvisibility=hidden' - endif - elif cc.has_argument('-fvisibility=hidden') - glib_conf.set('_GLIB_EXTERN', '__attribute__((visibility("default"))) extern') - glib_hidden_visibility_args = '-fvisibility=hidden' - endif +glib_build_shared = false +glib_build_static = false +if get_option('default_library') == 'both' + glib_build_static = true + glib_build_shared = true +elif get_option('default_library') == 'static' + glib_build_static = true +elif get_option('default_library') == 'shared' + glib_build_shared = true +endif + +glib_build_both = glib_build_static and glib_build_shared +glib_build_static_only = glib_build_static and not glib_build_shared +glib_build_shared_only = glib_build_shared and not glib_build_static + +if glib_build_shared and glib_build_static and ( + host_system == 'windows' or host_system == 'cygwin') + error('On Windows default_library must be "shared" or "static" but not "both"') endif -if get_option('default_library') == 'static' +if glib_build_static_only glibconfig_conf.set('GLIB_STATIC_COMPILATION', '1') glibconfig_conf.set('GOBJECT_STATIC_COMPILATION', '1') + glibconfig_conf.set('GIO_STATIC_COMPILATION', '1') + glibconfig_conf.set('GMODULE_STATIC_COMPILATION', '1') glibconfig_conf.set('G_INTL_STATIC_COMPILATION', '1') glibconfig_conf.set('FFI_STATIC_BUILD', '1') endif @@ -306,11 +318,11 @@ # optimization is 0 or g; otherwise, we have a production build. glib_debug_cflags = glib_debug = get_option('glib_debug') -optimized_build = get_option('optimization') not in '0', 'g' -if glib_debug.enabled() or (glib_debug.auto() and get_option('debug') and not optimized_build) +if (glib_debug.enabled() or ( + glib_debug.auto() and get_option('debug') and get_option('optimization') in '0', 'g' )) glib_debug_cflags += '-DG_ENABLE_DEBUG' message('Enabling various debug infrastructure') -elif optimized_build +else glib_debug_cflags += '-DG_DISABLE_CAST_CHECKS' message('Disabling cast checks') endif @@ -485,6 +497,8 @@ '-Wduplicated-branches', '-Wimplicit-fallthrough', '-Wmisleading-indentation', + '-Wmissing-field-initializers', + '-Wnonnull', '-Wunused', # Due to maintained deprecated code, we do not want to see unused parameters '-Wno-unused-parameter', @@ -510,10 +524,10 @@ # Due to pervasive use of things like GPOINTER_TO_UINT(), we do not support # building with -Wbad-function-cast. '-Wno-bad-function-cast', - '-Werror=declaration-after-statement', '-Werror=implicit-function-declaration', '-Werror=missing-prototypes', '-Werror=pointer-sign', + '-Wno-string-plus-int', warning_cxx_args = warning_common_args warning_objc_args = warning_c_args @@ -592,6 +606,7 @@ endif functions = + 'accept4', 'close_range', 'endmntent', 'endservent', @@ -600,6 +615,8 @@ 'fchmod', 'fchown', 'fdwalk', + 'free_aligned_sized', + 'free_sized', 'fsync', 'getauxval', 'getc_unlocked', @@ -709,17 +726,9 @@ endforeach # Check that stpcpy() is usable; must use header. -# cc.has_function() in some cases (clang, gcc 10+) assumes that if the -# compiler provides a builtin of the same name that the function exists, while -# it's in fact not provided by any header or library. This is true for -# stpcpy() on Windows using clang and gcc as well as posix_memalign() using -# gcc on Windows. Skip these checks on Windows for now to avoid false -# positives. See https://github.com/mesonbuild/meson/pull/7116, -# https://github.com/mesonbuild/meson/issues/3672 and +# See: # https://github.com/mesonbuild/meson/issues/5628. -# FIXME: Once meson no longer returns success for stpcpy() and -# posix_memalign() on Windows using GCC and clang we can remove this. -if host_system != 'windows' and cc.has_function('stpcpy', prefix : '#include <string.h>') +if cc.has_function('stpcpy', prefix : '#include <string.h>') glib_conf.set('HAVE_STPCPY', 1) endif @@ -955,6 +964,8 @@ dlopen_dlsym_test_code = ''' #include <dlfcn.h> +#include <stdio.h> +int r; int glib_underscore_test (void) { return 42; } int main (int argc, char ** argv) { void *f1 = (void*)0, *f2 = (void*)0, *handle; @@ -963,7 +974,8 @@ f1 = dlsym (handle, "glib_underscore_test"); f2 = dlsym (handle, "_glib_underscore_test"); } - return (!f2 || f1); + r = (!f2 || f1) ? puts ("1") : puts ("0"); + return r > 0 ? 0 : r; }''' libdl_dep = if cc.links(dlopen_dlsym_test_code, name : 'dlopen() and dlsym() in system libraries') @@ -1468,8 +1480,6 @@ # be 64-bit in C99, and it is available on all supported compilers sizet_align = cc.alignment('size_t') -glib_conf.set('ALIGNOF_UNSIGNED_LONG', long_align) - glib_conf.set('SIZEOF_CHAR', char_size) glib_conf.set('SIZEOF_INT', int_size) glib_conf.set('SIZEOF_SHORT', short_size) @@ -1523,7 +1533,6 @@ glibconfig_conf.set_quoted('gint32_modifier', gint32_modifier) glibconfig_conf.set_quoted('gint32_format', gint32_format) glibconfig_conf.set_quoted('guint32_format', guint32_format) -glib_conf.set('ALIGNOF_GUINT32', guint32_align) if int_size == 8 gint64 = 'int' @@ -1562,7 +1571,6 @@ glibconfig_conf.set_quoted('guint64_format', guint64_format) glibconfig_conf.set('gint64_constant', gint64_constant) glibconfig_conf.set('guint64_constant', guint64_constant) -glib_conf.set('ALIGNOF_GUINT64', guint64_align) if host_system == 'windows' glibconfig_conf.set('g_pid_type', 'void*') @@ -1702,38 +1710,11 @@ endif # === va_copy checks === -# we currently check for all three va_copy possibilities, so we get -# all results in config.log for bug reports. - -va_copy_func = '' -foreach try_func : '__va_copy', 'va_copy' - if cc.compiles('''#include <stdarg.h> - #include <stdlib.h> - #ifdef _MSC_VER - # include "msvc_recommended_pragmas.h" - #endif - void f (int i, ...) { - va_list args1, args2; - va_start (args1, i); - @0@ (args2, args1); - if (va_arg (args2, int) != 42 || va_arg (args1, int) != 42) - exit (1); - va_end (args1); va_end (args2); - } - int main() { - f (0, 42); - return 0; - }'''.format(try_func), - name : try_func + ' check') - va_copy_func = try_func - endif -endforeach -if va_copy_func != '' - glib_conf.set('G_VA_COPY', va_copy_func) - glib_vacopy = '#define G_VA_COPY ' + va_copy_func -else - glib_vacopy = '/* #undef G_VA_COPY */' -endif + +glib_vacopy = '' + +# We check for G_VA_COPY_AS_ARRAY for historical reasons, but we no longer +# use it: use Standard C va_copy() instead. va_list_val_copy_prog = ''' #include <stdarg.h> @@ -1974,10 +1955,6 @@ glib_conf.set('HAVE_PTHREAD_GETNAME_NP', 1) endif - if cc.has_header_symbol('sys/syscall.h', 'SYS_sched_getattr') - glib_conf.set('HAVE_SYS_SCHED_GETATTR', 1) - endif - # Assume that pthread_setname_np is available in some form; same as configure if cc.links(pthread_prefix + ''' int main() { @@ -2060,7 +2037,8 @@ libiconv = dependency('iconv') endif -pcre2 = dependency('libpcre2-8', version: '>= 10.32', required : false) +pcre2_req = '>=10.32' +pcre2 = dependency('libpcre2-8', version: pcre2_req, required: false, allow_fallback: false) if not pcre2.found() if cc.get_id() == 'msvc' or cc.get_id() == 'clang-cl' # MSVC: Search for the PCRE2 library by the configuration, which corresponds @@ -2076,8 +2054,11 @@ # Try again with the fallback if not pcre2.found() - pcre2 = dependency('libpcre2-8', required : true, fallback : 'pcre2', 'libpcre2_8') - use_pcre2_static_flag = true + pcre2 = dependency('libpcre2-8', version: pcre2_req, allow_fallback: true) + assert(pcre2.type_name() == 'internal') + # static flags are automatically enabled by the subproject if it's built + # with default_library=static + use_pcre2_static_flag = false elif host_system == 'windows' pcre2_static = cc.links('''#define PCRE2_STATIC #define PCRE2_CODE_UNIT_WIDTH 8 @@ -2099,7 +2080,7 @@ gvdb_dep = dependency('gvdb') libm = cc.find_library('m', required : false) -libffi_dep = dependency('libffi', version : '>= 3.0.0', fallback : 'libffi', 'ffi_dep') +libffi_dep = dependency('libffi', version : '>= 3.0.0') libz_dep = dependency('zlib') @@ -2108,7 +2089,7 @@ # FIXME: glib-gettext.m4 has much more checks to detect broken/uncompatible # implementations. This could be extended if issues are found in some platforms. libintl_deps = -libintl = dependency('intl', required: false) +libintl = dependency('intl', required: false, allow_fallback: false) if libintl.found() # libintl supports different threading APIs, which may not # require additional flags, but it defaults to using pthreads if @@ -2134,7 +2115,8 @@ if libintl.found() have_bind_textdomain_codeset = cc.has_function('bind_textdomain_codeset', dependencies: libintl_deps) else - libintl = subproject('proxy-libintl').get_variable('intl_dep') + libintl = dependency('intl', allow_fallback: true) + assert(libintl.type_name() == 'internal') libintl_deps = libintl have_bind_textdomain_codeset = true # proxy-libintl supports it endif @@ -2147,6 +2129,9 @@ glib_conf.set_quoted('GLIB_LOCALE_DIR', join_paths(glib_datadir, 'locale')) +glib_conf.set_quoted('GLIB_LOCALSTATEDIR', glib_localstatedir) +glib_conf.set_quoted('GLIB_RUNSTATEDIR', glib_runstatedir) + # libmount is only used by gio, but we need to fetch the libs to generate the # pkg-config file below libmount_dep = @@ -2363,11 +2348,21 @@ dtrace_obj_gen = generator(dtrace, output : '@BASENAME@.o', arguments : '-G', '-s', '@INPUT@', '-o', '@OUTPUT@') - # FIXME: $(SED) -e "s,define STAP_HAS_SEMAPHORES 1,undef STAP_HAS_SEMAPHORES," - # -e "s,define _SDT_HAS_SEMAPHORES 1,undef _SDT_HAS_SEMAPHORES," - dtrace_hdr_gen = generator(dtrace, + dtrace_hdr_gen = generator(python, output : '@BASENAME@.h', - arguments : '-h', '-s', '@INPUT@', '-o', '@OUTPUT@') + arguments : '-c', ''' +import subprocess, sys +subprocess.run(sys.argv1:, check=True) +output = sys.argv6 +with open(output) as f: + contents = f.read() +contents = contents.replace("define STAP_HAS_SEMAPHORES 1", + "undef STAP_HAS_SEMAPHORES") +contents = contents.replace("define _SDT_HAS_SEMAPHORES 1", + "undef _SDT_HAS_SEMAPHORES") +with open(output, "w") as f: + f.write(contents) +''', dtrace.full_path(), '-h', '-s', '@INPUT@', '-o', '@OUTPUT@') glib_conf.set('HAVE_DTRACE', 1) enable_dtrace = true endif @@ -2388,18 +2383,15 @@ enable_systemtap = true endif -test_timeout = 60 -test_timeout_slow = 180 - pkg = import('pkgconfig') windows = import('windows') +subdir('tools') subdir('glib') subdir('gobject') subdir('gthread') subdir('gmodule') subdir('gio') subdir('fuzzing') -subdir('tools') # xgettext is optional (on Windows for instance) if find_program('xgettext', required : get_option('nls')).found() @@ -2412,10 +2404,24 @@ install_tag : 'devel', ) +# Check whether we support overriding the invalid parameter handler on Windows for _get_osfhandle(), +# g_fsync() (i.e. _commit()), etc +if host_system == 'windows' + if cc.has_function('_set_thread_local_invalid_parameter_handler', prefix: '#include <stdlib.h>') + glib_conf.set('HAVE__SET_THREAD_LOCAL_INVALID_PARAMETER_HANDLER', 1) + endif + if cc.has_function('_set_invalid_parameter_handler', prefix: '#include <stdlib.h>') + glib_conf.set('HAVE__SET_INVALID_PARAMETER_HANDLER', 1) + endif + if cc.has_header_symbol('crtdbg.h', '_CrtSetReportMode') + glib_conf.set('HAVE__CRT_SET_REPORT_MODE', 1) + endif +endif + configure_file(output : 'config.h', configuration : glib_conf) if host_system == 'windows' - install_headers( 'msvc_recommended_pragmas.h' , subdir : 'glib-2.0') + install_headers( 'msvc_recommended_pragmas.h' , install_dir : glib_includedir) endif if get_option('man') @@ -2437,3 +2443,71 @@ gnome = import('gnome') subdir('docs/reference') + +summary({ + 'host cpu' : host_machine.cpu_family(), + 'host endian' : host_machine.endian(), + 'host system' : host_system, + 'C Compiler' : cc.get_id(), + 'C++ Compiler' : have_cxx ? cxx.get_id() : 'none', + 'shared build' : glib_build_shared, + 'static build' : glib_build_static, +}, section: 'Build environment') + +if build_machine.system() != host_system + summary({ + 'build cpu' : build_machine.cpu_family(), + 'build endian' : build_machine.endian(), + 'build system' : build_machine.system(), + }, section: 'Build environment') +endif + +summary({ + 'prefix' : glib_prefix, + 'bindir' : glib_bindir, + 'libexecdir' : glib_libexecdir, + 'pkgdatadir' : glib_pkgdatadir, + 'datadir' : glib_datadir, + 'includedir' : glib_includedir, + 'giomodulesdir' : glib_giomodulesdir, + 'localstatedir' : glib_localstatedir, + 'runstatedir' : glib_runstatedir, +}, section: 'Directories') + +if get_option('multiarch') + summary({ + 'multiarch bindir' : glib_bindir, + 'multiarch libexecdir' : glib_libexecdir, + }, section: 'Directories') +endif + +if enable_systemtap + summary('tapset dir', get_option('tapset_install_dir'), section: 'Directories') +endif + +if host_system == 'linux' + summary({ + 'selinux' : selinux_dep.found(), + 'libmount' : libmount_dep.found(), + }, section: 'Options') +endif + +summary({ + 'xattr' : xattr_dep.length() > 0, + 'man' : get_option('man'), + 'dtrace' : get_option('dtrace'), + 'systemtap' : enable_systemtap, + 'sysprof' : libsysprof_capture_dep.found(), + 'gtk_doc' : get_option('gtk_doc'), + 'bsymbolic_functions' : get_option('bsymbolic_functions'), + 'force_posix_threads' : get_option('force_posix_threads'), + 'tests' : get_option('tests'), + 'installed_tests' : get_option('installed_tests'), + 'nls' : get_option('nls'), + 'oss_fuzz' : get_option('oss_fuzz'), + 'glib_debug' : get_option('glib_debug'), + 'glib_assert' : get_option('glib_assert'), + 'glib_checks' : get_option('glib_checks'), + 'libelf' : get_option('libelf'), + 'multiarch' : get_option('multiarch'), +}, section: 'Options')
View file
_service:tar_scm:glib-2.74.4.tar.xz/meson_options.txt -> _service:tar_scm:glib-2.76.4.tar.xz/meson_options.txt
Changed
@@ -1,13 +1,8 @@ option('runtime_libdir', type : 'string', value : '', - description : 'install runtime libraries relative to libdir') - -option('iconv', - type : 'combo', - choices : 'auto', 'libc', 'external', - value : 'auto', - deprecated: true,) + description : 'install runtime libraries relative to libdir', + deprecated: true) option('charsetalias_dir', type : 'string', @@ -19,6 +14,14 @@ value : '', description : 'load gio modules from this directory (default to \'libdir/gio/modules\' if unset)') +# FIXME: Deliberately not named runstatedir to avoid colliding with +# https://github.com/mesonbuild/meson/issues/4141; port to that when Meson +# supports it +option('runtime_dir', + type: 'string', + value: '', + description: 'Directory for transient runtime state default: /run') + option('selinux', type : 'feature', value : 'auto',
View file
_service:tar_scm:glib-2.74.4.tar.xz/po/POTFILES.in -> _service:tar_scm:glib-2.76.4.tar.xz/po/POTFILES.in
Changed
@@ -196,6 +196,7 @@ glib/gregex.c glib/gshell.c glib/gspawn.c +glib/gspawn-private.h glib/gspawn-win32.c glib/gstrfuncs.c glib/guri.c
View file
_service:tar_scm:glib-2.74.4.tar.xz/po/ab.po -> _service:tar_scm:glib-2.76.4.tar.xz/po/ab.po
Changed
@@ -1,7 +1,7 @@ msgid "" msgstr "" "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/glib/issues\n" -"POT-Creation-Date: 2022-11-24 12:35+0000\n" +"POT-Creation-Date: 2022-09-24 17:13+0000\n" "Last-Translator: Нанба Наала <naala-nanba@rambler.ru>\n" "Language-Team: Abkhazian <daniel.abzakh@gmail.com>\n" "Language: ab\n" @@ -9,7 +9,6 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-DamnedLies-Scope: partial\n" #: gio/gappinfo.c:335 msgid "Setting default applications not supported yet" @@ -113,7 +112,7 @@ #: gio/gapplication-tool.c:74 gio/gapplication-tool.c:137 gio/gdbus-tool.c:108 #: gio/gio-tool.c:226 msgid "COMMAND" -msgstr "АДҴА" +msgstr "" #: gio/gapplication-tool.c:74 msgid "The command to print detailed help for" @@ -1217,7 +1216,7 @@ msgid "Not authorized to change debug settings" msgstr "" -#: gio/gdesktopappinfo.c:2182 gio/gdesktopappinfo.c:5120 +#: gio/gdesktopappinfo.c:2182 gio/gdesktopappinfo.c:5119 msgid "Unnamed" msgstr "Хьӡыда" @@ -1229,26 +1228,26 @@ msgid "Unable to find terminal required for application" msgstr "" -#: gio/gdesktopappinfo.c:3638 +#: gio/gdesktopappinfo.c:3637 #, c-format msgid "Can’t create user application configuration folder %s: %s" msgstr "" -#: gio/gdesktopappinfo.c:3642 +#: gio/gdesktopappinfo.c:3641 #, c-format msgid "Can’t create user MIME configuration folder %s: %s" msgstr "" -#: gio/gdesktopappinfo.c:3884 gio/gdesktopappinfo.c:3908 +#: gio/gdesktopappinfo.c:3883 gio/gdesktopappinfo.c:3907 msgid "Application information lacks an identifier" msgstr "" -#: gio/gdesktopappinfo.c:4144 +#: gio/gdesktopappinfo.c:4143 #, c-format msgid "Can’t create user desktop file %s" msgstr "" -#: gio/gdesktopappinfo.c:4280 +#: gio/gdesktopappinfo.c:4279 #, c-format msgid "Custom definition for %s" msgstr "" @@ -1366,7 +1365,7 @@ msgid "Invalid symlink value given" msgstr "" -#: gio/gfile.c:4163 glib/gfileutils.c:2354 +#: gio/gfile.c:4163 glib/gfileutils.c:2335 msgid "Symbolic links not supported" msgstr "" @@ -2008,7 +2007,7 @@ #: gio/gio-tool-mount.c:69 msgid "DEVICE" -msgstr "АИҾАРТӘЫРА" +msgstr "" #: gio/gio-tool-mount.c:70 msgid "Unmount all mounts with the given scheme" @@ -2107,7 +2106,7 @@ #: gio/gio-tool-rename.c:47 msgid "NAME" -msgstr "АХЬӠ" +msgstr "" #: gio/gio-tool-rename.c:52 msgid "Rename a file." @@ -2986,115 +2985,115 @@ msgid "Error setting extended attribute “%s”: %s" msgstr "" -#: gio/glocalfileinfo.c:1732 gio/win32/gwinhttpfile.c:191 +#: gio/glocalfileinfo.c:1738 gio/win32/gwinhttpfile.c:191 msgid " (invalid encoding)" msgstr "" -#: gio/glocalfileinfo.c:1891 gio/glocalfileoutputstream.c:945 +#: gio/glocalfileinfo.c:1897 gio/glocalfileoutputstream.c:945 #: gio/glocalfileoutputstream.c:997 #, c-format msgid "Error when getting information for file “%s”: %s" msgstr "" -#: gio/glocalfileinfo.c:2157 +#: gio/glocalfileinfo.c:2163 #, c-format msgid "Error when getting information for file descriptor: %s" msgstr "" -#: gio/glocalfileinfo.c:2202 +#: gio/glocalfileinfo.c:2208 msgid "Invalid attribute type (uint32 expected)" msgstr "" -#: gio/glocalfileinfo.c:2220 +#: gio/glocalfileinfo.c:2226 msgid "Invalid attribute type (uint64 expected)" msgstr "" -#: gio/glocalfileinfo.c:2239 gio/glocalfileinfo.c:2258 +#: gio/glocalfileinfo.c:2245 gio/glocalfileinfo.c:2264 msgid "Invalid attribute type (byte string expected)" msgstr "" -#: gio/glocalfileinfo.c:2305 +#: gio/glocalfileinfo.c:2311 msgid "Cannot set permissions on symlinks" msgstr "" -#: gio/glocalfileinfo.c:2321 +#: gio/glocalfileinfo.c:2327 #, c-format msgid "Error setting permissions: %s" msgstr "" -#: gio/glocalfileinfo.c:2372 +#: gio/glocalfileinfo.c:2378 #, c-format msgid "Error setting owner: %s" msgstr "" -#: gio/glocalfileinfo.c:2395 +#: gio/glocalfileinfo.c:2401 msgid "symlink must be non-NULL" msgstr "" -#: gio/glocalfileinfo.c:2405 gio/glocalfileinfo.c:2424 -#: gio/glocalfileinfo.c:2435 +#: gio/glocalfileinfo.c:2411 gio/glocalfileinfo.c:2430 +#: gio/glocalfileinfo.c:2441 #, c-format msgid "Error setting symlink: %s" msgstr "" -#: gio/glocalfileinfo.c:2414 +#: gio/glocalfileinfo.c:2420 msgid "Error setting symlink: file is not a symlink" msgstr "" -#: gio/glocalfileinfo.c:2506 +#: gio/glocalfileinfo.c:2492 #, c-format msgid "Extra nanoseconds %d for UNIX timestamp %lld are negative" msgstr "" -#: gio/glocalfileinfo.c:2515 +#: gio/glocalfileinfo.c:2501 #, c-format msgid "Extra nanoseconds %d for UNIX timestamp %lld reach 1 second" msgstr "" -#: gio/glocalfileinfo.c:2525 +#: gio/glocalfileinfo.c:2511 #, c-format msgid "UNIX timestamp %lld does not fit into 64 bits" msgstr "Аамҭалатәи адырга UNIX %lld 64 бит иакӡом" -#: gio/glocalfileinfo.c:2536 +#: gio/glocalfileinfo.c:2522 #, fuzzy, c-format msgid "UNIX timestamp %lld is outside of the range supported by Windows" msgstr "Аамҭалатәи адырга UNIX %ll d иаҵанакцом Windows зыцхыраауа аҵакыра" -#: gio/glocalfileinfo.c:2668 +#: gio/glocalfileinfo.c:2625 #, c-format msgid "File name “%s” cannot be converted to UTF-16" msgstr "" -#: gio/glocalfileinfo.c:2687 +#: gio/glocalfileinfo.c:2644 #, c-format msgid "File “%s” cannot be opened: Windows Error %lu" msgstr "" -#: gio/glocalfileinfo.c:2700 +#: gio/glocalfileinfo.c:2657 #, c-format msgid "Error setting modification or access time for file “%s”: %lu" msgstr "" -#: gio/glocalfileinfo.c:2856 +#: gio/glocalfileinfo.c:2798 gio/glocalfileinfo.c:2810 #, c-format msgid "Error setting modification or access time: %s" msgstr "" -#: gio/glocalfileinfo.c:2879 +#: gio/glocalfileinfo.c:2833 msgid "SELinux context must be non-NULL" msgstr "" -#: gio/glocalfileinfo.c:2886 +#: gio/glocalfileinfo.c:2840 msgid "SELinux is not enabled on this system" msgstr "" -#: gio/glocalfileinfo.c:2896 +#: gio/glocalfileinfo.c:2850 #, c-format msgid "Error setting SELinux context: %s" msgstr "" -#: gio/glocalfileinfo.c:2993 +#: gio/glocalfileinfo.c:2947 #, c-format msgid "Setting attribute %s not supported" msgstr "" @@ -4809,7 +4808,7 @@ msgid "Template “%s” doesn’t contain XXXXXX" msgstr "" -#: glib/gfileutils.c:2310 glib/gfileutils.c:2339 +#: glib/gfileutils.c:2291 glib/gfileutils.c:2320 #, c-format msgid "Failed to read the symbolic link “%s”: %s" msgstr "" @@ -5192,300 +5191,300 @@ msgid "Unknown option %s" msgstr "" -#: glib/gregex.c:479 +#: glib/gregex.c:474 msgid "corrupted object" msgstr "" -#: glib/gregex.c:481 +#: glib/gregex.c:476 msgid "out of memory" msgstr "" -#: glib/gregex.c:487 +#: glib/gregex.c:482 msgid "backtracking limit reached" msgstr "" -#: glib/gregex.c:498 +#: glib/gregex.c:493 glib/gregex.c:746 glib/gregex.c:775 msgid "internal error" msgstr "" -#: glib/gregex.c:500 +#: glib/gregex.c:495 msgid "the pattern contains items not supported for partial matching" msgstr "" -#: glib/gregex.c:502 +#: glib/gregex.c:497 msgid "back references as conditions are not supported for partial matching" msgstr "" -#: glib/gregex.c:508 +#: glib/gregex.c:503 msgid "recursion limit reached" msgstr "" -#: glib/gregex.c:510 +#: glib/gregex.c:505 msgid "bad offset" msgstr "" -#: glib/gregex.c:512 +#: glib/gregex.c:507 msgid "recursion loop" msgstr "" #. should not happen in GRegex since we check modes before each match -#: glib/gregex.c:515 +#: glib/gregex.c:510 msgid "matching mode is requested that was not compiled for JIT" msgstr "" -#: glib/gregex.c:536 glib/gregex.c:1838 +#: glib/gregex.c:514 msgid "unknown error" msgstr "" -#: glib/gregex.c:557 +#: glib/gregex.c:535 msgid "\\ at end of pattern" msgstr "" -#: glib/gregex.c:561 +#: glib/gregex.c:539 msgid "\\c at end of pattern" msgstr "" -#: glib/gregex.c:566 +#: glib/gregex.c:544 msgid "unrecognized character following \\" msgstr "" -#: glib/gregex.c:570 +#: glib/gregex.c:548 msgid "numbers out of order in {} quantifier" msgstr "" -#: glib/gregex.c:574 +#: glib/gregex.c:552 msgid "number too big in {} quantifier" msgstr "" -#: glib/gregex.c:578 +#: glib/gregex.c:556 msgid "missing terminating for character class" msgstr "" -#: glib/gregex.c:582 +#: glib/gregex.c:560 msgid "invalid escape sequence in character class" msgstr "" -#: glib/gregex.c:586 +#: glib/gregex.c:564 msgid "range out of order in character class" msgstr "" -#: glib/gregex.c:591 +#: glib/gregex.c:569 msgid "nothing to repeat" msgstr "" -#: glib/gregex.c:595 +#: glib/gregex.c:573 msgid "unrecognized character after (? or (?-" msgstr "" -#: glib/gregex.c:599 +#: glib/gregex.c:577 msgid "POSIX named classes are supported only within a class" msgstr "" -#: glib/gregex.c:603 +#: glib/gregex.c:581 msgid "POSIX collating elements are not supported" msgstr "" -#: glib/gregex.c:609 +#: glib/gregex.c:587 msgid "missing terminating )" msgstr "" -#: glib/gregex.c:613 +#: glib/gregex.c:591 msgid "reference to non-existent subpattern" msgstr "" -#: glib/gregex.c:617 +#: glib/gregex.c:595 msgid "missing ) after comment" msgstr "" -#: glib/gregex.c:621 +#: glib/gregex.c:599 msgid "regular expression is too large" msgstr "" -#: glib/gregex.c:625 +#: glib/gregex.c:603 msgid "malformed number or name after (?(" msgstr "" -#: glib/gregex.c:629 +#: glib/gregex.c:607 msgid "lookbehind assertion is not fixed length" msgstr "" -#: glib/gregex.c:633 +#: glib/gregex.c:611 msgid "conditional group contains more than two branches" msgstr "" -#: glib/gregex.c:637 +#: glib/gregex.c:615 msgid "assertion expected after (?(" msgstr "" -#: glib/gregex.c:641 +#: glib/gregex.c:619 msgid "a numbered reference must not be zero" msgstr "" -#: glib/gregex.c:645 +#: glib/gregex.c:623 msgid "unknown POSIX class name" msgstr "" -#: glib/gregex.c:650 +#: glib/gregex.c:628 msgid "character value in \\x{...} sequence is too large" msgstr "" -#: glib/gregex.c:654 +#: glib/gregex.c:632 msgid "\\C not allowed in lookbehind assertion" msgstr "" -#: glib/gregex.c:658 +#: glib/gregex.c:636 msgid "missing terminator in subpattern name" msgstr "" -#: glib/gregex.c:662 +#: glib/gregex.c:640 msgid "two named subpatterns have the same name" msgstr "" -#: glib/gregex.c:666 +#: glib/gregex.c:644 msgid "malformed \\P or \\p sequence" msgstr "" -#: glib/gregex.c:670 +#: glib/gregex.c:648 msgid "unknown property name after \\P or \\p" msgstr "" -#: glib/gregex.c:674 +#: glib/gregex.c:652 msgid "subpattern name is too long (maximum 32 characters)" msgstr "" -#: glib/gregex.c:678 +#: glib/gregex.c:656 msgid "too many named subpatterns (maximum 10,000)" msgstr "" -#: glib/gregex.c:682 +#: glib/gregex.c:660 msgid "octal value is greater than \\377" -msgstr "Аабаны иҟоу аҵакы еиҳауп \\377" +msgstr "" -#: glib/gregex.c:686 +#: glib/gregex.c:664 msgid "DEFINE group contains more than one branch" msgstr "" -#: glib/gregex.c:690 +#: glib/gregex.c:668 msgid "inconsistent NEWLINE options" msgstr "" -#: glib/gregex.c:694 +#: glib/gregex.c:672 msgid "" "\\g is not followed by a braced, angle-bracketed, or quoted name or number, " "or by a plain number" msgstr "" -#: glib/gregex.c:699 +#: glib/gregex.c:677 msgid "an argument is not allowed for (*ACCEPT), (*FAIL), or (*COMMIT)" msgstr "" -#: glib/gregex.c:703 +#: glib/gregex.c:681 msgid "(*VERB) not recognized" msgstr "" -#: glib/gregex.c:707 +#: glib/gregex.c:685 msgid "number is too big" msgstr "" -#: glib/gregex.c:711 +#: glib/gregex.c:689 msgid "missing subpattern name after (?&" msgstr "" -#: glib/gregex.c:715 +#: glib/gregex.c:693 msgid "different names for subpatterns of the same number are not allowed" msgstr "" -#: glib/gregex.c:719 +#: glib/gregex.c:697 msgid "(*MARK) must have an argument" msgstr "" -#: glib/gregex.c:723 +#: glib/gregex.c:701 msgid "\\c must be followed by an ASCII character" msgstr "" -#: glib/gregex.c:727 +#: glib/gregex.c:705 msgid "\\k is not followed by a braced, angle-bracketed, or quoted name" msgstr "" -#: glib/gregex.c:731 +#: glib/gregex.c:709 msgid "\\N is not supported in a class" msgstr "" -#: glib/gregex.c:735 +#: glib/gregex.c:713 msgid "name is too long in (*MARK), (*PRUNE), (*SKIP), or (*THEN)" msgstr "" -#: glib/gregex.c:739 glib/gregex.c:875 +#: glib/gregex.c:717 glib/gregex.c:856 msgid "code overflow" msgstr "" -#: glib/gregex.c:743 +#: glib/gregex.c:721 msgid "unrecognized character after (?P" msgstr "" -#: glib/gregex.c:747 +#: glib/gregex.c:725 msgid "overran compiling workspace" msgstr "" -#: glib/gregex.c:751 +#: glib/gregex.c:729 msgid "previously-checked referenced subpattern not found" msgstr "" -#: glib/gregex.c:874 glib/gregex.c:1121 glib/gregex.c:2444 +#: glib/gregex.c:855 glib/gregex.c:1100 glib/gregex.c:2406 #, c-format msgid "Error while matching regular expression %s: %s" msgstr "" -#: glib/gregex.c:1721 +#: glib/gregex.c:1696 msgid "PCRE library is compiled without UTF8 support" msgstr "Абиблиотека PCRE еизгоуп UTF-8 амаҵурада" -#: glib/gregex.c:1729 +#: glib/gregex.c:1704 msgid "PCRE library is compiled with incompatible options" msgstr "Абиблиотека PCRE еизгоуп еимарам ахышәарақәа рыла" -#: glib/gregex.c:1847 +#: glib/gregex.c:1813 #, c-format msgid "Error while compiling regular expression ‘%s’ at char %s: %s" msgstr "" -#: glib/gregex.c:2887 +#: glib/gregex.c:2848 msgid "hexadecimal digit or “}” expected" msgstr "Иазыԥшуп жәаф хыԥхьаӡара змоу аԥхьаӡац, мамзар “}”" -#: glib/gregex.c:2903 +#: glib/gregex.c:2864 msgid "hexadecimal digit expected" msgstr "Иазыԥшуп жәаф хыԥхьаӡара змоу аԥхьаӡац" -#: glib/gregex.c:2943 +#: glib/gregex.c:2904 msgid "missing “<” in symbolic reference" msgstr "Иазхаӡом “<” асимволтә зхьарԥш аҟны" -#: glib/gregex.c:2952 +#: glib/gregex.c:2913 msgid "unfinished symbolic reference" msgstr "Ихырқәшам асимолтә зхьарԥш" -#: glib/gregex.c:2959 +#: glib/gregex.c:2920 msgid "zero-length symbolic reference" msgstr "Асимвотә зхьарԥш зоура ноль ыҟоу" -#: glib/gregex.c:2970 +#: glib/gregex.c:2931 msgid "digit expected" msgstr "Аԥхьаӡац азҧшра" -#: glib/gregex.c:2988 +#: glib/gregex.c:2949 msgid "illegal symbolic reference" msgstr "Иақәнагам асимволтә зхьарԥш" -#: glib/gregex.c:3051 +#: glib/gregex.c:3012 msgid "stray final “\\”" msgstr "" -#: glib/gregex.c:3055 +#: glib/gregex.c:3016 msgid "unknown escape sequence" msgstr "Еилкаам икодрку аишьҭагылазаара" -#: glib/gregex.c:3065 +#: glib/gregex.c:3026 #, c-format msgid "Error while parsing replacement text “%s” at char %lu: %s" msgstr "Аҧсахратә текст аилыргара агха “%s” асимвол %lu аҟны : %s" @@ -5512,92 +5511,92 @@ msgid "Text was empty (or contained only whitespace)" msgstr "" -#: glib/gspawn.c:310 +#: glib/gspawn.c:314 #, c-format msgid "Failed to read data from child process (%s)" msgstr "" -#: glib/gspawn.c:462 +#: glib/gspawn.c:466 #, c-format msgid "Unexpected error in reading data from a child process (%s)" msgstr "" -#: glib/gspawn.c:547 +#: glib/gspawn.c:551 #, c-format msgid "Unexpected error in waitpid() (%s)" msgstr "" -#: glib/gspawn.c:1166 glib/gspawn-win32.c:1488 +#: glib/gspawn.c:1170 glib/gspawn-win32.c:1488 #, c-format msgid "Child process exited with code %ld" msgstr "" -#: glib/gspawn.c:1174 +#: glib/gspawn.c:1178 #, c-format msgid "Child process killed by signal %ld" msgstr "" -#: glib/gspawn.c:1181 +#: glib/gspawn.c:1185 #, c-format msgid "Child process stopped by signal %ld" msgstr "" -#: glib/gspawn.c:1188 +#: glib/gspawn.c:1192 #, c-format msgid "Child process exited abnormally" msgstr "" -#: glib/gspawn.c:1867 glib/gspawn-win32.c:393 glib/gspawn-win32.c:401 +#: glib/gspawn.c:1885 glib/gspawn-win32.c:393 glib/gspawn-win32.c:401 #, c-format msgid "Failed to read from child pipe (%s)" msgstr "Иаҿыгоу аканал (%s) аҟынтә аиагара залымшахеит" -#: glib/gspawn.c:2230 +#: glib/gspawn.c:2248 #, c-format msgid "Failed to spawn child process “%s” (%s)" msgstr "" -#: glib/gspawn.c:2347 +#: glib/gspawn.c:2365 #, c-format msgid "Failed to fork (%s)" msgstr "" -#: glib/gspawn.c:2507 glib/gspawn-win32.c:424 +#: glib/gspawn.c:2525 glib/gspawn-win32.c:424 #, c-format msgid "Failed to change to directory “%s” (%s)" msgstr "" -#: glib/gspawn.c:2517 +#: glib/gspawn.c:2535 #, c-format msgid "Failed to execute child process “%s” (%s)" msgstr "" -#: glib/gspawn.c:2527 +#: glib/gspawn.c:2545 #, c-format msgid "Failed to open file to remap file descriptor (%s)" msgstr "" -#: glib/gspawn.c:2535 +#: glib/gspawn.c:2553 #, c-format msgid "Failed to duplicate file descriptor for child process (%s)" msgstr "" -#: glib/gspawn.c:2544 +#: glib/gspawn.c:2562 #, c-format msgid "Failed to fork child process (%s)" msgstr "" -#: glib/gspawn.c:2552 +#: glib/gspawn.c:2570 #, c-format msgid "Failed to close file descriptor for child process (%s)" msgstr "" -#: glib/gspawn.c:2560 +#: glib/gspawn.c:2578 #, c-format msgid "Unknown error executing child process “%s”" msgstr "" -#: glib/gspawn.c:2584 +#: glib/gspawn.c:2602 #, c-format msgid "Failed to read enough data from child pid pipe (%s)" msgstr "" @@ -5961,3 +5960,3879 @@ #, c-format msgid "%.1f EB" msgstr "" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +#, fuzzy + + + + + + + + + + + + + + + + + + + + + + + +#, fuzzy + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +#, fuzzy + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +#, fuzzy + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +#, fuzzy + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +#, fuzzy + + + +#, fuzzy + +#, fuzzy + + + + + + +#, fuzzy + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +#, fuzzy + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +#, fuzzy + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +#, fuzzy + + + + + + + + + + + + + + + + + + + + + + + + + +#, fuzzy + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +#, fuzzy
View file
_service:tar_scm:glib-2.74.4.tar.xz/po/be.po -> _service:tar_scm:glib-2.76.4.tar.xz/po/be.po
Changed
@@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: glib.master\n" "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/glib/issues\n" -"POT-Creation-Date: 2022-12-12 00:16+0000\n" -"PO-Revision-Date: 2022-12-16 01:48+0300\n" +"POT-Creation-Date: 2022-11-24 19:49+0000\n" +"PO-Revision-Date: 2023-01-20 19:54+0300\n" "Last-Translator: Yuras Shumovich <shumovichy@gmail.com>\n" "Language-Team: Belarusian <i18n-bel-gnome@googlegroups.com>\n" "Language: be\n" @@ -500,10 +500,11 @@ #, c-format msgid "Cannot spawn a message bus when AT_SECURE is set" msgstr "" +"Немагчыма стварыць шыну паведамлення, калі зададзена значэнне AT_SECURE" #: gio/gdbusaddress.c:1108 msgid "Cannot spawn a message bus without a machine-id: " -msgstr "Немагчыма стварыць шыну апавяшчэння без ідэнтыфікатара машыны: " +msgstr "Немагчыма стварыць шыну паведамлення без ідэнтыфікатара машыны: " #: gio/gdbusaddress.c:1115 #, c-format @@ -522,14 +523,14 @@ "Немагчыма вызначыць адрас сеансавай магістралі (такая здольнасць не " "рэалізаваная для вашай аперацыйнай сістэмы)" -#: gio/gdbusaddress.c:1375 gio/gdbusconnection.c:7321 +#: gio/gdbusaddress.c:1375 gio/gdbusconnection.c:7322 #, c-format msgid "" "Cannot determine bus address from DBUS_STARTER_BUS_TYPE environment variable " "— unknown value “%s”" msgstr "" -#: gio/gdbusaddress.c:1384 gio/gdbusconnection.c:7330 +#: gio/gdbusaddress.c:1384 gio/gdbusconnection.c:7331 msgid "" "Cannot determine bus address because the DBUS_STARTER_BUS_TYPE environment " "variable is not set" @@ -649,7 +650,7 @@ msgid "(Additionally, releasing the lock for “%s” also failed: %s) " msgstr "" -#: gio/gdbusconnection.c:590 gio/gdbusconnection.c:2404 +#: gio/gdbusconnection.c:590 gio/gdbusconnection.c:2405 msgid "The connection is closed" msgstr "Злучэнне закрыта" @@ -657,89 +658,89 @@ msgid "Timeout was reached" msgstr "Тэрмін чакання скончыўся" -#: gio/gdbusconnection.c:2527 +#: gio/gdbusconnection.c:2528 msgid "" "Unsupported flags encountered when constructing a client-side connection" msgstr "Падчас стварэння злучэння з боку кліента напатканыя невядомыя сцяжкі" -#: gio/gdbusconnection.c:4256 gio/gdbusconnection.c:4610 +#: gio/gdbusconnection.c:4257 gio/gdbusconnection.c:4611 #, c-format msgid "" "No such interface “org.freedesktop.DBus.Properties” on object at path %s" msgstr "" -#: gio/gdbusconnection.c:4401 +#: gio/gdbusconnection.c:4402 #, c-format msgid "No such property “%s”" msgstr "Уласцівасць «%s» адсутнічае" -#: gio/gdbusconnection.c:4413 +#: gio/gdbusconnection.c:4414 #, c-format msgid "Property “%s” is not readable" msgstr "Уласцівасць «%s» недаступна для чытання" -#: gio/gdbusconnection.c:4424 +#: gio/gdbusconnection.c:4425 #, c-format msgid "Property “%s” is not writable" msgstr "Уласцівасць «%s» недаступна для запісу" -#: gio/gdbusconnection.c:4444 +#: gio/gdbusconnection.c:4445 #, c-format msgid "Error setting property “%s”: Expected type “%s” but got “%s”" msgstr "" -#: gio/gdbusconnection.c:4549 gio/gdbusconnection.c:4764 -#: gio/gdbusconnection.c:6747 +#: gio/gdbusconnection.c:4550 gio/gdbusconnection.c:4765 +#: gio/gdbusconnection.c:6748 #, c-format msgid "No such interface “%s”" msgstr "Інтэрфейс «%s» адсутнічае" -#: gio/gdbusconnection.c:4986 gio/gdbusconnection.c:7261 +#: gio/gdbusconnection.c:4987 gio/gdbusconnection.c:7262 #, c-format msgid "No such interface “%s” on object at path %s" msgstr "" -#: gio/gdbusconnection.c:5087 +#: gio/gdbusconnection.c:5088 #, c-format msgid "No such method “%s”" msgstr "Метад «%s» адсутнічае" -#: gio/gdbusconnection.c:5118 +#: gio/gdbusconnection.c:5119 #, c-format msgid "Type of message, “%s”, does not match expected type “%s”" msgstr "" -#: gio/gdbusconnection.c:5321 +#: gio/gdbusconnection.c:5322 #, c-format msgid "An object is already exported for the interface %s at %s" msgstr "Аб'ект ужо экспартаваны для інтэрфейсу \"%s\" на \"%s\"" -#: gio/gdbusconnection.c:5548 +#: gio/gdbusconnection.c:5549 #, c-format msgid "Unable to retrieve property %s.%s" msgstr "" -#: gio/gdbusconnection.c:5604 +#: gio/gdbusconnection.c:5605 #, c-format msgid "Unable to set property %s.%s" msgstr "" -#: gio/gdbusconnection.c:5783 +#: gio/gdbusconnection.c:5784 #, c-format msgid "Method “%s” returned type “%s”, but expected “%s”" msgstr "" -#: gio/gdbusconnection.c:6859 +#: gio/gdbusconnection.c:6860 #, c-format msgid "Method “%s” on interface “%s” with signature “%s” does not exist" msgstr "" -#: gio/gdbusconnection.c:6980 +#: gio/gdbusconnection.c:6981 #, c-format msgid "A subtree is already exported for %s" msgstr "Паддрэва для \"%s\" ужо экспартавана" -#: gio/gdbusconnection.c:7269 +#: gio/gdbusconnection.c:7270 #, c-format msgid "Object does not exist at path “%s”" msgstr "Аб'ект па шляху «%s» не існуе" @@ -912,7 +913,7 @@ #: gio/gdbusmessage.c:2845 msgid "Cannot serialize message: " -msgstr "Не ўдалося серыялізаваць паведамленне: " +msgstr "Немагчыма серыялізаваць паведамленне: " #: gio/gdbusmessage.c:2898 #, c-format @@ -980,25 +981,25 @@ "and proxy was constructed with the G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START flag" msgstr "" -#: gio/gdbusserver.c:765 +#: gio/gdbusserver.c:758 msgid "Abstract namespace not supported" msgstr "" -#: gio/gdbusserver.c:857 +#: gio/gdbusserver.c:850 msgid "Cannot specify nonce file when creating a server" msgstr "Немагчыма вызначыць файл таямніцы (\"nonce\") пры стварэнні сервера" -#: gio/gdbusserver.c:939 +#: gio/gdbusserver.c:932 #, c-format msgid "Error writing nonce file at “%s”: %s" msgstr "" -#: gio/gdbusserver.c:1114 +#: gio/gdbusserver.c:1107 #, c-format msgid "The string “%s” is not a valid D-Bus GUID" msgstr "Радок «%s» не з'яўляецца правільным D-Bus GUID" -#: gio/gdbusserver.c:1152 +#: gio/gdbusserver.c:1145 #, c-format msgid "Cannot listen on unsupported transport “%s”" msgstr "" @@ -1288,7 +1289,7 @@ msgid "Not authorized to change debug settings" msgstr "" -#: gio/gdesktopappinfo.c:2182 gio/gdesktopappinfo.c:5120 +#: gio/gdesktopappinfo.c:2182 gio/gdesktopappinfo.c:5106 msgid "Unnamed" msgstr "Без назвы" @@ -1296,30 +1297,30 @@ msgid "Desktop file didn’t specify Exec field" msgstr "" -#: gio/gdesktopappinfo.c:2891 +#: gio/gdesktopappinfo.c:2877 msgid "Unable to find terminal required for application" msgstr "Не ўдалося знайсці тэрмінал, патрэбны для праграмы" -#: gio/gdesktopappinfo.c:3638 +#: gio/gdesktopappinfo.c:3624 #, c-format msgid "Can’t create user application configuration folder %s: %s" msgstr "" -#: gio/gdesktopappinfo.c:3642 +#: gio/gdesktopappinfo.c:3628 #, c-format msgid "Can’t create user MIME configuration folder %s: %s" msgstr "" -#: gio/gdesktopappinfo.c:3884 gio/gdesktopappinfo.c:3908 +#: gio/gdesktopappinfo.c:3870 gio/gdesktopappinfo.c:3894 msgid "Application information lacks an identifier" msgstr "Інфармацыі аб праграме не стае ідэнтыфікатара" -#: gio/gdesktopappinfo.c:4144 +#: gio/gdesktopappinfo.c:4130 #, c-format msgid "Can’t create user desktop file %s" msgstr "" -#: gio/gdesktopappinfo.c:4280 +#: gio/gdesktopappinfo.c:4266 #, c-format msgid "Custom definition for %s" msgstr "Уласнае азначэнне для %s" @@ -1392,7 +1393,7 @@ msgid "Containing mount does not exist" msgstr "Прымацаваны дыск, які змяшчае файл, не існуе" -#: gio/gfile.c:2641 gio/glocalfile.c:2500 +#: gio/gfile.c:2641 gio/glocalfile.c:2504 msgid "Can’t copy over directory" msgstr "" @@ -1540,37 +1541,37 @@ msgid "HTTP proxy server closed connection unexpectedly." msgstr "" -#: gio/gicon.c:300 +#: gio/gicon.c:299 #, c-format msgid "Wrong number of tokens (%d)" msgstr "Хібная колькасць складнікаў (%d)" -#: gio/gicon.c:320 +#: gio/gicon.c:319 #, c-format msgid "No type for class name %s" msgstr "Назва класа %s не мае тыпу" -#: gio/gicon.c:330 +#: gio/gicon.c:329 #, c-format msgid "Type %s does not implement the GIcon interface" msgstr "Тып %s не мае інтэрфейсу GIcon" -#: gio/gicon.c:341 +#: gio/gicon.c:340 #, c-format msgid "Type %s is not classed" msgstr "Тып %s не мае класаў" -#: gio/gicon.c:355 +#: gio/gicon.c:354 #, c-format msgid "Malformed version number: %s" msgstr "Хібны нумар версіі: %s" -#: gio/gicon.c:369 +#: gio/gicon.c:368 #, c-format msgid "Type %s does not implement from_tokens() on the GIcon interface" msgstr "Тып %s не мае функцыі from_tokens() для інтэрфейсу GIcon" -#: gio/gicon.c:471 +#: gio/gicon.c:470 msgid "Can’t handle the supplied version of the icon encoding" msgstr "" @@ -1788,7 +1789,7 @@ #: gio/gio-tool-copy.c:107 msgid "Copy one or more files from SOURCE to DESTINATION." -msgstr "Капіраваць адзін або некалькі файлаў з КРЫНІЦА ў МЕСЦА_ПРЫЗНАЧЭННЯ" +msgstr "Капіраваць адзін або некалькі файлаў з КРЫНІЦА ў МЕСЦА_ПРЫЗНАЧЭННЯ." #: gio/gio-tool-copy.c:109 msgid "" @@ -2915,7 +2916,7 @@ msgid "Invalid filename %s" msgstr "Няправільная назва файла %s" -#: gio/glocalfile.c:996 +#: gio/glocalfile.c:1005 #, c-format msgid "Error getting filesystem info for %s: %s" msgstr "" @@ -2924,124 +2925,124 @@ #. * the enclosing (user visible) mount of a file, but none #. * exists. #. -#: gio/glocalfile.c:1137 +#: gio/glocalfile.c:1141 #, c-format msgid "Containing mount for file %s not found" msgstr "" -#: gio/glocalfile.c:1160 +#: gio/glocalfile.c:1164 msgid "Can’t rename root directory" msgstr "" -#: gio/glocalfile.c:1178 gio/glocalfile.c:1201 +#: gio/glocalfile.c:1182 gio/glocalfile.c:1205 #, c-format msgid "Error renaming file %s: %s" msgstr "" -#: gio/glocalfile.c:1185 +#: gio/glocalfile.c:1189 msgid "Can’t rename file, filename already exists" msgstr "" -#: gio/glocalfile.c:1198 gio/glocalfile.c:2394 gio/glocalfile.c:2422 -#: gio/glocalfile.c:2561 gio/glocalfileoutputstream.c:658 +#: gio/glocalfile.c:1202 gio/glocalfile.c:2398 gio/glocalfile.c:2426 +#: gio/glocalfile.c:2565 gio/glocalfileoutputstream.c:658 msgid "Invalid filename" msgstr "Няправільная назва файла" -#: gio/glocalfile.c:1366 gio/glocalfile.c:1377 +#: gio/glocalfile.c:1370 gio/glocalfile.c:1381 #, c-format msgid "Error opening file %s: %s" msgstr "" -#: gio/glocalfile.c:1502 +#: gio/glocalfile.c:1506 #, c-format msgid "Error removing file %s: %s" msgstr "" -#: gio/glocalfile.c:1996 gio/glocalfile.c:2007 gio/glocalfile.c:2034 +#: gio/glocalfile.c:2000 gio/glocalfile.c:2011 gio/glocalfile.c:2038 #, c-format msgid "Error trashing file %s: %s" msgstr "" -#: gio/glocalfile.c:2054 +#: gio/glocalfile.c:2058 #, c-format msgid "Unable to create trash directory %s: %s" msgstr "" -#: gio/glocalfile.c:2075 +#: gio/glocalfile.c:2079 #, c-format msgid "Unable to find toplevel directory to trash %s" msgstr "" -#: gio/glocalfile.c:2083 +#: gio/glocalfile.c:2087 #, c-format msgid "Trashing on system internal mounts is not supported" msgstr "" -#: gio/glocalfile.c:2169 gio/glocalfile.c:2197 +#: gio/glocalfile.c:2173 gio/glocalfile.c:2201 #, c-format msgid "Unable to find or create trash directory %s to trash %s" msgstr "" -#: gio/glocalfile.c:2243 +#: gio/glocalfile.c:2247 #, c-format msgid "Unable to create trashing info file for %s: %s" msgstr "" -#: gio/glocalfile.c:2305 +#: gio/glocalfile.c:2309 #, c-format msgid "Unable to trash file %s across filesystem boundaries" msgstr "" -#: gio/glocalfile.c:2309 gio/glocalfile.c:2365 +#: gio/glocalfile.c:2313 gio/glocalfile.c:2369 #, c-format msgid "Unable to trash file %s: %s" msgstr "" -#: gio/glocalfile.c:2371 +#: gio/glocalfile.c:2375 #, c-format msgid "Unable to trash file %s" msgstr "" -#: gio/glocalfile.c:2397 +#: gio/glocalfile.c:2401 #, c-format msgid "Error creating directory %s: %s" msgstr "" -#: gio/glocalfile.c:2426 +#: gio/glocalfile.c:2430 #, c-format msgid "Filesystem does not support symbolic links" msgstr "Файлавая сістэма не падтрымлівае сімвальных спасылак" -#: gio/glocalfile.c:2429 +#: gio/glocalfile.c:2433 #, c-format msgid "Error making symbolic link %s: %s" msgstr "" -#: gio/glocalfile.c:2472 gio/glocalfile.c:2507 gio/glocalfile.c:2564 +#: gio/glocalfile.c:2476 gio/glocalfile.c:2511 gio/glocalfile.c:2568 #, c-format msgid "Error moving file %s: %s" msgstr "Памылка перамяшчэння файла %s: %s" -#: gio/glocalfile.c:2495 +#: gio/glocalfile.c:2499 msgid "Can’t move directory over directory" msgstr "" -#: gio/glocalfile.c:2521 gio/glocalfileoutputstream.c:1110 +#: gio/glocalfile.c:2525 gio/glocalfileoutputstream.c:1110 #: gio/glocalfileoutputstream.c:1124 gio/glocalfileoutputstream.c:1139 #: gio/glocalfileoutputstream.c:1156 gio/glocalfileoutputstream.c:1170 msgid "Backup file creation failed" msgstr "Не ўдалося стварыць запасную копію файла" -#: gio/glocalfile.c:2540 +#: gio/glocalfile.c:2544 #, c-format msgid "Error removing target file: %s" msgstr "Памылка выдалення мэтавага файла: %s" -#: gio/glocalfile.c:2554 +#: gio/glocalfile.c:2558 msgid "Move between mounts not supported" msgstr "Перамяшчэнне з аднаго прымацаванага дыска на іншы не падтрымліваецца" -#: gio/glocalfile.c:2728 +#: gio/glocalfile.c:2734 #, c-format msgid "Could not determine the disk usage of %s: %s" msgstr "Не ўдалося вызначыць узровень выкарыстання дыска для %s: %s" @@ -3063,116 +3064,116 @@ msgid "Error setting extended attribute “%s”: %s" msgstr "" -#: gio/glocalfileinfo.c:1732 gio/win32/gwinhttpfile.c:191 +#: gio/glocalfileinfo.c:1731 gio/win32/gwinhttpfile.c:191 msgid " (invalid encoding)" msgstr " (няправільнае кадаванне)" -#: gio/glocalfileinfo.c:1891 gio/glocalfileoutputstream.c:945 +#: gio/glocalfileinfo.c:1890 gio/glocalfileoutputstream.c:945 #: gio/glocalfileoutputstream.c:997 #, c-format msgid "Error when getting information for file “%s”: %s" msgstr "Памылка пры зборы звестак пра файл “%s”: %s" -#: gio/glocalfileinfo.c:2157 +#: gio/glocalfileinfo.c:2156 #, c-format msgid "Error when getting information for file descriptor: %s" msgstr "Памылка пры зборы звестак аб дэскрыптары файла: %s" -#: gio/glocalfileinfo.c:2202 +#: gio/glocalfileinfo.c:2201 msgid "Invalid attribute type (uint32 expected)" msgstr "Няправільны тып атрыбута (чакаўся uint32)" -#: gio/glocalfileinfo.c:2220 +#: gio/glocalfileinfo.c:2219 msgid "Invalid attribute type (uint64 expected)" msgstr "Няправільны тып атрыбута (чакаўся uint64)" -#: gio/glocalfileinfo.c:2239 gio/glocalfileinfo.c:2258 +#: gio/glocalfileinfo.c:2238 gio/glocalfileinfo.c:2257 msgid "Invalid attribute type (byte string expected)" msgstr "Няправільны тып атрыбута (чакаўся радок байтаў)" -#: gio/glocalfileinfo.c:2305 +#: gio/glocalfileinfo.c:2304 msgid "Cannot set permissions on symlinks" msgstr "Немагчыма настаўляць дазволы для сімвальных спасылак" -#: gio/glocalfileinfo.c:2321 +#: gio/glocalfileinfo.c:2320 #, c-format msgid "Error setting permissions: %s" msgstr "Памылка настаўлення дазволаў: %s" -#: gio/glocalfileinfo.c:2372 +#: gio/glocalfileinfo.c:2371 #, c-format msgid "Error setting owner: %s" msgstr "Памылка прызначэння ўласніка: %s" -#: gio/glocalfileinfo.c:2395 +#: gio/glocalfileinfo.c:2394 msgid "symlink must be non-NULL" msgstr "сімвальная спасылка не можа мець NULL-значэнне" -#: gio/glocalfileinfo.c:2405 gio/glocalfileinfo.c:2424 -#: gio/glocalfileinfo.c:2435 +#: gio/glocalfileinfo.c:2404 gio/glocalfileinfo.c:2423 +#: gio/glocalfileinfo.c:2434 #, c-format msgid "Error setting symlink: %s" msgstr "Памылка настаўлення сімвальнай спасылкі: %s" -#: gio/glocalfileinfo.c:2414 +#: gio/glocalfileinfo.c:2413 msgid "Error setting symlink: file is not a symlink" msgstr "Памылка настаўлення: файл не з'яўляецца сімвальнай спасылкай" -#: gio/glocalfileinfo.c:2506 +#: gio/glocalfileinfo.c:2505 #, c-format msgid "Extra nanoseconds %d for UNIX timestamp %lld are negative" msgstr "" -#: gio/glocalfileinfo.c:2515 +#: gio/glocalfileinfo.c:2514 #, c-format msgid "Extra nanoseconds %d for UNIX timestamp %lld reach 1 second" msgstr "" -#: gio/glocalfileinfo.c:2525 +#: gio/glocalfileinfo.c:2524 #, c-format msgid "UNIX timestamp %lld does not fit into 64 bits" msgstr "" -#: gio/glocalfileinfo.c:2536 +#: gio/glocalfileinfo.c:2535 #, c-format msgid "UNIX timestamp %lld is outside of the range supported by Windows" msgstr "" "Часавы адбітак UNIX %lld па-за межамі дыяпазону, які падтрымліваецца Windows" -#: gio/glocalfileinfo.c:2668 +#: gio/glocalfileinfo.c:2667 #, c-format msgid "File name “%s” cannot be converted to UTF-16" msgstr "" -#: gio/glocalfileinfo.c:2687 +#: gio/glocalfileinfo.c:2686 #, c-format msgid "File “%s” cannot be opened: Windows Error %lu" msgstr "" -#: gio/glocalfileinfo.c:2700 +#: gio/glocalfileinfo.c:2699 #, c-format msgid "Error setting modification or access time for file “%s”: %lu" msgstr "" -#: gio/glocalfileinfo.c:2856 +#: gio/glocalfileinfo.c:2855 #, c-format msgid "Error setting modification or access time: %s" msgstr "Памылка настаўлення часавых метак змянення і доступу: %s" -#: gio/glocalfileinfo.c:2879 +#: gio/glocalfileinfo.c:2878 msgid "SELinux context must be non-NULL" msgstr "SELinux-кантэкст не можа мець NULL-значэнне" -#: gio/glocalfileinfo.c:2886 +#: gio/glocalfileinfo.c:2885 msgid "SELinux is not enabled on this system" msgstr "SELinux не ўключаны для гэтай сістэмы" -#: gio/glocalfileinfo.c:2896 +#: gio/glocalfileinfo.c:2895 #, c-format msgid "Error setting SELinux context: %s" msgstr "Памылка настаўлення SELinux-кантэксту: %s" -#: gio/glocalfileinfo.c:2993 +#: gio/glocalfileinfo.c:2992 #, c-format msgid "Setting attribute %s not supported" msgstr "Настаўленне атрыбута %s не падтрымліваецца" @@ -3276,11 +3277,11 @@ #: gio/gmemoryoutputstream.c:774 msgid "Requested seek before the beginning of the stream" -msgstr "Атрыманы запыт на пракрутку струменя далей за яго пачатак" +msgstr "Атрыманы запыт на пракрутку ў пазіцыю, ранейшую за пачатак струменя" #: gio/gmemoryoutputstream.c:789 msgid "Requested seek beyond the end of the stream" -msgstr "Атрыманы запыт на пракрутку далей за яго канец" +msgstr "Атрыманы запыт на пракрутку ў пазіцыю, далейшую за канец струменя" #. Translators: This is an error #. * message for mount objects that @@ -3388,8 +3389,8 @@ #. Translators: the first placeholder is a domain name, the #. * second is an error message #: gio/gresolver.c:403 gio/gthreadedresolver.c:152 gio/gthreadedresolver.c:170 -#: gio/gthreadedresolver.c:782 gio/gthreadedresolver.c:806 -#: gio/gthreadedresolver.c:831 gio/gthreadedresolver.c:846 +#: gio/gthreadedresolver.c:798 gio/gthreadedresolver.c:822 +#: gio/gthreadedresolver.c:847 gio/gthreadedresolver.c:862 #, c-format msgid "Error resolving “%s”: %s" msgstr "" @@ -3938,7 +3939,7 @@ #: gio/gsocket.c:5275 gio/gsocket.c:5315 gio/gsocket.c:5317 #, c-format msgid "Error sending message: %s" -msgstr "Памылка пасылання паведамлення: %s" +msgstr "Памылка адпраўкі паведамлення: %s" #: gio/gsocket.c:5039 msgid "GSocketControlMessage not supported on Windows" @@ -4104,35 +4105,35 @@ #. Translators: the placeholder is a DNS record type, such as ‘MX’ or ‘SRV’ #: gio/gthreadedresolver.c:552 gio/gthreadedresolver.c:574 -#: gio/gthreadedresolver.c:612 gio/gthreadedresolver.c:659 -#: gio/gthreadedresolver.c:688 gio/gthreadedresolver.c:700 +#: gio/gthreadedresolver.c:628 gio/gthreadedresolver.c:675 +#: gio/gthreadedresolver.c:704 gio/gthreadedresolver.c:716 #, c-format msgid "Error parsing DNS %s record: malformed DNS packet" msgstr "" -#: gio/gthreadedresolver.c:758 gio/gthreadedresolver.c:895 -#: gio/gthreadedresolver.c:993 gio/gthreadedresolver.c:1043 +#: gio/gthreadedresolver.c:774 gio/gthreadedresolver.c:911 +#: gio/gthreadedresolver.c:1009 gio/gthreadedresolver.c:1059 #, c-format msgid "No DNS record of the requested type for “%s”" msgstr "" -#: gio/gthreadedresolver.c:763 gio/gthreadedresolver.c:998 +#: gio/gthreadedresolver.c:779 gio/gthreadedresolver.c:1014 #, c-format msgid "Temporarily unable to resolve “%s”" msgstr "" -#: gio/gthreadedresolver.c:768 gio/gthreadedresolver.c:1003 -#: gio/gthreadedresolver.c:1113 +#: gio/gthreadedresolver.c:784 gio/gthreadedresolver.c:1019 +#: gio/gthreadedresolver.c:1129 #, c-format msgid "Error resolving “%s”" msgstr "" -#: gio/gthreadedresolver.c:782 gio/gthreadedresolver.c:806 -#: gio/gthreadedresolver.c:831 gio/gthreadedresolver.c:846 +#: gio/gthreadedresolver.c:798 gio/gthreadedresolver.c:822 +#: gio/gthreadedresolver.c:847 gio/gthreadedresolver.c:862 msgid "Malformed DNS packet" msgstr "" -#: gio/gthreadedresolver.c:888 +#: gio/gthreadedresolver.c:904 #, c-format msgid "Failed to parse DNS response for “%s”: " msgstr "" @@ -4339,77 +4340,77 @@ msgid "Wrong args\n" msgstr "Няправільныя аргументы\n" -#: glib/gbookmarkfile.c:779 +#: glib/gbookmarkfile.c:861 #, c-format msgid "Unexpected attribute “%s” for element “%s”" msgstr "" -#: glib/gbookmarkfile.c:790 glib/gbookmarkfile.c:870 glib/gbookmarkfile.c:880 -#: glib/gbookmarkfile.c:993 +#: glib/gbookmarkfile.c:872 glib/gbookmarkfile.c:952 glib/gbookmarkfile.c:962 +#: glib/gbookmarkfile.c:1075 #, c-format msgid "Attribute “%s” of element “%s” not found" msgstr "" -#: glib/gbookmarkfile.c:1202 glib/gbookmarkfile.c:1267 -#: glib/gbookmarkfile.c:1331 glib/gbookmarkfile.c:1341 +#: glib/gbookmarkfile.c:1284 glib/gbookmarkfile.c:1349 +#: glib/gbookmarkfile.c:1413 glib/gbookmarkfile.c:1423 #, c-format msgid "Unexpected tag “%s”, tag “%s” expected" msgstr "" -#: glib/gbookmarkfile.c:1227 glib/gbookmarkfile.c:1241 -#: glib/gbookmarkfile.c:1309 glib/gbookmarkfile.c:1355 +#: glib/gbookmarkfile.c:1309 glib/gbookmarkfile.c:1323 +#: glib/gbookmarkfile.c:1391 glib/gbookmarkfile.c:1437 #, c-format msgid "Unexpected tag “%s” inside “%s”" msgstr "" -#: glib/gbookmarkfile.c:1635 +#: glib/gbookmarkfile.c:1717 #, c-format msgid "Invalid date/time ‘%s’ in bookmark file" msgstr "" -#: glib/gbookmarkfile.c:1838 +#: glib/gbookmarkfile.c:1956 msgid "No valid bookmark file found in data dirs" msgstr "У каталогах з данымі не знойдзена файлаў з закладкамі" -#: glib/gbookmarkfile.c:2039 +#: glib/gbookmarkfile.c:2157 #, c-format msgid "A bookmark for URI “%s” already exists" msgstr "" -#: glib/gbookmarkfile.c:2088 glib/gbookmarkfile.c:2246 -#: glib/gbookmarkfile.c:2331 glib/gbookmarkfile.c:2411 -#: glib/gbookmarkfile.c:2496 glib/gbookmarkfile.c:2630 -#: glib/gbookmarkfile.c:2763 glib/gbookmarkfile.c:2898 -#: glib/gbookmarkfile.c:2940 glib/gbookmarkfile.c:3037 -#: glib/gbookmarkfile.c:3158 glib/gbookmarkfile.c:3352 -#: glib/gbookmarkfile.c:3493 glib/gbookmarkfile.c:3712 -#: glib/gbookmarkfile.c:3801 glib/gbookmarkfile.c:3890 -#: glib/gbookmarkfile.c:4009 +#: glib/gbookmarkfile.c:2206 glib/gbookmarkfile.c:2364 +#: glib/gbookmarkfile.c:2449 glib/gbookmarkfile.c:2529 +#: glib/gbookmarkfile.c:2614 glib/gbookmarkfile.c:2748 +#: glib/gbookmarkfile.c:2881 glib/gbookmarkfile.c:3016 +#: glib/gbookmarkfile.c:3058 glib/gbookmarkfile.c:3155 +#: glib/gbookmarkfile.c:3276 glib/gbookmarkfile.c:3470 +#: glib/gbookmarkfile.c:3611 glib/gbookmarkfile.c:3830 +#: glib/gbookmarkfile.c:3919 glib/gbookmarkfile.c:4008 +#: glib/gbookmarkfile.c:4127 #, c-format msgid "No bookmark found for URI “%s”" msgstr "" -#: glib/gbookmarkfile.c:2420 +#: glib/gbookmarkfile.c:2538 #, c-format msgid "No MIME type defined in the bookmark for URI “%s”" msgstr "" -#: glib/gbookmarkfile.c:2505 +#: glib/gbookmarkfile.c:2623 #, c-format msgid "No private flag has been defined in bookmark for URI “%s”" msgstr "" -#: glib/gbookmarkfile.c:3046 +#: glib/gbookmarkfile.c:3164 #, c-format msgid "No groups set in bookmark for URI “%s”" msgstr "" -#: glib/gbookmarkfile.c:3514 glib/gbookmarkfile.c:3722 +#: glib/gbookmarkfile.c:3632 glib/gbookmarkfile.c:3840 #, c-format msgid "No application with name “%s” registered a bookmark for “%s”" msgstr "" -#: glib/gbookmarkfile.c:3745 +#: glib/gbookmarkfile.c:3863 #, c-format msgid "Failed to expand exec line “%s” with URI “%s”" msgstr "" @@ -4882,7 +4883,7 @@ #: glib/gdir.c:158 #, c-format msgid "Error opening directory “%s”: %s" -msgstr "" +msgstr "Памылка адкрыцця каталога «%s»: %s" #: glib/gfileutils.c:735 glib/gfileutils.c:827 #, c-format @@ -5685,92 +5686,92 @@ msgid "Text was empty (or contained only whitespace)" msgstr "Тэкст пусты (або змяшчаў толькі прабельныя знакі)." -#: glib/gspawn.c:310 +#: glib/gspawn.c:319 #, c-format msgid "Failed to read data from child process (%s)" msgstr "Не ўдалося прачытаць даныя працэсу-нашчадка (%s)" -#: glib/gspawn.c:462 +#: glib/gspawn.c:471 #, c-format msgid "Unexpected error in reading data from a child process (%s)" msgstr "Нечаканая памылка падчас чытання даных працэсу-нашчадка (%s)" -#: glib/gspawn.c:547 +#: glib/gspawn.c:556 #, c-format msgid "Unexpected error in waitpid() (%s)" msgstr "Нечаканая памылка ў waitpid() (%s)" -#: glib/gspawn.c:1166 glib/gspawn-win32.c:1488 +#: glib/gspawn.c:1175 glib/gspawn-win32.c:1488 #, c-format msgid "Child process exited with code %ld" msgstr "Працэс-нашчадак скончыў працу з кодам %ld" -#: glib/gspawn.c:1174 +#: glib/gspawn.c:1183 #, c-format msgid "Child process killed by signal %ld" msgstr "Працэс-нашчадак забіты сігналам %ld" -#: glib/gspawn.c:1181 +#: glib/gspawn.c:1190 #, c-format msgid "Child process stopped by signal %ld" msgstr "Працэс-нашчадак спынены сігналам %ld" -#: glib/gspawn.c:1188 +#: glib/gspawn.c:1197 #, c-format msgid "Child process exited abnormally" msgstr "Працэс-нашчадак скончыў працу надзвычайным чынам" -#: glib/gspawn.c:1867 glib/gspawn-win32.c:393 glib/gspawn-win32.c:401 +#: glib/gspawn.c:2027 glib/gspawn-win32.c:393 glib/gspawn-win32.c:401 #, c-format msgid "Failed to read from child pipe (%s)" msgstr "Не ўдалося прачытаць даныя з канала нашчадка (%s)" -#: glib/gspawn.c:2230 +#: glib/gspawn.c:2390 #, c-format msgid "Failed to spawn child process “%s” (%s)" msgstr "Не ўдалося запусціць працэс-нашчадак «%s» (%s)" -#: glib/gspawn.c:2347 +#: glib/gspawn.c:2507 #, c-format msgid "Failed to fork (%s)" msgstr "Не ўдалося адгалінаваць працэс (%s)" -#: glib/gspawn.c:2507 glib/gspawn-win32.c:424 +#: glib/gspawn.c:2667 glib/gspawn-win32.c:424 #, c-format msgid "Failed to change to directory “%s” (%s)" msgstr "Не ўдалося змяніць каталог «%s» (%s)" -#: glib/gspawn.c:2517 +#: glib/gspawn.c:2677 #, c-format msgid "Failed to execute child process “%s” (%s)" msgstr "Не ўдалося выканаць працэс-нашчадак «%s» (%s)" -#: glib/gspawn.c:2527 +#: glib/gspawn.c:2687 #, c-format msgid "Failed to open file to remap file descriptor (%s)" msgstr "" -#: glib/gspawn.c:2535 +#: glib/gspawn.c:2695 #, c-format msgid "Failed to duplicate file descriptor for child process (%s)" msgstr "" -#: glib/gspawn.c:2544 +#: glib/gspawn.c:2704 #, c-format msgid "Failed to fork child process (%s)" msgstr "Не ўдалося адгалінаваць працэс-нашчадак (%s)" -#: glib/gspawn.c:2552 +#: glib/gspawn.c:2712 #, c-format msgid "Failed to close file descriptor for child process (%s)" msgstr "" -#: glib/gspawn.c:2560 +#: glib/gspawn.c:2720 #, c-format msgid "Unknown error executing child process “%s”" msgstr "Невядомая памылка падчас выканання працэсу-нашчадка «%s»" -#: glib/gspawn.c:2584 +#: glib/gspawn.c:2744 #, c-format msgid "Failed to read enough data from child pid pipe (%s)" msgstr "" @@ -5824,21 +5825,21 @@ "Нечаканая памылка ў функцыі g_io_channel_win32_poll() падчас чытання даных " "працэсу-нашчадка" -#: glib/gstrfuncs.c:3372 glib/gstrfuncs.c:3474 +#: glib/gstrfuncs.c:3370 glib/gstrfuncs.c:3472 msgid "Empty string is not a number" msgstr "Пусты радок не з'яўляецца лікам" -#: glib/gstrfuncs.c:3396 +#: glib/gstrfuncs.c:3394 #, c-format msgid "“%s” is not a signed number" msgstr "«%s» не з'яўляецца лікам са знакам" -#: glib/gstrfuncs.c:3406 glib/gstrfuncs.c:3510 +#: glib/gstrfuncs.c:3404 glib/gstrfuncs.c:3508 #, c-format msgid "Number “%s” is out of bounds %s, %s" msgstr "Лік «%s» па-за межамі дыяпазону %s, %s" -#: glib/gstrfuncs.c:3500 +#: glib/gstrfuncs.c:3498 #, c-format msgid "“%s” is not an unsigned number" msgstr "«%s» не з'яўляецца лікам без знака"
View file
_service:tar_scm:glib-2.74.4.tar.xz/po/bg.po -> _service:tar_scm:glib-2.76.4.tar.xz/po/bg.po
Changed
@@ -2,10 +2,10 @@ # Copyright (C) 2002, 2005, 2006, 2007, 2009 Free Software Foundation, Inc. # Copyright (C) 2010, 2011, 2012, 2013, 2015 Free Software Foundation, Inc. # Copyright (C) 2016 Free Software Foundation, Inc. -# Copyright (C) 2022 Alexander Shopov. +# Copyright (C) 2022, 2023 Alexander Shopov. # Borislav Aleksandrov <B.Aleksandrov@cnsys.bg>, 2002. # Alexander Shopov <ash@kambanaria.org>, 2002, 2005, 2006, 2007, 2008, 2009, 2010, 2011. -# Alexander Shopov <ash@kambanaria.org>, 2012, 2013, 2015, 2016, 2022. +# Alexander Shopov <ash@kambanaria.org>, 2012, 2013, 2015, 2016, 2022, 2023. # Damyan Ivanov <dam+gnome@ktnx.net>, 2010. # Krasimir Chonov <mk2616@abv.bg>, 2014. # @@ -13,8 +13,8 @@ msgstr "" "Project-Id-Version: glib main\n" "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/glib/issues\n" -"POT-Creation-Date: 2022-09-12 18:00+0000\n" -"PO-Revision-Date: 2022-09-13 09:41+0200\n" +"POT-Creation-Date: 2023-02-15 16:30+0000\n" +"PO-Revision-Date: 2023-03-04 19:15+0200\n" "Last-Translator: Alexander Shopov <ash@kambanaria.org>\n" "Language-Team: Bulgarian <dict@fsa-bg.org>\n" "Language: bg\n" @@ -23,24 +23,24 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: gio/gappinfo.c:335 +#: gio/gappinfo.c:339 msgid "Setting default applications not supported yet" msgstr "Задаването на приложение като стандартно не се поддържа" -#: gio/gappinfo.c:368 +#: gio/gappinfo.c:372 msgid "Setting application as last used for type not supported yet" msgstr "" "Задаването на последно ползваното приложение като стандартно не се поддържа" -#: gio/gappinfo.c:810 +#: gio/gappinfo.c:814 #, c-format msgid "Failed to find default application for content type ‘%s’" msgstr "Липсва стандартно приложение за съдържание от вид „%s“" -#: gio/gappinfo.c:870 +#: gio/gappinfo.c:874 #, c-format msgid "Failed to find default application for URI Scheme ‘%s’" -msgstr "ЛипсваНяма стандартно приложение за схема за адреси „%s“" +msgstr "Няма стандартно приложение за схема за адреси „%s“" #: gio/gapplication.c:502 msgid "GApplication options" @@ -242,12 +242,12 @@ msgid "error sending %s message to application: %s\n" msgstr "грешка при изпращане на съобщение „%s“ до приложение „%s“\n" -#: gio/gapplication-tool.c:321 +#: gio/gapplication-tool.c:324 msgid "action name must be given after application id\n" msgstr "" "името на действие трябва да бъде подадено след идентификатора на приложение\n" -#: gio/gapplication-tool.c:329 +#: gio/gapplication-tool.c:332 #, c-format msgid "" "invalid action name: “%s”\n" @@ -256,25 +256,25 @@ "неправилно име на действие: „%s“\n" "името трябва да съдържа букви, цифри, „-“ или „.“\n" -#: gio/gapplication-tool.c:348 +#: gio/gapplication-tool.c:351 #, c-format msgid "error parsing action parameter: %s\n" msgstr "грешка при анализа на параметър: %s\n" -#: gio/gapplication-tool.c:360 +#: gio/gapplication-tool.c:363 msgid "actions accept a maximum of one parameter\n" msgstr "действията приемат само по един параметър\n" -#: gio/gapplication-tool.c:415 +#: gio/gapplication-tool.c:418 msgid "list-actions command takes only the application id" msgstr "командата „list-actions“ изисква само идентификатор на приложение" -#: gio/gapplication-tool.c:425 +#: gio/gapplication-tool.c:428 #, c-format msgid "unable to find desktop file for application %s\n" msgstr "не може да се открие файл „.desktop“ за приложението „%s“\n" -#: gio/gapplication-tool.c:470 +#: gio/gapplication-tool.c:473 #, c-format msgid "" "unrecognised command: %s\n" @@ -309,11 +309,11 @@ msgid "Truncate not supported on base stream" msgstr "Основният поток не може да се съкращава" -#: gio/gcancellable.c:319 gio/gdbusconnection.c:1859 gio/gdbusprivate.c:1420 +#: gio/gcancellable.c:326 gio/gdbusconnection.c:1859 gio/gdbusprivate.c:1420 #: gio/gsimpleasyncresult.c:873 gio/gsimpleasyncresult.c:899 #, c-format msgid "Operation was cancelled" -msgstr "Действието е прекратено" +msgstr "Действието е отменено" #: gio/gcharsetconverter.c:262 msgid "Invalid object, not initialized" @@ -329,13 +329,13 @@ #: gio/gcharsetconverter.c:344 gio/gdatainputstream.c:850 #: gio/gdatainputstream.c:1268 glib/gconvert.c:451 glib/gconvert.c:883 -#: glib/giochannel.c:1576 glib/giochannel.c:1618 glib/giochannel.c:2473 +#: glib/giochannel.c:1576 glib/giochannel.c:1618 glib/giochannel.c:2478 #: glib/gutf8.c:892 glib/gutf8.c:1346 msgid "Invalid byte sequence in conversion input" msgstr "Грешна байтова последователност на входа за преобразуване" #: gio/gcharsetconverter.c:349 glib/gconvert.c:459 glib/gconvert.c:797 -#: glib/giochannel.c:1583 glib/giochannel.c:2485 +#: glib/giochannel.c:1583 glib/giochannel.c:2493 #, c-format msgid "Error during conversion: %s" msgstr "Грешка по време на преобразуване: %s" @@ -395,17 +395,17 @@ msgid "Unexpected early end-of-stream" msgstr "Неочаквано ранен край на поток" -#: gio/gdbusaddress.c:164 gio/gdbusaddress.c:238 gio/gdbusaddress.c:327 +#: gio/gdbusaddress.c:162 gio/gdbusaddress.c:234 gio/gdbusaddress.c:321 #, c-format msgid "Unsupported key “%s” in address entry “%s”" msgstr "Неподдържан ключ „%s“ в адрес „%s“" -#: gio/gdbusaddress.c:177 +#: gio/gdbusaddress.c:175 #, c-format msgid "Meaningless key/value pair combination in address entry “%s”" msgstr "Безсмислена комбинация от ключ и стойност в адреса „%s“" -#: gio/gdbusaddress.c:186 +#: gio/gdbusaddress.c:184 #, c-format msgid "" "Address “%s” is invalid (need exactly one of path, dir, tmpdir, or abstract " @@ -414,28 +414,28 @@ "Адресът „%s“ е грешен (трябва да съдържа само едно от следните: път, " "директория, временна директория или абстрактни ключове)" -#: gio/gdbusaddress.c:253 gio/gdbusaddress.c:264 gio/gdbusaddress.c:279 -#: gio/gdbusaddress.c:342 gio/gdbusaddress.c:353 +#: gio/gdbusaddress.c:249 gio/gdbusaddress.c:260 gio/gdbusaddress.c:275 +#: gio/gdbusaddress.c:336 gio/gdbusaddress.c:347 #, c-format msgid "Error in address “%s” — the “%s” attribute is malformed" msgstr "Грешка в адреса „%s“ — атрибутът „%s“ е неправилен" -#: gio/gdbusaddress.c:423 gio/gdbusaddress.c:682 +#: gio/gdbusaddress.c:417 gio/gdbusaddress.c:676 #, c-format msgid "Unknown or unsupported transport “%s” for address “%s”" msgstr "Непознат или неподдържан транспорт „%s“ за адрес „%s“" -#: gio/gdbusaddress.c:467 +#: gio/gdbusaddress.c:461 #, c-format msgid "Address element “%s” does not contain a colon (:)" msgstr "Елементът на адреса „%s“ не съдържа двоеточие („:“)" -#: gio/gdbusaddress.c:476 +#: gio/gdbusaddress.c:470 #, c-format msgid "Transport name in address element “%s” must not be empty" msgstr "Името на транспорта в елемента на адреса „%s“ не трябва да е празно" -#: gio/gdbusaddress.c:497 +#: gio/gdbusaddress.c:491 #, c-format msgid "" "Key/Value pair %d, “%s”, in address element “%s” does not contain an equal " @@ -444,14 +444,14 @@ "Двойката ключ/стойност %d, „%s“ в адресния елемент „%s“ не съдържа знак за " "равенство („=“)" -#: gio/gdbusaddress.c:508 +#: gio/gdbusaddress.c:502 #, c-format msgid "" "Key/Value pair %d, “%s”, in address element “%s” must not have an empty key" msgstr "" "Двойката ключ/стойност %d, „%s“ в адресния елемент „%s“ съдържа празен ключ" -#: gio/gdbusaddress.c:522 +#: gio/gdbusaddress.c:516 #, c-format msgid "" "Error unescaping key or value in Key/Value pair %d, “%s”, in address element " @@ -460,7 +460,7 @@ "Грешка при декодиране на ключа или стойността в двойката %d, „%s“ в адресния " "елемент „%s“" -#: gio/gdbusaddress.c:590 +#: gio/gdbusaddress.c:584 #, c-format msgid "" "Error in address “%s” — the unix transport requires exactly one of the keys " @@ -469,83 +469,83 @@ "Грешка в адреса „%s“ — транспортът „unix“ изисква точно един от ключовете " "„path“ или „abstract“" -#: gio/gdbusaddress.c:625 +#: gio/gdbusaddress.c:619 #, c-format msgid "Error in address “%s” — the host attribute is missing or malformed" msgstr "Грешка в адреса „%s“ — атрибутът за хост „host“ липсва или е грешен" -#: gio/gdbusaddress.c:639 +#: gio/gdbusaddress.c:633 #, c-format msgid "Error in address “%s” — the port attribute is missing or malformed" msgstr "Грешка в адреса „%s“ — атрибутът за порт „port“ липсва или е грешен" -#: gio/gdbusaddress.c:653 +#: gio/gdbusaddress.c:647 #, c-format msgid "Error in address “%s” — the noncefile attribute is missing or malformed" msgstr "" "Грешка в адреса „%s“ — атрибутът за момент „noncefile“ липсва или е грешен" -#: gio/gdbusaddress.c:674 +#: gio/gdbusaddress.c:668 msgid "Error auto-launching: " msgstr "Грешка при автоматично стартиране: " -#: gio/gdbusaddress.c:727 +#: gio/gdbusaddress.c:721 #, c-format msgid "Error opening nonce file “%s”: %s" msgstr "Грешка при отваряне на моментен файл „%s“: %s" -#: gio/gdbusaddress.c:746 +#: gio/gdbusaddress.c:740 #, c-format msgid "Error reading from nonce file “%s”: %s" msgstr "Грешка при четене на моментен файл „%s“: %s" -#: gio/gdbusaddress.c:755 +#: gio/gdbusaddress.c:749 #, c-format msgid "Error reading from nonce file “%s”, expected 16 bytes, got %d" msgstr "" "Грешка при четене на моментен файл „%s“, очакват се 16 байта, а са получени " "%d" -#: gio/gdbusaddress.c:773 +#: gio/gdbusaddress.c:767 #, c-format msgid "Error writing contents of nonce file “%s” to stream:" msgstr "Грешка при запис на съдържанието на моментен файл „%s“ в поток:" -#: gio/gdbusaddress.c:988 +#: gio/gdbusaddress.c:982 msgid "The given address is empty" msgstr "Даденият адрес е празен" -#: gio/gdbusaddress.c:1101 +#: gio/gdbusaddress.c:1095 #, c-format msgid "Cannot spawn a message bus when AT_SECURE is set" msgstr "" "Създаването на шина за обмен на съобщения не е възможно при изрично зададен " "„AT_SECURE“" -#: gio/gdbusaddress.c:1108 +#: gio/gdbusaddress.c:1102 msgid "Cannot spawn a message bus without a machine-id: " msgstr "" "Създаването на шина за обмен на съобщения не е възможно без идентификатор на " "машина: " -#: gio/gdbusaddress.c:1115 +#: gio/gdbusaddress.c:1109 #, c-format msgid "Cannot autolaunch D-Bus without X11 $DISPLAY" msgstr "D-Bus не може да се стартира автоматично без „$DISPLAY“ от X11" -#: gio/gdbusaddress.c:1157 +#: gio/gdbusaddress.c:1151 #, c-format msgid "Error spawning command line “%s”: " msgstr "Грешка при изпълняване на външна команда „%s“: " -#: gio/gdbusaddress.c:1226 +#: gio/gdbusaddress.c:1220 #, c-format msgid "Cannot determine session bus address (not implemented for this OS)" msgstr "" "Адресът на шината на сесията не може да се определи (липсва реализация за " "тази операционна система)" -#: gio/gdbusaddress.c:1375 gio/gdbusconnection.c:7321 +#: gio/gdbusaddress.c:1374 gio/gdbusconnection.c:7316 #, c-format msgid "" "Cannot determine bus address from DBUS_STARTER_BUS_TYPE environment variable " @@ -554,7 +554,7 @@ "Адресът на шината не може да се определи от променливата на обкръжението " "„DBUS_STARTER_BUS_TYPE“ — непозната стойност „%s“" -#: gio/gdbusaddress.c:1384 gio/gdbusconnection.c:7330 +#: gio/gdbusaddress.c:1383 gio/gdbusconnection.c:7325 msgid "" "Cannot determine bus address because the DBUS_STARTER_BUS_TYPE environment " "variable is not set" @@ -562,7 +562,7 @@ "Адресът на шината не може да се определи, защото променливата " "„DBUS_STARTER_BUS_TYPE“ липсва в обкръжението" -#: gio/gdbusaddress.c:1394 +#: gio/gdbusaddress.c:1393 #, c-format msgid "Unknown bus type %d" msgstr "Непознат вид шина %d" @@ -583,13 +583,17 @@ "Изчерпване на наличните механизми за идентификация (пробвани: %s) (налични: " "%s)" -#: gio/gdbusauth.c:1178 +#: gio/gdbusauth.c:1045 +msgid "Unexpected lack of content trying to read a byte" +msgstr "Неочаквана липса на съдържание при опит за байт" + +#: gio/gdbusauth.c:1195 msgid "User IDs must be the same for peer and server" msgstr "" "Идентификаторите за потребител от сървъра и отсрещната страна трябва да са " "еднакви" -#: gio/gdbusauth.c:1190 +#: gio/gdbusauth.c:1207 msgid "Cancelled via GDBusAuthObserver::authorize-authenticated-peer" msgstr "Прекъсване чрез „GDBusAuthObserver::authorize-authenticated-peer“" @@ -681,7 +685,7 @@ msgid "(Additionally, releasing the lock for “%s” also failed: %s) " msgstr "(Допълнително, отключването на „%s“ бе също неуспешно: %s) " -#: gio/gdbusconnection.c:590 gio/gdbusconnection.c:2404 +#: gio/gdbusconnection.c:590 gio/gdbusconnection.c:2405 msgid "The connection is closed" msgstr "Връзката прекъсна" @@ -689,121 +693,121 @@ msgid "Timeout was reached" msgstr "Времето за изчакване е просрочено" -#: gio/gdbusconnection.c:2527 +#: gio/gdbusconnection.c:2528 msgid "" "Unsupported flags encountered when constructing a client-side connection" msgstr "Неподдържани флагове при създаване на изходяща връзка" -#: gio/gdbusconnection.c:4256 gio/gdbusconnection.c:4610 +#: gio/gdbusconnection.c:4257 gio/gdbusconnection.c:4611 #, c-format msgid "" "No such interface “org.freedesktop.DBus.Properties” on object at path %s" msgstr "Обектът в „%s“ няма интерфейс „org.freedesktop.DBus.Properties“" -#: gio/gdbusconnection.c:4401 +#: gio/gdbusconnection.c:4402 #, c-format msgid "No such property “%s”" msgstr "Липсва свойство „%s“" -#: gio/gdbusconnection.c:4413 +#: gio/gdbusconnection.c:4414 #, c-format msgid "Property “%s” is not readable" msgstr "Свойството „%s“ не поддържа четене" -#: gio/gdbusconnection.c:4424 +#: gio/gdbusconnection.c:4425 #, c-format msgid "Property “%s” is not writable" msgstr "Свойството „%s“ не поддържа запис" -#: gio/gdbusconnection.c:4444 +#: gio/gdbusconnection.c:4445 #, c-format msgid "Error setting property “%s”: Expected type “%s” but got “%s”" msgstr "" "Грешка при задаване на свойството „%s“: Очакван е вид „%s“, а е получен „%s“" -#: gio/gdbusconnection.c:4549 gio/gdbusconnection.c:4764 -#: gio/gdbusconnection.c:6747 +#: gio/gdbusconnection.c:4550 gio/gdbusconnection.c:4765 +#: gio/gdbusconnection.c:6742 #, c-format msgid "No such interface “%s”" msgstr "Липсва интерфейс „%s“" -#: gio/gdbusconnection.c:4986 gio/gdbusconnection.c:7261 +#: gio/gdbusconnection.c:4981 gio/gdbusconnection.c:7256 #, c-format msgid "No such interface “%s” on object at path %s" msgstr "Липсва интерфейс „%s“ към обекта в „%s“" -#: gio/gdbusconnection.c:5087 +#: gio/gdbusconnection.c:5082 #, c-format msgid "No such method “%s”" msgstr "Липсва метод „%s“" -#: gio/gdbusconnection.c:5118 +#: gio/gdbusconnection.c:5113 #, c-format msgid "Type of message, “%s”, does not match expected type “%s”" msgstr "Видът на съобщението („%s“) не съвпада с очаквания („%s“)" -#: gio/gdbusconnection.c:5321 +#: gio/gdbusconnection.c:5316 #, c-format msgid "An object is already exported for the interface %s at %s" msgstr "Вече е наличен обект за интерфейса „%s“ в „%s“" -#: gio/gdbusconnection.c:5548 +#: gio/gdbusconnection.c:5543 #, c-format msgid "Unable to retrieve property %s.%s" msgstr "Свойството „%s.%s“ не може да бъде получено" -#: gio/gdbusconnection.c:5604 +#: gio/gdbusconnection.c:5599 #, c-format msgid "Unable to set property %s.%s" msgstr "Свойството „%s.%s“ не може да бъде зададено" -#: gio/gdbusconnection.c:5783 +#: gio/gdbusconnection.c:5778 #, c-format msgid "Method “%s” returned type “%s”, but expected “%s”" msgstr "Методът „%s“ върна вид „%s“, а се очаква „%s“" -#: gio/gdbusconnection.c:6859 +#: gio/gdbusconnection.c:6854 #, c-format msgid "Method “%s” on interface “%s” with signature “%s” does not exist" msgstr "Не съществува метод „%s“ на интерфейса „%s“ със сигнатура „%s“" -#: gio/gdbusconnection.c:6980 +#: gio/gdbusconnection.c:6975 #, c-format msgid "A subtree is already exported for %s" msgstr "Вече е изнесено поддърво за „%s“" -#: gio/gdbusconnection.c:7269 +#: gio/gdbusconnection.c:7264 #, c-format msgid "Object does not exist at path “%s”" msgstr "Обектът липсва в пътя „%s“" -#: gio/gdbusmessage.c:1303 +#: gio/gdbusmessage.c:1306 msgid "type is INVALID" msgstr "видът е „INVALID“" -#: gio/gdbusmessage.c:1314 +#: gio/gdbusmessage.c:1317 msgid "METHOD_CALL message: PATH or MEMBER header field is missing" msgstr "" "Съобщение „METHOD_CALL“: в заглавната част липсват полета „PATH“ или „MEMBER“" -#: gio/gdbusmessage.c:1325 +#: gio/gdbusmessage.c:1328 msgid "METHOD_RETURN message: REPLY_SERIAL header field is missing" msgstr "" "Съобщение „METHOD_RETURN“: в заглавната част липсва поле „REPLY_SERIAL“" -#: gio/gdbusmessage.c:1337 +#: gio/gdbusmessage.c:1340 msgid "ERROR message: REPLY_SERIAL or ERROR_NAME header field is missing" msgstr "" "Съобщение „ERROR“: в заглавната част липсват полета „REPLY_SERIAL“ или " "„ERROR_NAME“" -#: gio/gdbusmessage.c:1350 +#: gio/gdbusmessage.c:1353 msgid "SIGNAL message: PATH, INTERFACE or MEMBER header field is missing" msgstr "" "Съобщение „SIGNAL“: в заглавната част липсват полета „PATH“, „INTERFACE“ или " "„MEMBER“" -#: gio/gdbusmessage.c:1358 +#: gio/gdbusmessage.c:1361 msgid "" "SIGNAL message: The PATH header field is using the reserved value /org/" "freedesktop/DBus/Local" @@ -811,7 +815,7 @@ "Съобщение „SIGNAL“: Полето „PATH“ в заглавната част използва запазената " "стойност „/org/freedesktop/DBus/Local“" -#: gio/gdbusmessage.c:1366 +#: gio/gdbusmessage.c:1369 msgid "" "SIGNAL message: The INTERFACE header field is using the reserved value org." "freedesktop.DBus.Local" @@ -819,19 +823,19 @@ "Съобщение „SIGNAL“: Полето „INTERFACE“ в заглавната част използва запазената " "стойност „org.freedesktop.DBus.Local“" -#: gio/gdbusmessage.c:1414 gio/gdbusmessage.c:1474 +#: gio/gdbusmessage.c:1417 gio/gdbusmessage.c:1477 #, c-format msgid "Wanted to read %lu byte but only got %lu" msgid_plural "Wanted to read %lu bytes but only got %lu" msgstr0 "При опит за четене на %lu байт бяха получени %lu" msgstr1 "При опит за четене на %lu байта бяха получени %lu" -#: gio/gdbusmessage.c:1428 +#: gio/gdbusmessage.c:1431 #, c-format msgid "Expected NUL byte after the string “%s” but found byte %d" msgstr "След низа „%s“ се очаква байт NUL, а не %d" -#: gio/gdbusmessage.c:1447 +#: gio/gdbusmessage.c:1450 #, c-format msgid "" "Expected valid UTF-8 string but found invalid bytes at byte offset %d " @@ -841,21 +845,21 @@ "отместване %d (дължината на низа е %d). Декодираният от UTF-8 низ до тази " "позиция е „%s“" -#: gio/gdbusmessage.c:1511 gio/gdbusmessage.c:1787 gio/gdbusmessage.c:1998 +#: gio/gdbusmessage.c:1514 gio/gdbusmessage.c:1790 gio/gdbusmessage.c:2001 msgid "Value nested too deeply" msgstr "Прекалено дълбоко вложена стойност" -#: gio/gdbusmessage.c:1679 +#: gio/gdbusmessage.c:1682 #, c-format msgid "Parsed value “%s” is not a valid D-Bus object path" msgstr "Анализираната стойност „%s“ не е допустим път до обект в D-Bus" -#: gio/gdbusmessage.c:1703 +#: gio/gdbusmessage.c:1706 #, c-format msgid "Parsed value “%s” is not a valid D-Bus signature" msgstr "Анализираната стойност „%s“ не е допустима сигнатура в D-Bus" -#: gio/gdbusmessage.c:1754 +#: gio/gdbusmessage.c:1757 #, c-format msgid "" "Encountered array of length %u byte. Maximum length is 2<<26 bytes (64 MiB)." @@ -866,7 +870,7 @@ msgstr1 "" "Срещнат е масив с дължина %u байта. Максималната дължина е 2²⁶ (64 MiB)" -#: gio/gdbusmessage.c:1774 +#: gio/gdbusmessage.c:1777 #, c-format msgid "" "Encountered array of type “a%c”, expected to have a length a multiple of %u " @@ -875,16 +879,16 @@ "Получен бе масив от вид „a%c“. Очакваше се да има дължина делима на %u " "байта, но тя бе %u байта" -#: gio/gdbusmessage.c:1928 gio/gdbusmessage.c:2647 +#: gio/gdbusmessage.c:1931 gio/gdbusmessage.c:2650 msgid "Empty structures (tuples) are not allowed in D-Bus" msgstr "Празни структури (𝑛-орки) не са позволени в D-Bus" -#: gio/gdbusmessage.c:1982 +#: gio/gdbusmessage.c:1985 #, c-format msgid "Parsed value “%s” for variant is not a valid D-Bus signature" msgstr "Анализираната вариантна стойност „%s“ не е допустима сигнатура в D-Bus" -#: gio/gdbusmessage.c:2023 +#: gio/gdbusmessage.c:2026 #, c-format msgid "" "Error deserializing GVariant with type string “%s” from the D-Bus wire format" @@ -892,7 +896,7 @@ "Грешка при десериализиране на „GVariant“ от вид „%s“ от машинния формат на D-" "Bus" -#: gio/gdbusmessage.c:2208 +#: gio/gdbusmessage.c:2211 #, c-format msgid "" "Invalid endianness value. Expected 0x6c (“l”) or 0x42 (“B”) but found value " @@ -901,28 +905,28 @@ "Недопустима стойност на индикатора за подреждане на байтовете в думи. Очаква " "се или 0x6c („l“), или 0x42 („B“), а е открита стойност 0x%02x" -#: gio/gdbusmessage.c:2227 +#: gio/gdbusmessage.c:2230 #, c-format msgid "Invalid major protocol version. Expected 1 but found %d" msgstr "Недопустима главна версия на протокола. Очаква се 1, а е открита %d" -#: gio/gdbusmessage.c:2285 gio/gdbusmessage.c:2883 +#: gio/gdbusmessage.c:2288 gio/gdbusmessage.c:2886 msgid "Signature header found but is not of type signature" msgstr "Заглавната част със сигнатура е намерена, на тя не е за вид" -#: gio/gdbusmessage.c:2297 +#: gio/gdbusmessage.c:2300 #, c-format msgid "Signature header with signature “%s” found but message body is empty" msgstr "" "Открита е заглавна част със сигнатура „%s“, обаче тялото на съобщението е " "празно" -#: gio/gdbusmessage.c:2312 +#: gio/gdbusmessage.c:2315 #, c-format msgid "Parsed value “%s” is not a valid D-Bus signature (for body)" msgstr "Разчетената стойност „%s“ не е допустима сигнатура в D-Bus (за тяло)" -#: gio/gdbusmessage.c:2344 +#: gio/gdbusmessage.c:2347 #, 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" @@ -930,18 +934,18 @@ msgstr1 "" "В заглавната част на съобщението няма сигнатура, а тялото е %u байта" -#: gio/gdbusmessage.c:2354 +#: gio/gdbusmessage.c:2357 msgid "Cannot deserialize message: " msgstr "Неуспешно декодиране на съобщение: " -#: gio/gdbusmessage.c:2700 +#: gio/gdbusmessage.c:2703 #, c-format msgid "" "Error serializing GVariant with type string “%s” to the D-Bus wire format" msgstr "" "Грешка при сериализиране на „GVariant“ от вид „%s“ в машинния формат на D-Bus" -#: gio/gdbusmessage.c:2837 +#: gio/gdbusmessage.c:2840 #, c-format msgid "" "Number of file descriptors in message (%d) differs from header field (%d)" @@ -949,17 +953,17 @@ "Броят файлови дескриптори в съобщението (%d) е различно от броя в заглавното " "поле (%d)" -#: gio/gdbusmessage.c:2845 +#: gio/gdbusmessage.c:2848 msgid "Cannot serialize message: " msgstr "Неуспешна сериализация на съобщението: " -#: gio/gdbusmessage.c:2898 +#: gio/gdbusmessage.c:2901 #, c-format msgid "Message body has signature “%s” but there is no signature header" msgstr "" "Тялото на съобщението има сигнатура „%s“, но няма заглавна част за сигнатура" -#: gio/gdbusmessage.c:2908 +#: gio/gdbusmessage.c:2911 #, c-format msgid "" "Message body has type signature “%s” but signature in the header field is " @@ -968,19 +972,19 @@ "Тялото на съобщението има сигнатура за вид „%s“, но полето в заглавната част " "за сигнатури е „%s“" -#: gio/gdbusmessage.c:2924 +#: gio/gdbusmessage.c:2927 #, c-format msgid "Message body is empty but signature in the header field is “(%s)”" msgstr "" "Тялото на съобщението е празно, а сигнатурата в полето на заглавната част е " "„(%s)“" -#: gio/gdbusmessage.c:3479 +#: gio/gdbusmessage.c:3482 #, c-format msgid "Error return with body of type “%s”" msgstr "Връщане на грешка с тяло от вид „%s“" -#: gio/gdbusmessage.c:3487 +#: gio/gdbusmessage.c:3490 msgid "Error return with empty body" msgstr "Връщане на грешка с празно тяло на съобщението" @@ -1007,17 +1011,17 @@ msgid "Unable to load %s or %s: " msgstr "Неуспешно зареждане на „%s“ или „%s“: " -#: gio/gdbusproxy.c:1575 +#: gio/gdbusproxy.c:1568 #, c-format msgid "Error calling StartServiceByName for %s: " msgstr "Грешка при извикване на „StartServiceByName“ за %s:" -#: gio/gdbusproxy.c:1598 +#: gio/gdbusproxy.c:1591 #, c-format msgid "Unexpected reply %d from StartServiceByName(\"%s\") method" msgstr "Неочакван отговор „%d“ от метода „StartServicebyName(\"%s\")“" -#: gio/gdbusproxy.c:2709 gio/gdbusproxy.c:2844 +#: gio/gdbusproxy.c:2702 gio/gdbusproxy.c:2837 #, c-format msgid "" "Cannot invoke method; proxy is for the well-known name %s without an owner, " @@ -1027,25 +1031,25 @@ "без собственик „%s“, а е създаден с флага " "„G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START“" -#: gio/gdbusserver.c:765 +#: gio/gdbusserver.c:758 msgid "Abstract namespace not supported" msgstr "Не се поддържа абстрактно пространство за имена" -#: gio/gdbusserver.c:857 +#: gio/gdbusserver.c:850 msgid "Cannot specify nonce file when creating a server" msgstr "Не може да се задава моментен файл при създаване на сървър" -#: gio/gdbusserver.c:939 +#: gio/gdbusserver.c:932 #, c-format msgid "Error writing nonce file at “%s”: %s" msgstr "Грешка при запис в моментен файл „%s“: %s" -#: gio/gdbusserver.c:1114 +#: gio/gdbusserver.c:1107 #, c-format msgid "The string “%s” is not a valid D-Bus GUID" msgstr "Низът „%s“ не е допустим глобален идентификатор (GIUD) в D-Bus" -#: gio/gdbusserver.c:1152 +#: gio/gdbusserver.c:1145 #, c-format msgid "Cannot listen on unsupported transport “%s”" msgstr "Невъзможно е да се чака за връзки по неподдържан транспорт „%s“" @@ -1074,14 +1078,14 @@ "Използвайте „%s КОМАНДА --help“ за допълнителна информация за всяка " "команда.\n" -#: gio/gdbus-tool.c:204 gio/gdbus-tool.c:276 gio/gdbus-tool.c:348 -#: gio/gdbus-tool.c:372 gio/gdbus-tool.c:862 gio/gdbus-tool.c:1247 -#: gio/gdbus-tool.c:1734 +#: gio/gdbus-tool.c:204 gio/gdbus-tool.c:276 gio/gdbus-tool.c:347 +#: gio/gdbus-tool.c:371 gio/gdbus-tool.c:861 gio/gdbus-tool.c:1246 +#: gio/gdbus-tool.c:1733 #, c-format msgid "Error: %s\n" msgstr "Грешка: %s\n" -#: gio/gdbus-tool.c:215 gio/gdbus-tool.c:289 gio/gdbus-tool.c:1750 +#: gio/gdbus-tool.c:215 gio/gdbus-tool.c:289 gio/gdbus-tool.c:1749 #, c-format msgid "Error parsing introspection XML: %s\n" msgstr "Грешка при анализа на XML с аналитична информация: %s\n" @@ -1091,49 +1095,49 @@ msgid "Error: %s is not a valid name\n" msgstr "Грешка: „%s“ не е вярно име\n" -#: gio/gdbus-tool.c:258 gio/gdbus-tool.c:748 gio/gdbus-tool.c:1066 -#: gio/gdbus-tool.c:1900 gio/gdbus-tool.c:2140 +#: gio/gdbus-tool.c:258 gio/gdbus-tool.c:747 gio/gdbus-tool.c:1065 +#: gio/gdbus-tool.c:1899 gio/gdbus-tool.c:2139 #, c-format msgid "Error: %s is not a valid object path\n" msgstr "Грешка: „%s“ не е допустим път до обект\n" -#: gio/gdbus-tool.c:406 +#: gio/gdbus-tool.c:405 msgid "Connect to the system bus" msgstr "Свързване към системната шина" -#: gio/gdbus-tool.c:407 +#: gio/gdbus-tool.c:406 msgid "Connect to the session bus" msgstr "Свързване към сесийната шина" -#: gio/gdbus-tool.c:408 +#: gio/gdbus-tool.c:407 msgid "Connect to given D-Bus address" msgstr "Свързване към даден адрес на D-Bus" -#: gio/gdbus-tool.c:418 +#: gio/gdbus-tool.c:417 msgid "Connection Endpoint Options:" msgstr "Варианти за връзка:" -#: gio/gdbus-tool.c:419 +#: gio/gdbus-tool.c:418 msgid "Options specifying the connection endpoint" msgstr "Опции, указващи точката за връзка" -#: gio/gdbus-tool.c:442 +#: gio/gdbus-tool.c:441 #, c-format msgid "No connection endpoint specified" msgstr "Не е указана точка за връзка" -#: gio/gdbus-tool.c:452 +#: gio/gdbus-tool.c:451 #, c-format msgid "Multiple connection endpoints specified" msgstr "Указани са множество точки за връзка" -#: gio/gdbus-tool.c:525 +#: gio/gdbus-tool.c:524 #, c-format msgid "" "Warning: According to introspection data, interface “%s” does not exist\n" msgstr "Предупреждение: Според анализа интерфейсът „%s“ не съществува\n" -#: gio/gdbus-tool.c:534 +#: gio/gdbus-tool.c:533 #, c-format msgid "" "Warning: According to introspection data, method “%s” does not exist on " @@ -1142,166 +1146,166 @@ "Предупреждение: Според анализа методът „%s“ не се предлага от интерфейса " "„%s“\n" -#: gio/gdbus-tool.c:596 +#: gio/gdbus-tool.c:595 msgid "Optional destination for signal (unique name)" msgstr "Незадължителен получател на сигнала (уникално име)" -#: gio/gdbus-tool.c:597 +#: gio/gdbus-tool.c:596 msgid "Object path to emit signal on" msgstr "Път до обекта, към който да се излъчи сигнал" -#: gio/gdbus-tool.c:598 +#: gio/gdbus-tool.c:597 msgid "Signal and interface name" msgstr "Име на сигнал и интерфейс" -#: gio/gdbus-tool.c:631 +#: gio/gdbus-tool.c:630 msgid "Emit a signal." msgstr "Издаване на сигнал." -#: gio/gdbus-tool.c:686 gio/gdbus-tool.c:1003 gio/gdbus-tool.c:1837 -#: gio/gdbus-tool.c:2069 gio/gdbus-tool.c:2289 +#: gio/gdbus-tool.c:685 gio/gdbus-tool.c:1002 gio/gdbus-tool.c:1836 +#: gio/gdbus-tool.c:2068 gio/gdbus-tool.c:2288 #, c-format msgid "Error connecting: %s\n" msgstr "Грешка при свързване: %s\n" -#: gio/gdbus-tool.c:706 +#: gio/gdbus-tool.c:705 #, c-format msgid "Error: %s is not a valid unique bus name.\n" msgstr "Грешка: „%s“ не е вярно, уникално име на шина\n" -#: gio/gdbus-tool.c:725 gio/gdbus-tool.c:1046 gio/gdbus-tool.c:1880 +#: gio/gdbus-tool.c:724 gio/gdbus-tool.c:1045 gio/gdbus-tool.c:1879 msgid "Error: Object path is not specified\n" msgstr "Грешка: Не е указан път до обект\n" -#: gio/gdbus-tool.c:768 +#: gio/gdbus-tool.c:767 msgid "Error: Signal name is not specified\n" msgstr "Грешка: Не е указано име на сигнал\n" -#: gio/gdbus-tool.c:782 +#: gio/gdbus-tool.c:781 #, c-format msgid "Error: Signal name “%s” is invalid\n" msgstr "Грешка: „%s“ не е допустимо име на сигнал\n" -#: gio/gdbus-tool.c:794 +#: gio/gdbus-tool.c:793 #, c-format msgid "Error: %s is not a valid interface name\n" msgstr "Грешка: „%s“ не е допустимо име на интерфейс\n" -#: gio/gdbus-tool.c:800 +#: gio/gdbus-tool.c:799 #, c-format msgid "Error: %s is not a valid member name\n" msgstr "Грешка: „%s“ не е допустимо име на член\n" #. Use the original non-"parse-me-harder" error -#: gio/gdbus-tool.c:837 gio/gdbus-tool.c:1178 +#: gio/gdbus-tool.c:836 gio/gdbus-tool.c:1177 #, c-format msgid "Error parsing parameter %d: %s\n" msgstr "Грешка при анализ на параметър %d: %s\n" -#: gio/gdbus-tool.c:869 +#: gio/gdbus-tool.c:868 #, c-format msgid "Error flushing connection: %s\n" msgstr "" "Грешка при изчистване на буферите при предаването на данните на връзка: %s\n" -#: gio/gdbus-tool.c:897 +#: gio/gdbus-tool.c:896 msgid "Destination name to invoke method on" msgstr "Целево име, към чийто метод да се направи обръщение" -#: gio/gdbus-tool.c:898 +#: gio/gdbus-tool.c:897 msgid "Object path to invoke method on" msgstr "Път до обект, към чийто метод да се направи обръщение" -#: gio/gdbus-tool.c:899 +#: gio/gdbus-tool.c:898 msgid "Method and interface name" msgstr "Име на метод и интерфейс" -#: gio/gdbus-tool.c:900 +#: gio/gdbus-tool.c:899 msgid "Timeout in seconds" msgstr "Време за изчакване в секунди" -#: gio/gdbus-tool.c:901 +#: gio/gdbus-tool.c:900 msgid "Allow interactive authorization" msgstr "Позволяване на интерактивно упълномощаване" -#: gio/gdbus-tool.c:948 +#: gio/gdbus-tool.c:947 msgid "Invoke a method on a remote object." msgstr "Обръщение към метод на отдалечен обект" -#: gio/gdbus-tool.c:1020 gio/gdbus-tool.c:1854 gio/gdbus-tool.c:2094 +#: gio/gdbus-tool.c:1019 gio/gdbus-tool.c:1853 gio/gdbus-tool.c:2093 msgid "Error: Destination is not specified\n" msgstr "Грешка: не е указана цел\n" -#: gio/gdbus-tool.c:1031 gio/gdbus-tool.c:1871 gio/gdbus-tool.c:2105 +#: gio/gdbus-tool.c:1030 gio/gdbus-tool.c:1870 gio/gdbus-tool.c:2104 #, c-format msgid "Error: %s is not a valid bus name\n" msgstr "Грешка: „%s“ е неправилно име на шина\n" -#: gio/gdbus-tool.c:1081 +#: gio/gdbus-tool.c:1080 msgid "Error: Method name is not specified\n" msgstr "Грешка: Не е указано име на метод\n" -#: gio/gdbus-tool.c:1092 +#: gio/gdbus-tool.c:1091 #, c-format msgid "Error: Method name “%s” is invalid\n" msgstr "Грешка: „%s“ е неправилно име на метод\n" -#: gio/gdbus-tool.c:1170 +#: gio/gdbus-tool.c:1169 #, c-format msgid "Error parsing parameter %d of type “%s”: %s\n" msgstr "Грешка при анализ на параметър %d от вид „%s“: %s\n" -#: gio/gdbus-tool.c:1196 +#: gio/gdbus-tool.c:1195 #, c-format msgid "Error adding handle %d: %s\n" msgstr "Грешка при добавяне на функция за обработка %d: %s\n" -#: gio/gdbus-tool.c:1696 +#: gio/gdbus-tool.c:1695 msgid "Destination name to introspect" msgstr "Име на целта за анализ" -#: gio/gdbus-tool.c:1697 +#: gio/gdbus-tool.c:1696 msgid "Object path to introspect" msgstr "Път до обекта за анализ" -#: gio/gdbus-tool.c:1698 +#: gio/gdbus-tool.c:1697 msgid "Print XML" msgstr "Извеждане на XML" -#: gio/gdbus-tool.c:1699 +#: gio/gdbus-tool.c:1698 msgid "Introspect children" msgstr "Анализ на наследниците" -#: gio/gdbus-tool.c:1700 +#: gio/gdbus-tool.c:1699 msgid "Only print properties" msgstr "Извеждане само на свойствата" -#: gio/gdbus-tool.c:1789 +#: gio/gdbus-tool.c:1788 msgid "Introspect a remote object." msgstr "Анализ на отдалечен обект." -#: gio/gdbus-tool.c:1995 +#: gio/gdbus-tool.c:1994 msgid "Destination name to monitor" msgstr "Име на целта за наблюдение" -#: gio/gdbus-tool.c:1996 +#: gio/gdbus-tool.c:1995 msgid "Object path to monitor" msgstr "Път до обекта за наблюдение" -#: gio/gdbus-tool.c:2021 +#: gio/gdbus-tool.c:2020 msgid "Monitor a remote object." msgstr "Наблюдение на отдалечен обект." -#: gio/gdbus-tool.c:2079 +#: gio/gdbus-tool.c:2078 msgid "Error: can’t monitor a non-message-bus connection\n" msgstr "ГРЕШКА: може да се наблюдават само връзки към шината за съобщения\n" -#: gio/gdbus-tool.c:2203 +#: gio/gdbus-tool.c:2202 msgid "Service to activate before waiting for the other one (well-known name)" msgstr "" "Услуга за задействане преди изчакване на другата (трябва да е известно име)" -#: gio/gdbus-tool.c:2206 +#: gio/gdbus-tool.c:2205 msgid "" "Timeout to wait for before exiting with an error (seconds); 0 for no timeout " "(default)" @@ -1309,27 +1313,27 @@ "Време за изчакване в секунди преди изход с грешка. Стандартно е 0 за " "изчакване без ограничение" -#: gio/gdbus-tool.c:2254 +#: gio/gdbus-tool.c:2253 msgid "OPTION… BUS-NAME" msgstr "ОПЦИЯ… ИМЕ_ПО_ШИНА" -#: gio/gdbus-tool.c:2255 +#: gio/gdbus-tool.c:2254 msgid "Wait for a bus name to appear." msgstr "Изчакване за появата на името по шината." -#: gio/gdbus-tool.c:2331 +#: gio/gdbus-tool.c:2330 msgid "Error: A service to activate for must be specified.\n" msgstr "Грешка: не е указана услуга за задействане.\n" -#: gio/gdbus-tool.c:2336 +#: gio/gdbus-tool.c:2335 msgid "Error: A service to wait for must be specified.\n" msgstr "Грешка: не е указана услуга за изчакване.\n" -#: gio/gdbus-tool.c:2341 +#: gio/gdbus-tool.c:2340 msgid "Error: Too many arguments.\n" msgstr "Грешка: Твърде много аргументи.\n" -#: gio/gdbus-tool.c:2349 gio/gdbus-tool.c:2356 +#: gio/gdbus-tool.c:2348 gio/gdbus-tool.c:2355 #, c-format msgid "Error: %s is not a valid well-known bus name.\n" msgstr "Грешка: „%s“ не е известно име на шина.\n" @@ -1339,38 +1343,43 @@ msgid "Not authorized to change debug settings" msgstr "Няма права за смяната на настройки за изчистване на грешки" -#: gio/gdesktopappinfo.c:2182 gio/gdesktopappinfo.c:5119 +#: gio/gdesktopappinfo.c:2242 gio/gdesktopappinfo.c:5223 msgid "Unnamed" msgstr "Без име" -#: gio/gdesktopappinfo.c:2592 +#: gio/gdesktopappinfo.c:2652 msgid "Desktop file didn’t specify Exec field" msgstr "Във файла „.desktop“ липсва поле за изпълнение (Exec)" -#: gio/gdesktopappinfo.c:2891 +#: gio/gdesktopappinfo.c:2942 msgid "Unable to find terminal required for application" msgstr "Не може да се открие терминал за приложението" -#: gio/gdesktopappinfo.c:3637 +#: gio/gdesktopappinfo.c:3002 +#, c-format +msgid "Program ‘%s’ not found in $PATH" +msgstr "Програмата „%s“ липсва в „$PATH“" + +#: gio/gdesktopappinfo.c:3735 #, c-format msgid "Can’t create user application configuration folder %s: %s" msgstr "Не може да се създаде папката с потребителските настройки %s: %s" -#: gio/gdesktopappinfo.c:3641 +#: gio/gdesktopappinfo.c:3739 #, c-format msgid "Can’t create user MIME configuration folder %s: %s" msgstr "Не може да се създаде папката с настройките за MIME %s: %s" -#: gio/gdesktopappinfo.c:3883 gio/gdesktopappinfo.c:3907 +#: gio/gdesktopappinfo.c:3981 gio/gdesktopappinfo.c:4005 msgid "Application information lacks an identifier" msgstr "В информацията за програма липсва идентификатор" -#: gio/gdesktopappinfo.c:4143 +#: gio/gdesktopappinfo.c:4241 #, c-format msgid "Can’t create user desktop file %s" msgstr "Не може да се създаде файл „.desktop“: „%s“" -#: gio/gdesktopappinfo.c:4279 +#: gio/gdesktopappinfo.c:4377 #, c-format msgid "Custom definition for %s" msgstr "Потребителска дефиниция за %s" @@ -1443,7 +1452,7 @@ msgid "Containing mount does not exist" msgstr "Съдържащият монтиран обект не съществува" -#: gio/gfile.c:2641 gio/glocalfile.c:2500 +#: gio/gfile.c:2641 gio/glocalfile.c:2511 msgid "Can’t copy over directory" msgstr "Не може да се копира върху папка" @@ -1491,7 +1500,7 @@ msgid "Invalid symlink value given" msgstr "Зададена е неправилна стойност на символна връзка" -#: gio/gfile.c:4163 glib/gfileutils.c:2335 +#: gio/gfile.c:4163 glib/gfileutils.c:2392 msgid "Symbolic links not supported" msgstr "Символни връзки не се поддържат" @@ -1592,37 +1601,37 @@ msgid "HTTP proxy server closed connection unexpectedly." msgstr "Сървърът-посредник по HTTP неочаквано прекрати връзката" -#: gio/gicon.c:300 +#: gio/gicon.c:299 #, c-format msgid "Wrong number of tokens (%d)" msgstr "Неправилен брой лексеми (%d)" -#: gio/gicon.c:320 +#: gio/gicon.c:319 #, c-format msgid "No type for class name %s" msgstr "Липсва вид за името на клас „%s“" -#: gio/gicon.c:330 +#: gio/gicon.c:329 #, c-format msgid "Type %s does not implement the GIcon interface" msgstr "Видът „%s“ не поддържа интерфейса „GIcon“" -#: gio/gicon.c:341 +#: gio/gicon.c:340 #, c-format msgid "Type %s is not classed" msgstr "Видът „%s“ не е клас" -#: gio/gicon.c:355 +#: gio/gicon.c:354 #, c-format msgid "Malformed version number: %s" msgstr "Неправилен номер на версия: %s" -#: gio/gicon.c:369 +#: gio/gicon.c:368 #, c-format msgid "Type %s does not implement from_tokens() on the GIcon interface" msgstr "Видът „%s“ не поддържа „from_tokens()“ от интерфейса „GIcon“" -#: gio/gicon.c:471 +#: gio/gicon.c:470 msgid "Can’t handle the supplied version of the icon encoding" msgstr "Подадената версия на кодирането на икони не се поддържа" @@ -2440,7 +2449,7 @@ msgid "List contents of directories in a tree-like format." msgstr "Извеждане на съдържанието на директориите в дървовиден вариант." -#: gio/glib-compile-resources.c:142 gio/glib-compile-schemas.c:1516 +#: gio/glib-compile-resources.c:142 gio/glib-compile-schemas.c:1513 #, c-format msgid "Element <%s> not allowed inside <%s>" msgstr "Елементът <%s> не е позволен в <%s>" @@ -2497,7 +2506,7 @@ msgid "text may not appear inside <%s>" msgstr "в <%s> не е позволен текст" -#: gio/glib-compile-resources.c:821 gio/glib-compile-schemas.c:2174 +#: gio/glib-compile-resources.c:821 gio/glib-compile-schemas.c:2171 msgid "Show program version and exit" msgstr "Извеждане на версията на програмата и изход" @@ -2513,8 +2522,8 @@ "Папката откъдето да се заредят файловете, указани във ФАЙЛа (стандартно е " "текущата)" -#: gio/glib-compile-resources.c:823 gio/glib-compile-schemas.c:2175 -#: gio/glib-compile-schemas.c:2204 +#: gio/glib-compile-resources.c:823 gio/glib-compile-schemas.c:2172 +#: gio/glib-compile-schemas.c:2201 msgid "DIRECTORY" msgstr "ПАПКА" @@ -2735,16 +2744,16 @@ msgid "<aliases> must contain at least one <alias>" msgstr "<aliases> трябва да съдържа поне един <alias>" -#: gio/glib-compile-schemas.c:799 +#: gio/glib-compile-schemas.c:796 msgid "Empty names are not permitted" msgstr "Празни имена не са позволени" -#: gio/glib-compile-schemas.c:809 +#: gio/glib-compile-schemas.c:806 #, c-format msgid "Invalid name “%s”: names must begin with a lowercase letter" msgstr "Неправилно име „%s“: имената трябва да започват с малка буква" -#: gio/glib-compile-schemas.c:821 +#: gio/glib-compile-schemas.c:818 #, c-format msgid "" "Invalid name “%s”: invalid character “%c”; only lowercase letters, numbers " @@ -2753,36 +2762,36 @@ "Неправилно име „%s“: неправилен знак „%c“ — позволени са само малки букви, " "цифри и тире („-“)" -#: gio/glib-compile-schemas.c:830 +#: gio/glib-compile-schemas.c:827 #, c-format msgid "Invalid name “%s”: two successive hyphens (“--”) are not permitted" msgstr "Неправилно име „%s“: не са позволени две последователни тирета („--“)" -#: gio/glib-compile-schemas.c:839 +#: gio/glib-compile-schemas.c:836 #, c-format msgid "Invalid name “%s”: the last character may not be a hyphen (“-”)" msgstr "Неправилно име „%s“: последният знак не може да е тире („-“)" -#: gio/glib-compile-schemas.c:847 +#: gio/glib-compile-schemas.c:844 #, c-format msgid "Invalid name “%s”: maximum length is 1024" msgstr "Неправилно име „%s“: максималната дължина е 1024" -#: gio/glib-compile-schemas.c:919 +#: gio/glib-compile-schemas.c:916 #, c-format msgid "<child name='%s'> already specified" msgstr "<child name='%s'> вече е указано" -#: gio/glib-compile-schemas.c:945 +#: gio/glib-compile-schemas.c:942 msgid "Cannot add keys to a “list-of” schema" msgstr "Към схема „list-of“ не може да се добавят ключове" -#: gio/glib-compile-schemas.c:956 +#: gio/glib-compile-schemas.c:953 #, c-format msgid "<key name='%s'> already specified" msgstr "<key name='%s'> вече е указано" -#: gio/glib-compile-schemas.c:974 +#: gio/glib-compile-schemas.c:971 #, c-format msgid "" "<key name='%s'> shadows <key name='%s'> in <schema id='%s'>; use <override> " @@ -2791,7 +2800,7 @@ "<key name='%s'> засенчва <key name='%s'> в <schema id='%s'>. Използвайте " "<override>, за да промените стойността" -#: gio/glib-compile-schemas.c:985 +#: gio/glib-compile-schemas.c:982 #, c-format msgid "" "Exactly one of “type”, “enum” or “flags” must be specified as an attribute " @@ -2800,63 +2809,63 @@ "Като атрибут на <key> трябва да присъства точно едно от „type“, „enum“ или " "„flags“" -#: gio/glib-compile-schemas.c:1004 +#: gio/glib-compile-schemas.c:1001 #, c-format msgid "<%s id='%s'> not (yet) defined." msgstr "<%s id='%s'> не е дефинирано (все още)." -#: gio/glib-compile-schemas.c:1019 +#: gio/glib-compile-schemas.c:1016 #, c-format msgid "Invalid GVariant type string “%s”" msgstr "Неправилен низ за вид на „GVariant“: „%s“" -#: gio/glib-compile-schemas.c:1049 +#: gio/glib-compile-schemas.c:1046 msgid "<override> given but schema isn’t extending anything" msgstr "Използвано е <override>, но схемата не разширява нищо" -#: gio/glib-compile-schemas.c:1062 +#: gio/glib-compile-schemas.c:1059 #, c-format msgid "No <key name='%s'> to override" msgstr "Липсва <key name='%s'> за предефиниране" -#: gio/glib-compile-schemas.c:1070 +#: gio/glib-compile-schemas.c:1067 #, c-format msgid "<override name='%s'> already specified" msgstr "Вече е указано <override name='%s'>" -#: gio/glib-compile-schemas.c:1143 +#: gio/glib-compile-schemas.c:1140 #, c-format msgid "<schema id='%s'> already specified" msgstr "Вече е указано <schema id='%s'>" -#: gio/glib-compile-schemas.c:1155 +#: gio/glib-compile-schemas.c:1152 #, c-format msgid "<schema id='%s'> extends not yet existing schema “%s”" msgstr "<schema id='%s'> добавя към схема „%s“, която още не съществува" -#: gio/glib-compile-schemas.c:1171 +#: gio/glib-compile-schemas.c:1168 #, c-format msgid "<schema id='%s'> is list of not yet existing schema “%s”" msgstr "<schema id='%s'> е списък на схема „%s“, която още не съществува" -#: gio/glib-compile-schemas.c:1179 +#: gio/glib-compile-schemas.c:1176 #, c-format msgid "Cannot be a list of a schema with a path" msgstr "Не може да е списък от схема с път" -#: gio/glib-compile-schemas.c:1189 +#: gio/glib-compile-schemas.c:1186 #, c-format msgid "Cannot extend a schema with a path" msgstr "Схема не може да се разширява с път" -#: gio/glib-compile-schemas.c:1199 +#: gio/glib-compile-schemas.c:1196 #, c-format msgid "" "<schema id='%s'> is a list, extending <schema id='%s'> which is not a list" msgstr "" "<schema id='%s'> е списък, разширяващ <schema id='%s'>, която не е списък" -#: gio/glib-compile-schemas.c:1209 +#: gio/glib-compile-schemas.c:1206 #, c-format msgid "" "<schema id='%s' list-of='%s'> extends <schema id='%s' list-of='%s'> but “%s” " @@ -2865,17 +2874,17 @@ "<schema id='%s' list-of='%s'> разширява <schema id='%s' list-of='%s'>, но " "„%s“ не разширява „%s“" -#: gio/glib-compile-schemas.c:1226 +#: gio/glib-compile-schemas.c:1223 #, c-format msgid "A path, if given, must begin and end with a slash" msgstr "Всеки път трябва да започва и да завършва с наклонена черта („/“)" -#: gio/glib-compile-schemas.c:1233 +#: gio/glib-compile-schemas.c:1230 #, c-format msgid "The path of a list must end with “:/”" msgstr "Пътят на списък трябва да завършва с „:/“" -#: gio/glib-compile-schemas.c:1242 +#: gio/glib-compile-schemas.c:1239 #, c-format msgid "" "Warning: Schema “%s” has path “%s”. Paths starting with “/apps/”, “/" @@ -2884,49 +2893,49 @@ "ПРЕДУПРЕЖДЕНИЕ: схемата „%s“ съдържа пътя „%s“. Пътищата, които започват с „/" "apps/“, „/desktop/“ или „/system/“ са остарели." -#: gio/glib-compile-schemas.c:1272 +#: gio/glib-compile-schemas.c:1269 #, c-format msgid "<%s id='%s'> already specified" msgstr "вече е указано <%s id='%s'>" -#: gio/glib-compile-schemas.c:1422 gio/glib-compile-schemas.c:1438 +#: gio/glib-compile-schemas.c:1419 gio/glib-compile-schemas.c:1435 #, c-format msgid "Only one <%s> element allowed inside <%s>" msgstr "Само един елемент <%s> е позволен в <%s>" -#: gio/glib-compile-schemas.c:1520 +#: gio/glib-compile-schemas.c:1517 #, c-format msgid "Element <%s> not allowed at the top level" msgstr "Елементът <%s> не е позволен на най-горно ниво" -#: gio/glib-compile-schemas.c:1538 +#: gio/glib-compile-schemas.c:1535 msgid "Element <default> is required in <key>" msgstr "Задължително е в <key> да има елемент <default>" -#: gio/glib-compile-schemas.c:1628 +#: gio/glib-compile-schemas.c:1625 #, c-format msgid "Text may not appear inside <%s>" msgstr "В <%s> не е позволен текст" -#: gio/glib-compile-schemas.c:1696 +#: gio/glib-compile-schemas.c:1693 #, c-format msgid "Warning: undefined reference to <schema id='%s'/>" msgstr "ПРЕДУПРЕЖДЕНИЕ: недефиниран указател към <schema id='%s'/>" #. Translators: Do not translate "--strict". -#: gio/glib-compile-schemas.c:1835 gio/glib-compile-schemas.c:1914 +#: gio/glib-compile-schemas.c:1832 gio/glib-compile-schemas.c:1911 msgid "--strict was specified; exiting." msgstr "Указано е „--strict“, изход." -#: gio/glib-compile-schemas.c:1847 +#: gio/glib-compile-schemas.c:1844 msgid "This entire file has been ignored." msgstr "Целият файл е пренебрегнат." -#: gio/glib-compile-schemas.c:1910 +#: gio/glib-compile-schemas.c:1907 msgid "Ignoring this file." msgstr "Пренебрегване на файла." -#: gio/glib-compile-schemas.c:1965 +#: gio/glib-compile-schemas.c:1962 #, c-format msgid "" "No such key “%s” in schema “%s” as specified in override file “%s”; ignoring " @@ -2935,7 +2944,7 @@ "Липсва ключ „%s“ в схемата „%s“, указан във файла за предефиниране „%s“. " "Това предифиниране се прескача." -#: gio/glib-compile-schemas.c:1973 +#: gio/glib-compile-schemas.c:1970 #, c-format msgid "" "No such key “%s” in schema “%s” as specified in override file “%s” and --" @@ -2944,7 +2953,7 @@ "Липсва ключ „%s“ в схемата „%s“, указан във файла за предефиниране „%s“, " "зададена е и опцията „--strict“, затова програмата приключва." -#: gio/glib-compile-schemas.c:1995 +#: gio/glib-compile-schemas.c:1992 #, c-format msgid "" "Cannot provide per-desktop overrides for localized key “%s” in schema " @@ -2954,7 +2963,7 @@ "локализирания ключ „%s“ в схемата „%s“ (файлът с предефинирана стойност е " "„%s“). Това предифиниране се прескача." -#: gio/glib-compile-schemas.c:2004 +#: gio/glib-compile-schemas.c:2001 #, c-format msgid "" "Cannot provide per-desktop overrides for localized key “%s” in schema " @@ -2964,7 +2973,7 @@ "локализирания ключ „%s“ в схемата „%s“ (файлът с предефинирана стойност е " "„%s“), зададена е и опцията „--strict“, затова програмата приключва." -#: gio/glib-compile-schemas.c:2028 +#: gio/glib-compile-schemas.c:2025 #, c-format msgid "" "Error parsing key “%s” in schema “%s” as specified in override file “%s”: " @@ -2973,7 +2982,7 @@ "Грешка при анализиране на ключа „%s“ от схемата „%s“, указан във файла за " "предефиниране „%s“ — %s. Това предифиниране се прескача." -#: gio/glib-compile-schemas.c:2040 +#: gio/glib-compile-schemas.c:2037 #, c-format msgid "" "Error parsing key “%s” in schema “%s” as specified in override file “%s”: " @@ -2983,7 +2992,7 @@ "предефиниране „%s“ — %s, зададена е и опцията „--strict“, затова програмата " "приключва." -#: gio/glib-compile-schemas.c:2067 +#: gio/glib-compile-schemas.c:2064 #, c-format msgid "" "Override for key “%s” in schema “%s” in override file “%s” is outside the " @@ -2992,7 +3001,7 @@ "Предефинирането на ключа „%s“ в схемата „%s“ във файла за предефиниране „%s“ " "е извън обсега, даден в схемата. Това предифиниране се прескача." -#: gio/glib-compile-schemas.c:2077 +#: gio/glib-compile-schemas.c:2074 #, c-format msgid "" "Override for key “%s” in schema “%s” in override file “%s” is outside the " @@ -3002,7 +3011,7 @@ "е извън обсега, даден в схемата, зададена е и опцията „--strict“, затова " "програмата приключва." -#: gio/glib-compile-schemas.c:2103 +#: gio/glib-compile-schemas.c:2100 #, c-format msgid "" "Override for key “%s” in schema “%s” in override file “%s” is not in the " @@ -3011,7 +3020,7 @@ "Предефинирането на ключа „%s“ в схемата „%s“ във файла за предефиниране „%s“ " "не е в списъка с позволени стойности. Това предифиниране се прескача." -#: gio/glib-compile-schemas.c:2113 +#: gio/glib-compile-schemas.c:2110 #, c-format msgid "" "Override for key “%s” in schema “%s” in override file “%s” is not in the " @@ -3021,23 +3030,23 @@ "не е в списъка с позволени стойности, зададена е и опцията „--strict“, " "затова програмата приключва." -#: gio/glib-compile-schemas.c:2175 +#: gio/glib-compile-schemas.c:2172 msgid "Where to store the gschemas.compiled file" msgstr "Място за съхраняване на файла „gschemas.compiled“" -#: gio/glib-compile-schemas.c:2176 +#: gio/glib-compile-schemas.c:2173 msgid "Abort on any errors in schemas" msgstr "Прекъсване на работа при всякакви грешки в схемите" -#: gio/glib-compile-schemas.c:2177 +#: gio/glib-compile-schemas.c:2174 msgid "Do not write the gschema.compiled file" msgstr "Без запис на файл „gschema.compiled“" -#: gio/glib-compile-schemas.c:2178 +#: gio/glib-compile-schemas.c:2175 msgid "Do not enforce key name restrictions" msgstr "Без налагане на ограниченията за имена на ключове" -#: gio/glib-compile-schemas.c:2207 +#: gio/glib-compile-schemas.c:2204 msgid "" "Compile all GSettings schema files into a schema cache.\n" "Schema files are required to have the extension .gschema.xml,\n" @@ -3047,15 +3056,15 @@ "Файловете със схемите трябва да завършват на „.gschema.xml“,\n" "а файлът с кеша се нарича „gschemas.compiled“." -#: gio/glib-compile-schemas.c:2228 +#: gio/glib-compile-schemas.c:2225 msgid "You should give exactly one directory name" msgstr "Изисква се точно едно име на папка" -#: gio/glib-compile-schemas.c:2271 +#: gio/glib-compile-schemas.c:2268 msgid "No schema files found: doing nothing." msgstr "Не са открити файлове със схеми: нищо няма да се прави." -#: gio/glib-compile-schemas.c:2273 +#: gio/glib-compile-schemas.c:2270 msgid "No schema files found: removed existing output file." msgstr "" "Не са открити файлове със схеми: съществуващият резултатен файл е премахнат." @@ -3065,7 +3074,7 @@ msgid "Invalid filename %s" msgstr "Неправилно име на файл: %s" -#: gio/glocalfile.c:996 +#: gio/glocalfile.c:1005 #, c-format msgid "Error getting filesystem info for %s: %s" msgstr "Грешка при получаване на информация за файловата система за „%s“: %s" @@ -3074,126 +3083,126 @@ #. * the enclosing (user visible) mount of a file, but none #. * exists. #. -#: gio/glocalfile.c:1137 +#: gio/glocalfile.c:1141 #, c-format msgid "Containing mount for file %s not found" msgstr "Съдържащият монтиран обект за файла „%s“ не съществува" -#: gio/glocalfile.c:1160 +#: gio/glocalfile.c:1164 msgid "Can’t rename root directory" msgstr "Кореновата папка не може да се преименува" -#: gio/glocalfile.c:1178 gio/glocalfile.c:1201 +#: gio/glocalfile.c:1182 gio/glocalfile.c:1205 #, c-format msgid "Error renaming file %s: %s" msgstr "Грешка при преименуване на файла „%s“: %s" -#: gio/glocalfile.c:1185 +#: gio/glocalfile.c:1189 msgid "Can’t rename file, filename already exists" msgstr "Файлът не може да се преименува — съществува друг файл с такова име" -#: gio/glocalfile.c:1198 gio/glocalfile.c:2394 gio/glocalfile.c:2422 -#: gio/glocalfile.c:2561 gio/glocalfileoutputstream.c:658 +#: gio/glocalfile.c:1202 gio/glocalfile.c:2405 gio/glocalfile.c:2433 +#: gio/glocalfile.c:2572 gio/glocalfileoutputstream.c:658 msgid "Invalid filename" msgstr "Неправилно име на файл" -#: gio/glocalfile.c:1366 gio/glocalfile.c:1377 +#: gio/glocalfile.c:1370 gio/glocalfile.c:1381 #, c-format msgid "Error opening file %s: %s" msgstr "Грешка при отваряне на файла „%s“: %s" -#: gio/glocalfile.c:1502 +#: gio/glocalfile.c:1506 #, c-format msgid "Error removing file %s: %s" msgstr "Грешка при изтриване на файла „%s“: %s" -#: gio/glocalfile.c:1996 gio/glocalfile.c:2007 gio/glocalfile.c:2034 +#: gio/glocalfile.c:2000 gio/glocalfile.c:2011 gio/glocalfile.c:2038 #, c-format msgid "Error trashing file %s: %s" msgstr "Грешка при преместване на файл в кошчето „%s“: %s" -#: gio/glocalfile.c:2054 +#: gio/glocalfile.c:2058 #, c-format msgid "Unable to create trash directory %s: %s" msgstr "Неуспешно създаване на папката за кошче „%s“: %s" -#: gio/glocalfile.c:2075 +#: gio/glocalfile.c:2079 #, c-format msgid "Unable to find toplevel directory to trash %s" msgstr "" "Не може да се открие най-горната папка за преместване в кошчето на „%s“" -#: gio/glocalfile.c:2083 +#: gio/glocalfile.c:2087 #, c-format msgid "Trashing on system internal mounts is not supported" msgstr "" "Преместване в кошчето на монтираните вътрешни системни томове не се поддържа" -#: gio/glocalfile.c:2169 gio/glocalfile.c:2197 +#: gio/glocalfile.c:2173 gio/glocalfile.c:2201 #, c-format msgid "Unable to find or create trash directory %s to trash %s" msgstr "Не може да се създаде папката за кошче „%s“ за изхвърлянето на „%s“" -#: gio/glocalfile.c:2243 +#: gio/glocalfile.c:2245 #, c-format msgid "Unable to create trashing info file for %s: %s" msgstr "Неуспешно създаване на файл с информация за кошчето за „%s“: %s" -#: gio/glocalfile.c:2305 +#: gio/glocalfile.c:2316 #, c-format msgid "Unable to trash file %s across filesystem boundaries" msgstr "Неуспешно преместване на файл в кошче на друга файлова система: %s" -#: gio/glocalfile.c:2309 gio/glocalfile.c:2365 +#: gio/glocalfile.c:2320 gio/glocalfile.c:2376 #, c-format msgid "Unable to trash file %s: %s" msgstr "Неуспешно преместване на файл в кошчето „%s“: %s" -#: gio/glocalfile.c:2371 +#: gio/glocalfile.c:2382 #, c-format msgid "Unable to trash file %s" msgstr "Неуспешно преместване на файл в кошчето „%s“" -#: gio/glocalfile.c:2397 +#: gio/glocalfile.c:2408 #, c-format msgid "Error creating directory %s: %s" msgstr "Грешка при създаване на папка „%s“: %s" -#: gio/glocalfile.c:2426 +#: gio/glocalfile.c:2437 #, c-format msgid "Filesystem does not support symbolic links" msgstr "Файловата система не поддържа символни връзки" -#: gio/glocalfile.c:2429 +#: gio/glocalfile.c:2440 #, c-format msgid "Error making symbolic link %s: %s" msgstr "Грешка при създаване на символна връзка „%s“: %s" -#: gio/glocalfile.c:2472 gio/glocalfile.c:2507 gio/glocalfile.c:2564 +#: gio/glocalfile.c:2483 gio/glocalfile.c:2518 gio/glocalfile.c:2575 #, c-format msgid "Error moving file %s: %s" msgstr "Грешка при преместване на файл „%s“: %s" -#: gio/glocalfile.c:2495 +#: gio/glocalfile.c:2506 msgid "Can’t move directory over directory" msgstr "Папка не може да бъде преместена върху папка" -#: gio/glocalfile.c:2521 gio/glocalfileoutputstream.c:1110 +#: gio/glocalfile.c:2532 gio/glocalfileoutputstream.c:1110 #: gio/glocalfileoutputstream.c:1124 gio/glocalfileoutputstream.c:1139 #: gio/glocalfileoutputstream.c:1156 gio/glocalfileoutputstream.c:1170 msgid "Backup file creation failed" msgstr "Неуспешно създаване на резервен файл" -#: gio/glocalfile.c:2540 +#: gio/glocalfile.c:2551 #, c-format msgid "Error removing target file: %s" msgstr "Грешка при премахване на целевия файл: %s" -#: gio/glocalfile.c:2554 +#: gio/glocalfile.c:2565 msgid "Move between mounts not supported" msgstr "Не се поддържа местене между монтирани местоположения" -#: gio/glocalfile.c:2728 +#: gio/glocalfile.c:2741 #, c-format msgid "Could not determine the disk usage of %s: %s" msgstr "Не може да се определи заетото място на %s: %s" @@ -3215,119 +3224,119 @@ msgid "Error setting extended attribute “%s”: %s" msgstr "Грешка при задаване на разширен атрибут „%s“: %s" -#: gio/glocalfileinfo.c:1738 gio/win32/gwinhttpfile.c:191 +#: gio/glocalfileinfo.c:1819 gio/win32/gwinhttpfile.c:191 msgid " (invalid encoding)" msgstr " (неправилно кодиране)" -#: gio/glocalfileinfo.c:1897 gio/glocalfileoutputstream.c:945 +#: gio/glocalfileinfo.c:1978 gio/glocalfileoutputstream.c:945 #: gio/glocalfileoutputstream.c:997 #, c-format msgid "Error when getting information for file “%s”: %s" msgstr "Грешка при получаване на информация за файла „%s“: %s" -#: gio/glocalfileinfo.c:2163 +#: gio/glocalfileinfo.c:2281 #, c-format msgid "Error when getting information for file descriptor: %s" msgstr "Грешка при получаване на информация за файловия дескриптор: %s" -#: gio/glocalfileinfo.c:2208 +#: gio/glocalfileinfo.c:2326 msgid "Invalid attribute type (uint32 expected)" msgstr "Неправилен вид на атрибут (очакваше се uint32)" -#: gio/glocalfileinfo.c:2226 +#: gio/glocalfileinfo.c:2344 msgid "Invalid attribute type (uint64 expected)" msgstr "Неправилен вид на атрибут (очакваше се uint64)" -#: gio/glocalfileinfo.c:2245 gio/glocalfileinfo.c:2264 +#: gio/glocalfileinfo.c:2363 gio/glocalfileinfo.c:2382 msgid "Invalid attribute type (byte string expected)" msgstr "Неправилен вид на атрибут (очакваше се низ от байтове)" -#: gio/glocalfileinfo.c:2311 +#: gio/glocalfileinfo.c:2429 msgid "Cannot set permissions on symlinks" msgstr "Грешка при задаване на правата за достъп на символната връзка" -#: gio/glocalfileinfo.c:2327 +#: gio/glocalfileinfo.c:2445 #, c-format msgid "Error setting permissions: %s" msgstr "Грешка при задаване на правата за достъп: %s" -#: gio/glocalfileinfo.c:2378 +#: gio/glocalfileinfo.c:2496 #, c-format msgid "Error setting owner: %s" msgstr "Грешка при задаване на собственик: %s" -#: gio/glocalfileinfo.c:2401 +#: gio/glocalfileinfo.c:2519 msgid "symlink must be non-NULL" msgstr "символната връзка трябва да не е NULL" -#: gio/glocalfileinfo.c:2411 gio/glocalfileinfo.c:2430 -#: gio/glocalfileinfo.c:2441 +#: gio/glocalfileinfo.c:2529 gio/glocalfileinfo.c:2548 +#: gio/glocalfileinfo.c:2559 #, c-format msgid "Error setting symlink: %s" msgstr "Грешка при задаване на символна връзка: %s" -#: gio/glocalfileinfo.c:2420 +#: gio/glocalfileinfo.c:2538 msgid "Error setting symlink: file is not a symlink" msgstr "Грешка при задаване на символна връзка: файлът не е такава" -#: gio/glocalfileinfo.c:2492 +#: gio/glocalfileinfo.c:2630 #, c-format msgid "Extra nanoseconds %d for UNIX timestamp %lld are negative" msgstr "" "Допълнителните наносекунди %d за времевото клеймо по UNIX %lld са отрицателни" -#: gio/glocalfileinfo.c:2501 +#: gio/glocalfileinfo.c:2639 #, c-format msgid "Extra nanoseconds %d for UNIX timestamp %lld reach 1 second" msgstr "" "Допълнителните наносекунди %d за времевото клеймо по UNIX %lld стигат 1 " "секунда" -#: gio/glocalfileinfo.c:2511 +#: gio/glocalfileinfo.c:2649 #, c-format msgid "UNIX timestamp %lld does not fit into 64 bits" msgstr "Времевото клеймо по UNIX %lld не се помества в 64 бита" -#: gio/glocalfileinfo.c:2522 +#: gio/glocalfileinfo.c:2660 #, c-format msgid "UNIX timestamp %lld is outside of the range supported by Windows" msgstr "Времевото клеймо по UNIX %lld е извън диапазона, поддържан в Windows" -#: gio/glocalfileinfo.c:2625 +#: gio/glocalfileinfo.c:2792 #, c-format msgid "File name “%s” cannot be converted to UTF-16" msgstr "Името на файла „%s“ не може да се преобразува в UTF-16" -#: gio/glocalfileinfo.c:2644 +#: gio/glocalfileinfo.c:2811 #, c-format msgid "File “%s” cannot be opened: Windows Error %lu" msgstr "Файлът „%s“ не може да бъде отворен — грешка от Windows: %lu" -#: gio/glocalfileinfo.c:2657 +#: gio/glocalfileinfo.c:2824 #, c-format msgid "Error setting modification or access time for file “%s”: %lu" msgstr "" "Грешка при задаване на времето на промяна или достъп на файла „%s“: %lu" -#: gio/glocalfileinfo.c:2798 gio/glocalfileinfo.c:2810 +#: gio/glocalfileinfo.c:2981 #, c-format msgid "Error setting modification or access time: %s" msgstr "Грешка при задаване на времето на промяна или достъп: %s" -#: gio/glocalfileinfo.c:2833 +#: gio/glocalfileinfo.c:3004 msgid "SELinux context must be non-NULL" msgstr "Контекстът на SELinux трябва да не е NULL" -#: gio/glocalfileinfo.c:2840 +#: gio/glocalfileinfo.c:3011 msgid "SELinux is not enabled on this system" msgstr "SELinux не е включен на тази система" -#: gio/glocalfileinfo.c:2850 +#: gio/glocalfileinfo.c:3021 #, c-format msgid "Error setting SELinux context: %s" msgstr "Грешка при задаване на контекста на SELinux: %s" -#: gio/glocalfileinfo.c:2947 +#: gio/glocalfileinfo.c:3118 #, c-format msgid "Setting attribute %s not supported" msgstr "Не се поддържа задаването на атрибута %s" @@ -3376,13 +3385,13 @@ msgid "Error renaming temporary file: %s" msgstr "Грешка при преименуване на временен файл: %s" -#: gio/glocalfileoutputstream.c:611 gio/glocalfileoutputstream.c:1241 +#: gio/glocalfileoutputstream.c:611 gio/glocalfileoutputstream.c:1242 #, c-format msgid "Error truncating file: %s" msgstr "Грешка при съкращаване на файл: %s" #: gio/glocalfileoutputstream.c:664 gio/glocalfileoutputstream.c:909 -#: gio/glocalfileoutputstream.c:1222 gio/gsubprocess.c:231 +#: gio/glocalfileoutputstream.c:1223 gio/gsubprocess.c:231 #, c-format msgid "Error opening file “%s”: %s" msgstr "Грешка при отваряне на файла „%s“: %s" @@ -3399,7 +3408,7 @@ msgid "The file was externally modified" msgstr "Файлът бе променен от външно приложение" -#: gio/glocalfileoutputstream.c:1204 +#: gio/glocalfileoutputstream.c:1205 #, c-format msgid "Error removing old file: %s" msgstr "Грешка при изтриване на стар файл: %s" @@ -3548,8 +3557,8 @@ #. Translators: the first placeholder is a domain name, the #. * second is an error message #: gio/gresolver.c:403 gio/gthreadedresolver.c:152 gio/gthreadedresolver.c:170 -#: gio/gthreadedresolver.c:782 gio/gthreadedresolver.c:806 -#: gio/gthreadedresolver.c:831 gio/gthreadedresolver.c:846 +#: gio/gthreadedresolver.c:798 gio/gthreadedresolver.c:822 +#: gio/gthreadedresolver.c:847 gio/gthreadedresolver.c:862 #, c-format msgid "Error resolving “%s”: %s" msgstr "Грешка при откриване по адрес на „%s“: %s" @@ -4270,35 +4279,35 @@ #. Translators: the placeholder is a DNS record type, such as ‘MX’ or ‘SRV’ #: gio/gthreadedresolver.c:552 gio/gthreadedresolver.c:574 -#: gio/gthreadedresolver.c:612 gio/gthreadedresolver.c:659 -#: gio/gthreadedresolver.c:688 gio/gthreadedresolver.c:700 +#: gio/gthreadedresolver.c:628 gio/gthreadedresolver.c:675 +#: gio/gthreadedresolver.c:704 gio/gthreadedresolver.c:716 #, c-format msgid "Error parsing DNS %s record: malformed DNS packet" msgstr "Неуспешен анализ на запис %s в DNS: неправилен пакет от DNS" -#: gio/gthreadedresolver.c:758 gio/gthreadedresolver.c:895 -#: gio/gthreadedresolver.c:993 gio/gthreadedresolver.c:1043 +#: gio/gthreadedresolver.c:774 gio/gthreadedresolver.c:911 +#: gio/gthreadedresolver.c:1009 gio/gthreadedresolver.c:1059 #, c-format msgid "No DNS record of the requested type for “%s”" msgstr "Няма запис в DNS от указания вид за „%s“" -#: gio/gthreadedresolver.c:763 gio/gthreadedresolver.c:998 +#: gio/gthreadedresolver.c:779 gio/gthreadedresolver.c:1014 #, c-format msgid "Temporarily unable to resolve “%s”" msgstr "Временно е невъзможно „%s“ да бъде открит по адрес" -#: gio/gthreadedresolver.c:768 gio/gthreadedresolver.c:1003 -#: gio/gthreadedresolver.c:1113 +#: gio/gthreadedresolver.c:784 gio/gthreadedresolver.c:1019 +#: gio/gthreadedresolver.c:1129 #, c-format msgid "Error resolving “%s”" msgstr "Грешка при откриване по адрес на „%s“" -#: gio/gthreadedresolver.c:782 gio/gthreadedresolver.c:806 -#: gio/gthreadedresolver.c:831 gio/gthreadedresolver.c:846 +#: gio/gthreadedresolver.c:798 gio/gthreadedresolver.c:822 +#: gio/gthreadedresolver.c:847 gio/gthreadedresolver.c:862 msgid "Malformed DNS packet" msgstr "Неправилен пакет от DNS" -#: gio/gthreadedresolver.c:888 +#: gio/gthreadedresolver.c:904 #, c-format msgid "Failed to parse DNS response for “%s”: " msgstr "Неуспешен анализ на отговора от DNS за „%s“: " @@ -4426,7 +4435,7 @@ msgid "Error closing file descriptor: %s" msgstr "Грешка при затваряне на файловия дескриптор: %s" -#: gio/gunixmounts.c:2815 gio/gunixmounts.c:2868 +#: gio/gunixmounts.c:2817 gio/gunixmounts.c:2870 msgid "Filesystem root" msgstr "Коренова папка на файловата система" @@ -4508,77 +4517,77 @@ msgid "Wrong args\n" msgstr "Неправилни аргументи\n" -#: glib/gbookmarkfile.c:779 +#: glib/gbookmarkfile.c:861 #, c-format msgid "Unexpected attribute “%s” for element “%s”" msgstr "Неочакван атрибут „%s“ на елемента „%s“" -#: glib/gbookmarkfile.c:790 glib/gbookmarkfile.c:870 glib/gbookmarkfile.c:880 -#: glib/gbookmarkfile.c:993 +#: glib/gbookmarkfile.c:872 glib/gbookmarkfile.c:952 glib/gbookmarkfile.c:962 +#: glib/gbookmarkfile.c:1075 #, c-format msgid "Attribute “%s” of element “%s” not found" msgstr "Атрибутът „%s“ на елемента „%s“ не е открит" -#: glib/gbookmarkfile.c:1202 glib/gbookmarkfile.c:1267 -#: glib/gbookmarkfile.c:1331 glib/gbookmarkfile.c:1341 +#: glib/gbookmarkfile.c:1284 glib/gbookmarkfile.c:1349 +#: glib/gbookmarkfile.c:1413 glib/gbookmarkfile.c:1423 #, c-format msgid "Unexpected tag “%s”, tag “%s” expected" msgstr "Неочакван етикет „%s“, очакваше се „%s“" -#: glib/gbookmarkfile.c:1227 glib/gbookmarkfile.c:1241 -#: glib/gbookmarkfile.c:1309 glib/gbookmarkfile.c:1355 +#: glib/gbookmarkfile.c:1309 glib/gbookmarkfile.c:1323 +#: glib/gbookmarkfile.c:1391 glib/gbookmarkfile.c:1437 #, c-format msgid "Unexpected tag “%s” inside “%s”" msgstr "Неочакван етикет „%s“ вътре в „%s“" -#: glib/gbookmarkfile.c:1635 +#: glib/gbookmarkfile.c:1717 #, c-format msgid "Invalid date/time ‘%s’ in bookmark file" msgstr "Неправилна дата или време „%s“ във файла с отметки" -#: glib/gbookmarkfile.c:1838 +#: glib/gbookmarkfile.c:1956 msgid "No valid bookmark file found in data dirs" msgstr "Не може да се открие валиден файл с отметки в папките с данни" -#: glib/gbookmarkfile.c:2039 +#: glib/gbookmarkfile.c:2157 #, c-format msgid "A bookmark for URI “%s” already exists" msgstr "Вече съществува отметка за адреса „%s“" -#: glib/gbookmarkfile.c:2088 glib/gbookmarkfile.c:2246 -#: glib/gbookmarkfile.c:2331 glib/gbookmarkfile.c:2411 -#: glib/gbookmarkfile.c:2496 glib/gbookmarkfile.c:2630 -#: glib/gbookmarkfile.c:2763 glib/gbookmarkfile.c:2898 -#: glib/gbookmarkfile.c:2940 glib/gbookmarkfile.c:3037 -#: glib/gbookmarkfile.c:3158 glib/gbookmarkfile.c:3352 -#: glib/gbookmarkfile.c:3493 glib/gbookmarkfile.c:3712 -#: glib/gbookmarkfile.c:3801 glib/gbookmarkfile.c:3890 -#: glib/gbookmarkfile.c:4009 +#: glib/gbookmarkfile.c:2206 glib/gbookmarkfile.c:2364 +#: glib/gbookmarkfile.c:2449 glib/gbookmarkfile.c:2529 +#: glib/gbookmarkfile.c:2614 glib/gbookmarkfile.c:2748 +#: glib/gbookmarkfile.c:2881 glib/gbookmarkfile.c:3016 +#: glib/gbookmarkfile.c:3058 glib/gbookmarkfile.c:3155 +#: glib/gbookmarkfile.c:3276 glib/gbookmarkfile.c:3470 +#: glib/gbookmarkfile.c:3611 glib/gbookmarkfile.c:3830 +#: glib/gbookmarkfile.c:3919 glib/gbookmarkfile.c:4008 +#: glib/gbookmarkfile.c:4127 #, c-format msgid "No bookmark found for URI “%s”" msgstr "Не е открита отметка за адреса „%s“" -#: glib/gbookmarkfile.c:2420 +#: glib/gbookmarkfile.c:2538 #, c-format msgid "No MIME type defined in the bookmark for URI “%s”" msgstr "Не е указан видът MIME в отметката за адреса „%s“" -#: glib/gbookmarkfile.c:2505 +#: glib/gbookmarkfile.c:2623 #, c-format msgid "No private flag has been defined in bookmark for URI “%s”" msgstr "Не е зададен флаг за лични данни в отметката за адреса „%s“" -#: glib/gbookmarkfile.c:3046 +#: glib/gbookmarkfile.c:3164 #, c-format msgid "No groups set in bookmark for URI “%s”" msgstr "Не са зададени групи в отметката за адреса „%s“" -#: glib/gbookmarkfile.c:3514 glib/gbookmarkfile.c:3722 +#: glib/gbookmarkfile.c:3632 glib/gbookmarkfile.c:3840 #, c-format msgid "No application with name “%s” registered a bookmark for “%s”" msgstr "Никоя програма „%s“ не е регистрирала отметка за „%s“" -#: glib/gbookmarkfile.c:3745 +#: glib/gbookmarkfile.c:3863 #, c-format msgid "Failed to expand exec line “%s” with URI “%s”" msgstr "Неуспешно дописване за изпълнение на реда „%s“ с адреса „%s“" @@ -5056,86 +5065,86 @@ msgid "Error opening directory “%s”: %s" msgstr "Грешка при отваряне на папка „%s“: %s" -#: glib/gfileutils.c:735 glib/gfileutils.c:827 +#: glib/gfileutils.c:753 glib/gfileutils.c:845 #, c-format msgid "Could not allocate %lu byte to read file “%s”" msgid_plural "Could not allocate %lu bytes to read file “%s”" msgstr0 "Неуспешно заделяне на %lu байт за четене на файла „%s“" msgstr1 "Неуспешно заделяне на %lu байта за четене на файла „%s“" -#: glib/gfileutils.c:752 +#: glib/gfileutils.c:770 #, c-format msgid "Error reading file “%s”: %s" msgstr "Грешка при четене на файл „%s“: %s" -#: glib/gfileutils.c:788 +#: glib/gfileutils.c:806 #, c-format msgid "File “%s” is too large" msgstr "Файлът „%s“ е прекалено голям" -#: glib/gfileutils.c:852 +#: glib/gfileutils.c:870 #, c-format msgid "Failed to read from file “%s”: %s" msgstr "Неуспешно четене от файл „%s“: %s" -#: glib/gfileutils.c:902 glib/gfileutils.c:977 glib/gfileutils.c:1449 +#: glib/gfileutils.c:920 glib/gfileutils.c:995 glib/gfileutils.c:1472 #, c-format msgid "Failed to open file “%s”: %s" msgstr "Неуспешно отваряне на файл „%s“: %s" -#: glib/gfileutils.c:915 +#: glib/gfileutils.c:933 #, c-format msgid "Failed to get attributes of file “%s”: fstat() failed: %s" msgstr "" "Неуспешно получаване на атрибутите на файл „%s“: неуспешно изпълнение на " "„fstat()“: %s" -#: glib/gfileutils.c:946 +#: glib/gfileutils.c:964 #, c-format msgid "Failed to open file “%s”: fdopen() failed: %s" msgstr "" "Неуспешно отваряне на файл „%s“: неуспешно изпълнение на „fdopen()“: %s" -#: glib/gfileutils.c:1047 +#: glib/gfileutils.c:1065 #, c-format msgid "Failed to rename file “%s” to “%s”: g_rename() failed: %s" msgstr "" "Неуспешно преименуване на файл „%s“ на „%s“: неуспешно изпълнение на " "„g_rename()“: %s" -#: glib/gfileutils.c:1156 +#: glib/gfileutils.c:1179 #, c-format msgid "Failed to write file “%s”: write() failed: %s" msgstr "Неуспешен запис на файл „%s“: неуспешно изпълнение на „write()“: %s" -#: glib/gfileutils.c:1177 +#: glib/gfileutils.c:1200 #, c-format msgid "Failed to write file “%s”: fsync() failed: %s" msgstr "Неуспешен запис на файл „%s“: неуспешно изпълнение на „fsync()“: %s" -#: glib/gfileutils.c:1338 glib/gfileutils.c:1753 +#: glib/gfileutils.c:1361 glib/gfileutils.c:1776 #, c-format msgid "Failed to create file “%s”: %s" msgstr "Неуспешно създаване на файл „%s“: %s" -#: glib/gfileutils.c:1383 +#: glib/gfileutils.c:1406 #, c-format msgid "Existing file “%s” could not be removed: g_unlink() failed: %s" msgstr "" "Неуспешно изтриване на съществуващия файл „%s“: неуспешно изпълнение на " "„g_unlink()“: %s" -#: glib/gfileutils.c:1718 +#: glib/gfileutils.c:1741 #, c-format msgid "Template “%s” invalid, should not contain a “%s”" msgstr "Шаблонът „%s“ е неправилен, не трябва да съдържа „%s“" -#: glib/gfileutils.c:1731 +#: glib/gfileutils.c:1754 #, c-format msgid "Template “%s” doesn’t contain XXXXXX" msgstr "Шаблонът „%s“ не съдържа „XXXXXX“" -#: glib/gfileutils.c:2291 glib/gfileutils.c:2320 +#: glib/gfileutils.c:2348 glib/gfileutils.c:2377 #, c-format msgid "Failed to read the symbolic link “%s”: %s" msgstr "Неуспешно четене на символната връзка „%s“: %s" @@ -5197,8 +5206,8 @@ msgstr "Ключовият файл съдържа неподдържаното кодиране „%s“" #: glib/gkeyfile.c:1679 glib/gkeyfile.c:1852 glib/gkeyfile.c:3299 -#: glib/gkeyfile.c:3363 glib/gkeyfile.c:3493 glib/gkeyfile.c:3625 -#: glib/gkeyfile.c:3771 glib/gkeyfile.c:4006 glib/gkeyfile.c:4073 +#: glib/gkeyfile.c:3363 glib/gkeyfile.c:3493 glib/gkeyfile.c:3622 +#: glib/gkeyfile.c:3768 glib/gkeyfile.c:4003 glib/gkeyfile.c:4070 #, c-format msgid "Key file does not have group “%s”" msgstr "Ключовият файл не съдържа групата „%s“" @@ -5235,32 +5244,32 @@ msgid "Key “%s” in group “%s” has value “%s” where %s was expected" msgstr "Ключът „%s“ в групата „%s“ има стойност „%s“, а се очакваше „%s“" -#: glib/gkeyfile.c:4326 +#: glib/gkeyfile.c:4323 msgid "Key file contains escape character at end of line" msgstr "Ключовият файл съдържа екранираща последователност в край на ред" -#: glib/gkeyfile.c:4348 +#: glib/gkeyfile.c:4345 #, c-format msgid "Key file contains invalid escape sequence “%s”" msgstr "Ключовият файл съдържа грешна екранираща последователност — „%s“" -#: glib/gkeyfile.c:4493 +#: glib/gkeyfile.c:4490 #, c-format msgid "Value “%s” cannot be interpreted as a number." msgstr "Стойността „%s“ не може да се интерпретира като число." -#: glib/gkeyfile.c:4507 +#: glib/gkeyfile.c:4504 #, c-format msgid "Integer value “%s” out of range" msgstr "Целочислената стойност „%s“ е извън интервала на допустими стойности" -#: glib/gkeyfile.c:4540 +#: glib/gkeyfile.c:4537 #, c-format msgid "Value “%s” cannot be interpreted as a float number." msgstr "" "Стойността „%s“ не може да се интерпретира като число с плаваща запетая." -#: glib/gkeyfile.c:4579 +#: glib/gkeyfile.c:4576 #, c-format msgid "Value “%s” cannot be interpreted as a boolean." msgstr "Стойността „%s“ не може да се интерпретира като булева." @@ -5284,32 +5293,32 @@ msgid "Failed to open file “%s”: open() failed: %s" msgstr "Неуспешно отваряне на файл „%s“: неуспешно изпълнение на „open()“: %s" -#: glib/gmarkup.c:400 glib/gmarkup.c:442 +#: glib/gmarkup.c:393 glib/gmarkup.c:435 #, c-format msgid "Error on line %d char %d: " msgstr "Грешка на ред %d, знак %d: " -#: glib/gmarkup.c:464 glib/gmarkup.c:547 +#: glib/gmarkup.c:457 glib/gmarkup.c:540 #, c-format msgid "Invalid UTF-8 encoded text in name — not valid “%s”" msgstr "Неправилно кодиран текст в UTF-8 — „%s“ е грешен" -#: glib/gmarkup.c:475 +#: glib/gmarkup.c:468 #, c-format msgid "“%s” is not a valid name" msgstr "„%s“ е неправилно име" -#: glib/gmarkup.c:491 +#: glib/gmarkup.c:484 #, c-format msgid "“%s” is not a valid name: “%c”" msgstr "„%s“ е неправилно име: „%c“" -#: glib/gmarkup.c:615 +#: glib/gmarkup.c:608 #, c-format msgid "Error on line %d: %s" msgstr "Грешка на ред %d: %s" -#: glib/gmarkup.c:692 +#: glib/gmarkup.c:685 #, c-format msgid "" "Failed to parse “%-.*s”, which should have been a digit inside a character " @@ -5318,7 +5327,7 @@ "Грешка при анализ на „%-.*s“, което трябва да е число в указател на знак " "(напр. „ê“). Вероятно числото е твърде голямо" -#: glib/gmarkup.c:704 +#: glib/gmarkup.c:697 msgid "" "Character reference did not end with a semicolon; most likely you used an " "ampersand character without intending to start an entity — escape ampersand " @@ -5327,24 +5336,24 @@ "Указателят на знак не завършва с „;“. Най-вероятно сте използвали „&“, без " "той да е начало на заместваща последователност. Представете го чрез „&“" -#: glib/gmarkup.c:730 +#: glib/gmarkup.c:723 #, c-format msgid "Character reference “%-.*s” does not encode a permitted character" msgstr "Указателят на знак „%-.*s“ не представя разрешен знак при декодиране" -#: glib/gmarkup.c:768 +#: glib/gmarkup.c:761 msgid "" "Empty entity “&;” seen; valid entities are: & " < > '" msgstr "" "Намерена е празна заместваща последователност: „&;“. Валидни " "последователности са: „&“, „"“, „<“, „>“, „'“" -#: glib/gmarkup.c:776 +#: glib/gmarkup.c:769 #, c-format msgid "Entity name “%-.*s” is not known" msgstr "Името на заместващата последователност „%-.*s“ е неизвестно" -#: glib/gmarkup.c:781 +#: glib/gmarkup.c:774 msgid "" "Entity did not end with a semicolon; most likely you used an ampersand " "character without intending to start an entity — escape ampersand as &" @@ -5353,11 +5362,11 @@ "„&“, без той да е начало на заместваща последователност. Представете го чрез " "„&“" -#: glib/gmarkup.c:1195 +#: glib/gmarkup.c:1188 msgid "Document must begin with an element (e.g. <book>)" msgstr "Документът трябва да започва с елемент (напр. <book>)" -#: glib/gmarkup.c:1235 +#: glib/gmarkup.c:1228 #, c-format msgid "" "“%s” is not a valid character following a “<” character; it may not begin an " @@ -5365,7 +5374,7 @@ msgstr "" "„%s“ е неправилен знак след „<“. Името на елемент не може да започне с него" -#: glib/gmarkup.c:1278 +#: glib/gmarkup.c:1271 #, c-format msgid "" "Odd character “%s”, expected a “>” character to end the empty-element tag " @@ -5374,12 +5383,12 @@ "Неподходящ знак „%s“, очаква се етикетът на празния елемент „%s“ да завърши " "с „>“" -#: glib/gmarkup.c:1348 +#: glib/gmarkup.c:1341 #, c-format msgid "Too many attributes in element “%s”" msgstr "Прекалено много атрибути в елемента „%s“" -#: glib/gmarkup.c:1368 +#: glib/gmarkup.c:1361 #, c-format msgid "" "Odd character “%s”, expected a “=” after attribute name “%s” of element “%s”" @@ -5387,7 +5396,7 @@ "Неподходящ знак „%s“, очаква се „=“ след името на атрибут „%s“ на елемент " "„%s“" -#: glib/gmarkup.c:1410 +#: glib/gmarkup.c:1403 #, c-format msgid "" "Odd character “%s”, expected a “>” or “/” character to end the start tag of " @@ -5398,7 +5407,7 @@ "завърши със знак „>“ или „/“, или евентуално да продължи с атрибут. Най-" "вероятно използвате неправилен знак в името на атрибут" -#: glib/gmarkup.c:1455 +#: glib/gmarkup.c:1448 #, c-format msgid "" "Odd character “%s”, expected an open quote mark after the equals sign when " @@ -5407,7 +5416,7 @@ "Неподходящ знак „%s“, очаква се знак „\"“ или „'“ след знака за равенство, " "когато се присвоява стойност на атрибута „%s“ на елемент „%s“" -#: glib/gmarkup.c:1589 +#: glib/gmarkup.c:1582 #, c-format msgid "" "“%s” is not a valid character following the characters “</”; “%s” may not " @@ -5415,7 +5424,7 @@ msgstr "" "„%s“ е неправилен знак след „</“. Името на елемент не може да започва с „%s“" -#: glib/gmarkup.c:1627 +#: glib/gmarkup.c:1620 #, c-format msgid "" "“%s” is not a valid character following the close element name “%s”; the " @@ -5424,26 +5433,26 @@ "„%s“ е неправилен знак при завършването на затварящ етикет с име „%s“. " "Позволен е знакът „>“" -#: glib/gmarkup.c:1639 +#: glib/gmarkup.c:1632 #, c-format msgid "Element “%s” was closed, no element is currently open" msgstr "Елементът „%s“ е затворен, няма текущо отворен елемент" -#: glib/gmarkup.c:1648 +#: glib/gmarkup.c:1641 #, c-format msgid "Element “%s” was closed, but the currently open element is “%s”" msgstr "Елементът „%s“ е затворен, но текущо е отворен елемент „%s“" -#: glib/gmarkup.c:1801 +#: glib/gmarkup.c:1794 msgid "Document was empty or contained only whitespace" msgstr "Документът е празен или съдържа само празни знаци" -#: glib/gmarkup.c:1815 +#: glib/gmarkup.c:1808 msgid "Document ended unexpectedly just after an open angle bracket “<”" msgstr "" "Документът завършва неочаквано веднага след отваряща счупена скоба — „<“" -#: glib/gmarkup.c:1823 glib/gmarkup.c:1868 +#: glib/gmarkup.c:1816 glib/gmarkup.c:1861 #, c-format msgid "" "Document ended unexpectedly with elements still open — “%s” was the last " @@ -5452,7 +5461,7 @@ "Документът завършва неочаквано — има отворени елементи. Последно отворен е " "„%s“" -#: glib/gmarkup.c:1831 +#: glib/gmarkup.c:1824 #, c-format msgid "" "Document ended unexpectedly, expected to see a close angle bracket ending " @@ -5461,19 +5470,19 @@ "Документът завършва неочаквано, очаква се затваряща счупена скоба да завърши " "етикета <%s/>" -#: glib/gmarkup.c:1837 +#: glib/gmarkup.c:1830 msgid "Document ended unexpectedly inside an element name" msgstr "Документът завършва неочаквано в името на елемент" -#: glib/gmarkup.c:1843 +#: glib/gmarkup.c:1836 msgid "Document ended unexpectedly inside an attribute name" msgstr "Документът завършва неочаквано в името на атрибут" -#: glib/gmarkup.c:1848 +#: glib/gmarkup.c:1841 msgid "Document ended unexpectedly inside an element-opening tag." msgstr "Документът завършва неочаквано в отварящ етикет на елемент " -#: glib/gmarkup.c:1854 +#: glib/gmarkup.c:1847 msgid "" "Document ended unexpectedly after the equals sign following an attribute " "name; no attribute value" @@ -5481,22 +5490,22 @@ "Документът завършва неочаквано след знака за равенство след името на " "атрибута. Атрибутът няма стойност" -#: glib/gmarkup.c:1861 +#: glib/gmarkup.c:1854 msgid "Document ended unexpectedly while inside an attribute value" msgstr "Документът завършва неочаквано вътре в стойността на атрибут" -#: glib/gmarkup.c:1878 +#: glib/gmarkup.c:1871 #, c-format msgid "Document ended unexpectedly inside the close tag for element “%s”" msgstr "Документът завършва неочаквано в затварящия етикет на елемент „%s“" -#: glib/gmarkup.c:1882 +#: glib/gmarkup.c:1875 msgid "" "Document ended unexpectedly inside the close tag for an unopened element" msgstr "" "Документът завършва неочаквано в затварящия етикет на неотворен елемент" -#: glib/gmarkup.c:1888 +#: glib/gmarkup.c:1881 msgid "Document ended unexpectedly inside a comment or processing instruction" msgstr "Документът завършва неочаквано в коментар или инструкция за обработка" @@ -5563,186 +5572,186 @@ msgid "Unknown option %s" msgstr "Непозната опция „%s“" -#: glib/gregex.c:436 +#: glib/gregex.c:479 msgid "corrupted object" msgstr "повреден обект" -#: glib/gregex.c:438 +#: glib/gregex.c:481 msgid "out of memory" msgstr "недостатъчно памет" -#: glib/gregex.c:443 +#: glib/gregex.c:487 msgid "backtracking limit reached" msgstr "достигната е границата на обратното връщане" -#: glib/gregex.c:454 glib/gregex.c:707 glib/gregex.c:736 +#: glib/gregex.c:498 msgid "internal error" msgstr "вътрешна грешка" -#: glib/gregex.c:456 +#: glib/gregex.c:500 msgid "the pattern contains items not supported for partial matching" msgstr "" "шаблонът съдържа елементи, които не се поддържат при частично съвпадение" -#: glib/gregex.c:458 +#: glib/gregex.c:502 msgid "back references as conditions are not supported for partial matching" msgstr "" "обратните указатели не се поддържат като условие при частично съвпадение" -#: glib/gregex.c:464 +#: glib/gregex.c:508 msgid "recursion limit reached" msgstr "прекалено дълбока рекурсия" -#: glib/gregex.c:466 +#: glib/gregex.c:510 msgid "bad offset" msgstr "неправилно отместване" -#: glib/gregex.c:468 +#: glib/gregex.c:512 msgid "recursion loop" msgstr "зацикляне при рекурсия" #. should not happen in GRegex since we check modes before each match -#: glib/gregex.c:471 +#: glib/gregex.c:515 msgid "matching mode is requested that was not compiled for JIT" msgstr "заявеният начин за напасване на е компилиран с поддръжка на JIT" -#: glib/gregex.c:475 +#: glib/gregex.c:536 glib/gregex.c:1838 msgid "unknown error" msgstr "непозната грешка" -#: glib/gregex.c:496 +#: glib/gregex.c:557 msgid "\\ at end of pattern" msgstr "„\\“ в края на шаблон" -#: glib/gregex.c:500 +#: glib/gregex.c:561 msgid "\\c at end of pattern" msgstr "„\\c“ в края на шаблон" -#: glib/gregex.c:505 +#: glib/gregex.c:566 msgid "unrecognized character following \\" msgstr "след „\\“ следва непознат знак" -#: glib/gregex.c:509 +#: glib/gregex.c:570 msgid "numbers out of order in {} quantifier" msgstr "числата не са в правилен ред в определението за брой с „{}“" -#: glib/gregex.c:513 +#: glib/gregex.c:574 msgid "number too big in {} quantifier" msgstr "прекалено голямо число в определението за брой с „{}“" -#: glib/gregex.c:517 +#: glib/gregex.c:578 msgid "missing terminating for character class" msgstr "липсва завършващ знак „“ за клас от знаци" -#: glib/gregex.c:521 +#: glib/gregex.c:582 msgid "invalid escape sequence in character class" msgstr "грешна екранираща последователност в класа от знаци" -#: glib/gregex.c:525 +#: glib/gregex.c:586 msgid "range out of order in character class" msgstr "знаците са в неправилен ред в класа от знаци" -#: glib/gregex.c:530 +#: glib/gregex.c:591 msgid "nothing to repeat" msgstr "няма какво да се повтори" -#: glib/gregex.c:534 +#: glib/gregex.c:595 msgid "unrecognized character after (? or (?-" msgstr "непознат знак след „(?“ или „(?-“" -#: glib/gregex.c:538 +#: glib/gregex.c:599 msgid "POSIX named classes are supported only within a class" msgstr "именованите класове от POSIX се поддържат само в клас" -#: glib/gregex.c:542 +#: glib/gregex.c:603 msgid "POSIX collating elements are not supported" msgstr "не се поддържат елементи на POSIX за подредба" -#: glib/gregex.c:548 +#: glib/gregex.c:609 msgid "missing terminating )" msgstr "липсва завършваща „)“" -#: glib/gregex.c:552 +#: glib/gregex.c:613 msgid "reference to non-existent subpattern" msgstr "указател към несъществуващ подшаблон" -#: glib/gregex.c:556 +#: glib/gregex.c:617 msgid "missing ) after comment" msgstr "липсва „)“ след коментар" -#: glib/gregex.c:560 +#: glib/gregex.c:621 msgid "regular expression is too large" msgstr "регулярният израз е прекалено голям" -#: glib/gregex.c:564 +#: glib/gregex.c:625 msgid "malformed number or name after (?(" msgstr "неправилен номер или име след „(?(“" -#: glib/gregex.c:568 +#: glib/gregex.c:629 msgid "lookbehind assertion is not fixed length" msgstr "предположението за преглед назад не е с постоянна дължина" -#: glib/gregex.c:572 +#: glib/gregex.c:633 msgid "conditional group contains more than two branches" msgstr "условната група съдържа повече от две разклонения" -#: glib/gregex.c:576 +#: glib/gregex.c:637 msgid "assertion expected after (?(" msgstr "очаква се предположение след „(?(“" -#: glib/gregex.c:580 +#: glib/gregex.c:641 msgid "a numbered reference must not be zero" msgstr "номерираният указател не трябва да е „0“" -#: glib/gregex.c:584 +#: glib/gregex.c:645 msgid "unknown POSIX class name" msgstr "непознато име на клас по POSIX" -#: glib/gregex.c:589 +#: glib/gregex.c:650 msgid "character value in \\x{...} sequence is too large" msgstr "знаковата стойност в последователността „\\x{…}“ е прекалено голяма" -#: glib/gregex.c:593 +#: glib/gregex.c:654 msgid "\\C not allowed in lookbehind assertion" msgstr "предположението за преглед назад не може да съдържа „\\C“" -#: glib/gregex.c:597 +#: glib/gregex.c:658 msgid "missing terminator in subpattern name" msgstr "липсва краен знак в име на подшаблон" -#: glib/gregex.c:601 +#: glib/gregex.c:662 msgid "two named subpatterns have the same name" msgstr "два именовани подшаблона са с еднакво име" -#: glib/gregex.c:605 +#: glib/gregex.c:666 msgid "malformed \\P or \\p sequence" msgstr "неправилни последователности „\\P“ или „\\p“" -#: glib/gregex.c:609 +#: glib/gregex.c:670 msgid "unknown property name after \\P or \\p" msgstr "непознато име на свойство след „\\P“ или „\\p“" -#: glib/gregex.c:613 +#: glib/gregex.c:674 msgid "subpattern name is too long (maximum 32 characters)" msgstr "името на подшаблон е прекалено дълго (максимално е 32 знака)" -#: glib/gregex.c:617 +#: glib/gregex.c:678 msgid "too many named subpatterns (maximum 10,000)" msgstr "прекалено много именовани подшаблони (максимумът е 10 000)" -#: glib/gregex.c:621 +#: glib/gregex.c:682 msgid "octal value is greater than \\377" msgstr "осмичната стойност е по-голяма от „\\377“" -#: glib/gregex.c:625 +#: glib/gregex.c:686 msgid "DEFINE group contains more than one branch" msgstr "група „DEFINE“ съдържа повече от едно разклонение" -#: glib/gregex.c:629 +#: glib/gregex.c:690 msgid "inconsistent NEWLINE options" msgstr "несъвместими опции за нов ред" -#: glib/gregex.c:633 +#: glib/gregex.c:694 msgid "" "\\g is not followed by a braced, angle-bracketed, or quoted name or number, " "or by a plain number" @@ -5750,120 +5759,120 @@ "„\\g“ не е последвано от име, число във фигурни или квадратни скоби, " "цитирано име или обикновено число" -#: glib/gregex.c:638 +#: glib/gregex.c:699 msgid "an argument is not allowed for (*ACCEPT), (*FAIL), or (*COMMIT)" msgstr "„(*ACCEPT)“, „(*FAIL)“ и „(*COMMIT)“ не приемат аргументи" -#: glib/gregex.c:642 +#: glib/gregex.c:703 msgid "(*VERB) not recognized" msgstr "неразпознат „(*ГЛАГОЛ)“" -#: glib/gregex.c:646 +#: glib/gregex.c:707 msgid "number is too big" msgstr "числото е прекалено голямо" -#: glib/gregex.c:650 +#: glib/gregex.c:711 msgid "missing subpattern name after (?&" msgstr "липсва име на подшаблон след „(?&“" -#: glib/gregex.c:654 +#: glib/gregex.c:715 msgid "different names for subpatterns of the same number are not allowed" msgstr "не са позволени различни имена за подшаблони с еднакъв номер" -#: glib/gregex.c:658 +#: glib/gregex.c:719 msgid "(*MARK) must have an argument" msgstr "„(*MARK)“ изисква аргумент" -#: glib/gregex.c:662 +#: glib/gregex.c:723 msgid "\\c must be followed by an ASCII character" msgstr "„\\c“ трябва да се следва от знак от ASCII" -#: glib/gregex.c:666 +#: glib/gregex.c:727 msgid "\\k is not followed by a braced, angle-bracketed, or quoted name" msgstr "" "„\\k“ не е последвано от име във фигурни или квадратни скоби или от цитирано " "име" -#: glib/gregex.c:670 +#: glib/gregex.c:731 msgid "\\N is not supported in a class" msgstr "„\\N“ не се поддържа в клас" -#: glib/gregex.c:674 +#: glib/gregex.c:735 msgid "name is too long in (*MARK), (*PRUNE), (*SKIP), or (*THEN)" msgstr "" "името е прекалено дълго за „(*MARK)“, „(*PRUNE)“, „(*SKIP)“ и „(*THEN)“" -#: glib/gregex.c:678 glib/gregex.c:809 +#: glib/gregex.c:739 glib/gregex.c:875 msgid "code overflow" msgstr "препълване на кода" -#: glib/gregex.c:682 +#: glib/gregex.c:743 msgid "unrecognized character after (?P" msgstr "непознат знак след „(?P“" -#: glib/gregex.c:686 +#: glib/gregex.c:747 msgid "overran compiling workspace" msgstr "надхвърлено е работното пространство за компилация" -#: glib/gregex.c:690 +#: glib/gregex.c:751 msgid "previously-checked referenced subpattern not found" msgstr "не е открит указан предварително проверен подшаблон" -#: glib/gregex.c:808 glib/gregex.c:1041 glib/gregex.c:2342 +#: glib/gregex.c:874 glib/gregex.c:1121 glib/gregex.c:2444 #, c-format msgid "Error while matching regular expression %s: %s" msgstr "Грешка при напасването на регулярния израз „%s“: %s" -#: glib/gregex.c:1618 +#: glib/gregex.c:1721 msgid "PCRE library is compiled without UTF8 support" msgstr "Библиотеката PCRE е компилирана без поддръжка на UTF-8" -#: glib/gregex.c:1626 +#: glib/gregex.c:1729 msgid "PCRE library is compiled with incompatible options" msgstr "Библиотеката PCRE е компилирана с несъвместими опции" -#: glib/gregex.c:1751 +#: glib/gregex.c:1847 #, c-format msgid "Error while compiling regular expression ‘%s’ at char %s: %s" msgstr "Грешка при компилирането на регулярния израз „%s“, знак %s: %s" -#: glib/gregex.c:2786 +#: glib/gregex.c:2887 msgid "hexadecimal digit or “}” expected" msgstr "очаква се шестнадесетично число или „}“" -#: glib/gregex.c:2802 +#: glib/gregex.c:2903 msgid "hexadecimal digit expected" msgstr "очаква се шестнадесетично число" -#: glib/gregex.c:2842 +#: glib/gregex.c:2943 msgid "missing “<” in symbolic reference" msgstr "в символния указател липсва „<“" -#: glib/gregex.c:2851 +#: glib/gregex.c:2952 msgid "unfinished symbolic reference" msgstr "незавършен символен указател" -#: glib/gregex.c:2858 +#: glib/gregex.c:2959 msgid "zero-length symbolic reference" msgstr "символен указател с нулева дължина" -#: glib/gregex.c:2869 +#: glib/gregex.c:2970 msgid "digit expected" msgstr "очаква се цифра" -#: glib/gregex.c:2887 +#: glib/gregex.c:2988 msgid "illegal symbolic reference" msgstr "неправилен символен указател" -#: glib/gregex.c:2950 +#: glib/gregex.c:3051 msgid "stray final “\\”" msgstr "в края има един знак „\\“ в повече" -#: glib/gregex.c:2954 +#: glib/gregex.c:3055 msgid "unknown escape sequence" msgstr "непозната екранираща последователност" -#: glib/gregex.c:2964 +#: glib/gregex.c:3065 #, c-format msgid "Error while parsing replacement text “%s” at char %lu: %s" msgstr "Грешка при анализа на текста за замяна „%s“ при знак %lu: %s" @@ -5893,99 +5902,104 @@ msgid "Text was empty (or contained only whitespace)" msgstr "Текстът е празен (или съдържа само празни знаци)" -#: glib/gspawn.c:314 +#: glib/gspawn.c:319 #, c-format msgid "Failed to read data from child process (%s)" msgstr "Неуспешно четене на данни от дъщерен процес (%s)" -#: glib/gspawn.c:466 +#: glib/gspawn.c:471 #, c-format msgid "Unexpected error in reading data from a child process (%s)" msgstr "" "Неочаквана грешка в „select()“ при четене на данни от дъщерен процес (%s)" -#: glib/gspawn.c:551 +#: glib/gspawn.c:556 #, c-format msgid "Unexpected error in waitpid() (%s)" msgstr "Неочаквана грешка в „waitpid()“ (%s)" -#: glib/gspawn.c:1170 glib/gspawn-win32.c:1488 +#: glib/gspawn.c:1175 glib/gspawn-win32.c:1503 #, c-format msgid "Child process exited with code %ld" msgstr "Дъщерният процес завърши с код %ld" -#: glib/gspawn.c:1178 +#: glib/gspawn.c:1183 #, c-format msgid "Child process killed by signal %ld" msgstr "Дъщерният процес бе убит от сигнал %ld" -#: glib/gspawn.c:1185 +#: glib/gspawn.c:1190 #, c-format msgid "Child process stopped by signal %ld" msgstr "Дъщерният процес бе спрян от сигнал %ld" -#: glib/gspawn.c:1192 +#: glib/gspawn.c:1197 #, c-format msgid "Child process exited abnormally" msgstr "Дъщерният процес завърши аварийно" -#: glib/gspawn.c:1885 glib/gspawn-win32.c:393 glib/gspawn-win32.c:401 +#: glib/gspawn.c:2027 glib/gspawn-win32.c:393 glib/gspawn-win32.c:401 #, c-format msgid "Failed to read from child pipe (%s)" msgstr "Неуспешно четене от дъщерен канал (%s)" -#: glib/gspawn.c:2248 +#: glib/gspawn.c:2399 #, c-format msgid "Failed to spawn child process “%s” (%s)" msgstr "Неуспешно пораждане на дъщерен процес „%s“ (%s)" -#: glib/gspawn.c:2365 +#: glib/gspawn.c:2525 #, c-format msgid "Failed to fork (%s)" msgstr "Неуспешно пораждане (%s)" -#: glib/gspawn.c:2525 glib/gspawn-win32.c:424 +#: glib/gspawn.c:2685 glib/gspawn-win32.c:424 #, c-format msgid "Failed to change to directory “%s” (%s)" msgstr "Неуспешна смяна към папка „%s“ (%s)" -#: glib/gspawn.c:2535 +#: glib/gspawn.c:2695 #, c-format msgid "Failed to execute child process “%s” (%s)" msgstr "Неуспешно изпълнение на дъщерен процес „%s“ (%s)" -#: glib/gspawn.c:2545 +#: glib/gspawn.c:2705 #, c-format msgid "Failed to open file to remap file descriptor (%s)" msgstr "Неуспешно отваряне на файл за заместване на файлов дескриптор (%s)" -#: glib/gspawn.c:2553 +#: glib/gspawn.c:2713 #, c-format msgid "Failed to duplicate file descriptor for child process (%s)" msgstr "Неуспешно дублиране на файлов дескриптор за дъщерен процес (%s)" -#: glib/gspawn.c:2562 +#: glib/gspawn.c:2722 #, c-format msgid "Failed to fork child process (%s)" msgstr "Неуспешно разклоняване на дъщерен процес (%s)" -#: glib/gspawn.c:2570 +#: glib/gspawn.c:2730 #, c-format msgid "Failed to close file descriptor for child process (%s)" msgstr "Неуспешно затваряне на файловия дескриптор на дъщерен процес (%s)" -#: glib/gspawn.c:2578 +#: glib/gspawn.c:2738 #, c-format msgid "Unknown error executing child process “%s”" msgstr "Неизвестна грешка при изпълнение на дъщерен процес „%s“" -#: glib/gspawn.c:2602 +#: glib/gspawn.c:2762 #, c-format msgid "Failed to read enough data from child pid pipe (%s)" msgstr "" "Неуспешно четене на достатъчно данни от канала на дъщерен процес (с " "идентификатор %s)" +#: glib/gspawn-private.h:134 +#, c-format +msgid "Invalid source FDs argument" +msgstr "Неправилен аргумент за файлов дескриптор на източник" + #: glib/gspawn-win32.c:337 msgid "Failed to read data from child process" msgstr "Неуспешно четене на данни от дъщерен процес" @@ -6005,27 +6019,27 @@ msgid "Invalid program name: %s" msgstr "Неправилно име на програма: %s" -#: glib/gspawn-win32.c:521 glib/gspawn-win32.c:853 +#: glib/gspawn-win32.c:521 glib/gspawn-win32.c:868 #, c-format msgid "Invalid string in argument vector at %d: %s" msgstr "Неправилен низ във вектора с аргументи на позиция %d: %s" -#: glib/gspawn-win32.c:532 glib/gspawn-win32.c:869 +#: glib/gspawn-win32.c:532 glib/gspawn-win32.c:884 #, c-format msgid "Invalid string in environment: %s" msgstr "Неправилен низ в средата: %s" -#: glib/gspawn-win32.c:849 +#: glib/gspawn-win32.c:864 #, c-format msgid "Invalid working directory: %s" msgstr "Неправилна работна папка: %s" -#: glib/gspawn-win32.c:914 +#: glib/gspawn-win32.c:929 #, c-format msgid "Failed to execute helper program (%s)" msgstr "Неуспешно изпълнение на програмата за помощта (%s)" -#: glib/gspawn-win32.c:1143 +#: glib/gspawn-win32.c:1158 msgid "" "Unexpected error in g_io_channel_win32_poll() reading data from a child " "process" @@ -6033,21 +6047,21 @@ "Неочаквана грешка в „g_io_channel_win32_poll()“ при четене на данни от " "дъщерен процес" -#: glib/gstrfuncs.c:3372 glib/gstrfuncs.c:3474 +#: glib/gstrfuncs.c:3370 glib/gstrfuncs.c:3472 msgid "Empty string is not a number" msgstr "Празен низ не е число" -#: glib/gstrfuncs.c:3396 +#: glib/gstrfuncs.c:3394 #, c-format msgid "“%s” is not a signed number" msgstr "„%s“ е число със знак" -#: glib/gstrfuncs.c:3406 glib/gstrfuncs.c:3510 +#: glib/gstrfuncs.c:3404 glib/gstrfuncs.c:3508 #, c-format msgid "Number “%s” is out of bounds %s, %s" msgstr "Числото „%s“ е извън диапазона на допустимите стойности %s, %s" -#: glib/gstrfuncs.c:3500 +#: glib/gstrfuncs.c:3498 #, c-format msgid "“%s” is not an unsigned number" msgstr "„%s“ не е число без знак" @@ -6126,132 +6140,132 @@ msgstr "Знак извън обхвата на UTF-16" #. Translators: A unit symbol for size formatting, showing for example: "13.0 kB" -#: glib/gutils.c:2857 +#: glib/gutils.c:2966 msgid "kB" msgstr "kB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 MB" -#: glib/gutils.c:2859 +#: glib/gutils.c:2968 msgid "MB" msgstr "MB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 GB" -#: glib/gutils.c:2861 +#: glib/gutils.c:2970 msgid "GB" msgstr "GB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 TB" -#: glib/gutils.c:2863 +#: glib/gutils.c:2972 msgid "TB" msgstr "TB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 PB" -#: glib/gutils.c:2865 +#: glib/gutils.c:2974 msgid "PB" msgstr "PB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 EB" -#: glib/gutils.c:2867 +#: glib/gutils.c:2976 msgid "EB" msgstr "EB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 KiB" -#: glib/gutils.c:2871 +#: glib/gutils.c:2980 msgid "KiB" msgstr "KiB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 MiB" -#: glib/gutils.c:2873 +#: glib/gutils.c:2982 msgid "MiB" msgstr "MiB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 GiB" -#: glib/gutils.c:2875 +#: glib/gutils.c:2984 msgid "GiB" msgstr "GiB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 TiB" -#: glib/gutils.c:2877 +#: glib/gutils.c:2986 msgid "TiB" msgstr "TiB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 PiB" -#: glib/gutils.c:2879 +#: glib/gutils.c:2988 msgid "PiB" msgstr "PiB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 EiB" -#: glib/gutils.c:2881 +#: glib/gutils.c:2990 msgid "EiB" msgstr "EiB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 kb" -#: glib/gutils.c:2885 +#: glib/gutils.c:2994 msgid "kb" msgstr "kb" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Mb" -#: glib/gutils.c:2887 +#: glib/gutils.c:2996 msgid "Mb" msgstr "Mb" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Gb" -#: glib/gutils.c:2889 +#: glib/gutils.c:2998 msgid "Gb" msgstr "Gb" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Tb" -#: glib/gutils.c:2891 +#: glib/gutils.c:3000 msgid "Tb" msgstr "Tb" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Pb" -#: glib/gutils.c:2893 +#: glib/gutils.c:3002 msgid "Pb" msgstr "Pb" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Eb" -#: glib/gutils.c:2895 +#: glib/gutils.c:3004 msgid "Eb" msgstr "Eb" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Kib" -#: glib/gutils.c:2899 +#: glib/gutils.c:3008 msgid "Kib" msgstr "Kib" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Mib" -#: glib/gutils.c:2901 +#: glib/gutils.c:3010 msgid "Mib" msgstr "Mib" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Gib" -#: glib/gutils.c:2903 +#: glib/gutils.c:3012 msgid "Gib" msgstr "Gib" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Tib" -#: glib/gutils.c:2905 +#: glib/gutils.c:3014 msgid "Tib" msgstr "Tib" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Pib" -#: glib/gutils.c:2907 +#: glib/gutils.c:3016 msgid "Pib" msgstr "Pib" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Eib" -#: glib/gutils.c:2909 +#: glib/gutils.c:3018 msgid "Eib" msgstr "Eib" -#: glib/gutils.c:2947 +#: glib/gutils.c:3056 msgid "byte" msgid_plural "bytes" msgstr0 "байт" msgstr1 "байта" -#: glib/gutils.c:2951 +#: glib/gutils.c:3060 msgid "bit" msgid_plural "bits" msgstr0 "%u бит" @@ -6259,7 +6273,7 @@ #. Translators: The "%u" is replaced with the size value, like "13"; it could #. * be part of "13 bytes", but only the number is requested this time. -#: glib/gutils.c:2959 +#: glib/gutils.c:3068 #, c-format msgctxt "format-size" msgid "%u" @@ -6267,7 +6281,7 @@ #. Translators: The first "%u" is replaced with the value, the "%s" with a unit of the value. #. * The order can be changed with "%$2s %$1u". An example: "13 bytes" -#: glib/gutils.c:2964 +#: glib/gutils.c:3073 #, c-format msgctxt "format-size" msgid "%u %s" @@ -6275,7 +6289,7 @@ #. Translators: The "%.1f" is replaced with the size value, like "13.0"; it could #. * be part of "13.0 MB", but only the number is requested this time. -#: glib/gutils.c:3000 +#: glib/gutils.c:3109 #, c-format msgctxt "format-size" msgid "%.1f" @@ -6284,14 +6298,14 @@ #. Translators: The first "%.1f" is replaced with the value, the "%s" with a unit of the value. #. * The order can be changed with "%$2s %$1.1f". Keep the no-break space between the value and #. * the unit symbol. An example: "13.0 MB" -#: glib/gutils.c:3006 +#: glib/gutils.c:3115 #, c-format msgctxt "format-size" msgid "%.1f %s" msgstr "%.1f %s" #. Translators: the %s in "%s bytes" will always be replaced by a number. -#: glib/gutils.c:3046 +#: glib/gutils.c:3155 #, c-format msgid "%s byte" msgid_plural "%s bytes" @@ -6299,14 +6313,14 @@ msgstr1 "%s байта" #. Translators: the %s in "%s bits" will always be replaced by a number. -#: glib/gutils.c:3051 +#: glib/gutils.c:3160 #, c-format msgid "%s bit" msgid_plural "%s bits" msgstr0 "%s бит" msgstr1 "%s бита" -#: glib/gutils.c:3092 +#: glib/gutils.c:3201 #, c-format msgid "%u byte" msgid_plural "%u bytes" @@ -6318,32 +6332,32 @@ #. * compatibility. Users will not see this string unless a program is using this deprecated function. #. * Please translate as literally as possible. #. -#: glib/gutils.c:3105 +#: glib/gutils.c:3214 #, c-format msgid "%.1f KB" msgstr "%.1f KB" -#: glib/gutils.c:3110 +#: glib/gutils.c:3219 #, c-format msgid "%.1f MB" msgstr "%.1f MB" -#: glib/gutils.c:3115 +#: glib/gutils.c:3224 #, c-format msgid "%.1f GB" msgstr "%.1f GB" -#: glib/gutils.c:3120 +#: glib/gutils.c:3229 #, c-format msgid "%.1f TB" msgstr "%.1f TB" -#: glib/gutils.c:3125 +#: glib/gutils.c:3234 #, c-format msgid "%.1f PB" msgstr "%.1f PB" -#: glib/gutils.c:3130 +#: glib/gutils.c:3239 #, c-format msgid "%.1f EB" msgstr "%.1f EB"
View file
_service:tar_scm:glib-2.74.4.tar.xz/po/ca.po -> _service:tar_scm:glib-2.76.4.tar.xz/po/ca.po
Changed
@@ -6,14 +6,14 @@ # Sílvia Miranda <silvia@softcatala.cat>, 2011. # Jordi Serratosa <jordis@softcatala.cat>, 2012, 2017. # Gil Forcada <gilforcada@guifi.net>, 2008-2013, 2013, 2014, 2016. -# Jordi Mas i Hernàndez <jmas@softcatala.org>, 2016-2022 +# Jordi Mas i Hernàndez <jmas@softcatala.org>, 2016-2023 # Xavi Ivars <xavi.ivars@gmail.com>, 2017. msgid "" msgstr "" "Project-Id-Version: glib 2.8\n" "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/glib/issues\n" -"POT-Creation-Date: 2022-08-08 10:42+0000\n" -"PO-Revision-Date: 2022-08-14 11:48+0100\n" +"POT-Creation-Date: 2023-02-15 16:30+0000\n" +"PO-Revision-Date: 2023-03-07 11:48+0100\n" "Last-Translator: Jordi Mas <jmas@softcatala.org>\n" "Language-Team: Catalan <tradgnome@softcatala.org>\n" "Language: ca\n" @@ -24,24 +24,24 @@ "X-Generator: Poedit 3.0.1\n" "X-Project-Style: gnome\n" -#: gio/gappinfo.c:335 +#: gio/gappinfo.c:339 msgid "Setting default applications not supported yet" msgstr "Encara no s'admeten les aplicacions per defecte" -#: gio/gappinfo.c:368 +#: gio/gappinfo.c:372 msgid "Setting application as last used for type not supported yet" msgstr "" "L'establiment de l'aplicació com a última utilitzada per al tipus encara no " "és compatible" -#: gio/gappinfo.c:808 +#: gio/gappinfo.c:814 #, c-format msgid "Failed to find default application for content type ‘%s’" msgstr "" "No s'ha pogut trobar l'aplicació predeterminada per al tipus de contingut " "«%s»" -#: gio/gappinfo.c:868 +#: gio/gappinfo.c:874 #, c-format msgid "Failed to find default application for URI Scheme ‘%s’" msgstr "" @@ -246,13 +246,13 @@ msgid "error sending %s message to application: %s\n" msgstr "s'ha produït un error en enviar el missatge %s: %s\n" -#: gio/gapplication-tool.c:321 +#: gio/gapplication-tool.c:324 msgid "action name must be given after application id\n" msgstr "" "s'ha de proporcionar el nom de l'acció després de l'identificador de " "l'aplicació\n" -#: gio/gapplication-tool.c:329 +#: gio/gapplication-tool.c:332 #, c-format msgid "" "invalid action name: “%s”\n" @@ -261,27 +261,27 @@ "el nom d'acció no és vàlid: «%s»\n" "els noms d'acció han d'estar formats per caràcters alfanumèrics, «-» i «.»\n" -#: gio/gapplication-tool.c:348 +#: gio/gapplication-tool.c:351 #, c-format msgid "error parsing action parameter: %s\n" msgstr "s'ha produït un error en analitzar el paràmetre d'acció: %s\n" -#: gio/gapplication-tool.c:360 +#: gio/gapplication-tool.c:363 msgid "actions accept a maximum of one parameter\n" msgstr "les accions accepten com a màxim un paràmetre\n" -#: gio/gapplication-tool.c:415 +#: gio/gapplication-tool.c:418 msgid "list-actions command takes only the application id" msgstr "" "l'ordre de llistat d'aplicacions (list-actions) només pren l'identificador " "d'aplicació" -#: gio/gapplication-tool.c:425 +#: gio/gapplication-tool.c:428 #, c-format msgid "unable to find desktop file for application %s\n" msgstr "no s'ha pogut trobar el fitxer d'escriptori de l'aplicació %s\n" -#: gio/gapplication-tool.c:470 +#: gio/gapplication-tool.c:473 #, c-format msgid "" "unrecognised command: %s\n" @@ -316,7 +316,7 @@ msgid "Truncate not supported on base stream" msgstr "No es permet truncar en els fluxos base" -#: gio/gcancellable.c:319 gio/gdbusconnection.c:1859 gio/gdbusprivate.c:1420 +#: gio/gcancellable.c:326 gio/gdbusconnection.c:1859 gio/gdbusprivate.c:1420 #: gio/gsimpleasyncresult.c:873 gio/gsimpleasyncresult.c:899 #, c-format msgid "Operation was cancelled" @@ -336,13 +336,13 @@ #: gio/gcharsetconverter.c:344 gio/gdatainputstream.c:850 #: gio/gdatainputstream.c:1268 glib/gconvert.c:451 glib/gconvert.c:883 -#: glib/giochannel.c:1576 glib/giochannel.c:1618 glib/giochannel.c:2473 +#: glib/giochannel.c:1576 glib/giochannel.c:1618 glib/giochannel.c:2478 #: glib/gutf8.c:892 glib/gutf8.c:1346 msgid "Invalid byte sequence in conversion input" msgstr "La seqüència de bytes a l'entrada de conversió no és vàlida" #: gio/gcharsetconverter.c:349 glib/gconvert.c:459 glib/gconvert.c:797 -#: glib/giochannel.c:1583 glib/giochannel.c:2485 +#: glib/giochannel.c:1583 glib/giochannel.c:2493 #, c-format msgid "Error during conversion: %s" msgstr "S'ha produït un error durant la conversió: %s" @@ -401,17 +401,17 @@ msgid "Unexpected early end-of-stream" msgstr "No s'esperava un final de flux tan aviat" -#: gio/gdbusaddress.c:164 gio/gdbusaddress.c:238 gio/gdbusaddress.c:327 +#: gio/gdbusaddress.c:162 gio/gdbusaddress.c:234 gio/gdbusaddress.c:321 #, c-format msgid "Unsupported key “%s” in address entry “%s”" msgstr "No es permet la clau «%s» en l'entrada de l'adreça «%s»" -#: gio/gdbusaddress.c:177 +#: gio/gdbusaddress.c:175 #, c-format msgid "Meaningless key/value pair combination in address entry “%s”" msgstr "L'entrada d'adreça «%s» té una parella clau/valor que no té sentit" -#: gio/gdbusaddress.c:186 +#: gio/gdbusaddress.c:184 #, c-format msgid "" "Address “%s” is invalid (need exactly one of path, dir, tmpdir, or abstract " @@ -420,29 +420,29 @@ "L'adreça «%s» no és vàlida (ha de ser, o bé un camí, o bé un tmpdir " "-directori temporal-, o bé unes claus abstractes)" -#: gio/gdbusaddress.c:253 gio/gdbusaddress.c:264 gio/gdbusaddress.c:279 -#: gio/gdbusaddress.c:342 gio/gdbusaddress.c:353 +#: gio/gdbusaddress.c:249 gio/gdbusaddress.c:260 gio/gdbusaddress.c:275 +#: gio/gdbusaddress.c:336 gio/gdbusaddress.c:347 #, c-format msgid "Error in address “%s” — the “%s” attribute is malformed" msgstr "Hi ha un error a l'adreça «%s» — l'atribut «%s» no està ben formatat" -#: gio/gdbusaddress.c:423 gio/gdbusaddress.c:682 +#: gio/gdbusaddress.c:417 gio/gdbusaddress.c:676 #, c-format msgid "Unknown or unsupported transport “%s” for address “%s”" msgstr "" "El transport «%s» per a l'adreça «%s» és desconegut o no està implementat" -#: gio/gdbusaddress.c:467 +#: gio/gdbusaddress.c:461 #, c-format msgid "Address element “%s” does not contain a colon (:)" msgstr "L'element d'adreça «%s» no conté dos punts (:)" -#: gio/gdbusaddress.c:476 +#: gio/gdbusaddress.c:470 #, c-format msgid "Transport name in address element “%s” must not be empty" msgstr "El nom del transport a l'adreça a l'element «%s» no pot estar buit" -#: gio/gdbusaddress.c:497 +#: gio/gdbusaddress.c:491 #, c-format msgid "" "Key/Value pair %d, “%s”, in address element “%s” does not contain an equal " @@ -451,7 +451,7 @@ "La parella de clau/valor %d, «%s», a l'element d'adreça «%s», no conté un " "signe d'igual" -#: gio/gdbusaddress.c:508 +#: gio/gdbusaddress.c:502 #, c-format msgid "" "Key/Value pair %d, “%s”, in address element “%s” must not have an empty key" @@ -459,7 +459,7 @@ "La parella de clau/valor %d, «%s», a l'element d'adreça «%s», no conté un " "signe d'igual" -#: gio/gdbusaddress.c:522 +#: gio/gdbusaddress.c:516 #, c-format msgid "" "Error unescaping key or value in Key/Value pair %d, “%s”, in address element" @@ -468,7 +468,7 @@ "S'ha produït un error en suprimir l'escapament d'una clau o d'un valor en la" " parella clau/valor %d, «%s», de l'element d'adreça «%s»" -#: gio/gdbusaddress.c:590 +#: gio/gdbusaddress.c:584 #, c-format msgid "" "Error in address “%s” — the unix transport requires exactly one of the keys " @@ -478,20 +478,20 @@ "establerta exactament una clau, o bé de tipus «path» (camí), o bé de tipus " "«abstract» (abstracte)" -#: gio/gdbusaddress.c:625 +#: gio/gdbusaddress.c:619 #, c-format msgid "Error in address “%s” — the host attribute is missing or malformed" msgstr "" "Hi ha un error a l'adreça «%s»: manca o està mal formatat l'atribut del nom " "d'ordinador" -#: gio/gdbusaddress.c:639 +#: gio/gdbusaddress.c:633 #, c-format msgid "Error in address “%s” — the port attribute is missing or malformed" msgstr "" "Hi ha un error a l'adreça «%s»: manca o està mal formatat l'atribut del port" -#: gio/gdbusaddress.c:653 +#: gio/gdbusaddress.c:647 #, c-format msgid "" "Error in address “%s” — the noncefile attribute is missing or malformed" @@ -499,66 +499,66 @@ "Hi ha un error a l'adreça «%s»: l'atribut noncefile no existeix o està mal " "formatat" -#: gio/gdbusaddress.c:674 +#: gio/gdbusaddress.c:668 msgid "Error auto-launching: " msgstr "S'ha produït un error en executar-se automàticament: " -#: gio/gdbusaddress.c:727 +#: gio/gdbusaddress.c:721 #, c-format msgid "Error opening nonce file “%s”: %s" msgstr "S'ha produït un error en obrir el fitxer nonce «%s»: %s" -#: gio/gdbusaddress.c:746 +#: gio/gdbusaddress.c:740 #, c-format msgid "Error reading from nonce file “%s”: %s" msgstr "S'ha produït un error en llegir el fitxer nonce «%s»: %s" -#: gio/gdbusaddress.c:755 +#: gio/gdbusaddress.c:749 #, c-format msgid "Error reading from nonce file “%s”, expected 16 bytes, got %d" msgstr "" "S'ha produït un error en llegir el fitxer nonce «%s»: s'esperaven 16 bytes, " "però se n'han obtingut %d" -#: gio/gdbusaddress.c:773 +#: gio/gdbusaddress.c:767 #, c-format msgid "Error writing contents of nonce file “%s” to stream:" msgstr "" "S'ha produït un error en escriure els continguts del fitxer nonce «%s» al " "flux:" -#: gio/gdbusaddress.c:988 +#: gio/gdbusaddress.c:982 msgid "The given address is empty" msgstr "L'adreça que s'ha indicat és buida" -#: gio/gdbusaddress.c:1101 +#: gio/gdbusaddress.c:1095 #, c-format msgid "Cannot spawn a message bus when AT_SECURE is set" msgstr "No es pot engendrar un bus de missatges quan s'ha definit AT_SECURE" -#: gio/gdbusaddress.c:1108 +#: gio/gdbusaddress.c:1102 msgid "Cannot spawn a message bus without a machine-id: " msgstr "" "No es pot engendrar un bus de missatge sense un identificador de màquina: " -#: gio/gdbusaddress.c:1115 +#: gio/gdbusaddress.c:1109 #, c-format msgid "Cannot autolaunch D-Bus without X11 $DISPLAY" msgstr "No es pot executar D-Bus automàticament sense X11 $DISPLAY" -#: gio/gdbusaddress.c:1157 +#: gio/gdbusaddress.c:1151 #, c-format msgid "Error spawning command line “%s”: " msgstr "S'ha produït un error en engendrar la línia d'ordres «%s»: " -#: gio/gdbusaddress.c:1226 +#: gio/gdbusaddress.c:1220 #, c-format msgid "Cannot determine session bus address (not implemented for this OS)" msgstr "" "No s'ha pogut determinar l'adreça del bus de sessió (no està implementat en " "aquest sistema operatiu)" -#: gio/gdbusaddress.c:1375 gio/gdbusconnection.c:7321 +#: gio/gdbusaddress.c:1374 gio/gdbusconnection.c:7316 #, c-format msgid "" "Cannot determine bus address from DBUS_STARTER_BUS_TYPE environment variable" @@ -567,7 +567,7 @@ "No es pot determinar l'adreça del bus a través de la variable d'entorn " "«DBUS_STARTER_BUS_TYPE»: conté un valor desconegut «%s»" -#: gio/gdbusaddress.c:1384 gio/gdbusconnection.c:7330 +#: gio/gdbusaddress.c:1383 gio/gdbusconnection.c:7325 msgid "" "Cannot determine bus address because the DBUS_STARTER_BUS_TYPE environment " "variable is not set" @@ -575,7 +575,7 @@ "No es pot determinar l'adreça del bus perquè la variable d'entorn " "«DBUS_STARTER_BUS_TYPE» no està establerta" -#: gio/gdbusaddress.c:1394 +#: gio/gdbusaddress.c:1393 #, c-format msgid "Unknown bus type %d" msgstr "Tipus de bus desconegut %d" @@ -599,12 +599,16 @@ "S'han exhaurit tots els mecanismes d'autenticació disponibles (s'han provat:" " %s) (hi ha disponibles: %s)" -#: gio/gdbusauth.c:1178 +#: gio/gdbusauth.c:1045 +msgid "Unexpected lack of content trying to read a byte" +msgstr "Manca inesperada de contingut en intentar llegir un byte" + +#: gio/gdbusauth.c:1195 msgid "User IDs must be the same for peer and server" msgstr "" "Els identificadors d'usuari han de ser els mateixos per a clients i servidor" -#: gio/gdbusauth.c:1190 +#: gio/gdbusauth.c:1207 msgid "Cancelled via GDBusAuthObserver::authorize-authenticated-peer" msgstr "" "S'ha cancel·lat a través de GDBusAuthObserver::authorize-authenticated-peer" @@ -706,7 +710,7 @@ msgstr "" "(A més a més, l'alliberació del blocatge per a «%s» també ha fallat: %s) " -#: gio/gdbusconnection.c:590 gio/gdbusconnection.c:2404 +#: gio/gdbusconnection.c:590 gio/gdbusconnection.c:2405 msgid "The connection is closed" msgstr "La connexió està tancada" @@ -714,14 +718,14 @@ msgid "Timeout was reached" msgstr "S'ha esgotat el temps d'espera" -#: gio/gdbusconnection.c:2527 +#: gio/gdbusconnection.c:2528 msgid "" "Unsupported flags encountered when constructing a client-side connection" msgstr "" "S'han trobat senyaladors no implementats en construir-se la part de la " "connexió del client" -#: gio/gdbusconnection.c:4256 gio/gdbusconnection.c:4610 +#: gio/gdbusconnection.c:4257 gio/gdbusconnection.c:4611 #, c-format msgid "" "No such interface “org.freedesktop.DBus.Properties” on object at path %s" @@ -729,107 +733,107 @@ "No existeix la interfície «org.freedesktop.DBus.Properties» en l'objecte al " "camí %s" -#: gio/gdbusconnection.c:4401 +#: gio/gdbusconnection.c:4402 #, c-format msgid "No such property “%s”" msgstr "No existeix la propietat «%s»" -#: gio/gdbusconnection.c:4413 +#: gio/gdbusconnection.c:4414 #, c-format msgid "Property “%s” is not readable" msgstr "La propietat «%s» no és de lectura" -#: gio/gdbusconnection.c:4424 +#: gio/gdbusconnection.c:4425 #, c-format msgid "Property “%s” is not writable" msgstr "La propietat «%s» no és d'escriptura" -#: gio/gdbusconnection.c:4444 +#: gio/gdbusconnection.c:4445 #, c-format msgid "Error setting property “%s”: Expected type “%s” but got “%s”" msgstr "" "S'ha produït un error en establir la propietat «%s»: s'esperava el tipus " "«%s», però s'ha obtingut el «%s»" -#: gio/gdbusconnection.c:4549 gio/gdbusconnection.c:4764 -#: gio/gdbusconnection.c:6747 +#: gio/gdbusconnection.c:4550 gio/gdbusconnection.c:4765 +#: gio/gdbusconnection.c:6742 #, c-format msgid "No such interface “%s”" msgstr "No existeix la interfície «%s»" -#: gio/gdbusconnection.c:4986 gio/gdbusconnection.c:7261 +#: gio/gdbusconnection.c:4981 gio/gdbusconnection.c:7256 #, c-format msgid "No such interface “%s” on object at path %s" msgstr "No existeix la interfície «%s» en l'objecte al camí %s" -#: gio/gdbusconnection.c:5087 +#: gio/gdbusconnection.c:5082 #, c-format msgid "No such method “%s”" msgstr "No existeix el mètode «%s»" -#: gio/gdbusconnection.c:5118 +#: gio/gdbusconnection.c:5113 #, c-format msgid "Type of message, “%s”, does not match expected type “%s”" msgstr "El tipus de missatge «%s» no correspon al tipus «%s» que s'esperava" -#: gio/gdbusconnection.c:5321 +#: gio/gdbusconnection.c:5316 #, c-format msgid "An object is already exported for the interface %s at %s" msgstr "Ja hi ha un objecte exportat per a la interfície %s a %s" -#: gio/gdbusconnection.c:5548 +#: gio/gdbusconnection.c:5543 #, c-format msgid "Unable to retrieve property %s.%s" msgstr "No s'ha pogut recuperar la propietat %s.%s" -#: gio/gdbusconnection.c:5604 +#: gio/gdbusconnection.c:5599 #, c-format msgid "Unable to set property %s.%s" msgstr "No s'ha pogut establir la propietat %s.%s" -#: gio/gdbusconnection.c:5783 +#: gio/gdbusconnection.c:5778 #, c-format msgid "Method “%s” returned type “%s”, but expected “%s”" msgstr "El mètode «%s» ha retornat un tipus «%s», però s'esperava «%s»" -#: gio/gdbusconnection.c:6859 +#: gio/gdbusconnection.c:6854 #, c-format msgid "Method “%s” on interface “%s” with signature “%s” does not exist" msgstr "No existeix el mètode «%s» a la interfície «%s» amb la signatura «%s»" -#: gio/gdbusconnection.c:6980 +#: gio/gdbusconnection.c:6975 #, c-format msgid "A subtree is already exported for %s" msgstr "Ja està exportat un subarbre per a %s" -#: gio/gdbusconnection.c:7269 +#: gio/gdbusconnection.c:7264 #, c-format msgid "Object does not exist at path “%s”" msgstr "L'objecte no existeix al camí «%s»" -#: gio/gdbusmessage.c:1303 +#: gio/gdbusmessage.c:1306 msgid "type is INVALID" msgstr "el tipus és no vàlid" -#: gio/gdbusmessage.c:1314 +#: gio/gdbusmessage.c:1317 msgid "METHOD_CALL message: PATH or MEMBER header field is missing" msgstr "Missatge «METHOD_CALL»: manca el camp de capçalera «PATH» o «MEMBER»" -#: gio/gdbusmessage.c:1325 +#: gio/gdbusmessage.c:1328 msgid "METHOD_RETURN message: REPLY_SERIAL header field is missing" msgstr "Missatge «METHOD_RETURN»: manca el camp de capçalera «REPLY_SERIAL»" -#: gio/gdbusmessage.c:1337 +#: gio/gdbusmessage.c:1340 msgid "ERROR message: REPLY_SERIAL or ERROR_NAME header field is missing" msgstr "" "Missatge «ERROR»: manca el camp de capçalera «REPLY_SERIAL» o «ERROR_NAME»" -#: gio/gdbusmessage.c:1350 +#: gio/gdbusmessage.c:1353 msgid "SIGNAL message: PATH, INTERFACE or MEMBER header field is missing" msgstr "" "Missatge «SIGNAL»: manca el camp de capçalera «PATH», «INTERFACE» o «MEMBER»" -#: gio/gdbusmessage.c:1358 +#: gio/gdbusmessage.c:1361 msgid "" "SIGNAL message: The PATH header field is using the reserved value " "/org/freedesktop/DBus/Local" @@ -837,7 +841,7 @@ "Missatge «SIGNAL»: el camp de la capçalera «PATH» utilitza el valor reservat" " «/org/freedesktop/DBus/Local»" -#: gio/gdbusmessage.c:1366 +#: gio/gdbusmessage.c:1369 msgid "" "SIGNAL message: The INTERFACE header field is using the reserved value " "org.freedesktop.DBus.Local" @@ -845,21 +849,21 @@ "Missatge SIGNAL: el camp de capçalera INTERFACE utilitza el valor reservat " "org.freedesktop.DBus.Local" -#: gio/gdbusmessage.c:1414 gio/gdbusmessage.c:1474 +#: gio/gdbusmessage.c:1417 gio/gdbusmessage.c:1477 #, c-format msgid "Wanted to read %lu byte but only got %lu" msgid_plural "Wanted to read %lu bytes but only got %lu" msgstr0 "Es volia llegir %lu byte però només s'han rebut %lu" msgstr1 "Es volien llegir %lu bytes però només s'han rebut %lu" -#: gio/gdbusmessage.c:1428 +#: gio/gdbusmessage.c:1431 #, c-format msgid "Expected NUL byte after the string “%s” but found byte %d" msgstr "" "S'esperava el byte «NUL» després de la cadena «%s» però s'ha trobat el byte " "%d" -#: gio/gdbusmessage.c:1447 +#: gio/gdbusmessage.c:1450 #, c-format msgid "" "Expected valid UTF-8 string but found invalid bytes at byte offset %d " @@ -870,21 +874,21 @@ "l'òfset %d (la llargada de la cadena és %d). La cadena UTF-8 vàlida fins " "aquell moment era «%s»" -#: gio/gdbusmessage.c:1511 gio/gdbusmessage.c:1787 gio/gdbusmessage.c:1998 +#: gio/gdbusmessage.c:1514 gio/gdbusmessage.c:1790 gio/gdbusmessage.c:2001 msgid "Value nested too deeply" msgstr "Valor imbricat massa profund" -#: gio/gdbusmessage.c:1679 +#: gio/gdbusmessage.c:1682 #, c-format msgid "Parsed value “%s” is not a valid D-Bus object path" msgstr "El valor analitzat «%s» no és un camí d'objecte D-Bus vàlid" -#: gio/gdbusmessage.c:1703 +#: gio/gdbusmessage.c:1706 #, c-format msgid "Parsed value “%s” is not a valid D-Bus signature" msgstr "El valor analitzat «%s» no és una signatura D-Bus vàlida" -#: gio/gdbusmessage.c:1754 +#: gio/gdbusmessage.c:1757 #, c-format msgid "" "Encountered array of length %u byte. Maximum length is 2<<26 bytes (64 MiB)." @@ -898,7 +902,7 @@ "S'ha trobat una matriu de llargada %u bytes. La llargada màxima és de 2<<26 " "bytes (64 MiB)." -#: gio/gdbusmessage.c:1774 +#: gio/gdbusmessage.c:1777 #, c-format msgid "" "Encountered array of type “a%c”, expected to have a length a multiple of %u " @@ -907,16 +911,16 @@ "S'ha trobat una matriu de tipus «a%c» que s'esperava que tingués una " "llargada múltiple de %u bytes, però en realitat és de %u bytes" -#: gio/gdbusmessage.c:1928 gio/gdbusmessage.c:2647 +#: gio/gdbusmessage.c:1931 gio/gdbusmessage.c:2650 msgid "Empty structures (tuples) are not allowed in D-Bus" msgstr "No es permeten estructures buides (tuples) a D-Bus" -#: gio/gdbusmessage.c:1982 +#: gio/gdbusmessage.c:1985 #, c-format msgid "Parsed value “%s” for variant is not a valid D-Bus signature" msgstr "El valor analitzat «%s» per variant no és una signatura D-Bus vàlida" -#: gio/gdbusmessage.c:2023 +#: gio/gdbusmessage.c:2026 #, c-format msgid "" "Error deserializing GVariant with type string “%s” from the D-Bus wire " @@ -925,7 +929,7 @@ "S'ha produït un error en convertir a estructura de dades la GVariant amb el " "tipus de cadena «%s» del format de cable D-Bus" -#: gio/gdbusmessage.c:2208 +#: gio/gdbusmessage.c:2211 #, c-format msgid "" "Invalid endianness value. Expected 0x6c (“l”) or 0x42 (“B”) but found value " @@ -934,28 +938,28 @@ "Valor d'ordenació de bits (endianness) no vàlid. S'esperava 0x6c («l») o " "0x42 («B») però s'ha trobat el valor 0x%02x" -#: gio/gdbusmessage.c:2227 +#: gio/gdbusmessage.c:2230 #, c-format msgid "Invalid major protocol version. Expected 1 but found %d" msgstr "Versió major del protocol no vàlida. S'esperava 1 però s'ha trobat %d" -#: gio/gdbusmessage.c:2285 gio/gdbusmessage.c:2883 +#: gio/gdbusmessage.c:2288 gio/gdbusmessage.c:2886 msgid "Signature header found but is not of type signature" msgstr "S'ha trobat la capçalera de signatura però no és del tipus signatura" -#: gio/gdbusmessage.c:2297 +#: gio/gdbusmessage.c:2300 #, c-format msgid "Signature header with signature “%s” found but message body is empty" msgstr "" "S'ha trobat la capçalera de la signatura amb la signatura «%s», però el cos " "és buit" -#: gio/gdbusmessage.c:2312 +#: gio/gdbusmessage.c:2315 #, c-format msgid "Parsed value “%s” is not a valid D-Bus signature (for body)" msgstr "El valor analitzat «%s» no és una signatura de D-Bus vàlida (pel cos)" -#: gio/gdbusmessage.c:2344 +#: gio/gdbusmessage.c:2347 #, 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" @@ -966,11 +970,11 @@ "No hi ha cap capçalera de la signatura en el missatge, però el cos és de %u " "bytes" -#: gio/gdbusmessage.c:2354 +#: gio/gdbusmessage.c:2357 msgid "Cannot deserialize message: " msgstr "No s'ha pogut tornar a convertir el missatge a estructura de dades: " -#: gio/gdbusmessage.c:2700 +#: gio/gdbusmessage.c:2703 #, c-format msgid "" "Error serializing GVariant with type string “%s” to the D-Bus wire format" @@ -978,7 +982,7 @@ "No s'ha pogut convertir a seqüència de bits la GVariant de tipus cadena «%s»" " al format de cable D-Bus" -#: gio/gdbusmessage.c:2837 +#: gio/gdbusmessage.c:2840 #, c-format msgid "" "Number of file descriptors in message (%d) differs from header field (%d)" @@ -986,18 +990,18 @@ "El nombre de descriptors de fitxer al missatge (%d) difereix del camp de la " "capçalera (%d)" -#: gio/gdbusmessage.c:2845 +#: gio/gdbusmessage.c:2848 msgid "Cannot serialize message: " msgstr "No s'ha pogut convertir a seqüència de bits el missatge: " -#: gio/gdbusmessage.c:2898 +#: gio/gdbusmessage.c:2901 #, c-format msgid "Message body has signature “%s” but there is no signature header" msgstr "" "El cos del missatge té la signatura «%s» però no hi ha cap capçalera de " "signatura" -#: gio/gdbusmessage.c:2908 +#: gio/gdbusmessage.c:2911 #, c-format msgid "" "Message body has type signature “%s” but signature in the header field is " @@ -1006,19 +1010,19 @@ "El cos del missatge té el tipus de signatura «%s» però la signatura en el " "camp de la capçalera és «%s»" -#: gio/gdbusmessage.c:2924 +#: gio/gdbusmessage.c:2927 #, c-format msgid "Message body is empty but signature in the header field is “(%s)”" msgstr "" "El cos del missatge és buit però la signatura en el camp de la capçalera és " "«(%s)»" -#: gio/gdbusmessage.c:3479 +#: gio/gdbusmessage.c:3482 #, c-format msgid "Error return with body of type “%s”" msgstr "S'ha retornat un error amb el cos de tipus «%s»" -#: gio/gdbusmessage.c:3487 +#: gio/gdbusmessage.c:3490 msgid "Error return with empty body" msgstr "S'ha retornat un error amb el cos buit" @@ -1045,19 +1049,19 @@ msgid "Unable to load %s or %s: " msgstr "No s'ha pogut carregar %s ni %s: " -#: gio/gdbusproxy.c:1575 +#: gio/gdbusproxy.c:1568 #, c-format msgid "Error calling StartServiceByName for %s: " msgstr "S'ha produït un error en cridar «StartServiceByName» per a %s: " -#: gio/gdbusproxy.c:1598 +#: gio/gdbusproxy.c:1591 #, c-format msgid "Unexpected reply %d from StartServiceByName(\"%s\") method" msgstr "" "S'ha obtingut una resposta inesperada %d per al mètode " "«StartServiceByName(\"%s\")»" -#: gio/gdbusproxy.c:2709 gio/gdbusproxy.c:2844 +#: gio/gdbusproxy.c:2702 gio/gdbusproxy.c:2837 #, c-format msgid "" "Cannot invoke method; proxy is for the well-known name %s without an owner, " @@ -1067,25 +1071,25 @@ "conegut %s sense cap propietari i el servidor intermediari s'ha construït " "amb el senyalador «G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START»" -#: gio/gdbusserver.c:765 +#: gio/gdbusserver.c:758 msgid "Abstract namespace not supported" msgstr "No es pot utilitzar l'espai de noms abstracte" -#: gio/gdbusserver.c:857 +#: gio/gdbusserver.c:850 msgid "Cannot specify nonce file when creating a server" msgstr "No es pot especificar el fitxer «nonce» quan es crea un servidor" -#: gio/gdbusserver.c:939 +#: gio/gdbusserver.c:932 #, c-format msgid "Error writing nonce file at “%s”: %s" msgstr "S'ha produït un error en escriure el fitxer nonce a «%s»: %s" -#: gio/gdbusserver.c:1114 +#: gio/gdbusserver.c:1107 #, c-format msgid "The string “%s” is not a valid D-Bus GUID" msgstr "La cadena «%s» no és un GUID vàlid de D-Bus" -#: gio/gdbusserver.c:1152 +#: gio/gdbusserver.c:1145 #, c-format msgid "Cannot listen on unsupported transport “%s”" msgstr "No es pot escoltar «%s», és un transport desconegut" @@ -1113,14 +1117,14 @@ "\n" "Utilitzeu «%s ORDRE --help» per a veure l'ajuda de cada ordre en particular.\n" -#: gio/gdbus-tool.c:204 gio/gdbus-tool.c:276 gio/gdbus-tool.c:348 -#: gio/gdbus-tool.c:372 gio/gdbus-tool.c:862 gio/gdbus-tool.c:1247 -#: gio/gdbus-tool.c:1734 +#: gio/gdbus-tool.c:204 gio/gdbus-tool.c:276 gio/gdbus-tool.c:347 +#: gio/gdbus-tool.c:371 gio/gdbus-tool.c:861 gio/gdbus-tool.c:1246 +#: gio/gdbus-tool.c:1733 #, c-format msgid "Error: %s\n" msgstr "S'ha produït un error: %s\n" -#: gio/gdbus-tool.c:215 gio/gdbus-tool.c:289 gio/gdbus-tool.c:1750 +#: gio/gdbus-tool.c:215 gio/gdbus-tool.c:289 gio/gdbus-tool.c:1749 #, c-format msgid "Error parsing introspection XML: %s\n" msgstr "S'ha produït un error en analitzar la introspecció XML: %s\n" @@ -1130,50 +1134,50 @@ msgid "Error: %s is not a valid name\n" msgstr "Error: %s no és un nom de membre vàlid\n" -#: gio/gdbus-tool.c:258 gio/gdbus-tool.c:748 gio/gdbus-tool.c:1066 -#: gio/gdbus-tool.c:1900 gio/gdbus-tool.c:2140 +#: gio/gdbus-tool.c:258 gio/gdbus-tool.c:747 gio/gdbus-tool.c:1065 +#: gio/gdbus-tool.c:1899 gio/gdbus-tool.c:2139 #, c-format msgid "Error: %s is not a valid object path\n" msgstr "Error: «%s» no és un camí d'objecte vàlid\n" -#: gio/gdbus-tool.c:406 +#: gio/gdbus-tool.c:405 msgid "Connect to the system bus" msgstr "Connecta al bus del sistema" -#: gio/gdbus-tool.c:407 +#: gio/gdbus-tool.c:406 msgid "Connect to the session bus" msgstr "Connecta al bus de la sessió" -#: gio/gdbus-tool.c:408 +#: gio/gdbus-tool.c:407 msgid "Connect to given D-Bus address" msgstr "Connecta a l'adreça de D-Bus donada" -#: gio/gdbus-tool.c:418 +#: gio/gdbus-tool.c:417 msgid "Connection Endpoint Options:" msgstr "Opcions del punt final de connexió:" -#: gio/gdbus-tool.c:419 +#: gio/gdbus-tool.c:418 msgid "Options specifying the connection endpoint" msgstr "Opcions d'especificació del punt final de connexió" -#: gio/gdbus-tool.c:442 +#: gio/gdbus-tool.c:441 #, c-format msgid "No connection endpoint specified" msgstr "No s'ha especificat el punt final de connexió" -#: gio/gdbus-tool.c:452 +#: gio/gdbus-tool.c:451 #, c-format msgid "Multiple connection endpoints specified" msgstr "S'han especificat més d'un punt final de connexió" -#: gio/gdbus-tool.c:525 +#: gio/gdbus-tool.c:524 #, c-format msgid "" "Warning: According to introspection data, interface “%s” does not exist\n" msgstr "" "Avís: d'acord amb les dades d'introspecció no existeix la interfície «%s»\n" -#: gio/gdbus-tool.c:534 +#: gio/gdbus-tool.c:533 #, c-format msgid "" "Warning: According to introspection data, method “%s” does not exist on " @@ -1182,166 +1186,166 @@ "Avís: d'acord amb les dades d'introspecció no existeix el mètode «%s» a la " "interfície «%s»\n" -#: gio/gdbus-tool.c:596 +#: gio/gdbus-tool.c:595 msgid "Optional destination for signal (unique name)" msgstr "Destinació opcional del senyal (nom únic)" -#: gio/gdbus-tool.c:597 +#: gio/gdbus-tool.c:596 msgid "Object path to emit signal on" msgstr "Camí a l'objecte al qual se li enviarà un senyal" -#: gio/gdbus-tool.c:598 +#: gio/gdbus-tool.c:597 msgid "Signal and interface name" msgstr "Senyal i nom d'interfície" -#: gio/gdbus-tool.c:631 +#: gio/gdbus-tool.c:630 msgid "Emit a signal." msgstr "Envia un senyal." -#: gio/gdbus-tool.c:686 gio/gdbus-tool.c:1003 gio/gdbus-tool.c:1837 -#: gio/gdbus-tool.c:2069 gio/gdbus-tool.c:2289 +#: gio/gdbus-tool.c:685 gio/gdbus-tool.c:1002 gio/gdbus-tool.c:1836 +#: gio/gdbus-tool.c:2068 gio/gdbus-tool.c:2288 #, c-format msgid "Error connecting: %s\n" msgstr "S'ha produït un error en connectar-se: %s\n" -#: gio/gdbus-tool.c:706 +#: gio/gdbus-tool.c:705 #, c-format msgid "Error: %s is not a valid unique bus name.\n" msgstr "Error: %s no és un nom de bus únic vàlid.\n" -#: gio/gdbus-tool.c:725 gio/gdbus-tool.c:1046 gio/gdbus-tool.c:1880 +#: gio/gdbus-tool.c:724 gio/gdbus-tool.c:1045 gio/gdbus-tool.c:1879 msgid "Error: Object path is not specified\n" msgstr "Error: no s'ha especificat el camí a l'objecte\n" -#: gio/gdbus-tool.c:768 +#: gio/gdbus-tool.c:767 msgid "Error: Signal name is not specified\n" msgstr "Error: no s'ha especificat el nom del senyal\n" -#: gio/gdbus-tool.c:782 +#: gio/gdbus-tool.c:781 #, c-format msgid "Error: Signal name “%s” is invalid\n" msgstr "Error: el nom del senyal «%s» no és vàlid\n" -#: gio/gdbus-tool.c:794 +#: gio/gdbus-tool.c:793 #, c-format msgid "Error: %s is not a valid interface name\n" msgstr "Error: %s no és un nom d'interfície vàlid\n" -#: gio/gdbus-tool.c:800 +#: gio/gdbus-tool.c:799 #, c-format msgid "Error: %s is not a valid member name\n" msgstr "Error: %s no és un nom de membre vàlid\n" #. Use the original non-"parse-me-harder" error -#: gio/gdbus-tool.c:837 gio/gdbus-tool.c:1178 +#: gio/gdbus-tool.c:836 gio/gdbus-tool.c:1177 #, c-format msgid "Error parsing parameter %d: %s\n" msgstr "S'ha produït un error en analitzar el paràmetre %d: %s\n" -#: gio/gdbus-tool.c:869 +#: gio/gdbus-tool.c:868 #, c-format msgid "Error flushing connection: %s\n" msgstr "S'ha produït un error en buidar la connexió: %s\n" -#: gio/gdbus-tool.c:897 +#: gio/gdbus-tool.c:896 msgid "Destination name to invoke method on" msgstr "Nom de destinació on invocar el mètode" -#: gio/gdbus-tool.c:898 +#: gio/gdbus-tool.c:897 msgid "Object path to invoke method on" msgstr "Camí a l'objecte on invocar el mètode" -#: gio/gdbus-tool.c:899 +#: gio/gdbus-tool.c:898 msgid "Method and interface name" msgstr "Mètode i nom d'interfície" -#: gio/gdbus-tool.c:900 +#: gio/gdbus-tool.c:899 msgid "Timeout in seconds" msgstr "Temps d'espera, en segons" -#: gio/gdbus-tool.c:901 +#: gio/gdbus-tool.c:900 msgid "Allow interactive authorization" msgstr "Permet l'autorització interactiva" -#: gio/gdbus-tool.c:948 +#: gio/gdbus-tool.c:947 msgid "Invoke a method on a remote object." msgstr "Invoca un mètode en un objecte remot." -#: gio/gdbus-tool.c:1020 gio/gdbus-tool.c:1854 gio/gdbus-tool.c:2094 +#: gio/gdbus-tool.c:1019 gio/gdbus-tool.c:1853 gio/gdbus-tool.c:2093 msgid "Error: Destination is not specified\n" msgstr "Error: no s'ha especificat la destinació\n" -#: gio/gdbus-tool.c:1031 gio/gdbus-tool.c:1871 gio/gdbus-tool.c:2105 +#: gio/gdbus-tool.c:1030 gio/gdbus-tool.c:1870 gio/gdbus-tool.c:2104 #, c-format msgid "Error: %s is not a valid bus name\n" msgstr "Error: %s no és un nom de bus vàlid\n" -#: gio/gdbus-tool.c:1081 +#: gio/gdbus-tool.c:1080 msgid "Error: Method name is not specified\n" msgstr "Error: no s'ha especificat el nom del mètode\n" -#: gio/gdbus-tool.c:1092 +#: gio/gdbus-tool.c:1091 #, c-format msgid "Error: Method name “%s” is invalid\n" msgstr "Error: el nom del mètode «%s» no és vàlid\n" -#: gio/gdbus-tool.c:1170 +#: gio/gdbus-tool.c:1169 #, c-format msgid "Error parsing parameter %d of type “%s”: %s\n" msgstr "S'ha produït un error en analitzar el paràmetre %d del tipus «%s»: %s\n" -#: gio/gdbus-tool.c:1196 +#: gio/gdbus-tool.c:1195 #, c-format msgid "Error adding handle %d: %s\n" msgstr "S'ha produït un error en afegir el gestor %d: %s\n" -#: gio/gdbus-tool.c:1696 +#: gio/gdbus-tool.c:1695 msgid "Destination name to introspect" msgstr "Nom de destinació a examinar" -#: gio/gdbus-tool.c:1697 +#: gio/gdbus-tool.c:1696 msgid "Object path to introspect" msgstr "Camí a l'objecte a examinar" -#: gio/gdbus-tool.c:1698 +#: gio/gdbus-tool.c:1697 msgid "Print XML" msgstr "Imprimeix XML" -#: gio/gdbus-tool.c:1699 +#: gio/gdbus-tool.c:1698 msgid "Introspect children" msgstr "Examina el fill" -#: gio/gdbus-tool.c:1700 +#: gio/gdbus-tool.c:1699 msgid "Only print properties" msgstr "Només mostra les propietats" -#: gio/gdbus-tool.c:1789 +#: gio/gdbus-tool.c:1788 msgid "Introspect a remote object." msgstr "Examina un objecte remot." -#: gio/gdbus-tool.c:1995 +#: gio/gdbus-tool.c:1994 msgid "Destination name to monitor" msgstr "Nom de destinació al qual se li vol fer un seguiment" -#: gio/gdbus-tool.c:1996 +#: gio/gdbus-tool.c:1995 msgid "Object path to monitor" msgstr "Camí a l'objecte al qual se li vol fer un seguiment" -#: gio/gdbus-tool.c:2021 +#: gio/gdbus-tool.c:2020 msgid "Monitor a remote object." msgstr "Fes el seguiment a un objecte remot." -#: gio/gdbus-tool.c:2079 +#: gio/gdbus-tool.c:2078 msgid "Error: can’t monitor a non-message-bus connection\n" msgstr "" "Error: no es pot fer un seguiment d'una connexió que no sigui de missatges " "del bus\n" -#: gio/gdbus-tool.c:2203 +#: gio/gdbus-tool.c:2202 msgid "Service to activate before waiting for the other one (well-known name)" msgstr "Servei a activar abans d'esperar l'altre (nom conegut)" -#: gio/gdbus-tool.c:2206 +#: gio/gdbus-tool.c:2205 msgid "" "Timeout to wait for before exiting with an error (seconds); 0 for no timeout" " (default)" @@ -1349,27 +1353,27 @@ "Temps d'espera abans de sortir amb un error (segons); 0 si no voleu temps " "d'espera (predeterminat)" -#: gio/gdbus-tool.c:2254 +#: gio/gdbus-tool.c:2253 msgid "OPTION… BUS-NAME" msgstr "OPCIÓ... NOM-DEL-BUS" -#: gio/gdbus-tool.c:2255 +#: gio/gdbus-tool.c:2254 msgid "Wait for a bus name to appear." msgstr "Espera que aparegui el nom del bus." -#: gio/gdbus-tool.c:2331 +#: gio/gdbus-tool.c:2330 msgid "Error: A service to activate for must be specified.\n" msgstr "Error: no s'ha especificat el servei a activar.\n" -#: gio/gdbus-tool.c:2336 +#: gio/gdbus-tool.c:2335 msgid "Error: A service to wait for must be specified.\n" msgstr "Error: no s'ha especificat el servei a esperar.\n" -#: gio/gdbus-tool.c:2341 +#: gio/gdbus-tool.c:2340 msgid "Error: Too many arguments.\n" msgstr "Error: massa arguments.\n" -#: gio/gdbus-tool.c:2349 gio/gdbus-tool.c:2356 +#: gio/gdbus-tool.c:2348 gio/gdbus-tool.c:2355 #, c-format msgid "Error: %s is not a valid well-known bus name.\n" msgstr "Error: %s no és un nom de bus conegut vàlid.\n" @@ -1379,41 +1383,46 @@ msgid "Not authorized to change debug settings" msgstr "No esteu autoritzat a canviar la configuració de depuració" -#: gio/gdesktopappinfo.c:2182 gio/gdesktopappinfo.c:5113 +#: gio/gdesktopappinfo.c:2242 gio/gdesktopappinfo.c:5223 msgid "Unnamed" msgstr "Sense nom" -#: gio/gdesktopappinfo.c:2592 +#: gio/gdesktopappinfo.c:2652 msgid "Desktop file didn’t specify Exec field" msgstr "El fitxer d'escriptori no especificava el camp d'execució" -#: gio/gdesktopappinfo.c:2891 +#: gio/gdesktopappinfo.c:2942 msgid "Unable to find terminal required for application" msgstr "No s'ha pogut trobar el terminal que demanava l'aplicació" -#: gio/gdesktopappinfo.c:3631 +#: gio/gdesktopappinfo.c:3002 +#, c-format +msgid "Program ‘%s’ not found in $PATH" +msgstr "No s'ha trobat el programa «%s» a $PATH" + +#: gio/gdesktopappinfo.c:3735 #, c-format msgid "Can’t create user application configuration folder %s: %s" msgstr "" "No s'ha pogut crear el directori de configuració de l'aplicació de l'usuari " "%s: %s" -#: gio/gdesktopappinfo.c:3635 +#: gio/gdesktopappinfo.c:3739 #, c-format msgid "Can’t create user MIME configuration folder %s: %s" msgstr "" "No s'ha pogut crear el directori de configuració MIME de l'usuari %s: %s" -#: gio/gdesktopappinfo.c:3877 gio/gdesktopappinfo.c:3901 +#: gio/gdesktopappinfo.c:3981 gio/gdesktopappinfo.c:4005 msgid "Application information lacks an identifier" msgstr "A la informació d'aplicació li manca un identificador" -#: gio/gdesktopappinfo.c:4137 +#: gio/gdesktopappinfo.c:4241 #, c-format msgid "Can’t create user desktop file %s" msgstr "No s'ha pogut crear el fitxer d'escriptori de l'usuari %s" -#: gio/gdesktopappinfo.c:4273 +#: gio/gdesktopappinfo.c:4377 #, c-format msgid "Custom definition for %s" msgstr "Definició personalitzada per a %s" @@ -1489,7 +1498,7 @@ msgid "Containing mount does not exist" msgstr "No existeix el punt de muntatge contenidor" -#: gio/gfile.c:2641 gio/glocalfile.c:2500 +#: gio/gfile.c:2641 gio/glocalfile.c:2511 msgid "Can’t copy over directory" msgstr "No es pot copiar al directori" @@ -1537,7 +1546,7 @@ msgid "Invalid symlink value given" msgstr "El valor donat per a l'enllaç simbòlic no és vàlid" -#: gio/gfile.c:4163 glib/gfileutils.c:2335 +#: gio/gfile.c:4163 glib/gfileutils.c:2392 msgid "Symbolic links not supported" msgstr "No es poden utilitzar els enllaços simbòlics" @@ -1639,37 +1648,37 @@ msgid "HTTP proxy server closed connection unexpectedly." msgstr "El servidor intermediari d'HTTP ha tancat la connexió inesperadament." -#: gio/gicon.c:300 +#: gio/gicon.c:299 #, c-format msgid "Wrong number of tokens (%d)" msgstr "Nombre de testimonis erroni (%d)" -#: gio/gicon.c:320 +#: gio/gicon.c:319 #, c-format msgid "No type for class name %s" msgstr "El nom de classe %s no té tipus" -#: gio/gicon.c:330 +#: gio/gicon.c:329 #, c-format msgid "Type %s does not implement the GIcon interface" msgstr "El tipus %s no implementa la interfície GIcon" -#: gio/gicon.c:341 +#: gio/gicon.c:340 #, c-format msgid "Type %s is not classed" msgstr "El tipus %s no té classe" -#: gio/gicon.c:355 +#: gio/gicon.c:354 #, c-format msgid "Malformed version number: %s" msgstr "El número de versió no és format correctament: %s" -#: gio/gicon.c:369 +#: gio/gicon.c:368 #, c-format msgid "Type %s does not implement from_tokens() on the GIcon interface" msgstr "El tipus %s no implementa «from_tokens()» a la interfície GIcon" -#: gio/gicon.c:471 +#: gio/gicon.c:470 msgid "Can’t handle the supplied version of the icon encoding" msgstr "" "No es pot gestionar la versió proporcionada de la codificació de la icona" @@ -1820,7 +1829,7 @@ #: gio/gio-tool-cat.c:135 gio/gio-tool-info.c:379 gio/gio-tool-list.c:173 #: gio/gio-tool-mkdir.c:50 gio/gio-tool-monitor.c:39 gio/gio-tool-monitor.c:41 #: gio/gio-tool-monitor.c:43 gio/gio-tool-monitor.c:45 -#: gio/gio-tool-monitor.c:206 gio/gio-tool-mount.c:1202 gio/gio-tool-open.c:72 +#: gio/gio-tool-monitor.c:206 gio/gio-tool-mount.c:1210 gio/gio-tool-open.c:72 #: gio/gio-tool-remove.c:50 gio/gio-tool-rename.c:47 gio/gio-tool-set.c:95 #: gio/gio-tool-trash.c:222 gio/gio-tool-tree.c:241 msgid "LOCATION" @@ -1841,7 +1850,7 @@ "smb://servidor/recurs/fitxer.txt com a ubicació." #: gio/gio-tool-cat.c:164 gio/gio-tool-info.c:410 gio/gio-tool-mkdir.c:78 -#: gio/gio-tool-monitor.c:231 gio/gio-tool-mount.c:1253 gio/gio-tool-open.c:98 +#: gio/gio-tool-monitor.c:231 gio/gio-tool-mount.c:1261 gio/gio-tool-open.c:98 #: gio/gio-tool-remove.c:74 gio/gio-tool-trash.c:303 msgid "No locations given" msgstr "No s'ha donat cap ubicació" @@ -2259,19 +2268,19 @@ msgid "Mount a TCRYPT system volume" msgstr "Munta un volum de sistema TCRYPT" -#: gio/gio-tool-mount.c:268 gio/gio-tool-mount.c:300 +#: gio/gio-tool-mount.c:276 gio/gio-tool-mount.c:308 msgid "Anonymous access denied" msgstr "S'ha denegat l'accés anònim" -#: gio/gio-tool-mount.c:525 +#: gio/gio-tool-mount.c:533 msgid "No drive for device file" msgstr "No hi ha cap disc pel fitxer de dispositiu" -#: gio/gio-tool-mount.c:1017 +#: gio/gio-tool-mount.c:1025 msgid "No volume for given ID" msgstr "No hi ha cap volum per a l'identificador donat" -#: gio/gio-tool-mount.c:1206 +#: gio/gio-tool-mount.c:1214 msgid "Mount or unmount the locations." msgstr "Munta o desmunta les ubicacions." @@ -2478,7 +2487,7 @@ msgid "List contents of directories in a tree-like format." msgstr "Llista el contingut dels directoris en un format d'arbre." -#: gio/glib-compile-resources.c:142 gio/glib-compile-schemas.c:1516 +#: gio/glib-compile-resources.c:142 gio/glib-compile-schemas.c:1513 #, c-format msgid "Element <%s> not allowed inside <%s>" msgstr "No es permet posar l'element <%s> dins de <%s>" @@ -2534,7 +2543,7 @@ msgid "text may not appear inside <%s>" msgstr "no pot haver-hi text dins de <%s>" -#: gio/glib-compile-resources.c:821 gio/glib-compile-schemas.c:2174 +#: gio/glib-compile-resources.c:821 gio/glib-compile-schemas.c:2171 msgid "Show program version and exit" msgstr "Mostra la versió del programa i surt" @@ -2550,8 +2559,8 @@ "Els directoris des d'on s'han de llegir els fitxers (per defecte és el " "directori actual)" -#: gio/glib-compile-resources.c:823 gio/glib-compile-schemas.c:2175 -#: gio/glib-compile-schemas.c:2204 +#: gio/glib-compile-resources.c:823 gio/glib-compile-schemas.c:2172 +#: gio/glib-compile-schemas.c:2201 msgid "DIRECTORY" msgstr "DIRECTORI" @@ -2780,17 +2789,17 @@ msgid "<aliases> must contain at least one <alias>" msgstr "<aliases> ha de contenir com a mínim un <alias>" -#: gio/glib-compile-schemas.c:799 +#: gio/glib-compile-schemas.c:796 msgid "Empty names are not permitted" msgstr "No es permet utilitzar noms buits" -#: gio/glib-compile-schemas.c:809 +#: gio/glib-compile-schemas.c:806 #, c-format msgid "Invalid name “%s”: names must begin with a lowercase letter" msgstr "" "El nom «%s» no és vàlid: els noms han de començar amb una lletra minúscula" -#: gio/glib-compile-schemas.c:821 +#: gio/glib-compile-schemas.c:818 #, c-format msgid "" "Invalid name “%s”: invalid character “%c”; only lowercase letters, numbers " @@ -2799,37 +2808,37 @@ "El nom «%s» no és vàlid: el caràcter «%c» no és vàlid. Només es permeten " "lletres minúscules, nombres i el guionet («-»)" -#: gio/glib-compile-schemas.c:830 +#: gio/glib-compile-schemas.c:827 #, c-format msgid "Invalid name “%s”: two successive hyphens (“--”) are not permitted" msgstr "" "El nom «%s» no és vàlid: no es poden posar dos guionets seguits («--»)" -#: gio/glib-compile-schemas.c:839 +#: gio/glib-compile-schemas.c:836 #, c-format msgid "Invalid name “%s”: the last character may not be a hyphen (“-”)" msgstr "El nom «%s» no és vàlid: l'últim caràcter no pot ser un guionet («-»)" -#: gio/glib-compile-schemas.c:847 +#: gio/glib-compile-schemas.c:844 #, c-format msgid "Invalid name “%s”: maximum length is 1024" msgstr "El nom «%s» no és vàlid: la llargada màxima és de 1024" -#: gio/glib-compile-schemas.c:919 +#: gio/glib-compile-schemas.c:916 #, c-format msgid "<child name='%s'> already specified" msgstr "ja està especificat <child name='%s'>" -#: gio/glib-compile-schemas.c:945 +#: gio/glib-compile-schemas.c:942 msgid "Cannot add keys to a “list-of” schema" msgstr "No es poden afegir claus a un esquema del tipus «list-of»" -#: gio/glib-compile-schemas.c:956 +#: gio/glib-compile-schemas.c:953 #, c-format msgid "<key name='%s'> already specified" msgstr "ja està especificat <key name='%s'>" -#: gio/glib-compile-schemas.c:974 +#: gio/glib-compile-schemas.c:971 #, c-format msgid "" "<key name='%s'> shadows <key name='%s'> in <schema id='%s'>; use <override> " @@ -2838,7 +2847,7 @@ "La <key name='%s'> emmascara la <key name='%s'> a <schema id='%s'>. " "Utilitzeu <override> per a modificar-ne el valor" -#: gio/glib-compile-schemas.c:985 +#: gio/glib-compile-schemas.c:982 #, c-format msgid "" "Exactly one of “type”, “enum” or “flags” must be specified as an attribute " @@ -2846,57 +2855,57 @@ msgstr "" "L'atribut de la <key> ha de ser necessàriament «type», «enum» o «flags»" -#: gio/glib-compile-schemas.c:1004 +#: gio/glib-compile-schemas.c:1001 #, c-format msgid "<%s id='%s'> not (yet) defined." msgstr "(encara) no s'ha definit <%s id='%s'>." -#: gio/glib-compile-schemas.c:1019 +#: gio/glib-compile-schemas.c:1016 #, c-format msgid "Invalid GVariant type string “%s”" msgstr "El tipus de cadena GVariant «%s» no és vàlid" -#: gio/glib-compile-schemas.c:1049 +#: gio/glib-compile-schemas.c:1046 msgid "<override> given but schema isn’t extending anything" msgstr "S'ha indicat <override> però l'esquema no està ampliant res" -#: gio/glib-compile-schemas.c:1062 +#: gio/glib-compile-schemas.c:1059 #, c-format msgid "No <key name='%s'> to override" msgstr "No hi ha cap <key name='%s'> a sobreescriure" -#: gio/glib-compile-schemas.c:1070 +#: gio/glib-compile-schemas.c:1067 #, c-format msgid "<override name='%s'> already specified" msgstr "ja s'ha especificat <override name='%s'>" -#: gio/glib-compile-schemas.c:1143 +#: gio/glib-compile-schemas.c:1140 #, c-format msgid "<schema id='%s'> already specified" msgstr "ja s'ha especificat <schema id='%s'>" -#: gio/glib-compile-schemas.c:1155 +#: gio/glib-compile-schemas.c:1152 #, c-format msgid "<schema id='%s'> extends not yet existing schema “%s”" msgstr "El <schema id='%s'> amplia l'esquema «%s» que encara no existeix" -#: gio/glib-compile-schemas.c:1171 +#: gio/glib-compile-schemas.c:1168 #, c-format msgid "<schema id='%s'> is list of not yet existing schema “%s”" msgstr "" "El <schema id='%s'> és una llista d'un esquema «%s» que encara no existeix" -#: gio/glib-compile-schemas.c:1179 +#: gio/glib-compile-schemas.c:1176 #, c-format msgid "Cannot be a list of a schema with a path" msgstr "No pot ser una llista d'un esquema amb un camí" -#: gio/glib-compile-schemas.c:1189 +#: gio/glib-compile-schemas.c:1186 #, c-format msgid "Cannot extend a schema with a path" msgstr "No es pot ampliar un esquema amb un camí" -#: gio/glib-compile-schemas.c:1199 +#: gio/glib-compile-schemas.c:1196 #, c-format msgid "" "<schema id='%s'> is a list, extending <schema id='%s'> which is not a list" @@ -2904,7 +2913,7 @@ "El <schema id='%s'> és una llista i amplia el <schema id='%s'> que no és una" " llista" -#: gio/glib-compile-schemas.c:1209 +#: gio/glib-compile-schemas.c:1206 #, c-format msgid "" "<schema id='%s' list-of='%s'> extends <schema id='%s' list-of='%s'> but “%s”" @@ -2913,17 +2922,17 @@ "El <schema id='%s' list-of='%s'> amplia el <schema id='%s' list-of='%s'> " "però «%s» no amplia «%s»" -#: gio/glib-compile-schemas.c:1226 +#: gio/glib-compile-schemas.c:1223 #, c-format msgid "A path, if given, must begin and end with a slash" msgstr "Si es dona un camí ha de començar i acabar amb una barra inclinada" -#: gio/glib-compile-schemas.c:1233 +#: gio/glib-compile-schemas.c:1230 #, c-format msgid "The path of a list must end with “:/”" msgstr "El camí d'una llista ha d'acabar amb «:/»" -#: gio/glib-compile-schemas.c:1242 +#: gio/glib-compile-schemas.c:1239 #, c-format msgid "" "Warning: Schema “%s” has path “%s”. Paths starting with “/apps/”, " @@ -2932,49 +2941,49 @@ "Avís: l'esquema «%s» conté el camí «%s». Els camins que comencen amb " "«/apps/», «/desktop/» o «/system/» estan obsolets." -#: gio/glib-compile-schemas.c:1272 +#: gio/glib-compile-schemas.c:1269 #, c-format msgid "<%s id='%s'> already specified" msgstr "ja s'ha especificat <%s id='%s'>" -#: gio/glib-compile-schemas.c:1422 gio/glib-compile-schemas.c:1438 +#: gio/glib-compile-schemas.c:1419 gio/glib-compile-schemas.c:1435 #, c-format msgid "Only one <%s> element allowed inside <%s>" msgstr "No es permet posar l'element <%s> dins de <%s>" -#: gio/glib-compile-schemas.c:1520 +#: gio/glib-compile-schemas.c:1517 #, c-format msgid "Element <%s> not allowed at the top level" msgstr "No es permet posar l'element <%s> al primer nivell" -#: gio/glib-compile-schemas.c:1538 +#: gio/glib-compile-schemas.c:1535 msgid "Element <default> is required in <key>" msgstr "L'element <default> està requerit a <key>" -#: gio/glib-compile-schemas.c:1628 +#: gio/glib-compile-schemas.c:1625 #, c-format msgid "Text may not appear inside <%s>" msgstr "No pot haver-hi text dins de <%s>" -#: gio/glib-compile-schemas.c:1696 +#: gio/glib-compile-schemas.c:1693 #, c-format msgid "Warning: undefined reference to <schema id='%s'/>" msgstr "Avís: referència no definida a <schema id='%s'/>" #. Translators: Do not translate "--strict". -#: gio/glib-compile-schemas.c:1835 gio/glib-compile-schemas.c:1914 +#: gio/glib-compile-schemas.c:1832 gio/glib-compile-schemas.c:1911 msgid "--strict was specified; exiting." msgstr "S'ha especificat «--strict», se surt." -#: gio/glib-compile-schemas.c:1847 +#: gio/glib-compile-schemas.c:1844 msgid "This entire file has been ignored." msgstr "S'ha ignorat el fitxer sencer." -#: gio/glib-compile-schemas.c:1910 +#: gio/glib-compile-schemas.c:1907 msgid "Ignoring this file." msgstr "S'està ignorant aquest fitxer." -#: gio/glib-compile-schemas.c:1965 +#: gio/glib-compile-schemas.c:1962 #, c-format msgid "" "No such key “%s” in schema “%s” as specified in override file “%s”; ignoring" @@ -2984,7 +2993,7 @@ "sobreescriptura «%s»; s'ignora la sobreescriptura d'aquesta clau." # c-format -#: gio/glib-compile-schemas.c:1973 +#: gio/glib-compile-schemas.c:1970 #, c-format msgid "" "No such key “%s” in schema “%s” as specified in override file “%s” and " @@ -2993,7 +3002,7 @@ "No existeix la clau «%s» en l'esquema «%s» tal com especifica el fitxer de " "sobreescriptura «%s» i s'ha especificat --strict; se surt." -#: gio/glib-compile-schemas.c:1995 +#: gio/glib-compile-schemas.c:1992 #, c-format msgid "" "Cannot provide per-desktop overrides for localized key “%s” in schema “%s” " @@ -3003,7 +3012,7 @@ " a l'esquema «%s» (fitxer de sobreescriptura «%s»); s'ignora la " "sobreescriptura d'aquesta clau." -#: gio/glib-compile-schemas.c:2004 +#: gio/glib-compile-schemas.c:2001 #, c-format msgid "" "Cannot provide per-desktop overrides for localized key “%s” in schema “%s” " @@ -3013,7 +3022,7 @@ " a l'esquema «%s» (fitxer de sobreescriptura «%s») i s'ha especificat " "--strict; se surt." -#: gio/glib-compile-schemas.c:2028 +#: gio/glib-compile-schemas.c:2025 #, c-format msgid "" "Error parsing key “%s” in schema “%s” as specified in override file “%s”: " @@ -3023,7 +3032,7 @@ "especifica el fitxer de sobreescriptura «%s»: %s. S'ignora la " "sobreescriptura d'aquesta clau." -#: gio/glib-compile-schemas.c:2040 +#: gio/glib-compile-schemas.c:2037 #, c-format msgid "" "Error parsing key “%s” in schema “%s” as specified in override file “%s”: " @@ -3033,7 +3042,7 @@ "especifica el fitxer de sobreescriptura «%s»: %s. S'ha especificat --strict;" " se surt." -#: gio/glib-compile-schemas.c:2067 +#: gio/glib-compile-schemas.c:2064 #, c-format msgid "" "Override for key “%s” in schema “%s” in override file “%s” is outside the " @@ -3043,7 +3052,7 @@ "sobreescriptura «%s» és fora de l'interval de l'esquema donat; s'ignora la " "sobreescriptura d'aquesta clau." -#: gio/glib-compile-schemas.c:2077 +#: gio/glib-compile-schemas.c:2074 #, c-format msgid "" "Override for key “%s” in schema “%s” in override file “%s” is outside the " @@ -3053,7 +3062,7 @@ "sobreescriptura «%s» és fora de l'interval de l'esquema donat i s'ha " "especificat --strict; se surt." -#: gio/glib-compile-schemas.c:2103 +#: gio/glib-compile-schemas.c:2100 #, c-format msgid "" "Override for key “%s” in schema “%s” in override file “%s” is not in the " @@ -3063,7 +3072,7 @@ "sobreescriptura «%s» no és a la llista de valors vàlids; s'ignora la " "sobreescriptura d'aquesta clau." -#: gio/glib-compile-schemas.c:2113 +#: gio/glib-compile-schemas.c:2110 #, c-format msgid "" "Override for key “%s” in schema “%s” in override file “%s” is not in the " @@ -3073,23 +3082,23 @@ "sobreescriptura «%s» no és a la llista de valors vàlids i s'ha especificat " "--strict; se surt." -#: gio/glib-compile-schemas.c:2175 +#: gio/glib-compile-schemas.c:2172 msgid "Where to store the gschemas.compiled file" msgstr "On desar el fitxer gschemas.compiled" -#: gio/glib-compile-schemas.c:2176 +#: gio/glib-compile-schemas.c:2173 msgid "Abort on any errors in schemas" msgstr "Interromp si hi ha cap error en els esquemes" -#: gio/glib-compile-schemas.c:2177 +#: gio/glib-compile-schemas.c:2174 msgid "Do not write the gschema.compiled file" msgstr "No escriguis el fitxer gschema.compiled" -#: gio/glib-compile-schemas.c:2178 +#: gio/glib-compile-schemas.c:2175 msgid "Do not enforce key name restrictions" msgstr "No siguis estricte amb les restriccions dels noms de les claus" -#: gio/glib-compile-schemas.c:2207 +#: gio/glib-compile-schemas.c:2204 msgid "" "Compile all GSettings schema files into a schema cache.\n" "Schema files are required to have the extension .gschema.xml,\n" @@ -3099,15 +3108,15 @@ "Els fitxers d'esquema han de tenir l'extensió .gschema.xml\n" "i el fitxer de memòria cau es dirà gschemas.compiled." -#: gio/glib-compile-schemas.c:2228 +#: gio/glib-compile-schemas.c:2225 msgid "You should give exactly one directory name" msgstr "Heu de donar un sol nom de directori" -#: gio/glib-compile-schemas.c:2271 +#: gio/glib-compile-schemas.c:2268 msgid "No schema files found: doing nothing." msgstr "No s'ha trobat cap fitxer d'esquemes: no es fa res." -#: gio/glib-compile-schemas.c:2273 +#: gio/glib-compile-schemas.c:2270 msgid "No schema files found: removed existing output file." msgstr "" "No s'ha trobat cap fitxer d'esquemes: suprimeix el fitxer de sortida actual." @@ -3117,7 +3126,7 @@ msgid "Invalid filename %s" msgstr "El nom del fitxer no és vàlid: %s" -#: gio/glocalfile.c:996 +#: gio/glocalfile.c:1005 #, c-format msgid "Error getting filesystem info for %s: %s" msgstr "" @@ -3127,128 +3136,128 @@ #. Translators: This is an error message when trying to find #. * the enclosing (user visible) mount of a file, but none #. * exists. -#: gio/glocalfile.c:1137 +#: gio/glocalfile.c:1141 #, c-format msgid "Containing mount for file %s not found" msgstr "No s'ha trobat el punt del muntatge pel fitxer %s" -#: gio/glocalfile.c:1160 +#: gio/glocalfile.c:1164 msgid "Can’t rename root directory" msgstr "No es pot canviar el nom del directori arrel" -#: gio/glocalfile.c:1178 gio/glocalfile.c:1201 +#: gio/glocalfile.c:1182 gio/glocalfile.c:1205 #, c-format msgid "Error renaming file %s: %s" msgstr "S'ha produït un error en canviar el nom del fitxer %s: %s" -#: gio/glocalfile.c:1185 +#: gio/glocalfile.c:1189 msgid "Can’t rename file, filename already exists" msgstr "No es pot canviar el nom del fitxer, ja existeix aquest nom" -#: gio/glocalfile.c:1198 gio/glocalfile.c:2394 gio/glocalfile.c:2422 -#: gio/glocalfile.c:2561 gio/glocalfileoutputstream.c:658 +#: gio/glocalfile.c:1202 gio/glocalfile.c:2405 gio/glocalfile.c:2433 +#: gio/glocalfile.c:2572 gio/glocalfileoutputstream.c:658 msgid "Invalid filename" msgstr "Nom de fitxer no vàlid" -#: gio/glocalfile.c:1366 gio/glocalfile.c:1377 +#: gio/glocalfile.c:1370 gio/glocalfile.c:1381 #, c-format msgid "Error opening file %s: %s" msgstr "S'ha produït un error en obrir el fitxer %s: %s" -#: gio/glocalfile.c:1502 +#: gio/glocalfile.c:1506 #, c-format msgid "Error removing file %s: %s" msgstr "S'ha produït un error en suprimir el fitxer %s: %s" -#: gio/glocalfile.c:1996 gio/glocalfile.c:2007 gio/glocalfile.c:2034 +#: gio/glocalfile.c:2000 gio/glocalfile.c:2011 gio/glocalfile.c:2038 #, c-format msgid "Error trashing file %s: %s" msgstr "S'ha produït un error en enviar a la paperera el fitxer %s: %s" -#: gio/glocalfile.c:2054 +#: gio/glocalfile.c:2058 #, c-format msgid "Unable to create trash directory %s: %s" msgstr "No s'ha pogut crear el directori de la paperera %s: %s" -#: gio/glocalfile.c:2075 +#: gio/glocalfile.c:2079 #, c-format msgid "Unable to find toplevel directory to trash %s" msgstr "No s'ha pogut trobar el directori superior per a la paperera %s" -#: gio/glocalfile.c:2083 +#: gio/glocalfile.c:2087 #, c-format msgid "Trashing on system internal mounts is not supported" msgstr "" "No està implementat l'enviament a la paperera en muntatges interns del " "sistema" -#: gio/glocalfile.c:2169 gio/glocalfile.c:2197 +#: gio/glocalfile.c:2173 gio/glocalfile.c:2201 #, c-format msgid "Unable to find or create trash directory %s to trash %s" msgstr "No s'ha pogut trobar o crear el directori %s de la paperera per %s" -#: gio/glocalfile.c:2243 +#: gio/glocalfile.c:2245 #, c-format msgid "Unable to create trashing info file for %s: %s" msgstr "No s'ha pogut crear el fitxer d'informació de la paperera per %s: %s" -#: gio/glocalfile.c:2305 +#: gio/glocalfile.c:2316 #, c-format msgid "Unable to trash file %s across filesystem boundaries" msgstr "" "No s'ha pogut enviar el fitxer %s a la paperera als límits del sistema de " "fitxers" -#: gio/glocalfile.c:2309 gio/glocalfile.c:2365 +#: gio/glocalfile.c:2320 gio/glocalfile.c:2376 #, c-format msgid "Unable to trash file %s: %s" msgstr "No s'ha pogut enviar el fitxer a la paperera %s: %s" -#: gio/glocalfile.c:2371 +#: gio/glocalfile.c:2382 #, c-format msgid "Unable to trash file %s" msgstr "No s'ha pogut enviar el fitxer %s a la paperera" -#: gio/glocalfile.c:2397 +#: gio/glocalfile.c:2408 #, c-format msgid "Error creating directory %s: %s" msgstr "S'ha produït un error en crear el directori %s: %s" -#: gio/glocalfile.c:2426 +#: gio/glocalfile.c:2437 #, c-format msgid "Filesystem does not support symbolic links" msgstr "El sistema de fitxers no implementa enllaços simbòlics" -#: gio/glocalfile.c:2429 +#: gio/glocalfile.c:2440 #, c-format msgid "Error making symbolic link %s: %s" msgstr "S'ha produït un error en fer l'enllaç simbòlic: %s: %s" -#: gio/glocalfile.c:2472 gio/glocalfile.c:2507 gio/glocalfile.c:2564 +#: gio/glocalfile.c:2483 gio/glocalfile.c:2518 gio/glocalfile.c:2575 #, c-format msgid "Error moving file %s: %s" msgstr "S'ha produït un error en moure el fitxer %s: %s" -#: gio/glocalfile.c:2495 +#: gio/glocalfile.c:2506 msgid "Can’t move directory over directory" msgstr "No s'ha pogut moure el directori al directori" -#: gio/glocalfile.c:2521 gio/glocalfileoutputstream.c:1110 +#: gio/glocalfile.c:2532 gio/glocalfileoutputstream.c:1110 #: gio/glocalfileoutputstream.c:1124 gio/glocalfileoutputstream.c:1139 #: gio/glocalfileoutputstream.c:1156 gio/glocalfileoutputstream.c:1170 msgid "Backup file creation failed" msgstr "Ha fallat la creació del fitxer de còpia de seguretat" -#: gio/glocalfile.c:2540 +#: gio/glocalfile.c:2551 #, c-format msgid "Error removing target file: %s" msgstr "S'ha produït un error en suprimir el fitxer objectiu: %s" -#: gio/glocalfile.c:2554 +#: gio/glocalfile.c:2565 msgid "Move between mounts not supported" msgstr "No està implementat moure entre muntatges" -#: gio/glocalfile.c:2728 +#: gio/glocalfile.c:2741 #, c-format msgid "Could not determine the disk usage of %s: %s" msgstr "No s'han pogut determinar l'ús del disc de %s: %s" @@ -3270,124 +3279,124 @@ msgid "Error setting extended attribute “%s”: %s" msgstr "S'ha produït un error en establir l'atribut ampliat «%s»: %s" -#: gio/glocalfileinfo.c:1738 gio/win32/gwinhttpfile.c:191 +#: gio/glocalfileinfo.c:1819 gio/win32/gwinhttpfile.c:191 msgid " (invalid encoding)" msgstr " (codificació no vàlida)" -#: gio/glocalfileinfo.c:1897 gio/glocalfileoutputstream.c:945 +#: gio/glocalfileinfo.c:1978 gio/glocalfileoutputstream.c:945 #: gio/glocalfileoutputstream.c:997 #, c-format msgid "Error when getting information for file “%s”: %s" msgstr "S'ha produït un error en obtenir informació del fitxer «%s»: %s" -#: gio/glocalfileinfo.c:2163 +#: gio/glocalfileinfo.c:2281 #, c-format msgid "Error when getting information for file descriptor: %s" msgstr "" "S'ha produït un error en obtenir informació del descriptor de fitxer: %s" -#: gio/glocalfileinfo.c:2208 +#: gio/glocalfileinfo.c:2326 msgid "Invalid attribute type (uint32 expected)" msgstr "Tipus d'atribut no vàlid (s'esperava un uint32)" -#: gio/glocalfileinfo.c:2226 +#: gio/glocalfileinfo.c:2344 msgid "Invalid attribute type (uint64 expected)" msgstr "Tipus d'atribut no vàlid (s'esperava un uint64)" -#: gio/glocalfileinfo.c:2245 gio/glocalfileinfo.c:2264 +#: gio/glocalfileinfo.c:2363 gio/glocalfileinfo.c:2382 msgid "Invalid attribute type (byte string expected)" msgstr "Tipus d'atribut no vàlid (s'esperava una cadena de bytes)" -#: gio/glocalfileinfo.c:2311 +#: gio/glocalfileinfo.c:2429 msgid "Cannot set permissions on symlinks" msgstr "No es poden establir permisos en els enllaços simbòlics" -#: gio/glocalfileinfo.c:2327 +#: gio/glocalfileinfo.c:2445 #, c-format msgid "Error setting permissions: %s" msgstr "S'ha produït un error en establir els permisos: %s" -#: gio/glocalfileinfo.c:2378 +#: gio/glocalfileinfo.c:2496 #, c-format msgid "Error setting owner: %s" msgstr "S'ha produït un error en establir el propietari: %s" -#: gio/glocalfileinfo.c:2401 +#: gio/glocalfileinfo.c:2519 msgid "symlink must be non-NULL" msgstr "l'enllaç simbòlic no pot ser nul" -#: gio/glocalfileinfo.c:2411 gio/glocalfileinfo.c:2430 -#: gio/glocalfileinfo.c:2441 +#: gio/glocalfileinfo.c:2529 gio/glocalfileinfo.c:2548 +#: gio/glocalfileinfo.c:2559 #, c-format msgid "Error setting symlink: %s" msgstr "S'ha produït un error en establir l'enllaç simbòlic: %s" -#: gio/glocalfileinfo.c:2420 +#: gio/glocalfileinfo.c:2538 msgid "Error setting symlink: file is not a symlink" msgstr "" "S'ha produït un error en establir l'enllaç simbòlic: el fitxer no és un " "enllaç simbòlic" -#: gio/glocalfileinfo.c:2492 +#: gio/glocalfileinfo.c:2630 #, c-format msgid "Extra nanoseconds %d for UNIX timestamp %lld are negative" msgstr "" "%d nanosegons addicionals per a la marca horària d'UNIX %lld és negatiu" -#: gio/glocalfileinfo.c:2501 +#: gio/glocalfileinfo.c:2639 #, c-format msgid "Extra nanoseconds %d for UNIX timestamp %lld reach 1 second" msgstr "" "%d nanosegons addicionals per a la marca horària d'UNIX %lld arriba al segon" -#: gio/glocalfileinfo.c:2511 +#: gio/glocalfileinfo.c:2649 #, c-format msgid "UNIX timestamp %lld does not fit into 64 bits" msgstr "La marca horària d'UNIX %lld no hi cap en 64 bits" -#: gio/glocalfileinfo.c:2522 +#: gio/glocalfileinfo.c:2660 #, c-format msgid "UNIX timestamp %lld is outside of the range supported by Windows" msgstr "" "La marca horària d'UNIX %lld és fora de l'interval suportat per Windows" -#: gio/glocalfileinfo.c:2625 +#: gio/glocalfileinfo.c:2792 #, c-format msgid "File name “%s” cannot be converted to UTF-16" msgstr "El valor «%s» no es pot convertir a UTF-16" -#: gio/glocalfileinfo.c:2644 +#: gio/glocalfileinfo.c:2811 #, c-format msgid "File “%s” cannot be opened: Windows Error %lu" msgstr "No es pot obrir el fitxer «%s»: error %lu del Windows" -#: gio/glocalfileinfo.c:2657 +#: gio/glocalfileinfo.c:2824 #, c-format msgid "Error setting modification or access time for file “%s”: %lu" msgstr "" "S'ha produït un error en establir el temps de modificació o d'accés per al " "fitxer: «%s»: %lu" -#: gio/glocalfileinfo.c:2798 gio/glocalfileinfo.c:2810 +#: gio/glocalfileinfo.c:2981 #, c-format msgid "Error setting modification or access time: %s" msgstr "" "S'ha produït un error en establir el temps de modificació o d'accés: %s" -#: gio/glocalfileinfo.c:2833 +#: gio/glocalfileinfo.c:3004 msgid "SELinux context must be non-NULL" msgstr "El context del SELinux no pot ser nul" -#: gio/glocalfileinfo.c:2840 +#: gio/glocalfileinfo.c:3011 msgid "SELinux is not enabled on this system" msgstr "Aquest sistema no té habilitat el SELinux" -#: gio/glocalfileinfo.c:2850 +#: gio/glocalfileinfo.c:3021 #, c-format msgid "Error setting SELinux context: %s" msgstr "S'ha produït un error en establir el context del SELinux: %s" -#: gio/glocalfileinfo.c:2947 +#: gio/glocalfileinfo.c:3118 #, c-format msgid "Setting attribute %s not supported" msgstr "No està implementat establir l'atribut %s" @@ -3436,13 +3445,13 @@ msgid "Error renaming temporary file: %s" msgstr "S'ha produït un error en canviar el nom del fitxer temporal: %s" -#: gio/glocalfileoutputstream.c:611 gio/glocalfileoutputstream.c:1241 +#: gio/glocalfileoutputstream.c:611 gio/glocalfileoutputstream.c:1242 #, c-format msgid "Error truncating file: %s" msgstr "S'ha produït un error en truncar el fitxer: %s" #: gio/glocalfileoutputstream.c:664 gio/glocalfileoutputstream.c:909 -#: gio/glocalfileoutputstream.c:1222 gio/gsubprocess.c:231 +#: gio/glocalfileoutputstream.c:1223 gio/gsubprocess.c:231 #, c-format msgid "Error opening file “%s”: %s" msgstr "S'ha produït un error en obrir el fitxer «%s»: %s" @@ -3459,7 +3468,7 @@ msgid "The file was externally modified" msgstr "El fitxer ha estat modificat des d'alguna aplicació externa" -#: gio/glocalfileoutputstream.c:1204 +#: gio/glocalfileoutputstream.c:1205 #, c-format msgid "Error removing old file: %s" msgstr "S'ha produït un error en suprimir el fitxer vell: %s" @@ -3610,8 +3619,8 @@ #. Translators: the first placeholder is a domain name, the #. * second is an error message #: gio/gresolver.c:403 gio/gthreadedresolver.c:152 gio/gthreadedresolver.c:170 -#: gio/gthreadedresolver.c:782 gio/gthreadedresolver.c:806 -#: gio/gthreadedresolver.c:831 gio/gthreadedresolver.c:846 +#: gio/gthreadedresolver.c:798 gio/gthreadedresolver.c:822 +#: gio/gthreadedresolver.c:847 gio/gthreadedresolver.c:862 #, c-format msgid "Error resolving “%s”: %s" msgstr "S'ha produït un error en resoldre «%s»: %s" @@ -4340,37 +4349,37 @@ #. Translators: the placeholder is a DNS record type, such as ‘MX’ or ‘SRV’ #: gio/gthreadedresolver.c:552 gio/gthreadedresolver.c:574 -#: gio/gthreadedresolver.c:612 gio/gthreadedresolver.c:659 -#: gio/gthreadedresolver.c:688 gio/gthreadedresolver.c:700 +#: gio/gthreadedresolver.c:628 gio/gthreadedresolver.c:675 +#: gio/gthreadedresolver.c:704 gio/gthreadedresolver.c:716 #, c-format msgid "Error parsing DNS %s record: malformed DNS packet" msgstr "" "S'ha produït un error en analitzar el registre de DNS %s: paquet DNS mal " "format" -#: gio/gthreadedresolver.c:758 gio/gthreadedresolver.c:895 -#: gio/gthreadedresolver.c:993 gio/gthreadedresolver.c:1043 +#: gio/gthreadedresolver.c:774 gio/gthreadedresolver.c:911 +#: gio/gthreadedresolver.c:1009 gio/gthreadedresolver.c:1059 #, c-format msgid "No DNS record of the requested type for “%s”" msgstr "No hi ha cap registre del tipus sol·licitat al DNS per «%s»" -#: gio/gthreadedresolver.c:763 gio/gthreadedresolver.c:998 +#: gio/gthreadedresolver.c:779 gio/gthreadedresolver.c:1014 #, c-format msgid "Temporarily unable to resolve “%s”" msgstr "No s'ha pogut resoldre «%s» de forma temporal" -#: gio/gthreadedresolver.c:768 gio/gthreadedresolver.c:1003 -#: gio/gthreadedresolver.c:1113 +#: gio/gthreadedresolver.c:784 gio/gthreadedresolver.c:1019 +#: gio/gthreadedresolver.c:1129 #, c-format msgid "Error resolving “%s”" msgstr "S'ha produït un error en resoldre «%s»" -#: gio/gthreadedresolver.c:782 gio/gthreadedresolver.c:806 -#: gio/gthreadedresolver.c:831 gio/gthreadedresolver.c:846 +#: gio/gthreadedresolver.c:798 gio/gthreadedresolver.c:822 +#: gio/gthreadedresolver.c:847 gio/gthreadedresolver.c:862 msgid "Malformed DNS packet" msgstr "Paquet DNS mal format" -#: gio/gthreadedresolver.c:888 +#: gio/gthreadedresolver.c:904 #, c-format msgid "Failed to parse DNS response for “%s”: " msgstr "No s'ha pogut analitzar la resposta DNS per a «%s»: " @@ -4501,7 +4510,7 @@ msgid "Error closing file descriptor: %s" msgstr "S'ha produït un error en tancar el descriptor de fitxer: %s" -#: gio/gunixmounts.c:2815 gio/gunixmounts.c:2868 +#: gio/gunixmounts.c:2817 gio/gunixmounts.c:2870 msgid "Filesystem root" msgstr "Arrel del sistema de fitxers" @@ -4583,81 +4592,81 @@ msgid "Wrong args\n" msgstr "Els arguments no són vàlids\n" -#: glib/gbookmarkfile.c:779 +#: glib/gbookmarkfile.c:861 #, c-format msgid "Unexpected attribute “%s” for element “%s”" msgstr "No s'esperava l'atribut «%s» per a l'element «%s»" -#: glib/gbookmarkfile.c:790 glib/gbookmarkfile.c:870 glib/gbookmarkfile.c:880 -#: glib/gbookmarkfile.c:993 +#: glib/gbookmarkfile.c:872 glib/gbookmarkfile.c:952 glib/gbookmarkfile.c:962 +#: glib/gbookmarkfile.c:1075 #, c-format msgid "Attribute “%s” of element “%s” not found" msgstr "No s'ha trobat l'atribut «%s» de l'element «%s»" -#: glib/gbookmarkfile.c:1202 glib/gbookmarkfile.c:1267 -#: glib/gbookmarkfile.c:1331 glib/gbookmarkfile.c:1341 +#: glib/gbookmarkfile.c:1284 glib/gbookmarkfile.c:1349 +#: glib/gbookmarkfile.c:1413 glib/gbookmarkfile.c:1423 #, c-format msgid "Unexpected tag “%s”, tag “%s” expected" msgstr "No s'esperava l'etiqueta «%s», s'esperava «%s»" -#: glib/gbookmarkfile.c:1227 glib/gbookmarkfile.c:1241 -#: glib/gbookmarkfile.c:1309 glib/gbookmarkfile.c:1355 +#: glib/gbookmarkfile.c:1309 glib/gbookmarkfile.c:1323 +#: glib/gbookmarkfile.c:1391 glib/gbookmarkfile.c:1437 #, c-format msgid "Unexpected tag “%s” inside “%s”" msgstr "No s'esperava l'etiqueta «%s» dins «%s»" -#: glib/gbookmarkfile.c:1635 +#: glib/gbookmarkfile.c:1717 #, c-format msgid "Invalid date/time ‘%s’ in bookmark file" msgstr "La data/hora «%s» no és vàlida al fitxer d'adreces d'interès" -#: glib/gbookmarkfile.c:1838 +#: glib/gbookmarkfile.c:1956 msgid "No valid bookmark file found in data dirs" msgstr "" "No s'ha trobat cap fitxer d'adreces d'interès dins dels directoris de dades" -#: glib/gbookmarkfile.c:2039 +#: glib/gbookmarkfile.c:2157 #, c-format msgid "A bookmark for URI “%s” already exists" msgstr "Ja existeix una adreça d'interès per a l'URI «%s»" -#: glib/gbookmarkfile.c:2088 glib/gbookmarkfile.c:2246 -#: glib/gbookmarkfile.c:2331 glib/gbookmarkfile.c:2411 -#: glib/gbookmarkfile.c:2496 glib/gbookmarkfile.c:2630 -#: glib/gbookmarkfile.c:2763 glib/gbookmarkfile.c:2898 -#: glib/gbookmarkfile.c:2940 glib/gbookmarkfile.c:3037 -#: glib/gbookmarkfile.c:3158 glib/gbookmarkfile.c:3352 -#: glib/gbookmarkfile.c:3493 glib/gbookmarkfile.c:3712 -#: glib/gbookmarkfile.c:3801 glib/gbookmarkfile.c:3890 -#: glib/gbookmarkfile.c:4009 +#: glib/gbookmarkfile.c:2206 glib/gbookmarkfile.c:2364 +#: glib/gbookmarkfile.c:2449 glib/gbookmarkfile.c:2529 +#: glib/gbookmarkfile.c:2614 glib/gbookmarkfile.c:2748 +#: glib/gbookmarkfile.c:2881 glib/gbookmarkfile.c:3016 +#: glib/gbookmarkfile.c:3058 glib/gbookmarkfile.c:3155 +#: glib/gbookmarkfile.c:3276 glib/gbookmarkfile.c:3470 +#: glib/gbookmarkfile.c:3611 glib/gbookmarkfile.c:3830 +#: glib/gbookmarkfile.c:3919 glib/gbookmarkfile.c:4008 +#: glib/gbookmarkfile.c:4127 #, c-format msgid "No bookmark found for URI “%s”" msgstr "No s'ha trobat cap adreça d'interès per a l'URI «%s»" -#: glib/gbookmarkfile.c:2420 +#: glib/gbookmarkfile.c:2538 #, c-format msgid "No MIME type defined in the bookmark for URI “%s”" msgstr "No hi ha cap tipus MIME definit a l'adreça d'interès per a l'URI «%s»" -#: glib/gbookmarkfile.c:2505 +#: glib/gbookmarkfile.c:2623 #, c-format msgid "No private flag has been defined in bookmark for URI “%s”" msgstr "" "No hi ha cap senyalador privat definit a l'adreça d'interès per a l'URI «%s»" -#: glib/gbookmarkfile.c:3046 +#: glib/gbookmarkfile.c:3164 #, c-format msgid "No groups set in bookmark for URI “%s”" msgstr "No hi ha cap grup establert a l'adreça d'interès per a l'URI «%s»" -#: glib/gbookmarkfile.c:3514 glib/gbookmarkfile.c:3722 +#: glib/gbookmarkfile.c:3632 glib/gbookmarkfile.c:3840 #, c-format msgid "No application with name “%s” registered a bookmark for “%s”" msgstr "" "No hi ha cap aplicació amb el nom «%s» que hagi registrat l'adreça d'interès" " «%s»" -#: glib/gbookmarkfile.c:3745 +#: glib/gbookmarkfile.c:3863 #, c-format msgid "Failed to expand exec line “%s” with URI “%s”" msgstr "No s'ha pogut ampliar la línia d'execució «%s» amb l'URI «%s»" @@ -5130,87 +5139,87 @@ msgid "Error opening directory “%s”: %s" msgstr "S'ha produït un error en obrir el directori «%s»: %s" -#: glib/gfileutils.c:735 glib/gfileutils.c:827 +#: glib/gfileutils.c:753 glib/gfileutils.c:845 #, c-format msgid "Could not allocate %lu byte to read file “%s”" msgid_plural "Could not allocate %lu bytes to read file “%s”" msgstr0 "No s'han pogut assignar %lu byte per a llegir el fitxer «%s»" msgstr1 "No s'han pogut assignar %lu bytes per a llegir el fitxer «%s»" -#: glib/gfileutils.c:752 +#: glib/gfileutils.c:770 #, c-format msgid "Error reading file “%s”: %s" msgstr "S'ha produït un error en llegir el fitxer «%s»: %s" -#: glib/gfileutils.c:788 +#: glib/gfileutils.c:806 #, c-format msgid "File “%s” is too large" msgstr "El fitxer «%s» és massa gran" -#: glib/gfileutils.c:852 +#: glib/gfileutils.c:870 #, c-format msgid "Failed to read from file “%s”: %s" msgstr "No s'ha pogut llegir del fitxer «%s»: %s" -#: glib/gfileutils.c:902 glib/gfileutils.c:977 glib/gfileutils.c:1449 +#: glib/gfileutils.c:920 glib/gfileutils.c:995 glib/gfileutils.c:1472 #, c-format msgid "Failed to open file “%s”: %s" msgstr "No s'ha pogut obrir el fitxer «%s»: %s" -#: glib/gfileutils.c:915 +#: glib/gfileutils.c:933 #, c-format msgid "Failed to get attributes of file “%s”: fstat() failed: %s" msgstr "" "No s'han pogut obtenir els atributs del fitxer «%s»: ha fallat la funció " "fstat(): %s" -#: glib/gfileutils.c:946 +#: glib/gfileutils.c:964 #, c-format msgid "Failed to open file “%s”: fdopen() failed: %s" msgstr "No s'ha pogut obrir el fitxer «%s»: ha fallat la funció fdopen(): %s" -#: glib/gfileutils.c:1047 +#: glib/gfileutils.c:1065 #, c-format msgid "Failed to rename file “%s” to “%s”: g_rename() failed: %s" msgstr "" "No s'ha pogut canviar el nom del fitxer «%s» a «%s»: ha fallat la funció " "g_rename(): %s" -#: glib/gfileutils.c:1156 +#: glib/gfileutils.c:1179 #, c-format msgid "Failed to write file “%s”: write() failed: %s" msgstr "" "No s'ha pogut escriure el fitxer «%s»: ha fallat la funció write(): %s" -#: glib/gfileutils.c:1177 +#: glib/gfileutils.c:1200 #, c-format msgid "Failed to write file “%s”: fsync() failed: %s" msgstr "" "No s'ha pogut escriure el fitxer «%s»: ha fallat la funció fsync(): %s" -#: glib/gfileutils.c:1338 glib/gfileutils.c:1753 +#: glib/gfileutils.c:1361 glib/gfileutils.c:1776 #, c-format msgid "Failed to create file “%s”: %s" msgstr "No s'ha pogut crear el fitxer «%s»: %s" -#: glib/gfileutils.c:1383 +#: glib/gfileutils.c:1406 #, c-format msgid "Existing file “%s” could not be removed: g_unlink() failed: %s" msgstr "" "No s'ha pogut suprimir el fitxer existent «%s»: ha fallat la funció " "g_unlink(): %s" -#: glib/gfileutils.c:1718 +#: glib/gfileutils.c:1741 #, c-format msgid "Template “%s” invalid, should not contain a “%s”" msgstr "La plantilla «%s» no és vàlida, no hauria de tenir cap «%s»" -#: glib/gfileutils.c:1731 +#: glib/gfileutils.c:1754 #, c-format msgid "Template “%s” doesn’t contain XXXXXX" msgstr "La plantilla «%s» no conté XXXXXX" -#: glib/gfileutils.c:2291 glib/gfileutils.c:2320 +#: glib/gfileutils.c:2348 glib/gfileutils.c:2377 #, c-format msgid "Failed to read the symbolic link “%s”: %s" msgstr "No s'ha pogut llegir l'enllaç simbòlic «%s»: %s" @@ -5274,8 +5283,8 @@ msgstr "El fitxer de claus conté la codificació no implementada «%s»" #: glib/gkeyfile.c:1679 glib/gkeyfile.c:1852 glib/gkeyfile.c:3299 -#: glib/gkeyfile.c:3363 glib/gkeyfile.c:3493 glib/gkeyfile.c:3625 -#: glib/gkeyfile.c:3771 glib/gkeyfile.c:4006 glib/gkeyfile.c:4073 +#: glib/gkeyfile.c:3363 glib/gkeyfile.c:3493 glib/gkeyfile.c:3622 +#: glib/gkeyfile.c:3768 glib/gkeyfile.c:4003 glib/gkeyfile.c:4070 #, c-format msgid "Key file does not have group “%s”" msgstr "El fitxer de claus no té el grup «%s»" @@ -5314,31 +5323,31 @@ msgstr "" "La clau «%s» en el grup «%s» té el valor «%s» però s'esperava el valor %s" -#: glib/gkeyfile.c:4326 +#: glib/gkeyfile.c:4323 msgid "Key file contains escape character at end of line" msgstr "El fitxer de claus conté un caràcter d'escapada al final de línia" -#: glib/gkeyfile.c:4348 +#: glib/gkeyfile.c:4345 #, c-format msgid "Key file contains invalid escape sequence “%s”" msgstr "El fitxer de claus conté la seqüència d'escapada no vàlida «%s»" -#: glib/gkeyfile.c:4493 +#: glib/gkeyfile.c:4490 #, c-format msgid "Value “%s” cannot be interpreted as a number." msgstr "El valor «%s» no es pot interpretar com un nombre." -#: glib/gkeyfile.c:4507 +#: glib/gkeyfile.c:4504 #, c-format msgid "Integer value “%s” out of range" msgstr "El valor enter «%s» és fora de l'interval" -#: glib/gkeyfile.c:4540 +#: glib/gkeyfile.c:4537 #, c-format msgid "Value “%s” cannot be interpreted as a float number." msgstr "El valor «%s» no es pot interpretar com un nombre amb coma flotant." -#: glib/gkeyfile.c:4579 +#: glib/gkeyfile.c:4576 #, c-format msgid "Value “%s” cannot be interpreted as a boolean." msgstr "El valor «%s» no es pot interpretar com un booleà." @@ -5361,32 +5370,32 @@ msgid "Failed to open file “%s”: open() failed: %s" msgstr "No s'ha pogut obrir el fitxer «%s»: ha fallat la funció open(): %s" -#: glib/gmarkup.c:400 glib/gmarkup.c:442 +#: glib/gmarkup.c:393 glib/gmarkup.c:435 #, c-format msgid "Error on line %d char %d: " msgstr "S'ha produït un error a la línia %d caràcter %d: " -#: glib/gmarkup.c:464 glib/gmarkup.c:547 +#: glib/gmarkup.c:457 glib/gmarkup.c:540 #, c-format msgid "Invalid UTF-8 encoded text in name — not valid “%s”" msgstr "El nom conté caràcters UTF-8 no vàlids: «%s»" -#: glib/gmarkup.c:475 +#: glib/gmarkup.c:468 #, c-format msgid "“%s” is not a valid name" msgstr "«%s» no és un nom vàlid" -#: glib/gmarkup.c:491 +#: glib/gmarkup.c:484 #, c-format msgid "“%s” is not a valid name: “%c”" msgstr "«%s» no és un nom vàlid: «%c»" -#: glib/gmarkup.c:615 +#: glib/gmarkup.c:608 #, c-format msgid "Error on line %d: %s" msgstr "S'ha produït un error a la línia %d: %s" -#: glib/gmarkup.c:692 +#: glib/gmarkup.c:685 #, c-format msgid "" "Failed to parse “%-.*s”, which should have been a digit inside a character " @@ -5395,7 +5404,7 @@ "No s'ha pogut analitzar «%-.*s»: hi hauria d'haver hagut un dígit dins un " "caràcter de referència (per exemple ê). Potser el dígit és massa gran" -#: glib/gmarkup.c:704 +#: glib/gmarkup.c:697 msgid "" "Character reference did not end with a semicolon; most likely you used an " "ampersand character without intending to start an entity — escape ampersand " @@ -5405,24 +5414,24 @@ "utilitzat un caràcter «&» sense intenció d'iniciar una entitat. Substituïu " "el caràcter «&» per &" -#: glib/gmarkup.c:730 +#: glib/gmarkup.c:723 #, c-format msgid "Character reference “%-.*s” does not encode a permitted character" msgstr "El caràcter de referència «%-.*s» no codifica un caràcter permès" -#: glib/gmarkup.c:768 +#: glib/gmarkup.c:761 msgid "" "Empty entity “&;” seen; valid entities are: & " < > '" msgstr "" "S'ha detectat una entitat buida «&;». Les entitats vàlides són: & "" " < > '" -#: glib/gmarkup.c:776 +#: glib/gmarkup.c:769 #, c-format msgid "Entity name “%-.*s” is not known" msgstr "Es desconeix el nom d'entitat «%-.*s»" -#: glib/gmarkup.c:781 +#: glib/gmarkup.c:774 msgid "" "Entity did not end with a semicolon; most likely you used an ampersand " "character without intending to start an entity — escape ampersand as &" @@ -5431,11 +5440,11 @@ "«&» sense intenció d'iniciar una entitat. Substituïu el caràcter «&» per " "&" -#: glib/gmarkup.c:1195 +#: glib/gmarkup.c:1188 msgid "Document must begin with an element (e.g. <book>)" msgstr "El document ha de començar amb un element (p. ex. <book>)" -#: glib/gmarkup.c:1235 +#: glib/gmarkup.c:1228 #, c-format msgid "" "“%s” is not a valid character following a “<” character; it may not begin an" @@ -5444,7 +5453,7 @@ "«%s» no és un caràcter vàlid després d'un caràcter «<»: no pot començar un " "nom d'element" -#: glib/gmarkup.c:1278 +#: glib/gmarkup.c:1271 #, c-format msgid "" "Odd character “%s”, expected a “>” character to end the empty-element tag " @@ -5453,12 +5462,12 @@ "S'ha trobat un caràcter estrany: «%s». S'esperava el caràcter «>» per a " "tancar l'etiqueta d'element buit «%s»" -#: glib/gmarkup.c:1348 +#: glib/gmarkup.c:1341 #, c-format msgid "Too many attributes in element “%s”" msgstr "Massa atributs en l'element «%s»" -#: glib/gmarkup.c:1368 +#: glib/gmarkup.c:1361 #, c-format msgid "" "Odd character “%s”, expected a “=” after attribute name “%s” of element “%s”" @@ -5466,7 +5475,7 @@ "S'ha trobat un caràcter estrany: «%s». S'esperava un «=» després del nom " "d'atribut «%s» de l'element «%s»" -#: glib/gmarkup.c:1410 +#: glib/gmarkup.c:1403 #, c-format msgid "" "Odd character “%s”, expected a “>” or “/” character to end the start tag of " @@ -5477,7 +5486,7 @@ "a finalitzar l'etiqueta d'inici de l'element «%s», o opcionalment un " "atribut. Potser heu utilitzat un caràcter no vàlid en un nom d'atribut" -#: glib/gmarkup.c:1455 +#: glib/gmarkup.c:1448 #, c-format msgid "" "Odd character “%s”, expected an open quote mark after the equals sign when " @@ -5486,7 +5495,7 @@ "S'ha trobat un caràcter estrany: «%s». S'esperaven unes cometes d'obertura " "després del signe «=» en donar valor a l'atribut «%s» de l'element «%s»" -#: glib/gmarkup.c:1589 +#: glib/gmarkup.c:1582 #, c-format msgid "" "“%s” is not a valid character following the characters “</”; “%s” may not " @@ -5495,7 +5504,7 @@ "«%s» no és un caràcter vàlid després dels caràcters «</»; «%s» no pot " "iniciar un nom d'element" -#: glib/gmarkup.c:1627 +#: glib/gmarkup.c:1620 #, c-format msgid "" "“%s” is not a valid character following the close element name “%s”; the " @@ -5504,27 +5513,27 @@ "«%s» no és un caràcter vàlid després del nom d'element de tancament «%s». El" " caràcter permès és «>»" -#: glib/gmarkup.c:1639 +#: glib/gmarkup.c:1632 #, c-format msgid "Element “%s” was closed, no element is currently open" msgstr "L'element «%s» estava tancat. Actualment no hi ha cap element obert" -#: glib/gmarkup.c:1648 +#: glib/gmarkup.c:1641 #, c-format msgid "Element “%s” was closed, but the currently open element is “%s”" msgstr "L'element «%s» estava tancat. L'element obert actualment és «%s»" -#: glib/gmarkup.c:1801 +#: glib/gmarkup.c:1794 msgid "Document was empty or contained only whitespace" msgstr "El document era buit o només contenia espais en blanc" -#: glib/gmarkup.c:1815 +#: glib/gmarkup.c:1808 msgid "Document ended unexpectedly just after an open angle bracket “<”" msgstr "" "El document ha acabat de manera inesperada immediatament després del símbol " "«<»" -#: glib/gmarkup.c:1823 glib/gmarkup.c:1868 +#: glib/gmarkup.c:1816 glib/gmarkup.c:1861 #, c-format msgid "" "Document ended unexpectedly with elements still open — “%s” was the last " @@ -5533,7 +5542,7 @@ "El document ha acabat de manera inesperada amb elements que encara eren " "oberts. «%s» era l'últim element obert" -#: glib/gmarkup.c:1831 +#: glib/gmarkup.c:1824 #, c-format msgid "" "Document ended unexpectedly, expected to see a close angle bracket ending " @@ -5542,21 +5551,21 @@ "El document ha acabat de manera inesperada. S'esperava trobar un símbol «>» " "que acabés l'etiqueta <%s/>" -#: glib/gmarkup.c:1837 +#: glib/gmarkup.c:1830 msgid "Document ended unexpectedly inside an element name" msgstr "El document ha acabat de manera inesperada enmig d'un nom d'element" -#: glib/gmarkup.c:1843 +#: glib/gmarkup.c:1836 msgid "Document ended unexpectedly inside an attribute name" msgstr "El document ha acabat de manera inesperada enmig d'un nom d'atribut" -#: glib/gmarkup.c:1848 +#: glib/gmarkup.c:1841 msgid "Document ended unexpectedly inside an element-opening tag." msgstr "" "El document ha acabat de manera inesperada enmig d'una etiqueta d'obertura " "d'un element." -#: glib/gmarkup.c:1854 +#: glib/gmarkup.c:1847 msgid "" "Document ended unexpectedly after the equals sign following an attribute " "name; no attribute value" @@ -5564,25 +5573,25 @@ "El document ha acabat de manera inesperada després d'un signe d'igual " "després d'un nom d'atribut. No hi ha cap valor d'atribut" -#: glib/gmarkup.c:1861 +#: glib/gmarkup.c:1854 msgid "Document ended unexpectedly while inside an attribute value" msgstr "El document ha acabat de manera inesperada enmig d'un valor d'atribut" -#: glib/gmarkup.c:1878 +#: glib/gmarkup.c:1871 #, c-format msgid "Document ended unexpectedly inside the close tag for element “%s”" msgstr "" "El document ha acabat de manera inesperada enmig de l'etiqueta de tancament " "de l'element «%s»" -#: glib/gmarkup.c:1882 +#: glib/gmarkup.c:1875 msgid "" "Document ended unexpectedly inside the close tag for an unopened element" msgstr "" "El document ha acabat de manera inesperada enmig de l'etiqueta de tancament " "per un element no obert" -#: glib/gmarkup.c:1888 +#: glib/gmarkup.c:1881 msgid "Document ended unexpectedly inside a comment or processing instruction" msgstr "" "El document ha acabat de manera inesperada enmig d'un comentari o d'una " @@ -5647,189 +5656,189 @@ msgid "Unknown option %s" msgstr "Es desconeix l'opció %s" -#: glib/gregex.c:436 +#: glib/gregex.c:479 msgid "corrupted object" msgstr "objecte malmès" -#: glib/gregex.c:438 +#: glib/gregex.c:481 msgid "out of memory" msgstr "no hi ha prou memòria" -#: glib/gregex.c:443 +#: glib/gregex.c:487 msgid "backtracking limit reached" msgstr "s'ha arribat al límit de tornades enrere" -#: glib/gregex.c:454 glib/gregex.c:707 glib/gregex.c:736 +#: glib/gregex.c:498 msgid "internal error" msgstr "error intern" -#: glib/gregex.c:456 +#: glib/gregex.c:500 msgid "the pattern contains items not supported for partial matching" msgstr "" "el patró conté elements que no estan implementats en les concordances " "parcials" -#: glib/gregex.c:458 +#: glib/gregex.c:502 msgid "back references as conditions are not supported for partial matching" msgstr "" "no s'ha implementat l'ús de referències anteriors per a coincidències " "parcials" -#: glib/gregex.c:464 +#: glib/gregex.c:508 msgid "recursion limit reached" msgstr "s'ha arribat al límit de recurrències" -#: glib/gregex.c:466 +#: glib/gregex.c:510 msgid "bad offset" msgstr "desplaçament incorrecte" -#: glib/gregex.c:468 +#: glib/gregex.c:512 msgid "recursion loop" msgstr "bucle recursiu" #. should not happen in GRegex since we check modes before each match -#: glib/gregex.c:471 +#: glib/gregex.c:515 msgid "matching mode is requested that was not compiled for JIT" msgstr "es demana que el mode de coincidència però es va compilar per al JIT" -#: glib/gregex.c:475 +#: glib/gregex.c:536 glib/gregex.c:1838 msgid "unknown error" msgstr "error desconegut" -#: glib/gregex.c:496 +#: glib/gregex.c:557 msgid "\\ at end of pattern" msgstr "\\ al final del patró" -#: glib/gregex.c:500 +#: glib/gregex.c:561 msgid "\\c at end of pattern" msgstr "\\c al final del patró" -#: glib/gregex.c:505 +#: glib/gregex.c:566 msgid "unrecognized character following \\" msgstr "caràcter no reconegut després de \\" -#: glib/gregex.c:509 +#: glib/gregex.c:570 msgid "numbers out of order in {} quantifier" msgstr "nombres fora de l'interval en el quantificador {}" -#: glib/gregex.c:513 +#: glib/gregex.c:574 msgid "number too big in {} quantifier" msgstr "nombre massa gran en el quantificador {}" -#: glib/gregex.c:517 +#: glib/gregex.c:578 msgid "missing terminating for character class" msgstr "falta el «» per a la classe de caràcter" -#: glib/gregex.c:521 +#: glib/gregex.c:582 msgid "invalid escape sequence in character class" msgstr "la seqüència d'escapada en la classe de caràcter no és vàlida" -#: glib/gregex.c:525 +#: glib/gregex.c:586 msgid "range out of order in character class" msgstr "s'ha sortit de l'interval en la classe de caràcter" -#: glib/gregex.c:530 +#: glib/gregex.c:591 msgid "nothing to repeat" msgstr "no hi ha res per a repetir" -#: glib/gregex.c:534 +#: glib/gregex.c:595 msgid "unrecognized character after (? or (?-" msgstr "no es reconeix el caràcter després de «(?» o «(?-»" -#: glib/gregex.c:538 +#: glib/gregex.c:599 msgid "POSIX named classes are supported only within a class" msgstr "" "Només es permeten les classes amb nom de POSIX dins de la pròpia classe" -#: glib/gregex.c:542 +#: glib/gregex.c:603 msgid "POSIX collating elements are not supported" msgstr "No es poden utilitzar els elements d'ordenació de POSIX" -#: glib/gregex.c:548 +#: glib/gregex.c:609 msgid "missing terminating )" msgstr "falta un «)»" -#: glib/gregex.c:552 +#: glib/gregex.c:613 msgid "reference to non-existent subpattern" msgstr "referència a un subpatró que no existeix" -#: glib/gregex.c:556 +#: glib/gregex.c:617 msgid "missing ) after comment" msgstr "falta un «)» després del comentari" -#: glib/gregex.c:560 +#: glib/gregex.c:621 msgid "regular expression is too large" msgstr "l'expressió regular és massa gran" -#: glib/gregex.c:564 +#: glib/gregex.c:625 msgid "malformed number or name after (?(" msgstr "el nombre o el nom no estan ben formats després de «(?(»" -#: glib/gregex.c:568 +#: glib/gregex.c:629 msgid "lookbehind assertion is not fixed length" msgstr "l'asserció cap enrere no té llargada fixa" -#: glib/gregex.c:572 +#: glib/gregex.c:633 msgid "conditional group contains more than two branches" msgstr "el grup condicional conté més de dues branques" -#: glib/gregex.c:576 +#: glib/gregex.c:637 msgid "assertion expected after (?(" msgstr "s'esperava una asserció després de «(?(»" -#: glib/gregex.c:580 +#: glib/gregex.c:641 msgid "a numbered reference must not be zero" msgstr "les referències numerades no poden ser zero" -#: glib/gregex.c:584 +#: glib/gregex.c:645 msgid "unknown POSIX class name" msgstr "nom de classe POSIX desconeguda" -#: glib/gregex.c:589 +#: glib/gregex.c:650 msgid "character value in \\x{...} sequence is too large" msgstr "el valor del caràcter a la seqüència «\\x{...}» és massa gran" -#: glib/gregex.c:593 +#: glib/gregex.c:654 msgid "\\C not allowed in lookbehind assertion" msgstr "no es permet \\C en assercions cap enrere" -#: glib/gregex.c:597 +#: glib/gregex.c:658 msgid "missing terminator in subpattern name" msgstr "falta la finalització en el nom del subpatró" -#: glib/gregex.c:601 +#: glib/gregex.c:662 msgid "two named subpatterns have the same name" msgstr "dos noms de subpatró tenen el mateix nom" -#: glib/gregex.c:605 +#: glib/gregex.c:666 msgid "malformed \\P or \\p sequence" msgstr "la seqüència «\\P» o «\\p» no està ben formada" -#: glib/gregex.c:609 +#: glib/gregex.c:670 msgid "unknown property name after \\P or \\p" msgstr "es desconeix el nom de la propietat després de «\\P» o «\\p»" -#: glib/gregex.c:613 +#: glib/gregex.c:674 msgid "subpattern name is too long (maximum 32 characters)" msgstr "el nom del subpatró és massa llarg (32 caràcters com a màxim)" -#: glib/gregex.c:617 +#: glib/gregex.c:678 msgid "too many named subpatterns (maximum 10,000)" msgstr "hi ha massa subpatrons amb nom (màxim de 10.000)" -#: glib/gregex.c:621 +#: glib/gregex.c:682 msgid "octal value is greater than \\377" msgstr "el valor octal és més gran que \\377" -#: glib/gregex.c:625 +#: glib/gregex.c:686 msgid "DEFINE group contains more than one branch" msgstr "El grup «DEFINE» conté més d'una branca" -#: glib/gregex.c:629 +#: glib/gregex.c:690 msgid "inconsistent NEWLINE options" msgstr "opcions «NEWLINE» incoherents" -#: glib/gregex.c:633 +#: glib/gregex.c:694 msgid "" "\\g is not followed by a braced, angle-bracketed, or quoted name or number, " "or by a plain number" @@ -5837,120 +5846,120 @@ "després de «\\g» no hi ha cap número o cap nom o número entre claudàtors, " "claus angulars o cometes" -#: glib/gregex.c:638 +#: glib/gregex.c:699 msgid "an argument is not allowed for (*ACCEPT), (*FAIL), or (*COMMIT)" msgstr "no es permeten arguments per «(*ACCEPT)», «(*FAIL)» o «(*COMMIT)»" -#: glib/gregex.c:642 +#: glib/gregex.c:703 msgid "(*VERB) not recognized" msgstr "no es reconeix «(*VERB)»" -#: glib/gregex.c:646 +#: glib/gregex.c:707 msgid "number is too big" msgstr "el número és massa gran" -#: glib/gregex.c:650 +#: glib/gregex.c:711 msgid "missing subpattern name after (?&" msgstr "falta el nom del subpatró després de (?&" -#: glib/gregex.c:654 +#: glib/gregex.c:715 msgid "different names for subpatterns of the same number are not allowed" msgstr "no s'accepten noms diferents per subpatrons del mateix número" -#: glib/gregex.c:658 +#: glib/gregex.c:719 msgid "(*MARK) must have an argument" msgstr "«(*MARK)» ha de tenir un argument" -#: glib/gregex.c:662 +#: glib/gregex.c:723 msgid "\\c must be followed by an ASCII character" msgstr "després de «\\c» ha d'haver-hi un caràcter ASCII" -#: glib/gregex.c:666 +#: glib/gregex.c:727 msgid "\\k is not followed by a braced, angle-bracketed, or quoted name" msgstr "" "després de «\\k» no hi ha cap nom entre claudàtors, claus angulars o cometes" -#: glib/gregex.c:670 +#: glib/gregex.c:731 msgid "\\N is not supported in a class" msgstr "no es pot utilitzar \\N en una classe" -#: glib/gregex.c:674 +#: glib/gregex.c:735 msgid "name is too long in (*MARK), (*PRUNE), (*SKIP), or (*THEN)" msgstr "el nom és massa llarg a «(*MARK)«, «(*PRUNE)«, «(*SKIP)» o «(*THEN)»" -#: glib/gregex.c:678 glib/gregex.c:809 +#: glib/gregex.c:739 glib/gregex.c:875 msgid "code overflow" msgstr "desbordament del codi" -#: glib/gregex.c:682 +#: glib/gregex.c:743 msgid "unrecognized character after (?P" msgstr "no es reconeix el caràcter després de «(?P»" -#: glib/gregex.c:686 +#: glib/gregex.c:747 msgid "overran compiling workspace" msgstr "s'ha produït un desbordament en compilar l'espai de treball" -#: glib/gregex.c:690 +#: glib/gregex.c:751 msgid "previously-checked referenced subpattern not found" msgstr "no s'ha trobat el subpatró referenciat comprovat anteriorment" -#: glib/gregex.c:808 glib/gregex.c:1041 glib/gregex.c:2342 +#: glib/gregex.c:874 glib/gregex.c:1121 glib/gregex.c:2444 #, c-format msgid "Error while matching regular expression %s: %s" msgstr "S'ha produït un error en fer coincidir l'expressió regular %s: %s" -#: glib/gregex.c:1618 +#: glib/gregex.c:1721 msgid "PCRE library is compiled without UTF8 support" msgstr "La biblioteca PCRE no està compilada per a interpretar UTF-8" -#: glib/gregex.c:1626 +#: glib/gregex.c:1729 msgid "PCRE library is compiled with incompatible options" msgstr "La biblioteca PCRE ha estat compilada amb opcions incompatibles" -#: glib/gregex.c:1751 +#: glib/gregex.c:1847 #, c-format msgid "Error while compiling regular expression ‘%s’ at char %s: %s" msgstr "" "S'ha produït un error en compilar l'expressió regular «%s» al caràcter %s: " "%s" -#: glib/gregex.c:2786 +#: glib/gregex.c:2887 msgid "hexadecimal digit or “}” expected" msgstr "s'esperava un dígit hexadecimal o bé «}»" -#: glib/gregex.c:2802 +#: glib/gregex.c:2903 msgid "hexadecimal digit expected" msgstr "s'esperava un dígit hexadecimal" -#: glib/gregex.c:2842 +#: glib/gregex.c:2943 msgid "missing “<” in symbolic reference" msgstr "falta un «<» en la referència simbòlica" -#: glib/gregex.c:2851 +#: glib/gregex.c:2952 msgid "unfinished symbolic reference" msgstr "la referència simbòlica no està acabada" -#: glib/gregex.c:2858 +#: glib/gregex.c:2959 msgid "zero-length symbolic reference" msgstr "referència simbòlica de longitud zero" -#: glib/gregex.c:2869 +#: glib/gregex.c:2970 msgid "digit expected" msgstr "s'esperava un dígit" -#: glib/gregex.c:2887 +#: glib/gregex.c:2988 msgid "illegal symbolic reference" msgstr "la referència simbòlica no és vàlida" -#: glib/gregex.c:2950 +#: glib/gregex.c:3051 msgid "stray final “\\”" msgstr "«\\» final extraviat" -#: glib/gregex.c:2954 +#: glib/gregex.c:3055 msgid "unknown escape sequence" msgstr "no es reconeix la seqüència d'escapament" -#: glib/gregex.c:2964 +#: glib/gregex.c:3065 #, c-format msgid "Error while parsing replacement text “%s” at char %lu: %s" msgstr "" @@ -5983,102 +5992,107 @@ msgid "Text was empty (or contained only whitespace)" msgstr "El text era buit (o només contenia espais en blanc)" -#: glib/gspawn.c:314 +#: glib/gspawn.c:319 #, c-format msgid "Failed to read data from child process (%s)" msgstr "No s'han pogut llegir dades des del procés fill (%s)" -#: glib/gspawn.c:466 +#: glib/gspawn.c:471 #, c-format msgid "Unexpected error in reading data from a child process (%s)" msgstr "" "S'ha produït un error no esperat en llegir dades des d'un procés fill (%s)" -#: glib/gspawn.c:551 +#: glib/gspawn.c:556 #, c-format msgid "Unexpected error in waitpid() (%s)" msgstr "S'ha produït un error inesperat en waitpid() (%s)" -#: glib/gspawn.c:1170 glib/gspawn-win32.c:1488 +#: glib/gspawn.c:1175 glib/gspawn-win32.c:1503 #, c-format msgid "Child process exited with code %ld" msgstr "El procés fill ha sortit amb el codi %ld" -#: glib/gspawn.c:1178 +#: glib/gspawn.c:1183 #, c-format msgid "Child process killed by signal %ld" msgstr "El senyal %ld ha matat el procés fill" -#: glib/gspawn.c:1185 +#: glib/gspawn.c:1190 #, c-format msgid "Child process stopped by signal %ld" msgstr "El senyal %ld ha aturat el procés fill" -#: glib/gspawn.c:1192 +#: glib/gspawn.c:1197 #, c-format msgid "Child process exited abnormally" msgstr "El procés fill ha sortit inesperadament" -#: glib/gspawn.c:1885 glib/gspawn-win32.c:393 glib/gspawn-win32.c:401 +#: glib/gspawn.c:2027 glib/gspawn-win32.c:393 glib/gspawn-win32.c:401 #, c-format msgid "Failed to read from child pipe (%s)" msgstr "No s'ha pogut llegir des del conducte fill (%s)" -#: glib/gspawn.c:2248 +#: glib/gspawn.c:2399 #, c-format msgid "Failed to spawn child process “%s” (%s)" msgstr "No s'ha pogut engendrar el procés fill «%s» (%s)" -#: glib/gspawn.c:2365 +#: glib/gspawn.c:2525 #, c-format msgid "Failed to fork (%s)" msgstr "No s'ha pogut bifurcar (%s)" -#: glib/gspawn.c:2525 glib/gspawn-win32.c:424 +#: glib/gspawn.c:2685 glib/gspawn-win32.c:424 #, c-format msgid "Failed to change to directory “%s” (%s)" msgstr "No s'ha pogut canviar al directori «%s» (%s)" -#: glib/gspawn.c:2535 +#: glib/gspawn.c:2695 #, c-format msgid "Failed to execute child process “%s” (%s)" msgstr "No s'ha pogut executar el procés fill «%s» (%s)" -#: glib/gspawn.c:2545 +#: glib/gspawn.c:2705 #, c-format msgid "Failed to open file to remap file descriptor (%s)" msgstr "" "No s'ha pogut obrir el fitxer per a tornar a assignar el descriptor de " "fitxers (%s)" -#: glib/gspawn.c:2553 +#: glib/gspawn.c:2713 #, c-format msgid "Failed to duplicate file descriptor for child process (%s)" msgstr "" "No s'ha pogut duplicar el descriptor de fitxers per al procés fill (%s)" -#: glib/gspawn.c:2562 +#: glib/gspawn.c:2722 #, c-format msgid "Failed to fork child process (%s)" msgstr "No s'ha pogut bifurcar el procés fill (%s)" -#: glib/gspawn.c:2570 +#: glib/gspawn.c:2730 #, c-format msgid "Failed to close file descriptor for child process (%s)" msgstr "No s'ha pogut tancar el descriptor de fitxers per al procés fill (%s)" -#: glib/gspawn.c:2578 +#: glib/gspawn.c:2738 #, c-format msgid "Unknown error executing child process “%s”" msgstr "S'ha produït un error desconegut en executar el procés fill «%s»" -#: glib/gspawn.c:2602 +#: glib/gspawn.c:2762 #, c-format msgid "Failed to read enough data from child pid pipe (%s)" msgstr "" "No s'han pogut llegir prou dades del conducte de l'identificador del procés " "fill (%s)" +#: glib/gspawn-private.h:134 +#, c-format +msgid "Invalid source FDs argument" +msgstr "Argument FDs d'origen no vàlid" + #: glib/gspawn-win32.c:337 msgid "Failed to read data from child process" msgstr "No s'han pogut llegir dades del procés fill" @@ -6098,27 +6112,27 @@ msgid "Invalid program name: %s" msgstr "El nom del programa no és vàlid: %s" -#: glib/gspawn-win32.c:521 glib/gspawn-win32.c:853 +#: glib/gspawn-win32.c:521 glib/gspawn-win32.c:868 #, c-format msgid "Invalid string in argument vector at %d: %s" msgstr "La cadena en el vector d'argument no és vàlida a %d: %s" -#: glib/gspawn-win32.c:532 glib/gspawn-win32.c:869 +#: glib/gspawn-win32.c:532 glib/gspawn-win32.c:884 #, c-format msgid "Invalid string in environment: %s" msgstr "Cadena no vàlida a l'entorn: %s" -#: glib/gspawn-win32.c:849 +#: glib/gspawn-win32.c:864 #, c-format msgid "Invalid working directory: %s" msgstr "El directori de treball no és vàlid: %s" -#: glib/gspawn-win32.c:914 +#: glib/gspawn-win32.c:929 #, c-format msgid "Failed to execute helper program (%s)" msgstr "No s'ha pogut executar el programa d'ajuda (%s)" -#: glib/gspawn-win32.c:1143 +#: glib/gspawn-win32.c:1158 msgid "" "Unexpected error in g_io_channel_win32_poll() reading data from a child " "process" @@ -6126,21 +6140,21 @@ "S'ha produït un error inesperat a g_io_channel_win32_poll() en llegir dades " "d'un procés fill" -#: glib/gstrfuncs.c:3366 glib/gstrfuncs.c:3468 +#: glib/gstrfuncs.c:3370 glib/gstrfuncs.c:3472 msgid "Empty string is not a number" msgstr "La cadena buida no és un número" -#: glib/gstrfuncs.c:3390 +#: glib/gstrfuncs.c:3394 #, c-format msgid "“%s” is not a signed number" msgstr "«%s» no és un nombre amb signe" -#: glib/gstrfuncs.c:3400 glib/gstrfuncs.c:3504 +#: glib/gstrfuncs.c:3404 glib/gstrfuncs.c:3508 #, c-format msgid "Number “%s” is out of bounds %s, %s" msgstr "El número «%s» està fora de rangs %s, %s" -#: glib/gstrfuncs.c:3494 +#: glib/gstrfuncs.c:3498 #, c-format msgid "“%s” is not an unsigned number" msgstr "«%s» no és un nombre sense signe" @@ -6220,155 +6234,155 @@ #. Translators: A unit symbol for size formatting, showing for example: "13.0 #. kB" -#: glib/gutils.c:2857 +#: glib/gutils.c:2966 msgid "kB" msgstr "kB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 #. MB" -#: glib/gutils.c:2859 +#: glib/gutils.c:2968 msgid "MB" msgstr "MB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 #. GB" -#: glib/gutils.c:2861 +#: glib/gutils.c:2970 msgid "GB" msgstr "GB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 #. TB" -#: glib/gutils.c:2863 +#: glib/gutils.c:2972 msgid "TB" msgstr "TB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 #. PB" -#: glib/gutils.c:2865 +#: glib/gutils.c:2974 msgid "PB" msgstr "PB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 #. EB" -#: glib/gutils.c:2867 +#: glib/gutils.c:2976 msgid "EB" msgstr "EB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 #. KiB" -#: glib/gutils.c:2871 +#: glib/gutils.c:2980 msgid "KiB" msgstr "KiB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 #. MiB" -#: glib/gutils.c:2873 +#: glib/gutils.c:2982 msgid "MiB" msgstr "MiB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 #. GiB" -#: glib/gutils.c:2875 +#: glib/gutils.c:2984 msgid "GiB" msgstr "GiB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 #. TiB" -#: glib/gutils.c:2877 +#: glib/gutils.c:2986 msgid "TiB" msgstr "TiB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 #. PiB" -#: glib/gutils.c:2879 +#: glib/gutils.c:2988 msgid "PiB" msgstr "PiB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 #. EiB" -#: glib/gutils.c:2881 +#: glib/gutils.c:2990 msgid "EiB" msgstr "EiB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 #. kb" -#: glib/gutils.c:2885 +#: glib/gutils.c:2994 msgid "kb" msgstr "kb" #. Translators: A unit symbol for size formatting, showing for example: "13.0 #. Mb" -#: glib/gutils.c:2887 +#: glib/gutils.c:2996 msgid "Mb" msgstr "Mb" #. Translators: A unit symbol for size formatting, showing for example: "13.0 #. Gb" -#: glib/gutils.c:2889 +#: glib/gutils.c:2998 msgid "Gb" msgstr "Gb" #. Translators: A unit symbol for size formatting, showing for example: "13.0 #. Tb" -#: glib/gutils.c:2891 +#: glib/gutils.c:3000 msgid "Tb" msgstr "Tb" #. Translators: A unit symbol for size formatting, showing for example: "13.0 #. Pb" -#: glib/gutils.c:2893 +#: glib/gutils.c:3002 msgid "Pb" msgstr "Pb" #. Translators: A unit symbol for size formatting, showing for example: "13.0 #. Eb" -#: glib/gutils.c:2895 +#: glib/gutils.c:3004 msgid "Eb" msgstr "Eb" #. Translators: A unit symbol for size formatting, showing for example: "13.0 #. Kib" -#: glib/gutils.c:2899 +#: glib/gutils.c:3008 msgid "Kib" msgstr "Kib" #. Translators: A unit symbol for size formatting, showing for example: "13.0 #. Mib" -#: glib/gutils.c:2901 +#: glib/gutils.c:3010 msgid "Mib" msgstr "Mib" #. Translators: A unit symbol for size formatting, showing for example: "13.0 #. Gib" -#: glib/gutils.c:2903 +#: glib/gutils.c:3012 msgid "Gib" msgstr "Gib" #. Translators: A unit symbol for size formatting, showing for example: "13.0 #. Tib" -#: glib/gutils.c:2905 +#: glib/gutils.c:3014 msgid "Tib" msgstr "Tib" #. Translators: A unit symbol for size formatting, showing for example: "13.0 #. Pib" -#: glib/gutils.c:2907 +#: glib/gutils.c:3016 msgid "Pib" msgstr "Pib" #. Translators: A unit symbol for size formatting, showing for example: "13.0 #. Eib" -#: glib/gutils.c:2909 +#: glib/gutils.c:3018 msgid "Eib" msgstr "Eib" -#: glib/gutils.c:2947 +#: glib/gutils.c:3056 msgid "byte" msgid_plural "bytes" msgstr0 "byte" msgstr1 "bytes" -#: glib/gutils.c:2951 +#: glib/gutils.c:3060 msgid "bit" msgid_plural "bits" msgstr0 "bit" @@ -6376,7 +6390,7 @@ #. Translators: The "%u" is replaced with the size value, like "13"; it could #. * be part of "13 bytes", but only the number is requested this time. -#: glib/gutils.c:2959 +#: glib/gutils.c:3068 #, c-format msgctxt "format-size" msgid "%u" @@ -6385,7 +6399,7 @@ #. Translators: The first "%u" is replaced with the value, the "%s" with a #. unit of the value. #. * The order can be changed with "%$2s %$1u". An example: "13 bytes" -#: glib/gutils.c:2964 +#: glib/gutils.c:3073 #, c-format msgctxt "format-size" msgid "%u %s" @@ -6394,7 +6408,7 @@ #. Translators: The "%.1f" is replaced with the size value, like "13.0"; it #. could #. * be part of "13.0 MB", but only the number is requested this time. -#: glib/gutils.c:3000 +#: glib/gutils.c:3109 #, c-format msgctxt "format-size" msgid "%.1f" @@ -6405,14 +6419,14 @@ #. * The order can be changed with "%$2s %$1.1f". Keep the no-break space #. between the value and #. * the unit symbol. An example: "13.0 MB" -#: glib/gutils.c:3006 +#: glib/gutils.c:3115 #, c-format msgctxt "format-size" msgid "%.1f %s" msgstr "%.1f %s" #. Translators: the %s in "%s bytes" will always be replaced by a number. -#: glib/gutils.c:3046 +#: glib/gutils.c:3155 #, c-format msgid "%s byte" msgid_plural "%s bytes" @@ -6420,14 +6434,14 @@ msgstr1 "%s bytes" #. Translators: the %s in "%s bits" will always be replaced by a number. -#: glib/gutils.c:3051 +#: glib/gutils.c:3160 #, c-format msgid "%s bit" msgid_plural "%s bits" msgstr0 "%s bit" msgstr1 "%s bits" -#: glib/gutils.c:3092 +#: glib/gutils.c:3201 #, c-format msgid "%u byte" msgid_plural "%u bytes" @@ -6441,32 +6455,32 @@ #. * compatibility. Users will not see this string unless a program is using #. this deprecated function. #. * Please translate as literally as possible. -#: glib/gutils.c:3105 +#: glib/gutils.c:3214 #, c-format msgid "%.1f KB" msgstr "%.1f KB" -#: glib/gutils.c:3110 +#: glib/gutils.c:3219 #, c-format msgid "%.1f MB" msgstr "%.1f MB" -#: glib/gutils.c:3115 +#: glib/gutils.c:3224 #, c-format msgid "%.1f GB" msgstr "%.1f GB" -#: glib/gutils.c:3120 +#: glib/gutils.c:3229 #, c-format msgid "%.1f TB" msgstr "%.1f TB" -#: glib/gutils.c:3125 +#: glib/gutils.c:3234 #, c-format msgid "%.1f PB" msgstr "%.1f PB" -#: glib/gutils.c:3130 +#: glib/gutils.c:3239 #, c-format msgid "%.1f EB" msgstr "%.1f EB"
View file
_service:tar_scm:glib-2.74.4.tar.xz/po/cs.po -> _service:tar_scm:glib-2.76.4.tar.xz/po/cs.po
Changed
@@ -9,14 +9,14 @@ # Lukas Novotny <lukasnov@cvs.gnome.org>, 2006. # Jakub Friedl <jfriedl@suse.cz>, 2006, 2007. # Petr Kovar <pknbe@volny.cz>, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015. -# Marek Černocký <marek@manet.cz>, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022. +# Marek Černocký <marek@manet.cz>, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023. # msgid "" msgstr "" "Project-Id-Version: glib\n" "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/glib/issues\n" -"POT-Creation-Date: 2022-08-15 20:23+0000\n" -"PO-Revision-Date: 2022-08-29 10:46+0200\n" +"POT-Creation-Date: 2023-02-15 16:30+0000\n" +"PO-Revision-Date: 2023-03-05 23:06+0100\n" "Last-Translator: Marek Černocký <marek@manet.cz>\n" "Language-Team: čeština <gnome-cs-list@gnome.org>\n" "Language: cs\n" @@ -27,22 +27,22 @@ "X-Generator: Gtranslator 2.91.7\n" "X-Project-Style: gnome\n" -#: gio/gappinfo.c:335 +#: gio/gappinfo.c:339 msgid "Setting default applications not supported yet" msgstr "Nastavení výchozích aplikací není podporováno" -#: gio/gappinfo.c:368 +#: gio/gappinfo.c:372 msgid "Setting application as last used for type not supported yet" msgstr "" "Nastavení aplikace, jako poslední použité pro daný typ, není zatím " "podporováno" -#: gio/gappinfo.c:808 +#: gio/gappinfo.c:814 #, c-format msgid "Failed to find default application for content type ‘%s’" msgstr "Selhalo vyhledání výchozí aplikace pro obsah typu „%s“" -#: gio/gappinfo.c:868 +#: gio/gappinfo.c:874 #, c-format msgid "Failed to find default application for URI Scheme ‘%s’" msgstr "Selhalo vyhledání výchozí aplikace pro schéma URI „%s“" @@ -243,11 +243,11 @@ msgid "error sending %s message to application: %s\n" msgstr "chyba při odesílání zprávy %s aplikaci: %s\n" -#: gio/gapplication-tool.c:321 +#: gio/gapplication-tool.c:324 msgid "action name must be given after application id\n" msgstr "název aplikace musí následovat po ID aplikace\n" -#: gio/gapplication-tool.c:329 +#: gio/gapplication-tool.c:332 #, c-format msgid "" "invalid action name: “%s”\n" @@ -256,25 +256,25 @@ "neplatný název akce: „%s“\n" "názvy akcí mohou obsahovat pouze alfanumerické znaky, „-“ a „.“\n" -#: gio/gapplication-tool.c:348 +#: gio/gapplication-tool.c:351 #, c-format msgid "error parsing action parameter: %s\n" msgstr "chyba při analyzování parametru akce: %s\n" -#: gio/gapplication-tool.c:360 +#: gio/gapplication-tool.c:363 msgid "actions accept a maximum of one parameter\n" msgstr "akce podporují nanejvýš jeden parametr\n" -#: gio/gapplication-tool.c:415 +#: gio/gapplication-tool.c:418 msgid "list-actions command takes only the application id" msgstr "S příkazem list-actions lze použít pouze ID aplikace" -#: gio/gapplication-tool.c:425 +#: gio/gapplication-tool.c:428 #, c-format msgid "unable to find desktop file for application %s\n" msgstr "nelze nalézt soubor desktop pro aplikaci %s\n" -#: gio/gapplication-tool.c:470 +#: gio/gapplication-tool.c:473 #, c-format msgid "" "unrecognised command: %s\n" @@ -309,7 +309,7 @@ msgid "Truncate not supported on base stream" msgstr "Zkrácování není v proudu podporováno" -#: gio/gcancellable.c:319 gio/gdbusconnection.c:1859 gio/gdbusprivate.c:1420 +#: gio/gcancellable.c:326 gio/gdbusconnection.c:1859 gio/gdbusprivate.c:1420 #: gio/gsimpleasyncresult.c:873 gio/gsimpleasyncresult.c:899 #, c-format msgid "Operation was cancelled" @@ -329,13 +329,13 @@ #: gio/gcharsetconverter.c:344 gio/gdatainputstream.c:850 #: gio/gdatainputstream.c:1268 glib/gconvert.c:451 glib/gconvert.c:883 -#: glib/giochannel.c:1576 glib/giochannel.c:1618 glib/giochannel.c:2473 +#: glib/giochannel.c:1576 glib/giochannel.c:1618 glib/giochannel.c:2478 #: glib/gutf8.c:892 glib/gutf8.c:1346 msgid "Invalid byte sequence in conversion input" msgstr "Neplatná posloupnost bajtů na vstupu převodu" #: gio/gcharsetconverter.c:349 glib/gconvert.c:459 glib/gconvert.c:797 -#: glib/giochannel.c:1583 glib/giochannel.c:2485 +#: glib/giochannel.c:1583 glib/giochannel.c:2493 #, c-format msgid "Error during conversion: %s" msgstr "Chyba při převodu: %s" @@ -392,17 +392,17 @@ msgid "Unexpected early end-of-stream" msgstr "Neočekávaný časný konec proudu" -#: gio/gdbusaddress.c:164 gio/gdbusaddress.c:238 gio/gdbusaddress.c:327 +#: gio/gdbusaddress.c:162 gio/gdbusaddress.c:234 gio/gdbusaddress.c:321 #, c-format msgid "Unsupported key “%s” in address entry “%s”" msgstr "Nepodporovaný klíč „%s“ v záznamu s adresou „%s“" -#: gio/gdbusaddress.c:177 +#: gio/gdbusaddress.c:175 #, c-format msgid "Meaningless key/value pair combination in address entry “%s”" msgstr "Nesmyslná párová kombinace klíč/hodnota v záznamu s adresou „%s“" -#: gio/gdbusaddress.c:186 +#: gio/gdbusaddress.c:184 #, c-format msgid "" "Address “%s” is invalid (need exactly one of path, dir, tmpdir, or abstract " @@ -411,28 +411,28 @@ "Adresa „%s“ je neplatná (je zapotřebí právě jeden z klíčů path, tmpdir nebo " "abstract)" -#: gio/gdbusaddress.c:253 gio/gdbusaddress.c:264 gio/gdbusaddress.c:279 -#: gio/gdbusaddress.c:342 gio/gdbusaddress.c:353 +#: gio/gdbusaddress.c:249 gio/gdbusaddress.c:260 gio/gdbusaddress.c:275 +#: gio/gdbusaddress.c:336 gio/gdbusaddress.c:347 #, c-format msgid "Error in address “%s” — the “%s” attribute is malformed" msgstr "Chyba v adrese „%s“ – atribut „%s“ má chybný formát" -#: gio/gdbusaddress.c:423 gio/gdbusaddress.c:682 +#: gio/gdbusaddress.c:417 gio/gdbusaddress.c:676 #, c-format msgid "Unknown or unsupported transport “%s” for address “%s”" msgstr "Neznámý nebo nepodporovaný přenos „%s“ adresy „%s“" -#: gio/gdbusaddress.c:467 +#: gio/gdbusaddress.c:461 #, c-format msgid "Address element “%s” does not contain a colon (:)" msgstr "Prvek adresy „%s“ neobsahuje dvojtečku (:)" -#: gio/gdbusaddress.c:476 +#: gio/gdbusaddress.c:470 #, c-format msgid "Transport name in address element “%s” must not be empty" msgstr "Název přenosu v prvku adresy „%s“ nesmí být prázdný" -#: gio/gdbusaddress.c:497 +#: gio/gdbusaddress.c:491 #, c-format msgid "" "Key/Value pair %d, “%s”, in address element “%s” does not contain an equal " @@ -440,13 +440,13 @@ msgstr "" "Pár klíč/hodnota %d, „%s“, v prvku adresy „%s“ neobsahuje znak rovná se" -#: gio/gdbusaddress.c:508 +#: gio/gdbusaddress.c:502 #, c-format msgid "" "Key/Value pair %d, “%s”, in address element “%s” must not have an empty key" msgstr "Pár klíč/hodnota %d, „%s“ v prvku adresy „%s“ nesmí mít prázdný klíč" -#: gio/gdbusaddress.c:522 +#: gio/gdbusaddress.c:516 #, c-format msgid "" "Error unescaping key or value in Key/Value pair %d, “%s”, in address element " @@ -455,7 +455,7 @@ "Chyba v neuvozeném klíči nebo hodnotě v páru klíč/hodnota %d, „%s“, v prvku " "adresy „%s“" -#: gio/gdbusaddress.c:590 +#: gio/gdbusaddress.c:584 #, c-format msgid "" "Error in address “%s” — the unix transport requires exactly one of the keys " @@ -464,74 +464,74 @@ "Chyba v adrese „%s“ – unix transport vyžaduje jako nastavený právě jeden z " "klíčů „path“ nebo „abstract“" -#: gio/gdbusaddress.c:625 +#: gio/gdbusaddress.c:619 #, c-format msgid "Error in address “%s” — the host attribute is missing or malformed" msgstr "Chyba v adrese „%s“ – atribut počítače schází nebo má chybný formát" -#: gio/gdbusaddress.c:639 +#: gio/gdbusaddress.c:633 #, c-format msgid "Error in address “%s” — the port attribute is missing or malformed" msgstr "Chyba v adrese „%s“ – atribut portu schází nebo má chybný formát" -#: gio/gdbusaddress.c:653 +#: gio/gdbusaddress.c:647 #, c-format msgid "Error in address “%s” — the noncefile attribute is missing or malformed" msgstr "Chyba v adrese „%s“ – atribut noncefile schází nebo má chybný formát" -#: gio/gdbusaddress.c:674 +#: gio/gdbusaddress.c:668 msgid "Error auto-launching: " msgstr "Chyba při automatickém spouštění: " -#: gio/gdbusaddress.c:727 +#: gio/gdbusaddress.c:721 #, c-format msgid "Error opening nonce file “%s”: %s" msgstr "Chyba při otevírání souboru nonce „%s“: %s" -#: gio/gdbusaddress.c:746 +#: gio/gdbusaddress.c:740 #, c-format msgid "Error reading from nonce file “%s”: %s" msgstr "Chyba při čtení ze souboru nonce „%s“: %s" -#: gio/gdbusaddress.c:755 +#: gio/gdbusaddress.c:749 #, c-format msgid "Error reading from nonce file “%s”, expected 16 bytes, got %d" msgstr "Chyba při čtení ze souboru nonce „%s“, očekáváno 16 bajtů, obdrženo %d" -#: gio/gdbusaddress.c:773 +#: gio/gdbusaddress.c:767 #, c-format msgid "Error writing contents of nonce file “%s” to stream:" msgstr "Chyba při zápisu obsahu souboru nonce „%s“ do proudu:" -#: gio/gdbusaddress.c:988 +#: gio/gdbusaddress.c:982 msgid "The given address is empty" msgstr "Daná adresa je prázdná" -#: gio/gdbusaddress.c:1101 +#: gio/gdbusaddress.c:1095 #, c-format msgid "Cannot spawn a message bus when AT_SECURE is set" msgstr "Nelze spustit sběrnici zpráv, když je nastaveno AT_SECURE" -#: gio/gdbusaddress.c:1108 +#: gio/gdbusaddress.c:1102 msgid "Cannot spawn a message bus without a machine-id: " msgstr "Nelze spustit sběrnici zpráv bez machine-id: " -#: gio/gdbusaddress.c:1115 +#: gio/gdbusaddress.c:1109 #, c-format msgid "Cannot autolaunch D-Bus without X11 $DISPLAY" msgstr "Nelze automaticky spustit D-Bus bez X11 $DISPLAY" -#: gio/gdbusaddress.c:1157 +#: gio/gdbusaddress.c:1151 #, c-format msgid "Error spawning command line “%s”: " msgstr "Chyba při spouštění příkazového řádku „%s“: " -#: gio/gdbusaddress.c:1226 +#: gio/gdbusaddress.c:1220 #, c-format msgid "Cannot determine session bus address (not implemented for this OS)" msgstr "Nelze určit adresu sběrnice sezení (v tomto OS neimplementováno)" -#: gio/gdbusaddress.c:1375 gio/gdbusconnection.c:7321 +#: gio/gdbusaddress.c:1374 gio/gdbusconnection.c:7316 #, c-format msgid "" "Cannot determine bus address from DBUS_STARTER_BUS_TYPE environment variable " @@ -540,7 +540,7 @@ "Nelze určit adresu sběrnice z proměnné prostředí DBUS_STARTER_BUS_TYPE – " "neznámá hodnota „%s“" -#: gio/gdbusaddress.c:1384 gio/gdbusconnection.c:7330 +#: gio/gdbusaddress.c:1383 gio/gdbusconnection.c:7325 msgid "" "Cannot determine bus address because the DBUS_STARTER_BUS_TYPE environment " "variable is not set" @@ -548,7 +548,7 @@ "Nelze určit adresu sběrnice, jelikož proměnná prostředí " "DBUS_STARTER_BUS_TYPE není nastavena" -#: gio/gdbusaddress.c:1394 +#: gio/gdbusaddress.c:1393 #, c-format msgid "Unknown bus type %d" msgstr "Neznámý typ sběrnice %d" @@ -568,11 +568,15 @@ msgstr "" "Vyčerpány všechny dostupné ověřovací mechanismy (pokusů: %s) (dostupných: %s)" -#: gio/gdbusauth.c:1178 +#: gio/gdbusauth.c:1045 +msgid "Unexpected lack of content trying to read a byte" +msgstr "Neočekávaně chybí obsah při pokusu o přečtení bajtu" + +#: gio/gdbusauth.c:1195 msgid "User IDs must be the same for peer and server" msgstr "ID uživatele musí být stejné pro klienta i server" -#: gio/gdbusauth.c:1190 +#: gio/gdbusauth.c:1207 msgid "Cancelled via GDBusAuthObserver::authorize-authenticated-peer" msgstr "Zrušeno přes GDBusAuthObserver::authorize-authenticated-peer" @@ -660,7 +664,7 @@ msgid "(Additionally, releasing the lock for “%s” also failed: %s) " msgstr "(Navíc selhalo také uvolnění zámku pro „%s“: %s) " -#: gio/gdbusconnection.c:590 gio/gdbusconnection.c:2404 +#: gio/gdbusconnection.c:590 gio/gdbusconnection.c:2405 msgid "The connection is closed" msgstr "Spojení bylo ukončeno" @@ -668,117 +672,117 @@ msgid "Timeout was reached" msgstr "Časový limit vypršel" -#: gio/gdbusconnection.c:2527 +#: gio/gdbusconnection.c:2528 msgid "" "Unsupported flags encountered when constructing a client-side connection" msgstr "" "Nalezeny nepodporované příznaky při vytváření spojení na straně klienta" -#: gio/gdbusconnection.c:4256 gio/gdbusconnection.c:4610 +#: gio/gdbusconnection.c:4257 gio/gdbusconnection.c:4611 #, c-format msgid "" "No such interface “org.freedesktop.DBus.Properties” on object at path %s" msgstr "" "Rozhraní „org.freedesktop.DBus.Properties“ na objektu na cestě %s neexistuje" -#: gio/gdbusconnection.c:4401 +#: gio/gdbusconnection.c:4402 #, c-format msgid "No such property “%s”" msgstr "Vlastnost „%s“ neexistuje" -#: gio/gdbusconnection.c:4413 +#: gio/gdbusconnection.c:4414 #, c-format msgid "Property “%s” is not readable" msgstr "Vlastnost „%s“ není ke čtení" -#: gio/gdbusconnection.c:4424 +#: gio/gdbusconnection.c:4425 #, c-format msgid "Property “%s” is not writable" msgstr "Vlastnost „%s“ není zapisovatelná" -#: gio/gdbusconnection.c:4444 +#: gio/gdbusconnection.c:4445 #, c-format msgid "Error setting property “%s”: Expected type “%s” but got “%s”" msgstr "" "Chyba při nastavování vlastnosti „%s“: Očekáván typ „%s“, ale obdržen „%s“" -#: gio/gdbusconnection.c:4549 gio/gdbusconnection.c:4764 -#: gio/gdbusconnection.c:6747 +#: gio/gdbusconnection.c:4550 gio/gdbusconnection.c:4765 +#: gio/gdbusconnection.c:6742 #, c-format msgid "No such interface “%s”" msgstr "Rozhraní „%s“ neexistuje" -#: gio/gdbusconnection.c:4986 gio/gdbusconnection.c:7261 +#: gio/gdbusconnection.c:4981 gio/gdbusconnection.c:7256 #, c-format msgid "No such interface “%s” on object at path %s" msgstr "Rozhraní „%s“na objektu na cestě %s neexistuje" -#: gio/gdbusconnection.c:5087 +#: gio/gdbusconnection.c:5082 #, c-format msgid "No such method “%s”" msgstr "Metoda „%s“ neexistuje" -#: gio/gdbusconnection.c:5118 +#: gio/gdbusconnection.c:5113 #, c-format msgid "Type of message, “%s”, does not match expected type “%s”" msgstr "Typ zprávy „%s“ se neshoduje s očekávaným typem „%s“" -#: gio/gdbusconnection.c:5321 +#: gio/gdbusconnection.c:5316 #, c-format msgid "An object is already exported for the interface %s at %s" msgstr "Objekt je již exportován pro prostředí %s na %s" -#: gio/gdbusconnection.c:5548 +#: gio/gdbusconnection.c:5543 #, c-format msgid "Unable to retrieve property %s.%s" msgstr "Nelze načíst vlastnost %s.%s" -#: gio/gdbusconnection.c:5604 +#: gio/gdbusconnection.c:5599 #, c-format msgid "Unable to set property %s.%s" msgstr "Nelze nastavit vlastnost %s.%s" -#: gio/gdbusconnection.c:5783 +#: gio/gdbusconnection.c:5778 #, c-format msgid "Method “%s” returned type “%s”, but expected “%s”" msgstr "Metoda „%s“ vrátila typ „%s“, ale očekáván byl „%s“" -#: gio/gdbusconnection.c:6859 +#: gio/gdbusconnection.c:6854 #, c-format msgid "Method “%s” on interface “%s” with signature “%s” does not exist" msgstr "Metoda „%s“ na rozhraní „%s“ s podpisem „%s“ neexistuje" -#: gio/gdbusconnection.c:6980 +#: gio/gdbusconnection.c:6975 #, c-format msgid "A subtree is already exported for %s" msgstr "Podstrom je již exportován pro %s" -#: gio/gdbusconnection.c:7269 +#: gio/gdbusconnection.c:7264 #, c-format msgid "Object does not exist at path “%s”" msgstr "V cestě „%s“ objekt neexistuje" -#: gio/gdbusmessage.c:1303 +#: gio/gdbusmessage.c:1306 msgid "type is INVALID" msgstr "typ je INVALID" -#: gio/gdbusmessage.c:1314 +#: gio/gdbusmessage.c:1317 msgid "METHOD_CALL message: PATH or MEMBER header field is missing" msgstr "Zpráva METHOD_CALL: pole se záhlavím PATH nebo MEMBER schází" -#: gio/gdbusmessage.c:1325 +#: gio/gdbusmessage.c:1328 msgid "METHOD_RETURN message: REPLY_SERIAL header field is missing" msgstr "Zpráva METHOD_RETURN: pole se záhlavím REPLY_SERIAL schází" -#: gio/gdbusmessage.c:1337 +#: gio/gdbusmessage.c:1340 msgid "ERROR message: REPLY_SERIAL or ERROR_NAME header field is missing" msgstr "Zpráva ERROR: pole se záhlavím REPLY_SERIAL nebo ERROR_NAME schází" -#: gio/gdbusmessage.c:1350 +#: gio/gdbusmessage.c:1353 msgid "SIGNAL message: PATH, INTERFACE or MEMBER header field is missing" msgstr "Zpráva SIGNAL: pole se záhlavím PATH, INTERFACE nebo MEMBER schází" -#: gio/gdbusmessage.c:1358 +#: gio/gdbusmessage.c:1361 msgid "" "SIGNAL message: The PATH header field is using the reserved value /org/" "freedesktop/DBus/Local" @@ -786,7 +790,7 @@ "Zpráva SIGNAL: pole se záhlavím PATH používá rezervovanou hodnotu /org/" "freedesktop/DBus/Local" -#: gio/gdbusmessage.c:1366 +#: gio/gdbusmessage.c:1369 msgid "" "SIGNAL message: The INTERFACE header field is using the reserved value org." "freedesktop.DBus.Local" @@ -794,7 +798,7 @@ "Zpráva SIGNAL: pole se záhlavím INTERFACE používá rezervovanou hodnotu org." "freedesktop.DBus.Local" -#: gio/gdbusmessage.c:1414 gio/gdbusmessage.c:1474 +#: gio/gdbusmessage.c:1417 gio/gdbusmessage.c:1477 #, c-format msgid "Wanted to read %lu byte but only got %lu" msgid_plural "Wanted to read %lu bytes but only got %lu" @@ -802,12 +806,12 @@ msgstr1 "Zamýšlely se přečíst %lu bajty, ale obdrženo %lu" msgstr2 "Zamýšlelo se přečíst %lu bajtů, ale obdrženo %lu" -#: gio/gdbusmessage.c:1428 +#: gio/gdbusmessage.c:1431 #, c-format msgid "Expected NUL byte after the string “%s” but found byte %d" msgstr "Očekáván bajt NULL za řetězcem „%s“, ale byl nalezen bajt %d" -#: gio/gdbusmessage.c:1447 +#: gio/gdbusmessage.c:1450 #, c-format msgid "" "Expected valid UTF-8 string but found invalid bytes at byte offset %d " @@ -816,21 +820,21 @@ "Očekáván platný řetězec UTF-8, ale byly nalezeny neplatné bajty na pozici %d " "(délka řetězce je %d). Platný řetězec UTF-8 až do příslušného bodu byl „%s“" -#: gio/gdbusmessage.c:1511 gio/gdbusmessage.c:1787 gio/gdbusmessage.c:1998 +#: gio/gdbusmessage.c:1514 gio/gdbusmessage.c:1790 gio/gdbusmessage.c:2001 msgid "Value nested too deeply" msgstr "Hodnota je zanořená příliš hluboko" -#: gio/gdbusmessage.c:1679 +#: gio/gdbusmessage.c:1682 #, c-format msgid "Parsed value “%s” is not a valid D-Bus object path" msgstr "Analyzovaná hodnota „%s“ není platná cesta objektu D-Bus" -#: gio/gdbusmessage.c:1703 +#: gio/gdbusmessage.c:1706 #, c-format msgid "Parsed value “%s” is not a valid D-Bus signature" msgstr "Analyzovaná hodnota „%s“ není platný podpis D-Bus" -#: gio/gdbusmessage.c:1754 +#: gio/gdbusmessage.c:1757 #, c-format msgid "" "Encountered array of length %u byte. Maximum length is 2<<26 bytes (64 MiB)." @@ -843,7 +847,7 @@ msgstr2 "" "Zjištěno pole o délce %u bajtů. Maximální délka je 2<<26 bajtů (64 MiB)." -#: gio/gdbusmessage.c:1774 +#: gio/gdbusmessage.c:1777 #, c-format msgid "" "Encountered array of type “a%c”, expected to have a length a multiple of %u " @@ -852,16 +856,16 @@ "Vyskytlo se pole typu „a%c“, které by mělo mít délku v násobku %u bajtů, ale " "skutečná délka je %u bajtů" -#: gio/gdbusmessage.c:1928 gio/gdbusmessage.c:2647 +#: gio/gdbusmessage.c:1931 gio/gdbusmessage.c:2650 msgid "Empty structures (tuples) are not allowed in D-Bus" msgstr "Prázdné struktury (n-tice) nejsou na sběrnici D-Bus dovoleny" -#: gio/gdbusmessage.c:1982 +#: gio/gdbusmessage.c:1985 #, c-format msgid "Parsed value “%s” for variant is not a valid D-Bus signature" msgstr "Analyzovaná hodnota „%s“ varianty není platným podpisem D-Bus" -#: gio/gdbusmessage.c:2023 +#: gio/gdbusmessage.c:2026 #, c-format msgid "" "Error deserializing GVariant with type string “%s” from the D-Bus wire format" @@ -869,7 +873,7 @@ "Chyba při rušení serializace GVariant s řetězcem typu „%s“ z přenosového " "formátu D-Bus" -#: gio/gdbusmessage.c:2208 +#: gio/gdbusmessage.c:2211 #, c-format msgid "" "Invalid endianness value. Expected 0x6c (“l”) or 0x42 (“B”) but found value " @@ -878,27 +882,27 @@ "Neplatná hodnota endianity. Očekávána 0x6c („l“) nebo 0x42 („B“), ale " "nalezena hodnota 0x%02x" -#: gio/gdbusmessage.c:2227 +#: gio/gdbusmessage.c:2230 #, c-format msgid "Invalid major protocol version. Expected 1 but found %d" msgstr "Neplatná verze hlavního protokolu. Očekávána 1, ale nalezena %d" -#: gio/gdbusmessage.c:2285 gio/gdbusmessage.c:2883 +#: gio/gdbusmessage.c:2288 gio/gdbusmessage.c:2886 msgid "Signature header found but is not of type signature" msgstr "Byla nalezena hlavička podpisu, ale není typu podpis" -#: gio/gdbusmessage.c:2297 +#: gio/gdbusmessage.c:2300 #, c-format msgid "Signature header with signature “%s” found but message body is empty" msgstr "" "Byla nalezena hlavička podpisu s podpisem „%s“, ale tělo zprávy je prázdné" -#: gio/gdbusmessage.c:2312 +#: gio/gdbusmessage.c:2315 #, c-format msgid "Parsed value “%s” is not a valid D-Bus signature (for body)" msgstr "Analyzovaná hodnota „%s“ není platným podpisem D-Bus (pro tělo)" -#: gio/gdbusmessage.c:2344 +#: gio/gdbusmessage.c:2347 #, 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" @@ -906,11 +910,11 @@ msgstr1 "Ve zprávě není hlavička s podpisem, ale tělo zprávy má %u bajty" msgstr2 "Ve zprávě není hlavička s podpisem, ale tělo zprávy má %u bajtů" -#: gio/gdbusmessage.c:2354 +#: gio/gdbusmessage.c:2357 msgid "Cannot deserialize message: " msgstr "Nelze zrušit serializaci zprávy: " -#: gio/gdbusmessage.c:2700 +#: gio/gdbusmessage.c:2703 #, c-format msgid "" "Error serializing GVariant with type string “%s” to the D-Bus wire format" @@ -918,40 +922,40 @@ "Chyba při serializaci GVariant s řetězcem typu „%s“ do přenosového formátu D-" "Bus" -#: gio/gdbusmessage.c:2837 +#: gio/gdbusmessage.c:2840 #, c-format msgid "" "Number of file descriptors in message (%d) differs from header field (%d)" msgstr "" "Počet popisovačů souborů ve zprávě (%d) se liší od pole v hlavičce (%d)" -#: gio/gdbusmessage.c:2845 +#: gio/gdbusmessage.c:2848 msgid "Cannot serialize message: " msgstr "Nelze serializovat zprávu: " -#: gio/gdbusmessage.c:2898 +#: gio/gdbusmessage.c:2901 #, c-format msgid "Message body has signature “%s” but there is no signature header" msgstr "Tělo zprávy má podpis „%s“, ale záhlaví s podpisem neexistuje" -#: gio/gdbusmessage.c:2908 +#: gio/gdbusmessage.c:2911 #, c-format msgid "" "Message body has type signature “%s” but signature in the header field is " "“%s”" msgstr "Tělo zprávy má podpis typu „%s“, ale podpis v poli se záhlavím je „%s“" -#: gio/gdbusmessage.c:2924 +#: gio/gdbusmessage.c:2927 #, c-format msgid "Message body is empty but signature in the header field is “(%s)”" msgstr "Tělo zprávy je prázdné, ale podpis v poli se záhlavím je „(%s)“" -#: gio/gdbusmessage.c:3479 +#: gio/gdbusmessage.c:3482 #, c-format msgid "Error return with body of type “%s”" msgstr "Navrácena chyba s tělem typu „%s“" -#: gio/gdbusmessage.c:3487 +#: gio/gdbusmessage.c:3490 msgid "Error return with empty body" msgstr "Navrácena chyba s prázdným tělem" @@ -976,17 +980,17 @@ msgid "Unable to load %s or %s: " msgstr "Nelze načíst %s: %s" -#: gio/gdbusproxy.c:1575 +#: gio/gdbusproxy.c:1568 #, c-format msgid "Error calling StartServiceByName for %s: " msgstr "Chyba při volání StartServiceByName pro %s: " -#: gio/gdbusproxy.c:1598 +#: gio/gdbusproxy.c:1591 #, c-format msgid "Unexpected reply %d from StartServiceByName(\"%s\") method" msgstr "Neočekávaná odpověď %d od metody StartServiceByName(„%s“)" -#: gio/gdbusproxy.c:2709 gio/gdbusproxy.c:2844 +#: gio/gdbusproxy.c:2702 gio/gdbusproxy.c:2837 #, c-format msgid "" "Cannot invoke method; proxy is for the well-known name %s without an owner, " @@ -995,25 +999,25 @@ "Metodu nelze vyvolat; proxy je na dobře známý název %s bez vlastníka a proxy " "byla vytvořena s příznakem G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START" -#: gio/gdbusserver.c:765 +#: gio/gdbusserver.c:758 msgid "Abstract namespace not supported" msgstr "Abstraktní jmenný prostor není podporován" -#: gio/gdbusserver.c:857 +#: gio/gdbusserver.c:850 msgid "Cannot specify nonce file when creating a server" msgstr "Při vytváření serveru nelze určit soubor nonce" -#: gio/gdbusserver.c:939 +#: gio/gdbusserver.c:932 #, c-format msgid "Error writing nonce file at “%s”: %s" msgstr "Chyba při zápisu souboru nonce na „%s“: %s" -#: gio/gdbusserver.c:1114 +#: gio/gdbusserver.c:1107 #, c-format msgid "The string “%s” is not a valid D-Bus GUID" msgstr "Řetězec „%s“ není platné D-Bus GUID" -#: gio/gdbusserver.c:1152 +#: gio/gdbusserver.c:1145 #, c-format msgid "Cannot listen on unsupported transport “%s”" msgstr "Nelze naslouchat na nepodporovaném přenosu „%s“" @@ -1041,14 +1045,14 @@ "\n" "Nápovědu k jednotlivým příkazům získáte použitím „%s PŘÍKAZ --help“.\n" -#: gio/gdbus-tool.c:204 gio/gdbus-tool.c:276 gio/gdbus-tool.c:348 -#: gio/gdbus-tool.c:372 gio/gdbus-tool.c:862 gio/gdbus-tool.c:1247 -#: gio/gdbus-tool.c:1734 +#: gio/gdbus-tool.c:204 gio/gdbus-tool.c:276 gio/gdbus-tool.c:347 +#: gio/gdbus-tool.c:371 gio/gdbus-tool.c:861 gio/gdbus-tool.c:1246 +#: gio/gdbus-tool.c:1733 #, c-format msgid "Error: %s\n" msgstr "Chyba: %s\n" -#: gio/gdbus-tool.c:215 gio/gdbus-tool.c:289 gio/gdbus-tool.c:1750 +#: gio/gdbus-tool.c:215 gio/gdbus-tool.c:289 gio/gdbus-tool.c:1749 #, c-format msgid "Error parsing introspection XML: %s\n" msgstr "Chyba při analýze introspection XML: %s\n" @@ -1058,49 +1062,49 @@ msgid "Error: %s is not a valid name\n" msgstr "Chyba: %s není platným názvem\n" -#: gio/gdbus-tool.c:258 gio/gdbus-tool.c:748 gio/gdbus-tool.c:1066 -#: gio/gdbus-tool.c:1900 gio/gdbus-tool.c:2140 +#: gio/gdbus-tool.c:258 gio/gdbus-tool.c:747 gio/gdbus-tool.c:1065 +#: gio/gdbus-tool.c:1899 gio/gdbus-tool.c:2139 #, c-format msgid "Error: %s is not a valid object path\n" msgstr "Chyba: %s není platnou cestou objektu\n" -#: gio/gdbus-tool.c:406 +#: gio/gdbus-tool.c:405 msgid "Connect to the system bus" msgstr "Připojit k systémové sběrnici" -#: gio/gdbus-tool.c:407 +#: gio/gdbus-tool.c:406 msgid "Connect to the session bus" msgstr "Připojit ke sběrnici sezení" -#: gio/gdbus-tool.c:408 +#: gio/gdbus-tool.c:407 msgid "Connect to given D-Bus address" msgstr "Připojit k dané adrese D-Bus" -#: gio/gdbus-tool.c:418 +#: gio/gdbus-tool.c:417 msgid "Connection Endpoint Options:" msgstr "Volby koncového bodu spojení:" -#: gio/gdbus-tool.c:419 +#: gio/gdbus-tool.c:418 msgid "Options specifying the connection endpoint" msgstr "Volby určující koncový bod spojení" -#: gio/gdbus-tool.c:442 +#: gio/gdbus-tool.c:441 #, c-format msgid "No connection endpoint specified" msgstr "Neurčen žádný koncový bod spojení" -#: gio/gdbus-tool.c:452 +#: gio/gdbus-tool.c:451 #, c-format msgid "Multiple connection endpoints specified" msgstr "Určeno více koncových bodů spojení" -#: gio/gdbus-tool.c:525 +#: gio/gdbus-tool.c:524 #, c-format msgid "" "Warning: According to introspection data, interface “%s” does not exist\n" msgstr "Varování: Podle introspektivních dat rozhraní „%s“ neexistuje\n" -#: gio/gdbus-tool.c:534 +#: gio/gdbus-tool.c:533 #, c-format msgid "" "Warning: According to introspection data, method “%s” does not exist on " @@ -1109,166 +1113,166 @@ "Varování: Podle introspektivních dat metoda „%s“ neexistuje na rozhraní " "„%s“\n" -#: gio/gdbus-tool.c:596 +#: gio/gdbus-tool.c:595 msgid "Optional destination for signal (unique name)" msgstr "Volitelný cíl signálu (jedinečný název)" -#: gio/gdbus-tool.c:597 +#: gio/gdbus-tool.c:596 msgid "Object path to emit signal on" msgstr "Cesta objektu, na kterou se má vyslat signál" -#: gio/gdbus-tool.c:598 +#: gio/gdbus-tool.c:597 msgid "Signal and interface name" msgstr "Název signálu a rozhraní" -#: gio/gdbus-tool.c:631 +#: gio/gdbus-tool.c:630 msgid "Emit a signal." msgstr "Vyslat signál." -#: gio/gdbus-tool.c:686 gio/gdbus-tool.c:1003 gio/gdbus-tool.c:1837 -#: gio/gdbus-tool.c:2069 gio/gdbus-tool.c:2289 +#: gio/gdbus-tool.c:685 gio/gdbus-tool.c:1002 gio/gdbus-tool.c:1836 +#: gio/gdbus-tool.c:2068 gio/gdbus-tool.c:2288 #, c-format msgid "Error connecting: %s\n" msgstr "Chyba při spojení: %s\n" -#: gio/gdbus-tool.c:706 +#: gio/gdbus-tool.c:705 #, c-format msgid "Error: %s is not a valid unique bus name.\n" msgstr "Chyba: %s není platným jedinečným názvem sběrnice.\n" -#: gio/gdbus-tool.c:725 gio/gdbus-tool.c:1046 gio/gdbus-tool.c:1880 +#: gio/gdbus-tool.c:724 gio/gdbus-tool.c:1045 gio/gdbus-tool.c:1879 msgid "Error: Object path is not specified\n" msgstr "Chyba: Není určena žádná cesta k objektu\n" -#: gio/gdbus-tool.c:768 +#: gio/gdbus-tool.c:767 msgid "Error: Signal name is not specified\n" msgstr "Chyba: Není určen název signálu\n" -#: gio/gdbus-tool.c:782 +#: gio/gdbus-tool.c:781 #, c-format msgid "Error: Signal name “%s” is invalid\n" msgstr "Chyba: Název signálu „%s“ je neplatný\n" -#: gio/gdbus-tool.c:794 +#: gio/gdbus-tool.c:793 #, c-format msgid "Error: %s is not a valid interface name\n" msgstr "Chyba: %s není platným názvem rozhraní\n" -#: gio/gdbus-tool.c:800 +#: gio/gdbus-tool.c:799 #, c-format msgid "Error: %s is not a valid member name\n" msgstr "Chyba: %s není platným názvem členu\n" #. Use the original non-"parse-me-harder" error -#: gio/gdbus-tool.c:837 gio/gdbus-tool.c:1178 +#: gio/gdbus-tool.c:836 gio/gdbus-tool.c:1177 #, c-format msgid "Error parsing parameter %d: %s\n" msgstr "Chyba při analyzování parametru %d: %s\n" -#: gio/gdbus-tool.c:869 +#: gio/gdbus-tool.c:868 #, c-format msgid "Error flushing connection: %s\n" msgstr "Chyba při vyprazdňování spojení: %s\n" -#: gio/gdbus-tool.c:897 +#: gio/gdbus-tool.c:896 msgid "Destination name to invoke method on" msgstr "Název cíle, u kterého se má spustit metoda" -#: gio/gdbus-tool.c:898 +#: gio/gdbus-tool.c:897 msgid "Object path to invoke method on" msgstr "Cesta objektu, u kterého se má spustit metoda" -#: gio/gdbus-tool.c:899 +#: gio/gdbus-tool.c:898 msgid "Method and interface name" msgstr "Název metody a rozhraní" -#: gio/gdbus-tool.c:900 +#: gio/gdbus-tool.c:899 msgid "Timeout in seconds" msgstr "Časový limit v sekundách" -#: gio/gdbus-tool.c:901 +#: gio/gdbus-tool.c:900 msgid "Allow interactive authorization" msgstr "Povolit interaktivní autorizaci" -#: gio/gdbus-tool.c:948 +#: gio/gdbus-tool.c:947 msgid "Invoke a method on a remote object." msgstr "Spustit metodu na vzdáleném objektu." -#: gio/gdbus-tool.c:1020 gio/gdbus-tool.c:1854 gio/gdbus-tool.c:2094 +#: gio/gdbus-tool.c:1019 gio/gdbus-tool.c:1853 gio/gdbus-tool.c:2093 msgid "Error: Destination is not specified\n" msgstr "Chyba: Není určen žádný cíl\n" -#: gio/gdbus-tool.c:1031 gio/gdbus-tool.c:1871 gio/gdbus-tool.c:2105 +#: gio/gdbus-tool.c:1030 gio/gdbus-tool.c:1870 gio/gdbus-tool.c:2104 #, c-format msgid "Error: %s is not a valid bus name\n" msgstr "Chyba: %s není platným názvem sběrnice\n" -#: gio/gdbus-tool.c:1081 +#: gio/gdbus-tool.c:1080 msgid "Error: Method name is not specified\n" msgstr "Chyba: Není určen název metody\n" -#: gio/gdbus-tool.c:1092 +#: gio/gdbus-tool.c:1091 #, c-format msgid "Error: Method name “%s” is invalid\n" msgstr "Chyba: Název metody „%s“ je neplatný\n" -#: gio/gdbus-tool.c:1170 +#: gio/gdbus-tool.c:1169 #, c-format msgid "Error parsing parameter %d of type “%s”: %s\n" msgstr "Chyba při analyzování parametru %d typu „%s“: %s\n" -#: gio/gdbus-tool.c:1196 +#: gio/gdbus-tool.c:1195 #, c-format msgid "Error adding handle %d: %s\n" msgstr "Chyba při přidávání obsluhy %d: %s\n" -#: gio/gdbus-tool.c:1696 +#: gio/gdbus-tool.c:1695 msgid "Destination name to introspect" msgstr "Název cíle, u kterého provést introspection" -#: gio/gdbus-tool.c:1697 +#: gio/gdbus-tool.c:1696 msgid "Object path to introspect" msgstr "Cesta objektu, u které provést introspection" -#: gio/gdbus-tool.c:1698 +#: gio/gdbus-tool.c:1697 msgid "Print XML" msgstr "Vypsat XML" -#: gio/gdbus-tool.c:1699 +#: gio/gdbus-tool.c:1698 msgid "Introspect children" msgstr "Provést introspection potomka" -#: gio/gdbus-tool.c:1700 +#: gio/gdbus-tool.c:1699 msgid "Only print properties" msgstr "Vypsat pouze vlastnosti" -#: gio/gdbus-tool.c:1789 +#: gio/gdbus-tool.c:1788 msgid "Introspect a remote object." msgstr "Provést introspection vzdáleného objektu." -#: gio/gdbus-tool.c:1995 +#: gio/gdbus-tool.c:1994 msgid "Destination name to monitor" msgstr "Název cíle určený ke sledování" -#: gio/gdbus-tool.c:1996 +#: gio/gdbus-tool.c:1995 msgid "Object path to monitor" msgstr "Cesta objektu určená ke sledování" -#: gio/gdbus-tool.c:2021 +#: gio/gdbus-tool.c:2020 msgid "Monitor a remote object." msgstr "Sledovat vzdálený objekt." -#: gio/gdbus-tool.c:2079 +#: gio/gdbus-tool.c:2078 msgid "Error: can’t monitor a non-message-bus connection\n" msgstr "Chyba: nelze monitorovat připojení na sběrnici bez zpráv\n" -#: gio/gdbus-tool.c:2203 +#: gio/gdbus-tool.c:2202 msgid "Service to activate before waiting for the other one (well-known name)" msgstr "" "Služba, která se má aktivovat před čekáním na jinou službu (oficiálně známý " "název)" -#: gio/gdbus-tool.c:2206 +#: gio/gdbus-tool.c:2205 msgid "" "Timeout to wait for before exiting with an error (seconds); 0 for no timeout " "(default)" @@ -1276,27 +1280,27 @@ "Časové omezení čekaní, po kterém se skončí s chybou (v sekundách). 0 znamená " "bez omezení (výchozí)" -#: gio/gdbus-tool.c:2254 +#: gio/gdbus-tool.c:2253 msgid "OPTION… BUS-NAME" msgstr "PŘEPÍNAČ… NÁZEV-SBĚRNICE" -#: gio/gdbus-tool.c:2255 +#: gio/gdbus-tool.c:2254 msgid "Wait for a bus name to appear." msgstr "Čekat, než se objeví název sběrnice." -#: gio/gdbus-tool.c:2331 +#: gio/gdbus-tool.c:2330 msgid "Error: A service to activate for must be specified.\n" msgstr "Chyba: Musí být určena služba, pro kterou provádíte aktivaci.\n" -#: gio/gdbus-tool.c:2336 +#: gio/gdbus-tool.c:2335 msgid "Error: A service to wait for must be specified.\n" msgstr "Chyba: Musí být určena služba, na kterou čekáte.\n" -#: gio/gdbus-tool.c:2341 +#: gio/gdbus-tool.c:2340 msgid "Error: Too many arguments.\n" msgstr "Chyba: Příliš mnoho argumentů.\n" -#: gio/gdbus-tool.c:2349 gio/gdbus-tool.c:2356 +#: gio/gdbus-tool.c:2348 gio/gdbus-tool.c:2355 #, c-format msgid "Error: %s is not a valid well-known bus name.\n" msgstr "Chyba: %s není platným oficiálně známým názvem sběrnice.\n" @@ -1306,38 +1310,43 @@ msgid "Not authorized to change debug settings" msgstr "Neautorizováno ke změnám ladicích nastavení" -#: gio/gdesktopappinfo.c:2182 gio/gdesktopappinfo.c:5113 +#: gio/gdesktopappinfo.c:2242 gio/gdesktopappinfo.c:5223 msgid "Unnamed" msgstr "Bez názvu" -#: gio/gdesktopappinfo.c:2592 +#: gio/gdesktopappinfo.c:2652 msgid "Desktop file didn’t specify Exec field" msgstr "V souboru .desktop není určeno pole Exec" -#: gio/gdesktopappinfo.c:2891 +#: gio/gdesktopappinfo.c:2942 msgid "Unable to find terminal required for application" msgstr "Nezdařilo se najít terminál vyžadovaný pro aplikaci" -#: gio/gdesktopappinfo.c:3631 +#: gio/gdesktopappinfo.c:3002 +#, c-format +msgid "Program ‘%s’ not found in $PATH" +msgstr "Program „%s“ nebyl nalezent v cestách podle $PATH" + +#: gio/gdesktopappinfo.c:3735 #, c-format msgid "Can’t create user application configuration folder %s: %s" msgstr "Nezdařilo se vytvořit složku %s s uživatelským nastavením aplikace: %s" -#: gio/gdesktopappinfo.c:3635 +#: gio/gdesktopappinfo.c:3739 #, c-format msgid "Can’t create user MIME configuration folder %s: %s" msgstr "Nezdařilo se vytvořit složku %s s uživatelským nastavením MIME: %s" -#: gio/gdesktopappinfo.c:3877 gio/gdesktopappinfo.c:3901 +#: gio/gdesktopappinfo.c:3981 gio/gdesktopappinfo.c:4005 msgid "Application information lacks an identifier" msgstr "Informace o aplikaci postrádá identifikátor" -#: gio/gdesktopappinfo.c:4137 +#: gio/gdesktopappinfo.c:4241 #, c-format msgid "Can’t create user desktop file %s" msgstr "Nezdařilo se vytvořit uživatelský soubor .desktop %s" -#: gio/gdesktopappinfo.c:4273 +#: gio/gdesktopappinfo.c:4377 #, c-format msgid "Custom definition for %s" msgstr "Vlastní definice %s" @@ -1410,7 +1419,7 @@ msgid "Containing mount does not exist" msgstr "Obsahující připojené neexistuje" -#: gio/gfile.c:2641 gio/glocalfile.c:2500 +#: gio/gfile.c:2641 gio/glocalfile.c:2511 msgid "Can’t copy over directory" msgstr "Nelze kopírovat nad složku" @@ -1456,7 +1465,7 @@ msgid "Invalid symlink value given" msgstr "Zadaný symbolický odkaz je neplatný" -#: gio/gfile.c:4163 glib/gfileutils.c:2335 +#: gio/gfile.c:4163 glib/gfileutils.c:2392 msgid "Symbolic links not supported" msgstr "Symbolické odkazy nejsou podporovány" @@ -1557,37 +1566,37 @@ msgid "HTTP proxy server closed connection unexpectedly." msgstr "Server HTTP proxy neočekávaně ukončil spojení." -#: gio/gicon.c:300 +#: gio/gicon.c:299 #, c-format msgid "Wrong number of tokens (%d)" msgstr "Chybný počet tokenů (%d)" -#: gio/gicon.c:320 +#: gio/gicon.c:319 #, c-format msgid "No type for class name %s" msgstr "Název třídy %s nemá typ" -#: gio/gicon.c:330 +#: gio/gicon.c:329 #, c-format msgid "Type %s does not implement the GIcon interface" msgstr "Typ %s neimplementuje rozhraní GIcon" -#: gio/gicon.c:341 +#: gio/gicon.c:340 #, c-format msgid "Type %s is not classed" msgstr "Typ %s není mezi třídami" -#: gio/gicon.c:355 +#: gio/gicon.c:354 #, c-format msgid "Malformed version number: %s" msgstr "Chybné číslo verze: %s" -#: gio/gicon.c:369 +#: gio/gicon.c:368 #, c-format msgid "Type %s does not implement from_tokens() on the GIcon interface" msgstr "Typ %s neimplementuje from_tokens() v rozhraní GIcon" -#: gio/gicon.c:471 +#: gio/gicon.c:470 msgid "Can’t handle the supplied version of the icon encoding" msgstr "Nelze zpracovat poskytnutou verzi kódování ikony" @@ -1737,7 +1746,7 @@ #: gio/gio-tool-cat.c:135 gio/gio-tool-info.c:379 gio/gio-tool-list.c:173 #: gio/gio-tool-mkdir.c:50 gio/gio-tool-monitor.c:39 gio/gio-tool-monitor.c:41 #: gio/gio-tool-monitor.c:43 gio/gio-tool-monitor.c:45 -#: gio/gio-tool-monitor.c:206 gio/gio-tool-mount.c:1202 gio/gio-tool-open.c:72 +#: gio/gio-tool-monitor.c:206 gio/gio-tool-mount.c:1210 gio/gio-tool-open.c:72 #: gio/gio-tool-remove.c:50 gio/gio-tool-rename.c:47 gio/gio-tool-set.c:95 #: gio/gio-tool-trash.c:222 gio/gio-tool-tree.c:241 msgid "LOCATION" @@ -1758,7 +1767,7 @@ "použít něco jako smb://server/cesta/soubor.txt" #: gio/gio-tool-cat.c:164 gio/gio-tool-info.c:410 gio/gio-tool-mkdir.c:78 -#: gio/gio-tool-monitor.c:231 gio/gio-tool-mount.c:1253 gio/gio-tool-open.c:98 +#: gio/gio-tool-monitor.c:231 gio/gio-tool-mount.c:1261 gio/gio-tool-open.c:98 #: gio/gio-tool-remove.c:74 gio/gio-tool-trash.c:303 msgid "No locations given" msgstr "Nebylo zadáno žádné umístění" @@ -2169,19 +2178,19 @@ msgid "Mount a TCRYPT system volume" msgstr "Připojit systémový svazek TCRYPT" -#: gio/gio-tool-mount.c:268 gio/gio-tool-mount.c:300 +#: gio/gio-tool-mount.c:276 gio/gio-tool-mount.c:308 msgid "Anonymous access denied" msgstr "Anonymní přístup byl zamítnut" -#: gio/gio-tool-mount.c:525 +#: gio/gio-tool-mount.c:533 msgid "No drive for device file" msgstr "Pro soubor zařízení není žádné médium" -#: gio/gio-tool-mount.c:1017 +#: gio/gio-tool-mount.c:1025 msgid "No volume for given ID" msgstr "Pro dané ID není žádný svazek" -#: gio/gio-tool-mount.c:1206 +#: gio/gio-tool-mount.c:1214 msgid "Mount or unmount the locations." msgstr "Připojit nebo odpojit umístění." @@ -2385,7 +2394,7 @@ msgid "List contents of directories in a tree-like format." msgstr "Vypsat obsah složek v podobě stromu." -#: gio/glib-compile-resources.c:142 gio/glib-compile-schemas.c:1516 +#: gio/glib-compile-resources.c:142 gio/glib-compile-schemas.c:1513 #, c-format msgid "Element <%s> not allowed inside <%s>" msgstr "Prvek <%s> není povolen uvnitř <%s>" @@ -2442,7 +2451,7 @@ msgid "text may not appear inside <%s>" msgstr "text nemůže být umístěn uvnitř <%s>" -#: gio/glib-compile-resources.c:821 gio/glib-compile-schemas.c:2174 +#: gio/glib-compile-resources.c:821 gio/glib-compile-schemas.c:2171 msgid "Show program version and exit" msgstr "Zobrazit verzi programu a skončit" @@ -2458,8 +2467,8 @@ "Složka, ze které mají být čteny soubory odkazované v SOUBOR (výchozí je " "aktuální složka)" -#: gio/glib-compile-resources.c:823 gio/glib-compile-schemas.c:2175 -#: gio/glib-compile-schemas.c:2204 +#: gio/glib-compile-resources.c:823 gio/glib-compile-schemas.c:2172 +#: gio/glib-compile-schemas.c:2201 msgid "DIRECTORY" msgstr "SLOŽKA" @@ -2682,16 +2691,16 @@ msgid "<aliases> must contain at least one <alias>" msgstr "<aliases> musí nejméně jedenkrát obsahovat <alias>" -#: gio/glib-compile-schemas.c:799 +#: gio/glib-compile-schemas.c:796 msgid "Empty names are not permitted" msgstr "Prázdné názvy nejsou povoleny" -#: gio/glib-compile-schemas.c:809 +#: gio/glib-compile-schemas.c:806 #, c-format msgid "Invalid name “%s”: names must begin with a lowercase letter" msgstr "Neplatný název „%s“: názvy musí začínat malým písmenem" -#: gio/glib-compile-schemas.c:821 +#: gio/glib-compile-schemas.c:818 #, c-format msgid "" "Invalid name “%s”: invalid character “%c”; only lowercase letters, numbers " @@ -2700,37 +2709,37 @@ "Neplatný název „%s“: neplatný znak „%c“; pouze malá písmena, číslice a " "pomlčka („-“) jsou povoleny." -#: gio/glib-compile-schemas.c:830 +#: gio/glib-compile-schemas.c:827 #, c-format msgid "Invalid name “%s”: two successive hyphens (“--”) are not permitted" msgstr "" "Neplatný název „%s“: dvě po sobě následující pomlčky („--“) nejsou povoleny." -#: gio/glib-compile-schemas.c:839 +#: gio/glib-compile-schemas.c:836 #, c-format msgid "Invalid name “%s”: the last character may not be a hyphen (“-”)" msgstr "Neplatný název „%s“: posledním znakem nemůže být pomlčka („-“)." -#: gio/glib-compile-schemas.c:847 +#: gio/glib-compile-schemas.c:844 #, c-format msgid "Invalid name “%s”: maximum length is 1024" msgstr "Neplatný název „%s“: maximální délka je 1024" -#: gio/glib-compile-schemas.c:919 +#: gio/glib-compile-schemas.c:916 #, c-format msgid "<child name='%s'> already specified" msgstr "<child name='%s'> již bylo určeno" -#: gio/glib-compile-schemas.c:945 +#: gio/glib-compile-schemas.c:942 msgid "Cannot add keys to a “list-of” schema" msgstr "Ke schématu „list-of“ nelze přidat klíče" -#: gio/glib-compile-schemas.c:956 +#: gio/glib-compile-schemas.c:953 #, c-format msgid "<key name='%s'> already specified" msgstr "<key name='%s'> již bylo určeno" -#: gio/glib-compile-schemas.c:974 +#: gio/glib-compile-schemas.c:971 #, c-format msgid "" "<key name='%s'> shadows <key name='%s'> in <schema id='%s'>; use <override> " @@ -2739,7 +2748,7 @@ "<key name='%s'> má přednost před <key name='%s'> v <schema id='%s'>; " "použijte <override> ke změně hodnoty" -#: gio/glib-compile-schemas.c:985 +#: gio/glib-compile-schemas.c:982 #, c-format msgid "" "Exactly one of “type”, “enum” or “flags” must be specified as an attribute " @@ -2748,63 +2757,63 @@ "Právě jeden z „type“, „enum“ nebo „flags“ musí být vybrán jako atribut ke " "klíči <key>" -#: gio/glib-compile-schemas.c:1004 +#: gio/glib-compile-schemas.c:1001 #, c-format msgid "<%s id='%s'> not (yet) defined." msgstr "<%s id='%s'> (zatím) nebylo určeno." -#: gio/glib-compile-schemas.c:1019 +#: gio/glib-compile-schemas.c:1016 #, c-format msgid "Invalid GVariant type string “%s”" msgstr "Neplatný řetězec typu GVariant „%s“" -#: gio/glib-compile-schemas.c:1049 +#: gio/glib-compile-schemas.c:1046 msgid "<override> given but schema isn’t extending anything" msgstr "Zadáno <override>, ale schéma nic nerozšiřuje" -#: gio/glib-compile-schemas.c:1062 +#: gio/glib-compile-schemas.c:1059 #, c-format msgid "No <key name='%s'> to override" msgstr "Neexistuje žádné <key name='%s'> k přepsání" -#: gio/glib-compile-schemas.c:1070 +#: gio/glib-compile-schemas.c:1067 #, c-format msgid "<override name='%s'> already specified" msgstr "<override name='%s'> již bylo určeno" -#: gio/glib-compile-schemas.c:1143 +#: gio/glib-compile-schemas.c:1140 #, c-format msgid "<schema id='%s'> already specified" msgstr "<schema id='%s'> již bylo určeno" -#: gio/glib-compile-schemas.c:1155 +#: gio/glib-compile-schemas.c:1152 #, c-format msgid "<schema id='%s'> extends not yet existing schema “%s”" msgstr "<schema id='%s'> rozšiřuje zatím neexistující schéma „%s“" -#: gio/glib-compile-schemas.c:1171 +#: gio/glib-compile-schemas.c:1168 #, c-format msgid "<schema id='%s'> is list of not yet existing schema “%s”" msgstr "<schema id='%s'> je seznamem zatím neexistujícího schématu „%s“" -#: gio/glib-compile-schemas.c:1179 +#: gio/glib-compile-schemas.c:1176 #, c-format msgid "Cannot be a list of a schema with a path" msgstr "Nemůže být seznamem schématu s cestou" -#: gio/glib-compile-schemas.c:1189 +#: gio/glib-compile-schemas.c:1186 #, c-format msgid "Cannot extend a schema with a path" msgstr "Nemůže rozšířit schéma s cestou" -#: gio/glib-compile-schemas.c:1199 +#: gio/glib-compile-schemas.c:1196 #, c-format msgid "" "<schema id='%s'> is a list, extending <schema id='%s'> which is not a list" msgstr "" "<schema id='%s'> je seznam rozšiřující <schema id='%s'>, což není seznam" -#: gio/glib-compile-schemas.c:1209 +#: gio/glib-compile-schemas.c:1206 #, c-format msgid "" "<schema id='%s' list-of='%s'> extends <schema id='%s' list-of='%s'> but “%s” " @@ -2813,17 +2822,17 @@ "<schema id='%s' list-of='%s'> rozšiřuje <schema id='%s' list-of='%s'>, ale " "„%s“ nerozšiřuje „%s“" -#: gio/glib-compile-schemas.c:1226 +#: gio/glib-compile-schemas.c:1223 #, c-format msgid "A path, if given, must begin and end with a slash" msgstr "Cesta, je-li zadána, musí začínat a končit lomítkem" -#: gio/glib-compile-schemas.c:1233 +#: gio/glib-compile-schemas.c:1230 #, c-format msgid "The path of a list must end with “:/”" msgstr "Cesta seznamu musí končit „:/“" -#: gio/glib-compile-schemas.c:1242 +#: gio/glib-compile-schemas.c:1239 #, c-format msgid "" "Warning: Schema “%s” has path “%s”. Paths starting with “/apps/”, “/" @@ -2832,49 +2841,49 @@ "Varování: Schéma „%s“ má cestu „%s“. Cesty začínající „/apps/“, „/desktop/“ " "nebo „/system/“ jsou zavržené." -#: gio/glib-compile-schemas.c:1272 +#: gio/glib-compile-schemas.c:1269 #, c-format msgid "<%s id='%s'> already specified" msgstr "<%s id='%s'> již bylo určeno" -#: gio/glib-compile-schemas.c:1422 gio/glib-compile-schemas.c:1438 +#: gio/glib-compile-schemas.c:1419 gio/glib-compile-schemas.c:1435 #, c-format msgid "Only one <%s> element allowed inside <%s>" msgstr "Uvnitř <%2$s> je povolen jen jeden prvek <%1$s>" -#: gio/glib-compile-schemas.c:1520 +#: gio/glib-compile-schemas.c:1517 #, c-format msgid "Element <%s> not allowed at the top level" msgstr "Prvek <%s> není povolen na nejvyšší úrovni" -#: gio/glib-compile-schemas.c:1538 +#: gio/glib-compile-schemas.c:1535 msgid "Element <default> is required in <key>" msgstr "V prvku <key> je vyžadován prvek <default>" -#: gio/glib-compile-schemas.c:1628 +#: gio/glib-compile-schemas.c:1625 #, c-format msgid "Text may not appear inside <%s>" msgstr "Text nemůže být umístěn uvnitř <%s>" -#: gio/glib-compile-schemas.c:1696 +#: gio/glib-compile-schemas.c:1693 #, c-format msgid "Warning: undefined reference to <schema id='%s'/>" msgstr "Varování: nedefinovaný odkaz na <schema id='%s'/>" #. Translators: Do not translate "--strict". -#: gio/glib-compile-schemas.c:1835 gio/glib-compile-schemas.c:1914 +#: gio/glib-compile-schemas.c:1832 gio/glib-compile-schemas.c:1911 msgid "--strict was specified; exiting." msgstr "Bylo zadáno --strict; ukončuje se." -#: gio/glib-compile-schemas.c:1847 +#: gio/glib-compile-schemas.c:1844 msgid "This entire file has been ignored." msgstr "Celý tento soubor byl ignorován." -#: gio/glib-compile-schemas.c:1910 +#: gio/glib-compile-schemas.c:1907 msgid "Ignoring this file." msgstr "Tento soubor se ignoruje." -#: gio/glib-compile-schemas.c:1965 +#: gio/glib-compile-schemas.c:1962 #, c-format msgid "" "No such key “%s” in schema “%s” as specified in override file “%s”; ignoring " @@ -2883,7 +2892,7 @@ "Klíč „%s“ neexistuje ve schématu „%s“, jak bylo určeno v přepisovacím " "souboru „%s“; přepisování bude pro tento klíč ignorováno." -#: gio/glib-compile-schemas.c:1973 +#: gio/glib-compile-schemas.c:1970 #, c-format msgid "" "No such key “%s” in schema “%s” as specified in override file “%s” and --" @@ -2892,7 +2901,7 @@ "Klíč „%s“ neexistuje ve schématu „%s“, jak bylo určeno v přepisovacím " "souboru „%s“, a přitom bylo zadáno --strict; ukončuje se." -#: gio/glib-compile-schemas.c:1995 +#: gio/glib-compile-schemas.c:1992 #, c-format msgid "" "Cannot provide per-desktop overrides for localized key “%s” in schema " @@ -2902,7 +2911,7 @@ "„%s“ ve schématu „%s“ (přepisovací soubor „%s“); přepisování bude pro tento " "klíč ignorováno." -#: gio/glib-compile-schemas.c:2004 +#: gio/glib-compile-schemas.c:2001 #, c-format msgid "" "Cannot provide per-desktop overrides for localized key “%s” in schema " @@ -2912,7 +2921,7 @@ "„%s“ ve schématu „%s“ (přepisovací soubor „%s“) a přitom bylo zadáno --" "strict; ukončuje se." -#: gio/glib-compile-schemas.c:2028 +#: gio/glib-compile-schemas.c:2025 #, c-format msgid "" "Error parsing key “%s” in schema “%s” as specified in override file “%s”: " @@ -2921,7 +2930,7 @@ "Chyba při zpracování klíče „%s“ ve schématu „%s“, jenž je uveden v " "přepisovacím souboru „%s“: %s. Přepisování bude pro tento klíč ignorováno." -#: gio/glib-compile-schemas.c:2040 +#: gio/glib-compile-schemas.c:2037 #, c-format msgid "" "Error parsing key “%s” in schema “%s” as specified in override file “%s”: " @@ -2930,7 +2939,7 @@ "Chyba při zpracování klíče „%s“ ve schématu „%s“, jenž je uveden v " "přepisovacím souboru „%s“: %s. Přitom bylo zadáno --strict; ukončuje se." -#: gio/glib-compile-schemas.c:2067 +#: gio/glib-compile-schemas.c:2064 #, c-format msgid "" "Override for key “%s” in schema “%s” in override file “%s” is outside the " @@ -2939,7 +2948,7 @@ "Přepis pro klíč „%s“ ve schématu „%s“ v přepisovacím souboru „%s“ je mimo " "rozsah zadaný ve schématu; přepisování bude pro tento klíč ignorováno." -#: gio/glib-compile-schemas.c:2077 +#: gio/glib-compile-schemas.c:2074 #, c-format msgid "" "Override for key “%s” in schema “%s” in override file “%s” is outside the " @@ -2948,7 +2957,7 @@ "Přepis pro klíč „%s“ ve schématu „%s“ v přepisovacím souboru „%s“ je mimo " "rozsah zadaný ve schématu a přitom bylo zadáno --strict; ukončuje se." -#: gio/glib-compile-schemas.c:2103 +#: gio/glib-compile-schemas.c:2100 #, c-format msgid "" "Override for key “%s” in schema “%s” in override file “%s” is not in the " @@ -2957,7 +2966,7 @@ "Přepis pro klíč „%s“ ve schématu „%s“ v přepisovacím souboru „%s“ není v " "seznamu platných možností; přepisování bude pro tento klíč ignorováno." -#: gio/glib-compile-schemas.c:2113 +#: gio/glib-compile-schemas.c:2110 #, c-format msgid "" "Override for key “%s” in schema “%s” in override file “%s” is not in the " @@ -2966,23 +2975,23 @@ "Přepis pro klíč „%s“ ve schématu „%s“ v přepisovacím souboru „%s“ není v " "seznamu platných možností a přitom bylo zadáno --strict; ukončuje se." -#: gio/glib-compile-schemas.c:2175 +#: gio/glib-compile-schemas.c:2172 msgid "Where to store the gschemas.compiled file" msgstr "Kam ukládat soubor gschemas.compiled" -#: gio/glib-compile-schemas.c:2176 +#: gio/glib-compile-schemas.c:2173 msgid "Abort on any errors in schemas" msgstr "Přerušit při libovolných chybách ve schématech" -#: gio/glib-compile-schemas.c:2177 +#: gio/glib-compile-schemas.c:2174 msgid "Do not write the gschema.compiled file" msgstr "Nezapisovat soubor gschema.compiled" -#: gio/glib-compile-schemas.c:2178 +#: gio/glib-compile-schemas.c:2175 msgid "Do not enforce key name restrictions" msgstr "Nevynucovat omezení názvů klíče" -#: gio/glib-compile-schemas.c:2207 +#: gio/glib-compile-schemas.c:2204 msgid "" "Compile all GSettings schema files into a schema cache.\n" "Schema files are required to have the extension .gschema.xml,\n" @@ -2992,15 +3001,15 @@ "Soubory schémat musí mít rozšíření .gschema.xml,\n" "a soubor mezipaměti se jmenuje gschemas.compiled." -#: gio/glib-compile-schemas.c:2228 +#: gio/glib-compile-schemas.c:2225 msgid "You should give exactly one directory name" msgstr "Měl by být zadán právě jeden název složky" -#: gio/glib-compile-schemas.c:2271 +#: gio/glib-compile-schemas.c:2268 msgid "No schema files found: doing nothing." msgstr "Žádné soubory schémat nenalezeny: nebude se nic dělat." -#: gio/glib-compile-schemas.c:2273 +#: gio/glib-compile-schemas.c:2270 msgid "No schema files found: removed existing output file." msgstr "" "Žádné soubory schémat nenalezeny: odstraněn existující výstupní soubor." @@ -3010,7 +3019,7 @@ msgid "Invalid filename %s" msgstr "Neplatný název souboru %s" -#: gio/glocalfile.c:996 +#: gio/glocalfile.c:1005 #, c-format msgid "Error getting filesystem info for %s: %s" msgstr "Chyba při získávání informace o souborovém systému pro %s: %s" @@ -3019,125 +3028,125 @@ #. * the enclosing (user visible) mount of a file, but none #. * exists. #. -#: gio/glocalfile.c:1137 +#: gio/glocalfile.c:1141 #, c-format msgid "Containing mount for file %s not found" msgstr "Přípojení obsahující soubor %s nebylo nalezen" -#: gio/glocalfile.c:1160 +#: gio/glocalfile.c:1164 msgid "Can’t rename root directory" msgstr "Nelze přejmenovat kořenovou složku" -#: gio/glocalfile.c:1178 gio/glocalfile.c:1201 +#: gio/glocalfile.c:1182 gio/glocalfile.c:1205 #, c-format msgid "Error renaming file %s: %s" msgstr "Chyba při přejmenovávání souboru %s: %s" -#: gio/glocalfile.c:1185 +#: gio/glocalfile.c:1189 msgid "Can’t rename file, filename already exists" msgstr "Soubor nelze přejmenovat, název souboru již existuje" -#: gio/glocalfile.c:1198 gio/glocalfile.c:2394 gio/glocalfile.c:2422 -#: gio/glocalfile.c:2561 gio/glocalfileoutputstream.c:658 +#: gio/glocalfile.c:1202 gio/glocalfile.c:2405 gio/glocalfile.c:2433 +#: gio/glocalfile.c:2572 gio/glocalfileoutputstream.c:658 msgid "Invalid filename" msgstr "Neplatný název souboru" -#: gio/glocalfile.c:1366 gio/glocalfile.c:1377 +#: gio/glocalfile.c:1370 gio/glocalfile.c:1381 #, c-format msgid "Error opening file %s: %s" msgstr "Chyba při otevírání souboru %s: %s" -#: gio/glocalfile.c:1502 +#: gio/glocalfile.c:1506 #, c-format msgid "Error removing file %s: %s" msgstr "Chyba při odstraňování souboru %s: %s" -#: gio/glocalfile.c:1996 gio/glocalfile.c:2007 gio/glocalfile.c:2034 +#: gio/glocalfile.c:2000 gio/glocalfile.c:2011 gio/glocalfile.c:2038 #, c-format msgid "Error trashing file %s: %s" msgstr "Chyba při zahazování souboru %s do koše: %s" -#: gio/glocalfile.c:2054 +#: gio/glocalfile.c:2058 #, c-format msgid "Unable to create trash directory %s: %s" msgstr "Nelze vytvořit složku koše %s: %s" -#: gio/glocalfile.c:2075 +#: gio/glocalfile.c:2079 #, c-format msgid "Unable to find toplevel directory to trash %s" msgstr "Nezdařilo se najít složku nejvyšší úrovně pro vyhození %s" -#: gio/glocalfile.c:2083 +#: gio/glocalfile.c:2087 #, c-format msgid "Trashing on system internal mounts is not supported" msgstr "" "Přesouvání do koše na svazku připojeném interně systémem není podporováno" -#: gio/glocalfile.c:2169 gio/glocalfile.c:2197 +#: gio/glocalfile.c:2173 gio/glocalfile.c:2201 #, c-format msgid "Unable to find or create trash directory %s to trash %s" msgstr "Nezdařilo se najít nebo vytvořit složku koše %s pro vyhození %s" -#: gio/glocalfile.c:2243 +#: gio/glocalfile.c:2245 #, c-format msgid "Unable to create trashing info file for %s: %s" msgstr "Nelze vytvořit informační soubor o koši pro %s: %s" -#: gio/glocalfile.c:2305 +#: gio/glocalfile.c:2316 #, c-format msgid "Unable to trash file %s across filesystem boundaries" msgstr "Nelze zahodit soubor %s do koše mimo hranice souborového systému" -#: gio/glocalfile.c:2309 gio/glocalfile.c:2365 +#: gio/glocalfile.c:2320 gio/glocalfile.c:2376 #, c-format msgid "Unable to trash file %s: %s" msgstr "Nelze zahodit soubor %s do koše: %s" -#: gio/glocalfile.c:2371 +#: gio/glocalfile.c:2382 #, c-format msgid "Unable to trash file %s" msgstr "Nelze zahodit soubor %s do koše" -#: gio/glocalfile.c:2397 +#: gio/glocalfile.c:2408 #, c-format msgid "Error creating directory %s: %s" msgstr "Chyba při vytváření složky %s: %s" -#: gio/glocalfile.c:2426 +#: gio/glocalfile.c:2437 #, c-format msgid "Filesystem does not support symbolic links" msgstr "Systém souborů nepodporuje symbolické odkazy" -#: gio/glocalfile.c:2429 +#: gio/glocalfile.c:2440 #, c-format msgid "Error making symbolic link %s: %s" msgstr "Chyba při vytváření symbolického odkazu %s: %s" -#: gio/glocalfile.c:2472 gio/glocalfile.c:2507 gio/glocalfile.c:2564 +#: gio/glocalfile.c:2483 gio/glocalfile.c:2518 gio/glocalfile.c:2575 #, c-format msgid "Error moving file %s: %s" msgstr "Chyba při přesunování souboru %s: %s" -#: gio/glocalfile.c:2495 +#: gio/glocalfile.c:2506 msgid "Can’t move directory over directory" msgstr "Složku nelze přesunout nad složku" -#: gio/glocalfile.c:2521 gio/glocalfileoutputstream.c:1110 +#: gio/glocalfile.c:2532 gio/glocalfileoutputstream.c:1110 #: gio/glocalfileoutputstream.c:1124 gio/glocalfileoutputstream.c:1139 #: gio/glocalfileoutputstream.c:1156 gio/glocalfileoutputstream.c:1170 msgid "Backup file creation failed" msgstr "Vytvoření záložního souboru selhalo" -#: gio/glocalfile.c:2540 +#: gio/glocalfile.c:2551 #, c-format msgid "Error removing target file: %s" msgstr "Chyba při odstraňování cílového souboru: %s" -#: gio/glocalfile.c:2554 +#: gio/glocalfile.c:2565 msgid "Move between mounts not supported" msgstr "Přesunování mezi připojeními není podporováno" -#: gio/glocalfile.c:2728 +#: gio/glocalfile.c:2741 #, c-format msgid "Could not determine the disk usage of %s: %s" msgstr "Nelze zjistit využití disku %s: %s" @@ -3159,117 +3168,117 @@ msgid "Error setting extended attribute “%s”: %s" msgstr "Chyba při nastavování rozšířeného atributu „%s“: %s" -#: gio/glocalfileinfo.c:1738 gio/win32/gwinhttpfile.c:191 +#: gio/glocalfileinfo.c:1819 gio/win32/gwinhttpfile.c:191 msgid " (invalid encoding)" msgstr " (neplatné kódování)" -#: gio/glocalfileinfo.c:1897 gio/glocalfileoutputstream.c:945 +#: gio/glocalfileinfo.c:1978 gio/glocalfileoutputstream.c:945 #: gio/glocalfileoutputstream.c:997 #, c-format msgid "Error when getting information for file “%s”: %s" msgstr "Chyba při získávání informací pro soubor „%s“: %s" -#: gio/glocalfileinfo.c:2163 +#: gio/glocalfileinfo.c:2281 #, c-format msgid "Error when getting information for file descriptor: %s" msgstr "Chyba při získávání informací pro popisovače souboru: %s" -#: gio/glocalfileinfo.c:2208 +#: gio/glocalfileinfo.c:2326 msgid "Invalid attribute type (uint32 expected)" msgstr "Neplatný typ atributu (očekáván uint32)" -#: gio/glocalfileinfo.c:2226 +#: gio/glocalfileinfo.c:2344 msgid "Invalid attribute type (uint64 expected)" msgstr "Neplatný typ atributu (očekáván uint64)" -#: gio/glocalfileinfo.c:2245 gio/glocalfileinfo.c:2264 +#: gio/glocalfileinfo.c:2363 gio/glocalfileinfo.c:2382 msgid "Invalid attribute type (byte string expected)" msgstr "Neplatný typ atributu (očekáván bajtový řetězec)" -#: gio/glocalfileinfo.c:2311 +#: gio/glocalfileinfo.c:2429 msgid "Cannot set permissions on symlinks" msgstr "Nelze nastavit oprávnění na symbolických odkazech" -#: gio/glocalfileinfo.c:2327 +#: gio/glocalfileinfo.c:2445 #, c-format msgid "Error setting permissions: %s" msgstr "Chyba při nastavování oprávnění: %s" -#: gio/glocalfileinfo.c:2378 +#: gio/glocalfileinfo.c:2496 #, c-format msgid "Error setting owner: %s" msgstr "Chyba při nastavování vlastníka: %s" -#: gio/glocalfileinfo.c:2401 +#: gio/glocalfileinfo.c:2519 msgid "symlink must be non-NULL" msgstr "symbolický odkaz nesmí být prázdný" -#: gio/glocalfileinfo.c:2411 gio/glocalfileinfo.c:2430 -#: gio/glocalfileinfo.c:2441 +#: gio/glocalfileinfo.c:2529 gio/glocalfileinfo.c:2548 +#: gio/glocalfileinfo.c:2559 #, c-format msgid "Error setting symlink: %s" msgstr "Chyba při nastavování symbolického odkazu: %s" -#: gio/glocalfileinfo.c:2420 +#: gio/glocalfileinfo.c:2538 msgid "Error setting symlink: file is not a symlink" msgstr "" "Chyba při nastavování symbolického odkazu: soubor není symbolickým odkazem" -#: gio/glocalfileinfo.c:2492 +#: gio/glocalfileinfo.c:2630 #, c-format msgid "Extra nanoseconds %d for UNIX timestamp %lld are negative" msgstr "Dodatečné nanosekundy %d pro UNIXové časové razítko %lld jsou záporné." -#: gio/glocalfileinfo.c:2501 +#: gio/glocalfileinfo.c:2639 #, c-format msgid "Extra nanoseconds %d for UNIX timestamp %lld reach 1 second" msgstr "" "Dodatečné nanosekundy %d pro UNIXové časové razítko %lld dosáhly 1 sekundy." -#: gio/glocalfileinfo.c:2511 +#: gio/glocalfileinfo.c:2649 #, c-format msgid "UNIX timestamp %lld does not fit into 64 bits" msgstr "UNIXové časové razítko %lld se nevleze do 64 bitů." -#: gio/glocalfileinfo.c:2522 +#: gio/glocalfileinfo.c:2660 #, c-format msgid "UNIX timestamp %lld is outside of the range supported by Windows" msgstr "UNIXové časové razítko %lld je mimo rozsah podporovaný Windows." -#: gio/glocalfileinfo.c:2625 +#: gio/glocalfileinfo.c:2792 #, c-format msgid "File name “%s” cannot be converted to UTF-16" msgstr "Název souboru „%s“ se nezdařilo převést do UTF-16." -#: gio/glocalfileinfo.c:2644 +#: gio/glocalfileinfo.c:2811 #, c-format msgid "File “%s” cannot be opened: Windows Error %lu" msgstr "Soubor „%s“ se nezdařilo otevřít: chyba Windows %lu" -#: gio/glocalfileinfo.c:2657 +#: gio/glocalfileinfo.c:2824 #, c-format msgid "Error setting modification or access time for file “%s”: %lu" msgstr "Chyba při nastavování času změny nebo přístupu u souboru „%s“: %lu" -#: gio/glocalfileinfo.c:2798 gio/glocalfileinfo.c:2810 +#: gio/glocalfileinfo.c:2981 #, c-format msgid "Error setting modification or access time: %s" msgstr "Chyba při nastavování času změny nebo přístupu: %s" -#: gio/glocalfileinfo.c:2833 +#: gio/glocalfileinfo.c:3004 msgid "SELinux context must be non-NULL" msgstr "Kontext SELinux nesmí být prázdný." -#: gio/glocalfileinfo.c:2840 +#: gio/glocalfileinfo.c:3011 msgid "SELinux is not enabled on this system" msgstr "V tomto systému není SELinux povolen" -#: gio/glocalfileinfo.c:2850 +#: gio/glocalfileinfo.c:3021 #, c-format msgid "Error setting SELinux context: %s" msgstr "Chyba při nastavování kontextu SELinux: %s" -#: gio/glocalfileinfo.c:2947 +#: gio/glocalfileinfo.c:3118 #, c-format msgid "Setting attribute %s not supported" msgstr "Nastavení atributu %s není podporováno" @@ -3316,13 +3325,13 @@ msgid "Error renaming temporary file: %s" msgstr "Chyba při přejmenovávání dočasného souboru: %s" -#: gio/glocalfileoutputstream.c:611 gio/glocalfileoutputstream.c:1241 +#: gio/glocalfileoutputstream.c:611 gio/glocalfileoutputstream.c:1242 #, c-format msgid "Error truncating file: %s" msgstr "Chyba při zkracování souboru: %s" #: gio/glocalfileoutputstream.c:664 gio/glocalfileoutputstream.c:909 -#: gio/glocalfileoutputstream.c:1222 gio/gsubprocess.c:231 +#: gio/glocalfileoutputstream.c:1223 gio/gsubprocess.c:231 #, c-format msgid "Error opening file “%s”: %s" msgstr "Chyba při otevírání souboru %s: %s" @@ -3339,7 +3348,7 @@ msgid "The file was externally modified" msgstr "Soubor byl externě pozměněn" -#: gio/glocalfileoutputstream.c:1204 +#: gio/glocalfileoutputstream.c:1205 #, c-format msgid "Error removing old file: %s" msgstr "Chyba při odstraňování starého souboru: %s" @@ -3487,8 +3496,8 @@ #. Translators: the first placeholder is a domain name, the #. * second is an error message #: gio/gresolver.c:403 gio/gthreadedresolver.c:152 gio/gthreadedresolver.c:170 -#: gio/gthreadedresolver.c:782 gio/gthreadedresolver.c:806 -#: gio/gthreadedresolver.c:831 gio/gthreadedresolver.c:846 +#: gio/gthreadedresolver.c:798 gio/gthreadedresolver.c:822 +#: gio/gthreadedresolver.c:847 gio/gthreadedresolver.c:862 #, c-format msgid "Error resolving “%s”: %s" msgstr "Chyba při řešení „%s“: %s" @@ -4201,35 +4210,35 @@ #. Translators: the placeholder is a DNS record type, such as ‘MX’ or ‘SRV’ #: gio/gthreadedresolver.c:552 gio/gthreadedresolver.c:574 -#: gio/gthreadedresolver.c:612 gio/gthreadedresolver.c:659 -#: gio/gthreadedresolver.c:688 gio/gthreadedresolver.c:700 +#: gio/gthreadedresolver.c:628 gio/gthreadedresolver.c:675 +#: gio/gthreadedresolver.c:704 gio/gthreadedresolver.c:716 #, c-format msgid "Error parsing DNS %s record: malformed DNS packet" msgstr "Chyba při zpracování záznamu %s z DNS: poškozený paket DNS" -#: gio/gthreadedresolver.c:758 gio/gthreadedresolver.c:895 -#: gio/gthreadedresolver.c:993 gio/gthreadedresolver.c:1043 +#: gio/gthreadedresolver.c:774 gio/gthreadedresolver.c:911 +#: gio/gthreadedresolver.c:1009 gio/gthreadedresolver.c:1059 #, c-format msgid "No DNS record of the requested type for “%s”" msgstr "Záznam DNS požadovaného typu pro „%s“ neexistuje" -#: gio/gthreadedresolver.c:763 gio/gthreadedresolver.c:998 +#: gio/gthreadedresolver.c:779 gio/gthreadedresolver.c:1014 #, c-format msgid "Temporarily unable to resolve “%s”" msgstr "Dočasně není možné vyřešit „%s“" -#: gio/gthreadedresolver.c:768 gio/gthreadedresolver.c:1003 -#: gio/gthreadedresolver.c:1113 +#: gio/gthreadedresolver.c:784 gio/gthreadedresolver.c:1019 +#: gio/gthreadedresolver.c:1129 #, c-format msgid "Error resolving “%s”" msgstr "Chyba při řešení „%s“" -#: gio/gthreadedresolver.c:782 gio/gthreadedresolver.c:806 -#: gio/gthreadedresolver.c:831 gio/gthreadedresolver.c:846 +#: gio/gthreadedresolver.c:798 gio/gthreadedresolver.c:822 +#: gio/gthreadedresolver.c:847 gio/gthreadedresolver.c:862 msgid "Malformed DNS packet" msgstr "Poškozený paket DNS" -#: gio/gthreadedresolver.c:888 +#: gio/gthreadedresolver.c:904 #, c-format msgid "Failed to parse DNS response for “%s”: " msgstr "Selhalo zpracování odpovědi DNS pro „%s“: " @@ -4358,7 +4367,7 @@ msgid "Error closing file descriptor: %s" msgstr "Chyba při zavírání popisovače souboru: %s" -#: gio/gunixmounts.c:2815 gio/gunixmounts.c:2868 +#: gio/gunixmounts.c:2817 gio/gunixmounts.c:2870 msgid "Filesystem root" msgstr "Kořen systému souborů" @@ -4440,77 +4449,77 @@ msgid "Wrong args\n" msgstr "Nesprávné argumenty\n" -#: glib/gbookmarkfile.c:779 +#: glib/gbookmarkfile.c:861 #, c-format msgid "Unexpected attribute “%s” for element “%s”" msgstr "Neočekávaný atribut „%s“ prvku „%s“" -#: glib/gbookmarkfile.c:790 glib/gbookmarkfile.c:870 glib/gbookmarkfile.c:880 -#: glib/gbookmarkfile.c:993 +#: glib/gbookmarkfile.c:872 glib/gbookmarkfile.c:952 glib/gbookmarkfile.c:962 +#: glib/gbookmarkfile.c:1075 #, c-format msgid "Attribute “%s” of element “%s” not found" msgstr "Atribut „%s“ prvku „%s“ nebyl nalezen" -#: glib/gbookmarkfile.c:1202 glib/gbookmarkfile.c:1267 -#: glib/gbookmarkfile.c:1331 glib/gbookmarkfile.c:1341 +#: glib/gbookmarkfile.c:1284 glib/gbookmarkfile.c:1349 +#: glib/gbookmarkfile.c:1413 glib/gbookmarkfile.c:1423 #, c-format msgid "Unexpected tag “%s”, tag “%s” expected" msgstr "Neočekávaná značka „%s“, byla očekávána značka „%s“" -#: glib/gbookmarkfile.c:1227 glib/gbookmarkfile.c:1241 -#: glib/gbookmarkfile.c:1309 glib/gbookmarkfile.c:1355 +#: glib/gbookmarkfile.c:1309 glib/gbookmarkfile.c:1323 +#: glib/gbookmarkfile.c:1391 glib/gbookmarkfile.c:1437 #, c-format msgid "Unexpected tag “%s” inside “%s”" msgstr "Neočekávaná značka „%s“ v „%s“" -#: glib/gbookmarkfile.c:1635 +#: glib/gbookmarkfile.c:1717 #, c-format msgid "Invalid date/time ‘%s’ in bookmark file" msgstr "Neplatné datum/čas „%s“ v souboru se záložkami" -#: glib/gbookmarkfile.c:1838 +#: glib/gbookmarkfile.c:1956 msgid "No valid bookmark file found in data dirs" msgstr "V datových složkách nebyl nalezen platný soubor záložek" -#: glib/gbookmarkfile.c:2039 +#: glib/gbookmarkfile.c:2157 #, c-format msgid "A bookmark for URI “%s” already exists" msgstr "Záložka URI „%s“ již existuje" -#: glib/gbookmarkfile.c:2088 glib/gbookmarkfile.c:2246 -#: glib/gbookmarkfile.c:2331 glib/gbookmarkfile.c:2411 -#: glib/gbookmarkfile.c:2496 glib/gbookmarkfile.c:2630 -#: glib/gbookmarkfile.c:2763 glib/gbookmarkfile.c:2898 -#: glib/gbookmarkfile.c:2940 glib/gbookmarkfile.c:3037 -#: glib/gbookmarkfile.c:3158 glib/gbookmarkfile.c:3352 -#: glib/gbookmarkfile.c:3493 glib/gbookmarkfile.c:3712 -#: glib/gbookmarkfile.c:3801 glib/gbookmarkfile.c:3890 -#: glib/gbookmarkfile.c:4009 +#: glib/gbookmarkfile.c:2206 glib/gbookmarkfile.c:2364 +#: glib/gbookmarkfile.c:2449 glib/gbookmarkfile.c:2529 +#: glib/gbookmarkfile.c:2614 glib/gbookmarkfile.c:2748 +#: glib/gbookmarkfile.c:2881 glib/gbookmarkfile.c:3016 +#: glib/gbookmarkfile.c:3058 glib/gbookmarkfile.c:3155 +#: glib/gbookmarkfile.c:3276 glib/gbookmarkfile.c:3470 +#: glib/gbookmarkfile.c:3611 glib/gbookmarkfile.c:3830 +#: glib/gbookmarkfile.c:3919 glib/gbookmarkfile.c:4008 +#: glib/gbookmarkfile.c:4127 #, c-format msgid "No bookmark found for URI “%s”" msgstr "Nebyla nalezena záložka URI „%s“" -#: glib/gbookmarkfile.c:2420 +#: glib/gbookmarkfile.c:2538 #, c-format msgid "No MIME type defined in the bookmark for URI “%s”" msgstr "V záložce URI „%s“ není definován žádný typ MIME" -#: glib/gbookmarkfile.c:2505 +#: glib/gbookmarkfile.c:2623 #, c-format msgid "No private flag has been defined in bookmark for URI “%s”" msgstr "V záložce URI „%s“ nebyl definován žádný soukromý příznak" -#: glib/gbookmarkfile.c:3046 +#: glib/gbookmarkfile.c:3164 #, c-format msgid "No groups set in bookmark for URI “%s”" msgstr "V záložce URI „%s“ nejsou nastavené žádné skupiny" -#: glib/gbookmarkfile.c:3514 glib/gbookmarkfile.c:3722 +#: glib/gbookmarkfile.c:3632 glib/gbookmarkfile.c:3840 #, c-format msgid "No application with name “%s” registered a bookmark for “%s”" msgstr "Žádná aplikace s názvem „%s“ nezaregistrovala záložku „%s“" -#: glib/gbookmarkfile.c:3745 +#: glib/gbookmarkfile.c:3863 #, c-format msgid "Failed to expand exec line “%s” with URI “%s”" msgstr "Nelze rozšířit řádek exec „%s“ pomocí URI „%s“" @@ -4991,7 +5000,7 @@ msgid "Error opening directory “%s”: %s" msgstr "Chyba při otevírání složky „%s“: %s" -#: glib/gfileutils.c:735 glib/gfileutils.c:827 +#: glib/gfileutils.c:753 glib/gfileutils.c:845 #, c-format msgid "Could not allocate %lu byte to read file “%s”" msgid_plural "Could not allocate %lu bytes to read file “%s”" @@ -4999,72 +5008,72 @@ msgstr1 "Nelze alokovat %lu bajty k přečtení souboru „%s“" msgstr2 "Nelze alokovat %lu bajtů k přečtení souboru „%s“" -#: glib/gfileutils.c:752 +#: glib/gfileutils.c:770 #, c-format msgid "Error reading file “%s”: %s" msgstr "Chyba čtení souboru „%s“: %s" -#: glib/gfileutils.c:788 +#: glib/gfileutils.c:806 #, c-format msgid "File “%s” is too large" msgstr "Soubor „%s“ je příliš velký" -#: glib/gfileutils.c:852 +#: glib/gfileutils.c:870 #, c-format msgid "Failed to read from file “%s”: %s" msgstr "Chyba při čtení ze souboru „%s“: %s" -#: glib/gfileutils.c:902 glib/gfileutils.c:977 glib/gfileutils.c:1449 +#: glib/gfileutils.c:920 glib/gfileutils.c:995 glib/gfileutils.c:1472 #, c-format msgid "Failed to open file “%s”: %s" msgstr "Nelze otevřít soubor „%s“: %s" -#: glib/gfileutils.c:915 +#: glib/gfileutils.c:933 #, c-format msgid "Failed to get attributes of file “%s”: fstat() failed: %s" msgstr "Nelze získat atributy souboru „%s“: funkce fstat() selhala: %s" -#: glib/gfileutils.c:946 +#: glib/gfileutils.c:964 #, c-format msgid "Failed to open file “%s”: fdopen() failed: %s" msgstr "Nelze otevřít soubor „%s“: funkce fdopen() selhala: %s" -#: glib/gfileutils.c:1047 +#: glib/gfileutils.c:1065 #, c-format msgid "Failed to rename file “%s” to “%s”: g_rename() failed: %s" msgstr "Nelze přejmenovat soubor „%s“ na „%s“: funkce g_rename() selhala: %s" -#: glib/gfileutils.c:1156 +#: glib/gfileutils.c:1179 #, c-format msgid "Failed to write file “%s”: write() failed: %s" msgstr "Nelze zapisovat do souboru „%s“: funkce write() selhala: %s" -#: glib/gfileutils.c:1177 +#: glib/gfileutils.c:1200 #, c-format msgid "Failed to write file “%s”: fsync() failed: %s" msgstr "Nelze zapisovat do souboru „%s“: funkce fsync() selhala: %s" -#: glib/gfileutils.c:1338 glib/gfileutils.c:1753 +#: glib/gfileutils.c:1361 glib/gfileutils.c:1776 #, c-format msgid "Failed to create file “%s”: %s" msgstr "Nelze vytvořit soubor „%s“: %s" -#: glib/gfileutils.c:1383 +#: glib/gfileutils.c:1406 #, c-format msgid "Existing file “%s” could not be removed: g_unlink() failed: %s" msgstr "Existující soubor „%s“ nelze odstranit: funkce g_unlink() selhala: %s" -#: glib/gfileutils.c:1718 +#: glib/gfileutils.c:1741 #, c-format msgid "Template “%s” invalid, should not contain a “%s”" msgstr "Šablona „%s“ je neplatná, neměla by obsahovat „%s“" -#: glib/gfileutils.c:1731 +#: glib/gfileutils.c:1754 #, c-format msgid "Template “%s” doesn’t contain XXXXXX" msgstr "Šablona „%s“ neobsahuje XXXXXX" -#: glib/gfileutils.c:2291 glib/gfileutils.c:2320 +#: glib/gfileutils.c:2348 glib/gfileutils.c:2377 #, c-format msgid "Failed to read the symbolic link “%s”: %s" msgstr "Nelze přečíst symbolický odkaz „%s“: %s" @@ -5126,8 +5135,8 @@ msgstr "Soubor klíče obsahuje nepodporované kódování „%s“" #: glib/gkeyfile.c:1679 glib/gkeyfile.c:1852 glib/gkeyfile.c:3299 -#: glib/gkeyfile.c:3363 glib/gkeyfile.c:3493 glib/gkeyfile.c:3625 -#: glib/gkeyfile.c:3771 glib/gkeyfile.c:4006 glib/gkeyfile.c:4073 +#: glib/gkeyfile.c:3363 glib/gkeyfile.c:3493 glib/gkeyfile.c:3622 +#: glib/gkeyfile.c:3768 glib/gkeyfile.c:4003 glib/gkeyfile.c:4070 #, c-format msgid "Key file does not have group “%s”" msgstr "Soubor klíče nemá skupinu „%s“" @@ -5163,31 +5172,31 @@ msgid "Key “%s” in group “%s” has value “%s” where %s was expected" msgstr "Klíč „%s“ ve skupině „%s“ má hodnotu „%s“, když byla očekávána „%s“" -#: glib/gkeyfile.c:4326 +#: glib/gkeyfile.c:4323 msgid "Key file contains escape character at end of line" msgstr "Soubor klíče obsahuje na konci řádku znak změny" -#: glib/gkeyfile.c:4348 +#: glib/gkeyfile.c:4345 #, c-format msgid "Key file contains invalid escape sequence “%s”" msgstr "Soubor klíče obsahuje neplatnou únikovou sekvenci „%s“" -#: glib/gkeyfile.c:4493 +#: glib/gkeyfile.c:4490 #, c-format msgid "Value “%s” cannot be interpreted as a number." msgstr "Hodnotu „%s“ nelze interpretovat jako číslo." -#: glib/gkeyfile.c:4507 +#: glib/gkeyfile.c:4504 #, c-format msgid "Integer value “%s” out of range" msgstr "Celočíselná hodnota „%s“ je mimo rozsah" -#: glib/gkeyfile.c:4540 +#: glib/gkeyfile.c:4537 #, c-format msgid "Value “%s” cannot be interpreted as a float number." msgstr "Hodnotu „%s“ nelze interpretovat jako reálné (plovoucí) číslo." -#: glib/gkeyfile.c:4579 +#: glib/gkeyfile.c:4576 #, c-format msgid "Value “%s” cannot be interpreted as a boolean." msgstr "Hodnotu „%s“ nelze interpretovat jako pravdivostní hodnotu." @@ -5208,32 +5217,32 @@ msgid "Failed to open file “%s”: open() failed: %s" msgstr "Selhalo otevření souboru „%s“: selhala funkce open(): %s" -#: glib/gmarkup.c:400 glib/gmarkup.c:442 +#: glib/gmarkup.c:393 glib/gmarkup.c:435 #, c-format msgid "Error on line %d char %d: " msgstr "Chyba na řádku %d, znak %d: " -#: glib/gmarkup.c:464 glib/gmarkup.c:547 +#: glib/gmarkup.c:457 glib/gmarkup.c:540 #, c-format msgid "Invalid UTF-8 encoded text in name — not valid “%s”" msgstr "V názvu je neplatný text v kódování UTF-8 – platné není „%s“" -#: glib/gmarkup.c:475 +#: glib/gmarkup.c:468 #, c-format msgid "“%s” is not a valid name" msgstr "„%s“ není platným názvem" -#: glib/gmarkup.c:491 +#: glib/gmarkup.c:484 #, c-format msgid "“%s” is not a valid name: “%c”" msgstr "„%s“ není platným názvem: „%c“" -#: glib/gmarkup.c:615 +#: glib/gmarkup.c:608 #, c-format msgid "Error on line %d: %s" msgstr "Chyba na řádku %d: %s" -#: glib/gmarkup.c:692 +#: glib/gmarkup.c:685 #, c-format msgid "" "Failed to parse “%-.*s”, which should have been a digit inside a character " @@ -5242,7 +5251,7 @@ "Nelze zpracovat „%-.*s“, což by mělo být číslo v znakové entitě (například " "ê) – číslo je možná příliš velké" -#: glib/gmarkup.c:704 +#: glib/gmarkup.c:697 msgid "" "Character reference did not end with a semicolon; most likely you used an " "ampersand character without intending to start an entity — escape ampersand " @@ -5251,24 +5260,24 @@ "Znaková entita nekončí středníkem; pravděpodobně jste použili znak & bez " "úmyslu začít entitu – zapište prosím ligaturu et jako &" -#: glib/gmarkup.c:730 +#: glib/gmarkup.c:723 #, c-format msgid "Character reference “%-.*s” does not encode a permitted character" msgstr "Znaková entita „%-.*s“ nekóduje povolený znak" -#: glib/gmarkup.c:768 +#: glib/gmarkup.c:761 msgid "" "Empty entity “&;” seen; valid entities are: & " < > '" msgstr "" "Nalezena prázdná entita „&;“, platnými entitami jsou: & " < > " "'" -#: glib/gmarkup.c:776 +#: glib/gmarkup.c:769 #, c-format msgid "Entity name “%-.*s” is not known" msgstr "Název entity „%-.*s“ není znám" -#: glib/gmarkup.c:781 +#: glib/gmarkup.c:774 msgid "" "Entity did not end with a semicolon; most likely you used an ampersand " "character without intending to start an entity — escape ampersand as &" @@ -5276,18 +5285,18 @@ "Entita nekončí středníkem; pravděpodobně jste použili znak & bez úmyslu " "začít entitu – zapište prosím ligaturu et jako &" -#: glib/gmarkup.c:1195 +#: glib/gmarkup.c:1188 msgid "Document must begin with an element (e.g. <book>)" msgstr "Dokument musí začínat prvkem (například: <book>)" -#: glib/gmarkup.c:1235 +#: glib/gmarkup.c:1228 #, c-format msgid "" "“%s” is not a valid character following a “<” character; it may not begin an " "element name" msgstr "„%s“ není platný znak po znaku „<“; nesmí jím začínat název prvku" -#: glib/gmarkup.c:1278 +#: glib/gmarkup.c:1271 #, c-format msgid "" "Odd character “%s”, expected a “>” character to end the empty-element tag " @@ -5296,19 +5305,19 @@ "Nezapadající znak „%s“, byl očekáván znak „>“ k ukončení značky empty-" "element „%s“" -#: glib/gmarkup.c:1348 +#: glib/gmarkup.c:1341 #, c-format msgid "Too many attributes in element “%s”" msgstr "Příliš mnoho atributů v prvku „%s“" -#: glib/gmarkup.c:1368 +#: glib/gmarkup.c:1361 #, c-format msgid "" "Odd character “%s”, expected a “=” after attribute name “%s” of element “%s”" msgstr "" "Nezapadající znak „%s“, po názvu atributu „%s“ prvku „%s“ bylo očekáváno „=“" -#: glib/gmarkup.c:1410 +#: glib/gmarkup.c:1403 #, c-format msgid "" "Odd character “%s”, expected a “>” or “/” character to end the start tag of " @@ -5319,7 +5328,7 @@ "značky prvku „%s“, nebo případně atribut; pravděpodobně jste použili " "neplatný znak v názvu atributu" -#: glib/gmarkup.c:1455 +#: glib/gmarkup.c:1448 #, c-format msgid "" "Odd character “%s”, expected an open quote mark after the equals sign when " @@ -5328,7 +5337,7 @@ "Nezapadající znak „%s“, po znaku rovnítka při udávání hodnoty atributu „%s“ " "prvku „%s“ byly očekávány uvozovky" -#: glib/gmarkup.c:1589 +#: glib/gmarkup.c:1582 #, c-format msgid "" "“%s” is not a valid character following the characters “</”; “%s” may not " @@ -5336,7 +5345,7 @@ msgstr "" "„%s“ není platný znak po znacích „</“; znakem „%s“ nesmí začínat název prvku" -#: glib/gmarkup.c:1627 +#: glib/gmarkup.c:1620 #, c-format msgid "" "“%s” is not a valid character following the close element name “%s”; the " @@ -5345,25 +5354,25 @@ "„%s“ není povoleným znakem po ukončovacím názvu prvku „%s“; povoleným znakem " "je „>“" -#: glib/gmarkup.c:1639 +#: glib/gmarkup.c:1632 #, c-format msgid "Element “%s” was closed, no element is currently open" msgstr "Prvek „%s“ byl uzavřen, žádný prvek není momentálně otevřený" -#: glib/gmarkup.c:1648 +#: glib/gmarkup.c:1641 #, c-format msgid "Element “%s” was closed, but the currently open element is “%s”" msgstr "Prvek „%s“ byl uzavřen, ale aktuálně je otevřený prvek „%s“" -#: glib/gmarkup.c:1801 +#: glib/gmarkup.c:1794 msgid "Document was empty or contained only whitespace" msgstr "Dokument je prázdný nebo obsahuje pouze mezery" -#: glib/gmarkup.c:1815 +#: glib/gmarkup.c:1808 msgid "Document ended unexpectedly just after an open angle bracket “<”" msgstr "Dokument neočekávaně skončil ihned po otevírací značce „<“" -#: glib/gmarkup.c:1823 glib/gmarkup.c:1868 +#: glib/gmarkup.c:1816 glib/gmarkup.c:1861 #, c-format msgid "" "Document ended unexpectedly with elements still open — “%s” was the last " @@ -5372,7 +5381,7 @@ "Dokument neočekávaně skončil s otevřenými prvky – poslední otevřený prvek " "byl „%s“" -#: glib/gmarkup.c:1831 +#: glib/gmarkup.c:1824 #, c-format msgid "" "Document ended unexpectedly, expected to see a close angle bracket ending " @@ -5380,19 +5389,19 @@ msgstr "" "Dokument neočekávaně skončil, byla očekávána uzavírací závorka značky <%s/>" -#: glib/gmarkup.c:1837 +#: glib/gmarkup.c:1830 msgid "Document ended unexpectedly inside an element name" msgstr "Dokument neočekávaně skončil uvnitř názvu prvku" -#: glib/gmarkup.c:1843 +#: glib/gmarkup.c:1836 msgid "Document ended unexpectedly inside an attribute name" msgstr "Dokument neočekávaně skončil uvnitř názvu atributu" -#: glib/gmarkup.c:1848 +#: glib/gmarkup.c:1841 msgid "Document ended unexpectedly inside an element-opening tag." msgstr "Dokument neočekávaně skončil ve značce otevírající prvek." -#: glib/gmarkup.c:1854 +#: glib/gmarkup.c:1847 msgid "" "Document ended unexpectedly after the equals sign following an attribute " "name; no attribute value" @@ -5400,22 +5409,22 @@ "Dokument neočekávaně skončil po znaku přiřazení následujícím za názvem " "atributu; chybí hodnota atributu" -#: glib/gmarkup.c:1861 +#: glib/gmarkup.c:1854 msgid "Document ended unexpectedly while inside an attribute value" msgstr "Dokument neočekávaně skončil uvnitř hodnoty atributu" -#: glib/gmarkup.c:1878 +#: glib/gmarkup.c:1871 #, c-format msgid "Document ended unexpectedly inside the close tag for element “%s”" msgstr "Dokument neočekávaně skončil uvnitř uzavírací značky prvku „%s“" -#: glib/gmarkup.c:1882 +#: glib/gmarkup.c:1875 msgid "" "Document ended unexpectedly inside the close tag for an unopened element" msgstr "" "Dokument neočekávaně skončil uvnitř uzavírací značky neotevřeného prvku" -#: glib/gmarkup.c:1888 +#: glib/gmarkup.c:1881 msgid "Document ended unexpectedly inside a comment or processing instruction" msgstr "" "Dokument neočekávaně skončil uvnitř komentáře nebo instrukce pro zpracování" @@ -5481,185 +5490,185 @@ msgid "Unknown option %s" msgstr "Neznámý přepínač %s" -#: glib/gregex.c:436 +#: glib/gregex.c:479 msgid "corrupted object" msgstr "poškozený objekt" -#: glib/gregex.c:438 +#: glib/gregex.c:481 msgid "out of memory" msgstr "nedostatek paměti" -#: glib/gregex.c:443 +#: glib/gregex.c:487 msgid "backtracking limit reached" msgstr "dosažen limit zpětného vyhledávání" -#: glib/gregex.c:454 glib/gregex.c:707 glib/gregex.c:736 +#: glib/gregex.c:498 msgid "internal error" msgstr "vnitřní chyba" -#: glib/gregex.c:456 +#: glib/gregex.c:500 msgid "the pattern contains items not supported for partial matching" msgstr "vzorek obsahuje položky nepodporované u částečného porovnávání" -#: glib/gregex.c:458 +#: glib/gregex.c:502 msgid "back references as conditions are not supported for partial matching" msgstr "" "zpětné odkazy coby podmínky nejsou podporované u částečného porovnávání" -#: glib/gregex.c:464 +#: glib/gregex.c:508 msgid "recursion limit reached" msgstr "dosažen limit rekurze" -#: glib/gregex.c:466 +#: glib/gregex.c:510 msgid "bad offset" msgstr "chybný offset" -#: glib/gregex.c:468 +#: glib/gregex.c:512 msgid "recursion loop" msgstr "rekurzivní smyčka" #. should not happen in GRegex since we check modes before each match -#: glib/gregex.c:471 +#: glib/gregex.c:515 msgid "matching mode is requested that was not compiled for JIT" msgstr "je požadován příslušný režim, který ale nebyl zkompilován pro JIT" -#: glib/gregex.c:475 +#: glib/gregex.c:536 glib/gregex.c:1838 msgid "unknown error" msgstr "neznámá chyba" -#: glib/gregex.c:496 +#: glib/gregex.c:557 msgid "\\ at end of pattern" msgstr "\\ na konci vzorku" -#: glib/gregex.c:500 +#: glib/gregex.c:561 msgid "\\c at end of pattern" msgstr "\\c na konci vzorku" -#: glib/gregex.c:505 +#: glib/gregex.c:566 msgid "unrecognized character following \\" msgstr "nerozpoznaný znak následuje po \\" -#: glib/gregex.c:509 +#: glib/gregex.c:570 msgid "numbers out of order in {} quantifier" msgstr "čísla v {} quantifier nejsou v pořádku" -#: glib/gregex.c:513 +#: glib/gregex.c:574 msgid "number too big in {} quantifier" msgstr "číslo v {} quantifier je příliš vysoké" -#: glib/gregex.c:517 +#: glib/gregex.c:578 msgid "missing terminating for character class" msgstr "schází koncový znak znakové třídy" -#: glib/gregex.c:521 +#: glib/gregex.c:582 msgid "invalid escape sequence in character class" msgstr "neplatná posloupnost pro změnu ve znakové třídě" -#: glib/gregex.c:525 +#: glib/gregex.c:586 msgid "range out of order in character class" msgstr "rozsah ve znakové třídě není v pořádku" -#: glib/gregex.c:530 +#: glib/gregex.c:591 msgid "nothing to repeat" msgstr "nic k opakování" -#: glib/gregex.c:534 +#: glib/gregex.c:595 msgid "unrecognized character after (? or (?-" msgstr "nerozpoznaný znak po (? nebo (?-" -#: glib/gregex.c:538 +#: glib/gregex.c:599 msgid "POSIX named classes are supported only within a class" msgstr "třídy nazvané po POSIX nejsou uvnitř třídy podporovány" -#: glib/gregex.c:542 +#: glib/gregex.c:603 msgid "POSIX collating elements are not supported" msgstr "Porovnávací prvky POSIX nejsou podporovány" -#: glib/gregex.c:548 +#: glib/gregex.c:609 msgid "missing terminating )" msgstr "schází koncový znak )" -#: glib/gregex.c:552 +#: glib/gregex.c:613 msgid "reference to non-existent subpattern" msgstr "odkaz na neexistující podřazený vzorek" -#: glib/gregex.c:556 +#: glib/gregex.c:617 msgid "missing ) after comment" msgstr "po komentáři schází znak )" -#: glib/gregex.c:560 +#: glib/gregex.c:621 msgid "regular expression is too large" msgstr "regulární výraz je příliš dlouhý" -#: glib/gregex.c:564 +#: glib/gregex.c:625 msgid "malformed number or name after (?(" msgstr "nesprávně utvořené číslo nebo název po (?(" -#: glib/gregex.c:568 +#: glib/gregex.c:629 msgid "lookbehind assertion is not fixed length" msgstr "zpětný výrok není pevné délky" -#: glib/gregex.c:572 +#: glib/gregex.c:633 msgid "conditional group contains more than two branches" msgstr "podmínková skupina obsahuje více než dvě větve" -#: glib/gregex.c:576 +#: glib/gregex.c:637 msgid "assertion expected after (?(" msgstr "po (?( očekáván výrok" -#: glib/gregex.c:580 +#: glib/gregex.c:641 msgid "a numbered reference must not be zero" msgstr "číslovaná reference nesmí být nula" -#: glib/gregex.c:584 +#: glib/gregex.c:645 msgid "unknown POSIX class name" msgstr "neplatný název třídy POSIX" -#: glib/gregex.c:589 +#: glib/gregex.c:650 msgid "character value in \\x{...} sequence is too large" msgstr "znaková hodnota v posloupnosti \\x{…} je příliš vysoká" -#: glib/gregex.c:593 +#: glib/gregex.c:654 msgid "\\C not allowed in lookbehind assertion" msgstr "\\C není dovoleno ve zpětném výroku" -#: glib/gregex.c:597 +#: glib/gregex.c:658 msgid "missing terminator in subpattern name" msgstr "schází ukončovací člen v názvu podřazeného vzorku" -#: glib/gregex.c:601 +#: glib/gregex.c:662 msgid "two named subpatterns have the same name" msgstr "dva nazvané podřazené vzorky mají stejný název" -#: glib/gregex.c:605 +#: glib/gregex.c:666 msgid "malformed \\P or \\p sequence" msgstr "chybně utvořená posloupnost \\P nebo \\p" -#: glib/gregex.c:609 +#: glib/gregex.c:670 msgid "unknown property name after \\P or \\p" msgstr "neznámý název vlastnosti po \\P či \\p" -#: glib/gregex.c:613 +#: glib/gregex.c:674 msgid "subpattern name is too long (maximum 32 characters)" msgstr "název podřazeného vzorku je příliš dlouhý (maximem je 32 znaků)" -#: glib/gregex.c:617 +#: glib/gregex.c:678 msgid "too many named subpatterns (maximum 10,000)" msgstr "příliš mnoho nazvaných podřazených vzorků (maximem je 10 000)" -#: glib/gregex.c:621 +#: glib/gregex.c:682 msgid "octal value is greater than \\377" msgstr "osmičková hodnota je větší než \\377" -#: glib/gregex.c:625 +#: glib/gregex.c:686 msgid "DEFINE group contains more than one branch" msgstr "skupina DEFINE obsahuje více než jednu větev" -#: glib/gregex.c:629 +#: glib/gregex.c:690 msgid "inconsistent NEWLINE options" msgstr "neslučitelné volby NEWLINE" -#: glib/gregex.c:633 +#: glib/gregex.c:694 msgid "" "\\g is not followed by a braced, angle-bracketed, or quoted name or number, " "or by a plain number" @@ -5667,118 +5676,118 @@ "po \\g nenásleduje název nebo číslo ve složené nebo lomené závorce nebo v " "uvozovkách, nebo nenulové číslo" -#: glib/gregex.c:638 +#: glib/gregex.c:699 msgid "an argument is not allowed for (*ACCEPT), (*FAIL), or (*COMMIT)" msgstr "argument není povolen u (*ACCEPT), (*FAIL) nebo (*COMMIT)" -#: glib/gregex.c:642 +#: glib/gregex.c:703 msgid "(*VERB) not recognized" msgstr "(*VERB) nerozpoznáno" -#: glib/gregex.c:646 +#: glib/gregex.c:707 msgid "number is too big" msgstr "číslo je příliš velké" -#: glib/gregex.c:650 +#: glib/gregex.c:711 msgid "missing subpattern name after (?&" msgstr "schází název podřazeného vzorku po (?&" -#: glib/gregex.c:654 +#: glib/gregex.c:715 msgid "different names for subpatterns of the same number are not allowed" msgstr "rozdílné názvy podřazených vzorků stejného čísla nejsou povoleny" -#: glib/gregex.c:658 +#: glib/gregex.c:719 msgid "(*MARK) must have an argument" msgstr "(*MARK) musí mít argument" -#: glib/gregex.c:662 +#: glib/gregex.c:723 msgid "\\c must be followed by an ASCII character" msgstr "po \\c nesmí následovat znak ASCII" -#: glib/gregex.c:666 +#: glib/gregex.c:727 msgid "\\k is not followed by a braced, angle-bracketed, or quoted name" msgstr "" "po \\k nenásleduje název ve složené nebo lomné závorce nebo v uvozovkách" -#: glib/gregex.c:670 +#: glib/gregex.c:731 msgid "\\N is not supported in a class" msgstr "\\N není podporováno ve třídě" -#: glib/gregex.c:674 +#: glib/gregex.c:735 msgid "name is too long in (*MARK), (*PRUNE), (*SKIP), or (*THEN)" msgstr "název je příliš dlouhý v (*MARK), (*PRUNE), (*SKIP) nebo (*THEN)" -#: glib/gregex.c:678 glib/gregex.c:809 +#: glib/gregex.c:739 glib/gregex.c:875 msgid "code overflow" msgstr "přetečení kódu" -#: glib/gregex.c:682 +#: glib/gregex.c:743 msgid "unrecognized character after (?P" msgstr "nerozpoznaný znak pře (?P" -#: glib/gregex.c:686 +#: glib/gregex.c:747 msgid "overran compiling workspace" msgstr "přetečení přijímaných informací překládaného pracovního prostoru" -#: glib/gregex.c:690 +#: glib/gregex.c:751 msgid "previously-checked referenced subpattern not found" msgstr "v předchozím kroku kontrolovaný odkazovaný podřazený vzorek nenalezen" -#: glib/gregex.c:808 glib/gregex.c:1041 glib/gregex.c:2342 +#: glib/gregex.c:874 glib/gregex.c:1121 glib/gregex.c:2444 #, c-format msgid "Error while matching regular expression %s: %s" msgstr "Chyba při porovnávání regulárního výrazu %s: %s" -#: glib/gregex.c:1618 +#: glib/gregex.c:1721 msgid "PCRE library is compiled without UTF8 support" msgstr "Knihovna PCRE byla přeložena bez podpory UTF-8" -#: glib/gregex.c:1626 +#: glib/gregex.c:1729 msgid "PCRE library is compiled with incompatible options" msgstr "Knihovna PCRE je přeložena s nekompatibilními volbami" -#: glib/gregex.c:1751 +#: glib/gregex.c:1847 #, c-format msgid "Error while compiling regular expression ‘%s’ at char %s: %s" msgstr "Chyba při kompilaci regulárního výrazu „%s“ na znaku %s: %s" -#: glib/gregex.c:2786 +#: glib/gregex.c:2887 msgid "hexadecimal digit or “}” expected" msgstr "očekávána šestnáctková číslice nebo „}“" -#: glib/gregex.c:2802 +#: glib/gregex.c:2903 msgid "hexadecimal digit expected" msgstr "očekávána šestnáctková číslice" -#: glib/gregex.c:2842 +#: glib/gregex.c:2943 msgid "missing “<” in symbolic reference" msgstr "v symbolickém odkazu chybí „<“" -#: glib/gregex.c:2851 +#: glib/gregex.c:2952 msgid "unfinished symbolic reference" msgstr "neukončený symbolický odkaz" -#: glib/gregex.c:2858 +#: glib/gregex.c:2959 msgid "zero-length symbolic reference" msgstr "symbolický odkaz o nulové délce" -#: glib/gregex.c:2869 +#: glib/gregex.c:2970 msgid "digit expected" msgstr "očekávána číslice" -#: glib/gregex.c:2887 +#: glib/gregex.c:2988 msgid "illegal symbolic reference" msgstr "nedovolený symbolický odkaz" -#: glib/gregex.c:2950 +#: glib/gregex.c:3051 msgid "stray final “\\”" msgstr "osamocené koncové „\\“" -#: glib/gregex.c:2954 +#: glib/gregex.c:3055 msgid "unknown escape sequence" msgstr "neznámá úniková sekvence" -#: glib/gregex.c:2964 +#: glib/gregex.c:3065 #, c-format msgid "Error while parsing replacement text “%s” at char %lu: %s" msgstr "Chyba při zpracování náhradního textu „%s“ na znaku %lu: %s" @@ -5808,96 +5817,101 @@ msgid "Text was empty (or contained only whitespace)" msgstr "Text je prázdný (nebo obsahuje pouze mezery)" -#: glib/gspawn.c:314 +#: glib/gspawn.c:319 #, c-format msgid "Failed to read data from child process (%s)" msgstr "Nelze číst data z procesu potomka (%s)" -#: glib/gspawn.c:466 +#: glib/gspawn.c:471 #, c-format msgid "Unexpected error in reading data from a child process (%s)" msgstr "Neočekávaná chyba při čtení dat z procesu potomka (%s)" -#: glib/gspawn.c:551 +#: glib/gspawn.c:556 #, c-format msgid "Unexpected error in waitpid() (%s)" msgstr "Neočekávaná chyba v waitpid() (%s)" -#: glib/gspawn.c:1170 glib/gspawn-win32.c:1488 +#: glib/gspawn.c:1175 glib/gspawn-win32.c:1503 #, c-format msgid "Child process exited with code %ld" msgstr "Proces potomka skončil s kódem %ld" -#: glib/gspawn.c:1178 +#: glib/gspawn.c:1183 #, c-format msgid "Child process killed by signal %ld" msgstr "Proces potomka byl zabit signálem %ld" -#: glib/gspawn.c:1185 +#: glib/gspawn.c:1190 #, c-format msgid "Child process stopped by signal %ld" msgstr "Proces potomka byl zastaven signálem %ld" -#: glib/gspawn.c:1192 +#: glib/gspawn.c:1197 #, c-format msgid "Child process exited abnormally" msgstr "Proces potomka neskončil normálně" -#: glib/gspawn.c:1885 glib/gspawn-win32.c:393 glib/gspawn-win32.c:401 +#: glib/gspawn.c:2027 glib/gspawn-win32.c:393 glib/gspawn-win32.c:401 #, c-format msgid "Failed to read from child pipe (%s)" msgstr "Selhalo čtení z roury potomka (%s)" -#: glib/gspawn.c:2248 +#: glib/gspawn.c:2399 #, c-format msgid "Failed to spawn child process “%s” (%s)" msgstr "Selhalo zplození procesu potomka „%s“ (%s)" -#: glib/gspawn.c:2365 +#: glib/gspawn.c:2525 #, c-format msgid "Failed to fork (%s)" msgstr "Selhalo rozvětvení procesu (%s)" -#: glib/gspawn.c:2525 glib/gspawn-win32.c:424 +#: glib/gspawn.c:2685 glib/gspawn-win32.c:424 #, c-format msgid "Failed to change to directory “%s” (%s)" msgstr "Selhal přechod do složky „%s“ (%s)" -#: glib/gspawn.c:2535 +#: glib/gspawn.c:2695 #, c-format msgid "Failed to execute child process “%s” (%s)" msgstr "Selhalo spuštění procesu potomka „%s“ (%s)" -#: glib/gspawn.c:2545 +#: glib/gspawn.c:2705 #, c-format msgid "Failed to open file to remap file descriptor (%s)" msgstr "Selhalo otevření souboru pro přemapování popisovače souboru (%s)" -#: glib/gspawn.c:2553 +#: glib/gspawn.c:2713 #, c-format msgid "Failed to duplicate file descriptor for child process (%s)" msgstr "Selhalo zduplikování popisovače souboru pro proces potomka (%s)" -#: glib/gspawn.c:2562 +#: glib/gspawn.c:2722 #, c-format msgid "Failed to fork child process (%s)" msgstr "Selhalo rozvětvení procesu potomka (%s)" -#: glib/gspawn.c:2570 +#: glib/gspawn.c:2730 #, c-format msgid "Failed to close file descriptor for child process (%s)" msgstr "Selhalo zavření popisovače souboru pro proces potomka (%s)" -#: glib/gspawn.c:2578 +#: glib/gspawn.c:2738 #, c-format msgid "Unknown error executing child process “%s”" msgstr "Neznámá chyba při běhu procesu potomka „%s“" -#: glib/gspawn.c:2602 +#: glib/gspawn.c:2762 #, c-format msgid "Failed to read enough data from child pid pipe (%s)" msgstr "Nezdařilo se přečíst dostatek dat z roury pid potomka (%s)" +#: glib/gspawn-private.h:134 +#, c-format +msgid "Invalid source FDs argument" +msgstr "Neplatný argument se zdrojovými popisovači souborů" + #: glib/gspawn-win32.c:337 msgid "Failed to read data from child process" msgstr "Selhalo čtení dat z procesu potomka" @@ -5917,48 +5931,48 @@ msgid "Invalid program name: %s" msgstr "Neplatný název programu: %s" -#: glib/gspawn-win32.c:521 glib/gspawn-win32.c:853 +#: glib/gspawn-win32.c:521 glib/gspawn-win32.c:868 #, c-format msgid "Invalid string in argument vector at %d: %s" msgstr "Neplatný řetězec v poli argumentů na %d: %s" -#: glib/gspawn-win32.c:532 glib/gspawn-win32.c:869 +#: glib/gspawn-win32.c:532 glib/gspawn-win32.c:884 #, c-format msgid "Invalid string in environment: %s" msgstr "Neplatný řetězec v prostředí: %s" -#: glib/gspawn-win32.c:849 +#: glib/gspawn-win32.c:864 #, c-format msgid "Invalid working directory: %s" msgstr "Neplatná aktuální složka: %s" -#: glib/gspawn-win32.c:914 +#: glib/gspawn-win32.c:929 #, c-format msgid "Failed to execute helper program (%s)" msgstr "Nelze spustit pomocný program (%s)" -#: glib/gspawn-win32.c:1143 +#: glib/gspawn-win32.c:1158 msgid "" "Unexpected error in g_io_channel_win32_poll() reading data from a child " "process" msgstr "" "Neočekávaná chyba v g_io_channel_win32_poll() při čtení dat z procesu potomka" -#: glib/gstrfuncs.c:3366 glib/gstrfuncs.c:3468 +#: glib/gstrfuncs.c:3370 glib/gstrfuncs.c:3472 msgid "Empty string is not a number" msgstr "Prázdný řetězec není číslo" -#: glib/gstrfuncs.c:3390 +#: glib/gstrfuncs.c:3394 #, c-format msgid "“%s” is not a signed number" msgstr "„%s“ není číslo se znaménkem" -#: glib/gstrfuncs.c:3400 glib/gstrfuncs.c:3504 +#: glib/gstrfuncs.c:3404 glib/gstrfuncs.c:3508 #, c-format msgid "Number “%s” is out of bounds %s, %s" msgstr "Číslo „%s“ je mimo meze %s, %s" -#: glib/gstrfuncs.c:3494 +#: glib/gstrfuncs.c:3498 #, c-format msgid "“%s” is not an unsigned number" msgstr "„%s“ není číslo bez znaménka" @@ -6037,133 +6051,133 @@ msgstr "Znak je mimo rozsah UTF-16" #. Translators: A unit symbol for size formatting, showing for example: "13.0 kB" -#: glib/gutils.c:2857 +#: glib/gutils.c:2966 msgid "kB" msgstr "kB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 MB" -#: glib/gutils.c:2859 +#: glib/gutils.c:2968 msgid "MB" msgstr "MB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 GB" -#: glib/gutils.c:2861 +#: glib/gutils.c:2970 msgid "GB" msgstr "GB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 TB" -#: glib/gutils.c:2863 +#: glib/gutils.c:2972 msgid "TB" msgstr "TB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 PB" -#: glib/gutils.c:2865 +#: glib/gutils.c:2974 msgid "PB" msgstr "PB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 EB" -#: glib/gutils.c:2867 +#: glib/gutils.c:2976 msgid "EB" msgstr "EB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 KiB" -#: glib/gutils.c:2871 +#: glib/gutils.c:2980 msgid "KiB" msgstr "KiB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 MiB" -#: glib/gutils.c:2873 +#: glib/gutils.c:2982 msgid "MiB" msgstr "MiB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 GiB" -#: glib/gutils.c:2875 +#: glib/gutils.c:2984 msgid "GiB" msgstr "GiB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 TiB" -#: glib/gutils.c:2877 +#: glib/gutils.c:2986 msgid "TiB" msgstr "TiB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 PiB" -#: glib/gutils.c:2879 +#: glib/gutils.c:2988 msgid "PiB" msgstr "PiB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 EiB" -#: glib/gutils.c:2881 +#: glib/gutils.c:2990 msgid "EiB" msgstr "EiB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 kb" -#: glib/gutils.c:2885 +#: glib/gutils.c:2994 msgid "kb" msgstr "kb" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Mb" -#: glib/gutils.c:2887 +#: glib/gutils.c:2996 msgid "Mb" msgstr "Mb" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Gb" -#: glib/gutils.c:2889 +#: glib/gutils.c:2998 msgid "Gb" msgstr "Gb" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Tb" -#: glib/gutils.c:2891 +#: glib/gutils.c:3000 msgid "Tb" msgstr "Tb" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Pb" -#: glib/gutils.c:2893 +#: glib/gutils.c:3002 msgid "Pb" msgstr "Pb" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Eb" -#: glib/gutils.c:2895 +#: glib/gutils.c:3004 msgid "Eb" msgstr "Eb" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Kib" -#: glib/gutils.c:2899 +#: glib/gutils.c:3008 msgid "Kib" msgstr "Kib" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Mib" -#: glib/gutils.c:2901 +#: glib/gutils.c:3010 msgid "Mib" msgstr "Mib" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Gib" -#: glib/gutils.c:2903 +#: glib/gutils.c:3012 msgid "Gib" msgstr "Gib" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Tib" -#: glib/gutils.c:2905 +#: glib/gutils.c:3014 msgid "Tib" msgstr "Tib" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Pib" -#: glib/gutils.c:2907 +#: glib/gutils.c:3016 msgid "Pib" msgstr "Pib" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Eib" -#: glib/gutils.c:2909 +#: glib/gutils.c:3018 msgid "Eib" msgstr "Eib" -#: glib/gutils.c:2947 +#: glib/gutils.c:3056 msgid "byte" msgid_plural "bytes" msgstr0 "bajt" msgstr1 "bajty" msgstr2 "bajtů" -#: glib/gutils.c:2951 +#: glib/gutils.c:3060 msgid "bit" msgid_plural "bits" msgstr0 "bit" @@ -6172,7 +6186,7 @@ #. Translators: The "%u" is replaced with the size value, like "13"; it could #. * be part of "13 bytes", but only the number is requested this time. -#: glib/gutils.c:2959 +#: glib/gutils.c:3068 #, c-format msgctxt "format-size" msgid "%u" @@ -6180,7 +6194,7 @@ #. Translators: The first "%u" is replaced with the value, the "%s" with a unit of the value. #. * The order can be changed with "%$2s %$1u". An example: "13 bytes" -#: glib/gutils.c:2964 +#: glib/gutils.c:3073 #, c-format msgctxt "format-size" msgid "%u %s" @@ -6188,7 +6202,7 @@ #. Translators: The "%.1f" is replaced with the size value, like "13.0"; it could #. * be part of "13.0 MB", but only the number is requested this time. -#: glib/gutils.c:3000 +#: glib/gutils.c:3109 #, c-format msgctxt "format-size" msgid "%.1f" @@ -6197,14 +6211,14 @@ #. Translators: The first "%.1f" is replaced with the value, the "%s" with a unit of the value. #. * The order can be changed with "%$2s %$1.1f". Keep the no-break space between the value and #. * the unit symbol. An example: "13.0 MB" -#: glib/gutils.c:3006 +#: glib/gutils.c:3115 #, c-format msgctxt "format-size" msgid "%.1f %s" msgstr "%.1f %s" #. Translators: the %s in "%s bytes" will always be replaced by a number. -#: glib/gutils.c:3046 +#: glib/gutils.c:3155 #, c-format msgid "%s byte" msgid_plural "%s bytes" @@ -6213,7 +6227,7 @@ msgstr2 "%s bajtů" #. Translators: the %s in "%s bits" will always be replaced by a number. -#: glib/gutils.c:3051 +#: glib/gutils.c:3160 #, c-format msgid "%s bit" msgid_plural "%s bits" @@ -6221,7 +6235,7 @@ msgstr1 "%s bity" msgstr2 "%s bitů" -#: glib/gutils.c:3092 +#: glib/gutils.c:3201 #, c-format msgid "%u byte" msgid_plural "%u bytes" @@ -6234,32 +6248,32 @@ #. * compatibility. Users will not see this string unless a program is using this deprecated function. #. * Please translate as literally as possible. #. -#: glib/gutils.c:3105 +#: glib/gutils.c:3214 #, c-format msgid "%.1f KB" msgstr "%.1f KB" -#: glib/gutils.c:3110 +#: glib/gutils.c:3219 #, c-format msgid "%.1f MB" msgstr "%.1f MB" -#: glib/gutils.c:3115 +#: glib/gutils.c:3224 #, c-format msgid "%.1f GB" msgstr "%.1f GB" -#: glib/gutils.c:3120 +#: glib/gutils.c:3229 #, c-format msgid "%.1f TB" msgstr "%.1f TB" -#: glib/gutils.c:3125 +#: glib/gutils.c:3234 #, c-format msgid "%.1f PB" msgstr "%.1f PB" -#: glib/gutils.c:3130 +#: glib/gutils.c:3239 #, c-format msgid "%.1f EB" msgstr "%.1f EB"
View file
_service:tar_scm:glib-2.74.4.tar.xz/po/da.po -> _service:tar_scm:glib-2.76.4.tar.xz/po/da.po
Changed
@@ -28,8 +28,8 @@ msgstr "" "Project-Id-Version: glib master\n" "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/glib/issues\n" -"POT-Creation-Date: 2022-08-05 19:22+0000\n" -"PO-Revision-Date: 2022-08-27 15:44+0200\n" +"POT-Creation-Date: 2023-02-15 16:30+0000\n" +"PO-Revision-Date: 2023-02-26 11:46+0100\n" "Last-Translator: Alan Mortensen <alanmortensen.am@gmail.com>\n" "Language-Team: Danish <dansk@dansk-gruppen.dk>\n" "Language: da\n" @@ -37,23 +37,23 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 2.3\n" +"X-Generator: Poedit 3.0.1\n" -#: gio/gappinfo.c:335 +#: gio/gappinfo.c:339 msgid "Setting default applications not supported yet" msgstr "Indstilling af standardprogrammer understøttes endnu ikke" -#: gio/gappinfo.c:368 +#: gio/gappinfo.c:372 msgid "Setting application as last used for type not supported yet" msgstr "" "Indstilling af program som det sidst brugte til typen understøttes endnu ikke" -#: gio/gappinfo.c:808 +#: gio/gappinfo.c:814 #, c-format msgid "Failed to find default application for content type ‘%s’" msgstr "Kunne ikke finde standardprogram til indholdstypen “%s”" -#: gio/gappinfo.c:868 +#: gio/gappinfo.c:874 #, c-format msgid "Failed to find default application for URI Scheme ‘%s’" msgstr "Kunne ikke finde standardprogram til URI-skemaet “%s”" @@ -251,11 +251,11 @@ msgid "error sending %s message to application: %s\n" msgstr "fejl ved afsendelse af meddelelse %s til program: %s\n" -#: gio/gapplication-tool.c:321 +#: gio/gapplication-tool.c:324 msgid "action name must be given after application id\n" msgstr "der skal gives et handlingsnavn efter program-id\n" -#: gio/gapplication-tool.c:329 +#: gio/gapplication-tool.c:332 #, c-format msgid "" "invalid action name: “%s”\n" @@ -264,25 +264,25 @@ "ugyldigt handlingsnavn: “%s”\n" "handlingsnavne kan kun bestå af alfanumeriske tegn, “-” og “.”\n" -#: gio/gapplication-tool.c:348 +#: gio/gapplication-tool.c:351 #, c-format msgid "error parsing action parameter: %s\n" msgstr "fejl ved fortolkning af handlingsparameter: %s\n" -#: gio/gapplication-tool.c:360 +#: gio/gapplication-tool.c:363 msgid "actions accept a maximum of one parameter\n" msgstr "handlinger tager maksimalt en enkelt parameter\n" -#: gio/gapplication-tool.c:415 +#: gio/gapplication-tool.c:418 msgid "list-actions command takes only the application id" msgstr "kommandoen list-actions tager kun program-id" -#: gio/gapplication-tool.c:425 +#: gio/gapplication-tool.c:428 #, c-format msgid "unable to find desktop file for application %s\n" msgstr "kan ikke finde skrivebordsfil for programmet %s\n" -#: gio/gapplication-tool.c:470 +#: gio/gapplication-tool.c:473 #, c-format msgid "" "unrecognised command: %s\n" @@ -317,7 +317,7 @@ msgid "Truncate not supported on base stream" msgstr "Afkortning understøttes ikke af basisstrømmen" -#: gio/gcancellable.c:319 gio/gdbusconnection.c:1859 gio/gdbusprivate.c:1420 +#: gio/gcancellable.c:326 gio/gdbusconnection.c:1859 gio/gdbusprivate.c:1420 #: gio/gsimpleasyncresult.c:873 gio/gsimpleasyncresult.c:899 #, c-format msgid "Operation was cancelled" @@ -337,13 +337,13 @@ #: gio/gcharsetconverter.c:344 gio/gdatainputstream.c:850 #: gio/gdatainputstream.c:1268 glib/gconvert.c:451 glib/gconvert.c:883 -#: glib/giochannel.c:1576 glib/giochannel.c:1618 glib/giochannel.c:2473 +#: glib/giochannel.c:1576 glib/giochannel.c:1618 glib/giochannel.c:2478 #: glib/gutf8.c:892 glib/gutf8.c:1346 msgid "Invalid byte sequence in conversion input" msgstr "Ugyldig bytesekvens i konverteringsinddata" #: gio/gcharsetconverter.c:349 glib/gconvert.c:459 glib/gconvert.c:797 -#: glib/giochannel.c:1583 glib/giochannel.c:2485 +#: glib/giochannel.c:1583 glib/giochannel.c:2493 #, c-format msgid "Error during conversion: %s" msgstr "Fejl under konvertering: %s" @@ -400,17 +400,17 @@ msgid "Unexpected early end-of-stream" msgstr "Uventet tidlig strømafslutning" -#: gio/gdbusaddress.c:164 gio/gdbusaddress.c:238 gio/gdbusaddress.c:327 +#: gio/gdbusaddress.c:162 gio/gdbusaddress.c:234 gio/gdbusaddress.c:321 #, c-format msgid "Unsupported key “%s” in address entry “%s”" msgstr "Ikke-understøttet nøgle “%s” i adresseindgang “%s”" -#: gio/gdbusaddress.c:177 +#: gio/gdbusaddress.c:175 #, c-format msgid "Meaningless key/value pair combination in address entry “%s”" msgstr "Meningsløst nøgle-/værdikombination i adresseindgang “%s”" -#: gio/gdbusaddress.c:186 +#: gio/gdbusaddress.c:184 #, c-format msgid "" "Address “%s” is invalid (need exactly one of path, dir, tmpdir, or abstract " @@ -419,28 +419,28 @@ "Adressen “%s” er ugyldig (kræver præcist en af nøglerne path, dir, tmpdir " "eller abstract)" -#: gio/gdbusaddress.c:253 gio/gdbusaddress.c:264 gio/gdbusaddress.c:279 -#: gio/gdbusaddress.c:342 gio/gdbusaddress.c:353 +#: gio/gdbusaddress.c:249 gio/gdbusaddress.c:260 gio/gdbusaddress.c:275 +#: gio/gdbusaddress.c:336 gio/gdbusaddress.c:347 #, c-format msgid "Error in address “%s” — the “%s” attribute is malformed" msgstr "Fejl i adressen “%s” — attributten “%s” er fejlformateret" -#: gio/gdbusaddress.c:423 gio/gdbusaddress.c:682 +#: gio/gdbusaddress.c:417 gio/gdbusaddress.c:676 #, c-format msgid "Unknown or unsupported transport “%s” for address “%s”" msgstr "Ukendt eller ikke-understøttet transport “%s” for adressen “%s”" -#: gio/gdbusaddress.c:467 +#: gio/gdbusaddress.c:461 #, c-format msgid "Address element “%s” does not contain a colon (:)" msgstr "Adresseelementet “%s” indeholder intet kolon (:)" -#: gio/gdbusaddress.c:476 +#: gio/gdbusaddress.c:470 #, c-format msgid "Transport name in address element “%s” must not be empty" msgstr "Transportnavn i adresseelementet “%s” må ikke være tomt" -#: gio/gdbusaddress.c:497 +#: gio/gdbusaddress.c:491 #, c-format msgid "" "Key/Value pair %d, “%s”, in address element “%s” does not contain an equal " @@ -449,14 +449,14 @@ "Nøgle-/værdiparret %d, “%s” i adresseelementet “%s” indeholder ikke et " "lighedstegn" -#: gio/gdbusaddress.c:508 +#: gio/gdbusaddress.c:502 #, c-format msgid "" "Key/Value pair %d, “%s”, in address element “%s” must not have an empty key" msgstr "" "Nøgle-/værdiparret %d, “%s” i adresseelementet “%s” må ikke have en tom nøgle" -#: gio/gdbusaddress.c:522 +#: gio/gdbusaddress.c:516 #, c-format msgid "" "Error unescaping key or value in Key/Value pair %d, “%s”, in address element " @@ -465,7 +465,7 @@ "Fejl ved af-undvigelse af nøgle eller værdi i nøgle-/værdiparret %d, “%s” i " "adresseelementet “%s”" -#: gio/gdbusaddress.c:590 +#: gio/gdbusaddress.c:584 #, c-format msgid "" "Error in address “%s” — the unix transport requires exactly one of the keys " @@ -474,79 +474,79 @@ "Fejl i adressen “%s” — unix-transporten kræver at præcist en af nøglerne " "“path” eller “abstract” er givet" -#: gio/gdbusaddress.c:625 +#: gio/gdbusaddress.c:619 #, c-format msgid "Error in address “%s” — the host attribute is missing or malformed" msgstr "" "Fejl i adressen “%s” — værtsattributten mangler eller er fejlformateret" -#: gio/gdbusaddress.c:639 +#: gio/gdbusaddress.c:633 #, c-format msgid "Error in address “%s” — the port attribute is missing or malformed" msgstr "Fejl i adressen “%s” — portattributten mangler eller er fejlformateret" -#: gio/gdbusaddress.c:653 +#: gio/gdbusaddress.c:647 #, c-format msgid "Error in address “%s” — the noncefile attribute is missing or malformed" msgstr "" "Fejl i adressen “%s” — noncefile-attributten mangler eller er fejlformateret" -#: gio/gdbusaddress.c:674 +#: gio/gdbusaddress.c:668 msgid "Error auto-launching: " msgstr "Fejl ved automatisk opstart: " -#: gio/gdbusaddress.c:727 +#: gio/gdbusaddress.c:721 #, c-format msgid "Error opening nonce file “%s”: %s" msgstr "Fejl ved åbning af “nonce”-filen “%s”: %s" -#: gio/gdbusaddress.c:746 +#: gio/gdbusaddress.c:740 #, c-format msgid "Error reading from nonce file “%s”: %s" msgstr "Fejl ved læsning af “nonce”-filen “%s”: %s" -#: gio/gdbusaddress.c:755 +#: gio/gdbusaddress.c:749 #, c-format msgid "Error reading from nonce file “%s”, expected 16 bytes, got %d" msgstr "Fejl ved læsning af “nonce”-filen “%s”. Forventede 16 byte, fandt %d" -#: gio/gdbusaddress.c:773 +#: gio/gdbusaddress.c:767 #, c-format msgid "Error writing contents of nonce file “%s” to stream:" msgstr "Fejl under skrivning af indhold af “nonce”-filen “%s” til strømmen:" -#: gio/gdbusaddress.c:988 +#: gio/gdbusaddress.c:982 msgid "The given address is empty" msgstr "Den givne adresse er tom" # nå ja, det er ikke grimmere på dansk end på engelsk -#: gio/gdbusaddress.c:1101 +#: gio/gdbusaddress.c:1095 #, c-format msgid "Cannot spawn a message bus when AT_SECURE is set" msgstr "Kan ikke starte en meddelelsesbus, når AT_SECURE er indstillet" -#: gio/gdbusaddress.c:1108 +#: gio/gdbusaddress.c:1102 msgid "Cannot spawn a message bus without a machine-id: " msgstr "Kan ikke starte en meddelelsesbus uden maskine-id: " -#: gio/gdbusaddress.c:1115 +#: gio/gdbusaddress.c:1109 #, c-format msgid "Cannot autolaunch D-Bus without X11 $DISPLAY" msgstr "Kan ikke køre D-Bus automatisk uden $DISPLAY til X11" -#: gio/gdbusaddress.c:1157 +#: gio/gdbusaddress.c:1151 #, c-format msgid "Error spawning command line “%s”: " msgstr "Fejl ved kørsel af kommandolinjen “%s”: " -#: gio/gdbusaddress.c:1226 +#: gio/gdbusaddress.c:1220 #, c-format msgid "Cannot determine session bus address (not implemented for this OS)" msgstr "" "Kan ikke bestemme sessionsbussens adresse (ikke implementeret for dette " "operativsystem)" -#: gio/gdbusaddress.c:1375 gio/gdbusconnection.c:7321 +#: gio/gdbusaddress.c:1374 gio/gdbusconnection.c:7316 #, c-format msgid "" "Cannot determine bus address from DBUS_STARTER_BUS_TYPE environment variable " @@ -555,7 +555,7 @@ "Kan ikke bestemme busadressen fra miljøvariablen DBUS_STARTER_BUS_TYPE — " "ukendt værdi “%s”" -#: gio/gdbusaddress.c:1384 gio/gdbusconnection.c:7330 +#: gio/gdbusaddress.c:1383 gio/gdbusconnection.c:7325 msgid "" "Cannot determine bus address because the DBUS_STARTER_BUS_TYPE environment " "variable is not set" @@ -563,7 +563,7 @@ "Kan ikke bestemme busadressen, da miljøvariablen DBUS_STARTER_BUS_TYPE ikke " "er angivet" -#: gio/gdbusaddress.c:1394 +#: gio/gdbusaddress.c:1393 #, c-format msgid "Unknown bus type %d" msgstr "Ukendt bustype %d" @@ -584,11 +584,15 @@ "Forsøgte alle tilgængelige godkendelsesmekanismer (forsøgt: %s) " "(tilgængelige: %s)" -#: gio/gdbusauth.c:1178 +#: gio/gdbusauth.c:1045 +msgid "Unexpected lack of content trying to read a byte" +msgstr "Uventet mangel på indhold ved forsøg på at læse en byte" + +#: gio/gdbusauth.c:1195 msgid "User IDs must be the same for peer and server" msgstr "Bruger-id'er skal være de samme for peer og server" -#: gio/gdbusauth.c:1190 +#: gio/gdbusauth.c:1207 msgid "Cancelled via GDBusAuthObserver::authorize-authenticated-peer" msgstr "Annulleret via GDBusAuthObserver::authorize-authenticated-peer" @@ -681,7 +685,7 @@ msgid "(Additionally, releasing the lock for “%s” also failed: %s) " msgstr "(Yderligere kunne låsen for “%s” ikke opgives: %s) " -#: gio/gdbusconnection.c:590 gio/gdbusconnection.c:2404 +#: gio/gdbusconnection.c:590 gio/gdbusconnection.c:2405 msgid "The connection is closed" msgstr "Forbindelsen er lukket" @@ -689,119 +693,119 @@ msgid "Timeout was reached" msgstr "Tiden løb ud" -#: gio/gdbusconnection.c:2527 +#: gio/gdbusconnection.c:2528 msgid "" "Unsupported flags encountered when constructing a client-side connection" msgstr "" "Der blev fundet ikke-understøttede flag ved oprettelse af en forbindelse på " "klientsiden" -#: gio/gdbusconnection.c:4256 gio/gdbusconnection.c:4610 +#: gio/gdbusconnection.c:4257 gio/gdbusconnection.c:4611 #, c-format msgid "" "No such interface “org.freedesktop.DBus.Properties” on object at path %s" msgstr "" "Ingen grænseflade “org.freedesktop.DBus.Properties” på objekt ved stien %s" -#: gio/gdbusconnection.c:4401 +#: gio/gdbusconnection.c:4402 #, c-format msgid "No such property “%s”" msgstr "Ingen sådan egenskab “%s”" -#: gio/gdbusconnection.c:4413 +#: gio/gdbusconnection.c:4414 #, c-format msgid "Property “%s” is not readable" msgstr "Egenskaben “%s” kan ikke læses" -#: gio/gdbusconnection.c:4424 +#: gio/gdbusconnection.c:4425 #, c-format msgid "Property “%s” is not writable" msgstr "Egenskaben “%s” er skrivebeskyttet" -#: gio/gdbusconnection.c:4444 +#: gio/gdbusconnection.c:4445 #, c-format msgid "Error setting property “%s”: Expected type “%s” but got “%s”" msgstr "" "Fejl ved anvendelse af egenskaben “%s”: Forventede typen “%s”, men fik “%s”" -#: gio/gdbusconnection.c:4549 gio/gdbusconnection.c:4764 -#: gio/gdbusconnection.c:6747 +#: gio/gdbusconnection.c:4550 gio/gdbusconnection.c:4765 +#: gio/gdbusconnection.c:6742 #, c-format msgid "No such interface “%s”" msgstr "Ingen sådan grænseflade “%s”" -#: gio/gdbusconnection.c:4986 gio/gdbusconnection.c:7261 +#: gio/gdbusconnection.c:4981 gio/gdbusconnection.c:7256 #, c-format msgid "No such interface “%s” on object at path %s" msgstr "Ingen sådan grænseflade “%s” på objektet ved stien %s" -#: gio/gdbusconnection.c:5087 +#: gio/gdbusconnection.c:5082 #, c-format msgid "No such method “%s”" msgstr "Ingen sådan metode “%s”" -#: gio/gdbusconnection.c:5118 +#: gio/gdbusconnection.c:5113 #, c-format msgid "Type of message, “%s”, does not match expected type “%s”" msgstr "Beskedtypen “%s” er ikke den forventede type, “%s”" -#: gio/gdbusconnection.c:5321 +#: gio/gdbusconnection.c:5316 #, c-format msgid "An object is already exported for the interface %s at %s" msgstr "Der er allerede eksporteret et objekt for grænsefladen %s på %s" -#: gio/gdbusconnection.c:5548 +#: gio/gdbusconnection.c:5543 #, c-format msgid "Unable to retrieve property %s.%s" msgstr "Kan ikke hente egenskaben %s.%s" -#: gio/gdbusconnection.c:5604 +#: gio/gdbusconnection.c:5599 #, c-format msgid "Unable to set property %s.%s" msgstr "Kan ikke sætte egenskaben %s.%s" -#: gio/gdbusconnection.c:5783 +#: gio/gdbusconnection.c:5778 #, c-format msgid "Method “%s” returned type “%s”, but expected “%s”" msgstr "Metoden “%s” returnerede typen “%s”, men forventede “%s”" -#: gio/gdbusconnection.c:6859 +#: gio/gdbusconnection.c:6854 #, c-format msgid "Method “%s” on interface “%s” with signature “%s” does not exist" msgstr "Metoden “%s” på grænsefladen “%s” med signatur “%s” findes ikke" -#: gio/gdbusconnection.c:6980 +#: gio/gdbusconnection.c:6975 #, c-format msgid "A subtree is already exported for %s" msgstr "Der er allerede eksporteret et undertræ for %s" -#: gio/gdbusconnection.c:7269 +#: gio/gdbusconnection.c:7264 #, c-format msgid "Object does not exist at path “%s”" msgstr "Objektet findes ikke ved stien “%s”" -#: gio/gdbusmessage.c:1303 +#: gio/gdbusmessage.c:1306 msgid "type is INVALID" msgstr "typen er INVALID" -#: gio/gdbusmessage.c:1314 +#: gio/gdbusmessage.c:1317 msgid "METHOD_CALL message: PATH or MEMBER header field is missing" msgstr "" "Meddelelse for METHOD_CALL: Et af teksthovederne PATH eller MEMBER mangler" -#: gio/gdbusmessage.c:1325 +#: gio/gdbusmessage.c:1328 msgid "METHOD_RETURN message: REPLY_SERIAL header field is missing" msgstr "Meddelelse for METHOD_RETURN: Teksthovedet REPLY_SERIAL mangler" -#: gio/gdbusmessage.c:1337 +#: gio/gdbusmessage.c:1340 msgid "ERROR message: REPLY_SERIAL or ERROR_NAME header field is missing" msgstr "FEJLmeddelelse: Teksthovedet REPLY_SERIAL eller ERROR_NAME mangler" -#: gio/gdbusmessage.c:1350 +#: gio/gdbusmessage.c:1353 msgid "SIGNAL message: PATH, INTERFACE or MEMBER header field is missing" msgstr "SIGNALmeddelelse: Teksthovedet PATH, INTERFACE eller MEMBER mangler" -#: gio/gdbusmessage.c:1358 +#: gio/gdbusmessage.c:1361 msgid "" "SIGNAL message: The PATH header field is using the reserved value /org/" "freedesktop/DBus/Local" @@ -809,7 +813,7 @@ "SIGNALmeddelelse: Teksthovedet PATH bruger den reserverede værdi /org/" "freedesktop/DBus/Local" -#: gio/gdbusmessage.c:1366 +#: gio/gdbusmessage.c:1369 msgid "" "SIGNAL message: The INTERFACE header field is using the reserved value org." "freedesktop.DBus.Local" @@ -817,19 +821,19 @@ "SIGNALbesked: Teksthovedet INTERFACE bruger den reserverede værdi org." "freedesktop.DBus.Local" -#: gio/gdbusmessage.c:1414 gio/gdbusmessage.c:1474 +#: gio/gdbusmessage.c:1417 gio/gdbusmessage.c:1477 #, c-format msgid "Wanted to read %lu byte but only got %lu" msgid_plural "Wanted to read %lu bytes but only got %lu" msgstr0 "Ville læse %lu byte men fik kun %lu" msgstr1 "Ville læse %lu byte men fik kun %lu" -#: gio/gdbusmessage.c:1428 +#: gio/gdbusmessage.c:1431 #, c-format msgid "Expected NUL byte after the string “%s” but found byte %d" msgstr "Forventede NUL-byte efter strengen “%s”, men fandt byte %d" -#: gio/gdbusmessage.c:1447 +#: gio/gdbusmessage.c:1450 #, c-format msgid "" "Expected valid UTF-8 string but found invalid bytes at byte offset %d " @@ -839,21 +843,21 @@ "(strengens længde er %d). Den gyldige UTF-8-streng indtil dette punkt var " "“%s”" -#: gio/gdbusmessage.c:1511 gio/gdbusmessage.c:1787 gio/gdbusmessage.c:1998 +#: gio/gdbusmessage.c:1514 gio/gdbusmessage.c:1790 gio/gdbusmessage.c:2001 msgid "Value nested too deeply" msgstr "Værdien er for dybt indlejret" -#: gio/gdbusmessage.c:1679 +#: gio/gdbusmessage.c:1682 #, c-format msgid "Parsed value “%s” is not a valid D-Bus object path" msgstr "Den fortolkede værdi “%s” er ikke en gyldig objektsti til D-Bus" -#: gio/gdbusmessage.c:1703 +#: gio/gdbusmessage.c:1706 #, c-format msgid "Parsed value “%s” is not a valid D-Bus signature" msgstr "Fortolket værdi “%s” er ikke en gyldig D-Bus-signatur" -#: gio/gdbusmessage.c:1754 +#: gio/gdbusmessage.c:1757 #, c-format msgid "" "Encountered array of length %u byte. Maximum length is 2<<26 bytes (64 MiB)." @@ -866,7 +870,7 @@ "Stødte på et array med længde %u byte. Den maksimale længde er 2<<26 byte " "(64 MiB)." -#: gio/gdbusmessage.c:1774 +#: gio/gdbusmessage.c:1777 #, c-format msgid "" "Encountered array of type “a%c”, expected to have a length a multiple of %u " @@ -875,16 +879,16 @@ "Stødte på et array af typen “a%c”, som ventes at have en længde som er et " "multiplum af %u byte, men som havde længde %u byte" -#: gio/gdbusmessage.c:1928 gio/gdbusmessage.c:2647 +#: gio/gdbusmessage.c:1931 gio/gdbusmessage.c:2650 msgid "Empty structures (tuples) are not allowed in D-Bus" msgstr "Tomme strukturer (tupler) er ikke tilladte i D-Bus" -#: gio/gdbusmessage.c:1982 +#: gio/gdbusmessage.c:1985 #, c-format msgid "Parsed value “%s” for variant is not a valid D-Bus signature" msgstr "Fortolket værdi “%s” for variant er ikke en gyldig D-Bus-signatur" -#: gio/gdbusmessage.c:2023 +#: gio/gdbusmessage.c:2026 #, c-format msgid "" "Error deserializing GVariant with type string “%s” from the D-Bus wire format" @@ -892,7 +896,7 @@ "Fejl ved deserialisering af GVariant med type-streng “%s” fra D-Bus-wire-" "formatet" -#: gio/gdbusmessage.c:2208 +#: gio/gdbusmessage.c:2211 #, c-format msgid "" "Invalid endianness value. Expected 0x6c (“l”) or 0x42 (“B”) but found value " @@ -901,38 +905,38 @@ "Ugyldigt værdi for byterækkefølge (endianness). Forventede 0x6c (“l”) eller " "0x42 (“B”), men fandt værdien 0x%02x" -#: gio/gdbusmessage.c:2227 +#: gio/gdbusmessage.c:2230 #, c-format msgid "Invalid major protocol version. Expected 1 but found %d" msgstr "Ugyldig hovedprotokolversion. Forventede 1 men fandt %d" -#: gio/gdbusmessage.c:2285 gio/gdbusmessage.c:2883 +#: gio/gdbusmessage.c:2288 gio/gdbusmessage.c:2886 msgid "Signature header found but is not of type signature" msgstr "Signaturteksthoved fundet, men er ikke af typen signatur" -#: gio/gdbusmessage.c:2297 +#: gio/gdbusmessage.c:2300 #, c-format msgid "Signature header with signature “%s” found but message body is empty" msgstr "" "Signaturteksthoved med signaturen “%s” fundet, men beskedteksten er tom" -#: gio/gdbusmessage.c:2312 +#: gio/gdbusmessage.c:2315 #, c-format msgid "Parsed value “%s” is not a valid D-Bus signature (for body)" msgstr "Fortolket værdi “%s” er ikke en gyldig D-Bus-signatur (for tekst)" -#: gio/gdbusmessage.c:2344 +#: gio/gdbusmessage.c:2347 #, 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" msgstr0 "Intet signaturteksthoved i beskeden, men beskedteksten er %u byte" msgstr1 "Intet signaturteksthoved i beskeden, men beskedteksten er %u byte" -#: gio/gdbusmessage.c:2354 +#: gio/gdbusmessage.c:2357 msgid "Cannot deserialize message: " msgstr "Kan ikke deserialisere besked: " -#: gio/gdbusmessage.c:2700 +#: gio/gdbusmessage.c:2703 #, c-format msgid "" "Error serializing GVariant with type string “%s” to the D-Bus wire format" @@ -940,23 +944,23 @@ "Fejl ved serialisering af GVariant med typestreng “%s” til D-Bus-wire-" "formatet" -#: gio/gdbusmessage.c:2837 +#: gio/gdbusmessage.c:2840 #, c-format msgid "" "Number of file descriptors in message (%d) differs from header field (%d)" msgstr "" "Antal fildeskriptorer i meddelelsen (%d) er forskelligt fra teksthovedet (%d)" -#: gio/gdbusmessage.c:2845 +#: gio/gdbusmessage.c:2848 msgid "Cannot serialize message: " msgstr "Kan ikke serialisere besked: " -#: gio/gdbusmessage.c:2898 +#: gio/gdbusmessage.c:2901 #, c-format msgid "Message body has signature “%s” but there is no signature header" msgstr "Beskedteksten har signatur “%s”, men der er intet signaturteksthoved" -#: gio/gdbusmessage.c:2908 +#: gio/gdbusmessage.c:2911 #, c-format msgid "" "Message body has type signature “%s” but signature in the header field is " @@ -964,17 +968,17 @@ msgstr "" "Beskedteksten har typesignatur “%s”, men signaturen i teksthovedet er “%s”" -#: gio/gdbusmessage.c:2924 +#: gio/gdbusmessage.c:2927 #, c-format msgid "Message body is empty but signature in the header field is “(%s)”" msgstr "Beskedteksten er tom, men signaturen i teksthovedet er “(%s)”" -#: gio/gdbusmessage.c:3479 +#: gio/gdbusmessage.c:3482 #, c-format msgid "Error return with body of type “%s”" msgstr "Fejlagtig returværdi med beskedtekst af typen “%s”" -#: gio/gdbusmessage.c:3487 +#: gio/gdbusmessage.c:3490 msgid "Error return with empty body" msgstr "Fejlagtig returværdi - tom beskedtekst" @@ -999,18 +1003,18 @@ msgid "Unable to load %s or %s: " msgstr "Kan ikke indlæse %s eller %s: " -#: gio/gdbusproxy.c:1575 +#: gio/gdbusproxy.c:1568 #, c-format msgid "Error calling StartServiceByName for %s: " msgstr "Fejl ved kald til StartServiceByName for %s: " -#: gio/gdbusproxy.c:1598 +#: gio/gdbusproxy.c:1591 #, c-format msgid "Unexpected reply %d from StartServiceByName(\"%s\") method" msgstr "Uventet svar %d fra metoden StartServiceByName(“%s”)" # Ved ikke helt hvad proxy dækker over her -#: gio/gdbusproxy.c:2709 gio/gdbusproxy.c:2844 +#: gio/gdbusproxy.c:2702 gio/gdbusproxy.c:2837 #, c-format msgid "" "Cannot invoke method; proxy is for the well-known name %s without an owner, " @@ -1019,25 +1023,25 @@ "Kan ikke kalde metode; proxy er for et velkendt navn %s uden ejer, og proxy " "blev konstrueret med flaget G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START" -#: gio/gdbusserver.c:765 +#: gio/gdbusserver.c:758 msgid "Abstract namespace not supported" msgstr "Abstrakt navnerum understøttes ikke" -#: gio/gdbusserver.c:857 +#: gio/gdbusserver.c:850 msgid "Cannot specify nonce file when creating a server" msgstr "Kan ikke angive “nonce”-fil ved oprettelse af server" -#: gio/gdbusserver.c:939 +#: gio/gdbusserver.c:932 #, c-format msgid "Error writing nonce file at “%s”: %s" msgstr "Fejl ved skrivning af “nonce”-fil i “%s”: %s" -#: gio/gdbusserver.c:1114 +#: gio/gdbusserver.c:1107 #, c-format msgid "The string “%s” is not a valid D-Bus GUID" msgstr "Strengen “%s” er ikke en gyldig D-Bus-GUID" -#: gio/gdbusserver.c:1152 +#: gio/gdbusserver.c:1145 #, c-format msgid "Cannot listen on unsupported transport “%s”" msgstr "Kan ikke lytte på ikke-understøttet transport “%s”" @@ -1065,14 +1069,14 @@ "\n" "Brug “%s KOMMANDO --help” for at få hjælp om hver kommando.\n" -#: gio/gdbus-tool.c:204 gio/gdbus-tool.c:276 gio/gdbus-tool.c:348 -#: gio/gdbus-tool.c:372 gio/gdbus-tool.c:862 gio/gdbus-tool.c:1247 -#: gio/gdbus-tool.c:1734 +#: gio/gdbus-tool.c:204 gio/gdbus-tool.c:276 gio/gdbus-tool.c:347 +#: gio/gdbus-tool.c:371 gio/gdbus-tool.c:861 gio/gdbus-tool.c:1246 +#: gio/gdbus-tool.c:1733 #, c-format msgid "Error: %s\n" msgstr "Fejl: %s\n" -#: gio/gdbus-tool.c:215 gio/gdbus-tool.c:289 gio/gdbus-tool.c:1750 +#: gio/gdbus-tool.c:215 gio/gdbus-tool.c:289 gio/gdbus-tool.c:1749 #, c-format msgid "Error parsing introspection XML: %s\n" msgstr "Fejl ved fortolkning af XML til introspektion: %s\n" @@ -1082,49 +1086,49 @@ msgid "Error: %s is not a valid name\n" msgstr "Fejl: %s er ikke et gyldigt navn\n" -#: gio/gdbus-tool.c:258 gio/gdbus-tool.c:748 gio/gdbus-tool.c:1066 -#: gio/gdbus-tool.c:1900 gio/gdbus-tool.c:2140 +#: gio/gdbus-tool.c:258 gio/gdbus-tool.c:747 gio/gdbus-tool.c:1065 +#: gio/gdbus-tool.c:1899 gio/gdbus-tool.c:2139 #, c-format msgid "Error: %s is not a valid object path\n" msgstr "Fejl: “%s” er ikke en gyldig objektsti\n" -#: gio/gdbus-tool.c:406 +#: gio/gdbus-tool.c:405 msgid "Connect to the system bus" msgstr "Forbind til systembussen" -#: gio/gdbus-tool.c:407 +#: gio/gdbus-tool.c:406 msgid "Connect to the session bus" msgstr "Forbind til sessionsbussen" -#: gio/gdbus-tool.c:408 +#: gio/gdbus-tool.c:407 msgid "Connect to given D-Bus address" msgstr "Forbind til den givne D-Bus-adresse" -#: gio/gdbus-tool.c:418 +#: gio/gdbus-tool.c:417 msgid "Connection Endpoint Options:" msgstr "Tilvalg for forbindelsesslutpunkt:" -#: gio/gdbus-tool.c:419 +#: gio/gdbus-tool.c:418 msgid "Options specifying the connection endpoint" msgstr "Tilvalg, der angiver forbindelsens slutpunkt" -#: gio/gdbus-tool.c:442 +#: gio/gdbus-tool.c:441 #, c-format msgid "No connection endpoint specified" msgstr "Intet slutpunkt for forbindelsen angivet" -#: gio/gdbus-tool.c:452 +#: gio/gdbus-tool.c:451 #, c-format msgid "Multiple connection endpoints specified" msgstr "Flere slutpunkter for forbindelsen angivet" -#: gio/gdbus-tool.c:525 +#: gio/gdbus-tool.c:524 #, c-format msgid "" "Warning: According to introspection data, interface “%s” does not exist\n" msgstr "Advarsel: Grænsefladen “%s” findes ikke ifølge introspektionsdata\n" -#: gio/gdbus-tool.c:534 +#: gio/gdbus-tool.c:533 #, c-format msgid "" "Warning: According to introspection data, method “%s” does not exist on " @@ -1133,164 +1137,164 @@ "Advarsel: Metoden “%s” findes ikke i grænsefladen “%s” ifølge " "introspektionsdata\n" -#: gio/gdbus-tool.c:596 +#: gio/gdbus-tool.c:595 msgid "Optional destination for signal (unique name)" msgstr "Valgfri destination for signal (unikt navn)" -#: gio/gdbus-tool.c:597 +#: gio/gdbus-tool.c:596 msgid "Object path to emit signal on" msgstr "Objektsti, der skal udsendes et signal fra" -#: gio/gdbus-tool.c:598 +#: gio/gdbus-tool.c:597 msgid "Signal and interface name" msgstr "Signal- og grænsefladenavn" -#: gio/gdbus-tool.c:631 +#: gio/gdbus-tool.c:630 msgid "Emit a signal." msgstr "Udsend et signal." -#: gio/gdbus-tool.c:686 gio/gdbus-tool.c:1003 gio/gdbus-tool.c:1837 -#: gio/gdbus-tool.c:2069 gio/gdbus-tool.c:2289 +#: gio/gdbus-tool.c:685 gio/gdbus-tool.c:1002 gio/gdbus-tool.c:1836 +#: gio/gdbus-tool.c:2068 gio/gdbus-tool.c:2288 #, c-format msgid "Error connecting: %s\n" msgstr "Fejl ved forbindelse: %s\n" -#: gio/gdbus-tool.c:706 +#: gio/gdbus-tool.c:705 #, c-format msgid "Error: %s is not a valid unique bus name.\n" msgstr "Fejl: “%s” er ikke et gyldigt unikt busnavn.\n" -#: gio/gdbus-tool.c:725 gio/gdbus-tool.c:1046 gio/gdbus-tool.c:1880 +#: gio/gdbus-tool.c:724 gio/gdbus-tool.c:1045 gio/gdbus-tool.c:1879 msgid "Error: Object path is not specified\n" msgstr "Fejl: Objektstien er ikke angivet\n" -#: gio/gdbus-tool.c:768 +#: gio/gdbus-tool.c:767 msgid "Error: Signal name is not specified\n" msgstr "Fejl: Signalnavnet er ikke angivet\n" -#: gio/gdbus-tool.c:782 +#: gio/gdbus-tool.c:781 #, c-format msgid "Error: Signal name “%s” is invalid\n" msgstr "Fejl: Signalnavnet “%s” er ugyldigt\n" -#: gio/gdbus-tool.c:794 +#: gio/gdbus-tool.c:793 #, c-format msgid "Error: %s is not a valid interface name\n" msgstr "Fejl: “%s” er ikke et gyldigt grænsefladenavn\n" -#: gio/gdbus-tool.c:800 +#: gio/gdbus-tool.c:799 #, c-format msgid "Error: %s is not a valid member name\n" msgstr "Fejl: “%s” er ikke et gyldigt medlemsnavn\n" #. Use the original non-"parse-me-harder" error -#: gio/gdbus-tool.c:837 gio/gdbus-tool.c:1178 +#: gio/gdbus-tool.c:836 gio/gdbus-tool.c:1177 #, c-format msgid "Error parsing parameter %d: %s\n" msgstr "Fejl ved fortolkning af parameter %d: %s\n" -#: gio/gdbus-tool.c:869 +#: gio/gdbus-tool.c:868 #, c-format msgid "Error flushing connection: %s\n" msgstr "Fejl ved tømning (flush) af forbindelse: %s\n" -#: gio/gdbus-tool.c:897 +#: gio/gdbus-tool.c:896 msgid "Destination name to invoke method on" msgstr "Destinationsnavnet, som metoden skal kaldes på" -#: gio/gdbus-tool.c:898 +#: gio/gdbus-tool.c:897 msgid "Object path to invoke method on" msgstr "Objektstien, som metoden skal kaldes på" -#: gio/gdbus-tool.c:899 +#: gio/gdbus-tool.c:898 msgid "Method and interface name" msgstr "Metode- og grænsefladenavn" -#: gio/gdbus-tool.c:900 +#: gio/gdbus-tool.c:899 msgid "Timeout in seconds" msgstr "Tidsudløb i sekunder" -#: gio/gdbus-tool.c:901 +#: gio/gdbus-tool.c:900 msgid "Allow interactive authorization" msgstr "Tillad interaktiv godkendelse" -#: gio/gdbus-tool.c:948 +#: gio/gdbus-tool.c:947 msgid "Invoke a method on a remote object." msgstr "Kald en metode på et fjernobjekt." -#: gio/gdbus-tool.c:1020 gio/gdbus-tool.c:1854 gio/gdbus-tool.c:2094 +#: gio/gdbus-tool.c:1019 gio/gdbus-tool.c:1853 gio/gdbus-tool.c:2093 msgid "Error: Destination is not specified\n" msgstr "Fejl: Destinationen er ikke angivet\n" -#: gio/gdbus-tool.c:1031 gio/gdbus-tool.c:1871 gio/gdbus-tool.c:2105 +#: gio/gdbus-tool.c:1030 gio/gdbus-tool.c:1870 gio/gdbus-tool.c:2104 #, c-format msgid "Error: %s is not a valid bus name\n" msgstr "Fejl: %s er ikke et gyldigt busnavn\n" -#: gio/gdbus-tool.c:1081 +#: gio/gdbus-tool.c:1080 msgid "Error: Method name is not specified\n" msgstr "Fejl: Metodenavnet er ikke angivet\n" -#: gio/gdbus-tool.c:1092 +#: gio/gdbus-tool.c:1091 #, c-format msgid "Error: Method name “%s” is invalid\n" msgstr "Fejl: Metodenavnet “%s” er ugyldigt\n" -#: gio/gdbus-tool.c:1170 +#: gio/gdbus-tool.c:1169 #, c-format msgid "Error parsing parameter %d of type “%s”: %s\n" msgstr "Fejl ved fortolkning af parameter %d af typen “%s”: %s\n" -#: gio/gdbus-tool.c:1196 +#: gio/gdbus-tool.c:1195 #, c-format msgid "Error adding handle %d: %s\n" msgstr "Fejl ved tilføjelse af håndtag: %d: %s\n" -#: gio/gdbus-tool.c:1696 +#: gio/gdbus-tool.c:1695 msgid "Destination name to introspect" msgstr "Destinationsnavnet, der skal introspiceres" -#: gio/gdbus-tool.c:1697 +#: gio/gdbus-tool.c:1696 msgid "Object path to introspect" msgstr "Objektstien, der skal introspiceres" -#: gio/gdbus-tool.c:1698 +#: gio/gdbus-tool.c:1697 msgid "Print XML" msgstr "Udskriv XML" -#: gio/gdbus-tool.c:1699 +#: gio/gdbus-tool.c:1698 msgid "Introspect children" msgstr "Foretag introspektion af underelementer" -#: gio/gdbus-tool.c:1700 +#: gio/gdbus-tool.c:1699 msgid "Only print properties" msgstr "Vis kun egenskaber" -#: gio/gdbus-tool.c:1789 +#: gio/gdbus-tool.c:1788 msgid "Introspect a remote object." msgstr "Introspicér et fjernobjekt." -#: gio/gdbus-tool.c:1995 +#: gio/gdbus-tool.c:1994 msgid "Destination name to monitor" msgstr "Navn på destination, der skal overvåges" -#: gio/gdbus-tool.c:1996 +#: gio/gdbus-tool.c:1995 msgid "Object path to monitor" msgstr "Objektsti, der skal overvåges" -#: gio/gdbus-tool.c:2021 +#: gio/gdbus-tool.c:2020 msgid "Monitor a remote object." msgstr "Overvåg et fjernobjekt." -#: gio/gdbus-tool.c:2079 +#: gio/gdbus-tool.c:2078 msgid "Error: can’t monitor a non-message-bus connection\n" msgstr "Fejl: Kan ikke overvåge en ikke-meddelelsesbus-forbindelse\n" -#: gio/gdbus-tool.c:2203 +#: gio/gdbus-tool.c:2202 msgid "Service to activate before waiting for the other one (well-known name)" msgstr "Tjeneste som skal aktiveres, før den anden afventes (velkendt navn)" -#: gio/gdbus-tool.c:2206 +#: gio/gdbus-tool.c:2205 msgid "" "Timeout to wait for before exiting with an error (seconds); 0 for no timeout " "(default)" @@ -1298,27 +1302,27 @@ "Ventetid før afslutning med fejl (sekunder); 0 for ingen tidsgrænse " "(standard)" -#: gio/gdbus-tool.c:2254 +#: gio/gdbus-tool.c:2253 msgid "OPTION… BUS-NAME" msgstr "TILVALG … BUSNAVN" -#: gio/gdbus-tool.c:2255 +#: gio/gdbus-tool.c:2254 msgid "Wait for a bus name to appear." msgstr "Vent på at et busnavn fremkommer." -#: gio/gdbus-tool.c:2331 +#: gio/gdbus-tool.c:2330 msgid "Error: A service to activate for must be specified.\n" msgstr "Fejl: Der skal angives en tjeneste at aktivere for.\n" -#: gio/gdbus-tool.c:2336 +#: gio/gdbus-tool.c:2335 msgid "Error: A service to wait for must be specified.\n" msgstr "Fejl: Der skal angives en tjeneste at vente på.\n" -#: gio/gdbus-tool.c:2341 +#: gio/gdbus-tool.c:2340 msgid "Error: Too many arguments.\n" msgstr "Fejl: For mange argumenter.\n" -#: gio/gdbus-tool.c:2349 gio/gdbus-tool.c:2356 +#: gio/gdbus-tool.c:2348 gio/gdbus-tool.c:2355 #, c-format msgid "Error: %s is not a valid well-known bus name.\n" msgstr "Fejl: %s er ikke et gyldigt velkendt busnavn.\n" @@ -1328,38 +1332,43 @@ msgid "Not authorized to change debug settings" msgstr "Ikke godkendt til at ændre fejlsøgningsindstillinger" -#: gio/gdesktopappinfo.c:2182 gio/gdesktopappinfo.c:5113 +#: gio/gdesktopappinfo.c:2242 gio/gdesktopappinfo.c:5223 msgid "Unnamed" msgstr "Unavngivet" -#: gio/gdesktopappinfo.c:2592 +#: gio/gdesktopappinfo.c:2652 msgid "Desktop file didn’t specify Exec field" msgstr "Skrivebordsfil angav intet Exec-felt" -#: gio/gdesktopappinfo.c:2891 +#: gio/gdesktopappinfo.c:2942 msgid "Unable to find terminal required for application" msgstr "Kan ikke finde terminal krævet af dette program" -#: gio/gdesktopappinfo.c:3631 +#: gio/gdesktopappinfo.c:3002 +#, c-format +msgid "Program ‘%s’ not found in $PATH" +msgstr "Programmet “%s” blev ikke fundet i $PATH" + +#: gio/gdesktopappinfo.c:3735 #, c-format msgid "Can’t create user application configuration folder %s: %s" msgstr "Kan ikke oprette konfigurationsfolder %s for brugerprogram: %s" -#: gio/gdesktopappinfo.c:3635 +#: gio/gdesktopappinfo.c:3739 #, c-format msgid "Can’t create user MIME configuration folder %s: %s" msgstr "Kan ikke oprette bruger-MIME-konfigurationsfolder %s: %s" -#: gio/gdesktopappinfo.c:3877 gio/gdesktopappinfo.c:3901 +#: gio/gdesktopappinfo.c:3981 gio/gdesktopappinfo.c:4005 msgid "Application information lacks an identifier" msgstr "Programinformation mangler en identifikator" -#: gio/gdesktopappinfo.c:4137 +#: gio/gdesktopappinfo.c:4241 #, c-format msgid "Can’t create user desktop file %s" msgstr "Kan ikke oprette brugerskrivebords-fil %s" -#: gio/gdesktopappinfo.c:4273 +#: gio/gdesktopappinfo.c:4377 #, c-format msgid "Custom definition for %s" msgstr "Tilpasset definition for %s" @@ -1432,7 +1441,7 @@ msgid "Containing mount does not exist" msgstr "Indeholdende montering findes ikke" -#: gio/gfile.c:2641 gio/glocalfile.c:2500 +#: gio/gfile.c:2641 gio/glocalfile.c:2511 msgid "Can’t copy over directory" msgstr "Kan ikke kopiere over mappe" @@ -1477,7 +1486,7 @@ msgid "Invalid symlink value given" msgstr "Ugyldig værdi givet for symlink" -#: gio/gfile.c:4163 glib/gfileutils.c:2335 +#: gio/gfile.c:4163 glib/gfileutils.c:2392 msgid "Symbolic links not supported" msgstr "Symbolske links er ikke understøttet" @@ -1580,38 +1589,38 @@ msgid "HTTP proxy server closed connection unexpectedly." msgstr "HTTP-proxyserveren lukkede uventet forbindelsen." -#: gio/gicon.c:300 +#: gio/gicon.c:299 #, c-format msgid "Wrong number of tokens (%d)" msgstr "Forkert antal tegn (%d)" -#: gio/gicon.c:320 +#: gio/gicon.c:319 #, c-format msgid "No type for class name %s" msgstr "Ingen type til klassenavn %s" -#: gio/gicon.c:330 +#: gio/gicon.c:329 #, c-format msgid "Type %s does not implement the GIcon interface" msgstr "Typen %s implementerer ikke GIcon-grænsefladen" -#: gio/gicon.c:341 +#: gio/gicon.c:340 #, c-format msgid "Type %s is not classed" msgstr "Typen %s har ingen klasse" -#: gio/gicon.c:355 +#: gio/gicon.c:354 #, c-format msgid "Malformed version number: %s" msgstr "Fejlformateret versionsnummer %s" -#: gio/gicon.c:369 +#: gio/gicon.c:368 #, c-format msgid "Type %s does not implement from_tokens() on the GIcon interface" msgstr "" "Typen %s implementerer ikke from_tokens(), som er del af GIcon-grænsefladen" -#: gio/gicon.c:471 +#: gio/gicon.c:470 msgid "Can’t handle the supplied version of the icon encoding" msgstr "Kan ikke håndtere den givne version af ikonkodningen" @@ -1761,7 +1770,7 @@ #: gio/gio-tool-cat.c:135 gio/gio-tool-info.c:379 gio/gio-tool-list.c:173 #: gio/gio-tool-mkdir.c:50 gio/gio-tool-monitor.c:39 gio/gio-tool-monitor.c:41 #: gio/gio-tool-monitor.c:43 gio/gio-tool-monitor.c:45 -#: gio/gio-tool-monitor.c:206 gio/gio-tool-mount.c:1202 gio/gio-tool-open.c:72 +#: gio/gio-tool-monitor.c:206 gio/gio-tool-mount.c:1210 gio/gio-tool-open.c:72 #: gio/gio-tool-remove.c:50 gio/gio-tool-rename.c:47 gio/gio-tool-set.c:95 #: gio/gio-tool-trash.c:222 gio/gio-tool-tree.c:241 msgid "LOCATION" @@ -1782,7 +1791,7 @@ "smb://server/ressource/fil.txt som sted." #: gio/gio-tool-cat.c:164 gio/gio-tool-info.c:410 gio/gio-tool-mkdir.c:78 -#: gio/gio-tool-monitor.c:231 gio/gio-tool-mount.c:1253 gio/gio-tool-open.c:98 +#: gio/gio-tool-monitor.c:231 gio/gio-tool-mount.c:1261 gio/gio-tool-open.c:98 #: gio/gio-tool-remove.c:74 gio/gio-tool-trash.c:303 msgid "No locations given" msgstr "Ingen steder givet" @@ -2199,19 +2208,19 @@ msgid "Mount a TCRYPT system volume" msgstr "Montér en TCRYPT-systemdiskenhed" -#: gio/gio-tool-mount.c:268 gio/gio-tool-mount.c:300 +#: gio/gio-tool-mount.c:276 gio/gio-tool-mount.c:308 msgid "Anonymous access denied" msgstr "Anonym adgang nægtet" -#: gio/gio-tool-mount.c:525 +#: gio/gio-tool-mount.c:533 msgid "No drive for device file" msgstr "Intet drev for enhedsfilen" -#: gio/gio-tool-mount.c:1017 +#: gio/gio-tool-mount.c:1025 msgid "No volume for given ID" msgstr "Ingen diskenhed for givent id" -#: gio/gio-tool-mount.c:1206 +#: gio/gio-tool-mount.c:1214 msgid "Mount or unmount the locations." msgstr "Montér eller afmontér stederne." @@ -2417,7 +2426,7 @@ msgid "List contents of directories in a tree-like format." msgstr "Vis indhold af mapper i et træagtigt format." -#: gio/glib-compile-resources.c:142 gio/glib-compile-schemas.c:1516 +#: gio/glib-compile-resources.c:142 gio/glib-compile-schemas.c:1513 #, c-format msgid "Element <%s> not allowed inside <%s>" msgstr "Elementet <%s> er ikke tilladt inden i <%s>" @@ -2473,7 +2482,7 @@ msgid "text may not appear inside <%s>" msgstr "der må ikke være tekst inden i <%s>" -#: gio/glib-compile-resources.c:821 gio/glib-compile-schemas.c:2174 +#: gio/glib-compile-resources.c:821 gio/glib-compile-schemas.c:2171 msgid "Show program version and exit" msgstr "Vis programversion og afslut" @@ -2489,8 +2498,8 @@ "Katalogerne hvorfra filer fra henvisninger i FIL læses (som standard det " "nuværende katalog)" -#: gio/glib-compile-resources.c:823 gio/glib-compile-schemas.c:2175 -#: gio/glib-compile-schemas.c:2204 +#: gio/glib-compile-resources.c:823 gio/glib-compile-schemas.c:2172 +#: gio/glib-compile-schemas.c:2201 msgid "DIRECTORY" msgstr "KATALOG" @@ -2714,16 +2723,16 @@ msgid "<aliases> must contain at least one <alias>" msgstr "<aliases> skal indeholde mindst én <alias>" -#: gio/glib-compile-schemas.c:799 +#: gio/glib-compile-schemas.c:796 msgid "Empty names are not permitted" msgstr "Tomme navne er ikke tilladt" -#: gio/glib-compile-schemas.c:809 +#: gio/glib-compile-schemas.c:806 #, c-format msgid "Invalid name “%s”: names must begin with a lowercase letter" msgstr "Ugyldigt navn “%s”: Navne skal begynde med et lille bogstav" -#: gio/glib-compile-schemas.c:821 +#: gio/glib-compile-schemas.c:818 #, c-format msgid "" "Invalid name “%s”: invalid character “%c”; only lowercase letters, numbers " @@ -2732,36 +2741,36 @@ "Ugyldigt navn “%s”: ugyldigt tegn “%c”; kun små bogstaver, tal og bindestreg " "(“-”) er tilladt" -#: gio/glib-compile-schemas.c:830 +#: gio/glib-compile-schemas.c:827 #, c-format msgid "Invalid name “%s”: two successive hyphens (“--”) are not permitted" msgstr "Ugyldigt navn “%s”: To bindestreger i træk (“--”) er ikke tilladt" -#: gio/glib-compile-schemas.c:839 +#: gio/glib-compile-schemas.c:836 #, c-format msgid "Invalid name “%s”: the last character may not be a hyphen (“-”)" msgstr "Ugyldigt navn “%s”: Sidste tegn må ikke være en bindestreg (“-”)" -#: gio/glib-compile-schemas.c:847 +#: gio/glib-compile-schemas.c:844 #, c-format msgid "Invalid name “%s”: maximum length is 1024" msgstr "Ugyldigt navn “%s”: maksimale længde er 1024" -#: gio/glib-compile-schemas.c:919 +#: gio/glib-compile-schemas.c:916 #, c-format msgid "<child name='%s'> already specified" msgstr "<child name='%s'> allerede angivet" -#: gio/glib-compile-schemas.c:945 +#: gio/glib-compile-schemas.c:942 msgid "Cannot add keys to a “list-of” schema" msgstr "Kan ikke føje nøgler til et “list-of”-skema" -#: gio/glib-compile-schemas.c:956 +#: gio/glib-compile-schemas.c:953 #, c-format msgid "<key name='%s'> already specified" msgstr "<key name='%s'> allerede angivet" -#: gio/glib-compile-schemas.c:974 +#: gio/glib-compile-schemas.c:971 #, c-format msgid "" "<key name='%s'> shadows <key name='%s'> in <schema id='%s'>; use <override> " @@ -2770,7 +2779,7 @@ "<key name='%s'> overskygger <key name='%s'> i <schema id='%s'>; brug " "<override> for at ændre værdi" -#: gio/glib-compile-schemas.c:985 +#: gio/glib-compile-schemas.c:982 #, c-format msgid "" "Exactly one of “type”, “enum” or “flags” must be specified as an attribute " @@ -2779,57 +2788,57 @@ "Præcist en af “type”, “enum” eller “flags” skal være angivet som attribut " "for <key>" -#: gio/glib-compile-schemas.c:1004 +#: gio/glib-compile-schemas.c:1001 #, c-format msgid "<%s id='%s'> not (yet) defined." msgstr "<%s id='%s'> (endnu) ikke defineret." -#: gio/glib-compile-schemas.c:1019 +#: gio/glib-compile-schemas.c:1016 #, c-format msgid "Invalid GVariant type string “%s”" msgstr "Ugyldig typestreng “%s” for GVariant" # override og extend bruges i forbindelse med nedarvning i forbindelse med objektorienteret programmering -#: gio/glib-compile-schemas.c:1049 +#: gio/glib-compile-schemas.c:1046 msgid "<override> given but schema isn’t extending anything" msgstr "<override> givet, men skemaet nedarver ikke fra noget" -#: gio/glib-compile-schemas.c:1062 +#: gio/glib-compile-schemas.c:1059 #, c-format msgid "No <key name='%s'> to override" msgstr "Ingen <key name='%s'> at overskrive" -#: gio/glib-compile-schemas.c:1070 +#: gio/glib-compile-schemas.c:1067 #, c-format msgid "<override name='%s'> already specified" msgstr "<override name='%s'> er allerede angivet" -#: gio/glib-compile-schemas.c:1143 +#: gio/glib-compile-schemas.c:1140 #, c-format msgid "<schema id='%s'> already specified" msgstr "<schema id='%s'> er allerede angivet" -#: gio/glib-compile-schemas.c:1155 +#: gio/glib-compile-schemas.c:1152 #, c-format msgid "<schema id='%s'> extends not yet existing schema “%s”" msgstr "<schema id='%s'> nedarver fra skemaet “%s”, som ikke findes endnu" -#: gio/glib-compile-schemas.c:1171 +#: gio/glib-compile-schemas.c:1168 #, c-format msgid "<schema id='%s'> is list of not yet existing schema “%s”" msgstr "<schema id='%s'> er en liste for skemaet “%s”, som ikke findes endnu" -#: gio/glib-compile-schemas.c:1179 +#: gio/glib-compile-schemas.c:1176 #, c-format msgid "Cannot be a list of a schema with a path" msgstr "Kan ikke være en liste for et skema med en sti" -#: gio/glib-compile-schemas.c:1189 +#: gio/glib-compile-schemas.c:1186 #, c-format msgid "Cannot extend a schema with a path" msgstr "Kan ikke nedarve fra et skema med en sti" -#: gio/glib-compile-schemas.c:1199 +#: gio/glib-compile-schemas.c:1196 #, c-format msgid "" "<schema id='%s'> is a list, extending <schema id='%s'> which is not a list" @@ -2837,7 +2846,7 @@ "<schema id='%s'> er en liste, der nedarver fra <schema id='%s'>, som ikke er " "en liste" -#: gio/glib-compile-schemas.c:1209 +#: gio/glib-compile-schemas.c:1206 #, c-format msgid "" "<schema id='%s' list-of='%s'> extends <schema id='%s' list-of='%s'> but “%s” " @@ -2846,17 +2855,17 @@ "<schema id='%s' list-of='%s'> nedarver fra <schema id='%s' list-of='%s'>, " "men “%s” nedarver ikke fra “%s”" -#: gio/glib-compile-schemas.c:1226 +#: gio/glib-compile-schemas.c:1223 #, c-format msgid "A path, if given, must begin and end with a slash" msgstr "En sti, hvis givet, skal starte og slutte med skråstreg" -#: gio/glib-compile-schemas.c:1233 +#: gio/glib-compile-schemas.c:1230 #, c-format msgid "The path of a list must end with “:/”" msgstr "Stien for en liste skal slutte med “:/”" -#: gio/glib-compile-schemas.c:1242 +#: gio/glib-compile-schemas.c:1239 #, c-format msgid "" "Warning: Schema “%s” has path “%s”. Paths starting with “/apps/”, “/" @@ -2865,49 +2874,49 @@ "Advarsel: Skemaet “%s” har stien “%s”. Stier som begynder med “/apps/”, “/" "desktop/” eller “/system/” er forældede." -#: gio/glib-compile-schemas.c:1272 +#: gio/glib-compile-schemas.c:1269 #, c-format msgid "<%s id='%s'> already specified" msgstr "<%s id='%s'> allerede angivet" -#: gio/glib-compile-schemas.c:1422 gio/glib-compile-schemas.c:1438 +#: gio/glib-compile-schemas.c:1419 gio/glib-compile-schemas.c:1435 #, c-format msgid "Only one <%s> element allowed inside <%s>" msgstr "Kun ét <%s>-element er tilladt inden i <%s>" -#: gio/glib-compile-schemas.c:1520 +#: gio/glib-compile-schemas.c:1517 #, c-format msgid "Element <%s> not allowed at the top level" msgstr "Elementet <%s> er ikke tilladt i topniveau" -#: gio/glib-compile-schemas.c:1538 +#: gio/glib-compile-schemas.c:1535 msgid "Element <default> is required in <key>" msgstr "Elementet <default> er påkrævet i <key>" -#: gio/glib-compile-schemas.c:1628 +#: gio/glib-compile-schemas.c:1625 #, c-format msgid "Text may not appear inside <%s>" msgstr "Der må ikke være tekst inden i <%s>" -#: gio/glib-compile-schemas.c:1696 +#: gio/glib-compile-schemas.c:1693 #, c-format msgid "Warning: undefined reference to <schema id='%s'/>" msgstr "Advarsel: udefineret reference til <schema id='%s'/>" #. Translators: Do not translate "--strict". -#: gio/glib-compile-schemas.c:1835 gio/glib-compile-schemas.c:1914 +#: gio/glib-compile-schemas.c:1832 gio/glib-compile-schemas.c:1911 msgid "--strict was specified; exiting." msgstr "--strict blev angivet; afslutter." -#: gio/glib-compile-schemas.c:1847 +#: gio/glib-compile-schemas.c:1844 msgid "This entire file has been ignored." msgstr "Hele denne fil er blevet ignoreret." -#: gio/glib-compile-schemas.c:1910 +#: gio/glib-compile-schemas.c:1907 msgid "Ignoring this file." msgstr "Ignorerer denne fil." -#: gio/glib-compile-schemas.c:1965 +#: gio/glib-compile-schemas.c:1962 #, c-format msgid "" "No such key “%s” in schema “%s” as specified in override file “%s”; ignoring " @@ -2916,7 +2925,7 @@ "Ingen sådan nøgle “%s” i skemaet “%s” som angivet i overskrivningsfilen " "“%s”; ignorerer overskrivning for denne nøgle." -#: gio/glib-compile-schemas.c:1973 +#: gio/glib-compile-schemas.c:1970 #, c-format msgid "" "No such key “%s” in schema “%s” as specified in override file “%s” and --" @@ -2925,7 +2934,7 @@ "Ingen sådan nøgle “%s” i skemaet “%s” som angivet i overskrivningsfilen " "“%s”, og --strict var givet; afslutter." -#: gio/glib-compile-schemas.c:1995 +#: gio/glib-compile-schemas.c:1992 #, c-format msgid "" "Cannot provide per-desktop overrides for localized key “%s” in schema " @@ -2935,7 +2944,7 @@ "skemaet “%s” (overskrivelsesfil “%s”); ignorerer overskrivning for denne " "nøgle." -#: gio/glib-compile-schemas.c:2004 +#: gio/glib-compile-schemas.c:2001 #, c-format msgid "" "Cannot provide per-desktop overrides for localized key “%s” in schema " @@ -2944,7 +2953,7 @@ "Kan ikke skrivebordsspecifikt overskrive den lokaliserede nøgle “%s” i " "skemaet “%s” (overskrivelsesfil “%s”), og --strict var givet; afslutter." -#: gio/glib-compile-schemas.c:2028 +#: gio/glib-compile-schemas.c:2025 #, c-format msgid "" "Error parsing key “%s” in schema “%s” as specified in override file “%s”: " @@ -2953,7 +2962,7 @@ "Fejl ved fortolkning af nøglen “%s” i skemaet “%s” som givet i " "overskrivningsfilen “%s”: %s. Ignorerer overskrivning for denne nøgle." -#: gio/glib-compile-schemas.c:2040 +#: gio/glib-compile-schemas.c:2037 #, c-format msgid "" "Error parsing key “%s” in schema “%s” as specified in override file “%s”: " @@ -2962,7 +2971,7 @@ "Fejl ved fortolkning af nøglen “%s” i skemaet “%s” som givet i " "overskrivningsfilen “%s”: %s. --strict var givet; afslutter." -#: gio/glib-compile-schemas.c:2067 +#: gio/glib-compile-schemas.c:2064 #, c-format msgid "" "Override for key “%s” in schema “%s” in override file “%s” is outside the " @@ -2972,7 +2981,7 @@ "ikke i det interval, skemaet angiver; ignorerer overskrivning for denne " "nøgle." -#: gio/glib-compile-schemas.c:2077 +#: gio/glib-compile-schemas.c:2074 #, c-format msgid "" "Override for key “%s” in schema “%s” in override file “%s” is outside the " @@ -2981,7 +2990,7 @@ "Overskrivning for nøglen “%s” i skemaet “%s” i overskrivningsfilen “%s” er " "ikke i det interval, skemaet angiver, og --strict var givet; afslutter." -#: gio/glib-compile-schemas.c:2103 +#: gio/glib-compile-schemas.c:2100 #, c-format msgid "" "Override for key “%s” in schema “%s” in override file “%s” is not in the " @@ -2991,7 +3000,7 @@ "findes ikke i listen over gyldige valg; ignorerer overskrivning for denne " "nøgle." -#: gio/glib-compile-schemas.c:2113 +#: gio/glib-compile-schemas.c:2110 #, c-format msgid "" "Override for key “%s” in schema “%s” in override file “%s” is not in the " @@ -3000,23 +3009,23 @@ "Overskrivning for nøglen “%s” i skemaet “%s” i overskrivningsfilen “%s” " "findes ikke i listen over gyldige valg, og --strict var givet; afslutter." -#: gio/glib-compile-schemas.c:2175 +#: gio/glib-compile-schemas.c:2172 msgid "Where to store the gschemas.compiled file" msgstr "Hvor filen gschemas.compiled skal lægges" -#: gio/glib-compile-schemas.c:2176 +#: gio/glib-compile-schemas.c:2173 msgid "Abort on any errors in schemas" msgstr "Afbryd ved enhver fejl i skemaer" -#: gio/glib-compile-schemas.c:2177 +#: gio/glib-compile-schemas.c:2174 msgid "Do not write the gschema.compiled file" msgstr "Skriv ikke filen gschema.compiled" -#: gio/glib-compile-schemas.c:2178 +#: gio/glib-compile-schemas.c:2175 msgid "Do not enforce key name restrictions" msgstr "Gennemtving ikke begrænsninger på nøglenavn" -#: gio/glib-compile-schemas.c:2207 +#: gio/glib-compile-schemas.c:2204 msgid "" "Compile all GSettings schema files into a schema cache.\n" "Schema files are required to have the extension .gschema.xml,\n" @@ -3026,15 +3035,15 @@ "Schemafiler skal have filendelsen .gschema.xml,\n" "og mellemlagerfilen kaldes gschemas.compiled." -#: gio/glib-compile-schemas.c:2228 +#: gio/glib-compile-schemas.c:2225 msgid "You should give exactly one directory name" msgstr "Du skal give præcist et katalognavn" -#: gio/glib-compile-schemas.c:2271 +#: gio/glib-compile-schemas.c:2268 msgid "No schema files found: doing nothing." msgstr "Ingen skemafiler fundet: Gør intet." -#: gio/glib-compile-schemas.c:2273 +#: gio/glib-compile-schemas.c:2270 msgid "No schema files found: removed existing output file." msgstr "Ingen skemafiler fundet: fjernede eksisterende uddatafil." @@ -3043,7 +3052,7 @@ msgid "Invalid filename %s" msgstr "Ugyldigt filnavn %s" -#: gio/glocalfile.c:996 +#: gio/glocalfile.c:1005 #, c-format msgid "Error getting filesystem info for %s: %s" msgstr "Fejl ved hentning af filsysteminfo for %s: %s" @@ -3052,124 +3061,124 @@ #. * the enclosing (user visible) mount of a file, but none #. * exists. #. -#: gio/glocalfile.c:1137 +#: gio/glocalfile.c:1141 #, c-format msgid "Containing mount for file %s not found" msgstr "Indeholdende montering for filen %s blev ikke fundet" -#: gio/glocalfile.c:1160 +#: gio/glocalfile.c:1164 msgid "Can’t rename root directory" msgstr "Kan ikke omdøbe rodmappen" -#: gio/glocalfile.c:1178 gio/glocalfile.c:1201 +#: gio/glocalfile.c:1182 gio/glocalfile.c:1205 #, c-format msgid "Error renaming file %s: %s" msgstr "Fejl ved omdøbning af filen %s: %s" -#: gio/glocalfile.c:1185 +#: gio/glocalfile.c:1189 msgid "Can’t rename file, filename already exists" msgstr "Kan ikke omdøbe fil, da filnavnet allerede findes" -#: gio/glocalfile.c:1198 gio/glocalfile.c:2394 gio/glocalfile.c:2422 -#: gio/glocalfile.c:2561 gio/glocalfileoutputstream.c:658 +#: gio/glocalfile.c:1202 gio/glocalfile.c:2405 gio/glocalfile.c:2433 +#: gio/glocalfile.c:2572 gio/glocalfileoutputstream.c:658 msgid "Invalid filename" msgstr "Ugyldigt filnavn" -#: gio/glocalfile.c:1366 gio/glocalfile.c:1377 +#: gio/glocalfile.c:1370 gio/glocalfile.c:1381 #, c-format msgid "Error opening file %s: %s" msgstr "Fejl ved åbning af filen %s: %s" -#: gio/glocalfile.c:1502 +#: gio/glocalfile.c:1506 #, c-format msgid "Error removing file %s: %s" msgstr "Fejl under fjernelse af filen %s: %s" -#: gio/glocalfile.c:1996 gio/glocalfile.c:2007 gio/glocalfile.c:2034 +#: gio/glocalfile.c:2000 gio/glocalfile.c:2011 gio/glocalfile.c:2038 #, c-format msgid "Error trashing file %s: %s" msgstr "Fejl ved flytning af filen %s til papirkurv: %s" -#: gio/glocalfile.c:2054 +#: gio/glocalfile.c:2058 #, c-format msgid "Unable to create trash directory %s: %s" msgstr "Kan ikke oprette papirkurvskatalog %s: %s" -#: gio/glocalfile.c:2075 +#: gio/glocalfile.c:2079 #, c-format msgid "Unable to find toplevel directory to trash %s" msgstr "Kan ikke finde topniveau-katalog til papirkurv %s" -#: gio/glocalfile.c:2083 +#: gio/glocalfile.c:2087 #, c-format msgid "Trashing on system internal mounts is not supported" msgstr "Papirkurv understøttes ikke på interne systemmonteringer" -#: gio/glocalfile.c:2169 gio/glocalfile.c:2197 +#: gio/glocalfile.c:2173 gio/glocalfile.c:2201 #, c-format msgid "Unable to find or create trash directory %s to trash %s" msgstr "Kan ikke finde eller oprette papirkurvskatalog %s til papirkurv %s" -#: gio/glocalfile.c:2243 +#: gio/glocalfile.c:2245 #, c-format msgid "Unable to create trashing info file for %s: %s" msgstr "Kan ikke oprette papirkurvs-infofil for %s: %s" -#: gio/glocalfile.c:2305 +#: gio/glocalfile.c:2316 #, c-format msgid "Unable to trash file %s across filesystem boundaries" msgstr "Kan ikke smide filen %s ud på andet filsystem" -#: gio/glocalfile.c:2309 gio/glocalfile.c:2365 +#: gio/glocalfile.c:2320 gio/glocalfile.c:2376 #, c-format msgid "Unable to trash file %s: %s" msgstr "Kan ikke smide filen %s ud: %s" -#: gio/glocalfile.c:2371 +#: gio/glocalfile.c:2382 #, c-format msgid "Unable to trash file %s" msgstr "Kan ikke smide filen %s ud" -#: gio/glocalfile.c:2397 +#: gio/glocalfile.c:2408 #, c-format msgid "Error creating directory %s: %s" msgstr "Fejl ved oprettelse af mappen %s: %s" -#: gio/glocalfile.c:2426 +#: gio/glocalfile.c:2437 #, c-format msgid "Filesystem does not support symbolic links" msgstr "Filsystemet understøtter ikke symbolske links" -#: gio/glocalfile.c:2429 +#: gio/glocalfile.c:2440 #, c-format msgid "Error making symbolic link %s: %s" msgstr "Fejl under oprettelse af symbolsk link %s: %s" -#: gio/glocalfile.c:2472 gio/glocalfile.c:2507 gio/glocalfile.c:2564 +#: gio/glocalfile.c:2483 gio/glocalfile.c:2518 gio/glocalfile.c:2575 #, c-format msgid "Error moving file %s: %s" msgstr "Fejl ved flytning af filen %s: %s" -#: gio/glocalfile.c:2495 +#: gio/glocalfile.c:2506 msgid "Can’t move directory over directory" msgstr "Kan ikke flytte mappe over mappe" -#: gio/glocalfile.c:2521 gio/glocalfileoutputstream.c:1110 +#: gio/glocalfile.c:2532 gio/glocalfileoutputstream.c:1110 #: gio/glocalfileoutputstream.c:1124 gio/glocalfileoutputstream.c:1139 #: gio/glocalfileoutputstream.c:1156 gio/glocalfileoutputstream.c:1170 msgid "Backup file creation failed" msgstr "Oprettelse af sikkerhedskopi mislykkedes" -#: gio/glocalfile.c:2540 +#: gio/glocalfile.c:2551 #, c-format msgid "Error removing target file: %s" msgstr "Fejl ved fjernelse af målfil: %s" -#: gio/glocalfile.c:2554 +#: gio/glocalfile.c:2565 msgid "Move between mounts not supported" msgstr "Flytning mellem monteringer understøttes ikke" -#: gio/glocalfile.c:2728 +#: gio/glocalfile.c:2741 #, c-format msgid "Could not determine the disk usage of %s: %s" msgstr "Kunne ikke bestemme diskforbruget af %s: %s" @@ -3191,119 +3200,119 @@ msgid "Error setting extended attribute “%s”: %s" msgstr "Fejl ved indstilling af udvidet attribut “%s”: %s" -#: gio/glocalfileinfo.c:1738 gio/win32/gwinhttpfile.c:191 +#: gio/glocalfileinfo.c:1819 gio/win32/gwinhttpfile.c:191 msgid " (invalid encoding)" msgstr " (ugyldig kodning)" -#: gio/glocalfileinfo.c:1897 gio/glocalfileoutputstream.c:945 +#: gio/glocalfileinfo.c:1978 gio/glocalfileoutputstream.c:945 #: gio/glocalfileoutputstream.c:997 #, c-format msgid "Error when getting information for file “%s”: %s" msgstr "Fejl ved indhentning af oplysninger om filen “%s”: %s" -#: gio/glocalfileinfo.c:2163 +#: gio/glocalfileinfo.c:2281 #, c-format msgid "Error when getting information for file descriptor: %s" msgstr "Fejl ved indhentning af oplysninger om fildeskriptor: %s" -#: gio/glocalfileinfo.c:2208 +#: gio/glocalfileinfo.c:2326 msgid "Invalid attribute type (uint32 expected)" msgstr "Ugyldig attributtype (uint32 forventet)" -#: gio/glocalfileinfo.c:2226 +#: gio/glocalfileinfo.c:2344 msgid "Invalid attribute type (uint64 expected)" msgstr "Ugyldig attributtype (uint64 forventet)" -#: gio/glocalfileinfo.c:2245 gio/glocalfileinfo.c:2264 +#: gio/glocalfileinfo.c:2363 gio/glocalfileinfo.c:2382 msgid "Invalid attribute type (byte string expected)" msgstr "Ugyldig attributtype (byte-streng forventet)" -#: gio/glocalfileinfo.c:2311 +#: gio/glocalfileinfo.c:2429 msgid "Cannot set permissions on symlinks" msgstr "Kan ikke ændre rettigheder på symlinks" -#: gio/glocalfileinfo.c:2327 +#: gio/glocalfileinfo.c:2445 #, c-format msgid "Error setting permissions: %s" msgstr "Fejl ved ændring af rettigheder: %s" -#: gio/glocalfileinfo.c:2378 +#: gio/glocalfileinfo.c:2496 #, c-format msgid "Error setting owner: %s" msgstr "Fejl ved ændring af ejer: %s" -#: gio/glocalfileinfo.c:2401 +#: gio/glocalfileinfo.c:2519 msgid "symlink must be non-NULL" msgstr "symlink må ikke være NULL" -#: gio/glocalfileinfo.c:2411 gio/glocalfileinfo.c:2430 -#: gio/glocalfileinfo.c:2441 +#: gio/glocalfileinfo.c:2529 gio/glocalfileinfo.c:2548 +#: gio/glocalfileinfo.c:2559 #, c-format msgid "Error setting symlink: %s" msgstr "Fejl ved manipulation af symlink: %s" -#: gio/glocalfileinfo.c:2420 +#: gio/glocalfileinfo.c:2538 msgid "Error setting symlink: file is not a symlink" msgstr "Fejl ved manipulation af symlink: filen er ikke et symlink" -#: gio/glocalfileinfo.c:2492 +#: gio/glocalfileinfo.c:2630 #, c-format msgid "Extra nanoseconds %d for UNIX timestamp %lld are negative" msgstr "Antal ekstra nanosekunder %d for UNIX-tidsstempel %lld er negativt" -#: gio/glocalfileinfo.c:2501 +#: gio/glocalfileinfo.c:2639 #, c-format msgid "Extra nanoseconds %d for UNIX timestamp %lld reach 1 second" msgstr "" "Antal ekstra nanosekunder %d for UNIX-tidsstempel %lld når op på 1 sekund" -#: gio/glocalfileinfo.c:2511 +#: gio/glocalfileinfo.c:2649 #, c-format msgid "UNIX timestamp %lld does not fit into 64 bits" msgstr "UNIX-tidsstempel %lld passer ikke ind i 64 bit" -#: gio/glocalfileinfo.c:2522 +#: gio/glocalfileinfo.c:2660 #, c-format msgid "UNIX timestamp %lld is outside of the range supported by Windows" msgstr "" "UNIX-tidsstempel %lld ligger uden for intervallet, som understøttes af " "Windows" -#: gio/glocalfileinfo.c:2625 +#: gio/glocalfileinfo.c:2792 #, c-format msgid "File name “%s” cannot be converted to UTF-16" msgstr "Filnavnet “%s” kan ikke konverteres til UTF-16" -#: gio/glocalfileinfo.c:2644 +#: gio/glocalfileinfo.c:2811 #, c-format msgid "File “%s” cannot be opened: Windows Error %lu" msgstr "Filen “%s” kan ikke åbnes: Windowsfejl %lu" -#: gio/glocalfileinfo.c:2657 +#: gio/glocalfileinfo.c:2824 #, c-format msgid "Error setting modification or access time for file “%s”: %lu" msgstr "" "Fejl ved ændring af tidspunkt for ændring eller tilgang for filen “%s”: %lu" -#: gio/glocalfileinfo.c:2798 gio/glocalfileinfo.c:2810 +#: gio/glocalfileinfo.c:2981 #, c-format msgid "Error setting modification or access time: %s" msgstr "Fejl ved ændring af tidspunkt for ændring eller tilgang: %s" -#: gio/glocalfileinfo.c:2833 +#: gio/glocalfileinfo.c:3004 msgid "SELinux context must be non-NULL" msgstr "SELinux-kontekst skal være forskellig fra NULL" -#: gio/glocalfileinfo.c:2840 +#: gio/glocalfileinfo.c:3011 msgid "SELinux is not enabled on this system" msgstr "SELinux er ikke aktiveret på dette system" -#: gio/glocalfileinfo.c:2850 +#: gio/glocalfileinfo.c:3021 #, c-format msgid "Error setting SELinux context: %s" msgstr "Fejl ved ændring af SELinux-kontekst: %s" -#: gio/glocalfileinfo.c:2947 +#: gio/glocalfileinfo.c:3118 #, c-format msgid "Setting attribute %s not supported" msgstr "Indstilling af attributten %s understøttes ikke" @@ -3350,13 +3359,13 @@ msgid "Error renaming temporary file: %s" msgstr "Fejl under omdøbning af midlertidig fil: %s" -#: gio/glocalfileoutputstream.c:611 gio/glocalfileoutputstream.c:1241 +#: gio/glocalfileoutputstream.c:611 gio/glocalfileoutputstream.c:1242 #, c-format msgid "Error truncating file: %s" msgstr "Fejl ved afkortning af filen: %s" #: gio/glocalfileoutputstream.c:664 gio/glocalfileoutputstream.c:909 -#: gio/glocalfileoutputstream.c:1222 gio/gsubprocess.c:231 +#: gio/glocalfileoutputstream.c:1223 gio/gsubprocess.c:231 #, c-format msgid "Error opening file “%s”: %s" msgstr "Fejl ved åbning af filen “%s”: %s" @@ -3373,7 +3382,7 @@ msgid "The file was externally modified" msgstr "Filen blev ændret eksternt" -#: gio/glocalfileoutputstream.c:1204 +#: gio/glocalfileoutputstream.c:1205 #, c-format msgid "Error removing old file: %s" msgstr "Fejl under fjernelse af gammel fil: %s" @@ -3522,8 +3531,8 @@ #. Translators: the first placeholder is a domain name, the #. * second is an error message #: gio/gresolver.c:403 gio/gthreadedresolver.c:152 gio/gthreadedresolver.c:170 -#: gio/gthreadedresolver.c:782 gio/gthreadedresolver.c:806 -#: gio/gthreadedresolver.c:831 gio/gthreadedresolver.c:846 +#: gio/gthreadedresolver.c:798 gio/gthreadedresolver.c:822 +#: gio/gthreadedresolver.c:847 gio/gthreadedresolver.c:862 #, c-format msgid "Error resolving “%s”: %s" msgstr "Fejl ved opløsning af “%s”: %s" @@ -4234,35 +4243,35 @@ #. Translators: the placeholder is a DNS record type, such as ‘MX’ or ‘SRV’ #: gio/gthreadedresolver.c:552 gio/gthreadedresolver.c:574 -#: gio/gthreadedresolver.c:612 gio/gthreadedresolver.c:659 -#: gio/gthreadedresolver.c:688 gio/gthreadedresolver.c:700 +#: gio/gthreadedresolver.c:628 gio/gthreadedresolver.c:675 +#: gio/gthreadedresolver.c:704 gio/gthreadedresolver.c:716 #, c-format msgid "Error parsing DNS %s record: malformed DNS packet" msgstr "Fejl ved fortolkning af DNS-post %s: fejlformateret DNS-pakke" -#: gio/gthreadedresolver.c:758 gio/gthreadedresolver.c:895 -#: gio/gthreadedresolver.c:993 gio/gthreadedresolver.c:1043 +#: gio/gthreadedresolver.c:774 gio/gthreadedresolver.c:911 +#: gio/gthreadedresolver.c:1009 gio/gthreadedresolver.c:1059 #, c-format msgid "No DNS record of the requested type for “%s”" msgstr "Ingen DNS-post af den forespurgte type for “%s”" -#: gio/gthreadedresolver.c:763 gio/gthreadedresolver.c:998 +#: gio/gthreadedresolver.c:779 gio/gthreadedresolver.c:1014 #, c-format msgid "Temporarily unable to resolve “%s”" msgstr "Midlertidigt ude af stand til at opløse “%s”" -#: gio/gthreadedresolver.c:768 gio/gthreadedresolver.c:1003 -#: gio/gthreadedresolver.c:1113 +#: gio/gthreadedresolver.c:784 gio/gthreadedresolver.c:1019 +#: gio/gthreadedresolver.c:1129 #, c-format msgid "Error resolving “%s”" msgstr "Fejl ved opløsning af “%s”" -#: gio/gthreadedresolver.c:782 gio/gthreadedresolver.c:806 -#: gio/gthreadedresolver.c:831 gio/gthreadedresolver.c:846 +#: gio/gthreadedresolver.c:798 gio/gthreadedresolver.c:822 +#: gio/gthreadedresolver.c:847 gio/gthreadedresolver.c:862 msgid "Malformed DNS packet" msgstr "Fejlformateret DNS-pakke" -#: gio/gthreadedresolver.c:888 +#: gio/gthreadedresolver.c:904 #, c-format msgid "Failed to parse DNS response for “%s”: " msgstr "Kunne ikke fortolke DNS-svar for “%s”: " @@ -4390,7 +4399,7 @@ msgid "Error closing file descriptor: %s" msgstr "Fejl ved lukning af fildeskriptor: %s" -#: gio/gunixmounts.c:2815 gio/gunixmounts.c:2868 +#: gio/gunixmounts.c:2817 gio/gunixmounts.c:2870 msgid "Filesystem root" msgstr "Filsystemets rod" @@ -4474,77 +4483,77 @@ msgid "Wrong args\n" msgstr "Forkerte argumenter\n" -#: glib/gbookmarkfile.c:779 +#: glib/gbookmarkfile.c:861 #, c-format msgid "Unexpected attribute “%s” for element “%s”" msgstr "Uventet attribut “%s” for elementet “%s”" -#: glib/gbookmarkfile.c:790 glib/gbookmarkfile.c:870 glib/gbookmarkfile.c:880 -#: glib/gbookmarkfile.c:993 +#: glib/gbookmarkfile.c:872 glib/gbookmarkfile.c:952 glib/gbookmarkfile.c:962 +#: glib/gbookmarkfile.c:1075 #, c-format msgid "Attribute “%s” of element “%s” not found" msgstr "Attributten “%s” for elementet “%s” blev ikke fundet" -#: glib/gbookmarkfile.c:1202 glib/gbookmarkfile.c:1267 -#: glib/gbookmarkfile.c:1331 glib/gbookmarkfile.c:1341 +#: glib/gbookmarkfile.c:1284 glib/gbookmarkfile.c:1349 +#: glib/gbookmarkfile.c:1413 glib/gbookmarkfile.c:1423 #, c-format msgid "Unexpected tag “%s”, tag “%s” expected" msgstr "Uventet mærke “%s”, forventede mærket “%s”" -#: glib/gbookmarkfile.c:1227 glib/gbookmarkfile.c:1241 -#: glib/gbookmarkfile.c:1309 glib/gbookmarkfile.c:1355 +#: glib/gbookmarkfile.c:1309 glib/gbookmarkfile.c:1323 +#: glib/gbookmarkfile.c:1391 glib/gbookmarkfile.c:1437 #, c-format msgid "Unexpected tag “%s” inside “%s”" msgstr "Uventet mærke “%s” inden i “%s”" -#: glib/gbookmarkfile.c:1635 +#: glib/gbookmarkfile.c:1717 #, c-format msgid "Invalid date/time ‘%s’ in bookmark file" msgstr "Ugyldig dato/klokkeslæt “%s” i bogmærkefil" -#: glib/gbookmarkfile.c:1838 +#: glib/gbookmarkfile.c:1956 msgid "No valid bookmark file found in data dirs" msgstr "Ingen gyldig bogmærkefil blev fundet i datakatalogerne" -#: glib/gbookmarkfile.c:2039 +#: glib/gbookmarkfile.c:2157 #, c-format msgid "A bookmark for URI “%s” already exists" msgstr "Et bogmærke for URI'en “%s” findes allerede" -#: glib/gbookmarkfile.c:2088 glib/gbookmarkfile.c:2246 -#: glib/gbookmarkfile.c:2331 glib/gbookmarkfile.c:2411 -#: glib/gbookmarkfile.c:2496 glib/gbookmarkfile.c:2630 -#: glib/gbookmarkfile.c:2763 glib/gbookmarkfile.c:2898 -#: glib/gbookmarkfile.c:2940 glib/gbookmarkfile.c:3037 -#: glib/gbookmarkfile.c:3158 glib/gbookmarkfile.c:3352 -#: glib/gbookmarkfile.c:3493 glib/gbookmarkfile.c:3712 -#: glib/gbookmarkfile.c:3801 glib/gbookmarkfile.c:3890 -#: glib/gbookmarkfile.c:4009 +#: glib/gbookmarkfile.c:2206 glib/gbookmarkfile.c:2364 +#: glib/gbookmarkfile.c:2449 glib/gbookmarkfile.c:2529 +#: glib/gbookmarkfile.c:2614 glib/gbookmarkfile.c:2748 +#: glib/gbookmarkfile.c:2881 glib/gbookmarkfile.c:3016 +#: glib/gbookmarkfile.c:3058 glib/gbookmarkfile.c:3155 +#: glib/gbookmarkfile.c:3276 glib/gbookmarkfile.c:3470 +#: glib/gbookmarkfile.c:3611 glib/gbookmarkfile.c:3830 +#: glib/gbookmarkfile.c:3919 glib/gbookmarkfile.c:4008 +#: glib/gbookmarkfile.c:4127 #, c-format msgid "No bookmark found for URI “%s”" msgstr "Der blev intet bogmærke fundet for URI'en “%s”" -#: glib/gbookmarkfile.c:2420 +#: glib/gbookmarkfile.c:2538 #, c-format msgid "No MIME type defined in the bookmark for URI “%s”" msgstr "Ingen MIME-type er defineret i bogmærket for URI'en “%s”" -#: glib/gbookmarkfile.c:2505 +#: glib/gbookmarkfile.c:2623 #, c-format msgid "No private flag has been defined in bookmark for URI “%s”" msgstr "Intet privat flag er defineret i bogmærket for URI'en “%s”" -#: glib/gbookmarkfile.c:3046 +#: glib/gbookmarkfile.c:3164 #, c-format msgid "No groups set in bookmark for URI “%s”" msgstr "Ingen grupper er sat i bogmærket for URI'en “%s”" -#: glib/gbookmarkfile.c:3514 glib/gbookmarkfile.c:3722 +#: glib/gbookmarkfile.c:3632 glib/gbookmarkfile.c:3840 #, c-format msgid "No application with name “%s” registered a bookmark for “%s”" msgstr "Intet program med navnet “%s” har registreret et bogmærke for “%s”" -#: glib/gbookmarkfile.c:3745 +#: glib/gbookmarkfile.c:3863 #, c-format msgid "Failed to expand exec line “%s” with URI “%s”" msgstr "Kunne ikke udvide eksekveringslinjen “%s” med URI'en “%s”" @@ -5020,80 +5029,80 @@ msgid "Error opening directory “%s”: %s" msgstr "Fejl ved åbning af mappen “%s”: %s" -#: glib/gfileutils.c:735 glib/gfileutils.c:827 +#: glib/gfileutils.c:753 glib/gfileutils.c:845 #, c-format msgid "Could not allocate %lu byte to read file “%s”" msgid_plural "Could not allocate %lu bytes to read file “%s”" msgstr0 "Kunne ikke allokere %lu byte til at læse filen “%s”" msgstr1 "Kunne ikke allokere %lu byte til at læse filen “%s”" -#: glib/gfileutils.c:752 +#: glib/gfileutils.c:770 #, c-format msgid "Error reading file “%s”: %s" msgstr "Fejl ved læsning af filen “%s”: %s" -#: glib/gfileutils.c:788 +#: glib/gfileutils.c:806 #, c-format msgid "File “%s” is too large" msgstr "Filen “%s” er for stor" -#: glib/gfileutils.c:852 +#: glib/gfileutils.c:870 #, c-format msgid "Failed to read from file “%s”: %s" msgstr "Kunne ikke læse fra filen “%s”: %s" -#: glib/gfileutils.c:902 glib/gfileutils.c:977 glib/gfileutils.c:1449 +#: glib/gfileutils.c:920 glib/gfileutils.c:995 glib/gfileutils.c:1472 #, c-format msgid "Failed to open file “%s”: %s" msgstr "Kunne ikke åbne filen “%s”: %s" -#: glib/gfileutils.c:915 +#: glib/gfileutils.c:933 #, c-format msgid "Failed to get attributes of file “%s”: fstat() failed: %s" msgstr "Kunne ikke læse attributter for filen “%s”: fstat() mislykkedes: %s" -#: glib/gfileutils.c:946 +#: glib/gfileutils.c:964 #, c-format msgid "Failed to open file “%s”: fdopen() failed: %s" msgstr "Kunne ikke åbne filen “%s”: fdopen() mislykkedes: %s" -#: glib/gfileutils.c:1047 +#: glib/gfileutils.c:1065 #, c-format msgid "Failed to rename file “%s” to “%s”: g_rename() failed: %s" msgstr "Kunne ikke omdøbe filen “%s” til “%s”: g_rename() mislykkedes: %s" -#: glib/gfileutils.c:1156 +#: glib/gfileutils.c:1179 #, c-format msgid "Failed to write file “%s”: write() failed: %s" msgstr "Kunne ikke skrive filen “%s”: write() mislykkedes: %s" -#: glib/gfileutils.c:1177 +#: glib/gfileutils.c:1200 #, c-format msgid "Failed to write file “%s”: fsync() failed: %s" msgstr "Kunne ikke skrive filen “%s”: fsync() mislykkedes: %s" -#: glib/gfileutils.c:1338 glib/gfileutils.c:1753 +#: glib/gfileutils.c:1361 glib/gfileutils.c:1776 #, c-format msgid "Failed to create file “%s”: %s" msgstr "Fejl under oprettelse af filen “%s”: %s" -#: glib/gfileutils.c:1383 +#: glib/gfileutils.c:1406 #, c-format msgid "Existing file “%s” could not be removed: g_unlink() failed: %s" msgstr "" "Den eksisterende fil “%s” kunne ikke fjernes: g_unlink() mislykkedes: %s" -#: glib/gfileutils.c:1718 +#: glib/gfileutils.c:1741 #, c-format msgid "Template “%s” invalid, should not contain a “%s”" msgstr "Skabelonen “%s” er ugyldig, må ikke indeholde en “%s”" -#: glib/gfileutils.c:1731 +#: glib/gfileutils.c:1754 #, c-format msgid "Template “%s” doesn’t contain XXXXXX" msgstr "Skabelonen “%s” indeholder ikke XXXXXX" -#: glib/gfileutils.c:2291 glib/gfileutils.c:2320 +#: glib/gfileutils.c:2348 glib/gfileutils.c:2377 #, c-format msgid "Failed to read the symbolic link “%s”: %s" msgstr "Kunne ikke læse den symbolske link “%s”: %s" @@ -5155,8 +5164,8 @@ msgstr "Nøglefilen indeholder kodningen “%s”, der ikke understøttes" #: glib/gkeyfile.c:1679 glib/gkeyfile.c:1852 glib/gkeyfile.c:3299 -#: glib/gkeyfile.c:3363 glib/gkeyfile.c:3493 glib/gkeyfile.c:3625 -#: glib/gkeyfile.c:3771 glib/gkeyfile.c:4006 glib/gkeyfile.c:4073 +#: glib/gkeyfile.c:3363 glib/gkeyfile.c:3493 glib/gkeyfile.c:3622 +#: glib/gkeyfile.c:3768 glib/gkeyfile.c:4003 glib/gkeyfile.c:4070 #, c-format msgid "Key file does not have group “%s”" msgstr "Nøglefilen indeholder ikke gruppen “%s”" @@ -5192,31 +5201,31 @@ msgid "Key “%s” in group “%s” has value “%s” where %s was expected" msgstr "Nøglen “%s” i gruppen “%s” har værdien “%s”, mens %s blev forventet" -#: glib/gkeyfile.c:4326 +#: glib/gkeyfile.c:4323 msgid "Key file contains escape character at end of line" msgstr "Nøglefilen indeholder beskyttede tegn for enden af linjen" -#: glib/gkeyfile.c:4348 +#: glib/gkeyfile.c:4345 #, c-format msgid "Key file contains invalid escape sequence “%s”" msgstr "Nøglefilen indeholder en ugyldig undvigesekvens “%s”" -#: glib/gkeyfile.c:4493 +#: glib/gkeyfile.c:4490 #, c-format msgid "Value “%s” cannot be interpreted as a number." msgstr "Værdien “%s” kan ikke fortolkes som et nummer." -#: glib/gkeyfile.c:4507 +#: glib/gkeyfile.c:4504 #, c-format msgid "Integer value “%s” out of range" msgstr "Heltalsværdien “%s” er ikke i gyldigt interval" -#: glib/gkeyfile.c:4540 +#: glib/gkeyfile.c:4537 #, c-format msgid "Value “%s” cannot be interpreted as a float number." msgstr "Værdien “%s” kan ikke fortolkes som en float." -#: glib/gkeyfile.c:4579 +#: glib/gkeyfile.c:4576 #, c-format msgid "Value “%s” cannot be interpreted as a boolean." msgstr "Værdien “%s” kan ikke fortolkes som en sandhedsværdi." @@ -5237,32 +5246,32 @@ msgid "Failed to open file “%s”: open() failed: %s" msgstr "Kunne ikke åbne filen “%s”: open() mislykkedes: %s" -#: glib/gmarkup.c:400 glib/gmarkup.c:442 +#: glib/gmarkup.c:393 glib/gmarkup.c:435 #, c-format msgid "Error on line %d char %d: " msgstr "Fejl på linje %d tegn %d: " -#: glib/gmarkup.c:464 glib/gmarkup.c:547 +#: glib/gmarkup.c:457 glib/gmarkup.c:540 #, c-format msgid "Invalid UTF-8 encoded text in name — not valid “%s”" msgstr "Ugyldig UTF-8-kodet tekst i navnet — ugyldig “%s”" -#: glib/gmarkup.c:475 +#: glib/gmarkup.c:468 #, c-format msgid "“%s” is not a valid name" msgstr "“%s” er ikke et gyldigt navn" -#: glib/gmarkup.c:491 +#: glib/gmarkup.c:484 #, c-format msgid "“%s” is not a valid name: “%c”" msgstr "“%s” er ikke et gyldigt navn: “%c”" -#: glib/gmarkup.c:615 +#: glib/gmarkup.c:608 #, c-format msgid "Error on line %d: %s" msgstr "Fejl på linje %d: %s" -#: glib/gmarkup.c:692 +#: glib/gmarkup.c:685 #, c-format msgid "" "Failed to parse “%-.*s”, which should have been a digit inside a character " @@ -5271,7 +5280,7 @@ "Fejl ved fortolkning af “%-.*s” som skulle have været et ciffer i en " "tegnreference (ê for eksempel) — måske er cifret for stort" -#: glib/gmarkup.c:704 +#: glib/gmarkup.c:697 msgid "" "Character reference did not end with a semicolon; most likely you used an " "ampersand character without intending to start an entity — escape ampersand " @@ -5281,23 +5290,23 @@ "og-tegn uden at det var beregnet på at starte en entitet — undgå dette ved " "at bruge & i stedet" -#: glib/gmarkup.c:730 +#: glib/gmarkup.c:723 #, c-format msgid "Character reference “%-.*s” does not encode a permitted character" msgstr "Tegnreferencen “%-.*s” koder ikke et tilladt tegn" -#: glib/gmarkup.c:768 +#: glib/gmarkup.c:761 msgid "" "Empty entity “&;” seen; valid entities are: & " < > '" msgstr "" "Tom entitet “&;” fundet; gyldige entiteter er: & " < > '" -#: glib/gmarkup.c:776 +#: glib/gmarkup.c:769 #, c-format msgid "Entity name “%-.*s” is not known" msgstr "Entitetsnavnet “%-.*s” er ukendt" -#: glib/gmarkup.c:781 +#: glib/gmarkup.c:774 msgid "" "Entity did not end with a semicolon; most likely you used an ampersand " "character without intending to start an entity — escape ampersand as &" @@ -5306,11 +5315,11 @@ "tegn uden at det var beregnet på at starte en entitet — dette undgås ved at " "bruge & i stedet" -#: glib/gmarkup.c:1195 +#: glib/gmarkup.c:1188 msgid "Document must begin with an element (e.g. <book>)" msgstr "Dokumentet skal begynde med et element (f.eks <book>)" -#: glib/gmarkup.c:1235 +#: glib/gmarkup.c:1228 #, c-format msgid "" "“%s” is not a valid character following a “<” character; it may not begin an " @@ -5319,7 +5328,7 @@ "“%s” er ikke et gyldigt tegn efter et “<”-tegn; det kan ikke være " "begyndelsen på et elementnavn" -#: glib/gmarkup.c:1278 +#: glib/gmarkup.c:1271 #, c-format msgid "" "Odd character “%s”, expected a “>” character to end the empty-element tag " @@ -5328,12 +5337,12 @@ "Mærkeligt tegn “%s”, forventede et “>”-tegn for at afslutte det tomme " "elementmærke “%s”" -#: glib/gmarkup.c:1348 +#: glib/gmarkup.c:1341 #, c-format msgid "Too many attributes in element “%s”" msgstr "For mange attributter i elementet “%s”" -#: glib/gmarkup.c:1368 +#: glib/gmarkup.c:1361 #, c-format msgid "" "Odd character “%s”, expected a “=” after attribute name “%s” of element “%s”" @@ -5341,7 +5350,7 @@ "Mærkeligt tegn “%s”, forventede et “=” efter attributnavn “%s” for elementet " "“%s”" -#: glib/gmarkup.c:1410 +#: glib/gmarkup.c:1403 #, c-format msgid "" "Odd character “%s”, expected a “>” or “/” character to end the start tag of " @@ -5352,7 +5361,7 @@ "begyndelsesmærket til elementet “%s” eller alternativt en attribut; måske " "brugte du et ugyldigt tegn i attributnavnet" -#: glib/gmarkup.c:1455 +#: glib/gmarkup.c:1448 #, c-format msgid "" "Odd character “%s”, expected an open quote mark after the equals sign when " @@ -5361,7 +5370,7 @@ "Mærkeligt tegn “%s”, forventede et åbningsanførselstegn efter lighedstegnet " "når værdien for egenskaben “%s” for attributten “%s” angives" -#: glib/gmarkup.c:1589 +#: glib/gmarkup.c:1582 #, c-format msgid "" "“%s” is not a valid character following the characters “</”; “%s” may not " @@ -5370,7 +5379,7 @@ "“%s” er ikke et gyldigt tegn efter tegnene “</”; “%s” er måske ikke " "begyndelsen på et elementnavn" -#: glib/gmarkup.c:1627 +#: glib/gmarkup.c:1620 #, c-format msgid "" "“%s” is not a valid character following the close element name “%s”; the " @@ -5379,25 +5388,25 @@ "“%s” er ikke et gyldigt tegn efter det lukkende elementnavn “%s”; tilladt " "tegn er “>”" -#: glib/gmarkup.c:1639 +#: glib/gmarkup.c:1632 #, c-format msgid "Element “%s” was closed, no element is currently open" msgstr "Element “%s” blev lukket, ingen åbne elementer nu" -#: glib/gmarkup.c:1648 +#: glib/gmarkup.c:1641 #, c-format msgid "Element “%s” was closed, but the currently open element is “%s”" msgstr "Element “%s” blev lukket, men aktivt åbent element er “%s”" -#: glib/gmarkup.c:1801 +#: glib/gmarkup.c:1794 msgid "Document was empty or contained only whitespace" msgstr "Dokumentet var tomt eller indeholdt kun blanke tegn" -#: glib/gmarkup.c:1815 +#: glib/gmarkup.c:1808 msgid "Document ended unexpectedly just after an open angle bracket “<”" msgstr "Dokumentet sluttede uventet lige efter en åben vinkelparentes “<”" -#: glib/gmarkup.c:1823 glib/gmarkup.c:1868 +#: glib/gmarkup.c:1816 glib/gmarkup.c:1861 #, c-format msgid "" "Document ended unexpectedly with elements still open — “%s” was the last " @@ -5405,7 +5414,7 @@ msgstr "" "Dokumentet sluttede uventet med åbne elementer — “%s” var sidste åbne element" -#: glib/gmarkup.c:1831 +#: glib/gmarkup.c:1824 #, c-format msgid "" "Document ended unexpectedly, expected to see a close angle bracket ending " @@ -5414,19 +5423,19 @@ "Dokumentet sluttede uventet, forventede at se en vinkelparentes for at " "afslutte det sidste mærke <%s/>" -#: glib/gmarkup.c:1837 +#: glib/gmarkup.c:1830 msgid "Document ended unexpectedly inside an element name" msgstr "Dokumentet sluttede uventet inden i et elementnavn" -#: glib/gmarkup.c:1843 +#: glib/gmarkup.c:1836 msgid "Document ended unexpectedly inside an attribute name" msgstr "Dokumentet sluttede uventet inden i et attributnavn" -#: glib/gmarkup.c:1848 +#: glib/gmarkup.c:1841 msgid "Document ended unexpectedly inside an element-opening tag." msgstr "Dokumentet sluttede uventet inden i et element-åbnende mærke." -#: glib/gmarkup.c:1854 +#: glib/gmarkup.c:1847 msgid "" "Document ended unexpectedly after the equals sign following an attribute " "name; no attribute value" @@ -5434,22 +5443,22 @@ "Dokumentet sluttede uventet efter lighedstegnet efter et attributnavn; ingen " "attributværdi" -#: glib/gmarkup.c:1861 +#: glib/gmarkup.c:1854 msgid "Document ended unexpectedly while inside an attribute value" msgstr "Dokumentet sluttede uventet inden i en attributværdi" -#: glib/gmarkup.c:1878 +#: glib/gmarkup.c:1871 #, c-format msgid "Document ended unexpectedly inside the close tag for element “%s”" msgstr "Dokumentet sluttede uventet inden i lukningsmærket for elementet “%s”" -#: glib/gmarkup.c:1882 +#: glib/gmarkup.c:1875 msgid "" "Document ended unexpectedly inside the close tag for an unopened element" msgstr "" "Dokumentet sluttede uventet inden i lukningsmærket for et uåbnet element" -#: glib/gmarkup.c:1888 +#: glib/gmarkup.c:1881 msgid "Document ended unexpectedly inside a comment or processing instruction" msgstr "" "Dokumentet sluttede uventet inden i en kommentar eller behandlingsinstruktion" @@ -5513,188 +5522,188 @@ msgid "Unknown option %s" msgstr "Ukendt tilvalg %s" -#: glib/gregex.c:436 +#: glib/gregex.c:479 msgid "corrupted object" msgstr "beskadiget objekt" -#: glib/gregex.c:438 +#: glib/gregex.c:481 msgid "out of memory" msgstr "ikke mere ledig hukommelse" -#: glib/gregex.c:443 +#: glib/gregex.c:487 msgid "backtracking limit reached" msgstr "grænse for bagudlæsning nået" -#: glib/gregex.c:454 glib/gregex.c:707 glib/gregex.c:736 +#: glib/gregex.c:498 msgid "internal error" msgstr "intern fejl" -#: glib/gregex.c:456 +#: glib/gregex.c:500 msgid "the pattern contains items not supported for partial matching" msgstr "" "mønsteret indeholder elementer der ikke understøttes i forbindelse med " "partiel træfning" -#: glib/gregex.c:458 +#: glib/gregex.c:502 msgid "back references as conditions are not supported for partial matching" msgstr "" "baglæns referencer som betingelser understøttes ikke i forbindelse med " "partiel træfning" -#: glib/gregex.c:464 +#: glib/gregex.c:508 msgid "recursion limit reached" msgstr "rekursionsgrænse nået" -#: glib/gregex.c:466 +#: glib/gregex.c:510 msgid "bad offset" msgstr "ugyldig forskydning" -#: glib/gregex.c:468 +#: glib/gregex.c:512 msgid "recursion loop" msgstr "rekursiv løkke" #. should not happen in GRegex since we check modes before each match -#: glib/gregex.c:471 +#: glib/gregex.c:515 msgid "matching mode is requested that was not compiled for JIT" msgstr "der anmodes om en matchtilstand, som ikke er kompileret til JIT" -#: glib/gregex.c:475 +#: glib/gregex.c:536 glib/gregex.c:1838 msgid "unknown error" msgstr "ukendt fejl" -#: glib/gregex.c:496 +#: glib/gregex.c:557 msgid "\\ at end of pattern" msgstr "\\ sidst i mønster" -#: glib/gregex.c:500 +#: glib/gregex.c:561 msgid "\\c at end of pattern" msgstr "\\c sidst i mønster" -#: glib/gregex.c:505 +#: glib/gregex.c:566 msgid "unrecognized character following \\" msgstr "ukendt tegn følger \\" -#: glib/gregex.c:509 +#: glib/gregex.c:570 msgid "numbers out of order in {} quantifier" msgstr "tal er ude af rækkefølge i {}-kvantor" -#: glib/gregex.c:513 +#: glib/gregex.c:574 msgid "number too big in {} quantifier" msgstr "for stort tal i {}-kvantor" -#: glib/gregex.c:517 +#: glib/gregex.c:578 msgid "missing terminating for character class" msgstr "manglende afsluttende for tegnklasse" -#: glib/gregex.c:521 +#: glib/gregex.c:582 msgid "invalid escape sequence in character class" msgstr "ugyldig undvigesekvens i tegnklasse" -#: glib/gregex.c:525 +#: glib/gregex.c:586 msgid "range out of order in character class" msgstr "følgen er ikke ordnet i tegnklassen" -#: glib/gregex.c:530 +#: glib/gregex.c:591 msgid "nothing to repeat" msgstr "intet at gentage" -#: glib/gregex.c:534 +#: glib/gregex.c:595 msgid "unrecognized character after (? or (?-" msgstr "ukendt tegn efter (? eller (?-" -#: glib/gregex.c:538 +#: glib/gregex.c:599 msgid "POSIX named classes are supported only within a class" msgstr "POSIX-navngivne klasser understøttes kun inden i en klasse" -#: glib/gregex.c:542 +#: glib/gregex.c:603 msgid "POSIX collating elements are not supported" msgstr "POSIX-arrangerende elementer understøttes ikke" -#: glib/gregex.c:548 +#: glib/gregex.c:609 msgid "missing terminating )" msgstr "manglende afsluttende )" -#: glib/gregex.c:552 +#: glib/gregex.c:613 msgid "reference to non-existent subpattern" msgstr "reference til ikke-eksisterende undermønster" -#: glib/gregex.c:556 +#: glib/gregex.c:617 msgid "missing ) after comment" msgstr "manglende ) efter kommentar" -#: glib/gregex.c:560 +#: glib/gregex.c:621 msgid "regular expression is too large" msgstr "regulært udtryk for stort" -#: glib/gregex.c:564 +#: glib/gregex.c:625 msgid "malformed number or name after (?(" msgstr "fejlformateret tal eller navn efter (?(" -#: glib/gregex.c:568 +#: glib/gregex.c:629 msgid "lookbehind assertion is not fixed length" msgstr "lookbehind-assert-erklæring har ikke fast længde" -#: glib/gregex.c:572 +#: glib/gregex.c:633 msgid "conditional group contains more than two branches" msgstr "betinget gruppe indeholder mere end to grene" -#: glib/gregex.c:576 +#: glib/gregex.c:637 msgid "assertion expected after (?(" msgstr "assert-erklæring forventet efter (?(" -#: glib/gregex.c:580 +#: glib/gregex.c:641 msgid "a numbered reference must not be zero" msgstr "en nummereret reference kan ikke være nul" -#: glib/gregex.c:584 +#: glib/gregex.c:645 msgid "unknown POSIX class name" msgstr "ukendt POSIX-klassenavn" -#: glib/gregex.c:589 +#: glib/gregex.c:650 msgid "character value in \\x{...} sequence is too large" msgstr "tegnværdi i \\x{…}-sekvens er for stor" -#: glib/gregex.c:593 +#: glib/gregex.c:654 msgid "\\C not allowed in lookbehind assertion" msgstr "\\C ikke tillad i lookbehind-assert-erklæring" -#: glib/gregex.c:597 +#: glib/gregex.c:658 msgid "missing terminator in subpattern name" msgstr "manglende terminator i undermønsters navn" -#: glib/gregex.c:601 +#: glib/gregex.c:662 msgid "two named subpatterns have the same name" msgstr "to navngivne undermønstre har samme navn" -#: glib/gregex.c:605 +#: glib/gregex.c:666 msgid "malformed \\P or \\p sequence" msgstr "fejlformateret \\P- eller \\p-sekvens" -#: glib/gregex.c:609 +#: glib/gregex.c:670 msgid "unknown property name after \\P or \\p" msgstr "ukendt egenskabsnavn efter \\P eller \\p" -#: glib/gregex.c:613 +#: glib/gregex.c:674 msgid "subpattern name is too long (maximum 32 characters)" msgstr "undermønsters navn er for langt (maksimal 32 tegn)" -#: glib/gregex.c:617 +#: glib/gregex.c:678 msgid "too many named subpatterns (maximum 10,000)" msgstr "for mange navngivne undermønstre (maksimalt 10.000)" -#: glib/gregex.c:621 +#: glib/gregex.c:682 msgid "octal value is greater than \\377" msgstr "oktal værdi er større end \\377" -#: glib/gregex.c:625 +#: glib/gregex.c:686 msgid "DEFINE group contains more than one branch" msgstr "DEFINE-gruppe indeholder mere end én gren" -#: glib/gregex.c:629 +#: glib/gregex.c:690 msgid "inconsistent NEWLINE options" msgstr "inkonsistente NEWLINE-indstillinger" -#: glib/gregex.c:633 +#: glib/gregex.c:694 msgid "" "\\g is not followed by a braced, angle-bracketed, or quoted name or number, " "or by a plain number" @@ -5702,119 +5711,119 @@ "\\g følges ikke af et navn eller tal indeholdt i klammer eller " "vinkelklammer, eller af et enkeltstående tal" -#: glib/gregex.c:638 +#: glib/gregex.c:699 msgid "an argument is not allowed for (*ACCEPT), (*FAIL), or (*COMMIT)" msgstr "et argument er ikke tilladt for (*ACCEPT), (*FAIL) eller (*COMMIT)" -#: glib/gregex.c:642 +#: glib/gregex.c:703 msgid "(*VERB) not recognized" msgstr "(*VERB) ikke genkendt" -#: glib/gregex.c:646 +#: glib/gregex.c:707 msgid "number is too big" msgstr "tallet er for stort" -#: glib/gregex.c:650 +#: glib/gregex.c:711 msgid "missing subpattern name after (?&" msgstr "manglende undermønsternavn efter (?&" -#: glib/gregex.c:654 +#: glib/gregex.c:715 msgid "different names for subpatterns of the same number are not allowed" msgstr "forskellige navne til undermønstre med samme nummer er ikke tilladt" -#: glib/gregex.c:658 +#: glib/gregex.c:719 msgid "(*MARK) must have an argument" msgstr "(*MARK) skal have et argument" -#: glib/gregex.c:662 +#: glib/gregex.c:723 msgid "\\c must be followed by an ASCII character" msgstr "\\c skal være efterfulgt af et ASCII-tegn" -#: glib/gregex.c:666 +#: glib/gregex.c:727 msgid "\\k is not followed by a braced, angle-bracketed, or quoted name" msgstr "" "\\k følges ikke af et navn indeholdt i klammer, vinkelklammer eller " "citationstegn" -#: glib/gregex.c:670 +#: glib/gregex.c:731 msgid "\\N is not supported in a class" msgstr "\\N understøttes ikke i en klasse" -#: glib/gregex.c:674 +#: glib/gregex.c:735 msgid "name is too long in (*MARK), (*PRUNE), (*SKIP), or (*THEN)" msgstr "navn er for langt i (*MARK), (*PRUNE), (*SKIP) eller (*THEN)" -#: glib/gregex.c:678 glib/gregex.c:809 +#: glib/gregex.c:739 glib/gregex.c:875 msgid "code overflow" msgstr "kodeoverløb" -#: glib/gregex.c:682 +#: glib/gregex.c:743 msgid "unrecognized character after (?P" msgstr "ukendt tegn efter (?P" -#: glib/gregex.c:686 +#: glib/gregex.c:747 msgid "overran compiling workspace" msgstr "overløb kompileringsarbejdspladsen" -#: glib/gregex.c:690 +#: glib/gregex.c:751 msgid "previously-checked referenced subpattern not found" msgstr "tidligere kontrolleret, refereret undermønster blev ikke fundet" -#: glib/gregex.c:808 glib/gregex.c:1041 glib/gregex.c:2342 +#: glib/gregex.c:874 glib/gregex.c:1121 glib/gregex.c:2444 #, c-format msgid "Error while matching regular expression %s: %s" msgstr "Fejl under søgning med det regulære udtryk %s: %s" -#: glib/gregex.c:1618 +#: glib/gregex.c:1721 msgid "PCRE library is compiled without UTF8 support" msgstr "PCRE-biblioteket er kompileret uden UTF8-understøttelse" -#: glib/gregex.c:1626 +#: glib/gregex.c:1729 msgid "PCRE library is compiled with incompatible options" msgstr "PCRE-biblioteket er kompileret med inkompatible indstillinger" -#: glib/gregex.c:1751 +#: glib/gregex.c:1847 #, c-format msgid "Error while compiling regular expression ‘%s’ at char %s: %s" msgstr "Fejl under kompilering af det regulære udtryk “%s” ved tegn %s: %s" -#: glib/gregex.c:2786 +#: glib/gregex.c:2887 msgid "hexadecimal digit or “}” expected" msgstr "hexadecimalt ciffer eller “}” forventet" -#: glib/gregex.c:2802 +#: glib/gregex.c:2903 msgid "hexadecimal digit expected" msgstr "hexadecimalt ciffer forventet" -#: glib/gregex.c:2842 +#: glib/gregex.c:2943 msgid "missing “<” in symbolic reference" msgstr "manglende “<” i symbolsk reference" -#: glib/gregex.c:2851 +#: glib/gregex.c:2952 msgid "unfinished symbolic reference" msgstr "ufærdig symbolsk reference" -#: glib/gregex.c:2858 +#: glib/gregex.c:2959 msgid "zero-length symbolic reference" msgstr "symbolsk reference med længde nul" -#: glib/gregex.c:2869 +#: glib/gregex.c:2970 msgid "digit expected" msgstr "ciffer forventet" -#: glib/gregex.c:2887 +#: glib/gregex.c:2988 msgid "illegal symbolic reference" msgstr "ugyldig symbolsk reference" -#: glib/gregex.c:2950 +#: glib/gregex.c:3051 msgid "stray final “\\”" msgstr "løst afsluttende “\\”" -#: glib/gregex.c:2954 +#: glib/gregex.c:3055 msgid "unknown escape sequence" msgstr "ukendt undvigesekvens" -#: glib/gregex.c:2964 +#: glib/gregex.c:3065 #, c-format msgid "Error while parsing replacement text “%s” at char %lu: %s" msgstr "Fejl under fortolkning af erstatningstekst “%s” ved tegn %lu: %s" @@ -5844,97 +5853,103 @@ msgid "Text was empty (or contained only whitespace)" msgstr "Tekst var tom (eller indeholdt kun blanke tegn)" -#: glib/gspawn.c:314 +#: glib/gspawn.c:319 #, c-format msgid "Failed to read data from child process (%s)" msgstr "Fejl ved læsning af data fra underproces (%s)" -#: glib/gspawn.c:466 +#: glib/gspawn.c:471 #, c-format msgid "Unexpected error in reading data from a child process (%s)" msgstr "Uventet fejl ved læsning af data fra underproces (%s)" -#: glib/gspawn.c:551 +#: glib/gspawn.c:556 #, c-format msgid "Unexpected error in waitpid() (%s)" msgstr "Uventet fejl i waitpid() (%s)" -#: glib/gspawn.c:1170 glib/gspawn-win32.c:1488 +#: glib/gspawn.c:1175 glib/gspawn-win32.c:1503 #, c-format msgid "Child process exited with code %ld" msgstr "Underproces afsluttede med kode %ld" -#: glib/gspawn.c:1178 +#: glib/gspawn.c:1183 #, c-format msgid "Child process killed by signal %ld" msgstr "Underproces dræbt med signal %ld" -#: glib/gspawn.c:1185 +#: glib/gspawn.c:1190 #, c-format msgid "Child process stopped by signal %ld" msgstr "Underproces stoppet med signal %ld" -#: glib/gspawn.c:1192 +#: glib/gspawn.c:1197 #, c-format msgid "Child process exited abnormally" msgstr "Underproces afsluttede fejlagtigt" -#: glib/gspawn.c:1885 glib/gspawn-win32.c:393 glib/gspawn-win32.c:401 +#: glib/gspawn.c:2027 glib/gspawn-win32.c:393 glib/gspawn-win32.c:401 #, c-format msgid "Failed to read from child pipe (%s)" msgstr "Fejl under læsning fra barnedatakanal (%s)" -#: glib/gspawn.c:2248 +#: glib/gspawn.c:2399 #, c-format msgid "Failed to spawn child process “%s” (%s)" msgstr "Fejl under kørsel af underprocessen “%s” (%s)" -#: glib/gspawn.c:2365 +#: glib/gspawn.c:2525 #, c-format msgid "Failed to fork (%s)" msgstr "Fejl under fraspaltning af proces (%s)" -#: glib/gspawn.c:2525 glib/gspawn-win32.c:424 +#: glib/gspawn.c:2685 glib/gspawn-win32.c:424 #, c-format msgid "Failed to change to directory “%s” (%s)" msgstr "Fejl ved skift til mappen “%s” (%s)" -#: glib/gspawn.c:2535 +#: glib/gspawn.c:2695 #, c-format msgid "Failed to execute child process “%s” (%s)" msgstr "Kunne ikke køre underprocessen “%s” (%s)" -#: glib/gspawn.c:2545 +#: glib/gspawn.c:2705 #, c-format msgid "Failed to open file to remap file descriptor (%s)" msgstr "Kunne ikke åbne filen for at omtildele fildeskriptoren (%s)" -#: glib/gspawn.c:2553 +#: glib/gspawn.c:2713 #, c-format msgid "Failed to duplicate file descriptor for child process (%s)" msgstr "Kunne ikke duplikere fildeskriptoren for underproces (%s)" -#: glib/gspawn.c:2562 +#: glib/gspawn.c:2722 #, c-format msgid "Failed to fork child process (%s)" msgstr "Fejl ved fraspaltning af underproces (%s)" -#: glib/gspawn.c:2570 +#: glib/gspawn.c:2730 #, c-format msgid "Failed to close file descriptor for child process (%s)" msgstr "Kunne ikke lukke fildeskriptoren for underproces (%s)" -#: glib/gspawn.c:2578 +#: glib/gspawn.c:2738 #, c-format msgid "Unknown error executing child process “%s”" msgstr "Ukendt fejl under kørsel af underprocessen “%s”" -#: glib/gspawn.c:2602 +#: glib/gspawn.c:2762 #, c-format msgid "Failed to read enough data from child pid pipe (%s)" msgstr "" "Kunne ikke læse tilstrækkelig mængde data fra underprocessens pid-kanal (%s)" +# FD: fildeskriptor +#: glib/gspawn-private.h:134 +#, c-format +msgid "Invalid source FDs argument" +msgstr "Ugyldigt argument til kilde-FD'er" + #: glib/gspawn-win32.c:337 msgid "Failed to read data from child process" msgstr "Fejl under læsning af data fra underproces" @@ -5954,27 +5969,27 @@ msgid "Invalid program name: %s" msgstr "Ugyldigt programnavn: %s" -#: glib/gspawn-win32.c:521 glib/gspawn-win32.c:853 +#: glib/gspawn-win32.c:521 glib/gspawn-win32.c:868 #, c-format msgid "Invalid string in argument vector at %d: %s" msgstr "Ugyldig streng i argumentvektor på %d: %s" -#: glib/gspawn-win32.c:532 glib/gspawn-win32.c:869 +#: glib/gspawn-win32.c:532 glib/gspawn-win32.c:884 #, c-format msgid "Invalid string in environment: %s" msgstr "Ugyldig streng i miljø: %s" -#: glib/gspawn-win32.c:849 +#: glib/gspawn-win32.c:864 #, c-format msgid "Invalid working directory: %s" msgstr "Ugyldigt arbejdskatalog: %s" -#: glib/gspawn-win32.c:914 +#: glib/gspawn-win32.c:929 #, c-format msgid "Failed to execute helper program (%s)" msgstr "Fejl under kørsel af hjælpeprogram (%s)" -#: glib/gspawn-win32.c:1143 +#: glib/gspawn-win32.c:1158 msgid "" "Unexpected error in g_io_channel_win32_poll() reading data from a child " "process" @@ -5982,21 +5997,21 @@ "Uventet fejl i g_io_channel_win32_poll() under læsning af data fra en " "underproces" -#: glib/gstrfuncs.c:3366 glib/gstrfuncs.c:3468 +#: glib/gstrfuncs.c:3370 glib/gstrfuncs.c:3472 msgid "Empty string is not a number" msgstr "Tom streng er ikke et tal" -#: glib/gstrfuncs.c:3390 +#: glib/gstrfuncs.c:3394 #, c-format msgid "“%s” is not a signed number" msgstr "“%s” er ikke et tal med fortegn" -#: glib/gstrfuncs.c:3400 glib/gstrfuncs.c:3504 +#: glib/gstrfuncs.c:3404 glib/gstrfuncs.c:3508 #, c-format msgid "Number “%s” is out of bounds %s, %s" msgstr "Tallet “%s” er uden for det gyldige interval %s, %s" -#: glib/gstrfuncs.c:3494 +#: glib/gstrfuncs.c:3498 #, c-format msgid "“%s” is not an unsigned number" msgstr "“%s” er ikke et tal uden fortegn" @@ -6075,132 +6090,132 @@ msgstr "Tegn uden for gyldigt interval for UTF-16" #. Translators: A unit symbol for size formatting, showing for example: "13.0 kB" -#: glib/gutils.c:2857 +#: glib/gutils.c:2966 msgid "kB" msgstr "kB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 MB" -#: glib/gutils.c:2859 +#: glib/gutils.c:2968 msgid "MB" msgstr "MB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 GB" -#: glib/gutils.c:2861 +#: glib/gutils.c:2970 msgid "GB" msgstr "GB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 TB" -#: glib/gutils.c:2863 +#: glib/gutils.c:2972 msgid "TB" msgstr "TB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 PB" -#: glib/gutils.c:2865 +#: glib/gutils.c:2974 msgid "PB" msgstr "PB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 EB" -#: glib/gutils.c:2867 +#: glib/gutils.c:2976 msgid "EB" msgstr "EB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 KiB" -#: glib/gutils.c:2871 +#: glib/gutils.c:2980 msgid "KiB" msgstr "KiB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 MiB" -#: glib/gutils.c:2873 +#: glib/gutils.c:2982 msgid "MiB" msgstr "MiB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 GiB" -#: glib/gutils.c:2875 +#: glib/gutils.c:2984 msgid "GiB" msgstr "GiB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 TiB" -#: glib/gutils.c:2877 +#: glib/gutils.c:2986 msgid "TiB" msgstr "TiB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 PiB" -#: glib/gutils.c:2879 +#: glib/gutils.c:2988 msgid "PiB" msgstr "PiB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 EiB" -#: glib/gutils.c:2881 +#: glib/gutils.c:2990 msgid "EiB" msgstr "EiB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 kb" -#: glib/gutils.c:2885 +#: glib/gutils.c:2994 msgid "kb" msgstr "kb" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Mb" -#: glib/gutils.c:2887 +#: glib/gutils.c:2996 msgid "Mb" msgstr "Mb" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Gb" -#: glib/gutils.c:2889 +#: glib/gutils.c:2998 msgid "Gb" msgstr "Gb" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Tb" -#: glib/gutils.c:2891 +#: glib/gutils.c:3000 msgid "Tb" msgstr "Tb" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Pb" -#: glib/gutils.c:2893 +#: glib/gutils.c:3002 msgid "Pb" msgstr "Pb" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Eb" -#: glib/gutils.c:2895 +#: glib/gutils.c:3004 msgid "Eb" msgstr "Eb" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Kib" -#: glib/gutils.c:2899 +#: glib/gutils.c:3008 msgid "Kib" msgstr "Kib" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Mib" -#: glib/gutils.c:2901 +#: glib/gutils.c:3010 msgid "Mib" msgstr "Mib" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Gib" -#: glib/gutils.c:2903 +#: glib/gutils.c:3012 msgid "Gib" msgstr "Gib" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Tib" -#: glib/gutils.c:2905 +#: glib/gutils.c:3014 msgid "Tib" msgstr "Tib" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Pib" -#: glib/gutils.c:2907 +#: glib/gutils.c:3016 msgid "Pib" msgstr "Pib" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Eib" -#: glib/gutils.c:2909 +#: glib/gutils.c:3018 msgid "Eib" msgstr "Eib" -#: glib/gutils.c:2947 +#: glib/gutils.c:3056 msgid "byte" msgid_plural "bytes" msgstr0 "byte" msgstr1 "byte" -#: glib/gutils.c:2951 +#: glib/gutils.c:3060 msgid "bit" msgid_plural "bits" msgstr0 "bit" @@ -6208,7 +6223,7 @@ #. Translators: The "%u" is replaced with the size value, like "13"; it could #. * be part of "13 bytes", but only the number is requested this time. -#: glib/gutils.c:2959 +#: glib/gutils.c:3068 #, c-format msgctxt "format-size" msgid "%u" @@ -6216,7 +6231,7 @@ #. Translators: The first "%u" is replaced with the value, the "%s" with a unit of the value. #. * The order can be changed with "%$2s %$1u". An example: "13 bytes" -#: glib/gutils.c:2964 +#: glib/gutils.c:3073 #, c-format msgctxt "format-size" msgid "%u %s" @@ -6224,7 +6239,7 @@ #. Translators: The "%.1f" is replaced with the size value, like "13.0"; it could #. * be part of "13.0 MB", but only the number is requested this time. -#: glib/gutils.c:3000 +#: glib/gutils.c:3109 #, c-format msgctxt "format-size" msgid "%.1f" @@ -6233,15 +6248,14 @@ #. Translators: The first "%.1f" is replaced with the value, the "%s" with a unit of the value. #. * The order can be changed with "%$2s %$1.1f". Keep the no-break space between the value and #. * the unit symbol. An example: "13.0 MB" -#: glib/gutils.c:3006 +#: glib/gutils.c:3115 #, c-format -#| msgid "%.1f kB" msgctxt "format-size" msgid "%.1f %s" msgstr "%.1f %s" #. Translators: the %s in "%s bytes" will always be replaced by a number. -#: glib/gutils.c:3046 +#: glib/gutils.c:3155 #, c-format msgid "%s byte" msgid_plural "%s bytes" @@ -6249,14 +6263,14 @@ msgstr1 "%s byte" #. Translators: the %s in "%s bits" will always be replaced by a number. -#: glib/gutils.c:3051 +#: glib/gutils.c:3160 #, c-format msgid "%s bit" msgid_plural "%s bits" msgstr0 "%s byte" msgstr1 "%s byte" -#: glib/gutils.c:3092 +#: glib/gutils.c:3201 #, c-format msgid "%u byte" msgid_plural "%u bytes" @@ -6268,32 +6282,32 @@ #. * compatibility. Users will not see this string unless a program is using this deprecated function. #. * Please translate as literally as possible. #. -#: glib/gutils.c:3105 +#: glib/gutils.c:3214 #, c-format msgid "%.1f KB" msgstr "%.1f KB" -#: glib/gutils.c:3110 +#: glib/gutils.c:3219 #, c-format msgid "%.1f MB" msgstr "%.1f MB" -#: glib/gutils.c:3115 +#: glib/gutils.c:3224 #, c-format msgid "%.1f GB" msgstr "%.1f GB" -#: glib/gutils.c:3120 +#: glib/gutils.c:3229 #, c-format msgid "%.1f TB" msgstr "%.1f TB" -#: glib/gutils.c:3125 +#: glib/gutils.c:3234 #, c-format msgid "%.1f PB" msgstr "%.1f PB" -#: glib/gutils.c:3130 +#: glib/gutils.c:3239 #, c-format msgid "%.1f EB" msgstr "%.1f EB"
View file
_service:tar_scm:glib-2.74.4.tar.xz/po/de.po -> _service:tar_scm:glib-2.76.4.tar.xz/po/de.po
Changed
@@ -11,7 +11,7 @@ # Tobias Endrigkeit <tobiasendrigkeit@googlemail.com>, 2012. # Bernd Homuth <dev@hmt.im>, 2015. # Wolfgang Stöggl <c72578@yahoo.de>, 2011, 2015-2016. -# Tim Sabsch <tim@sabsch.com>, 2019-2022. +# Tim Sabsch <tim@sabsch.com>, 2019-2023. # Mario Blättermann <mario.blaettermann@gmail.com>, 2010-2013, 2015-2018, 2020-2021. # Philipp Kiemle <philipp.kiemle@gmail.com>, 2021-2022. # Jürgen Benvenuti <gastornis@posteo.org>, 2022. @@ -20,34 +20,34 @@ msgstr "" "Project-Id-Version: glib master\n" "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/glib/issues\n" -"POT-Creation-Date: 2022-09-22 12:38+0000\n" -"PO-Revision-Date: 2022-09-24 20:17+0200\n" -"Last-Translator: Jürgen Benvenuti <gastornis@posteo.org>\n" +"POT-Creation-Date: 2023-02-18 14:49+0000\n" +"PO-Revision-Date: 2023-03-03 19:15+0100\n" +"Last-Translator: Tim Sabsch <tim@sabsch.com>\n" "Language-Team: German <gnome-de@gnome.org>\n" "Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 3.1.1\n" +"X-Generator: Poedit 3.2.2\n" -#: gio/gappinfo.c:335 +#: gio/gappinfo.c:339 msgid "Setting default applications not supported yet" msgstr "Setzen von Standardanwendungen wird noch nicht unterstützt" -#: gio/gappinfo.c:368 +#: gio/gappinfo.c:372 msgid "Setting application as last used for type not supported yet" msgstr "" "Setzen einer Anwendung als »zuletzt verwendet für einen Typ« wird noch nicht " "unterstützt" -#: gio/gappinfo.c:810 +#: gio/gappinfo.c:814 #, c-format msgid "Failed to find default application for content type ‘%s’" msgstr "" "Es konnte keine Vorgabeanwendung für den Inhaltstyp »%s« gefunden werden" -#: gio/gappinfo.c:870 +#: gio/gappinfo.c:874 #, c-format msgid "Failed to find default application for URI Scheme ‘%s’" msgstr "" @@ -247,11 +247,11 @@ msgid "error sending %s message to application: %s\n" msgstr "Fehler beim Senden der %s-Nachricht zur Anwendung: %s\n" -#: gio/gapplication-tool.c:321 +#: gio/gapplication-tool.c:324 msgid "action name must be given after application id\n" msgstr "Der Aktionsname muss nach der Anwendungskennung angegeben werden\n" -#: gio/gapplication-tool.c:329 +#: gio/gapplication-tool.c:332 #, c-format msgid "" "invalid action name: “%s”\n" @@ -260,25 +260,25 @@ "Ungültiger Aktionsname: »%s«\n" "Aktionsnamen dürfen nur aus alphanumerischen Zeichen, »-« und ».« bestehen\n" -#: gio/gapplication-tool.c:348 +#: gio/gapplication-tool.c:351 #, c-format msgid "error parsing action parameter: %s\n" msgstr "Fehler bei der Verarbeitung des Aktionsparameters: %s\n" -#: gio/gapplication-tool.c:360 +#: gio/gapplication-tool.c:363 msgid "actions accept a maximum of one parameter\n" msgstr "Aktionen akzeptiert maximal einen Parameter\n" -#: gio/gapplication-tool.c:415 +#: gio/gapplication-tool.c:418 msgid "list-actions command takes only the application id" msgstr "Der Befehl list-actions akzeptiert nur die Anwendungskennung" -#: gio/gapplication-tool.c:425 +#: gio/gapplication-tool.c:428 #, c-format msgid "unable to find desktop file for application %s\n" msgstr "Die desktop-Datei für die Anwendung %s konnte nicht gefunden werden\n" -#: gio/gapplication-tool.c:470 +#: gio/gapplication-tool.c:473 #, c-format msgid "" "unrecognised command: %s\n" @@ -313,7 +313,7 @@ msgid "Truncate not supported on base stream" msgstr "Abschneiden wird vom Basis-Datenstrom nicht unterstützt" -#: gio/gcancellable.c:319 gio/gdbusconnection.c:1859 gio/gdbusprivate.c:1420 +#: gio/gcancellable.c:326 gio/gdbusconnection.c:1859 gio/gdbusprivate.c:1420 #: gio/gsimpleasyncresult.c:873 gio/gsimpleasyncresult.c:899 #, c-format msgid "Operation was cancelled" @@ -333,13 +333,13 @@ #: gio/gcharsetconverter.c:344 gio/gdatainputstream.c:850 #: gio/gdatainputstream.c:1268 glib/gconvert.c:451 glib/gconvert.c:883 -#: glib/giochannel.c:1576 glib/giochannel.c:1618 glib/giochannel.c:2473 +#: glib/giochannel.c:1576 glib/giochannel.c:1618 glib/giochannel.c:2478 #: glib/gutf8.c:892 glib/gutf8.c:1346 msgid "Invalid byte sequence in conversion input" msgstr "Ungültige Bytefolge in Umwandlungseingabe" #: gio/gcharsetconverter.c:349 glib/gconvert.c:459 glib/gconvert.c:797 -#: glib/giochannel.c:1583 glib/giochannel.c:2485 +#: glib/giochannel.c:1583 glib/giochannel.c:2493 #, c-format msgid "Error during conversion: %s" msgstr "Fehler bei der Umwandlung: %s" @@ -397,17 +397,17 @@ msgid "Unexpected early end-of-stream" msgstr "Unerwartet frühes Datenstromende" -#: gio/gdbusaddress.c:164 gio/gdbusaddress.c:238 gio/gdbusaddress.c:327 +#: gio/gdbusaddress.c:162 gio/gdbusaddress.c:234 gio/gdbusaddress.c:321 #, c-format msgid "Unsupported key “%s” in address entry “%s”" msgstr "Nicht unterstützter Schlüssel »%s« im Adresseintrag »%s«" -#: gio/gdbusaddress.c:177 +#: gio/gdbusaddress.c:175 #, c-format msgid "Meaningless key/value pair combination in address entry “%s”" msgstr "Bedeutungsloses Schlüssel-Wert-Paar im Adresseintrag »%s«" -#: gio/gdbusaddress.c:186 +#: gio/gdbusaddress.c:184 #, c-format msgid "" "Address “%s” is invalid (need exactly one of path, dir, tmpdir, or abstract " @@ -416,28 +416,28 @@ "Adresse »%s« ist ungültig (benötigt genau einen der Schlüssel path, dir, " "tmpdir oder abstract keys)" -#: gio/gdbusaddress.c:253 gio/gdbusaddress.c:264 gio/gdbusaddress.c:279 -#: gio/gdbusaddress.c:342 gio/gdbusaddress.c:353 +#: gio/gdbusaddress.c:249 gio/gdbusaddress.c:260 gio/gdbusaddress.c:275 +#: gio/gdbusaddress.c:336 gio/gdbusaddress.c:347 #, c-format msgid "Error in address “%s” — the “%s” attribute is malformed" msgstr "Fehler in Adresse »%s« – Das Attribut »%s« ist nicht korrekt" -#: gio/gdbusaddress.c:423 gio/gdbusaddress.c:682 +#: gio/gdbusaddress.c:417 gio/gdbusaddress.c:676 #, c-format msgid "Unknown or unsupported transport “%s” for address “%s”" msgstr "Unbekannter oder nicht unterstützter Transport »%s« für Adresse »%s«" -#: gio/gdbusaddress.c:467 +#: gio/gdbusaddress.c:461 #, c-format msgid "Address element “%s” does not contain a colon (:)" msgstr "Adresselement »%s« enthält keinen Doppelpunkt" -#: gio/gdbusaddress.c:476 +#: gio/gdbusaddress.c:470 #, c-format msgid "Transport name in address element “%s” must not be empty" msgstr "Der Transportname im Adresselement »%s« darf nicht leer sein" -#: gio/gdbusaddress.c:497 +#: gio/gdbusaddress.c:491 #, c-format msgid "" "Key/Value pair %d, “%s”, in address element “%s” does not contain an equal " @@ -446,7 +446,7 @@ "Schlüssel-Wert-Paar %d, »%s«, in Adresselement »%s« enthält kein " "Gleichheitszeichen" -#: gio/gdbusaddress.c:508 +#: gio/gdbusaddress.c:502 #, c-format msgid "" "Key/Value pair %d, “%s”, in address element “%s” must not have an empty key" @@ -454,7 +454,7 @@ "Schlüssel-Wert-Paar %d, »%s«, in Adresselement »%s« darf keinen leeren " "Schlüssel enthalten" -#: gio/gdbusaddress.c:522 +#: gio/gdbusaddress.c:516 #, c-format msgid "" "Error unescaping key or value in Key/Value pair %d, “%s”, in address element " @@ -463,7 +463,7 @@ "Fehler beim Entfernen von Escape-Zeichen im Schlüssel-Wert-Paar %d, »%s«, im " "Adresselement »%s«" -#: gio/gdbusaddress.c:590 +#: gio/gdbusaddress.c:584 #, c-format msgid "" "Error in address “%s” — the unix transport requires exactly one of the keys " @@ -472,84 +472,84 @@ "Fehler in Adresse »%s« - für den Unix-Transport muss genau einer der " "Schlüssel »path« oder »abstract« gesetzt sein" -#: gio/gdbusaddress.c:625 +#: gio/gdbusaddress.c:619 #, c-format msgid "Error in address “%s” — the host attribute is missing or malformed" msgstr "" "Fehler in Adresse »%s« – Das Host-Attribut fehlt oder ist nicht korrekt" -#: gio/gdbusaddress.c:639 +#: gio/gdbusaddress.c:633 #, c-format msgid "Error in address “%s” — the port attribute is missing or malformed" msgstr "" "Fehler in Adresse »%s« – Das Port-Attribut fehlt oder ist nicht korrekt" -#: gio/gdbusaddress.c:653 +#: gio/gdbusaddress.c:647 #, c-format msgid "Error in address “%s” — the noncefile attribute is missing or malformed" msgstr "" "Fehler in Adresse »%s« – Das noncefile-Attribut fehlt oder ist nicht korrekt" -#: gio/gdbusaddress.c:674 +#: gio/gdbusaddress.c:668 msgid "Error auto-launching: " msgstr "Fehler beim automatischen Starten: " -#: gio/gdbusaddress.c:727 +#: gio/gdbusaddress.c:721 #, c-format msgid "Error opening nonce file “%s”: %s" msgstr "Fehler beim Öffnen der Nonce-Datei »%s«: %s" -#: gio/gdbusaddress.c:746 +#: gio/gdbusaddress.c:740 #, c-format msgid "Error reading from nonce file “%s”: %s" msgstr "Fehler beim Lesen der Nonce-Datei »%s«: %s" -#: gio/gdbusaddress.c:755 +#: gio/gdbusaddress.c:749 #, c-format msgid "Error reading from nonce file “%s”, expected 16 bytes, got %d" msgstr "" "Fehler beim Lesen der Nonce-Datei »%s«, erwartet wurden 16 Bytes, jedoch %d " "erhalten" -#: gio/gdbusaddress.c:773 +#: gio/gdbusaddress.c:767 #, c-format msgid "Error writing contents of nonce file “%s” to stream:" msgstr "" "Fehler beim Schreiben des Inhalts der Nonce-Datei »%s« in den Datenstrom:" -#: gio/gdbusaddress.c:988 +#: gio/gdbusaddress.c:982 msgid "The given address is empty" msgstr "Die angegebene Adresse ist leer" -#: gio/gdbusaddress.c:1101 +#: gio/gdbusaddress.c:1095 #, c-format msgid "Cannot spawn a message bus when AT_SECURE is set" msgstr "" "Ein Nachrichtenbus kann nicht erzeugt werden, wenn AT_SECURE gesetzt ist" -#: gio/gdbusaddress.c:1108 +#: gio/gdbusaddress.c:1102 msgid "Cannot spawn a message bus without a machine-id: " msgstr "" "Ein Nachrichtenbus kann nicht ohne eine Rechner-Kennung erzeugt werden: " -#: gio/gdbusaddress.c:1115 +#: gio/gdbusaddress.c:1109 #, c-format msgid "Cannot autolaunch D-Bus without X11 $DISPLAY" msgstr "D-Bus kann nicht automatisch ohne X11 $DISPLAY gestartet werden" -#: gio/gdbusaddress.c:1157 +#: gio/gdbusaddress.c:1151 #, c-format msgid "Error spawning command line “%s”: " msgstr "Fehler beim Erzeugen der Befehlszeile »%s«: " -#: gio/gdbusaddress.c:1226 +#: gio/gdbusaddress.c:1220 #, c-format msgid "Cannot determine session bus address (not implemented for this OS)" msgstr "" "Adresse des Sitzungsbus konnte nicht ermittelt werden (für dieses " "Betriebssystem nicht implementiert)" -#: gio/gdbusaddress.c:1375 gio/gdbusconnection.c:7321 +#: gio/gdbusaddress.c:1374 gio/gdbusconnection.c:7316 #, c-format msgid "" "Cannot determine bus address from DBUS_STARTER_BUS_TYPE environment variable " @@ -558,7 +558,7 @@ "Bus-Adresse konnte nicht über die Umgebungsvariable DBUS_STARTER_BUS_TYPE " "ermittelt werden – unbekannter Wert »%s«" -#: gio/gdbusaddress.c:1384 gio/gdbusconnection.c:7330 +#: gio/gdbusaddress.c:1383 gio/gdbusconnection.c:7325 msgid "" "Cannot determine bus address because the DBUS_STARTER_BUS_TYPE environment " "variable is not set" @@ -566,7 +566,7 @@ "Bus-Adresse konnte nicht ermittelt werden, da die Umgebungsvariable " "DBUS_STARTER_BUS_TYPE nicht gesetzt ist" -#: gio/gdbusaddress.c:1394 +#: gio/gdbusaddress.c:1393 #, c-format msgid "Unknown bus type %d" msgstr "Unbekannter Bus-Typ %d" @@ -588,11 +588,15 @@ "Alle verfügbaren Legitimierungsmechanismen sind ausgeschöpft (%s Versuche) " "(verfügbar: %s)" -#: gio/gdbusauth.c:1178 +#: gio/gdbusauth.c:1045 +msgid "Unexpected lack of content trying to read a byte" +msgstr "Unerwarteter Mangel an Inhalt beim Versuch, einen Byte zu lesen" + +#: gio/gdbusauth.c:1195 msgid "User IDs must be the same for peer and server" msgstr "Benutzerkennungen müssen für Server und Gegenstelle gleich sein" -#: gio/gdbusauth.c:1190 +#: gio/gdbusauth.c:1207 msgid "Cancelled via GDBusAuthObserver::authorize-authenticated-peer" msgstr "Abgebrochen durch GDBusAuthObserver::authorize-authenticated-peer" @@ -686,7 +690,7 @@ msgid "(Additionally, releasing the lock for “%s” also failed: %s) " msgstr "(Außerdem schlug das Entsperren von »%s« ebenso fehl: %s) " -#: gio/gdbusconnection.c:590 gio/gdbusconnection.c:2404 +#: gio/gdbusconnection.c:590 gio/gdbusconnection.c:2405 msgid "The connection is closed" msgstr "Verbindung ist geschlossen" @@ -694,14 +698,14 @@ msgid "Timeout was reached" msgstr "Zeitüberschreitung wurde erreicht" -#: gio/gdbusconnection.c:2527 +#: gio/gdbusconnection.c:2528 msgid "" "Unsupported flags encountered when constructing a client-side connection" msgstr "" "Beim Erstellen einer client-seitigen Verbindung wurden nicht unterstützte " "Flags entdeckt" -#: gio/gdbusconnection.c:4256 gio/gdbusconnection.c:4610 +#: gio/gdbusconnection.c:4257 gio/gdbusconnection.c:4611 #, c-format msgid "" "No such interface “org.freedesktop.DBus.Properties” on object at path %s" @@ -709,105 +713,105 @@ "Keine derartige Schnittstelle »org.freedesktop.DBus.Properties« des Objekts " "im Pfad %s" -#: gio/gdbusconnection.c:4401 +#: gio/gdbusconnection.c:4402 #, c-format msgid "No such property “%s”" msgstr "Keine derartige Eigenschaft »%s«" -#: gio/gdbusconnection.c:4413 +#: gio/gdbusconnection.c:4414 #, c-format msgid "Property “%s” is not readable" msgstr "Eigenschaft »%s« ist nicht lesbar" -#: gio/gdbusconnection.c:4424 +#: gio/gdbusconnection.c:4425 #, c-format msgid "Property “%s” is not writable" msgstr "Eigenschaft »%s« ist nicht schreibbar" -#: gio/gdbusconnection.c:4444 +#: gio/gdbusconnection.c:4445 #, c-format msgid "Error setting property “%s”: Expected type “%s” but got “%s”" msgstr "" "Fehler beim Setzen der Eigenschaft »%s«: Erwarteter Typ war »%s«, aber »%s« " "wurde erhalten" -#: gio/gdbusconnection.c:4549 gio/gdbusconnection.c:4764 -#: gio/gdbusconnection.c:6747 +#: gio/gdbusconnection.c:4550 gio/gdbusconnection.c:4765 +#: gio/gdbusconnection.c:6742 #, c-format msgid "No such interface “%s”" msgstr "Keine derartige Schnittstelle »%s«" -#: gio/gdbusconnection.c:4986 gio/gdbusconnection.c:7261 +#: gio/gdbusconnection.c:4981 gio/gdbusconnection.c:7256 #, c-format msgid "No such interface “%s” on object at path %s" msgstr "Keine derartige Schnittstelle »%s« des Objekts im Pfad %s" -#: gio/gdbusconnection.c:5087 +#: gio/gdbusconnection.c:5082 #, c-format msgid "No such method “%s”" msgstr "Keine derartige Methode »%s«" -#: gio/gdbusconnection.c:5118 +#: gio/gdbusconnection.c:5113 #, c-format msgid "Type of message, “%s”, does not match expected type “%s”" msgstr "Der Nachrichtentyp »%s« entspricht nicht dem erwarteten Typ »%s«" -#: gio/gdbusconnection.c:5321 +#: gio/gdbusconnection.c:5316 #, c-format msgid "An object is already exported for the interface %s at %s" msgstr "Für die Schnittstelle %s auf %s wurde bereits ein Objekt exportiert" -#: gio/gdbusconnection.c:5548 +#: gio/gdbusconnection.c:5543 #, c-format msgid "Unable to retrieve property %s.%s" msgstr "Eigenschaft kann nicht abgefragt werden: %s.%s" -#: gio/gdbusconnection.c:5604 +#: gio/gdbusconnection.c:5599 #, c-format msgid "Unable to set property %s.%s" msgstr "Eigenschaft kann nicht gesetzt werden: %s.%s" -#: gio/gdbusconnection.c:5783 +#: gio/gdbusconnection.c:5778 #, c-format msgid "Method “%s” returned type “%s”, but expected “%s”" msgstr "Methode »%s« gab Typ »%s« zurück, aber »%s« wurde erwartet" -#: gio/gdbusconnection.c:6859 +#: gio/gdbusconnection.c:6854 #, c-format msgid "Method “%s” on interface “%s” with signature “%s” does not exist" msgstr "Methode »%s« in Schnittstelle »%s« mit Signatur »%s« existiert nicht" -#: gio/gdbusconnection.c:6980 +#: gio/gdbusconnection.c:6975 #, c-format msgid "A subtree is already exported for %s" msgstr "Ein Unterbaum wurde bereits für %s exportiert" -#: gio/gdbusconnection.c:7269 +#: gio/gdbusconnection.c:7264 #, c-format msgid "Object does not exist at path “%s”" msgstr "Das Objekt existiert nicht am Pfad »%s«" -#: gio/gdbusmessage.c:1303 +#: gio/gdbusmessage.c:1306 msgid "type is INVALID" msgstr "Typ ist UNGÜLTIG" -#: gio/gdbusmessage.c:1314 +#: gio/gdbusmessage.c:1317 msgid "METHOD_CALL message: PATH or MEMBER header field is missing" msgstr "METHOD_CALL-Meldung: Kopfzeilenfeld PATH oder MEMBER fehlt" -#: gio/gdbusmessage.c:1325 +#: gio/gdbusmessage.c:1328 msgid "METHOD_RETURN message: REPLY_SERIAL header field is missing" msgstr "METHOD_RETURN-Meldung: Kopfzeilenfeld REPLY_SERIAL fehlt" -#: gio/gdbusmessage.c:1337 +#: gio/gdbusmessage.c:1340 msgid "ERROR message: REPLY_SERIAL or ERROR_NAME header field is missing" msgstr "ERROR-Meldung: Kopfzeilenfeld REPLY_SERIAL oder ERROR_NAME fehlt" -#: gio/gdbusmessage.c:1350 +#: gio/gdbusmessage.c:1353 msgid "SIGNAL message: PATH, INTERFACE or MEMBER header field is missing" msgstr "SIGNAL-Meldung: Kopfzeilenfeld PATH, INTERFACE oder MEMBER fehlt" -#: gio/gdbusmessage.c:1358 +#: gio/gdbusmessage.c:1361 msgid "" "SIGNAL message: The PATH header field is using the reserved value /org/" "freedesktop/DBus/Local" @@ -815,7 +819,7 @@ "SIGNAL-Meldung: Das Kopfzeilenfeld PATH verwendet den reservierten Wert /org/" "freedesktop/DBus/Local" -#: gio/gdbusmessage.c:1366 +#: gio/gdbusmessage.c:1369 msgid "" "SIGNAL message: The INTERFACE header field is using the reserved value org." "freedesktop.DBus.Local" @@ -823,21 +827,21 @@ "SIGNAL-Meldung: Das Kopfzeilenfeld INTERFACE verwendet den reservierten Wert " "org.freedesktop.DBus.Local" -#: gio/gdbusmessage.c:1414 gio/gdbusmessage.c:1474 +#: gio/gdbusmessage.c:1417 gio/gdbusmessage.c:1477 #, c-format msgid "Wanted to read %lu byte but only got %lu" msgid_plural "Wanted to read %lu bytes but only got %lu" msgstr0 "%lu Byte sollte gelesen werden, aber nur %lu erhalten" msgstr1 "%lu Bytes sollten gelesen werden, aber nur %lu erhalten" -#: gio/gdbusmessage.c:1428 +#: gio/gdbusmessage.c:1431 #, c-format msgid "Expected NUL byte after the string “%s” but found byte %d" msgstr "" "Ein NUL-Byte wurde nach der Zeichenkette »%s« erwartet, aber es wurde Byte " "%d gefunden" -#: gio/gdbusmessage.c:1447 +#: gio/gdbusmessage.c:1450 #, c-format msgid "" "Expected valid UTF-8 string but found invalid bytes at byte offset %d " @@ -847,21 +851,21 @@ "Position %d gefunden (Länge der Zeichenkette ist %d). Die gültige UTF-8-" "Zeichenkette bis zu diesem Punkt war »%s«." -#: gio/gdbusmessage.c:1511 gio/gdbusmessage.c:1787 gio/gdbusmessage.c:1998 +#: gio/gdbusmessage.c:1514 gio/gdbusmessage.c:1790 gio/gdbusmessage.c:2001 msgid "Value nested too deeply" msgstr "Der Wert ist zu tief verschachtelt" -#: gio/gdbusmessage.c:1679 +#: gio/gdbusmessage.c:1682 #, c-format msgid "Parsed value “%s” is not a valid D-Bus object path" msgstr "Verarbeiteter Wert »%s« ist kein gültiger D-Bus-Objektpfad" -#: gio/gdbusmessage.c:1703 +#: gio/gdbusmessage.c:1706 #, c-format msgid "Parsed value “%s” is not a valid D-Bus signature" msgstr "Verarbeiteter Wert »%s« ist keine gültige D-Bus-Signatur" -#: gio/gdbusmessage.c:1754 +#: gio/gdbusmessage.c:1757 #, c-format msgid "" "Encountered array of length %u byte. Maximum length is 2<<26 bytes (64 MiB)." @@ -874,7 +878,7 @@ "Array der Länge %u Bytes wurde erkannt. Maximale Länge ist 2<<26 Bytes (64 " "MiB)." -#: gio/gdbusmessage.c:1774 +#: gio/gdbusmessage.c:1777 #, c-format msgid "" "Encountered array of type “a%c”, expected to have a length a multiple of %u " @@ -883,16 +887,16 @@ "Es wurde ein Feld des Typs »a%c« gefunden. Erwartet wurde als Länge ein " "Vielfaches von %u Byte, aber es waren %u Byte Länge" -#: gio/gdbusmessage.c:1928 gio/gdbusmessage.c:2647 +#: gio/gdbusmessage.c:1931 gio/gdbusmessage.c:2650 msgid "Empty structures (tuples) are not allowed in D-Bus" msgstr "Leere Strukturen (Tupel) sind in D-Bus nicht erlaubt" -#: gio/gdbusmessage.c:1982 +#: gio/gdbusmessage.c:1985 #, c-format msgid "Parsed value “%s” for variant is not a valid D-Bus signature" msgstr "Verarbeiteter Wert »%s« für Variante ist keine gültige D-Bus-Signatur" -#: gio/gdbusmessage.c:2023 +#: gio/gdbusmessage.c:2026 #, c-format msgid "" "Error deserializing GVariant with type string “%s” from the D-Bus wire format" @@ -900,7 +904,7 @@ "Fehler beim Deserialisieren von GVariant mit der Typenzeichenkette »%s« aus " "dem D-Bus Wire-Format" -#: gio/gdbusmessage.c:2208 +#: gio/gdbusmessage.c:2211 #, c-format msgid "" "Invalid endianness value. Expected 0x6c (“l”) or 0x42 (“B”) but found value " @@ -909,29 +913,29 @@ "Ungültiger Wert für die Speicherreihenfolge. Es wird entweder 0x6c (»l«) " "oder 0x42 (»B«) erwartet, aber der Wert 0x%02x gefunden" -#: gio/gdbusmessage.c:2227 +#: gio/gdbusmessage.c:2230 #, c-format msgid "Invalid major protocol version. Expected 1 but found %d" msgstr "" "Ungültige Version des Hauptprotokolls. Erwartet wurde 1, jedoch %d gefunden" -#: gio/gdbusmessage.c:2285 gio/gdbusmessage.c:2883 +#: gio/gdbusmessage.c:2288 gio/gdbusmessage.c:2886 msgid "Signature header found but is not of type signature" msgstr "Signatur-Kopfzeilenfeld gefunden, ist aber nicht vom Typ Signatur" -#: gio/gdbusmessage.c:2297 +#: gio/gdbusmessage.c:2300 #, c-format msgid "Signature header with signature “%s” found but message body is empty" msgstr "" "Signatur-Kopfzeilenfeld mit Signatur »%s« gefunden, aber Nachrichtenrumpf " "ist leer" -#: gio/gdbusmessage.c:2312 +#: gio/gdbusmessage.c:2315 #, c-format msgid "Parsed value “%s” is not a valid D-Bus signature (for body)" msgstr "Verarbeiteter Wert »%s« ist keine gültige D-Bus-Signatur (für Rumpf)" -#: gio/gdbusmessage.c:2344 +#: gio/gdbusmessage.c:2347 #, 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" @@ -942,11 +946,11 @@ "Kein Signatur-Kopfzeilenfeld in der Nachricht, aber der Nachrichtenrumpf ist " "%u Bytes groß" -#: gio/gdbusmessage.c:2354 +#: gio/gdbusmessage.c:2357 msgid "Cannot deserialize message: " msgstr "Meldung kann nicht deserialisiert werden: " -#: gio/gdbusmessage.c:2700 +#: gio/gdbusmessage.c:2703 #, c-format msgid "" "Error serializing GVariant with type string “%s” to the D-Bus wire format" @@ -954,7 +958,7 @@ "Fehler beim Deserialisieren von GVariant mit der Typenzeichenkette »%s« in " "das D-Bus Wire-Format" -#: gio/gdbusmessage.c:2837 +#: gio/gdbusmessage.c:2840 #, c-format msgid "" "Number of file descriptors in message (%d) differs from header field (%d)" @@ -962,18 +966,18 @@ "Anzahl der Dateideskriptoren in Meldung (%d) und Kopfzeilenfeld (%d) ist " "unterschiedlich" -#: gio/gdbusmessage.c:2845 +#: gio/gdbusmessage.c:2848 msgid "Cannot serialize message: " msgstr "Meldung kann nicht serialisiert werden: " -#: gio/gdbusmessage.c:2898 +#: gio/gdbusmessage.c:2901 #, c-format msgid "Message body has signature “%s” but there is no signature header" msgstr "" "Nachrichtenrumpf hat den Signaturtyp »%s«, aber es gibt keine Signatur im " "Kopfzeilenfeld" -#: gio/gdbusmessage.c:2908 +#: gio/gdbusmessage.c:2911 #, c-format msgid "" "Message body has type signature “%s” but signature in the header field is " @@ -982,18 +986,18 @@ "Nachrichtenrumpf hat den Signaturtyp »%s«, aber die Signatur im " "Kopfzeilenfeld ist »%s«" -#: gio/gdbusmessage.c:2924 +#: gio/gdbusmessage.c:2927 #, c-format msgid "Message body is empty but signature in the header field is “(%s)”" msgstr "" "Nachrichtenrumpf ist leer, aber die Signatur im Kopfzeilenfeld ist »(%s)«" -#: gio/gdbusmessage.c:3479 +#: gio/gdbusmessage.c:3482 #, c-format msgid "Error return with body of type “%s”" msgstr "Fehlerrückmeldung mit Inhalt des Typs »%s«" -#: gio/gdbusmessage.c:3487 +#: gio/gdbusmessage.c:3490 msgid "Error return with empty body" msgstr "Fehlerrückmeldung mit leerem Inhalt" @@ -1019,17 +1023,17 @@ msgid "Unable to load %s or %s: " msgstr "%s oder %s kann nicht geladen werden: " -#: gio/gdbusproxy.c:1575 +#: gio/gdbusproxy.c:1568 #, c-format msgid "Error calling StartServiceByName for %s: " msgstr "Fehler beim Aufruf von StartServiceByName für %s: " -#: gio/gdbusproxy.c:1598 +#: gio/gdbusproxy.c:1591 #, c-format msgid "Unexpected reply %d from StartServiceByName(\"%s\") method" msgstr "Unerwartete Antwort %d von der Methode StartServiceByName(»%s«)" -#: gio/gdbusproxy.c:2709 gio/gdbusproxy.c:2844 +#: gio/gdbusproxy.c:2702 gio/gdbusproxy.c:2837 #, c-format msgid "" "Cannot invoke method; proxy is for the well-known name %s without an owner, " @@ -1039,25 +1043,25 @@ "bekannten Namen %s ohne Besitzer, und der Proxy wurde mit dem Flag " "»G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START« erstellt" -#: gio/gdbusserver.c:765 +#: gio/gdbusserver.c:758 msgid "Abstract namespace not supported" msgstr "Abstrakter Namensraum wird nicht unterstützt" -#: gio/gdbusserver.c:857 +#: gio/gdbusserver.c:850 msgid "Cannot specify nonce file when creating a server" msgstr "Nonce-Datei kann beim Erstellen eines Servers nicht angegeben werden" -#: gio/gdbusserver.c:939 +#: gio/gdbusserver.c:932 #, c-format msgid "Error writing nonce file at “%s”: %s" msgstr "Fehler beim Schreiben der Nonce-Datei auf »%s«: %s" -#: gio/gdbusserver.c:1114 +#: gio/gdbusserver.c:1107 #, c-format msgid "The string “%s” is not a valid D-Bus GUID" msgstr "Die Zeichenkette »%s« ist keine gültige GUID für D-Bus" -#: gio/gdbusserver.c:1152 +#: gio/gdbusserver.c:1145 #, c-format msgid "Cannot listen on unsupported transport “%s”" msgstr "An nicht unterstützter Übertragung »%s« kann nicht gelauscht werden" @@ -1085,14 +1089,14 @@ "\n" "Mit »%s BEFEHL --help« erhalten Sie Hilfe zu jedem der Befehle.\n" -#: gio/gdbus-tool.c:204 gio/gdbus-tool.c:276 gio/gdbus-tool.c:348 -#: gio/gdbus-tool.c:372 gio/gdbus-tool.c:862 gio/gdbus-tool.c:1247 -#: gio/gdbus-tool.c:1734 +#: gio/gdbus-tool.c:204 gio/gdbus-tool.c:276 gio/gdbus-tool.c:347 +#: gio/gdbus-tool.c:371 gio/gdbus-tool.c:861 gio/gdbus-tool.c:1246 +#: gio/gdbus-tool.c:1733 #, c-format msgid "Error: %s\n" msgstr "Fehler: %s\n" -#: gio/gdbus-tool.c:215 gio/gdbus-tool.c:289 gio/gdbus-tool.c:1750 +#: gio/gdbus-tool.c:215 gio/gdbus-tool.c:289 gio/gdbus-tool.c:1749 #, c-format msgid "Error parsing introspection XML: %s\n" msgstr "Fehler beim Verarbeiten des XML-Codes der Inspektion: %s\n" @@ -1102,43 +1106,43 @@ msgid "Error: %s is not a valid name\n" msgstr "Fehler: %s ist kein gültiger Name\n" -#: gio/gdbus-tool.c:258 gio/gdbus-tool.c:748 gio/gdbus-tool.c:1066 -#: gio/gdbus-tool.c:1900 gio/gdbus-tool.c:2140 +#: gio/gdbus-tool.c:258 gio/gdbus-tool.c:747 gio/gdbus-tool.c:1065 +#: gio/gdbus-tool.c:1899 gio/gdbus-tool.c:2139 #, c-format msgid "Error: %s is not a valid object path\n" msgstr "Fehler: %s ist kein gültiger Objektpfad\n" -#: gio/gdbus-tool.c:406 +#: gio/gdbus-tool.c:405 msgid "Connect to the system bus" msgstr "Zum Systembus verbinden" -#: gio/gdbus-tool.c:407 +#: gio/gdbus-tool.c:406 msgid "Connect to the session bus" msgstr "Zum Sitzungsbus verbinden" -#: gio/gdbus-tool.c:408 +#: gio/gdbus-tool.c:407 msgid "Connect to given D-Bus address" msgstr "Zur angegebenen D-Bus-Adresse verbinden" -#: gio/gdbus-tool.c:418 +#: gio/gdbus-tool.c:417 msgid "Connection Endpoint Options:" msgstr "Optionen für Gegenstelle der Verbindung:" -#: gio/gdbus-tool.c:419 +#: gio/gdbus-tool.c:418 msgid "Options specifying the connection endpoint" msgstr "Optionen zur Gegenstelle der Verbindung" -#: gio/gdbus-tool.c:442 +#: gio/gdbus-tool.c:441 #, c-format msgid "No connection endpoint specified" msgstr "Keine Gegenstelle der Verbindung angegeben" -#: gio/gdbus-tool.c:452 +#: gio/gdbus-tool.c:451 #, c-format msgid "Multiple connection endpoints specified" msgstr "Mehrere Gegenstellen der Verbindung angegeben" -#: gio/gdbus-tool.c:525 +#: gio/gdbus-tool.c:524 #, c-format msgid "" "Warning: According to introspection data, interface “%s” does not exist\n" @@ -1146,7 +1150,7 @@ "Warnung: Entsprechend den Inspektionsdaten existiert die Schnittstelle »%s« " "nicht\n" -#: gio/gdbus-tool.c:534 +#: gio/gdbus-tool.c:533 #, c-format msgid "" "Warning: According to introspection data, method “%s” does not exist on " @@ -1155,167 +1159,167 @@ "Warnung: Entsprechend den Inspektionsdaten existiert die Methode »%s« nicht " "in der Schnittstelle »%s«\n" -#: gio/gdbus-tool.c:596 +#: gio/gdbus-tool.c:595 msgid "Optional destination for signal (unique name)" msgstr "Optionales Ziel des Signals (eindeutiger Name)" -#: gio/gdbus-tool.c:597 +#: gio/gdbus-tool.c:596 msgid "Object path to emit signal on" msgstr "Objektpfad, auf den das Signal ausgegeben werden soll" -#: gio/gdbus-tool.c:598 +#: gio/gdbus-tool.c:597 msgid "Signal and interface name" msgstr "Signal und Schnittstellenname" -#: gio/gdbus-tool.c:631 +#: gio/gdbus-tool.c:630 msgid "Emit a signal." msgstr "Ein Signal ausgeben." -#: gio/gdbus-tool.c:686 gio/gdbus-tool.c:1003 gio/gdbus-tool.c:1837 -#: gio/gdbus-tool.c:2069 gio/gdbus-tool.c:2289 +#: gio/gdbus-tool.c:685 gio/gdbus-tool.c:1002 gio/gdbus-tool.c:1836 +#: gio/gdbus-tool.c:2068 gio/gdbus-tool.c:2288 #, c-format msgid "Error connecting: %s\n" msgstr "Fehler beim Verbinden: %s\n" -#: gio/gdbus-tool.c:706 +#: gio/gdbus-tool.c:705 #, c-format msgid "Error: %s is not a valid unique bus name.\n" msgstr "Fehler: %s ist kein gültiger eindeutiger Bus-Name.\n" -#: gio/gdbus-tool.c:725 gio/gdbus-tool.c:1046 gio/gdbus-tool.c:1880 +#: gio/gdbus-tool.c:724 gio/gdbus-tool.c:1045 gio/gdbus-tool.c:1879 msgid "Error: Object path is not specified\n" msgstr "Fehler: Objektpfad wurde nicht angegeben\n" -#: gio/gdbus-tool.c:768 +#: gio/gdbus-tool.c:767 msgid "Error: Signal name is not specified\n" msgstr "Fehler: Signalname wurde nicht angegeben\n" -#: gio/gdbus-tool.c:782 +#: gio/gdbus-tool.c:781 #, c-format msgid "Error: Signal name “%s” is invalid\n" msgstr "Fehler: Signalname »%s« ist ungültig\n" -#: gio/gdbus-tool.c:794 +#: gio/gdbus-tool.c:793 #, c-format msgid "Error: %s is not a valid interface name\n" msgstr "Fehler: %s ist kein gültiger Schnittstellenname\n" -#: gio/gdbus-tool.c:800 +#: gio/gdbus-tool.c:799 #, c-format msgid "Error: %s is not a valid member name\n" msgstr "Fehler: %s ist kein gültiger Mitgliedsname\n" #. Use the original non-"parse-me-harder" error -#: gio/gdbus-tool.c:837 gio/gdbus-tool.c:1178 +#: gio/gdbus-tool.c:836 gio/gdbus-tool.c:1177 #, c-format msgid "Error parsing parameter %d: %s\n" msgstr "Fehler bei der Verarbeitung des Parameters %d: %s\n" -#: gio/gdbus-tool.c:869 +#: gio/gdbus-tool.c:868 #, c-format msgid "Error flushing connection: %s\n" msgstr "Fehler beim Löschen der Verbindung: %s\n" -#: gio/gdbus-tool.c:897 +#: gio/gdbus-tool.c:896 msgid "Destination name to invoke method on" msgstr "Name des Ziels, für das die Methode aufgerufen werden soll" -#: gio/gdbus-tool.c:898 +#: gio/gdbus-tool.c:897 msgid "Object path to invoke method on" msgstr "Objektpfad, für den die Methode aufgerufen werden soll" -#: gio/gdbus-tool.c:899 +#: gio/gdbus-tool.c:898 msgid "Method and interface name" msgstr "Methode und Schnittstellenname" -#: gio/gdbus-tool.c:900 +#: gio/gdbus-tool.c:899 msgid "Timeout in seconds" msgstr "Zeitablauf in Sekunden" -#: gio/gdbus-tool.c:901 +#: gio/gdbus-tool.c:900 msgid "Allow interactive authorization" msgstr "Interaktive Legitimierung erlauben" -#: gio/gdbus-tool.c:948 +#: gio/gdbus-tool.c:947 msgid "Invoke a method on a remote object." msgstr "Eine Methode für ein entferntes Objekt aufrufen." -#: gio/gdbus-tool.c:1020 gio/gdbus-tool.c:1854 gio/gdbus-tool.c:2094 +#: gio/gdbus-tool.c:1019 gio/gdbus-tool.c:1853 gio/gdbus-tool.c:2093 msgid "Error: Destination is not specified\n" msgstr "Fehler: Ziel wurde nicht angegeben\n" -#: gio/gdbus-tool.c:1031 gio/gdbus-tool.c:1871 gio/gdbus-tool.c:2105 +#: gio/gdbus-tool.c:1030 gio/gdbus-tool.c:1870 gio/gdbus-tool.c:2104 #, c-format msgid "Error: %s is not a valid bus name\n" msgstr "Fehler: %s ist kein gültiger Bus-Name\n" -#: gio/gdbus-tool.c:1081 +#: gio/gdbus-tool.c:1080 msgid "Error: Method name is not specified\n" msgstr "Fehler: Name der Methode wurde nicht angegeben\n" -#: gio/gdbus-tool.c:1092 +#: gio/gdbus-tool.c:1091 #, c-format msgid "Error: Method name “%s” is invalid\n" msgstr "Fehler: Name der Methode »%s« ist ungültig\n" -#: gio/gdbus-tool.c:1170 +#: gio/gdbus-tool.c:1169 #, c-format msgid "Error parsing parameter %d of type “%s”: %s\n" msgstr "Fehler bei der Verarbeitung des Parameters %d vom Typ »%s«: %s\n" -#: gio/gdbus-tool.c:1196 +#: gio/gdbus-tool.c:1195 #, c-format msgid "Error adding handle %d: %s\n" msgstr "Fehler beim Hinzufügen des Handlers %d: %s\n" -#: gio/gdbus-tool.c:1696 +#: gio/gdbus-tool.c:1695 msgid "Destination name to introspect" msgstr "Name des Ziels der Inspektion" -#: gio/gdbus-tool.c:1697 +#: gio/gdbus-tool.c:1696 msgid "Object path to introspect" msgstr "Zu inspizierender Objektpfad" -#: gio/gdbus-tool.c:1698 +#: gio/gdbus-tool.c:1697 msgid "Print XML" msgstr "XML drucken" -#: gio/gdbus-tool.c:1699 +#: gio/gdbus-tool.c:1698 msgid "Introspect children" msgstr "Unterelemente inspizieren" -#: gio/gdbus-tool.c:1700 +#: gio/gdbus-tool.c:1699 msgid "Only print properties" msgstr "Nur Eigenschaften ausgeben" -#: gio/gdbus-tool.c:1789 +#: gio/gdbus-tool.c:1788 msgid "Introspect a remote object." msgstr "Ein entferntes Objekt inspizieren." -#: gio/gdbus-tool.c:1995 +#: gio/gdbus-tool.c:1994 msgid "Destination name to monitor" msgstr "Name des zu überwachenden Ziels" -#: gio/gdbus-tool.c:1996 +#: gio/gdbus-tool.c:1995 msgid "Object path to monitor" msgstr "Zu überwachender Objektpfad" -#: gio/gdbus-tool.c:2021 +#: gio/gdbus-tool.c:2020 msgid "Monitor a remote object." msgstr "Ein entferntes Objekt überwachen." -#: gio/gdbus-tool.c:2079 +#: gio/gdbus-tool.c:2078 msgid "Error: can’t monitor a non-message-bus connection\n" msgstr "" "Fehler: eine Nicht-Message-Bus-Verbindung kann nicht überwacht werden\n" -#: gio/gdbus-tool.c:2203 +#: gio/gdbus-tool.c:2202 msgid "Service to activate before waiting for the other one (well-known name)" msgstr "" "Zu aktivierender Dienst, bevor auf den anderen gewartet wird (allgemein " "bekannter Name)" -#: gio/gdbus-tool.c:2206 +#: gio/gdbus-tool.c:2205 msgid "" "Timeout to wait for before exiting with an error (seconds); 0 for no timeout " "(default)" @@ -1323,29 +1327,29 @@ "Zeitspanne, die gewartet werden soll, bis mit einer Fehlermeldung " "abgebrochen wird (Sekunden); 0 für keine Zeitspanne (Voreinstellung)" -#: gio/gdbus-tool.c:2254 +#: gio/gdbus-tool.c:2253 msgid "OPTION… BUS-NAME" msgstr "OPTION … BUS-NAME" -#: gio/gdbus-tool.c:2255 +#: gio/gdbus-tool.c:2254 msgid "Wait for a bus name to appear." msgstr "Name eines Busses, auf dessen Verfügbarkeit gewartet werden soll." -#: gio/gdbus-tool.c:2331 +#: gio/gdbus-tool.c:2330 msgid "Error: A service to activate for must be specified.\n" msgstr "" "Fehler: Es muss ein Dienst angegeben werden, der gestartet werden soll.\n" -#: gio/gdbus-tool.c:2336 +#: gio/gdbus-tool.c:2335 msgid "Error: A service to wait for must be specified.\n" msgstr "" "Fehler: Es muss ein Dienst angegeben werden, auf den gewartet werden soll.\n" -#: gio/gdbus-tool.c:2341 +#: gio/gdbus-tool.c:2340 msgid "Error: Too many arguments.\n" msgstr "Fehler: Zu viele Argumente.\n" -#: gio/gdbus-tool.c:2349 gio/gdbus-tool.c:2356 +#: gio/gdbus-tool.c:2348 gio/gdbus-tool.c:2355 #, c-format msgid "Error: %s is not a valid well-known bus name.\n" msgstr "Fehler: %s ist kein gültiger, bekannter Bus-Name\n" @@ -1355,41 +1359,46 @@ msgid "Not authorized to change debug settings" msgstr "Nicht berechtigt, Fehlerdiagnose-Einstellungen zu ändern" -#: gio/gdesktopappinfo.c:2182 gio/gdesktopappinfo.c:5119 +#: gio/gdesktopappinfo.c:2242 gio/gdesktopappinfo.c:5223 msgid "Unnamed" msgstr "Unbenannt" -#: gio/gdesktopappinfo.c:2592 +#: gio/gdesktopappinfo.c:2652 msgid "Desktop file didn’t specify Exec field" msgstr "Desktop-Datei hat kein Exec-Feld angegeben" -#: gio/gdesktopappinfo.c:2891 +#: gio/gdesktopappinfo.c:2942 msgid "Unable to find terminal required for application" msgstr "Für die Anwendung benötigtes Terminal konnte nicht gefunden werden" -#: gio/gdesktopappinfo.c:3637 +#: gio/gdesktopappinfo.c:3002 +#, c-format +msgid "Program ‘%s’ not found in $PATH" +msgstr "Programm »%s« wurde nicht im $PATH gefunden" + +#: gio/gdesktopappinfo.c:3735 #, c-format msgid "Can’t create user application configuration folder %s: %s" msgstr "" "Konfigurationsordner %s für Benutzeranwendungen konnte nicht erstellt " "werden: %s" -#: gio/gdesktopappinfo.c:3641 +#: gio/gdesktopappinfo.c:3739 #, c-format msgid "Can’t create user MIME configuration folder %s: %s" msgstr "" "MIME-Konfigurationsordner %s des Benutzers konnte nicht erstellt werden: %s" -#: gio/gdesktopappinfo.c:3883 gio/gdesktopappinfo.c:3907 +#: gio/gdesktopappinfo.c:3981 gio/gdesktopappinfo.c:4005 msgid "Application information lacks an identifier" msgstr "Den Anwendungsinformationen fehlt ein Bezeichner" -#: gio/gdesktopappinfo.c:4143 +#: gio/gdesktopappinfo.c:4241 #, c-format msgid "Can’t create user desktop file %s" msgstr "Benutzer-Desktop-Datei %s kann nicht erstellt werden" -#: gio/gdesktopappinfo.c:4279 +#: gio/gdesktopappinfo.c:4377 #, c-format msgid "Custom definition for %s" msgstr "Benutzerdefinition für %s" @@ -1462,7 +1471,7 @@ msgid "Containing mount does not exist" msgstr "Enthaltender Einhängepunkt existiert nicht" -#: gio/gfile.c:2641 gio/glocalfile.c:2500 +#: gio/gfile.c:2641 gio/glocalfile.c:2511 msgid "Can’t copy over directory" msgstr "Es kann nicht über den Ordner kopiert werden" @@ -1508,7 +1517,7 @@ msgid "Invalid symlink value given" msgstr "Ungültiger Wert für symbolische Verknüpfung angegeben" -#: gio/gfile.c:4163 glib/gfileutils.c:2335 +#: gio/gfile.c:4163 glib/gfileutils.c:2392 msgid "Symbolic links not supported" msgstr "Symbolische Verknüpfungen nicht unterstützt" @@ -1610,37 +1619,37 @@ msgid "HTTP proxy server closed connection unexpectedly." msgstr "HTTP Proxy-Server hat die Verbindung unerwartet geschlossen." -#: gio/gicon.c:300 +#: gio/gicon.c:299 #, c-format msgid "Wrong number of tokens (%d)" msgstr "Ungültige Symbolanzahl (%d)" -#: gio/gicon.c:320 +#: gio/gicon.c:319 #, c-format msgid "No type for class name %s" msgstr "Kein Typ für Klassenname %s" -#: gio/gicon.c:330 +#: gio/gicon.c:329 #, c-format msgid "Type %s does not implement the GIcon interface" msgstr "GIcon-Schnittstelle wird vom Typ %s nicht unterstützt" -#: gio/gicon.c:341 +#: gio/gicon.c:340 #, c-format msgid "Type %s is not classed" msgstr "Typ %s ist keine Klasse" -#: gio/gicon.c:355 +#: gio/gicon.c:354 #, c-format msgid "Malformed version number: %s" msgstr "Ungültige Versionsnummer: %s" -#: gio/gicon.c:369 +#: gio/gicon.c:368 #, c-format msgid "Type %s does not implement from_tokens() on the GIcon interface" msgstr "Typ %s implementiert nicht from_tokens() der GIcon-Schnittstelle" -#: gio/gicon.c:471 +#: gio/gicon.c:470 msgid "Can’t handle the supplied version of the icon encoding" msgstr "Übergebene Version der Symbol-Kodierung kann nicht verarbeitet werden" @@ -2451,7 +2460,7 @@ msgid "List contents of directories in a tree-like format." msgstr "Den Inhalt von Ordnern in einer Baumstruktur auflisten." -#: gio/glib-compile-resources.c:142 gio/glib-compile-schemas.c:1516 +#: gio/glib-compile-resources.c:142 gio/glib-compile-schemas.c:1513 #, c-format msgid "Element <%s> not allowed inside <%s>" msgstr "Element <%s> ist innerhalb <%s> nicht erlaubt" @@ -2508,7 +2517,7 @@ msgid "text may not appear inside <%s>" msgstr "Text könnte nicht innerhalb von <%s> erscheinen" -#: gio/glib-compile-resources.c:821 gio/glib-compile-schemas.c:2174 +#: gio/glib-compile-resources.c:821 gio/glib-compile-schemas.c:2171 msgid "Show program version and exit" msgstr "Programm-Version anzeigen und beenden" @@ -2524,8 +2533,8 @@ "Die Ordner, aus denen in FILE referenzierte Dateien gelesen werden sollen " "(Vorgabe ist der aktuelle Ordner)" -#: gio/glib-compile-resources.c:823 gio/glib-compile-schemas.c:2175 -#: gio/glib-compile-schemas.c:2204 +#: gio/glib-compile-resources.c:823 gio/glib-compile-schemas.c:2172 +#: gio/glib-compile-schemas.c:2201 msgid "DIRECTORY" msgstr "ORDNER" @@ -2754,16 +2763,16 @@ msgid "<aliases> must contain at least one <alias>" msgstr "<aliases> muss mindestens einen <alias> enthalten" -#: gio/glib-compile-schemas.c:799 +#: gio/glib-compile-schemas.c:796 msgid "Empty names are not permitted" msgstr "Leere Namen sind nicht zulässig" -#: gio/glib-compile-schemas.c:809 +#: gio/glib-compile-schemas.c:806 #, c-format msgid "Invalid name “%s”: names must begin with a lowercase letter" msgstr "Ungültiger Name »%s«: Namen müssen mit einem Kleinbuchstaben beginnen" -#: gio/glib-compile-schemas.c:821 +#: gio/glib-compile-schemas.c:818 #, c-format msgid "" "Invalid name “%s”: invalid character “%c”; only lowercase letters, numbers " @@ -2772,39 +2781,39 @@ "Ungültiger Name »%s«: ungültiges Zeichen »%c«; nur Kleinbuchstaben, Ziffern " "und Bindestriche »-« sind zulässig" -#: gio/glib-compile-schemas.c:830 +#: gio/glib-compile-schemas.c:827 #, c-format msgid "Invalid name “%s”: two successive hyphens (“--”) are not permitted" msgstr "" "Ungültiger Name »%s«: Zwei aufeinander folgende Bindestriche »--« sind nicht " "zulässig" -#: gio/glib-compile-schemas.c:839 +#: gio/glib-compile-schemas.c:836 #, c-format msgid "Invalid name “%s”: the last character may not be a hyphen (“-”)" msgstr "" "Ungültiger Name »%s«: das letzte Zeichen darf kein Bindestrich »-« sein." -#: gio/glib-compile-schemas.c:847 +#: gio/glib-compile-schemas.c:844 #, c-format msgid "Invalid name “%s”: maximum length is 1024" msgstr "Ungültiger Name »%s«: maximale Länge ist 1024" -#: gio/glib-compile-schemas.c:919 +#: gio/glib-compile-schemas.c:916 #, c-format msgid "<child name='%s'> already specified" msgstr "<child name='%s'> wurde bereits angegeben" -#: gio/glib-compile-schemas.c:945 +#: gio/glib-compile-schemas.c:942 msgid "Cannot add keys to a “list-of” schema" msgstr "Schlüssel können nicht zum Schema »list-of« hinzugefügt werden" -#: gio/glib-compile-schemas.c:956 +#: gio/glib-compile-schemas.c:953 #, c-format msgid "<key name='%s'> already specified" msgstr "<key name='%s'> wurde bereits angegeben" -#: gio/glib-compile-schemas.c:974 +#: gio/glib-compile-schemas.c:971 #, c-format msgid "" "<key name='%s'> shadows <key name='%s'> in <schema id='%s'>; use <override> " @@ -2813,7 +2822,7 @@ "<key name='%s'> verdeckt <key name='%s'> in <schema id='%s'>; verwenden Sie " "<override>, um den Wert anzupassen" -#: gio/glib-compile-schemas.c:985 +#: gio/glib-compile-schemas.c:982 #, c-format msgid "" "Exactly one of “type”, “enum” or “flags” must be specified as an attribute " @@ -2822,57 +2831,57 @@ "Genau eines von »type«, »enum« oder »flags« muss als Attribut für <key> " "angegeben werden" -#: gio/glib-compile-schemas.c:1004 +#: gio/glib-compile-schemas.c:1001 #, c-format msgid "<%s id='%s'> not (yet) defined." msgstr "<%s id='%s'> (noch) nicht definiert." -#: gio/glib-compile-schemas.c:1019 +#: gio/glib-compile-schemas.c:1016 #, c-format msgid "Invalid GVariant type string “%s”" msgstr "Ungültige GVariant-Typzeichenkette »%s«" -#: gio/glib-compile-schemas.c:1049 +#: gio/glib-compile-schemas.c:1046 msgid "<override> given but schema isn’t extending anything" msgstr "<override> angegeben, aber das Schema erweitert nichts" -#: gio/glib-compile-schemas.c:1062 +#: gio/glib-compile-schemas.c:1059 #, c-format msgid "No <key name='%s'> to override" msgstr "Kein <key name='%s'> zum Überschreiben" -#: gio/glib-compile-schemas.c:1070 +#: gio/glib-compile-schemas.c:1067 #, c-format msgid "<override name='%s'> already specified" msgstr "<override name='%s'> wurde bereits angegeben" -#: gio/glib-compile-schemas.c:1143 +#: gio/glib-compile-schemas.c:1140 #, c-format msgid "<schema id='%s'> already specified" msgstr "<schema id='%s'> wurde bereits angegeben" -#: gio/glib-compile-schemas.c:1155 +#: gio/glib-compile-schemas.c:1152 #, c-format msgid "<schema id='%s'> extends not yet existing schema “%s”" msgstr "<schema id='%s'> erweitert noch nicht vorhandenes Schema »%s«" -#: gio/glib-compile-schemas.c:1171 +#: gio/glib-compile-schemas.c:1168 #, c-format msgid "<schema id='%s'> is list of not yet existing schema “%s”" msgstr "" "<schema id='%s'> ist eine Liste des noch nicht vorhandenen Schemas »%s«" -#: gio/glib-compile-schemas.c:1179 +#: gio/glib-compile-schemas.c:1176 #, c-format msgid "Cannot be a list of a schema with a path" msgstr "Darf keine Liste von Schemata mit einem Pfad sein" -#: gio/glib-compile-schemas.c:1189 +#: gio/glib-compile-schemas.c:1186 #, c-format msgid "Cannot extend a schema with a path" msgstr "Ein Schema darf nicht um einen Pfad erweitert werden" -#: gio/glib-compile-schemas.c:1199 +#: gio/glib-compile-schemas.c:1196 #, c-format msgid "" "<schema id='%s'> is a list, extending <schema id='%s'> which is not a list" @@ -2880,7 +2889,7 @@ "<schema id='%s'> ist eine Liste, welche <schema id='%s'> erweitert, das " "keine Liste ist" -#: gio/glib-compile-schemas.c:1209 +#: gio/glib-compile-schemas.c:1206 #, c-format msgid "" "<schema id='%s' list-of='%s'> extends <schema id='%s' list-of='%s'> but “%s” " @@ -2889,18 +2898,18 @@ "<schema id='%s' list-of='%s'> erweitert <schema id='%s' list-of='%s'>, aber " "»%s« erweitert »%s« nicht" -#: gio/glib-compile-schemas.c:1226 +#: gio/glib-compile-schemas.c:1223 #, c-format msgid "A path, if given, must begin and end with a slash" msgstr "" "Ein Pfad, falls angegeben, muss mit einem Schrägstrich beginnen und enden" -#: gio/glib-compile-schemas.c:1233 +#: gio/glib-compile-schemas.c:1230 #, c-format msgid "The path of a list must end with “:/”" msgstr "Der Pfad einer Liste muss mit »:/« enden" -#: gio/glib-compile-schemas.c:1242 +#: gio/glib-compile-schemas.c:1239 #, c-format msgid "" "Warning: Schema “%s” has path “%s”. Paths starting with “/apps/”, “/" @@ -2909,49 +2918,49 @@ "Warnung: Schema »%s« hat den Pfad »%s«. Mit »/apps/«, »/desktop/« oder »/" "system/« beginnende Pfade gelten jedoch als veraltet." -#: gio/glib-compile-schemas.c:1272 +#: gio/glib-compile-schemas.c:1269 #, c-format msgid "<%s id='%s'> already specified" msgstr "<%s id='%s'> bereits angegeben" -#: gio/glib-compile-schemas.c:1422 gio/glib-compile-schemas.c:1438 +#: gio/glib-compile-schemas.c:1419 gio/glib-compile-schemas.c:1435 #, c-format msgid "Only one <%s> element allowed inside <%s>" msgstr "Nur ein <%s>-Element ist innerhalb von <%s> erlaubt" -#: gio/glib-compile-schemas.c:1520 +#: gio/glib-compile-schemas.c:1517 #, c-format msgid "Element <%s> not allowed at the top level" msgstr "Element <%s> ist in der obersten Ebene nicht erlaubt" -#: gio/glib-compile-schemas.c:1538 +#: gio/glib-compile-schemas.c:1535 msgid "Element <default> is required in <key>" msgstr "Element <default> wird in <key> benötigt" -#: gio/glib-compile-schemas.c:1628 +#: gio/glib-compile-schemas.c:1625 #, c-format msgid "Text may not appear inside <%s>" msgstr "Text darf nicht innerhalb von <%s> erscheinen" -#: gio/glib-compile-schemas.c:1696 +#: gio/glib-compile-schemas.c:1693 #, c-format msgid "Warning: undefined reference to <schema id='%s'/>" msgstr "Warnung: nicht definierte Referenz zu <schema id='%s'/>" #. Translators: Do not translate "--strict". -#: gio/glib-compile-schemas.c:1835 gio/glib-compile-schemas.c:1914 +#: gio/glib-compile-schemas.c:1832 gio/glib-compile-schemas.c:1911 msgid "--strict was specified; exiting." msgstr "--strict wurde angegeben; Abbruch." -#: gio/glib-compile-schemas.c:1847 +#: gio/glib-compile-schemas.c:1844 msgid "This entire file has been ignored." msgstr "Die gesamte Datei wurde ignoriert." -#: gio/glib-compile-schemas.c:1910 +#: gio/glib-compile-schemas.c:1907 msgid "Ignoring this file." msgstr "Diese Datei wird ignoriert." -#: gio/glib-compile-schemas.c:1965 +#: gio/glib-compile-schemas.c:1962 #, c-format msgid "" "No such key “%s” in schema “%s” as specified in override file “%s”; ignoring " @@ -2960,7 +2969,7 @@ "Kein Schlüssel »%s« in Schema »%s« wie angegeben in überschreibender Datei " "»%s«. Die Überschreibung wird für diesen Schlüssel ignoriert." -#: gio/glib-compile-schemas.c:1973 +#: gio/glib-compile-schemas.c:1970 #, c-format msgid "" "No such key “%s” in schema “%s” as specified in override file “%s” and --" @@ -2970,7 +2979,7 @@ "»%s«, und »--strict« wurde angegeben. Abbruch." # Das habe ich nicht wirklich verstanden, bitte sorgfältig gegenlesen. -#: gio/glib-compile-schemas.c:1995 +#: gio/glib-compile-schemas.c:1992 #, c-format msgid "" "Cannot provide per-desktop overrides for localized key “%s” in schema " @@ -2981,7 +2990,7 @@ "Überschreibung wird für diesen Schlüssel ignoriert." # Das habe ich nicht wirklich verstanden, bitte sorgfältig gegenlesen. -#: gio/glib-compile-schemas.c:2004 +#: gio/glib-compile-schemas.c:2001 #, c-format msgid "" "Cannot provide per-desktop overrides for localized key “%s” in schema " @@ -2991,7 +3000,7 @@ "Schema »%s« (überschreibende Datei »%s«) nicht bereitgestellt werden, und »--" "strict« wurde angegeben. Abbruch." -#: gio/glib-compile-schemas.c:2028 +#: gio/glib-compile-schemas.c:2025 #, c-format msgid "" "Error parsing key “%s” in schema “%s” as specified in override file “%s”: " @@ -3001,7 +3010,7 @@ "überschreibender Datei »%s«: %s. Die Überschreibung wird für diesen " "Schlüssel ignoriert." -#: gio/glib-compile-schemas.c:2040 +#: gio/glib-compile-schemas.c:2037 #, c-format msgid "" "Error parsing key “%s” in schema “%s” as specified in override file “%s”: " @@ -3010,7 +3019,7 @@ "Fehler beim Verarbeiten des Schlüssels »%s« in Schema »%s« wie angegeben in " "überschreibender Datei »%s«: %s, und »--strict« wurde angegeben. Abbruch." -#: gio/glib-compile-schemas.c:2067 +#: gio/glib-compile-schemas.c:2064 #, c-format msgid "" "Override for key “%s” in schema “%s” in override file “%s” is outside the " @@ -3020,7 +3029,7 @@ "»%s« liegt außerhalb des im Schema angegebenen Bereichs. Die Überschreibung " "wird für diesen Schlüssel ignoriert." -#: gio/glib-compile-schemas.c:2077 +#: gio/glib-compile-schemas.c:2074 #, c-format msgid "" "Override for key “%s” in schema “%s” in override file “%s” is outside the " @@ -3030,7 +3039,7 @@ "»%s« liegt außerhalb des im Schema angegebenen Bereichs, und »--strict« " "wurde angegeben. Abbruch." -#: gio/glib-compile-schemas.c:2103 +#: gio/glib-compile-schemas.c:2100 #, c-format msgid "" "Override for key “%s” in schema “%s” in override file “%s” is not in the " @@ -3040,7 +3049,7 @@ "»%s« befindet sich nicht in der Liste gültiger Auswahlmöglichkeiten. Die " "Überschreibung wird für diesen Schlüssel ignoriert." -#: gio/glib-compile-schemas.c:2113 +#: gio/glib-compile-schemas.c:2110 #, c-format msgid "" "Override for key “%s” in schema “%s” in override file “%s” is not in the " @@ -3050,23 +3059,23 @@ "»%s« befindet sich nicht in der Liste gültiger Auswahlmöglichkeiten, und »--" "strict« wurde angegeben. Abbruch." -#: gio/glib-compile-schemas.c:2175 +#: gio/glib-compile-schemas.c:2172 msgid "Where to store the gschemas.compiled file" msgstr "Speicherort der Datei gschemas.compiled" -#: gio/glib-compile-schemas.c:2176 +#: gio/glib-compile-schemas.c:2173 msgid "Abort on any errors in schemas" msgstr "Abbruch wegen einiger Fehler in Schemata" -#: gio/glib-compile-schemas.c:2177 +#: gio/glib-compile-schemas.c:2174 msgid "Do not write the gschema.compiled file" msgstr "Die Datei »gschema.compiled« nicht schreiben" -#: gio/glib-compile-schemas.c:2178 +#: gio/glib-compile-schemas.c:2175 msgid "Do not enforce key name restrictions" msgstr "Keine Einschränkungen für Schlüsselnamen erzwingen" -#: gio/glib-compile-schemas.c:2207 +#: gio/glib-compile-schemas.c:2204 msgid "" "Compile all GSettings schema files into a schema cache.\n" "Schema files are required to have the extension .gschema.xml,\n" @@ -3076,15 +3085,15 @@ "Schemadateien müssen die Erweiterung .gschema.xml haben,\n" "die Zwischenspeicherdatei die Erweiterung gschemas.compiled." -#: gio/glib-compile-schemas.c:2228 +#: gio/glib-compile-schemas.c:2225 msgid "You should give exactly one directory name" msgstr "Sie sollten genau einen Ordnernamen angeben" -#: gio/glib-compile-schemas.c:2271 +#: gio/glib-compile-schemas.c:2268 msgid "No schema files found: doing nothing." msgstr "Keine Schema-Dateien gefunden. Es wird nichts unternommen." -#: gio/glib-compile-schemas.c:2273 +#: gio/glib-compile-schemas.c:2270 msgid "No schema files found: removed existing output file." msgstr "Keine Schema-Dateien gefunden. Vorhandene Ausgabedatei wurde entfernt." @@ -3093,7 +3102,7 @@ msgid "Invalid filename %s" msgstr "Ungültiger Dateiname %s" -#: gio/glocalfile.c:996 +#: gio/glocalfile.c:1005 #, c-format msgid "Error getting filesystem info for %s: %s" msgstr "Fehler beim Einlesen der Dateisystem-Information für %s: %s" @@ -3102,130 +3111,130 @@ #. * the enclosing (user visible) mount of a file, but none #. * exists. #. -#: gio/glocalfile.c:1137 +#: gio/glocalfile.c:1141 #, c-format msgid "Containing mount for file %s not found" msgstr "Enthaltender Einhängepunkt für Datei %s wurde nicht gefunden" -#: gio/glocalfile.c:1160 +#: gio/glocalfile.c:1164 msgid "Can’t rename root directory" msgstr "Wurzelordner kann nicht umbenannt werden" -#: gio/glocalfile.c:1178 gio/glocalfile.c:1201 +#: gio/glocalfile.c:1182 gio/glocalfile.c:1205 #, c-format msgid "Error renaming file %s: %s" msgstr "Fehler beim Umbenennen der Datei %s: %s" -#: gio/glocalfile.c:1185 +#: gio/glocalfile.c:1189 msgid "Can’t rename file, filename already exists" msgstr "Datei kann nicht umbenannt werden, da der Dateiname bereits existiert" -#: gio/glocalfile.c:1198 gio/glocalfile.c:2394 gio/glocalfile.c:2422 -#: gio/glocalfile.c:2561 gio/glocalfileoutputstream.c:658 +#: gio/glocalfile.c:1202 gio/glocalfile.c:2405 gio/glocalfile.c:2433 +#: gio/glocalfile.c:2572 gio/glocalfileoutputstream.c:658 msgid "Invalid filename" msgstr "Ungültiger Dateiname" -#: gio/glocalfile.c:1366 gio/glocalfile.c:1377 +#: gio/glocalfile.c:1370 gio/glocalfile.c:1381 #, c-format msgid "Error opening file %s: %s" msgstr "Fehler beim Öffnen der Datei »%s«: %s" -#: gio/glocalfile.c:1502 +#: gio/glocalfile.c:1506 #, c-format msgid "Error removing file %s: %s" msgstr "Fehler beim Entfernen der Datei »%s«: %s" -#: gio/glocalfile.c:1996 gio/glocalfile.c:2007 gio/glocalfile.c:2034 +#: gio/glocalfile.c:2000 gio/glocalfile.c:2011 gio/glocalfile.c:2038 #, c-format msgid "Error trashing file %s: %s" msgstr "Fehler beim Verschieben der Datei %s in den Papierkorb: %s" -#: gio/glocalfile.c:2054 +#: gio/glocalfile.c:2058 #, c-format msgid "Unable to create trash directory %s: %s" msgstr "Papierkorb-Ordner %s konnte nicht angelegt werden: %s" -#: gio/glocalfile.c:2075 +#: gio/glocalfile.c:2079 #, c-format msgid "Unable to find toplevel directory to trash %s" msgstr "" "Oberster Ordner konnte zum Verschieben von %s in den Papierkorb nicht " "gefunden werden" -#: gio/glocalfile.c:2083 +#: gio/glocalfile.c:2087 #, c-format msgid "Trashing on system internal mounts is not supported" msgstr "" "Papierkorbaktionen zwischen systeminternen Einhängepunkten werden nicht " "unterstützt" -#: gio/glocalfile.c:2169 gio/glocalfile.c:2197 +#: gio/glocalfile.c:2173 gio/glocalfile.c:2201 #, c-format msgid "Unable to find or create trash directory %s to trash %s" msgstr "Papierkorb-Ordner %s konnte für %s nicht gefunden oder angelegt werden" -#: gio/glocalfile.c:2243 +#: gio/glocalfile.c:2245 #, c-format msgid "Unable to create trashing info file for %s: %s" msgstr "Löschprotokoll-Datei für %s konnte nicht angelegt werden: %s" -#: gio/glocalfile.c:2305 +#: gio/glocalfile.c:2316 #, c-format msgid "Unable to trash file %s across filesystem boundaries" msgstr "" "Datei %s kann nicht über Dateisystemgrenzen hinweg in den Papierkorb " "verschoben werden" -#: gio/glocalfile.c:2309 gio/glocalfile.c:2365 +#: gio/glocalfile.c:2320 gio/glocalfile.c:2376 #, c-format msgid "Unable to trash file %s: %s" msgstr "Datei %s kann nicht in den Papierkorb verschoben werden: %s" -#: gio/glocalfile.c:2371 +#: gio/glocalfile.c:2382 #, c-format msgid "Unable to trash file %s" msgstr "Datei %s kann nicht in den Papierkorb verschoben werden" -#: gio/glocalfile.c:2397 +#: gio/glocalfile.c:2408 #, c-format msgid "Error creating directory %s: %s" msgstr "Fehler beim Erstellen des Ordners »%s«: %s" -#: gio/glocalfile.c:2426 +#: gio/glocalfile.c:2437 #, c-format msgid "Filesystem does not support symbolic links" msgstr "Das Dateisystem unterstützt keine symbolische Verknüpfungen" -#: gio/glocalfile.c:2429 +#: gio/glocalfile.c:2440 #, c-format msgid "Error making symbolic link %s: %s" msgstr "Fehler beim Erstellen der symbolischen Verknüpfung %s: %s" -#: gio/glocalfile.c:2472 gio/glocalfile.c:2507 gio/glocalfile.c:2564 +#: gio/glocalfile.c:2483 gio/glocalfile.c:2518 gio/glocalfile.c:2575 #, c-format msgid "Error moving file %s: %s" msgstr "Fehler beim Verschieben der Datei %s: %s" -#: gio/glocalfile.c:2495 +#: gio/glocalfile.c:2506 msgid "Can’t move directory over directory" msgstr "Ordner kann nicht über Ordner verschoben werden" -#: gio/glocalfile.c:2521 gio/glocalfileoutputstream.c:1110 +#: gio/glocalfile.c:2532 gio/glocalfileoutputstream.c:1110 #: gio/glocalfileoutputstream.c:1124 gio/glocalfileoutputstream.c:1139 #: gio/glocalfileoutputstream.c:1156 gio/glocalfileoutputstream.c:1170 msgid "Backup file creation failed" msgstr "Erstellen der Sicherungsdatei gescheitert" -#: gio/glocalfile.c:2540 +#: gio/glocalfile.c:2551 #, c-format msgid "Error removing target file: %s" msgstr "Fehler beim Entfernen der Zieldatei: %s" -#: gio/glocalfile.c:2554 +#: gio/glocalfile.c:2565 msgid "Move between mounts not supported" msgstr "Verschieben zwischen Einhängepunkten nicht unterstützt" -#: gio/glocalfile.c:2728 +#: gio/glocalfile.c:2741 #, c-format msgid "Could not determine the disk usage of %s: %s" msgstr "Konnte die Festplattenbelegung von %s nicht bestimmen: %s" @@ -3247,121 +3256,121 @@ msgid "Error setting extended attribute “%s”: %s" msgstr "Fehler beim Setzen des erweiterten Attributs »%s«: %s" -#: gio/glocalfileinfo.c:1738 gio/win32/gwinhttpfile.c:191 +#: gio/glocalfileinfo.c:1819 gio/win32/gwinhttpfile.c:191 msgid " (invalid encoding)" msgstr " (ungültige Kodierung)" -#: gio/glocalfileinfo.c:1897 gio/glocalfileoutputstream.c:945 +#: gio/glocalfileinfo.c:1978 gio/glocalfileoutputstream.c:945 #: gio/glocalfileoutputstream.c:997 #, c-format msgid "Error when getting information for file “%s”: %s" msgstr "Fehler beim Holen der Informationen für Datei »%s«: %s" -#: gio/glocalfileinfo.c:2163 +#: gio/glocalfileinfo.c:2281 #, c-format msgid "Error when getting information for file descriptor: %s" msgstr "Fehler beim Holen der Informationen für Dateideskriptor: %s" -#: gio/glocalfileinfo.c:2208 +#: gio/glocalfileinfo.c:2326 msgid "Invalid attribute type (uint32 expected)" msgstr "Ungültiger Attributtyp (»uint32« erwartet)" -#: gio/glocalfileinfo.c:2226 +#: gio/glocalfileinfo.c:2344 msgid "Invalid attribute type (uint64 expected)" msgstr "Ungültiger Attributtyp (»uint64« erwartet)" -#: gio/glocalfileinfo.c:2245 gio/glocalfileinfo.c:2264 +#: gio/glocalfileinfo.c:2363 gio/glocalfileinfo.c:2382 msgid "Invalid attribute type (byte string expected)" msgstr "Ungültiger Attributtyp (»byte string« erwartet)" -#: gio/glocalfileinfo.c:2311 +#: gio/glocalfileinfo.c:2429 msgid "Cannot set permissions on symlinks" msgstr "" "Zugriffsrechte für symbolische Verknüpfungen können nicht gesetzt werden" -#: gio/glocalfileinfo.c:2327 +#: gio/glocalfileinfo.c:2445 #, c-format msgid "Error setting permissions: %s" msgstr "Fehler beim Setzen der Zugriffsrechte: %s" -#: gio/glocalfileinfo.c:2378 +#: gio/glocalfileinfo.c:2496 #, c-format msgid "Error setting owner: %s" msgstr "Fehler beim Setzen des Besitzers: %s" -#: gio/glocalfileinfo.c:2401 +#: gio/glocalfileinfo.c:2519 msgid "symlink must be non-NULL" msgstr "Symbolische Verknüpfung darf nicht NULL sein" -#: gio/glocalfileinfo.c:2411 gio/glocalfileinfo.c:2430 -#: gio/glocalfileinfo.c:2441 +#: gio/glocalfileinfo.c:2529 gio/glocalfileinfo.c:2548 +#: gio/glocalfileinfo.c:2559 #, c-format msgid "Error setting symlink: %s" msgstr "Fehler beim Setzen der symbolischen Verknüpfung: %s" -#: gio/glocalfileinfo.c:2420 +#: gio/glocalfileinfo.c:2538 msgid "Error setting symlink: file is not a symlink" msgstr "" "Fehler beim Setzen der symbolischen Verknüpfung: Datei ist keine symbolische " "Verknüpfung" -#: gio/glocalfileinfo.c:2492 +#: gio/glocalfileinfo.c:2630 #, c-format msgid "Extra nanoseconds %d for UNIX timestamp %lld are negative" msgstr "Zusätzliche Nanosekunden %d für UNIX-Zeitstempel %lld sind negativ" -#: gio/glocalfileinfo.c:2501 +#: gio/glocalfileinfo.c:2639 #, c-format msgid "Extra nanoseconds %d for UNIX timestamp %lld reach 1 second" msgstr "" "Zusätzliche Nanosekunden %d für UNIX-Zeitstempel %lld erreichen 1 Sekunde" -#: gio/glocalfileinfo.c:2511 +#: gio/glocalfileinfo.c:2649 #, c-format msgid "UNIX timestamp %lld does not fit into 64 bits" msgstr "UNIX-Zeitstempel %lld passt nicht in 64 Bit" -#: gio/glocalfileinfo.c:2522 +#: gio/glocalfileinfo.c:2660 #, c-format msgid "UNIX timestamp %lld is outside of the range supported by Windows" msgstr "" "UNIX-Zeitstempel %lld ist außerhalb des von Windows unterstützten Bereichs" -#: gio/glocalfileinfo.c:2625 +#: gio/glocalfileinfo.c:2792 #, c-format msgid "File name “%s” cannot be converted to UTF-16" msgstr "Dateiname »%s« kann nicht nach UTF-16 konvertiert werden" -#: gio/glocalfileinfo.c:2644 +#: gio/glocalfileinfo.c:2811 #, c-format msgid "File “%s” cannot be opened: Windows Error %lu" msgstr "Datei »%s« kann nicht geöffnet werden: Windows-Fehler %lu" -#: gio/glocalfileinfo.c:2657 +#: gio/glocalfileinfo.c:2824 #, c-format msgid "Error setting modification or access time for file “%s”: %lu" msgstr "" "Fehler beim Setzen der Änderungs- oder Zugriffszeit für Datei »%s«: %lu" -#: gio/glocalfileinfo.c:2798 gio/glocalfileinfo.c:2810 +#: gio/glocalfileinfo.c:2981 #, c-format msgid "Error setting modification or access time: %s" msgstr "Fehler beim Setzen der Zugriffsrechte oder der Zugriffszeit: %s" -#: gio/glocalfileinfo.c:2833 +#: gio/glocalfileinfo.c:3004 msgid "SELinux context must be non-NULL" msgstr "SELinux-Kontext darf nicht NULL sein" -#: gio/glocalfileinfo.c:2840 +#: gio/glocalfileinfo.c:3011 msgid "SELinux is not enabled on this system" msgstr "SELinux ist auf diesem System nicht aktiviert" -#: gio/glocalfileinfo.c:2850 +#: gio/glocalfileinfo.c:3021 #, c-format msgid "Error setting SELinux context: %s" msgstr "Fehler beim Setzen des SELinux-Kontexts: %s" -#: gio/glocalfileinfo.c:2947 +#: gio/glocalfileinfo.c:3118 #, c-format msgid "Setting attribute %s not supported" msgstr "Setzen des Attributs %s nicht unterstützt" @@ -3580,8 +3589,8 @@ #. Translators: the first placeholder is a domain name, the #. * second is an error message #: gio/gresolver.c:403 gio/gthreadedresolver.c:152 gio/gthreadedresolver.c:170 -#: gio/gthreadedresolver.c:782 gio/gthreadedresolver.c:806 -#: gio/gthreadedresolver.c:831 gio/gthreadedresolver.c:846 +#: gio/gthreadedresolver.c:798 gio/gthreadedresolver.c:822 +#: gio/gthreadedresolver.c:847 gio/gthreadedresolver.c:862 #, c-format msgid "Error resolving “%s”: %s" msgstr "Fehler beim Auflösen von »%s«: %s" @@ -4308,35 +4317,35 @@ #. Translators: the placeholder is a DNS record type, such as ‘MX’ or ‘SRV’ #: gio/gthreadedresolver.c:552 gio/gthreadedresolver.c:574 -#: gio/gthreadedresolver.c:612 gio/gthreadedresolver.c:659 -#: gio/gthreadedresolver.c:688 gio/gthreadedresolver.c:700 +#: gio/gthreadedresolver.c:628 gio/gthreadedresolver.c:675 +#: gio/gthreadedresolver.c:704 gio/gthreadedresolver.c:716 #, c-format msgid "Error parsing DNS %s record: malformed DNS packet" msgstr "Fehler bei der Verarbeitung des DNS %s-Eintrags: ungültiges DNS-Paket" -#: gio/gthreadedresolver.c:758 gio/gthreadedresolver.c:895 -#: gio/gthreadedresolver.c:993 gio/gthreadedresolver.c:1043 +#: gio/gthreadedresolver.c:774 gio/gthreadedresolver.c:911 +#: gio/gthreadedresolver.c:1009 gio/gthreadedresolver.c:1059 #, c-format msgid "No DNS record of the requested type for “%s”" msgstr "Kein DNS-Eintrag des angeforderten Typs für »%s«" -#: gio/gthreadedresolver.c:763 gio/gthreadedresolver.c:998 +#: gio/gthreadedresolver.c:779 gio/gthreadedresolver.c:1014 #, c-format msgid "Temporarily unable to resolve “%s”" msgstr "»%s« kann vorübergehend nicht aufgelöst werden" -#: gio/gthreadedresolver.c:768 gio/gthreadedresolver.c:1003 -#: gio/gthreadedresolver.c:1113 +#: gio/gthreadedresolver.c:784 gio/gthreadedresolver.c:1019 +#: gio/gthreadedresolver.c:1129 #, c-format msgid "Error resolving “%s”" msgstr "Fehler beim Auflösen von »%s«" -#: gio/gthreadedresolver.c:782 gio/gthreadedresolver.c:806 -#: gio/gthreadedresolver.c:831 gio/gthreadedresolver.c:846 +#: gio/gthreadedresolver.c:798 gio/gthreadedresolver.c:822 +#: gio/gthreadedresolver.c:847 gio/gthreadedresolver.c:862 msgid "Malformed DNS packet" msgstr "Ungültiges DNS-Paket" -#: gio/gthreadedresolver.c:888 +#: gio/gthreadedresolver.c:904 #, c-format msgid "Failed to parse DNS response for “%s”: " msgstr "Fehler bei der Verarbeitung der DNS-Antwort zu »%s«: " @@ -4465,7 +4474,7 @@ msgid "Error closing file descriptor: %s" msgstr "Fehler beim Schließen des Dateideskriptors: %s" -#: gio/gunixmounts.c:2815 gio/gunixmounts.c:2868 +#: gio/gunixmounts.c:2817 gio/gunixmounts.c:2870 msgid "Filesystem root" msgstr "Wurzelordner des Dateisystems" @@ -4549,82 +4558,82 @@ msgid "Wrong args\n" msgstr "Falsche Argumente\n" -#: glib/gbookmarkfile.c:779 +#: glib/gbookmarkfile.c:861 #, c-format msgid "Unexpected attribute “%s” for element “%s”" msgstr "Unerwartetes Attribut »%s« des Elements »%s«" -#: glib/gbookmarkfile.c:790 glib/gbookmarkfile.c:870 glib/gbookmarkfile.c:880 -#: glib/gbookmarkfile.c:993 +#: glib/gbookmarkfile.c:872 glib/gbookmarkfile.c:952 glib/gbookmarkfile.c:962 +#: glib/gbookmarkfile.c:1075 #, c-format msgid "Attribute “%s” of element “%s” not found" msgstr "Attribut »%s« des Elements »%s« konnte nicht gefunden werden" -#: glib/gbookmarkfile.c:1202 glib/gbookmarkfile.c:1267 -#: glib/gbookmarkfile.c:1331 glib/gbookmarkfile.c:1341 +#: glib/gbookmarkfile.c:1284 glib/gbookmarkfile.c:1349 +#: glib/gbookmarkfile.c:1413 glib/gbookmarkfile.c:1423 #, c-format msgid "Unexpected tag “%s”, tag “%s” expected" msgstr "Unerwarteter Tag »%s«; Tag »%s« wird erwartet" -#: glib/gbookmarkfile.c:1227 glib/gbookmarkfile.c:1241 -#: glib/gbookmarkfile.c:1309 glib/gbookmarkfile.c:1355 +#: glib/gbookmarkfile.c:1309 glib/gbookmarkfile.c:1323 +#: glib/gbookmarkfile.c:1391 glib/gbookmarkfile.c:1437 #, c-format msgid "Unexpected tag “%s” inside “%s”" msgstr "Unerwarteter Tag »%s« innerhalb von »%s«" -#: glib/gbookmarkfile.c:1635 +#: glib/gbookmarkfile.c:1717 #, c-format msgid "Invalid date/time ‘%s’ in bookmark file" msgstr "Ungültiges Datum bzw. Uhrzeit »%s« in der Lesezeichendatei" -#: glib/gbookmarkfile.c:1838 +#: glib/gbookmarkfile.c:1956 msgid "No valid bookmark file found in data dirs" msgstr "Es wurde keine gültige Lesezeichendatei in den Datenordnern gefunden" -#: glib/gbookmarkfile.c:2039 +#: glib/gbookmarkfile.c:2157 #, c-format msgid "A bookmark for URI “%s” already exists" msgstr "Es existiert bereits ein Lesezeichen für die Adresse »%s«" -#: glib/gbookmarkfile.c:2088 glib/gbookmarkfile.c:2246 -#: glib/gbookmarkfile.c:2331 glib/gbookmarkfile.c:2411 -#: glib/gbookmarkfile.c:2496 glib/gbookmarkfile.c:2630 -#: glib/gbookmarkfile.c:2763 glib/gbookmarkfile.c:2898 -#: glib/gbookmarkfile.c:2940 glib/gbookmarkfile.c:3037 -#: glib/gbookmarkfile.c:3158 glib/gbookmarkfile.c:3352 -#: glib/gbookmarkfile.c:3493 glib/gbookmarkfile.c:3712 -#: glib/gbookmarkfile.c:3801 glib/gbookmarkfile.c:3890 -#: glib/gbookmarkfile.c:4009 +#: glib/gbookmarkfile.c:2206 glib/gbookmarkfile.c:2364 +#: glib/gbookmarkfile.c:2449 glib/gbookmarkfile.c:2529 +#: glib/gbookmarkfile.c:2614 glib/gbookmarkfile.c:2748 +#: glib/gbookmarkfile.c:2881 glib/gbookmarkfile.c:3016 +#: glib/gbookmarkfile.c:3058 glib/gbookmarkfile.c:3155 +#: glib/gbookmarkfile.c:3276 glib/gbookmarkfile.c:3470 +#: glib/gbookmarkfile.c:3611 glib/gbookmarkfile.c:3830 +#: glib/gbookmarkfile.c:3919 glib/gbookmarkfile.c:4008 +#: glib/gbookmarkfile.c:4127 #, c-format msgid "No bookmark found for URI “%s”" msgstr "Es konnte kein Lesezeichen für die Adresse »%s« gefunden werden." -#: glib/gbookmarkfile.c:2420 +#: glib/gbookmarkfile.c:2538 #, c-format msgid "No MIME type defined in the bookmark for URI “%s”" msgstr "Es ist kein MIME-Typ im Lesezeichen für die Adresse »%s« definiert." -#: glib/gbookmarkfile.c:2505 +#: glib/gbookmarkfile.c:2623 #, c-format msgid "No private flag has been defined in bookmark for URI “%s”" msgstr "" "Es konnte keine »privat«-Markierung für das Lesezeichen für die Adresse »%s« " "gefunden werden." -#: glib/gbookmarkfile.c:3046 +#: glib/gbookmarkfile.c:3164 #, c-format msgid "No groups set in bookmark for URI “%s”" msgstr "" "Es wurden keine Gruppen für das Lesezeichen für die Adresse »%s« festgelegt." -#: glib/gbookmarkfile.c:3514 glib/gbookmarkfile.c:3722 +#: glib/gbookmarkfile.c:3632 glib/gbookmarkfile.c:3840 #, c-format msgid "No application with name “%s” registered a bookmark for “%s”" msgstr "" "Es wurde keine Anwendung namens »%s« gefunden, die ein Lesezeichen für »%s« " "registriert hat." -#: glib/gbookmarkfile.c:3745 +#: glib/gbookmarkfile.c:3863 #, c-format msgid "Failed to expand exec line “%s” with URI “%s”" msgstr "" @@ -5102,86 +5111,86 @@ msgid "Error opening directory “%s”: %s" msgstr "Fehler beim Öffnen des Ordners »%s«: %s" -#: glib/gfileutils.c:735 glib/gfileutils.c:827 +#: glib/gfileutils.c:753 glib/gfileutils.c:845 #, c-format msgid "Could not allocate %lu byte to read file “%s”" msgid_plural "Could not allocate %lu bytes to read file “%s”" msgstr0 "%lu Byte konnte nicht zugeordnet werden, um Datei »%s« zu lesen" msgstr1 "%lu Bytes konnten nicht zugeordnet werden, um Datei »%s« zu lesen" -#: glib/gfileutils.c:752 +#: glib/gfileutils.c:770 #, c-format msgid "Error reading file “%s”: %s" msgstr "Fehler beim Lesen der Datei »%s«: %s" -#: glib/gfileutils.c:788 +#: glib/gfileutils.c:806 #, c-format msgid "File “%s” is too large" msgstr "Datei »%s« ist zu groß" -#: glib/gfileutils.c:852 +#: glib/gfileutils.c:870 #, c-format msgid "Failed to read from file “%s”: %s" msgstr "Aus der Datei »%s« konnte nicht gelesen werden: %s" -#: glib/gfileutils.c:902 glib/gfileutils.c:977 glib/gfileutils.c:1449 +#: glib/gfileutils.c:920 glib/gfileutils.c:995 glib/gfileutils.c:1472 #, c-format msgid "Failed to open file “%s”: %s" msgstr "Datei »%s« konnte nicht geöffnet werden: %s" -#: glib/gfileutils.c:915 +#: glib/gfileutils.c:933 #, c-format msgid "Failed to get attributes of file “%s”: fstat() failed: %s" msgstr "" "Attribute der Datei »%s« konnten nicht ermittelt werden: fstat() " "gescheitert: %s" -#: glib/gfileutils.c:946 +#: glib/gfileutils.c:964 #, c-format msgid "Failed to open file “%s”: fdopen() failed: %s" msgstr "Datei »%s« konnte nicht geöffnet werden: fdopen() gescheitert: %s" -#: glib/gfileutils.c:1047 +#: glib/gfileutils.c:1065 #, c-format msgid "Failed to rename file “%s” to “%s”: g_rename() failed: %s" msgstr "" "Datei »%s« konnte nicht in »%s« umbenannt werden: g_rename() ist " "gescheitert: %s" -#: glib/gfileutils.c:1156 +#: glib/gfileutils.c:1179 #, c-format msgid "Failed to write file “%s”: write() failed: %s" msgstr "Schreiben der Datei »%s« schlug fehl: write() ist gescheitert: %s" -#: glib/gfileutils.c:1177 +#: glib/gfileutils.c:1200 #, c-format msgid "Failed to write file “%s”: fsync() failed: %s" msgstr "" "Datei »%s« konnte nicht geschrieben werden: fsync() ist gescheitert: %s" -#: glib/gfileutils.c:1338 glib/gfileutils.c:1753 +#: glib/gfileutils.c:1361 glib/gfileutils.c:1776 #, c-format msgid "Failed to create file “%s”: %s" msgstr "Datei »%s« konnte nicht angelegt werden: %s" -#: glib/gfileutils.c:1383 +#: glib/gfileutils.c:1406 #, c-format msgid "Existing file “%s” could not be removed: g_unlink() failed: %s" msgstr "" "Die vorhandene Datei »%s« konnte nicht entfernt werden: g_unlink() ist " "gescheitert: %s" -#: glib/gfileutils.c:1718 +#: glib/gfileutils.c:1741 #, c-format msgid "Template “%s” invalid, should not contain a “%s”" msgstr "Vorlage »%s« ungültig, sollte kein »%s« enthalten" -#: glib/gfileutils.c:1731 +#: glib/gfileutils.c:1754 #, c-format msgid "Template “%s” doesn’t contain XXXXXX" msgstr "Vorlage »%s« enthält nicht XXXXXX" -#: glib/gfileutils.c:2291 glib/gfileutils.c:2320 +#: glib/gfileutils.c:2348 glib/gfileutils.c:2377 #, c-format msgid "Failed to read the symbolic link “%s”: %s" msgstr "Die symbolische Verknüpfung »%s« konnte nicht gelesen werden: %s" @@ -5243,8 +5252,8 @@ msgstr "Die Schlüsselwertedatei enthält die nicht unterstützte Kodierung »%s«" #: glib/gkeyfile.c:1679 glib/gkeyfile.c:1852 glib/gkeyfile.c:3299 -#: glib/gkeyfile.c:3363 glib/gkeyfile.c:3493 glib/gkeyfile.c:3625 -#: glib/gkeyfile.c:3771 glib/gkeyfile.c:4006 glib/gkeyfile.c:4073 +#: glib/gkeyfile.c:3363 glib/gkeyfile.c:3493 glib/gkeyfile.c:3622 +#: glib/gkeyfile.c:3768 glib/gkeyfile.c:4003 glib/gkeyfile.c:4070 #, c-format msgid "Key file does not have group “%s”" msgstr "Die Schlüsselwertedatei enthält nicht die Gruppe »%s«" @@ -5285,32 +5294,32 @@ "Der Schlüssel »%s« in der Gruppe »%s« enthält den Wert »%s«, obwohl %s " "erwartet wurde" -#: glib/gkeyfile.c:4326 +#: glib/gkeyfile.c:4323 msgid "Key file contains escape character at end of line" msgstr "Die Schlüsselwertedatei enthält ein Escape-Zeichen am Zeilenende" # CHECK -#: glib/gkeyfile.c:4348 +#: glib/gkeyfile.c:4345 #, c-format msgid "Key file contains invalid escape sequence “%s”" msgstr "Die Schlüsselwertedatei enthält das ungültige Escape-Zeichen »%s«" -#: glib/gkeyfile.c:4493 +#: glib/gkeyfile.c:4490 #, c-format msgid "Value “%s” cannot be interpreted as a number." msgstr "Der Wert »%s« konnte nicht als Zahl interpretiert werden." -#: glib/gkeyfile.c:4507 +#: glib/gkeyfile.c:4504 #, c-format msgid "Integer value “%s” out of range" msgstr "Ganzzahliger Wert »%s« ist außerhalb des Wertebereiches" -#: glib/gkeyfile.c:4540 +#: glib/gkeyfile.c:4537 #, c-format msgid "Value “%s” cannot be interpreted as a float number." msgstr "Der Wert »%s« konnte nicht als Gleitkommazahl interpretiert werden." -#: glib/gkeyfile.c:4579 +#: glib/gkeyfile.c:4576 #, c-format msgid "Value “%s” cannot be interpreted as a boolean." msgstr "" @@ -5333,32 +5342,32 @@ msgid "Failed to open file “%s”: open() failed: %s" msgstr "Datei »%s« konnte nicht geöffnet werden: open() ist gescheitert: %s" -#: glib/gmarkup.c:400 glib/gmarkup.c:442 +#: glib/gmarkup.c:393 glib/gmarkup.c:435 #, c-format msgid "Error on line %d char %d: " msgstr "Fehler in Zeile %d, Zeichen %d: " -#: glib/gmarkup.c:464 glib/gmarkup.c:547 +#: glib/gmarkup.c:457 glib/gmarkup.c:540 #, c-format msgid "Invalid UTF-8 encoded text in name — not valid “%s”" msgstr "Ungültiger UTF-8-kodierter Text im Namen – »%s« ist nicht gültig" -#: glib/gmarkup.c:475 +#: glib/gmarkup.c:468 #, c-format msgid "“%s” is not a valid name" msgstr "»%s« ist kein gültiger Name" -#: glib/gmarkup.c:491 +#: glib/gmarkup.c:484 #, c-format msgid "“%s” is not a valid name: “%c”" msgstr "»%s« ist kein gültiger Name: »%c«" -#: glib/gmarkup.c:615 +#: glib/gmarkup.c:608 #, c-format msgid "Error on line %d: %s" msgstr "Fehler in Zeile %d: %s" -#: glib/gmarkup.c:692 +#: glib/gmarkup.c:685 #, c-format msgid "" "Failed to parse “%-.*s”, which should have been a digit inside a character " @@ -5367,7 +5376,7 @@ "»%-.*s«, was eine Zahl in einer Zeichenreferenz (wie ê) sein sollte, " "konnte nicht analysiert werden – vielleicht ist die Zahl zu groß" -#: glib/gmarkup.c:704 +#: glib/gmarkup.c:697 msgid "" "Character reference did not end with a semicolon; most likely you used an " "ampersand character without intending to start an entity — escape ampersand " @@ -5377,24 +5386,24 @@ "&-Zeichen benutzt, ohne eine Entität beginnen zu wollen – umschreiben Sie " "das »&« als &" -#: glib/gmarkup.c:730 +#: glib/gmarkup.c:723 #, c-format msgid "Character reference “%-.*s” does not encode a permitted character" msgstr "Zeichenreferenz »%-.*s« kodiert kein zulässiges Zeichen" -#: glib/gmarkup.c:768 +#: glib/gmarkup.c:761 msgid "" "Empty entity “&;” seen; valid entities are: & " < > '" msgstr "" "Leere Entität »&;« gefunden; gültige Entitäten sind & " < > " "'" -#: glib/gmarkup.c:776 +#: glib/gmarkup.c:769 #, c-format msgid "Entity name “%-.*s” is not known" msgstr "Entitätenname »%-.*s« ist unbekannt" -#: glib/gmarkup.c:781 +#: glib/gmarkup.c:774 msgid "" "Entity did not end with a semicolon; most likely you used an ampersand " "character without intending to start an entity — escape ampersand as &" @@ -5403,11 +5412,11 @@ "Zeichen benutzt, ohne eine Entität beginnen zu wollen – umschreiben Sie das " "»&« als &" -#: glib/gmarkup.c:1195 +#: glib/gmarkup.c:1188 msgid "Document must begin with an element (e.g. <book>)" msgstr "Dokument muss mit einem Element beginnen (e.g. <book>)" -#: glib/gmarkup.c:1235 +#: glib/gmarkup.c:1228 #, c-format msgid "" "“%s” is not a valid character following a “<” character; it may not begin an " @@ -5416,7 +5425,7 @@ "»%s« ist kein gültiges Zeichen nach einem »<«-Zeichen; es darf keinen " "Elementnamen beginnen" -#: glib/gmarkup.c:1278 +#: glib/gmarkup.c:1271 #, c-format msgid "" "Odd character “%s”, expected a “>” character to end the empty-element tag " @@ -5425,12 +5434,12 @@ "Seltsames Zeichen »%s«, »>« erwartet um Start-Tag des leeren Elements »%s« " "abzuschließen" -#: glib/gmarkup.c:1348 +#: glib/gmarkup.c:1341 #, c-format msgid "Too many attributes in element “%s”" msgstr "Zu viele Attribute im Element »%s«" -#: glib/gmarkup.c:1368 +#: glib/gmarkup.c:1361 #, c-format msgid "" "Odd character “%s”, expected a “=” after attribute name “%s” of element “%s”" @@ -5438,7 +5447,7 @@ "Seltsames Zeichen »%s«, »=« wird nach dem Attributnamen »%s« des Elements " "»%s« erwartet" -#: glib/gmarkup.c:1410 +#: glib/gmarkup.c:1403 #, c-format msgid "" "Odd character “%s”, expected a “>” or “/” character to end the start tag of " @@ -5449,7 +5458,7 @@ "»/« erwartet, um das Start-Tag des Elements »%s« abzuschließen; vielleicht " "haben Sie ein ungültiges Zeichen in einem Attributnamen benutzt" -#: glib/gmarkup.c:1455 +#: glib/gmarkup.c:1448 #, c-format msgid "" "Odd character “%s”, expected an open quote mark after the equals sign when " @@ -5459,7 +5468,7 @@ "Elements »%s« wurde ein Anführungszeichen nach dem Gleichheitszeichen " "erwartet" -#: glib/gmarkup.c:1589 +#: glib/gmarkup.c:1582 #, c-format msgid "" "“%s” is not a valid character following the characters “</”; “%s” may not " @@ -5468,7 +5477,7 @@ "»%s« ist kein gültiges Zeichen, wenn es auf die Zeichen »</« folgt; »%s« " "darf keinen Elementnamen beginnen" -#: glib/gmarkup.c:1627 +#: glib/gmarkup.c:1620 #, c-format msgid "" "“%s” is not a valid character following the close element name “%s”; the " @@ -5477,26 +5486,26 @@ "»%s« ist kein gültiges Zeichen, wenn es auf den schließenden Elementnamen " "»%s« folgt; das erlaubte Zeichen ist »>«" -#: glib/gmarkup.c:1639 +#: glib/gmarkup.c:1632 #, c-format msgid "Element “%s” was closed, no element is currently open" msgstr "Element »%s« wurde geschlossen, kein Element ist derzeit offen" -#: glib/gmarkup.c:1648 +#: glib/gmarkup.c:1641 #, c-format msgid "Element “%s” was closed, but the currently open element is “%s”" msgstr "" "Element »%s« wurde geschlossen, aber das derzeit offene Element ist »%s«" -#: glib/gmarkup.c:1801 +#: glib/gmarkup.c:1794 msgid "Document was empty or contained only whitespace" msgstr "Dokument ist leer oder enthält nur Leerraum" -#: glib/gmarkup.c:1815 +#: glib/gmarkup.c:1808 msgid "Document ended unexpectedly just after an open angle bracket “<”" msgstr "Dokument endete unerwartet nach einer offenen spitzen Klammer »<«" -#: glib/gmarkup.c:1823 glib/gmarkup.c:1868 +#: glib/gmarkup.c:1816 glib/gmarkup.c:1861 #, c-format msgid "" "Document ended unexpectedly with elements still open — “%s” was the last " @@ -5505,7 +5514,7 @@ "Dokument endete unerwartet mit noch offenen Elementen – »%s« war das letzte " "offene Element" -#: glib/gmarkup.c:1831 +#: glib/gmarkup.c:1824 #, c-format msgid "" "Document ended unexpectedly, expected to see a close angle bracket ending " @@ -5514,19 +5523,19 @@ "Dokument endete unerwartet, es wurde eine spitze Klammer »>«, die das Tag " "<%s/> schließt, erwartet" -#: glib/gmarkup.c:1837 +#: glib/gmarkup.c:1830 msgid "Document ended unexpectedly inside an element name" msgstr "Dokument endete unerwartet innerhalb eines Elementnamens" -#: glib/gmarkup.c:1843 +#: glib/gmarkup.c:1836 msgid "Document ended unexpectedly inside an attribute name" msgstr "Dokument endete unerwartet innerhalb eines Attributnamens" -#: glib/gmarkup.c:1848 +#: glib/gmarkup.c:1841 msgid "Document ended unexpectedly inside an element-opening tag." msgstr "Dokument endete unerwartet innerhalb eines Element-öffnenden Tags." -#: glib/gmarkup.c:1854 +#: glib/gmarkup.c:1847 msgid "" "Document ended unexpectedly after the equals sign following an attribute " "name; no attribute value" @@ -5534,25 +5543,25 @@ "Dokument endete unerwartet nach dem Gleichheitszeichen, das einem " "Attributnamen folgt; kein Attributwert" -#: glib/gmarkup.c:1861 +#: glib/gmarkup.c:1854 msgid "Document ended unexpectedly while inside an attribute value" msgstr "Dokument endete unerwartet innerhalb eines Attributwertes" -#: glib/gmarkup.c:1878 +#: glib/gmarkup.c:1871 #, c-format msgid "Document ended unexpectedly inside the close tag for element “%s”" msgstr "" "Dokument endete unerwartet innerhalb eines schließenden Tags für das Element " "»%s«" -#: glib/gmarkup.c:1882 +#: glib/gmarkup.c:1875 msgid "" "Document ended unexpectedly inside the close tag for an unopened element" msgstr "" "Dokument endete unerwartet innerhalb eines schließenden Tags für ein " "ungeöffnetes Element" -#: glib/gmarkup.c:1888 +#: glib/gmarkup.c:1881 msgid "Document ended unexpectedly inside a comment or processing instruction" msgstr "" "Dokument endete unerwartet innerhalb eines Kommentars oder " @@ -5617,190 +5626,191 @@ msgid "Unknown option %s" msgstr "Unbekannte Option %s" -#: glib/gregex.c:474 +#: glib/gregex.c:479 msgid "corrupted object" msgstr "Beschädigtes Objekt" -#: glib/gregex.c:476 +#: glib/gregex.c:481 msgid "out of memory" msgstr "Nicht genügend freier Speicher" -#: glib/gregex.c:482 +#: glib/gregex.c:487 msgid "backtracking limit reached" msgstr "Rückverfolgungsgrenze wurde erreicht" -#: glib/gregex.c:493 glib/gregex.c:746 glib/gregex.c:775 +#: glib/gregex.c:498 msgid "internal error" msgstr "Interner Fehler" -#: glib/gregex.c:495 +#: glib/gregex.c:500 msgid "the pattern contains items not supported for partial matching" msgstr "" "Der Ausdruck enthält Elemente, die teilweise Übereinstimmung nicht " "unterstützen" -#: glib/gregex.c:497 +#: glib/gregex.c:502 msgid "back references as conditions are not supported for partial matching" msgstr "" "Rückreferenzen als Bedingungen werden für teilweise Übereinstimmung nicht " "unterstützt" -#: glib/gregex.c:503 +#: glib/gregex.c:508 msgid "recursion limit reached" msgstr "Rekursionslimit wurde erreicht" -#: glib/gregex.c:505 +#: glib/gregex.c:510 msgid "bad offset" msgstr "fehlerhafter Versatz" -#: glib/gregex.c:507 +#: glib/gregex.c:512 msgid "recursion loop" msgstr "Rekursionsschleife" #. should not happen in GRegex since we check modes before each match -#: glib/gregex.c:510 +#: glib/gregex.c:515 msgid "matching mode is requested that was not compiled for JIT" msgstr "" +"Übereinstimmungsmodus wurde angefragt, der nicht für JIT kompiliert ist" -#: glib/gregex.c:514 +#: glib/gregex.c:536 glib/gregex.c:1838 msgid "unknown error" msgstr "Unbekannter Fehler" -#: glib/gregex.c:535 +#: glib/gregex.c:557 msgid "\\ at end of pattern" msgstr "\\ am Ende des Ausdrucks" -#: glib/gregex.c:539 +#: glib/gregex.c:561 msgid "\\c at end of pattern" msgstr "\\c am Ende des Ausdrucks" -#: glib/gregex.c:544 +#: glib/gregex.c:566 msgid "unrecognized character following \\" msgstr "Unbekanntes Zeichen nach \\" # CHECK -#: glib/gregex.c:548 +#: glib/gregex.c:570 msgid "numbers out of order in {} quantifier" msgstr "Ziffern wirkungslos in {}-Quantifizierer" -#: glib/gregex.c:552 +#: glib/gregex.c:574 msgid "number too big in {} quantifier" msgstr "Ziffer zu groß in {}-Quantifizierer" -#: glib/gregex.c:556 +#: glib/gregex.c:578 msgid "missing terminating for character class" msgstr "Terminierendes für Zeichenklasse fehlt" -#: glib/gregex.c:560 +#: glib/gregex.c:582 msgid "invalid escape sequence in character class" msgstr "Ungültige Escape-Sequenz in Zeichenklasse" # CHECK -#: glib/gregex.c:564 +#: glib/gregex.c:586 msgid "range out of order in character class" msgstr "Bereich wirkungslos in Zeichenklasse" -#: glib/gregex.c:569 +#: glib/gregex.c:591 msgid "nothing to repeat" msgstr "Nichts zum Wiederholen" -#: glib/gregex.c:573 +#: glib/gregex.c:595 msgid "unrecognized character after (? or (?-" msgstr "Unbekanntes Zeichen nach (? oder (?-" -#: glib/gregex.c:577 +#: glib/gregex.c:599 msgid "POSIX named classes are supported only within a class" msgstr "POSIX-benannte Klassen werden nur innerhalb einer Klasse unterstützt" -#: glib/gregex.c:581 +#: glib/gregex.c:603 msgid "POSIX collating elements are not supported" msgstr "POSIX-Elementverknüpfungen nicht unterstützt" -#: glib/gregex.c:587 +#: glib/gregex.c:609 msgid "missing terminating )" msgstr "Abschließende ) fehlt" -#: glib/gregex.c:591 +#: glib/gregex.c:613 msgid "reference to non-existent subpattern" msgstr "Referenz auf nicht existierenden Unterausdruck" -#: glib/gregex.c:595 +#: glib/gregex.c:617 msgid "missing ) after comment" msgstr "fehlende ) nach Kommentar" -#: glib/gregex.c:599 +#: glib/gregex.c:621 msgid "regular expression is too large" msgstr "Regulärer Ausdruck zu groß" -#: glib/gregex.c:603 +#: glib/gregex.c:625 msgid "malformed number or name after (?(" msgstr "Falsch formatierte Zahl oder Name nach (?(" -#: glib/gregex.c:607 +#: glib/gregex.c:629 msgid "lookbehind assertion is not fixed length" msgstr "Rückblickende Annahme hat keine feste Länge" -#: glib/gregex.c:611 +#: glib/gregex.c:633 msgid "conditional group contains more than two branches" msgstr "Bedingte Gruppe enthält mehr als zwei Verzweigungen" -#: glib/gregex.c:615 +#: glib/gregex.c:637 msgid "assertion expected after (?(" msgstr "Annahme erwartet nach (?(" -#: glib/gregex.c:619 +#: glib/gregex.c:641 msgid "a numbered reference must not be zero" msgstr "Eine nummerierte Referenz darf nicht Null sein" -#: glib/gregex.c:623 +#: glib/gregex.c:645 msgid "unknown POSIX class name" msgstr "Unbekannter POSIX-Klassenname" -#: glib/gregex.c:628 +#: glib/gregex.c:650 msgid "character value in \\x{...} sequence is too large" msgstr "Wert in \\x{…}-Sequenz ist zu groß" -#: glib/gregex.c:632 +#: glib/gregex.c:654 msgid "\\C not allowed in lookbehind assertion" msgstr "\\C nicht erlaubt in rückblickender Annahme" -#: glib/gregex.c:636 +#: glib/gregex.c:658 msgid "missing terminator in subpattern name" msgstr "Terminierung im Namen des Unterausdrucks fehlt" -#: glib/gregex.c:640 +#: glib/gregex.c:662 msgid "two named subpatterns have the same name" msgstr "Zwei benannte Unterausdrücke haben den gleichen Namen" -#: glib/gregex.c:644 +#: glib/gregex.c:666 msgid "malformed \\P or \\p sequence" msgstr "Fehlerhafte \\P- oder \\p-Sequenz" -#: glib/gregex.c:648 +#: glib/gregex.c:670 msgid "unknown property name after \\P or \\p" msgstr "Unbekannte Eigenschaftsname nach \\P oder \\p" -#: glib/gregex.c:652 +#: glib/gregex.c:674 msgid "subpattern name is too long (maximum 32 characters)" msgstr "Name des Unterausdrucks ist zu lang (maximal 32 Zeichen)" -#: glib/gregex.c:656 +#: glib/gregex.c:678 msgid "too many named subpatterns (maximum 10,000)" msgstr "Zu viele benannte Unterausdrücke (maximal 10.000)" -#: glib/gregex.c:660 +#: glib/gregex.c:682 msgid "octal value is greater than \\377" msgstr "Oktaler Wert ist größer als \\377" -#: glib/gregex.c:664 +#: glib/gregex.c:686 msgid "DEFINE group contains more than one branch" msgstr "DEFINE-Gruppe enthält mehr als eine Verzweigung" -#: glib/gregex.c:668 +#: glib/gregex.c:690 msgid "inconsistent NEWLINE options" msgstr "Inkonsistente NEWLINE-Optionen" -#: glib/gregex.c:672 +#: glib/gregex.c:694 msgid "" "\\g is not followed by a braced, angle-bracketed, or quoted name or number, " "or by a plain number" @@ -5808,124 +5818,124 @@ "Auf \\g folgt kein eingeklammerter, in eckigen Klammern eingeklammerter oder " "zitierter Name oder eine Zahl oder eine einfache Zahl" -#: glib/gregex.c:677 +#: glib/gregex.c:699 msgid "an argument is not allowed for (*ACCEPT), (*FAIL), or (*COMMIT)" msgstr "Ein Argument ist für (*ACCEPT), (*FAIL), oder (*COMMIT) nicht erlaubt" -#: glib/gregex.c:681 +#: glib/gregex.c:703 msgid "(*VERB) not recognized" msgstr "(*VERB) nicht erkannt" -#: glib/gregex.c:685 +#: glib/gregex.c:707 msgid "number is too big" msgstr "Zahl ist zu groß" -#: glib/gregex.c:689 +#: glib/gregex.c:711 msgid "missing subpattern name after (?&" msgstr "Name des Unterausdrucks nach (?& fehlt" -#: glib/gregex.c:693 +#: glib/gregex.c:715 msgid "different names for subpatterns of the same number are not allowed" msgstr "" "Verschiedene Namen für Unterausdrücke der gleichen Nummer sind nicht erlaubt" -#: glib/gregex.c:697 +#: glib/gregex.c:719 msgid "(*MARK) must have an argument" msgstr "(*MARK) benötigt ein Argument" -#: glib/gregex.c:701 +#: glib/gregex.c:723 msgid "\\c must be followed by an ASCII character" msgstr "Auf \\c muss ein ASCII-Zeichen folgen" -#: glib/gregex.c:705 +#: glib/gregex.c:727 msgid "\\k is not followed by a braced, angle-bracketed, or quoted name" msgstr "" "Auf \\k folgt kein eingeklammerter, in eckigen Klammern eingeklammerter oder " "zitierter Name" -#: glib/gregex.c:709 +#: glib/gregex.c:731 msgid "\\N is not supported in a class" msgstr "\\N wird in einer Klasse nicht unterstützt" -#: glib/gregex.c:713 +#: glib/gregex.c:735 msgid "name is too long in (*MARK), (*PRUNE), (*SKIP), or (*THEN)" msgstr "Name ist zu lang in (*MARK), (*PRUNE), (*SKIP), oder (*THEN)" -#: glib/gregex.c:717 glib/gregex.c:856 +#: glib/gregex.c:739 glib/gregex.c:875 msgid "code overflow" msgstr "Code-Überlauf" -#: glib/gregex.c:721 +#: glib/gregex.c:743 msgid "unrecognized character after (?P" msgstr "Unbekanntes Zeichen nach (?P" -#: glib/gregex.c:725 +#: glib/gregex.c:747 msgid "overran compiling workspace" msgstr "Überlauf beim Kompilieren des Arbeitsbereichs" -#: glib/gregex.c:729 +#: glib/gregex.c:751 msgid "previously-checked referenced subpattern not found" msgstr "" "Bereits geprüfter, referenzierter Unterausdruck konnte nicht gefunden werden" -#: glib/gregex.c:855 glib/gregex.c:1100 glib/gregex.c:2406 +#: glib/gregex.c:874 glib/gregex.c:1121 glib/gregex.c:2444 #, c-format msgid "Error while matching regular expression %s: %s" msgstr "Fehler beim Anwenden des regulären Ausdrucks %s: %s" -#: glib/gregex.c:1696 +#: glib/gregex.c:1721 msgid "PCRE library is compiled without UTF8 support" msgstr "PCRE-Bibliothek wurde ohne UTF8-Unterstützung kompiliert" -#: glib/gregex.c:1704 +#: glib/gregex.c:1729 msgid "PCRE library is compiled with incompatible options" msgstr "" "PCRE-Bibliothek wurde mit Unterstützung für nicht-kompatible Optionen " "kompiliert" -#: glib/gregex.c:1813 +#: glib/gregex.c:1847 #, c-format msgid "Error while compiling regular expression ‘%s’ at char %s: %s" msgstr "" "Fehler beim Kompilieren des regulären Ausdrucks »%s« bei Zeichen %s: %s" -#: glib/gregex.c:2848 +#: glib/gregex.c:2887 msgid "hexadecimal digit or “}” expected" msgstr "Hexadezimalzahl oder »}« erwartet" -#: glib/gregex.c:2864 +#: glib/gregex.c:2903 msgid "hexadecimal digit expected" msgstr "Hexadezimalzahl erwartet" -#: glib/gregex.c:2904 +#: glib/gregex.c:2943 msgid "missing “<” in symbolic reference" msgstr "Fehlendes »<» in symbolischer Referenz" -#: glib/gregex.c:2913 +#: glib/gregex.c:2952 msgid "unfinished symbolic reference" msgstr "Unvollendete symbolische Referenz" -#: glib/gregex.c:2920 +#: glib/gregex.c:2959 msgid "zero-length symbolic reference" msgstr "Symbolische Referenz der Länge 0" -#: glib/gregex.c:2931 +#: glib/gregex.c:2970 msgid "digit expected" msgstr "Ziffer erwartet" -#: glib/gregex.c:2949 +#: glib/gregex.c:2988 msgid "illegal symbolic reference" msgstr "Illegale symbolische Referenz" -#: glib/gregex.c:3012 +#: glib/gregex.c:3051 msgid "stray final “\\”" msgstr "Verirrtes abschließendes »\\«" -#: glib/gregex.c:3016 +#: glib/gregex.c:3055 msgid "unknown escape sequence" msgstr "Unbekannte Escape-Sequenz" -#: glib/gregex.c:3026 +#: glib/gregex.c:3065 #, c-format msgid "Error while parsing replacement text “%s” at char %lu: %s" msgstr "Fehler beim Verarbeiten des Ersetzungstextes »%s« an Zeichen %lu: %s" @@ -5956,102 +5966,107 @@ msgid "Text was empty (or contained only whitespace)" msgstr "Text war leer (oder enthielt nur Leerraum)" -#: glib/gspawn.c:314 +#: glib/gspawn.c:319 #, c-format msgid "Failed to read data from child process (%s)" msgstr "Daten vom Kindprozess konnten nicht gelesen werden (%s)" -#: glib/gspawn.c:466 +#: glib/gspawn.c:471 #, c-format msgid "Unexpected error in reading data from a child process (%s)" msgstr "Unerwarteter Fehler beim Lesen von Daten eines Kindprozesses (%s)" -#: glib/gspawn.c:551 +#: glib/gspawn.c:556 #, c-format msgid "Unexpected error in waitpid() (%s)" msgstr "Unerwarteter Fehler in waitpid() (%s)" -#: glib/gspawn.c:1170 glib/gspawn-win32.c:1488 +#: glib/gspawn.c:1175 glib/gspawn-win32.c:1503 #, c-format msgid "Child process exited with code %ld" msgstr "Der Kindprozess wurde mit Status %ld beendet" -#: glib/gspawn.c:1178 +#: glib/gspawn.c:1183 #, c-format msgid "Child process killed by signal %ld" msgstr "Der Kindprozess wurde mit Signal %ld beendet" -#: glib/gspawn.c:1185 +#: glib/gspawn.c:1190 #, c-format msgid "Child process stopped by signal %ld" msgstr "Der Kindprozess wurde mit Signal %ld beendet" -#: glib/gspawn.c:1192 +#: glib/gspawn.c:1197 #, c-format msgid "Child process exited abnormally" msgstr "Der Kindprozess wurde gewaltsam beendet" -#: glib/gspawn.c:1885 glib/gspawn-win32.c:393 glib/gspawn-win32.c:401 +#: glib/gspawn.c:2027 glib/gspawn-win32.c:393 glib/gspawn-win32.c:401 #, c-format msgid "Failed to read from child pipe (%s)" msgstr "Lesen aus Weiterleitung zum Kind (%s) gescheitert" -#: glib/gspawn.c:2248 +#: glib/gspawn.c:2399 #, c-format msgid "Failed to spawn child process “%s” (%s)" msgstr "Abspalten des Kindprozesses »%s« gescheitert (%s)" -#: glib/gspawn.c:2365 +#: glib/gspawn.c:2525 #, c-format msgid "Failed to fork (%s)" msgstr "Abspalten gescheitert (%s)" -#: glib/gspawn.c:2525 glib/gspawn-win32.c:424 +#: glib/gspawn.c:2685 glib/gspawn-win32.c:424 #, c-format msgid "Failed to change to directory “%s” (%s)" msgstr "In Ordner »%s« (%s) konnte nicht gewechselt werden" -#: glib/gspawn.c:2535 +#: glib/gspawn.c:2695 #, c-format msgid "Failed to execute child process “%s” (%s)" msgstr "Kindprozess »%s« konnte nicht ausgeführt werden (%s)" -#: glib/gspawn.c:2545 +#: glib/gspawn.c:2705 #, c-format msgid "Failed to open file to remap file descriptor (%s)" msgstr "" "Öffnen der Datei zur Neuzuweisung des Datei-Deskriptors ist fehlgeschlagen " "(%s)" -#: glib/gspawn.c:2553 +#: glib/gspawn.c:2713 #, c-format msgid "Failed to duplicate file descriptor for child process (%s)" msgstr "" "Duplizieren des Datei-Deskriptors für Kindprozess ist fehlgeschlagen (%s)" -#: glib/gspawn.c:2562 +#: glib/gspawn.c:2722 #, c-format msgid "Failed to fork child process (%s)" msgstr "Abspalten des Kindprozesses gescheitert (%s)" -#: glib/gspawn.c:2570 +#: glib/gspawn.c:2730 #, c-format msgid "Failed to close file descriptor for child process (%s)" msgstr "" "Schließen des Datei-Deskriptors des Kindprozesses ist fehlgeschlagen (%s)" -#: glib/gspawn.c:2578 +#: glib/gspawn.c:2738 #, c-format msgid "Unknown error executing child process “%s”" msgstr "Unbekannter Fehler beim Ausführen des Kindprozesses »%s«" -#: glib/gspawn.c:2602 +#: glib/gspawn.c:2762 #, c-format msgid "Failed to read enough data from child pid pipe (%s)" msgstr "" "Es konnten nicht genug Daten von Kind-Programmkennungsweiterleitung (%s) " "gelesen werden" +#: glib/gspawn-private.h:134 +#, c-format +msgid "Invalid source FDs argument" +msgstr "Ungültiges Datei-Deskriptor-Argument der Quelle" + #: glib/gspawn-win32.c:337 msgid "Failed to read data from child process" msgstr "Daten konnten nicht vom Kindprozess gelesen werden" @@ -6071,27 +6086,27 @@ msgid "Invalid program name: %s" msgstr "Ungültiger Programmname: %s" -#: glib/gspawn-win32.c:521 glib/gspawn-win32.c:853 +#: glib/gspawn-win32.c:521 glib/gspawn-win32.c:868 #, c-format msgid "Invalid string in argument vector at %d: %s" msgstr "Ungültige Zeichenkette im Argumentsvektor bei %d: %s" -#: glib/gspawn-win32.c:532 glib/gspawn-win32.c:869 +#: glib/gspawn-win32.c:532 glib/gspawn-win32.c:884 #, c-format msgid "Invalid string in environment: %s" msgstr "Ungültige Zeichenkette in der Umgebung: %s" -#: glib/gspawn-win32.c:849 +#: glib/gspawn-win32.c:864 #, c-format msgid "Invalid working directory: %s" msgstr "Ungültiger Arbeitsordner: %s" -#: glib/gspawn-win32.c:914 +#: glib/gspawn-win32.c:929 #, c-format msgid "Failed to execute helper program (%s)" msgstr "Hilfsprogramm (%s) konnte nicht ausgeführt werden" -#: glib/gspawn-win32.c:1143 +#: glib/gspawn-win32.c:1158 msgid "" "Unexpected error in g_io_channel_win32_poll() reading data from a child " "process" @@ -6099,21 +6114,21 @@ "Unerwarteter Fehler in g_io_channel_win32_poll() beim Lesen aus dem " "Kindprozess" -#: glib/gstrfuncs.c:3372 glib/gstrfuncs.c:3474 +#: glib/gstrfuncs.c:3370 glib/gstrfuncs.c:3472 msgid "Empty string is not a number" msgstr "Leere Zeichenkette ist keine Zahl" -#: glib/gstrfuncs.c:3396 +#: glib/gstrfuncs.c:3394 #, c-format msgid "“%s” is not a signed number" msgstr "»%s« ist keine vorzeichenbehaftete Zahl" -#: glib/gstrfuncs.c:3406 glib/gstrfuncs.c:3510 +#: glib/gstrfuncs.c:3404 glib/gstrfuncs.c:3508 #, c-format msgid "Number “%s” is out of bounds %s, %s" msgstr "Zahl »%s« ist außerhalb des zulässigen Bereichs %s, %s" -#: glib/gstrfuncs.c:3500 +#: glib/gstrfuncs.c:3498 #, c-format msgid "“%s” is not an unsigned number" msgstr "»%s« ist keine vorzeichenlose Zahl" @@ -6192,132 +6207,132 @@ msgstr "Zeichen außerhalb des Bereiches für UTF-16" #. Translators: A unit symbol for size formatting, showing for example: "13.0 kB" -#: glib/gutils.c:2857 +#: glib/gutils.c:2966 msgid "kB" msgstr "KB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 MB" -#: glib/gutils.c:2859 +#: glib/gutils.c:2968 msgid "MB" msgstr "MB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 GB" -#: glib/gutils.c:2861 +#: glib/gutils.c:2970 msgid "GB" msgstr "GB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 TB" -#: glib/gutils.c:2863 +#: glib/gutils.c:2972 msgid "TB" msgstr "TB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 PB" -#: glib/gutils.c:2865 +#: glib/gutils.c:2974 msgid "PB" msgstr "PB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 EB" -#: glib/gutils.c:2867 +#: glib/gutils.c:2976 msgid "EB" msgstr "EB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 KiB" -#: glib/gutils.c:2871 +#: glib/gutils.c:2980 msgid "KiB" msgstr "KiB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 MiB" -#: glib/gutils.c:2873 +#: glib/gutils.c:2982 msgid "MiB" msgstr "MiB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 GiB" -#: glib/gutils.c:2875 +#: glib/gutils.c:2984 msgid "GiB" msgstr "GiB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 TiB" -#: glib/gutils.c:2877 +#: glib/gutils.c:2986 msgid "TiB" msgstr "TiB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 PiB" -#: glib/gutils.c:2879 +#: glib/gutils.c:2988 msgid "PiB" msgstr "PiB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 EiB" -#: glib/gutils.c:2881 +#: glib/gutils.c:2990 msgid "EiB" msgstr "EiB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 kb" -#: glib/gutils.c:2885 +#: glib/gutils.c:2994 msgid "kb" msgstr "KB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Mb" -#: glib/gutils.c:2887 +#: glib/gutils.c:2996 msgid "Mb" msgstr "MB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Gb" -#: glib/gutils.c:2889 +#: glib/gutils.c:2998 msgid "Gb" msgstr "GB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Tb" -#: glib/gutils.c:2891 +#: glib/gutils.c:3000 msgid "Tb" msgstr "TB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Pb" -#: glib/gutils.c:2893 +#: glib/gutils.c:3002 msgid "Pb" msgstr "PB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Eb" -#: glib/gutils.c:2895 +#: glib/gutils.c:3004 msgid "Eb" msgstr "EB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Kib" -#: glib/gutils.c:2899 +#: glib/gutils.c:3008 msgid "Kib" msgstr "KiB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Mib" -#: glib/gutils.c:2901 +#: glib/gutils.c:3010 msgid "Mib" msgstr "MiB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Gib" -#: glib/gutils.c:2903 +#: glib/gutils.c:3012 msgid "Gib" msgstr "GiB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Tib" -#: glib/gutils.c:2905 +#: glib/gutils.c:3014 msgid "Tib" msgstr "TiB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Pib" -#: glib/gutils.c:2907 +#: glib/gutils.c:3016 msgid "Pib" msgstr "PiB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Eib" -#: glib/gutils.c:2909 +#: glib/gutils.c:3018 msgid "Eib" msgstr "EiB" -#: glib/gutils.c:2947 +#: glib/gutils.c:3056 msgid "byte" msgid_plural "bytes" msgstr0 "Byte" msgstr1 "Bytes" -#: glib/gutils.c:2951 +#: glib/gutils.c:3060 msgid "bit" msgid_plural "bits" msgstr0 "Bit" @@ -6325,7 +6340,7 @@ #. Translators: The "%u" is replaced with the size value, like "13"; it could #. * be part of "13 bytes", but only the number is requested this time. -#: glib/gutils.c:2959 +#: glib/gutils.c:3068 #, c-format msgctxt "format-size" msgid "%u" @@ -6333,7 +6348,7 @@ #. Translators: The first "%u" is replaced with the value, the "%s" with a unit of the value. #. * The order can be changed with "%$2s %$1u". An example: "13 bytes" -#: glib/gutils.c:2964 +#: glib/gutils.c:3073 #, c-format msgctxt "format-size" msgid "%u %s" @@ -6341,7 +6356,7 @@ #. Translators: The "%.1f" is replaced with the size value, like "13.0"; it could #. * be part of "13.0 MB", but only the number is requested this time. -#: glib/gutils.c:3000 +#: glib/gutils.c:3109 #, c-format msgctxt "format-size" msgid "%.1f" @@ -6350,14 +6365,14 @@ #. Translators: The first "%.1f" is replaced with the value, the "%s" with a unit of the value. #. * The order can be changed with "%$2s %$1.1f". Keep the no-break space between the value and #. * the unit symbol. An example: "13.0 MB" -#: glib/gutils.c:3006 +#: glib/gutils.c:3115 #, c-format msgctxt "format-size" msgid "%.1f %s" msgstr "%.1f %s" #. Translators: the %s in "%s bytes" will always be replaced by a number. -#: glib/gutils.c:3046 +#: glib/gutils.c:3155 #, c-format msgid "%s byte" msgid_plural "%s bytes" @@ -6365,14 +6380,14 @@ msgstr1 "%s Bytes" #. Translators: the %s in "%s bits" will always be replaced by a number. -#: glib/gutils.c:3051 +#: glib/gutils.c:3160 #, c-format msgid "%s bit" msgid_plural "%s bits" msgstr0 "%s bit" msgstr1 "%s bits" -#: glib/gutils.c:3092 +#: glib/gutils.c:3201 #, c-format msgid "%u byte" msgid_plural "%u bytes" @@ -6384,32 +6399,32 @@ #. * compatibility. Users will not see this string unless a program is using this deprecated function. #. * Please translate as literally as possible. #. -#: glib/gutils.c:3105 +#: glib/gutils.c:3214 #, c-format msgid "%.1f KB" msgstr "%.1f KB" -#: glib/gutils.c:3110 +#: glib/gutils.c:3219 #, c-format msgid "%.1f MB" msgstr "%.1f MB" -#: glib/gutils.c:3115 +#: glib/gutils.c:3224 #, c-format msgid "%.1f GB" msgstr "%.1f GB" -#: glib/gutils.c:3120 +#: glib/gutils.c:3229 #, c-format msgid "%.1f TB" msgstr "%.1f TB" -#: glib/gutils.c:3125 +#: glib/gutils.c:3234 #, c-format msgid "%.1f PB" msgstr "%.1f PB" -#: glib/gutils.c:3130 +#: glib/gutils.c:3239 #, c-format msgid "%.1f EB" msgstr "%.1f EB"
View file
_service:tar_scm:glib-2.74.4.tar.xz/po/en_GB.po -> _service:tar_scm:glib-2.76.4.tar.xz/po/en_GB.po
Changed
@@ -4,14 +4,14 @@ # Gareth Owen <gowen72@yahoo.com> 2004 # Philip Withnall <philip@tecnocode.co.uk>, 2010. # Zander Brown <zbrown@gnome.org>, 2019-2021. -# Bruce Cowan <bruce@bcowan.me.uk>, 2009-2022. +# Bruce Cowan <bruce@bcowan.me.uk>, 2009-2023. # msgid "" msgstr "" "Project-Id-Version: glib\n" "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/glib/issues\n" -"POT-Creation-Date: 2022-08-05 19:22+0000\n" -"PO-Revision-Date: 2022-09-05 10:29+0100\n" +"POT-Creation-Date: 2023-04-14 16:57+0000\n" +"PO-Revision-Date: 2023-07-02 21:07+0100\n" "Last-Translator: Bruce Cowan <bruce@bcowan.me.uk>\n" "Language-Team: English - United Kingdom <en@li.org>\n" "Language: en_GB\n" @@ -19,7 +19,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Gtranslator 42.0\n" +"X-Generator: Poedit 3.3.1\n" "X-Project-Style: gnome\n" "X-DL-Team: en_GB\n" "X-DL-Module: glib\n" @@ -27,20 +27,20 @@ "X-DL-Domain: po\n" "X-DL-State: Translating\n" -#: gio/gappinfo.c:335 +#: gio/gappinfo.c:339 msgid "Setting default applications not supported yet" msgstr "Setting default applications not supported yet" -#: gio/gappinfo.c:368 +#: gio/gappinfo.c:372 msgid "Setting application as last used for type not supported yet" msgstr "Setting application as last used for type not supported yet" -#: gio/gappinfo.c:808 +#: gio/gappinfo.c:814 #, c-format msgid "Failed to find default application for content type ‘%s’" msgstr "Failed to find default application for content type ‘%s’" -#: gio/gappinfo.c:868 +#: gio/gappinfo.c:874 #, c-format msgid "Failed to find default application for URI Scheme ‘%s’" msgstr "Failed to find default application for URI Scheme ‘%s’" @@ -237,11 +237,11 @@ msgid "error sending %s message to application: %s\n" msgstr "error sending %s message to application: %s\n" -#: gio/gapplication-tool.c:321 +#: gio/gapplication-tool.c:324 msgid "action name must be given after application id\n" msgstr "action name must be given after application id\n" -#: gio/gapplication-tool.c:329 +#: gio/gapplication-tool.c:332 #, c-format msgid "" "invalid action name: “%s”\n" @@ -250,25 +250,25 @@ "invalid action name: “%s”\n" "action names must consist of only alphanumerics, “-” and “.”\n" -#: gio/gapplication-tool.c:348 +#: gio/gapplication-tool.c:351 #, c-format msgid "error parsing action parameter: %s\n" msgstr "error parsing action parameter: %s\n" -#: gio/gapplication-tool.c:360 +#: gio/gapplication-tool.c:363 msgid "actions accept a maximum of one parameter\n" msgstr "actions accept a maximum of one parameter\n" -#: gio/gapplication-tool.c:415 +#: gio/gapplication-tool.c:418 msgid "list-actions command takes only the application id" msgstr "list-actions command takes only the application id" -#: gio/gapplication-tool.c:425 +#: gio/gapplication-tool.c:428 #, c-format msgid "unable to find desktop file for application %s\n" msgstr "unable to find desktop file for application %s\n" -#: gio/gapplication-tool.c:470 +#: gio/gapplication-tool.c:473 #, c-format msgid "" "unrecognised command: %s\n" @@ -280,7 +280,7 @@ #: gio/gbufferedinputstream.c:422 gio/gbufferedinputstream.c:500 #: gio/ginputstream.c:181 gio/ginputstream.c:381 gio/ginputstream.c:650 #: gio/ginputstream.c:1052 gio/goutputstream.c:225 gio/goutputstream.c:1051 -#: gio/gpollableinputstream.c:207 gio/gpollableoutputstream.c:279 +#: gio/gpollableinputstream.c:221 gio/gpollableoutputstream.c:293 #, c-format msgid "Too large count value passed to %s" msgstr "Too large count value passed to %s" @@ -303,7 +303,7 @@ msgid "Truncate not supported on base stream" msgstr "Truncate not supported on base stream" -#: gio/gcancellable.c:319 gio/gdbusconnection.c:1859 gio/gdbusprivate.c:1420 +#: gio/gcancellable.c:326 gio/gdbusconnection.c:1865 gio/gdbusprivate.c:1420 #: gio/gsimpleasyncresult.c:873 gio/gsimpleasyncresult.c:899 #, c-format msgid "Operation was cancelled" @@ -323,13 +323,13 @@ #: gio/gcharsetconverter.c:344 gio/gdatainputstream.c:850 #: gio/gdatainputstream.c:1268 glib/gconvert.c:451 glib/gconvert.c:883 -#: glib/giochannel.c:1576 glib/giochannel.c:1618 glib/giochannel.c:2473 +#: glib/giochannel.c:1576 glib/giochannel.c:1618 glib/giochannel.c:2478 #: glib/gutf8.c:892 glib/gutf8.c:1346 msgid "Invalid byte sequence in conversion input" msgstr "Invalid byte sequence in conversion input" #: gio/gcharsetconverter.c:349 glib/gconvert.c:459 glib/gconvert.c:797 -#: glib/giochannel.c:1583 glib/giochannel.c:2485 +#: glib/giochannel.c:1583 glib/giochannel.c:2493 #, c-format msgid "Error during conversion: %s" msgstr "Error during conversion: %s" @@ -386,17 +386,17 @@ msgid "Unexpected early end-of-stream" msgstr "Unexpected early end-of-stream" -#: gio/gdbusaddress.c:164 gio/gdbusaddress.c:238 gio/gdbusaddress.c:327 +#: gio/gdbusaddress.c:168 gio/gdbusaddress.c:240 gio/gdbusaddress.c:327 #, c-format msgid "Unsupported key “%s” in address entry “%s”" msgstr "Unsupported key “%s” in address entry “%s”" -#: gio/gdbusaddress.c:177 +#: gio/gdbusaddress.c:181 #, c-format msgid "Meaningless key/value pair combination in address entry “%s”" msgstr "Meaningless key/value pair combination in address entry “%s”" -#: gio/gdbusaddress.c:186 +#: gio/gdbusaddress.c:190 #, c-format msgid "" "Address “%s” is invalid (need exactly one of path, dir, tmpdir, or abstract " @@ -405,7 +405,7 @@ "Address “%s” is invalid (need exactly one of path, dir, tmpdir, or abstract " "keys)" -#: gio/gdbusaddress.c:253 gio/gdbusaddress.c:264 gio/gdbusaddress.c:279 +#: gio/gdbusaddress.c:255 gio/gdbusaddress.c:266 gio/gdbusaddress.c:281 #: gio/gdbusaddress.c:342 gio/gdbusaddress.c:353 #, c-format msgid "Error in address “%s” — the “%s” attribute is malformed" @@ -528,7 +528,7 @@ msgid "Cannot determine session bus address (not implemented for this OS)" msgstr "Cannot determine session bus address (not implemented for this OS)" -#: gio/gdbusaddress.c:1375 gio/gdbusconnection.c:7321 +#: gio/gdbusaddress.c:1380 gio/gdbusconnection.c:7324 #, c-format msgid "" "Cannot determine bus address from DBUS_STARTER_BUS_TYPE environment variable " @@ -537,7 +537,7 @@ "Cannot determine bus address from DBUS_STARTER_BUS_TYPE environment variable " "— unknown value “%s”" -#: gio/gdbusaddress.c:1384 gio/gdbusconnection.c:7330 +#: gio/gdbusaddress.c:1389 gio/gdbusconnection.c:7333 msgid "" "Cannot determine bus address because the DBUS_STARTER_BUS_TYPE environment " "variable is not set" @@ -545,7 +545,7 @@ "Cannot determine bus address because the DBUS_STARTER_BUS_TYPE environment " "variable is not set" -#: gio/gdbusaddress.c:1394 +#: gio/gdbusaddress.c:1399 #, c-format msgid "Unknown bus type %d" msgstr "Unknown bus type %d" @@ -565,218 +565,223 @@ msgstr "" "Exhausted all available authentication mechanisms (tried: %s) (available: %s)" -#: gio/gdbusauth.c:1178 +#: gio/gdbusauth.c:1045 +#| msgid "Unexpected lack of content trying to read a line" +msgid "Unexpected lack of content trying to read a byte" +msgstr "Unexpected lack of content trying to read a byte" + +#: gio/gdbusauth.c:1195 msgid "User IDs must be the same for peer and server" msgstr "User IDs must be the same for peer and server" -#: gio/gdbusauth.c:1190 +#: gio/gdbusauth.c:1207 msgid "Cancelled via GDBusAuthObserver::authorize-authenticated-peer" msgstr "Cancelled via GDBusAuthObserver::authorize-authenticated-peer" -#: gio/gdbusauthmechanismsha1.c:303 +#: gio/gdbusauthmechanismsha1.c:307 #, c-format msgid "Error when getting information for directory “%s”: %s" msgstr "Error when getting information for directory “%s”: %s" -#: gio/gdbusauthmechanismsha1.c:318 +#: gio/gdbusauthmechanismsha1.c:322 #, c-format msgid "" "Permissions on directory “%s” are malformed. Expected mode 0700, got 0%o" msgstr "" "Permissions on directory “%s” are malformed. Expected mode 0700, got 0%o" -#: gio/gdbusauthmechanismsha1.c:351 gio/gdbusauthmechanismsha1.c:362 +#: gio/gdbusauthmechanismsha1.c:355 gio/gdbusauthmechanismsha1.c:366 #, c-format msgid "Error creating directory “%s”: %s" msgstr "Error creating directory “%s”: %s" -#: gio/gdbusauthmechanismsha1.c:364 gio/gfile.c:1095 gio/gfile.c:1333 +#: gio/gdbusauthmechanismsha1.c:368 gio/gfile.c:1095 gio/gfile.c:1333 #: gio/gfile.c:1471 gio/gfile.c:1709 gio/gfile.c:1764 gio/gfile.c:1822 #: gio/gfile.c:1906 gio/gfile.c:1963 gio/gfile.c:2027 gio/gfile.c:2082 -#: gio/gfile.c:3787 gio/gfile.c:3927 gio/gfile.c:4339 gio/gfile.c:4809 -#: gio/gfile.c:5220 gio/gfile.c:5305 gio/gfile.c:5395 gio/gfile.c:5492 -#: gio/gfile.c:5579 gio/gfile.c:5680 gio/gfile.c:8809 gio/gfile.c:8899 -#: gio/gfile.c:8983 gio/win32/gwinhttpfile.c:453 +#: gio/gfile.c:3797 gio/gfile.c:3937 gio/gfile.c:4349 gio/gfile.c:4819 +#: gio/gfile.c:5230 gio/gfile.c:5315 gio/gfile.c:5405 gio/gfile.c:5502 +#: gio/gfile.c:5589 gio/gfile.c:5690 gio/gfile.c:8819 gio/gfile.c:8909 +#: gio/gfile.c:8993 gio/win32/gwinhttpfile.c:453 msgid "Operation not supported" msgstr "Operation not supported" -#: gio/gdbusauthmechanismsha1.c:407 +#: gio/gdbusauthmechanismsha1.c:411 #, c-format msgid "Error opening keyring “%s” for reading: " msgstr "Error opening keyring “%s” for reading: " -#: gio/gdbusauthmechanismsha1.c:430 gio/gdbusauthmechanismsha1.c:771 +#: gio/gdbusauthmechanismsha1.c:434 gio/gdbusauthmechanismsha1.c:775 #, c-format msgid "Line %d of the keyring at “%s” with content “%s” is malformed" msgstr "Line %d of the keyring at “%s” with content “%s” is malformed" -#: gio/gdbusauthmechanismsha1.c:444 gio/gdbusauthmechanismsha1.c:785 +#: gio/gdbusauthmechanismsha1.c:448 gio/gdbusauthmechanismsha1.c:789 #, c-format msgid "" "First token of line %d of the keyring at “%s” with content “%s” is malformed" msgstr "" "First token of line %d of the keyring at “%s” with content “%s” is malformed" -#: gio/gdbusauthmechanismsha1.c:458 gio/gdbusauthmechanismsha1.c:799 +#: gio/gdbusauthmechanismsha1.c:462 gio/gdbusauthmechanismsha1.c:803 #, c-format msgid "" "Second token of line %d of the keyring at “%s” with content “%s” is malformed" msgstr "" "Second token of line %d of the keyring at “%s” with content “%s” is malformed" -#: gio/gdbusauthmechanismsha1.c:482 +#: gio/gdbusauthmechanismsha1.c:486 #, c-format msgid "Didn’t find cookie with id %d in the keyring at “%s”" msgstr "Didn’t find cookie with id %d in the keyring at “%s”" -#: gio/gdbusauthmechanismsha1.c:539 +#: gio/gdbusauthmechanismsha1.c:543 #, c-format msgid "Error creating lock file “%s”: %s" msgstr "Error creating lock file “%s”: %s" -#: gio/gdbusauthmechanismsha1.c:612 +#: gio/gdbusauthmechanismsha1.c:616 #, c-format msgid "Error deleting stale lock file “%s”: %s" msgstr "Error deleting stale lock file “%s”: %s" -#: gio/gdbusauthmechanismsha1.c:651 +#: gio/gdbusauthmechanismsha1.c:655 #, c-format msgid "Error closing (unlinked) lock file “%s”: %s" msgstr "Error closing (unlinked) lock file “%s”: %s" -#: gio/gdbusauthmechanismsha1.c:662 +#: gio/gdbusauthmechanismsha1.c:666 #, c-format msgid "Error unlinking lock file “%s”: %s" msgstr "Error unlinking lock file “%s”: %s" -#: gio/gdbusauthmechanismsha1.c:738 +#: gio/gdbusauthmechanismsha1.c:742 #, c-format msgid "Error opening keyring “%s” for writing: " msgstr "Error opening keyring “%s” for writing: " -#: gio/gdbusauthmechanismsha1.c:932 +#: gio/gdbusauthmechanismsha1.c:936 #, c-format msgid "(Additionally, releasing the lock for “%s” also failed: %s) " msgstr "(Additionally, releasing the lock for “%s” also failed: %s) " -#: gio/gdbusconnection.c:590 gio/gdbusconnection.c:2404 +#: gio/gdbusconnection.c:590 gio/gdbusconnection.c:2413 msgid "The connection is closed" msgstr "The connection is closed" -#: gio/gdbusconnection.c:1889 +#: gio/gdbusconnection.c:1897 msgid "Timeout was reached" msgstr "Timeout was reached" -#: gio/gdbusconnection.c:2527 +#: gio/gdbusconnection.c:2536 msgid "" "Unsupported flags encountered when constructing a client-side connection" msgstr "" "Unsupported flags encountered when constructing a client-side connection" -#: gio/gdbusconnection.c:4256 gio/gdbusconnection.c:4610 +#: gio/gdbusconnection.c:4265 gio/gdbusconnection.c:4619 #, c-format msgid "" "No such interface “org.freedesktop.DBus.Properties” on object at path %s" msgstr "" "No such interface “org.freedesktop.DBus.Properties” on object at path %s" -#: gio/gdbusconnection.c:4401 +#: gio/gdbusconnection.c:4410 #, c-format msgid "No such property “%s”" msgstr "No such property “%s”" -#: gio/gdbusconnection.c:4413 +#: gio/gdbusconnection.c:4422 #, c-format msgid "Property “%s” is not readable" msgstr "Property “%s” is not readable" -#: gio/gdbusconnection.c:4424 +#: gio/gdbusconnection.c:4433 #, c-format msgid "Property “%s” is not writable" msgstr "Property “%s” is not writable" -#: gio/gdbusconnection.c:4444 +#: gio/gdbusconnection.c:4453 #, c-format msgid "Error setting property “%s”: Expected type “%s” but got “%s”" msgstr "Error setting property “%s”: Expected type “%s” but got “%s”" -#: gio/gdbusconnection.c:4549 gio/gdbusconnection.c:4764 -#: gio/gdbusconnection.c:6747 +#: gio/gdbusconnection.c:4558 gio/gdbusconnection.c:4773 +#: gio/gdbusconnection.c:6750 #, c-format msgid "No such interface “%s”" msgstr "No such interface “%s”" -#: gio/gdbusconnection.c:4986 gio/gdbusconnection.c:7261 +#: gio/gdbusconnection.c:4989 gio/gdbusconnection.c:7264 #, c-format msgid "No such interface “%s” on object at path %s" msgstr "No such interface “%s” on object at path %s" -#: gio/gdbusconnection.c:5087 +#: gio/gdbusconnection.c:5090 #, c-format msgid "No such method “%s”" msgstr "No such method “%s”" -#: gio/gdbusconnection.c:5118 +#: gio/gdbusconnection.c:5121 #, c-format msgid "Type of message, “%s”, does not match expected type “%s”" msgstr "Type of message, “%s”, does not match expected type “%s”" -#: gio/gdbusconnection.c:5321 +#: gio/gdbusconnection.c:5324 #, c-format msgid "An object is already exported for the interface %s at %s" msgstr "An object is already exported for the interface %s at %s" -#: gio/gdbusconnection.c:5548 +#: gio/gdbusconnection.c:5551 #, c-format msgid "Unable to retrieve property %s.%s" msgstr "Unable to retrieve property %s.%s" -#: gio/gdbusconnection.c:5604 +#: gio/gdbusconnection.c:5607 #, c-format msgid "Unable to set property %s.%s" msgstr "Unable to set property %s.%s" -#: gio/gdbusconnection.c:5783 +#: gio/gdbusconnection.c:5786 #, c-format msgid "Method “%s” returned type “%s”, but expected “%s”" msgstr "Method “%s” returned type “%s”, but expected “%s”" -#: gio/gdbusconnection.c:6859 +#: gio/gdbusconnection.c:6862 #, c-format msgid "Method “%s” on interface “%s” with signature “%s” does not exist" msgstr "Method “%s” on interface “%s” with signature “%s” does not exist" -#: gio/gdbusconnection.c:6980 +#: gio/gdbusconnection.c:6983 #, c-format msgid "A subtree is already exported for %s" msgstr "A subtree is already exported for %s" -#: gio/gdbusconnection.c:7269 +#: gio/gdbusconnection.c:7272 #, c-format msgid "Object does not exist at path “%s”" msgstr "Object does not exist at path “%s”" -#: gio/gdbusmessage.c:1303 +#: gio/gdbusmessage.c:1306 msgid "type is INVALID" msgstr "type is INVALID" -#: gio/gdbusmessage.c:1314 +#: gio/gdbusmessage.c:1317 msgid "METHOD_CALL message: PATH or MEMBER header field is missing" msgstr "METHOD_CALL message: PATH or MEMBER header field is missing" -#: gio/gdbusmessage.c:1325 +#: gio/gdbusmessage.c:1328 msgid "METHOD_RETURN message: REPLY_SERIAL header field is missing" msgstr "METHOD_RETURN message: REPLY_SERIAL header field is missing" -#: gio/gdbusmessage.c:1337 +#: gio/gdbusmessage.c:1340 msgid "ERROR message: REPLY_SERIAL or ERROR_NAME header field is missing" msgstr "ERROR message: REPLY_SERIAL or ERROR_NAME header field is missing" -#: gio/gdbusmessage.c:1350 +#: gio/gdbusmessage.c:1353 msgid "SIGNAL message: PATH, INTERFACE or MEMBER header field is missing" msgstr "SIGNAL message: PATH, INTERFACE or MEMBER header field is missing" -#: gio/gdbusmessage.c:1358 +#: gio/gdbusmessage.c:1361 msgid "" "SIGNAL message: The PATH header field is using the reserved value /org/" "freedesktop/DBus/Local" @@ -784,7 +789,7 @@ "SIGNAL message: The PATH header field is using the reserved value /org/" "freedesktop/DBus/Local" -#: gio/gdbusmessage.c:1366 +#: gio/gdbusmessage.c:1369 msgid "" "SIGNAL message: The INTERFACE header field is using the reserved value org." "freedesktop.DBus.Local" @@ -792,19 +797,19 @@ "SIGNAL message: The INTERFACE header field is using the reserved value org." "freedesktop.DBus.Local" -#: gio/gdbusmessage.c:1414 gio/gdbusmessage.c:1474 +#: gio/gdbusmessage.c:1417 gio/gdbusmessage.c:1477 #, c-format msgid "Wanted to read %lu byte but only got %lu" msgid_plural "Wanted to read %lu bytes but only got %lu" msgstr0 "Wanted to read %lu byte but only got %lu" msgstr1 "Wanted to read %lu bytes but only got %lu" -#: gio/gdbusmessage.c:1428 +#: gio/gdbusmessage.c:1431 #, c-format msgid "Expected NUL byte after the string “%s” but found byte %d" msgstr "Expected NUL byte after the string “%s” but found byte %d" -#: gio/gdbusmessage.c:1447 +#: gio/gdbusmessage.c:1450 #, c-format msgid "" "Expected valid UTF-8 string but found invalid bytes at byte offset %d " @@ -813,21 +818,21 @@ "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”" -#: gio/gdbusmessage.c:1511 gio/gdbusmessage.c:1787 gio/gdbusmessage.c:1998 +#: gio/gdbusmessage.c:1514 gio/gdbusmessage.c:1790 gio/gdbusmessage.c:2001 msgid "Value nested too deeply" msgstr "Value nested too deeply" -#: gio/gdbusmessage.c:1679 +#: gio/gdbusmessage.c:1682 #, c-format msgid "Parsed value “%s” is not a valid D-Bus object path" msgstr "Parsed value “%s” is not a valid D-Bus object path" -#: gio/gdbusmessage.c:1703 +#: gio/gdbusmessage.c:1706 #, c-format msgid "Parsed value “%s” is not a valid D-Bus signature" msgstr "Parsed value “%s” is not a valid D-Bus signature" -#: gio/gdbusmessage.c:1754 +#: gio/gdbusmessage.c:1757 #, c-format msgid "" "Encountered array of length %u byte. Maximum length is 2<<26 bytes (64 MiB)." @@ -838,7 +843,7 @@ msgstr1 "" "Encountered array of length %u bytes. Maximum length is 2<<26 bytes (64 MiB)." -#: gio/gdbusmessage.c:1774 +#: gio/gdbusmessage.c:1777 #, c-format msgid "" "Encountered array of type “a%c”, expected to have a length a multiple of %u " @@ -847,23 +852,23 @@ "Encountered array of type “a%c”, expected to have a length a multiple of %u " "bytes, but found to be %u bytes in length" -#: gio/gdbusmessage.c:1928 gio/gdbusmessage.c:2647 +#: gio/gdbusmessage.c:1931 gio/gdbusmessage.c:2650 msgid "Empty structures (tuples) are not allowed in D-Bus" msgstr "Empty structures (tuples) are not allowed in D-Bus" -#: gio/gdbusmessage.c:1982 +#: gio/gdbusmessage.c:1985 #, c-format msgid "Parsed value “%s” for variant is not a valid D-Bus signature" msgstr "Parsed value “%s” for variant is not a valid D-Bus signature" -#: gio/gdbusmessage.c:2023 +#: gio/gdbusmessage.c:2026 #, c-format msgid "" "Error deserializing GVariant with type string “%s” from the D-Bus wire format" msgstr "" "Error deserialising GVariant with type string “%s” from the D-Bus wire format" -#: gio/gdbusmessage.c:2208 +#: gio/gdbusmessage.c:2211 #, c-format msgid "" "Invalid endianness value. Expected 0x6c (“l”) or 0x42 (“B”) but found value " @@ -872,60 +877,60 @@ "Invalid endianness value. Expected 0x6c (“l”) or 0x42 (“B”) but found value " "0x%02x" -#: gio/gdbusmessage.c:2227 +#: gio/gdbusmessage.c:2230 #, c-format msgid "Invalid major protocol version. Expected 1 but found %d" msgstr "Invalid major protocol version. Expected 1 but found %d" -#: gio/gdbusmessage.c:2285 gio/gdbusmessage.c:2883 +#: gio/gdbusmessage.c:2288 gio/gdbusmessage.c:2886 msgid "Signature header found but is not of type signature" msgstr "Signature header found but is not of type signature" -#: gio/gdbusmessage.c:2297 +#: gio/gdbusmessage.c:2300 #, c-format msgid "Signature header with signature “%s” found but message body is empty" msgstr "Signature header with signature “%s” found but message body is empty" -#: gio/gdbusmessage.c:2312 +#: gio/gdbusmessage.c:2315 #, c-format msgid "Parsed value “%s” is not a valid D-Bus signature (for body)" msgstr "Parsed value “%s” is not a valid D-Bus signature (for body)" -#: gio/gdbusmessage.c:2344 +#: gio/gdbusmessage.c:2347 #, 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" msgstr0 "No signature header in message but the message body is %u byte" msgstr1 "No signature header in message but the message body is %u bytes" -#: gio/gdbusmessage.c:2354 +#: gio/gdbusmessage.c:2357 msgid "Cannot deserialize message: " msgstr "Cannot deserialise message: " -#: gio/gdbusmessage.c:2700 +#: gio/gdbusmessage.c:2703 #, c-format msgid "" "Error serializing GVariant with type string “%s” to the D-Bus wire format" msgstr "" "Error serialising GVariant with type string “%s” to the D-Bus wire format" -#: gio/gdbusmessage.c:2837 +#: gio/gdbusmessage.c:2840 #, c-format msgid "" "Number of file descriptors in message (%d) differs from header field (%d)" msgstr "" "Number of file descriptors in message (%d) differs from header field (%d)" -#: gio/gdbusmessage.c:2845 +#: gio/gdbusmessage.c:2848 msgid "Cannot serialize message: " msgstr "Cannot serialise message: " -#: gio/gdbusmessage.c:2898 +#: gio/gdbusmessage.c:2901 #, c-format msgid "Message body has signature “%s” but there is no signature header" msgstr "Message body has signature “%s” but there is no signature header" -#: gio/gdbusmessage.c:2908 +#: gio/gdbusmessage.c:2911 #, c-format msgid "" "Message body has type signature “%s” but signature in the header field is " @@ -934,17 +939,17 @@ "Message body has type signature “%s” but signature in the header field is " "“%s”" -#: gio/gdbusmessage.c:2924 +#: gio/gdbusmessage.c:2927 #, c-format msgid "Message body is empty but signature in the header field is “(%s)”" msgstr "Message body is empty but signature in the header field is “(%s)”" -#: gio/gdbusmessage.c:3479 +#: gio/gdbusmessage.c:3482 #, c-format msgid "Error return with body of type “%s”" msgstr "Error return with body of type “%s”" -#: gio/gdbusmessage.c:3487 +#: gio/gdbusmessage.c:3490 msgid "Error return with empty body" msgstr "Error return with empty body" @@ -969,17 +974,17 @@ msgid "Unable to load %s or %s: " msgstr "Unable to load %s or %s: " -#: gio/gdbusproxy.c:1575 +#: gio/gdbusproxy.c:1568 #, c-format msgid "Error calling StartServiceByName for %s: " msgstr "Error calling StartServiceByName for %s: " -#: gio/gdbusproxy.c:1598 +#: gio/gdbusproxy.c:1591 #, c-format msgid "Unexpected reply %d from StartServiceByName(\"%s\") method" msgstr "Unexpected reply %d from StartServiceByName(\"%s\") method" -#: gio/gdbusproxy.c:2709 gio/gdbusproxy.c:2844 +#: gio/gdbusproxy.c:2702 gio/gdbusproxy.c:2837 #, c-format msgid "" "Cannot invoke method; proxy is for the well-known name %s without an owner, " @@ -989,25 +994,25 @@ "owner, and proxy was constructed with the " "G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START flag" -#: gio/gdbusserver.c:765 +#: gio/gdbusserver.c:758 msgid "Abstract namespace not supported" msgstr "Abstract namespace not supported" -#: gio/gdbusserver.c:857 +#: gio/gdbusserver.c:850 msgid "Cannot specify nonce file when creating a server" msgstr "Cannot specify nonce file when creating a server" -#: gio/gdbusserver.c:939 +#: gio/gdbusserver.c:932 #, c-format msgid "Error writing nonce file at “%s”: %s" msgstr "Error writing nonce file at “%s”: %s" -#: gio/gdbusserver.c:1114 +#: gio/gdbusserver.c:1107 #, c-format msgid "The string “%s” is not a valid D-Bus GUID" msgstr "The string “%s” is not a valid D-Bus GUID" -#: gio/gdbusserver.c:1152 +#: gio/gdbusserver.c:1145 #, c-format msgid "Cannot listen on unsupported transport “%s”" msgstr "Cannot listen on unsupported transport “%s”" @@ -1035,14 +1040,14 @@ "\n" "Use “%s COMMAND --help” to get help on each command.\n" -#: gio/gdbus-tool.c:204 gio/gdbus-tool.c:276 gio/gdbus-tool.c:348 -#: gio/gdbus-tool.c:372 gio/gdbus-tool.c:862 gio/gdbus-tool.c:1247 -#: gio/gdbus-tool.c:1734 +#: gio/gdbus-tool.c:204 gio/gdbus-tool.c:276 gio/gdbus-tool.c:347 +#: gio/gdbus-tool.c:371 gio/gdbus-tool.c:861 gio/gdbus-tool.c:1246 +#: gio/gdbus-tool.c:1733 #, c-format msgid "Error: %s\n" msgstr "Error: %s\n" -#: gio/gdbus-tool.c:215 gio/gdbus-tool.c:289 gio/gdbus-tool.c:1750 +#: gio/gdbus-tool.c:215 gio/gdbus-tool.c:289 gio/gdbus-tool.c:1749 #, c-format msgid "Error parsing introspection XML: %s\n" msgstr "Error parsing introspection XML: %s\n" @@ -1052,50 +1057,50 @@ msgid "Error: %s is not a valid name\n" msgstr "Error: %s is not a valid name\n" -#: gio/gdbus-tool.c:258 gio/gdbus-tool.c:748 gio/gdbus-tool.c:1066 -#: gio/gdbus-tool.c:1900 gio/gdbus-tool.c:2140 +#: gio/gdbus-tool.c:258 gio/gdbus-tool.c:747 gio/gdbus-tool.c:1065 +#: gio/gdbus-tool.c:1899 gio/gdbus-tool.c:2139 #, c-format msgid "Error: %s is not a valid object path\n" msgstr "Error: %s is not a valid object path\n" -#: gio/gdbus-tool.c:406 +#: gio/gdbus-tool.c:405 msgid "Connect to the system bus" msgstr "Connect to the system bus" -#: gio/gdbus-tool.c:407 +#: gio/gdbus-tool.c:406 msgid "Connect to the session bus" msgstr "Connect to the session bus" -#: gio/gdbus-tool.c:408 +#: gio/gdbus-tool.c:407 msgid "Connect to given D-Bus address" msgstr "Connect to given D-Bus address" -#: gio/gdbus-tool.c:418 +#: gio/gdbus-tool.c:417 msgid "Connection Endpoint Options:" msgstr "Connection Endpoint Options:" -#: gio/gdbus-tool.c:419 +#: gio/gdbus-tool.c:418 msgid "Options specifying the connection endpoint" msgstr "Options specifying the connection endpoint" -#: gio/gdbus-tool.c:442 +#: gio/gdbus-tool.c:441 #, c-format msgid "No connection endpoint specified" msgstr "No connection endpoint specified" -#: gio/gdbus-tool.c:452 +#: gio/gdbus-tool.c:451 #, c-format msgid "Multiple connection endpoints specified" msgstr "Multiple connection endpoints specified" -#: gio/gdbus-tool.c:525 +#: gio/gdbus-tool.c:524 #, c-format msgid "" "Warning: According to introspection data, interface “%s” does not exist\n" msgstr "" "Warning: According to introspection data, interface “%s” does not exist\n" -#: gio/gdbus-tool.c:534 +#: gio/gdbus-tool.c:533 #, c-format msgid "" "Warning: According to introspection data, method “%s” does not exist on " @@ -1104,164 +1109,164 @@ "Warning: According to introspection data, method “%s” does not exist on " "interface “%s”\n" -#: gio/gdbus-tool.c:596 +#: gio/gdbus-tool.c:595 msgid "Optional destination for signal (unique name)" msgstr "Optional destination for signal (unique name)" -#: gio/gdbus-tool.c:597 +#: gio/gdbus-tool.c:596 msgid "Object path to emit signal on" msgstr "Object path to emit signal on" -#: gio/gdbus-tool.c:598 +#: gio/gdbus-tool.c:597 msgid "Signal and interface name" msgstr "Signal and interface name" -#: gio/gdbus-tool.c:631 +#: gio/gdbus-tool.c:630 msgid "Emit a signal." msgstr "Emit a signal." -#: gio/gdbus-tool.c:686 gio/gdbus-tool.c:1003 gio/gdbus-tool.c:1837 -#: gio/gdbus-tool.c:2069 gio/gdbus-tool.c:2289 +#: gio/gdbus-tool.c:685 gio/gdbus-tool.c:1002 gio/gdbus-tool.c:1836 +#: gio/gdbus-tool.c:2068 gio/gdbus-tool.c:2288 #, c-format msgid "Error connecting: %s\n" msgstr "Error connecting: %s\n" -#: gio/gdbus-tool.c:706 +#: gio/gdbus-tool.c:705 #, c-format msgid "Error: %s is not a valid unique bus name.\n" msgstr "Error: %s is not a valid unique bus name.\n" -#: gio/gdbus-tool.c:725 gio/gdbus-tool.c:1046 gio/gdbus-tool.c:1880 +#: gio/gdbus-tool.c:724 gio/gdbus-tool.c:1045 gio/gdbus-tool.c:1879 msgid "Error: Object path is not specified\n" msgstr "Error: Object path is not specified\n" -#: gio/gdbus-tool.c:768 +#: gio/gdbus-tool.c:767 msgid "Error: Signal name is not specified\n" msgstr "Error: Signal name is not specified\n" -#: gio/gdbus-tool.c:782 +#: gio/gdbus-tool.c:781 #, c-format msgid "Error: Signal name “%s” is invalid\n" msgstr "Error: Signal name “%s” is invalid\n" -#: gio/gdbus-tool.c:794 +#: gio/gdbus-tool.c:793 #, c-format msgid "Error: %s is not a valid interface name\n" msgstr "Error: %s is not a valid interface name\n" -#: gio/gdbus-tool.c:800 +#: gio/gdbus-tool.c:799 #, c-format msgid "Error: %s is not a valid member name\n" msgstr "Error: %s is not a valid member name\n" #. Use the original non-"parse-me-harder" error -#: gio/gdbus-tool.c:837 gio/gdbus-tool.c:1178 +#: gio/gdbus-tool.c:836 gio/gdbus-tool.c:1177 #, c-format msgid "Error parsing parameter %d: %s\n" msgstr "Error parsing parameter %d: %s\n" -#: gio/gdbus-tool.c:869 +#: gio/gdbus-tool.c:868 #, c-format msgid "Error flushing connection: %s\n" msgstr "Error flushing connection: %s\n" -#: gio/gdbus-tool.c:897 +#: gio/gdbus-tool.c:896 msgid "Destination name to invoke method on" msgstr "Destination name to invoke method on" -#: gio/gdbus-tool.c:898 +#: gio/gdbus-tool.c:897 msgid "Object path to invoke method on" msgstr "Object path to invoke method on" -#: gio/gdbus-tool.c:899 +#: gio/gdbus-tool.c:898 msgid "Method and interface name" msgstr "Method and interface name" -#: gio/gdbus-tool.c:900 +#: gio/gdbus-tool.c:899 msgid "Timeout in seconds" msgstr "Timeout in seconds" -#: gio/gdbus-tool.c:901 +#: gio/gdbus-tool.c:900 msgid "Allow interactive authorization" msgstr "Allow interactive authorisation" -#: gio/gdbus-tool.c:948 +#: gio/gdbus-tool.c:947 msgid "Invoke a method on a remote object." msgstr "Invoke a method on a remote object." -#: gio/gdbus-tool.c:1020 gio/gdbus-tool.c:1854 gio/gdbus-tool.c:2094 +#: gio/gdbus-tool.c:1019 gio/gdbus-tool.c:1853 gio/gdbus-tool.c:2093 msgid "Error: Destination is not specified\n" msgstr "Error: Destination is not specified\n" -#: gio/gdbus-tool.c:1031 gio/gdbus-tool.c:1871 gio/gdbus-tool.c:2105 +#: gio/gdbus-tool.c:1030 gio/gdbus-tool.c:1870 gio/gdbus-tool.c:2104 #, c-format msgid "Error: %s is not a valid bus name\n" msgstr "Error: %s is not a valid bus name\n" -#: gio/gdbus-tool.c:1081 +#: gio/gdbus-tool.c:1080 msgid "Error: Method name is not specified\n" msgstr "Error: Method name is not specified\n" -#: gio/gdbus-tool.c:1092 +#: gio/gdbus-tool.c:1091 #, c-format msgid "Error: Method name “%s” is invalid\n" msgstr "Error: Method name “%s” is invalid\n" -#: gio/gdbus-tool.c:1170 +#: gio/gdbus-tool.c:1169 #, c-format msgid "Error parsing parameter %d of type “%s”: %s\n" msgstr "Error parsing parameter %d of type “%s”: %s\n" -#: gio/gdbus-tool.c:1196 +#: gio/gdbus-tool.c:1195 #, c-format msgid "Error adding handle %d: %s\n" msgstr "Error adding handle %d: %s\n" -#: gio/gdbus-tool.c:1696 +#: gio/gdbus-tool.c:1695 msgid "Destination name to introspect" msgstr "Destination name to introspect" -#: gio/gdbus-tool.c:1697 +#: gio/gdbus-tool.c:1696 msgid "Object path to introspect" msgstr "Object path to introspect" -#: gio/gdbus-tool.c:1698 +#: gio/gdbus-tool.c:1697 msgid "Print XML" msgstr "Print XML" -#: gio/gdbus-tool.c:1699 +#: gio/gdbus-tool.c:1698 msgid "Introspect children" msgstr "Introspect children" -#: gio/gdbus-tool.c:1700 +#: gio/gdbus-tool.c:1699 msgid "Only print properties" msgstr "Only print properties" -#: gio/gdbus-tool.c:1789 +#: gio/gdbus-tool.c:1788 msgid "Introspect a remote object." msgstr "Introspect a remote object." -#: gio/gdbus-tool.c:1995 +#: gio/gdbus-tool.c:1994 msgid "Destination name to monitor" msgstr "Destination name to monitor" -#: gio/gdbus-tool.c:1996 +#: gio/gdbus-tool.c:1995 msgid "Object path to monitor" msgstr "Object path to monitor" -#: gio/gdbus-tool.c:2021 +#: gio/gdbus-tool.c:2020 msgid "Monitor a remote object." msgstr "Monitor a remote object." -#: gio/gdbus-tool.c:2079 +#: gio/gdbus-tool.c:2078 msgid "Error: can’t monitor a non-message-bus connection\n" msgstr "Error: can’t monitor a non-message-bus connection\n" -#: gio/gdbus-tool.c:2203 +#: gio/gdbus-tool.c:2202 msgid "Service to activate before waiting for the other one (well-known name)" msgstr "Service to activate before waiting for the other one (well-known name)" -#: gio/gdbus-tool.c:2206 +#: gio/gdbus-tool.c:2205 msgid "" "Timeout to wait for before exiting with an error (seconds); 0 for no timeout " "(default)" @@ -1269,68 +1274,73 @@ "Timeout to wait for before exiting with an error (seconds); 0 for no timeout " "(default)" -#: gio/gdbus-tool.c:2254 +#: gio/gdbus-tool.c:2253 msgid "OPTION… BUS-NAME" msgstr "OPTION… BUS-NAME" -#: gio/gdbus-tool.c:2255 +#: gio/gdbus-tool.c:2254 msgid "Wait for a bus name to appear." msgstr "Wait for a bus name to appear." -#: gio/gdbus-tool.c:2331 +#: gio/gdbus-tool.c:2330 msgid "Error: A service to activate for must be specified.\n" msgstr "Error: A service to activate for must be specified.\n" -#: gio/gdbus-tool.c:2336 +#: gio/gdbus-tool.c:2335 msgid "Error: A service to wait for must be specified.\n" msgstr "Error: A service to wait for must be specified.\n" -#: gio/gdbus-tool.c:2341 +#: gio/gdbus-tool.c:2340 msgid "Error: Too many arguments.\n" msgstr "Error: Too many arguments.\n" -#: gio/gdbus-tool.c:2349 gio/gdbus-tool.c:2356 +#: gio/gdbus-tool.c:2348 gio/gdbus-tool.c:2355 #, c-format msgid "Error: %s is not a valid well-known bus name.\n" msgstr "Error: %s is not a valid well-known bus name.\n" -#: gio/gdebugcontrollerdbus.c:360 +#: gio/gdebugcontrollerdbus.c:361 #, c-format msgid "Not authorized to change debug settings" msgstr "Not authorised to change debug settings" -#: gio/gdesktopappinfo.c:2182 gio/gdesktopappinfo.c:5113 +#: gio/gdesktopappinfo.c:2242 gio/gdesktopappinfo.c:5226 msgid "Unnamed" msgstr "Unnamed" -#: gio/gdesktopappinfo.c:2592 +#: gio/gdesktopappinfo.c:2652 msgid "Desktop file didn’t specify Exec field" msgstr "Desktop file didn’t specify Exec field" -#: gio/gdesktopappinfo.c:2891 +#: gio/gdesktopappinfo.c:2942 msgid "Unable to find terminal required for application" msgstr "Unable to find terminal required for application" -#: gio/gdesktopappinfo.c:3631 +#: gio/gdesktopappinfo.c:3002 +#, c-format +msgid "Program ‘%s’ not found in $PATH" +msgstr "Program ‘%s’ not found in $PATH" + +#: gio/gdesktopappinfo.c:3738 #, c-format msgid "Can’t create user application configuration folder %s: %s" msgstr "Can’t create user application configuration folder %s: %s" -#: gio/gdesktopappinfo.c:3635 +#: gio/gdesktopappinfo.c:3742 #, c-format msgid "Can’t create user MIME configuration folder %s: %s" msgstr "Can’t create user MIME configuration folder %s: %s" -#: gio/gdesktopappinfo.c:3877 gio/gdesktopappinfo.c:3901 +#: gio/gdesktopappinfo.c:3984 gio/gdesktopappinfo.c:4008 msgid "Application information lacks an identifier" msgstr "Application information lacks an identifier" -#: gio/gdesktopappinfo.c:4137 +#: gio/gdesktopappinfo.c:4244 #, c-format msgid "Can’t create user desktop file %s" msgstr "Can’t create user desktop file %s" -#: gio/gdesktopappinfo.c:4273 +#: gio/gdesktopappinfo.c:4380 #, c-format msgid "Custom definition for %s" msgstr "Custom definition for %s" @@ -1403,7 +1413,7 @@ msgid "Containing mount does not exist" msgstr "Containing mount does not exist" -#: gio/gfile.c:2641 gio/glocalfile.c:2500 +#: gio/gfile.c:2641 gio/glocalfile.c:2515 msgid "Can’t copy over directory" msgstr "Can’t copy over directory" @@ -1428,49 +1438,49 @@ msgid "Error splicing file: %s" msgstr "Error splicing file: %s" -#: gio/gfile.c:3185 +#: gio/gfile.c:3195 msgid "Copy (reflink/clone) between mounts is not supported" msgstr "Copy (reflink/clone) between mounts is not supported" -#: gio/gfile.c:3189 +#: gio/gfile.c:3199 msgid "Copy (reflink/clone) is not supported or invalid" msgstr "Copy (reflink/clone) is not supported or invalid" -#: gio/gfile.c:3194 +#: gio/gfile.c:3204 msgid "Copy (reflink/clone) is not supported or didn’t work" msgstr "Copy (reflink/clone) is not supported or didn’t work" -#: gio/gfile.c:3259 +#: gio/gfile.c:3269 msgid "Can’t copy special file" msgstr "Can’t copy special file" -#: gio/gfile.c:4153 +#: gio/gfile.c:4163 msgid "Invalid symlink value given" msgstr "Invalid symlink value given" -#: gio/gfile.c:4163 glib/gfileutils.c:2335 +#: gio/gfile.c:4173 glib/gfileutils.c:2392 msgid "Symbolic links not supported" msgstr "Symbolic links not supported" -#: gio/gfile.c:4450 +#: gio/gfile.c:4460 msgid "Trash not supported" msgstr "Wastebasket not supported" -#: gio/gfile.c:4562 +#: gio/gfile.c:4572 #, c-format msgid "File names cannot contain “%c”" msgstr "File names cannot contain “%c”" -#: gio/gfile.c:6993 gio/gfile.c:7119 +#: gio/gfile.c:7003 gio/gfile.c:7129 #, c-format msgid "Failed to create a temporary directory for template “%s”: %s" msgstr "Failed to create a temporary directory for template “%s”: %s" -#: gio/gfile.c:7408 gio/gvolume.c:366 +#: gio/gfile.c:7418 gio/gvolume.c:366 msgid "volume doesn’t implement mount" msgstr "volume doesn’t implement mount" -#: gio/gfile.c:7522 gio/gfile.c:7599 +#: gio/gfile.c:7532 gio/gfile.c:7609 msgid "No application is registered as handling this file" msgstr "No application is registered as handling this file" @@ -1479,11 +1489,11 @@ msgstr "Enumerator is closed" #: gio/gfileenumerator.c:221 gio/gfileenumerator.c:280 -#: gio/gfileenumerator.c:379 gio/gfileenumerator.c:478 +#: gio/gfileenumerator.c:424 gio/gfileenumerator.c:523 msgid "File enumerator has outstanding operation" msgstr "File enumerator has outstanding operation" -#: gio/gfileenumerator.c:370 gio/gfileenumerator.c:469 +#: gio/gfileenumerator.c:415 gio/gfileenumerator.c:514 msgid "File enumerator is already closed" msgstr "File enumerator is already closed" @@ -1549,37 +1559,37 @@ msgid "HTTP proxy server closed connection unexpectedly." msgstr "HTTP proxy server closed connection unexpectedly." -#: gio/gicon.c:300 +#: gio/gicon.c:299 #, c-format msgid "Wrong number of tokens (%d)" msgstr "Wrong number of tokens (%d)" -#: gio/gicon.c:320 +#: gio/gicon.c:319 #, c-format msgid "No type for class name %s" msgstr "No type for class name %s" -#: gio/gicon.c:330 +#: gio/gicon.c:329 #, c-format msgid "Type %s does not implement the GIcon interface" msgstr "Type %s does not implement the GIcon interface" -#: gio/gicon.c:341 +#: gio/gicon.c:340 #, c-format msgid "Type %s is not classed" msgstr "Type %s is not classed" -#: gio/gicon.c:355 +#: gio/gicon.c:354 #, c-format msgid "Malformed version number: %s" msgstr "Malformed version number: %s" -#: gio/gicon.c:369 +#: gio/gicon.c:368 #, c-format msgid "Type %s does not implement from_tokens() on the GIcon interface" msgstr "Type %s does not implement from_tokens() on the GIcon interface" -#: gio/gicon.c:471 +#: gio/gicon.c:470 msgid "Can’t handle the supplied version of the icon encoding" msgstr "Can’t handle the supplied version of the icon encoding" @@ -1726,12 +1736,12 @@ msgstr "Error writing to stdout" #. Translators: commandline placeholder -#: gio/gio-tool-cat.c:135 gio/gio-tool-info.c:379 gio/gio-tool-list.c:173 +#: gio/gio-tool-cat.c:135 gio/gio-tool-info.c:382 gio/gio-tool-list.c:176 #: gio/gio-tool-mkdir.c:50 gio/gio-tool-monitor.c:39 gio/gio-tool-monitor.c:41 #: gio/gio-tool-monitor.c:43 gio/gio-tool-monitor.c:45 -#: gio/gio-tool-monitor.c:206 gio/gio-tool-mount.c:1202 gio/gio-tool-open.c:72 +#: gio/gio-tool-monitor.c:206 gio/gio-tool-mount.c:1210 gio/gio-tool-open.c:72 #: gio/gio-tool-remove.c:50 gio/gio-tool-rename.c:47 gio/gio-tool-set.c:95 -#: gio/gio-tool-trash.c:222 gio/gio-tool-tree.c:241 +#: gio/gio-tool-trash.c:222 gio/gio-tool-tree.c:246 msgid "LOCATION" msgstr "LOCATION" @@ -1749,8 +1759,8 @@ "locations instead of local files: for example, you can use something\n" "like smb://server/resource/file.txt as location." -#: gio/gio-tool-cat.c:164 gio/gio-tool-info.c:410 gio/gio-tool-mkdir.c:78 -#: gio/gio-tool-monitor.c:231 gio/gio-tool-mount.c:1253 gio/gio-tool-open.c:98 +#: gio/gio-tool-cat.c:164 gio/gio-tool-info.c:413 gio/gio-tool-mkdir.c:78 +#: gio/gio-tool-monitor.c:231 gio/gio-tool-mount.c:1261 gio/gio-tool-open.c:98 #: gio/gio-tool-remove.c:74 gio/gio-tool-trash.c:303 msgid "No locations given" msgstr "No locations given" @@ -1846,57 +1856,57 @@ msgid "attributes:\n" msgstr "attributes:\n" -#: gio/gio-tool-info.c:165 gio/gio-tool-info.c:174 +#: gio/gio-tool-info.c:166 gio/gio-tool-info.c:176 #, c-format msgid "display name: %s\n" msgstr "display name: %s\n" -#: gio/gio-tool-info.c:182 +#: gio/gio-tool-info.c:184 #, c-format msgid "name: %s\n" msgstr "name: %s\n" -#: gio/gio-tool-info.c:189 +#: gio/gio-tool-info.c:191 #, c-format msgid "type: %s\n" msgstr "type: %s\n" -#: gio/gio-tool-info.c:195 +#: gio/gio-tool-info.c:197 msgid "size: " msgstr "size: " -#: gio/gio-tool-info.c:200 +#: gio/gio-tool-info.c:203 msgid "hidden\n" msgstr "hidden\n" -#: gio/gio-tool-info.c:203 +#: gio/gio-tool-info.c:206 #, c-format msgid "uri: %s\n" msgstr "uri: %s\n" -#: gio/gio-tool-info.c:210 +#: gio/gio-tool-info.c:213 #, c-format msgid "local path: %s\n" msgstr "local path: %s\n" -#: gio/gio-tool-info.c:244 +#: gio/gio-tool-info.c:247 #, c-format msgid "unix mount: %s%s %s %s %s\n" msgstr "unix mount: %s%s %s %s %s\n" -#: gio/gio-tool-info.c:325 +#: gio/gio-tool-info.c:328 msgid "Settable attributes:\n" msgstr "Settable attributes:\n" -#: gio/gio-tool-info.c:349 +#: gio/gio-tool-info.c:352 msgid "Writable attribute namespaces:\n" msgstr "Writable attribute namespaces:\n" -#: gio/gio-tool-info.c:384 +#: gio/gio-tool-info.c:387 msgid "Show information about locations." msgstr "Show information about locations." -#: gio/gio-tool-info.c:386 +#: gio/gio-tool-info.c:389 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" @@ -1962,11 +1972,11 @@ msgid "Print full URIs" msgstr "Print full URIs" -#: gio/gio-tool-list.c:178 +#: gio/gio-tool-list.c:181 msgid "List the contents of the locations." msgstr "List the contents of the locations." -#: gio/gio-tool-list.c:180 +#: gio/gio-tool-list.c:183 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" @@ -2160,19 +2170,19 @@ msgid "Mount a TCRYPT system volume" msgstr "Mount a TCRYPT system volume" -#: gio/gio-tool-mount.c:268 gio/gio-tool-mount.c:300 +#: gio/gio-tool-mount.c:276 gio/gio-tool-mount.c:308 msgid "Anonymous access denied" msgstr "Anonymous access denied" -#: gio/gio-tool-mount.c:525 +#: gio/gio-tool-mount.c:533 msgid "No drive for device file" msgstr "No drive for device file" -#: gio/gio-tool-mount.c:1017 +#: gio/gio-tool-mount.c:1025 msgid "No volume for given ID" msgstr "No volume for given ID" -#: gio/gio-tool-mount.c:1206 +#: gio/gio-tool-mount.c:1214 msgid "Mount or unmount the locations." msgstr "Mount or unmount the locations." @@ -2373,11 +2383,11 @@ msgid "Follow symbolic links, mounts and shortcuts" msgstr "Follow symbolic links, mounts and shortcuts" -#: gio/gio-tool-tree.c:246 +#: gio/gio-tool-tree.c:251 msgid "List contents of directories in a tree-like format." msgstr "List contents of directories in a tree-like format." -#: gio/glib-compile-resources.c:142 gio/glib-compile-schemas.c:1516 +#: gio/glib-compile-resources.c:142 gio/glib-compile-schemas.c:1513 #, c-format msgid "Element <%s> not allowed inside <%s>" msgstr "Element <%s> not allowed inside <%s>" @@ -2432,7 +2442,7 @@ msgid "text may not appear inside <%s>" msgstr "text may not appear inside <%s>" -#: gio/glib-compile-resources.c:821 gio/glib-compile-schemas.c:2174 +#: gio/glib-compile-resources.c:821 gio/glib-compile-schemas.c:2171 msgid "Show program version and exit" msgstr "Show program version and exit" @@ -2448,8 +2458,8 @@ "The directories to load files referenced in FILE from (default: current " "directory)" -#: gio/glib-compile-resources.c:823 gio/glib-compile-schemas.c:2175 -#: gio/glib-compile-schemas.c:2204 +#: gio/glib-compile-resources.c:823 gio/glib-compile-schemas.c:2172 +#: gio/glib-compile-schemas.c:2201 msgid "DIRECTORY" msgstr "DIRECTORY" @@ -2670,16 +2680,16 @@ msgid "<aliases> must contain at least one <alias>" msgstr "<aliases> must contain at least one <alias>" -#: gio/glib-compile-schemas.c:799 +#: gio/glib-compile-schemas.c:796 msgid "Empty names are not permitted" msgstr "Empty names are not permitted" -#: gio/glib-compile-schemas.c:809 +#: gio/glib-compile-schemas.c:806 #, c-format msgid "Invalid name “%s”: names must begin with a lowercase letter" msgstr "Invalid name “%s”: names must begin with a lowercase letter" -#: gio/glib-compile-schemas.c:821 +#: gio/glib-compile-schemas.c:818 #, c-format msgid "" "Invalid name “%s”: invalid character “%c”; only lowercase letters, numbers " @@ -2688,36 +2698,36 @@ "Invalid name “%s”: invalid character “%c”; only lowercase letters, numbers " "and hyphen (“-”) are permitted" -#: gio/glib-compile-schemas.c:830 +#: gio/glib-compile-schemas.c:827 #, c-format msgid "Invalid name “%s”: two successive hyphens (“--”) are not permitted" msgstr "Invalid name “%s”: two successive hyphens (“--”) are not permitted" -#: gio/glib-compile-schemas.c:839 +#: gio/glib-compile-schemas.c:836 #, c-format msgid "Invalid name “%s”: the last character may not be a hyphen (“-”)" msgstr "Invalid name “%s”: the last character may not be a hyphen (“-”)" -#: gio/glib-compile-schemas.c:847 +#: gio/glib-compile-schemas.c:844 #, c-format msgid "Invalid name “%s”: maximum length is 1024" msgstr "Invalid name “%s”: maximum length is 1024" -#: gio/glib-compile-schemas.c:919 +#: gio/glib-compile-schemas.c:916 #, c-format msgid "<child name='%s'> already specified" msgstr "<child name='%s'> already specified" -#: gio/glib-compile-schemas.c:945 +#: gio/glib-compile-schemas.c:942 msgid "Cannot add keys to a “list-of” schema" msgstr "Cannot add keys to a “list-of” schema" -#: gio/glib-compile-schemas.c:956 +#: gio/glib-compile-schemas.c:953 #, c-format msgid "<key name='%s'> already specified" msgstr "<key name='%s'> already specified" -#: gio/glib-compile-schemas.c:974 +#: gio/glib-compile-schemas.c:971 #, c-format msgid "" "<key name='%s'> shadows <key name='%s'> in <schema id='%s'>; use <override> " @@ -2726,7 +2736,7 @@ "<key name='%s'> shadows <key name='%s'> in <schema id='%s'>; use <override> " "to modify value" -#: gio/glib-compile-schemas.c:985 +#: gio/glib-compile-schemas.c:982 #, c-format msgid "" "Exactly one of “type”, “enum” or “flags” must be specified as an attribute " @@ -2735,63 +2745,63 @@ "Exactly one of “type”, “enum” or “flags” must be specified as an attribute " "to <key>" -#: gio/glib-compile-schemas.c:1004 +#: gio/glib-compile-schemas.c:1001 #, c-format msgid "<%s id='%s'> not (yet) defined." msgstr "<%s id='%s'> not (yet) defined." -#: gio/glib-compile-schemas.c:1019 +#: gio/glib-compile-schemas.c:1016 #, c-format msgid "Invalid GVariant type string “%s”" msgstr "Invalid GVariant type string “%s”" -#: gio/glib-compile-schemas.c:1049 +#: gio/glib-compile-schemas.c:1046 msgid "<override> given but schema isn’t extending anything" msgstr "<override> given but schema isn’t extending anything" -#: gio/glib-compile-schemas.c:1062 +#: gio/glib-compile-schemas.c:1059 #, c-format msgid "No <key name='%s'> to override" msgstr "No <key name='%s'> to override" -#: gio/glib-compile-schemas.c:1070 +#: gio/glib-compile-schemas.c:1067 #, c-format msgid "<override name='%s'> already specified" msgstr "<override name='%s'> already specified" -#: gio/glib-compile-schemas.c:1143 +#: gio/glib-compile-schemas.c:1140 #, c-format msgid "<schema id='%s'> already specified" msgstr "<schema id='%s'> already specified" -#: gio/glib-compile-schemas.c:1155 +#: gio/glib-compile-schemas.c:1152 #, c-format msgid "<schema id='%s'> extends not yet existing schema “%s”" msgstr "<schema id='%s'> extends not yet existing schema “%s”" -#: gio/glib-compile-schemas.c:1171 +#: gio/glib-compile-schemas.c:1168 #, c-format msgid "<schema id='%s'> is list of not yet existing schema “%s”" msgstr "<schema id='%s'> is list of not yet existing schema “%s”" -#: gio/glib-compile-schemas.c:1179 +#: gio/glib-compile-schemas.c:1176 #, c-format msgid "Cannot be a list of a schema with a path" msgstr "Cannot be a list of a schema with a path" -#: gio/glib-compile-schemas.c:1189 +#: gio/glib-compile-schemas.c:1186 #, c-format msgid "Cannot extend a schema with a path" msgstr "Cannot extend a schema with a path" -#: gio/glib-compile-schemas.c:1199 +#: gio/glib-compile-schemas.c:1196 #, c-format msgid "" "<schema id='%s'> is a list, extending <schema id='%s'> which is not a list" msgstr "" "<schema id='%s'> is a list, extending <schema id='%s'> which is not a list" -#: gio/glib-compile-schemas.c:1209 +#: gio/glib-compile-schemas.c:1206 #, c-format msgid "" "<schema id='%s' list-of='%s'> extends <schema id='%s' list-of='%s'> but “%s” " @@ -2800,17 +2810,17 @@ "<schema id='%s' list-of='%s'> extends <schema id='%s' list-of='%s'> but “%s” " "does not extend “%s”" -#: gio/glib-compile-schemas.c:1226 +#: gio/glib-compile-schemas.c:1223 #, c-format msgid "A path, if given, must begin and end with a slash" msgstr "A path, if given, must begin and end with a slash" -#: gio/glib-compile-schemas.c:1233 +#: gio/glib-compile-schemas.c:1230 #, c-format msgid "The path of a list must end with “:/”" msgstr "The path of a list must end with “:/”" -#: gio/glib-compile-schemas.c:1242 +#: gio/glib-compile-schemas.c:1239 #, c-format msgid "" "Warning: Schema “%s” has path “%s”. Paths starting with “/apps/”, “/" @@ -2819,49 +2829,49 @@ "Warning: Schema “%s” has path “%s”. Paths starting with “/apps/”, “/" "desktop/” or “/system/” are deprecated." -#: gio/glib-compile-schemas.c:1272 +#: gio/glib-compile-schemas.c:1269 #, c-format msgid "<%s id='%s'> already specified" msgstr "<%s id='%s'> already specified" -#: gio/glib-compile-schemas.c:1422 gio/glib-compile-schemas.c:1438 +#: gio/glib-compile-schemas.c:1419 gio/glib-compile-schemas.c:1435 #, c-format msgid "Only one <%s> element allowed inside <%s>" msgstr "Only one <%s> element allowed inside <%s>" -#: gio/glib-compile-schemas.c:1520 +#: gio/glib-compile-schemas.c:1517 #, c-format msgid "Element <%s> not allowed at the top level" msgstr "Element <%s> not allowed at the top level" -#: gio/glib-compile-schemas.c:1538 +#: gio/glib-compile-schemas.c:1535 msgid "Element <default> is required in <key>" msgstr "Element <default> is required in <key>" -#: gio/glib-compile-schemas.c:1628 +#: gio/glib-compile-schemas.c:1625 #, c-format msgid "Text may not appear inside <%s>" msgstr "Text may not appear inside <%s>" -#: gio/glib-compile-schemas.c:1696 +#: gio/glib-compile-schemas.c:1693 #, c-format msgid "Warning: undefined reference to <schema id='%s'/>" msgstr "Warning: undefined reference to <schema id='%s'/>" #. Translators: Do not translate "--strict". -#: gio/glib-compile-schemas.c:1835 gio/glib-compile-schemas.c:1914 +#: gio/glib-compile-schemas.c:1832 gio/glib-compile-schemas.c:1911 msgid "--strict was specified; exiting." msgstr "--strict was specified; exiting." -#: gio/glib-compile-schemas.c:1847 +#: gio/glib-compile-schemas.c:1844 msgid "This entire file has been ignored." msgstr "This entire file has been ignored." -#: gio/glib-compile-schemas.c:1910 +#: gio/glib-compile-schemas.c:1907 msgid "Ignoring this file." msgstr "Ignoring this file." -#: gio/glib-compile-schemas.c:1965 +#: gio/glib-compile-schemas.c:1962 #, c-format msgid "" "No such key “%s” in schema “%s” as specified in override file “%s”; ignoring " @@ -2870,7 +2880,7 @@ "No such key “%s” in schema “%s” as specified in override file “%s”; ignoring " "override for this key." -#: gio/glib-compile-schemas.c:1973 +#: gio/glib-compile-schemas.c:1970 #, c-format msgid "" "No such key “%s” in schema “%s” as specified in override file “%s” and --" @@ -2879,7 +2889,7 @@ "No such key “%s” in schema “%s” as specified in override file “%s” and --" "strict was specified; exiting." -#: gio/glib-compile-schemas.c:1995 +#: gio/glib-compile-schemas.c:1992 #, c-format msgid "" "Cannot provide per-desktop overrides for localized key “%s” in schema " @@ -2888,7 +2898,7 @@ "Cannot provide per-desktop overrides for localised key “%s” in schema " "“%s” (override file “%s”); ignoring override for this key." -#: gio/glib-compile-schemas.c:2004 +#: gio/glib-compile-schemas.c:2001 #, c-format msgid "" "Cannot provide per-desktop overrides for localized key “%s” in schema " @@ -2897,7 +2907,7 @@ "Cannot provide per-desktop overrides for localised key “%s” in schema " "“%s” (override file “%s”) and --strict was specified; exiting." -#: gio/glib-compile-schemas.c:2028 +#: gio/glib-compile-schemas.c:2025 #, c-format msgid "" "Error parsing key “%s” in schema “%s” as specified in override file “%s”: " @@ -2906,7 +2916,7 @@ "Error parsing key “%s” in schema “%s” as specified in override file “%s”: " "%s. Ignoring override for this key." -#: gio/glib-compile-schemas.c:2040 +#: gio/glib-compile-schemas.c:2037 #, c-format msgid "" "Error parsing key “%s” in schema “%s” as specified in override file “%s”: " @@ -2915,7 +2925,7 @@ "Error parsing key “%s” in schema “%s” as specified in override file “%s”: " "%s. --strict was specified; exiting." -#: gio/glib-compile-schemas.c:2067 +#: gio/glib-compile-schemas.c:2064 #, c-format msgid "" "Override for key “%s” in schema “%s” in override file “%s” is outside the " @@ -2924,7 +2934,7 @@ "Override for key “%s” in schema “%s” in override file “%s” is outside the " "range given in the schema; ignoring override for this key." -#: gio/glib-compile-schemas.c:2077 +#: gio/glib-compile-schemas.c:2074 #, c-format msgid "" "Override for key “%s” in schema “%s” in override file “%s” is outside the " @@ -2933,7 +2943,7 @@ "Override for key “%s” in schema “%s” in override file “%s” is outside the " "range given in the schema and --strict was specified; exiting." -#: gio/glib-compile-schemas.c:2103 +#: gio/glib-compile-schemas.c:2100 #, c-format msgid "" "Override for key “%s” in schema “%s” in override file “%s” is not in the " @@ -2942,7 +2952,7 @@ "Override for key “%s” in schema “%s” in override file “%s” is not in the " "list of valid choices; ignoring override for this key." -#: gio/glib-compile-schemas.c:2113 +#: gio/glib-compile-schemas.c:2110 #, c-format msgid "" "Override for key “%s” in schema “%s” in override file “%s” is not in the " @@ -2951,23 +2961,23 @@ "Override for key “%s” in schema “%s” in override file “%s” is not in the " "list of valid choices and --strict was specified; exiting." -#: gio/glib-compile-schemas.c:2175 +#: gio/glib-compile-schemas.c:2172 msgid "Where to store the gschemas.compiled file" msgstr "Where to store the gschemas.compiled file" -#: gio/glib-compile-schemas.c:2176 +#: gio/glib-compile-schemas.c:2173 msgid "Abort on any errors in schemas" msgstr "Abort on any errors in schemas" -#: gio/glib-compile-schemas.c:2177 +#: gio/glib-compile-schemas.c:2174 msgid "Do not write the gschema.compiled file" msgstr "Do not write the gschema.compiled file" -#: gio/glib-compile-schemas.c:2178 +#: gio/glib-compile-schemas.c:2175 msgid "Do not enforce key name restrictions" msgstr "Do not enforce key name restrictions" -#: gio/glib-compile-schemas.c:2207 +#: gio/glib-compile-schemas.c:2204 msgid "" "Compile all GSettings schema files into a schema cache.\n" "Schema files are required to have the extension .gschema.xml,\n" @@ -2977,24 +2987,24 @@ "Schema files are required to have the extension .gschema.xml,\n" "and the cache file is called gschemas.compiled." -#: gio/glib-compile-schemas.c:2228 +#: gio/glib-compile-schemas.c:2225 msgid "You should give exactly one directory name" msgstr "You should give exactly one directory name" -#: gio/glib-compile-schemas.c:2271 +#: gio/glib-compile-schemas.c:2268 msgid "No schema files found: doing nothing." msgstr "No schema files found: doing nothing." -#: gio/glib-compile-schemas.c:2273 +#: gio/glib-compile-schemas.c:2270 msgid "No schema files found: removed existing output file." msgstr "No schema files found: removed existing output file." -#: gio/glocalfile.c:563 gio/win32/gwinhttpfile.c:436 +#: gio/glocalfile.c:567 gio/win32/gwinhttpfile.c:436 #, c-format msgid "Invalid filename %s" msgstr "Invalid filename %s" -#: gio/glocalfile.c:996 +#: gio/glocalfile.c:1009 #, c-format msgid "Error getting filesystem info for %s: %s" msgstr "Error getting filesystem info for %s: %s" @@ -3003,254 +3013,254 @@ #. * the enclosing (user visible) mount of a file, but none #. * exists. #. -#: gio/glocalfile.c:1137 +#: gio/glocalfile.c:1145 #, c-format msgid "Containing mount for file %s not found" msgstr "Containing mount for file %s not found" -#: gio/glocalfile.c:1160 +#: gio/glocalfile.c:1168 msgid "Can’t rename root directory" msgstr "Can’t rename root directory" -#: gio/glocalfile.c:1178 gio/glocalfile.c:1201 +#: gio/glocalfile.c:1186 gio/glocalfile.c:1209 #, c-format msgid "Error renaming file %s: %s" msgstr "Error renaming file %s: %s" -#: gio/glocalfile.c:1185 +#: gio/glocalfile.c:1193 msgid "Can’t rename file, filename already exists" msgstr "Can’t rename file, filename already exists" -#: gio/glocalfile.c:1198 gio/glocalfile.c:2394 gio/glocalfile.c:2422 -#: gio/glocalfile.c:2561 gio/glocalfileoutputstream.c:658 +#: gio/glocalfile.c:1206 gio/glocalfile.c:2409 gio/glocalfile.c:2437 +#: gio/glocalfile.c:2576 gio/glocalfileoutputstream.c:658 msgid "Invalid filename" msgstr "Invalid filename" -#: gio/glocalfile.c:1366 gio/glocalfile.c:1377 +#: gio/glocalfile.c:1374 gio/glocalfile.c:1385 #, c-format msgid "Error opening file %s: %s" msgstr "Error opening file %s: %s" -#: gio/glocalfile.c:1502 +#: gio/glocalfile.c:1510 #, c-format msgid "Error removing file %s: %s" msgstr "Error removing file %s: %s" -#: gio/glocalfile.c:1996 gio/glocalfile.c:2007 gio/glocalfile.c:2034 +#: gio/glocalfile.c:2004 gio/glocalfile.c:2015 gio/glocalfile.c:2042 #, c-format msgid "Error trashing file %s: %s" msgstr "Error moving file %s to the wastebasket: %s" -#: gio/glocalfile.c:2054 +#: gio/glocalfile.c:2062 #, c-format msgid "Unable to create trash directory %s: %s" msgstr "Unable to create the wastebasket directory %s: %s" -#: gio/glocalfile.c:2075 +#: gio/glocalfile.c:2083 #, c-format msgid "Unable to find toplevel directory to trash %s" msgstr "Unable to find toplevel directory to move %s to the wastebasket" -#: gio/glocalfile.c:2083 +#: gio/glocalfile.c:2091 #, c-format msgid "Trashing on system internal mounts is not supported" msgstr "Can’t move to wastebasket on system internal mounts" -#: gio/glocalfile.c:2169 gio/glocalfile.c:2197 +#: gio/glocalfile.c:2177 gio/glocalfile.c:2205 #, c-format msgid "Unable to find or create trash directory %s to trash %s" msgstr "Unable to find or create wastebasket directory %s to move %s to" -#: gio/glocalfile.c:2243 +#: gio/glocalfile.c:2249 #, c-format msgid "Unable to create trashing info file for %s: %s" msgstr "Unable to create wastebasket info file for %s: %s" -#: gio/glocalfile.c:2305 +#: gio/glocalfile.c:2320 #, c-format msgid "Unable to trash file %s across filesystem boundaries" msgstr "Unable to move %s to wastebasket across filesystem boundaries" -#: gio/glocalfile.c:2309 gio/glocalfile.c:2365 +#: gio/glocalfile.c:2324 gio/glocalfile.c:2380 #, c-format msgid "Unable to trash file %s: %s" msgstr "Unable to move file %s to the wastebasket: %s" -#: gio/glocalfile.c:2371 +#: gio/glocalfile.c:2386 #, c-format msgid "Unable to trash file %s" msgstr "Unable to move file %s to the wastebasket" -#: gio/glocalfile.c:2397 +#: gio/glocalfile.c:2412 #, c-format msgid "Error creating directory %s: %s" msgstr "Error creating directory %s: %s" -#: gio/glocalfile.c:2426 +#: gio/glocalfile.c:2441 #, c-format msgid "Filesystem does not support symbolic links" msgstr "Filesystem does not support symbolic links" -#: gio/glocalfile.c:2429 +#: gio/glocalfile.c:2444 #, c-format msgid "Error making symbolic link %s: %s" msgstr "Error making symbolic link %s: %s" -#: gio/glocalfile.c:2472 gio/glocalfile.c:2507 gio/glocalfile.c:2564 +#: gio/glocalfile.c:2487 gio/glocalfile.c:2522 gio/glocalfile.c:2579 #, c-format msgid "Error moving file %s: %s" msgstr "Error moving file %s: %s" -#: gio/glocalfile.c:2495 +#: gio/glocalfile.c:2510 msgid "Can’t move directory over directory" msgstr "Can’t move directory over directory" -#: gio/glocalfile.c:2521 gio/glocalfileoutputstream.c:1110 +#: gio/glocalfile.c:2536 gio/glocalfileoutputstream.c:1110 #: gio/glocalfileoutputstream.c:1124 gio/glocalfileoutputstream.c:1139 #: gio/glocalfileoutputstream.c:1156 gio/glocalfileoutputstream.c:1170 msgid "Backup file creation failed" msgstr "Backup file creation failed" -#: gio/glocalfile.c:2540 +#: gio/glocalfile.c:2555 #, c-format msgid "Error removing target file: %s" msgstr "Error removing target file: %s" -#: gio/glocalfile.c:2554 +#: gio/glocalfile.c:2569 msgid "Move between mounts not supported" msgstr "Move between mounts not supported" -#: gio/glocalfile.c:2728 +#: gio/glocalfile.c:2745 #, c-format msgid "Could not determine the disk usage of %s: %s" msgstr "Could not determine the disk usage of %s: %s" -#: gio/glocalfileinfo.c:775 +#: gio/glocalfileinfo.c:779 msgid "Attribute value must be non-NULL" msgstr "Attribute value must be non-NULL" -#: gio/glocalfileinfo.c:782 +#: gio/glocalfileinfo.c:786 msgid "Invalid attribute type (string or invalid expected)" msgstr "Invalid attribute type (string or invalid expected)" -#: gio/glocalfileinfo.c:789 +#: gio/glocalfileinfo.c:793 msgid "Invalid extended attribute name" msgstr "Invalid extended attribute name" -#: gio/glocalfileinfo.c:840 +#: gio/glocalfileinfo.c:844 #, c-format msgid "Error setting extended attribute “%s”: %s" msgstr "Error setting extended attribute “%s”: %s" -#: gio/glocalfileinfo.c:1738 gio/win32/gwinhttpfile.c:191 +#: gio/glocalfileinfo.c:1823 gio/win32/gwinhttpfile.c:191 msgid " (invalid encoding)" msgstr " (invalid encoding)" -#: gio/glocalfileinfo.c:1897 gio/glocalfileoutputstream.c:945 +#: gio/glocalfileinfo.c:1982 gio/glocalfileoutputstream.c:945 #: gio/glocalfileoutputstream.c:997 #, c-format msgid "Error when getting information for file “%s”: %s" msgstr "Error when getting information for file “%s”: %s" -#: gio/glocalfileinfo.c:2163 +#: gio/glocalfileinfo.c:2288 #, c-format msgid "Error when getting information for file descriptor: %s" msgstr "Error when getting information for file descriptor: %s" -#: gio/glocalfileinfo.c:2208 +#: gio/glocalfileinfo.c:2333 msgid "Invalid attribute type (uint32 expected)" msgstr "Invalid attribute type (uint32 expected)" -#: gio/glocalfileinfo.c:2226 +#: gio/glocalfileinfo.c:2351 msgid "Invalid attribute type (uint64 expected)" msgstr "Invalid attribute type (uint64 expected)" -#: gio/glocalfileinfo.c:2245 gio/glocalfileinfo.c:2264 +#: gio/glocalfileinfo.c:2370 gio/glocalfileinfo.c:2389 msgid "Invalid attribute type (byte string expected)" msgstr "Invalid attribute type (byte string expected)" -#: gio/glocalfileinfo.c:2311 +#: gio/glocalfileinfo.c:2436 msgid "Cannot set permissions on symlinks" msgstr "Cannot set permissions on symlinks" -#: gio/glocalfileinfo.c:2327 +#: gio/glocalfileinfo.c:2452 #, c-format msgid "Error setting permissions: %s" msgstr "Error setting permissions: %s" -#: gio/glocalfileinfo.c:2378 +#: gio/glocalfileinfo.c:2503 #, c-format msgid "Error setting owner: %s" msgstr "Error setting owner: %s" -#: gio/glocalfileinfo.c:2401 +#: gio/glocalfileinfo.c:2526 msgid "symlink must be non-NULL" msgstr "symlink must be non-NULL" -#: gio/glocalfileinfo.c:2411 gio/glocalfileinfo.c:2430 -#: gio/glocalfileinfo.c:2441 +#: gio/glocalfileinfo.c:2536 gio/glocalfileinfo.c:2555 +#: gio/glocalfileinfo.c:2566 #, c-format msgid "Error setting symlink: %s" msgstr "Error setting symlink: %s" -#: gio/glocalfileinfo.c:2420 +#: gio/glocalfileinfo.c:2545 msgid "Error setting symlink: file is not a symlink" msgstr "Error setting symlink: file is not a symlink" -#: gio/glocalfileinfo.c:2492 +#: gio/glocalfileinfo.c:2637 #, c-format msgid "Extra nanoseconds %d for UNIX timestamp %lld are negative" msgstr "Extra nanoseconds %d for UNIX timestamp %lld are negative" -#: gio/glocalfileinfo.c:2501 +#: gio/glocalfileinfo.c:2646 #, c-format msgid "Extra nanoseconds %d for UNIX timestamp %lld reach 1 second" msgstr "Extra nanoseconds %d for UNIX timestamp %lld reach 1 second" -#: gio/glocalfileinfo.c:2511 +#: gio/glocalfileinfo.c:2656 #, c-format msgid "UNIX timestamp %lld does not fit into 64 bits" msgstr "UNIX timestamp %lld does not fit into 64 bits" -#: gio/glocalfileinfo.c:2522 +#: gio/glocalfileinfo.c:2667 #, c-format msgid "UNIX timestamp %lld is outside of the range supported by Windows" msgstr "UNIX timestamp %lld is outside of the range supported by Windows" -#: gio/glocalfileinfo.c:2625 +#: gio/glocalfileinfo.c:2799 #, c-format msgid "File name “%s” cannot be converted to UTF-16" msgstr "File name “%s” cannot be converted to UTF-16" -#: gio/glocalfileinfo.c:2644 +#: gio/glocalfileinfo.c:2818 #, c-format msgid "File “%s” cannot be opened: Windows Error %lu" msgstr "File “%s” cannot be opened: Windows Error %lu" -#: gio/glocalfileinfo.c:2657 +#: gio/glocalfileinfo.c:2831 #, c-format msgid "Error setting modification or access time for file “%s”: %lu" msgstr "Error setting modification or access time for file “%s”: %lu" -#: gio/glocalfileinfo.c:2798 gio/glocalfileinfo.c:2810 +#: gio/glocalfileinfo.c:2988 #, c-format msgid "Error setting modification or access time: %s" msgstr "Error setting modification or access time: %s" -#: gio/glocalfileinfo.c:2833 +#: gio/glocalfileinfo.c:3011 msgid "SELinux context must be non-NULL" msgstr "SELinux context must be non-NULL" -#: gio/glocalfileinfo.c:2840 +#: gio/glocalfileinfo.c:3018 msgid "SELinux is not enabled on this system" msgstr "SELinux is not enabled on this system" -#: gio/glocalfileinfo.c:2850 +#: gio/glocalfileinfo.c:3028 #, c-format msgid "Error setting SELinux context: %s" msgstr "Error setting SELinux context: %s" -#: gio/glocalfileinfo.c:2947 +#: gio/glocalfileinfo.c:3125 #, c-format msgid "Setting attribute %s not supported" msgstr "Setting attribute %s not supported" @@ -3297,13 +3307,13 @@ msgid "Error renaming temporary file: %s" msgstr "Error renaming temporary file: %s" -#: gio/glocalfileoutputstream.c:611 gio/glocalfileoutputstream.c:1241 +#: gio/glocalfileoutputstream.c:611 gio/glocalfileoutputstream.c:1242 #, c-format msgid "Error truncating file: %s" msgstr "Error truncating file: %s" #: gio/glocalfileoutputstream.c:664 gio/glocalfileoutputstream.c:909 -#: gio/glocalfileoutputstream.c:1222 gio/gsubprocess.c:231 +#: gio/glocalfileoutputstream.c:1223 gio/gsubprocess.c:231 #, c-format msgid "Error opening file “%s”: %s" msgstr "Error opening file “%s”: %s" @@ -3320,7 +3330,7 @@ msgid "The file was externally modified" msgstr "The file was externally modified" -#: gio/glocalfileoutputstream.c:1204 +#: gio/glocalfileoutputstream.c:1205 #, c-format msgid "Error removing old file: %s" msgstr "Error removing old file: %s" @@ -3467,8 +3477,8 @@ #. Translators: the first placeholder is a domain name, the #. * second is an error message #: gio/gresolver.c:403 gio/gthreadedresolver.c:152 gio/gthreadedresolver.c:170 -#: gio/gthreadedresolver.c:782 gio/gthreadedresolver.c:806 -#: gio/gthreadedresolver.c:831 gio/gthreadedresolver.c:846 +#: gio/gthreadedresolver.c:798 gio/gthreadedresolver.c:822 +#: gio/gthreadedresolver.c:847 gio/gthreadedresolver.c:862 #, c-format msgid "Error resolving “%s”: %s" msgstr "Error resolving “%s”: %s" @@ -3485,8 +3495,8 @@ #: gio/gresource.c:683 gio/gresource.c:945 gio/gresource.c:985 #: gio/gresource.c:1109 gio/gresource.c:1181 gio/gresource.c:1255 -#: gio/gresource.c:1336 gio/gresourcefile.c:478 gio/gresourcefile.c:601 -#: gio/gresourcefile.c:752 +#: gio/gresource.c:1336 gio/gresourcefile.c:478 gio/gresourcefile.c:602 +#: gio/gresourcefile.c:753 #, c-format msgid "The resource at “%s” does not exist" msgstr "The resource at “%s” does not exist" @@ -3496,16 +3506,16 @@ msgid "The resource at “%s” failed to decompress" msgstr "The resource at “%s” failed to decompress" -#: gio/gresourcefile.c:658 +#: gio/gresourcefile.c:659 msgid "Resource files cannot be renamed" msgstr "Resource files cannot be renamed" -#: gio/gresourcefile.c:748 +#: gio/gresourcefile.c:749 #, c-format msgid "The resource at “%s” is not a directory" msgstr "The resource at “%s” is not a directory" -#: gio/gresourcefile.c:956 +#: gio/gresourcefile.c:957 msgid "Input stream doesn’t implement seek" msgstr "Input stream doesn’t implement seek" @@ -3870,7 +3880,7 @@ msgid "Socket is already closed" msgstr "Socket is already closed" -#: gio/gsocket.c:449 gio/gsocket.c:3201 gio/gsocket.c:4434 gio/gsocket.c:4492 +#: gio/gsocket.c:449 gio/gsocket.c:3225 gio/gsocket.c:4458 gio/gsocket.c:4516 msgid "Socket I/O timed out" msgstr "Socket I/O timed out" @@ -3964,74 +3974,74 @@ msgid "No support for IPv6 source-specific multicast" msgstr "No support for IPv6 source-specific multicast" -#: gio/gsocket.c:2900 +#: gio/gsocket.c:2924 #, c-format msgid "Error accepting connection: %s" msgstr "Error accepting connection: %s" -#: gio/gsocket.c:3026 +#: gio/gsocket.c:3050 msgid "Connection in progress" msgstr "Connection in progress" -#: gio/gsocket.c:3077 +#: gio/gsocket.c:3101 msgid "Unable to get pending error: " msgstr "Unable to get pending error: " -#: gio/gsocket.c:3266 +#: gio/gsocket.c:3290 #, c-format msgid "Error receiving data: %s" msgstr "Error receiving data: %s" -#: gio/gsocket.c:3463 +#: gio/gsocket.c:3487 #, c-format msgid "Error sending data: %s" msgstr "Error sending data: %s" -#: gio/gsocket.c:3650 +#: gio/gsocket.c:3674 #, c-format msgid "Unable to shutdown socket: %s" msgstr "Unable to shutdown socket: %s" -#: gio/gsocket.c:3731 +#: gio/gsocket.c:3755 #, c-format msgid "Error closing socket: %s" msgstr "Error closing socket: %s" -#: gio/gsocket.c:4427 +#: gio/gsocket.c:4451 #, c-format msgid "Waiting for socket condition: %s" msgstr "Waiting for socket condition: %s" -#: gio/gsocket.c:4817 gio/gsocket.c:4833 gio/gsocket.c:4846 +#: gio/gsocket.c:4841 gio/gsocket.c:4857 gio/gsocket.c:4870 #, c-format msgid "Unable to send message: %s" msgstr "Unable to send message: %s" -#: gio/gsocket.c:4818 gio/gsocket.c:4834 gio/gsocket.c:4847 +#: gio/gsocket.c:4842 gio/gsocket.c:4858 gio/gsocket.c:4871 msgid "Message vectors too large" msgstr "Message vectors too large" -#: gio/gsocket.c:4863 gio/gsocket.c:4865 gio/gsocket.c:5012 gio/gsocket.c:5097 -#: gio/gsocket.c:5275 gio/gsocket.c:5315 gio/gsocket.c:5317 +#: gio/gsocket.c:4887 gio/gsocket.c:4889 gio/gsocket.c:5036 gio/gsocket.c:5121 +#: gio/gsocket.c:5299 gio/gsocket.c:5339 gio/gsocket.c:5341 #, c-format msgid "Error sending message: %s" msgstr "Error sending message: %s" -#: gio/gsocket.c:5039 +#: gio/gsocket.c:5063 msgid "GSocketControlMessage not supported on Windows" msgstr "GSocketControlMessage not supported on Windows" -#: gio/gsocket.c:5512 gio/gsocket.c:5588 gio/gsocket.c:5814 +#: gio/gsocket.c:5536 gio/gsocket.c:5612 gio/gsocket.c:5838 #, c-format msgid "Error receiving message: %s" msgstr "Error receiving message: %s" -#: gio/gsocket.c:6099 gio/gsocket.c:6110 gio/gsocket.c:6173 +#: gio/gsocket.c:6123 gio/gsocket.c:6134 gio/gsocket.c:6197 #, c-format msgid "Unable to read socket credentials: %s" msgstr "Unable to read socket credentials: %s" -#: gio/gsocket.c:6182 +#: gio/gsocket.c:6206 msgid "g_socket_get_credentials not implemented for this OS" msgstr "g_socket_get_credentials not implemented for this OS" @@ -4153,12 +4163,12 @@ msgid "Unknown SOCKSv5 proxy error." msgstr "Unknown SOCKSv5 proxy error." -#: gio/gtestdbus.c:614 glib/gspawn-win32.c:354 +#: gio/gtestdbus.c:615 glib/gspawn-win32.c:354 #, c-format msgid "Failed to create pipe for communicating with child process (%s)" msgstr "Failed to create pipe for communicating with child process (%s)" -#: gio/gtestdbus.c:621 +#: gio/gtestdbus.c:622 #, c-format msgid "Pipes are not supported in this platform" msgstr "Pipes are not supported in this platform" @@ -4179,35 +4189,35 @@ #. Translators: the placeholder is a DNS record type, such as ‘MX’ or ‘SRV’ #: gio/gthreadedresolver.c:552 gio/gthreadedresolver.c:574 -#: gio/gthreadedresolver.c:612 gio/gthreadedresolver.c:659 -#: gio/gthreadedresolver.c:688 gio/gthreadedresolver.c:700 +#: gio/gthreadedresolver.c:628 gio/gthreadedresolver.c:675 +#: gio/gthreadedresolver.c:704 gio/gthreadedresolver.c:716 #, c-format msgid "Error parsing DNS %s record: malformed DNS packet" msgstr "Error parsing DNS %s record: malformed DNS packet" -#: gio/gthreadedresolver.c:758 gio/gthreadedresolver.c:895 -#: gio/gthreadedresolver.c:993 gio/gthreadedresolver.c:1043 +#: gio/gthreadedresolver.c:774 gio/gthreadedresolver.c:911 +#: gio/gthreadedresolver.c:1009 gio/gthreadedresolver.c:1059 #, c-format msgid "No DNS record of the requested type for “%s”" msgstr "No DNS record of the requested type for “%s”" -#: gio/gthreadedresolver.c:763 gio/gthreadedresolver.c:998 +#: gio/gthreadedresolver.c:779 gio/gthreadedresolver.c:1014 #, c-format msgid "Temporarily unable to resolve “%s”" msgstr "Temporarily unable to resolve “%s”" -#: gio/gthreadedresolver.c:768 gio/gthreadedresolver.c:1003 -#: gio/gthreadedresolver.c:1113 +#: gio/gthreadedresolver.c:784 gio/gthreadedresolver.c:1019 +#: gio/gthreadedresolver.c:1129 #, c-format msgid "Error resolving “%s”" msgstr "Error resolving “%s”" -#: gio/gthreadedresolver.c:782 gio/gthreadedresolver.c:806 -#: gio/gthreadedresolver.c:831 gio/gthreadedresolver.c:846 +#: gio/gthreadedresolver.c:798 gio/gthreadedresolver.c:822 +#: gio/gthreadedresolver.c:847 gio/gthreadedresolver.c:862 msgid "Malformed DNS packet" msgstr "Malformed DNS packet" -#: gio/gthreadedresolver.c:888 +#: gio/gthreadedresolver.c:904 #, c-format msgid "Failed to parse DNS response for “%s”: " msgstr "Failed to parse DNS response for “%s”: " @@ -4333,7 +4343,7 @@ msgid "Error closing file descriptor: %s" msgstr "Error closing file descriptor: %s" -#: gio/gunixmounts.c:2815 gio/gunixmounts.c:2868 +#: gio/gunixmounts.c:2817 gio/gunixmounts.c:2870 msgid "Filesystem root" msgstr "Filesystem root" @@ -4415,77 +4425,77 @@ msgid "Wrong args\n" msgstr "Wrong args\n" -#: glib/gbookmarkfile.c:779 +#: glib/gbookmarkfile.c:861 #, c-format msgid "Unexpected attribute “%s” for element “%s”" msgstr "Unexpected attribute “%s” for element “%s”" -#: glib/gbookmarkfile.c:790 glib/gbookmarkfile.c:870 glib/gbookmarkfile.c:880 -#: glib/gbookmarkfile.c:993 +#: glib/gbookmarkfile.c:872 glib/gbookmarkfile.c:952 glib/gbookmarkfile.c:962 +#: glib/gbookmarkfile.c:1075 #, c-format msgid "Attribute “%s” of element “%s” not found" msgstr "Attribute “%s” of element “%s” not found" -#: glib/gbookmarkfile.c:1202 glib/gbookmarkfile.c:1267 -#: glib/gbookmarkfile.c:1331 glib/gbookmarkfile.c:1341 +#: glib/gbookmarkfile.c:1284 glib/gbookmarkfile.c:1349 +#: glib/gbookmarkfile.c:1413 glib/gbookmarkfile.c:1423 #, c-format msgid "Unexpected tag “%s”, tag “%s” expected" msgstr "Unexpected tag “%s”, tag “%s” expected" -#: glib/gbookmarkfile.c:1227 glib/gbookmarkfile.c:1241 -#: glib/gbookmarkfile.c:1309 glib/gbookmarkfile.c:1355 +#: glib/gbookmarkfile.c:1309 glib/gbookmarkfile.c:1323 +#: glib/gbookmarkfile.c:1391 glib/gbookmarkfile.c:1437 #, c-format msgid "Unexpected tag “%s” inside “%s”" msgstr "Unexpected tag “%s” inside “%s”" -#: glib/gbookmarkfile.c:1635 +#: glib/gbookmarkfile.c:1717 #, c-format msgid "Invalid date/time ‘%s’ in bookmark file" msgstr "Invalid date/time ‘%s’ in bookmark file" -#: glib/gbookmarkfile.c:1838 +#: glib/gbookmarkfile.c:1956 msgid "No valid bookmark file found in data dirs" msgstr "No valid bookmark file found in data dirs" -#: glib/gbookmarkfile.c:2039 +#: glib/gbookmarkfile.c:2157 #, c-format msgid "A bookmark for URI “%s” already exists" msgstr "A bookmark for URI “%s” already exists" -#: glib/gbookmarkfile.c:2088 glib/gbookmarkfile.c:2246 -#: glib/gbookmarkfile.c:2331 glib/gbookmarkfile.c:2411 -#: glib/gbookmarkfile.c:2496 glib/gbookmarkfile.c:2630 -#: glib/gbookmarkfile.c:2763 glib/gbookmarkfile.c:2898 -#: glib/gbookmarkfile.c:2940 glib/gbookmarkfile.c:3037 -#: glib/gbookmarkfile.c:3158 glib/gbookmarkfile.c:3352 -#: glib/gbookmarkfile.c:3493 glib/gbookmarkfile.c:3712 -#: glib/gbookmarkfile.c:3801 glib/gbookmarkfile.c:3890 -#: glib/gbookmarkfile.c:4009 +#: glib/gbookmarkfile.c:2206 glib/gbookmarkfile.c:2364 +#: glib/gbookmarkfile.c:2449 glib/gbookmarkfile.c:2529 +#: glib/gbookmarkfile.c:2614 glib/gbookmarkfile.c:2748 +#: glib/gbookmarkfile.c:2881 glib/gbookmarkfile.c:3016 +#: glib/gbookmarkfile.c:3058 glib/gbookmarkfile.c:3155 +#: glib/gbookmarkfile.c:3276 glib/gbookmarkfile.c:3470 +#: glib/gbookmarkfile.c:3611 glib/gbookmarkfile.c:3830 +#: glib/gbookmarkfile.c:3919 glib/gbookmarkfile.c:4008 +#: glib/gbookmarkfile.c:4127 #, c-format msgid "No bookmark found for URI “%s”" msgstr "No bookmark found for URI “%s”" -#: glib/gbookmarkfile.c:2420 +#: glib/gbookmarkfile.c:2538 #, c-format msgid "No MIME type defined in the bookmark for URI “%s”" msgstr "No MIME type defined in the bookmark for URI “%s”" -#: glib/gbookmarkfile.c:2505 +#: glib/gbookmarkfile.c:2623 #, c-format msgid "No private flag has been defined in bookmark for URI “%s”" msgstr "No private flag has been defined in bookmark for URI “%s”" -#: glib/gbookmarkfile.c:3046 +#: glib/gbookmarkfile.c:3164 #, c-format msgid "No groups set in bookmark for URI “%s”" msgstr "No groups set in bookmark for URI “%s”" -#: glib/gbookmarkfile.c:3514 glib/gbookmarkfile.c:3722 +#: glib/gbookmarkfile.c:3632 glib/gbookmarkfile.c:3840 #, c-format msgid "No application with name “%s” registered a bookmark for “%s”" msgstr "No application with name “%s” registered a bookmark for “%s”" -#: glib/gbookmarkfile.c:3745 +#: glib/gbookmarkfile.c:3863 #, c-format msgid "Failed to expand exec line “%s” with URI “%s”" msgstr "Failed to expand exec line “%s” with URI “%s”" @@ -4960,79 +4970,79 @@ msgid "Error opening directory “%s”: %s" msgstr "Error opening directory “%s”: %s" -#: glib/gfileutils.c:735 glib/gfileutils.c:827 +#: glib/gfileutils.c:753 glib/gfileutils.c:845 #, c-format msgid "Could not allocate %lu byte to read file “%s”" msgid_plural "Could not allocate %lu bytes to read file “%s”" msgstr0 "Could not allocate %lu byte to read file “%s”" msgstr1 "Could not allocate %lu bytes to read file “%s”" -#: glib/gfileutils.c:752 +#: glib/gfileutils.c:770 #, c-format msgid "Error reading file “%s”: %s" msgstr "Error reading file “%s”: %s" -#: glib/gfileutils.c:788 +#: glib/gfileutils.c:806 #, c-format msgid "File “%s” is too large" msgstr "File “%s” is too large" -#: glib/gfileutils.c:852 +#: glib/gfileutils.c:870 #, c-format msgid "Failed to read from file “%s”: %s" msgstr "Failed to read from file “%s”: %s" -#: glib/gfileutils.c:902 glib/gfileutils.c:977 glib/gfileutils.c:1449 +#: glib/gfileutils.c:920 glib/gfileutils.c:995 glib/gfileutils.c:1472 #, c-format msgid "Failed to open file “%s”: %s" msgstr "Failed to open file “%s”: %s" -#: glib/gfileutils.c:915 +#: glib/gfileutils.c:933 #, c-format msgid "Failed to get attributes of file “%s”: fstat() failed: %s" msgstr "Failed to get attributes of file “%s”: fstat() failed: %s" -#: glib/gfileutils.c:946 +#: glib/gfileutils.c:964 #, c-format msgid "Failed to open file “%s”: fdopen() failed: %s" msgstr "Failed to open file “%s”: fdopen() failed: %s" -#: glib/gfileutils.c:1047 +#: glib/gfileutils.c:1065 #, c-format msgid "Failed to rename file “%s” to “%s”: g_rename() failed: %s" msgstr "Failed to rename file “%s” to “%s”: g_rename() failed: %s" -#: glib/gfileutils.c:1156 +#: glib/gfileutils.c:1179 #, c-format msgid "Failed to write file “%s”: write() failed: %s" msgstr "Failed to write file “%s”: write() failed: %s" -#: glib/gfileutils.c:1177 +#: glib/gfileutils.c:1200 #, c-format msgid "Failed to write file “%s”: fsync() failed: %s" msgstr "Failed to write file “%s”: fsync() failed: %s" -#: glib/gfileutils.c:1338 glib/gfileutils.c:1753 +#: glib/gfileutils.c:1361 glib/gfileutils.c:1776 #, c-format msgid "Failed to create file “%s”: %s" msgstr "Failed to create file “%s”: %s" -#: glib/gfileutils.c:1383 +#: glib/gfileutils.c:1406 #, c-format msgid "Existing file “%s” could not be removed: g_unlink() failed: %s" msgstr "Existing file “%s” could not be removed: g_unlink() failed: %s" -#: glib/gfileutils.c:1718 +#: glib/gfileutils.c:1741 #, c-format msgid "Template “%s” invalid, should not contain a “%s”" msgstr "Template “%s” invalid, should not contain a “%s”" -#: glib/gfileutils.c:1731 +#: glib/gfileutils.c:1754 #, c-format msgid "Template “%s” doesn’t contain XXXXXX" msgstr "Template “%s” doesn’t contain XXXXXX" -#: glib/gfileutils.c:2291 glib/gfileutils.c:2320 +#: glib/gfileutils.c:2348 glib/gfileutils.c:2377 #, c-format msgid "Failed to read the symbolic link “%s”: %s" msgstr "Failed to read the symbolic link “%s”: %s" @@ -5058,65 +5068,65 @@ msgid "Can’t do a raw read in g_io_channel_read_to_end" msgstr "Can’t do a raw read in g_io_channel_read_to_end" -#: glib/gkeyfile.c:796 +#: glib/gkeyfile.c:800 msgid "Valid key file could not be found in search dirs" msgstr "Valid key file could not be found in search dirs" -#: glib/gkeyfile.c:833 +#: glib/gkeyfile.c:837 msgid "Not a regular file" msgstr "Not a regular file" -#: glib/gkeyfile.c:1291 +#: glib/gkeyfile.c:1295 #, c-format msgid "" "Key file contains line “%s” which is not a key-value pair, group, or comment" msgstr "" "Key file contains line “%s” which is not a key-value pair, group, or comment" -#: glib/gkeyfile.c:1348 +#: glib/gkeyfile.c:1352 #, c-format msgid "Invalid group name: %s" msgstr "Invalid group name: %s" -#: glib/gkeyfile.c:1372 +#: glib/gkeyfile.c:1376 msgid "Key file does not start with a group" msgstr "Key file does not start with a group" -#: glib/gkeyfile.c:1396 +#: glib/gkeyfile.c:1400 #, c-format msgid "Invalid key name: %.*s" msgstr "Invalid key name: %.*s" -#: glib/gkeyfile.c:1424 +#: glib/gkeyfile.c:1428 #, c-format msgid "Key file contains unsupported encoding “%s”" msgstr "Key file contains unsupported encoding “%s”" -#: glib/gkeyfile.c:1679 glib/gkeyfile.c:1852 glib/gkeyfile.c:3299 -#: glib/gkeyfile.c:3363 glib/gkeyfile.c:3493 glib/gkeyfile.c:3625 -#: glib/gkeyfile.c:3771 glib/gkeyfile.c:4006 glib/gkeyfile.c:4073 +#: glib/gkeyfile.c:1683 glib/gkeyfile.c:1856 glib/gkeyfile.c:3303 +#: glib/gkeyfile.c:3367 glib/gkeyfile.c:3497 glib/gkeyfile.c:3626 +#: glib/gkeyfile.c:3772 glib/gkeyfile.c:4007 glib/gkeyfile.c:4074 #, c-format msgid "Key file does not have group “%s”" msgstr "Key file does not have group “%s”" -#: glib/gkeyfile.c:1807 +#: glib/gkeyfile.c:1811 #, c-format msgid "Key file does not have key “%s” in group “%s”" msgstr "Key file does not have key “%s” in group “%s”" -#: glib/gkeyfile.c:1969 glib/gkeyfile.c:2085 +#: glib/gkeyfile.c:1973 glib/gkeyfile.c:2089 #, c-format msgid "Key file contains key “%s” with value “%s” which is not UTF-8" msgstr "Key file contains key “%s” with value “%s” which is not UTF-8" -#: glib/gkeyfile.c:1989 glib/gkeyfile.c:2105 glib/gkeyfile.c:2544 +#: glib/gkeyfile.c:1993 glib/gkeyfile.c:2109 glib/gkeyfile.c:2548 #, c-format msgid "" "Key file contains key “%s” which has a value that cannot be interpreted." msgstr "" "Key file contains key “%s” which has a value that cannot be interpreted." -#: glib/gkeyfile.c:2759 glib/gkeyfile.c:3128 +#: glib/gkeyfile.c:2763 glib/gkeyfile.c:3132 #, c-format msgid "" "Key file contains key “%s” in group “%s” which has a value that cannot be " @@ -5125,81 +5135,81 @@ "Key file contains key “%s” in group “%s” which has a value that cannot be " "interpreted." -#: glib/gkeyfile.c:2837 glib/gkeyfile.c:2914 +#: glib/gkeyfile.c:2841 glib/gkeyfile.c:2918 #, c-format msgid "Key “%s” in group “%s” has value “%s” where %s was expected" msgstr "Key “%s” in group “%s” has value “%s” where %s was expected" -#: glib/gkeyfile.c:4326 +#: glib/gkeyfile.c:4327 msgid "Key file contains escape character at end of line" msgstr "Key file contains escape character at end of line" -#: glib/gkeyfile.c:4348 +#: glib/gkeyfile.c:4349 #, c-format msgid "Key file contains invalid escape sequence “%s”" msgstr "Key file contains invalid escape sequence “%s”" -#: glib/gkeyfile.c:4493 +#: glib/gkeyfile.c:4494 #, c-format msgid "Value “%s” cannot be interpreted as a number." msgstr "Value “%s” cannot be interpreted as a number." -#: glib/gkeyfile.c:4507 +#: glib/gkeyfile.c:4508 #, c-format msgid "Integer value “%s” out of range" msgstr "Integer value “%s” out of range" -#: glib/gkeyfile.c:4540 +#: glib/gkeyfile.c:4541 #, c-format msgid "Value “%s” cannot be interpreted as a float number." msgstr "Value “%s” cannot be interpreted as a float number." -#: glib/gkeyfile.c:4579 +#: glib/gkeyfile.c:4580 #, c-format msgid "Value “%s” cannot be interpreted as a boolean." msgstr "Value “%s” cannot be interpreted as a boolean." -#: glib/gmappedfile.c:131 +#: glib/gmappedfile.c:135 #, c-format msgid "Failed to get attributes of file “%s%s%s%s”: fstat() failed: %s" msgstr "Failed to get attributes of file “%s%s%s%s”: fstat() failed: %s" -#: glib/gmappedfile.c:197 +#: glib/gmappedfile.c:201 #, c-format msgid "Failed to map %s%s%s%s: mmap() failed: %s" msgstr "Failed to map %s%s%s%s: mmap() failed: %s" -#: glib/gmappedfile.c:264 +#: glib/gmappedfile.c:268 #, c-format msgid "Failed to open file “%s”: open() failed: %s" msgstr "Failed to open file “%s”: open() failed: %s" -#: glib/gmarkup.c:400 glib/gmarkup.c:442 +#: glib/gmarkup.c:398 glib/gmarkup.c:440 #, c-format msgid "Error on line %d char %d: " msgstr "Error on line %d char %d: " -#: glib/gmarkup.c:464 glib/gmarkup.c:547 +#: glib/gmarkup.c:462 glib/gmarkup.c:545 #, c-format msgid "Invalid UTF-8 encoded text in name — not valid “%s”" msgstr "Invalid UTF-8 encoded text in name — not valid “%s”" -#: glib/gmarkup.c:475 +#: glib/gmarkup.c:473 #, c-format msgid "“%s” is not a valid name" msgstr "“%s” is not a valid name" -#: glib/gmarkup.c:491 +#: glib/gmarkup.c:489 #, c-format msgid "“%s” is not a valid name: “%c”" msgstr "“%s” is not a valid name: “%c”" -#: glib/gmarkup.c:615 +#: glib/gmarkup.c:613 #, c-format msgid "Error on line %d: %s" msgstr "Error on line %d: %s" -#: glib/gmarkup.c:692 +#: glib/gmarkup.c:690 #, c-format msgid "" "Failed to parse “%-.*s”, which should have been a digit inside a character " @@ -5208,7 +5218,7 @@ "Failed to parse “%-.*s”, which should have been a digit inside a character " "reference (ê for example) — perhaps the digit is too large" -#: glib/gmarkup.c:704 +#: glib/gmarkup.c:702 msgid "" "Character reference did not end with a semicolon; most likely you used an " "ampersand character without intending to start an entity — escape ampersand " @@ -5218,23 +5228,23 @@ "ampersand character without intending to start an entity — escape ampersand " "as &" -#: glib/gmarkup.c:730 +#: glib/gmarkup.c:728 #, c-format msgid "Character reference “%-.*s” does not encode a permitted character" msgstr "Character reference “%-.*s” does not encode a permitted character" -#: glib/gmarkup.c:768 +#: glib/gmarkup.c:766 msgid "" "Empty entity “&;” seen; valid entities are: & " < > '" msgstr "" "Empty entity “&;” seen; valid entities are: & " < > '" -#: glib/gmarkup.c:776 +#: glib/gmarkup.c:774 #, c-format msgid "Entity name “%-.*s” is not known" msgstr "Entity name “%-.*s” is not known" -#: glib/gmarkup.c:781 +#: glib/gmarkup.c:779 msgid "" "Entity did not end with a semicolon; most likely you used an ampersand " "character without intending to start an entity — escape ampersand as &" @@ -5242,11 +5252,11 @@ "Entity did not end with a semicolon; most likely you used an ampersand " "character without intending to start an entity — escape ampersand as &" -#: glib/gmarkup.c:1195 +#: glib/gmarkup.c:1193 msgid "Document must begin with an element (e.g. <book>)" msgstr "Document must begin with an element (e.g. <book>)" -#: glib/gmarkup.c:1235 +#: glib/gmarkup.c:1233 #, c-format msgid "" "“%s” is not a valid character following a “<” character; it may not begin an " @@ -5255,7 +5265,7 @@ "“%s” is not a valid character following a “<” character; it may not begin an " "element name" -#: glib/gmarkup.c:1278 +#: glib/gmarkup.c:1276 #, c-format msgid "" "Odd character “%s”, expected a “>” character to end the empty-element tag " @@ -5264,19 +5274,19 @@ "Odd character “%s”: expected a '>' character to end the empty-element tag " "“%s”" -#: glib/gmarkup.c:1348 +#: glib/gmarkup.c:1346 #, c-format msgid "Too many attributes in element “%s”" msgstr "Too many attributes in element “%s”" -#: glib/gmarkup.c:1368 +#: glib/gmarkup.c:1366 #, c-format msgid "" "Odd character “%s”, expected a “=” after attribute name “%s” of element “%s”" msgstr "" "Odd character “%s”, expected a '=' after attribute name “%s” of element “%s”" -#: glib/gmarkup.c:1410 +#: glib/gmarkup.c:1408 #, c-format msgid "" "Odd character “%s”, expected a “>” or “/” character to end the start tag of " @@ -5287,7 +5297,7 @@ "element “%s”, or optionally an attribute; perhaps you used an invalid " "character in an attribute name" -#: glib/gmarkup.c:1455 +#: glib/gmarkup.c:1453 #, c-format msgid "" "Odd character “%s”, expected an open quote mark after the equals sign when " @@ -5296,7 +5306,7 @@ "Odd character “%s”, expected an open quote mark after the equals sign when " "giving value for attribute “%s” of element “%s”" -#: glib/gmarkup.c:1589 +#: glib/gmarkup.c:1587 #, c-format msgid "" "“%s” is not a valid character following the characters “</”; “%s” may not " @@ -5305,7 +5315,7 @@ "“%s” is not a valid character following the characters “</”; “%s” may not " "begin an element name" -#: glib/gmarkup.c:1627 +#: glib/gmarkup.c:1625 #, c-format msgid "" "“%s” is not a valid character following the close element name “%s”; the " @@ -5314,25 +5324,25 @@ "“%s” is not a valid character following the close element name “%s”; the " "allowed character is '>'" -#: glib/gmarkup.c:1639 +#: glib/gmarkup.c:1637 #, c-format msgid "Element “%s” was closed, no element is currently open" msgstr "Element “%s” was closed, no element is currently open" -#: glib/gmarkup.c:1648 +#: glib/gmarkup.c:1646 #, c-format msgid "Element “%s” was closed, but the currently open element is “%s”" msgstr "Element “%s” was closed, but the currently open element is “%s”" -#: glib/gmarkup.c:1801 +#: glib/gmarkup.c:1799 msgid "Document was empty or contained only whitespace" msgstr "Document was empty or contained only whitespace" -#: glib/gmarkup.c:1815 +#: glib/gmarkup.c:1813 msgid "Document ended unexpectedly just after an open angle bracket “<”" msgstr "Document ended unexpectedly just after an open angle bracket “<”" -#: glib/gmarkup.c:1823 glib/gmarkup.c:1868 +#: glib/gmarkup.c:1821 glib/gmarkup.c:1866 #, c-format msgid "" "Document ended unexpectedly with elements still open — “%s” was the last " @@ -5341,7 +5351,7 @@ "Document ended unexpectedly with elements still open — “%s” was the last " "element opened" -#: glib/gmarkup.c:1831 +#: glib/gmarkup.c:1829 #, c-format msgid "" "Document ended unexpectedly, expected to see a close angle bracket ending " @@ -5350,19 +5360,19 @@ "Document ended unexpectedly, expected to see a close angle bracket ending " "the tag <%s/>" -#: glib/gmarkup.c:1837 +#: glib/gmarkup.c:1835 msgid "Document ended unexpectedly inside an element name" msgstr "Document ended unexpectedly inside an element name" -#: glib/gmarkup.c:1843 +#: glib/gmarkup.c:1841 msgid "Document ended unexpectedly inside an attribute name" msgstr "Document ended unexpectedly inside an attribute name" -#: glib/gmarkup.c:1848 +#: glib/gmarkup.c:1846 msgid "Document ended unexpectedly inside an element-opening tag." msgstr "Document ended unexpectedly inside an element-opening tag." -#: glib/gmarkup.c:1854 +#: glib/gmarkup.c:1852 msgid "" "Document ended unexpectedly after the equals sign following an attribute " "name; no attribute value" @@ -5370,22 +5380,22 @@ "Document ended unexpectedly after the equals sign following an attribute " "name; no attribute value" -#: glib/gmarkup.c:1861 +#: glib/gmarkup.c:1859 msgid "Document ended unexpectedly while inside an attribute value" msgstr "Document ended unexpectedly while inside an attribute value" -#: glib/gmarkup.c:1878 +#: glib/gmarkup.c:1876 #, c-format msgid "Document ended unexpectedly inside the close tag for element “%s”" msgstr "Document ended unexpectedly inside the close tag for element “%s”" -#: glib/gmarkup.c:1882 +#: glib/gmarkup.c:1880 msgid "" "Document ended unexpectedly inside the close tag for an unopened element" msgstr "" "Document ended unexpectedly inside the close tag for an unopened element" -#: glib/gmarkup.c:1888 +#: glib/gmarkup.c:1886 msgid "Document ended unexpectedly inside a comment or processing instruction" msgstr "Document ended unexpectedly inside a comment or processing instruction" @@ -5448,302 +5458,303 @@ msgid "Unknown option %s" msgstr "Unknown option %s" -#: glib/gregex.c:436 +#: glib/gregex.c:479 msgid "corrupted object" msgstr "corrupted object" -#: glib/gregex.c:438 +#: glib/gregex.c:481 msgid "out of memory" msgstr "out of memory" -#: glib/gregex.c:443 +#: glib/gregex.c:487 msgid "backtracking limit reached" msgstr "backtracking limit reached" -#: glib/gregex.c:454 glib/gregex.c:707 glib/gregex.c:736 +#: glib/gregex.c:498 msgid "internal error" msgstr "internal error" -#: glib/gregex.c:456 +#: glib/gregex.c:500 msgid "the pattern contains items not supported for partial matching" msgstr "the pattern contains items not supported for partial matching" -#: glib/gregex.c:458 +#: glib/gregex.c:502 msgid "back references as conditions are not supported for partial matching" msgstr "back references as conditions are not supported for partial matching" -#: glib/gregex.c:464 +#: glib/gregex.c:508 msgid "recursion limit reached" msgstr "recursion limit reached" -#: glib/gregex.c:466 +#: glib/gregex.c:510 msgid "bad offset" msgstr "bad offset" -#: glib/gregex.c:468 +#: glib/gregex.c:512 msgid "recursion loop" msgstr "recursion loop" #. should not happen in GRegex since we check modes before each match -#: glib/gregex.c:471 +#: glib/gregex.c:515 msgid "matching mode is requested that was not compiled for JIT" msgstr "matching mode is requested that was not compiled for JIT" -#: glib/gregex.c:475 +#: glib/gregex.c:536 glib/gregex.c:1838 msgid "unknown error" msgstr "unknown error" -#: glib/gregex.c:496 +#: glib/gregex.c:557 msgid "\\ at end of pattern" msgstr "\\ at end of pattern" -#: glib/gregex.c:500 +#: glib/gregex.c:561 msgid "\\c at end of pattern" msgstr "\\c at end of pattern" -#: glib/gregex.c:505 +#: glib/gregex.c:566 msgid "unrecognized character following \\" msgstr "unrecognised character following \\" -#: glib/gregex.c:509 +#: glib/gregex.c:570 msgid "numbers out of order in {} quantifier" msgstr "numbers out of order in {} quantifier" -#: glib/gregex.c:513 +#: glib/gregex.c:574 msgid "number too big in {} quantifier" msgstr "number too big in {} quantifier" -#: glib/gregex.c:517 +#: glib/gregex.c:578 msgid "missing terminating for character class" msgstr "missing terminating for character class" -#: glib/gregex.c:521 +#: glib/gregex.c:582 msgid "invalid escape sequence in character class" msgstr "invalid escape sequence in character class" -#: glib/gregex.c:525 +#: glib/gregex.c:586 msgid "range out of order in character class" msgstr "range out of order in character class" -#: glib/gregex.c:530 +#: glib/gregex.c:591 msgid "nothing to repeat" msgstr "nothing to repeat" -#: glib/gregex.c:534 +#: glib/gregex.c:595 msgid "unrecognized character after (? or (?-" msgstr "unrecognised character after (? or (?-" -#: glib/gregex.c:538 +#: glib/gregex.c:599 msgid "POSIX named classes are supported only within a class" msgstr "POSIX named classes are supported only within a class" -#: glib/gregex.c:542 +#: glib/gregex.c:603 msgid "POSIX collating elements are not supported" msgstr "POSIX collating elements are not supported" -#: glib/gregex.c:548 +#: glib/gregex.c:609 msgid "missing terminating )" msgstr "missing terminating )" -#: glib/gregex.c:552 +#: glib/gregex.c:613 msgid "reference to non-existent subpattern" msgstr "reference to non-existent subpattern" -#: glib/gregex.c:556 +#: glib/gregex.c:617 msgid "missing ) after comment" msgstr "missing ) after comment" -#: glib/gregex.c:560 +#: glib/gregex.c:621 msgid "regular expression is too large" msgstr "regular expression is too large" -#: glib/gregex.c:564 +#: glib/gregex.c:625 msgid "malformed number or name after (?(" msgstr "malformed number or name after (?(" -#: glib/gregex.c:568 +#: glib/gregex.c:629 msgid "lookbehind assertion is not fixed length" msgstr "lookbehind assertion is not fixed length" -#: glib/gregex.c:572 +#: glib/gregex.c:633 msgid "conditional group contains more than two branches" msgstr "conditional group contains more than two branches" -#: glib/gregex.c:576 +#: glib/gregex.c:637 msgid "assertion expected after (?(" msgstr "assertion expected after (?(" -#: glib/gregex.c:580 +#: glib/gregex.c:641 msgid "a numbered reference must not be zero" msgstr "a numbered reference must not be zero" -#: glib/gregex.c:584 +#: glib/gregex.c:645 msgid "unknown POSIX class name" msgstr "unknown POSIX class name" -#: glib/gregex.c:589 +#: glib/gregex.c:650 msgid "character value in \\x{...} sequence is too large" -msgstr "character value in \\x{…} sequence is too large" +msgstr "character value in \\x{...} sequence is too large" -#: glib/gregex.c:593 +#: glib/gregex.c:654 msgid "\\C not allowed in lookbehind assertion" msgstr "\\C not allowed in lookbehind assertion" -#: glib/gregex.c:597 +#: glib/gregex.c:658 msgid "missing terminator in subpattern name" msgstr "missing terminator in subpattern name" -#: glib/gregex.c:601 +#: glib/gregex.c:662 msgid "two named subpatterns have the same name" msgstr "two named subpatterns have the same name" -#: glib/gregex.c:605 +#: glib/gregex.c:666 msgid "malformed \\P or \\p sequence" msgstr "malformed \\P or \\p sequence" -#: glib/gregex.c:609 +#: glib/gregex.c:670 msgid "unknown property name after \\P or \\p" msgstr "unknown property name after \\P or \\p" -#: glib/gregex.c:613 +#: glib/gregex.c:674 msgid "subpattern name is too long (maximum 32 characters)" msgstr "subpattern name is too long (maximum 32 characters)" -#: glib/gregex.c:617 +#: glib/gregex.c:678 msgid "too many named subpatterns (maximum 10,000)" msgstr "too many named subpatterns (maximum 10,000)" -#: glib/gregex.c:621 +#: glib/gregex.c:682 msgid "octal value is greater than \\377" msgstr "octal value is greater than \\377" -#: glib/gregex.c:625 +#: glib/gregex.c:686 msgid "DEFINE group contains more than one branch" msgstr "DEFINE group contains more than one branch" -#: glib/gregex.c:629 +#: glib/gregex.c:690 msgid "inconsistent NEWLINE options" msgstr "inconsistent NEWLINE options" -#: glib/gregex.c:633 +#: glib/gregex.c:694 msgid "" "\\g is not followed by a braced, angle-bracketed, or quoted name or number, " "or by a plain number" msgstr "" -"\\g is not followed by a braced, angle-bracketed, or quoted name or number, " -"or by a plain number" +"\\g is not followed by a curly-bracketed, angle-bracketed, or quoted name or " +"number, or by a plain number" -#: glib/gregex.c:638 +#: glib/gregex.c:699 msgid "an argument is not allowed for (*ACCEPT), (*FAIL), or (*COMMIT)" msgstr "an argument is not allowed for (*ACCEPT), (*FAIL), or (*COMMIT)" -#: glib/gregex.c:642 +#: glib/gregex.c:703 msgid "(*VERB) not recognized" msgstr "(*VERB) not recognised" -#: glib/gregex.c:646 +#: glib/gregex.c:707 msgid "number is too big" msgstr "number is too big" -#: glib/gregex.c:650 +#: glib/gregex.c:711 msgid "missing subpattern name after (?&" msgstr "missing subpattern name after (?&" -#: glib/gregex.c:654 +#: glib/gregex.c:715 msgid "different names for subpatterns of the same number are not allowed" msgstr "different names for subpatterns of the same number are not allowed" -#: glib/gregex.c:658 +#: glib/gregex.c:719 msgid "(*MARK) must have an argument" msgstr "(*MARK) must have an argument" -#: glib/gregex.c:662 +#: glib/gregex.c:723 msgid "\\c must be followed by an ASCII character" msgstr "\\c must be followed by an ASCII character" -#: glib/gregex.c:666 +#: glib/gregex.c:727 msgid "\\k is not followed by a braced, angle-bracketed, or quoted name" -msgstr "\\k is not followed by a braced, angle-bracketed, or quoted name" +msgstr "" +"\\k is not followed by a curly-bracketed, angle-bracketed, or quoted name" -#: glib/gregex.c:670 +#: glib/gregex.c:731 msgid "\\N is not supported in a class" msgstr "\\N is not supported in a class" -#: glib/gregex.c:674 +#: glib/gregex.c:735 msgid "name is too long in (*MARK), (*PRUNE), (*SKIP), or (*THEN)" msgstr "name is too long in (*MARK), (*PRUNE), (*SKIP), or (*THEN)" -#: glib/gregex.c:678 glib/gregex.c:809 +#: glib/gregex.c:739 glib/gregex.c:875 msgid "code overflow" msgstr "code overflow" -#: glib/gregex.c:682 +#: glib/gregex.c:743 msgid "unrecognized character after (?P" msgstr "unrecognised character after (?P" -#: glib/gregex.c:686 +#: glib/gregex.c:747 msgid "overran compiling workspace" msgstr "overran compiling workspace" -#: glib/gregex.c:690 +#: glib/gregex.c:751 msgid "previously-checked referenced subpattern not found" msgstr "previously-checked referenced subpattern not found" -#: glib/gregex.c:808 glib/gregex.c:1041 glib/gregex.c:2342 +#: glib/gregex.c:874 glib/gregex.c:1121 glib/gregex.c:2444 #, c-format msgid "Error while matching regular expression %s: %s" msgstr "Error while matching regular expression %s: %s" -#: glib/gregex.c:1618 +#: glib/gregex.c:1721 msgid "PCRE library is compiled without UTF8 support" msgstr "PCRE library is compiled without UTF8 support" -#: glib/gregex.c:1626 +#: glib/gregex.c:1729 msgid "PCRE library is compiled with incompatible options" msgstr "PCRE library is compiled with incompatible options" -#: glib/gregex.c:1751 +#: glib/gregex.c:1847 #, c-format msgid "Error while compiling regular expression ‘%s’ at char %s: %s" msgstr "Error while compiling regular expression ‘%s’ at char %s: %s" -#: glib/gregex.c:2786 +#: glib/gregex.c:2887 msgid "hexadecimal digit or “}” expected" msgstr "hexadecimal digit or “}” expected" -#: glib/gregex.c:2802 +#: glib/gregex.c:2903 msgid "hexadecimal digit expected" msgstr "hexadecimal digit expected" -#: glib/gregex.c:2842 +#: glib/gregex.c:2943 msgid "missing “<” in symbolic reference" msgstr "missing “<” in symbolic reference" -#: glib/gregex.c:2851 +#: glib/gregex.c:2952 msgid "unfinished symbolic reference" msgstr "unfinished symbolic reference" -#: glib/gregex.c:2858 +#: glib/gregex.c:2959 msgid "zero-length symbolic reference" msgstr "zero-length symbolic reference" -#: glib/gregex.c:2869 +#: glib/gregex.c:2970 msgid "digit expected" msgstr "digit expected" -#: glib/gregex.c:2887 +#: glib/gregex.c:2988 msgid "illegal symbolic reference" msgstr "illegal symbolic reference" -#: glib/gregex.c:2950 +#: glib/gregex.c:3051 msgid "stray final “\\”" msgstr "stray final “\\”" -#: glib/gregex.c:2954 +#: glib/gregex.c:3055 msgid "unknown escape sequence" msgstr "unknown escape sequence" -#: glib/gregex.c:2964 +#: glib/gregex.c:3065 #, c-format msgid "Error while parsing replacement text “%s” at char %lu: %s" msgstr "Error while parsing replacement text “%s” at char %lu: %s" @@ -5770,96 +5781,102 @@ msgid "Text was empty (or contained only whitespace)" msgstr "Text was empty (or contained only whitespace)" -#: glib/gspawn.c:314 +#: glib/gspawn.c:319 #, c-format msgid "Failed to read data from child process (%s)" msgstr "Failed to read data from child process (%s)" -#: glib/gspawn.c:466 +#: glib/gspawn.c:471 #, c-format msgid "Unexpected error in reading data from a child process (%s)" msgstr "Unexpected error in reading data from a child process (%s)" -#: glib/gspawn.c:551 +#: glib/gspawn.c:556 #, c-format msgid "Unexpected error in waitpid() (%s)" msgstr "Unexpected error in waitpid() (%s)" -#: glib/gspawn.c:1170 glib/gspawn-win32.c:1488 +#: glib/gspawn.c:1175 glib/gspawn-win32.c:1503 #, c-format msgid "Child process exited with code %ld" msgstr "Child process exited with code %ld" -#: glib/gspawn.c:1178 +#: glib/gspawn.c:1183 #, c-format msgid "Child process killed by signal %ld" msgstr "Child process killed by signal %ld" -#: glib/gspawn.c:1185 +#: glib/gspawn.c:1190 #, c-format msgid "Child process stopped by signal %ld" msgstr "Child process stopped by signal %ld" -#: glib/gspawn.c:1192 +#: glib/gspawn.c:1197 #, c-format msgid "Child process exited abnormally" msgstr "Child process exited abnormally" -#: glib/gspawn.c:1885 glib/gspawn-win32.c:393 glib/gspawn-win32.c:401 +#: glib/gspawn.c:2027 glib/gspawn-win32.c:393 glib/gspawn-win32.c:401 #, c-format msgid "Failed to read from child pipe (%s)" msgstr "Failed to read from child pipe (%s)" -#: glib/gspawn.c:2248 +#: glib/gspawn.c:2399 #, c-format msgid "Failed to spawn child process “%s” (%s)" msgstr "Failed to spawn child process “%s” (%s)" -#: glib/gspawn.c:2365 +#: glib/gspawn.c:2525 #, c-format msgid "Failed to fork (%s)" msgstr "Failed to fork (%s)" -#: glib/gspawn.c:2525 glib/gspawn-win32.c:424 +#: glib/gspawn.c:2685 glib/gspawn-win32.c:424 #, c-format msgid "Failed to change to directory “%s” (%s)" msgstr "Failed to change to directory “%s” (%s)" -#: glib/gspawn.c:2535 +#: glib/gspawn.c:2695 #, c-format msgid "Failed to execute child process “%s” (%s)" msgstr "Failed to execute child process “%s” (%s)" -#: glib/gspawn.c:2545 +#: glib/gspawn.c:2705 #, c-format msgid "Failed to open file to remap file descriptor (%s)" msgstr "Failed to open file to remap file descriptor (%s)" -#: glib/gspawn.c:2553 +#: glib/gspawn.c:2713 #, c-format msgid "Failed to duplicate file descriptor for child process (%s)" msgstr "Failed to duplicate file descriptor for child process (%s)" -#: glib/gspawn.c:2562 +#: glib/gspawn.c:2722 #, c-format msgid "Failed to fork child process (%s)" msgstr "Failed to fork child process (%s)" -#: glib/gspawn.c:2570 +#: glib/gspawn.c:2730 #, c-format msgid "Failed to close file descriptor for child process (%s)" msgstr "Failed to close file descriptor for child process (%s)" -#: glib/gspawn.c:2578 +#: glib/gspawn.c:2738 #, c-format msgid "Unknown error executing child process “%s”" msgstr "Unknown error executing child process “%s”" -#: glib/gspawn.c:2602 +#: glib/gspawn.c:2762 #, c-format msgid "Failed to read enough data from child pid pipe (%s)" msgstr "Failed to read enough data from child pid pipe (%s)" +#: glib/gspawn-private.h:134 +#, c-format +#| msgid "Invalid seek request" +msgid "Invalid source FDs argument" +msgstr "Invalid source FDs argument" + #: glib/gspawn-win32.c:337 msgid "Failed to read data from child process" msgstr "Failed to read data from child process" @@ -5879,27 +5896,27 @@ msgid "Invalid program name: %s" msgstr "Invalid program name: %s" -#: glib/gspawn-win32.c:521 glib/gspawn-win32.c:853 +#: glib/gspawn-win32.c:521 glib/gspawn-win32.c:868 #, c-format msgid "Invalid string in argument vector at %d: %s" msgstr "Invalid string in argument vector at %d: %s" -#: glib/gspawn-win32.c:532 glib/gspawn-win32.c:869 +#: glib/gspawn-win32.c:532 glib/gspawn-win32.c:884 #, c-format msgid "Invalid string in environment: %s" msgstr "Invalid string in environment: %s" -#: glib/gspawn-win32.c:849 +#: glib/gspawn-win32.c:864 #, c-format msgid "Invalid working directory: %s" msgstr "Invalid working directory: %s" -#: glib/gspawn-win32.c:914 +#: glib/gspawn-win32.c:929 #, c-format msgid "Failed to execute helper program (%s)" msgstr "Failed to execute helper program (%s)" -#: glib/gspawn-win32.c:1143 +#: glib/gspawn-win32.c:1158 msgid "" "Unexpected error in g_io_channel_win32_poll() reading data from a child " "process" @@ -5907,21 +5924,21 @@ "Unexpected error in g_io_channel_win32_poll() reading data from a child " "process" -#: glib/gstrfuncs.c:3366 glib/gstrfuncs.c:3468 +#: glib/gstrfuncs.c:3373 glib/gstrfuncs.c:3475 msgid "Empty string is not a number" msgstr "Empty string is not a number" -#: glib/gstrfuncs.c:3390 +#: glib/gstrfuncs.c:3397 #, c-format msgid "“%s” is not a signed number" msgstr "“%s” is not a signed number" -#: glib/gstrfuncs.c:3400 glib/gstrfuncs.c:3504 +#: glib/gstrfuncs.c:3407 glib/gstrfuncs.c:3511 #, c-format msgid "Number “%s” is out of bounds %s, %s" msgstr "Number “%s” is out of bounds %s, %s" -#: glib/gstrfuncs.c:3494 +#: glib/gstrfuncs.c:3501 #, c-format msgid "“%s” is not an unsigned number" msgstr "“%s” is not an unsigned number" @@ -6000,132 +6017,132 @@ msgstr "Character out of range for UTF-16" #. Translators: A unit symbol for size formatting, showing for example: "13.0 kB" -#: glib/gutils.c:2857 +#: glib/gutils.c:2966 msgid "kB" msgstr "kB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 MB" -#: glib/gutils.c:2859 +#: glib/gutils.c:2968 msgid "MB" msgstr "MB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 GB" -#: glib/gutils.c:2861 +#: glib/gutils.c:2970 msgid "GB" msgstr "GB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 TB" -#: glib/gutils.c:2863 +#: glib/gutils.c:2972 msgid "TB" msgstr "TB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 PB" -#: glib/gutils.c:2865 +#: glib/gutils.c:2974 msgid "PB" msgstr "PB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 EB" -#: glib/gutils.c:2867 +#: glib/gutils.c:2976 msgid "EB" msgstr "EB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 KiB" -#: glib/gutils.c:2871 +#: glib/gutils.c:2980 msgid "KiB" msgstr "KiB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 MiB" -#: glib/gutils.c:2873 +#: glib/gutils.c:2982 msgid "MiB" msgstr "MiB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 GiB" -#: glib/gutils.c:2875 +#: glib/gutils.c:2984 msgid "GiB" msgstr "GiB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 TiB" -#: glib/gutils.c:2877 +#: glib/gutils.c:2986 msgid "TiB" msgstr "TiB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 PiB" -#: glib/gutils.c:2879 +#: glib/gutils.c:2988 msgid "PiB" msgstr "PiB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 EiB" -#: glib/gutils.c:2881 +#: glib/gutils.c:2990 msgid "EiB" msgstr "EiB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 kb" -#: glib/gutils.c:2885 +#: glib/gutils.c:2994 msgid "kb" msgstr "kb" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Mb" -#: glib/gutils.c:2887 +#: glib/gutils.c:2996 msgid "Mb" msgstr "Mb" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Gb" -#: glib/gutils.c:2889 +#: glib/gutils.c:2998 msgid "Gb" msgstr "Gb" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Tb" -#: glib/gutils.c:2891 +#: glib/gutils.c:3000 msgid "Tb" msgstr "Tb" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Pb" -#: glib/gutils.c:2893 +#: glib/gutils.c:3002 msgid "Pb" msgstr "Pb" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Eb" -#: glib/gutils.c:2895 +#: glib/gutils.c:3004 msgid "Eb" msgstr "Eb" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Kib" -#: glib/gutils.c:2899 +#: glib/gutils.c:3008 msgid "Kib" msgstr "Kib" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Mib" -#: glib/gutils.c:2901 +#: glib/gutils.c:3010 msgid "Mib" msgstr "Mib" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Gib" -#: glib/gutils.c:2903 +#: glib/gutils.c:3012 msgid "Gib" msgstr "Gib" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Tib" -#: glib/gutils.c:2905 +#: glib/gutils.c:3014 msgid "Tib" msgstr "Tib" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Pib" -#: glib/gutils.c:2907 +#: glib/gutils.c:3016 msgid "Pib" msgstr "Pib" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Eib" -#: glib/gutils.c:2909 +#: glib/gutils.c:3018 msgid "Eib" msgstr "Eib" -#: glib/gutils.c:2947 +#: glib/gutils.c:3056 msgid "byte" msgid_plural "bytes" msgstr0 "byte" msgstr1 "bytes" -#: glib/gutils.c:2951 +#: glib/gutils.c:3060 msgid "bit" msgid_plural "bits" msgstr0 "bit" @@ -6133,7 +6150,7 @@ #. Translators: The "%u" is replaced with the size value, like "13"; it could #. * be part of "13 bytes", but only the number is requested this time. -#: glib/gutils.c:2959 +#: glib/gutils.c:3068 #, c-format msgctxt "format-size" msgid "%u" @@ -6141,7 +6158,7 @@ #. Translators: The first "%u" is replaced with the value, the "%s" with a unit of the value. #. * The order can be changed with "%$2s %$1u". An example: "13 bytes" -#: glib/gutils.c:2964 +#: glib/gutils.c:3073 #, c-format msgctxt "format-size" msgid "%u %s" @@ -6149,7 +6166,7 @@ #. Translators: The "%.1f" is replaced with the size value, like "13.0"; it could #. * be part of "13.0 MB", but only the number is requested this time. -#: glib/gutils.c:3000 +#: glib/gutils.c:3109 #, c-format msgctxt "format-size" msgid "%.1f" @@ -6158,14 +6175,14 @@ #. Translators: The first "%.1f" is replaced with the value, the "%s" with a unit of the value. #. * The order can be changed with "%$2s %$1.1f". Keep the no-break space between the value and #. * the unit symbol. An example: "13.0 MB" -#: glib/gutils.c:3006 +#: glib/gutils.c:3115 #, c-format msgctxt "format-size" msgid "%.1f %s" msgstr "%.1f %s" #. Translators: the %s in "%s bytes" will always be replaced by a number. -#: glib/gutils.c:3046 +#: glib/gutils.c:3155 #, c-format msgid "%s byte" msgid_plural "%s bytes" @@ -6173,14 +6190,14 @@ msgstr1 "%s bytes" #. Translators: the %s in "%s bits" will always be replaced by a number. -#: glib/gutils.c:3051 +#: glib/gutils.c:3160 #, c-format msgid "%s bit" msgid_plural "%s bits" msgstr0 "%s bit" msgstr1 "%s bits" -#: glib/gutils.c:3092 +#: glib/gutils.c:3201 #, c-format msgid "%u byte" msgid_plural "%u bytes" @@ -6192,32 +6209,32 @@ #. * compatibility. Users will not see this string unless a program is using this deprecated function. #. * Please translate as literally as possible. #. -#: glib/gutils.c:3105 +#: glib/gutils.c:3214 #, c-format msgid "%.1f KB" msgstr "%.1f KB" -#: glib/gutils.c:3110 +#: glib/gutils.c:3219 #, c-format msgid "%.1f MB" msgstr "%.1f MB" -#: glib/gutils.c:3115 +#: glib/gutils.c:3224 #, c-format msgid "%.1f GB" msgstr "%.1f GB" -#: glib/gutils.c:3120 +#: glib/gutils.c:3229 #, c-format msgid "%.1f TB" msgstr "%.1f TB" -#: glib/gutils.c:3125 +#: glib/gutils.c:3234 #, c-format msgid "%.1f PB" msgstr "%.1f PB" -#: glib/gutils.c:3130 +#: glib/gutils.c:3239 #, c-format msgid "%.1f EB" msgstr "%.1f EB"
View file
_service:tar_scm:glib-2.74.4.tar.xz/po/es.po -> _service:tar_scm:glib-2.76.4.tar.xz/po/es.po
Changed
@@ -8,16 +8,15 @@ # # # Jorge González <jorgegonz@svn.gnome.org>, 2007, 2008, 2009, 2010, 2011, 2012. -# Daniel Mustieles <daniel.mustieles@gmail.com>, 2010-2022. -# Daniel Mustieles García <daniel.mustieles@gmail.com>, 2022. +# Daniel Mustieles <daniel.mustieles@gmail.com>, 2022-2023. # msgid "" msgstr "" "Project-Id-Version: glib.master\n" "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/glib/issues\n" -"POT-Creation-Date: 2022-08-31 23:44+0000\n" -"PO-Revision-Date: 2022-09-12 07:48+0200\n" -"Last-Translator: Daniel Mustieles García <daniel.mustieles@gmail.com>\n" +"POT-Creation-Date: 2023-02-15 16:30+0000\n" +"PO-Revision-Date: 2023-02-21 11:41+0100\n" +"Last-Translator: Daniel Mustieles <daniel.mustieles@gmail.com>\n" "Language-Team: Spanish - Spain <gnome-es-list@gnome.org>\n" "Language: es_ES\n" "MIME-Version: 1.0\n" @@ -26,23 +25,23 @@ "Plural-Forms: nplurals=2; plural=(n != 1)\n" "X-Generator: Gtranslator 42.0\n" -#: gio/gappinfo.c:335 +#: gio/gappinfo.c:339 msgid "Setting default applications not supported yet" msgstr "Todavía no se soporta establecer aplicaciones predeterminadas" -#: gio/gappinfo.c:368 +#: gio/gappinfo.c:372 msgid "Setting application as last used for type not supported yet" msgstr "" "Establecer aplicación como la usada por última vez para el tipo no está " "soportado" -#: gio/gappinfo.c:810 +#: gio/gappinfo.c:814 #, c-format msgid "Failed to find default application for content type ‘%s’" msgstr "" "Falló al buscar una aplicación predeterminada para el tipo de contenido «%s»" -#: gio/gappinfo.c:870 +#: gio/gappinfo.c:874 #, c-format msgid "Failed to find default application for URI Scheme ‘%s’" msgstr "" @@ -246,12 +245,12 @@ msgid "error sending %s message to application: %s\n" msgstr "error al enviar el mensaje %s a la aplicación: %s\n" -#: gio/gapplication-tool.c:321 +#: gio/gapplication-tool.c:324 msgid "action name must be given after application id\n" msgstr "" "se debe indicar el nombre de la acción después del ID de la aplicación\n" -#: gio/gapplication-tool.c:329 +#: gio/gapplication-tool.c:332 #, c-format msgid "" "invalid action name: “%s”\n" @@ -261,25 +260,25 @@ "los nombres de las acciones sólo pueden tener caracteres alfanuméricos «-» y " "«.»\n" -#: gio/gapplication-tool.c:348 +#: gio/gapplication-tool.c:351 #, c-format msgid "error parsing action parameter: %s\n" msgstr "error al analizar el parámetro de la acción: %s\n" -#: gio/gapplication-tool.c:360 +#: gio/gapplication-tool.c:363 msgid "actions accept a maximum of one parameter\n" msgstr "las acciones aceptan un máximo de un parámetro\n" -#: gio/gapplication-tool.c:415 +#: gio/gapplication-tool.c:418 msgid "list-actions command takes only the application id" msgstr "el comando «list-actions» sólo toma el ID de la aplicación" -#: gio/gapplication-tool.c:425 +#: gio/gapplication-tool.c:428 #, c-format msgid "unable to find desktop file for application %s\n" msgstr "no se puede encontrar un archivo .desktop para la aplicación %s\n" -#: gio/gapplication-tool.c:470 +#: gio/gapplication-tool.c:473 #, c-format msgid "" "unrecognised command: %s\n" @@ -314,7 +313,7 @@ msgid "Truncate not supported on base stream" msgstr "No se soporta el truncado en el flujo base" -#: gio/gcancellable.c:319 gio/gdbusconnection.c:1859 gio/gdbusprivate.c:1420 +#: gio/gcancellable.c:326 gio/gdbusconnection.c:1859 gio/gdbusprivate.c:1420 #: gio/gsimpleasyncresult.c:873 gio/gsimpleasyncresult.c:899 #, c-format msgid "Operation was cancelled" @@ -334,13 +333,13 @@ #: gio/gcharsetconverter.c:344 gio/gdatainputstream.c:850 #: gio/gdatainputstream.c:1268 glib/gconvert.c:451 glib/gconvert.c:883 -#: glib/giochannel.c:1576 glib/giochannel.c:1618 glib/giochannel.c:2473 +#: glib/giochannel.c:1576 glib/giochannel.c:1618 glib/giochannel.c:2478 #: glib/gutf8.c:892 glib/gutf8.c:1346 msgid "Invalid byte sequence in conversion input" msgstr "Hay una secuencia de bytes no válida en la entrada de conversión" #: gio/gcharsetconverter.c:349 glib/gconvert.c:459 glib/gconvert.c:797 -#: glib/giochannel.c:1583 glib/giochannel.c:2485 +#: glib/giochannel.c:1583 glib/giochannel.c:2493 #, c-format msgid "Error during conversion: %s" msgstr "Falló durante la conversión: %s" @@ -398,18 +397,18 @@ msgid "Unexpected early end-of-stream" msgstr "Final de flujo inesperadamente prematuro" -#: gio/gdbusaddress.c:164 gio/gdbusaddress.c:238 gio/gdbusaddress.c:327 +#: gio/gdbusaddress.c:162 gio/gdbusaddress.c:234 gio/gdbusaddress.c:321 #, c-format msgid "Unsupported key “%s” in address entry “%s”" msgstr "Clave «%s» no soportada en la entrada de dirección «%s»" -#: gio/gdbusaddress.c:177 +#: gio/gdbusaddress.c:175 #, c-format msgid "Meaningless key/value pair combination in address entry “%s”" msgstr "" "Combinación del par clave/valor sin sentido en la entrada de dirección «%s»" -#: gio/gdbusaddress.c:186 +#: gio/gdbusaddress.c:184 #, c-format msgid "" "Address “%s” is invalid (need exactly one of path, dir, tmpdir, or abstract " @@ -418,29 +417,29 @@ "La dirección «%s» no es válida (se necesita exactamente una ruta, carpeta, " "carpeta temporal o claves abstractas)" -#: gio/gdbusaddress.c:253 gio/gdbusaddress.c:264 gio/gdbusaddress.c:279 -#: gio/gdbusaddress.c:342 gio/gdbusaddress.c:353 +#: gio/gdbusaddress.c:249 gio/gdbusaddress.c:260 gio/gdbusaddress.c:275 +#: gio/gdbusaddress.c:336 gio/gdbusaddress.c:347 #, c-format msgid "Error in address “%s” — the “%s” attribute is malformed" msgstr "Error en la dirección «%s» — el atributo «%s» está mal formado" -#: gio/gdbusaddress.c:423 gio/gdbusaddress.c:682 +#: gio/gdbusaddress.c:417 gio/gdbusaddress.c:676 #, c-format msgid "Unknown or unsupported transport “%s” for address “%s”" msgstr "Transporte «%s» desconocido o no soportado para la dirección «%s»" -#: gio/gdbusaddress.c:467 +#: gio/gdbusaddress.c:461 #, c-format msgid "Address element “%s” does not contain a colon (:)" msgstr "El elemento de dirección «%s» no contiene dos puntos (:)" -#: gio/gdbusaddress.c:476 +#: gio/gdbusaddress.c:470 #, c-format msgid "Transport name in address element “%s” must not be empty" msgstr "" "El nombre del transporte en el elemento de dirección «%s» no debe estar vacío" -#: gio/gdbusaddress.c:497 +#: gio/gdbusaddress.c:491 #, c-format msgid "" "Key/Value pair %d, “%s”, in address element “%s” does not contain an equal " @@ -449,7 +448,7 @@ "El par clave/valor %d, «%s», en el elemento de dirección «%s», no contiene " "un signo de igual" -#: gio/gdbusaddress.c:508 +#: gio/gdbusaddress.c:502 #, c-format msgid "" "Key/Value pair %d, “%s”, in address element “%s” must not have an empty key" @@ -457,7 +456,7 @@ "El par clave/valor %d, «%s», en el elemento de dirección «%s», no debe " "contener una clave vacía" -#: gio/gdbusaddress.c:522 +#: gio/gdbusaddress.c:516 #, c-format msgid "" "Error unescaping key or value in Key/Value pair %d, “%s”, in address element " @@ -466,7 +465,7 @@ "Error al desescapar la clave o el valor en el par clave/valor %d, «%s», en " "el elemento de dirección «%s»" -#: gio/gdbusaddress.c:590 +#: gio/gdbusaddress.c:584 #, c-format msgid "" "Error in address “%s” — the unix transport requires exactly one of the keys " @@ -475,86 +474,86 @@ "Error en la dirección «%s»: el transporte UNIX requiere exactamente que una " "de las claves «path» o «abstract» esté establecida" -#: gio/gdbusaddress.c:625 +#: gio/gdbusaddress.c:619 #, c-format msgid "Error in address “%s” — the host attribute is missing or malformed" msgstr "" "Error en la dirección «%s»: falta o está mal formado el atributo para el " "servidor" -#: gio/gdbusaddress.c:639 +#: gio/gdbusaddress.c:633 #, c-format msgid "Error in address “%s” — the port attribute is missing or malformed" msgstr "" "Error en la dirección «%s»: falta o está mal formado el atributo para el " "puerto" -#: gio/gdbusaddress.c:653 +#: gio/gdbusaddress.c:647 #, c-format msgid "Error in address “%s” — the noncefile attribute is missing or malformed" msgstr "" "Error en la dirección «%s»: falta o está mal formado el atributo para el " "archivo de número usado una sola vez" -#: gio/gdbusaddress.c:674 +#: gio/gdbusaddress.c:668 msgid "Error auto-launching: " msgstr "Error al autolanzar: " -#: gio/gdbusaddress.c:727 +#: gio/gdbusaddress.c:721 #, c-format msgid "Error opening nonce file “%s”: %s" msgstr "Error al abrir el archivo de número usado una sola vez «%s»: %s" -#: gio/gdbusaddress.c:746 +#: gio/gdbusaddress.c:740 #, c-format msgid "Error reading from nonce file “%s”: %s" msgstr "Error al leer el archivo de número usado una sola vez «%s»: %s" -#: gio/gdbusaddress.c:755 +#: gio/gdbusaddress.c:749 #, c-format msgid "Error reading from nonce file “%s”, expected 16 bytes, got %d" msgstr "" "Error al leer el archivo de número usado una sola vez «%s», se esperaban 16 " "bytes, se obtuvieron %d" -#: gio/gdbusaddress.c:773 +#: gio/gdbusaddress.c:767 #, c-format msgid "Error writing contents of nonce file “%s” to stream:" msgstr "" "Error al escribir el contenido del archivo de número usado una sola vez «%s» " "al flujo:" -#: gio/gdbusaddress.c:988 +#: gio/gdbusaddress.c:982 msgid "The given address is empty" msgstr "La dirección proporcionada está vacía" -#: gio/gdbusaddress.c:1101 +#: gio/gdbusaddress.c:1095 #, c-format msgid "Cannot spawn a message bus when AT_SECURE is set" msgstr "No se puede lanzar un mensaje cuando AT_SECURE está activado" -#: gio/gdbusaddress.c:1108 +#: gio/gdbusaddress.c:1102 msgid "Cannot spawn a message bus without a machine-id: " msgstr "No se puede lanzar («spawn») un mensaje al bus sin un ID de máquina: " -#: gio/gdbusaddress.c:1115 +#: gio/gdbusaddress.c:1109 #, c-format msgid "Cannot autolaunch D-Bus without X11 $DISPLAY" msgstr "No se puede lanzar D-Bus automáticamente sin X11 $DISPLAY" -#: gio/gdbusaddress.c:1157 +#: gio/gdbusaddress.c:1151 #, c-format msgid "Error spawning command line “%s”: " msgstr "Error al lanzar («spawn») el comando «%s»: " -#: gio/gdbusaddress.c:1226 +#: gio/gdbusaddress.c:1220 #, c-format msgid "Cannot determine session bus address (not implemented for this OS)" msgstr "" "No se puede determinar la dirección del bus de sesión (no implementado para " "este SO)" -#: gio/gdbusaddress.c:1375 gio/gdbusconnection.c:7321 +#: gio/gdbusaddress.c:1374 gio/gdbusconnection.c:7316 #, c-format msgid "" "Cannot determine bus address from DBUS_STARTER_BUS_TYPE environment variable " @@ -563,7 +562,7 @@ "No se puede determinar la dirección del bus desde la variable de entorno " "DBUS_STARTER_BUS_TYPE; variable «%s» desconocida" -#: gio/gdbusaddress.c:1384 gio/gdbusconnection.c:7330 +#: gio/gdbusaddress.c:1383 gio/gdbusconnection.c:7325 msgid "" "Cannot determine bus address because the DBUS_STARTER_BUS_TYPE environment " "variable is not set" @@ -571,7 +570,7 @@ "No se puede determinar la dirección del bus porque la variable de entorno " "DBUS_STARTER_BUS_TYPE no está establecida" -#: gio/gdbusaddress.c:1394 +#: gio/gdbusaddress.c:1393 #, c-format msgid "Unknown bus type %d" msgstr "Tipo de bus %d desconocido" @@ -593,11 +592,15 @@ "Se agotaron todos los mecanismos de autenticación (intentados: %s) " "(disponibles: %s)" -#: gio/gdbusauth.c:1178 +#: gio/gdbusauth.c:1045 +msgid "Unexpected lack of content trying to read a byte" +msgstr "Falta de contenido inesperada al intentar leer un byte" + +#: gio/gdbusauth.c:1195 msgid "User IDs must be the same for peer and server" msgstr "El ID del usuario debe ser el mismo en el par y el servidor" -#: gio/gdbusauth.c:1190 +#: gio/gdbusauth.c:1207 msgid "Cancelled via GDBusAuthObserver::authorize-authenticated-peer" msgstr "Cancelado a través de GDBusAuthObserver::authorize-authenticated-peer" @@ -693,7 +696,7 @@ msgstr "" "(Adicionalmente, también falló la liberación del bloqueo para «%s»: %s)" -#: gio/gdbusconnection.c:590 gio/gdbusconnection.c:2404 +#: gio/gdbusconnection.c:590 gio/gdbusconnection.c:2405 msgid "The connection is closed" msgstr "La conexión está cerrada" @@ -701,14 +704,14 @@ msgid "Timeout was reached" msgstr "Se alcanzó el tiempo de expiración" -#: gio/gdbusconnection.c:2527 +#: gio/gdbusconnection.c:2528 msgid "" "Unsupported flags encountered when constructing a client-side connection" msgstr "" "Se encontraron opciones no soportadas al construir la conexión del lado del " "cliente" -#: gio/gdbusconnection.c:4256 gio/gdbusconnection.c:4610 +#: gio/gdbusconnection.c:4257 gio/gdbusconnection.c:4611 #, c-format msgid "" "No such interface “org.freedesktop.DBus.Properties” on object at path %s" @@ -716,106 +719,106 @@ "No existe la interfaz «org.freedesktop.DBus.Properties» en el objeto en la " "ruta %s" -#: gio/gdbusconnection.c:4401 +#: gio/gdbusconnection.c:4402 #, c-format msgid "No such property “%s”" msgstr "No existe la propiedad «%s»" -#: gio/gdbusconnection.c:4413 +#: gio/gdbusconnection.c:4414 #, c-format msgid "Property “%s” is not readable" msgstr "No se puede leer la propiedad «%s»" -#: gio/gdbusconnection.c:4424 +#: gio/gdbusconnection.c:4425 #, c-format msgid "Property “%s” is not writable" msgstr "No se puede escribir la propiedad «%s»" -#: gio/gdbusconnection.c:4444 +#: gio/gdbusconnection.c:4445 #, c-format msgid "Error setting property “%s”: Expected type “%s” but got “%s”" msgstr "" "Error al establecer la propiedad «%s». Se esperaba el tipo «%s» pero se " "obtuvo «%s»." -#: gio/gdbusconnection.c:4549 gio/gdbusconnection.c:4764 -#: gio/gdbusconnection.c:6747 +#: gio/gdbusconnection.c:4550 gio/gdbusconnection.c:4765 +#: gio/gdbusconnection.c:6742 #, c-format msgid "No such interface “%s”" msgstr "La interfaz «%s» no existe" -#: gio/gdbusconnection.c:4986 gio/gdbusconnection.c:7261 +#: gio/gdbusconnection.c:4981 gio/gdbusconnection.c:7256 #, c-format msgid "No such interface “%s” on object at path %s" msgstr "No existe la interfaz «%s» en el objeto en la ruta %s" -#: gio/gdbusconnection.c:5087 +#: gio/gdbusconnection.c:5082 #, c-format msgid "No such method “%s”" msgstr "No existe el método «%s»" -#: gio/gdbusconnection.c:5118 +#: gio/gdbusconnection.c:5113 #, c-format msgid "Type of message, “%s”, does not match expected type “%s”" msgstr "El tipo de mensaje, «%s», no coincide con el tipo esperado «%s»" -#: gio/gdbusconnection.c:5321 +#: gio/gdbusconnection.c:5316 #, c-format msgid "An object is already exported for the interface %s at %s" msgstr "Ya existe un objeto exportado para la interfaz %s en %s" -#: gio/gdbusconnection.c:5548 +#: gio/gdbusconnection.c:5543 #, c-format msgid "Unable to retrieve property %s.%s" msgstr "No se pudo obtener la propiedad %s.%s" -#: gio/gdbusconnection.c:5604 +#: gio/gdbusconnection.c:5599 #, c-format msgid "Unable to set property %s.%s" msgstr "No se pudo establecer la propiedad %s.%s" -#: gio/gdbusconnection.c:5783 +#: gio/gdbusconnection.c:5778 #, c-format msgid "Method “%s” returned type “%s”, but expected “%s”" msgstr "El método «%s» devolvió el tipo «%s» pero se esperaba «%s»" -#: gio/gdbusconnection.c:6859 +#: gio/gdbusconnection.c:6854 #, c-format msgid "Method “%s” on interface “%s” with signature “%s” does not exist" msgstr "El método «%s» con interfaz «%s» y firma «%s» no existe" -#: gio/gdbusconnection.c:6980 +#: gio/gdbusconnection.c:6975 #, c-format msgid "A subtree is already exported for %s" msgstr "Ya se ha exportado un subárbol para %s" -#: gio/gdbusconnection.c:7269 +#: gio/gdbusconnection.c:7264 #, c-format msgid "Object does not exist at path “%s”" msgstr "El objeto no existe en la ruta «%s»" -#: gio/gdbusmessage.c:1303 +#: gio/gdbusmessage.c:1306 msgid "type is INVALID" msgstr "el tipo no es válido («INVALID»)" -#: gio/gdbusmessage.c:1314 +#: gio/gdbusmessage.c:1317 msgid "METHOD_CALL message: PATH or MEMBER header field is missing" msgstr "Mensaje de METHOD_CALL: falta el campo de cabecera PATH o MEMEBER" -#: gio/gdbusmessage.c:1325 +#: gio/gdbusmessage.c:1328 msgid "METHOD_RETURN message: REPLY_SERIAL header field is missing" msgstr "Mensaje de METHOD_RETURN: falta el campo de cabecera REPLY_SERIAL" -#: gio/gdbusmessage.c:1337 +#: gio/gdbusmessage.c:1340 msgid "ERROR message: REPLY_SERIAL or ERROR_NAME header field is missing" msgstr "" "Mensaje de ERROR: falta el campo de cabecera REPLY_SERRIAL o ERROR_NAME" -#: gio/gdbusmessage.c:1350 +#: gio/gdbusmessage.c:1353 msgid "SIGNAL message: PATH, INTERFACE or MEMBER header field is missing" msgstr "Mensaje de SIGNAL: falta el campo de cabecera PATH, INTERFACE o MEMBER" -#: gio/gdbusmessage.c:1358 +#: gio/gdbusmessage.c:1361 msgid "" "SIGNAL message: The PATH header field is using the reserved value /org/" "freedesktop/DBus/Local" @@ -823,7 +826,7 @@ "Mensaje de SIGNAL: el campo de cabecera PATH está usando el valor reservado /" "org/freedesktop/DBus/Local" -#: gio/gdbusmessage.c:1366 +#: gio/gdbusmessage.c:1369 msgid "" "SIGNAL message: The INTERFACE header field is using the reserved value org." "freedesktop.DBus.Local" @@ -831,21 +834,21 @@ "Mensaje de SIGNAL: el campo de cabecera INTERFACE está usando el valor " "reservado org.freedesktop.DBus.Local" -#: gio/gdbusmessage.c:1414 gio/gdbusmessage.c:1474 +#: gio/gdbusmessage.c:1417 gio/gdbusmessage.c:1477 #, c-format msgid "Wanted to read %lu byte but only got %lu" msgid_plural "Wanted to read %lu bytes but only got %lu" msgstr0 "Se quería leer %lu byte pero sólo se obtuvo %lu" msgstr1 "Se querían leer %lu bytes pero sólo se obtuvo %lu" -#: gio/gdbusmessage.c:1428 +#: gio/gdbusmessage.c:1431 #, c-format msgid "Expected NUL byte after the string “%s” but found byte %d" msgstr "" "Se esperaba el byte NULL después de la cadena «%s» pero se encontró el byte " "%d" -#: gio/gdbusmessage.c:1447 +#: gio/gdbusmessage.c:1450 #, c-format msgid "" "Expected valid UTF-8 string but found invalid bytes at byte offset %d " @@ -855,21 +858,21 @@ "en el byte desplazado %d (la longitud de la cadena es %d). La cadena UTF-8 " "válida hasta ese punto era «%s»." -#: gio/gdbusmessage.c:1511 gio/gdbusmessage.c:1787 gio/gdbusmessage.c:1998 +#: gio/gdbusmessage.c:1514 gio/gdbusmessage.c:1790 gio/gdbusmessage.c:2001 msgid "Value nested too deeply" msgstr "Valor anidado demasiado profundamente" -#: gio/gdbusmessage.c:1679 +#: gio/gdbusmessage.c:1682 #, c-format msgid "Parsed value “%s” is not a valid D-Bus object path" msgstr "El valor analizado «%s» no es un objeto de ruta D-Bus válido" -#: gio/gdbusmessage.c:1703 +#: gio/gdbusmessage.c:1706 #, c-format msgid "Parsed value “%s” is not a valid D-Bus signature" msgstr "El valor analizado «%s» no es una firma de D-Bus válida" -#: gio/gdbusmessage.c:1754 +#: gio/gdbusmessage.c:1757 #, c-format msgid "" "Encountered array of length %u byte. Maximum length is 2<<26 bytes (64 MiB)." @@ -882,7 +885,7 @@ "Se encontró un array de longitud %u bytes. La longitud máxima es 2<<26 bytes " "(64 MiB)." -#: gio/gdbusmessage.c:1774 +#: gio/gdbusmessage.c:1777 #, c-format msgid "" "Encountered array of type “a%c”, expected to have a length a multiple of %u " @@ -891,17 +894,17 @@ "Encontrado un vector de tipo «a%c», esperando que su longitud fuese múltiplo " "de %u bytes, pero su longitud es de %u" -#: gio/gdbusmessage.c:1928 gio/gdbusmessage.c:2647 +#: gio/gdbusmessage.c:1931 gio/gdbusmessage.c:2650 msgid "Empty structures (tuples) are not allowed in D-Bus" msgstr "Las estructuras vacías (tuplas) no están permitidas en D-Bus" -#: gio/gdbusmessage.c:1982 +#: gio/gdbusmessage.c:1985 #, c-format msgid "Parsed value “%s” for variant is not a valid D-Bus signature" msgstr "" "El valor analizado «%s» para la variante no es una firma de D-Bus válida" -#: gio/gdbusmessage.c:2023 +#: gio/gdbusmessage.c:2026 #, c-format msgid "" "Error deserializing GVariant with type string “%s” from the D-Bus wire format" @@ -909,7 +912,7 @@ "Error al deserializar GVariant con el tipo de cadena «%s» al formato de " "mensaje de D-Bus" -#: gio/gdbusmessage.c:2208 +#: gio/gdbusmessage.c:2211 #, c-format msgid "" "Invalid endianness value. Expected 0x6c (“l”) or 0x42 (“B”) but found value " @@ -918,31 +921,31 @@ "Valor endian no válido. Se esperaba 0x6c («l») o 0x42 («B»)» pero se obtuvo " "el valor 0x%02x" -#: gio/gdbusmessage.c:2227 +#: gio/gdbusmessage.c:2230 #, c-format msgid "Invalid major protocol version. Expected 1 but found %d" msgstr "" "La versión principal del protocolo no es válida. Se esperaba 1 pero se " "encontró %d." -#: gio/gdbusmessage.c:2285 gio/gdbusmessage.c:2883 +#: gio/gdbusmessage.c:2288 gio/gdbusmessage.c:2886 msgid "Signature header found but is not of type signature" msgstr "Cabecera de firma encontrada pero no es del tipo firma" -#: gio/gdbusmessage.c:2297 +#: gio/gdbusmessage.c:2300 #, c-format msgid "Signature header with signature “%s” found but message body is empty" msgstr "" "Se encontró la cabecera de firma con firma «%s» pero el cuerpo del mensaje " "está vacío" -#: gio/gdbusmessage.c:2312 +#: gio/gdbusmessage.c:2315 #, c-format msgid "Parsed value “%s” is not a valid D-Bus signature (for body)" msgstr "" "El valor analizado «%s» no es una firma de D-Bus válida (para el cuerpo)" -#: gio/gdbusmessage.c:2344 +#: gio/gdbusmessage.c:2347 #, 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" @@ -953,11 +956,11 @@ "No existe la cabecera de firma en el mensaje pero el cuerpo del mensaje " "tiene %u bytes" -#: gio/gdbusmessage.c:2354 +#: gio/gdbusmessage.c:2357 msgid "Cannot deserialize message: " msgstr "No se puede deserializar el mensaje: " -#: gio/gdbusmessage.c:2700 +#: gio/gdbusmessage.c:2703 #, c-format msgid "" "Error serializing GVariant with type string “%s” to the D-Bus wire format" @@ -965,7 +968,7 @@ "Error al serializar GVariant con el tipo de cadena «%s» al formato de " "mensaje de D-Bus" -#: gio/gdbusmessage.c:2837 +#: gio/gdbusmessage.c:2840 #, c-format msgid "" "Number of file descriptors in message (%d) differs from header field (%d)" @@ -973,17 +976,17 @@ "El número de descriptores de archivos en el mensaje (%d) es distinto del " "campo de cabecera (%d)" -#: gio/gdbusmessage.c:2845 +#: gio/gdbusmessage.c:2848 msgid "Cannot serialize message: " msgstr "No se puede serializar el mensaje: " -#: gio/gdbusmessage.c:2898 +#: gio/gdbusmessage.c:2901 #, c-format msgid "Message body has signature “%s” but there is no signature header" msgstr "" "El cuerpo del mensaje tiene la firma «%s» pero no existe la cabecera de firma" -#: gio/gdbusmessage.c:2908 +#: gio/gdbusmessage.c:2911 #, c-format msgid "" "Message body has type signature “%s” but signature in the header field is " @@ -992,19 +995,19 @@ "El cuerpo del mensaje tiene un tipo de firma «%s» pero la firma en el campo " "de cabecera es «%s»" -#: gio/gdbusmessage.c:2924 +#: gio/gdbusmessage.c:2927 #, c-format msgid "Message body is empty but signature in the header field is “(%s)”" msgstr "" "El cuerpo del mensaje está vacío pero la firma en el campo de cabecera es " "«(%s)»" -#: gio/gdbusmessage.c:3479 +#: gio/gdbusmessage.c:3482 #, c-format msgid "Error return with body of type “%s”" msgstr "Error al devolver el cuerpo de tipo «%s»" -#: gio/gdbusmessage.c:3487 +#: gio/gdbusmessage.c:3490 msgid "Error return with empty body" msgstr "Error al devolver un cuepro vacío" @@ -1030,17 +1033,17 @@ msgid "Unable to load %s or %s: " msgstr "No se pudo cargar «%s» o %s: " -#: gio/gdbusproxy.c:1575 +#: gio/gdbusproxy.c:1568 #, c-format msgid "Error calling StartServiceByName for %s: " msgstr "Error al llamar StartSereviceByName para %s: " -#: gio/gdbusproxy.c:1598 +#: gio/gdbusproxy.c:1591 #, c-format msgid "Unexpected reply %d from StartServiceByName(\"%s\") method" msgstr "Respuesta %d no esperada del método StartServiceByName(«%s»)" -#: gio/gdbusproxy.c:2709 gio/gdbusproxy.c:2844 +#: gio/gdbusproxy.c:2702 gio/gdbusproxy.c:2837 #, c-format msgid "" "Cannot invoke method; proxy is for the well-known name %s without an owner, " @@ -1050,27 +1053,27 @@ "%sconocido y el proxy se construyó con la opción " "G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START" -#: gio/gdbusserver.c:765 +#: gio/gdbusserver.c:758 msgid "Abstract namespace not supported" msgstr "Espacio de nombres abstracto no soportado" -#: gio/gdbusserver.c:857 +#: gio/gdbusserver.c:850 msgid "Cannot specify nonce file when creating a server" msgstr "" "No se puede especificar el archivo de número usado una sola vez al crear un " "servidor" -#: gio/gdbusserver.c:939 +#: gio/gdbusserver.c:932 #, c-format msgid "Error writing nonce file at “%s”: %s" msgstr "Error al escribir el archivo de número usado una sola vez en «%s»: %s" -#: gio/gdbusserver.c:1114 +#: gio/gdbusserver.c:1107 #, c-format msgid "The string “%s” is not a valid D-Bus GUID" msgstr "La cadena «%s» no es un GUID válido de D-Bus" -#: gio/gdbusserver.c:1152 +#: gio/gdbusserver.c:1145 #, c-format msgid "Cannot listen on unsupported transport “%s”" msgstr "No se puede escuchar en un transporte no soportado «%s»" @@ -1098,14 +1101,14 @@ "\n" "Use «%s COMANDO --help» para obtener ayuda de cada comando.\n" -#: gio/gdbus-tool.c:204 gio/gdbus-tool.c:276 gio/gdbus-tool.c:348 -#: gio/gdbus-tool.c:372 gio/gdbus-tool.c:862 gio/gdbus-tool.c:1247 -#: gio/gdbus-tool.c:1734 +#: gio/gdbus-tool.c:204 gio/gdbus-tool.c:276 gio/gdbus-tool.c:347 +#: gio/gdbus-tool.c:371 gio/gdbus-tool.c:861 gio/gdbus-tool.c:1246 +#: gio/gdbus-tool.c:1733 #, c-format msgid "Error: %s\n" msgstr "Error: %s\n" -#: gio/gdbus-tool.c:215 gio/gdbus-tool.c:289 gio/gdbus-tool.c:1750 +#: gio/gdbus-tool.c:215 gio/gdbus-tool.c:289 gio/gdbus-tool.c:1749 #, c-format msgid "Error parsing introspection XML: %s\n" msgstr "Error al analizar la introspección XML: %s\n" @@ -1115,43 +1118,43 @@ msgid "Error: %s is not a valid name\n" msgstr "Error: %s no es un nombre válido\n" -#: gio/gdbus-tool.c:258 gio/gdbus-tool.c:748 gio/gdbus-tool.c:1066 -#: gio/gdbus-tool.c:1900 gio/gdbus-tool.c:2140 +#: gio/gdbus-tool.c:258 gio/gdbus-tool.c:747 gio/gdbus-tool.c:1065 +#: gio/gdbus-tool.c:1899 gio/gdbus-tool.c:2139 #, c-format msgid "Error: %s is not a valid object path\n" msgstr "Error: %s no es una ruta de objeto válida\n" -#: gio/gdbus-tool.c:406 +#: gio/gdbus-tool.c:405 msgid "Connect to the system bus" msgstr "Conectar con el bus del sistema" -#: gio/gdbus-tool.c:407 +#: gio/gdbus-tool.c:406 msgid "Connect to the session bus" msgstr "Conectar con el bus de sesión" -#: gio/gdbus-tool.c:408 +#: gio/gdbus-tool.c:407 msgid "Connect to given D-Bus address" msgstr "Conectar con la dirección de D-Bus proporcionada" -#: gio/gdbus-tool.c:418 +#: gio/gdbus-tool.c:417 msgid "Connection Endpoint Options:" msgstr "Opciones de conexión del extremo:" -#: gio/gdbus-tool.c:419 +#: gio/gdbus-tool.c:418 msgid "Options specifying the connection endpoint" msgstr "Opciones para especificar la conexión del extremo:" -#: gio/gdbus-tool.c:442 +#: gio/gdbus-tool.c:441 #, c-format msgid "No connection endpoint specified" msgstr "No se especificó ningún punto de conexión extremo" -#: gio/gdbus-tool.c:452 +#: gio/gdbus-tool.c:451 #, c-format msgid "Multiple connection endpoints specified" msgstr "Se especificaron varios puntos de conexión extremos" -#: gio/gdbus-tool.c:525 +#: gio/gdbus-tool.c:524 #, c-format msgid "" "Warning: According to introspection data, interface “%s” does not exist\n" @@ -1159,7 +1162,7 @@ "Advertencia: según la introspección de los datos, la interfaz «%s» no " "existe\n" -#: gio/gdbus-tool.c:534 +#: gio/gdbus-tool.c:533 #, c-format msgid "" "Warning: According to introspection data, method “%s” does not exist on " @@ -1168,165 +1171,165 @@ "Advertencia: según la introspección de los datos, el método «%s» no existe " "en la interfaz «%s»\n" -#: gio/gdbus-tool.c:596 +#: gio/gdbus-tool.c:595 msgid "Optional destination for signal (unique name)" msgstr "Destino opcional para la señal (nombre único)" -#: gio/gdbus-tool.c:597 +#: gio/gdbus-tool.c:596 msgid "Object path to emit signal on" msgstr "Ruta del objeto sobre el que emitir la señal" -#: gio/gdbus-tool.c:598 +#: gio/gdbus-tool.c:597 msgid "Signal and interface name" msgstr "Nombres de la interfaz y señal" -#: gio/gdbus-tool.c:631 +#: gio/gdbus-tool.c:630 msgid "Emit a signal." msgstr "Emitir una señal." -#: gio/gdbus-tool.c:686 gio/gdbus-tool.c:1003 gio/gdbus-tool.c:1837 -#: gio/gdbus-tool.c:2069 gio/gdbus-tool.c:2289 +#: gio/gdbus-tool.c:685 gio/gdbus-tool.c:1002 gio/gdbus-tool.c:1836 +#: gio/gdbus-tool.c:2068 gio/gdbus-tool.c:2288 #, c-format msgid "Error connecting: %s\n" msgstr "Error al conectar: %s\n" -#: gio/gdbus-tool.c:706 +#: gio/gdbus-tool.c:705 #, c-format msgid "Error: %s is not a valid unique bus name.\n" msgstr "Error: %s no es un nombre de bus único válido.\n" -#: gio/gdbus-tool.c:725 gio/gdbus-tool.c:1046 gio/gdbus-tool.c:1880 +#: gio/gdbus-tool.c:724 gio/gdbus-tool.c:1045 gio/gdbus-tool.c:1879 msgid "Error: Object path is not specified\n" msgstr "Error: no se especificó la ruta del objeto\n" -#: gio/gdbus-tool.c:768 +#: gio/gdbus-tool.c:767 msgid "Error: Signal name is not specified\n" msgstr "Error: no se especificó el nombre de la señal\n" -#: gio/gdbus-tool.c:782 +#: gio/gdbus-tool.c:781 #, c-format msgid "Error: Signal name “%s” is invalid\n" msgstr "Error: el nombre de la señal «%s» no es válido\n" -#: gio/gdbus-tool.c:794 +#: gio/gdbus-tool.c:793 #, c-format msgid "Error: %s is not a valid interface name\n" msgstr "Error: %s no es un nombre de interfaz válida\n" -#: gio/gdbus-tool.c:800 +#: gio/gdbus-tool.c:799 #, c-format msgid "Error: %s is not a valid member name\n" msgstr "Error: %s no es un nombre de miembro válido\n" #. Use the original non-"parse-me-harder" error -#: gio/gdbus-tool.c:837 gio/gdbus-tool.c:1178 +#: gio/gdbus-tool.c:836 gio/gdbus-tool.c:1177 #, c-format msgid "Error parsing parameter %d: %s\n" msgstr "Error al analizar el parámetro %d: %s\n" -#: gio/gdbus-tool.c:869 +#: gio/gdbus-tool.c:868 #, c-format msgid "Error flushing connection: %s\n" msgstr "Error al limpiar la conexión: %s\n" -#: gio/gdbus-tool.c:897 +#: gio/gdbus-tool.c:896 msgid "Destination name to invoke method on" msgstr "Nombre del detino sobre el que invocar elmétodo" -#: gio/gdbus-tool.c:898 +#: gio/gdbus-tool.c:897 msgid "Object path to invoke method on" msgstr "Ruta del objeto sobre la que invocar el método" -#: gio/gdbus-tool.c:899 +#: gio/gdbus-tool.c:898 msgid "Method and interface name" msgstr "Nombre de la interfaz y método" -#: gio/gdbus-tool.c:900 +#: gio/gdbus-tool.c:899 msgid "Timeout in seconds" msgstr "Tiempo de expiración en segundos" -#: gio/gdbus-tool.c:901 +#: gio/gdbus-tool.c:900 msgid "Allow interactive authorization" msgstr "Permitir autorización interactiva" -#: gio/gdbus-tool.c:948 +#: gio/gdbus-tool.c:947 msgid "Invoke a method on a remote object." msgstr "Invocar un método en un objeto remoto." -#: gio/gdbus-tool.c:1020 gio/gdbus-tool.c:1854 gio/gdbus-tool.c:2094 +#: gio/gdbus-tool.c:1019 gio/gdbus-tool.c:1853 gio/gdbus-tool.c:2093 msgid "Error: Destination is not specified\n" msgstr "Error: el destino no está especificado\n" -#: gio/gdbus-tool.c:1031 gio/gdbus-tool.c:1871 gio/gdbus-tool.c:2105 +#: gio/gdbus-tool.c:1030 gio/gdbus-tool.c:1870 gio/gdbus-tool.c:2104 #, c-format msgid "Error: %s is not a valid bus name\n" msgstr "Error: %s no es un nombre de bus válido\n" -#: gio/gdbus-tool.c:1081 +#: gio/gdbus-tool.c:1080 msgid "Error: Method name is not specified\n" msgstr "Error: no se especificó el nombre del método\n" -#: gio/gdbus-tool.c:1092 +#: gio/gdbus-tool.c:1091 #, c-format msgid "Error: Method name “%s” is invalid\n" msgstr "Error: el nombre del método «%s» no es válido\n" -#: gio/gdbus-tool.c:1170 +#: gio/gdbus-tool.c:1169 #, c-format msgid "Error parsing parameter %d of type “%s”: %s\n" msgstr "Error al analizar el parámetro %d del tipo «%s»: %s\n" -#: gio/gdbus-tool.c:1196 +#: gio/gdbus-tool.c:1195 #, c-format msgid "Error adding handle %d: %s\n" msgstr "Error al añadir el manejador %d: %s\n" -#: gio/gdbus-tool.c:1696 +#: gio/gdbus-tool.c:1695 msgid "Destination name to introspect" msgstr "Nombre de destino que introspeccionar" -#: gio/gdbus-tool.c:1697 +#: gio/gdbus-tool.c:1696 msgid "Object path to introspect" msgstr "Ruta del objeto que introspeccionar" -#: gio/gdbus-tool.c:1698 +#: gio/gdbus-tool.c:1697 msgid "Print XML" msgstr "Imprimir XML" -#: gio/gdbus-tool.c:1699 +#: gio/gdbus-tool.c:1698 msgid "Introspect children" msgstr "Introspeccionar hijo" -#: gio/gdbus-tool.c:1700 +#: gio/gdbus-tool.c:1699 msgid "Only print properties" msgstr "Solo mostrar propiedades" -#: gio/gdbus-tool.c:1789 +#: gio/gdbus-tool.c:1788 msgid "Introspect a remote object." msgstr "Introspeccionar un objeto remoto." -#: gio/gdbus-tool.c:1995 +#: gio/gdbus-tool.c:1994 msgid "Destination name to monitor" msgstr "Nombre de destino para monitorizar" -#: gio/gdbus-tool.c:1996 +#: gio/gdbus-tool.c:1995 msgid "Object path to monitor" msgstr "Ruta objeto para monitorizar" -#: gio/gdbus-tool.c:2021 +#: gio/gdbus-tool.c:2020 msgid "Monitor a remote object." msgstr "Monitorizar un objeto remoto." -#: gio/gdbus-tool.c:2079 +#: gio/gdbus-tool.c:2078 msgid "Error: can’t monitor a non-message-bus connection\n" msgstr "" "Error: no se puede monitorizar una conexión que no sea de mensajes del bus\n" -#: gio/gdbus-tool.c:2203 +#: gio/gdbus-tool.c:2202 msgid "Service to activate before waiting for the other one (well-known name)" msgstr "Servicio que activar antes de esperar a otro (nombre conocido)" -#: gio/gdbus-tool.c:2206 +#: gio/gdbus-tool.c:2205 msgid "" "Timeout to wait for before exiting with an error (seconds); 0 for no timeout " "(default)" @@ -1334,27 +1337,27 @@ "Tiempo que esperar antes de salir con un error (en segundos); 0 para que no " "haya tiempo de expiración (predeterminado)" -#: gio/gdbus-tool.c:2254 +#: gio/gdbus-tool.c:2253 msgid "OPTION… BUS-NAME" msgstr "OPCIÓN… NOMBRE-BUS" -#: gio/gdbus-tool.c:2255 +#: gio/gdbus-tool.c:2254 msgid "Wait for a bus name to appear." msgstr "Esperar a que aparezca el nombre del bus." -#: gio/gdbus-tool.c:2331 +#: gio/gdbus-tool.c:2330 msgid "Error: A service to activate for must be specified.\n" msgstr "Error: se debe especificar un servicio que activar.\n" -#: gio/gdbus-tool.c:2336 +#: gio/gdbus-tool.c:2335 msgid "Error: A service to wait for must be specified.\n" msgstr "Error: se debe especificar un servicio al que esperar.\n" -#: gio/gdbus-tool.c:2341 +#: gio/gdbus-tool.c:2340 msgid "Error: Too many arguments.\n" msgstr "Demasiados argumentos.\n" -#: gio/gdbus-tool.c:2349 gio/gdbus-tool.c:2356 +#: gio/gdbus-tool.c:2348 gio/gdbus-tool.c:2355 #, c-format msgid "Error: %s is not a valid well-known bus name.\n" msgstr "Error: %s no es un nombre de bus conocido válido\n" @@ -1364,40 +1367,45 @@ msgid "Not authorized to change debug settings" msgstr "No autorizado para cambiar la configuración de depuración" -#: gio/gdesktopappinfo.c:2182 gio/gdesktopappinfo.c:5112 +#: gio/gdesktopappinfo.c:2242 gio/gdesktopappinfo.c:5223 msgid "Unnamed" msgstr "Sin nombre" -#: gio/gdesktopappinfo.c:2592 +#: gio/gdesktopappinfo.c:2652 msgid "Desktop file didn’t specify Exec field" msgstr "El archivo de escritorio no especificó el campo Exec" -#: gio/gdesktopappinfo.c:2891 +#: gio/gdesktopappinfo.c:2942 msgid "Unable to find terminal required for application" msgstr "Imposible encontrar el terminal requerido por la aplicación" -#: gio/gdesktopappinfo.c:3630 +#: gio/gdesktopappinfo.c:3002 +#, c-format +msgid "Program ‘%s’ not found in $PATH" +msgstr "Programa «%s» no encontrado en $PATH" + +#: gio/gdesktopappinfo.c:3735 #, c-format msgid "Can’t create user application configuration folder %s: %s" msgstr "" "No se puede crear la carpeta de configuración de la aplicación %s del " "usuario: %s" -#: gio/gdesktopappinfo.c:3634 +#: gio/gdesktopappinfo.c:3739 #, c-format msgid "Can’t create user MIME configuration folder %s: %s" msgstr "No se puede crear la carpeta de configuración MIME %s del usuario: %s" -#: gio/gdesktopappinfo.c:3876 gio/gdesktopappinfo.c:3900 +#: gio/gdesktopappinfo.c:3981 gio/gdesktopappinfo.c:4005 msgid "Application information lacks an identifier" msgstr "La información de la aplicación carece de un identificador" -#: gio/gdesktopappinfo.c:4136 +#: gio/gdesktopappinfo.c:4241 #, c-format msgid "Can’t create user desktop file %s" msgstr "No se puede crear el archivo de escritorio %s del usuario" -#: gio/gdesktopappinfo.c:4272 +#: gio/gdesktopappinfo.c:4377 #, c-format msgid "Custom definition for %s" msgstr "Definición personalizada para %s" @@ -1470,7 +1478,7 @@ msgid "Containing mount does not exist" msgstr "El punto de montaje contenido no existe" -#: gio/gfile.c:2641 gio/glocalfile.c:2500 +#: gio/gfile.c:2641 gio/glocalfile.c:2511 msgid "Can’t copy over directory" msgstr "No se puede copiar sobre la carpeta" @@ -1515,7 +1523,7 @@ msgid "Invalid symlink value given" msgstr "El valor del enlace simbólico dado no es válido" -#: gio/gfile.c:4163 glib/gfileutils.c:2335 +#: gio/gfile.c:4163 glib/gfileutils.c:2392 msgid "Symbolic links not supported" msgstr "Enlaces simbólicos no soportados" @@ -1616,37 +1624,37 @@ msgid "HTTP proxy server closed connection unexpectedly." msgstr "El servidor proxy HTTP cerró la conexión inesperadamente." -#: gio/gicon.c:300 +#: gio/gicon.c:299 #, c-format msgid "Wrong number of tokens (%d)" msgstr "Número de tokens (%d) incorrecto" -#: gio/gicon.c:320 +#: gio/gicon.c:319 #, c-format msgid "No type for class name %s" msgstr "No existe el tipo para la clase de nombre %s" -#: gio/gicon.c:330 +#: gio/gicon.c:329 #, c-format msgid "Type %s does not implement the GIcon interface" msgstr "El tipo %s no implementa la interfaz GIcon" -#: gio/gicon.c:341 +#: gio/gicon.c:340 #, c-format msgid "Type %s is not classed" msgstr "El tipo %s no tiene clase" -#: gio/gicon.c:355 +#: gio/gicon.c:354 #, c-format msgid "Malformed version number: %s" msgstr "Número de versión mal formado: %s" -#: gio/gicon.c:369 +#: gio/gicon.c:368 #, c-format msgid "Type %s does not implement from_tokens() on the GIcon interface" msgstr "El tipo %s no implementa from_tokens() en la interfaz GIcon" -#: gio/gicon.c:471 +#: gio/gicon.c:470 msgid "Can’t handle the supplied version of the icon encoding" msgstr "" "No se puede manejar la versión proporcionada de la codificación de icono" @@ -1799,7 +1807,7 @@ #: gio/gio-tool-cat.c:135 gio/gio-tool-info.c:379 gio/gio-tool-list.c:173 #: gio/gio-tool-mkdir.c:50 gio/gio-tool-monitor.c:39 gio/gio-tool-monitor.c:41 #: gio/gio-tool-monitor.c:43 gio/gio-tool-monitor.c:45 -#: gio/gio-tool-monitor.c:206 gio/gio-tool-mount.c:1202 gio/gio-tool-open.c:72 +#: gio/gio-tool-monitor.c:206 gio/gio-tool-mount.c:1210 gio/gio-tool-open.c:72 #: gio/gio-tool-remove.c:50 gio/gio-tool-rename.c:47 gio/gio-tool-set.c:95 #: gio/gio-tool-trash.c:222 gio/gio-tool-tree.c:241 msgid "LOCATION" @@ -1820,7 +1828,7 @@ "usar algo como smb://servidor/recurso/archivo.txt como ubicación." #: gio/gio-tool-cat.c:164 gio/gio-tool-info.c:410 gio/gio-tool-mkdir.c:78 -#: gio/gio-tool-monitor.c:231 gio/gio-tool-mount.c:1253 gio/gio-tool-open.c:98 +#: gio/gio-tool-monitor.c:231 gio/gio-tool-mount.c:1261 gio/gio-tool-open.c:98 #: gio/gio-tool-remove.c:74 gio/gio-tool-trash.c:303 msgid "No locations given" msgstr "No se han proporcionado ubicaciones" @@ -2237,19 +2245,19 @@ msgid "Mount a TCRYPT system volume" msgstr "Montar un volumen de sistema TCRYPT" -#: gio/gio-tool-mount.c:268 gio/gio-tool-mount.c:300 +#: gio/gio-tool-mount.c:276 gio/gio-tool-mount.c:308 msgid "Anonymous access denied" msgstr "Acceso anónimo denegado" -#: gio/gio-tool-mount.c:525 +#: gio/gio-tool-mount.c:533 msgid "No drive for device file" msgstr "No hay unidad para el archivo de dispositivo" -#: gio/gio-tool-mount.c:1017 +#: gio/gio-tool-mount.c:1025 msgid "No volume for given ID" msgstr "No hay volumen para el ID dado" -#: gio/gio-tool-mount.c:1206 +#: gio/gio-tool-mount.c:1214 msgid "Mount or unmount the locations." msgstr "Montar o desmontar las ubicaciones." @@ -2454,7 +2462,7 @@ msgid "List contents of directories in a tree-like format." msgstr "Listar el contenido de las carpetas en forma de árbol." -#: gio/glib-compile-resources.c:142 gio/glib-compile-schemas.c:1516 +#: gio/glib-compile-resources.c:142 gio/glib-compile-schemas.c:1513 #, c-format msgid "Element <%s> not allowed inside <%s>" msgstr "No se permite el elemento <%s> dentro de <%s>" @@ -2511,7 +2519,7 @@ msgid "text may not appear inside <%s>" msgstr "El texto no debe aparecer dentro de <%s>" -#: gio/glib-compile-resources.c:821 gio/glib-compile-schemas.c:2174 +#: gio/glib-compile-resources.c:821 gio/glib-compile-schemas.c:2171 msgid "Show program version and exit" msgstr "Mostrar la versión del programa y salir" @@ -2527,8 +2535,8 @@ "La carpeta de la que se tienen que leer los archivos indicados en ARCHIVO " "(la predeterminada es la carpeta actual)" -#: gio/glib-compile-resources.c:823 gio/glib-compile-schemas.c:2175 -#: gio/glib-compile-schemas.c:2204 +#: gio/glib-compile-resources.c:823 gio/glib-compile-schemas.c:2172 +#: gio/glib-compile-schemas.c:2201 msgid "DIRECTORY" msgstr "CARPETA" @@ -2754,17 +2762,17 @@ msgid "<aliases> must contain at least one <alias>" msgstr "<aliases> debe contener al menos un <alias>" -#: gio/glib-compile-schemas.c:799 +#: gio/glib-compile-schemas.c:796 msgid "Empty names are not permitted" msgstr "No se permiten nombres vacíos" -#: gio/glib-compile-schemas.c:809 +#: gio/glib-compile-schemas.c:806 #, c-format msgid "Invalid name “%s”: names must begin with a lowercase letter" msgstr "" "Nombre «%s» no válido: los nombres deben comenzar por una letra minúscula" -#: gio/glib-compile-schemas.c:821 +#: gio/glib-compile-schemas.c:818 #, c-format msgid "" "Invalid name “%s”: invalid character “%c”; only lowercase letters, numbers " @@ -2773,36 +2781,36 @@ "Nombre «%s» no válido: el carácter «%c» no es válido; sólo se permiten " "nombres en minúscula, números y guión («-»)" -#: gio/glib-compile-schemas.c:830 +#: gio/glib-compile-schemas.c:827 #, c-format msgid "Invalid name “%s”: two successive hyphens (“--”) are not permitted" msgstr "Nombre «%s» no válido: no se permiten dos guiones seguidos («--»)" -#: gio/glib-compile-schemas.c:839 +#: gio/glib-compile-schemas.c:836 #, c-format msgid "Invalid name “%s”: the last character may not be a hyphen (“-”)" msgstr "Nombre «%s» no válido: el último carácter no puede ser un guión («-»)" -#: gio/glib-compile-schemas.c:847 +#: gio/glib-compile-schemas.c:844 #, c-format msgid "Invalid name “%s”: maximum length is 1024" msgstr "Nombre «%s» no válido: la longitud máxima es 1024" -#: gio/glib-compile-schemas.c:919 +#: gio/glib-compile-schemas.c:916 #, c-format msgid "<child name='%s'> already specified" msgstr "<child name='%s'> ya especificado" -#: gio/glib-compile-schemas.c:945 +#: gio/glib-compile-schemas.c:942 msgid "Cannot add keys to a “list-of” schema" msgstr "no se pueden añadir claves a un esquema «list-of»" -#: gio/glib-compile-schemas.c:956 +#: gio/glib-compile-schemas.c:953 #, c-format msgid "<key name='%s'> already specified" msgstr "<key name='%s'> ya especificada" -#: gio/glib-compile-schemas.c:974 +#: gio/glib-compile-schemas.c:971 #, c-format msgid "" "<key name='%s'> shadows <key name='%s'> in <schema id='%s'>; use <override> " @@ -2811,7 +2819,7 @@ "<key name='%s'> eclipsa a <key name='%s'> en <schema id='%s'>; use " "<override> para modificar el valor" -#: gio/glib-compile-schemas.c:985 +#: gio/glib-compile-schemas.c:982 #, c-format msgid "" "Exactly one of “type”, “enum” or “flags” must be specified as an attribute " @@ -2820,56 +2828,56 @@ "Se debe especificar exactamente uno de «type», «enum» o «flags» como " "atributo para <key>" -#: gio/glib-compile-schemas.c:1004 +#: gio/glib-compile-schemas.c:1001 #, c-format msgid "<%s id='%s'> not (yet) defined." msgstr "<%s id='%s'> aún no especificado." -#: gio/glib-compile-schemas.c:1019 +#: gio/glib-compile-schemas.c:1016 #, c-format msgid "Invalid GVariant type string “%s”" msgstr "Tipo de cadena GVariant «%s» no válida" -#: gio/glib-compile-schemas.c:1049 +#: gio/glib-compile-schemas.c:1046 msgid "<override> given but schema isn’t extending anything" msgstr "Se proporcionó <override> pero el esquema no extiende nada" -#: gio/glib-compile-schemas.c:1062 +#: gio/glib-compile-schemas.c:1059 #, c-format msgid "No <key name='%s'> to override" msgstr "No existe <key name='%s'> para sobrescribir" -#: gio/glib-compile-schemas.c:1070 +#: gio/glib-compile-schemas.c:1067 #, c-format msgid "<override name='%s'> already specified" msgstr "<override name='%s'> ya especificada" -#: gio/glib-compile-schemas.c:1143 +#: gio/glib-compile-schemas.c:1140 #, c-format msgid "<schema id='%s'> already specified" msgstr "<schema id='%s'> ya especificado" -#: gio/glib-compile-schemas.c:1155 +#: gio/glib-compile-schemas.c:1152 #, c-format msgid "<schema id='%s'> extends not yet existing schema “%s”" msgstr "<schema id='%s'> extiende el esquema «%s» que aún no existe" -#: gio/glib-compile-schemas.c:1171 +#: gio/glib-compile-schemas.c:1168 #, c-format msgid "<schema id='%s'> is list of not yet existing schema “%s”" msgstr "<schema id='%s'> es una lista del esquema «%s» que aún no existe" -#: gio/glib-compile-schemas.c:1179 +#: gio/glib-compile-schemas.c:1176 #, c-format msgid "Cannot be a list of a schema with a path" msgstr "No puede ser una lista de un esquema con una ruta" -#: gio/glib-compile-schemas.c:1189 +#: gio/glib-compile-schemas.c:1186 #, c-format msgid "Cannot extend a schema with a path" msgstr "No se puede extender un esquema con una ruta" -#: gio/glib-compile-schemas.c:1199 +#: gio/glib-compile-schemas.c:1196 #, c-format msgid "" "<schema id='%s'> is a list, extending <schema id='%s'> which is not a list" @@ -2877,7 +2885,7 @@ "<schema id='%s'> es una lista, extendiendo <schema id='%s'> que no es una " "lista" -#: gio/glib-compile-schemas.c:1209 +#: gio/glib-compile-schemas.c:1206 #, c-format msgid "" "<schema id='%s' list-of='%s'> extends <schema id='%s' list-of='%s'> but “%s” " @@ -2886,17 +2894,17 @@ "<schema id='%s' list-of='%s'> extiende <schema id='%s' list-of='%s'> pero " "«%s» no extiende «%s»" -#: gio/glib-compile-schemas.c:1226 +#: gio/glib-compile-schemas.c:1223 #, c-format msgid "A path, if given, must begin and end with a slash" msgstr "Si se especifica una ruta, debe comenzar y terminar con una barra" -#: gio/glib-compile-schemas.c:1233 +#: gio/glib-compile-schemas.c:1230 #, c-format msgid "The path of a list must end with “:/”" msgstr "La ruta de la lista debe terminar con «:/»" -#: gio/glib-compile-schemas.c:1242 +#: gio/glib-compile-schemas.c:1239 #, c-format msgid "" "Warning: Schema “%s” has path “%s”. Paths starting with “/apps/”, “/" @@ -2905,49 +2913,49 @@ "Advertencia: el esquema «%s» tiene la ruta «%s». Las rutas que empiezan por " "«/apps/», «/desktop/» o «/system/» están obsoletas." -#: gio/glib-compile-schemas.c:1272 +#: gio/glib-compile-schemas.c:1269 #, c-format msgid "<%s id='%s'> already specified" msgstr "<%s id='%s'> ya especificado" -#: gio/glib-compile-schemas.c:1422 gio/glib-compile-schemas.c:1438 +#: gio/glib-compile-schemas.c:1419 gio/glib-compile-schemas.c:1435 #, c-format msgid "Only one <%s> element allowed inside <%s>" msgstr "Sólo se permite un elemento <%s> dentro de <%s>" -#: gio/glib-compile-schemas.c:1520 +#: gio/glib-compile-schemas.c:1517 #, c-format msgid "Element <%s> not allowed at the top level" msgstr "No se permite el elemento <%s> en el nivel superior" -#: gio/glib-compile-schemas.c:1538 +#: gio/glib-compile-schemas.c:1535 msgid "Element <default> is required in <key>" msgstr "Se requiere el elemento <default> en <key>" -#: gio/glib-compile-schemas.c:1628 +#: gio/glib-compile-schemas.c:1625 #, c-format msgid "Text may not appear inside <%s>" msgstr "El texto no debe aparecer dentro de <%s>" -#: gio/glib-compile-schemas.c:1696 +#: gio/glib-compile-schemas.c:1693 #, c-format msgid "Warning: undefined reference to <schema id='%s'/>" msgstr "Advertencia: referencia a <schema id='%s'/> no definida" #. Translators: Do not translate "--strict". -#: gio/glib-compile-schemas.c:1835 gio/glib-compile-schemas.c:1914 +#: gio/glib-compile-schemas.c:1832 gio/glib-compile-schemas.c:1911 msgid "--strict was specified; exiting." msgstr "se especificó --strict; saliendo." -#: gio/glib-compile-schemas.c:1847 +#: gio/glib-compile-schemas.c:1844 msgid "This entire file has been ignored." msgstr "Se ha ignorado este archivo completamente." -#: gio/glib-compile-schemas.c:1910 +#: gio/glib-compile-schemas.c:1907 msgid "Ignoring this file." msgstr "Ignorando este archivo." -#: gio/glib-compile-schemas.c:1965 +#: gio/glib-compile-schemas.c:1962 #, c-format msgid "" "No such key “%s” in schema “%s” as specified in override file “%s”; ignoring " @@ -2956,7 +2964,7 @@ "No existe la clave «%s» en el esquema «%s» como se especificó en el archivo " "de sobrescritura «%s»; se ignora para esta clave." -#: gio/glib-compile-schemas.c:1973 +#: gio/glib-compile-schemas.c:1970 #, c-format msgid "" "No such key “%s” in schema “%s” as specified in override file “%s” and --" @@ -2965,7 +2973,7 @@ "No existe la clave «%s» en el esquema «%s» como se especificó en el archivo " "de sobrescritura «%s» y se ha especificado --strict; saliendo." -#: gio/glib-compile-schemas.c:1995 +#: gio/glib-compile-schemas.c:1992 #, c-format msgid "" "Cannot provide per-desktop overrides for localized key “%s” in schema " @@ -2974,7 +2982,7 @@ "No se pueden proporcionar las alternativas para la clave «%s» traducida en " "el esquema «%s» (sobrescribe el archivo %s): se ignora para esta clave." -#: gio/glib-compile-schemas.c:2004 +#: gio/glib-compile-schemas.c:2001 #, c-format msgid "" "Cannot provide per-desktop overrides for localized key “%s” in schema " @@ -2984,7 +2992,7 @@ "el esquema «%s» (sobrescribe el archivo %s) y se ha especificado --strict; " "saliendo." -#: gio/glib-compile-schemas.c:2028 +#: gio/glib-compile-schemas.c:2025 #, c-format msgid "" "Error parsing key “%s” in schema “%s” as specified in override file “%s”: " @@ -2993,7 +3001,7 @@ "Error al analizar la clave «%s» en el esquema «%s» como se especificó en el " "archivo de sobrescritura «%s»: %s; se ignora para esta clave." -#: gio/glib-compile-schemas.c:2040 +#: gio/glib-compile-schemas.c:2037 #, c-format msgid "" "Error parsing key “%s” in schema “%s” as specified in override file “%s”: " @@ -3002,7 +3010,7 @@ "Error al analizar la clave «%s» en el esquema «%s» como se especificó en el " "archivo de sobrescritura «%s»: %s y se ha especificado --strict; saliendo." -#: gio/glib-compile-schemas.c:2067 +#: gio/glib-compile-schemas.c:2064 #, c-format msgid "" "Override for key “%s” in schema “%s” in override file “%s” is outside the " @@ -3012,7 +3020,7 @@ "sobrescritura «%s» está fuera del rango proporcionado en el esquema; se " "ignora para esta clave." -#: gio/glib-compile-schemas.c:2077 +#: gio/glib-compile-schemas.c:2074 #, c-format msgid "" "Override for key “%s” in schema “%s” in override file “%s” is outside the " @@ -3022,7 +3030,7 @@ "sobrescritura «%s» está fuera del rango proporcionado en el esquema y se ha " "especificado --strict; saliendo." -#: gio/glib-compile-schemas.c:2103 +#: gio/glib-compile-schemas.c:2100 #, c-format msgid "" "Override for key “%s” in schema “%s” in override file “%s” is not in the " @@ -3032,7 +3040,7 @@ "sobrescritura «%s» no está en la lista de opciones válidas; se ignora para " "esta clave." -#: gio/glib-compile-schemas.c:2113 +#: gio/glib-compile-schemas.c:2110 #, c-format msgid "" "Override for key “%s” in schema “%s” in override file “%s” is not in the " @@ -3042,23 +3050,23 @@ "sobrescritura «%s» no está en la lista de opciones válidas y se ha " "especificado --strict; saliendo." -#: gio/glib-compile-schemas.c:2175 +#: gio/glib-compile-schemas.c:2172 msgid "Where to store the gschemas.compiled file" msgstr "Dónde almacenar el archivo gschemas.compiled" -#: gio/glib-compile-schemas.c:2176 +#: gio/glib-compile-schemas.c:2173 msgid "Abort on any errors in schemas" msgstr "Abortar ante cualquier error en los esquemas" -#: gio/glib-compile-schemas.c:2177 +#: gio/glib-compile-schemas.c:2174 msgid "Do not write the gschema.compiled file" msgstr "No escribir el archivo gschemas.compiled" -#: gio/glib-compile-schemas.c:2178 +#: gio/glib-compile-schemas.c:2175 msgid "Do not enforce key name restrictions" msgstr "No forzar las restricciones de nombre de las claves" -#: gio/glib-compile-schemas.c:2207 +#: gio/glib-compile-schemas.c:2204 msgid "" "Compile all GSettings schema files into a schema cache.\n" "Schema files are required to have the extension .gschema.xml,\n" @@ -3069,15 +3077,15 @@ "Los archivos de esquema deben tener la extensión .gschema.xml,\n" "y el archivo de caché se llama gschemas.compiled." -#: gio/glib-compile-schemas.c:2228 +#: gio/glib-compile-schemas.c:2225 msgid "You should give exactly one directory name" msgstr "Deberá proporcionar exactamente un nombre de carpeta" -#: gio/glib-compile-schemas.c:2271 +#: gio/glib-compile-schemas.c:2268 msgid "No schema files found: doing nothing." msgstr "No se encontró ningún archivo de esquemas: no se hace nada." -#: gio/glib-compile-schemas.c:2273 +#: gio/glib-compile-schemas.c:2270 msgid "No schema files found: removed existing output file." msgstr "" "No se han encontrado archivos de esquemas: se ha eliminado el archivo de " @@ -3088,7 +3096,7 @@ msgid "Invalid filename %s" msgstr "Nombre de archivo no válido %s" -#: gio/glocalfile.c:996 +#: gio/glocalfile.c:1005 #, c-format msgid "Error getting filesystem info for %s: %s" msgstr "Error al obtener la información del sistema de archivos para %s: %s" @@ -3097,125 +3105,125 @@ #. * the enclosing (user visible) mount of a file, but none #. * exists. #. -#: gio/glocalfile.c:1137 +#: gio/glocalfile.c:1141 #, c-format msgid "Containing mount for file %s not found" msgstr "No se ha encontrado el punto de montaje para el archivo %s" -#: gio/glocalfile.c:1160 +#: gio/glocalfile.c:1164 msgid "Can’t rename root directory" msgstr "No se puede renombrar la carpeta raíz" -#: gio/glocalfile.c:1178 gio/glocalfile.c:1201 +#: gio/glocalfile.c:1182 gio/glocalfile.c:1205 #, c-format msgid "Error renaming file %s: %s" msgstr "Error al leer el archivo %s: %s" -#: gio/glocalfile.c:1185 +#: gio/glocalfile.c:1189 msgid "Can’t rename file, filename already exists" msgstr "No se puede renombrar el archivo, el nombre de archivo ya existe" -#: gio/glocalfile.c:1198 gio/glocalfile.c:2394 gio/glocalfile.c:2422 -#: gio/glocalfile.c:2561 gio/glocalfileoutputstream.c:658 +#: gio/glocalfile.c:1202 gio/glocalfile.c:2405 gio/glocalfile.c:2433 +#: gio/glocalfile.c:2572 gio/glocalfileoutputstream.c:658 msgid "Invalid filename" msgstr "Nombre de archivo no válido" -#: gio/glocalfile.c:1366 gio/glocalfile.c:1377 +#: gio/glocalfile.c:1370 gio/glocalfile.c:1381 #, c-format msgid "Error opening file %s: %s" msgstr "Error al abrir el archivo %s: %s" -#: gio/glocalfile.c:1502 +#: gio/glocalfile.c:1506 #, c-format msgid "Error removing file %s: %s" msgstr "Error al eliminar el archivo %s: %s" -#: gio/glocalfile.c:1996 gio/glocalfile.c:2007 gio/glocalfile.c:2034 +#: gio/glocalfile.c:2000 gio/glocalfile.c:2011 gio/glocalfile.c:2038 #, c-format msgid "Error trashing file %s: %s" msgstr "Error al mover a la papelera el archivo %s: %s" -#: gio/glocalfile.c:2054 +#: gio/glocalfile.c:2058 #, c-format msgid "Unable to create trash directory %s: %s" msgstr "No se pudo crear la carpeta de papelera %s: %s" -#: gio/glocalfile.c:2075 +#: gio/glocalfile.c:2079 #, c-format msgid "Unable to find toplevel directory to trash %s" msgstr "No se pudo encontrar la carpeta de nivel superior para la papelera %s" -#: gio/glocalfile.c:2083 +#: gio/glocalfile.c:2087 #, c-format msgid "Trashing on system internal mounts is not supported" msgstr "Copiar (reflink/clone) entre puntos de montaje no está soportado" -#: gio/glocalfile.c:2169 gio/glocalfile.c:2197 +#: gio/glocalfile.c:2173 gio/glocalfile.c:2201 #, c-format msgid "Unable to find or create trash directory %s to trash %s" msgstr "No se pudo encontrar o crear la carpeta %s de la papelera para %s" -#: gio/glocalfile.c:2243 +#: gio/glocalfile.c:2245 #, c-format msgid "Unable to create trashing info file for %s: %s" msgstr "No se pudo crear la información de papelera para el archivo %s: %s" -#: gio/glocalfile.c:2305 +#: gio/glocalfile.c:2316 #, c-format msgid "Unable to trash file %s across filesystem boundaries" msgstr "" "No se pudo enviar a la papelera el archivo %s entre sistemas de archivos" -#: gio/glocalfile.c:2309 gio/glocalfile.c:2365 +#: gio/glocalfile.c:2320 gio/glocalfile.c:2376 #, c-format msgid "Unable to trash file %s: %s" msgstr "No se pudo enviar a la papelera el archivo %s: %s" -#: gio/glocalfile.c:2371 +#: gio/glocalfile.c:2382 #, c-format msgid "Unable to trash file %s" msgstr "No se pudo enviar a la papelera el archivo %s" -#: gio/glocalfile.c:2397 +#: gio/glocalfile.c:2408 #, c-format msgid "Error creating directory %s: %s" msgstr "Error al crear la carpeta %s: %s" -#: gio/glocalfile.c:2426 +#: gio/glocalfile.c:2437 #, c-format msgid "Filesystem does not support symbolic links" msgstr "El sistema de archivos no soporta enlaces simbólicos" -#: gio/glocalfile.c:2429 +#: gio/glocalfile.c:2440 #, c-format msgid "Error making symbolic link %s: %s" msgstr "Error al crear el enlace simbólico %s: %s" -#: gio/glocalfile.c:2472 gio/glocalfile.c:2507 gio/glocalfile.c:2564 +#: gio/glocalfile.c:2483 gio/glocalfile.c:2518 gio/glocalfile.c:2575 #, c-format msgid "Error moving file %s: %s" msgstr "Error al mover el archivo %s: %s" -#: gio/glocalfile.c:2495 +#: gio/glocalfile.c:2506 msgid "Can’t move directory over directory" msgstr "No se puede mover una carpeta sobre una carpeta" -#: gio/glocalfile.c:2521 gio/glocalfileoutputstream.c:1110 +#: gio/glocalfile.c:2532 gio/glocalfileoutputstream.c:1110 #: gio/glocalfileoutputstream.c:1124 gio/glocalfileoutputstream.c:1139 #: gio/glocalfileoutputstream.c:1156 gio/glocalfileoutputstream.c:1170 msgid "Backup file creation failed" msgstr "Falló la creación del archivo de respaldo" -#: gio/glocalfile.c:2540 +#: gio/glocalfile.c:2551 #, c-format msgid "Error removing target file: %s" msgstr "Error al eliminar el archivo destino: %s" -#: gio/glocalfile.c:2554 +#: gio/glocalfile.c:2565 msgid "Move between mounts not supported" msgstr "No se soporta mover archivos entre puntos de montaje" -#: gio/glocalfile.c:2728 +#: gio/glocalfile.c:2741 #, c-format msgid "Could not determine the disk usage of %s: %s" msgstr "No se pudo determinar el uso de disco de %s: %s" @@ -3237,122 +3245,122 @@ msgid "Error setting extended attribute “%s”: %s" msgstr "Error al establecer el atributo extendido «%s»: %s" -#: gio/glocalfileinfo.c:1738 gio/win32/gwinhttpfile.c:191 +#: gio/glocalfileinfo.c:1819 gio/win32/gwinhttpfile.c:191 msgid " (invalid encoding)" msgstr " (codificación no válida)" -#: gio/glocalfileinfo.c:1897 gio/glocalfileoutputstream.c:945 +#: gio/glocalfileinfo.c:1978 gio/glocalfileoutputstream.c:945 #: gio/glocalfileoutputstream.c:997 #, c-format msgid "Error when getting information for file “%s”: %s" msgstr "Error al obtener la información del archivo «%s»: %s" -#: gio/glocalfileinfo.c:2163 +#: gio/glocalfileinfo.c:2281 #, c-format msgid "Error when getting information for file descriptor: %s" msgstr "Error al obtener la información del descriptor del archivo: %s" -#: gio/glocalfileinfo.c:2208 +#: gio/glocalfileinfo.c:2326 msgid "Invalid attribute type (uint32 expected)" msgstr "Tipo de atributo no válido (se esperaba uint32)" -#: gio/glocalfileinfo.c:2226 +#: gio/glocalfileinfo.c:2344 msgid "Invalid attribute type (uint64 expected)" msgstr "Tipo de atributo no válido (se esperaba uint64)" -#: gio/glocalfileinfo.c:2245 gio/glocalfileinfo.c:2264 +#: gio/glocalfileinfo.c:2363 gio/glocalfileinfo.c:2382 msgid "Invalid attribute type (byte string expected)" msgstr "Tipo de atributo no válido (se esperaba una cadena byte)" -#: gio/glocalfileinfo.c:2311 +#: gio/glocalfileinfo.c:2429 msgid "Cannot set permissions on symlinks" msgstr "No se pueden establecer permisos en enlaces simbólicos" -#: gio/glocalfileinfo.c:2327 +#: gio/glocalfileinfo.c:2445 #, c-format msgid "Error setting permissions: %s" msgstr "Error al establecer permisos: %s" -#: gio/glocalfileinfo.c:2378 +#: gio/glocalfileinfo.c:2496 #, c-format msgid "Error setting owner: %s" msgstr "Error al establecer el propietario: %s" -#: gio/glocalfileinfo.c:2401 +#: gio/glocalfileinfo.c:2519 msgid "symlink must be non-NULL" msgstr "el enlace simbólico debe ser no nulo" -#: gio/glocalfileinfo.c:2411 gio/glocalfileinfo.c:2430 -#: gio/glocalfileinfo.c:2441 +#: gio/glocalfileinfo.c:2529 gio/glocalfileinfo.c:2548 +#: gio/glocalfileinfo.c:2559 #, c-format msgid "Error setting symlink: %s" msgstr "Error al establecer el enlace simbólico: %s" -#: gio/glocalfileinfo.c:2420 +#: gio/glocalfileinfo.c:2538 msgid "Error setting symlink: file is not a symlink" msgstr "" "Error al establecer el enlace simbólico: el archivo no es un enlace simbólico" -#: gio/glocalfileinfo.c:2492 +#: gio/glocalfileinfo.c:2630 #, c-format msgid "Extra nanoseconds %d for UNIX timestamp %lld are negative" msgstr "" "Los %d nanosegundos adicionales para la marca de tiempo UNIX %lld son " "negativos" -#: gio/glocalfileinfo.c:2501 +#: gio/glocalfileinfo.c:2639 #, c-format msgid "Extra nanoseconds %d for UNIX timestamp %lld reach 1 second" msgstr "" "Los %d nanosegundos adicionales para la marca de tiempo UNIX %lld alcanzan 1 " "segundo" -#: gio/glocalfileinfo.c:2511 +#: gio/glocalfileinfo.c:2649 #, c-format msgid "UNIX timestamp %lld does not fit into 64 bits" msgstr "La marca de tiempo UNIX %lld no cabe en 64 bits" -#: gio/glocalfileinfo.c:2522 +#: gio/glocalfileinfo.c:2660 #, c-format msgid "UNIX timestamp %lld is outside of the range supported by Windows" msgstr "" "La marca de tiempo UNIX %lld está fuera del rango soportado por Windows" -#: gio/glocalfileinfo.c:2625 +#: gio/glocalfileinfo.c:2792 #, c-format msgid "File name “%s” cannot be converted to UTF-16" msgstr "El nombre de archivo «%s» no se puede convertir a UTF-16" -#: gio/glocalfileinfo.c:2644 +#: gio/glocalfileinfo.c:2811 #, c-format msgid "File “%s” cannot be opened: Windows Error %lu" msgstr "No se puede abrir el archivo «%s»: error de Windows %lu" -#: gio/glocalfileinfo.c:2657 +#: gio/glocalfileinfo.c:2824 #, c-format msgid "Error setting modification or access time for file “%s”: %lu" msgstr "" "Error al establecer o modificar la hora de acceso para el archivo %s: %lu" -#: gio/glocalfileinfo.c:2798 gio/glocalfileinfo.c:2810 +#: gio/glocalfileinfo.c:2981 #, c-format msgid "Error setting modification or access time: %s" msgstr "Error al establecer o modificar el tiempo de acceso: %s" -#: gio/glocalfileinfo.c:2833 +#: gio/glocalfileinfo.c:3004 msgid "SELinux context must be non-NULL" msgstr "El contexto SELinux debe ser no nulo" -#: gio/glocalfileinfo.c:2840 +#: gio/glocalfileinfo.c:3011 msgid "SELinux is not enabled on this system" msgstr "SELinux no está activado en este sistema" -#: gio/glocalfileinfo.c:2850 +#: gio/glocalfileinfo.c:3021 #, c-format msgid "Error setting SELinux context: %s" msgstr "Error al establecer el contexto SELinux: %s" -#: gio/glocalfileinfo.c:2947 +#: gio/glocalfileinfo.c:3118 #, c-format msgid "Setting attribute %s not supported" msgstr "Establecer el atributo %s no está soportado" @@ -3401,13 +3409,13 @@ msgid "Error renaming temporary file: %s" msgstr "Error al renombrar el archivo temporal: %s" -#: gio/glocalfileoutputstream.c:611 gio/glocalfileoutputstream.c:1241 +#: gio/glocalfileoutputstream.c:611 gio/glocalfileoutputstream.c:1242 #, c-format msgid "Error truncating file: %s" msgstr "Error al truncar el archivo: %s" #: gio/glocalfileoutputstream.c:664 gio/glocalfileoutputstream.c:909 -#: gio/glocalfileoutputstream.c:1222 gio/gsubprocess.c:231 +#: gio/glocalfileoutputstream.c:1223 gio/gsubprocess.c:231 #, c-format msgid "Error opening file “%s”: %s" msgstr "Error al abrir el archivo %s: %s" @@ -3424,7 +3432,7 @@ msgid "The file was externally modified" msgstr "El archivo se modificó externamente" -#: gio/glocalfileoutputstream.c:1204 +#: gio/glocalfileoutputstream.c:1205 #, c-format msgid "Error removing old file: %s" msgstr "Error al eliminar el archivo antiguo: %s" @@ -3576,8 +3584,8 @@ #. Translators: the first placeholder is a domain name, the #. * second is an error message #: gio/gresolver.c:403 gio/gthreadedresolver.c:152 gio/gthreadedresolver.c:170 -#: gio/gthreadedresolver.c:782 gio/gthreadedresolver.c:806 -#: gio/gthreadedresolver.c:831 gio/gthreadedresolver.c:846 +#: gio/gthreadedresolver.c:798 gio/gthreadedresolver.c:822 +#: gio/gthreadedresolver.c:847 gio/gthreadedresolver.c:862 #, c-format msgid "Error resolving “%s”: %s" msgstr "Error al resolver «%s»: %s" @@ -4302,35 +4310,35 @@ #. Translators: the placeholder is a DNS record type, such as ‘MX’ or ‘SRV’ #: gio/gthreadedresolver.c:552 gio/gthreadedresolver.c:574 -#: gio/gthreadedresolver.c:612 gio/gthreadedresolver.c:659 -#: gio/gthreadedresolver.c:688 gio/gthreadedresolver.c:700 +#: gio/gthreadedresolver.c:628 gio/gthreadedresolver.c:675 +#: gio/gthreadedresolver.c:704 gio/gthreadedresolver.c:716 #, c-format msgid "Error parsing DNS %s record: malformed DNS packet" msgstr "Error al analizar el registro DNS %s: paquete DNS mal formado" -#: gio/gthreadedresolver.c:758 gio/gthreadedresolver.c:895 -#: gio/gthreadedresolver.c:993 gio/gthreadedresolver.c:1043 +#: gio/gthreadedresolver.c:774 gio/gthreadedresolver.c:911 +#: gio/gthreadedresolver.c:1009 gio/gthreadedresolver.c:1059 #, c-format msgid "No DNS record of the requested type for “%s”" msgstr "No hay un registro de DNS del tipo solicitado para «%s»" -#: gio/gthreadedresolver.c:763 gio/gthreadedresolver.c:998 +#: gio/gthreadedresolver.c:779 gio/gthreadedresolver.c:1014 #, c-format msgid "Temporarily unable to resolve “%s”" msgstr "No se puede resolver «%s» temporalmente" -#: gio/gthreadedresolver.c:768 gio/gthreadedresolver.c:1003 -#: gio/gthreadedresolver.c:1113 +#: gio/gthreadedresolver.c:784 gio/gthreadedresolver.c:1019 +#: gio/gthreadedresolver.c:1129 #, c-format msgid "Error resolving “%s”" msgstr "Error al resolver «%s»" -#: gio/gthreadedresolver.c:782 gio/gthreadedresolver.c:806 -#: gio/gthreadedresolver.c:831 gio/gthreadedresolver.c:846 +#: gio/gthreadedresolver.c:798 gio/gthreadedresolver.c:822 +#: gio/gthreadedresolver.c:847 gio/gthreadedresolver.c:862 msgid "Malformed DNS packet" msgstr "Paquete DNS mal formado" -#: gio/gthreadedresolver.c:888 +#: gio/gthreadedresolver.c:904 #, c-format msgid "Failed to parse DNS response for “%s”: " msgstr "Falló al analizar la respuesta DNS para «%s» " @@ -4457,7 +4465,7 @@ msgid "Error closing file descriptor: %s" msgstr "Error al cerrar el descriptor del archivo: %s" -#: gio/gunixmounts.c:2815 gio/gunixmounts.c:2868 +#: gio/gunixmounts.c:2817 gio/gunixmounts.c:2870 msgid "Filesystem root" msgstr "Sistema de archivos raíz" @@ -4540,79 +4548,79 @@ msgid "Wrong args\n" msgstr "Argumentos incorrectos\n" -#: glib/gbookmarkfile.c:779 +#: glib/gbookmarkfile.c:861 #, c-format msgid "Unexpected attribute “%s” for element “%s”" msgstr "Atributo inesperado «%s» para el elemento «%s»" -#: glib/gbookmarkfile.c:790 glib/gbookmarkfile.c:870 glib/gbookmarkfile.c:880 -#: glib/gbookmarkfile.c:993 +#: glib/gbookmarkfile.c:872 glib/gbookmarkfile.c:952 glib/gbookmarkfile.c:962 +#: glib/gbookmarkfile.c:1075 #, c-format msgid "Attribute “%s” of element “%s” not found" msgstr "El atributo «%s» del elemento «%s» no se ha encontrado" -#: glib/gbookmarkfile.c:1202 glib/gbookmarkfile.c:1267 -#: glib/gbookmarkfile.c:1331 glib/gbookmarkfile.c:1341 +#: glib/gbookmarkfile.c:1284 glib/gbookmarkfile.c:1349 +#: glib/gbookmarkfile.c:1413 glib/gbookmarkfile.c:1423 #, c-format msgid "Unexpected tag “%s”, tag “%s” expected" msgstr "Etiqueta «%s» inesperada, se esperaba la etiqueta «%s»" -#: glib/gbookmarkfile.c:1227 glib/gbookmarkfile.c:1241 -#: glib/gbookmarkfile.c:1309 glib/gbookmarkfile.c:1355 +#: glib/gbookmarkfile.c:1309 glib/gbookmarkfile.c:1323 +#: glib/gbookmarkfile.c:1391 glib/gbookmarkfile.c:1437 #, c-format msgid "Unexpected tag “%s” inside “%s”" msgstr "Etiqueta «%s» inesperada dentro de «%s»" -#: glib/gbookmarkfile.c:1635 +#: glib/gbookmarkfile.c:1717 #, c-format msgid "Invalid date/time ‘%s’ in bookmark file" msgstr "Fecha/hora «%s» no válida en el archivo de marcadores" -#: glib/gbookmarkfile.c:1838 +#: glib/gbookmarkfile.c:1956 msgid "No valid bookmark file found in data dirs" msgstr "" "No se pudo encontrar ningún archivo de marcadores válido en las carpetas de " "datos" -#: glib/gbookmarkfile.c:2039 +#: glib/gbookmarkfile.c:2157 #, c-format msgid "A bookmark for URI “%s” already exists" msgstr "Ya existe un marcador para el URI «%s»" -#: glib/gbookmarkfile.c:2088 glib/gbookmarkfile.c:2246 -#: glib/gbookmarkfile.c:2331 glib/gbookmarkfile.c:2411 -#: glib/gbookmarkfile.c:2496 glib/gbookmarkfile.c:2630 -#: glib/gbookmarkfile.c:2763 glib/gbookmarkfile.c:2898 -#: glib/gbookmarkfile.c:2940 glib/gbookmarkfile.c:3037 -#: glib/gbookmarkfile.c:3158 glib/gbookmarkfile.c:3352 -#: glib/gbookmarkfile.c:3493 glib/gbookmarkfile.c:3712 -#: glib/gbookmarkfile.c:3801 glib/gbookmarkfile.c:3890 -#: glib/gbookmarkfile.c:4009 +#: glib/gbookmarkfile.c:2206 glib/gbookmarkfile.c:2364 +#: glib/gbookmarkfile.c:2449 glib/gbookmarkfile.c:2529 +#: glib/gbookmarkfile.c:2614 glib/gbookmarkfile.c:2748 +#: glib/gbookmarkfile.c:2881 glib/gbookmarkfile.c:3016 +#: glib/gbookmarkfile.c:3058 glib/gbookmarkfile.c:3155 +#: glib/gbookmarkfile.c:3276 glib/gbookmarkfile.c:3470 +#: glib/gbookmarkfile.c:3611 glib/gbookmarkfile.c:3830 +#: glib/gbookmarkfile.c:3919 glib/gbookmarkfile.c:4008 +#: glib/gbookmarkfile.c:4127 #, c-format msgid "No bookmark found for URI “%s”" msgstr "No se encontró un marcador para el URI «%s»" -#: glib/gbookmarkfile.c:2420 +#: glib/gbookmarkfile.c:2538 #, c-format msgid "No MIME type defined in the bookmark for URI “%s”" msgstr "Ningún tipo MIME definido en el marcador para la URI «%s»" -#: glib/gbookmarkfile.c:2505 +#: glib/gbookmarkfile.c:2623 #, c-format msgid "No private flag has been defined in bookmark for URI “%s”" msgstr "No se ha definido ningún flag privado en el marcador para el URI «%s»" -#: glib/gbookmarkfile.c:3046 +#: glib/gbookmarkfile.c:3164 #, c-format msgid "No groups set in bookmark for URI “%s”" msgstr "No se ha establecido ningún grupo en el marcador para el URI «%s»" -#: glib/gbookmarkfile.c:3514 glib/gbookmarkfile.c:3722 +#: glib/gbookmarkfile.c:3632 glib/gbookmarkfile.c:3840 #, c-format msgid "No application with name “%s” registered a bookmark for “%s”" msgstr "Ninguna aplicación con nombre «%s» registró un marcador para «%s»" -#: glib/gbookmarkfile.c:3745 +#: glib/gbookmarkfile.c:3863 #, c-format msgid "Failed to expand exec line “%s” with URI “%s”" msgstr "Falló la expansión de lalinea ejecutable «%s» con el URI «%s»" @@ -5087,79 +5095,79 @@ msgid "Error opening directory “%s”: %s" msgstr "Falló al abrir la carpeta «%s»: %s" -#: glib/gfileutils.c:735 glib/gfileutils.c:827 +#: glib/gfileutils.c:753 glib/gfileutils.c:845 #, c-format msgid "Could not allocate %lu byte to read file “%s”" msgid_plural "Could not allocate %lu bytes to read file “%s”" msgstr0 "No se pudo asignar %lu byte para leer el archivo «%s»" msgstr1 "No se pudieron asignar %lu bytes para leer el archivo «%s»" -#: glib/gfileutils.c:752 +#: glib/gfileutils.c:770 #, c-format msgid "Error reading file “%s”: %s" msgstr "Error al leer el archivo %s: %s" -#: glib/gfileutils.c:788 +#: glib/gfileutils.c:806 #, c-format msgid "File “%s” is too large" msgstr "El archivo «%s» es demasiado grande" -#: glib/gfileutils.c:852 +#: glib/gfileutils.c:870 #, c-format msgid "Failed to read from file “%s”: %s" msgstr "Falló al leer del archivo «%s»: %s" -#: glib/gfileutils.c:902 glib/gfileutils.c:977 glib/gfileutils.c:1449 +#: glib/gfileutils.c:920 glib/gfileutils.c:995 glib/gfileutils.c:1472 #, c-format msgid "Failed to open file “%s”: %s" msgstr "Falló al abrir el archivo «%s»: %s" -#: glib/gfileutils.c:915 +#: glib/gfileutils.c:933 #, c-format msgid "Failed to get attributes of file “%s”: fstat() failed: %s" msgstr "Falló al obtener los atributos del archivo «%s»: fstat() falló: %s" -#: glib/gfileutils.c:946 +#: glib/gfileutils.c:964 #, c-format msgid "Failed to open file “%s”: fdopen() failed: %s" msgstr "Falló al abrir el archivo «%s»: fdopen() falló: %s" -#: glib/gfileutils.c:1047 +#: glib/gfileutils.c:1065 #, c-format msgid "Failed to rename file “%s” to “%s”: g_rename() failed: %s" msgstr "Falló al renombrar el archivo «%s» a «%s»: g_rename() falló: %s" -#: glib/gfileutils.c:1156 +#: glib/gfileutils.c:1179 #, c-format msgid "Failed to write file “%s”: write() failed: %s" msgstr "Falló al escribir el archivo «%s»: falló write(): %s" -#: glib/gfileutils.c:1177 +#: glib/gfileutils.c:1200 #, c-format msgid "Failed to write file “%s”: fsync() failed: %s" msgstr "Falló al escribir el archivo «%s»: falló fsync(): %s" -#: glib/gfileutils.c:1338 glib/gfileutils.c:1753 +#: glib/gfileutils.c:1361 glib/gfileutils.c:1776 #, c-format msgid "Failed to create file “%s”: %s" msgstr "Falló al crear el archivo «%s»: %s" -#: glib/gfileutils.c:1383 +#: glib/gfileutils.c:1406 #, c-format msgid "Existing file “%s” could not be removed: g_unlink() failed: %s" msgstr "El archivo existente «%s» no se pudo eliminar: g_unlink() falló: %s" -#: glib/gfileutils.c:1718 +#: glib/gfileutils.c:1741 #, c-format msgid "Template “%s” invalid, should not contain a “%s”" msgstr "La plantilla «%s» no es válida, no debería contener un «%s»" -#: glib/gfileutils.c:1731 +#: glib/gfileutils.c:1754 #, c-format msgid "Template “%s” doesn’t contain XXXXXX" msgstr "La plantilla «%s» no contiene XXXXXX" -#: glib/gfileutils.c:2291 glib/gfileutils.c:2320 +#: glib/gfileutils.c:2348 glib/gfileutils.c:2377 #, c-format msgid "Failed to read the symbolic link “%s”: %s" msgstr "Falló al leer el enlace simbólico «%s»: %s" @@ -5224,8 +5232,8 @@ msgstr "El archivo de claves contiene una codificación «%s» no soportada" #: glib/gkeyfile.c:1679 glib/gkeyfile.c:1852 glib/gkeyfile.c:3299 -#: glib/gkeyfile.c:3363 glib/gkeyfile.c:3493 glib/gkeyfile.c:3625 -#: glib/gkeyfile.c:3771 glib/gkeyfile.c:4006 glib/gkeyfile.c:4073 +#: glib/gkeyfile.c:3363 glib/gkeyfile.c:3493 glib/gkeyfile.c:3622 +#: glib/gkeyfile.c:3768 glib/gkeyfile.c:4003 glib/gkeyfile.c:4070 #, c-format msgid "Key file does not have group “%s”" msgstr "El archivo de claves no tiene el grupo «%s»" @@ -5265,32 +5273,32 @@ msgstr "" "La clave «%s» en el grupo «%s» tiene el valor «%s», pero se esperaba %s" -#: glib/gkeyfile.c:4326 +#: glib/gkeyfile.c:4323 msgid "Key file contains escape character at end of line" msgstr "" "El archivo de claves contiene un carácter de escape al final de la línea" -#: glib/gkeyfile.c:4348 +#: glib/gkeyfile.c:4345 #, c-format msgid "Key file contains invalid escape sequence “%s”" msgstr "El archivo de claves contiene la secuencia de escape no válida «%s»" -#: glib/gkeyfile.c:4493 +#: glib/gkeyfile.c:4490 #, c-format msgid "Value “%s” cannot be interpreted as a number." msgstr "El valor «%s» no puede interpretarse como un número." -#: glib/gkeyfile.c:4507 +#: glib/gkeyfile.c:4504 #, c-format msgid "Integer value “%s” out of range" msgstr "El valor entero «%s» está fuera de rango" -#: glib/gkeyfile.c:4540 +#: glib/gkeyfile.c:4537 #, c-format msgid "Value “%s” cannot be interpreted as a float number." msgstr "El valor «%s» no puede interpretarse como un número de coma flotante." -#: glib/gkeyfile.c:4579 +#: glib/gkeyfile.c:4576 #, c-format msgid "Value “%s” cannot be interpreted as a boolean." msgstr "El valor «%s» no puede interpretarse como un booleano." @@ -5311,32 +5319,32 @@ msgid "Failed to open file “%s”: open() failed: %s" msgstr "Falló al abrir el archivo «%s»: open() falló: %s" -#: glib/gmarkup.c:400 glib/gmarkup.c:442 +#: glib/gmarkup.c:393 glib/gmarkup.c:435 #, c-format msgid "Error on line %d char %d: " msgstr "Error en la línea %d, carácter %d: " -#: glib/gmarkup.c:464 glib/gmarkup.c:547 +#: glib/gmarkup.c:457 glib/gmarkup.c:540 #, c-format msgid "Invalid UTF-8 encoded text in name — not valid “%s”" msgstr "Texto codificado como UTF-8 en el nombre no válido; «%s» no es válido" -#: glib/gmarkup.c:475 +#: glib/gmarkup.c:468 #, c-format msgid "“%s” is not a valid name" msgstr "«%s» no es un nombre válido" -#: glib/gmarkup.c:491 +#: glib/gmarkup.c:484 #, c-format msgid "“%s” is not a valid name: “%c”" msgstr "«%s» no es un nombre válido: «%c»" -#: glib/gmarkup.c:615 +#: glib/gmarkup.c:608 #, c-format msgid "Error on line %d: %s" msgstr "Error en la línea %d: %s" -#: glib/gmarkup.c:692 +#: glib/gmarkup.c:685 #, c-format msgid "" "Failed to parse “%-.*s”, which should have been a digit inside a character " @@ -5346,7 +5354,7 @@ "carácter de referencia( por ejemplo ê) - tal vez el dígito es demasiado " "grande" -#: glib/gmarkup.c:704 +#: glib/gmarkup.c:697 msgid "" "Character reference did not end with a semicolon; most likely you used an " "ampersand character without intending to start an entity — escape ampersand " @@ -5356,24 +5364,24 @@ "un carácter «&» sin pretender iniciar una entidad; escape el carácter \"&\" " "como &" -#: glib/gmarkup.c:730 +#: glib/gmarkup.c:723 #, c-format msgid "Character reference “%-.*s” does not encode a permitted character" msgstr "El carácter de referencia «%-.*s» no codifica un carácter permitido" -#: glib/gmarkup.c:768 +#: glib/gmarkup.c:761 msgid "" "Empty entity “&;” seen; valid entities are: & " < > '" msgstr "" "La entidad «&;» está vacía; las entidades válidas son: & " < " "> '" -#: glib/gmarkup.c:776 +#: glib/gmarkup.c:769 #, c-format msgid "Entity name “%-.*s” is not known" msgstr "El nombre de la entidad «%-.*s» es desconocido" -#: glib/gmarkup.c:781 +#: glib/gmarkup.c:774 msgid "" "Entity did not end with a semicolon; most likely you used an ampersand " "character without intending to start an entity — escape ampersand as &" @@ -5382,11 +5390,11 @@ "\"&\" sin la intención de indicar una entidad, escape el signo \"&\" como " "&" -#: glib/gmarkup.c:1195 +#: glib/gmarkup.c:1188 msgid "Document must begin with an element (e.g. <book>)" msgstr "El documento debe comenzar con un elemento (por ejemplo: <book>)" -#: glib/gmarkup.c:1235 +#: glib/gmarkup.c:1228 #, c-format msgid "" "“%s” is not a valid character following a “<” character; it may not begin an " @@ -5395,7 +5403,7 @@ "«%s» no es un carácter válido a continuación del carácter '<'; no debe " "iniciar un nombre de elemento" -#: glib/gmarkup.c:1278 +#: glib/gmarkup.c:1271 #, c-format msgid "" "Odd character “%s”, expected a “>” character to end the empty-element tag " @@ -5404,12 +5412,12 @@ "Carácter «%s» impropio, se esperaba un carácter «>» para terminar la " "etiqueta vacía del elemento «%s»" -#: glib/gmarkup.c:1348 +#: glib/gmarkup.c:1341 #, c-format msgid "Too many attributes in element “%s”" msgstr "Demasiados atributos en el elemento «%s»" -#: glib/gmarkup.c:1368 +#: glib/gmarkup.c:1361 #, c-format msgid "" "Odd character “%s”, expected a “=” after attribute name “%s” of element “%s”" @@ -5417,7 +5425,7 @@ "Carácter «%s» impropio, se esperaba el carácter '=' después del nombre de " "atributo «%s» del elemento «%s»" -#: glib/gmarkup.c:1410 +#: glib/gmarkup.c:1403 #, c-format msgid "" "Odd character “%s”, expected a “>” or “/” character to end the start tag of " @@ -5428,7 +5436,7 @@ "etiqueta de inicio del elemento «%s» u opcionalmente un atributo; tal vez " "utilizó un carácter que no es válido en un nombre de atributo" -#: glib/gmarkup.c:1455 +#: glib/gmarkup.c:1448 #, c-format msgid "" "Odd character “%s”, expected an open quote mark after the equals sign when " @@ -5437,7 +5445,7 @@ "Carácter «%s» impropio, se esperaba una marca de apertura de comillas " "después del signo igual al darle valor al atributo «%s» del elemento «%s»" -#: glib/gmarkup.c:1589 +#: glib/gmarkup.c:1582 #, c-format msgid "" "“%s” is not a valid character following the characters “</”; “%s” may not " @@ -5446,7 +5454,7 @@ "«%s» no es un carácter válido a continuación de los caracteres '</'; «%s» " "no debe iniciar un nombre de elemento" -#: glib/gmarkup.c:1627 +#: glib/gmarkup.c:1620 #, c-format msgid "" "“%s” is not a valid character following the close element name “%s”; the " @@ -5455,27 +5463,27 @@ "«%s» no es un carácter válido a continuación del nombre del elemento de " "cierre «%s»; el carácter permitido es '>'" -#: glib/gmarkup.c:1639 +#: glib/gmarkup.c:1632 #, c-format msgid "Element “%s” was closed, no element is currently open" msgstr "Se cerró el elemento «%s», no existe ningún elemento abierto" -#: glib/gmarkup.c:1648 +#: glib/gmarkup.c:1641 #, c-format msgid "Element “%s” was closed, but the currently open element is “%s”" msgstr "" "Se cerró el elemento «%s», pero el elemento que está abierto actualmente es " "«%s»" -#: glib/gmarkup.c:1801 +#: glib/gmarkup.c:1794 msgid "Document was empty or contained only whitespace" msgstr "El documento estaba vacío o sólo contenía espacios en blanco" -#: glib/gmarkup.c:1815 +#: glib/gmarkup.c:1808 msgid "Document ended unexpectedly just after an open angle bracket “<”" msgstr "El documento termina inesperadamente justo después de un '<'" -#: glib/gmarkup.c:1823 glib/gmarkup.c:1868 +#: glib/gmarkup.c:1816 glib/gmarkup.c:1861 #, c-format msgid "" "Document ended unexpectedly with elements still open — “%s” was the last " @@ -5484,7 +5492,7 @@ "El documento termina inesperadamente con elementos todavía abiertos - «%s» " "fue el último elemento abierto" -#: glib/gmarkup.c:1831 +#: glib/gmarkup.c:1824 #, c-format msgid "" "Document ended unexpectedly, expected to see a close angle bracket ending " @@ -5493,21 +5501,21 @@ "El documento termina inesperadamente, se esperaba un carácter '>' " "finalizando la etiqueta <%s/>" -#: glib/gmarkup.c:1837 +#: glib/gmarkup.c:1830 msgid "Document ended unexpectedly inside an element name" msgstr "El documento termina inesperadamente dentro de un nombre de elemento" -#: glib/gmarkup.c:1843 +#: glib/gmarkup.c:1836 msgid "Document ended unexpectedly inside an attribute name" msgstr "El documento termina inesperadamente dentro de un nombre de atributo" -#: glib/gmarkup.c:1848 +#: glib/gmarkup.c:1841 msgid "Document ended unexpectedly inside an element-opening tag." msgstr "" "El documento terminó inesperadamente dentro de una etiqueta de apertura de " "elemento." -#: glib/gmarkup.c:1854 +#: glib/gmarkup.c:1847 msgid "" "Document ended unexpectedly after the equals sign following an attribute " "name; no attribute value" @@ -5515,25 +5523,25 @@ "El documento termina inesperadamente después de los signos igual que siguen " "al nombre de atributo; sin valor de atributo" -#: glib/gmarkup.c:1861 +#: glib/gmarkup.c:1854 msgid "Document ended unexpectedly while inside an attribute value" msgstr "El documento termina inesperadamente dentro del valor de un atributo" -#: glib/gmarkup.c:1878 +#: glib/gmarkup.c:1871 #, c-format msgid "Document ended unexpectedly inside the close tag for element “%s”" msgstr "" "El documento termina inesperadamente dentro de la etiqueta de cierre del " "elemento «%s»" -#: glib/gmarkup.c:1882 +#: glib/gmarkup.c:1875 msgid "" "Document ended unexpectedly inside the close tag for an unopened element" msgstr "" "El documento termina inesperadamente dentro de la etiqueta de cierre para un " "elemento no abierto" -#: glib/gmarkup.c:1888 +#: glib/gmarkup.c:1881 msgid "Document ended unexpectedly inside a comment or processing instruction" msgstr "" "El documento termina inesperadamente dentro de un comentario o instrucción " @@ -5598,187 +5606,187 @@ msgid "Unknown option %s" msgstr "Opción desconocida %s" -#: glib/gregex.c:436 +#: glib/gregex.c:479 msgid "corrupted object" msgstr "objeto corrupto" -#: glib/gregex.c:438 +#: glib/gregex.c:481 msgid "out of memory" msgstr "sin memoria" -#: glib/gregex.c:443 +#: glib/gregex.c:487 msgid "backtracking limit reached" msgstr "se alcanzó el límite de «backtracking»" -#: glib/gregex.c:454 glib/gregex.c:707 glib/gregex.c:736 +#: glib/gregex.c:498 msgid "internal error" msgstr "error interno" -#: glib/gregex.c:456 +#: glib/gregex.c:500 msgid "the pattern contains items not supported for partial matching" msgstr "" "el patrón contiene elementos no soportados para una coincidencia parcial" -#: glib/gregex.c:458 +#: glib/gregex.c:502 msgid "back references as conditions are not supported for partial matching" msgstr "" "no se soportan referencias anteriores como condiciones para coincidencias " "parciales" -#: glib/gregex.c:464 +#: glib/gregex.c:508 msgid "recursion limit reached" msgstr "se alcanzó el límite de recursividad" -#: glib/gregex.c:466 +#: glib/gregex.c:510 msgid "bad offset" msgstr "desplazamiento erróneo" -#: glib/gregex.c:468 +#: glib/gregex.c:512 msgid "recursion loop" msgstr "bucle de repetición" #. should not happen in GRegex since we check modes before each match -#: glib/gregex.c:471 +#: glib/gregex.c:515 msgid "matching mode is requested that was not compiled for JIT" msgstr "solicitado el modo de coincidencia que no se compiló para JIT" -#: glib/gregex.c:475 +#: glib/gregex.c:536 glib/gregex.c:1838 msgid "unknown error" msgstr "error desconocido" -#: glib/gregex.c:496 +#: glib/gregex.c:557 msgid "\\ at end of pattern" msgstr "\\ al final del patrón" -#: glib/gregex.c:500 +#: glib/gregex.c:561 msgid "\\c at end of pattern" msgstr "\\c al final del patrón" -#: glib/gregex.c:505 +#: glib/gregex.c:566 msgid "unrecognized character following \\" msgstr "carácter no reconocido después de \\" -#: glib/gregex.c:509 +#: glib/gregex.c:570 msgid "numbers out of order in {} quantifier" msgstr "números fuera de rango en el cuantificador {}" -#: glib/gregex.c:513 +#: glib/gregex.c:574 msgid "number too big in {} quantifier" msgstr "número demasiado grande en el cuantificador {}" -#: glib/gregex.c:517 +#: glib/gregex.c:578 msgid "missing terminating for character class" msgstr "falta la terminación para la clase de carácter" -#: glib/gregex.c:521 +#: glib/gregex.c:582 msgid "invalid escape sequence in character class" msgstr "secuencia de escape no válida en la clase de carácter" -#: glib/gregex.c:525 +#: glib/gregex.c:586 msgid "range out of order in character class" msgstr "rango fuera de orden en la clase de carácter" -#: glib/gregex.c:530 +#: glib/gregex.c:591 msgid "nothing to repeat" msgstr "nada que repetir" -#: glib/gregex.c:534 +#: glib/gregex.c:595 msgid "unrecognized character after (? or (?-" msgstr "carácter no reconocido después de (? o (?-" -#: glib/gregex.c:538 +#: glib/gregex.c:599 msgid "POSIX named classes are supported only within a class" msgstr "Sólo se soportan las clases con nombres POSIX dentro de una clase" -#: glib/gregex.c:542 +#: glib/gregex.c:603 msgid "POSIX collating elements are not supported" msgstr "los elementos POSIX recopilados no están soportados" -#: glib/gregex.c:548 +#: glib/gregex.c:609 msgid "missing terminating )" msgstr "falta el ) de terminación" -#: glib/gregex.c:552 +#: glib/gregex.c:613 msgid "reference to non-existent subpattern" msgstr "referencia a un subpatrón no existente" -#: glib/gregex.c:556 +#: glib/gregex.c:617 msgid "missing ) after comment" msgstr "falta ) después del comentario" -#: glib/gregex.c:560 +#: glib/gregex.c:621 msgid "regular expression is too large" msgstr "la expresión regular es demasiado larga" -#: glib/gregex.c:564 +#: glib/gregex.c:625 msgid "malformed number or name after (?(" msgstr "número o nombre mal formado después de (?(" -#: glib/gregex.c:568 +#: glib/gregex.c:629 msgid "lookbehind assertion is not fixed length" msgstr "la comprobación «lookbehind» no tiene una longitud fija" -#: glib/gregex.c:572 +#: glib/gregex.c:633 msgid "conditional group contains more than two branches" msgstr "el grupo condicional contiene más de dos ramas" -#: glib/gregex.c:576 +#: glib/gregex.c:637 msgid "assertion expected after (?(" msgstr "se esperaba una comprobación después de (?(" -#: glib/gregex.c:580 +#: glib/gregex.c:641 msgid "a numbered reference must not be zero" msgstr "una referencia con número no puede ser cero" -#: glib/gregex.c:584 +#: glib/gregex.c:645 msgid "unknown POSIX class name" msgstr "nombre de clase POSIX desconocido" -#: glib/gregex.c:589 +#: glib/gregex.c:650 msgid "character value in \\x{...} sequence is too large" msgstr "el valor del carácter en la secuencia \\x{…} es demasiado largo" -#: glib/gregex.c:593 +#: glib/gregex.c:654 msgid "\\C not allowed in lookbehind assertion" msgstr "no se permite \\C en comprobaciones «lookbehind»" -#: glib/gregex.c:597 +#: glib/gregex.c:658 msgid "missing terminator in subpattern name" msgstr "falta el terminador en el nombre del subpatrón" -#: glib/gregex.c:601 +#: glib/gregex.c:662 msgid "two named subpatterns have the same name" msgstr "dos subpatrones tienen el mismo nombre" -#: glib/gregex.c:605 +#: glib/gregex.c:666 msgid "malformed \\P or \\p sequence" msgstr "secuencia \\P o \\p mal formada" -#: glib/gregex.c:609 +#: glib/gregex.c:670 msgid "unknown property name after \\P or \\p" msgstr "nombre de propiedad desconocido después de \\P o \\p" -#: glib/gregex.c:613 +#: glib/gregex.c:674 msgid "subpattern name is too long (maximum 32 characters)" msgstr "el nombre del subpatrón es demasiado largo (máximo 32 caracteres)" -#: glib/gregex.c:617 +#: glib/gregex.c:678 msgid "too many named subpatterns (maximum 10,000)" msgstr "demasiados subpatrones con nombre (máximo 10.000)" -#: glib/gregex.c:621 +#: glib/gregex.c:682 msgid "octal value is greater than \\377" msgstr "el valor octal es mayor que \\377" -#: glib/gregex.c:625 +#: glib/gregex.c:686 msgid "DEFINE group contains more than one branch" msgstr "el grupo DEFINE contiene más de una rama" -#: glib/gregex.c:629 +#: glib/gregex.c:690 msgid "inconsistent NEWLINE options" msgstr "opciones NEWLINE inconsistentes" -#: glib/gregex.c:633 +#: glib/gregex.c:694 msgid "" "\\g is not followed by a braced, angle-bracketed, or quoted name or number, " "or by a plain number" @@ -5786,119 +5794,119 @@ "\\g no está seguido por un nombre entre llaves, corchetes angulares o número " "o entre comillas, o por un número simple" -#: glib/gregex.c:638 +#: glib/gregex.c:699 msgid "an argument is not allowed for (*ACCEPT), (*FAIL), or (*COMMIT)" msgstr "no se permite un argumento para (*ACCEPT), (*FAIL), o (*COMMIT)" -#: glib/gregex.c:642 +#: glib/gregex.c:703 msgid "(*VERB) not recognized" msgstr "(*VERB) no reconocido" -#: glib/gregex.c:646 +#: glib/gregex.c:707 msgid "number is too big" msgstr "el número es demasiado grande" -#: glib/gregex.c:650 +#: glib/gregex.c:711 msgid "missing subpattern name after (?&" msgstr "falta elnombre del subpatrón después de (?&" -#: glib/gregex.c:654 +#: glib/gregex.c:715 msgid "different names for subpatterns of the same number are not allowed" msgstr "no se permiten diferentes nombres para subpatrones del mismo número" -#: glib/gregex.c:658 +#: glib/gregex.c:719 msgid "(*MARK) must have an argument" msgstr "(*MARK) debe tener un argumento" -#: glib/gregex.c:662 +#: glib/gregex.c:723 msgid "\\c must be followed by an ASCII character" msgstr "\\c debe estar seguido de un carácter ASCII" -#: glib/gregex.c:666 +#: glib/gregex.c:727 msgid "\\k is not followed by a braced, angle-bracketed, or quoted name" msgstr "" "\\k no está seguido por un nombre entre llaves, corchetes angulares o entre " "comillas" -#: glib/gregex.c:670 +#: glib/gregex.c:731 msgid "\\N is not supported in a class" msgstr "\\N no está soportado en una clase" -#: glib/gregex.c:674 +#: glib/gregex.c:735 msgid "name is too long in (*MARK), (*PRUNE), (*SKIP), or (*THEN)" msgstr "el nombre es demasiado largo en (*MARK), (*PRUNE), (*SKIP), o (*THEN)" -#: glib/gregex.c:678 glib/gregex.c:809 +#: glib/gregex.c:739 glib/gregex.c:875 msgid "code overflow" msgstr "desbordamiento de código" -#: glib/gregex.c:682 +#: glib/gregex.c:743 msgid "unrecognized character after (?P" msgstr "carácter no reconocido después de (?P" -#: glib/gregex.c:686 +#: glib/gregex.c:747 msgid "overran compiling workspace" msgstr "se desbordó el espacio de trabajo de compilación" -#: glib/gregex.c:690 +#: glib/gregex.c:751 msgid "previously-checked referenced subpattern not found" msgstr "no se encontró el subpatrón referenciado anteriormente comprobado" -#: glib/gregex.c:808 glib/gregex.c:1041 glib/gregex.c:2342 +#: glib/gregex.c:874 glib/gregex.c:1121 glib/gregex.c:2444 #, c-format msgid "Error while matching regular expression %s: %s" msgstr "Error al coincidir con la expresión regular %s: %s" -#: glib/gregex.c:1618 +#: glib/gregex.c:1721 msgid "PCRE library is compiled without UTF8 support" msgstr "La biblioteca PCRE está compilada sin soporte para UTF8" -#: glib/gregex.c:1626 +#: glib/gregex.c:1729 msgid "PCRE library is compiled with incompatible options" msgstr "La biblioteca PCRE está compilada con opciones incompatibles" -#: glib/gregex.c:1751 +#: glib/gregex.c:1847 #, c-format msgid "Error while compiling regular expression ‘%s’ at char %s: %s" msgstr "Error al compilar la expresión regular «%s» en el carácter %s: %s" -#: glib/gregex.c:2786 +#: glib/gregex.c:2887 msgid "hexadecimal digit or “}” expected" msgstr "se esperaba un dígito hexadecimal o «}»" -#: glib/gregex.c:2802 +#: glib/gregex.c:2903 msgid "hexadecimal digit expected" msgstr "se esperaba un dígito hexadecimal" -#: glib/gregex.c:2842 +#: glib/gregex.c:2943 msgid "missing “<” in symbolic reference" msgstr "falta «<» en la referencia simbólica" -#: glib/gregex.c:2851 +#: glib/gregex.c:2952 msgid "unfinished symbolic reference" msgstr "referencia de símbolo sin terminar" -#: glib/gregex.c:2858 +#: glib/gregex.c:2959 msgid "zero-length symbolic reference" msgstr "referencia simbólica de longitud cero" -#: glib/gregex.c:2869 +#: glib/gregex.c:2970 msgid "digit expected" msgstr "se esperaba un dígito" -#: glib/gregex.c:2887 +#: glib/gregex.c:2988 msgid "illegal symbolic reference" msgstr "referencia simbólica ilegal" -#: glib/gregex.c:2950 +#: glib/gregex.c:3051 msgid "stray final “\\”" msgstr "«\\» al final de la cadena" -#: glib/gregex.c:2954 +#: glib/gregex.c:3055 msgid "unknown escape sequence" msgstr "secuencia de escape desconocida" -#: glib/gregex.c:2964 +#: glib/gregex.c:3065 #, c-format msgid "Error while parsing replacement text “%s” at char %lu: %s" msgstr "Error al analizar el texto de reemplazo «%s» en el carácter %lu: %s" @@ -5930,96 +5938,101 @@ msgid "Text was empty (or contained only whitespace)" msgstr "El texto está vacío (o sólo contiene espacios en blanco)" -#: glib/gspawn.c:314 +#: glib/gspawn.c:319 #, c-format msgid "Failed to read data from child process (%s)" msgstr "Falló en la lectura de datos desde el proceso hijo (%s)" -#: glib/gspawn.c:466 +#: glib/gspawn.c:471 #, c-format msgid "Unexpected error in reading data from a child process (%s)" msgstr "Error inesperado al leer datos desde el proceso hijo (%s)" -#: glib/gspawn.c:551 +#: glib/gspawn.c:556 #, c-format msgid "Unexpected error in waitpid() (%s)" msgstr "Falló inesperado en waitpid() (%s)" -#: glib/gspawn.c:1170 glib/gspawn-win32.c:1488 +#: glib/gspawn.c:1175 glib/gspawn-win32.c:1503 #, c-format msgid "Child process exited with code %ld" msgstr "El proceso hijo terminó con el código %ld" -#: glib/gspawn.c:1178 +#: glib/gspawn.c:1183 #, c-format msgid "Child process killed by signal %ld" msgstr "El proceso hijo terminado por la señal %ld" -#: glib/gspawn.c:1185 +#: glib/gspawn.c:1190 #, c-format msgid "Child process stopped by signal %ld" msgstr "El proceso hijo se detuvo por la señal %ld" -#: glib/gspawn.c:1192 +#: glib/gspawn.c:1197 #, c-format msgid "Child process exited abnormally" msgstr "El proceso hijo terminó de forma anormal" -#: glib/gspawn.c:1885 glib/gspawn-win32.c:393 glib/gspawn-win32.c:401 +#: glib/gspawn.c:2027 glib/gspawn-win32.c:393 glib/gspawn-win32.c:401 #, c-format msgid "Failed to read from child pipe (%s)" msgstr "Falló al leer desde el conducto hijo (%s)" -#: glib/gspawn.c:2248 +#: glib/gspawn.c:2399 #, c-format msgid "Failed to spawn child process “%s” (%s)" msgstr "Falló al ejecutar el proceso hijo «%s» (%s)" -#: glib/gspawn.c:2365 +#: glib/gspawn.c:2525 #, c-format msgid "Failed to fork (%s)" msgstr "Falló al bifurcar (fork) (%s)" -#: glib/gspawn.c:2525 glib/gspawn-win32.c:424 +#: glib/gspawn.c:2685 glib/gspawn-win32.c:424 #, c-format msgid "Failed to change to directory “%s” (%s)" msgstr "Falló al cambiar a la carpeta «%s» (%s)" -#: glib/gspawn.c:2535 +#: glib/gspawn.c:2695 #, c-format msgid "Failed to execute child process “%s” (%s)" msgstr "Falló al ejecutar el proceso hijo «%s» (%s)" -#: glib/gspawn.c:2545 +#: glib/gspawn.c:2705 #, c-format msgid "Failed to open file to remap file descriptor (%s)" msgstr "Falló al abrir el archivo para volver a mapear el descriptor: (%s)" -#: glib/gspawn.c:2553 +#: glib/gspawn.c:2713 #, c-format msgid "Failed to duplicate file descriptor for child process (%s)" msgstr "Falló al duplicar el descriptor del archivo para el proceso hijo (%s)" -#: glib/gspawn.c:2562 +#: glib/gspawn.c:2722 #, c-format msgid "Failed to fork child process (%s)" msgstr "Falló al bifurcar el proceso hijo (%s)" -#: glib/gspawn.c:2570 +#: glib/gspawn.c:2730 #, c-format msgid "Failed to close file descriptor for child process (%s)" msgstr "Falló al cerrar el descriptor del archivo para el proceso hijo (%s)" -#: glib/gspawn.c:2578 +#: glib/gspawn.c:2738 #, c-format msgid "Unknown error executing child process “%s”" msgstr "Error desconocido al ejecutar el proceso hijo «%s»" -#: glib/gspawn.c:2602 +#: glib/gspawn.c:2762 #, c-format msgid "Failed to read enough data from child pid pipe (%s)" msgstr "Falló al leer suficientes datos desde el conducto del pid hijo (%s)" +#: glib/gspawn-private.h:134 +#, c-format +msgid "Invalid source FDs argument" +msgstr "Origen de argumento de FD no válido" + #: glib/gspawn-win32.c:337 msgid "Failed to read data from child process" msgstr "Falló al leer los datos desde un proceso hijo" @@ -6039,27 +6052,27 @@ msgid "Invalid program name: %s" msgstr "Nombre de programa no válido: %s" -#: glib/gspawn-win32.c:521 glib/gspawn-win32.c:853 +#: glib/gspawn-win32.c:521 glib/gspawn-win32.c:868 #, c-format msgid "Invalid string in argument vector at %d: %s" msgstr "Cadena no válida en el vector del argumento en %d: %s" -#: glib/gspawn-win32.c:532 glib/gspawn-win32.c:869 +#: glib/gspawn-win32.c:532 glib/gspawn-win32.c:884 #, c-format msgid "Invalid string in environment: %s" msgstr "Cadena no válida en el entorno: %s" -#: glib/gspawn-win32.c:849 +#: glib/gspawn-win32.c:864 #, c-format msgid "Invalid working directory: %s" msgstr "Carpeta de trabajo no válido: %s" -#: glib/gspawn-win32.c:914 +#: glib/gspawn-win32.c:929 #, c-format msgid "Failed to execute helper program (%s)" msgstr "Falló al ejecutar el programa auxiliar (%s)" -#: glib/gspawn-win32.c:1143 +#: glib/gspawn-win32.c:1158 msgid "" "Unexpected error in g_io_channel_win32_poll() reading data from a child " "process" @@ -6067,21 +6080,21 @@ "Falló inesperado en g_io_channel_win32_poll() al leer datos desde un proceso " "hijo" -#: glib/gstrfuncs.c:3366 glib/gstrfuncs.c:3468 +#: glib/gstrfuncs.c:3370 glib/gstrfuncs.c:3472 msgid "Empty string is not a number" msgstr "Una cadena vacía no es un número" -#: glib/gstrfuncs.c:3390 +#: glib/gstrfuncs.c:3394 #, c-format msgid "“%s” is not a signed number" msgstr "«%s» no es un número con signo" -#: glib/gstrfuncs.c:3400 glib/gstrfuncs.c:3504 +#: glib/gstrfuncs.c:3404 glib/gstrfuncs.c:3508 #, c-format msgid "Number “%s” is out of bounds %s, %s" msgstr "El número «%s» está fuera de los límites %s, %s" -#: glib/gstrfuncs.c:3494 +#: glib/gstrfuncs.c:3498 #, c-format msgid "“%s” is not an unsigned number" msgstr "«%s» no es un número sin signo" @@ -6160,132 +6173,132 @@ msgstr "El carácter se sale del rango para UTF-16" #. Translators: A unit symbol for size formatting, showing for example: "13.0 kB" -#: glib/gutils.c:2857 +#: glib/gutils.c:2966 msgid "kB" msgstr "kB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 MB" -#: glib/gutils.c:2859 +#: glib/gutils.c:2968 msgid "MB" msgstr "MB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 GB" -#: glib/gutils.c:2861 +#: glib/gutils.c:2970 msgid "GB" msgstr "GB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 TB" -#: glib/gutils.c:2863 +#: glib/gutils.c:2972 msgid "TB" msgstr "TB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 PB" -#: glib/gutils.c:2865 +#: glib/gutils.c:2974 msgid "PB" msgstr "PB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 EB" -#: glib/gutils.c:2867 +#: glib/gutils.c:2976 msgid "EB" msgstr "EB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 KiB" -#: glib/gutils.c:2871 +#: glib/gutils.c:2980 msgid "KiB" msgstr "KiB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 MiB" -#: glib/gutils.c:2873 +#: glib/gutils.c:2982 msgid "MiB" msgstr "MiB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 GiB" -#: glib/gutils.c:2875 +#: glib/gutils.c:2984 msgid "GiB" msgstr "GiB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 TiB" -#: glib/gutils.c:2877 +#: glib/gutils.c:2986 msgid "TiB" msgstr "TiB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 PiB" -#: glib/gutils.c:2879 +#: glib/gutils.c:2988 msgid "PiB" msgstr "PiB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 EiB" -#: glib/gutils.c:2881 +#: glib/gutils.c:2990 msgid "EiB" msgstr "EiB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 kb" -#: glib/gutils.c:2885 +#: glib/gutils.c:2994 msgid "kb" msgstr "kb" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Mb" -#: glib/gutils.c:2887 +#: glib/gutils.c:2996 msgid "Mb" msgstr "Mb" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Gb" -#: glib/gutils.c:2889 +#: glib/gutils.c:2998 msgid "Gb" msgstr "Gb" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Tb" -#: glib/gutils.c:2891 +#: glib/gutils.c:3000 msgid "Tb" msgstr "Tb" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Pb" -#: glib/gutils.c:2893 +#: glib/gutils.c:3002 msgid "Pb" msgstr "Pb" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Eb" -#: glib/gutils.c:2895 +#: glib/gutils.c:3004 msgid "Eb" msgstr "Eb" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Kib" -#: glib/gutils.c:2899 +#: glib/gutils.c:3008 msgid "Kib" msgstr "Kib" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Mib" -#: glib/gutils.c:2901 +#: glib/gutils.c:3010 msgid "Mib" msgstr "Mib" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Gib" -#: glib/gutils.c:2903 +#: glib/gutils.c:3012 msgid "Gib" msgstr "Gib" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Tib" -#: glib/gutils.c:2905 +#: glib/gutils.c:3014 msgid "Tib" msgstr "Tib" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Pib" -#: glib/gutils.c:2907 +#: glib/gutils.c:3016 msgid "Pib" msgstr "Pib" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Eib" -#: glib/gutils.c:2909 +#: glib/gutils.c:3018 msgid "Eib" msgstr "Eib" -#: glib/gutils.c:2947 +#: glib/gutils.c:3056 msgid "byte" msgid_plural "bytes" msgstr0 "byte" msgstr1 "bytes" -#: glib/gutils.c:2951 +#: glib/gutils.c:3060 msgid "bit" msgid_plural "bits" msgstr0 "bit" @@ -6293,7 +6306,7 @@ #. Translators: The "%u" is replaced with the size value, like "13"; it could #. * be part of "13 bytes", but only the number is requested this time. -#: glib/gutils.c:2959 +#: glib/gutils.c:3068 #, c-format msgctxt "format-size" msgid "%u" @@ -6301,7 +6314,7 @@ #. Translators: The first "%u" is replaced with the value, the "%s" with a unit of the value. #. * The order can be changed with "%$2s %$1u". An example: "13 bytes" -#: glib/gutils.c:2964 +#: glib/gutils.c:3073 #, c-format msgctxt "format-size" msgid "%u %s" @@ -6309,7 +6322,7 @@ #. Translators: The "%.1f" is replaced with the size value, like "13.0"; it could #. * be part of "13.0 MB", but only the number is requested this time. -#: glib/gutils.c:3000 +#: glib/gutils.c:3109 #, c-format msgctxt "format-size" msgid "%.1f" @@ -6318,14 +6331,14 @@ #. Translators: The first "%.1f" is replaced with the value, the "%s" with a unit of the value. #. * The order can be changed with "%$2s %$1.1f". Keep the no-break space between the value and #. * the unit symbol. An example: "13.0 MB" -#: glib/gutils.c:3006 +#: glib/gutils.c:3115 #, c-format msgctxt "format-size" msgid "%.1f %s" msgstr "%.1f %s" #. Translators: the %s in "%s bytes" will always be replaced by a number. -#: glib/gutils.c:3046 +#: glib/gutils.c:3155 #, c-format msgid "%s byte" msgid_plural "%s bytes" @@ -6333,14 +6346,14 @@ msgstr1 "%s bytes" #. Translators: the %s in "%s bits" will always be replaced by a number. -#: glib/gutils.c:3051 +#: glib/gutils.c:3160 #, c-format msgid "%s bit" msgid_plural "%s bits" msgstr0 "%s bit" msgstr1 "%s bits" -#: glib/gutils.c:3092 +#: glib/gutils.c:3201 #, c-format msgid "%u byte" msgid_plural "%u bytes" @@ -6352,32 +6365,32 @@ #. * compatibility. Users will not see this string unless a program is using this deprecated function. #. * Please translate as literally as possible. #. -#: glib/gutils.c:3105 +#: glib/gutils.c:3214 #, c-format msgid "%.1f KB" msgstr "%.1f KB" -#: glib/gutils.c:3110 +#: glib/gutils.c:3219 #, c-format msgid "%.1f MB" msgstr "%.1f MB" -#: glib/gutils.c:3115 +#: glib/gutils.c:3224 #, c-format msgid "%.1f GB" msgstr "%.1f GB" -#: glib/gutils.c:3120 +#: glib/gutils.c:3229 #, c-format msgid "%.1f TB" msgstr "%.1f TB" -#: glib/gutils.c:3125 +#: glib/gutils.c:3234 #, c-format msgid "%.1f PB" msgstr "%.1f PB" -#: glib/gutils.c:3130 +#: glib/gutils.c:3239 #, c-format msgid "%.1f EB" msgstr "%.1f EB"
View file
_service:tar_scm:glib-2.74.4.tar.xz/po/eu.po -> _service:tar_scm:glib-2.76.4.tar.xz/po/eu.po
Changed
@@ -5,13 +5,13 @@ # Hizkuntza Politikarako Sailburuordetza <hizpol@ej-gv.es>, 2004. # Iñaki Larrañaga Murgoitio <dooteo@zundan.com>, 2004, 2005, 2006, 2007, 2008, 2009, 2010. # Iñaki Larrañaga Murgoitio <dooteo@zundan.com>, 2011, 2012, 2013, 2014, 2015, 2016, 2017. -# Asier Sarasua Garmendia <asiersarasua@ni.eus>, 2019, 2020, 2021, 2022. +# Asier Sarasua Garmendia <asiersarasua@ni.eus>, 2019, 2020, 2021, 2022, 2023. # msgid "" msgstr "Project-Id-Version: glib master\n" "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/glib/issues\n" -"POT-Creation-Date: 2022-08-05 19:22+0000\n" -"PO-Revision-Date: 2022-08-07 10:00+0100\n" +"POT-Creation-Date: 2023-02-15 16:30+0000\n" +"PO-Revision-Date: 2023-02-26 10:00+0100\n" "Last-Translator: Asier Sarasua Garmendia <asiersarasua@ni.eus>\n" "Language-Team: Basque <librezale@librezale.eus>\n" "Language: eu\n" @@ -20,20 +20,20 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: gio/gappinfo.c:335 +#: gio/gappinfo.c:339 msgid "Setting default applications not supported yet" msgstr "Aplikazio lehenetsia ezartzea edago onartuta oraindik" -#: gio/gappinfo.c:368 +#: gio/gappinfo.c:372 msgid "Setting application as last used for type not supported yet" msgstr "Erabilitako azken aplikazioa motarako ezartzea ez dago onartuta oraindik" -#: gio/gappinfo.c:808 +#: gio/gappinfo.c:814 #, c-format msgid "Failed to find default application for content type ‘%s’" msgstr "Huts egin du ‘%s’ eduki motarako aplikazio lehenetsia aurkitzeak" -#: gio/gappinfo.c:868 +#: gio/gappinfo.c:874 #, c-format msgid "Failed to find default application for URI Scheme ‘%s’" msgstr "Huts egin du ‘%s’ URI eskemarako aplikazio lehenetsia aurkitzeak" @@ -226,11 +226,11 @@ msgid "error sending %s message to application: %s\n" msgstr "errorea '%s' mezua aplikazioari bidaltzean: %s\n" -#: gio/gapplication-tool.c:321 +#: gio/gapplication-tool.c:324 msgid "action name must be given after application id\n" msgstr "ekintzaren izena eman behar da aplikazioaren IDaren ondoren\n" -#: gio/gapplication-tool.c:329 +#: gio/gapplication-tool.c:332 #, c-format msgid "" "invalid action name: “%s”\n" @@ -239,25 +239,25 @@ "ekintzaren izenak soilik karaktere alfanumerikoak, “-” eta “.” karaktereak\n" "eduki ditzake\n" -#: gio/gapplication-tool.c:348 +#: gio/gapplication-tool.c:351 #, c-format msgid "error parsing action parameter: %s\n" msgstr "errorea ekintzaren parametroa analizatzean: %s\n" -#: gio/gapplication-tool.c:360 +#: gio/gapplication-tool.c:363 msgid "actions accept a maximum of one parameter\n" msgstr "ekintzak gehienez parametro bat onartzen du\n" -#: gio/gapplication-tool.c:415 +#: gio/gapplication-tool.c:418 msgid "list-actions command takes only the application id" msgstr "'list-actions' komandoak soilik aplikazioaren IDa hartzen du" -#: gio/gapplication-tool.c:425 +#: gio/gapplication-tool.c:428 #, c-format msgid "unable to find desktop file for application %s\n" msgstr "ezin da '%s' aplikazioaren '.desktop' fitxategia aurkitu\n" -#: gio/gapplication-tool.c:470 +#: gio/gapplication-tool.c:473 #, c-format msgid "" "unrecognised command: %s\n" @@ -291,7 +291,7 @@ msgid "Truncate not supported on base stream" msgstr "Trunkatzea ez da onartzen oinarrizko korrontean" -#: gio/gcancellable.c:319 gio/gdbusconnection.c:1859 gio/gdbusprivate.c:1420 +#: gio/gcancellable.c:326 gio/gdbusconnection.c:1859 gio/gdbusprivate.c:1420 #: gio/gsimpleasyncresult.c:873 gio/gsimpleasyncresult.c:899 #, c-format msgid "Operation was cancelled" @@ -311,13 +311,13 @@ #: gio/gcharsetconverter.c:344 gio/gdatainputstream.c:850 #: gio/gdatainputstream.c:1268 glib/gconvert.c:451 glib/gconvert.c:883 -#: glib/giochannel.c:1576 glib/giochannel.c:1618 glib/giochannel.c:2473 +#: glib/giochannel.c:1576 glib/giochannel.c:1618 glib/giochannel.c:2478 #: glib/gutf8.c:892 glib/gutf8.c:1346 msgid "Invalid byte sequence in conversion input" msgstr "Byteen sekuentzia baliogabea bihurketa-sarreran" #: gio/gcharsetconverter.c:349 glib/gconvert.c:459 glib/gconvert.c:797 -#: glib/giochannel.c:1583 glib/giochannel.c:2485 +#: glib/giochannel.c:1583 glib/giochannel.c:2493 #, c-format msgid "Error during conversion: %s" msgstr "Errorea bihurtzean: %s" @@ -374,152 +374,152 @@ msgid "Unexpected early end-of-stream" msgstr "Ustekabeko korronte-amaiera azkarregia" -#: gio/gdbusaddress.c:164 gio/gdbusaddress.c:238 gio/gdbusaddress.c:327 +#: gio/gdbusaddress.c:162 gio/gdbusaddress.c:234 gio/gdbusaddress.c:321 #, c-format msgid "Unsupported key “%s” in address entry “%s”" msgstr "Onartu gabeko “%s” gakoa helbidearen “%s” sarreran" -#: gio/gdbusaddress.c:177 +#: gio/gdbusaddress.c:175 #, c-format msgid "Meaningless key/value pair combination in address entry “%s”" msgstr "Zentzurik gabeko gakoa/balioa bikotearen konbinazioa “%s” helbidearen sarreran" -#: gio/gdbusaddress.c:186 +#: gio/gdbusaddress.c:184 #, c-format msgid "" "Address “%s” is invalid (need exactly one of path, dir, tmpdir, or abstract " "keys)" msgstr "“%s” helbidea baliogabea da (gako hauetako bat behar du: “path” (bide-izena), “tmpdir” (aldi baterako direktorioa) edo “abstract” (abstraktua))" -#: gio/gdbusaddress.c:253 gio/gdbusaddress.c:264 gio/gdbusaddress.c:279 -#: gio/gdbusaddress.c:342 gio/gdbusaddress.c:353 +#: gio/gdbusaddress.c:249 gio/gdbusaddress.c:260 gio/gdbusaddress.c:275 +#: gio/gdbusaddress.c:336 gio/gdbusaddress.c:347 #, c-format msgid "Error in address “%s” — the “%s” attribute is malformed" msgstr "Errorea “%s” helbidean — “%s” atributua gaizki osatuta dago" -#: gio/gdbusaddress.c:423 gio/gdbusaddress.c:682 +#: gio/gdbusaddress.c:417 gio/gdbusaddress.c:676 #, c-format msgid "Unknown or unsupported transport “%s” for address “%s”" msgstr "“%2$s” helbidearen “%1$s” garraioa ezezaguna edo onartu gabea" -#: gio/gdbusaddress.c:467 +#: gio/gdbusaddress.c:461 #, c-format msgid "Address element “%s” does not contain a colon (:)" msgstr "“%s” helbidearen elementuak ez dauka bi punturik (:)" -#: gio/gdbusaddress.c:476 +#: gio/gdbusaddress.c:470 #, c-format msgid "Transport name in address element “%s” must not be empty" msgstr "“%s” helbidearen elementuko garraio-izenak ez du hutsik egon behar" -#: gio/gdbusaddress.c:497 +#: gio/gdbusaddress.c:491 #, c-format msgid "" "Key/Value pair %d, “%s”, in address element “%s” does not contain an equal " "sign" msgstr "%d. gakoa/balioa bikoteak, “%s”, “%s” helbidearen elementuan, ez dauka berdina (=) ikurrik" -#: gio/gdbusaddress.c:508 +#: gio/gdbusaddress.c:502 #, c-format msgid "" "Key/Value pair %d, “%s”, in address element “%s” must not have an empty key" msgstr "%d. gakoa/balioa bikoteak, “%s”, “%s” helbidearen elementuan, ez du gakoa hutsik eduki behar" -#: gio/gdbusaddress.c:522 +#: gio/gdbusaddress.c:516 #, c-format msgid "" "Error unescaping key or value in Key/Value pair %d, “%s”, in address element " "“%s”" msgstr "Errorea gakoa edo balioa iheseko modutik kentzean %d. gakoa/balioa bikotean, “%s”, “%s” helbidearen elementuan" -#: gio/gdbusaddress.c:590 +#: gio/gdbusaddress.c:584 #, c-format msgid "" "Error in address “%s” — the unix transport requires exactly one of the keys " "“path” or “abstract” to be set" msgstr "Errorea “%s” helbidean - unix-eko garraioak “path” edo “abstract” gakoetariko bat behar du hain zuzen." -#: gio/gdbusaddress.c:625 +#: gio/gdbusaddress.c:619 #, c-format msgid "Error in address “%s” — the host attribute is missing or malformed" msgstr "Errorea “%s” helbidean — ostalariaren atributua falta da edo gaizki osatuta dago" -#: gio/gdbusaddress.c:639 +#: gio/gdbusaddress.c:633 #, c-format msgid "Error in address “%s” — the port attribute is missing or malformed" msgstr "Errorea “%s” helbidean — atakaren atributua falta da edo gaizki osatuta dago" -#: gio/gdbusaddress.c:653 +#: gio/gdbusaddress.c:647 #, c-format msgid "Error in address “%s” — the noncefile attribute is missing or malformed" msgstr "Errorea “%s” helbidean — izendapenaren fitxategiaren atributua falta da edo gaizki osatuta dago" -#: gio/gdbusaddress.c:674 +#: gio/gdbusaddress.c:668 msgid "Error auto-launching: " msgstr "Errorea automatikoki abiaraztean: " -#: gio/gdbusaddress.c:727 +#: gio/gdbusaddress.c:721 #, c-format msgid "Error opening nonce file “%s”: %s" msgstr "Errorea “%s” izendapeneko fitxategia irekitzean: %s" -#: gio/gdbusaddress.c:746 +#: gio/gdbusaddress.c:740 #, c-format msgid "Error reading from nonce file “%s”: %s" msgstr "Errorea “%s” izendapeneko fitxategitik irakurtzean: %s" -#: gio/gdbusaddress.c:755 +#: gio/gdbusaddress.c:749 #, c-format msgid "Error reading from nonce file “%s”, expected 16 bytes, got %d" msgstr "Errorea “%s” izendapeneko fitxategitik irakurtzean: 16 byte espero ziren, baina %d lortu dira" -#: gio/gdbusaddress.c:773 +#: gio/gdbusaddress.c:767 #, c-format msgid "Error writing contents of nonce file “%s” to stream:" msgstr "Errorea “%s” izendapeneko fitxategiko edukia korrontean idaztean:" -#: gio/gdbusaddress.c:988 +#: gio/gdbusaddress.c:982 msgid "The given address is empty" msgstr "Emandako helbidea hutsik dago" -#: gio/gdbusaddress.c:1101 +#: gio/gdbusaddress.c:1095 #, c-format msgid "Cannot spawn a message bus when AT_SECURE is set" msgstr "Ezin da mezuaren deia abiarazi AT_SECURE ezarrita dagoenean" -#: gio/gdbusaddress.c:1108 +#: gio/gdbusaddress.c:1102 msgid "Cannot spawn a message bus without a machine-id: " msgstr "Ezin da mezuaren deia abiarazi makinaren IDrik gabe: " -#: gio/gdbusaddress.c:1115 +#: gio/gdbusaddress.c:1109 #, c-format msgid "Cannot autolaunch D-Bus without X11 $DISPLAY" msgstr "Ezin da D-Bus automatikoki abiarazi X11 $DISPLAY gabe" -#: gio/gdbusaddress.c:1157 +#: gio/gdbusaddress.c:1151 #, c-format msgid "Error spawning command line “%s”: " msgstr "Errorea “%s” komando-lerroa abiaraztean: " -#: gio/gdbusaddress.c:1226 +#: gio/gdbusaddress.c:1220 #, c-format msgid "Cannot determine session bus address (not implemented for this OS)" msgstr "Ezin da saioaren bus-eko helbidea zehaztu (ez dago SE honetan garatuta)" -#: gio/gdbusaddress.c:1375 gio/gdbusconnection.c:7321 +#: gio/gdbusaddress.c:1374 gio/gdbusconnection.c:7316 #, c-format msgid "" "Cannot determine bus address from DBUS_STARTER_BUS_TYPE environment variable " "— unknown value “%s”" msgstr "Ezin da bus-aren helbidea zehaztua inguruneko DBUS_STARTER_BUS_TYPE aldagaitik. “%s” balio ezezaguna" -#: gio/gdbusaddress.c:1384 gio/gdbusconnection.c:7330 +#: gio/gdbusaddress.c:1383 gio/gdbusconnection.c:7325 msgid "" "Cannot determine bus address because the DBUS_STARTER_BUS_TYPE environment " "variable is not set" msgstr "Ezin da bus-aren helbidea zehaztua, inguruneko DBUS_STARTER_BUS_TYPE aldagaia ezarri gabe dagoelako" -#: gio/gdbusaddress.c:1394 +#: gio/gdbusaddress.c:1393 #, c-format msgid "Unknown bus type %d" msgstr "%d bus mota ezezaguna" @@ -538,11 +538,15 @@ "Exhausted all available authentication mechanisms (tried: %s) (available: %s)" msgstr "Autentifikazioko metodo guztiak agortuta (saiatuta: %s) (erabilgarri: %s)" -#: gio/gdbusauth.c:1178 +#: gio/gdbusauth.c:1045 +msgid "Unexpected lack of content trying to read a byte" +msgstr "Edukiaren zati bat falta da byte bat irakurtzean" + +#: gio/gdbusauth.c:1195 msgid "User IDs must be the same for peer and server" msgstr "Erabiltzailearen IDak ID bera izan behar du parekoan eta zerbitzarian" -#: gio/gdbusauth.c:1190 +#: gio/gdbusauth.c:1207 msgid "Cancelled via GDBusAuthObserver::authorize-authenticated-peer" msgstr "Bertan behera utzita GDBusAuthObserver::authorize-authenticated-peer erabiliz" @@ -629,7 +633,7 @@ msgid "(Additionally, releasing the lock for “%s” also failed: %s) " msgstr "(Gainera, “%s”(r)en blokeoa askatzeak ere huts egin du: %s) " -#: gio/gdbusconnection.c:590 gio/gdbusconnection.c:2404 +#: gio/gdbusconnection.c:590 gio/gdbusconnection.c:2405 msgid "The connection is closed" msgstr "Konexioa itxi egin da" @@ -637,159 +641,159 @@ msgid "Timeout was reached" msgstr "Denbora-mugara iritsi da" -#: gio/gdbusconnection.c:2527 +#: gio/gdbusconnection.c:2528 msgid "" "Unsupported flags encountered when constructing a client-side connection" msgstr "Onartu gabeko banderak aurkitu dira bezeroaren aldeko konexioa eraikitzean" -#: gio/gdbusconnection.c:4256 gio/gdbusconnection.c:4610 +#: gio/gdbusconnection.c:4257 gio/gdbusconnection.c:4611 #, c-format msgid "" "No such interface “org.freedesktop.DBus.Properties” on object at path %s" msgstr "Ez dago “org.freedesktop.DBus.Properties” interfazerik %s bide-izeneko objektuan" -#: gio/gdbusconnection.c:4401 +#: gio/gdbusconnection.c:4402 #, c-format msgid "No such property “%s”" msgstr "Ez dago “%s” propietaterik" -#: gio/gdbusconnection.c:4413 +#: gio/gdbusconnection.c:4414 #, c-format msgid "Property “%s” is not readable" msgstr "“%s” propietatea ez da irakurgarria" -#: gio/gdbusconnection.c:4424 +#: gio/gdbusconnection.c:4425 #, c-format msgid "Property “%s” is not writable" msgstr "“%s” propietatea ez da idazgarria" -#: gio/gdbusconnection.c:4444 +#: gio/gdbusconnection.c:4445 #, c-format msgid "Error setting property “%s”: Expected type “%s” but got “%s”" msgstr "Errorea “%s” propietatea ezartzean: “%s” mota espero zen, baina “%s” lortu da" -#: gio/gdbusconnection.c:4549 gio/gdbusconnection.c:4764 -#: gio/gdbusconnection.c:6747 +#: gio/gdbusconnection.c:4550 gio/gdbusconnection.c:4765 +#: gio/gdbusconnection.c:6742 #, c-format msgid "No such interface “%s”" msgstr "Ez dago “%s” interfazerik" -#: gio/gdbusconnection.c:4986 gio/gdbusconnection.c:7261 +#: gio/gdbusconnection.c:4981 gio/gdbusconnection.c:7256 #, c-format msgid "No such interface “%s” on object at path %s" msgstr "Ez dago “%s” interfazerik %s bide-izeneko objektuan" -#: gio/gdbusconnection.c:5087 +#: gio/gdbusconnection.c:5082 #, c-format msgid "No such method “%s”" msgstr "Ez dago “%s” metodorik" -#: gio/gdbusconnection.c:5118 +#: gio/gdbusconnection.c:5113 #, c-format msgid "Type of message, “%s”, does not match expected type “%s”" msgstr "“%s” mezu mota ez dator bat espero zen “%s” motarekin" -#: gio/gdbusconnection.c:5321 +#: gio/gdbusconnection.c:5316 #, c-format msgid "An object is already exported for the interface %s at %s" msgstr "Jadanik objektu bat esportatuta dago %s interfazearentzako %s(e)n" -#: gio/gdbusconnection.c:5548 +#: gio/gdbusconnection.c:5543 #, c-format msgid "Unable to retrieve property %s.%s" msgstr "Ezin da %s.%s propietatea eskuratu" -#: gio/gdbusconnection.c:5604 +#: gio/gdbusconnection.c:5599 #, c-format msgid "Unable to set property %s.%s" msgstr "Ezin da %s.%s propietatea ezarri" -#: gio/gdbusconnection.c:5783 +#: gio/gdbusconnection.c:5778 #, c-format msgid "Method “%s” returned type “%s”, but expected “%s”" msgstr "“%s” metodoak “%s” mota itzuli du, baina “%s” espero zen" -#: gio/gdbusconnection.c:6859 +#: gio/gdbusconnection.c:6854 #, c-format msgid "Method “%s” on interface “%s” with signature “%s” does not exist" msgstr "“%s” metodoa, “%s” interfazekoa eta “%s” sinadura duena, ez da existitzen" -#: gio/gdbusconnection.c:6980 +#: gio/gdbusconnection.c:6975 #, c-format msgid "A subtree is already exported for %s" msgstr "Azpizuhaitza jadanik %s(e)ra esportatuta" -#: gio/gdbusconnection.c:7269 +#: gio/gdbusconnection.c:7264 #, c-format msgid "Object does not exist at path “%s”" msgstr "Objekturik ez da existitzen “%s” bide-izenean" -#: gio/gdbusmessage.c:1303 +#: gio/gdbusmessage.c:1306 msgid "type is INVALID" msgstr "mota baliogabea da" -#: gio/gdbusmessage.c:1314 +#: gio/gdbusmessage.c:1317 msgid "METHOD_CALL message: PATH or MEMBER header field is missing" msgstr "METHOD_CALL-en mezua: goiburuko PATH edo MEMBER eremua falta da" -#: gio/gdbusmessage.c:1325 +#: gio/gdbusmessage.c:1328 msgid "METHOD_RETURN message: REPLY_SERIAL header field is missing" msgstr "METHOD_RETURN-en mezua: goiburuko REPLY_SERIAL eremua falta da" -#: gio/gdbusmessage.c:1337 +#: gio/gdbusmessage.c:1340 msgid "ERROR message: REPLY_SERIAL or ERROR_NAME header field is missing" msgstr "ERROR-en mezua: goiburuko REPLY_SERIAL edo ERROR_NAME eremua falta da" -#: gio/gdbusmessage.c:1350 +#: gio/gdbusmessage.c:1353 msgid "SIGNAL message: PATH, INTERFACE or MEMBER header field is missing" msgstr "SIGNAL-en mezua: goiburuko PATH, INTERFACE edo MEMBER eremua falta da" -#: gio/gdbusmessage.c:1358 +#: gio/gdbusmessage.c:1361 msgid "" "SIGNAL message: The PATH header field is using the reserved value /org/" "freedesktop/DBus/Local" msgstr "SIGNAL-en mezua: goiburuko PATH eremua '/org/freedesktop/DBus/Local' balio erreserbatua erabiltzen ari da" -#: gio/gdbusmessage.c:1366 +#: gio/gdbusmessage.c:1369 msgid "" "SIGNAL message: The INTERFACE header field is using the reserved value org." "freedesktop.DBus.Local" msgstr "SIGNAL-en mezua: goiburuko INTERFACE eremua '/org/freedesktop/DBus/Local' balio erreserbatua erabiltzen ari da" -#: gio/gdbusmessage.c:1414 gio/gdbusmessage.c:1474 +#: gio/gdbusmessage.c:1417 gio/gdbusmessage.c:1477 #, c-format msgid "Wanted to read %lu byte but only got %lu" msgid_plural "Wanted to read %lu bytes but only got %lu" msgstr0 "byte %lu irakurtzea nahi zen, baina soilik %lu lortu da" msgstr1 "%lu byte irakurtzea nahi ziren, baina %lu lortu da" -#: gio/gdbusmessage.c:1428 +#: gio/gdbusmessage.c:1431 #, c-format msgid "Expected NUL byte after the string “%s” but found byte %d" msgstr "NUL bytea espero zen “%s” katearen ondoren, baina “%d” bytea aurkitu da" -#: gio/gdbusmessage.c:1447 +#: gio/gdbusmessage.c:1450 #, 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”" msgstr "Baliozko UTF-8 katea espero zen, baina baliogabeko byte batzuk aurkitu dira byteen %d desplazamenduan (katearen luzera: %d). Ordurarteko baliozko UTF-8 katea honakoa zen: “%s”" -#: gio/gdbusmessage.c:1511 gio/gdbusmessage.c:1787 gio/gdbusmessage.c:1998 +#: gio/gdbusmessage.c:1514 gio/gdbusmessage.c:1790 gio/gdbusmessage.c:2001 msgid "Value nested too deeply" msgstr "Balioa sakonegi habiaratuta dago" -#: gio/gdbusmessage.c:1679 +#: gio/gdbusmessage.c:1682 #, c-format msgid "Parsed value “%s” is not a valid D-Bus object path" msgstr "Analizatutako “%s” balioa ez da baliozko D-Bus objektuaren bide-izen bat" -#: gio/gdbusmessage.c:1703 +#: gio/gdbusmessage.c:1706 #, c-format msgid "Parsed value “%s” is not a valid D-Bus signature" msgstr "Analizatutako “%s” balioa ez da baliozko D-Bus sinadura" -#: gio/gdbusmessage.c:1754 +#: gio/gdbusmessage.c:1757 #, c-format msgid "" "Encountered array of length %u byte. Maximum length is 2<<26 bytes (64 MiB)." @@ -798,104 +802,104 @@ msgstr0 "%u byte luzerako matrizea aurkituta. Gehieneko luzera 2<<26 byte da (64 MiB)." msgstr1 "%u byte luzerako matrizea aurkituta. Gehieneko luzera 2<<26 byte da (64 MiB)." -#: gio/gdbusmessage.c:1774 +#: gio/gdbusmessage.c:1777 #, c-format msgid "" "Encountered array of type “a%c”, expected to have a length a multiple of %u " "bytes, but found to be %u bytes in length" msgstr "“a%c' motako matrizea aurkitu da, expected to have a length a multiple of %u byteko multiploko luzera edukitzea espero zen, baina %u byteko luzera du" -#: gio/gdbusmessage.c:1928 gio/gdbusmessage.c:2647 +#: gio/gdbusmessage.c:1931 gio/gdbusmessage.c:2650 msgid "Empty structures (tuples) are not allowed in D-Bus" msgstr "D-Bus-en ez dira hutsik dauden egiturak (tuplak) onartzen" -#: gio/gdbusmessage.c:1982 +#: gio/gdbusmessage.c:1985 #, c-format msgid "Parsed value “%s” for variant is not a valid D-Bus signature" msgstr "Analizatutako “%s” balioa aldagaiarentzat ez da baliozko D-Bus sinadura bat" -#: gio/gdbusmessage.c:2023 +#: gio/gdbusmessage.c:2026 #, c-format msgid "" "Error deserializing GVariant with type string “%s” from the D-Bus wire format" msgstr "Errorea GVariant deserializatzean “%s” kate motarekin D-Bus konexioko formatutik" -#: gio/gdbusmessage.c:2208 +#: gio/gdbusmessage.c:2211 #, c-format msgid "" "Invalid endianness value. Expected 0x6c (“l”) or 0x42 (“B”) but found value " "0x%02x" msgstr "Baliogabeko endian balioa. 0x6c (“l“) edo 0x42 (“B“) espero zen, baina 0x%02x balioa aurkitu da." -#: gio/gdbusmessage.c:2227 +#: gio/gdbusmessage.c:2230 #, c-format msgid "Invalid major protocol version. Expected 1 but found %d" msgstr "Protokoloaren bertsio nagusia baliogabea. 1 espero zen, baina %d aurkitu da" -#: gio/gdbusmessage.c:2285 gio/gdbusmessage.c:2883 +#: gio/gdbusmessage.c:2288 gio/gdbusmessage.c:2886 msgid "Signature header found but is not of type signature" msgstr "Sinaduraren goiburua aurkitu da, baina ez da sinadura motakoa" -#: gio/gdbusmessage.c:2297 +#: gio/gdbusmessage.c:2300 #, c-format msgid "Signature header with signature “%s” found but message body is empty" msgstr "Sinaduraren goiburua “%s” sinadurarekin aurkitu da, baina gorputza hutsik dago" -#: gio/gdbusmessage.c:2312 +#: gio/gdbusmessage.c:2315 #, c-format msgid "Parsed value “%s” is not a valid D-Bus signature (for body)" msgstr "Analizatutako “%s” balioa ez da baliozko D-Bus sinadura (gorputzarentzako)" -#: gio/gdbusmessage.c:2344 +#: gio/gdbusmessage.c:2347 #, 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" msgstr0 "Ez dago sinaduraren goibururik mezuan, baina mezuaren gorputzak %u byte du" msgstr1 "Ez dago sinaduraren goibururik mezuan, baina mezuaren gorputzak %u byte ditu" -#: gio/gdbusmessage.c:2354 +#: gio/gdbusmessage.c:2357 msgid "Cannot deserialize message: " msgstr "Ezin da mezua deserializatu: " -#: gio/gdbusmessage.c:2700 +#: gio/gdbusmessage.c:2703 #, c-format msgid "" "Error serializing GVariant with type string “%s” to the D-Bus wire format" msgstr "Errorea GVariant serializatzean “%s” kate motarekin D-Bus konexioaren formatura" -#: gio/gdbusmessage.c:2837 +#: gio/gdbusmessage.c:2840 #, c-format msgid "" "Number of file descriptors in message (%d) differs from header field (%d)" msgstr "Mezuko fitxategi-deskriptoreen kopurua (%d) goiburu-eremukoaren (%d) desberdina da" -#: gio/gdbusmessage.c:2845 +#: gio/gdbusmessage.c:2848 msgid "Cannot serialize message: " msgstr "Ezin da mezua serializatu: " -#: gio/gdbusmessage.c:2898 +#: gio/gdbusmessage.c:2901 #, c-format msgid "Message body has signature “%s” but there is no signature header" msgstr "Mezuaren gorputzak “%s” sinadura du, baina ez dago sinaduraren goibururik" -#: gio/gdbusmessage.c:2908 +#: gio/gdbusmessage.c:2911 #, c-format msgid "" "Message body has type signature “%s” but signature in the header field is " "“%s”" msgstr "Mezuaren gorputzak “%s” sinadura mota du, baina goiburuaren eremuko sinadura “%s” da" -#: gio/gdbusmessage.c:2924 +#: gio/gdbusmessage.c:2927 #, c-format msgid "Message body is empty but signature in the header field is “(%s)”" msgstr "Mezuaren gorputza hutsik dago, baina goiburuaren eremuko sinadura “(%s)“ da" -#: gio/gdbusmessage.c:3479 +#: gio/gdbusmessage.c:3482 #, c-format msgid "Error return with body of type “%s”" msgstr "Errorearen itzulera “'%s” motako gorputzarekin" -#: gio/gdbusmessage.c:3487 +#: gio/gdbusmessage.c:3490 msgid "Error return with empty body" msgstr "Errorearen itzulera gorputz hutsarekin" @@ -920,42 +924,42 @@ msgid "Unable to load %s or %s: " msgstr "Ezin izan da %s edo %s kargatu: " -#: gio/gdbusproxy.c:1575 +#: gio/gdbusproxy.c:1568 #, c-format msgid "Error calling StartServiceByName for %s: " msgstr "Errorea %s(r)en StartServiceByName deia egitean: " -#: gio/gdbusproxy.c:1598 +#: gio/gdbusproxy.c:1591 #, c-format msgid "Unexpected reply %d from StartServiceByName(\"%s\") method" msgstr "Ustekabeko %d erantzuna StartServiceByName(“%s”) metodotik" -#: gio/gdbusproxy.c:2709 gio/gdbusproxy.c:2844 +#: gio/gdbusproxy.c:2702 gio/gdbusproxy.c:2837 #, c-format msgid "" "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 "Ezin da metodoari deitu: proxyak jaberik gabeko %s izen ezaguna du eta G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START banderarekin eraiki zen" -#: gio/gdbusserver.c:765 +#: gio/gdbusserver.c:758 msgid "Abstract namespace not supported" msgstr "Izen abstraktuen lekua ez da onartzen" -#: gio/gdbusserver.c:857 +#: gio/gdbusserver.c:850 msgid "Cannot specify nonce file when creating a server" msgstr "Ezin da izendapeneko fitxategia zehaztu zerbitzari bat sortzean" -#: gio/gdbusserver.c:939 +#: gio/gdbusserver.c:932 #, c-format msgid "Error writing nonce file at “%s”: %s" msgstr "Errorea “%s” izendapeneko fitxategian idaztean: %s" -#: gio/gdbusserver.c:1114 +#: gio/gdbusserver.c:1107 #, c-format msgid "The string “%s” is not a valid D-Bus GUID" msgstr "“%s” katea ez da baliozko D-Bus GUID bat" -#: gio/gdbusserver.c:1152 +#: gio/gdbusserver.c:1145 #, c-format msgid "Cannot listen on unsupported transport “%s”" msgstr "Ezin da onartu gabeko “%s” garraioa entzun" @@ -982,14 +986,14 @@ "\n" "Erabili “%s KOMANDOA --help” komando bakoitzari dagokion laguntza lortzeko.\n" -#: gio/gdbus-tool.c:204 gio/gdbus-tool.c:276 gio/gdbus-tool.c:348 -#: gio/gdbus-tool.c:372 gio/gdbus-tool.c:862 gio/gdbus-tool.c:1247 -#: gio/gdbus-tool.c:1734 +#: gio/gdbus-tool.c:204 gio/gdbus-tool.c:276 gio/gdbus-tool.c:347 +#: gio/gdbus-tool.c:371 gio/gdbus-tool.c:861 gio/gdbus-tool.c:1246 +#: gio/gdbus-tool.c:1733 #, c-format msgid "Error: %s\n" msgstr "Errorea: %s\n" -#: gio/gdbus-tool.c:215 gio/gdbus-tool.c:289 gio/gdbus-tool.c:1750 +#: gio/gdbus-tool.c:215 gio/gdbus-tool.c:289 gio/gdbus-tool.c:1749 #, c-format msgid "Error parsing introspection XML: %s\n" msgstr "Errorea introspekzioko XMLa analizatzean: %s\n" @@ -999,239 +1003,239 @@ msgid "Error: %s is not a valid name\n" msgstr "Errorea: '%s' ez da baliozko izena\n" -#: gio/gdbus-tool.c:258 gio/gdbus-tool.c:748 gio/gdbus-tool.c:1066 -#: gio/gdbus-tool.c:1900 gio/gdbus-tool.c:2140 +#: gio/gdbus-tool.c:258 gio/gdbus-tool.c:747 gio/gdbus-tool.c:1065 +#: gio/gdbus-tool.c:1899 gio/gdbus-tool.c:2139 #, c-format msgid "Error: %s is not a valid object path\n" msgstr "Errorea: '%s' ez da objektuaren baliozko bide-izena\n" -#: gio/gdbus-tool.c:406 +#: gio/gdbus-tool.c:405 msgid "Connect to the system bus" msgstr "Konektatu sistemako bus-arekin" -#: gio/gdbus-tool.c:407 +#: gio/gdbus-tool.c:406 msgid "Connect to the session bus" msgstr "Konektatu saioko bus-arekin" -#: gio/gdbus-tool.c:408 +#: gio/gdbus-tool.c:407 msgid "Connect to given D-Bus address" msgstr "Konektatu emandako D-Bus helbidera" -#: gio/gdbus-tool.c:418 +#: gio/gdbus-tool.c:417 msgid "Connection Endpoint Options:" msgstr "Konexioaren amaierako puntuaren aukerak:" -#: gio/gdbus-tool.c:419 +#: gio/gdbus-tool.c:418 msgid "Options specifying the connection endpoint" msgstr "Aukerak konexioaren amaierako puntua zehaztuz" -#: gio/gdbus-tool.c:442 +#: gio/gdbus-tool.c:441 #, c-format msgid "No connection endpoint specified" msgstr "Ez da konexioaren amaierako punturik zehaztu" -#: gio/gdbus-tool.c:452 +#: gio/gdbus-tool.c:451 #, c-format msgid "Multiple connection endpoints specified" msgstr "Konexioaren hainbat amaierako puntu zehaztu dira" -#: gio/gdbus-tool.c:525 +#: gio/gdbus-tool.c:524 #, c-format msgid "" "Warning: According to introspection data, interface “%s” does not exist\n" msgstr "Abisua: introspekzioko datuen arabera, “%s” interfazea ez da existitzen\n" -#: gio/gdbus-tool.c:534 +#: gio/gdbus-tool.c:533 #, c-format msgid "" "Warning: According to introspection data, method “%s” does not exist on " "interface “%s”\n" msgstr "Abisua: introspekzioko datuen arabera, “%s” metodoa ez da existitzen “%s” interfazean\n" -#: gio/gdbus-tool.c:596 +#: gio/gdbus-tool.c:595 msgid "Optional destination for signal (unique name)" msgstr "Seinalearen aukerazko helburua (izen esklusiboa)" -#: gio/gdbus-tool.c:597 +#: gio/gdbus-tool.c:596 msgid "Object path to emit signal on" msgstr "Objektuaren bide-izena bere gainera seinalea igortzeko" -#: gio/gdbus-tool.c:598 +#: gio/gdbus-tool.c:597 msgid "Signal and interface name" msgstr "Seinale eta interfazearen izena" -#: gio/gdbus-tool.c:631 +#: gio/gdbus-tool.c:630 msgid "Emit a signal." msgstr "Igorri seinale bat." -#: gio/gdbus-tool.c:686 gio/gdbus-tool.c:1003 gio/gdbus-tool.c:1837 -#: gio/gdbus-tool.c:2069 gio/gdbus-tool.c:2289 +#: gio/gdbus-tool.c:685 gio/gdbus-tool.c:1002 gio/gdbus-tool.c:1836 +#: gio/gdbus-tool.c:2068 gio/gdbus-tool.c:2288 #, c-format msgid "Error connecting: %s\n" msgstr "Errorea konektatzean: %s\n" -#: gio/gdbus-tool.c:706 +#: gio/gdbus-tool.c:705 #, c-format msgid "Error: %s is not a valid unique bus name.\n" msgstr "Errorea: '%s' ez da bus-aren baliozko izen esklusiboa\n" -#: gio/gdbus-tool.c:725 gio/gdbus-tool.c:1046 gio/gdbus-tool.c:1880 +#: gio/gdbus-tool.c:724 gio/gdbus-tool.c:1045 gio/gdbus-tool.c:1879 msgid "Error: Object path is not specified\n" msgstr "Errorea: objektuaren bide-izena ez dago zehaztuta\n" -#: gio/gdbus-tool.c:768 +#: gio/gdbus-tool.c:767 msgid "Error: Signal name is not specified\n" msgstr "Errorea: seinalearen izena ez dago zehaztuta\n" -#: gio/gdbus-tool.c:782 +#: gio/gdbus-tool.c:781 #, c-format msgid "Error: Signal name “%s” is invalid\n" msgstr "Errorea: “%s” seinalearen izena baliogabea da\n" -#: gio/gdbus-tool.c:794 +#: gio/gdbus-tool.c:793 #, c-format msgid "Error: %s is not a valid interface name\n" msgstr "Errorea: '%s' ez da interfazearen baliozko izena\n" -#: gio/gdbus-tool.c:800 +#: gio/gdbus-tool.c:799 #, c-format msgid "Error: %s is not a valid member name\n" msgstr "Errorea: '%s' ez da kidearen baliozko izena\n" #. Use the original non-"parse-me-harder" error -#: gio/gdbus-tool.c:837 gio/gdbus-tool.c:1178 +#: gio/gdbus-tool.c:836 gio/gdbus-tool.c:1177 #, c-format msgid "Error parsing parameter %d: %s\n" msgstr "Errorea %d parametroa analizatzean: %s\n" -#: gio/gdbus-tool.c:869 +#: gio/gdbus-tool.c:868 #, c-format msgid "Error flushing connection: %s\n" msgstr "Errorea konexioa garbitzean: %s\n" -#: gio/gdbus-tool.c:897 +#: gio/gdbus-tool.c:896 msgid "Destination name to invoke method on" msgstr "Helburuaren izena metodoari deitzeko" -#: gio/gdbus-tool.c:898 +#: gio/gdbus-tool.c:897 msgid "Object path to invoke method on" msgstr "Objektuaren bide-izena metodoari deitzeko" -#: gio/gdbus-tool.c:899 +#: gio/gdbus-tool.c:898 msgid "Method and interface name" msgstr "Metodo eta interfazearen izena" -#: gio/gdbus-tool.c:900 +#: gio/gdbus-tool.c:899 msgid "Timeout in seconds" msgstr "Denbora-muga (segundotan)" -#: gio/gdbus-tool.c:901 +#: gio/gdbus-tool.c:900 msgid "Allow interactive authorization" msgstr "Onartu baimen dinamikoa" -#: gio/gdbus-tool.c:948 +#: gio/gdbus-tool.c:947 msgid "Invoke a method on a remote object." msgstr "Deitu metodo bati urruneko objektu batean." -#: gio/gdbus-tool.c:1020 gio/gdbus-tool.c:1854 gio/gdbus-tool.c:2094 +#: gio/gdbus-tool.c:1019 gio/gdbus-tool.c:1853 gio/gdbus-tool.c:2093 msgid "Error: Destination is not specified\n" msgstr "Errorea: helburua ez dago zehaztuta\n" -#: gio/gdbus-tool.c:1031 gio/gdbus-tool.c:1871 gio/gdbus-tool.c:2105 +#: gio/gdbus-tool.c:1030 gio/gdbus-tool.c:1870 gio/gdbus-tool.c:2104 #, c-format msgid "Error: %s is not a valid bus name\n" msgstr "Errorea: '%s' ez da busaren baliozko izena\n" -#: gio/gdbus-tool.c:1081 +#: gio/gdbus-tool.c:1080 msgid "Error: Method name is not specified\n" msgstr "Errorea: metodoaren izena ez dago zehaztuta\n" -#: gio/gdbus-tool.c:1092 +#: gio/gdbus-tool.c:1091 #, c-format msgid "Error: Method name “%s” is invalid\n" msgstr "Errorea: “%s” metodoaren izena baliogabea da\n" -#: gio/gdbus-tool.c:1170 +#: gio/gdbus-tool.c:1169 #, c-format msgid "Error parsing parameter %d of type “%s”: %s\n" msgstr "Errorea “%2$s” motako %1$d parametroa analizatzean: %3$s\n" -#: gio/gdbus-tool.c:1196 +#: gio/gdbus-tool.c:1195 #, c-format msgid "Error adding handle %d: %s\n" msgstr "Errorea %d heldulekua gehitzean: %s\n" -#: gio/gdbus-tool.c:1696 +#: gio/gdbus-tool.c:1695 msgid "Destination name to introspect" msgstr "Helburuko izena introspekzioa egiteko" -#: gio/gdbus-tool.c:1697 +#: gio/gdbus-tool.c:1696 msgid "Object path to introspect" msgstr "Objektuaren bide-izena introspekzioa egiteko" -#: gio/gdbus-tool.c:1698 +#: gio/gdbus-tool.c:1697 msgid "Print XML" msgstr "Inprimatu XML" -#: gio/gdbus-tool.c:1699 +#: gio/gdbus-tool.c:1698 msgid "Introspect children" msgstr "Aztertu umeen barnean" -#: gio/gdbus-tool.c:1700 +#: gio/gdbus-tool.c:1699 msgid "Only print properties" msgstr "Soilik inprimatzeko propietateak" -#: gio/gdbus-tool.c:1789 +#: gio/gdbus-tool.c:1788 msgid "Introspect a remote object." msgstr "Urruneko objektu baten introspekzioa egin." -#: gio/gdbus-tool.c:1995 +#: gio/gdbus-tool.c:1994 msgid "Destination name to monitor" msgstr "Helburuko izena monitorizatzeko" -#: gio/gdbus-tool.c:1996 +#: gio/gdbus-tool.c:1995 msgid "Object path to monitor" msgstr "Objektuaren bide-izena monitorizatzeko" -#: gio/gdbus-tool.c:2021 +#: gio/gdbus-tool.c:2020 msgid "Monitor a remote object." msgstr "Monitorizatu urruneko objektu bat." -#: gio/gdbus-tool.c:2079 +#: gio/gdbus-tool.c:2078 msgid "Error: can’t monitor a non-message-bus connection\n" msgstr "Errorea: ezin da monitorizatu non-message-bus konexio bat\n" -#: gio/gdbus-tool.c:2203 +#: gio/gdbus-tool.c:2202 msgid "Service to activate before waiting for the other one (well-known name)" msgstr "Aktibatu beharreko zerbitzua bestearen (izen ezaguna) zain egon aurretik" -#: gio/gdbus-tool.c:2206 +#: gio/gdbus-tool.c:2205 msgid "" "Timeout to wait for before exiting with an error (seconds); 0 for no timeout " "(default)" msgstr "Denbora-muga errore batekin irten aurretik zain egoteko (segundotan); 0 denbora-mugarik ez (lehenetsia)" -#: gio/gdbus-tool.c:2254 +#: gio/gdbus-tool.c:2253 msgid "OPTION… BUS-NAME" msgstr "AUKERA… BUS-IZENA" -#: gio/gdbus-tool.c:2255 +#: gio/gdbus-tool.c:2254 msgid "Wait for a bus name to appear." msgstr "Bus-izen bat agertzeko zain egon." -#: gio/gdbus-tool.c:2331 +#: gio/gdbus-tool.c:2330 msgid "Error: A service to activate for must be specified.\n" msgstr "Errorea: zerbitzua zehaztu behar da aktibatzeko.\n" -#: gio/gdbus-tool.c:2336 +#: gio/gdbus-tool.c:2335 msgid "Error: A service to wait for must be specified.\n" msgstr "Errorea: zerbitzua zehaztu behar da haren zain egoteko.\n" -#: gio/gdbus-tool.c:2341 +#: gio/gdbus-tool.c:2340 msgid "Error: Too many arguments.\n" msgstr "Errorea: argumentu gehiegi.\n" -#: gio/gdbus-tool.c:2349 gio/gdbus-tool.c:2356 +#: gio/gdbus-tool.c:2348 gio/gdbus-tool.c:2355 #, c-format msgid "Error: %s is not a valid well-known bus name.\n" msgstr "Errorea: '%s' ez da busaren izen ezagun bat\n" @@ -1241,38 +1245,43 @@ msgid "Not authorized to change debug settings" msgstr "Ez duzu arazketa-ezarpenak aldatzeko baimenik" -#: gio/gdesktopappinfo.c:2182 gio/gdesktopappinfo.c:5113 +#: gio/gdesktopappinfo.c:2242 gio/gdesktopappinfo.c:5223 msgid "Unnamed" msgstr "Izengabea" -#: gio/gdesktopappinfo.c:2592 +#: gio/gdesktopappinfo.c:2652 msgid "Desktop file didn’t specify Exec field" msgstr "Mahaigaineko fitxategiak ez du Exec eremua zehaztu" -#: gio/gdesktopappinfo.c:2891 +#: gio/gdesktopappinfo.c:2942 msgid "Unable to find terminal required for application" msgstr "Ezin izan da aplikazioak eskatzen duen terminala aurkitu" -#: gio/gdesktopappinfo.c:3631 +#: gio/gdesktopappinfo.c:3002 +#, c-format +msgid "Program ‘%s’ not found in $PATH" +msgstr "Ez da aurkitu ‘%s’ programa $PATH bidean" + +#: gio/gdesktopappinfo.c:3735 #, c-format msgid "Can’t create user application configuration folder %s: %s" msgstr "Ezin da erabiltzailearen aplikazioaren %s konfigurazio-karpeta sortu: %s" -#: gio/gdesktopappinfo.c:3635 +#: gio/gdesktopappinfo.c:3739 #, c-format msgid "Can’t create user MIME configuration folder %s: %s" msgstr "Ezin da erabiltzailearen MIMEren %s konfigurazio-karpeta sortu: %s" -#: gio/gdesktopappinfo.c:3877 gio/gdesktopappinfo.c:3901 +#: gio/gdesktopappinfo.c:3981 gio/gdesktopappinfo.c:4005 msgid "Application information lacks an identifier" msgstr "Aplikazioaren informazioari identifikatzaile bat falta zaio" -#: gio/gdesktopappinfo.c:4137 +#: gio/gdesktopappinfo.c:4241 #, c-format msgid "Can’t create user desktop file %s" msgstr "Ezin da erabiltzailearen mahaigaineko %s fitxategia sortu" -#: gio/gdesktopappinfo.c:4273 +#: gio/gdesktopappinfo.c:4377 #, c-format msgid "Custom definition for %s" msgstr "%s(r)en definizio pertsonalizatua" @@ -1345,7 +1354,7 @@ msgid "Containing mount does not exist" msgstr "Ontziaren muntaia ez da existitzen" -#: gio/gfile.c:2641 gio/glocalfile.c:2500 +#: gio/gfile.c:2641 gio/glocalfile.c:2511 msgid "Can’t copy over directory" msgstr "Ezin da direktorioaren gainean kopiatu" @@ -1390,7 +1399,7 @@ msgid "Invalid symlink value given" msgstr "Esteka sinbolikoaren baliogabeko balioa eman da" -#: gio/gfile.c:4163 glib/gfileutils.c:2335 +#: gio/gfile.c:4163 glib/gfileutils.c:2392 msgid "Symbolic links not supported" msgstr "Esteka sinbolikoak ez dira onartzen" @@ -1492,37 +1501,37 @@ msgid "HTTP proxy server closed connection unexpectedly." msgstr "HTTP proxy zerbitzariak konexioa ustekabean itxi du." -#: gio/gicon.c:300 +#: gio/gicon.c:299 #, c-format msgid "Wrong number of tokens (%d)" msgstr "Okerreko token kopurua (%d)" -#: gio/gicon.c:320 +#: gio/gicon.c:319 #, c-format msgid "No type for class name %s" msgstr "Ez dago %s klasearen izen motarik" -#: gio/gicon.c:330 +#: gio/gicon.c:329 #, c-format msgid "Type %s does not implement the GIcon interface" msgstr "%s motak ez du GIcon interfazea inplementatzen" -#: gio/gicon.c:341 +#: gio/gicon.c:340 #, c-format msgid "Type %s is not classed" msgstr "%s mota ez du klaserik" -#: gio/gicon.c:355 +#: gio/gicon.c:354 #, c-format msgid "Malformed version number: %s" msgstr "Gaizko osatutako bertsio zenbakia: %s" -#: gio/gicon.c:369 +#: gio/gicon.c:368 #, c-format msgid "Type %s does not implement from_tokens() on the GIcon interface" msgstr "%s motak ez du from_tokens() inplementatzen GIcon interfazean" -#: gio/gicon.c:471 +#: gio/gicon.c:470 msgid "Can’t handle the supplied version of the icon encoding" msgstr "Ezin da ikonoaren kodeketaren emandako bertsioa kudeatu" @@ -1672,7 +1681,7 @@ #: gio/gio-tool-cat.c:135 gio/gio-tool-info.c:379 gio/gio-tool-list.c:173 #: gio/gio-tool-mkdir.c:50 gio/gio-tool-monitor.c:39 gio/gio-tool-monitor.c:41 #: gio/gio-tool-monitor.c:43 gio/gio-tool-monitor.c:45 -#: gio/gio-tool-monitor.c:206 gio/gio-tool-mount.c:1202 gio/gio-tool-open.c:72 +#: gio/gio-tool-monitor.c:206 gio/gio-tool-mount.c:1210 gio/gio-tool-open.c:72 #: gio/gio-tool-remove.c:50 gio/gio-tool-rename.c:47 gio/gio-tool-set.c:95 #: gio/gio-tool-trash.c:222 gio/gio-tool-tree.c:241 msgid "LOCATION" @@ -1690,7 +1699,7 @@ msgstr "'cat' tresna bezala erabiltzen da 'gio cat', baina GIOren kokalekuak erabiliz lokaleko fitxategien ordez. Adibidez, honelako zerbait erabil dezakezu kokaleku gisa: smb://zerbitzaria/baliabidea/fitxategia.txt" #: gio/gio-tool-cat.c:164 gio/gio-tool-info.c:410 gio/gio-tool-mkdir.c:78 -#: gio/gio-tool-monitor.c:231 gio/gio-tool-mount.c:1253 gio/gio-tool-open.c:98 +#: gio/gio-tool-monitor.c:231 gio/gio-tool-mount.c:1261 gio/gio-tool-open.c:98 #: gio/gio-tool-remove.c:74 gio/gio-tool-trash.c:303 msgid "No locations given" msgstr "Ez da kokalekurik eman" @@ -2091,19 +2100,19 @@ msgid "Mount a TCRYPT system volume" msgstr "Muntatu TCRYPT sistema-bolumen bat" -#: gio/gio-tool-mount.c:268 gio/gio-tool-mount.c:300 +#: gio/gio-tool-mount.c:276 gio/gio-tool-mount.c:308 msgid "Anonymous access denied" msgstr "Anonimoki atzitzea debekatua" -#: gio/gio-tool-mount.c:525 +#: gio/gio-tool-mount.c:533 msgid "No drive for device file" msgstr "Ez dago unitaterik gailu-fitxategirako" -#: gio/gio-tool-mount.c:1017 +#: gio/gio-tool-mount.c:1025 msgid "No volume for given ID" msgstr "Ez dago bolumenik ID horretarako" -#: gio/gio-tool-mount.c:1206 +#: gio/gio-tool-mount.c:1214 msgid "Mount or unmount the locations." msgstr "Muntatu edo desmuntatu kokalekuak." @@ -2302,7 +2311,7 @@ msgid "List contents of directories in a tree-like format." msgstr "Zerrendatu direktorioen edukia zuhaitz baten bezalako formatuan." -#: gio/glib-compile-resources.c:142 gio/glib-compile-schemas.c:1516 +#: gio/glib-compile-resources.c:142 gio/glib-compile-schemas.c:1513 #, c-format msgid "Element <%s> not allowed inside <%s>" msgstr "<%s> elementua ez da <%s>(r)en barruan onartzen" @@ -2357,7 +2366,7 @@ msgid "text may not appear inside <%s>" msgstr "testua ezin da <%s>(r)en barruan egon" -#: gio/glib-compile-resources.c:821 gio/glib-compile-schemas.c:2174 +#: gio/glib-compile-resources.c:821 gio/glib-compile-schemas.c:2171 msgid "Show program version and exit" msgstr "Erakutsi programaren bertsioa eta irten" @@ -2371,8 +2380,8 @@ "directory)" msgstr "FITXATEGIA atributuak erreferentziatutako fitxategiak kargatzeko direktorioak (lehenetsia: uneko direktorioa)" -#: gio/glib-compile-resources.c:823 gio/glib-compile-schemas.c:2175 -#: gio/glib-compile-schemas.c:2204 +#: gio/glib-compile-resources.c:823 gio/glib-compile-schemas.c:2172 +#: gio/glib-compile-schemas.c:2201 msgid "DIRECTORY" msgstr "DIREKTORIOA" @@ -2584,273 +2593,273 @@ msgid "<aliases> must contain at least one <alias>" msgstr "<aliases>-ek gutxienez <alias> bat eduki behar du" -#: gio/glib-compile-schemas.c:799 +#: gio/glib-compile-schemas.c:796 msgid "Empty names are not permitted" msgstr "Izen hutsak ez daude baimenduta" -#: gio/glib-compile-schemas.c:809 +#: gio/glib-compile-schemas.c:806 #, c-format msgid "Invalid name “%s”: names must begin with a lowercase letter" msgstr "“%s” izena baliogabea: izenak letra minuskula batekin hasi behar dira" -#: gio/glib-compile-schemas.c:821 +#: gio/glib-compile-schemas.c:818 #, c-format msgid "" "Invalid name “%s”: invalid character “%c”; only lowercase letters, numbers " "and hyphen (“-”) are permitted" msgstr "“%s” izena baliogabea: “%c” karakterea baliogabea. soilik letra minuskulak, zenbakiak eta hipenazioa (“-“) onartzen dira." -#: gio/glib-compile-schemas.c:830 +#: gio/glib-compile-schemas.c:827 #, c-format msgid "Invalid name “%s”: two successive hyphens (“--”) are not permitted" msgstr "“%s” izena baliogabea: bi hipenazio jarraian (“--“) ez dago onartuta." -#: gio/glib-compile-schemas.c:839 +#: gio/glib-compile-schemas.c:836 #, c-format msgid "Invalid name “%s”: the last character may not be a hyphen (“-”)" msgstr "“%s” izena baliogabea: azken karakterea ezin da hipenazioa (“-“) izan." -#: gio/glib-compile-schemas.c:847 +#: gio/glib-compile-schemas.c:844 #, c-format msgid "Invalid name “%s”: maximum length is 1024" msgstr "“%s” izena baliogabea: gehieneko luzera 1024 da" -#: gio/glib-compile-schemas.c:919 +#: gio/glib-compile-schemas.c:916 #, c-format msgid "<child name='%s'> already specified" msgstr "<child name='%s'> jadanik zehaztuta" -#: gio/glib-compile-schemas.c:945 +#: gio/glib-compile-schemas.c:942 msgid "Cannot add keys to a “list-of” schema" msgstr "Ezin zaio gakorik gehitu “list-of” eskema bati" -#: gio/glib-compile-schemas.c:956 +#: gio/glib-compile-schemas.c:953 #, c-format msgid "<key name='%s'> already specified" msgstr "<key name='%s'> jadanik zehaztuta" -#: gio/glib-compile-schemas.c:974 +#: gio/glib-compile-schemas.c:971 #, c-format msgid "" "<key name='%s'> shadows <key name='%s'> in <schema id='%s'>; use <override> " "to modify value" msgstr "<key name='%s'>-ek <key name='%s'> iluntzen du <schema id='%s'>-en; erabili <override> balioa aldatzeko" -#: gio/glib-compile-schemas.c:985 +#: gio/glib-compile-schemas.c:982 #, c-format msgid "" "Exactly one of “type”, “enum” or “flags” must be specified as an attribute " "to <key>" msgstr "<key>-rentzako hauetariko bat zehaztu behar da atributu gisa: “type“, “enum“edo “flags“" -#: gio/glib-compile-schemas.c:1004 +#: gio/glib-compile-schemas.c:1001 #, c-format msgid "<%s id='%s'> not (yet) defined." msgstr "<%s id='%s'> ez dago (oraindik) definituta." -#: gio/glib-compile-schemas.c:1019 +#: gio/glib-compile-schemas.c:1016 #, c-format msgid "Invalid GVariant type string “%s”" msgstr "Baliogabeko GVariant motako “%s” katea" -#: gio/glib-compile-schemas.c:1049 +#: gio/glib-compile-schemas.c:1046 msgid "<override> given but schema isn’t extending anything" msgstr "<override> eman da, baina eskema ez da ezer hedatzen ari" -#: gio/glib-compile-schemas.c:1062 +#: gio/glib-compile-schemas.c:1059 #, c-format msgid "No <key name='%s'> to override" msgstr "Ez dago <key name='%s'>(e)rik gainidazteko" -#: gio/glib-compile-schemas.c:1070 +#: gio/glib-compile-schemas.c:1067 #, c-format msgid "<override name='%s'> already specified" msgstr "<override name='%s'> jadanik zehaztuta" -#: gio/glib-compile-schemas.c:1143 +#: gio/glib-compile-schemas.c:1140 #, c-format msgid "<schema id='%s'> already specified" msgstr "<schema id='%s'> jadanik zehaztuta" -#: gio/glib-compile-schemas.c:1155 +#: gio/glib-compile-schemas.c:1152 #, c-format msgid "<schema id='%s'> extends not yet existing schema “%s”" msgstr "<schema id='%s'> oraindik existitzen ez den “%s” eskema hedatzen du" -#: gio/glib-compile-schemas.c:1171 +#: gio/glib-compile-schemas.c:1168 #, c-format msgid "<schema id='%s'> is list of not yet existing schema “%s”" msgstr "<schema id='%s'> oraindik existitzen ez den “%s” eskemaren zerrenda da" -#: gio/glib-compile-schemas.c:1179 +#: gio/glib-compile-schemas.c:1176 #, c-format msgid "Cannot be a list of a schema with a path" msgstr "Ezin da bide-izena duen eskema baten zerrenda izan" -#: gio/glib-compile-schemas.c:1189 +#: gio/glib-compile-schemas.c:1186 #, c-format msgid "Cannot extend a schema with a path" msgstr "Ezin da eskema bat bide-izen batekin hedatu" -#: gio/glib-compile-schemas.c:1199 +#: gio/glib-compile-schemas.c:1196 #, c-format msgid "" "<schema id='%s'> is a list, extending <schema id='%s'> which is not a list" msgstr "<schema id='%s'> zerrenda bat da, zerrenda ez den <schema id='%s'> hedatzen duena" -#: gio/glib-compile-schemas.c:1209 +#: gio/glib-compile-schemas.c:1206 #, c-format msgid "" "<schema id='%s' list-of='%s'> extends <schema id='%s' list-of='%s'> but “%s” " "does not extend “%s”" msgstr "<schema id='%s' list-of='%s'>(e)k <schema id='%s' list-of='%s'> hedatzen du, baina “%s”(e)k ez du “%s” hedatzen" -#: gio/glib-compile-schemas.c:1226 +#: gio/glib-compile-schemas.c:1223 #, c-format msgid "A path, if given, must begin and end with a slash" msgstr "Bide-izen bat ematen bada, barra batekin (/) hasi eta amaitu behar da" -#: gio/glib-compile-schemas.c:1233 +#: gio/glib-compile-schemas.c:1230 #, c-format msgid "The path of a list must end with “:/”" msgstr "Zerrenda bateko bide-izena “:/“-rekin amaitu behar da" -#: gio/glib-compile-schemas.c:1242 +#: gio/glib-compile-schemas.c:1239 #, c-format msgid "" "Warning: Schema “%s” has path “%s”. Paths starting with “/apps/”, “/" "desktop/” or “/system/” are deprecated." msgstr "Abisua: “%s” eskemak “%s” bide-izena du. \"/apps/\", \"/desktop/\" edo \"/system/\"-ekin hasten diren bide-izenak zaharkituta daude." -#: gio/glib-compile-schemas.c:1272 +#: gio/glib-compile-schemas.c:1269 #, c-format msgid "<%s id='%s'> already specified" msgstr "<%s id='%s'> jadanik zehaztuta" -#: gio/glib-compile-schemas.c:1422 gio/glib-compile-schemas.c:1438 +#: gio/glib-compile-schemas.c:1419 gio/glib-compile-schemas.c:1435 #, c-format msgid "Only one <%s> element allowed inside <%s>" msgstr "Soilik <%s> elementu bakarra onartzen da <%s>(r)en barruan" -#: gio/glib-compile-schemas.c:1520 +#: gio/glib-compile-schemas.c:1517 #, c-format msgid "Element <%s> not allowed at the top level" msgstr "<%s> elementua ez da maila gorenean onartzen" -#: gio/glib-compile-schemas.c:1538 +#: gio/glib-compile-schemas.c:1535 msgid "Element <default> is required in <key>" msgstr "<default> elementua behar da <key>-en" -#: gio/glib-compile-schemas.c:1628 +#: gio/glib-compile-schemas.c:1625 #, c-format msgid "Text may not appear inside <%s>" msgstr "Testua ezin da <%s>(r)en barruan egon" -#: gio/glib-compile-schemas.c:1696 +#: gio/glib-compile-schemas.c:1693 #, c-format msgid "Warning: undefined reference to <schema id='%s'/>" msgstr "Abisua: definitu gabeko erreferentzia <schema id='%s'/>-erako" #. Translators: Do not translate "--strict". -#: gio/glib-compile-schemas.c:1835 gio/glib-compile-schemas.c:1914 +#: gio/glib-compile-schemas.c:1832 gio/glib-compile-schemas.c:1911 msgid "--strict was specified; exiting." msgstr "--strict zehaztu da; irteten." -#: gio/glib-compile-schemas.c:1847 +#: gio/glib-compile-schemas.c:1844 msgid "This entire file has been ignored." msgstr "Fitxategi oso honi ezikusi egin zaio." -#: gio/glib-compile-schemas.c:1910 +#: gio/glib-compile-schemas.c:1907 msgid "Ignoring this file." msgstr "Fitxategi honi ezikusi egiten." -#: gio/glib-compile-schemas.c:1965 +#: gio/glib-compile-schemas.c:1962 #, c-format msgid "" "No such key “%s” in schema “%s” as specified in override file “%s”; ignoring " "override for this key." msgstr "Ez dago “%s” gakorik “%s” eskeman, gainidazteko “%s” fitxategian ageri den bezala; gako honen gainidazteari ezikusi egiten." -#: gio/glib-compile-schemas.c:1973 +#: gio/glib-compile-schemas.c:1970 #, c-format msgid "" "No such key “%s” in schema “%s” as specified in override file “%s” and --" "strict was specified; exiting." msgstr "Ez dago “%s” gakorik “%s” eskeman, gainidazteko “%s” fitxategian ageri den bezala, eta --strict zehaztu da; irteten." -#: gio/glib-compile-schemas.c:1995 +#: gio/glib-compile-schemas.c:1992 #, c-format msgid "" "Cannot provide per-desktop overrides for localized key “%s” in schema " "“%s” (override file “%s”); ignoring override for this key." msgstr "Ezin dira mahaigainaren araberako gainidazteak hornitu “%s” gako lokalizatuetarako “%s” eskeman (gainidatzi “%s” fitxategia); gako honen gainidazteari ezikusi egiten." -#: gio/glib-compile-schemas.c:2004 +#: gio/glib-compile-schemas.c:2001 #, c-format msgid "" "Cannot provide per-desktop overrides for localized key “%s” in schema " "“%s” (override file “%s”) and --strict was specified; exiting." msgstr "Ezin dira mahaigainaren araberako gainidazteak hornitu “%s” gako lokalizatuetarako “%s” eskeman (gainidatzi “%s” fitxategia), eta --strict zehaztu da; irteten." -#: gio/glib-compile-schemas.c:2028 +#: gio/glib-compile-schemas.c:2025 #, c-format msgid "" "Error parsing key “%s” in schema “%s” as specified in override file “%s”: " "%s. Ignoring override for this key." msgstr "Errorea “%s” gakoa (“%s” eskemakoa) analizatzean “%s” gainidazte-fitxategian ageri den bezala: %s. Gako honen gainidazteari ezikusi egiten." -#: gio/glib-compile-schemas.c:2040 +#: gio/glib-compile-schemas.c:2037 #, c-format msgid "" "Error parsing key “%s” in schema “%s” as specified in override file “%s”: " "%s. --strict was specified; exiting." msgstr "Errorea “%s” gakoa (“%s” eskemakoa) analizatzean “%s” gainidazte-fitxategian ageri den bezala: %s. --strict zehaztu da; irteten." -#: gio/glib-compile-schemas.c:2067 +#: gio/glib-compile-schemas.c:2064 #, c-format msgid "" "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 "“%s” gakoaren gainidaztea (“%s” eskemakoa) “%s” gainidazte-fitxategian ageri den bezala, eskeman emandako barrutitik kanpo dago; gako honen gainidazteari ezikusi egiten." -#: gio/glib-compile-schemas.c:2077 +#: gio/glib-compile-schemas.c:2074 #, 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 "“%s” gakoaren gainidaztea (“%s” eskemakoa) “%s” gainidazte-fitxategian ageri den bezala, eskeman emandako barrutitik kanpo dago eta --strict zehaztu da; irteten." -#: gio/glib-compile-schemas.c:2103 +#: gio/glib-compile-schemas.c:2100 #, 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 "“%s” gakoaren gainidaztea (“%s” eskemakoa) “%s” gainidazte-fitxategian ageri den bezala, ez dago baliozko aukeren zerrendan; gako honen gainidazteari ezikusi egiten." -#: gio/glib-compile-schemas.c:2113 +#: gio/glib-compile-schemas.c:2110 #, c-format msgid "" "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 "“%s” gakoaren gainidaztea (“%s” eskemakoa) “%s” gainidazte-fitxategian ageri den bezala, ez dago baliozko aukeren zerrendan eta --strict zehaztu da; irteten." -#: gio/glib-compile-schemas.c:2175 +#: gio/glib-compile-schemas.c:2172 msgid "Where to store the gschemas.compiled file" msgstr "Non gordeko den 'gschemas.compiled' fitxategia" -#: gio/glib-compile-schemas.c:2176 +#: gio/glib-compile-schemas.c:2173 msgid "Abort on any errors in schemas" msgstr "Abortatu eskemetan edozer motako erroreak agertzean" -#: gio/glib-compile-schemas.c:2177 +#: gio/glib-compile-schemas.c:2174 msgid "Do not write the gschema.compiled file" msgstr "Ez idatzi gschema.compiled fitxategia" -#: gio/glib-compile-schemas.c:2178 +#: gio/glib-compile-schemas.c:2175 msgid "Do not enforce key name restrictions" msgstr "Ez derrigortu gako-izenen murriztapenik" -#: gio/glib-compile-schemas.c:2207 +#: gio/glib-compile-schemas.c:2204 msgid "" "Compile all GSettings schema files into a schema cache.\n" "Schema files are required to have the extension .gschema.xml,\n" @@ -2859,15 +2868,15 @@ "Eskemen fitxategiek .gschema.xml luzapena eduki behar dute,\n" "eta cache-ko fitxategia gschemas.compiled deitzen da." -#: gio/glib-compile-schemas.c:2228 +#: gio/glib-compile-schemas.c:2225 msgid "You should give exactly one directory name" msgstr "Direktorio baten izena bakarrik eman behar duzu" -#: gio/glib-compile-schemas.c:2271 +#: gio/glib-compile-schemas.c:2268 msgid "No schema files found: doing nothing." msgstr "Ez da eskemen fitxategirik aurkitu: ez da ezer egingo." -#: gio/glib-compile-schemas.c:2273 +#: gio/glib-compile-schemas.c:2270 msgid "No schema files found: removed existing output file." msgstr "Ez da eskemen fitxategia aurkitu: lehendik dagoen irteera-fitxategia kendu da." @@ -2877,7 +2886,7 @@ msgid "Invalid filename %s" msgstr "%s fitxategi-izen baliogabea" -#: gio/glocalfile.c:996 +#: gio/glocalfile.c:1005 #, c-format msgid "Error getting filesystem info for %s: %s" msgstr "Errorea %s(r)en fitxategi-sistemako informazioa lortzean: %s" @@ -2886,125 +2895,125 @@ #. * the enclosing (user visible) mount of a file, but none #. * exists. #. -#: gio/glocalfile.c:1137 +#: gio/glocalfile.c:1141 #, c-format msgid "Containing mount for file %s not found" msgstr "Ez da %s fitxategiaren muntatze-puntua aurkitzen" -#: gio/glocalfile.c:1160 +#: gio/glocalfile.c:1164 msgid "Can’t rename root directory" msgstr "Ezin da erroko direktorioa izenez aldatu" -#: gio/glocalfile.c:1178 gio/glocalfile.c:1201 +#: gio/glocalfile.c:1182 gio/glocalfile.c:1205 #, c-format msgid "Error renaming file %s: %s" msgstr "Errorea '%s' fitxategia izenez aldatzean: %s" -#: gio/glocalfile.c:1185 +#: gio/glocalfile.c:1189 msgid "Can’t rename file, filename already exists" msgstr "Ezin da fitxategia izenez aldatu, fitxategi-izena badago lehendik ere" # -#: gio/glocalfile.c:1198 gio/glocalfile.c:2394 gio/glocalfile.c:2422 -#: gio/glocalfile.c:2561 gio/glocalfileoutputstream.c:658 +#: gio/glocalfile.c:1202 gio/glocalfile.c:2405 gio/glocalfile.c:2433 +#: gio/glocalfile.c:2572 gio/glocalfileoutputstream.c:658 msgid "Invalid filename" msgstr "Fitxategi-izen baliogabea" -#: gio/glocalfile.c:1366 gio/glocalfile.c:1377 +#: gio/glocalfile.c:1370 gio/glocalfile.c:1381 #, c-format msgid "Error opening file %s: %s" msgstr "Errorea '%s' fitxategia irekitzean: %s" -#: gio/glocalfile.c:1502 +#: gio/glocalfile.c:1506 #, c-format msgid "Error removing file %s: %s" msgstr "Errorea '%s' fitxategia kentzean: %s" -#: gio/glocalfile.c:1996 gio/glocalfile.c:2007 gio/glocalfile.c:2034 +#: gio/glocalfile.c:2000 gio/glocalfile.c:2011 gio/glocalfile.c:2038 #, c-format msgid "Error trashing file %s: %s" msgstr "Errorea '%s' fitxategia zakarrontzira botatzean: %s" -#: gio/glocalfile.c:2054 +#: gio/glocalfile.c:2058 #, c-format msgid "Unable to create trash directory %s: %s" msgstr "Ezin izan da %s zakarrontzi-direktorioa sortu: %s" -#: gio/glocalfile.c:2075 +#: gio/glocalfile.c:2079 #, c-format msgid "Unable to find toplevel directory to trash %s" msgstr "Ezin da '%s' zakarrontziaren goi-mailako direktorioa aurkitu" -#: gio/glocalfile.c:2083 +#: gio/glocalfile.c:2087 #, c-format msgid "Trashing on system internal mounts is not supported" msgstr "Sistemaren barneko muntaietan ez da onartzen zakarrontzira botatzea" -#: gio/glocalfile.c:2169 gio/glocalfile.c:2197 +#: gio/glocalfile.c:2173 gio/glocalfile.c:2201 #, c-format msgid "Unable to find or create trash directory %s to trash %s" msgstr "Ezin izan da %s zakarrontzi-direktorioa aurkitu edo sortu %s zakarrontzian" -#: gio/glocalfile.c:2243 +#: gio/glocalfile.c:2245 #, c-format msgid "Unable to create trashing info file for %s: %s" msgstr "Ezin da '%s' fitxategiaren zakarrontzi-informazioa sortu: %s" -#: gio/glocalfile.c:2305 +#: gio/glocalfile.c:2316 #, c-format msgid "Unable to trash file %s across filesystem boundaries" msgstr "Ezin da '%s' fitxategia fitxategi-sistemen arteko zakarrontzira bota" -#: gio/glocalfile.c:2309 gio/glocalfile.c:2365 +#: gio/glocalfile.c:2320 gio/glocalfile.c:2376 #, c-format msgid "Unable to trash file %s: %s" msgstr "Ezin da '%s' fitxategia zakarrontzira bota: %s" -#: gio/glocalfile.c:2371 +#: gio/glocalfile.c:2382 #, c-format msgid "Unable to trash file %s" msgstr "Ezin da '%s' fitxategia zakarrontzira bota" -#: gio/glocalfile.c:2397 +#: gio/glocalfile.c:2408 #, c-format msgid "Error creating directory %s: %s" msgstr "Errorea '%s' direktorioa sortzean: %s" -#: gio/glocalfile.c:2426 +#: gio/glocalfile.c:2437 #, c-format msgid "Filesystem does not support symbolic links" msgstr "Fitxategi-sistemak ez ditu esteka sinbolikorik onartzen" -#: gio/glocalfile.c:2429 +#: gio/glocalfile.c:2440 #, c-format msgid "Error making symbolic link %s: %s" msgstr "Errorea '%s' esteka sinbolikoa sortzean: %s" -#: gio/glocalfile.c:2472 gio/glocalfile.c:2507 gio/glocalfile.c:2564 +#: gio/glocalfile.c:2483 gio/glocalfile.c:2518 gio/glocalfile.c:2575 #, c-format msgid "Error moving file %s: %s" msgstr "Errorea '%s' fitxategia lekuz aldatzean: %s" -#: gio/glocalfile.c:2495 +#: gio/glocalfile.c:2506 msgid "Can’t move directory over directory" msgstr "Ezin da direktorioa lekuz aldatu direktorioaren gainera" -#: gio/glocalfile.c:2521 gio/glocalfileoutputstream.c:1110 +#: gio/glocalfile.c:2532 gio/glocalfileoutputstream.c:1110 #: gio/glocalfileoutputstream.c:1124 gio/glocalfileoutputstream.c:1139 #: gio/glocalfileoutputstream.c:1156 gio/glocalfileoutputstream.c:1170 msgid "Backup file creation failed" msgstr "Huts egin du babeskopia sortzean" -#: gio/glocalfile.c:2540 +#: gio/glocalfile.c:2551 #, c-format msgid "Error removing target file: %s" msgstr "Errorea helburuko fitxategia kentzean: %s" -#: gio/glocalfile.c:2554 +#: gio/glocalfile.c:2565 msgid "Move between mounts not supported" msgstr "Muntaien artean lekuz aldatzea ez dago onartuta" -#: gio/glocalfile.c:2728 +#: gio/glocalfile.c:2741 #, c-format msgid "Could not determine the disk usage of %s: %s" msgstr "Ezin izan da '%s' diskoaren erabilpena zehaztu: %s" @@ -3026,115 +3035,115 @@ msgid "Error setting extended attribute “%s”: %s" msgstr "Errorea “%s” atributu hedatua ezartzean: %s" -#: gio/glocalfileinfo.c:1738 gio/win32/gwinhttpfile.c:191 +#: gio/glocalfileinfo.c:1819 gio/win32/gwinhttpfile.c:191 msgid " (invalid encoding)" msgstr " (baliogabeko kodeketa)" -#: gio/glocalfileinfo.c:1897 gio/glocalfileoutputstream.c:945 +#: gio/glocalfileinfo.c:1978 gio/glocalfileoutputstream.c:945 #: gio/glocalfileoutputstream.c:997 #, c-format msgid "Error when getting information for file “%s”: %s" msgstr "Errorea “'%s” fitxategiaren informazioa eskuratzean: %s" -#: gio/glocalfileinfo.c:2163 +#: gio/glocalfileinfo.c:2281 #, c-format msgid "Error when getting information for file descriptor: %s" msgstr "Errorea fitxategiaren deskriptorearen informazioa irakurtzean: %s" -#: gio/glocalfileinfo.c:2208 +#: gio/glocalfileinfo.c:2326 msgid "Invalid attribute type (uint32 expected)" msgstr "Baliogabeko atributu mota (uint32 espero zen)" -#: gio/glocalfileinfo.c:2226 +#: gio/glocalfileinfo.c:2344 msgid "Invalid attribute type (uint64 expected)" msgstr "Baliogabeko atributu mota (uint64 espero zen)" -#: gio/glocalfileinfo.c:2245 gio/glocalfileinfo.c:2264 +#: gio/glocalfileinfo.c:2363 gio/glocalfileinfo.c:2382 msgid "Invalid attribute type (byte string expected)" msgstr "Baliogabeko atributu mota (byte katea espero zen)" -#: gio/glocalfileinfo.c:2311 +#: gio/glocalfileinfo.c:2429 msgid "Cannot set permissions on symlinks" msgstr "Ezin da baimenik ezarri esteka sinbolikoetan" -#: gio/glocalfileinfo.c:2327 +#: gio/glocalfileinfo.c:2445 #, c-format msgid "Error setting permissions: %s" msgstr "Errorea baimenak ezartzean: %s" -#: gio/glocalfileinfo.c:2378 +#: gio/glocalfileinfo.c:2496 #, c-format msgid "Error setting owner: %s" msgstr "Errorea jabea ezartzean: %s" -#: gio/glocalfileinfo.c:2401 +#: gio/glocalfileinfo.c:2519 msgid "symlink must be non-NULL" msgstr "esteka sinbolikoak NULL-en desberdina izan behar du" -#: gio/glocalfileinfo.c:2411 gio/glocalfileinfo.c:2430 -#: gio/glocalfileinfo.c:2441 +#: gio/glocalfileinfo.c:2529 gio/glocalfileinfo.c:2548 +#: gio/glocalfileinfo.c:2559 #, c-format msgid "Error setting symlink: %s" msgstr "Errorea esteka sinbolikoa ezartzean: %s" -#: gio/glocalfileinfo.c:2420 +#: gio/glocalfileinfo.c:2538 msgid "Error setting symlink: file is not a symlink" msgstr "Errorea esteka sinbolikoa ezartzean: fitxategia ez da esteka sinboliko bat" -#: gio/glocalfileinfo.c:2492 +#: gio/glocalfileinfo.c:2630 #, c-format msgid "Extra nanoseconds %d for UNIX timestamp %lld are negative" msgstr "%d nanosegundo gehigarriak negatiboak dira %lld UNIX denbora-zigiluetarako" -#: gio/glocalfileinfo.c:2501 +#: gio/glocalfileinfo.c:2639 #, c-format msgid "Extra nanoseconds %d for UNIX timestamp %lld reach 1 second" msgstr "%d nanosegundo gehigarriak segundo 1 dira %lld UNIX denbora-zigiluetarako" -#: gio/glocalfileinfo.c:2511 +#: gio/glocalfileinfo.c:2649 #, c-format msgid "UNIX timestamp %lld does not fit into 64 bits" msgstr "%lld UNIX denbora-zigilua ez da sartzen 64 bit-etan" -#: gio/glocalfileinfo.c:2522 +#: gio/glocalfileinfo.c:2660 #, c-format msgid "UNIX timestamp %lld is outside of the range supported by Windows" msgstr "%lld UNIX denbora-zigilua Windowsen onartutako barrutitik kanpo dago" -#: gio/glocalfileinfo.c:2625 +#: gio/glocalfileinfo.c:2792 #, c-format msgid "File name “%s” cannot be converted to UTF-16" msgstr "“%s” fitxategi-izena ezin da UTF-16 kodeketara bihurtu" -#: gio/glocalfileinfo.c:2644 +#: gio/glocalfileinfo.c:2811 #, c-format msgid "File “%s” cannot be opened: Windows Error %lu" msgstr "“%s” fitxategia ezin da ireki: Windows errorea %lu" -#: gio/glocalfileinfo.c:2657 +#: gio/glocalfileinfo.c:2824 #, c-format msgid "Error setting modification or access time for file “%s”: %lu" msgstr "Errorea “%s” fitxategiaren aldaketa edo atzipen denbora ezartzean: %lu" -#: gio/glocalfileinfo.c:2798 gio/glocalfileinfo.c:2810 +#: gio/glocalfileinfo.c:2981 #, c-format msgid "Error setting modification or access time: %s" msgstr "Errorea eraldaketa edo atzipen ordua ezartzean: %s" -#: gio/glocalfileinfo.c:2833 +#: gio/glocalfileinfo.c:3004 msgid "SELinux context must be non-NULL" msgstr "SELinux testuinguruak NULL-en desberdina izan behar du" -#: gio/glocalfileinfo.c:2840 +#: gio/glocalfileinfo.c:3011 msgid "SELinux is not enabled on this system" msgstr "SELinux ez dago gaituta sistema honetan" -#: gio/glocalfileinfo.c:2850 +#: gio/glocalfileinfo.c:3021 #, c-format msgid "Error setting SELinux context: %s" msgstr "Errorea SELinux testuingurua ezartzean: %s" -#: gio/glocalfileinfo.c:2947 +#: gio/glocalfileinfo.c:3118 #, c-format msgid "Setting attribute %s not supported" msgstr "%s atributuaren ezarpena ez dago onartuta" @@ -3181,13 +3190,13 @@ msgid "Error renaming temporary file: %s" msgstr "Errorea aldi baterako fitxategia izenez aldatzean: %s" -#: gio/glocalfileoutputstream.c:611 gio/glocalfileoutputstream.c:1241 +#: gio/glocalfileoutputstream.c:611 gio/glocalfileoutputstream.c:1242 #, c-format msgid "Error truncating file: %s" msgstr "Errorea fitxategia trunkatzean: %s" #: gio/glocalfileoutputstream.c:664 gio/glocalfileoutputstream.c:909 -#: gio/glocalfileoutputstream.c:1222 gio/gsubprocess.c:231 +#: gio/glocalfileoutputstream.c:1223 gio/gsubprocess.c:231 #, c-format msgid "Error opening file “%s”: %s" msgstr "Errorea “%s” fitxategia irekitzean: %s" @@ -3204,7 +3213,7 @@ msgid "The file was externally modified" msgstr "Fitxategia kanpotik aldatu da" -#: gio/glocalfileoutputstream.c:1204 +#: gio/glocalfileoutputstream.c:1205 #, c-format msgid "Error removing old file: %s" msgstr "Errorea fitxategi zaharra kentzean: %s" @@ -3350,8 +3359,8 @@ #. Translators: the first placeholder is a domain name, the #. * second is an error message #: gio/gresolver.c:403 gio/gthreadedresolver.c:152 gio/gthreadedresolver.c:170 -#: gio/gthreadedresolver.c:782 gio/gthreadedresolver.c:806 -#: gio/gthreadedresolver.c:831 gio/gthreadedresolver.c:846 +#: gio/gthreadedresolver.c:798 gio/gthreadedresolver.c:822 +#: gio/gthreadedresolver.c:847 gio/gthreadedresolver.c:862 #, c-format msgid "Error resolving “%s”: %s" msgstr "Errorea “%s” ebaztean: %s" @@ -4053,35 +4062,35 @@ #. Translators: the placeholder is a DNS record type, such as ‘MX’ or ‘SRV’ #: gio/gthreadedresolver.c:552 gio/gthreadedresolver.c:574 -#: gio/gthreadedresolver.c:612 gio/gthreadedresolver.c:659 -#: gio/gthreadedresolver.c:688 gio/gthreadedresolver.c:700 +#: gio/gthreadedresolver.c:628 gio/gthreadedresolver.c:675 +#: gio/gthreadedresolver.c:704 gio/gthreadedresolver.c:716 #, c-format msgid "Error parsing DNS %s record: malformed DNS packet" msgstr "Errorea DNS %s erregistroa analizatzean: gaizki osatutako DNS paketea" -#: gio/gthreadedresolver.c:758 gio/gthreadedresolver.c:895 -#: gio/gthreadedresolver.c:993 gio/gthreadedresolver.c:1043 +#: gio/gthreadedresolver.c:774 gio/gthreadedresolver.c:911 +#: gio/gthreadedresolver.c:1009 gio/gthreadedresolver.c:1059 #, c-format msgid "No DNS record of the requested type for “%s”" msgstr "Ez dago eskatutako motaren DNS erregistrorik “%s”(r)entzako" -#: gio/gthreadedresolver.c:763 gio/gthreadedresolver.c:998 +#: gio/gthreadedresolver.c:779 gio/gthreadedresolver.c:1014 #, c-format msgid "Temporarily unable to resolve “%s”" msgstr "Ezin da “%s” ebatzi aldi batean" -#: gio/gthreadedresolver.c:768 gio/gthreadedresolver.c:1003 -#: gio/gthreadedresolver.c:1113 +#: gio/gthreadedresolver.c:784 gio/gthreadedresolver.c:1019 +#: gio/gthreadedresolver.c:1129 #, c-format msgid "Error resolving “%s”" msgstr "Errorea “%s” ebaztean" -#: gio/gthreadedresolver.c:782 gio/gthreadedresolver.c:806 -#: gio/gthreadedresolver.c:831 gio/gthreadedresolver.c:846 +#: gio/gthreadedresolver.c:798 gio/gthreadedresolver.c:822 +#: gio/gthreadedresolver.c:847 gio/gthreadedresolver.c:862 msgid "Malformed DNS packet" msgstr "Gaizki osatutako DNS paketea" -#: gio/gthreadedresolver.c:888 +#: gio/gthreadedresolver.c:904 #, c-format msgid "Failed to parse DNS response for “%s”: " msgstr "Huts egin du “%s”(e)rako DNS erantzuna analizatzeak: " @@ -4202,7 +4211,7 @@ msgid "Error closing file descriptor: %s" msgstr "Errorea fitxategiaren deskriptorea ixtean: %s" -#: gio/gunixmounts.c:2815 gio/gunixmounts.c:2868 +#: gio/gunixmounts.c:2817 gio/gunixmounts.c:2870 msgid "Filesystem root" msgstr "Fitxategi-sistemaren erroa" @@ -4285,77 +4294,77 @@ msgid "Wrong args\n" msgstr "Okerreko argumentuak\n" -#: glib/gbookmarkfile.c:779 +#: glib/gbookmarkfile.c:861 #, c-format msgid "Unexpected attribute “%s” for element “%s”" msgstr "“%2$s” elementuaren ustekabeko “%1$s” atributua" -#: glib/gbookmarkfile.c:790 glib/gbookmarkfile.c:870 glib/gbookmarkfile.c:880 -#: glib/gbookmarkfile.c:993 +#: glib/gbookmarkfile.c:872 glib/gbookmarkfile.c:952 glib/gbookmarkfile.c:962 +#: glib/gbookmarkfile.c:1075 #, c-format msgid "Attribute “%s” of element “%s” not found" msgstr "“%2$s” elementuaren “%1$s” atributua ez da aurkitu" -#: glib/gbookmarkfile.c:1202 glib/gbookmarkfile.c:1267 -#: glib/gbookmarkfile.c:1331 glib/gbookmarkfile.c:1341 +#: glib/gbookmarkfile.c:1284 glib/gbookmarkfile.c:1349 +#: glib/gbookmarkfile.c:1413 glib/gbookmarkfile.c:1423 #, c-format msgid "Unexpected tag “%s”, tag “%s” expected" msgstr "Ustekabeko “%s” etiketa, “%s” espero zen" -#: glib/gbookmarkfile.c:1227 glib/gbookmarkfile.c:1241 -#: glib/gbookmarkfile.c:1309 glib/gbookmarkfile.c:1355 +#: glib/gbookmarkfile.c:1309 glib/gbookmarkfile.c:1323 +#: glib/gbookmarkfile.c:1391 glib/gbookmarkfile.c:1437 #, c-format msgid "Unexpected tag “%s” inside “%s”" msgstr "“%2$s” barruan ustekabeko “%1$s” etiketa" -#: glib/gbookmarkfile.c:1635 +#: glib/gbookmarkfile.c:1717 #, c-format msgid "Invalid date/time ‘%s’ in bookmark file" msgstr "Baliogabeko ‘%s’ data/ordua laster-marken fitxategian" -#: glib/gbookmarkfile.c:1838 +#: glib/gbookmarkfile.c:1956 msgid "No valid bookmark file found in data dirs" msgstr "Ezin izan da baliozko laster-marken fitxategia aurkitu datuen direktorioan" -#: glib/gbookmarkfile.c:2039 +#: glib/gbookmarkfile.c:2157 #, c-format msgid "A bookmark for URI “%s” already exists" msgstr "“%s” URIaren laster-marka badago lehendik ere" -#: glib/gbookmarkfile.c:2088 glib/gbookmarkfile.c:2246 -#: glib/gbookmarkfile.c:2331 glib/gbookmarkfile.c:2411 -#: glib/gbookmarkfile.c:2496 glib/gbookmarkfile.c:2630 -#: glib/gbookmarkfile.c:2763 glib/gbookmarkfile.c:2898 -#: glib/gbookmarkfile.c:2940 glib/gbookmarkfile.c:3037 -#: glib/gbookmarkfile.c:3158 glib/gbookmarkfile.c:3352 -#: glib/gbookmarkfile.c:3493 glib/gbookmarkfile.c:3712 -#: glib/gbookmarkfile.c:3801 glib/gbookmarkfile.c:3890 -#: glib/gbookmarkfile.c:4009 +#: glib/gbookmarkfile.c:2206 glib/gbookmarkfile.c:2364 +#: glib/gbookmarkfile.c:2449 glib/gbookmarkfile.c:2529 +#: glib/gbookmarkfile.c:2614 glib/gbookmarkfile.c:2748 +#: glib/gbookmarkfile.c:2881 glib/gbookmarkfile.c:3016 +#: glib/gbookmarkfile.c:3058 glib/gbookmarkfile.c:3155 +#: glib/gbookmarkfile.c:3276 glib/gbookmarkfile.c:3470 +#: glib/gbookmarkfile.c:3611 glib/gbookmarkfile.c:3830 +#: glib/gbookmarkfile.c:3919 glib/gbookmarkfile.c:4008 +#: glib/gbookmarkfile.c:4127 #, c-format msgid "No bookmark found for URI “%s”" msgstr "Ez da “%s” URIaren laster-markarik aurkitu" -#: glib/gbookmarkfile.c:2420 +#: glib/gbookmarkfile.c:2538 #, c-format msgid "No MIME type defined in the bookmark for URI “%s”" msgstr "Ez dago “%s” URIaren laster-markan MIME motarik definituta" -#: glib/gbookmarkfile.c:2505 +#: glib/gbookmarkfile.c:2623 #, c-format msgid "No private flag has been defined in bookmark for URI “%s”" msgstr "“%s” URIaren laster-markan ez dago bandera pribaturik definituta" -#: glib/gbookmarkfile.c:3046 +#: glib/gbookmarkfile.c:3164 #, c-format msgid "No groups set in bookmark for URI “%s”" msgstr "“%s” URIaren laster-markan ez dago talderik ezarrita" -#: glib/gbookmarkfile.c:3514 glib/gbookmarkfile.c:3722 +#: glib/gbookmarkfile.c:3632 glib/gbookmarkfile.c:3840 #, c-format msgid "No application with name “%s” registered a bookmark for “%s”" msgstr "“%s” izeneko aplikaziorik ez du erregistratu laster-markarik '%s'(e)n" -#: glib/gbookmarkfile.c:3745 +#: glib/gbookmarkfile.c:3863 #, c-format msgid "Failed to expand exec line “%s” with URI “%s”" msgstr "Huts egin du “%s” exekuzioko lerroa “%s” URIarekin hedatzean" @@ -4830,79 +4839,79 @@ msgid "Error opening directory “%s”: %s" msgstr "Errorea “%s” direktorioa irekitzean: %s" -#: glib/gfileutils.c:735 glib/gfileutils.c:827 +#: glib/gfileutils.c:753 glib/gfileutils.c:845 #, c-format msgid "Could not allocate %lu byte to read file “%s”" msgid_plural "Could not allocate %lu bytes to read file “%s”" msgstr0 "Ezin izan da byte %lu esleitu “%s” fitxategia irakurtzeko" msgstr1 "Ezin izan dira %lu byte esleitu “%s” fitxategia irakurtzeko" -#: glib/gfileutils.c:752 +#: glib/gfileutils.c:770 #, c-format msgid "Error reading file “%s”: %s" msgstr "Errorea “%s” fitxategia irakurtzean: %s" -#: glib/gfileutils.c:788 +#: glib/gfileutils.c:806 #, c-format msgid "File “%s” is too large" msgstr "“%s” fitxategia handiegia da" -#: glib/gfileutils.c:852 +#: glib/gfileutils.c:870 #, c-format msgid "Failed to read from file “%s”: %s" msgstr "Ezin izan da “%s” fitxategitik irakurri: %s" -#: glib/gfileutils.c:902 glib/gfileutils.c:977 glib/gfileutils.c:1449 +#: glib/gfileutils.c:920 glib/gfileutils.c:995 glib/gfileutils.c:1472 #, c-format msgid "Failed to open file “%s”: %s" msgstr "Ezin izan da “%s” fitxategia ireki: %s" -#: glib/gfileutils.c:915 +#: glib/gfileutils.c:933 #, c-format msgid "Failed to get attributes of file “%s”: fstat() failed: %s" msgstr "Ezin izan dira “%s” fitxategiko atributuak lortu, fstat() funtzioak huts egin du: %s" -#: glib/gfileutils.c:946 +#: glib/gfileutils.c:964 #, c-format msgid "Failed to open file “%s”: fdopen() failed: %s" msgstr "Ezin izan da “%s” fitxategia ireki, fdopen() funtzioak huts egin du: %s" -#: glib/gfileutils.c:1047 +#: glib/gfileutils.c:1065 #, c-format msgid "Failed to rename file “%s” to “%s”: g_rename() failed: %s" msgstr "Ezin izan da “%s” fitxategia “%s” gisa berrizendatu, g_rename() funtzioak huts egin du: %s" -#: glib/gfileutils.c:1156 +#: glib/gfileutils.c:1179 #, c-format msgid "Failed to write file “%s”: write() failed: %s" msgstr "Huts egin du “%s” fitxategian idaztean: fwrite() funtzioak huts egin du: %s" -#: glib/gfileutils.c:1177 +#: glib/gfileutils.c:1200 #, c-format msgid "Failed to write file “%s”: fsync() failed: %s" msgstr "Huts egin du “%s” fitxategia idaztean: fsync() funtzioak huts egin du: %s" -#: glib/gfileutils.c:1338 glib/gfileutils.c:1753 +#: glib/gfileutils.c:1361 glib/gfileutils.c:1776 #, c-format msgid "Failed to create file “%s”: %s" msgstr "Ezin izan da “%s” fitxategia sortu: %s" -#: glib/gfileutils.c:1383 +#: glib/gfileutils.c:1406 #, c-format msgid "Existing file “%s” could not be removed: g_unlink() failed: %s" msgstr "“%s” fitxategia ezin izan da kendu, g_unlik() funtzioak huts egin du: %s" -#: glib/gfileutils.c:1718 +#: glib/gfileutils.c:1741 #, c-format msgid "Template “%s” invalid, should not contain a “%s”" msgstr "“%s” txantiloia baliogabea da, ez luke “%s” eduki behar" -#: glib/gfileutils.c:1731 +#: glib/gfileutils.c:1754 #, c-format msgid "Template “%s” doesn’t contain XXXXXX" msgstr "“%s” txantiloiak ez dauka: XXXXXX" -#: glib/gfileutils.c:2291 glib/gfileutils.c:2320 +#: glib/gfileutils.c:2348 glib/gfileutils.c:2377 #, c-format msgid "Failed to read the symbolic link “%s”: %s" msgstr "Ezin izan da “%s” esteka sinbolikorik irakurri: %s" @@ -4964,8 +4973,8 @@ msgstr "Gako-fitxategiak onartzen ez den “%s” kodeketa du" #: glib/gkeyfile.c:1679 glib/gkeyfile.c:1852 glib/gkeyfile.c:3299 -#: glib/gkeyfile.c:3363 glib/gkeyfile.c:3493 glib/gkeyfile.c:3625 -#: glib/gkeyfile.c:3771 glib/gkeyfile.c:4006 glib/gkeyfile.c:4073 +#: glib/gkeyfile.c:3363 glib/gkeyfile.c:3493 glib/gkeyfile.c:3622 +#: glib/gkeyfile.c:3768 glib/gkeyfile.c:4003 glib/gkeyfile.c:4070 #, c-format msgid "Key file does not have group “%s”" msgstr "Gako-fitxategiak ez dauka “%s” taldea" @@ -4998,31 +5007,31 @@ msgid "Key “%s” in group “%s” has value “%s” where %s was expected" msgstr "“%2$s” taldeko “%1$s” gakoaren balioa “%3$s” da, “%4$s” izan ordez." -#: glib/gkeyfile.c:4326 +#: glib/gkeyfile.c:4323 msgid "Key file contains escape character at end of line" msgstr "Gako-fitxategiak ihes-karakterea dauka lerro amaieran" -#: glib/gkeyfile.c:4348 +#: glib/gkeyfile.c:4345 #, c-format msgid "Key file contains invalid escape sequence “%s”" msgstr "Gako-fitxategiak “%s” ihes-sekuentzia baliogabea dauka" -#: glib/gkeyfile.c:4493 +#: glib/gkeyfile.c:4490 #, c-format msgid "Value “%s” cannot be interpreted as a number." msgstr "“%s” balioa ezin da zenbaki gisa interpretatu" -#: glib/gkeyfile.c:4507 +#: glib/gkeyfile.c:4504 #, c-format msgid "Integer value “%s” out of range" msgstr "“%s” osoko balioa barrutitik kanpo" -#: glib/gkeyfile.c:4540 +#: glib/gkeyfile.c:4537 #, c-format msgid "Value “%s” cannot be interpreted as a float number." msgstr "“%s” balioa ezin da zenbaki mugikor gisa interpretatu." -#: glib/gkeyfile.c:4579 +#: glib/gkeyfile.c:4576 #, c-format msgid "Value “%s” cannot be interpreted as a boolean." msgstr "“%s” balioa ezin da boolear gisa interpretatu" @@ -5042,96 +5051,96 @@ msgid "Failed to open file “%s”: open() failed: %s" msgstr "Ezin izan da “%s” fitxategia ireki, open() funtzioak huts egin du: %s" -#: glib/gmarkup.c:400 glib/gmarkup.c:442 +#: glib/gmarkup.c:393 glib/gmarkup.c:435 #, c-format msgid "Error on line %d char %d: " msgstr "Errorea %d lerroko %d karakterean: " -#: glib/gmarkup.c:464 glib/gmarkup.c:547 +#: glib/gmarkup.c:457 glib/gmarkup.c:540 #, c-format msgid "Invalid UTF-8 encoded text in name — not valid “%s”" msgstr "UTF-8 gisa kodetutako testu baliogabea izenean - “%s” ez da baliozkoa" -#: glib/gmarkup.c:475 +#: glib/gmarkup.c:468 #, c-format msgid "“%s” is not a valid name" msgstr "“%s” ez da baliozko izena" -#: glib/gmarkup.c:491 +#: glib/gmarkup.c:484 #, c-format msgid "“%s” is not a valid name: “%c”" msgstr "“%s” ez da baliozko izena: “%c”" -#: glib/gmarkup.c:615 +#: glib/gmarkup.c:608 #, c-format msgid "Error on line %d: %s" msgstr "Errorea %d lerroan: %s" -#: glib/gmarkup.c:692 +#: glib/gmarkup.c:685 #, 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" msgstr "Ezin izan da “%-.*s” analizatu, digitu bat izan behar zuen karaktere-erreferentzia baten barruan (ê adibidez); agian digitua handiegia da" -#: glib/gmarkup.c:704 +#: glib/gmarkup.c:697 msgid "" "Character reference did not end with a semicolon; most likely you used an " "ampersand character without intending to start an entity — escape ampersand " "as &" msgstr "Karaktere-erreferentzia ez da puntu eta komaz bukatzen; ziurrenik & ikurra erabiliko zenuen entitatea hasteko asmorik gabe. Izendatu & karakterea & gisa" -#: glib/gmarkup.c:730 +#: glib/gmarkup.c:723 #, c-format msgid "Character reference “%-.*s” does not encode a permitted character" msgstr "“%-.*s” karaktere-erreferentziak ez du baimendutako karaktere bat kodetzen" -#: glib/gmarkup.c:768 +#: glib/gmarkup.c:761 msgid "" "Empty entity “&;” seen; valid entities are: & " < > '" msgstr "“&;” entitatea hutsik dago; baliozko entitateak hauek dira: & " < > '" -#: glib/gmarkup.c:776 +#: glib/gmarkup.c:769 #, c-format msgid "Entity name “%-.*s” is not known" msgstr "“%-.*s” entitate-izena ezezaguna da" -#: glib/gmarkup.c:781 +#: glib/gmarkup.c:774 msgid "" "Entity did not end with a semicolon; most likely you used an ampersand " "character without intending to start an entity — escape ampersand as &" msgstr "Entitatea ez da puntu eta komaz bukatzen; normalean & ikurra erabiltzen da entitatea hasteko asmorik gabe; izendatu & karakterea & gisa" -#: glib/gmarkup.c:1195 +#: glib/gmarkup.c:1188 msgid "Document must begin with an element (e.g. <book>)" msgstr "Dokumentuak elementu batez hasi behar du (adibidez, <book>)" -#: glib/gmarkup.c:1235 +#: glib/gmarkup.c:1228 #, c-format msgid "" "“%s” is not a valid character following a “<” character; it may not begin an " "element name" msgstr "“%s” ez da baliozko karakterea '<' karakterearen atzetik; baliteke elementu baten izena ez hastea" -#: glib/gmarkup.c:1278 +#: glib/gmarkup.c:1271 #, c-format msgid "" "Odd character “%s”, expected a “>” character to end the empty-element tag " "“%s”" msgstr "“%s” karaktere bitxia, '>' karakterea espero zen “%s” elementuaren etiketa hutsa amaitzeko" -#: glib/gmarkup.c:1348 +#: glib/gmarkup.c:1341 #, c-format msgid "Too many attributes in element “%s”" msgstr "Atributu gehiegi “%s” elementuan" -#: glib/gmarkup.c:1368 +#: glib/gmarkup.c:1361 #, c-format msgid "" "Odd character “%s”, expected a “=” after attribute name “%s” of element “%s”" msgstr "“%s” karaktere bitxia, '=' espero zen “%s” atributuaren ondoren “%s” elementuan" -#: glib/gmarkup.c:1410 +#: glib/gmarkup.c:1403 #, c-format msgid "" "Odd character “%s”, expected a “>” or “/” character to end the start tag of " @@ -5139,92 +5148,92 @@ "character in an attribute name" msgstr "“%s” atributuaren ondoren karaktere bitxia, “>“ edo “/“ karakterea espero zen “%s” atributuaren ondoren elementuaren hasiera-etiketa bukatzeko, edo bestela atributu bat. Agian karaktere baliogabea erabili duzu atributu-izen batean" -#: glib/gmarkup.c:1455 +#: glib/gmarkup.c:1448 #, c-format msgid "" "Odd character “%s”, expected an open quote mark after the equals sign when " "giving value for attribute “%s” of element “%s”" msgstr "“%s” karaktere bitxia, komatxo irekia espero zen berdin ikurraren ondoren “%s” atributuari balioa ematean “%s” elementuan" -#: glib/gmarkup.c:1589 +#: glib/gmarkup.c:1582 #, c-format msgid "" "“%s” is not a valid character following the characters “</”; “%s” may not " "begin an element name" msgstr "“%s” ez da karaktere balioduna “</“; karaktereen atzetik; baliteke “%s” atributuak elementu baten izena ez hastea" -#: glib/gmarkup.c:1627 +#: glib/gmarkup.c:1620 #, c-format msgid "" "“%s” is not a valid character following the close element name “%s”; the " "allowed character is “>”" msgstr "“%s” ez da baliozko karakterea da “%s” itxiera-elementuaren izenaren atzetik; baimendutako karakterea “>“ da" -#: glib/gmarkup.c:1639 +#: glib/gmarkup.c:1632 #, c-format msgid "Element “%s” was closed, no element is currently open" msgstr "“%s” elementua itxi egin da, unean ez dago elementurik irekita" -#: glib/gmarkup.c:1648 +#: glib/gmarkup.c:1641 #, c-format msgid "Element “%s” was closed, but the currently open element is “%s”" msgstr "“%s” elementua itxi egin da, baina unean “%s” elementua dago irekita" -#: glib/gmarkup.c:1801 +#: glib/gmarkup.c:1794 msgid "Document was empty or contained only whitespace" msgstr "Dokumentua hutsik dago edo zuriuneak bakarrik ditu" -#: glib/gmarkup.c:1815 +#: glib/gmarkup.c:1808 msgid "Document ended unexpectedly just after an open angle bracket “<”" msgstr "Dokumentua ustekabean itxi da “<“ angelu-parentesi ireki baten ondoren" -#: glib/gmarkup.c:1823 glib/gmarkup.c:1868 +#: glib/gmarkup.c:1816 glib/gmarkup.c:1861 #, c-format msgid "" "Document ended unexpectedly with elements still open — “%s” was the last " "element opened" msgstr "Dokumentua ustekabean amaitu da oraindik irekita zeuden elementuekin. “%s” irekitako azken elementua da" -#: glib/gmarkup.c:1831 +#: glib/gmarkup.c:1824 #, c-format msgid "" "Document ended unexpectedly, expected to see a close angle bracket ending " "the tag <%s/>" msgstr "Dokumentua ustekabean amaitu da, angelu-parentesi itxia ikustea espero zen <%s/> etiketa amaitzen" -#: glib/gmarkup.c:1837 +#: glib/gmarkup.c:1830 msgid "Document ended unexpectedly inside an element name" msgstr "Dokumentua ustekabean amaitu da elementu-izen baten barruan" -#: glib/gmarkup.c:1843 +#: glib/gmarkup.c:1836 msgid "Document ended unexpectedly inside an attribute name" msgstr "Dokumentua ustekabean amaitu da atributu-izen baten barruan" -#: glib/gmarkup.c:1848 +#: glib/gmarkup.c:1841 msgid "Document ended unexpectedly inside an element-opening tag." msgstr "Dokumentua ustekabean amaitu da elementua irekitzeko etiketa baten barruan." -#: glib/gmarkup.c:1854 +#: glib/gmarkup.c:1847 msgid "" "Document ended unexpectedly after the equals sign following an attribute " "name; no attribute value" msgstr "Dokumentua ustekabean amaitu da atributu-izen baten ondorengo berdin ikurraren atzetik; ez dago atributu-baliorik" -#: glib/gmarkup.c:1861 +#: glib/gmarkup.c:1854 msgid "Document ended unexpectedly while inside an attribute value" msgstr "Dokumentua ustekabean amaitu da atributu-balio baten barruan" -#: glib/gmarkup.c:1878 +#: glib/gmarkup.c:1871 #, c-format msgid "Document ended unexpectedly inside the close tag for element “%s”" msgstr "Dokumentua ustekabean amaitu da “%s” elementuaren itxiera-etiketaren barruan" -#: glib/gmarkup.c:1882 +#: glib/gmarkup.c:1875 msgid "" "Document ended unexpectedly inside the close tag for an unopened element" msgstr "Dokumentua ustekabean amaitu da ireki gabeko elementu baten itxiera-etiketaren barruan" -#: glib/gmarkup.c:1888 +#: glib/gmarkup.c:1881 msgid "Document ended unexpectedly inside a comment or processing instruction" msgstr "Dokumentua ustekabean amaitu da iruzkin baten barruan edo prozesatzen ari zen instrukzio baten barruan" @@ -5287,300 +5296,300 @@ msgid "Unknown option %s" msgstr "%s aukera ezezaguna" -#: glib/gregex.c:436 +#: glib/gregex.c:479 msgid "corrupted object" msgstr "hondatutako objektua" -#: glib/gregex.c:438 +#: glib/gregex.c:481 msgid "out of memory" msgstr "Memoriarik ez" -#: glib/gregex.c:443 +#: glib/gregex.c:487 msgid "backtracking limit reached" msgstr "atzera-jotzearen mugara gainditua" -#: glib/gregex.c:454 glib/gregex.c:707 glib/gregex.c:736 +#: glib/gregex.c:498 msgid "internal error" msgstr "barneko errorea" -#: glib/gregex.c:456 +#: glib/gregex.c:500 msgid "the pattern contains items not supported for partial matching" msgstr "ereduak zenbait elementu ditu bat etortze partzialetan onartzen ez direnak" -#: glib/gregex.c:458 +#: glib/gregex.c:502 msgid "back references as conditions are not supported for partial matching" msgstr "aurreko erreferentziak baldintza gisa ez daude onartuta bat etortze partzialetan" -#: glib/gregex.c:464 +#: glib/gregex.c:508 msgid "recursion limit reached" msgstr "errekurtsioaren muga gainditua" -#: glib/gregex.c:466 +#: glib/gregex.c:510 msgid "bad offset" msgstr "okerreko desplazamendua" -#: glib/gregex.c:468 +#: glib/gregex.c:512 msgid "recursion loop" msgstr "errekurtsioaren begizta" #. should not happen in GRegex since we check modes before each match -#: glib/gregex.c:471 +#: glib/gregex.c:515 msgid "matching mode is requested that was not compiled for JIT" msgstr "eskatu den bat etortze modua ez da konpilatu JITerako" -#: glib/gregex.c:475 +#: glib/gregex.c:536 glib/gregex.c:1838 msgid "unknown error" msgstr "errore ezezaguna" -#: glib/gregex.c:496 +#: glib/gregex.c:557 msgid "\\ at end of pattern" msgstr "\\ ereduaren amaieran" -#: glib/gregex.c:500 +#: glib/gregex.c:561 msgid "\\c at end of pattern" msgstr "\\c ereduaren amaieran" -#: glib/gregex.c:505 +#: glib/gregex.c:566 msgid "unrecognized character following \\" msgstr "karaktere ezezagunak jarraitzen dio \\ karaktereari" -#: glib/gregex.c:509 +#: glib/gregex.c:570 msgid "numbers out of order in {} quantifier" msgstr "zenbakiak barrutitik kanpo {} kuantifikatzailean" -#: glib/gregex.c:513 +#: glib/gregex.c:574 msgid "number too big in {} quantifier" msgstr "zenbaki handiegiak {} kuantifikatzaileak" -#: glib/gregex.c:517 +#: glib/gregex.c:578 msgid "missing terminating for character class" msgstr "karaktere-klasearen amaierako falta da" -#: glib/gregex.c:521 +#: glib/gregex.c:582 msgid "invalid escape sequence in character class" msgstr "karaktere-klasean baliogabeko ihes sekuentzia" -#: glib/gregex.c:525 +#: glib/gregex.c:586 msgid "range out of order in character class" msgstr "karaktere-klaseko barrutia barrutitik kanpo" -#: glib/gregex.c:530 +#: glib/gregex.c:591 msgid "nothing to repeat" msgstr "ezer ez errepikatzeko" -#: glib/gregex.c:534 +#: glib/gregex.c:595 msgid "unrecognized character after (? or (?-" msgstr "karaktere ezezaguna (? edo (?- karaktereen atzetik" -#: glib/gregex.c:538 +#: glib/gregex.c:599 msgid "POSIX named classes are supported only within a class" msgstr "POSIX izeneko klaseak soilik onartzen dira klase baten barruan" -#: glib/gregex.c:542 +#: glib/gregex.c:603 msgid "POSIX collating elements are not supported" msgstr "Tartekatutako POSIX elementuak ez daude onartuta" -#: glib/gregex.c:548 +#: glib/gregex.c:609 msgid "missing terminating )" msgstr "amaierako ) falta da" -#: glib/gregex.c:552 +#: glib/gregex.c:613 msgid "reference to non-existent subpattern" msgstr "existitzen ez den azpieredu baten erreferentzia" -#: glib/gregex.c:556 +#: glib/gregex.c:617 msgid "missing ) after comment" msgstr "iruzkinaren ondoren ) falta da" -#: glib/gregex.c:560 +#: glib/gregex.c:621 msgid "regular expression is too large" msgstr "adierazpen erregularra luzeegia da" -#: glib/gregex.c:564 +#: glib/gregex.c:625 msgid "malformed number or name after (?(" msgstr "gaizki osatutako zenbakia edo izena (?(-ren atzetik" -#: glib/gregex.c:568 +#: glib/gregex.c:629 msgid "lookbehind assertion is not fixed length" msgstr "'lookbehind' baieztapenak ez du luzera finkorik" -#: glib/gregex.c:572 +#: glib/gregex.c:633 msgid "conditional group contains more than two branches" msgstr "baldintza taldeak bi adar baino gehiago ditu" -#: glib/gregex.c:576 +#: glib/gregex.c:637 msgid "assertion expected after (?(" msgstr "baieztapena espero zen (?)-ren atzetik" -#: glib/gregex.c:580 +#: glib/gregex.c:641 msgid "a numbered reference must not be zero" msgstr "zenbatutako erreferentzia bat ezin du zero izan" -#: glib/gregex.c:584 +#: glib/gregex.c:645 msgid "unknown POSIX class name" msgstr "POSIX klasearen izen ezezaguna" -#: glib/gregex.c:589 +#: glib/gregex.c:650 msgid "character value in \\x{...} sequence is too large" msgstr "\\x{…} sekuentziako karaktere-balioa luzeegia da" -#: glib/gregex.c:593 +#: glib/gregex.c:654 msgid "\\C not allowed in lookbehind assertion" msgstr "\\C ez dago baimenduta 'lookbehind' baieztapenean" -#: glib/gregex.c:597 +#: glib/gregex.c:658 msgid "missing terminator in subpattern name" msgstr "amaierako karakterea falta da azpiereduko izenean" -#: glib/gregex.c:601 +#: glib/gregex.c:662 msgid "two named subpatterns have the same name" msgstr "bi azpiereduk izen berdina dute" -#: glib/gregex.c:605 +#: glib/gregex.c:666 msgid "malformed \\P or \\p sequence" msgstr "gaizki osatutako \\P edo \\p sekuentzia" -#: glib/gregex.c:609 +#: glib/gregex.c:670 msgid "unknown property name after \\P or \\p" msgstr "propietate-izen ezezaguna \\P edo \\p atzetik" -#: glib/gregex.c:613 +#: glib/gregex.c:674 msgid "subpattern name is too long (maximum 32 characters)" msgstr "azpiereduaren izena luzeegia (32 karaktere gehienez)" -#: glib/gregex.c:617 +#: glib/gregex.c:678 msgid "too many named subpatterns (maximum 10,000)" msgstr "izendun azpieredu gehiegi (10.000 gehienez)" -#: glib/gregex.c:621 +#: glib/gregex.c:682 msgid "octal value is greater than \\377" msgstr "balio zortzitarra \\377 baino handiagoa" -#: glib/gregex.c:625 +#: glib/gregex.c:686 msgid "DEFINE group contains more than one branch" msgstr "DEFINE taldeak adar bat baino gehiago ditu" -#: glib/gregex.c:629 +#: glib/gregex.c:690 msgid "inconsistent NEWLINE options" msgstr "NEWLINE aukera inkoherentea" -#: glib/gregex.c:633 +#: glib/gregex.c:694 msgid "" "\\g is not followed by a braced, angle-bracketed, or quoted name or number, " "or by a plain number" msgstr "\\g ez da parentesi, kortxete edo aipu motako izena edo zenbaki, edo zenbaki soil batekin jarraitzen" -#: glib/gregex.c:638 +#: glib/gregex.c:699 msgid "an argument is not allowed for (*ACCEPT), (*FAIL), or (*COMMIT)" msgstr "argumentu bat ez dago onartuta (*ACCEPT), (*FAIL), edo (*COMMIT)-entzako" -#: glib/gregex.c:642 +#: glib/gregex.c:703 msgid "(*VERB) not recognized" msgstr "(*VERB) ez da ezagutzen" -#: glib/gregex.c:646 +#: glib/gregex.c:707 msgid "number is too big" msgstr "zenbakia handiegia da" -#: glib/gregex.c:650 +#: glib/gregex.c:711 msgid "missing subpattern name after (?&" msgstr "azpiereduaren izena falta da (?& ondoren" -#: glib/gregex.c:654 +#: glib/gregex.c:715 msgid "different names for subpatterns of the same number are not allowed" msgstr "zenbaki berdinaren azpiereduen izen desberdinak ez daude onartuta" -#: glib/gregex.c:658 +#: glib/gregex.c:719 msgid "(*MARK) must have an argument" msgstr "(*MARK) argumentu bat eduki behar du" -#: glib/gregex.c:662 +#: glib/gregex.c:723 msgid "\\c must be followed by an ASCII character" msgstr "\\c ondoren ASCII karaktere bat behar da" -#: glib/gregex.c:666 +#: glib/gregex.c:727 msgid "\\k is not followed by a braced, angle-bracketed, or quoted name" msgstr "\\k ondoren ez dago parentesi, kortxete edo aipatutako izen bat" -#: glib/gregex.c:670 +#: glib/gregex.c:731 msgid "\\N is not supported in a class" msgstr "\\N ez dago klase batean onartuta" -#: glib/gregex.c:674 +#: glib/gregex.c:735 msgid "name is too long in (*MARK), (*PRUNE), (*SKIP), or (*THEN)" msgstr "izena luzeegia da (*MARK), (*PRUNE), (*SKIP), edo (*THEN)-en" -#: glib/gregex.c:678 glib/gregex.c:809 +#: glib/gregex.c:739 glib/gregex.c:875 msgid "code overflow" msgstr "kodea gainezkatua" -#: glib/gregex.c:682 +#: glib/gregex.c:743 msgid "unrecognized character after (?P" msgstr "karaktere ezezaguna (?P karaktereen atzetik" -#: glib/gregex.c:686 +#: glib/gregex.c:747 msgid "overran compiling workspace" msgstr "konpilazioaren laneko area gainezkatua" -#: glib/gregex.c:690 +#: glib/gregex.c:751 msgid "previously-checked referenced subpattern not found" msgstr "ez da aurrez egiaztatutako erreferentziatutako azpieredua aurkitu" -#: glib/gregex.c:808 glib/gregex.c:1041 glib/gregex.c:2342 +#: glib/gregex.c:874 glib/gregex.c:1121 glib/gregex.c:2444 #, c-format msgid "Error while matching regular expression %s: %s" msgstr "Errorea %s adierazpen erregularra bilatzean: %s" -#: glib/gregex.c:1618 +#: glib/gregex.c:1721 msgid "PCRE library is compiled without UTF8 support" msgstr "PCRE liburutegia UTF8 euskarri gabe konpilatua" -#: glib/gregex.c:1626 +#: glib/gregex.c:1729 msgid "PCRE library is compiled with incompatible options" msgstr "PCRE liburutegia aukera bateragarririk gabe konpilatua" -#: glib/gregex.c:1751 +#: glib/gregex.c:1847 #, c-format msgid "Error while compiling regular expression ‘%s’ at char %s: %s" msgstr "Errorea ‘%s’adierazpen erregularra %s karakterean konpilatzean: %s" -#: glib/gregex.c:2786 +#: glib/gregex.c:2887 msgid "hexadecimal digit or “}” expected" msgstr "digitu hamaseitarra edo “}“ espero zen" -#: glib/gregex.c:2802 +#: glib/gregex.c:2903 msgid "hexadecimal digit expected" msgstr "digitu hamaseitarra espero zen" -#: glib/gregex.c:2842 +#: glib/gregex.c:2943 msgid "missing “<” in symbolic reference" msgstr "“<“ falta da erreferentzia sinbolikoan" -#: glib/gregex.c:2851 +#: glib/gregex.c:2952 msgid "unfinished symbolic reference" msgstr "amaitu gabeko erreferentzia sinbolikoa" -#: glib/gregex.c:2858 +#: glib/gregex.c:2959 msgid "zero-length symbolic reference" msgstr "zero luzerako erreferentzia sinbolikoa" -#: glib/gregex.c:2869 +#: glib/gregex.c:2970 msgid "digit expected" msgstr "digitua espero zen" -#: glib/gregex.c:2887 +#: glib/gregex.c:2988 msgid "illegal symbolic reference" msgstr "erreferentzia sinboliko ilegala" -#: glib/gregex.c:2950 +#: glib/gregex.c:3051 msgid "stray final “\\”" msgstr "“\\“ katearen amaieran" -#: glib/gregex.c:2954 +#: glib/gregex.c:3055 msgid "unknown escape sequence" msgstr "ihes-sekuentzi ezezaguna" -#: glib/gregex.c:2964 +#: glib/gregex.c:3065 #, c-format msgid "Error while parsing replacement text “%s” at char %lu: %s" msgstr "Errorea ordezko “%s” testua analizatzean %lu karakterean: %s" @@ -5607,96 +5616,102 @@ msgid "Text was empty (or contained only whitespace)" msgstr "Testua hutsik dago (edo zuriuneak bakarrik ditu)" -#: glib/gspawn.c:314 +#: glib/gspawn.c:319 #, c-format msgid "Failed to read data from child process (%s)" msgstr "Ezin izan da daturik irakurri prozesu umetik (%s)" -#: glib/gspawn.c:466 +#: glib/gspawn.c:471 #, c-format msgid "Unexpected error in reading data from a child process (%s)" msgstr "Ustekabeko errorea datuak prozesu umetik irakurtzean (%s)" -#: glib/gspawn.c:551 +#: glib/gspawn.c:556 #, c-format msgid "Unexpected error in waitpid() (%s)" msgstr "Ustekabeko errorea waitpid()-en (%s)" -#: glib/gspawn.c:1170 glib/gspawn-win32.c:1488 +#: glib/gspawn.c:1175 glib/gspawn-win32.c:1503 #, c-format msgid "Child process exited with code %ld" msgstr "Prozesu haurra amaitu da %ld kodearekin" -#: glib/gspawn.c:1178 +#: glib/gspawn.c:1183 #, c-format msgid "Child process killed by signal %ld" msgstr "Prozesu haurra %ld seinaleak hilda" -#: glib/gspawn.c:1185 +#: glib/gspawn.c:1190 #, c-format msgid "Child process stopped by signal %ld" msgstr "Prozesu haurra %ld seinaleak geldituta" -#: glib/gspawn.c:1192 +#: glib/gspawn.c:1197 #, c-format msgid "Child process exited abnormally" msgstr "Prozesu haurra ustekabean amaituta" -#: glib/gspawn.c:1885 glib/gspawn-win32.c:393 glib/gspawn-win32.c:401 +#: glib/gspawn.c:2027 glib/gspawn-win32.c:393 glib/gspawn-win32.c:401 #, c-format msgid "Failed to read from child pipe (%s)" msgstr "Ezin izan da kanalizazio umetik irakurri (%s)" -#: glib/gspawn.c:2248 +#: glib/gspawn.c:2399 #, c-format msgid "Failed to spawn child process “%s” (%s)" msgstr "Ezin izan da “%s” prozesu haurra abiarazi (%s)" -#: glib/gspawn.c:2365 +#: glib/gspawn.c:2525 #, c-format msgid "Failed to fork (%s)" msgstr "Ezin da sardetu (%s)" -#: glib/gspawn.c:2525 glib/gspawn-win32.c:424 +#: glib/gspawn.c:2685 glib/gspawn-win32.c:424 #, c-format msgid "Failed to change to directory “%s” (%s)" msgstr "Ezin izan da “%s” direktoriora aldatu (%s)" -#: glib/gspawn.c:2535 +#: glib/gspawn.c:2695 #, c-format msgid "Failed to execute child process “%s” (%s)" msgstr "Ezin izan da “%s” prozesu haurra exekutatu (%s)" -#: glib/gspawn.c:2545 +#: glib/gspawn.c:2705 #, c-format msgid "Failed to open file to remap file descriptor (%s)" msgstr "Huts egin du fitxategia irekitzeak fitxategi-deskribatzailea birmapatzeko (%s)" -#: glib/gspawn.c:2553 +#: glib/gspawn.c:2713 #, c-format msgid "Failed to duplicate file descriptor for child process (%s)" msgstr "Huts egin du prozesu umerako fitxategi-deskribatzailea bikoizteak (%s)" -#: glib/gspawn.c:2562 +#: glib/gspawn.c:2722 #, c-format msgid "Failed to fork child process (%s)" msgstr "Ezin izan da prozesu haurra sardetu (%s)" -#: glib/gspawn.c:2570 +#: glib/gspawn.c:2730 #, c-format msgid "Failed to close file descriptor for child process (%s)" msgstr "Huts egin du prozesu umerako fitxategi-deskribatzailea ixteak (%s)" -#: glib/gspawn.c:2578 +#: glib/gspawn.c:2738 #, c-format msgid "Unknown error executing child process “%s”" msgstr "Errore ezezaguna “%s” prozesu haurra exekutatzean" -#: glib/gspawn.c:2602 +#: glib/gspawn.c:2762 #, c-format msgid "Failed to read enough data from child pid pipe (%s)" msgstr "Ezin izan da nahikoa datu irakurri pid kanalizazio umetik (%s)" +# +#: glib/gspawn-private.h:134 +#, c-format +msgid "Invalid source FDs argument" +msgstr "Iturburuko FD argumentu baliogabea" + #: glib/gspawn-win32.c:337 msgid "Failed to read data from child process" msgstr "Ezin izan da daturik irakurri prozesu umetik" @@ -5717,48 +5732,48 @@ msgid "Invalid program name: %s" msgstr "Programaren izen baliogabea: %s" -#: glib/gspawn-win32.c:521 glib/gspawn-win32.c:853 +#: glib/gspawn-win32.c:521 glib/gspawn-win32.c:868 #, c-format msgid "Invalid string in argument vector at %d: %s" msgstr "Kate baliogabea %d(e)ko bektorearen argumentuan: %s" -#: glib/gspawn-win32.c:532 glib/gspawn-win32.c:869 +#: glib/gspawn-win32.c:532 glib/gspawn-win32.c:884 #, c-format msgid "Invalid string in environment: %s" msgstr "Kate baliogabea ingurunean: %s" -#: glib/gspawn-win32.c:849 +#: glib/gspawn-win32.c:864 #, c-format msgid "Invalid working directory: %s" msgstr "Laneko direktorio baliogabea: %s" # -#: glib/gspawn-win32.c:914 +#: glib/gspawn-win32.c:929 #, c-format msgid "Failed to execute helper program (%s)" msgstr "Ezin izan da laguntza-programa exekutatu (%s)" -#: glib/gspawn-win32.c:1143 +#: glib/gspawn-win32.c:1158 msgid "" "Unexpected error in g_io_channel_win32_poll() reading data from a child " "process" msgstr "Ustekabeko errorea gertatu da 'g_io_channel_win32_poll()'-en prozesu umetik datuak irakurtzean" -#: glib/gstrfuncs.c:3366 glib/gstrfuncs.c:3468 +#: glib/gstrfuncs.c:3370 glib/gstrfuncs.c:3472 msgid "Empty string is not a number" msgstr "Kate hutsa ez da zenbaki bat" -#: glib/gstrfuncs.c:3390 +#: glib/gstrfuncs.c:3394 #, c-format msgid "“%s” is not a signed number" msgstr "“%s” ez da zeinudun zenbaki bat" -#: glib/gstrfuncs.c:3400 glib/gstrfuncs.c:3504 +#: glib/gstrfuncs.c:3404 glib/gstrfuncs.c:3508 #, c-format msgid "Number “%s” is out of bounds %s, %s" msgstr "“%s” zenbakia barrutitik kanpo %s, %s" -#: glib/gstrfuncs.c:3494 +#: glib/gstrfuncs.c:3498 #, c-format msgid "“%s” is not an unsigned number" msgstr "“%s” ez da zeinurik gabeko zenbaki bat" @@ -5837,132 +5852,132 @@ msgstr "Karakterea UTF-16 barrutitik kanpo" #. Translators: A unit symbol for size formatting, showing for example: "13.0 kB" -#: glib/gutils.c:2857 +#: glib/gutils.c:2966 msgid "kB" msgstr "kB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 MB" -#: glib/gutils.c:2859 +#: glib/gutils.c:2968 msgid "MB" msgstr "MB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 GB" -#: glib/gutils.c:2861 +#: glib/gutils.c:2970 msgid "GB" msgstr "GB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 TB" -#: glib/gutils.c:2863 +#: glib/gutils.c:2972 msgid "TB" msgstr "TB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 PB" -#: glib/gutils.c:2865 +#: glib/gutils.c:2974 msgid "PB" msgstr "PB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 EB" -#: glib/gutils.c:2867 +#: glib/gutils.c:2976 msgid "EB" msgstr "EB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 KiB" -#: glib/gutils.c:2871 +#: glib/gutils.c:2980 msgid "KiB" msgstr "KiB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 MiB" -#: glib/gutils.c:2873 +#: glib/gutils.c:2982 msgid "MiB" msgstr "MiB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 GiB" -#: glib/gutils.c:2875 +#: glib/gutils.c:2984 msgid "GiB" msgstr "GiB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 TiB" -#: glib/gutils.c:2877 +#: glib/gutils.c:2986 msgid "TiB" msgstr "TiB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 PiB" -#: glib/gutils.c:2879 +#: glib/gutils.c:2988 msgid "PiB" msgstr "PiB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 EiB" -#: glib/gutils.c:2881 +#: glib/gutils.c:2990 msgid "EiB" msgstr "EiB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 kb" -#: glib/gutils.c:2885 +#: glib/gutils.c:2994 msgid "kb" msgstr "kb" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Mb" -#: glib/gutils.c:2887 +#: glib/gutils.c:2996 msgid "Mb" msgstr "Mb" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Gb" -#: glib/gutils.c:2889 +#: glib/gutils.c:2998 msgid "Gb" msgstr "Gb" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Tb" -#: glib/gutils.c:2891 +#: glib/gutils.c:3000 msgid "Tb" msgstr "Tb" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Pb" -#: glib/gutils.c:2893 +#: glib/gutils.c:3002 msgid "Pb" msgstr "Pb" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Eb" -#: glib/gutils.c:2895 +#: glib/gutils.c:3004 msgid "Eb" msgstr "Eb" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Kib" -#: glib/gutils.c:2899 +#: glib/gutils.c:3008 msgid "Kib" msgstr "Kib" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Mib" -#: glib/gutils.c:2901 +#: glib/gutils.c:3010 msgid "Mib" msgstr "Mib" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Gib" -#: glib/gutils.c:2903 +#: glib/gutils.c:3012 msgid "Gib" msgstr "Gib" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Tib" -#: glib/gutils.c:2905 +#: glib/gutils.c:3014 msgid "Tib" msgstr "Tib" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Pib" -#: glib/gutils.c:2907 +#: glib/gutils.c:3016 msgid "Pib" msgstr "Pib" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Eib" -#: glib/gutils.c:2909 +#: glib/gutils.c:3018 msgid "Eib" msgstr "Eib" -#: glib/gutils.c:2947 +#: glib/gutils.c:3056 msgid "byte" msgid_plural "bytes" msgstr0 "byte" msgstr1 "byte" -#: glib/gutils.c:2951 +#: glib/gutils.c:3060 msgid "bit" msgid_plural "bits" msgstr0 "bit" @@ -5970,7 +5985,7 @@ #. Translators: The "%u" is replaced with the size value, like "13"; it could #. * be part of "13 bytes", but only the number is requested this time. -#: glib/gutils.c:2959 +#: glib/gutils.c:3068 #, c-format msgctxt "format-size" msgid "%u" @@ -5978,7 +5993,7 @@ #. Translators: The first "%u" is replaced with the value, the "%s" with a unit of the value. #. * The order can be changed with "%$2s %$1u". An example: "13 bytes" -#: glib/gutils.c:2964 +#: glib/gutils.c:3073 #, c-format msgctxt "format-size" msgid "%u %s" @@ -5986,7 +6001,7 @@ #. Translators: The "%.1f" is replaced with the size value, like "13.0"; it could #. * be part of "13.0 MB", but only the number is requested this time. -#: glib/gutils.c:3000 +#: glib/gutils.c:3109 #, c-format msgctxt "format-size" msgid "%.1f" @@ -5995,14 +6010,14 @@ #. Translators: The first "%.1f" is replaced with the value, the "%s" with a unit of the value. #. * The order can be changed with "%$2s %$1.1f". Keep the no-break space between the value and #. * the unit symbol. An example: "13.0 MB" -#: glib/gutils.c:3006 +#: glib/gutils.c:3115 #, c-format msgctxt "format-size" msgid "%.1f %s" msgstr "%.1f %s" #. Translators: the %s in "%s bytes" will always be replaced by a number. -#: glib/gutils.c:3046 +#: glib/gutils.c:3155 #, c-format msgid "%s byte" msgid_plural "%s bytes" @@ -6010,14 +6025,14 @@ msgstr1 "%s byte" #. Translators: the %s in "%s bits" will always be replaced by a number. -#: glib/gutils.c:3051 +#: glib/gutils.c:3160 #, c-format msgid "%s bit" msgid_plural "%s bits" msgstr0 "bit %s" msgstr1 "%s byte" -#: glib/gutils.c:3092 +#: glib/gutils.c:3201 #, c-format msgid "%u byte" msgid_plural "%u bytes" @@ -6029,32 +6044,32 @@ #. * compatibility. Users will not see this string unless a program is using this deprecated function. #. * Please translate as literally as possible. #. -#: glib/gutils.c:3105 +#: glib/gutils.c:3214 #, c-format msgid "%.1f KB" msgstr "%.1f KB" -#: glib/gutils.c:3110 +#: glib/gutils.c:3219 #, c-format msgid "%.1f MB" msgstr "%.1f MB" -#: glib/gutils.c:3115 +#: glib/gutils.c:3224 #, c-format msgid "%.1f GB" msgstr "%.1f GB" -#: glib/gutils.c:3120 +#: glib/gutils.c:3229 #, c-format msgid "%.1f TB" msgstr "%.1f TB" -#: glib/gutils.c:3125 +#: glib/gutils.c:3234 #, c-format msgid "%.1f PB" msgstr "%.1f PB" -#: glib/gutils.c:3130 +#: glib/gutils.c:3239 #, c-format msgid "%.1f EB" msgstr "%.1f EB"
View file
_service:tar_scm:glib-2.74.4.tar.xz/po/fa.po -> _service:tar_scm:glib-2.76.4.tar.xz/po/fa.po
Changed
@@ -10,8 +10,8 @@ msgstr "" "Project-Id-Version: glib HEAD\n" "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/glib/issues\n" -"POT-Creation-Date: 2022-09-12 05:47+0000\n" -"PO-Revision-Date: 2022-09-12 13:55+0430\n" +"POT-Creation-Date: 2023-02-15 16:30+0000\n" +"PO-Revision-Date: 2023-03-22 14:04+0330\n" "Last-Translator: Danial Behzadi <dani.behzi@ubuntu.com>\n" "Language-Team: Persian <>\n" "Language: fa\n" @@ -19,22 +19,22 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n!=1);\n" -"X-Generator: Poedit 3.1.1\n" +"X-Generator: Poedit 3.2.2\n" -#: gio/gappinfo.c:335 +#: gio/gappinfo.c:339 msgid "Setting default applications not supported yet" msgstr "تنظیم برنامهٔ پیشگزیده هنوز پشتیبانی نمیشود" -#: gio/gappinfo.c:368 +#: gio/gappinfo.c:372 msgid "Setting application as last used for type not supported yet" msgstr "تنظیم برنامه به عنوان آخرین استفاده برای گونه هنوز پشتیبانی نمیشود" -#: gio/gappinfo.c:810 +#: gio/gappinfo.c:814 #, c-format msgid "Failed to find default application for content type ‘%s’" msgstr "شکست در یافتن برنامهٔ پیشگزیده برای گونهٔ محتوای «%s»" -#: gio/gappinfo.c:870 +#: gio/gappinfo.c:874 #, c-format msgid "Failed to find default application for URI Scheme ‘%s’" msgstr "شکست در یافتن برنامهٔ پیشگزیده برای شمای نشانی %s" @@ -229,11 +229,11 @@ msgid "error sending %s message to application: %s\n" msgstr "خطای فرستادن %s پیام به برنامه: %s\n" -#: gio/gapplication-tool.c:321 +#: gio/gapplication-tool.c:324 msgid "action name must be given after application id\n" msgstr "نام کنش باید پس از شناسهٔ برنامه داده شود\n" -#: gio/gapplication-tool.c:329 +#: gio/gapplication-tool.c:332 #, c-format msgid "" "invalid action name: “%s”\n" @@ -242,27 +242,27 @@ "نام کنش نامعتبر: «%s»\n" "نامهای کنشها باید فقط شامل حرفرقم، «-» و «.» باشند\n" -#: gio/gapplication-tool.c:348 +#: gio/gapplication-tool.c:351 #, c-format msgid "error parsing action parameter: %s\n" msgstr "" "خطا در تجزیه پارامتر کنش: %s\n" "\n" -#: gio/gapplication-tool.c:360 +#: gio/gapplication-tool.c:363 msgid "actions accept a maximum of one parameter\n" msgstr "کنش بیشینه یک پارامتر میپذیرد\n" -#: gio/gapplication-tool.c:415 +#: gio/gapplication-tool.c:418 msgid "list-actions command takes only the application id" msgstr "دستور کنشهای سیاهه فقط شناسهٔ برنامه را میگیرند" -#: gio/gapplication-tool.c:425 +#: gio/gapplication-tool.c:428 #, c-format msgid "unable to find desktop file for application %s\n" msgstr "ناتوان در یافتن پروندهٔ میزکار برای برنامهٔ %s\n" -#: gio/gapplication-tool.c:470 +#: gio/gapplication-tool.c:473 #, c-format msgid "" "unrecognised command: %s\n" @@ -297,7 +297,7 @@ msgid "Truncate not supported on base stream" msgstr "هرس روی جریان پایه پشتیبانی نمیشود" -#: gio/gcancellable.c:319 gio/gdbusconnection.c:1859 gio/gdbusprivate.c:1420 +#: gio/gcancellable.c:326 gio/gdbusconnection.c:1859 gio/gdbusprivate.c:1420 #: gio/gsimpleasyncresult.c:873 gio/gsimpleasyncresult.c:899 #, c-format msgid "Operation was cancelled" @@ -317,13 +317,13 @@ #: gio/gcharsetconverter.c:344 gio/gdatainputstream.c:850 #: gio/gdatainputstream.c:1268 glib/gconvert.c:451 glib/gconvert.c:883 -#: glib/giochannel.c:1576 glib/giochannel.c:1618 glib/giochannel.c:2473 +#: glib/giochannel.c:1576 glib/giochannel.c:1618 glib/giochannel.c:2478 #: glib/gutf8.c:892 glib/gutf8.c:1346 msgid "Invalid byte sequence in conversion input" msgstr "دنبالهٔ بایتی نامعتبر در ورودی تبدیل" #: gio/gcharsetconverter.c:349 glib/gconvert.c:459 glib/gconvert.c:797 -#: glib/giochannel.c:1583 glib/giochannel.c:2485 +#: glib/giochannel.c:1583 glib/giochannel.c:2493 #, c-format msgid "Error during conversion: %s" msgstr "خطا در حین تبدیل: %s" @@ -380,17 +380,17 @@ msgid "Unexpected early end-of-stream" msgstr "پایان جریان زودهنگام نامنتظره" -#: gio/gdbusaddress.c:164 gio/gdbusaddress.c:238 gio/gdbusaddress.c:327 +#: gio/gdbusaddress.c:162 gio/gdbusaddress.c:234 gio/gdbusaddress.c:321 #, c-format msgid "Unsupported key “%s” in address entry “%s”" msgstr "کلید پشتیبانی نشدهٔ «%s» در ورودی نشانی «%s»" -#: gio/gdbusaddress.c:177 +#: gio/gdbusaddress.c:175 #, c-format msgid "Meaningless key/value pair combination in address entry “%s”" msgstr "ترکیب جفت کلید و مقدار بیمعنی در ورودی نشانی «%s»" -#: gio/gdbusaddress.c:186 +#: gio/gdbusaddress.c:184 #, c-format msgid "" "Address “%s” is invalid (need exactly one of path, dir, tmpdir, or abstract keys)" @@ -398,45 +398,45 @@ "نشانی «%s» نامعتبر است (فقط یکی از کلیدهای path، dir، tmpdir یا abstract را نیاز " "دارد)" -#: gio/gdbusaddress.c:253 gio/gdbusaddress.c:264 gio/gdbusaddress.c:279 -#: gio/gdbusaddress.c:342 gio/gdbusaddress.c:353 +#: gio/gdbusaddress.c:249 gio/gdbusaddress.c:260 gio/gdbusaddress.c:275 +#: gio/gdbusaddress.c:336 gio/gdbusaddress.c:347 #, c-format msgid "Error in address “%s” — the “%s” attribute is malformed" msgstr "خطا در نشانی «%s» — مولّفهٔ «%s» بدریخت است" -#: gio/gdbusaddress.c:423 gio/gdbusaddress.c:682 +#: gio/gdbusaddress.c:417 gio/gdbusaddress.c:676 #, c-format msgid "Unknown or unsupported transport “%s” for address “%s”" msgstr "جابهجایی پشتیبانی نشده یا ناشناختهٔ «%s» برای نشانی «%s»" -#: gio/gdbusaddress.c:467 +#: gio/gdbusaddress.c:461 #, c-format msgid "Address element “%s” does not contain a colon (:)" msgstr "عنصر نشانی «%s» دارای دونقطه (:) نیست." -#: gio/gdbusaddress.c:476 +#: gio/gdbusaddress.c:470 #, c-format msgid "Transport name in address element “%s” must not be empty" msgstr "نام جابهجایی در عنصر نشانی «%s» نباید خالی باشد" -#: gio/gdbusaddress.c:497 +#: gio/gdbusaddress.c:491 #, c-format msgid "" "Key/Value pair %d, “%s”, in address element “%s” does not contain an equal sign" msgstr "جفت گلید و مقدار %Id، «%s» در عنصر نشانی «%s» دارای علامت مساوی نیست" -#: gio/gdbusaddress.c:508 +#: gio/gdbusaddress.c:502 #, c-format msgid "Key/Value pair %d, “%s”, in address element “%s” must not have an empty key" msgstr "جفت گلید و مقدار %Id، «%s» در عنصر نشانی «%s» نباید کلیدی خالی داشته باشد" -#: gio/gdbusaddress.c:522 +#: gio/gdbusaddress.c:516 #, c-format msgid "" "Error unescaping key or value in Key/Value pair %d, “%s”, in address element “%s”" msgstr "خطا در حذف کلید یا مقدار در جفت کلیدمقدار %Id، «%s» در نشانی عنصر «%s»" -#: gio/gdbusaddress.c:590 +#: gio/gdbusaddress.c:584 #, c-format msgid "" "Error in address “%s” — the unix transport requires exactly one of the keys " @@ -445,74 +445,74 @@ "خطا در نشانی «%s» — جابهجایی یونیکس نیازمند تنظیم بودن دقیقاً یکی از کلیدهای path " "یا abstract است" -#: gio/gdbusaddress.c:625 +#: gio/gdbusaddress.c:619 #, c-format msgid "Error in address “%s” — the host attribute is missing or malformed" msgstr "خطا در نشانی «%s» — مولّفهٔ host غایب یا بدریخت است" -#: gio/gdbusaddress.c:639 +#: gio/gdbusaddress.c:633 #, c-format msgid "Error in address “%s” — the port attribute is missing or malformed" msgstr "خطا در نشانی «%s» — مولّفهٔ port غایب یا بدریخت است" -#: gio/gdbusaddress.c:653 +#: gio/gdbusaddress.c:647 #, c-format msgid "Error in address “%s” — the noncefile attribute is missing or malformed" msgstr "خطا در نشانی «%s» — مولّفهٔ noncefile غایب یا بدریخت است" -#: gio/gdbusaddress.c:674 +#: gio/gdbusaddress.c:668 msgid "Error auto-launching: " msgstr "خطا در راهاندازی خودکار: " -#: gio/gdbusaddress.c:727 +#: gio/gdbusaddress.c:721 #, c-format msgid "Error opening nonce file “%s”: %s" msgstr "خطا در گشودن پروندهٔ فعلی «%s»: %s" -#: gio/gdbusaddress.c:746 +#: gio/gdbusaddress.c:740 #, c-format msgid "Error reading from nonce file “%s”: %s" msgstr "خطا در خواندن از پروندهٔ فعلی «%s»: %s" -#: gio/gdbusaddress.c:755 +#: gio/gdbusaddress.c:749 #, c-format msgid "Error reading from nonce file “%s”, expected 16 bytes, got %d" msgstr "خطا در خواندن از پروندهٔ فعلی «%s»، انتظار ۱۶ بایت میرفت ولی %Id دریافت شد" -#: gio/gdbusaddress.c:773 +#: gio/gdbusaddress.c:767 #, c-format msgid "Error writing contents of nonce file “%s” to stream:" msgstr "خطا در نوشتن محتوای پروندهٔ فعلی «%s» روی جریان:" -#: gio/gdbusaddress.c:988 +#: gio/gdbusaddress.c:982 msgid "The given address is empty" msgstr "آدرس داده شده خالی است" -#: gio/gdbusaddress.c:1101 +#: gio/gdbusaddress.c:1095 #, c-format msgid "Cannot spawn a message bus when AT_SECURE is set" msgstr "هنگام تنظیم بودن AT_SECURE نمیتوان گذرگاه پیامی ایجاد کرد" -#: gio/gdbusaddress.c:1108 +#: gio/gdbusaddress.c:1102 msgid "Cannot spawn a message bus without a machine-id: " msgstr "نمیتوان بدون یک شناسهٔ دستگاه، گذرگاه پیامی ایجاد کرد: " -#: gio/gdbusaddress.c:1115 +#: gio/gdbusaddress.c:1109 #, c-format msgid "Cannot autolaunch D-Bus without X11 $DISPLAY" msgstr "نمیتوان بدون $DISPLAY X11 به طور خودکار D-Bus را اجرا کرد" -#: gio/gdbusaddress.c:1157 +#: gio/gdbusaddress.c:1151 #, c-format msgid "Error spawning command line “%s”: " msgstr "خطا در ایجاد خط فرمان «%s»: " -#: gio/gdbusaddress.c:1226 +#: gio/gdbusaddress.c:1220 #, c-format msgid "Cannot determine session bus address (not implemented for this OS)" msgstr "نمیتوان نشانی گذرگاه نشست را تشخیص داد (برای این سیستمعامل پیاده نشده)" -#: gio/gdbusaddress.c:1375 gio/gdbusconnection.c:7321 +#: gio/gdbusaddress.c:1374 gio/gdbusconnection.c:7316 #, c-format msgid "" "Cannot determine bus address from DBUS_STARTER_BUS_TYPE environment variable — " @@ -521,7 +521,7 @@ "نمیتوان نشانی گذرگاه را از متغیّر محیطی DBUS_STARTER_BUS_TYPE تشخیص داد — مقدار " "ناشناختهٔ «%s»" -#: gio/gdbusaddress.c:1384 gio/gdbusconnection.c:7330 +#: gio/gdbusaddress.c:1383 gio/gdbusconnection.c:7325 msgid "" "Cannot determine bus address because the DBUS_STARTER_BUS_TYPE environment " "variable is not set" @@ -529,7 +529,7 @@ "نمیتوان نشانی گذرگاه را تشخیص داد؛ چون متغیّر محیطی DBUS_STARTER_BUS_TYPE تنظیم " "نشده" -#: gio/gdbusaddress.c:1394 +#: gio/gdbusaddress.c:1393 #, c-format msgid "Unknown bus type %d" msgstr "گونهٔ گذرگاه ناشناخته %d" @@ -548,11 +548,15 @@ "Exhausted all available authentication mechanisms (tried: %s) (available: %s)" msgstr "تمامی سازوکارهای تأیید هویت موجود آزموده شد (آزموده: %s) (موجود: %s)" -#: gio/gdbusauth.c:1178 +#: gio/gdbusauth.c:1045 +msgid "Unexpected lack of content trying to read a byte" +msgstr "کمبود محتوای نامنتظره هنگام خواندن یک بایت" + +#: gio/gdbusauth.c:1195 msgid "User IDs must be the same for peer and server" msgstr "شناسههای کاربری باید برای نمونه و کارساز یکی باشد" -#: gio/gdbusauth.c:1190 +#: gio/gdbusauth.c:1207 msgid "Cancelled via GDBusAuthObserver::authorize-authenticated-peer" msgstr "لغو شده به دست GDBusAuthObserver::authorize-authenticated-peer" @@ -638,7 +642,7 @@ msgid "(Additionally, releasing the lock for “%s” also failed: %s) " msgstr "(به علاوه، آزاد سازی قفل برا ی «%s» هم شکست خورد: %s) " -#: gio/gdbusconnection.c:590 gio/gdbusconnection.c:2404 +#: gio/gdbusconnection.c:590 gio/gdbusconnection.c:2405 msgid "The connection is closed" msgstr "اتصال بسته شده است" @@ -646,111 +650,111 @@ msgid "Timeout was reached" msgstr "زمان به پایان رسید" -#: gio/gdbusconnection.c:2527 +#: gio/gdbusconnection.c:2528 msgid "Unsupported flags encountered when constructing a client-side connection" msgstr "مواجهه با پرچمهای پشتیبانی نشده هنگام ساخت یک اتّصال سمت کارخواه" -#: gio/gdbusconnection.c:4256 gio/gdbusconnection.c:4610 +#: gio/gdbusconnection.c:4257 gio/gdbusconnection.c:4611 #, c-format msgid "No such interface “org.freedesktop.DBus.Properties” on object at path %s" msgstr "واسطی چون org.freedesktop.DBus.Properties روی شی در مسیر %s وجود ندارد" -#: gio/gdbusconnection.c:4401 +#: gio/gdbusconnection.c:4402 #, c-format msgid "No such property “%s”" msgstr "ویژگی «%s» وجود ندارد" -#: gio/gdbusconnection.c:4413 +#: gio/gdbusconnection.c:4414 #, c-format msgid "Property “%s” is not readable" msgstr "ویژگی «%s» خواندنی نیست" -#: gio/gdbusconnection.c:4424 +#: gio/gdbusconnection.c:4425 #, c-format msgid "Property “%s” is not writable" msgstr "ویژگی «%s» نوشتنی نیست" -#: gio/gdbusconnection.c:4444 +#: gio/gdbusconnection.c:4445 #, c-format msgid "Error setting property “%s”: Expected type “%s” but got “%s”" msgstr "خطای تنظیم مولّفهٔ «%s»: انتظار گونهٔ «%s» میرفت؛ ولی «%s» گرفته شد" -#: gio/gdbusconnection.c:4549 gio/gdbusconnection.c:4764 gio/gdbusconnection.c:6747 +#: gio/gdbusconnection.c:4550 gio/gdbusconnection.c:4765 gio/gdbusconnection.c:6742 #, c-format msgid "No such interface “%s”" msgstr "واسطی چون «%s» وجود ندارد" -#: gio/gdbusconnection.c:4986 gio/gdbusconnection.c:7261 +#: gio/gdbusconnection.c:4981 gio/gdbusconnection.c:7256 #, c-format msgid "No such interface “%s” on object at path %s" msgstr "واسطی چون «%s» روی شی در مسیر %s وجود ندارد" -#: gio/gdbusconnection.c:5087 +#: gio/gdbusconnection.c:5082 #, c-format msgid "No such method “%s”" msgstr "روش «%s» وجود ندارد" -#: gio/gdbusconnection.c:5118 +#: gio/gdbusconnection.c:5113 #, c-format msgid "Type of message, “%s”, does not match expected type “%s”" msgstr "گونهٔ پیام، «%s»، با گونهٔ مورد انتظار «%s» مطابق نیست" -#: gio/gdbusconnection.c:5321 +#: gio/gdbusconnection.c:5316 #, c-format msgid "An object is already exported for the interface %s at %s" msgstr "یک شیء از قبل برای واسط %s در %s صادر شده است" -#: gio/gdbusconnection.c:5548 +#: gio/gdbusconnection.c:5543 #, c-format msgid "Unable to retrieve property %s.%s" msgstr "ناتوان در دریافت ویژگی %s.%s" -#: gio/gdbusconnection.c:5604 +#: gio/gdbusconnection.c:5599 #, c-format msgid "Unable to set property %s.%s" msgstr "ناتوان در تنظیم ویژگی %s.%s" -#: gio/gdbusconnection.c:5783 +#: gio/gdbusconnection.c:5778 #, c-format msgid "Method “%s” returned type “%s”, but expected “%s”" msgstr "روش «%s» گونهٔ «%s» را برگرداند؛ ولی انتظار «%s» میرفت" -#: gio/gdbusconnection.c:6859 +#: gio/gdbusconnection.c:6854 #, c-format msgid "Method “%s” on interface “%s” with signature “%s” does not exist" msgstr "روش «%s» روی واسط «%s» با امضای «%s» وجود ندارد" -#: gio/gdbusconnection.c:6980 +#: gio/gdbusconnection.c:6975 #, c-format msgid "A subtree is already exported for %s" msgstr "زیردرختی از پیش برای %s برونریزی شده" -#: gio/gdbusconnection.c:7269 +#: gio/gdbusconnection.c:7264 #, c-format msgid "Object does not exist at path “%s”" msgstr "شی در مسیر «%s» وجود ندارد" -#: gio/gdbusmessage.c:1303 +#: gio/gdbusmessage.c:1306 msgid "type is INVALID" msgstr "نوع INVALID است" -#: gio/gdbusmessage.c:1314 +#: gio/gdbusmessage.c:1317 msgid "METHOD_CALL message: PATH or MEMBER header field is missing" msgstr "پیام METHOD_CALL: زمینهٔ سرایند PATH یا MEMBER وجود ندارد" -#: gio/gdbusmessage.c:1325 +#: gio/gdbusmessage.c:1328 msgid "METHOD_RETURN message: REPLY_SERIAL header field is missing" msgstr "پیام METHOD_RETURN: زمینهٔ سرایند REPLY_SERIAL وجود ندارد" -#: gio/gdbusmessage.c:1337 +#: gio/gdbusmessage.c:1340 msgid "ERROR message: REPLY_SERIAL or ERROR_NAME header field is missing" msgstr "پیام خطا: زمینهٔ سرایند REPLY_SERIAL یا ERROR_NAME ناموجود" -#: gio/gdbusmessage.c:1350 +#: gio/gdbusmessage.c:1353 msgid "SIGNAL message: PATH, INTERFACE or MEMBER header field is missing" msgstr "پیام سیگنال: زمینهٔ سرایند PATH، INTERFACE یا MEMBER ناموجود" -#: gio/gdbusmessage.c:1358 +#: gio/gdbusmessage.c:1361 msgid "" "SIGNAL message: The PATH header field is using the reserved value /org/" "freedesktop/DBus/Local" @@ -758,7 +762,7 @@ "پیام سیگنال: زمینهٔ سرایند PATH دارد از مقدار رزرو شدهٔ /org/freedesktop/DBus/" "Local استفاده میکند" -#: gio/gdbusmessage.c:1366 +#: gio/gdbusmessage.c:1369 msgid "" "SIGNAL message: The INTERFACE header field is using the reserved value org." "freedesktop.DBus.Local" @@ -766,19 +770,19 @@ "پیام سیگنال: زمینهٔ سرایند INTERFACE دارد از مقدار رزرو شدهٔ org.freedesktop.DBus." "Local استفاده میکند" -#: gio/gdbusmessage.c:1414 gio/gdbusmessage.c:1474 +#: gio/gdbusmessage.c:1417 gio/gdbusmessage.c:1477 #, c-format msgid "Wanted to read %lu byte but only got %lu" msgid_plural "Wanted to read %lu bytes but only got %lu" msgstr0 "میخواست %lu بایت بخواند؛ ولی فقط %lu بایت گرفت" msgstr1 "میخواست %lu بایت بخواند؛ ولی فقط %lu بایت گرفت" -#: gio/gdbusmessage.c:1428 +#: gio/gdbusmessage.c:1431 #, c-format msgid "Expected NUL byte after the string “%s” but found byte %d" msgstr "پس از رشتهٔ «%s» انتظار بایت NUL میرفت؛ ولی بایت %Id پیدا شد" -#: gio/gdbusmessage.c:1447 +#: gio/gdbusmessage.c:1450 #, c-format msgid "" "Expected valid UTF-8 string but found invalid bytes at byte offset %d (length of " @@ -787,21 +791,21 @@ "انتظار رشتهٔ UTF-8 معتبر میرفت؛ ولی بایتهای نامعتبر در عرض از مبدأ بایت %Id پیدا " "شد (طول رشته %Id است). رشتهٔ معتبر UTF-8 تا آن نقطه «%s» بود" -#: gio/gdbusmessage.c:1511 gio/gdbusmessage.c:1787 gio/gdbusmessage.c:1998 +#: gio/gdbusmessage.c:1514 gio/gdbusmessage.c:1790 gio/gdbusmessage.c:2001 msgid "Value nested too deeply" msgstr "مقدار بیش از حد تودرتو شده" -#: gio/gdbusmessage.c:1679 +#: gio/gdbusmessage.c:1682 #, c-format msgid "Parsed value “%s” is not a valid D-Bus object path" msgstr "مقدار تجزیه شدهٔ «%s» مسیر شی D-Bus معتبری نیست" -#: gio/gdbusmessage.c:1703 +#: gio/gdbusmessage.c:1706 #, c-format msgid "Parsed value “%s” is not a valid D-Bus signature" msgstr "مقدار تجزیه شدهٔ «%s» امضای D-Bus معتبری نیست" -#: gio/gdbusmessage.c:1754 +#: gio/gdbusmessage.c:1757 #, c-format msgid "" "Encountered array of length %u byte. Maximum length is 2<<26 bytes (64 MiB)." @@ -810,101 +814,101 @@ msgstr0 "" msgstr1 "" -#: gio/gdbusmessage.c:1774 +#: gio/gdbusmessage.c:1777 #, c-format msgid "" "Encountered array of type “a%c”, expected to have a length a multiple of %u " "bytes, but found to be %u bytes in length" msgstr "" -#: gio/gdbusmessage.c:1928 gio/gdbusmessage.c:2647 +#: gio/gdbusmessage.c:1931 gio/gdbusmessage.c:2650 msgid "Empty structures (tuples) are not allowed in D-Bus" msgstr "" -#: gio/gdbusmessage.c:1982 +#: gio/gdbusmessage.c:1985 #, c-format msgid "Parsed value “%s” for variant is not a valid D-Bus signature" msgstr "" -#: gio/gdbusmessage.c:2023 +#: gio/gdbusmessage.c:2026 #, c-format msgid "" "Error deserializing GVariant with type string “%s” from the D-Bus wire format" msgstr "" -#: gio/gdbusmessage.c:2208 +#: gio/gdbusmessage.c:2211 #, c-format msgid "" "Invalid endianness value. Expected 0x6c (“l”) or 0x42 (“B”) but found value " "0x%02x" msgstr "" -#: gio/gdbusmessage.c:2227 +#: gio/gdbusmessage.c:2230 #, c-format msgid "Invalid major protocol version. Expected 1 but found %d" msgstr "" -#: gio/gdbusmessage.c:2285 gio/gdbusmessage.c:2883 +#: gio/gdbusmessage.c:2288 gio/gdbusmessage.c:2886 msgid "Signature header found but is not of type signature" msgstr "" -#: gio/gdbusmessage.c:2297 +#: gio/gdbusmessage.c:2300 #, c-format msgid "Signature header with signature “%s” found but message body is empty" msgstr "" -#: gio/gdbusmessage.c:2312 +#: gio/gdbusmessage.c:2315 #, c-format msgid "Parsed value “%s” is not a valid D-Bus signature (for body)" msgstr "" -#: gio/gdbusmessage.c:2344 +#: gio/gdbusmessage.c:2347 #, 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" msgstr0 "" msgstr1 "" -#: gio/gdbusmessage.c:2354 +#: gio/gdbusmessage.c:2357 msgid "Cannot deserialize message: " msgstr "" -#: gio/gdbusmessage.c:2700 +#: gio/gdbusmessage.c:2703 #, c-format msgid "Error serializing GVariant with type string “%s” to the D-Bus wire format" msgstr "" -#: gio/gdbusmessage.c:2837 +#: gio/gdbusmessage.c:2840 #, c-format msgid "Number of file descriptors in message (%d) differs from header field (%d)" msgstr "" -#: gio/gdbusmessage.c:2845 +#: gio/gdbusmessage.c:2848 msgid "Cannot serialize message: " msgstr "" -#: gio/gdbusmessage.c:2898 +#: gio/gdbusmessage.c:2901 #, c-format msgid "Message body has signature “%s” but there is no signature header" msgstr "" -#: gio/gdbusmessage.c:2908 +#: gio/gdbusmessage.c:2911 #, c-format msgid "" "Message body has type signature “%s” but signature in the header field is “%s”" msgstr "" -#: gio/gdbusmessage.c:2924 +#: gio/gdbusmessage.c:2927 #, c-format msgid "Message body is empty but signature in the header field is “(%s)”" msgstr "" -#: gio/gdbusmessage.c:3479 +#: gio/gdbusmessage.c:3482 #, c-format msgid "Error return with body of type “%s”" msgstr "خطای بازگشت با بدنهٔ گونهٔ «%s»" -#: gio/gdbusmessage.c:3487 +#: gio/gdbusmessage.c:3490 msgid "Error return with empty body" msgstr "" @@ -929,42 +933,42 @@ msgid "Unable to load %s or %s: " msgstr "ناتوان در بار کردن %s یا %s: " -#: gio/gdbusproxy.c:1575 +#: gio/gdbusproxy.c:1568 #, c-format msgid "Error calling StartServiceByName for %s: " msgstr "" -#: gio/gdbusproxy.c:1598 +#: gio/gdbusproxy.c:1591 #, c-format msgid "Unexpected reply %d from StartServiceByName(\"%s\") method" msgstr "" -#: gio/gdbusproxy.c:2709 gio/gdbusproxy.c:2844 +#: gio/gdbusproxy.c:2702 gio/gdbusproxy.c:2837 #, c-format msgid "" "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 "" -#: gio/gdbusserver.c:765 +#: gio/gdbusserver.c:758 msgid "Abstract namespace not supported" msgstr "فضانام انتزاعی پشتیبانی نمیشود" -#: gio/gdbusserver.c:857 +#: gio/gdbusserver.c:850 msgid "Cannot specify nonce file when creating a server" msgstr "" -#: gio/gdbusserver.c:939 +#: gio/gdbusserver.c:932 #, c-format msgid "Error writing nonce file at “%s”: %s" msgstr "خطا در خواندن پروندهٔ فعلی «%s»: %s" -#: gio/gdbusserver.c:1114 +#: gio/gdbusserver.c:1107 #, c-format msgid "The string “%s” is not a valid D-Bus GUID" msgstr "" -#: gio/gdbusserver.c:1152 +#: gio/gdbusserver.c:1145 #, c-format msgid "Cannot listen on unsupported transport “%s”" msgstr "" @@ -983,14 +987,14 @@ "Use “%s COMMAND --help” to get help on each command.\n" msgstr "" -#: gio/gdbus-tool.c:204 gio/gdbus-tool.c:276 gio/gdbus-tool.c:348 -#: gio/gdbus-tool.c:372 gio/gdbus-tool.c:862 gio/gdbus-tool.c:1247 -#: gio/gdbus-tool.c:1734 +#: gio/gdbus-tool.c:204 gio/gdbus-tool.c:276 gio/gdbus-tool.c:347 +#: gio/gdbus-tool.c:371 gio/gdbus-tool.c:861 gio/gdbus-tool.c:1246 +#: gio/gdbus-tool.c:1733 #, c-format msgid "Error: %s\n" msgstr "خطا: %s\n" -#: gio/gdbus-tool.c:215 gio/gdbus-tool.c:289 gio/gdbus-tool.c:1750 +#: gio/gdbus-tool.c:215 gio/gdbus-tool.c:289 gio/gdbus-tool.c:1749 #, c-format msgid "Error parsing introspection XML: %s\n" msgstr "خطا در تجزیهٔ XML دروننگری %s\n" @@ -1000,238 +1004,238 @@ msgid "Error: %s is not a valid name\n" msgstr "خطا: %s نام معتبری نیست\n" -#: gio/gdbus-tool.c:258 gio/gdbus-tool.c:748 gio/gdbus-tool.c:1066 -#: gio/gdbus-tool.c:1900 gio/gdbus-tool.c:2140 +#: gio/gdbus-tool.c:258 gio/gdbus-tool.c:747 gio/gdbus-tool.c:1065 +#: gio/gdbus-tool.c:1899 gio/gdbus-tool.c:2139 #, c-format msgid "Error: %s is not a valid object path\n" msgstr "خطا: %s یک مسیر شیء معتبر نیست\n" -#: gio/gdbus-tool.c:406 +#: gio/gdbus-tool.c:405 msgid "Connect to the system bus" msgstr "وصل شدن به گذرگاه سامانه" -#: gio/gdbus-tool.c:407 +#: gio/gdbus-tool.c:406 msgid "Connect to the session bus" msgstr "وصل شدن به گذرگاه نشست" -#: gio/gdbus-tool.c:408 +#: gio/gdbus-tool.c:407 msgid "Connect to given D-Bus address" msgstr "وصلشدن به نشانی دیباس داده شده" -#: gio/gdbus-tool.c:418 +#: gio/gdbus-tool.c:417 msgid "Connection Endpoint Options:" msgstr "گزینههای نقطهٔ پایانی اتّصال:" -#: gio/gdbus-tool.c:419 +#: gio/gdbus-tool.c:418 msgid "Options specifying the connection endpoint" msgstr "گزینههای مشخّصکنندهٔ نقطهٔ پایانی اتّصال" -#: gio/gdbus-tool.c:442 +#: gio/gdbus-tool.c:441 #, c-format msgid "No connection endpoint specified" msgstr "هیچ نقطهٔ پایانی اتّصالی مشخّص نشده" -#: gio/gdbus-tool.c:452 +#: gio/gdbus-tool.c:451 #, c-format msgid "Multiple connection endpoints specified" msgstr "چندین نقطهٔ پایانی اتّصال مشخّص شده" -#: gio/gdbus-tool.c:525 +#: gio/gdbus-tool.c:524 #, c-format msgid "Warning: According to introspection data, interface “%s” does not exist\n" msgstr "هشدار: با توجه به دادههای دروننگری، واسط «%s» وجود ندارد\n" -#: gio/gdbus-tool.c:534 +#: gio/gdbus-tool.c:533 #, c-format msgid "" "Warning: According to introspection data, method “%s” does not exist on " "interface “%s”\n" msgstr "هشدار: با توجه به دادههای دروننگری، روش «%s» روی واسط «%s» وجود ندارد\n" -#: gio/gdbus-tool.c:596 +#: gio/gdbus-tool.c:595 msgid "Optional destination for signal (unique name)" msgstr "مقصد اختیاری برای سیگنال (نام یکتا)" -#: gio/gdbus-tool.c:597 +#: gio/gdbus-tool.c:596 msgid "Object path to emit signal on" msgstr "" -#: gio/gdbus-tool.c:598 +#: gio/gdbus-tool.c:597 msgid "Signal and interface name" msgstr "" -#: gio/gdbus-tool.c:631 +#: gio/gdbus-tool.c:630 msgid "Emit a signal." msgstr "" -#: gio/gdbus-tool.c:686 gio/gdbus-tool.c:1003 gio/gdbus-tool.c:1837 -#: gio/gdbus-tool.c:2069 gio/gdbus-tool.c:2289 +#: gio/gdbus-tool.c:685 gio/gdbus-tool.c:1002 gio/gdbus-tool.c:1836 +#: gio/gdbus-tool.c:2068 gio/gdbus-tool.c:2288 #, c-format msgid "Error connecting: %s\n" msgstr "خطا در هنگام اتصال: %s\n" -#: gio/gdbus-tool.c:706 +#: gio/gdbus-tool.c:705 #, c-format msgid "Error: %s is not a valid unique bus name.\n" msgstr "خطا: %s نام گذرگاه یکتای معتبری نیست\n" -#: gio/gdbus-tool.c:725 gio/gdbus-tool.c:1046 gio/gdbus-tool.c:1880 +#: gio/gdbus-tool.c:724 gio/gdbus-tool.c:1045 gio/gdbus-tool.c:1879 msgid "Error: Object path is not specified\n" msgstr "خطا: مسیر شیء مشخص نشده است\n" -#: gio/gdbus-tool.c:768 +#: gio/gdbus-tool.c:767 msgid "Error: Signal name is not specified\n" msgstr "خطا: نام سیگنال مشخص نشده است\n" -#: gio/gdbus-tool.c:782 +#: gio/gdbus-tool.c:781 #, c-format msgid "Error: Signal name “%s” is invalid\n" msgstr "خطا: نام سیگنال «%s» نامعتبر است\n" -#: gio/gdbus-tool.c:794 +#: gio/gdbus-tool.c:793 #, c-format msgid "Error: %s is not a valid interface name\n" msgstr "خطا: %s نام واسط معتبری نیست\n" -#: gio/gdbus-tool.c:800 +#: gio/gdbus-tool.c:799 #, c-format msgid "Error: %s is not a valid member name\n" msgstr "خطا: %s یک نام عضو معتبر نیست\n" #. Use the original non-"parse-me-harder" error -#: gio/gdbus-tool.c:837 gio/gdbus-tool.c:1178 +#: gio/gdbus-tool.c:836 gio/gdbus-tool.c:1177 #, c-format msgid "Error parsing parameter %d: %s\n" msgstr "خطا در تجزیه پارامتر %Id: %s\n" -#: gio/gdbus-tool.c:869 +#: gio/gdbus-tool.c:868 #, c-format msgid "Error flushing connection: %s\n" msgstr "خطا در بستن اتّصال: %s\n" -#: gio/gdbus-tool.c:897 +#: gio/gdbus-tool.c:896 msgid "Destination name to invoke method on" msgstr "" -#: gio/gdbus-tool.c:898 +#: gio/gdbus-tool.c:897 msgid "Object path to invoke method on" msgstr "" -#: gio/gdbus-tool.c:899 +#: gio/gdbus-tool.c:898 msgid "Method and interface name" msgstr "نام متد و واسط" -#: gio/gdbus-tool.c:900 +#: gio/gdbus-tool.c:899 msgid "Timeout in seconds" msgstr "" -#: gio/gdbus-tool.c:901 +#: gio/gdbus-tool.c:900 msgid "Allow interactive authorization" msgstr "" -#: gio/gdbus-tool.c:948 +#: gio/gdbus-tool.c:947 msgid "Invoke a method on a remote object." msgstr "" -#: gio/gdbus-tool.c:1020 gio/gdbus-tool.c:1854 gio/gdbus-tool.c:2094 +#: gio/gdbus-tool.c:1019 gio/gdbus-tool.c:1853 gio/gdbus-tool.c:2093 msgid "Error: Destination is not specified\n" msgstr "خطا: مقصد مشخص نشده است\n" -#: gio/gdbus-tool.c:1031 gio/gdbus-tool.c:1871 gio/gdbus-tool.c:2105 +#: gio/gdbus-tool.c:1030 gio/gdbus-tool.c:1870 gio/gdbus-tool.c:2104 #, c-format msgid "Error: %s is not a valid bus name\n" msgstr "خطا: %s نام گذرگاه معتبری نیست\n" -#: gio/gdbus-tool.c:1081 +#: gio/gdbus-tool.c:1080 msgid "Error: Method name is not specified\n" msgstr "خطا: نام متد مشخص نشده است\n" -#: gio/gdbus-tool.c:1092 +#: gio/gdbus-tool.c:1091 #, c-format msgid "Error: Method name “%s” is invalid\n" msgstr "خطا: نام روش «%s» نامعتبر است\n" -#: gio/gdbus-tool.c:1170 +#: gio/gdbus-tool.c:1169 #, c-format msgid "Error parsing parameter %d of type “%s”: %s\n" msgstr "خطا در تجزیهٔ پارامتر %Id از گونهٔ «%s»: %s\n" -#: gio/gdbus-tool.c:1196 +#: gio/gdbus-tool.c:1195 #, c-format msgid "Error adding handle %d: %s\n" msgstr "خطا در افزودن دستهٔ %Id: %s\n" -#: gio/gdbus-tool.c:1696 +#: gio/gdbus-tool.c:1695 msgid "Destination name to introspect" msgstr "" -#: gio/gdbus-tool.c:1697 +#: gio/gdbus-tool.c:1696 msgid "Object path to introspect" msgstr "" -#: gio/gdbus-tool.c:1698 +#: gio/gdbus-tool.c:1697 msgid "Print XML" msgstr "چاپ XML" -#: gio/gdbus-tool.c:1699 +#: gio/gdbus-tool.c:1698 msgid "Introspect children" msgstr "" -#: gio/gdbus-tool.c:1700 +#: gio/gdbus-tool.c:1699 msgid "Only print properties" msgstr "تنها ترجیحات را چاپ کن" -#: gio/gdbus-tool.c:1789 +#: gio/gdbus-tool.c:1788 msgid "Introspect a remote object." msgstr "" -#: gio/gdbus-tool.c:1995 +#: gio/gdbus-tool.c:1994 msgid "Destination name to monitor" msgstr "نام مقصد جهت پایش" -#: gio/gdbus-tool.c:1996 +#: gio/gdbus-tool.c:1995 msgid "Object path to monitor" msgstr "مسیر شیء جهت پایش" -#: gio/gdbus-tool.c:2021 +#: gio/gdbus-tool.c:2020 msgid "Monitor a remote object." msgstr "پایش یک شیء دوردست." -#: gio/gdbus-tool.c:2079 +#: gio/gdbus-tool.c:2078 msgid "Error: can’t monitor a non-message-bus connection\n" msgstr "" -#: gio/gdbus-tool.c:2203 +#: gio/gdbus-tool.c:2202 msgid "Service to activate before waiting for the other one (well-known name)" msgstr "" -#: gio/gdbus-tool.c:2206 +#: gio/gdbus-tool.c:2205 msgid "" "Timeout to wait for before exiting with an error (seconds); 0 for no timeout " "(default)" msgstr "" -#: gio/gdbus-tool.c:2254 +#: gio/gdbus-tool.c:2253 msgid "OPTION… BUS-NAME" msgstr "OPTION… BUS-NAME" -#: gio/gdbus-tool.c:2255 +#: gio/gdbus-tool.c:2254 msgid "Wait for a bus name to appear." msgstr "انتظار برای ظهور یک نام گذرگاه." -#: gio/gdbus-tool.c:2331 +#: gio/gdbus-tool.c:2330 msgid "Error: A service to activate for must be specified.\n" msgstr "خطا: باید خدمتی برای فعّال کردنش مشخّص شده باشد.\n" -#: gio/gdbus-tool.c:2336 +#: gio/gdbus-tool.c:2335 msgid "Error: A service to wait for must be specified.\n" msgstr "خطا: باید خدمتی برای منتظرش شدن مشخّص شده باشد.\n" -#: gio/gdbus-tool.c:2341 +#: gio/gdbus-tool.c:2340 msgid "Error: Too many arguments.\n" msgstr "خطا: آرگومانهای بیش از حد.\n" -#: gio/gdbus-tool.c:2349 gio/gdbus-tool.c:2356 +#: gio/gdbus-tool.c:2348 gio/gdbus-tool.c:2355 #, c-format msgid "Error: %s is not a valid well-known bus name.\n" msgstr "خطا: %s نام گذرگاه شناخته شدهٔ معتبری نیست\n" @@ -1241,38 +1245,43 @@ msgid "Not authorized to change debug settings" msgstr "برای تغییر تنظیمات اشکالزدایی مجاز نیست" -#: gio/gdesktopappinfo.c:2182 gio/gdesktopappinfo.c:5119 +#: gio/gdesktopappinfo.c:2242 gio/gdesktopappinfo.c:5223 msgid "Unnamed" msgstr "بدوننام" -#: gio/gdesktopappinfo.c:2592 +#: gio/gdesktopappinfo.c:2652 msgid "Desktop file didn’t specify Exec field" msgstr "پروندهٔ میزکار زمینهٔ Exec را مشخّص نکرده" -#: gio/gdesktopappinfo.c:2891 +#: gio/gdesktopappinfo.c:2942 msgid "Unable to find terminal required for application" msgstr "نمیتوان پایانهٔ لازم برای این برنامه را پیدا کرد" -#: gio/gdesktopappinfo.c:3637 +#: gio/gdesktopappinfo.c:3002 +#, c-format +msgid "Program ‘%s’ not found in $PATH" +msgstr "" + +#: gio/gdesktopappinfo.c:3735 #, c-format msgid "Can’t create user application configuration folder %s: %s" msgstr "نمیتوان شاخهٔ پیکربندی برنامهٔ کاربر %s را ایجاد کرد: %s" -#: gio/gdesktopappinfo.c:3641 +#: gio/gdesktopappinfo.c:3739 #, c-format msgid "Can’t create user MIME configuration folder %s: %s" msgstr "نمیتوان شاخهٔ پیکربندی MIME کاربر %s را ایجاد کرد: %s" -#: gio/gdesktopappinfo.c:3883 gio/gdesktopappinfo.c:3907 +#: gio/gdesktopappinfo.c:3981 gio/gdesktopappinfo.c:4005 msgid "Application information lacks an identifier" msgstr "اطّلاعات برنامه یک شناسه کم دارد" -#: gio/gdesktopappinfo.c:4143 +#: gio/gdesktopappinfo.c:4241 #, c-format msgid "Can’t create user desktop file %s" msgstr "نمیتوان پروندهٔ میزکار کاربر %s را ایجاد کرد" -#: gio/gdesktopappinfo.c:4279 +#: gio/gdesktopappinfo.c:4377 #, c-format msgid "Custom definition for %s" msgstr "تعریف شخصی برای %s" @@ -1344,7 +1353,7 @@ msgid "Containing mount does not exist" msgstr "" -#: gio/gfile.c:2641 gio/glocalfile.c:2500 +#: gio/gfile.c:2641 gio/glocalfile.c:2511 msgid "Can’t copy over directory" msgstr "نمیتوان روی شاخه رونوشت کرد" @@ -1389,7 +1398,7 @@ msgid "Invalid symlink value given" msgstr "مقدار نامعتبر پیوند نمادین داده شده" -#: gio/gfile.c:4163 glib/gfileutils.c:2335 +#: gio/gfile.c:4163 glib/gfileutils.c:2392 msgid "Symbolic links not supported" msgstr "پیوندهای نمادی پشتیبانی نمیشوند" @@ -1487,37 +1496,37 @@ msgid "HTTP proxy server closed connection unexpectedly." msgstr "کارساز پیشکار HTTP اتّصال را به طور غیرمنتظرهای بست." -#: gio/gicon.c:300 +#: gio/gicon.c:299 #, c-format msgid "Wrong number of tokens (%d)" msgstr "تعداد ژتونهای اشتباه (%Id)" -#: gio/gicon.c:320 +#: gio/gicon.c:319 #, c-format msgid "No type for class name %s" msgstr "گونهای برای نام کلاس %s وجود ندارد" -#: gio/gicon.c:330 +#: gio/gicon.c:329 #, c-format msgid "Type %s does not implement the GIcon interface" msgstr "گونهٔ %s واسط GIcon را پیاده نساخته" -#: gio/gicon.c:341 +#: gio/gicon.c:340 #, c-format msgid "Type %s is not classed" msgstr "" -#: gio/gicon.c:355 +#: gio/gicon.c:354 #, c-format msgid "Malformed version number: %s" msgstr "شمارهٔ نگارش بدریخت: %s" -#: gio/gicon.c:369 +#: gio/gicon.c:368 #, c-format msgid "Type %s does not implement from_tokens() on the GIcon interface" msgstr "گونهٔ %s from_tokens() را روی واسط GIcon پیاده نساخته" -#: gio/gicon.c:471 +#: gio/gicon.c:470 msgid "Can’t handle the supplied version of the icon encoding" msgstr "نمیتوان نگارش فراهم شدهٔ رمزنگاری نقشک را مدیریت کرد" @@ -2282,7 +2291,7 @@ msgid "List contents of directories in a tree-like format." msgstr "" -#: gio/glib-compile-resources.c:142 gio/glib-compile-schemas.c:1516 +#: gio/glib-compile-resources.c:142 gio/glib-compile-schemas.c:1513 #, c-format msgid "Element <%s> not allowed inside <%s>" msgstr "" @@ -2337,7 +2346,7 @@ msgid "text may not appear inside <%s>" msgstr "" -#: gio/glib-compile-resources.c:821 gio/glib-compile-schemas.c:2174 +#: gio/glib-compile-resources.c:821 gio/glib-compile-schemas.c:2171 msgid "Show program version and exit" msgstr "" @@ -2351,8 +2360,8 @@ "directory)" msgstr "" -#: gio/glib-compile-resources.c:823 gio/glib-compile-schemas.c:2175 -#: gio/glib-compile-schemas.c:2204 +#: gio/glib-compile-resources.c:823 gio/glib-compile-schemas.c:2172 +#: gio/glib-compile-schemas.c:2201 msgid "DIRECTORY" msgstr "DIRECTORY" @@ -2558,287 +2567,287 @@ msgid "<aliases> must contain at least one <alias>" msgstr "" -#: gio/glib-compile-schemas.c:799 +#: gio/glib-compile-schemas.c:796 msgid "Empty names are not permitted" msgstr "نامهای خالی مجاز نیستند" -#: gio/glib-compile-schemas.c:809 +#: gio/glib-compile-schemas.c:806 #, c-format msgid "Invalid name “%s”: names must begin with a lowercase letter" msgstr "" -#: gio/glib-compile-schemas.c:821 +#: gio/glib-compile-schemas.c:818 #, c-format msgid "" "Invalid name “%s”: invalid character “%c”; only lowercase letters, numbers and " "hyphen (“-”) are permitted" msgstr "" -#: gio/glib-compile-schemas.c:830 +#: gio/glib-compile-schemas.c:827 #, c-format msgid "Invalid name “%s”: two successive hyphens (“--”) are not permitted" msgstr "" -#: gio/glib-compile-schemas.c:839 +#: gio/glib-compile-schemas.c:836 #, c-format msgid "Invalid name “%s”: the last character may not be a hyphen (“-”)" msgstr "" -#: gio/glib-compile-schemas.c:847 +#: gio/glib-compile-schemas.c:844 #, c-format msgid "Invalid name “%s”: maximum length is 1024" msgstr "" -#: gio/glib-compile-schemas.c:919 +#: gio/glib-compile-schemas.c:916 #, c-format msgid "<child name='%s'> already specified" msgstr "" -#: gio/glib-compile-schemas.c:945 +#: gio/glib-compile-schemas.c:942 msgid "Cannot add keys to a “list-of” schema" msgstr "" -#: gio/glib-compile-schemas.c:956 +#: gio/glib-compile-schemas.c:953 #, c-format msgid "<key name='%s'> already specified" msgstr "" -#: gio/glib-compile-schemas.c:974 +#: gio/glib-compile-schemas.c:971 #, c-format msgid "" "<key name='%s'> shadows <key name='%s'> in <schema id='%s'>; use <override> to " "modify value" msgstr "" -#: gio/glib-compile-schemas.c:985 +#: gio/glib-compile-schemas.c:982 #, c-format msgid "" "Exactly one of “type”, “enum” or “flags” must be specified as an attribute to " "<key>" msgstr "" -#: gio/glib-compile-schemas.c:1004 +#: gio/glib-compile-schemas.c:1001 #, c-format msgid "<%s id='%s'> not (yet) defined." msgstr "" -#: gio/glib-compile-schemas.c:1019 +#: gio/glib-compile-schemas.c:1016 #, c-format msgid "Invalid GVariant type string “%s”" msgstr "رشتهٔ گونهٔ GVariant نامعتبر «%s»" -#: gio/glib-compile-schemas.c:1049 +#: gio/glib-compile-schemas.c:1046 msgid "<override> given but schema isn’t extending anything" msgstr "" -#: gio/glib-compile-schemas.c:1062 +#: gio/glib-compile-schemas.c:1059 #, c-format msgid "No <key name='%s'> to override" msgstr "" -#: gio/glib-compile-schemas.c:1070 +#: gio/glib-compile-schemas.c:1067 #, c-format msgid "<override name='%s'> already specified" msgstr "" -#: gio/glib-compile-schemas.c:1143 +#: gio/glib-compile-schemas.c:1140 #, c-format msgid "<schema id='%s'> already specified" msgstr "" -#: gio/glib-compile-schemas.c:1155 +#: gio/glib-compile-schemas.c:1152 #, c-format msgid "<schema id='%s'> extends not yet existing schema “%s”" msgstr "" -#: gio/glib-compile-schemas.c:1171 +#: gio/glib-compile-schemas.c:1168 #, c-format msgid "<schema id='%s'> is list of not yet existing schema “%s”" msgstr "" -#: gio/glib-compile-schemas.c:1179 +#: gio/glib-compile-schemas.c:1176 #, c-format msgid "Cannot be a list of a schema with a path" msgstr "نمیتواند سیاههای از یک شما با یک مسیر باشد" -#: gio/glib-compile-schemas.c:1189 +#: gio/glib-compile-schemas.c:1186 #, c-format msgid "Cannot extend a schema with a path" msgstr "نمیتواند شمایی را با یک مسیر گستراند" -#: gio/glib-compile-schemas.c:1199 +#: gio/glib-compile-schemas.c:1196 #, c-format msgid "<schema id='%s'> is a list, extending <schema id='%s'> which is not a list" msgstr "" -#: gio/glib-compile-schemas.c:1209 +#: gio/glib-compile-schemas.c:1206 #, c-format msgid "" "<schema id='%s' list-of='%s'> extends <schema id='%s' list-of='%s'> but “%s” " "does not extend “%s”" msgstr "" -#: gio/glib-compile-schemas.c:1226 +#: gio/glib-compile-schemas.c:1223 #, c-format msgid "A path, if given, must begin and end with a slash" msgstr "یک مسیر، اگر داده شود، باید با یک اسلش آغاز و پایان یابد" -#: gio/glib-compile-schemas.c:1233 +#: gio/glib-compile-schemas.c:1230 #, c-format msgid "The path of a list must end with “:/”" msgstr "مسیر یک سیاهه باید با «:/» خاتمه پیدا کند" -#: gio/glib-compile-schemas.c:1242 +#: gio/glib-compile-schemas.c:1239 #, c-format msgid "" "Warning: Schema “%s” has path “%s”. Paths starting with “/apps/”, “/desktop/” " "or “/system/” are deprecated." msgstr "" -#: gio/glib-compile-schemas.c:1272 +#: gio/glib-compile-schemas.c:1269 #, c-format msgid "<%s id='%s'> already specified" msgstr "<%s id='%s'> از قبل مشخص شده است" -#: gio/glib-compile-schemas.c:1422 gio/glib-compile-schemas.c:1438 +#: gio/glib-compile-schemas.c:1419 gio/glib-compile-schemas.c:1435 #, c-format msgid "Only one <%s> element allowed inside <%s>" msgstr "" -#: gio/glib-compile-schemas.c:1520 +#: gio/glib-compile-schemas.c:1517 #, c-format msgid "Element <%s> not allowed at the top level" msgstr "" -#: gio/glib-compile-schemas.c:1538 +#: gio/glib-compile-schemas.c:1535 msgid "Element <default> is required in <key>" msgstr "" -#: gio/glib-compile-schemas.c:1628 +#: gio/glib-compile-schemas.c:1625 #, c-format msgid "Text may not appear inside <%s>" msgstr "" -#: gio/glib-compile-schemas.c:1696 +#: gio/glib-compile-schemas.c:1693 #, c-format msgid "Warning: undefined reference to <schema id='%s'/>" msgstr "" #. Translators: Do not translate "--strict". -#: gio/glib-compile-schemas.c:1835 gio/glib-compile-schemas.c:1914 +#: gio/glib-compile-schemas.c:1832 gio/glib-compile-schemas.c:1911 msgid "--strict was specified; exiting." msgstr "" -#: gio/glib-compile-schemas.c:1847 +#: gio/glib-compile-schemas.c:1844 msgid "This entire file has been ignored." msgstr "تمامی این پرونده چشم پوشی شده." -#: gio/glib-compile-schemas.c:1910 +#: gio/glib-compile-schemas.c:1907 msgid "Ignoring this file." msgstr "چشم پوشی از این پرونده." -#: gio/glib-compile-schemas.c:1965 +#: gio/glib-compile-schemas.c:1962 #, c-format msgid "" "No such key “%s” in schema “%s” as specified in override file “%s”; ignoring " "override for this key." msgstr "" -#: gio/glib-compile-schemas.c:1973 +#: gio/glib-compile-schemas.c:1970 #, c-format msgid "" "No such key “%s” in schema “%s” as specified in override file “%s” and --strict " "was specified; exiting." msgstr "" -#: gio/glib-compile-schemas.c:1995 +#: gio/glib-compile-schemas.c:1992 #, c-format 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:2004 +#: gio/glib-compile-schemas.c:2001 #, c-format msgid "" "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:2028 +#: gio/glib-compile-schemas.c:2025 #, c-format msgid "" "Error parsing key “%s” in schema “%s” as specified in override file “%s”: %s. " "Ignoring override for this key." msgstr "" -#: gio/glib-compile-schemas.c:2040 +#: gio/glib-compile-schemas.c:2037 #, c-format msgid "" "Error parsing key “%s” in schema “%s” as specified in override file “%s”: %s. --" "strict was specified; exiting." msgstr "" -#: gio/glib-compile-schemas.c:2067 +#: gio/glib-compile-schemas.c:2064 #, c-format msgid "" "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 "" -#: gio/glib-compile-schemas.c:2077 +#: gio/glib-compile-schemas.c:2074 #, 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 "" -#: gio/glib-compile-schemas.c:2103 +#: gio/glib-compile-schemas.c:2100 #, 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 "" -#: gio/glib-compile-schemas.c:2113 +#: gio/glib-compile-schemas.c:2110 #, c-format msgid "" "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 "" -#: gio/glib-compile-schemas.c:2175 +#: gio/glib-compile-schemas.c:2172 msgid "Where to store the gschemas.compiled file" msgstr "مکان ذخیرهٔ پروندهٔ gschemas.compiled" -#: gio/glib-compile-schemas.c:2176 +#: gio/glib-compile-schemas.c:2173 msgid "Abort on any errors in schemas" msgstr "قطع کردن با رخدادِ هر نوع خطا در شِماها" -#: gio/glib-compile-schemas.c:2177 +#: gio/glib-compile-schemas.c:2174 msgid "Do not write the gschema.compiled file" msgstr "بر روی پروندهٔ gschema.compiled ننویس" -#: gio/glib-compile-schemas.c:2178 +#: gio/glib-compile-schemas.c:2175 msgid "Do not enforce key name restrictions" msgstr "" -#: gio/glib-compile-schemas.c:2207 +#: gio/glib-compile-schemas.c:2204 msgid "" "Compile all GSettings schema files into a schema cache.\n" "Schema files are required to have the extension .gschema.xml,\n" "and the cache file is called gschemas.compiled." msgstr "" -#: gio/glib-compile-schemas.c:2228 +#: gio/glib-compile-schemas.c:2225 msgid "You should give exactly one directory name" msgstr "باید دقیقأ یک نام شاخه بدهید" -#: gio/glib-compile-schemas.c:2271 +#: gio/glib-compile-schemas.c:2268 msgid "No schema files found: doing nothing." msgstr "هیچ پرونده شمایی پیدا نشد: کاری نمیشود." -#: gio/glib-compile-schemas.c:2273 +#: gio/glib-compile-schemas.c:2270 msgid "No schema files found: removed existing output file." msgstr "هیچ پرونده شمایی پیدا نشد: پروندهٔ خروجی موجود برداشته شد." @@ -2847,7 +2856,7 @@ msgid "Invalid filename %s" msgstr "نام پرونده نامعتبر: %s" -#: gio/glocalfile.c:996 +#: gio/glocalfile.c:1005 #, c-format msgid "Error getting filesystem info for %s: %s" msgstr "خطا در گرفتن اطّلاعات سامانهپرونده برای %s: %s" @@ -2856,124 +2865,124 @@ #. * the enclosing (user visible) mount of a file, but none #. * exists. #. -#: gio/glocalfile.c:1137 +#: gio/glocalfile.c:1141 #, c-format msgid "Containing mount for file %s not found" msgstr "" -#: gio/glocalfile.c:1160 +#: gio/glocalfile.c:1164 msgid "Can’t rename root directory" msgstr "نمیتوان نام شاخهٔ ریشه را عوض کرد" -#: gio/glocalfile.c:1178 gio/glocalfile.c:1201 +#: gio/glocalfile.c:1182 gio/glocalfile.c:1205 #, c-format msgid "Error renaming file %s: %s" msgstr "خطا در تغییر نام پرونده %s: %s" -#: gio/glocalfile.c:1185 +#: gio/glocalfile.c:1189 msgid "Can’t rename file, filename already exists" msgstr "نمیتوان نام پرونده را عوض کرد. نام پرونده از پیش وجود دارد" -#: gio/glocalfile.c:1198 gio/glocalfile.c:2394 gio/glocalfile.c:2422 -#: gio/glocalfile.c:2561 gio/glocalfileoutputstream.c:658 +#: gio/glocalfile.c:1202 gio/glocalfile.c:2405 gio/glocalfile.c:2433 +#: gio/glocalfile.c:2572 gio/glocalfileoutputstream.c:658 msgid "Invalid filename" msgstr "نام پرونده نامعتبر" -#: gio/glocalfile.c:1366 gio/glocalfile.c:1377 +#: gio/glocalfile.c:1370 gio/glocalfile.c:1381 #, c-format msgid "Error opening file %s: %s" msgstr "خطا در گشودن پروندهٔ %s: %s" -#: gio/glocalfile.c:1502 +#: gio/glocalfile.c:1506 #, c-format msgid "Error removing file %s: %s" msgstr "خطا در برداشتن پروندهٔ %s: %s" -#: gio/glocalfile.c:1996 gio/glocalfile.c:2007 gio/glocalfile.c:2034 +#: gio/glocalfile.c:2000 gio/glocalfile.c:2011 gio/glocalfile.c:2038 #, c-format msgid "Error trashing file %s: %s" msgstr "خطا در دور ریختن پروندهٔ %s: %s" -#: gio/glocalfile.c:2054 +#: gio/glocalfile.c:2058 #, c-format msgid "Unable to create trash directory %s: %s" msgstr "ناتوان در ایجاد شاخهٔ زبالهدان %s: %s" -#: gio/glocalfile.c:2075 +#: gio/glocalfile.c:2079 #, c-format msgid "Unable to find toplevel directory to trash %s" msgstr "ناتوان در یافتن شاخهٔ سطح بالا برای دور ریختن %s" -#: gio/glocalfile.c:2083 +#: gio/glocalfile.c:2087 #, c-format msgid "Trashing on system internal mounts is not supported" msgstr "" -#: gio/glocalfile.c:2169 gio/glocalfile.c:2197 +#: gio/glocalfile.c:2173 gio/glocalfile.c:2201 #, c-format msgid "Unable to find or create trash directory %s to trash %s" msgstr "ناتوان در یافتن یا ایجاد شاخهٔ زبالهدان %s برای دور ریختن %s" -#: gio/glocalfile.c:2243 +#: gio/glocalfile.c:2245 #, c-format msgid "Unable to create trashing info file for %s: %s" msgstr "ناتوان در ایجاد پروندهٔ اطّلاعات دور ریختن برای %s: %s" -#: gio/glocalfile.c:2305 +#: gio/glocalfile.c:2316 #, c-format msgid "Unable to trash file %s across filesystem boundaries" msgstr "ناتوان در دور ریختن پروندهٔ %s از فرار محدودههای سامانهپرونده" -#: gio/glocalfile.c:2309 gio/glocalfile.c:2365 +#: gio/glocalfile.c:2320 gio/glocalfile.c:2376 #, c-format msgid "Unable to trash file %s: %s" msgstr "ناتوان در دور ریختن پروندهٔ %s: %s" -#: gio/glocalfile.c:2371 +#: gio/glocalfile.c:2382 #, c-format msgid "Unable to trash file %s" msgstr "ناتوان در دور ریختن پروندهٔ %s" -#: gio/glocalfile.c:2397 +#: gio/glocalfile.c:2408 #, c-format msgid "Error creating directory %s: %s" msgstr "خطا در ایجاد شاخهٔ %s: %s" -#: gio/glocalfile.c:2426 +#: gio/glocalfile.c:2437 #, c-format msgid "Filesystem does not support symbolic links" msgstr "سیستمپرونده از پیوندهای نمادین پشتیبانی نمیکند" -#: gio/glocalfile.c:2429 +#: gio/glocalfile.c:2440 #, c-format msgid "Error making symbolic link %s: %s" msgstr "خطا در ساختن پیوند نمادین %s: %s" -#: gio/glocalfile.c:2472 gio/glocalfile.c:2507 gio/glocalfile.c:2564 +#: gio/glocalfile.c:2483 gio/glocalfile.c:2518 gio/glocalfile.c:2575 #, c-format msgid "Error moving file %s: %s" msgstr "خطا در جابجایی پروندهٔ %s: %s" -#: gio/glocalfile.c:2495 +#: gio/glocalfile.c:2506 msgid "Can’t move directory over directory" msgstr "نمیتوان شاخه را روی شاخه جابهجا کرد" -#: gio/glocalfile.c:2521 gio/glocalfileoutputstream.c:1110 +#: gio/glocalfile.c:2532 gio/glocalfileoutputstream.c:1110 #: gio/glocalfileoutputstream.c:1124 gio/glocalfileoutputstream.c:1139 #: gio/glocalfileoutputstream.c:1156 gio/glocalfileoutputstream.c:1170 msgid "Backup file creation failed" msgstr "ساخت پرونده پشتیبان شکست خورد" -#: gio/glocalfile.c:2540 +#: gio/glocalfile.c:2551 #, c-format msgid "Error removing target file: %s" msgstr "خطا در هنگام حذف پرونده هدف: %s" -#: gio/glocalfile.c:2554 +#: gio/glocalfile.c:2565 msgid "Move between mounts not supported" msgstr "" -#: gio/glocalfile.c:2728 +#: gio/glocalfile.c:2741 #, c-format msgid "Could not determine the disk usage of %s: %s" msgstr "نتوانست استفادهٔ دیسک %s را تشخیص دهد: %s" @@ -2995,114 +3004,114 @@ msgid "Error setting extended attribute “%s”: %s" msgstr "خطا در تنظیم کردن صفت گستردهٔ «%s»: %s" -#: gio/glocalfileinfo.c:1738 gio/win32/gwinhttpfile.c:191 +#: gio/glocalfileinfo.c:1819 gio/win32/gwinhttpfile.c:191 msgid " (invalid encoding)" msgstr " (کدگذاری نامعتبر)" -#: gio/glocalfileinfo.c:1897 gio/glocalfileoutputstream.c:945 +#: gio/glocalfileinfo.c:1978 gio/glocalfileoutputstream.c:945 #: gio/glocalfileoutputstream.c:997 #, c-format msgid "Error when getting information for file “%s”: %s" msgstr "خطا هنگام گرفتن اطّلاعات برای پروندهٔ «%s»: %s" -#: gio/glocalfileinfo.c:2163 +#: gio/glocalfileinfo.c:2281 #, c-format msgid "Error when getting information for file descriptor: %s" msgstr "خطا هنگام گرفتن اطّلاعات برای توصیفگر پرونده: %s" -#: gio/glocalfileinfo.c:2208 +#: gio/glocalfileinfo.c:2326 msgid "Invalid attribute type (uint32 expected)" msgstr "نوع مشخصه نامعتبر (uint32 مورد انتظار بود)" -#: gio/glocalfileinfo.c:2226 +#: gio/glocalfileinfo.c:2344 msgid "Invalid attribute type (uint64 expected)" msgstr "نوع مشخصه نامعتبر بود (uint64 مورد انتظار بود)" -#: gio/glocalfileinfo.c:2245 gio/glocalfileinfo.c:2264 +#: gio/glocalfileinfo.c:2363 gio/glocalfileinfo.c:2382 msgid "Invalid attribute type (byte string expected)" msgstr "نوع مشخصه نامعتبر (رشته بایتی مورد انتظار بود)" -#: gio/glocalfileinfo.c:2311 +#: gio/glocalfileinfo.c:2429 msgid "Cannot set permissions on symlinks" msgstr "نمیتوان اجازههای روی پیوند نمادین را تنظیم کرد" -#: gio/glocalfileinfo.c:2327 +#: gio/glocalfileinfo.c:2445 #, c-format msgid "Error setting permissions: %s" msgstr "خطا در هنگام تنظیم اجازهها: %s" -#: gio/glocalfileinfo.c:2378 +#: gio/glocalfileinfo.c:2496 #, c-format msgid "Error setting owner: %s" msgstr "خطا در هنگام تنظیم مالک: %s" -#: gio/glocalfileinfo.c:2401 +#: gio/glocalfileinfo.c:2519 msgid "symlink must be non-NULL" msgstr "" -#: gio/glocalfileinfo.c:2411 gio/glocalfileinfo.c:2430 gio/glocalfileinfo.c:2441 +#: gio/glocalfileinfo.c:2529 gio/glocalfileinfo.c:2548 gio/glocalfileinfo.c:2559 #, c-format msgid "Error setting symlink: %s" msgstr "خطا در تنظیم پیوند نمادین: %s" -#: gio/glocalfileinfo.c:2420 +#: gio/glocalfileinfo.c:2538 msgid "Error setting symlink: file is not a symlink" msgstr "" -#: gio/glocalfileinfo.c:2492 +#: gio/glocalfileinfo.c:2630 #, c-format msgid "Extra nanoseconds %d for UNIX timestamp %lld are negative" msgstr "" -#: gio/glocalfileinfo.c:2501 +#: gio/glocalfileinfo.c:2639 #, c-format msgid "Extra nanoseconds %d for UNIX timestamp %lld reach 1 second" msgstr "" -#: gio/glocalfileinfo.c:2511 +#: gio/glocalfileinfo.c:2649 #, c-format msgid "UNIX timestamp %lld does not fit into 64 bits" msgstr "" -#: gio/glocalfileinfo.c:2522 +#: gio/glocalfileinfo.c:2660 #, c-format msgid "UNIX timestamp %lld is outside of the range supported by Windows" msgstr "" -#: gio/glocalfileinfo.c:2625 +#: gio/glocalfileinfo.c:2792 #, c-format msgid "File name “%s” cannot be converted to UTF-16" msgstr "" -#: gio/glocalfileinfo.c:2644 +#: gio/glocalfileinfo.c:2811 #, c-format msgid "File “%s” cannot be opened: Windows Error %lu" msgstr "" -#: gio/glocalfileinfo.c:2657 +#: gio/glocalfileinfo.c:2824 #, c-format msgid "Error setting modification or access time for file “%s”: %lu" msgstr "خطا در تنظیم کردن زمان دسترسی یا تغییر برای پروندهٔ «%s»: %lu" -#: gio/glocalfileinfo.c:2798 gio/glocalfileinfo.c:2810 +#: gio/glocalfileinfo.c:2981 #, c-format msgid "Error setting modification or access time: %s" msgstr "خطا در هنگام تنظیم کردن زمان دسترسی یا تغییر: %s" -#: gio/glocalfileinfo.c:2833 +#: gio/glocalfileinfo.c:3004 msgid "SELinux context must be non-NULL" msgstr "" -#: gio/glocalfileinfo.c:2840 +#: gio/glocalfileinfo.c:3011 msgid "SELinux is not enabled on this system" msgstr "سیستم SELinux بر روی این سیستم فعال نشده است" -#: gio/glocalfileinfo.c:2850 +#: gio/glocalfileinfo.c:3021 #, c-format msgid "Error setting SELinux context: %s" msgstr "خطا در تنظیم مفاد SELinux: %s" -#: gio/glocalfileinfo.c:2947 +#: gio/glocalfileinfo.c:3118 #, c-format msgid "Setting attribute %s not supported" msgstr "تنظیم کردن مشخصه %s پشتیبانی نمیشود" @@ -3149,13 +3158,13 @@ msgid "Error renaming temporary file: %s" msgstr "خطا خطا در تغییر نام پرونده موقت: %s" -#: gio/glocalfileoutputstream.c:611 gio/glocalfileoutputstream.c:1241 +#: gio/glocalfileoutputstream.c:611 gio/glocalfileoutputstream.c:1242 #, c-format msgid "Error truncating file: %s" msgstr "خطا در هنگام کوتاه کردن پرونده: %s" #: gio/glocalfileoutputstream.c:664 gio/glocalfileoutputstream.c:909 -#: gio/glocalfileoutputstream.c:1222 gio/gsubprocess.c:231 +#: gio/glocalfileoutputstream.c:1223 gio/gsubprocess.c:231 #, c-format msgid "Error opening file “%s”: %s" msgstr "خطا در گشودن پروندهٔ «%s»: %s" @@ -3172,7 +3181,7 @@ msgid "The file was externally modified" msgstr "پرونده از خارج تغییر کرده است" -#: gio/glocalfileoutputstream.c:1204 +#: gio/glocalfileoutputstream.c:1205 #, c-format msgid "Error removing old file: %s" msgstr "خطا در هنگام حذف پرونده قدیمی: %s" @@ -3317,8 +3326,8 @@ #. Translators: the first placeholder is a domain name, the #. * second is an error message #: gio/gresolver.c:403 gio/gthreadedresolver.c:152 gio/gthreadedresolver.c:170 -#: gio/gthreadedresolver.c:782 gio/gthreadedresolver.c:806 -#: gio/gthreadedresolver.c:831 gio/gthreadedresolver.c:846 +#: gio/gthreadedresolver.c:798 gio/gthreadedresolver.c:822 +#: gio/gthreadedresolver.c:847 gio/gthreadedresolver.c:862 #, c-format msgid "Error resolving “%s”: %s" msgstr "خطا در حل «%s»: %s" @@ -3973,35 +3982,35 @@ #. Translators: the placeholder is a DNS record type, such as ‘MX’ or ‘SRV’ #: gio/gthreadedresolver.c:552 gio/gthreadedresolver.c:574 -#: gio/gthreadedresolver.c:612 gio/gthreadedresolver.c:659 -#: gio/gthreadedresolver.c:688 gio/gthreadedresolver.c:700 +#: gio/gthreadedresolver.c:628 gio/gthreadedresolver.c:675 +#: gio/gthreadedresolver.c:704 gio/gthreadedresolver.c:716 #, c-format msgid "Error parsing DNS %s record: malformed DNS packet" msgstr "" -#: gio/gthreadedresolver.c:758 gio/gthreadedresolver.c:895 -#: gio/gthreadedresolver.c:993 gio/gthreadedresolver.c:1043 +#: gio/gthreadedresolver.c:774 gio/gthreadedresolver.c:911 +#: gio/gthreadedresolver.c:1009 gio/gthreadedresolver.c:1059 #, c-format msgid "No DNS record of the requested type for “%s”" msgstr "" -#: gio/gthreadedresolver.c:763 gio/gthreadedresolver.c:998 +#: gio/gthreadedresolver.c:779 gio/gthreadedresolver.c:1014 #, c-format msgid "Temporarily unable to resolve “%s”" msgstr "" -#: gio/gthreadedresolver.c:768 gio/gthreadedresolver.c:1003 -#: gio/gthreadedresolver.c:1113 +#: gio/gthreadedresolver.c:784 gio/gthreadedresolver.c:1019 +#: gio/gthreadedresolver.c:1129 #, c-format msgid "Error resolving “%s”" msgstr "خطا در حل «%s»" -#: gio/gthreadedresolver.c:782 gio/gthreadedresolver.c:806 -#: gio/gthreadedresolver.c:831 gio/gthreadedresolver.c:846 +#: gio/gthreadedresolver.c:798 gio/gthreadedresolver.c:822 +#: gio/gthreadedresolver.c:847 gio/gthreadedresolver.c:862 msgid "Malformed DNS packet" msgstr "" -#: gio/gthreadedresolver.c:888 +#: gio/gthreadedresolver.c:904 #, c-format msgid "Failed to parse DNS response for “%s”: " msgstr "شکست در تجزیهٔ پاسخ ساناد برای «%s»: " @@ -4125,7 +4134,7 @@ msgid "Error closing file descriptor: %s" msgstr "خطا در بستن توصیفگر پرونده: %s" -#: gio/gunixmounts.c:2815 gio/gunixmounts.c:2868 +#: gio/gunixmounts.c:2817 gio/gunixmounts.c:2870 msgid "Filesystem root" msgstr "ریشه سیستمپروندهها" @@ -4207,74 +4216,74 @@ msgid "Wrong args\n" msgstr "" -#: glib/gbookmarkfile.c:779 +#: glib/gbookmarkfile.c:861 #, c-format msgid "Unexpected attribute “%s” for element “%s”" msgstr "صفت نامنتظرهٔ «%s» برای عنصر «%s»" -#: glib/gbookmarkfile.c:790 glib/gbookmarkfile.c:870 glib/gbookmarkfile.c:880 -#: glib/gbookmarkfile.c:993 +#: glib/gbookmarkfile.c:872 glib/gbookmarkfile.c:952 glib/gbookmarkfile.c:962 +#: glib/gbookmarkfile.c:1075 #, c-format msgid "Attribute “%s” of element “%s” not found" msgstr "صفت «%s» برای عنصر «%s» پیدا نشد" -#: glib/gbookmarkfile.c:1202 glib/gbookmarkfile.c:1267 glib/gbookmarkfile.c:1331 -#: glib/gbookmarkfile.c:1341 +#: glib/gbookmarkfile.c:1284 glib/gbookmarkfile.c:1349 glib/gbookmarkfile.c:1413 +#: glib/gbookmarkfile.c:1423 #, c-format msgid "Unexpected tag “%s”, tag “%s” expected" msgstr "برچسب نامنتظرهٔ «%s»، انتظار برچسب «%s» میرفت" -#: glib/gbookmarkfile.c:1227 glib/gbookmarkfile.c:1241 glib/gbookmarkfile.c:1309 -#: glib/gbookmarkfile.c:1355 +#: glib/gbookmarkfile.c:1309 glib/gbookmarkfile.c:1323 glib/gbookmarkfile.c:1391 +#: glib/gbookmarkfile.c:1437 #, c-format msgid "Unexpected tag “%s” inside “%s”" msgstr "برچسب نامنتظرهٔ «%s» داخل «%s»" -#: glib/gbookmarkfile.c:1635 +#: glib/gbookmarkfile.c:1717 #, c-format msgid "Invalid date/time ‘%s’ in bookmark file" msgstr "" -#: glib/gbookmarkfile.c:1838 +#: glib/gbookmarkfile.c:1956 msgid "No valid bookmark file found in data dirs" msgstr "پروندهٔ چوبالف معتبری در شاخههای داده پیدا نمیشود" -#: glib/gbookmarkfile.c:2039 +#: glib/gbookmarkfile.c:2157 #, c-format msgid "A bookmark for URI “%s” already exists" msgstr "نشانکی برای نشانی «%s» از پیش موجود است" -#: glib/gbookmarkfile.c:2088 glib/gbookmarkfile.c:2246 glib/gbookmarkfile.c:2331 -#: glib/gbookmarkfile.c:2411 glib/gbookmarkfile.c:2496 glib/gbookmarkfile.c:2630 -#: glib/gbookmarkfile.c:2763 glib/gbookmarkfile.c:2898 glib/gbookmarkfile.c:2940 -#: glib/gbookmarkfile.c:3037 glib/gbookmarkfile.c:3158 glib/gbookmarkfile.c:3352 -#: glib/gbookmarkfile.c:3493 glib/gbookmarkfile.c:3712 glib/gbookmarkfile.c:3801 -#: glib/gbookmarkfile.c:3890 glib/gbookmarkfile.c:4009 +#: glib/gbookmarkfile.c:2206 glib/gbookmarkfile.c:2364 glib/gbookmarkfile.c:2449 +#: glib/gbookmarkfile.c:2529 glib/gbookmarkfile.c:2614 glib/gbookmarkfile.c:2748 +#: glib/gbookmarkfile.c:2881 glib/gbookmarkfile.c:3016 glib/gbookmarkfile.c:3058 +#: glib/gbookmarkfile.c:3155 glib/gbookmarkfile.c:3276 glib/gbookmarkfile.c:3470 +#: glib/gbookmarkfile.c:3611 glib/gbookmarkfile.c:3830 glib/gbookmarkfile.c:3919 +#: glib/gbookmarkfile.c:4008 glib/gbookmarkfile.c:4127 #, c-format msgid "No bookmark found for URI “%s”" msgstr "نشانکی برای نشانی «%s» پیدا نشد" -#: glib/gbookmarkfile.c:2420 +#: glib/gbookmarkfile.c:2538 #, c-format msgid "No MIME type defined in the bookmark for URI “%s”" msgstr "هیچ گونهٔ MIMEای در نشانک برای نشانی «%s» تعریف نشده" -#: glib/gbookmarkfile.c:2505 +#: glib/gbookmarkfile.c:2623 #, c-format msgid "No private flag has been defined in bookmark for URI “%s”" msgstr "هیچ پرچم خصوصیای در نشانک برای نشانی «%s» تعریف نشده" -#: glib/gbookmarkfile.c:3046 +#: glib/gbookmarkfile.c:3164 #, c-format msgid "No groups set in bookmark for URI “%s”" msgstr "هیچ گروهی در نشانک برای نشانی «%s» تعیین نشده" -#: glib/gbookmarkfile.c:3514 glib/gbookmarkfile.c:3722 +#: glib/gbookmarkfile.c:3632 glib/gbookmarkfile.c:3840 #, c-format msgid "No application with name “%s” registered a bookmark for “%s”" msgstr "هیچ برنامهای با نام «%s» نشانکی برای «%s» ثبت نکرده" -#: glib/gbookmarkfile.c:3745 +#: glib/gbookmarkfile.c:3863 #, c-format msgid "Failed to expand exec line “%s” with URI “%s”" msgstr "شکست در گستراندن خط «%s» با نشانی «%s»" @@ -4753,79 +4762,79 @@ msgid "Error opening directory “%s”: %s" msgstr "خطا در گشودن شاخهٔ «%s»: %s" -#: glib/gfileutils.c:735 glib/gfileutils.c:827 +#: glib/gfileutils.c:753 glib/gfileutils.c:845 #, c-format msgid "Could not allocate %lu byte to read file “%s”" msgid_plural "Could not allocate %lu bytes to read file “%s”" msgstr0 "نتوانست %Ilu بایت برای خواندن پروندهٔ «%s» تخصیص دهد" msgstr1 "نتوانست %Ilu بایت برای خواندن پروندهٔ «%s» تخصیص دهد" -#: glib/gfileutils.c:752 +#: glib/gfileutils.c:770 #, c-format msgid "Error reading file “%s”: %s" msgstr "خطا در خواندن پروندهٔ «%s»: %s" -#: glib/gfileutils.c:788 +#: glib/gfileutils.c:806 #, c-format msgid "File “%s” is too large" msgstr "پروندهٔ «%s» بسیار بزرگ است" -#: glib/gfileutils.c:852 +#: glib/gfileutils.c:870 #, c-format msgid "Failed to read from file “%s”: %s" msgstr "شکست در خواندن از پروندهٔ «%s»: %s" -#: glib/gfileutils.c:902 glib/gfileutils.c:977 glib/gfileutils.c:1449 +#: glib/gfileutils.c:920 glib/gfileutils.c:995 glib/gfileutils.c:1472 #, c-format msgid "Failed to open file “%s”: %s" msgstr "شکست در گشودن پروندهٔ «%s»: %s" -#: glib/gfileutils.c:915 +#: glib/gfileutils.c:933 #, c-format msgid "Failed to get attributes of file “%s”: fstat() failed: %s" msgstr "شکست در گرفتن مشخصههای پروندهٔ «%s»: fstat() شکست خورد: %s" -#: glib/gfileutils.c:946 +#: glib/gfileutils.c:964 #, c-format msgid "Failed to open file “%s”: fdopen() failed: %s" msgstr "شکست در گشودن پروندهٔ «%s»: fdopen() شکست خورد: %s" -#: glib/gfileutils.c:1047 +#: glib/gfileutils.c:1065 #, c-format msgid "Failed to rename file “%s” to “%s”: g_rename() failed: %s" msgstr "شکست در تغییر نام پروندهٔ «%s» به «%s»: g_rename() شکست خورد: %s" -#: glib/gfileutils.c:1156 +#: glib/gfileutils.c:1179 #, c-format msgid "Failed to write file “%s”: write() failed: %s" msgstr "شکست در نوشتن پروندهٔ «%s»: fdwrite() شکست خورد: %s" -#: glib/gfileutils.c:1177 +#: glib/gfileutils.c:1200 #, c-format msgid "Failed to write file “%s”: fsync() failed: %s" msgstr "شکست در نوشتن پروندهٔ «%s»: fsync() شکست خورد: %s" -#: glib/gfileutils.c:1338 glib/gfileutils.c:1753 +#: glib/gfileutils.c:1361 glib/gfileutils.c:1776 #, c-format msgid "Failed to create file “%s”: %s" msgstr "شکست در ایجاد پروندهٔ «%s»: %s" -#: glib/gfileutils.c:1383 +#: glib/gfileutils.c:1406 #, c-format msgid "Existing file “%s” could not be removed: g_unlink() failed: %s" msgstr "پروندهٔ موجود «%s» نتوانست برداشته شود: g_unlink() شکست خورد: %s" -#: glib/gfileutils.c:1718 +#: glib/gfileutils.c:1741 #, c-format msgid "Template “%s” invalid, should not contain a “%s”" msgstr "قالب «%s» نامعتبر است، نباید «%s» داشته باشد" -#: glib/gfileutils.c:1731 +#: glib/gfileutils.c:1754 #, c-format msgid "Template “%s” doesn’t contain XXXXXX" msgstr "قالب «%s» شامل XXXXXX نیست" -#: glib/gfileutils.c:2291 glib/gfileutils.c:2320 +#: glib/gfileutils.c:2348 glib/gfileutils.c:2377 #, c-format msgid "Failed to read the symbolic link “%s”: %s" msgstr "شکست در خواندن پیوند نمادین «%s»: %s" @@ -4885,8 +4894,8 @@ msgstr "پروندهٔ کلید حاوی کدگذاری پشتیبانی نشدهٔ «%s» است" #: glib/gkeyfile.c:1679 glib/gkeyfile.c:1852 glib/gkeyfile.c:3299 -#: glib/gkeyfile.c:3363 glib/gkeyfile.c:3493 glib/gkeyfile.c:3625 -#: glib/gkeyfile.c:3771 glib/gkeyfile.c:4006 glib/gkeyfile.c:4073 +#: glib/gkeyfile.c:3363 glib/gkeyfile.c:3493 glib/gkeyfile.c:3622 +#: glib/gkeyfile.c:3768 glib/gkeyfile.c:4003 glib/gkeyfile.c:4070 #, c-format msgid "Key file does not have group “%s”" msgstr "پروندهٔ کلید گروه «%s» را ندارد" @@ -4918,31 +4927,31 @@ msgid "Key “%s” in group “%s” has value “%s” where %s was expected" msgstr "کلید «%s» در گروه «%s» دارای مقدار «%s» است؛ در حالی مه انتظار %s می رفت" -#: glib/gkeyfile.c:4326 +#: glib/gkeyfile.c:4323 msgid "Key file contains escape character at end of line" msgstr "پرونده کلید شامل نویسهٔ گریز در انتهای خط است" -#: glib/gkeyfile.c:4348 +#: glib/gkeyfile.c:4345 #, c-format msgid "Key file contains invalid escape sequence “%s”" msgstr "پروندهٔ کلید حاوی دنبالهٔ گریز نامعتبر «%s» است" -#: glib/gkeyfile.c:4493 +#: glib/gkeyfile.c:4490 #, c-format msgid "Value “%s” cannot be interpreted as a number." msgstr "مقدار «%s» را نمیتوان به عدد تفسیر کرد." -#: glib/gkeyfile.c:4507 +#: glib/gkeyfile.c:4504 #, c-format msgid "Integer value “%s” out of range" msgstr "مقدار صحیح «%s» خارج از محدوده است" -#: glib/gkeyfile.c:4540 +#: glib/gkeyfile.c:4537 #, c-format msgid "Value “%s” cannot be interpreted as a float number." msgstr "مقدار «%s» را نمیتوان به عدد اعشاری تفسیر کرد." -#: glib/gkeyfile.c:4579 +#: glib/gkeyfile.c:4576 #, c-format msgid "Value “%s” cannot be interpreted as a boolean." msgstr "مقدار «%s» را نمیتوان به مقدار بولی تفسیر کرد." @@ -4962,32 +4971,32 @@ msgid "Failed to open file “%s”: open() failed: %s" msgstr "شکست در گشودن «%s»: open() شکست خورد: %s" -#: glib/gmarkup.c:400 glib/gmarkup.c:442 +#: glib/gmarkup.c:393 glib/gmarkup.c:435 #, c-format msgid "Error on line %d char %d: " msgstr "خطا در سطر %Id نویسهٔ %Id: " -#: glib/gmarkup.c:464 glib/gmarkup.c:547 +#: glib/gmarkup.c:457 glib/gmarkup.c:540 #, c-format msgid "Invalid UTF-8 encoded text in name — not valid “%s”" msgstr "متن کدگذاریشدهٔ UTF-8 نامعتبر در نام - «%s» معتبر نیست" -#: glib/gmarkup.c:475 +#: glib/gmarkup.c:468 #, c-format msgid "“%s” is not a valid name" msgstr "نام «%s» معتبر نیست" -#: glib/gmarkup.c:491 +#: glib/gmarkup.c:484 #, c-format msgid "“%s” is not a valid name: “%c”" msgstr "نام «%s» معتبر نیست: «%c»" -#: glib/gmarkup.c:615 +#: glib/gmarkup.c:608 #, c-format msgid "Error on line %d: %s" msgstr "خطا در سطر %Id: %s" -#: glib/gmarkup.c:692 +#: glib/gmarkup.c:685 #, c-format msgid "" "Failed to parse “%-.*s”, which should have been a digit inside a character " @@ -4996,7 +5005,7 @@ "شکست در تجزیهٔ «%-.*s»، که باید رقمی داخل یک ارجاع نویسهای (مثل ê) باشد - " "شاید رقم خیلی بزرگ است" -#: glib/gmarkup.c:704 +#: glib/gmarkup.c:697 msgid "" "Character reference did not end with a semicolon; most likely you used an " "ampersand character without intending to start an entity — escape ampersand as " @@ -5006,23 +5015,23 @@ "موجودیتی را بیاغازید از نویسهٔ & استفاده کردهاید - برای نوشتن علامت & از & " "استفاده کنید;" -#: glib/gmarkup.c:730 +#: glib/gmarkup.c:723 #, c-format msgid "Character reference “%-.*s” does not encode a permitted character" msgstr "ارجاع نویسهای «%-.*s» به نویسهٔ مجاز اشاره نمیکند" -#: glib/gmarkup.c:768 +#: glib/gmarkup.c:761 msgid "Empty entity “&;” seen; valid entities are: & " < > '" msgstr "" "موجودیت خالی «&;» مشاهده شد؛ موجودیتهای معتبر عبارتند از: & " < > " "'" -#: glib/gmarkup.c:776 +#: glib/gmarkup.c:769 #, c-format msgid "Entity name “%-.*s” is not known" msgstr "نام موجودیت «%-.*s» شناخته شده نیست" -#: glib/gmarkup.c:781 +#: glib/gmarkup.c:774 msgid "" "Entity did not end with a semicolon; most likely you used an ampersand character " "without intending to start an entity — escape ampersand as &" @@ -5031,18 +5040,18 @@ "موجودیتی را بیاغازید از نویسهٔ & استفاده کردهاید - برای نوشتن علامت & از & " "استفاده کنید;" -#: glib/gmarkup.c:1195 +#: glib/gmarkup.c:1188 msgid "Document must begin with an element (e.g. <book>)" msgstr "نوشتار باید با یک عنصر (مثلاً <book>) شروع شود" -#: glib/gmarkup.c:1235 +#: glib/gmarkup.c:1228 #, c-format msgid "" "“%s” is not a valid character following a “<” character; it may not begin an " "element name" msgstr "«%s» پس از یک نویسهٔ '<' نویسهٔ مجازی نیست؛ نمیشود ابتدای نام یک عنصر باشد" -#: glib/gmarkup.c:1278 +#: glib/gmarkup.c:1271 #, c-format msgid "" "Odd character “%s”, expected a “>” character to end the empty-element tag “%s”" @@ -5050,19 +5059,19 @@ "نویسهٔ غیرعادی «%s»، برای پایان دادن به برچسب عنصر خالی «%s» انتظار یک نویسهٔ «>» " "میرفت" -#: glib/gmarkup.c:1348 +#: glib/gmarkup.c:1341 #, c-format msgid "Too many attributes in element “%s”" msgstr "" -#: glib/gmarkup.c:1368 +#: glib/gmarkup.c:1361 #, c-format msgid "" "Odd character “%s”, expected a “=” after attribute name “%s” of element “%s”" msgstr "" "نویسهٔ غیرعادی «%s»، بعد از نام مشخصهٔ «%s» عنصر «%s» انتظار یک نویسهٔ «=» میرفت" -#: glib/gmarkup.c:1410 +#: glib/gmarkup.c:1403 #, c-format msgid "" "Odd character “%s”, expected a “>” or “/” character to end the start tag of " @@ -5073,7 +5082,7 @@ "انتظار یک نویسهٔ «>» یا «/» میرفت؛ شاید از یک نویسهٔ نامعتبر در نام مشخصهای " "استفاده کرده باشید" -#: glib/gmarkup.c:1455 +#: glib/gmarkup.c:1448 #, c-format msgid "" "Odd character “%s”, expected an open quote mark after the equals sign when " @@ -5082,7 +5091,7 @@ "نویسهٔ غیرعادی «%s»، هنگام مقدار دادن به مشخصهٔ «%s» از عنصر «%s» پس از علامت " "تساوی انتظار یک علامت نقل قول باز میرفت" -#: glib/gmarkup.c:1589 +#: glib/gmarkup.c:1582 #, c-format msgid "" "“%s” is not a valid character following the characters “</”; “%s” may not begin " @@ -5091,32 +5100,32 @@ "«%s» بعد از نویسههای «</» نویسهٔ معتبری نیست؛ «%s» نمیتواند ابتدای نام عناصر قرار " "بگیرد" -#: glib/gmarkup.c:1627 +#: glib/gmarkup.c:1620 #, c-format msgid "" "“%s” is not a valid character following the close element name “%s”; the allowed " "character is “>”" msgstr "«%s» نویسهٔ معتبری برای بستن نام عنصر «%s» نیست؛ نویسهٔ مجاز «<» است" -#: glib/gmarkup.c:1639 +#: glib/gmarkup.c:1632 #, c-format msgid "Element “%s” was closed, no element is currently open" msgstr "عنصر «%s» بسته بود، در حال حاضر هیچ عنصری باز نیست" -#: glib/gmarkup.c:1648 +#: glib/gmarkup.c:1641 #, c-format msgid "Element “%s” was closed, but the currently open element is “%s”" msgstr "عنصر «%s» بسته بود، ولی عنصری که در حال حاضر باز است «%s» است" -#: glib/gmarkup.c:1801 +#: glib/gmarkup.c:1794 msgid "Document was empty or contained only whitespace" msgstr "نوشتار خالی است یا فقط فاصلهٔ خالی دارد" -#: glib/gmarkup.c:1815 +#: glib/gmarkup.c:1808 msgid "Document ended unexpectedly just after an open angle bracket “<”" msgstr "نوشتار بهطور غیرمنتظرهای درست بعد از یک علامت کوچکتر '<' پایان یافت" -#: glib/gmarkup.c:1823 glib/gmarkup.c:1868 +#: glib/gmarkup.c:1816 glib/gmarkup.c:1861 #, c-format msgid "" "Document ended unexpectedly with elements still open — “%s” was the last element " @@ -5125,7 +5134,7 @@ "نوشتار وقتی که هنوز عناصری باز بودند بهطور غیرمنتظرهای پایان یافت — آخرین عنصر " "باز شده «%s» بود" -#: glib/gmarkup.c:1831 +#: glib/gmarkup.c:1824 #, c-format msgid "" "Document ended unexpectedly, expected to see a close angle bracket ending the " @@ -5134,19 +5143,19 @@ "نوشتار بهطور غیرمنتظرهای پایان یافت، یک علامت بزرگتر برای بستن برچسب <%s/> " "انتظار میرفت" -#: glib/gmarkup.c:1837 +#: glib/gmarkup.c:1830 msgid "Document ended unexpectedly inside an element name" msgstr "نوشتار بهطور غیرمنتظرهای داخل نام یک عنصر بهپایان رسید" -#: glib/gmarkup.c:1843 +#: glib/gmarkup.c:1836 msgid "Document ended unexpectedly inside an attribute name" msgstr "نوشتار بهطور غیرمنتظرهای داخل نام یک مشخصه بهپایان رسید" -#: glib/gmarkup.c:1848 +#: glib/gmarkup.c:1841 msgid "Document ended unexpectedly inside an element-opening tag." msgstr "نوشتار بهطور غیرمنتظرهای داخل یک برچسب عنصربازکن پایان یافت." -#: glib/gmarkup.c:1854 +#: glib/gmarkup.c:1847 msgid "" "Document ended unexpectedly after the equals sign following an attribute name; " "no attribute value" @@ -5154,20 +5163,20 @@ "نوشتار بهطور غیرمنتظرهای بعد از علامت تساویای که پس از نام مشخصهای آمده بود تمام " "شد؛ بدون مقدار برای مشخصه" -#: glib/gmarkup.c:1861 +#: glib/gmarkup.c:1854 msgid "Document ended unexpectedly while inside an attribute value" msgstr "نوشتار بهطور غیرمنتظرهای داخل مقدار یک مشخصه بهپایان رسید" -#: glib/gmarkup.c:1878 +#: glib/gmarkup.c:1871 #, c-format msgid "Document ended unexpectedly inside the close tag for element “%s”" msgstr "نوشتار بهطور غیرمنتظرهای داخل برچسب بستن عنصر «%s» پایان یافت" -#: glib/gmarkup.c:1882 +#: glib/gmarkup.c:1875 msgid "Document ended unexpectedly inside the close tag for an unopened element" msgstr "نوشتار بهطور غیرمنتظرهای داخل برچسب بستن عنصر «%s» پایان یافت" -#: glib/gmarkup.c:1888 +#: glib/gmarkup.c:1881 msgid "Document ended unexpectedly inside a comment or processing instruction" msgstr "نوشتار بهطور غیرمنتظرهای داخل یک توضیح یا دستورالعمل پردازشی پایان یافت" @@ -5230,300 +5239,300 @@ msgid "Unknown option %s" msgstr "گزینهٔ نامعلوم %s" -#: glib/gregex.c:436 +#: glib/gregex.c:479 msgid "corrupted object" msgstr "شیء ناقص" -#: glib/gregex.c:438 +#: glib/gregex.c:481 msgid "out of memory" msgstr "حافظه کم است" -#: glib/gregex.c:443 +#: glib/gregex.c:487 msgid "backtracking limit reached" msgstr "محدودیت backtracking فرارسید" -#: glib/gregex.c:454 glib/gregex.c:707 glib/gregex.c:736 +#: glib/gregex.c:498 msgid "internal error" msgstr "خطا داخلی" -#: glib/gregex.c:456 +#: glib/gregex.c:500 msgid "the pattern contains items not supported for partial matching" msgstr "الگو حاوی مواردی است که برای مطابقت جزئی مناسب نیست" -#: glib/gregex.c:458 +#: glib/gregex.c:502 msgid "back references as conditions are not supported for partial matching" msgstr "" -#: glib/gregex.c:464 +#: glib/gregex.c:508 msgid "recursion limit reached" msgstr "محدودیت تکرار فرارسید" -#: glib/gregex.c:466 +#: glib/gregex.c:510 msgid "bad offset" msgstr "جابهجایی نادرست" -#: glib/gregex.c:468 +#: glib/gregex.c:512 msgid "recursion loop" msgstr "" #. should not happen in GRegex since we check modes before each match -#: glib/gregex.c:471 +#: glib/gregex.c:515 msgid "matching mode is requested that was not compiled for JIT" msgstr "" -#: glib/gregex.c:475 +#: glib/gregex.c:536 glib/gregex.c:1838 msgid "unknown error" msgstr "خطا نادرست" -#: glib/gregex.c:496 +#: glib/gregex.c:557 msgid "\\ at end of pattern" msgstr "\\ در پایان الگو" -#: glib/gregex.c:500 +#: glib/gregex.c:561 msgid "\\c at end of pattern" msgstr "\\c در پایان الگو" -#: glib/gregex.c:505 +#: glib/gregex.c:566 msgid "unrecognized character following \\" msgstr "نویسهٔ ناشناخته پس از \\" -#: glib/gregex.c:509 +#: glib/gregex.c:570 msgid "numbers out of order in {} quantifier" msgstr "اعداد بدون ترتیل در کمیتسنج {}" -#: glib/gregex.c:513 +#: glib/gregex.c:574 msgid "number too big in {} quantifier" msgstr "اعداد در کمیتسنج {} بسیار بزرگ هستند" -#: glib/gregex.c:517 +#: glib/gregex.c:578 msgid "missing terminating for character class" msgstr "بدون پایاندهنده برای کلاس نویسه" -#: glib/gregex.c:521 +#: glib/gregex.c:582 msgid "invalid escape sequence in character class" msgstr "دنبالهٔ گریز نامعتبر در کلاس نویسه" -#: glib/gregex.c:525 +#: glib/gregex.c:586 msgid "range out of order in character class" msgstr "محدوده در کلاس نویسه بدون ترتیب است" -#: glib/gregex.c:530 +#: glib/gregex.c:591 msgid "nothing to repeat" msgstr "چیزی برای تکرار نیست" -#: glib/gregex.c:534 +#: glib/gregex.c:595 msgid "unrecognized character after (? or (?-" msgstr "نویسهٔ ناشناس پس از (? یا (?-" -#: glib/gregex.c:538 +#: glib/gregex.c:599 msgid "POSIX named classes are supported only within a class" msgstr "" -#: glib/gregex.c:542 +#: glib/gregex.c:603 msgid "POSIX collating elements are not supported" msgstr "عنصرهای تطبیق با POSIX پشتیبانی نمیشوند" -#: glib/gregex.c:548 +#: glib/gregex.c:609 msgid "missing terminating )" msgstr "" -#: glib/gregex.c:552 +#: glib/gregex.c:613 msgid "reference to non-existent subpattern" msgstr "" -#: glib/gregex.c:556 +#: glib/gregex.c:617 msgid "missing ) after comment" msgstr "" -#: glib/gregex.c:560 +#: glib/gregex.c:621 msgid "regular expression is too large" msgstr "عبارت باقاعده بیش از حد بلند است" -#: glib/gregex.c:564 +#: glib/gregex.c:625 msgid "malformed number or name after (?(" msgstr "" -#: glib/gregex.c:568 +#: glib/gregex.c:629 msgid "lookbehind assertion is not fixed length" msgstr "" -#: glib/gregex.c:572 +#: glib/gregex.c:633 msgid "conditional group contains more than two branches" msgstr "" -#: glib/gregex.c:576 +#: glib/gregex.c:637 msgid "assertion expected after (?(" msgstr "" -#: glib/gregex.c:580 +#: glib/gregex.c:641 msgid "a numbered reference must not be zero" msgstr "" -#: glib/gregex.c:584 +#: glib/gregex.c:645 msgid "unknown POSIX class name" msgstr "نام کلاس POSIX ناشناخته" -#: glib/gregex.c:589 +#: glib/gregex.c:650 msgid "character value in \\x{...} sequence is too large" msgstr "" -#: glib/gregex.c:593 +#: glib/gregex.c:654 msgid "\\C not allowed in lookbehind assertion" msgstr "" -#: glib/gregex.c:597 +#: glib/gregex.c:658 msgid "missing terminator in subpattern name" msgstr "" -#: glib/gregex.c:601 +#: glib/gregex.c:662 msgid "two named subpatterns have the same name" msgstr "" -#: glib/gregex.c:605 +#: glib/gregex.c:666 msgid "malformed \\P or \\p sequence" msgstr "" -#: glib/gregex.c:609 +#: glib/gregex.c:670 msgid "unknown property name after \\P or \\p" msgstr "خصیصهٔ ناشناس پس از \\P یا \\p" -#: glib/gregex.c:613 +#: glib/gregex.c:674 msgid "subpattern name is too long (maximum 32 characters)" msgstr "" -#: glib/gregex.c:617 +#: glib/gregex.c:678 msgid "too many named subpatterns (maximum 10,000)" msgstr "" -#: glib/gregex.c:621 +#: glib/gregex.c:682 msgid "octal value is greater than \\377" msgstr "" -#: glib/gregex.c:625 +#: glib/gregex.c:686 msgid "DEFINE group contains more than one branch" msgstr "" -#: glib/gregex.c:629 +#: glib/gregex.c:690 msgid "inconsistent NEWLINE options" msgstr "" -#: glib/gregex.c:633 +#: glib/gregex.c:694 msgid "" "\\g is not followed by a braced, angle-bracketed, or quoted name or number, or " "by a plain number" msgstr "" -#: glib/gregex.c:638 +#: glib/gregex.c:699 msgid "an argument is not allowed for (*ACCEPT), (*FAIL), or (*COMMIT)" msgstr "" -#: glib/gregex.c:642 +#: glib/gregex.c:703 msgid "(*VERB) not recognized" msgstr "" -#: glib/gregex.c:646 +#: glib/gregex.c:707 msgid "number is too big" -msgstr "" +msgstr "عدد بیش از حد بزرگ است" -#: glib/gregex.c:650 +#: glib/gregex.c:711 msgid "missing subpattern name after (?&" msgstr "" -#: glib/gregex.c:654 +#: glib/gregex.c:715 msgid "different names for subpatterns of the same number are not allowed" msgstr "" -#: glib/gregex.c:658 +#: glib/gregex.c:719 msgid "(*MARK) must have an argument" msgstr "" -#: glib/gregex.c:662 +#: glib/gregex.c:723 msgid "\\c must be followed by an ASCII character" msgstr "" -#: glib/gregex.c:666 +#: glib/gregex.c:727 msgid "\\k is not followed by a braced, angle-bracketed, or quoted name" msgstr "" -#: glib/gregex.c:670 +#: glib/gregex.c:731 msgid "\\N is not supported in a class" msgstr "از /N در یک کلاس پشتیبانی نمیشود" -#: glib/gregex.c:674 +#: glib/gregex.c:735 msgid "name is too long in (*MARK), (*PRUNE), (*SKIP), or (*THEN)" msgstr "نام در (*MARK)، (*PRUNE)، (*SKIP) یا (*THEN) بیش از حد طولانی است." -#: glib/gregex.c:678 glib/gregex.c:809 +#: glib/gregex.c:739 glib/gregex.c:875 msgid "code overflow" msgstr "سرریز کد" -#: glib/gregex.c:682 +#: glib/gregex.c:743 msgid "unrecognized character after (?P" msgstr "نویسه ناشناس بعد از (?P" -#: glib/gregex.c:686 +#: glib/gregex.c:747 msgid "overran compiling workspace" msgstr "فضای کاری ترجمهٔ پایمال شده" -#: glib/gregex.c:690 +#: glib/gregex.c:751 msgid "previously-checked referenced subpattern not found" msgstr "زیرالگوی ارجاع شدهٔ پیشتر بررسی شده پیدا نشد" -#: glib/gregex.c:808 glib/gregex.c:1041 glib/gregex.c:2342 +#: glib/gregex.c:874 glib/gregex.c:1121 glib/gregex.c:2444 #, c-format msgid "Error while matching regular expression %s: %s" msgstr "خطا در هنگام منطبق کردن عبارت باقاعده %s: %s" -#: glib/gregex.c:1618 +#: glib/gregex.c:1721 msgid "PCRE library is compiled without UTF8 support" msgstr "کتابخانه PCRE بدون پشتیبانی از UTF8 کامپایل شده است" -#: glib/gregex.c:1626 +#: glib/gregex.c:1729 msgid "PCRE library is compiled with incompatible options" msgstr "کتابخانهٔ PCRE با گزینههایی ناسازگار ترجمه شده" -#: glib/gregex.c:1751 +#: glib/gregex.c:1847 #, c-format msgid "Error while compiling regular expression ‘%s’ at char %s: %s" msgstr "خطا هنگام ترجمهٔ عبارت با قاعدهٔ «%s» در نویسهٔ %s: %s" -#: glib/gregex.c:2786 +#: glib/gregex.c:2887 msgid "hexadecimal digit or “}” expected" msgstr "انتظار رقم شانزدهشانزدهی یا «}» میرفت" -#: glib/gregex.c:2802 +#: glib/gregex.c:2903 msgid "hexadecimal digit expected" msgstr "رقم هگزادسیمال مورد انتظار بود" -#: glib/gregex.c:2842 +#: glib/gregex.c:2943 msgid "missing “<” in symbolic reference" msgstr "بدون «>» در ارجاع نمادین" -#: glib/gregex.c:2851 +#: glib/gregex.c:2952 msgid "unfinished symbolic reference" msgstr "ارجاع نمادین ناتمام" -#: glib/gregex.c:2858 +#: glib/gregex.c:2959 msgid "zero-length symbolic reference" msgstr "مرجع نمادین با طول صفر" -#: glib/gregex.c:2869 +#: glib/gregex.c:2970 msgid "digit expected" msgstr "انتظار رقم میرفت" -#: glib/gregex.c:2887 +#: glib/gregex.c:2988 msgid "illegal symbolic reference" msgstr "ارجاع نمادین غیرقانونی" -#: glib/gregex.c:2950 +#: glib/gregex.c:3051 msgid "stray final “\\”" msgstr "«\\» پایانی سرگردان" -#: glib/gregex.c:2954 +#: glib/gregex.c:3055 msgid "unknown escape sequence" msgstr "دنبالهٔ گریز ناشناخته" -#: glib/gregex.c:2964 +#: glib/gregex.c:3065 #, c-format msgid "Error while parsing replacement text “%s” at char %lu: %s" msgstr "خطا هنگام تجزیه کردن متن جایگزین «%s» در نویسهٔ %lu: %s" @@ -5552,96 +5561,101 @@ msgid "Text was empty (or contained only whitespace)" msgstr "متن خالی بود (یا فقط فاصلهٔ خالی داشت)" -#: glib/gspawn.c:314 +#: glib/gspawn.c:319 #, c-format msgid "Failed to read data from child process (%s)" msgstr "خواندن دادهها از فرایند فرزند شکست خورد (%s)" -#: glib/gspawn.c:466 +#: glib/gspawn.c:471 #, c-format msgid "Unexpected error in reading data from a child process (%s)" msgstr "خطای غیرمنتظره در خواندن دادهها از یک فرایند فرزند (%s)" -#: glib/gspawn.c:551 +#: glib/gspawn.c:556 #, c-format msgid "Unexpected error in waitpid() (%s)" msgstr "خطای غیرمنتظره در waitpid() (%s)" -#: glib/gspawn.c:1170 glib/gspawn-win32.c:1488 +#: glib/gspawn.c:1175 glib/gspawn-win32.c:1503 #, c-format msgid "Child process exited with code %ld" msgstr "فرایند فرزند با رمز %ld خارج شد" -#: glib/gspawn.c:1178 +#: glib/gspawn.c:1183 #, c-format msgid "Child process killed by signal %ld" msgstr "فرایند فرزند به دست سیگنال %ld کشته شد" -#: glib/gspawn.c:1185 +#: glib/gspawn.c:1190 #, c-format msgid "Child process stopped by signal %ld" msgstr "فرایند فرزند به دست سیگنال %ld متوقّف شد" -#: glib/gspawn.c:1192 +#: glib/gspawn.c:1197 #, c-format msgid "Child process exited abnormally" msgstr "فرایند فرزند به طور غیر معمول خارج شد" -#: glib/gspawn.c:1885 glib/gspawn-win32.c:393 glib/gspawn-win32.c:401 +#: glib/gspawn.c:2027 glib/gspawn-win32.c:393 glib/gspawn-win32.c:401 #, c-format msgid "Failed to read from child pipe (%s)" msgstr "خواندن از لولهٔ فرزند شکست خورد (%s)" -#: glib/gspawn.c:2248 +#: glib/gspawn.c:2399 #, c-format msgid "Failed to spawn child process “%s” (%s)" msgstr "انشعاب فرایند فرزند «%s» شکست خورد (%s)" -#: glib/gspawn.c:2365 +#: glib/gspawn.c:2525 #, c-format msgid "Failed to fork (%s)" msgstr "انشعاب شکست خورد (%s)" -#: glib/gspawn.c:2525 glib/gspawn-win32.c:424 +#: glib/gspawn.c:2685 glib/gspawn-win32.c:424 #, c-format msgid "Failed to change to directory “%s” (%s)" msgstr "تغییر به شاخهٔ «%s» شکست خورد: (%s)" -#: glib/gspawn.c:2535 +#: glib/gspawn.c:2695 #, c-format msgid "Failed to execute child process “%s” (%s)" msgstr "اجرای فرایند فرزند «%s» شکست خورد (%s)" -#: glib/gspawn.c:2545 +#: glib/gspawn.c:2705 #, c-format msgid "Failed to open file to remap file descriptor (%s)" msgstr "شکست در گشودن شرحدهندهٔ پروندهٔ بازنگاشت (%s)" -#: glib/gspawn.c:2553 +#: glib/gspawn.c:2713 #, c-format msgid "Failed to duplicate file descriptor for child process (%s)" msgstr "شکست در تکرار شرحدهندهٔ پرونده برای فرایند فرزند (%s)" -#: glib/gspawn.c:2562 +#: glib/gspawn.c:2722 #, c-format msgid "Failed to fork child process (%s)" msgstr "انشعاب فرایند فرزند شکست خورد (%s)" -#: glib/gspawn.c:2570 +#: glib/gspawn.c:2730 #, c-format msgid "Failed to close file descriptor for child process (%s)" msgstr "شکست در بستن شرحدهندهٔ پرونده برای فرایند فرزند (%s)" -#: glib/gspawn.c:2578 +#: glib/gspawn.c:2738 #, c-format msgid "Unknown error executing child process “%s”" msgstr "خطای ناشناخته در اجرای فرایند فرزند «%s»" -#: glib/gspawn.c:2602 +#: glib/gspawn.c:2762 #, c-format msgid "Failed to read enough data from child pid pipe (%s)" msgstr "خواندن دادهٔ کافی از لولهٔ pid فرزند شکست خورد (%s)" +#: glib/gspawn-private.h:134 +#, c-format +msgid "Invalid source FDs argument" +msgstr "آرگومان FDs منبع نامعتبر" + #: glib/gspawn-win32.c:337 msgid "Failed to read data from child process" msgstr "خواندن دادهها از فرایند فرزند شکست خورد" @@ -5661,48 +5675,48 @@ msgid "Invalid program name: %s" msgstr "نام برنامهٔ نامعتبر: %s" -#: glib/gspawn-win32.c:521 glib/gspawn-win32.c:853 +#: glib/gspawn-win32.c:521 glib/gspawn-win32.c:868 #, c-format msgid "Invalid string in argument vector at %d: %s" msgstr "رشتهٔ نامعتبر در بردار آرگومان درآیهٔ %Id: %s" -#: glib/gspawn-win32.c:532 glib/gspawn-win32.c:869 +#: glib/gspawn-win32.c:532 glib/gspawn-win32.c:884 #, c-format msgid "Invalid string in environment: %s" msgstr "رشتهٔ نامعتبر در محیط: %s" -#: glib/gspawn-win32.c:849 +#: glib/gspawn-win32.c:864 #, c-format msgid "Invalid working directory: %s" msgstr "شاخهٔ کاری نامعتبر: %s" -#: glib/gspawn-win32.c:914 +#: glib/gspawn-win32.c:929 #, c-format msgid "Failed to execute helper program (%s)" msgstr "اجرای برنامهٔ راهنما (%s) شکست خورد" -#: glib/gspawn-win32.c:1143 +#: glib/gspawn-win32.c:1158 msgid "" "Unexpected error in g_io_channel_win32_poll() reading data from a child process" msgstr "" "خطای غیرمنتظره در g_io_channel_win32_poll() هنگام خواندن دادهها از یک فرایند " "فرزند" -#: glib/gstrfuncs.c:3372 glib/gstrfuncs.c:3474 +#: glib/gstrfuncs.c:3370 glib/gstrfuncs.c:3472 msgid "Empty string is not a number" msgstr "رشتهٔ خالی یک شماره نیست" -#: glib/gstrfuncs.c:3396 +#: glib/gstrfuncs.c:3394 #, c-format msgid "“%s” is not a signed number" msgstr "«%s» عددی علامتدار نیست" -#: glib/gstrfuncs.c:3406 glib/gstrfuncs.c:3510 +#: glib/gstrfuncs.c:3404 glib/gstrfuncs.c:3508 #, c-format msgid "Number “%s” is out of bounds %s, %s" msgstr "شمارهٔ «%s» خارج از محدودهٔ %s, %s است" -#: glib/gstrfuncs.c:3500 +#: glib/gstrfuncs.c:3498 #, c-format msgid "“%s” is not an unsigned number" msgstr "«%s» عددی بدون علامت نیست" @@ -5781,132 +5795,132 @@ msgstr "نویسهٔ خارج از محدوده برای UTF-16" #. Translators: A unit symbol for size formatting, showing for example: "13.0 kB" -#: glib/gutils.c:2857 +#: glib/gutils.c:2966 msgid "kB" msgstr "کب" #. Translators: A unit symbol for size formatting, showing for example: "13.0 MB" -#: glib/gutils.c:2859 +#: glib/gutils.c:2968 msgid "MB" msgstr "مب" #. Translators: A unit symbol for size formatting, showing for example: "13.0 GB" -#: glib/gutils.c:2861 +#: glib/gutils.c:2970 msgid "GB" msgstr "گب" #. Translators: A unit symbol for size formatting, showing for example: "13.0 TB" -#: glib/gutils.c:2863 +#: glib/gutils.c:2972 msgid "TB" msgstr "تب" #. Translators: A unit symbol for size formatting, showing for example: "13.0 PB" -#: glib/gutils.c:2865 +#: glib/gutils.c:2974 msgid "PB" msgstr "پب" #. Translators: A unit symbol for size formatting, showing for example: "13.0 EB" -#: glib/gutils.c:2867 +#: glib/gutils.c:2976 msgid "EB" msgstr "اِب" #. Translators: A unit symbol for size formatting, showing for example: "13.0 KiB" -#: glib/gutils.c:2871 +#: glib/gutils.c:2980 msgid "KiB" msgstr "کیب" #. Translators: A unit symbol for size formatting, showing for example: "13.0 MiB" -#: glib/gutils.c:2873 +#: glib/gutils.c:2982 msgid "MiB" msgstr "میب" #. Translators: A unit symbol for size formatting, showing for example: "13.0 GiB" -#: glib/gutils.c:2875 +#: glib/gutils.c:2984 msgid "GiB" msgstr "گیب" #. Translators: A unit symbol for size formatting, showing for example: "13.0 TiB" -#: glib/gutils.c:2877 +#: glib/gutils.c:2986 msgid "TiB" msgstr "تیب" #. Translators: A unit symbol for size formatting, showing for example: "13.0 PiB" -#: glib/gutils.c:2879 +#: glib/gutils.c:2988 msgid "PiB" msgstr "پیب" #. Translators: A unit symbol for size formatting, showing for example: "13.0 EiB" -#: glib/gutils.c:2881 +#: glib/gutils.c:2990 msgid "EiB" msgstr "ایب" #. Translators: A unit symbol for size formatting, showing for example: "13.0 kb" -#: glib/gutils.c:2885 +#: glib/gutils.c:2994 msgid "kb" msgstr "کبی" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Mb" -#: glib/gutils.c:2887 +#: glib/gutils.c:2996 msgid "Mb" msgstr "مبی" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Gb" -#: glib/gutils.c:2889 +#: glib/gutils.c:2998 msgid "Gb" msgstr "گبی" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Tb" -#: glib/gutils.c:2891 +#: glib/gutils.c:3000 msgid "Tb" msgstr "تبی" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Pb" -#: glib/gutils.c:2893 +#: glib/gutils.c:3002 msgid "Pb" msgstr "پبی" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Eb" -#: glib/gutils.c:2895 +#: glib/gutils.c:3004 msgid "Eb" msgstr "اِبی" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Kib" -#: glib/gutils.c:2899 +#: glib/gutils.c:3008 msgid "Kib" msgstr "کیبی" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Mib" -#: glib/gutils.c:2901 +#: glib/gutils.c:3010 msgid "Mib" msgstr "میبی" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Gib" -#: glib/gutils.c:2903 +#: glib/gutils.c:3012 msgid "Gib" msgstr "گیبی" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Tib" -#: glib/gutils.c:2905 +#: glib/gutils.c:3014 msgid "Tib" msgstr "تیبی" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Pib" -#: glib/gutils.c:2907 +#: glib/gutils.c:3016 msgid "Pib" msgstr "پیبی" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Eib" -#: glib/gutils.c:2909 +#: glib/gutils.c:3018 msgid "Eib" msgstr "ایبی" -#: glib/gutils.c:2947 +#: glib/gutils.c:3056 msgid "byte" msgid_plural "bytes" msgstr0 "بایت" msgstr1 "بایت" -#: glib/gutils.c:2951 +#: glib/gutils.c:3060 msgid "bit" msgid_plural "bits" msgstr0 "بیت" @@ -5914,7 +5928,7 @@ #. Translators: The "%u" is replaced with the size value, like "13"; it could #. * be part of "13 bytes", but only the number is requested this time. -#: glib/gutils.c:2959 +#: glib/gutils.c:3068 #, c-format msgctxt "format-size" msgid "%u" @@ -5922,7 +5936,7 @@ #. Translators: The first "%u" is replaced with the value, the "%s" with a unit of the value. #. * The order can be changed with "%$2s %$1u". An example: "13 bytes" -#: glib/gutils.c:2964 +#: glib/gutils.c:3073 #, c-format msgctxt "format-size" msgid "%u %s" @@ -5930,7 +5944,7 @@ #. Translators: The "%.1f" is replaced with the size value, like "13.0"; it could #. * be part of "13.0 MB", but only the number is requested this time. -#: glib/gutils.c:3000 +#: glib/gutils.c:3109 #, c-format msgctxt "format-size" msgid "%.1f" @@ -5939,14 +5953,14 @@ #. Translators: The first "%.1f" is replaced with the value, the "%s" with a unit of the value. #. * The order can be changed with "%$2s %$1.1f". Keep the no-break space between the value and #. * the unit symbol. An example: "13.0 MB" -#: glib/gutils.c:3006 +#: glib/gutils.c:3115 #, c-format msgctxt "format-size" msgid "%.1f %s" msgstr "%I.1f %s" #. Translators: the %s in "%s bytes" will always be replaced by a number. -#: glib/gutils.c:3046 +#: glib/gutils.c:3155 #, c-format msgid "%s byte" msgid_plural "%s bytes" @@ -5954,14 +5968,14 @@ msgstr1 "%s بایت" #. Translators: the %s in "%s bits" will always be replaced by a number. -#: glib/gutils.c:3051 +#: glib/gutils.c:3160 #, c-format msgid "%s bit" msgid_plural "%s bits" msgstr0 "%s بیت" msgstr1 "%s بیت" -#: glib/gutils.c:3092 +#: glib/gutils.c:3201 #, c-format msgid "%u byte" msgid_plural "%u bytes" @@ -5973,32 +5987,32 @@ #. * compatibility. Users will not see this string unless a program is using this deprecated function. #. * Please translate as literally as possible. #. -#: glib/gutils.c:3105 +#: glib/gutils.c:3214 #, c-format msgid "%.1f KB" msgstr "%I.1f کیلوبایت" -#: glib/gutils.c:3110 +#: glib/gutils.c:3219 #, c-format msgid "%.1f MB" msgstr "%I.1f مگابایت" -#: glib/gutils.c:3115 +#: glib/gutils.c:3224 #, c-format msgid "%.1f GB" msgstr "%I.1f گیگابایت" -#: glib/gutils.c:3120 +#: glib/gutils.c:3229 #, c-format msgid "%.1f TB" msgstr "%I.1f ترابایت" -#: glib/gutils.c:3125 +#: glib/gutils.c:3234 #, c-format msgid "%.1f PB" msgstr "%I.1f پتابایت" -#: glib/gutils.c:3130 +#: glib/gutils.c:3239 #, c-format msgid "%.1f EB" msgstr "%I.1f اگزابایت"
View file
_service:tar_scm:glib-2.74.4.tar.xz/po/fr.po -> _service:tar_scm:glib-2.76.4.tar.xz/po/fr.po
Changed
@@ -19,8 +19,8 @@ msgstr "" "Project-Id-Version: glib master\n" "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/glib/issues\n" -"POT-Creation-Date: 2022-09-10 09:05+0000\n" -"PO-Revision-Date: 2022-09-10 15:17+0200\n" +"POT-Creation-Date: 2023-02-15 16:30+0000\n" +"PO-Revision-Date: 2023-03-05 17:53+0100\n" "Last-Translator: Claude Paroz <claude@2xlibre.net>\n" "Language-Team: GNOME French Team <gnomefr@traduc.org>\n" "Language: fr\n" @@ -28,26 +28,26 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -"X-Generator: Gtranslator 40.0\n" +"X-Generator: Poedit 3.2.2\n" -#: gio/gappinfo.c:335 +#: gio/gappinfo.c:339 msgid "Setting default applications not supported yet" msgstr "" "La définition des applications par défaut n’est pas encore prise en charge" -#: gio/gappinfo.c:368 +#: gio/gappinfo.c:372 msgid "Setting application as last used for type not supported yet" msgstr "" "La définition de l’application comme étant la dernière utilisée pour le type " "n’est pas encore prise en charge" -#: gio/gappinfo.c:810 +#: gio/gappinfo.c:814 #, c-format msgid "Failed to find default application for content type ‘%s’" msgstr "" "Impossible de trouver l’application par défaut pour le type de contenu « %s »" -#: gio/gappinfo.c:870 +#: gio/gappinfo.c:874 #, c-format msgid "Failed to find default application for URI Scheme ‘%s’" msgstr "" @@ -251,11 +251,11 @@ msgid "error sending %s message to application: %s\n" msgstr "erreur d’envoi du message %s à l’application : %s\n" -#: gio/gapplication-tool.c:321 +#: gio/gapplication-tool.c:324 msgid "action name must be given after application id\n" msgstr "un nom d’action doit être indiqué après l’identifiant d’application\n" -#: gio/gapplication-tool.c:329 +#: gio/gapplication-tool.c:332 #, c-format msgid "" "invalid action name: “%s”\n" @@ -265,25 +265,25 @@ "les noms d’actions ne peuvent contenir que des caractères alphanumériques, " "« - » et « . »\n" -#: gio/gapplication-tool.c:348 +#: gio/gapplication-tool.c:351 #, c-format msgid "error parsing action parameter: %s\n" msgstr "erreur d’analyse du paramètre d’action : %s\n" -#: gio/gapplication-tool.c:360 +#: gio/gapplication-tool.c:363 msgid "actions accept a maximum of one parameter\n" msgstr "les actions n’acceptent pas plus d’un paramètre\n" -#: gio/gapplication-tool.c:415 +#: gio/gapplication-tool.c:418 msgid "list-actions command takes only the application id" msgstr "la commande list-actions n’accepte que l’identifiant de l’application" -#: gio/gapplication-tool.c:425 +#: gio/gapplication-tool.c:428 #, c-format msgid "unable to find desktop file for application %s\n" msgstr "impossible de trouver le fichier desktop pour l’application %s\n" -#: gio/gapplication-tool.c:470 +#: gio/gapplication-tool.c:473 #, c-format msgid "" "unrecognised command: %s\n" @@ -318,7 +318,7 @@ msgid "Truncate not supported on base stream" msgstr "La troncature n’est pas prise en charge sur le flux de base" -#: gio/gcancellable.c:319 gio/gdbusconnection.c:1859 gio/gdbusprivate.c:1420 +#: gio/gcancellable.c:326 gio/gdbusconnection.c:1859 gio/gdbusprivate.c:1420 #: gio/gsimpleasyncresult.c:873 gio/gsimpleasyncresult.c:899 #, c-format msgid "Operation was cancelled" @@ -338,13 +338,13 @@ #: gio/gcharsetconverter.c:344 gio/gdatainputstream.c:850 #: gio/gdatainputstream.c:1268 glib/gconvert.c:451 glib/gconvert.c:883 -#: glib/giochannel.c:1576 glib/giochannel.c:1618 glib/giochannel.c:2473 +#: glib/giochannel.c:1576 glib/giochannel.c:1618 glib/giochannel.c:2478 #: glib/gutf8.c:892 glib/gutf8.c:1346 msgid "Invalid byte sequence in conversion input" msgstr "Séquence d’octets incorrecte en entrée du convertisseur" #: gio/gcharsetconverter.c:349 glib/gconvert.c:459 glib/gconvert.c:797 -#: glib/giochannel.c:1583 glib/giochannel.c:2485 +#: glib/giochannel.c:1583 glib/giochannel.c:2493 #, c-format msgid "Error during conversion: %s" msgstr "Erreur lors de la conversion : %s" @@ -406,18 +406,18 @@ msgid "Unexpected early end-of-stream" msgstr "Fin précoce de flux inattendue" -#: gio/gdbusaddress.c:164 gio/gdbusaddress.c:238 gio/gdbusaddress.c:327 +#: gio/gdbusaddress.c:162 gio/gdbusaddress.c:234 gio/gdbusaddress.c:321 #, c-format msgid "Unsupported key “%s” in address entry “%s”" msgstr "Clé « %s » non prise en charge dans l’élément d’adresse « %s »" -#: gio/gdbusaddress.c:177 +#: gio/gdbusaddress.c:175 #, c-format msgid "Meaningless key/value pair combination in address entry “%s”" msgstr "" "Combinaison clé/valeur sans signification dans l’élément d’adresse « %s »" -#: gio/gdbusaddress.c:186 +#: gio/gdbusaddress.c:184 #, c-format msgid "" "Address “%s” is invalid (need exactly one of path, dir, tmpdir, or abstract " @@ -426,30 +426,30 @@ "L’adresse « %s » n’est pas valide (nécessite exactement une des clés de " "« path », « dir », « tmpdir » ou « abstract »)" -#: gio/gdbusaddress.c:253 gio/gdbusaddress.c:264 gio/gdbusaddress.c:279 -#: gio/gdbusaddress.c:342 gio/gdbusaddress.c:353 +#: gio/gdbusaddress.c:249 gio/gdbusaddress.c:260 gio/gdbusaddress.c:275 +#: gio/gdbusaddress.c:336 gio/gdbusaddress.c:347 #, c-format msgid "Error in address “%s” — the “%s” attribute is malformed" msgstr "Erreur dans l’adresse « %s » — l’attribut « %s » est mal formé" -#: gio/gdbusaddress.c:423 gio/gdbusaddress.c:682 +#: gio/gdbusaddress.c:417 gio/gdbusaddress.c:676 #, c-format msgid "Unknown or unsupported transport “%s” for address “%s”" msgstr "Transport « %s » inconnu ou non pris en charge pour l’adresse « %s »" -#: gio/gdbusaddress.c:467 +#: gio/gdbusaddress.c:461 #, c-format msgid "Address element “%s” does not contain a colon (:)" msgstr "" "L’élément d’adresse « %s » ne comporte pas de caractère deux-points (:)" -#: gio/gdbusaddress.c:476 +#: gio/gdbusaddress.c:470 #, c-format msgid "Transport name in address element “%s” must not be empty" msgstr "" "Le nom de transport dans l’élément d’adresse « %s » ne doit pas être vide" -#: gio/gdbusaddress.c:497 +#: gio/gdbusaddress.c:491 #, c-format msgid "" "Key/Value pair %d, “%s”, in address element “%s” does not contain an equal " @@ -458,7 +458,7 @@ "Le couple clé/valeur %d, « %s », dans l’élément d’adresse « %s » ne comporte " "pas de signe égal" -#: gio/gdbusaddress.c:508 +#: gio/gdbusaddress.c:502 #, c-format msgid "" "Key/Value pair %d, “%s”, in address element “%s” must not have an empty key" @@ -466,7 +466,7 @@ "Le couple clé/valeur %d, « %s », dans l’élément d’adresse « %s » ne doit pas " "avoir une clé vide" -#: gio/gdbusaddress.c:522 +#: gio/gdbusaddress.c:516 #, c-format msgid "" "Error unescaping key or value in Key/Value pair %d, “%s”, in address element " @@ -475,7 +475,7 @@ "Erreur lors du décodage de la clé ou de la valeur dans le couple clé/valeur " "%d, « %s », dans l’élément d’adresse « %s »" -#: gio/gdbusaddress.c:590 +#: gio/gdbusaddress.c:584 #, c-format msgid "" "Error in address “%s” — the unix transport requires exactly one of the keys " @@ -484,89 +484,89 @@ "Erreur dans l’adresse « %s » — le transport Unix requiert que soit " "exactement définie une des clés « path » ou « abstract »" -#: gio/gdbusaddress.c:625 +#: gio/gdbusaddress.c:619 #, c-format msgid "Error in address “%s” — the host attribute is missing or malformed" msgstr "" "Erreur dans l’adresse « %s » — l’attribut de l’hôte est manquant ou mal formé" -#: gio/gdbusaddress.c:639 +#: gio/gdbusaddress.c:633 #, c-format msgid "Error in address “%s” — the port attribute is missing or malformed" msgstr "" "Erreur dans l’adresse « %s » — l’attribut du port est manquant ou mal formé" -#: gio/gdbusaddress.c:653 +#: gio/gdbusaddress.c:647 #, c-format msgid "Error in address “%s” — the noncefile attribute is missing or malformed" msgstr "" "Erreur dans l’adresse « %s » — l’attribut du fichier à dénomination unique " "est manquant ou mal formé" -#: gio/gdbusaddress.c:674 +#: gio/gdbusaddress.c:668 msgid "Error auto-launching: " msgstr "Erreur de lancement automatique :" -#: gio/gdbusaddress.c:727 +#: gio/gdbusaddress.c:721 #, c-format msgid "Error opening nonce file “%s”: %s" msgstr "" "Erreur lors de l’ouverture du fichier à dénomination unique « %s » : %s" -#: gio/gdbusaddress.c:746 +#: gio/gdbusaddress.c:740 #, c-format msgid "Error reading from nonce file “%s”: %s" msgstr "Erreur de lecture du fichier à dénomination unique « %s » : %s" -#: gio/gdbusaddress.c:755 +#: gio/gdbusaddress.c:749 #, c-format msgid "Error reading from nonce file “%s”, expected 16 bytes, got %d" msgstr "" "Erreur de lecture du fichier à dénomination unique « %s », 16 octets " "attendus, %d reçus" -#: gio/gdbusaddress.c:773 +#: gio/gdbusaddress.c:767 #, c-format msgid "Error writing contents of nonce file “%s” to stream:" msgstr "" "Erreur d’écriture du contenu du fichier à numérotation unique « %s » sur le " "flux :" -#: gio/gdbusaddress.c:988 +#: gio/gdbusaddress.c:982 msgid "The given address is empty" msgstr "L’adresse indiquée est vide" -#: gio/gdbusaddress.c:1101 +#: gio/gdbusaddress.c:1095 #, c-format msgid "Cannot spawn a message bus when AT_SECURE is set" msgstr "" "Impossible de générer dynamiquement un bus messages quand AT_SECURE est " "défini" -#: gio/gdbusaddress.c:1108 +#: gio/gdbusaddress.c:1102 msgid "Cannot spawn a message bus without a machine-id: " msgstr "" "Impossible de générer dynamiquement un bus messages sans identifiant " "machine : " -#: gio/gdbusaddress.c:1115 +#: gio/gdbusaddress.c:1109 #, c-format msgid "Cannot autolaunch D-Bus without X11 $DISPLAY" msgstr "Impossible de lancer automatiquement D-Bus sans $DISPLAY X11" -#: gio/gdbusaddress.c:1157 +#: gio/gdbusaddress.c:1151 #, c-format msgid "Error spawning command line “%s”: " msgstr "Erreur lors de la génération de la ligne de commande « %s » : " -#: gio/gdbusaddress.c:1226 +#: gio/gdbusaddress.c:1220 #, c-format msgid "Cannot determine session bus address (not implemented for this OS)" msgstr "" "Impossible de déterminer l’adresse du bus de session (non pris en charge " "pour ce système d’exploitation)" -#: gio/gdbusaddress.c:1375 gio/gdbusconnection.c:7321 +#: gio/gdbusaddress.c:1374 gio/gdbusconnection.c:7316 #, c-format msgid "" "Cannot determine bus address from DBUS_STARTER_BUS_TYPE environment variable " @@ -575,7 +575,7 @@ "Impossible de déterminer l’adresse du bus à partir de la variable " "d’environnement DBUS_STARTER_BUS_TYPE — valeur inconnue « %s »" -#: gio/gdbusaddress.c:1384 gio/gdbusconnection.c:7330 +#: gio/gdbusaddress.c:1383 gio/gdbusconnection.c:7325 msgid "" "Cannot determine bus address because the DBUS_STARTER_BUS_TYPE environment " "variable is not set" @@ -583,7 +583,7 @@ "Impossible de déterminer l’adresse du bus étant donné que la variable " "d’environnement DBUS_STARTER_BUS_TYPE n’est pas définie" -#: gio/gdbusaddress.c:1394 +#: gio/gdbusaddress.c:1393 #, c-format msgid "Unknown bus type %d" msgstr "Type de bus %d inconnu" @@ -606,13 +606,17 @@ "Tous les mécanismes d’authentification disponibles ont été épuisés (tentés : " "%s) (disponibles : %s)" -#: gio/gdbusauth.c:1178 +#: gio/gdbusauth.c:1045 +msgid "Unexpected lack of content trying to read a byte" +msgstr "Manque de contenu imprévu lors de la tentative de lecture d’un octet" + +#: gio/gdbusauth.c:1195 msgid "User IDs must be the same for peer and server" msgstr "" "Les identifiants des utilisateurs doivent être identiques pour le pair et le " "serveur" -#: gio/gdbusauth.c:1190 +#: gio/gdbusauth.c:1207 msgid "Cancelled via GDBusAuthObserver::authorize-authenticated-peer" msgstr "Annulé via GDBusAuthObserver::authorize-authenticated-peer" @@ -711,7 +715,7 @@ msgid "(Additionally, releasing the lock for “%s” also failed: %s) " msgstr "(en outre, le relèvement du verrou pour « %s » a aussi échoué : %s) " -#: gio/gdbusconnection.c:590 gio/gdbusconnection.c:2404 +#: gio/gdbusconnection.c:590 gio/gdbusconnection.c:2405 msgid "The connection is closed" msgstr "La connexion est fermée" @@ -719,14 +723,14 @@ msgid "Timeout was reached" msgstr "Le délai d’attente est dépassé" -#: gio/gdbusconnection.c:2527 +#: gio/gdbusconnection.c:2528 msgid "" "Unsupported flags encountered when constructing a client-side connection" msgstr "" "Marqueurs non pris en charge rencontrés lors de la construction d’une " "connexion côté client" -#: gio/gdbusconnection.c:4256 gio/gdbusconnection.c:4610 +#: gio/gdbusconnection.c:4257 gio/gdbusconnection.c:4611 #, c-format msgid "" "No such interface “org.freedesktop.DBus.Properties” on object at path %s" @@ -734,107 +738,107 @@ "Pas d’interface « org.freedesktop.DBus.Properties » pour l’objet à " "l’emplacement %s" -#: gio/gdbusconnection.c:4401 +#: gio/gdbusconnection.c:4402 #, c-format msgid "No such property “%s”" msgstr "La propriété « %s » n’existe pas" -#: gio/gdbusconnection.c:4413 +#: gio/gdbusconnection.c:4414 #, c-format msgid "Property “%s” is not readable" msgstr "La propriété « %s » ne peut pas être lue" -#: gio/gdbusconnection.c:4424 +#: gio/gdbusconnection.c:4425 #, c-format msgid "Property “%s” is not writable" msgstr "La propriété « %s » ne peut pas être écrite" -#: gio/gdbusconnection.c:4444 +#: gio/gdbusconnection.c:4445 #, c-format msgid "Error setting property “%s”: Expected type “%s” but got “%s”" msgstr "" "Erreur lors de la définition de la propriété « %s » : type attendu « %s », " "« %s » obtenu" -#: gio/gdbusconnection.c:4549 gio/gdbusconnection.c:4764 -#: gio/gdbusconnection.c:6747 +#: gio/gdbusconnection.c:4550 gio/gdbusconnection.c:4765 +#: gio/gdbusconnection.c:6742 #, c-format msgid "No such interface “%s”" msgstr "L’interface « %s » n’existe pas" -#: gio/gdbusconnection.c:4986 gio/gdbusconnection.c:7261 +#: gio/gdbusconnection.c:4981 gio/gdbusconnection.c:7256 #, c-format msgid "No such interface “%s” on object at path %s" msgstr "L’interface « %s » n’existe pas pour l’objet à l’emplacement %s" -#: gio/gdbusconnection.c:5087 +#: gio/gdbusconnection.c:5082 #, c-format msgid "No such method “%s”" msgstr "La méthode « %s » n’existe pas" -#: gio/gdbusconnection.c:5118 +#: gio/gdbusconnection.c:5113 #, c-format msgid "Type of message, “%s”, does not match expected type “%s”" msgstr "Le type du message, « %s », ne correspond pas au type attendu « %s »" -#: gio/gdbusconnection.c:5321 +#: gio/gdbusconnection.c:5316 #, c-format msgid "An object is already exported for the interface %s at %s" msgstr "Un objet est déjà exporté pour l’interface « %s » en « %s »" -#: gio/gdbusconnection.c:5548 +#: gio/gdbusconnection.c:5543 #, c-format msgid "Unable to retrieve property %s.%s" msgstr "Impossible d’obtenir la propriété %s.%s" -#: gio/gdbusconnection.c:5604 +#: gio/gdbusconnection.c:5599 #, c-format msgid "Unable to set property %s.%s" msgstr "Impossible de définir la propriété %s.%s" -#: gio/gdbusconnection.c:5783 +#: gio/gdbusconnection.c:5778 #, c-format msgid "Method “%s” returned type “%s”, but expected “%s”" msgstr "La méthode « %s » a renvoyé le type « %s », mais « %s » était attendu" -#: gio/gdbusconnection.c:6859 +#: gio/gdbusconnection.c:6854 #, c-format msgid "Method “%s” on interface “%s” with signature “%s” does not exist" msgstr "" "La méthode « %s » sur l’interface « %s » avec la signature « %s » n’existe " "pas" -#: gio/gdbusconnection.c:6980 +#: gio/gdbusconnection.c:6975 #, c-format msgid "A subtree is already exported for %s" msgstr "Une sous-arborescence est déjà exportée pour « %s »" -#: gio/gdbusconnection.c:7269 +#: gio/gdbusconnection.c:7264 #, c-format msgid "Object does not exist at path “%s”" msgstr "L’objet n’existe pas à l’emplacement « %s »" -#: gio/gdbusmessage.c:1303 +#: gio/gdbusmessage.c:1306 msgid "type is INVALID" msgstr "le type est « INVALID »" -#: gio/gdbusmessage.c:1314 +#: gio/gdbusmessage.c:1317 msgid "METHOD_CALL message: PATH or MEMBER header field is missing" msgstr "Message de METHOD_CALL : champ d’en-tête PATH ou MEMBER manquant" -#: gio/gdbusmessage.c:1325 +#: gio/gdbusmessage.c:1328 msgid "METHOD_RETURN message: REPLY_SERIAL header field is missing" msgstr "Message de METHOD_RETURN : champ d’en-tête REPLY_SERIAL manquant" -#: gio/gdbusmessage.c:1337 +#: gio/gdbusmessage.c:1340 msgid "ERROR message: REPLY_SERIAL or ERROR_NAME header field is missing" msgstr "Message d’ERREUR : champ d’en-tête REPLY_SERIAL ou ERROR_NAME manquant" -#: gio/gdbusmessage.c:1350 +#: gio/gdbusmessage.c:1353 msgid "SIGNAL message: PATH, INTERFACE or MEMBER header field is missing" msgstr "Message de SIGNAL : champ d’en-tête PATH, INTERFACE ou MEMBER manquant" -#: gio/gdbusmessage.c:1358 +#: gio/gdbusmessage.c:1361 msgid "" "SIGNAL message: The PATH header field is using the reserved value /org/" "freedesktop/DBus/Local" @@ -842,7 +846,7 @@ "Message de SIGNAL : le champ d’en-tête PATH utilise la valeur réservée /org/" "freedesktop/DBus/Local" -#: gio/gdbusmessage.c:1366 +#: gio/gdbusmessage.c:1369 msgid "" "SIGNAL message: The INTERFACE header field is using the reserved value org." "freedesktop.DBus.Local" @@ -850,21 +854,21 @@ "Message de SIGNAL : le champ d’en-tête INTERFACE utilise la valeur réservée " "org.freedesktop.DBus.Local" -#: gio/gdbusmessage.c:1414 gio/gdbusmessage.c:1474 +#: gio/gdbusmessage.c:1417 gio/gdbusmessage.c:1477 #, c-format msgid "Wanted to read %lu byte but only got %lu" msgid_plural "Wanted to read %lu bytes but only got %lu" msgstr0 "Lecture de %lu octet demandée, mais seulement %lu reçu(s)" msgstr1 "Lecture de %lu octets demandée, mais seulement %lu reçu(s)" -#: gio/gdbusmessage.c:1428 +#: gio/gdbusmessage.c:1431 #, c-format msgid "Expected NUL byte after the string “%s” but found byte %d" msgstr "" "Octet 00 (NUL) attendu à la fin de la chaîne « %s » mais un octet %d a été " "trouvé" -#: gio/gdbusmessage.c:1447 +#: gio/gdbusmessage.c:1450 #, c-format msgid "" "Expected valid UTF-8 string but found invalid bytes at byte offset %d " @@ -874,23 +878,23 @@ "rencontrés à la position %d (longueur de la chaîne : %d octets). La chaîne " "UTF-8 valide jusqu’à cet endroit est « %s »" -#: gio/gdbusmessage.c:1511 gio/gdbusmessage.c:1787 gio/gdbusmessage.c:1998 +#: gio/gdbusmessage.c:1514 gio/gdbusmessage.c:1790 gio/gdbusmessage.c:2001 msgid "Value nested too deeply" msgstr "Valeur imbriquée trop profondément" -#: gio/gdbusmessage.c:1679 +#: gio/gdbusmessage.c:1682 #, c-format msgid "Parsed value “%s” is not a valid D-Bus object path" msgstr "" "La valeur analysée « %s » n’est pas un chemin vers un objet D-Bus valide" -#: gio/gdbusmessage.c:1703 +#: gio/gdbusmessage.c:1706 #, c-format msgid "Parsed value “%s” is not a valid D-Bus signature" msgstr "La valeur analysée « %s » n’est pas une signature D-Bus valide" # 2<<26 donne 128 Mo, 2^26 donne 64 Mo, 1<<26 donne 64 Mo -#: gio/gdbusmessage.c:1754 +#: gio/gdbusmessage.c:1757 #, c-format msgid "" "Encountered array of length %u byte. Maximum length is 2<<26 bytes (64 MiB)." @@ -903,7 +907,7 @@ "Un tableau de %u octets de long a été trouvé. La longueur maximale est de " "2<<26 octets (64 Mo)." -#: gio/gdbusmessage.c:1774 +#: gio/gdbusmessage.c:1777 #, c-format msgid "" "Encountered array of type “a%c”, expected to have a length a multiple of %u " @@ -912,18 +916,18 @@ "Un tableau de type « a%c » a été trouvé, avec une longueur attendue multiple " "de %u octets, mais la longueur réelle est de %u octets" -#: gio/gdbusmessage.c:1928 gio/gdbusmessage.c:2647 +#: gio/gdbusmessage.c:1931 gio/gdbusmessage.c:2650 msgid "Empty structures (tuples) are not allowed in D-Bus" msgstr "Les structures vides (tuples) ne sont pas autorisées dans D-Bus" -#: gio/gdbusmessage.c:1982 +#: gio/gdbusmessage.c:1985 #, c-format msgid "Parsed value “%s” for variant is not a valid D-Bus signature" msgstr "" "La valeur « %s » analysée en tant que variant n’est pas une signature valide " "de D-Bus" -#: gio/gdbusmessage.c:2023 +#: gio/gdbusmessage.c:2026 #, c-format msgid "" "Error deserializing GVariant with type string “%s” from the D-Bus wire format" @@ -931,7 +935,7 @@ "Erreur en désérialisant le GVariant en chaîne de type « %s » à partir du " "format de transmission D-Bus" -#: gio/gdbusmessage.c:2208 +#: gio/gdbusmessage.c:2211 #, c-format msgid "" "Invalid endianness value. Expected 0x6c (“l”) or 0x42 (“B”) but found value " @@ -940,30 +944,30 @@ "Valeur de boutisme non valide. 0x6c (« l ») ou 0x42 (« B ») attendus, mais " "0x%02x trouvé" -#: gio/gdbusmessage.c:2227 +#: gio/gdbusmessage.c:2230 #, c-format msgid "Invalid major protocol version. Expected 1 but found %d" msgstr "Version majeure du protocole non valide. 1 attendu, %d trouvé" -#: gio/gdbusmessage.c:2285 gio/gdbusmessage.c:2883 +#: gio/gdbusmessage.c:2288 gio/gdbusmessage.c:2886 msgid "Signature header found but is not of type signature" msgstr "En-tête de signature trouvé mais n’est pas de type signature" -#: gio/gdbusmessage.c:2297 +#: gio/gdbusmessage.c:2300 #, c-format msgid "Signature header with signature “%s” found but message body is empty" msgstr "" "En-tête de signature trouvé avec la signature « %s », mais le corps du " "message est vide" -#: gio/gdbusmessage.c:2312 +#: gio/gdbusmessage.c:2315 #, c-format msgid "Parsed value “%s” is not a valid D-Bus signature (for body)" msgstr "" "La valeur analysée « %s » n’est pas une signature valide de D-Bus (pour le " "corps)" -#: gio/gdbusmessage.c:2344 +#: gio/gdbusmessage.c:2347 #, 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" @@ -974,11 +978,11 @@ "Pas de signature d’en-tête dans le message, mais le corps du message est de " "%u octets" -#: gio/gdbusmessage.c:2354 +#: gio/gdbusmessage.c:2357 msgid "Cannot deserialize message: " msgstr "Impossible de désérialiser le message : " -#: gio/gdbusmessage.c:2700 +#: gio/gdbusmessage.c:2703 #, c-format msgid "" "Error serializing GVariant with type string “%s” to the D-Bus wire format" @@ -986,7 +990,7 @@ "Erreur en sérialisant le GVariant en chaîne de type « %s » dans le format de " "transmission D-Bus" -#: gio/gdbusmessage.c:2837 +#: gio/gdbusmessage.c:2840 #, c-format msgid "" "Number of file descriptors in message (%d) differs from header field (%d)" @@ -994,18 +998,18 @@ "Le nombre de descripteurs de fichiers dans le message (%d) diffère de celui " "du champ d’en-tête (%d)" -#: gio/gdbusmessage.c:2845 +#: gio/gdbusmessage.c:2848 msgid "Cannot serialize message: " msgstr "Impossible de sérialiser le message : " -#: gio/gdbusmessage.c:2898 +#: gio/gdbusmessage.c:2901 #, c-format msgid "Message body has signature “%s” but there is no signature header" msgstr "" "Le corps du message a la signature « %s », mais il n’y a pas d’en-tête de " "signature" -#: gio/gdbusmessage.c:2908 +#: gio/gdbusmessage.c:2911 #, c-format msgid "" "Message body has type signature “%s” but signature in the header field is " @@ -1014,19 +1018,19 @@ "Le corps du message a une signature de type « %s », mais celle dans le champ " "d’en-tête est « %s »" -#: gio/gdbusmessage.c:2924 +#: gio/gdbusmessage.c:2927 #, c-format msgid "Message body is empty but signature in the header field is “(%s)”" msgstr "" "Le corps du message est vide mais sa signature dans le champ d’en-tête est " "« (%s) »" -#: gio/gdbusmessage.c:3479 +#: gio/gdbusmessage.c:3482 #, c-format msgid "Error return with body of type “%s”" msgstr "Retour d’erreur avec un corps de type « %s »" -#: gio/gdbusmessage.c:3487 +#: gio/gdbusmessage.c:3490 msgid "Error return with empty body" msgstr "Retour d’erreur avec un corps vide" @@ -1053,18 +1057,18 @@ msgid "Unable to load %s or %s: " msgstr "Impossible de charger %s ou %s : " -#: gio/gdbusproxy.c:1575 +#: gio/gdbusproxy.c:1568 #, c-format msgid "Error calling StartServiceByName for %s: " msgstr "Erreur lors de l’appel de StartServiceByName pour %s : " # Guillemets anglais laissés volontairement -#: gio/gdbusproxy.c:1598 +#: gio/gdbusproxy.c:1591 #, c-format msgid "Unexpected reply %d from StartServiceByName(\"%s\") method" msgstr "Réponse %d inattendue de la méthode StartServiceByName(\"%s\")" -#: gio/gdbusproxy.c:2709 gio/gdbusproxy.c:2844 +#: gio/gdbusproxy.c:2702 gio/gdbusproxy.c:2837 #, c-format msgid "" "Cannot invoke method; proxy is for the well-known name %s without an owner, " @@ -1074,28 +1078,28 @@ "%s sans propriétaire alors que le proxy a été construit avec le marqueur " "G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START" -#: gio/gdbusserver.c:765 +#: gio/gdbusserver.c:758 msgid "Abstract namespace not supported" msgstr "L’espace de noms abstrait n’est pas pris en charge" -#: gio/gdbusserver.c:857 +#: gio/gdbusserver.c:850 msgid "Cannot specify nonce file when creating a server" msgstr "" "Impossible de définir un fichier à dénomination unique lors de la création " "d’un serveur" -#: gio/gdbusserver.c:939 +#: gio/gdbusserver.c:932 #, c-format msgid "Error writing nonce file at “%s”: %s" msgstr "" "Erreur lors de l’écriture du fichier à dénomination unique à « %s » : %s" -#: gio/gdbusserver.c:1114 +#: gio/gdbusserver.c:1107 #, c-format msgid "The string “%s” is not a valid D-Bus GUID" msgstr "La chaîne « %s » n’est pas un GUID valide de D-Bus" -#: gio/gdbusserver.c:1152 +#: gio/gdbusserver.c:1145 #, c-format msgid "Cannot listen on unsupported transport “%s”" msgstr "Impossible d’écouter sur le transport « %s » non pris en charge" @@ -1123,14 +1127,14 @@ "\n" "Utiliser « %s COMMANDE --help » pour obtenir une aide sur chaque commande.\n" -#: gio/gdbus-tool.c:204 gio/gdbus-tool.c:276 gio/gdbus-tool.c:348 -#: gio/gdbus-tool.c:372 gio/gdbus-tool.c:862 gio/gdbus-tool.c:1247 -#: gio/gdbus-tool.c:1734 +#: gio/gdbus-tool.c:204 gio/gdbus-tool.c:276 gio/gdbus-tool.c:347 +#: gio/gdbus-tool.c:371 gio/gdbus-tool.c:861 gio/gdbus-tool.c:1246 +#: gio/gdbus-tool.c:1733 #, c-format msgid "Error: %s\n" msgstr "Erreur : %s\n" -#: gio/gdbus-tool.c:215 gio/gdbus-tool.c:289 gio/gdbus-tool.c:1750 +#: gio/gdbus-tool.c:215 gio/gdbus-tool.c:289 gio/gdbus-tool.c:1749 #, c-format msgid "Error parsing introspection XML: %s\n" msgstr "Erreur lors de l’analyse du XML d’introspection : %s\n" @@ -1140,43 +1144,43 @@ msgid "Error: %s is not a valid name\n" msgstr "Erreur : %s n’est pas un nom valide\n" -#: gio/gdbus-tool.c:258 gio/gdbus-tool.c:748 gio/gdbus-tool.c:1066 -#: gio/gdbus-tool.c:1900 gio/gdbus-tool.c:2140 +#: gio/gdbus-tool.c:258 gio/gdbus-tool.c:747 gio/gdbus-tool.c:1065 +#: gio/gdbus-tool.c:1899 gio/gdbus-tool.c:2139 #, c-format msgid "Error: %s is not a valid object path\n" msgstr "Erreur : « %s » n’est pas un chemin d’objet valide\n" -#: gio/gdbus-tool.c:406 +#: gio/gdbus-tool.c:405 msgid "Connect to the system bus" msgstr "Connexion au bus système" -#: gio/gdbus-tool.c:407 +#: gio/gdbus-tool.c:406 msgid "Connect to the session bus" msgstr "Connexion au bus de session" -#: gio/gdbus-tool.c:408 +#: gio/gdbus-tool.c:407 msgid "Connect to given D-Bus address" msgstr "Connexion à l’adresse D-Bus donnée" -#: gio/gdbus-tool.c:418 +#: gio/gdbus-tool.c:417 msgid "Connection Endpoint Options:" msgstr "Options de connexion au point terminal :" -#: gio/gdbus-tool.c:419 +#: gio/gdbus-tool.c:418 msgid "Options specifying the connection endpoint" msgstr "Options définissant la connexion au point terminal" -#: gio/gdbus-tool.c:442 +#: gio/gdbus-tool.c:441 #, c-format msgid "No connection endpoint specified" msgstr "Aucun point terminal de connexion défini" -#: gio/gdbus-tool.c:452 +#: gio/gdbus-tool.c:451 #, c-format msgid "Multiple connection endpoints specified" msgstr "Plusieurs points terminaux de connexion définis" -#: gio/gdbus-tool.c:525 +#: gio/gdbus-tool.c:524 #, c-format msgid "" "Warning: According to introspection data, interface “%s” does not exist\n" @@ -1184,7 +1188,7 @@ "Avertissement : selon les données de l’examen interne, l’interface « %s » " "n’existe pas\n" -#: gio/gdbus-tool.c:534 +#: gio/gdbus-tool.c:533 #, c-format msgid "" "Warning: According to introspection data, method “%s” does not exist on " @@ -1193,167 +1197,167 @@ "Avertissement : selon les données de l’examen interne, la méthode « %s » " "n’existe pas sur l’interface « %s »\n" -#: gio/gdbus-tool.c:596 +#: gio/gdbus-tool.c:595 msgid "Optional destination for signal (unique name)" msgstr "Destination facultative pour le signal (nom unique)" -#: gio/gdbus-tool.c:597 +#: gio/gdbus-tool.c:596 msgid "Object path to emit signal on" msgstr "Chemin de l’objet sur lequel émettre le signal" -#: gio/gdbus-tool.c:598 +#: gio/gdbus-tool.c:597 msgid "Signal and interface name" msgstr "Noms de signal et d’interface" -#: gio/gdbus-tool.c:631 +#: gio/gdbus-tool.c:630 msgid "Emit a signal." msgstr "Émet un signal." -#: gio/gdbus-tool.c:686 gio/gdbus-tool.c:1003 gio/gdbus-tool.c:1837 -#: gio/gdbus-tool.c:2069 gio/gdbus-tool.c:2289 +#: gio/gdbus-tool.c:685 gio/gdbus-tool.c:1002 gio/gdbus-tool.c:1836 +#: gio/gdbus-tool.c:2068 gio/gdbus-tool.c:2288 #, c-format msgid "Error connecting: %s\n" msgstr "Erreur de connexion : %s\n" -#: gio/gdbus-tool.c:706 +#: gio/gdbus-tool.c:705 #, c-format msgid "Error: %s is not a valid unique bus name.\n" msgstr "Erreur : %s n’est pas un nom unique de bus valide.\n" -#: gio/gdbus-tool.c:725 gio/gdbus-tool.c:1046 gio/gdbus-tool.c:1880 +#: gio/gdbus-tool.c:724 gio/gdbus-tool.c:1045 gio/gdbus-tool.c:1879 msgid "Error: Object path is not specified\n" msgstr "Erreur : le chemin pour l’objet n’est pas précisé\n" -#: gio/gdbus-tool.c:768 +#: gio/gdbus-tool.c:767 msgid "Error: Signal name is not specified\n" msgstr "Erreur : le nom du signal n’est pas défini\n" # c-format -#: gio/gdbus-tool.c:782 +#: gio/gdbus-tool.c:781 #, c-format msgid "Error: Signal name “%s” is invalid\n" msgstr "Erreur : le nom de signal « %s » n’est pas valide\n" -#: gio/gdbus-tool.c:794 +#: gio/gdbus-tool.c:793 #, c-format msgid "Error: %s is not a valid interface name\n" msgstr "Erreur : %s n’est pas un nom d’interface valide\n" -#: gio/gdbus-tool.c:800 +#: gio/gdbus-tool.c:799 #, c-format msgid "Error: %s is not a valid member name\n" msgstr "Erreur : %s n’est pas un nom de membre valide\n" #. Use the original non-"parse-me-harder" error -#: gio/gdbus-tool.c:837 gio/gdbus-tool.c:1178 +#: gio/gdbus-tool.c:836 gio/gdbus-tool.c:1177 #, c-format msgid "Error parsing parameter %d: %s\n" msgstr "Erreur lors de l’analyse du paramètre %d : %s\n" -#: gio/gdbus-tool.c:869 +#: gio/gdbus-tool.c:868 #, c-format msgid "Error flushing connection: %s\n" msgstr "Erreur de purge de la connexion : %s\n" -#: gio/gdbus-tool.c:897 +#: gio/gdbus-tool.c:896 msgid "Destination name to invoke method on" msgstr "Nom de la destination sur laquelle appeler une méthode" -#: gio/gdbus-tool.c:898 +#: gio/gdbus-tool.c:897 msgid "Object path to invoke method on" msgstr "Chemin de l’objet sur lequel appeler une méthode" -#: gio/gdbus-tool.c:899 +#: gio/gdbus-tool.c:898 msgid "Method and interface name" msgstr "Noms de méthode et d’interface" -#: gio/gdbus-tool.c:900 +#: gio/gdbus-tool.c:899 msgid "Timeout in seconds" msgstr "Délai d’attente en secondes" -#: gio/gdbus-tool.c:901 +#: gio/gdbus-tool.c:900 msgid "Allow interactive authorization" msgstr "Permettre l’autorisation interactive" -#: gio/gdbus-tool.c:948 +#: gio/gdbus-tool.c:947 msgid "Invoke a method on a remote object." msgstr "Appeler une méthode sur un objet distant." -#: gio/gdbus-tool.c:1020 gio/gdbus-tool.c:1854 gio/gdbus-tool.c:2094 +#: gio/gdbus-tool.c:1019 gio/gdbus-tool.c:1853 gio/gdbus-tool.c:2093 msgid "Error: Destination is not specified\n" msgstr "Erreur : la destination n’est pas précisée\n" -#: gio/gdbus-tool.c:1031 gio/gdbus-tool.c:1871 gio/gdbus-tool.c:2105 +#: gio/gdbus-tool.c:1030 gio/gdbus-tool.c:1870 gio/gdbus-tool.c:2104 #, c-format msgid "Error: %s is not a valid bus name\n" msgstr "Erreur : %s n’est pas un nom de bus valide\n" -#: gio/gdbus-tool.c:1081 +#: gio/gdbus-tool.c:1080 msgid "Error: Method name is not specified\n" msgstr "Erreur : le nom de la méthode n’est pas défini\n" -#: gio/gdbus-tool.c:1092 +#: gio/gdbus-tool.c:1091 #, c-format msgid "Error: Method name “%s” is invalid\n" msgstr "Erreur : le nom de méthode « %s » n’est pas valide\n" -#: gio/gdbus-tool.c:1170 +#: gio/gdbus-tool.c:1169 #, c-format msgid "Error parsing parameter %d of type “%s”: %s\n" msgstr "Erreur d’analyse du paramètre %d de type « %s » : %s\n" -#: gio/gdbus-tool.c:1196 +#: gio/gdbus-tool.c:1195 #, c-format msgid "Error adding handle %d: %s\n" msgstr "Erreur d’ajout de l’identificateur %d : %s\n" -#: gio/gdbus-tool.c:1696 +#: gio/gdbus-tool.c:1695 msgid "Destination name to introspect" msgstr "Nom de la destination à examiner en interne" -#: gio/gdbus-tool.c:1697 +#: gio/gdbus-tool.c:1696 msgid "Object path to introspect" msgstr "Chemin de l’objet à examiner en interne" -#: gio/gdbus-tool.c:1698 +#: gio/gdbus-tool.c:1697 msgid "Print XML" msgstr "Imprimer le XML" -#: gio/gdbus-tool.c:1699 +#: gio/gdbus-tool.c:1698 msgid "Introspect children" msgstr "Examiner en interne les enfants" -#: gio/gdbus-tool.c:1700 +#: gio/gdbus-tool.c:1699 msgid "Only print properties" msgstr "N’afficher que les propriétés" -#: gio/gdbus-tool.c:1789 +#: gio/gdbus-tool.c:1788 msgid "Introspect a remote object." msgstr "Examiner en interne un objet distant." -#: gio/gdbus-tool.c:1995 +#: gio/gdbus-tool.c:1994 msgid "Destination name to monitor" msgstr "Nom de la destination à surveiller" -#: gio/gdbus-tool.c:1996 +#: gio/gdbus-tool.c:1995 msgid "Object path to monitor" msgstr "Chemin de l’objet à surveiller" -#: gio/gdbus-tool.c:2021 +#: gio/gdbus-tool.c:2020 msgid "Monitor a remote object." msgstr "Surveiller un objet distant." -#: gio/gdbus-tool.c:2079 +#: gio/gdbus-tool.c:2078 msgid "Error: can’t monitor a non-message-bus connection\n" msgstr "" "Erreur : impossible de surveiller une connexion qui n’est pas un bus de " "messages\n" -#: gio/gdbus-tool.c:2203 +#: gio/gdbus-tool.c:2202 msgid "Service to activate before waiting for the other one (well-known name)" msgstr "Service à activer avant d’attendre l’autre (nom bien connu)" -#: gio/gdbus-tool.c:2206 +#: gio/gdbus-tool.c:2205 msgid "" "Timeout to wait for before exiting with an error (seconds); 0 for no timeout " "(default)" @@ -1361,27 +1365,27 @@ "Délai d’attente avant de quitter avec une erreur (secondes) ; 0 pour aucun " "délai (par défaut)" -#: gio/gdbus-tool.c:2254 +#: gio/gdbus-tool.c:2253 msgid "OPTION… BUS-NAME" msgstr "OPTION… NOM-DE-BUS" -#: gio/gdbus-tool.c:2255 +#: gio/gdbus-tool.c:2254 msgid "Wait for a bus name to appear." msgstr "Attend l’apparition d’un nom de bus." -#: gio/gdbus-tool.c:2331 +#: gio/gdbus-tool.c:2330 msgid "Error: A service to activate for must be specified.\n" msgstr "Erreur : un service à activer doit être indiqué.\n" -#: gio/gdbus-tool.c:2336 +#: gio/gdbus-tool.c:2335 msgid "Error: A service to wait for must be specified.\n" msgstr "Erreur : un service à attendre doit être indiqué.\n" -#: gio/gdbus-tool.c:2341 +#: gio/gdbus-tool.c:2340 msgid "Error: Too many arguments.\n" msgstr "Erreur : trop de paramètres.\n" -#: gio/gdbus-tool.c:2349 gio/gdbus-tool.c:2356 +#: gio/gdbus-tool.c:2348 gio/gdbus-tool.c:2355 #, c-format msgid "Error: %s is not a valid well-known bus name.\n" msgstr "Erreur : %s n’est pas un nom de bus bien connu valide\n" @@ -1391,42 +1395,47 @@ msgid "Not authorized to change debug settings" msgstr "Non autorisé à modifier les paramètres de débogage" -#: gio/gdesktopappinfo.c:2182 gio/gdesktopappinfo.c:5119 +#: gio/gdesktopappinfo.c:2242 gio/gdesktopappinfo.c:5223 msgid "Unnamed" msgstr "Sans nom" # Un fichier Desktop n’est pas forcément sur le bureau... -#: gio/gdesktopappinfo.c:2592 +#: gio/gdesktopappinfo.c:2652 msgid "Desktop file didn’t specify Exec field" msgstr "Le fichier .desktop n’a pas précisé son champ Exec" -#: gio/gdesktopappinfo.c:2891 +#: gio/gdesktopappinfo.c:2942 msgid "Unable to find terminal required for application" msgstr "Impossible de trouver le terminal requis par l’application" -#: gio/gdesktopappinfo.c:3637 +#: gio/gdesktopappinfo.c:3002 +#, c-format +msgid "Program ‘%s’ not found in $PATH" +msgstr "Programme « %s » non trouvé dans $PATH" + +#: gio/gdesktopappinfo.c:3735 #, c-format msgid "Can’t create user application configuration folder %s: %s" msgstr "" "Impossible de créer le dossier de configuration utilisateur d’application " "%s : %s" -#: gio/gdesktopappinfo.c:3641 +#: gio/gdesktopappinfo.c:3739 #, c-format msgid "Can’t create user MIME configuration folder %s: %s" msgstr "" "Impossible de créer le dossier de configuration utilisateur MIME %s : %s" -#: gio/gdesktopappinfo.c:3883 gio/gdesktopappinfo.c:3907 +#: gio/gdesktopappinfo.c:3981 gio/gdesktopappinfo.c:4005 msgid "Application information lacks an identifier" msgstr "Les informations de l’application ne comportent pas d’identifiant" -#: gio/gdesktopappinfo.c:4143 +#: gio/gdesktopappinfo.c:4241 #, c-format msgid "Can’t create user desktop file %s" msgstr "Impossible de créer le fichier .desktop utilisateur %s" -#: gio/gdesktopappinfo.c:4279 +#: gio/gdesktopappinfo.c:4377 #, c-format msgid "Custom definition for %s" msgstr "Définition personnalisée pour %s" @@ -1503,7 +1512,7 @@ msgid "Containing mount does not exist" msgstr "Le point de montage conteneur n’existe pas" -#: gio/gfile.c:2641 gio/glocalfile.c:2500 +#: gio/gfile.c:2641 gio/glocalfile.c:2511 msgid "Can’t copy over directory" msgstr "Impossible d’écraser un répertoire" @@ -1551,7 +1560,7 @@ msgid "Invalid symlink value given" msgstr "Valeur de lien symbolique donnée non valide" -#: gio/gfile.c:4163 glib/gfileutils.c:2335 +#: gio/gfile.c:4163 glib/gfileutils.c:2392 msgid "Symbolic links not supported" msgstr "Liens symboliques non pris en charge" @@ -1654,38 +1663,38 @@ msgstr "" "Le serveur mandataire HTTP a terminé la connexion de manière inattendue." -#: gio/gicon.c:300 +#: gio/gicon.c:299 #, c-format msgid "Wrong number of tokens (%d)" msgstr "Nombre de jetons incorrect (%d)" -#: gio/gicon.c:320 +#: gio/gicon.c:319 #, c-format msgid "No type for class name %s" msgstr "Aucun type pour le nom de classe %s" -#: gio/gicon.c:330 +#: gio/gicon.c:329 #, c-format msgid "Type %s does not implement the GIcon interface" msgstr "Le type %s n’implémente pas l’interface GIcon" -#: gio/gicon.c:341 +#: gio/gicon.c:340 #, c-format msgid "Type %s is not classed" msgstr "Le type %s n’est pas classé" -#: gio/gicon.c:355 +#: gio/gicon.c:354 #, c-format msgid "Malformed version number: %s" msgstr "Numéro de version incorrect : %s" -#: gio/gicon.c:369 +#: gio/gicon.c:368 #, c-format msgid "Type %s does not implement from_tokens() on the GIcon interface" msgstr "" "Le type %s n’implémente pas la fonction from_tokens() de l’interface GIcon" -#: gio/gicon.c:471 +#: gio/gicon.c:470 msgid "Can’t handle the supplied version of the icon encoding" msgstr "Impossible de gérer la version fournie du codage de l’icône" @@ -2499,7 +2508,7 @@ msgstr "" "Afficher la liste du contenu de répertoires dans un format arborescent." -#: gio/glib-compile-resources.c:142 gio/glib-compile-schemas.c:1516 +#: gio/glib-compile-resources.c:142 gio/glib-compile-schemas.c:1513 #, c-format msgid "Element <%s> not allowed inside <%s>" msgstr "Élément <%s> interdit dans <%s>" @@ -2556,7 +2565,7 @@ msgid "text may not appear inside <%s>" msgstr "<%s> ne peut pas contenir du texte" -#: gio/glib-compile-resources.c:821 gio/glib-compile-schemas.c:2174 +#: gio/glib-compile-resources.c:821 gio/glib-compile-schemas.c:2171 msgid "Show program version and exit" msgstr "Affiche la version du programme et quitte" @@ -2572,8 +2581,8 @@ "Les répertoires à partir desquels charger les fichiers référencés dans " "FICHIER (par défaut le répertoire actuel)" -#: gio/glib-compile-resources.c:823 gio/glib-compile-schemas.c:2175 -#: gio/glib-compile-schemas.c:2204 +#: gio/glib-compile-resources.c:823 gio/glib-compile-schemas.c:2172 +#: gio/glib-compile-schemas.c:2201 msgid "DIRECTORY" msgstr "RÉPERTOIRE" @@ -2801,17 +2810,17 @@ msgid "<aliases> must contain at least one <alias>" msgstr "<aliases> doit contenir au moins un <alias>" -#: gio/glib-compile-schemas.c:799 +#: gio/glib-compile-schemas.c:796 msgid "Empty names are not permitted" msgstr "Les noms vides ne sont pas autorisés" -#: gio/glib-compile-schemas.c:809 +#: gio/glib-compile-schemas.c:806 #, c-format msgid "Invalid name “%s”: names must begin with a lowercase letter" msgstr "" "Nom « %s » non valide : les noms doivent commencer par une lettre minuscule" -#: gio/glib-compile-schemas.c:821 +#: gio/glib-compile-schemas.c:818 #, c-format msgid "" "Invalid name “%s”: invalid character “%c”; only lowercase letters, numbers " @@ -2820,39 +2829,39 @@ "Nom « %s » non valide : caractère « %c » non valide ; seuls les minuscules, " "les nombres et le tiret (« - ») sont autorisés" -#: gio/glib-compile-schemas.c:830 +#: gio/glib-compile-schemas.c:827 #, c-format msgid "Invalid name “%s”: two successive hyphens (“--”) are not permitted" msgstr "" "Nom « %s » non valide : deux tirets successifs (« -- ») ne sont pas autorisés" -#: gio/glib-compile-schemas.c:839 +#: gio/glib-compile-schemas.c:836 #, c-format msgid "Invalid name “%s”: the last character may not be a hyphen (“-”)" msgstr "" "Nom « %s » non valide : le dernier caractère ne peut pas être un tiret (« -" " »)" -#: gio/glib-compile-schemas.c:847 +#: gio/glib-compile-schemas.c:844 #, c-format msgid "Invalid name “%s”: maximum length is 1024" msgstr "Nom « %s » non valide : la longueur maximale est 1024" -#: gio/glib-compile-schemas.c:919 +#: gio/glib-compile-schemas.c:916 #, c-format msgid "<child name='%s'> already specified" msgstr "<child name='%s'> a déjà été défini" -#: gio/glib-compile-schemas.c:945 +#: gio/glib-compile-schemas.c:942 msgid "Cannot add keys to a “list-of” schema" msgstr "Impossible d’ajouter des clés à un schéma « list-of »" -#: gio/glib-compile-schemas.c:956 +#: gio/glib-compile-schemas.c:953 #, c-format msgid "<key name='%s'> already specified" msgstr "<key name='%s'> a déjà été défini" -#: gio/glib-compile-schemas.c:974 +#: gio/glib-compile-schemas.c:971 #, c-format msgid "" "<key name='%s'> shadows <key name='%s'> in <schema id='%s'>; use <override> " @@ -2861,7 +2870,7 @@ "<key name='%s'> masque <key name='%s'> dans <schema id='%s'> ; utilisez " "<override> pour modifier la valeur" -#: gio/glib-compile-schemas.c:985 +#: gio/glib-compile-schemas.c:982 #, c-format msgid "" "Exactly one of “type”, “enum” or “flags” must be specified as an attribute " @@ -2870,57 +2879,57 @@ "<key> ne peut recevoir qu’un et un seul attribut parmi « type », « enum » ou " "« flags »" -#: gio/glib-compile-schemas.c:1004 +#: gio/glib-compile-schemas.c:1001 #, c-format msgid "<%s id='%s'> not (yet) defined." msgstr "<%s id='%s'> pas (encore) défini." -#: gio/glib-compile-schemas.c:1019 +#: gio/glib-compile-schemas.c:1016 #, c-format msgid "Invalid GVariant type string “%s”" msgstr "Chaîne de type GVariant « %s » non valide" -#: gio/glib-compile-schemas.c:1049 +#: gio/glib-compile-schemas.c:1046 msgid "<override> given but schema isn’t extending anything" msgstr "un <override> est donné mais son schéma n’étend rien du tout" -#: gio/glib-compile-schemas.c:1062 +#: gio/glib-compile-schemas.c:1059 #, c-format msgid "No <key name='%s'> to override" msgstr "Aucune <key name='%s'> à redéfinir" -#: gio/glib-compile-schemas.c:1070 +#: gio/glib-compile-schemas.c:1067 #, c-format msgid "<override name='%s'> already specified" msgstr "<override name='%s'> déjà défini" -#: gio/glib-compile-schemas.c:1143 +#: gio/glib-compile-schemas.c:1140 #, c-format msgid "<schema id='%s'> already specified" msgstr "<schema id='%s'> déjà défini" -#: gio/glib-compile-schemas.c:1155 +#: gio/glib-compile-schemas.c:1152 #, c-format msgid "<schema id='%s'> extends not yet existing schema “%s”" msgstr "<schema id='%s'> étend le schéma « %s » qui n’existe pas encore" -#: gio/glib-compile-schemas.c:1171 +#: gio/glib-compile-schemas.c:1168 #, c-format msgid "<schema id='%s'> is list of not yet existing schema “%s”" msgstr "" "<schema id='%s'> est une liste du schéma « %s » qui n’existe pas encore" -#: gio/glib-compile-schemas.c:1179 +#: gio/glib-compile-schemas.c:1176 #, c-format msgid "Cannot be a list of a schema with a path" msgstr "Un schéma avec un chemin ne peut contenir de liste" -#: gio/glib-compile-schemas.c:1189 +#: gio/glib-compile-schemas.c:1186 #, c-format msgid "Cannot extend a schema with a path" msgstr "Impossible d’étendre un schéma avec un chemin" -#: gio/glib-compile-schemas.c:1199 +#: gio/glib-compile-schemas.c:1196 #, c-format msgid "" "<schema id='%s'> is a list, extending <schema id='%s'> which is not a list" @@ -2928,7 +2937,7 @@ "<schema id='%s'> est une liste ; elle étend <schema id='%s'> qui n’est pas " "une liste" -#: gio/glib-compile-schemas.c:1209 +#: gio/glib-compile-schemas.c:1206 #, c-format msgid "" "<schema id='%s' list-of='%s'> extends <schema id='%s' list-of='%s'> but “%s” " @@ -2937,18 +2946,18 @@ "<schema id='%s' list-of='%s'> étend <schema id='%s' list-of='%s'> mais " "« %s » n’étend pas « %s »" -#: gio/glib-compile-schemas.c:1226 +#: gio/glib-compile-schemas.c:1223 #, c-format msgid "A path, if given, must begin and end with a slash" msgstr "" "Si un chemin est indiqué, il doit commencer et finir par une barre oblique" -#: gio/glib-compile-schemas.c:1233 +#: gio/glib-compile-schemas.c:1230 #, c-format msgid "The path of a list must end with “:/”" msgstr "Le chemin d’une liste doit finir par « :/ »" -#: gio/glib-compile-schemas.c:1242 +#: gio/glib-compile-schemas.c:1239 #, c-format msgid "" "Warning: Schema “%s” has path “%s”. Paths starting with “/apps/”, “/" @@ -2957,49 +2966,49 @@ "Attention : le schéma « %s » comporte le chemin « %s ». Les chemins " "commençant par « /apps/ », « /desktop/ » ou « /system/ » sont obsolètes." -#: gio/glib-compile-schemas.c:1272 +#: gio/glib-compile-schemas.c:1269 #, c-format msgid "<%s id='%s'> already specified" msgstr "<%s id='%s'> est déjà défini" -#: gio/glib-compile-schemas.c:1422 gio/glib-compile-schemas.c:1438 +#: gio/glib-compile-schemas.c:1419 gio/glib-compile-schemas.c:1435 #, c-format msgid "Only one <%s> element allowed inside <%s>" msgstr "Un seul élément <%s> est autorisé dans <%s>" -#: gio/glib-compile-schemas.c:1520 +#: gio/glib-compile-schemas.c:1517 #, c-format msgid "Element <%s> not allowed at the top level" msgstr "Élément <%s> interdit au premier niveau" -#: gio/glib-compile-schemas.c:1538 +#: gio/glib-compile-schemas.c:1535 msgid "Element <default> is required in <key>" msgstr "Élément <default> obligatoire dans <key>" -#: gio/glib-compile-schemas.c:1628 +#: gio/glib-compile-schemas.c:1625 #, c-format msgid "Text may not appear inside <%s>" msgstr "<%s> ne peut pas contenir du texte" -#: gio/glib-compile-schemas.c:1696 +#: gio/glib-compile-schemas.c:1693 #, c-format msgid "Warning: undefined reference to <schema id='%s'/>" msgstr "Attention : référence indéfinie vers <schema id='%s'/>" #. Translators: Do not translate "--strict". -#: gio/glib-compile-schemas.c:1835 gio/glib-compile-schemas.c:1914 +#: gio/glib-compile-schemas.c:1832 gio/glib-compile-schemas.c:1911 msgid "--strict was specified; exiting." msgstr "--strict a été spécifié ; sortie en cours." -#: gio/glib-compile-schemas.c:1847 +#: gio/glib-compile-schemas.c:1844 msgid "This entire file has been ignored." msgstr "Le fichier complet a été ignoré." -#: gio/glib-compile-schemas.c:1910 +#: gio/glib-compile-schemas.c:1907 msgid "Ignoring this file." msgstr "Ce fichier est ignoré." -#: gio/glib-compile-schemas.c:1965 +#: gio/glib-compile-schemas.c:1962 #, c-format msgid "" "No such key “%s” in schema “%s” as specified in override file “%s”; ignoring " @@ -3008,7 +3017,7 @@ "Aucune clé nommée « %s » dans le schéma « %s » comme défini dans le fichier " "« %s » de redéfinition ; aucune redéfinition pour cette clé." -#: gio/glib-compile-schemas.c:1973 +#: gio/glib-compile-schemas.c:1970 #, c-format msgid "" "No such key “%s” in schema “%s” as specified in override file “%s” and --" @@ -3017,7 +3026,7 @@ "Aucune clé nommée « %s » dans le schéma « %s » comme défini dans le fichier " "« %s » de redéfinition et --strict a été spécifié ; sortie en cours." -#: gio/glib-compile-schemas.c:1995 +#: gio/glib-compile-schemas.c:1992 #, c-format msgid "" "Cannot provide per-desktop overrides for localized key “%s” in schema " @@ -3027,7 +3036,7 @@ "« %s » dans le schéma « %s » (fichier de redéfinition « %s ») ; aucune " "redéfinition pour cette clé." -#: gio/glib-compile-schemas.c:2004 +#: gio/glib-compile-schemas.c:2001 #, c-format msgid "" "Cannot provide per-desktop overrides for localized key “%s” in schema " @@ -3037,7 +3046,7 @@ "« %s » dans le schéma « %s » (fichier de redéfinition « %s ») et --strict a " "été spécifié ; sortie en cours." -#: gio/glib-compile-schemas.c:2028 +#: gio/glib-compile-schemas.c:2025 #, c-format msgid "" "Error parsing key “%s” in schema “%s” as specified in override file “%s”: " @@ -3046,7 +3055,7 @@ "Erreur d’analyse de la clé « %s » dans le schéma « %s » comme défini dans le " "fichier « %s » de redéfinition : %s. Aucune redéfinition pour cette clé." -#: gio/glib-compile-schemas.c:2040 +#: gio/glib-compile-schemas.c:2037 #, c-format msgid "" "Error parsing key “%s” in schema “%s” as specified in override file “%s”: " @@ -3056,7 +3065,7 @@ "fichier « %s » de redéfinition : %s. --strict a été spécifié ; sortie en " "cours." -#: gio/glib-compile-schemas.c:2067 +#: gio/glib-compile-schemas.c:2064 #, c-format msgid "" "Override for key “%s” in schema “%s” in override file “%s” is outside the " @@ -3066,7 +3075,7 @@ "redéfinition « %s » n’est pas dans la plage indiquée par le schéma ; aucune " "redéfinition pour cette clé." -#: gio/glib-compile-schemas.c:2077 +#: gio/glib-compile-schemas.c:2074 #, c-format msgid "" "Override for key “%s” in schema “%s” in override file “%s” is outside the " @@ -3076,7 +3085,7 @@ "redéfinition « %s » n’est pas dans la plage indiquée par le schéma et --" "strict a été spécifié ; sortie en cours." -#: gio/glib-compile-schemas.c:2103 +#: gio/glib-compile-schemas.c:2100 #, c-format msgid "" "Override for key “%s” in schema “%s” in override file “%s” is not in the " @@ -3086,7 +3095,7 @@ "redéfinition « %s » n’est pas dans la liste des choix valides ; aucune " "redéfinition pour cette clé." -#: gio/glib-compile-schemas.c:2113 +#: gio/glib-compile-schemas.c:2110 #, c-format msgid "" "Override for key “%s” in schema “%s” in override file “%s” is not in the " @@ -3096,23 +3105,23 @@ "redéfinition « %s » n’est pas dans la liste des choix valides et --strict a " "été spécifié ; sortie en cours." -#: gio/glib-compile-schemas.c:2175 +#: gio/glib-compile-schemas.c:2172 msgid "Where to store the gschemas.compiled file" msgstr "Endroit où enregistrer le fichier gschemas.compiled" -#: gio/glib-compile-schemas.c:2176 +#: gio/glib-compile-schemas.c:2173 msgid "Abort on any errors in schemas" msgstr "Annulation en cas d’erreurs dans des schémas" -#: gio/glib-compile-schemas.c:2177 +#: gio/glib-compile-schemas.c:2174 msgid "Do not write the gschema.compiled file" msgstr "Ne pas écrire de fichier gschema.compiled" -#: gio/glib-compile-schemas.c:2178 +#: gio/glib-compile-schemas.c:2175 msgid "Do not enforce key name restrictions" msgstr "Ne pas appliquer les limitations de nom de clé" -#: gio/glib-compile-schemas.c:2207 +#: gio/glib-compile-schemas.c:2204 msgid "" "Compile all GSettings schema files into a schema cache.\n" "Schema files are required to have the extension .gschema.xml,\n" @@ -3122,15 +3131,15 @@ "L’extension .gschema.xml est requise pour les fichiers schémas,\n" "et le fichier cache est nommé gschemas.compiled." -#: gio/glib-compile-schemas.c:2228 +#: gio/glib-compile-schemas.c:2225 msgid "You should give exactly one directory name" msgstr "Vous devez indiquer un et un seul nom de répertoire" -#: gio/glib-compile-schemas.c:2271 +#: gio/glib-compile-schemas.c:2268 msgid "No schema files found: doing nothing." msgstr "Aucun fichier schéma trouvé : aucune action effectuée." -#: gio/glib-compile-schemas.c:2273 +#: gio/glib-compile-schemas.c:2270 msgid "No schema files found: removed existing output file." msgstr "Aucun fichier schéma trouvé : fichier de sortie existant supprimé." @@ -3139,7 +3148,7 @@ msgid "Invalid filename %s" msgstr "Nom de fichier non valide : %s" -#: gio/glocalfile.c:996 +#: gio/glocalfile.c:1005 #, c-format msgid "Error getting filesystem info for %s: %s" msgstr "" @@ -3149,133 +3158,133 @@ #. * the enclosing (user visible) mount of a file, but none #. * exists. #. -#: gio/glocalfile.c:1137 +#: gio/glocalfile.c:1141 #, c-format msgid "Containing mount for file %s not found" msgstr "Le point de montage conteneur pour le fichier %s est introuvable" -#: gio/glocalfile.c:1160 +#: gio/glocalfile.c:1164 msgid "Can’t rename root directory" msgstr "Impossible de renommer le répertoire racine" -#: gio/glocalfile.c:1178 gio/glocalfile.c:1201 +#: gio/glocalfile.c:1182 gio/glocalfile.c:1205 #, c-format msgid "Error renaming file %s: %s" msgstr "Erreur de renommage du fichier %s : %s" -#: gio/glocalfile.c:1185 +#: gio/glocalfile.c:1189 msgid "Can’t rename file, filename already exists" msgstr "Impossible de renommer le fichier car ce nom est déjà utilisé" -#: gio/glocalfile.c:1198 gio/glocalfile.c:2394 gio/glocalfile.c:2422 -#: gio/glocalfile.c:2561 gio/glocalfileoutputstream.c:658 +#: gio/glocalfile.c:1202 gio/glocalfile.c:2405 gio/glocalfile.c:2433 +#: gio/glocalfile.c:2572 gio/glocalfileoutputstream.c:658 msgid "Invalid filename" msgstr "Nom de fichier non valide" -#: gio/glocalfile.c:1366 gio/glocalfile.c:1377 +#: gio/glocalfile.c:1370 gio/glocalfile.c:1381 #, c-format msgid "Error opening file %s: %s" msgstr "Erreur lors de l’ouverture du fichier %s : %s" -#: gio/glocalfile.c:1502 +#: gio/glocalfile.c:1506 #, c-format msgid "Error removing file %s: %s" msgstr "Erreur lors de la suppression du fichier %s : %s" -#: gio/glocalfile.c:1996 gio/glocalfile.c:2007 gio/glocalfile.c:2034 +#: gio/glocalfile.c:2000 gio/glocalfile.c:2011 gio/glocalfile.c:2038 #, c-format msgid "Error trashing file %s: %s" msgstr "Erreur lors de la mise à la corbeille du fichier %s : %s" -#: gio/glocalfile.c:2054 +#: gio/glocalfile.c:2058 #, c-format msgid "Unable to create trash directory %s: %s" msgstr "Impossible de créer le répertoire de la corbeille %s : %s" -#: gio/glocalfile.c:2075 +#: gio/glocalfile.c:2079 #, c-format msgid "Unable to find toplevel directory to trash %s" msgstr "" "Impossible de trouver le répertoire racine pour mettre %s à la corbeille" -#: gio/glocalfile.c:2083 +#: gio/glocalfile.c:2087 #, c-format msgid "Trashing on system internal mounts is not supported" msgstr "" "La mise à la corbeille sur des montages systèmes internes n’est pas prise en " "charge" -#: gio/glocalfile.c:2169 gio/glocalfile.c:2197 +#: gio/glocalfile.c:2173 gio/glocalfile.c:2201 #, c-format msgid "Unable to find or create trash directory %s to trash %s" msgstr "" "Impossible de trouver ou créer le répertoire de la corbeille %s pour mettre " "%s à la corbeille" -#: gio/glocalfile.c:2243 +#: gio/glocalfile.c:2245 #, c-format msgid "Unable to create trashing info file for %s: %s" msgstr "" "Impossible de créer le fichier d’informations de mise à la corbeille pour " "%s : %s" -#: gio/glocalfile.c:2305 +#: gio/glocalfile.c:2316 #, c-format msgid "Unable to trash file %s across filesystem boundaries" msgstr "" "Impossible de mettre à la corbeille le fichier %s au-delà des limites du " "système de fichiers" -#: gio/glocalfile.c:2309 gio/glocalfile.c:2365 +#: gio/glocalfile.c:2320 gio/glocalfile.c:2376 #, c-format msgid "Unable to trash file %s: %s" msgstr "Impossible de mettre à la corbeille le fichier %s : %s" -#: gio/glocalfile.c:2371 +#: gio/glocalfile.c:2382 #, c-format msgid "Unable to trash file %s" msgstr "Impossible de mettre à la corbeille le fichier %s" -#: gio/glocalfile.c:2397 +#: gio/glocalfile.c:2408 #, c-format msgid "Error creating directory %s: %s" msgstr "Erreur lors de la création du répertoire %s : %s" -#: gio/glocalfile.c:2426 +#: gio/glocalfile.c:2437 #, c-format msgid "Filesystem does not support symbolic links" msgstr "Le système de fichiers ne gère pas les liens symboliques" -#: gio/glocalfile.c:2429 +#: gio/glocalfile.c:2440 #, c-format msgid "Error making symbolic link %s: %s" msgstr "Erreur lors de la création du lien symbolique %s : %s" -#: gio/glocalfile.c:2472 gio/glocalfile.c:2507 gio/glocalfile.c:2564 +#: gio/glocalfile.c:2483 gio/glocalfile.c:2518 gio/glocalfile.c:2575 #, c-format msgid "Error moving file %s: %s" msgstr "Erreur lors du déplacement du fichier %s : %s" -#: gio/glocalfile.c:2495 +#: gio/glocalfile.c:2506 msgid "Can’t move directory over directory" msgstr "Impossible de déplacer un répertoire par dessus un autre" -#: gio/glocalfile.c:2521 gio/glocalfileoutputstream.c:1110 +#: gio/glocalfile.c:2532 gio/glocalfileoutputstream.c:1110 #: gio/glocalfileoutputstream.c:1124 gio/glocalfileoutputstream.c:1139 #: gio/glocalfileoutputstream.c:1156 gio/glocalfileoutputstream.c:1170 msgid "Backup file creation failed" msgstr "La création du fichier de sauvegarde a échoué" -#: gio/glocalfile.c:2540 +#: gio/glocalfile.c:2551 #, c-format msgid "Error removing target file: %s" msgstr "Erreur lors de la suppression du fichier cible : %s" -#: gio/glocalfile.c:2554 +#: gio/glocalfile.c:2565 msgid "Move between mounts not supported" msgstr "Le déplacement entre points de montage n’est pas pris en charge" -#: gio/glocalfile.c:2728 +#: gio/glocalfile.c:2741 #, c-format msgid "Could not determine the disk usage of %s: %s" msgstr "Impossible de déterminer l’utilisation disque de %s : %s" @@ -3298,126 +3307,126 @@ msgid "Error setting extended attribute “%s”: %s" msgstr "Erreur lors de la définition de l’attribut étendu « %s » : %s" -#: gio/glocalfileinfo.c:1738 gio/win32/gwinhttpfile.c:191 +#: gio/glocalfileinfo.c:1819 gio/win32/gwinhttpfile.c:191 msgid " (invalid encoding)" msgstr " (codage non valide)" -#: gio/glocalfileinfo.c:1897 gio/glocalfileoutputstream.c:945 +#: gio/glocalfileinfo.c:1978 gio/glocalfileoutputstream.c:945 #: gio/glocalfileoutputstream.c:997 #, c-format msgid "Error when getting information for file “%s”: %s" msgstr "Erreur lors de l’obtention des informations du fichier « %s » : %s" -#: gio/glocalfileinfo.c:2163 +#: gio/glocalfileinfo.c:2281 #, c-format msgid "Error when getting information for file descriptor: %s" msgstr "" "Erreur lors de l’obtention des informations du descripteur de fichier : %s" -#: gio/glocalfileinfo.c:2208 +#: gio/glocalfileinfo.c:2326 msgid "Invalid attribute type (uint32 expected)" msgstr "Type d’attribut non valide (uint32 attendu)" -#: gio/glocalfileinfo.c:2226 +#: gio/glocalfileinfo.c:2344 msgid "Invalid attribute type (uint64 expected)" msgstr "Type d’attribut non valide (uint64 attendu)" -#: gio/glocalfileinfo.c:2245 gio/glocalfileinfo.c:2264 +#: gio/glocalfileinfo.c:2363 gio/glocalfileinfo.c:2382 msgid "Invalid attribute type (byte string expected)" msgstr "Type d’attribut non valide (chaîne d’octets attendue)" -#: gio/glocalfileinfo.c:2311 +#: gio/glocalfileinfo.c:2429 msgid "Cannot set permissions on symlinks" msgstr "Impossible de définir des permissions sur les liens symboliques" -#: gio/glocalfileinfo.c:2327 +#: gio/glocalfileinfo.c:2445 #, c-format msgid "Error setting permissions: %s" msgstr "Erreur lors de la définition des permissions : %s" -#: gio/glocalfileinfo.c:2378 +#: gio/glocalfileinfo.c:2496 #, c-format msgid "Error setting owner: %s" msgstr "Erreur lors de la définition du propriétaire : %s" -#: gio/glocalfileinfo.c:2401 +#: gio/glocalfileinfo.c:2519 msgid "symlink must be non-NULL" msgstr "un lien symbolique ne doit pas être « NULL »" -#: gio/glocalfileinfo.c:2411 gio/glocalfileinfo.c:2430 -#: gio/glocalfileinfo.c:2441 +#: gio/glocalfileinfo.c:2529 gio/glocalfileinfo.c:2548 +#: gio/glocalfileinfo.c:2559 #, c-format msgid "Error setting symlink: %s" msgstr "Erreur lors de la définition du lien symbolique : %s" -#: gio/glocalfileinfo.c:2420 +#: gio/glocalfileinfo.c:2538 msgid "Error setting symlink: file is not a symlink" msgstr "" "Erreur lors de la définition du lien symbolique : le fichier n’est pas un " "lien symbolique" -#: gio/glocalfileinfo.c:2492 +#: gio/glocalfileinfo.c:2630 #, c-format msgid "Extra nanoseconds %d for UNIX timestamp %lld are negative" msgstr "" "Les nanosecondes supplémentaires %d pour l’horodatage UNIX %lld sont " "négatives" -#: gio/glocalfileinfo.c:2501 +#: gio/glocalfileinfo.c:2639 #, c-format msgid "Extra nanoseconds %d for UNIX timestamp %lld reach 1 second" msgstr "" "Les nanosecondes supplémentaires %d pour l’horodatage UNIX %lld atteignent 1 " "seconde" -#: gio/glocalfileinfo.c:2511 +#: gio/glocalfileinfo.c:2649 #, c-format msgid "UNIX timestamp %lld does not fit into 64 bits" msgstr "L’horodatage UNIX %lld ne tient pas sur 64 bits" -#: gio/glocalfileinfo.c:2522 +#: gio/glocalfileinfo.c:2660 #, c-format msgid "UNIX timestamp %lld is outside of the range supported by Windows" msgstr "" "L’horodatage UNIX %lld est hors de la plage prise en charge par Windows" -#: gio/glocalfileinfo.c:2625 +#: gio/glocalfileinfo.c:2792 #, c-format msgid "File name “%s” cannot be converted to UTF-16" msgstr "Le nom de fichier « %s » ne peut être converti en UTF-16" -#: gio/glocalfileinfo.c:2644 +#: gio/glocalfileinfo.c:2811 #, c-format msgid "File “%s” cannot be opened: Windows Error %lu" msgstr "Le fichier « %s » ne peut être ouvert : erreur Windows %lu" -#: gio/glocalfileinfo.c:2657 +#: gio/glocalfileinfo.c:2824 #, c-format msgid "Error setting modification or access time for file “%s”: %lu" msgstr "" "Erreur lors de la définition de l’heure de modification ou d’accès pour le " "fichier « %s » : %lu" -#: gio/glocalfileinfo.c:2798 gio/glocalfileinfo.c:2810 +#: gio/glocalfileinfo.c:2981 #, c-format msgid "Error setting modification or access time: %s" msgstr "" "Erreur lors de la définition de l’heure de modification ou d’accès : %s" -#: gio/glocalfileinfo.c:2833 +#: gio/glocalfileinfo.c:3004 msgid "SELinux context must be non-NULL" msgstr "Le contexte SELinux ne doit pas être « NULL »" -#: gio/glocalfileinfo.c:2840 +#: gio/glocalfileinfo.c:3011 msgid "SELinux is not enabled on this system" msgstr "SELinux n’est pas activé sur ce système" -#: gio/glocalfileinfo.c:2850 +#: gio/glocalfileinfo.c:3021 #, c-format msgid "Error setting SELinux context: %s" msgstr "Erreur lors de la définition du contexte SELinux : %s" -#: gio/glocalfileinfo.c:2947 +#: gio/glocalfileinfo.c:3118 #, c-format msgid "Setting attribute %s not supported" msgstr "La définition de l’attribut %s n’est pas prise en charge" @@ -3464,13 +3473,13 @@ msgid "Error renaming temporary file: %s" msgstr "Erreur lors du renommage du fichier temporaire : %s" -#: gio/glocalfileoutputstream.c:611 gio/glocalfileoutputstream.c:1241 +#: gio/glocalfileoutputstream.c:611 gio/glocalfileoutputstream.c:1242 #, c-format msgid "Error truncating file: %s" msgstr "Erreur lors de la troncature du fichier : %s" #: gio/glocalfileoutputstream.c:664 gio/glocalfileoutputstream.c:909 -#: gio/glocalfileoutputstream.c:1222 gio/gsubprocess.c:231 +#: gio/glocalfileoutputstream.c:1223 gio/gsubprocess.c:231 #, c-format msgid "Error opening file “%s”: %s" msgstr "Erreur lors de l’ouverture du fichier « %s » : %s" @@ -3487,7 +3496,7 @@ msgid "The file was externally modified" msgstr "Le fichier a été modifié extérieurement" -#: gio/glocalfileoutputstream.c:1204 +#: gio/glocalfileoutputstream.c:1205 #, c-format msgid "Error removing old file: %s" msgstr "Erreur à la suppression de l’ancien fichier : %s" @@ -3637,8 +3646,8 @@ #. Translators: the first placeholder is a domain name, the #. * second is an error message #: gio/gresolver.c:403 gio/gthreadedresolver.c:152 gio/gthreadedresolver.c:170 -#: gio/gthreadedresolver.c:782 gio/gthreadedresolver.c:806 -#: gio/gthreadedresolver.c:831 gio/gthreadedresolver.c:846 +#: gio/gthreadedresolver.c:798 gio/gthreadedresolver.c:822 +#: gio/gthreadedresolver.c:847 gio/gthreadedresolver.c:862 #, c-format msgid "Error resolving “%s”: %s" msgstr "Erreur de résolution de « %s » : %s" @@ -4369,36 +4378,36 @@ #. Translators: the placeholder is a DNS record type, such as ‘MX’ or ‘SRV’ #: gio/gthreadedresolver.c:552 gio/gthreadedresolver.c:574 -#: gio/gthreadedresolver.c:612 gio/gthreadedresolver.c:659 -#: gio/gthreadedresolver.c:688 gio/gthreadedresolver.c:700 +#: gio/gthreadedresolver.c:628 gio/gthreadedresolver.c:675 +#: gio/gthreadedresolver.c:704 gio/gthreadedresolver.c:716 #, c-format msgid "Error parsing DNS %s record: malformed DNS packet" msgstr "" "Erreur lors de l’analyse de l’enregistrement DNS %s : paquet DNS non conforme" -#: gio/gthreadedresolver.c:758 gio/gthreadedresolver.c:895 -#: gio/gthreadedresolver.c:993 gio/gthreadedresolver.c:1043 +#: gio/gthreadedresolver.c:774 gio/gthreadedresolver.c:911 +#: gio/gthreadedresolver.c:1009 gio/gthreadedresolver.c:1059 #, c-format msgid "No DNS record of the requested type for “%s”" msgstr "Aucun enregistrement DNS du type demandé pour « %s »" -#: gio/gthreadedresolver.c:763 gio/gthreadedresolver.c:998 +#: gio/gthreadedresolver.c:779 gio/gthreadedresolver.c:1014 #, c-format msgid "Temporarily unable to resolve “%s”" msgstr "Impossible temporairement de résoudre « %s »" -#: gio/gthreadedresolver.c:768 gio/gthreadedresolver.c:1003 -#: gio/gthreadedresolver.c:1113 +#: gio/gthreadedresolver.c:784 gio/gthreadedresolver.c:1019 +#: gio/gthreadedresolver.c:1129 #, c-format msgid "Error resolving “%s”" msgstr "Erreur de résolution de « %s »" -#: gio/gthreadedresolver.c:782 gio/gthreadedresolver.c:806 -#: gio/gthreadedresolver.c:831 gio/gthreadedresolver.c:846 +#: gio/gthreadedresolver.c:798 gio/gthreadedresolver.c:822 +#: gio/gthreadedresolver.c:847 gio/gthreadedresolver.c:862 msgid "Malformed DNS packet" msgstr "Paquet DNS non conforme" -#: gio/gthreadedresolver.c:888 +#: gio/gthreadedresolver.c:904 #, c-format msgid "Failed to parse DNS response for “%s”: " msgstr "Impossible d’analyser la réponse DNS pour « %s » : " @@ -4528,7 +4537,7 @@ msgid "Error closing file descriptor: %s" msgstr "Erreur de fermeture du descripteur de fichier : %s" -#: gio/gunixmounts.c:2815 gio/gunixmounts.c:2868 +#: gio/gunixmounts.c:2817 gio/gunixmounts.c:2870 msgid "Filesystem root" msgstr "Racine du système de fichiers" @@ -4613,79 +4622,79 @@ msgid "Wrong args\n" msgstr "Paramètres incorrects\n" -#: glib/gbookmarkfile.c:779 +#: glib/gbookmarkfile.c:861 #, c-format msgid "Unexpected attribute “%s” for element “%s”" msgstr "Attribut « %s » inattendu pour l’élément « %s »" -#: glib/gbookmarkfile.c:790 glib/gbookmarkfile.c:870 glib/gbookmarkfile.c:880 -#: glib/gbookmarkfile.c:993 +#: glib/gbookmarkfile.c:872 glib/gbookmarkfile.c:952 glib/gbookmarkfile.c:962 +#: glib/gbookmarkfile.c:1075 #, c-format msgid "Attribute “%s” of element “%s” not found" msgstr "L’attribut « %s » de l’élément « %s » est introuvable" -#: glib/gbookmarkfile.c:1202 glib/gbookmarkfile.c:1267 -#: glib/gbookmarkfile.c:1331 glib/gbookmarkfile.c:1341 +#: glib/gbookmarkfile.c:1284 glib/gbookmarkfile.c:1349 +#: glib/gbookmarkfile.c:1413 glib/gbookmarkfile.c:1423 #, c-format msgid "Unexpected tag “%s”, tag “%s” expected" msgstr "Balise « %s » inattendue. La balise « %s » était attendue" -#: glib/gbookmarkfile.c:1227 glib/gbookmarkfile.c:1241 -#: glib/gbookmarkfile.c:1309 glib/gbookmarkfile.c:1355 +#: glib/gbookmarkfile.c:1309 glib/gbookmarkfile.c:1323 +#: glib/gbookmarkfile.c:1391 glib/gbookmarkfile.c:1437 #, c-format msgid "Unexpected tag “%s” inside “%s”" msgstr "Balise « %s » inattendue à l’intérieur de « %s »" -#: glib/gbookmarkfile.c:1635 +#: glib/gbookmarkfile.c:1717 #, c-format msgid "Invalid date/time ‘%s’ in bookmark file" msgstr "Date et heure « %s » non valide dans le fichier de signets" -#: glib/gbookmarkfile.c:1838 +#: glib/gbookmarkfile.c:1956 msgid "No valid bookmark file found in data dirs" msgstr "" "Impossible de trouver un fichier de signets valide dans les répertoires de " "données" -#: glib/gbookmarkfile.c:2039 +#: glib/gbookmarkfile.c:2157 #, c-format msgid "A bookmark for URI “%s” already exists" msgstr "Un signet pour l’URI « %s » existe déjà" -#: glib/gbookmarkfile.c:2088 glib/gbookmarkfile.c:2246 -#: glib/gbookmarkfile.c:2331 glib/gbookmarkfile.c:2411 -#: glib/gbookmarkfile.c:2496 glib/gbookmarkfile.c:2630 -#: glib/gbookmarkfile.c:2763 glib/gbookmarkfile.c:2898 -#: glib/gbookmarkfile.c:2940 glib/gbookmarkfile.c:3037 -#: glib/gbookmarkfile.c:3158 glib/gbookmarkfile.c:3352 -#: glib/gbookmarkfile.c:3493 glib/gbookmarkfile.c:3712 -#: glib/gbookmarkfile.c:3801 glib/gbookmarkfile.c:3890 -#: glib/gbookmarkfile.c:4009 +#: glib/gbookmarkfile.c:2206 glib/gbookmarkfile.c:2364 +#: glib/gbookmarkfile.c:2449 glib/gbookmarkfile.c:2529 +#: glib/gbookmarkfile.c:2614 glib/gbookmarkfile.c:2748 +#: glib/gbookmarkfile.c:2881 glib/gbookmarkfile.c:3016 +#: glib/gbookmarkfile.c:3058 glib/gbookmarkfile.c:3155 +#: glib/gbookmarkfile.c:3276 glib/gbookmarkfile.c:3470 +#: glib/gbookmarkfile.c:3611 glib/gbookmarkfile.c:3830 +#: glib/gbookmarkfile.c:3919 glib/gbookmarkfile.c:4008 +#: glib/gbookmarkfile.c:4127 #, c-format msgid "No bookmark found for URI “%s”" msgstr "Aucun signet trouvé pour l’URI « %s »" -#: glib/gbookmarkfile.c:2420 +#: glib/gbookmarkfile.c:2538 #, c-format msgid "No MIME type defined in the bookmark for URI “%s”" msgstr "Aucun type MIME défini dans le signet pour l’URI « %s »" -#: glib/gbookmarkfile.c:2505 +#: glib/gbookmarkfile.c:2623 #, c-format msgid "No private flag has been defined in bookmark for URI “%s”" msgstr "Aucun indicateur privé n’est défini dans le signet pour l’URI « %s »" -#: glib/gbookmarkfile.c:3046 +#: glib/gbookmarkfile.c:3164 #, c-format msgid "No groups set in bookmark for URI “%s”" msgstr "Aucun groupe n’est défini dans le signet pour l’URI « %s »" -#: glib/gbookmarkfile.c:3514 glib/gbookmarkfile.c:3722 +#: glib/gbookmarkfile.c:3632 glib/gbookmarkfile.c:3840 #, c-format msgid "No application with name “%s” registered a bookmark for “%s”" msgstr "Aucune application nommée « %s » n’a enregistré un signet pour « %s »" -#: glib/gbookmarkfile.c:3745 +#: glib/gbookmarkfile.c:3863 #, c-format msgid "Failed to expand exec line “%s” with URI “%s”" msgstr "" @@ -5163,85 +5172,85 @@ msgid "Error opening directory “%s”: %s" msgstr "Erreur à l’ouverture du répertoire « %s » : %s" -#: glib/gfileutils.c:735 glib/gfileutils.c:827 +#: glib/gfileutils.c:753 glib/gfileutils.c:845 #, c-format msgid "Could not allocate %lu byte to read file “%s”" msgid_plural "Could not allocate %lu bytes to read file “%s”" msgstr0 "Impossible d’allouer %lu octet pour lire le fichier « %s »" msgstr1 "Impossible d’allouer %lu octets pour lire le fichier « %s »" -#: glib/gfileutils.c:752 +#: glib/gfileutils.c:770 #, c-format msgid "Error reading file “%s”: %s" msgstr "Erreur de lecture du fichier « %s » : %s" -#: glib/gfileutils.c:788 +#: glib/gfileutils.c:806 #, c-format msgid "File “%s” is too large" msgstr "Le fichier « %s » est trop grand" -#: glib/gfileutils.c:852 +#: glib/gfileutils.c:870 #, c-format msgid "Failed to read from file “%s”: %s" msgstr "La lecture depuis le fichier « %s » a échoué : %s" -#: glib/gfileutils.c:902 glib/gfileutils.c:977 glib/gfileutils.c:1449 +#: glib/gfileutils.c:920 glib/gfileutils.c:995 glib/gfileutils.c:1472 #, c-format msgid "Failed to open file “%s”: %s" msgstr "L’ouverture du fichier « %s » a échoué : %s" -#: glib/gfileutils.c:915 +#: glib/gfileutils.c:933 #, c-format msgid "Failed to get attributes of file “%s”: fstat() failed: %s" msgstr "" "L’obtention des attributs du fichier « %s » a échoué : échec de fstat() : %s" -#: glib/gfileutils.c:946 +#: glib/gfileutils.c:964 #, c-format msgid "Failed to open file “%s”: fdopen() failed: %s" msgstr "L’ouverture du fichier « %s » a échoué : échec de fdopen() : %s" -#: glib/gfileutils.c:1047 +#: glib/gfileutils.c:1065 #, c-format msgid "Failed to rename file “%s” to “%s”: g_rename() failed: %s" msgstr "" "Le renommage du fichier « %s » vers « %s » a échoué : échec de g_rename() : " "%s" -#: glib/gfileutils.c:1156 +#: glib/gfileutils.c:1179 #, c-format msgid "Failed to write file “%s”: write() failed: %s" msgstr "L’écriture dans le fichier « %s » a échoué : échec de write() : %s" -#: glib/gfileutils.c:1177 +#: glib/gfileutils.c:1200 #, c-format msgid "Failed to write file “%s”: fsync() failed: %s" msgstr "L’écriture dans le fichier « %s » a échoué : échec de fsync() : %s" -#: glib/gfileutils.c:1338 glib/gfileutils.c:1753 +#: glib/gfileutils.c:1361 glib/gfileutils.c:1776 #, c-format msgid "Failed to create file “%s”: %s" msgstr "La création du fichier « %s » a échoué : %s" -#: glib/gfileutils.c:1383 +#: glib/gfileutils.c:1406 #, c-format msgid "Existing file “%s” could not be removed: g_unlink() failed: %s" msgstr "" "Le fichier existant « %s » ne peut pas être supprimé : échec de g_unlink() : " "%s" -#: glib/gfileutils.c:1718 +#: glib/gfileutils.c:1741 #, c-format msgid "Template “%s” invalid, should not contain a “%s”" msgstr "" "Le modèle « %s » n’est pas valide, il ne devrait pas contenir un « %s »" -#: glib/gfileutils.c:1731 +#: glib/gfileutils.c:1754 #, c-format msgid "Template “%s” doesn’t contain XXXXXX" msgstr "Le modèle « %s » ne contient pas XXXXXX" -#: glib/gfileutils.c:2291 glib/gfileutils.c:2320 +#: glib/gfileutils.c:2348 glib/gfileutils.c:2377 #, c-format msgid "Failed to read the symbolic link “%s”: %s" msgstr "La lecture du lien symbolique « %s » a échoué : %s" @@ -5307,8 +5316,8 @@ "Le fichier de clés contient un codage de caractères non pris en charge « %s »" #: glib/gkeyfile.c:1679 glib/gkeyfile.c:1852 glib/gkeyfile.c:3299 -#: glib/gkeyfile.c:3363 glib/gkeyfile.c:3493 glib/gkeyfile.c:3625 -#: glib/gkeyfile.c:3771 glib/gkeyfile.c:4006 glib/gkeyfile.c:4073 +#: glib/gkeyfile.c:3363 glib/gkeyfile.c:3493 glib/gkeyfile.c:3622 +#: glib/gkeyfile.c:3768 glib/gkeyfile.c:4003 glib/gkeyfile.c:4070 #, c-format msgid "Key file does not have group “%s”" msgstr "Le fichier de clés n’a pas de groupe « %s »" @@ -5349,34 +5358,34 @@ "La clé « %s » dans le groupe « %s » a une valeur « %s » alors que %s était " "attendu" -#: glib/gkeyfile.c:4326 +#: glib/gkeyfile.c:4323 msgid "Key file contains escape character at end of line" msgstr "Le fichier de clés contient un caractère d’échappement en fin de ligne" -#: glib/gkeyfile.c:4348 +#: glib/gkeyfile.c:4345 #, c-format msgid "Key file contains invalid escape sequence “%s”" msgstr "" "Le fichier de clés contient une séquence d’échappement non valide « %s »" -#: glib/gkeyfile.c:4493 +#: glib/gkeyfile.c:4490 #, c-format msgid "Value “%s” cannot be interpreted as a number." msgstr "La valeur « %s » ne peut pas être interprétée comme un nombre." -#: glib/gkeyfile.c:4507 +#: glib/gkeyfile.c:4504 #, c-format msgid "Integer value “%s” out of range" msgstr "La valeur entière « %s » est hors plage" -#: glib/gkeyfile.c:4540 +#: glib/gkeyfile.c:4537 #, c-format msgid "Value “%s” cannot be interpreted as a float number." msgstr "" "La valeur « %s » ne peut pas être interprétée comme un nombre à virgule " "flottante." -#: glib/gkeyfile.c:4579 +#: glib/gkeyfile.c:4576 #, c-format msgid "Value “%s” cannot be interpreted as a boolean." msgstr "La valeur « %s » ne peut pas être interprétée comme un booléen." @@ -5398,32 +5407,32 @@ msgid "Failed to open file “%s”: open() failed: %s" msgstr "L’ouverture du fichier « %s » a échoué : échec de open() : %s" -#: glib/gmarkup.c:400 glib/gmarkup.c:442 +#: glib/gmarkup.c:393 glib/gmarkup.c:435 #, c-format msgid "Error on line %d char %d: " msgstr "Erreur à la ligne %d, caractère %d : " -#: glib/gmarkup.c:464 glib/gmarkup.c:547 +#: glib/gmarkup.c:457 glib/gmarkup.c:540 #, c-format msgid "Invalid UTF-8 encoded text in name — not valid “%s”" msgstr "Codage UTF-8 non valide dans le nom — « %s » n’est pas valide" -#: glib/gmarkup.c:475 +#: glib/gmarkup.c:468 #, c-format msgid "“%s” is not a valid name" msgstr "« %s » n’est pas un nom valide" -#: glib/gmarkup.c:491 +#: glib/gmarkup.c:484 #, c-format msgid "“%s” is not a valid name: “%c”" msgstr "« %s » n’est pas un nom valide : « %c »" -#: glib/gmarkup.c:615 +#: glib/gmarkup.c:608 #, c-format msgid "Error on line %d: %s" msgstr "Erreur à la ligne %d : %s" -#: glib/gmarkup.c:692 +#: glib/gmarkup.c:685 #, c-format msgid "" "Failed to parse “%-.*s”, which should have been a digit inside a character " @@ -5433,7 +5442,7 @@ "référence des caractères (ê par exemple) — peut-être que le nombre est " "trop grand" -#: glib/gmarkup.c:704 +#: glib/gmarkup.c:697 msgid "" "Character reference did not end with a semicolon; most likely you used an " "ampersand character without intending to start an entity — escape ampersand " @@ -5443,24 +5452,24 @@ "vraisemblablement utilisé une esperluette sans intention d’écrire une entité " "— échappez l’esperluette avec &" -#: glib/gmarkup.c:730 +#: glib/gmarkup.c:723 #, c-format msgid "Character reference “%-.*s” does not encode a permitted character" msgstr "La référence au caractère « %-.*s » ne code pas un caractère autorisé" -#: glib/gmarkup.c:768 +#: glib/gmarkup.c:761 msgid "" "Empty entity “&;” seen; valid entities are: & " < > '" msgstr "" "Entité vide « &; » rencontrée ; les entités valides sont : & " < " "> '" -#: glib/gmarkup.c:776 +#: glib/gmarkup.c:769 #, c-format msgid "Entity name “%-.*s” is not known" msgstr "L’entité nommée « %-.*s » est inconnue" -#: glib/gmarkup.c:781 +#: glib/gmarkup.c:774 msgid "" "Entity did not end with a semicolon; most likely you used an ampersand " "character without intending to start an entity — escape ampersand as &" @@ -5469,11 +5478,11 @@ "utilisé une esperluette sans intention d’écrire une entité — échappez " "l’esperluette avec &" -#: glib/gmarkup.c:1195 +#: glib/gmarkup.c:1188 msgid "Document must begin with an element (e.g. <book>)" msgstr "Le document doit commencer avec un élément (par ex. <book>)" -#: glib/gmarkup.c:1235 +#: glib/gmarkup.c:1228 #, c-format msgid "" "“%s” is not a valid character following a “<” character; it may not begin an " @@ -5482,7 +5491,7 @@ "« %s » n’est pas un caractère valide à la suite du caractère « < » ; il ne " "semble pas commencer un nom d’élément" -#: glib/gmarkup.c:1278 +#: glib/gmarkup.c:1271 #, c-format msgid "" "Odd character “%s”, expected a “>” character to end the empty-element tag " @@ -5491,12 +5500,12 @@ "Caractère anormal « %s », un caractère « > » est requis pour terminer la " "balise d’élément vide « %s »" -#: glib/gmarkup.c:1348 +#: glib/gmarkup.c:1341 #, c-format msgid "Too many attributes in element “%s”" msgstr "Trop d’attributs dans l’élément « %s »" -#: glib/gmarkup.c:1368 +#: glib/gmarkup.c:1361 #, c-format msgid "" "Odd character “%s”, expected a “=” after attribute name “%s” of element “%s”" @@ -5504,7 +5513,7 @@ "Caractère anormal « %s », un caractère « = » est requis après le nom de " "l’attribut « %s » de l’élément « %s »" -#: glib/gmarkup.c:1410 +#: glib/gmarkup.c:1403 #, c-format msgid "" "Odd character “%s”, expected a “>” or “/” character to end the start tag of " @@ -5516,7 +5525,7 @@ "« %s » ; peut-être avez-vous utilisé un caractère non valide dans un nom " "d’attribut" -#: glib/gmarkup.c:1455 +#: glib/gmarkup.c:1448 #, c-format msgid "" "Odd character “%s”, expected an open quote mark after the equals sign when " @@ -5525,7 +5534,7 @@ "Caractère anormal « %s », un guillemet d’ouverture après le signe égal est " "requis quand on affecte une valeur à l’attribut « %s » de l’élément « %s »" -#: glib/gmarkup.c:1589 +#: glib/gmarkup.c:1582 #, c-format msgid "" "“%s” is not a valid character following the characters “</”; “%s” may not " @@ -5534,7 +5543,7 @@ "« %s » n’est pas un caractère valide à la suite des caractères « </ » ; " "« %s » ne peut pas commencer un nom d’élément" -#: glib/gmarkup.c:1627 +#: glib/gmarkup.c:1620 #, c-format msgid "" "“%s” is not a valid character following the close element name “%s”; the " @@ -5543,28 +5552,28 @@ "« %s » n’est pas un caractère valide à la suite du nom d’élément « %s » à " "fermer ; le caractère autorisé est « > »" -#: glib/gmarkup.c:1639 +#: glib/gmarkup.c:1632 #, c-format msgid "Element “%s” was closed, no element is currently open" msgstr "L’élément « %s » a été fermé, aucun élément n’est actuellement ouvert" -#: glib/gmarkup.c:1648 +#: glib/gmarkup.c:1641 #, c-format msgid "Element “%s” was closed, but the currently open element is “%s”" msgstr "" "L’élément « %s » a été fermé, mais l’élément actuellement ouvert est « %s »" -#: glib/gmarkup.c:1801 +#: glib/gmarkup.c:1794 msgid "Document was empty or contained only whitespace" msgstr "Le document était vide ou ne contenait que des espaces" -#: glib/gmarkup.c:1815 +#: glib/gmarkup.c:1808 msgid "Document ended unexpectedly just after an open angle bracket “<”" msgstr "" "Le document s’est terminé de manière inattendue juste après un crochet " "ouvrant « < »" -#: glib/gmarkup.c:1823 glib/gmarkup.c:1868 +#: glib/gmarkup.c:1816 glib/gmarkup.c:1861 #, c-format msgid "" "Document ended unexpectedly with elements still open — “%s” was the last " @@ -5573,7 +5582,7 @@ "Le document s’est terminé de manière inattendue avec des éléments encore " "ouverts — « %s » était le dernier élément ouvert" -#: glib/gmarkup.c:1831 +#: glib/gmarkup.c:1824 #, c-format msgid "" "Document ended unexpectedly, expected to see a close angle bracket ending " @@ -5582,25 +5591,25 @@ "Le document s’est terminé de manière inattendue, un crochet fermant pour la " "balise <%s/> est requis" -#: glib/gmarkup.c:1837 +#: glib/gmarkup.c:1830 msgid "Document ended unexpectedly inside an element name" msgstr "" "Le document s’est terminé de manière inattendue à l’intérieur d’un nom " "d’élément" -#: glib/gmarkup.c:1843 +#: glib/gmarkup.c:1836 msgid "Document ended unexpectedly inside an attribute name" msgstr "" "Le document s’est terminé de manière inattendue à l’intérieur d’un nom " "d’attribut" -#: glib/gmarkup.c:1848 +#: glib/gmarkup.c:1841 msgid "Document ended unexpectedly inside an element-opening tag." msgstr "" "Le document s’est terminé de manière inattendue à l’intérieur d’une balise " "d’ouverture d’élément." -#: glib/gmarkup.c:1854 +#: glib/gmarkup.c:1847 msgid "" "Document ended unexpectedly after the equals sign following an attribute " "name; no attribute value" @@ -5608,27 +5617,27 @@ "Le document s’est terminé de manière inattendue après le signe égal suivant " "un nom d’attribut ; aucune valeur d’attribut" -#: glib/gmarkup.c:1861 +#: glib/gmarkup.c:1854 msgid "Document ended unexpectedly while inside an attribute value" msgstr "" "Le document s’est terminé de manière inattendue alors qu’il était à " "l’intérieur d’une valeur d’attribut" -#: glib/gmarkup.c:1878 +#: glib/gmarkup.c:1871 #, c-format msgid "Document ended unexpectedly inside the close tag for element “%s”" msgstr "" "Le document s’est terminé de manière inattendue à l’intérieur de la balise " "de fermeture pour l’élément « %s »" -#: glib/gmarkup.c:1882 +#: glib/gmarkup.c:1875 msgid "" "Document ended unexpectedly inside the close tag for an unopened element" msgstr "" "Le document s’est terminé de manière inattendue à l’intérieur de la balise " "de fermeture pour un élément non ouvert" -#: glib/gmarkup.c:1888 +#: glib/gmarkup.c:1881 msgid "Document ended unexpectedly inside a comment or processing instruction" msgstr "" "Le document s’est terminé de manière inattendue à l’intérieur d’un " @@ -5693,190 +5702,190 @@ msgid "Unknown option %s" msgstr "Option inconnue %s" -#: glib/gregex.c:436 +#: glib/gregex.c:479 msgid "corrupted object" msgstr "objet endommagé" -#: glib/gregex.c:438 +#: glib/gregex.c:481 msgid "out of memory" msgstr "mémoire insuffisante" -#: glib/gregex.c:443 +#: glib/gregex.c:487 msgid "backtracking limit reached" msgstr "limite de suivi arrière atteinte" -#: glib/gregex.c:454 glib/gregex.c:707 glib/gregex.c:736 +#: glib/gregex.c:498 msgid "internal error" msgstr "erreur interne" -#: glib/gregex.c:456 +#: glib/gregex.c:500 msgid "the pattern contains items not supported for partial matching" msgstr "" "le motif contient des éléments non pris en charge pour une correspondance " "partielle" -#: glib/gregex.c:458 +#: glib/gregex.c:502 msgid "back references as conditions are not supported for partial matching" msgstr "" "les références inverses utilisées comme conditions ne sont pas prises en " "charge pour une correspondance partielle" -#: glib/gregex.c:464 +#: glib/gregex.c:508 msgid "recursion limit reached" msgstr "limite de récursivité atteinte" -#: glib/gregex.c:466 +#: glib/gregex.c:510 msgid "bad offset" msgstr "mauvais décalage" -#: glib/gregex.c:468 +#: glib/gregex.c:512 msgid "recursion loop" msgstr "boucle récursive" #. should not happen in GRegex since we check modes before each match -#: glib/gregex.c:471 +#: glib/gregex.c:515 msgid "matching mode is requested that was not compiled for JIT" msgstr "le mode de correspondance demandé n’a pas été compilé pour JIT" -#: glib/gregex.c:475 +#: glib/gregex.c:536 glib/gregex.c:1838 msgid "unknown error" msgstr "erreur inconnue" -#: glib/gregex.c:496 +#: glib/gregex.c:557 msgid "\\ at end of pattern" msgstr "\\ à la fin du motif" -#: glib/gregex.c:500 +#: glib/gregex.c:561 msgid "\\c at end of pattern" msgstr "\\c à la fin du motif" -#: glib/gregex.c:505 +#: glib/gregex.c:566 msgid "unrecognized character following \\" msgstr "un caractère non reconnu suit \\" -#: glib/gregex.c:509 +#: glib/gregex.c:570 msgid "numbers out of order in {} quantifier" msgstr "nombres en désordre dans le quantificateur {}" -#: glib/gregex.c:513 +#: glib/gregex.c:574 msgid "number too big in {} quantifier" msgstr "nombre trop grand dans le quantificateur {}" -#: glib/gregex.c:517 +#: glib/gregex.c:578 msgid "missing terminating for character class" msgstr "caractère terminaison manquant pour la classe de caractère" -#: glib/gregex.c:521 +#: glib/gregex.c:582 msgid "invalid escape sequence in character class" msgstr "séquence d’échappement non valide dans la classe de caractère" -#: glib/gregex.c:525 +#: glib/gregex.c:586 msgid "range out of order in character class" msgstr "plage déclassée dans la classe de caractère" -#: glib/gregex.c:530 +#: glib/gregex.c:591 msgid "nothing to repeat" msgstr "rien à répéter" -#: glib/gregex.c:534 +#: glib/gregex.c:595 msgid "unrecognized character after (? or (?-" msgstr "caractère non reconnu après (? ou (?-" -#: glib/gregex.c:538 +#: glib/gregex.c:599 msgid "POSIX named classes are supported only within a class" msgstr "" "Les classes nommées selon la norme POSIX sont uniquement prises en charge " "dans une classe" -#: glib/gregex.c:542 +#: glib/gregex.c:603 msgid "POSIX collating elements are not supported" msgstr "les éléments d’interclassement POSIX ne sont pas pris en charge" -#: glib/gregex.c:548 +#: glib/gregex.c:609 msgid "missing terminating )" msgstr ") de terminaison manquante" -#: glib/gregex.c:552 +#: glib/gregex.c:613 msgid "reference to non-existent subpattern" msgstr "référence à un sous-motif inexistant" -#: glib/gregex.c:556 +#: glib/gregex.c:617 msgid "missing ) after comment" msgstr "« ) » manquante après un commentaire" -#: glib/gregex.c:560 +#: glib/gregex.c:621 msgid "regular expression is too large" msgstr "l’expression régulière est trop grande" -#: glib/gregex.c:564 +#: glib/gregex.c:625 msgid "malformed number or name after (?(" msgstr "nom ou nombre non conforme après (?(" -#: glib/gregex.c:568 +#: glib/gregex.c:629 msgid "lookbehind assertion is not fixed length" msgstr "l’assertion « lookbehind » n’a pas de longueur fixe" -#: glib/gregex.c:572 +#: glib/gregex.c:633 msgid "conditional group contains more than two branches" msgstr "un groupe conditionnel contient plus de deux branches" -#: glib/gregex.c:576 +#: glib/gregex.c:637 msgid "assertion expected after (?(" msgstr "une assertion est attendue après (?(" -#: glib/gregex.c:580 +#: glib/gregex.c:641 msgid "a numbered reference must not be zero" msgstr "une référence numérotée ne doit pas être zéro" -#: glib/gregex.c:584 +#: glib/gregex.c:645 msgid "unknown POSIX class name" msgstr "nom de classe POSIX inconnu" -#: glib/gregex.c:589 +#: glib/gregex.c:650 msgid "character value in \\x{...} sequence is too large" msgstr "la valeur du caractère dans la séquence \\x{…} est trop grande" -#: glib/gregex.c:593 +#: glib/gregex.c:654 msgid "\\C not allowed in lookbehind assertion" msgstr "\\C n’est pas autorisé dans l’assertion « lookbehind »" -#: glib/gregex.c:597 +#: glib/gregex.c:658 msgid "missing terminator in subpattern name" msgstr "terminaison manquante dans le nom du sous-motif" -#: glib/gregex.c:601 +#: glib/gregex.c:662 msgid "two named subpatterns have the same name" msgstr "deux sous-motifs nommés possèdent le même nom" -#: glib/gregex.c:605 +#: glib/gregex.c:666 msgid "malformed \\P or \\p sequence" msgstr "séquence \\P ou \\p mal formée" -#: glib/gregex.c:609 +#: glib/gregex.c:670 msgid "unknown property name after \\P or \\p" msgstr "nom de propriété inconnu après \\P ou \\p" -#: glib/gregex.c:613 +#: glib/gregex.c:674 msgid "subpattern name is too long (maximum 32 characters)" msgstr "le nom du sous-motif est trop long (32 caractères maximum)" -#: glib/gregex.c:617 +#: glib/gregex.c:678 msgid "too many named subpatterns (maximum 10,000)" msgstr "trop de sous-motifs nommés (10 000 maximum)" -#: glib/gregex.c:621 +#: glib/gregex.c:682 msgid "octal value is greater than \\377" msgstr "la valeur octale est plus grande que \\377" -#: glib/gregex.c:625 +#: glib/gregex.c:686 msgid "DEFINE group contains more than one branch" msgstr "le groupe DEFINE contient plus d’une branche" -#: glib/gregex.c:629 +#: glib/gregex.c:690 msgid "inconsistent NEWLINE options" msgstr "options NEWLINE inconsistantes" -#: glib/gregex.c:633 +#: glib/gregex.c:694 msgid "" "\\g is not followed by a braced, angle-bracketed, or quoted name or number, " "or by a plain number" @@ -5884,121 +5893,121 @@ "\\g n’est pas suivi d’un nom ou nombre entre accolades, chevrons, guillemets " "simples ou d’un nombre simple" -#: glib/gregex.c:638 +#: glib/gregex.c:699 msgid "an argument is not allowed for (*ACCEPT), (*FAIL), or (*COMMIT)" msgstr "un paramètre n’est pas permis pour (*ACCEPT), (*FAIL) ou (*COMMIT)" -#: glib/gregex.c:642 +#: glib/gregex.c:703 msgid "(*VERB) not recognized" msgstr "(*VERB) non reconnu" -#: glib/gregex.c:646 +#: glib/gregex.c:707 msgid "number is too big" msgstr "le nombre est trop grand" -#: glib/gregex.c:650 +#: glib/gregex.c:711 msgid "missing subpattern name after (?&" msgstr "nom de sous-motif manquant après (?&" -#: glib/gregex.c:654 +#: glib/gregex.c:715 msgid "different names for subpatterns of the same number are not allowed" msgstr "" "il n’est pas permis d’avoir des noms différents pour des sous-motifs du même " "nombre" -#: glib/gregex.c:658 +#: glib/gregex.c:719 msgid "(*MARK) must have an argument" msgstr "(*MARK) doit avoir un paramètre" -#: glib/gregex.c:662 +#: glib/gregex.c:723 msgid "\\c must be followed by an ASCII character" msgstr "\\c doit être suivi d’un caractère ASCII" -#: glib/gregex.c:666 +#: glib/gregex.c:727 msgid "\\k is not followed by a braced, angle-bracketed, or quoted name" msgstr "" "\\k n’est pas suivi d’un nom entre accolades, chevrons ou guillemets simples" -#: glib/gregex.c:670 +#: glib/gregex.c:731 msgid "\\N is not supported in a class" msgstr "\\N n’est pas pris en charge dans une classe" -#: glib/gregex.c:674 +#: glib/gregex.c:735 msgid "name is too long in (*MARK), (*PRUNE), (*SKIP), or (*THEN)" msgstr "le nom est trop long dans (*MARK), (*PRUNE), (*SKIP) ou (*THEN)" -#: glib/gregex.c:678 glib/gregex.c:809 +#: glib/gregex.c:739 glib/gregex.c:875 msgid "code overflow" msgstr "dépassement de code" -#: glib/gregex.c:682 +#: glib/gregex.c:743 msgid "unrecognized character after (?P" msgstr "caractère non reconnu après (?P" -#: glib/gregex.c:686 +#: glib/gregex.c:747 msgid "overran compiling workspace" msgstr "dépassement de capacité en compilant l’espace de travail" -#: glib/gregex.c:690 +#: glib/gregex.c:751 msgid "previously-checked referenced subpattern not found" msgstr "un sous-motif référencé et précédemment vérifié n’a pas été trouvé" -#: glib/gregex.c:808 glib/gregex.c:1041 glib/gregex.c:2342 +#: glib/gregex.c:874 glib/gregex.c:1121 glib/gregex.c:2444 #, c-format msgid "Error while matching regular expression %s: %s" msgstr "Erreur lors de la correspondance de l’expression régulière %s : %s" -#: glib/gregex.c:1618 +#: glib/gregex.c:1721 msgid "PCRE library is compiled without UTF8 support" msgstr "La bibliothèque PCRE est compilée sans la prise en charge UTF-8" -#: glib/gregex.c:1626 +#: glib/gregex.c:1729 msgid "PCRE library is compiled with incompatible options" msgstr "La bibliothèque PCRE est compilée avec des options incompatibles" -#: glib/gregex.c:1751 +#: glib/gregex.c:1847 #, c-format msgid "Error while compiling regular expression ‘%s’ at char %s: %s" msgstr "" "Erreur à la compilation de l’expression régulière « %s » au caractère %s : %s" -#: glib/gregex.c:2786 +#: glib/gregex.c:2887 msgid "hexadecimal digit or “}” expected" msgstr "chiffre hexadécimal ou « } » attendu" -#: glib/gregex.c:2802 +#: glib/gregex.c:2903 msgid "hexadecimal digit expected" msgstr "chiffre hexadécimal attendu" -#: glib/gregex.c:2842 +#: glib/gregex.c:2943 msgid "missing “<” in symbolic reference" msgstr "« < » manquant dans la référence symbolique" -#: glib/gregex.c:2851 +#: glib/gregex.c:2952 msgid "unfinished symbolic reference" msgstr "référence symbolique non terminée" -#: glib/gregex.c:2858 +#: glib/gregex.c:2959 msgid "zero-length symbolic reference" msgstr "référence symbolique de longueur nulle" -#: glib/gregex.c:2869 +#: glib/gregex.c:2970 msgid "digit expected" msgstr "chiffre attendu" -#: glib/gregex.c:2887 +#: glib/gregex.c:2988 msgid "illegal symbolic reference" msgstr "référence symbolique illégale" -#: glib/gregex.c:2950 +#: glib/gregex.c:3051 msgid "stray final “\\”" msgstr "terminaison parasite « \\ »" -#: glib/gregex.c:2954 +#: glib/gregex.c:3055 msgid "unknown escape sequence" msgstr "séquence d’échappement inconnue" -#: glib/gregex.c:2964 +#: glib/gregex.c:3065 #, c-format msgid "Error while parsing replacement text “%s” at char %lu: %s" msgstr "" @@ -6033,102 +6042,107 @@ msgid "Text was empty (or contained only whitespace)" msgstr "Le texte était vide (ou ne contenait que des espaces)" -#: glib/gspawn.c:314 +#: glib/gspawn.c:319 #, c-format msgid "Failed to read data from child process (%s)" msgstr "La lecture des données depuis le processus fils a échoué (%s)" -#: glib/gspawn.c:466 +#: glib/gspawn.c:471 #, c-format msgid "Unexpected error in reading data from a child process (%s)" msgstr "" "Erreur inattendue lors de la lecture de données depuis un processus fils (%s)" -#: glib/gspawn.c:551 +#: glib/gspawn.c:556 #, c-format msgid "Unexpected error in waitpid() (%s)" msgstr "Erreur inattendue dans waitpid() (%s)" -#: glib/gspawn.c:1170 glib/gspawn-win32.c:1488 +#: glib/gspawn.c:1175 glib/gspawn-win32.c:1503 #, c-format msgid "Child process exited with code %ld" msgstr "Le processus fils s’est terminé avec le code %ld" -#: glib/gspawn.c:1178 +#: glib/gspawn.c:1183 #, c-format msgid "Child process killed by signal %ld" msgstr "Le processus fils a été tué par le signal %ld" -#: glib/gspawn.c:1185 +#: glib/gspawn.c:1190 #, c-format msgid "Child process stopped by signal %ld" msgstr "Le processus fils a été arrêté par le signal %ld" -#: glib/gspawn.c:1192 +#: glib/gspawn.c:1197 #, c-format msgid "Child process exited abnormally" msgstr "Le processus fils s’est terminé anormalement" -#: glib/gspawn.c:1885 glib/gspawn-win32.c:393 glib/gspawn-win32.c:401 +#: glib/gspawn.c:2027 glib/gspawn-win32.c:393 glib/gspawn-win32.c:401 #, c-format msgid "Failed to read from child pipe (%s)" msgstr "La lecture depuis un tube fils a échoué (%s)" -#: glib/gspawn.c:2248 +#: glib/gspawn.c:2399 #, c-format msgid "Failed to spawn child process “%s” (%s)" msgstr "L’exécution du processus fils « %s » a échoué (%s)" -#: glib/gspawn.c:2365 +#: glib/gspawn.c:2525 #, c-format msgid "Failed to fork (%s)" msgstr "Le clonage a échoué (%s)" -#: glib/gspawn.c:2525 glib/gspawn-win32.c:424 +#: glib/gspawn.c:2685 glib/gspawn-win32.c:424 #, c-format msgid "Failed to change to directory “%s” (%s)" msgstr "Le changement de répertoire « %s » a échoué (%s)" -#: glib/gspawn.c:2535 +#: glib/gspawn.c:2695 #, c-format msgid "Failed to execute child process “%s” (%s)" msgstr "L’exécution du processus fils « %s » a échoué (%s)" -#: glib/gspawn.c:2545 +#: glib/gspawn.c:2705 #, c-format msgid "Failed to open file to remap file descriptor (%s)" msgstr "" "L’ouverture du fichier pour réallouer le descripteur de fichier a échoué (%s)" -#: glib/gspawn.c:2553 +#: glib/gspawn.c:2713 #, c-format msgid "Failed to duplicate file descriptor for child process (%s)" msgstr "" "La duplication du descripteur de fichier pour le processus fils a échoué (%s)" -#: glib/gspawn.c:2562 +#: glib/gspawn.c:2722 #, c-format msgid "Failed to fork child process (%s)" msgstr "Le clonage du processus fils a échoué (%s)" -#: glib/gspawn.c:2570 +#: glib/gspawn.c:2730 #, c-format msgid "Failed to close file descriptor for child process (%s)" msgstr "" "La fermeture du descripteur de fichier pour le processus fils a échoué (%s)" -#: glib/gspawn.c:2578 +#: glib/gspawn.c:2738 #, c-format msgid "Unknown error executing child process “%s”" msgstr "Erreur inconnue à l’exécution du processus fils « %s »" -#: glib/gspawn.c:2602 +#: glib/gspawn.c:2762 #, c-format msgid "Failed to read enough data from child pid pipe (%s)" msgstr "" "Impossible de lire suffisamment de données depuis le tube du processus fils " "de pid (%s)" +#: glib/gspawn-private.h:134 +#, c-format +msgid "Invalid source FDs argument" +msgstr "Argument de descripteurs de fichiers source non valide" + #: glib/gspawn-win32.c:337 msgid "Failed to read data from child process" msgstr "La lecture des données depuis le processus fils a échoué" @@ -6148,27 +6162,27 @@ msgid "Invalid program name: %s" msgstr "Nom de programme non valide : %s" -#: glib/gspawn-win32.c:521 glib/gspawn-win32.c:853 +#: glib/gspawn-win32.c:521 glib/gspawn-win32.c:868 #, c-format msgid "Invalid string in argument vector at %d: %s" msgstr "Chaîne non valide dans le vecteur de paramètre à %d : %s" -#: glib/gspawn-win32.c:532 glib/gspawn-win32.c:869 +#: glib/gspawn-win32.c:532 glib/gspawn-win32.c:884 #, c-format msgid "Invalid string in environment: %s" msgstr "Chaîne non valide dans l’environnement : %s" -#: glib/gspawn-win32.c:849 +#: glib/gspawn-win32.c:864 #, c-format msgid "Invalid working directory: %s" msgstr "Répertoire de travail non valide : %s" -#: glib/gspawn-win32.c:914 +#: glib/gspawn-win32.c:929 #, c-format msgid "Failed to execute helper program (%s)" msgstr "L’exécution du programme d’aide a échoué (%s)" -#: glib/gspawn-win32.c:1143 +#: glib/gspawn-win32.c:1158 msgid "" "Unexpected error in g_io_channel_win32_poll() reading data from a child " "process" @@ -6176,21 +6190,21 @@ "Erreur inattendue dans g_io_channel_win32_poll() lors de la lecture des " "données depuis un processus fils" -#: glib/gstrfuncs.c:3372 glib/gstrfuncs.c:3474 +#: glib/gstrfuncs.c:3370 glib/gstrfuncs.c:3472 msgid "Empty string is not a number" msgstr "Une chaîne vide n’est pas un nombre" -#: glib/gstrfuncs.c:3396 +#: glib/gstrfuncs.c:3394 #, c-format msgid "“%s” is not a signed number" msgstr "« %s » n’est pas un nom valide" -#: glib/gstrfuncs.c:3406 glib/gstrfuncs.c:3510 +#: glib/gstrfuncs.c:3404 glib/gstrfuncs.c:3508 #, c-format msgid "Number “%s” is out of bounds %s, %s" msgstr "Le nombre « %s » est hors limites %s, %s" -#: glib/gstrfuncs.c:3500 +#: glib/gstrfuncs.c:3498 #, c-format msgid "“%s” is not an unsigned number" msgstr "« %s » n’est pas un nombre non signé" @@ -6269,132 +6283,132 @@ msgstr "Caractère hors plage pour UTF-16" #. Translators: A unit symbol for size formatting, showing for example: "13.0 kB" -#: glib/gutils.c:2857 +#: glib/gutils.c:2966 msgid "kB" msgstr "Ko" #. Translators: A unit symbol for size formatting, showing for example: "13.0 MB" -#: glib/gutils.c:2859 +#: glib/gutils.c:2968 msgid "MB" msgstr "Mo" #. Translators: A unit symbol for size formatting, showing for example: "13.0 GB" -#: glib/gutils.c:2861 +#: glib/gutils.c:2970 msgid "GB" msgstr "Go" #. Translators: A unit symbol for size formatting, showing for example: "13.0 TB" -#: glib/gutils.c:2863 +#: glib/gutils.c:2972 msgid "TB" msgstr "To" #. Translators: A unit symbol for size formatting, showing for example: "13.0 PB" -#: glib/gutils.c:2865 +#: glib/gutils.c:2974 msgid "PB" msgstr "Po" #. Translators: A unit symbol for size formatting, showing for example: "13.0 EB" -#: glib/gutils.c:2867 +#: glib/gutils.c:2976 msgid "EB" msgstr "Eo" #. Translators: A unit symbol for size formatting, showing for example: "13.0 KiB" -#: glib/gutils.c:2871 +#: glib/gutils.c:2980 msgid "KiB" msgstr "Kio" #. Translators: A unit symbol for size formatting, showing for example: "13.0 MiB" -#: glib/gutils.c:2873 +#: glib/gutils.c:2982 msgid "MiB" msgstr "Mio" #. Translators: A unit symbol for size formatting, showing for example: "13.0 GiB" -#: glib/gutils.c:2875 +#: glib/gutils.c:2984 msgid "GiB" msgstr "Gio" #. Translators: A unit symbol for size formatting, showing for example: "13.0 TiB" -#: glib/gutils.c:2877 +#: glib/gutils.c:2986 msgid "TiB" msgstr "Tio" #. Translators: A unit symbol for size formatting, showing for example: "13.0 PiB" -#: glib/gutils.c:2879 +#: glib/gutils.c:2988 msgid "PiB" msgstr "Pio" #. Translators: A unit symbol for size formatting, showing for example: "13.0 EiB" -#: glib/gutils.c:2881 +#: glib/gutils.c:2990 msgid "EiB" msgstr "Eio" #. Translators: A unit symbol for size formatting, showing for example: "13.0 kb" -#: glib/gutils.c:2885 +#: glib/gutils.c:2994 msgid "kb" msgstr "kb" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Mb" -#: glib/gutils.c:2887 +#: glib/gutils.c:2996 msgid "Mb" msgstr "Mb" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Gb" -#: glib/gutils.c:2889 +#: glib/gutils.c:2998 msgid "Gb" msgstr "Gb" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Tb" -#: glib/gutils.c:2891 +#: glib/gutils.c:3000 msgid "Tb" msgstr "Tb" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Pb" -#: glib/gutils.c:2893 +#: glib/gutils.c:3002 msgid "Pb" msgstr "Pb" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Eb" -#: glib/gutils.c:2895 +#: glib/gutils.c:3004 msgid "Eb" msgstr "Eb" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Kib" -#: glib/gutils.c:2899 +#: glib/gutils.c:3008 msgid "Kib" msgstr "Kib" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Mib" -#: glib/gutils.c:2901 +#: glib/gutils.c:3010 msgid "Mib" msgstr "Mib" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Gib" -#: glib/gutils.c:2903 +#: glib/gutils.c:3012 msgid "Gib" msgstr "Gib" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Tib" -#: glib/gutils.c:2905 +#: glib/gutils.c:3014 msgid "Tib" msgstr "Tib" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Pib" -#: glib/gutils.c:2907 +#: glib/gutils.c:3016 msgid "Pib" msgstr "Pib" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Eib" -#: glib/gutils.c:2909 +#: glib/gutils.c:3018 msgid "Eib" msgstr "Eib" -#: glib/gutils.c:2947 +#: glib/gutils.c:3056 msgid "byte" msgid_plural "bytes" msgstr0 "octet" msgstr1 "octets" -#: glib/gutils.c:2951 +#: glib/gutils.c:3060 msgid "bit" msgid_plural "bits" msgstr0 "bit" @@ -6402,7 +6416,7 @@ #. Translators: The "%u" is replaced with the size value, like "13"; it could #. * be part of "13 bytes", but only the number is requested this time. -#: glib/gutils.c:2959 +#: glib/gutils.c:3068 #, c-format msgctxt "format-size" msgid "%u" @@ -6410,7 +6424,7 @@ #. Translators: The first "%u" is replaced with the value, the "%s" with a unit of the value. #. * The order can be changed with "%$2s %$1u". An example: "13 bytes" -#: glib/gutils.c:2964 +#: glib/gutils.c:3073 #, c-format msgctxt "format-size" msgid "%u %s" @@ -6418,7 +6432,7 @@ #. Translators: The "%.1f" is replaced with the size value, like "13.0"; it could #. * be part of "13.0 MB", but only the number is requested this time. -#: glib/gutils.c:3000 +#: glib/gutils.c:3109 #, c-format msgctxt "format-size" msgid "%.1f" @@ -6427,14 +6441,14 @@ #. Translators: The first "%.1f" is replaced with the value, the "%s" with a unit of the value. #. * The order can be changed with "%$2s %$1.1f". Keep the no-break space between the value and #. * the unit symbol. An example: "13.0 MB" -#: glib/gutils.c:3006 +#: glib/gutils.c:3115 #, c-format msgctxt "format-size" msgid "%.1f %s" msgstr "%.1f %s" #. Translators: the %s in "%s bytes" will always be replaced by a number. -#: glib/gutils.c:3046 +#: glib/gutils.c:3155 #, c-format msgid "%s byte" msgid_plural "%s bytes" @@ -6442,14 +6456,14 @@ msgstr1 "%s octets" #. Translators: the %s in "%s bits" will always be replaced by a number. -#: glib/gutils.c:3051 +#: glib/gutils.c:3160 #, c-format msgid "%s bit" msgid_plural "%s bits" msgstr0 "%s bit" msgstr1 "%s bits" -#: glib/gutils.c:3092 +#: glib/gutils.c:3201 #, c-format msgid "%u byte" msgid_plural "%u bytes" @@ -6461,32 +6475,32 @@ #. * compatibility. Users will not see this string unless a program is using this deprecated function. #. * Please translate as literally as possible. #. -#: glib/gutils.c:3105 +#: glib/gutils.c:3214 #, c-format msgid "%.1f KB" msgstr "%.1f Ko" -#: glib/gutils.c:3110 +#: glib/gutils.c:3219 #, c-format msgid "%.1f MB" msgstr "%.1f Mo" -#: glib/gutils.c:3115 +#: glib/gutils.c:3224 #, c-format msgid "%.1f GB" msgstr "%.1f Go" -#: glib/gutils.c:3120 +#: glib/gutils.c:3229 #, c-format msgid "%.1f TB" msgstr "%.1f To" -#: glib/gutils.c:3125 +#: glib/gutils.c:3234 #, c-format msgid "%.1f PB" msgstr "%.1f Po" -#: glib/gutils.c:3130 +#: glib/gutils.c:3239 #, c-format msgid "%.1f EB" msgstr "%.1f Eo"
View file
_service:tar_scm:glib-2.74.4.tar.xz/po/gl.po -> _service:tar_scm:glib-2.76.4.tar.xz/po/gl.po
Changed
@@ -18,16 +18,16 @@ msgstr "" "Project-Id-Version: glib.master\n" "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/glib/issues\n" -"POT-Creation-Date: 2022-08-15 20:23+0000\n" -"PO-Revision-Date: 2022-08-21 17:14+0200\n" +"POT-Creation-Date: 2023-04-14 16:57+0000\n" +"PO-Revision-Date: 2023-04-27 11:06+0200\n" "Last-Translator: Fran Dieguez <frandieguez@gnome.org>\n" "Language-Team: Galician <proxecto@trasno.gal>\n" "Language: gl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" -"X-Generator: Gtranslator 40.0\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Poedit 3.2.2\n" "X-Project-Style: gnome\n" "X-DL-Team: gl\n" "X-DL-Module: glib\n" @@ -35,25 +35,23 @@ "X-DL-Domain: po\n" "X-DL-State: Translating\n" -#: gio/gappinfo.c:335 +#: gio/gappinfo.c:339 msgid "Setting default applications not supported yet" msgstr "Estabelecer as aplicacións predeterminadas non se soporta aínda" -#: gio/gappinfo.c:368 +#: gio/gappinfo.c:372 msgid "Setting application as last used for type not supported yet" msgstr "" "Establecer aplicación como última usada para o tipo non se soporta aínda" -#: gio/gappinfo.c:808 +#: gio/gappinfo.c:814 #, c-format -#| msgid "No default applications for “%s”\n" msgid "Failed to find default application for content type ‘%s’" msgstr "" "Non se atopou ningunha aplicación predeterminado para o tipo de contido «%s»" -#: gio/gappinfo.c:868 +#: gio/gappinfo.c:874 #, c-format -#| msgid "No default applications for “%s”\n" msgid "Failed to find default application for URI Scheme ‘%s’" msgstr "" "Produciuse un fallo ao buscar a aplicación predeterminada para o esquema de " @@ -256,11 +254,11 @@ msgid "error sending %s message to application: %s\n" msgstr "produciuse un erro ao enviar a mensaxe %s á aplicación: %s\n" -#: gio/gapplication-tool.c:321 +#: gio/gapplication-tool.c:324 msgid "action name must be given after application id\n" msgstr "o nome da acción debe fornecerse logo do id de aplicación\n" -#: gio/gapplication-tool.c:329 +#: gio/gapplication-tool.c:332 #, c-format msgid "" "invalid action name: “%s”\n" @@ -269,25 +267,25 @@ "nome da acción non válido: «%s»\n" "os nomes de acción deben consistir só de alfanuméricos, «-» e «.»\n" -#: gio/gapplication-tool.c:348 +#: gio/gapplication-tool.c:351 #, c-format msgid "error parsing action parameter: %s\n" msgstr "produciuse un erro ao analizar o parámetro da acción: %s\n" -#: gio/gapplication-tool.c:360 +#: gio/gapplication-tool.c:363 msgid "actions accept a maximum of one parameter\n" msgstr "as accións aceptan un máximo dun parámetro\n" -#: gio/gapplication-tool.c:415 +#: gio/gapplication-tool.c:418 msgid "list-actions command takes only the application id" msgstr "a orde list-actions recolle só o id de aplicación" -#: gio/gapplication-tool.c:425 +#: gio/gapplication-tool.c:428 #, c-format msgid "unable to find desktop file for application %s\n" msgstr "non é posíbel atopar o ficheiro desktop para a aplicación %s\n" -#: gio/gapplication-tool.c:470 +#: gio/gapplication-tool.c:473 #, c-format msgid "" "unrecognised command: %s\n" @@ -299,7 +297,7 @@ #: gio/gbufferedinputstream.c:422 gio/gbufferedinputstream.c:500 #: gio/ginputstream.c:181 gio/ginputstream.c:381 gio/ginputstream.c:650 #: gio/ginputstream.c:1052 gio/goutputstream.c:225 gio/goutputstream.c:1051 -#: gio/gpollableinputstream.c:207 gio/gpollableoutputstream.c:279 +#: gio/gpollableinputstream.c:221 gio/gpollableoutputstream.c:293 #, c-format msgid "Too large count value passed to %s" msgstr "O valor de conta pasado a %s é demasiado longo" @@ -322,7 +320,7 @@ msgid "Truncate not supported on base stream" msgstr "Non se permite truncar no fluxo base" -#: gio/gcancellable.c:319 gio/gdbusconnection.c:1859 gio/gdbusprivate.c:1420 +#: gio/gcancellable.c:326 gio/gdbusconnection.c:1865 gio/gdbusprivate.c:1420 #: gio/gsimpleasyncresult.c:873 gio/gsimpleasyncresult.c:899 #, c-format msgid "Operation was cancelled" @@ -342,13 +340,13 @@ #: gio/gcharsetconverter.c:344 gio/gdatainputstream.c:850 #: gio/gdatainputstream.c:1268 glib/gconvert.c:451 glib/gconvert.c:883 -#: glib/giochannel.c:1576 glib/giochannel.c:1618 glib/giochannel.c:2473 +#: glib/giochannel.c:1576 glib/giochannel.c:1618 glib/giochannel.c:2478 #: glib/gutf8.c:892 glib/gutf8.c:1346 msgid "Invalid byte sequence in conversion input" msgstr "A secuencia de bytes non é válida na entrada da conversión" #: gio/gcharsetconverter.c:349 glib/gconvert.c:459 glib/gconvert.c:797 -#: glib/giochannel.c:1583 glib/giochannel.c:2485 +#: glib/giochannel.c:1583 glib/giochannel.c:2493 #, c-format msgid "Error during conversion: %s" msgstr "Produciuse un erro durante a conversión: %s" @@ -405,17 +403,17 @@ msgid "Unexpected early end-of-stream" msgstr "Final de fluxo inesperadamente prematuro" -#: gio/gdbusaddress.c:164 gio/gdbusaddress.c:238 gio/gdbusaddress.c:327 +#: gio/gdbusaddress.c:168 gio/gdbusaddress.c:240 gio/gdbusaddress.c:327 #, c-format msgid "Unsupported key “%s” in address entry “%s”" msgstr "Clave «%s» non admitida na entrada do enderezo «%s»" -#: gio/gdbusaddress.c:177 +#: gio/gdbusaddress.c:181 #, c-format msgid "Meaningless key/value pair combination in address entry “%s”" msgstr "Combinación de par clave/valor sen sentido na entrada do enderezo «%s»" -#: gio/gdbusaddress.c:186 +#: gio/gdbusaddress.c:190 #, c-format msgid "" "Address “%s” is invalid (need exactly one of path, dir, tmpdir, or abstract " @@ -424,7 +422,7 @@ "O enderezo «%s» non é válido (necesítase exactamente unha ruta, directorio, " "directorio temporal ou claves abstractas)" -#: gio/gdbusaddress.c:253 gio/gdbusaddress.c:264 gio/gdbusaddress.c:279 +#: gio/gdbusaddress.c:255 gio/gdbusaddress.c:266 gio/gdbusaddress.c:281 #: gio/gdbusaddress.c:342 gio/gdbusaddress.c:353 #, c-format msgid "Error in address “%s” — the “%s” attribute is malformed" @@ -559,7 +557,7 @@ "Non é posíbel determinar o enderezo do bus de sesión (non está implementado " "para este SO)" -#: gio/gdbusaddress.c:1375 gio/gdbusconnection.c:7321 +#: gio/gdbusaddress.c:1380 gio/gdbusconnection.c:7324 #, c-format msgid "" "Cannot determine bus address from DBUS_STARTER_BUS_TYPE environment variable " @@ -568,7 +566,7 @@ "Non é posíbel determinar o enderezo do bus desde a variábel de ambiente " "DBUS_STARTER_BUS_TYPE - valor descoñecido «%s»" -#: gio/gdbusaddress.c:1384 gio/gdbusconnection.c:7330 +#: gio/gdbusaddress.c:1389 gio/gdbusconnection.c:7333 msgid "" "Cannot determine bus address because the DBUS_STARTER_BUS_TYPE environment " "variable is not set" @@ -576,7 +574,7 @@ "Non é posíbel determinar o enderezo do bus xa que a variábel de ambiente " "DBUS_STARTER_BUS_TYPE non está estabelecida" -#: gio/gdbusaddress.c:1394 +#: gio/gdbusaddress.c:1399 #, c-format msgid "Unknown bus type %d" msgstr "Tipo de bus %d descoñecido" @@ -597,20 +595,24 @@ "Esgotáronse todos os mecanismos de autenticación dispoñíbel (tentáronse: %s) " "(dispoñíbeis: %s)" -#: gio/gdbusauth.c:1178 +#: gio/gdbusauth.c:1045 +msgid "Unexpected lack of content trying to read a byte" +msgstr "Falta de contido inesperada ao tentar ler un byte" + +#: gio/gdbusauth.c:1195 msgid "User IDs must be the same for peer and server" msgstr "Os IDs de usuario deben ser os mesmos para o par e o servidor" -#: gio/gdbusauth.c:1190 +#: gio/gdbusauth.c:1207 msgid "Cancelled via GDBusAuthObserver::authorize-authenticated-peer" msgstr "Cancelando mediante GDBusAuthObserver::authorize-authenticated-peer" -#: gio/gdbusauthmechanismsha1.c:303 +#: gio/gdbusauthmechanismsha1.c:307 #, c-format msgid "Error when getting information for directory “%s”: %s" msgstr "Produciuse un erro ao obter a información do directorio «%s»: %s" -#: gio/gdbusauthmechanismsha1.c:318 +#: gio/gdbusauthmechanismsha1.c:322 #, c-format msgid "" "Permissions on directory “%s” are malformed. Expected mode 0700, got 0%o" @@ -618,32 +620,32 @@ "Os permisos no directorio «%s» están malformados. Esperábase o modo 0700 e " "obtívose 0%o" -#: gio/gdbusauthmechanismsha1.c:351 gio/gdbusauthmechanismsha1.c:362 +#: gio/gdbusauthmechanismsha1.c:355 gio/gdbusauthmechanismsha1.c:366 #, c-format msgid "Error creating directory “%s”: %s" msgstr "Produciuse un erro ao crear o directorio %s: %s" -#: gio/gdbusauthmechanismsha1.c:364 gio/gfile.c:1095 gio/gfile.c:1333 +#: gio/gdbusauthmechanismsha1.c:368 gio/gfile.c:1095 gio/gfile.c:1333 #: gio/gfile.c:1471 gio/gfile.c:1709 gio/gfile.c:1764 gio/gfile.c:1822 #: gio/gfile.c:1906 gio/gfile.c:1963 gio/gfile.c:2027 gio/gfile.c:2082 -#: gio/gfile.c:3787 gio/gfile.c:3927 gio/gfile.c:4339 gio/gfile.c:4809 -#: gio/gfile.c:5220 gio/gfile.c:5305 gio/gfile.c:5395 gio/gfile.c:5492 -#: gio/gfile.c:5579 gio/gfile.c:5680 gio/gfile.c:8809 gio/gfile.c:8899 -#: gio/gfile.c:8983 gio/win32/gwinhttpfile.c:453 +#: gio/gfile.c:3797 gio/gfile.c:3937 gio/gfile.c:4349 gio/gfile.c:4819 +#: gio/gfile.c:5230 gio/gfile.c:5315 gio/gfile.c:5405 gio/gfile.c:5502 +#: gio/gfile.c:5589 gio/gfile.c:5690 gio/gfile.c:8819 gio/gfile.c:8909 +#: gio/gfile.c:8993 gio/win32/gwinhttpfile.c:453 msgid "Operation not supported" msgstr "Operación non permitida" -#: gio/gdbusauthmechanismsha1.c:407 +#: gio/gdbusauthmechanismsha1.c:411 #, c-format msgid "Error opening keyring “%s” for reading: " msgstr "Produciuse un erro ao abrir o anel de chaves «%s» para a súa lectura: " -#: gio/gdbusauthmechanismsha1.c:430 gio/gdbusauthmechanismsha1.c:771 +#: gio/gdbusauthmechanismsha1.c:434 gio/gdbusauthmechanismsha1.c:775 #, c-format msgid "Line %d of the keyring at “%s” with content “%s” is malformed" msgstr "A liña %d do anel de chaves en «%s» con contido «%s» está malformada" -#: gio/gdbusauthmechanismsha1.c:444 gio/gdbusauthmechanismsha1.c:785 +#: gio/gdbusauthmechanismsha1.c:448 gio/gdbusauthmechanismsha1.c:789 #, c-format msgid "" "First token of line %d of the keyring at “%s” with content “%s” is malformed" @@ -651,7 +653,7 @@ "O primeiro token da liña %d no anel de chaves en «%s» co contido «%s» está " "malformado" -#: gio/gdbusauthmechanismsha1.c:458 gio/gdbusauthmechanismsha1.c:799 +#: gio/gdbusauthmechanismsha1.c:462 gio/gdbusauthmechanismsha1.c:803 #, c-format msgid "" "Second token of line %d of the keyring at “%s” with content “%s” is malformed" @@ -659,56 +661,56 @@ "O segundo token da liña %d no anel de chaves en «%s» co contido «%s» está " "malformado" -#: gio/gdbusauthmechanismsha1.c:482 +#: gio/gdbusauthmechanismsha1.c:486 #, c-format msgid "Didn’t find cookie with id %d in the keyring at “%s”" msgstr "Non foi posíbel atopar a cookie co id %d no anel de chave en «%s»" -#: gio/gdbusauthmechanismsha1.c:539 +#: gio/gdbusauthmechanismsha1.c:543 #, c-format msgid "Error creating lock file “%s”: %s" msgstr "Produciuse un erro ao crear o ficheiro de bloqueo «%s»: %s" -#: gio/gdbusauthmechanismsha1.c:612 +#: gio/gdbusauthmechanismsha1.c:616 #, c-format msgid "Error deleting stale lock file “%s”: %s" msgstr "Produciuse un erro ao eliminar o ficheiro de bloqueo antigo «%s»: %s" -#: gio/gdbusauthmechanismsha1.c:651 +#: gio/gdbusauthmechanismsha1.c:655 #, c-format msgid "Error closing (unlinked) lock file “%s”: %s" msgstr "Produciuse un erro ao pechar o ficheiro de bloqueo «%s»: %s" -#: gio/gdbusauthmechanismsha1.c:662 +#: gio/gdbusauthmechanismsha1.c:666 #, c-format msgid "Error unlinking lock file “%s”: %s" msgstr "Produciuse un erro ao abrir o ficheiro de bloqueo «%s»: %s" -#: gio/gdbusauthmechanismsha1.c:738 +#: gio/gdbusauthmechanismsha1.c:742 #, c-format msgid "Error opening keyring “%s” for writing: " msgstr "Produciuse un erro ao abrir o anel de chaves «%s» para escribir: " -#: gio/gdbusauthmechanismsha1.c:932 +#: gio/gdbusauthmechanismsha1.c:936 #, c-format msgid "(Additionally, releasing the lock for “%s” also failed: %s) " msgstr "(Ademais, a liberación do bloqueo para «%s» tamén fallou: %s) " -#: gio/gdbusconnection.c:590 gio/gdbusconnection.c:2404 +#: gio/gdbusconnection.c:590 gio/gdbusconnection.c:2413 msgid "The connection is closed" msgstr "A conexión está pechado" -#: gio/gdbusconnection.c:1889 +#: gio/gdbusconnection.c:1897 msgid "Timeout was reached" msgstr "Tempo de espera máximo alcanzado" -#: gio/gdbusconnection.c:2527 +#: gio/gdbusconnection.c:2536 msgid "" "Unsupported flags encountered when constructing a client-side connection" msgstr "" "Atopáronse opcións non compatíbeis ao construír a conexión da parte cliente" -#: gio/gdbusconnection.c:4256 gio/gdbusconnection.c:4610 +#: gio/gdbusconnection.c:4265 gio/gdbusconnection.c:4619 #, c-format msgid "" "No such interface “org.freedesktop.DBus.Properties” on object at path %s" @@ -716,105 +718,105 @@ "Non existe a interface «org.freedesktop.DBus.Properties» no obxecto coa ruta " "%s" -#: gio/gdbusconnection.c:4401 +#: gio/gdbusconnection.c:4410 #, c-format msgid "No such property “%s”" msgstr "Non existe a propiedade «%s»" -#: gio/gdbusconnection.c:4413 +#: gio/gdbusconnection.c:4422 #, c-format msgid "Property “%s” is not readable" msgstr "Non é posíbel escribir a propiedade «%s»" -#: gio/gdbusconnection.c:4424 +#: gio/gdbusconnection.c:4433 #, c-format msgid "Property “%s” is not writable" msgstr "Non é posíbel escribir a propiedade «%s»" -#: gio/gdbusconnection.c:4444 +#: gio/gdbusconnection.c:4453 #, c-format msgid "Error setting property “%s”: Expected type “%s” but got “%s”" msgstr "" "Produciuse un erro ao estabelecer a propiedade «%s»: Esperábase o tipo «%s» " "pero obtívose «%s»" -#: gio/gdbusconnection.c:4549 gio/gdbusconnection.c:4764 -#: gio/gdbusconnection.c:6747 +#: gio/gdbusconnection.c:4558 gio/gdbusconnection.c:4773 +#: gio/gdbusconnection.c:6750 #, c-format msgid "No such interface “%s”" msgstr "Non existe a interface «%s»" -#: gio/gdbusconnection.c:4986 gio/gdbusconnection.c:7261 +#: gio/gdbusconnection.c:4989 gio/gdbusconnection.c:7264 #, c-format msgid "No such interface “%s” on object at path %s" msgstr "Non existe a interface «%s» no obxecto coa ruta %s" -#: gio/gdbusconnection.c:5087 +#: gio/gdbusconnection.c:5090 #, c-format msgid "No such method “%s”" msgstr "Non existe a clave «%s»" -#: gio/gdbusconnection.c:5118 +#: gio/gdbusconnection.c:5121 #, c-format msgid "Type of message, “%s”, does not match expected type “%s”" msgstr "O tipo da mensaxe, «%s», non coincide co tipo «%s» esperado" -#: gio/gdbusconnection.c:5321 +#: gio/gdbusconnection.c:5324 #, c-format msgid "An object is already exported for the interface %s at %s" msgstr "Xa hai un obxecto exportado para a interface %s en %s" -#: gio/gdbusconnection.c:5548 +#: gio/gdbusconnection.c:5551 #, c-format msgid "Unable to retrieve property %s.%s" msgstr "Non é posíbel obter a propiedade %s.%s" -#: gio/gdbusconnection.c:5604 +#: gio/gdbusconnection.c:5607 #, c-format msgid "Unable to set property %s.%s" msgstr "Non é posíbel estabelecer a propiedade %s.%s" -#: gio/gdbusconnection.c:5783 +#: gio/gdbusconnection.c:5786 #, c-format msgid "Method “%s” returned type “%s”, but expected “%s”" msgstr "O método «%s» devolveu un tipo «%s» máis esperábase «%s»" -#: gio/gdbusconnection.c:6859 +#: gio/gdbusconnection.c:6862 #, c-format msgid "Method “%s” on interface “%s” with signature “%s” does not exist" msgstr "O método «%s» na interface «%s» coa sinatura «%s» non existe" -#: gio/gdbusconnection.c:6980 +#: gio/gdbusconnection.c:6983 #, c-format msgid "A subtree is already exported for %s" msgstr "Xa se exportou un subárbore para %s" -#: gio/gdbusconnection.c:7269 +#: gio/gdbusconnection.c:7272 #, c-format msgid "Object does not exist at path “%s”" msgstr "O obxecto non existe na ruta «%s»" -#: gio/gdbusmessage.c:1303 +#: gio/gdbusmessage.c:1306 msgid "type is INVALID" msgstr "o tipo é INVALID" -#: gio/gdbusmessage.c:1314 +#: gio/gdbusmessage.c:1317 msgid "METHOD_CALL message: PATH or MEMBER header field is missing" msgstr "Mensaxe METHOD_CALL: falta o campo da cabeceira PATH ou MEMBER" -#: gio/gdbusmessage.c:1325 +#: gio/gdbusmessage.c:1328 msgid "METHOD_RETURN message: REPLY_SERIAL header field is missing" msgstr "Mensaxe METHOD_RETURN: falta o campo da cabeceira REPLY_SERIAL" -#: gio/gdbusmessage.c:1337 +#: gio/gdbusmessage.c:1340 msgid "ERROR message: REPLY_SERIAL or ERROR_NAME header field is missing" msgstr "Mensaxe ERROR: falta o campo da cabeceira REPLY_SERIAL ou ERROR_NAME" -#: gio/gdbusmessage.c:1350 +#: gio/gdbusmessage.c:1353 msgid "SIGNAL message: PATH, INTERFACE or MEMBER header field is missing" msgstr "Mensaxe SIGNAL: falta o campo da cabeceira PATH, INTERFACE ou MEMBER" -#: gio/gdbusmessage.c:1358 +#: gio/gdbusmessage.c:1361 msgid "" "SIGNAL message: The PATH header field is using the reserved value /org/" "freedesktop/DBus/Local" @@ -822,7 +824,7 @@ "Mensaxe SIGNAL: o campo da cabeceira PATH está usando un valor reservado /" "org/freedesktop/DBus/Local" -#: gio/gdbusmessage.c:1366 +#: gio/gdbusmessage.c:1369 msgid "" "SIGNAL message: The INTERFACE header field is using the reserved value org." "freedesktop.DBus.Local" @@ -830,19 +832,19 @@ "Mensaxe SIGNAL: O campo da cabeceira INTERFACE está usando un valor " "reservado org.freedesktop.DBus.Local" -#: gio/gdbusmessage.c:1414 gio/gdbusmessage.c:1474 +#: gio/gdbusmessage.c:1417 gio/gdbusmessage.c:1477 #, c-format msgid "Wanted to read %lu byte but only got %lu" msgid_plural "Wanted to read %lu bytes but only got %lu" msgstr0 "Quíxose ler %lu byte pero obtívose un %lu" msgstr1 "Quixéronse ler %lu bytes pero obtívose un %lu" -#: gio/gdbusmessage.c:1428 +#: gio/gdbusmessage.c:1431 #, c-format msgid "Expected NUL byte after the string “%s” but found byte %d" msgstr "Esperábase un byte NUL despois da cadea «%s» pero atopouse o byte %d" -#: gio/gdbusmessage.c:1447 +#: gio/gdbusmessage.c:1450 #, c-format msgid "" "Expected valid UTF-8 string but found invalid bytes at byte offset %d " @@ -852,21 +854,21 @@ "byte desvío %d (a lonxitude da cadea é %d). A cadea UTF-8 correcta até ese " "punto foi «%s»" -#: gio/gdbusmessage.c:1511 gio/gdbusmessage.c:1787 gio/gdbusmessage.c:1998 +#: gio/gdbusmessage.c:1514 gio/gdbusmessage.c:1790 gio/gdbusmessage.c:2001 msgid "Value nested too deeply" msgstr "Valor aniñado demasiado profundo" -#: gio/gdbusmessage.c:1679 +#: gio/gdbusmessage.c:1682 #, c-format msgid "Parsed value “%s” is not a valid D-Bus object path" msgstr "O valor analizado «%s» non é unha ruta de obxecto D-Bus correcta" -#: gio/gdbusmessage.c:1703 +#: gio/gdbusmessage.c:1706 #, c-format msgid "Parsed value “%s” is not a valid D-Bus signature" msgstr "O valor analizado «%s» non é unha sinatura D-Bus correcta" -#: gio/gdbusmessage.c:1754 +#: gio/gdbusmessage.c:1757 #, c-format msgid "" "Encountered array of length %u byte. Maximum length is 2<<26 bytes (64 MiB)." @@ -879,7 +881,7 @@ "Atopouse unha matriz cunha lonxitude de %u bytes. A lonxitude máxima é 2<<26 " "bytes (64 MiB)." -#: gio/gdbusmessage.c:1774 +#: gio/gdbusmessage.c:1777 #, c-format msgid "" "Encountered array of type “a%c”, expected to have a length a multiple of %u " @@ -888,17 +890,17 @@ "Atopouse unha matriz de tipo «a%c», agardábase ter unha de lonxitude de " "varios %u bytes, aínda que se atopou unha de %u bytes" -#: gio/gdbusmessage.c:1928 gio/gdbusmessage.c:2647 +#: gio/gdbusmessage.c:1931 gio/gdbusmessage.c:2650 msgid "Empty structures (tuples) are not allowed in D-Bus" msgstr "Non se permiten as estruturas baleiras (tuplas) en D-Bus" -#: gio/gdbusmessage.c:1982 +#: gio/gdbusmessage.c:1985 #, c-format msgid "Parsed value “%s” for variant is not a valid D-Bus signature" msgstr "" "O valor «%s» analizado para a variante non é unha sinatura de D-Bus correcta" -#: gio/gdbusmessage.c:2023 +#: gio/gdbusmessage.c:2026 #, c-format msgid "" "Error deserializing GVariant with type string “%s” from the D-Bus wire format" @@ -906,7 +908,7 @@ "Produciuse un erro ao deserializar o GVariant co tipo cadea «%s» desde o " "formato ligado D-Bus" -#: gio/gdbusmessage.c:2208 +#: gio/gdbusmessage.c:2211 #, c-format msgid "" "Invalid endianness value. Expected 0x6c (“l”) or 0x42 (“B”) but found value " @@ -915,30 +917,30 @@ "Valor de «endianness» non válido. Esperábase 0x6c («|») ou 0x42 («B») pero " "atopouse 0x%02x" -#: gio/gdbusmessage.c:2227 +#: gio/gdbusmessage.c:2230 #, c-format msgid "Invalid major protocol version. Expected 1 but found %d" msgstr "" "A versión maior do protocolo non é válida. Esperábase 1 pero atopouse a %d" -#: gio/gdbusmessage.c:2285 gio/gdbusmessage.c:2883 +#: gio/gdbusmessage.c:2288 gio/gdbusmessage.c:2886 msgid "Signature header found but is not of type signature" msgstr "Atopouse a cabeceira da sinatura pero non é do tipo sinatura" -#: gio/gdbusmessage.c:2297 +#: gio/gdbusmessage.c:2300 #, c-format msgid "Signature header with signature “%s” found but message body is empty" msgstr "" "Atopouse a cabeceira de sinatura coa sinatura «%s» máis o corpo da mensaxe " "está baleiro" -#: gio/gdbusmessage.c:2312 +#: gio/gdbusmessage.c:2315 #, c-format msgid "Parsed value “%s” is not a valid D-Bus signature (for body)" msgstr "" "O valor analizado «%s» non é unha sinatura D-Bus correcta (para o corpo)" -#: gio/gdbusmessage.c:2344 +#: gio/gdbusmessage.c:2347 #, 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" @@ -949,11 +951,11 @@ "Non hai unha cabeceira da sinatura na mensaxe pero o corpo da mensaxe ten %u " "bytes" -#: gio/gdbusmessage.c:2354 +#: gio/gdbusmessage.c:2357 msgid "Cannot deserialize message: " msgstr "Non foi posíbel deserializar a mensaxe: " -#: gio/gdbusmessage.c:2700 +#: gio/gdbusmessage.c:2703 #, c-format msgid "" "Error serializing GVariant with type string “%s” to the D-Bus wire format" @@ -961,7 +963,7 @@ "Produciuse un erro ao serializar o GVariant co tipo cadea «%s» desde o " "formato ligado D-Bus" -#: gio/gdbusmessage.c:2837 +#: gio/gdbusmessage.c:2840 #, c-format msgid "" "Number of file descriptors in message (%d) differs from header field (%d)" @@ -969,18 +971,18 @@ "O número de descritores de ficheiro no mensaxe (%d) difire do campo " "cabeceira (%d)" -#: gio/gdbusmessage.c:2845 +#: gio/gdbusmessage.c:2848 msgid "Cannot serialize message: " msgstr "Non foi posíbel serializar a mensaxe: " -#: gio/gdbusmessage.c:2898 +#: gio/gdbusmessage.c:2901 #, c-format msgid "Message body has signature “%s” but there is no signature header" msgstr "" "O corpo da mensaxe ten a sinatura «%s» máis non está presente a cabeceira de " "sinatura" -#: gio/gdbusmessage.c:2908 +#: gio/gdbusmessage.c:2911 #, c-format msgid "" "Message body has type signature “%s” but signature in the header field is " @@ -989,19 +991,19 @@ "O corpo da mensaxe ten a sinatura de tipo «%s» pero a sinatura no campo da " "cabeceira é «%s»" -#: gio/gdbusmessage.c:2924 +#: gio/gdbusmessage.c:2927 #, c-format msgid "Message body is empty but signature in the header field is “(%s)”" msgstr "" "O corpo da mensaxe está baleiro máis a sinatura do campo da cabeceira é " "«(%s)»" -#: gio/gdbusmessage.c:3479 +#: gio/gdbusmessage.c:3482 #, c-format msgid "Error return with body of type “%s”" msgstr "Produciuse un erro ao devolver co corpo de tipo «%s»" -#: gio/gdbusmessage.c:3487 +#: gio/gdbusmessage.c:3490 msgid "Error return with empty body" msgstr "Produciuse un erro ao devolver co corpo baleiro" @@ -1026,17 +1028,17 @@ msgid "Unable to load %s or %s: " msgstr "Non foi posíbel cargar %s ou %s: " -#: gio/gdbusproxy.c:1575 +#: gio/gdbusproxy.c:1568 #, c-format msgid "Error calling StartServiceByName for %s: " msgstr "Produciuse un erro ao chamar a StartServiceByName para %s: " -#: gio/gdbusproxy.c:1598 +#: gio/gdbusproxy.c:1591 #, c-format msgid "Unexpected reply %d from StartServiceByName(\"%s\") method" msgstr "Resposta %d non esperada desde o método StartServiceByName(«%s»)" -#: gio/gdbusproxy.c:2709 gio/gdbusproxy.c:2844 +#: gio/gdbusproxy.c:2702 gio/gdbusproxy.c:2837 #, c-format msgid "" "Cannot invoke method; proxy is for the well-known name %s without an owner, " @@ -1045,27 +1047,27 @@ "Non é posíbel invocar ao método; o proxy non ten dono para un nome coñecido " "%s e o proxy construíuse coa opción G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START" -#: gio/gdbusserver.c:765 +#: gio/gdbusserver.c:758 msgid "Abstract namespace not supported" msgstr "Non se admite un espazo de nomes abstracto" -#: gio/gdbusserver.c:857 +#: gio/gdbusserver.c:850 msgid "Cannot specify nonce file when creating a server" msgstr "" "Non é posíbel especificar o ficheiro de uso de unha vez ao crear un servidor" -#: gio/gdbusserver.c:939 +#: gio/gdbusserver.c:932 #, c-format msgid "Error writing nonce file at “%s”: %s" msgstr "" "Produciuse un erro ao escribir no ficheiro de uso de unha vez en «%s»: %s" -#: gio/gdbusserver.c:1114 +#: gio/gdbusserver.c:1107 #, c-format msgid "The string “%s” is not a valid D-Bus GUID" msgstr "A cadea «%s» non é un GUID de D-BUS correcta" -#: gio/gdbusserver.c:1152 +#: gio/gdbusserver.c:1145 #, c-format msgid "Cannot listen on unsupported transport “%s”" msgstr "Non é posíbel escoitar nun transporte «%s» non admitido" @@ -1093,14 +1095,14 @@ "\n" "Use '%s ORDE --help' para obter axuda sobre cada orde.\n" -#: gio/gdbus-tool.c:204 gio/gdbus-tool.c:276 gio/gdbus-tool.c:348 -#: gio/gdbus-tool.c:372 gio/gdbus-tool.c:862 gio/gdbus-tool.c:1247 -#: gio/gdbus-tool.c:1734 +#: gio/gdbus-tool.c:204 gio/gdbus-tool.c:276 gio/gdbus-tool.c:347 +#: gio/gdbus-tool.c:371 gio/gdbus-tool.c:861 gio/gdbus-tool.c:1246 +#: gio/gdbus-tool.c:1733 #, c-format msgid "Error: %s\n" msgstr "Erro: %s\n" -#: gio/gdbus-tool.c:215 gio/gdbus-tool.c:289 gio/gdbus-tool.c:1750 +#: gio/gdbus-tool.c:215 gio/gdbus-tool.c:289 gio/gdbus-tool.c:1749 #, c-format msgid "Error parsing introspection XML: %s\n" msgstr "Produciuse un erro ao analizar o XML de introspección: %s\n" @@ -1110,49 +1112,49 @@ msgid "Error: %s is not a valid name\n" msgstr "Erro: %s non é un nome válido\n" -#: gio/gdbus-tool.c:258 gio/gdbus-tool.c:748 gio/gdbus-tool.c:1066 -#: gio/gdbus-tool.c:1900 gio/gdbus-tool.c:2140 +#: gio/gdbus-tool.c:258 gio/gdbus-tool.c:747 gio/gdbus-tool.c:1065 +#: gio/gdbus-tool.c:1899 gio/gdbus-tool.c:2139 #, c-format msgid "Error: %s is not a valid object path\n" msgstr "Erro: %s non é unha ruta a un obxecto correcta\n" -#: gio/gdbus-tool.c:406 +#: gio/gdbus-tool.c:405 msgid "Connect to the system bus" msgstr "Conectar ao bus do sistema" -#: gio/gdbus-tool.c:407 +#: gio/gdbus-tool.c:406 msgid "Connect to the session bus" msgstr "Conectar ao bus de sesión" -#: gio/gdbus-tool.c:408 +#: gio/gdbus-tool.c:407 msgid "Connect to given D-Bus address" msgstr "Conectar a un enderezo D-Bus fornecido" -#: gio/gdbus-tool.c:418 +#: gio/gdbus-tool.c:417 msgid "Connection Endpoint Options:" msgstr "Opcións da conexión do extremo:" -#: gio/gdbus-tool.c:419 +#: gio/gdbus-tool.c:418 msgid "Options specifying the connection endpoint" msgstr "Opción para especificar a conexión do extremo" -#: gio/gdbus-tool.c:442 +#: gio/gdbus-tool.c:441 #, c-format msgid "No connection endpoint specified" msgstr "Non se especificou o punto final da conexión" -#: gio/gdbus-tool.c:452 +#: gio/gdbus-tool.c:451 #, c-format msgid "Multiple connection endpoints specified" msgstr "Especificáronse varios puntos finais da conexión" -#: gio/gdbus-tool.c:525 +#: gio/gdbus-tool.c:524 #, c-format msgid "" "Warning: According to introspection data, interface “%s” does not exist\n" msgstr "Aviso: segundo os datos de introspección a interface «%s» non existe\n" -#: gio/gdbus-tool.c:534 +#: gio/gdbus-tool.c:533 #, c-format msgid "" "Warning: According to introspection data, method “%s” does not exist on " @@ -1161,164 +1163,164 @@ "Aviso: segundo os datos de introspección o método «%s» non existe na " "interface «%s»\n" -#: gio/gdbus-tool.c:596 +#: gio/gdbus-tool.c:595 msgid "Optional destination for signal (unique name)" msgstr "Destino opcional para o sinal (nome único)" -#: gio/gdbus-tool.c:597 +#: gio/gdbus-tool.c:596 msgid "Object path to emit signal on" msgstr "Ruta do obxecto sobre o que emitir o sinal" -#: gio/gdbus-tool.c:598 +#: gio/gdbus-tool.c:597 msgid "Signal and interface name" msgstr "Nomes da interface e sinal" -#: gio/gdbus-tool.c:631 +#: gio/gdbus-tool.c:630 msgid "Emit a signal." msgstr "Emitir un sinal." -#: gio/gdbus-tool.c:686 gio/gdbus-tool.c:1003 gio/gdbus-tool.c:1837 -#: gio/gdbus-tool.c:2069 gio/gdbus-tool.c:2289 +#: gio/gdbus-tool.c:685 gio/gdbus-tool.c:1002 gio/gdbus-tool.c:1836 +#: gio/gdbus-tool.c:2068 gio/gdbus-tool.c:2288 #, c-format msgid "Error connecting: %s\n" msgstr "Produciuse un erro ao conectar: %s\n" -#: gio/gdbus-tool.c:706 +#: gio/gdbus-tool.c:705 #, c-format msgid "Error: %s is not a valid unique bus name.\n" msgstr "Erro: %s non é un nome de bus único correcto.\n" -#: gio/gdbus-tool.c:725 gio/gdbus-tool.c:1046 gio/gdbus-tool.c:1880 +#: gio/gdbus-tool.c:724 gio/gdbus-tool.c:1045 gio/gdbus-tool.c:1879 msgid "Error: Object path is not specified\n" msgstr "Erro: non se especificou unha ruta de obxecto\n" -#: gio/gdbus-tool.c:768 +#: gio/gdbus-tool.c:767 msgid "Error: Signal name is not specified\n" msgstr "Erro: non se especificou o nome do sinal\n" -#: gio/gdbus-tool.c:782 +#: gio/gdbus-tool.c:781 #, c-format msgid "Error: Signal name “%s” is invalid\n" msgstr "Erro: o nome do sinal «%s» non é válido\n" -#: gio/gdbus-tool.c:794 +#: gio/gdbus-tool.c:793 #, c-format msgid "Error: %s is not a valid interface name\n" msgstr "Erro: %s non é un nome de interface correcto\n" -#: gio/gdbus-tool.c:800 +#: gio/gdbus-tool.c:799 #, c-format msgid "Error: %s is not a valid member name\n" msgstr "Erro: %s non é un nome de membro correcto\n" #. Use the original non-"parse-me-harder" error -#: gio/gdbus-tool.c:837 gio/gdbus-tool.c:1178 +#: gio/gdbus-tool.c:836 gio/gdbus-tool.c:1177 #, c-format msgid "Error parsing parameter %d: %s\n" msgstr "Produciuse un erro ao analizar a opción %d: %s\n" -#: gio/gdbus-tool.c:869 +#: gio/gdbus-tool.c:868 #, c-format msgid "Error flushing connection: %s\n" msgstr "Produciuse un erro ao limpar a conexión: %s\n" -#: gio/gdbus-tool.c:897 +#: gio/gdbus-tool.c:896 msgid "Destination name to invoke method on" msgstr "Nome do destino onde invocar o método" -#: gio/gdbus-tool.c:898 +#: gio/gdbus-tool.c:897 msgid "Object path to invoke method on" msgstr "Ruta ao obxecto onde invocar o método" -#: gio/gdbus-tool.c:899 +#: gio/gdbus-tool.c:898 msgid "Method and interface name" msgstr "Método e nome da interface" -#: gio/gdbus-tool.c:900 +#: gio/gdbus-tool.c:899 msgid "Timeout in seconds" msgstr "Tempo de expiración en segundos" -#: gio/gdbus-tool.c:901 +#: gio/gdbus-tool.c:900 msgid "Allow interactive authorization" msgstr "Permitir autorización interactiva" -#: gio/gdbus-tool.c:948 +#: gio/gdbus-tool.c:947 msgid "Invoke a method on a remote object." msgstr "Invocar un método nun obxecto remoto." -#: gio/gdbus-tool.c:1020 gio/gdbus-tool.c:1854 gio/gdbus-tool.c:2094 +#: gio/gdbus-tool.c:1019 gio/gdbus-tool.c:1853 gio/gdbus-tool.c:2093 msgid "Error: Destination is not specified\n" msgstr "Erro: non se especificou un destino\n" -#: gio/gdbus-tool.c:1031 gio/gdbus-tool.c:1871 gio/gdbus-tool.c:2105 +#: gio/gdbus-tool.c:1030 gio/gdbus-tool.c:1870 gio/gdbus-tool.c:2104 #, c-format msgid "Error: %s is not a valid bus name\n" msgstr "Erro: %s non é un nome de bus válido\n" -#: gio/gdbus-tool.c:1081 +#: gio/gdbus-tool.c:1080 msgid "Error: Method name is not specified\n" msgstr "Erro: non se especificou o nome do método\n" -#: gio/gdbus-tool.c:1092 +#: gio/gdbus-tool.c:1091 #, c-format msgid "Error: Method name “%s” is invalid\n" msgstr "Erro: o nome do método «%s» non é válido\n" -#: gio/gdbus-tool.c:1170 +#: gio/gdbus-tool.c:1169 #, c-format msgid "Error parsing parameter %d of type “%s”: %s\n" msgstr "Produciuse un erro ao analizar o parámetro %d do tipo «%s»: %s\n" -#: gio/gdbus-tool.c:1196 +#: gio/gdbus-tool.c:1195 #, c-format msgid "Error adding handle %d: %s\n" msgstr "Produciuse un erro ao engadir o manexador %d: %s\n" -#: gio/gdbus-tool.c:1696 +#: gio/gdbus-tool.c:1695 msgid "Destination name to introspect" msgstr "Nome de destino a introspeccionar" -#: gio/gdbus-tool.c:1697 +#: gio/gdbus-tool.c:1696 msgid "Object path to introspect" msgstr "Ruta do obxecto a introspeccionar" -#: gio/gdbus-tool.c:1698 +#: gio/gdbus-tool.c:1697 msgid "Print XML" msgstr "Imprimir XML" -#: gio/gdbus-tool.c:1699 +#: gio/gdbus-tool.c:1698 msgid "Introspect children" msgstr "Introspeccionar fillo" -#: gio/gdbus-tool.c:1700 +#: gio/gdbus-tool.c:1699 msgid "Only print properties" msgstr "Só mostrar propiedades" -#: gio/gdbus-tool.c:1789 +#: gio/gdbus-tool.c:1788 msgid "Introspect a remote object." msgstr "Introspecciona un obxecto remoto." -#: gio/gdbus-tool.c:1995 +#: gio/gdbus-tool.c:1994 msgid "Destination name to monitor" msgstr "Nome de destino a monitorizar" -#: gio/gdbus-tool.c:1996 +#: gio/gdbus-tool.c:1995 msgid "Object path to monitor" msgstr "Ruta do obxecto a monitorizar" -#: gio/gdbus-tool.c:2021 +#: gio/gdbus-tool.c:2020 msgid "Monitor a remote object." msgstr "Monitoriza un obxecto remoto." -#: gio/gdbus-tool.c:2079 +#: gio/gdbus-tool.c:2078 msgid "Error: can’t monitor a non-message-bus connection\n" msgstr "Erro: non é posíbel monitorizar unha conexión non-message-bus\n" -#: gio/gdbus-tool.c:2203 +#: gio/gdbus-tool.c:2202 msgid "Service to activate before waiting for the other one (well-known name)" msgstr "Servizo a activar antes de agardar polo outro (nome coñecido)" -#: gio/gdbus-tool.c:2206 +#: gio/gdbus-tool.c:2205 msgid "" "Timeout to wait for before exiting with an error (seconds); 0 for no timeout " "(default)" @@ -1326,71 +1328,76 @@ "Tempo de espera máximo a agardar antes de saír con un erro (segundos); 0 " "para non ter tempo de espera (valor por omisión)" -#: gio/gdbus-tool.c:2254 +#: gio/gdbus-tool.c:2253 msgid "OPTION… BUS-NAME" msgstr "OPCIÓN… NOME-BUS" -#: gio/gdbus-tool.c:2255 +#: gio/gdbus-tool.c:2254 msgid "Wait for a bus name to appear." msgstr "Agardar que apareza un nome de bus." -#: gio/gdbus-tool.c:2331 +#: gio/gdbus-tool.c:2330 msgid "Error: A service to activate for must be specified.\n" msgstr "Erro: Debe especificar un servizo a activar.\n" -#: gio/gdbus-tool.c:2336 +#: gio/gdbus-tool.c:2335 msgid "Error: A service to wait for must be specified.\n" msgstr "Erro: Debe especificar un servizo a agardar.\n" -#: gio/gdbus-tool.c:2341 +#: gio/gdbus-tool.c:2340 msgid "Error: Too many arguments.\n" msgstr "Erro: Demasiados argumentos.\n" -#: gio/gdbus-tool.c:2349 gio/gdbus-tool.c:2356 +#: gio/gdbus-tool.c:2348 gio/gdbus-tool.c:2355 #, c-format msgid "Error: %s is not a valid well-known bus name.\n" msgstr "Erro: %s non é un nome de bus válido e coñecido.\n" -#: gio/gdebugcontrollerdbus.c:360 +#: gio/gdebugcontrollerdbus.c:361 #, c-format msgid "Not authorized to change debug settings" msgstr "Non está autorizado para cambiar as preferencias de depuración" -#: gio/gdesktopappinfo.c:2182 gio/gdesktopappinfo.c:5113 +#: gio/gdesktopappinfo.c:2242 gio/gdesktopappinfo.c:5226 msgid "Unnamed" msgstr "Sen nome" -#: gio/gdesktopappinfo.c:2592 +#: gio/gdesktopappinfo.c:2652 msgid "Desktop file didn’t specify Exec field" msgstr "O ficheiro de escritorio non especificou o campo Exec" -#: gio/gdesktopappinfo.c:2891 +#: gio/gdesktopappinfo.c:2942 msgid "Unable to find terminal required for application" msgstr "Non é posíbel atopar o terminal requirido pola aplicación" -#: gio/gdesktopappinfo.c:3631 +#: gio/gdesktopappinfo.c:3002 +#, c-format +msgid "Program ‘%s’ not found in $PATH" +msgstr "Non se puido atopar o programa «%s» no $PATH" + +#: gio/gdesktopappinfo.c:3738 #, c-format msgid "Can’t create user application configuration folder %s: %s" msgstr "" "Non é posíbel crear o directorio de configuración da aplicación de usuario " "%s: %s" -#: gio/gdesktopappinfo.c:3635 +#: gio/gdesktopappinfo.c:3742 #, c-format msgid "Can’t create user MIME configuration folder %s: %s" msgstr "" "Non é posíbel crear o directorio de configuración MIME %s do usuario: %s" -#: gio/gdesktopappinfo.c:3877 gio/gdesktopappinfo.c:3901 +#: gio/gdesktopappinfo.c:3984 gio/gdesktopappinfo.c:4008 msgid "Application information lacks an identifier" msgstr "A información da aplicación carece dun identificador" -#: gio/gdesktopappinfo.c:4137 +#: gio/gdesktopappinfo.c:4244 #, c-format msgid "Can’t create user desktop file %s" msgstr "Non é posíbel crear o ficheiro de escritorio %s do usuario" -#: gio/gdesktopappinfo.c:4273 +#: gio/gdesktopappinfo.c:4380 #, c-format msgid "Custom definition for %s" msgstr "Definición personalizada para %s" @@ -1466,7 +1473,7 @@ msgid "Containing mount does not exist" msgstr "O punto de montaxe contido non existe" -#: gio/gfile.c:2641 gio/glocalfile.c:2500 +#: gio/gfile.c:2641 gio/glocalfile.c:2515 msgid "Can’t copy over directory" msgstr "Non é posíbel copiar sobre o directorio" @@ -1491,51 +1498,50 @@ msgid "Error splicing file: %s" msgstr "Produciuse un erro ao empalmar o ficheiro: %s" -#: gio/gfile.c:3185 +#: gio/gfile.c:3195 msgid "Copy (reflink/clone) between mounts is not supported" msgstr "Copiar (reflink/clonar) entre montaxes non é compatíbel" -#: gio/gfile.c:3189 +#: gio/gfile.c:3199 msgid "Copy (reflink/clone) is not supported or invalid" msgstr "Copiar (reflink/clone) non é compatíbel ou non é válido" -#: gio/gfile.c:3194 +#: gio/gfile.c:3204 msgid "Copy (reflink/clone) is not supported or didn’t work" msgstr "Copiar (reflink/clone) non é compatíbel ou non funciona" -#: gio/gfile.c:3259 +#: gio/gfile.c:3269 msgid "Can’t copy special file" msgstr "Non é posíbel copiar o ficheiro especial" -#: gio/gfile.c:4153 +#: gio/gfile.c:4163 msgid "Invalid symlink value given" msgstr "O valor da ligazón simbólica dada non é válido" -#: gio/gfile.c:4163 glib/gfileutils.c:2335 +#: gio/gfile.c:4173 glib/gfileutils.c:2392 msgid "Symbolic links not supported" msgstr "As ligazóns simbólicas non se admiten" -#: gio/gfile.c:4450 +#: gio/gfile.c:4460 msgid "Trash not supported" msgstr "O Lixo non é compatíbel" -#: gio/gfile.c:4562 +#: gio/gfile.c:4572 #, c-format msgid "File names cannot contain “%c”" msgstr "Os nomes de ficheiro non poden conter «%c»" -#: gio/gfile.c:6993 gio/gfile.c:7119 +#: gio/gfile.c:7003 gio/gfile.c:7129 #, c-format -#| msgid "Failed to change to directory “%s” (%s)" msgid "Failed to create a temporary directory for template “%s”: %s" msgstr "" "Produciuse un erro ao crear o directorio temporal para o modelo «%s»: %s" -#: gio/gfile.c:7408 gio/gvolume.c:366 +#: gio/gfile.c:7418 gio/gvolume.c:366 msgid "volume doesn’t implement mount" msgstr "o volume non implementa o montado" -#: gio/gfile.c:7522 gio/gfile.c:7599 +#: gio/gfile.c:7532 gio/gfile.c:7609 msgid "No application is registered as handling this file" msgstr "Non hai ningunha aplicación rexistrado para manexar este ficheiro" @@ -1544,11 +1550,11 @@ msgstr "O enumerador está pechado" #: gio/gfileenumerator.c:221 gio/gfileenumerator.c:280 -#: gio/gfileenumerator.c:379 gio/gfileenumerator.c:478 +#: gio/gfileenumerator.c:424 gio/gfileenumerator.c:523 msgid "File enumerator has outstanding operation" msgstr "O enumerador do ficheiro ten unha operación excepcional" -#: gio/gfileenumerator.c:370 gio/gfileenumerator.c:469 +#: gio/gfileenumerator.c:415 gio/gfileenumerator.c:514 msgid "File enumerator is already closed" msgstr "O enumerador do ficheiro xa está pechado" @@ -1614,37 +1620,37 @@ msgid "HTTP proxy server closed connection unexpectedly." msgstr "A conexión co servidor proxy HTTP pechouse de forma non esperada." -#: gio/gicon.c:300 +#: gio/gicon.c:299 #, c-format msgid "Wrong number of tokens (%d)" msgstr "Número incorrecto de tokens (%d)" -#: gio/gicon.c:320 +#: gio/gicon.c:319 #, c-format msgid "No type for class name %s" msgstr "Non hai un tipo para o nome de clase %s" -#: gio/gicon.c:330 +#: gio/gicon.c:329 #, c-format msgid "Type %s does not implement the GIcon interface" msgstr "O tipo %s non implementa unha interface GIcon" -#: gio/gicon.c:341 +#: gio/gicon.c:340 #, c-format msgid "Type %s is not classed" msgstr "O tipo %s non ten unha clase" -#: gio/gicon.c:355 +#: gio/gicon.c:354 #, c-format msgid "Malformed version number: %s" msgstr "Número de versión formado incorrectamente: %s" -#: gio/gicon.c:369 +#: gio/gicon.c:368 #, c-format msgid "Type %s does not implement from_tokens() on the GIcon interface" msgstr "O tipo %s non implementa from_tokens() na interface do GIcon" -#: gio/gicon.c:471 +#: gio/gicon.c:470 msgid "Can’t handle the supplied version of the icon encoding" msgstr "Non é posíbel manipular a versión fornecida da codificación da icona" @@ -1791,12 +1797,12 @@ msgstr "Produciuse un erro ao escribir ao stdout" #. Translators: commandline placeholder -#: gio/gio-tool-cat.c:135 gio/gio-tool-info.c:379 gio/gio-tool-list.c:173 +#: gio/gio-tool-cat.c:135 gio/gio-tool-info.c:382 gio/gio-tool-list.c:176 #: gio/gio-tool-mkdir.c:50 gio/gio-tool-monitor.c:39 gio/gio-tool-monitor.c:41 #: gio/gio-tool-monitor.c:43 gio/gio-tool-monitor.c:45 -#: gio/gio-tool-monitor.c:206 gio/gio-tool-mount.c:1202 gio/gio-tool-open.c:72 +#: gio/gio-tool-monitor.c:206 gio/gio-tool-mount.c:1210 gio/gio-tool-open.c:72 #: gio/gio-tool-remove.c:50 gio/gio-tool-rename.c:47 gio/gio-tool-set.c:95 -#: gio/gio-tool-trash.c:222 gio/gio-tool-tree.c:241 +#: gio/gio-tool-trash.c:222 gio/gio-tool-tree.c:246 msgid "LOCATION" msgstr "LOCALIZACIÓN" @@ -1815,8 +1821,8 @@ "GIO no lugar de ficheiros locais: por exemplo, pode usar algo así como \n" "smb:////server/resource/file.txt como localización." -#: gio/gio-tool-cat.c:164 gio/gio-tool-info.c:410 gio/gio-tool-mkdir.c:78 -#: gio/gio-tool-monitor.c:231 gio/gio-tool-mount.c:1253 gio/gio-tool-open.c:98 +#: gio/gio-tool-cat.c:164 gio/gio-tool-info.c:413 gio/gio-tool-mkdir.c:78 +#: gio/gio-tool-monitor.c:231 gio/gio-tool-mount.c:1261 gio/gio-tool-open.c:98 #: gio/gio-tool-remove.c:74 gio/gio-tool-trash.c:303 msgid "No locations given" msgstr "Non se forneceron localizacións" @@ -1912,57 +1918,57 @@ msgid "attributes:\n" msgstr "atributos:\n" -#: gio/gio-tool-info.c:165 gio/gio-tool-info.c:174 +#: gio/gio-tool-info.c:166 gio/gio-tool-info.c:176 #, c-format msgid "display name: %s\n" msgstr "nome en pantalla: %s\n" -#: gio/gio-tool-info.c:182 +#: gio/gio-tool-info.c:184 #, c-format msgid "name: %s\n" msgstr "nome: %s\n" -#: gio/gio-tool-info.c:189 +#: gio/gio-tool-info.c:191 #, c-format msgid "type: %s\n" msgstr "tipo: %s\n" -#: gio/gio-tool-info.c:195 +#: gio/gio-tool-info.c:197 msgid "size: " msgstr "tamaño: " -#: gio/gio-tool-info.c:200 +#: gio/gio-tool-info.c:203 msgid "hidden\n" msgstr "oculto\n" -#: gio/gio-tool-info.c:203 +#: gio/gio-tool-info.c:206 #, c-format msgid "uri: %s\n" msgstr "uri: %s\n" -#: gio/gio-tool-info.c:210 +#: gio/gio-tool-info.c:213 #, c-format msgid "local path: %s\n" msgstr "ruta local: %s\n" -#: gio/gio-tool-info.c:244 +#: gio/gio-tool-info.c:247 #, c-format msgid "unix mount: %s%s %s %s %s\n" msgstr "montaxe unix: %s%s %s %s %s\n" -#: gio/gio-tool-info.c:325 +#: gio/gio-tool-info.c:328 msgid "Settable attributes:\n" msgstr "Atributos estabelecíbeis:\n" -#: gio/gio-tool-info.c:349 +#: gio/gio-tool-info.c:352 msgid "Writable attribute namespaces:\n" msgstr "Espazos de nomes de atributo escribíbeis:\n" -#: gio/gio-tool-info.c:384 +#: gio/gio-tool-info.c:387 msgid "Show information about locations." msgstr "Mostrar información sobre as localizacións." -#: gio/gio-tool-info.c:386 +#: gio/gio-tool-info.c:389 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" @@ -2029,11 +2035,11 @@ msgid "Print full URIs" msgstr "Mostrar os URIs completos" -#: gio/gio-tool-list.c:178 +#: gio/gio-tool-list.c:181 msgid "List the contents of the locations." msgstr "Lista os contidos das localizacións." -#: gio/gio-tool-list.c:180 +#: gio/gio-tool-list.c:183 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" @@ -2235,19 +2241,19 @@ msgid "Mount a TCRYPT system volume" msgstr "Montar un volume de sistema TCRYPT" -#: gio/gio-tool-mount.c:268 gio/gio-tool-mount.c:300 +#: gio/gio-tool-mount.c:276 gio/gio-tool-mount.c:308 msgid "Anonymous access denied" msgstr "Acceso anónimo denegado" -#: gio/gio-tool-mount.c:525 +#: gio/gio-tool-mount.c:533 msgid "No drive for device file" msgstr "Non hai unha unidade para o ficheiro de dispositivo" -#: gio/gio-tool-mount.c:1017 +#: gio/gio-tool-mount.c:1025 msgid "No volume for given ID" msgstr "Non hai un volume para o ID fornecido" -#: gio/gio-tool-mount.c:1206 +#: gio/gio-tool-mount.c:1214 msgid "Mount or unmount the locations." msgstr "Montar ou desmontar as localizacións." @@ -2368,7 +2374,6 @@ msgstr "TIPO" #: gio/gio-tool-set.c:38 -#| msgid "Set a file attribute" msgid "Unset given attribute" msgstr "Desestabelecer o atributo fornecido" @@ -2407,7 +2412,7 @@ #: gio/gio-tool-trash.c:37 msgid "List files in the trash with their original locations" -msgstr "Lista os ficheiros no lixo coas súas localizacións orixinais." +msgstr "Lista os ficheiros no lixo coas súas localizacións orixinais" #: gio/gio-tool-trash.c:38 msgid "" @@ -2427,7 +2432,7 @@ #: gio/gio-tool-trash.c:138 msgid "Unable to move file to its original location: " -msgstr "non é posíbel mover o ficheiro á súa localización orixinal:" +msgstr "Non é posíbel mover o ficheiro á súa localización orixinal: " #: gio/gio-tool-trash.c:227 msgid "Move/Restore files or directories to the trash." @@ -2449,11 +2454,11 @@ msgid "Follow symbolic links, mounts and shortcuts" msgstr "Seguir as ligazóns simbólicas, montaxes e atallos" -#: gio/gio-tool-tree.c:246 +#: gio/gio-tool-tree.c:251 msgid "List contents of directories in a tree-like format." msgstr "Lista os contidos dos directorios nun formato árbore." -#: gio/glib-compile-resources.c:142 gio/glib-compile-schemas.c:1516 +#: gio/glib-compile-resources.c:142 gio/glib-compile-schemas.c:1513 #, c-format msgid "Element <%s> not allowed inside <%s>" msgstr "Non se permite o elemento <%s> dentro de <%s>" @@ -2510,7 +2515,7 @@ msgid "text may not appear inside <%s>" msgstr "o texto non debe aparecer dentro de <%s>" -#: gio/glib-compile-resources.c:821 gio/glib-compile-schemas.c:2174 +#: gio/glib-compile-resources.c:821 gio/glib-compile-schemas.c:2171 msgid "Show program version and exit" msgstr "Mostrar a versión do programa e saír" @@ -2526,8 +2531,8 @@ "Os directorios dos que ler ficheiros referenciados en FILE (por omisión: o " "directorio actual)" -#: gio/glib-compile-resources.c:823 gio/glib-compile-schemas.c:2175 -#: gio/glib-compile-schemas.c:2204 +#: gio/glib-compile-resources.c:823 gio/glib-compile-schemas.c:2172 +#: gio/glib-compile-schemas.c:2201 msgid "DIRECTORY" msgstr "DIRECTORIO" @@ -2753,16 +2758,16 @@ msgid "<aliases> must contain at least one <alias>" msgstr "<aliases> debe conter cando menos un <alias>" -#: gio/glib-compile-schemas.c:799 +#: gio/glib-compile-schemas.c:796 msgid "Empty names are not permitted" msgstr "Non se permiten nomes baleiros" -#: gio/glib-compile-schemas.c:809 +#: gio/glib-compile-schemas.c:806 #, c-format msgid "Invalid name “%s”: names must begin with a lowercase letter" msgstr "Nome «%s» non válido: os nomes deben comezar por unha letra minúscula" -#: gio/glib-compile-schemas.c:821 +#: gio/glib-compile-schemas.c:818 #, c-format msgid "" "Invalid name “%s”: invalid character “%c”; only lowercase letters, numbers " @@ -2771,36 +2776,36 @@ "Nome «%s» non válido: o carácter «%c» non é válido; só se permiten letras en " "minúsculas, números e guións («-»)" -#: gio/glib-compile-schemas.c:830 +#: gio/glib-compile-schemas.c:827 #, c-format msgid "Invalid name “%s”: two successive hyphens (“--”) are not permitted" msgstr "Nome «%s» non válido: non se permiten dous guións seguidos («--»)" -#: gio/glib-compile-schemas.c:839 +#: gio/glib-compile-schemas.c:836 #, c-format msgid "Invalid name “%s”: the last character may not be a hyphen (“-”)" msgstr "Nome «%s» non válido: o último carácter non pode ser un guión («-»)." -#: gio/glib-compile-schemas.c:847 +#: gio/glib-compile-schemas.c:844 #, c-format msgid "Invalid name “%s”: maximum length is 1024" msgstr "Nome «%s» non válido: a lonxitude máxima é 1024" -#: gio/glib-compile-schemas.c:919 +#: gio/glib-compile-schemas.c:916 #, c-format msgid "<child name='%s'> already specified" msgstr "<child name='%s'> xa especificado" -#: gio/glib-compile-schemas.c:945 +#: gio/glib-compile-schemas.c:942 msgid "Cannot add keys to a “list-of” schema" msgstr "Non é posíbel engadir claves a un esquema «lista-de»" -#: gio/glib-compile-schemas.c:956 +#: gio/glib-compile-schemas.c:953 #, c-format msgid "<key name='%s'> already specified" msgstr "<key name='%s'> xa especificada" -#: gio/glib-compile-schemas.c:974 +#: gio/glib-compile-schemas.c:971 #, c-format msgid "" "<key name='%s'> shadows <key name='%s'> in <schema id='%s'>; use <override> " @@ -2809,7 +2814,7 @@ "<key name='%s'> enmascara a <key name='%s'> en <schema id='%s'>; use " "<override> para modificar o valor" -#: gio/glib-compile-schemas.c:985 +#: gio/glib-compile-schemas.c:982 #, c-format msgid "" "Exactly one of “type”, “enum” or “flags” must be specified as an attribute " @@ -2818,56 +2823,56 @@ "Debe especificar exactamente un de «type», «enum» ou «flags» como un " "atributo de <key>" -#: gio/glib-compile-schemas.c:1004 +#: gio/glib-compile-schemas.c:1001 #, c-format msgid "<%s id='%s'> not (yet) defined." msgstr "<%s id='%s'> aínda non especificado." -#: gio/glib-compile-schemas.c:1019 +#: gio/glib-compile-schemas.c:1016 #, c-format msgid "Invalid GVariant type string “%s”" msgstr "Tipo de cadea GVarian «%s» non válida" -#: gio/glib-compile-schemas.c:1049 +#: gio/glib-compile-schemas.c:1046 msgid "<override> given but schema isn’t extending anything" msgstr "<override> fornecido pero o esquema non estende nada" -#: gio/glib-compile-schemas.c:1062 +#: gio/glib-compile-schemas.c:1059 #, c-format msgid "No <key name='%s'> to override" msgstr "Non existe <key name='%s'> para sobrescribir" -#: gio/glib-compile-schemas.c:1070 +#: gio/glib-compile-schemas.c:1067 #, c-format msgid "<override name='%s'> already specified" msgstr "<override name='%s'> xa foi especificada" -#: gio/glib-compile-schemas.c:1143 +#: gio/glib-compile-schemas.c:1140 #, c-format msgid "<schema id='%s'> already specified" msgstr "<schema id='%s'> xa especificado" -#: gio/glib-compile-schemas.c:1155 +#: gio/glib-compile-schemas.c:1152 #, c-format msgid "<schema id='%s'> extends not yet existing schema “%s”" msgstr "<schema id='%s'> estende ao aínda esquema inexistente «%s»" -#: gio/glib-compile-schemas.c:1171 +#: gio/glib-compile-schemas.c:1168 #, c-format msgid "<schema id='%s'> is list of not yet existing schema “%s”" msgstr "<schema id='%s'> é unha lista de esquemas aínda non existentes «%s»" -#: gio/glib-compile-schemas.c:1179 +#: gio/glib-compile-schemas.c:1176 #, c-format msgid "Cannot be a list of a schema with a path" msgstr "Non é posíbel que sexa unha lista de esquemas con unha ruta" -#: gio/glib-compile-schemas.c:1189 +#: gio/glib-compile-schemas.c:1186 #, c-format msgid "Cannot extend a schema with a path" msgstr "Non é posíbel estender un esquema con unha ruta" -#: gio/glib-compile-schemas.c:1199 +#: gio/glib-compile-schemas.c:1196 #, c-format msgid "" "<schema id='%s'> is a list, extending <schema id='%s'> which is not a list" @@ -2875,7 +2880,7 @@ "<schema id='%s'> é unha lista, estase estendendo <schema id='%s'> que non é " "unha lista" -#: gio/glib-compile-schemas.c:1209 +#: gio/glib-compile-schemas.c:1206 #, c-format msgid "" "<schema id='%s' list-of='%s'> extends <schema id='%s' list-of='%s'> but “%s” " @@ -2884,17 +2889,17 @@ "<schema id='%s' list-of='%s'> estende <schema id='%s' list-of='%s'> pero " "«%s» non estende a «%s»" -#: gio/glib-compile-schemas.c:1226 +#: gio/glib-compile-schemas.c:1223 #, c-format msgid "A path, if given, must begin and end with a slash" msgstr "Unha ruta, se se especifica, debe comezar e rematar con unha barra" -#: gio/glib-compile-schemas.c:1233 +#: gio/glib-compile-schemas.c:1230 #, c-format msgid "The path of a list must end with “:/”" msgstr "A ruta dunha lista debe rematar con «:/»" -#: gio/glib-compile-schemas.c:1242 +#: gio/glib-compile-schemas.c:1239 #, c-format msgid "" "Warning: Schema “%s” has path “%s”. Paths starting with “/apps/”, “/" @@ -2903,49 +2908,49 @@ "Aviso: O esquema «%s» ten unha ruta «%s». As rutas que comezan con «/" "apps/», «/desktop/» ou «/system/» están obsoletas." -#: gio/glib-compile-schemas.c:1272 +#: gio/glib-compile-schemas.c:1269 #, c-format msgid "<%s id='%s'> already specified" msgstr "<%s id='%s'> xa especificado" -#: gio/glib-compile-schemas.c:1422 gio/glib-compile-schemas.c:1438 +#: gio/glib-compile-schemas.c:1419 gio/glib-compile-schemas.c:1435 #, c-format msgid "Only one <%s> element allowed inside <%s>" msgstr "Non se permite un elemento <%s> dentro de <%s>" -#: gio/glib-compile-schemas.c:1520 +#: gio/glib-compile-schemas.c:1517 #, c-format msgid "Element <%s> not allowed at the top level" msgstr "Non se permite o elemento <%s> no nivel superior" -#: gio/glib-compile-schemas.c:1538 +#: gio/glib-compile-schemas.c:1535 msgid "Element <default> is required in <key>" msgstr "Requírense os elementos <default> en <key>" -#: gio/glib-compile-schemas.c:1628 +#: gio/glib-compile-schemas.c:1625 #, c-format msgid "Text may not appear inside <%s>" msgstr "O texto non debe aparecer dentro de <%s>" -#: gio/glib-compile-schemas.c:1696 +#: gio/glib-compile-schemas.c:1693 #, c-format msgid "Warning: undefined reference to <schema id='%s'/>" msgstr "Aviso: referencia non definida a <schema id='%s'/>" #. Translators: Do not translate "--strict". -#: gio/glib-compile-schemas.c:1835 gio/glib-compile-schemas.c:1914 +#: gio/glib-compile-schemas.c:1832 gio/glib-compile-schemas.c:1911 msgid "--strict was specified; exiting." msgstr "--strict foi especificado; saíndo." -#: gio/glib-compile-schemas.c:1847 +#: gio/glib-compile-schemas.c:1844 msgid "This entire file has been ignored." msgstr "Ignorouse este ficheiro completamente." -#: gio/glib-compile-schemas.c:1910 +#: gio/glib-compile-schemas.c:1907 msgid "Ignoring this file." msgstr "Ignorando este ficheiro." -#: gio/glib-compile-schemas.c:1965 +#: gio/glib-compile-schemas.c:1962 #, c-format msgid "" "No such key “%s” in schema “%s” as specified in override file “%s”; ignoring " @@ -2954,7 +2959,7 @@ "Non existe a clave «%s» no esquema «%s» como se especificou no ficheiro de " "sobrescrita «%s»; ignorando a sobrescrita para esta chave." -#: gio/glib-compile-schemas.c:1973 +#: gio/glib-compile-schemas.c:1970 #, c-format msgid "" "No such key “%s” in schema “%s” as specified in override file “%s” and --" @@ -2963,7 +2968,7 @@ "Non existe a clave «%s» no esquema «%s» como se especificou no ficheiro de " "sobrescrita «%s» e --strict foi especificado; saíndo." -#: gio/glib-compile-schemas.c:1995 +#: gio/glib-compile-schemas.c:1992 #, c-format msgid "" "Cannot provide per-desktop overrides for localized key “%s” in schema " @@ -2973,7 +2978,7 @@ "«%s» no esquema «%s» (ficheiro de sobrescrita «%s»); ignorando a sobrescrita " "para esta chave." -#: gio/glib-compile-schemas.c:2004 +#: gio/glib-compile-schemas.c:2001 #, c-format msgid "" "Cannot provide per-desktop overrides for localized key “%s” in schema " @@ -2983,7 +2988,7 @@ "«%s» no esquema «%s» (ficheiro de sobrescrita «%s») e --strict foi " "especificado; saíndo." -#: gio/glib-compile-schemas.c:2028 +#: gio/glib-compile-schemas.c:2025 #, c-format msgid "" "Error parsing key “%s” in schema “%s” as specified in override file “%s”: " @@ -2993,7 +2998,7 @@ "especificou no ficheiro de sobrescrita «%s»: %s. Ignorando a sobrescrita " "para esta chave." -#: gio/glib-compile-schemas.c:2040 +#: gio/glib-compile-schemas.c:2037 #, c-format msgid "" "Error parsing key “%s” in schema “%s” as specified in override file “%s”: " @@ -3003,7 +3008,7 @@ "especificou no ficheiro de sobrescrita «%s»: %s. --strict foi especificado; " "saíndo." -#: gio/glib-compile-schemas.c:2067 +#: gio/glib-compile-schemas.c:2064 #, c-format msgid "" "Override for key “%s” in schema “%s” in override file “%s” is outside the " @@ -3013,7 +3018,7 @@ "está fora do intervalo indicado no esquema; ignorando a sobrescrita para " "esta chave." -#: gio/glib-compile-schemas.c:2077 +#: gio/glib-compile-schemas.c:2074 #, c-format msgid "" "Override for key “%s” in schema “%s” in override file “%s” is outside the " @@ -3023,7 +3028,7 @@ "está fora do intervalo indicado no esquema e --strict foi especificado; " "saíndo." -#: gio/glib-compile-schemas.c:2103 +#: gio/glib-compile-schemas.c:2100 #, c-format msgid "" "Override for key “%s” in schema “%s” in override file “%s” is not in the " @@ -3033,7 +3038,7 @@ "non está na lista de opcións válidas; ignorando a sobrescrita para esta " "chave." -#: gio/glib-compile-schemas.c:2113 +#: gio/glib-compile-schemas.c:2110 #, c-format msgid "" "Override for key “%s” in schema “%s” in override file “%s” is not in the " @@ -3042,23 +3047,23 @@ "A clave de sobrescrita «%s» no esquema «%s» no ficheiro de sobrescrita «%s» " "non está na lista de opcións válidas e --strict foi especificado; saíndo." -#: gio/glib-compile-schemas.c:2175 +#: gio/glib-compile-schemas.c:2172 msgid "Where to store the gschemas.compiled file" msgstr "Onde almacenar o ficheiro gschemas.compiled" -#: gio/glib-compile-schemas.c:2176 +#: gio/glib-compile-schemas.c:2173 msgid "Abort on any errors in schemas" msgstr "Interromper ao atopar calquera erro nos esquemas" -#: gio/glib-compile-schemas.c:2177 +#: gio/glib-compile-schemas.c:2174 msgid "Do not write the gschema.compiled file" msgstr "Non escribir o ficheiro compilado de gschema" -#: gio/glib-compile-schemas.c:2178 +#: gio/glib-compile-schemas.c:2175 msgid "Do not enforce key name restrictions" msgstr "Non respectar as restricións de nome de clave" -#: gio/glib-compile-schemas.c:2207 +#: gio/glib-compile-schemas.c:2204 msgid "" "Compile all GSettings schema files into a schema cache.\n" "Schema files are required to have the extension .gschema.xml,\n" @@ -3068,26 +3073,26 @@ "de esquemas. Os ficheiros de esquema deben ter a extensión\n" ".gschema.xml e o ficheiro de caché chámase gschemas.compiled." -#: gio/glib-compile-schemas.c:2228 +#: gio/glib-compile-schemas.c:2225 msgid "You should give exactly one directory name" msgstr "Debería fornecer exactamente un nome de cartafol" -#: gio/glib-compile-schemas.c:2271 +#: gio/glib-compile-schemas.c:2268 msgid "No schema files found: doing nothing." msgstr "Non se atoparon ficheiros de esquema: non se fai nada." -#: gio/glib-compile-schemas.c:2273 +#: gio/glib-compile-schemas.c:2270 msgid "No schema files found: removed existing output file." msgstr "" "Non se atopou ningún ficheiro de esquemas: eliminouse o ficheiro de saída " "existente." -#: gio/glocalfile.c:563 gio/win32/gwinhttpfile.c:436 +#: gio/glocalfile.c:567 gio/win32/gwinhttpfile.c:436 #, c-format msgid "Invalid filename %s" msgstr "O nome do ficheiro non é válido %s" -#: gio/glocalfile.c:996 +#: gio/glocalfile.c:1009 #, c-format msgid "Error getting filesystem info for %s: %s" msgstr "" @@ -3097,265 +3102,264 @@ #. * the enclosing (user visible) mount of a file, but none #. * exists. #. -#: gio/glocalfile.c:1137 +#: gio/glocalfile.c:1145 #, c-format msgid "Containing mount for file %s not found" msgstr "Non se atopa o punto de montaxe que contén o ficheiro %s" -#: gio/glocalfile.c:1160 +#: gio/glocalfile.c:1168 msgid "Can’t rename root directory" msgstr "Non é posíbel renomear o directorio raíz" -#: gio/glocalfile.c:1178 gio/glocalfile.c:1201 +#: gio/glocalfile.c:1186 gio/glocalfile.c:1209 #, c-format msgid "Error renaming file %s: %s" msgstr "Produciuse un erro ao renomear o ficheiro %s: %s" -#: gio/glocalfile.c:1185 +#: gio/glocalfile.c:1193 msgid "Can’t rename file, filename already exists" msgstr "Non é posíbel renomear o ficheiro, o ficheiro xa existe" -#: gio/glocalfile.c:1198 gio/glocalfile.c:2394 gio/glocalfile.c:2422 -#: gio/glocalfile.c:2561 gio/glocalfileoutputstream.c:658 +#: gio/glocalfile.c:1206 gio/glocalfile.c:2409 gio/glocalfile.c:2437 +#: gio/glocalfile.c:2576 gio/glocalfileoutputstream.c:658 msgid "Invalid filename" msgstr "O nome do ficheiro non é válido" -#: gio/glocalfile.c:1366 gio/glocalfile.c:1377 +#: gio/glocalfile.c:1374 gio/glocalfile.c:1385 #, c-format msgid "Error opening file %s: %s" msgstr "Produciuse un erro ao abrir o ficheiro %s: %s" -#: gio/glocalfile.c:1502 +#: gio/glocalfile.c:1510 #, c-format msgid "Error removing file %s: %s" msgstr "Produciuse un erro ao eliminar o ficheiro %s: %s" -#: gio/glocalfile.c:1996 gio/glocalfile.c:2007 gio/glocalfile.c:2034 +#: gio/glocalfile.c:2004 gio/glocalfile.c:2015 gio/glocalfile.c:2042 #, c-format msgid "Error trashing file %s: %s" msgstr "Produciuse un erro ao mover ao lixo o ficheiro %s: %s" -#: gio/glocalfile.c:2054 +#: gio/glocalfile.c:2062 #, c-format msgid "Unable to create trash directory %s: %s" msgstr "Non é posíbel crear o directorio do lixo %s: %s" -#: gio/glocalfile.c:2075 +#: gio/glocalfile.c:2083 #, c-format msgid "Unable to find toplevel directory to trash %s" msgstr "" "Non é posíbel atopar o directorio de nivel superior para mover ao lixo %s" -#: gio/glocalfile.c:2083 +#: gio/glocalfile.c:2091 #, c-format msgid "Trashing on system internal mounts is not supported" msgstr "Enviar ao lixo en montaxes internos do sistema non se admite" -#: gio/glocalfile.c:2169 gio/glocalfile.c:2197 +#: gio/glocalfile.c:2177 gio/glocalfile.c:2205 #, c-format msgid "Unable to find or create trash directory %s to trash %s" msgstr "Non é posíbel atopar ou crear o directorio do lixo para %s ao lixo %s" -#: gio/glocalfile.c:2243 +#: gio/glocalfile.c:2249 #, c-format msgid "Unable to create trashing info file for %s: %s" msgstr "Non é posíbel crear a información de lixo para o ficheiro %s: %s" -#: gio/glocalfile.c:2305 +#: gio/glocalfile.c:2320 #, c-format msgid "Unable to trash file %s across filesystem boundaries" msgstr "" "Non é posíbel mover ao lixo o ficheiro %s a través dos límites do sistema de " "ficheiros" -#: gio/glocalfile.c:2309 gio/glocalfile.c:2365 +#: gio/glocalfile.c:2324 gio/glocalfile.c:2380 #, c-format msgid "Unable to trash file %s: %s" msgstr "Non é posíbel mover ao lixo o ficheiro %s: %s" -#: gio/glocalfile.c:2371 +#: gio/glocalfile.c:2386 #, c-format msgid "Unable to trash file %s" msgstr "Non é posíbel mover ao lixo o ficheiro %s" -#: gio/glocalfile.c:2397 +#: gio/glocalfile.c:2412 #, c-format msgid "Error creating directory %s: %s" msgstr "Produciuse un erro ao crear o directorio %s: %s" -#: gio/glocalfile.c:2426 +#: gio/glocalfile.c:2441 #, c-format msgid "Filesystem does not support symbolic links" msgstr "O sistema de ficheiros non é compatíbel coas ligazóns simbólicas" -#: gio/glocalfile.c:2429 +#: gio/glocalfile.c:2444 #, c-format msgid "Error making symbolic link %s: %s" msgstr "Produciuse un erro ao crear a ligazón simbólica %s: %s" -#: gio/glocalfile.c:2472 gio/glocalfile.c:2507 gio/glocalfile.c:2564 +#: gio/glocalfile.c:2487 gio/glocalfile.c:2522 gio/glocalfile.c:2579 #, c-format msgid "Error moving file %s: %s" msgstr "Produciuse un erro ao mover o ficheiro %s: %s" -#: gio/glocalfile.c:2495 +#: gio/glocalfile.c:2510 msgid "Can’t move directory over directory" msgstr "Non é posíbel mover o directorio sobre un directorio" -#: gio/glocalfile.c:2521 gio/glocalfileoutputstream.c:1110 +#: gio/glocalfile.c:2536 gio/glocalfileoutputstream.c:1110 #: gio/glocalfileoutputstream.c:1124 gio/glocalfileoutputstream.c:1139 #: gio/glocalfileoutputstream.c:1156 gio/glocalfileoutputstream.c:1170 msgid "Backup file creation failed" msgstr "Fallou a creación do ficheiro de seguranza" -#: gio/glocalfile.c:2540 +#: gio/glocalfile.c:2555 #, c-format msgid "Error removing target file: %s" msgstr "Produciuse un erro ao retirar o ficheiro obxectivo: %s" -#: gio/glocalfile.c:2554 +#: gio/glocalfile.c:2569 msgid "Move between mounts not supported" msgstr "Non se permite mover entre puntos de montaxe" -#: gio/glocalfile.c:2728 +#: gio/glocalfile.c:2745 #, c-format msgid "Could not determine the disk usage of %s: %s" msgstr "Non foi posíbel determinar o uso de disco de %s: %s" -#: gio/glocalfileinfo.c:775 +#: gio/glocalfileinfo.c:779 msgid "Attribute value must be non-NULL" msgstr "O valor do atributo debe ser non nulo" -#: gio/glocalfileinfo.c:782 -#| msgid "Invalid attribute type (string expected)" +#: gio/glocalfileinfo.c:786 msgid "Invalid attribute type (string or invalid expected)" msgstr "Tipo de atributo non válido (agardábase unha cadea ou non válido)" -#: gio/glocalfileinfo.c:789 +#: gio/glocalfileinfo.c:793 msgid "Invalid extended attribute name" msgstr "Nome estendido do atributo non válido" -#: gio/glocalfileinfo.c:840 +#: gio/glocalfileinfo.c:844 #, c-format msgid "Error setting extended attribute “%s”: %s" msgstr "Produciuse un erro ao estabelecer o atributo estendido «%s»: %s" -#: gio/glocalfileinfo.c:1738 gio/win32/gwinhttpfile.c:191 +#: gio/glocalfileinfo.c:1823 gio/win32/gwinhttpfile.c:191 msgid " (invalid encoding)" msgstr " (codificación non válida)" -#: gio/glocalfileinfo.c:1897 gio/glocalfileoutputstream.c:945 +#: gio/glocalfileinfo.c:1982 gio/glocalfileoutputstream.c:945 #: gio/glocalfileoutputstream.c:997 #, c-format msgid "Error when getting information for file “%s”: %s" msgstr "Produciuse un erro ao obter a información do ficheiro «%s»: %s" -#: gio/glocalfileinfo.c:2163 +#: gio/glocalfileinfo.c:2288 #, c-format msgid "Error when getting information for file descriptor: %s" msgstr "Produciuse un erro ao obter información do descritor do ficheiro: %s" -#: gio/glocalfileinfo.c:2208 +#: gio/glocalfileinfo.c:2333 msgid "Invalid attribute type (uint32 expected)" msgstr "O tipo de atributo non é válido (esperábase uint32)" -#: gio/glocalfileinfo.c:2226 +#: gio/glocalfileinfo.c:2351 msgid "Invalid attribute type (uint64 expected)" msgstr "O tipo de atributo non é válido (esperábase uint64)" -#: gio/glocalfileinfo.c:2245 gio/glocalfileinfo.c:2264 +#: gio/glocalfileinfo.c:2370 gio/glocalfileinfo.c:2389 msgid "Invalid attribute type (byte string expected)" msgstr "O tipo de atributo non é válido (esperábase unha cadea de bytes)" -#: gio/glocalfileinfo.c:2311 +#: gio/glocalfileinfo.c:2436 msgid "Cannot set permissions on symlinks" msgstr "Non foi posíbel estabelecer os permisos nas ligazóns simbólicas" -#: gio/glocalfileinfo.c:2327 +#: gio/glocalfileinfo.c:2452 #, c-format msgid "Error setting permissions: %s" msgstr "Produciuse un erro ao estabelecer os permisos: %s" -#: gio/glocalfileinfo.c:2378 +#: gio/glocalfileinfo.c:2503 #, c-format msgid "Error setting owner: %s" msgstr "Produciuse un erro ao estabelecer o propietario: %s" -#: gio/glocalfileinfo.c:2401 +#: gio/glocalfileinfo.c:2526 msgid "symlink must be non-NULL" msgstr "a ligazón simbólica debe ser non nula" -#: gio/glocalfileinfo.c:2411 gio/glocalfileinfo.c:2430 -#: gio/glocalfileinfo.c:2441 +#: gio/glocalfileinfo.c:2536 gio/glocalfileinfo.c:2555 +#: gio/glocalfileinfo.c:2566 #, c-format msgid "Error setting symlink: %s" msgstr "Produciuse un erro ao estabelecer a ligazón simbólica: %s" -#: gio/glocalfileinfo.c:2420 +#: gio/glocalfileinfo.c:2545 msgid "Error setting symlink: file is not a symlink" msgstr "" "Produciuse un erro ao estabelecer a ligazón simbólica: o ficheiro non é unha " "ligazón" -#: gio/glocalfileinfo.c:2492 +#: gio/glocalfileinfo.c:2637 #, c-format msgid "Extra nanoseconds %d for UNIX timestamp %lld are negative" msgstr "" "Os nanosegundos %d adicionais en marcas de tempo UNIX %lld son negativas" -#: gio/glocalfileinfo.c:2501 +#: gio/glocalfileinfo.c:2646 #, c-format msgid "Extra nanoseconds %d for UNIX timestamp %lld reach 1 second" msgstr "" "Os nanosegundos %d adicionais en marcas de tempo UNIX %lld alcanzan 1 segundo" -#: gio/glocalfileinfo.c:2511 +#: gio/glocalfileinfo.c:2656 #, c-format msgid "UNIX timestamp %lld does not fit into 64 bits" msgstr "A marca de tempo UNIX %lld non colle nos 64 bits" -#: gio/glocalfileinfo.c:2522 +#: gio/glocalfileinfo.c:2667 #, c-format msgid "UNIX timestamp %lld is outside of the range supported by Windows" msgstr "A marca de tempo %lld está fóra do rango admitido por Windows" -#: gio/glocalfileinfo.c:2625 +#: gio/glocalfileinfo.c:2799 #, c-format msgid "File name “%s” cannot be converted to UTF-16" -msgstr "Non é posíbel converter o nome de ficheiro «%s» a UTF-16." +msgstr "Non é posíbel converter o nome de ficheiro «%s» a UTF-16" -#: gio/glocalfileinfo.c:2644 +#: gio/glocalfileinfo.c:2818 #, c-format msgid "File “%s” cannot be opened: Windows Error %lu" msgstr "Non é posíbel abrir o ficheiro «%s»: Erro de Windows %lu" -#: gio/glocalfileinfo.c:2657 +#: gio/glocalfileinfo.c:2831 #, c-format msgid "Error setting modification or access time for file “%s”: %lu" msgstr "" "Produciuse un erro ao estabelecer a data de modificación ou acceso para o " "ficheiro «%s»: %lu" -#: gio/glocalfileinfo.c:2798 gio/glocalfileinfo.c:2810 +#: gio/glocalfileinfo.c:2988 #, c-format msgid "Error setting modification or access time: %s" msgstr "" "Produciuse un erro ao modificar a configuración ou o tempo de acceso: %s" -#: gio/glocalfileinfo.c:2833 +#: gio/glocalfileinfo.c:3011 msgid "SELinux context must be non-NULL" msgstr "O contexto SELinux debe ser non-NULL" -#: gio/glocalfileinfo.c:2840 +#: gio/glocalfileinfo.c:3018 msgid "SELinux is not enabled on this system" msgstr "SELinux non está activado neste sistema" -#: gio/glocalfileinfo.c:2850 +#: gio/glocalfileinfo.c:3028 #, c-format msgid "Error setting SELinux context: %s" msgstr "Produciuse un erro ao estabelecer o contexto SELinux: %s" -#: gio/glocalfileinfo.c:2947 +#: gio/glocalfileinfo.c:3125 #, c-format msgid "Setting attribute %s not supported" msgstr "Non se permite estabelecer o atributo %s" @@ -3405,13 +3409,13 @@ msgid "Error renaming temporary file: %s" msgstr "Produciuse un erro ao renomear o ficheiro temporal: %s" -#: gio/glocalfileoutputstream.c:611 gio/glocalfileoutputstream.c:1241 +#: gio/glocalfileoutputstream.c:611 gio/glocalfileoutputstream.c:1242 #, c-format msgid "Error truncating file: %s" msgstr "Produciuse un erro ao truncar o ficheiro: %s" #: gio/glocalfileoutputstream.c:664 gio/glocalfileoutputstream.c:909 -#: gio/glocalfileoutputstream.c:1222 gio/gsubprocess.c:231 +#: gio/glocalfileoutputstream.c:1223 gio/gsubprocess.c:231 #, c-format msgid "Error opening file “%s”: %s" msgstr "Produciuse un erro ao abrir o ficheiro %s: %s" @@ -3428,7 +3432,7 @@ msgid "The file was externally modified" msgstr "O ficheiro foi modificado externamente" -#: gio/glocalfileoutputstream.c:1204 +#: gio/glocalfileoutputstream.c:1205 #, c-format msgid "Error removing old file: %s" msgstr "Produciuse un erro ao retirar o ficheiro antigo: %s" @@ -3575,8 +3579,8 @@ #. Translators: the first placeholder is a domain name, the #. * second is an error message #: gio/gresolver.c:403 gio/gthreadedresolver.c:152 gio/gthreadedresolver.c:170 -#: gio/gthreadedresolver.c:782 gio/gthreadedresolver.c:806 -#: gio/gthreadedresolver.c:831 gio/gthreadedresolver.c:846 +#: gio/gthreadedresolver.c:798 gio/gthreadedresolver.c:822 +#: gio/gthreadedresolver.c:847 gio/gthreadedresolver.c:862 #, c-format msgid "Error resolving “%s”: %s" msgstr "Produciuse un erro ao resolver «%s»: %s" @@ -3593,8 +3597,8 @@ #: gio/gresource.c:683 gio/gresource.c:945 gio/gresource.c:985 #: gio/gresource.c:1109 gio/gresource.c:1181 gio/gresource.c:1255 -#: gio/gresource.c:1336 gio/gresourcefile.c:478 gio/gresourcefile.c:601 -#: gio/gresourcefile.c:752 +#: gio/gresource.c:1336 gio/gresourcefile.c:478 gio/gresourcefile.c:602 +#: gio/gresourcefile.c:753 #, c-format msgid "The resource at “%s” does not exist" msgstr "Non existe o recurso en «%s»" @@ -3604,16 +3608,16 @@ msgid "The resource at “%s” failed to decompress" msgstr "Produciuse un erro ao descomprimir o recurso en «%s»" -#: gio/gresourcefile.c:658 +#: gio/gresourcefile.c:659 msgid "Resource files cannot be renamed" msgstr "Os ficheiros de recurso non se poden renomear" -#: gio/gresourcefile.c:748 +#: gio/gresourcefile.c:749 #, c-format msgid "The resource at “%s” is not a directory" msgstr "O recurso en «%s» non é un cartafol" -#: gio/gresourcefile.c:956 +#: gio/gresourcefile.c:957 msgid "Input stream doesn’t implement seek" msgstr "O fluxo de entrada non implementa seek" @@ -3981,7 +3985,7 @@ msgid "Socket is already closed" msgstr "O fluxo de orixe xa está pechado" -#: gio/gsocket.c:449 gio/gsocket.c:3201 gio/gsocket.c:4434 gio/gsocket.c:4492 +#: gio/gsocket.c:449 gio/gsocket.c:3225 gio/gsocket.c:4458 gio/gsocket.c:4516 msgid "Socket I/O timed out" msgstr "Tempo de espera do Socket de E/S superado" @@ -4079,74 +4083,74 @@ msgid "No support for IPv6 source-specific multicast" msgstr "Non se admite o multicast IPv6 específico da fonte" -#: gio/gsocket.c:2900 +#: gio/gsocket.c:2924 #, c-format msgid "Error accepting connection: %s" msgstr "Produciuse un erro ao aceptar a conexión: %s" -#: gio/gsocket.c:3026 +#: gio/gsocket.c:3050 msgid "Connection in progress" msgstr "Conexión en marcha" -#: gio/gsocket.c:3077 +#: gio/gsocket.c:3101 msgid "Unable to get pending error: " msgstr "Non é posíbel obter o erro pendente: " -#: gio/gsocket.c:3266 +#: gio/gsocket.c:3290 #, c-format msgid "Error receiving data: %s" msgstr "Produciuse un erro ao recibir datos: %s" -#: gio/gsocket.c:3463 +#: gio/gsocket.c:3487 #, c-format msgid "Error sending data: %s" msgstr "Produciuse un erro ao enviar datos: %s" -#: gio/gsocket.c:3650 +#: gio/gsocket.c:3674 #, c-format msgid "Unable to shutdown socket: %s" msgstr "Non é posíbel desconectar o socket: %s" -#: gio/gsocket.c:3731 +#: gio/gsocket.c:3755 #, c-format msgid "Error closing socket: %s" msgstr "Produciuse un erro ao pechar o socket: %s" -#: gio/gsocket.c:4427 +#: gio/gsocket.c:4451 #, c-format msgid "Waiting for socket condition: %s" msgstr "Agardando pola situación do socket: %s" -#: gio/gsocket.c:4817 gio/gsocket.c:4833 gio/gsocket.c:4846 +#: gio/gsocket.c:4841 gio/gsocket.c:4857 gio/gsocket.c:4870 #, c-format msgid "Unable to send message: %s" msgstr "Non foi posíbel enviar a mensaxe: %s" -#: gio/gsocket.c:4818 gio/gsocket.c:4834 gio/gsocket.c:4847 +#: gio/gsocket.c:4842 gio/gsocket.c:4858 gio/gsocket.c:4871 msgid "Message vectors too large" msgstr "Os vectores de mensaxes son moi largos" -#: gio/gsocket.c:4863 gio/gsocket.c:4865 gio/gsocket.c:5012 gio/gsocket.c:5097 -#: gio/gsocket.c:5275 gio/gsocket.c:5315 gio/gsocket.c:5317 +#: gio/gsocket.c:4887 gio/gsocket.c:4889 gio/gsocket.c:5036 gio/gsocket.c:5121 +#: gio/gsocket.c:5299 gio/gsocket.c:5339 gio/gsocket.c:5341 #, c-format msgid "Error sending message: %s" msgstr "Produciuse un erro ao enviar a mensaxe: %s" -#: gio/gsocket.c:5039 +#: gio/gsocket.c:5063 msgid "GSocketControlMessage not supported on Windows" msgstr "O GSocketControlMessage non está permitido en Windows" -#: gio/gsocket.c:5512 gio/gsocket.c:5588 gio/gsocket.c:5814 +#: gio/gsocket.c:5536 gio/gsocket.c:5612 gio/gsocket.c:5838 #, c-format msgid "Error receiving message: %s" msgstr "Produciuse un erro ao recibir a mensaxe: %s" -#: gio/gsocket.c:6099 gio/gsocket.c:6110 gio/gsocket.c:6173 +#: gio/gsocket.c:6123 gio/gsocket.c:6134 gio/gsocket.c:6197 #, c-format msgid "Unable to read socket credentials: %s" msgstr "Non é posíbel ler as credenciais do socket: %s" -#: gio/gsocket.c:6182 +#: gio/gsocket.c:6206 msgid "g_socket_get_credentials not implemented for this OS" msgstr "" "g_socket_get_credentials non está implementado para este sistema operativo" @@ -4273,14 +4277,14 @@ msgid "Unknown SOCKSv5 proxy error." msgstr "Erro no proxy SOCKSv5 descoñecido." -#: gio/gtestdbus.c:614 glib/gspawn-win32.c:354 +#: gio/gtestdbus.c:615 glib/gspawn-win32.c:354 #, c-format msgid "Failed to create pipe for communicating with child process (%s)" msgstr "" "Produciuse un erro ao crear a canalización para comunicarse co proceso fillo " "(%s)" -#: gio/gtestdbus.c:621 +#: gio/gtestdbus.c:622 #, c-format msgid "Pipes are not supported in this platform" msgstr "As tuberías non están soportadas nesta plataforma" @@ -4301,36 +4305,36 @@ #. Translators: the placeholder is a DNS record type, such as ‘MX’ or ‘SRV’ #: gio/gthreadedresolver.c:552 gio/gthreadedresolver.c:574 -#: gio/gthreadedresolver.c:612 gio/gthreadedresolver.c:659 -#: gio/gthreadedresolver.c:688 gio/gthreadedresolver.c:700 +#: gio/gthreadedresolver.c:628 gio/gthreadedresolver.c:675 +#: gio/gthreadedresolver.c:704 gio/gthreadedresolver.c:716 #, c-format msgid "Error parsing DNS %s record: malformed DNS packet" msgstr "" "Produciuse un erro ao analizar o rexistro de DNS %s: paquete DNS mal formado" -#: gio/gthreadedresolver.c:758 gio/gthreadedresolver.c:895 -#: gio/gthreadedresolver.c:993 gio/gthreadedresolver.c:1043 +#: gio/gthreadedresolver.c:774 gio/gthreadedresolver.c:911 +#: gio/gthreadedresolver.c:1009 gio/gthreadedresolver.c:1059 #, c-format msgid "No DNS record of the requested type for “%s”" msgstr "Non hai un rexistro de DNS do tipo solicitado para «%s»" -#: gio/gthreadedresolver.c:763 gio/gthreadedresolver.c:998 +#: gio/gthreadedresolver.c:779 gio/gthreadedresolver.c:1014 #, c-format msgid "Temporarily unable to resolve “%s”" msgstr "Non é posíbel resolver temporalmente «%s»" -#: gio/gthreadedresolver.c:768 gio/gthreadedresolver.c:1003 -#: gio/gthreadedresolver.c:1113 +#: gio/gthreadedresolver.c:784 gio/gthreadedresolver.c:1019 +#: gio/gthreadedresolver.c:1129 #, c-format msgid "Error resolving “%s”" msgstr "Produciuse un erro ao resolver «%s»" -#: gio/gthreadedresolver.c:782 gio/gthreadedresolver.c:806 -#: gio/gthreadedresolver.c:831 gio/gthreadedresolver.c:846 +#: gio/gthreadedresolver.c:798 gio/gthreadedresolver.c:822 +#: gio/gthreadedresolver.c:847 gio/gthreadedresolver.c:862 msgid "Malformed DNS packet" msgstr "Paquete DNS mal formado" -#: gio/gthreadedresolver.c:888 +#: gio/gthreadedresolver.c:904 #, c-format msgid "Failed to parse DNS response for “%s”: " msgstr "Produciuse un erro ao analizar a resposta DNS para «%s»: " @@ -4458,7 +4462,7 @@ msgid "Error closing file descriptor: %s" msgstr "Produciuse un erro ao pechar o descritor do ficheiro: %s" -#: gio/gunixmounts.c:2815 gio/gunixmounts.c:2868 +#: gio/gunixmounts.c:2817 gio/gunixmounts.c:2870 msgid "Filesystem root" msgstr "Raíz do sistema de ficheiros" @@ -4541,79 +4545,79 @@ msgid "Wrong args\n" msgstr "Argumentos incorrectos\n" -#: glib/gbookmarkfile.c:779 +#: glib/gbookmarkfile.c:861 #, c-format msgid "Unexpected attribute “%s” for element “%s”" msgstr "Atributo «%s» inesperado para o elemento «%s»" -#: glib/gbookmarkfile.c:790 glib/gbookmarkfile.c:870 glib/gbookmarkfile.c:880 -#: glib/gbookmarkfile.c:993 +#: glib/gbookmarkfile.c:872 glib/gbookmarkfile.c:952 glib/gbookmarkfile.c:962 +#: glib/gbookmarkfile.c:1075 #, c-format msgid "Attribute “%s” of element “%s” not found" msgstr "Non se atopou o atributo «%s» do elemento «%s»" -#: glib/gbookmarkfile.c:1202 glib/gbookmarkfile.c:1267 -#: glib/gbookmarkfile.c:1331 glib/gbookmarkfile.c:1341 +#: glib/gbookmarkfile.c:1284 glib/gbookmarkfile.c:1349 +#: glib/gbookmarkfile.c:1413 glib/gbookmarkfile.c:1423 #, c-format msgid "Unexpected tag “%s”, tag “%s” expected" msgstr "Etiqueta «%s» inesperada, esperábase a etiqueta «%s»" -#: glib/gbookmarkfile.c:1227 glib/gbookmarkfile.c:1241 -#: glib/gbookmarkfile.c:1309 glib/gbookmarkfile.c:1355 +#: glib/gbookmarkfile.c:1309 glib/gbookmarkfile.c:1323 +#: glib/gbookmarkfile.c:1391 glib/gbookmarkfile.c:1437 #, c-format msgid "Unexpected tag “%s” inside “%s”" msgstr "Etiqueta «%s» inesperada dentro de «%s»" -#: glib/gbookmarkfile.c:1635 +#: glib/gbookmarkfile.c:1717 #, c-format msgid "Invalid date/time ‘%s’ in bookmark file" msgstr "Data/Hora «%s» non válida no ficheiro de marcador" -#: glib/gbookmarkfile.c:1838 +#: glib/gbookmarkfile.c:1956 msgid "No valid bookmark file found in data dirs" msgstr "" "Non foi posíbel atopar un ficheiro de marcadores válido nos directorios de " "datos" -#: glib/gbookmarkfile.c:2039 +#: glib/gbookmarkfile.c:2157 #, c-format msgid "A bookmark for URI “%s” already exists" msgstr "Xa existe un marcador para o URI «%s»" -#: glib/gbookmarkfile.c:2088 glib/gbookmarkfile.c:2246 -#: glib/gbookmarkfile.c:2331 glib/gbookmarkfile.c:2411 -#: glib/gbookmarkfile.c:2496 glib/gbookmarkfile.c:2630 -#: glib/gbookmarkfile.c:2763 glib/gbookmarkfile.c:2898 -#: glib/gbookmarkfile.c:2940 glib/gbookmarkfile.c:3037 -#: glib/gbookmarkfile.c:3158 glib/gbookmarkfile.c:3352 -#: glib/gbookmarkfile.c:3493 glib/gbookmarkfile.c:3712 -#: glib/gbookmarkfile.c:3801 glib/gbookmarkfile.c:3890 -#: glib/gbookmarkfile.c:4009 +#: glib/gbookmarkfile.c:2206 glib/gbookmarkfile.c:2364 +#: glib/gbookmarkfile.c:2449 glib/gbookmarkfile.c:2529 +#: glib/gbookmarkfile.c:2614 glib/gbookmarkfile.c:2748 +#: glib/gbookmarkfile.c:2881 glib/gbookmarkfile.c:3016 +#: glib/gbookmarkfile.c:3058 glib/gbookmarkfile.c:3155 +#: glib/gbookmarkfile.c:3276 glib/gbookmarkfile.c:3470 +#: glib/gbookmarkfile.c:3611 glib/gbookmarkfile.c:3830 +#: glib/gbookmarkfile.c:3919 glib/gbookmarkfile.c:4008 +#: glib/gbookmarkfile.c:4127 #, c-format msgid "No bookmark found for URI “%s”" msgstr "Non se atopou ningún marcador para o URI «%s»" -#: glib/gbookmarkfile.c:2420 +#: glib/gbookmarkfile.c:2538 #, c-format msgid "No MIME type defined in the bookmark for URI “%s”" msgstr "Non hai ningún tipo MIME definido no marcador para o URI «%s»" -#: glib/gbookmarkfile.c:2505 +#: glib/gbookmarkfile.c:2623 #, c-format msgid "No private flag has been defined in bookmark for URI “%s”" msgstr "Non se definiu ningún parámetro privado no marcador para o URI «%s»" -#: glib/gbookmarkfile.c:3046 +#: glib/gbookmarkfile.c:3164 #, c-format msgid "No groups set in bookmark for URI “%s”" msgstr "Non existe ningún grupo definido no marcador para o URI «%s»" -#: glib/gbookmarkfile.c:3514 glib/gbookmarkfile.c:3722 +#: glib/gbookmarkfile.c:3632 glib/gbookmarkfile.c:3840 #, c-format msgid "No application with name “%s” registered a bookmark for “%s”" msgstr "Ningunha aplicación denominada «%s» rexistrou un marcador para «%s»" -#: glib/gbookmarkfile.c:3745 +#: glib/gbookmarkfile.c:3863 #, c-format msgid "Failed to expand exec line “%s” with URI “%s”" msgstr "Produciuse un erro ao expandir a liña executábel «%s» co URI «%s»" @@ -5090,83 +5094,83 @@ msgid "Error opening directory “%s”: %s" msgstr "Produciuse un erro ao abrir o directorio «%s»: %s" -#: glib/gfileutils.c:735 glib/gfileutils.c:827 +#: glib/gfileutils.c:753 glib/gfileutils.c:845 #, c-format msgid "Could not allocate %lu byte to read file “%s”" msgid_plural "Could not allocate %lu bytes to read file “%s”" msgstr0 "Non foi posíbel asignar %lu byte para ler o ficheiro «%s»" msgstr1 "Non foi posíbel asignar %lu bytes para ler o ficheiro «%s»" -#: glib/gfileutils.c:752 +#: glib/gfileutils.c:770 #, c-format msgid "Error reading file “%s”: %s" msgstr "Produciuse un erro ao ler o ficheiro «%s»: %s" -#: glib/gfileutils.c:788 +#: glib/gfileutils.c:806 #, c-format msgid "File “%s” is too large" msgstr "O ficheiro «%s» é demasiado grande" -#: glib/gfileutils.c:852 +#: glib/gfileutils.c:870 #, c-format msgid "Failed to read from file “%s”: %s" msgstr "Produciuse un erro ao ler desde o ficheiro «%s»: %s" -#: glib/gfileutils.c:902 glib/gfileutils.c:977 glib/gfileutils.c:1449 +#: glib/gfileutils.c:920 glib/gfileutils.c:995 glib/gfileutils.c:1472 #, c-format msgid "Failed to open file “%s”: %s" msgstr "Produciuse un erro ao abrir o ficheiro «%s»: %s" -#: glib/gfileutils.c:915 +#: glib/gfileutils.c:933 #, c-format msgid "Failed to get attributes of file “%s”: fstat() failed: %s" msgstr "" "Produciuse un erro ao obter os atributos do ficheiro «%s»: fstat() fallou: %s" -#: glib/gfileutils.c:946 +#: glib/gfileutils.c:964 #, c-format msgid "Failed to open file “%s”: fdopen() failed: %s" msgstr "Produciuse un erro ao abrir o ficheiro «%s»: fdopen() fallou: %s" -#: glib/gfileutils.c:1047 +#: glib/gfileutils.c:1065 #, c-format msgid "Failed to rename file “%s” to “%s”: g_rename() failed: %s" msgstr "" "Produciuse un erro ao renomear o ficheiro «%s» como «%s»: g_rename() fallou: " "%s" -#: glib/gfileutils.c:1156 +#: glib/gfileutils.c:1179 #, c-format msgid "Failed to write file “%s”: write() failed: %s" msgstr "Produciuse un erro ao escribir o ficheiro «%s»: write() fallou: %s" -#: glib/gfileutils.c:1177 +#: glib/gfileutils.c:1200 #, c-format msgid "Failed to write file “%s”: fsync() failed: %s" msgstr "Produciuse un erro ao escribir o ficheiro «%s»: fsync() fallou: %s" -#: glib/gfileutils.c:1338 glib/gfileutils.c:1753 +#: glib/gfileutils.c:1361 glib/gfileutils.c:1776 #, c-format msgid "Failed to create file “%s”: %s" msgstr "Produciuse un erro ao crear o ficheiro «%s»: %s" -#: glib/gfileutils.c:1383 +#: glib/gfileutils.c:1406 #, c-format msgid "Existing file “%s” could not be removed: g_unlink() failed: %s" msgstr "" "Non foi posíbel retirar o ficheiro existente «%s»: g_unlink() fallou: %s" -#: glib/gfileutils.c:1718 +#: glib/gfileutils.c:1741 #, c-format msgid "Template “%s” invalid, should not contain a “%s”" msgstr "O modelo «%s» non é válido, non debería conter «%s»" -#: glib/gfileutils.c:1731 +#: glib/gfileutils.c:1754 #, c-format msgid "Template “%s” doesn’t contain XXXXXX" msgstr "O modelo «%s» non contén XXXXXX" -#: glib/gfileutils.c:2291 glib/gfileutils.c:2320 +#: glib/gfileutils.c:2348 glib/gfileutils.c:2377 #, c-format msgid "Failed to read the symbolic link “%s”: %s" msgstr "Produciuse un erro ao ler a ligazón simbólica «%s»: %s" @@ -5193,16 +5197,16 @@ msgid "Can’t do a raw read in g_io_channel_read_to_end" msgstr "Non é posíbel facer unha lectura en bruto en g_io_channel_read_to_end" -#: glib/gkeyfile.c:796 +#: glib/gkeyfile.c:800 msgid "Valid key file could not be found in search dirs" msgstr "" "Non é posíbel atopar un ficheiro de clave correcto nos directorios de busca" -#: glib/gkeyfile.c:833 +#: glib/gkeyfile.c:837 msgid "Not a regular file" msgstr "Non é un ficheiro normal" -#: glib/gkeyfile.c:1291 +#: glib/gkeyfile.c:1295 #, c-format msgid "" "Key file contains line “%s” which is not a key-value pair, group, or comment" @@ -5210,43 +5214,43 @@ "O ficheiro clave contén a liña «%s» que non é un par valor-clave, grupo ou " "comentario" -#: glib/gkeyfile.c:1348 +#: glib/gkeyfile.c:1352 #, c-format msgid "Invalid group name: %s" msgstr "Nome de grupo non válido: %s" -#: glib/gkeyfile.c:1372 +#: glib/gkeyfile.c:1376 msgid "Key file does not start with a group" msgstr "O ficheiro clave non comeza cun grupo" -#: glib/gkeyfile.c:1396 +#: glib/gkeyfile.c:1400 #, c-format msgid "Invalid key name: %.*s" msgstr "Nome de chave non válido: %.*s" -#: glib/gkeyfile.c:1424 +#: glib/gkeyfile.c:1428 #, c-format msgid "Key file contains unsupported encoding “%s”" msgstr "O ficheiro clave contén unha codificación non permitida «%s»" -#: glib/gkeyfile.c:1679 glib/gkeyfile.c:1852 glib/gkeyfile.c:3299 -#: glib/gkeyfile.c:3363 glib/gkeyfile.c:3493 glib/gkeyfile.c:3625 -#: glib/gkeyfile.c:3771 glib/gkeyfile.c:4006 glib/gkeyfile.c:4073 +#: glib/gkeyfile.c:1683 glib/gkeyfile.c:1856 glib/gkeyfile.c:3303 +#: glib/gkeyfile.c:3367 glib/gkeyfile.c:3497 glib/gkeyfile.c:3626 +#: glib/gkeyfile.c:3772 glib/gkeyfile.c:4007 glib/gkeyfile.c:4074 #, c-format msgid "Key file does not have group “%s”" msgstr "O ficheiro clave non ten un grupo «%s»" -#: glib/gkeyfile.c:1807 +#: glib/gkeyfile.c:1811 #, c-format msgid "Key file does not have key “%s” in group “%s”" msgstr "O ficheiro clave non ten a clave «%s» no grupo «%s»" -#: glib/gkeyfile.c:1969 glib/gkeyfile.c:2085 +#: glib/gkeyfile.c:1973 glib/gkeyfile.c:2089 #, c-format msgid "Key file contains key “%s” with value “%s” which is not UTF-8" msgstr "O ficheiro clave contén a clave «%s» co valor «%s» que non é UTF-8" -#: glib/gkeyfile.c:1989 glib/gkeyfile.c:2105 glib/gkeyfile.c:2544 +#: glib/gkeyfile.c:1993 glib/gkeyfile.c:2109 glib/gkeyfile.c:2548 #, c-format msgid "" "Key file contains key “%s” which has a value that cannot be interpreted." @@ -5254,7 +5258,7 @@ "O ficheiro clave contén a clave «%s» que ten un valor que non é posíbel " "interpretar." -#: glib/gkeyfile.c:2759 glib/gkeyfile.c:3128 +#: glib/gkeyfile.c:2763 glib/gkeyfile.c:3132 #, c-format msgid "" "Key file contains key “%s” in group “%s” which has a value that cannot be " @@ -5263,83 +5267,83 @@ "O ficheiro clave contén a clave «%s» no grupo «%s» que ten un valor que non " "é posíbel interpretar." -#: glib/gkeyfile.c:2837 glib/gkeyfile.c:2914 +#: glib/gkeyfile.c:2841 glib/gkeyfile.c:2918 #, c-format msgid "Key “%s” in group “%s” has value “%s” where %s was expected" msgstr "A clave «%s» do grupo «%s» ten o valor «%s», pero agardábase %s" -#: glib/gkeyfile.c:4326 +#: glib/gkeyfile.c:4327 msgid "Key file contains escape character at end of line" msgstr "O ficheiro clave contén un carácter de escape ao final da liña" -#: glib/gkeyfile.c:4348 +#: glib/gkeyfile.c:4349 #, c-format msgid "Key file contains invalid escape sequence “%s”" msgstr "O ficheiro clave contén a secuencia de escape non válida «%s»" -#: glib/gkeyfile.c:4493 +#: glib/gkeyfile.c:4494 #, c-format msgid "Value “%s” cannot be interpreted as a number." msgstr "Non é posíbel interpretar o valor «%s» como un número." -#: glib/gkeyfile.c:4507 +#: glib/gkeyfile.c:4508 #, c-format msgid "Integer value “%s” out of range" msgstr "O valor enteiro «%s» está fóra do intervalo" -#: glib/gkeyfile.c:4540 +#: glib/gkeyfile.c:4541 #, c-format msgid "Value “%s” cannot be interpreted as a float number." msgstr "Non é posíbel interpretar o valor «%s» como un número flotante." -#: glib/gkeyfile.c:4579 +#: glib/gkeyfile.c:4580 #, c-format msgid "Value “%s” cannot be interpreted as a boolean." msgstr "Non é posíbel interpretar o valor «%s» como un booleano." -#: glib/gmappedfile.c:131 +#: glib/gmappedfile.c:135 #, c-format msgid "Failed to get attributes of file “%s%s%s%s”: fstat() failed: %s" msgstr "" "Produciuse un erro ao obter os atributos do ficheiro «%s%s%s%s»: fstat() " "fallou: %s" -#: glib/gmappedfile.c:197 +#: glib/gmappedfile.c:201 #, c-format msgid "Failed to map %s%s%s%s: mmap() failed: %s" msgstr "Produciuse un erro ao mapear «%s%s%s%s»: mmap() fallou: %s" -#: glib/gmappedfile.c:264 +#: glib/gmappedfile.c:268 #, c-format msgid "Failed to open file “%s”: open() failed: %s" msgstr "Produciuse un erro ao abrir o ficheiro «%s»: open() fallou: %s" -#: glib/gmarkup.c:400 glib/gmarkup.c:442 +#: glib/gmarkup.c:398 glib/gmarkup.c:440 #, c-format msgid "Error on line %d char %d: " msgstr "Erro na liña %d carácter %d: " -#: glib/gmarkup.c:464 glib/gmarkup.c:547 +#: glib/gmarkup.c:462 glib/gmarkup.c:545 #, c-format msgid "Invalid UTF-8 encoded text in name — not valid “%s”" msgstr "O texto do nome codificado en UTF-8 non é válido - «%s» non válido" -#: glib/gmarkup.c:475 +#: glib/gmarkup.c:473 #, c-format msgid "“%s” is not a valid name" msgstr "«%s» non é un nome válido" -#: glib/gmarkup.c:491 +#: glib/gmarkup.c:489 #, c-format msgid "“%s” is not a valid name: “%c”" msgstr "«%s» non é un nome válido: '%c'" -#: glib/gmarkup.c:615 +#: glib/gmarkup.c:613 #, c-format msgid "Error on line %d: %s" msgstr "Erro na liña %d: %s" -#: glib/gmarkup.c:692 +#: glib/gmarkup.c:690 #, c-format msgid "" "Failed to parse “%-.*s”, which should have been a digit inside a character " @@ -5349,7 +5353,7 @@ "dunha referencia de carácter (por exemplo ê) - pode que o díxito sexa " "grande de máis" -#: glib/gmarkup.c:704 +#: glib/gmarkup.c:702 msgid "" "Character reference did not end with a semicolon; most likely you used an " "ampersand character without intending to start an entity — escape ampersand " @@ -5359,24 +5363,24 @@ "utilizou un carácter & sen intención de comezar unha entidade - escape o & " "como &" -#: glib/gmarkup.c:730 +#: glib/gmarkup.c:728 #, c-format msgid "Character reference “%-.*s” does not encode a permitted character" msgstr "A referencia de carácter «%-.*s» non codifica un carácter permitido" -#: glib/gmarkup.c:768 +#: glib/gmarkup.c:766 msgid "" "Empty entity “&;” seen; valid entities are: & " < > '" msgstr "" "Detectada unha entidade baleira «&;»; as entidades válidas son: & " " "< > '" -#: glib/gmarkup.c:776 +#: glib/gmarkup.c:774 #, c-format msgid "Entity name “%-.*s” is not known" msgstr "Non se coñece o nome de entidade «%-.*s»" -#: glib/gmarkup.c:781 +#: glib/gmarkup.c:779 msgid "" "Entity did not end with a semicolon; most likely you used an ampersand " "character without intending to start an entity — escape ampersand as &" @@ -5384,11 +5388,11 @@ "A entidade non remata cun punto e coma, probabelmente usou o carácter & sen " "a intención de comezar unha entidade, escriba o & como &" -#: glib/gmarkup.c:1195 +#: glib/gmarkup.c:1193 msgid "Document must begin with an element (e.g. <book>)" msgstr "O documento debe comezar cun elemento (por exemplo <book>)" -#: glib/gmarkup.c:1235 +#: glib/gmarkup.c:1233 #, c-format msgid "" "“%s” is not a valid character following a “<” character; it may not begin an " @@ -5397,7 +5401,7 @@ "«%s» non é un carácter válido despois dun carácter «<»; non pode iniciar un " "nome de elemento" -#: glib/gmarkup.c:1278 +#: glib/gmarkup.c:1276 #, c-format msgid "" "Odd character “%s”, expected a “>” character to end the empty-element tag " @@ -5406,12 +5410,12 @@ "Carácter estraño «%s», esperábase un carácter «>» para pechar a etiqueta de " "elemento baleiro «%s»" -#: glib/gmarkup.c:1348 +#: glib/gmarkup.c:1346 #, c-format msgid "Too many attributes in element “%s”" msgstr "Hai demasiados atributos no elemento «%s»" -#: glib/gmarkup.c:1368 +#: glib/gmarkup.c:1366 #, c-format msgid "" "Odd character “%s”, expected a “=” after attribute name “%s” of element “%s”" @@ -5419,7 +5423,7 @@ "Carácter estraño «%s», esperábase un «=» despois do nome do atributo «%s» do " "elemento «%s»" -#: glib/gmarkup.c:1410 +#: glib/gmarkup.c:1408 #, c-format msgid "" "Odd character “%s”, expected a “>” or “/” character to end the start tag of " @@ -5430,7 +5434,7 @@ "etiqueta de comezo do elemento «%s» ou opcionalmente un atributo; quizais " "usou un carácter non válido no nome dun atributo" -#: glib/gmarkup.c:1455 +#: glib/gmarkup.c:1453 #, c-format msgid "" "Odd character “%s”, expected an open quote mark after the equals sign when " @@ -5439,7 +5443,7 @@ "Carácter estraño «%s», esperábase unhas comiñas de apertura despois do signo " "igual para dar un valor ao atributo «%s» do elemento «%s»" -#: glib/gmarkup.c:1589 +#: glib/gmarkup.c:1587 #, c-format msgid "" "“%s” is not a valid character following the characters “</”; “%s” may not " @@ -5448,7 +5452,7 @@ "«%s» non é un carácter válido despois dos caracteres «</»; «%s» non pode " "comezar o nome dun elemento" -#: glib/gmarkup.c:1627 +#: glib/gmarkup.c:1625 #, c-format msgid "" "“%s” is not a valid character following the close element name “%s”; the " @@ -5457,25 +5461,25 @@ "«%s» non é un carácter válido despois do nome de elemento de peche «%s»; o " "carácter permitido é «>»" -#: glib/gmarkup.c:1639 +#: glib/gmarkup.c:1637 #, c-format msgid "Element “%s” was closed, no element is currently open" msgstr "Pechouse o elemento «%s», actualmente non hai ningún elemento aberto" -#: glib/gmarkup.c:1648 +#: glib/gmarkup.c:1646 #, c-format msgid "Element “%s” was closed, but the currently open element is “%s”" msgstr "Pechouse o elemento «%s», mais o elemento aberto actualmente é «%s»" -#: glib/gmarkup.c:1801 +#: glib/gmarkup.c:1799 msgid "Document was empty or contained only whitespace" msgstr "O documento estaba baleiro ou só contiña espazos en branco" -#: glib/gmarkup.c:1815 +#: glib/gmarkup.c:1813 msgid "Document ended unexpectedly just after an open angle bracket “<”" msgstr "O documento rematou inesperadamente despois dun símbolo menor que «<»" -#: glib/gmarkup.c:1823 glib/gmarkup.c:1868 +#: glib/gmarkup.c:1821 glib/gmarkup.c:1866 #, c-format msgid "" "Document ended unexpectedly with elements still open — “%s” was the last " @@ -5484,7 +5488,7 @@ "O documento rematou inesperadamente con elementos aínda abertos - «%s» foi o " "último elemento aberto" -#: glib/gmarkup.c:1831 +#: glib/gmarkup.c:1829 #, c-format msgid "" "Document ended unexpectedly, expected to see a close angle bracket ending " @@ -5493,21 +5497,21 @@ "O documento rematou inesperadamente, esperábase ver un símbolo maior que '>' " "que pechase a etiqueta <%s/>" -#: glib/gmarkup.c:1837 +#: glib/gmarkup.c:1835 msgid "Document ended unexpectedly inside an element name" msgstr "O documento rematou inesperadamente dentro dun nome de elemento" -#: glib/gmarkup.c:1843 +#: glib/gmarkup.c:1841 msgid "Document ended unexpectedly inside an attribute name" msgstr "O documento rematou inesperadamente dentro dun nome de atributo" -#: glib/gmarkup.c:1848 +#: glib/gmarkup.c:1846 msgid "Document ended unexpectedly inside an element-opening tag." msgstr "" "O documento rematou inesperadamente dentro dunha etiqueta de comezo de " "elemento." -#: glib/gmarkup.c:1854 +#: glib/gmarkup.c:1852 msgid "" "Document ended unexpectedly after the equals sign following an attribute " "name; no attribute value" @@ -5515,25 +5519,25 @@ "O documento rematou inesperadamente despois do signo igual que segue a un " "nome de atributo; non hai valor de atributo" -#: glib/gmarkup.c:1861 +#: glib/gmarkup.c:1859 msgid "Document ended unexpectedly while inside an attribute value" msgstr "O documento rematou inesperadamente dentro dun valor de atributo" -#: glib/gmarkup.c:1878 +#: glib/gmarkup.c:1876 #, c-format msgid "Document ended unexpectedly inside the close tag for element “%s”" msgstr "" "O documento rematou inesperadamente dentro da etiqueta que pechaba o " "elemento «%s»" -#: glib/gmarkup.c:1882 +#: glib/gmarkup.c:1880 msgid "" "Document ended unexpectedly inside the close tag for an unopened element" msgstr "" "O documento rematou inesperadamente dentro da etiqueta que pechaba o " "elemento «%s»" -#: glib/gmarkup.c:1888 +#: glib/gmarkup.c:1886 msgid "Document ended unexpectedly inside a comment or processing instruction" msgstr "" "O documento rematou inesperadamente dentro dun comentario ou instrución de " @@ -5598,186 +5602,186 @@ msgid "Unknown option %s" msgstr "Opción %s descoñecida" -#: glib/gregex.c:436 +#: glib/gregex.c:479 msgid "corrupted object" msgstr "obxecto danado" -#: glib/gregex.c:438 +#: glib/gregex.c:481 msgid "out of memory" msgstr "sen memoria" -#: glib/gregex.c:443 +#: glib/gregex.c:487 msgid "backtracking limit reached" msgstr "alcanzouse o límite de \"backtracking\"" -#: glib/gregex.c:454 glib/gregex.c:707 glib/gregex.c:736 +#: glib/gregex.c:498 msgid "internal error" msgstr "erro interno" -#: glib/gregex.c:456 +#: glib/gregex.c:500 msgid "the pattern contains items not supported for partial matching" msgstr "o patrón contén elementos non permitidos na coincidencia parcial" -#: glib/gregex.c:458 +#: glib/gregex.c:502 msgid "back references as conditions are not supported for partial matching" msgstr "" "as referencias anteriores como condicións non se permiten na coincidencia " "parcial" -#: glib/gregex.c:464 +#: glib/gregex.c:508 msgid "recursion limit reached" msgstr "atinxiuse o límite de recursividade" -#: glib/gregex.c:466 +#: glib/gregex.c:510 msgid "bad offset" msgstr "desprazamento erróneo" -#: glib/gregex.c:468 +#: glib/gregex.c:512 msgid "recursion loop" msgstr "bucle de repetición" #. should not happen in GRegex since we check modes before each match -#: glib/gregex.c:471 +#: glib/gregex.c:515 msgid "matching mode is requested that was not compiled for JIT" msgstr "o modo coincidente solicítase como se non fora compilado por JIT" -#: glib/gregex.c:475 +#: glib/gregex.c:536 glib/gregex.c:1838 msgid "unknown error" msgstr "erro descoñecido" -#: glib/gregex.c:496 +#: glib/gregex.c:557 msgid "\\ at end of pattern" msgstr "\\ ao final do patrón" -#: glib/gregex.c:500 +#: glib/gregex.c:561 msgid "\\c at end of pattern" msgstr "\\c ao final do patrón" -#: glib/gregex.c:505 +#: glib/gregex.c:566 msgid "unrecognized character following \\" msgstr "carácter non recoñecido despois de \\" -#: glib/gregex.c:509 +#: glib/gregex.c:570 msgid "numbers out of order in {} quantifier" msgstr "números fóra do intervalo no cuantificador {}" -#: glib/gregex.c:513 +#: glib/gregex.c:574 msgid "number too big in {} quantifier" msgstr "número demasiado grande no cuantificador {}" -#: glib/gregex.c:517 +#: glib/gregex.c:578 msgid "missing terminating for character class" msgstr "falta a terminación para a clase de carácter" -#: glib/gregex.c:521 +#: glib/gregex.c:582 msgid "invalid escape sequence in character class" msgstr "secuencia de escape non válida na clase de carácter" -#: glib/gregex.c:525 +#: glib/gregex.c:586 msgid "range out of order in character class" msgstr "intervalo fóra de orde na clase de carácter" -#: glib/gregex.c:530 +#: glib/gregex.c:591 msgid "nothing to repeat" msgstr "nada que repetir" -#: glib/gregex.c:534 +#: glib/gregex.c:595 msgid "unrecognized character after (? or (?-" msgstr "carácter non recoñecido despois de (? ou (?-" -#: glib/gregex.c:538 +#: glib/gregex.c:599 msgid "POSIX named classes are supported only within a class" msgstr "As clases de nomes POSIX só se permiten dentro dunha clase" -#: glib/gregex.c:542 +#: glib/gregex.c:603 msgid "POSIX collating elements are not supported" msgstr "Os elementos de colación POSIX non se admiten" -#: glib/gregex.c:548 +#: glib/gregex.c:609 msgid "missing terminating )" msgstr "falta o ) de terminación" -#: glib/gregex.c:552 +#: glib/gregex.c:613 msgid "reference to non-existent subpattern" msgstr "referencia a un subpatrón non existente" -#: glib/gregex.c:556 +#: glib/gregex.c:617 msgid "missing ) after comment" msgstr "falta un ) despois do comentario" -#: glib/gregex.c:560 +#: glib/gregex.c:621 msgid "regular expression is too large" msgstr "a expresión regular é demasiado longa" -#: glib/gregex.c:564 +#: glib/gregex.c:625 msgid "malformed number or name after (?(" msgstr "número ou nome formado incorrectamente despois de (?(" -#: glib/gregex.c:568 +#: glib/gregex.c:629 msgid "lookbehind assertion is not fixed length" msgstr "a aserción lockbehind non ten unha lonxitude fixa" -#: glib/gregex.c:572 +#: glib/gregex.c:633 msgid "conditional group contains more than two branches" msgstr "o grupo condicional contén máis de dúas ramas" -#: glib/gregex.c:576 +#: glib/gregex.c:637 msgid "assertion expected after (?(" msgstr "esperábase unha aserción despois de (?(" -#: glib/gregex.c:580 +#: glib/gregex.c:641 msgid "a numbered reference must not be zero" msgstr "unha referencia co número non pode ser cero" -#: glib/gregex.c:584 +#: glib/gregex.c:645 msgid "unknown POSIX class name" msgstr "nome de clase POSIX descoñecida" -#: glib/gregex.c:589 +#: glib/gregex.c:650 msgid "character value in \\x{...} sequence is too large" -msgstr "o valor do carácter na secuencia \\x{…} é demasiado longo" +msgstr "o valor do carácter na secuencia \\x{...} é demasiado longo" -#: glib/gregex.c:593 +#: glib/gregex.c:654 msgid "\\C not allowed in lookbehind assertion" msgstr "non se permite \\C en asercións lookbehind" -#: glib/gregex.c:597 +#: glib/gregex.c:658 msgid "missing terminator in subpattern name" msgstr "falta a terminación no nome do subpatrón" -#: glib/gregex.c:601 +#: glib/gregex.c:662 msgid "two named subpatterns have the same name" msgstr "dous subpatróns teñen o mesmo nome" -#: glib/gregex.c:605 +#: glib/gregex.c:666 msgid "malformed \\P or \\p sequence" msgstr "secuencia \\P ou \\p formada incorrectamente" -#: glib/gregex.c:609 +#: glib/gregex.c:670 msgid "unknown property name after \\P or \\p" msgstr "nome de propiedade descoñecido despois de \\P ou \\p" -#: glib/gregex.c:613 +#: glib/gregex.c:674 msgid "subpattern name is too long (maximum 32 characters)" msgstr "o nome do subpatrón é demasiado longo (máximo 32 caracteres)" -#: glib/gregex.c:617 +#: glib/gregex.c:678 msgid "too many named subpatterns (maximum 10,000)" msgstr "demasiados subpatróns con nome (máximo 10.000)" -#: glib/gregex.c:621 +#: glib/gregex.c:682 msgid "octal value is greater than \\377" msgstr "o valor octal é maior que \\377" -#: glib/gregex.c:625 +#: glib/gregex.c:686 msgid "DEFINE group contains more than one branch" msgstr "O grupo DEFINE contén máis dunha rama" -#: glib/gregex.c:629 +#: glib/gregex.c:690 msgid "inconsistent NEWLINE options" msgstr "opcións NEWLINE inconsistentes" -#: glib/gregex.c:633 +#: glib/gregex.c:694 msgid "" "\\g is not followed by a braced, angle-bracketed, or quoted name or number, " "or by a plain number" @@ -5785,122 +5789,121 @@ "\\g non está seguido por un nome entre chaves, corchetes angulares ou un " "número entre comiñas, ou por un número simple" -#: glib/gregex.c:638 +#: glib/gregex.c:699 msgid "an argument is not allowed for (*ACCEPT), (*FAIL), or (*COMMIT)" msgstr "non se permite un argumento para (*ACCEPT), (*FAIL), ou (*COMMIT)" -#: glib/gregex.c:642 +#: glib/gregex.c:703 msgid "(*VERB) not recognized" msgstr "(*VERB) no recoñecido" -#: glib/gregex.c:646 +#: glib/gregex.c:707 msgid "number is too big" msgstr "o número é demasiado grande" -#: glib/gregex.c:650 +#: glib/gregex.c:711 msgid "missing subpattern name after (?&" msgstr "falta o nome do subpatrón despois de (?&" -#: glib/gregex.c:654 +#: glib/gregex.c:715 msgid "different names for subpatterns of the same number are not allowed" msgstr "non se permiten diferentes nomes para subpatróns do mesmo número" -#: glib/gregex.c:658 +#: glib/gregex.c:719 msgid "(*MARK) must have an argument" msgstr "(*MARK) debe ter un argumento" -#: glib/gregex.c:662 +#: glib/gregex.c:723 msgid "\\c must be followed by an ASCII character" msgstr "\\c debe estar seguido dun carácter ASCII" -#: glib/gregex.c:666 +#: glib/gregex.c:727 msgid "\\k is not followed by a braced, angle-bracketed, or quoted name" msgstr "" "\\k non está seguido por un nome entre chaves, corchetes angulares ou entre " "comiñas" -#: glib/gregex.c:670 +#: glib/gregex.c:731 msgid "\\N is not supported in a class" msgstr "non se permite \\N nunha clase" -#: glib/gregex.c:674 +#: glib/gregex.c:735 msgid "name is too long in (*MARK), (*PRUNE), (*SKIP), or (*THEN)" msgstr "o nome é demasiado longo en (*MARK), (*PRUNE), (*SKIP), ou (*THEN)" -#: glib/gregex.c:678 glib/gregex.c:809 +#: glib/gregex.c:739 glib/gregex.c:875 msgid "code overflow" msgstr "desbordamento de código" -#: glib/gregex.c:682 +#: glib/gregex.c:743 msgid "unrecognized character after (?P" msgstr "carácter non recoñecido despois de (?P" -#: glib/gregex.c:686 +#: glib/gregex.c:747 msgid "overran compiling workspace" msgstr "desbordouse o espazo de traballo de compilación" -#: glib/gregex.c:690 +#: glib/gregex.c:751 msgid "previously-checked referenced subpattern not found" msgstr "non se atopou o subpatrón referenciado comprobado previamente" -#: glib/gregex.c:808 glib/gregex.c:1041 glib/gregex.c:2342 +#: glib/gregex.c:874 glib/gregex.c:1121 glib/gregex.c:2444 #, c-format msgid "Error while matching regular expression %s: %s" msgstr "" "Produciuse un erro ao estabelecer a equivalencia da expresión regular %s: %s" -#: glib/gregex.c:1618 +#: glib/gregex.c:1721 msgid "PCRE library is compiled without UTF8 support" msgstr "A biblioteca PCRE está compilada sen compatibilidade con UTF8" -#: glib/gregex.c:1626 +#: glib/gregex.c:1729 msgid "PCRE library is compiled with incompatible options" msgstr "A biblioteca PCRE está compilada con opcións non compatíbeis" -#: glib/gregex.c:1751 +#: glib/gregex.c:1847 #, c-format -#| msgid "Error while compiling regular expression %s at char %d: %s" msgid "Error while compiling regular expression ‘%s’ at char %s: %s" msgstr "" "Produciuse un erro ao compilar a expresión regular «%s» no carácter %s: %s" -#: glib/gregex.c:2786 +#: glib/gregex.c:2887 msgid "hexadecimal digit or “}” expected" msgstr "esperábase un díxito hexadecimal ou '}'" -#: glib/gregex.c:2802 +#: glib/gregex.c:2903 msgid "hexadecimal digit expected" msgstr "esperábase un díxito hexadecimal" -#: glib/gregex.c:2842 +#: glib/gregex.c:2943 msgid "missing “<” in symbolic reference" msgstr "falta «<» na referencia simbólica" -#: glib/gregex.c:2851 +#: glib/gregex.c:2952 msgid "unfinished symbolic reference" msgstr "referencia simbólica sen finalizar" -#: glib/gregex.c:2858 +#: glib/gregex.c:2959 msgid "zero-length symbolic reference" msgstr "referencia simbólica de lonxitude cero" -#: glib/gregex.c:2869 +#: glib/gregex.c:2970 msgid "digit expected" msgstr "esperábase un díxito" -#: glib/gregex.c:2887 +#: glib/gregex.c:2988 msgid "illegal symbolic reference" msgstr "referencia simbólica ilegal" -#: glib/gregex.c:2950 +#: glib/gregex.c:3051 msgid "stray final “\\”" msgstr "«\\» final perdido" -#: glib/gregex.c:2954 +#: glib/gregex.c:3055 msgid "unknown escape sequence" msgstr "secuencia de escape descoñecida" -#: glib/gregex.c:2964 +#: glib/gregex.c:3065 #, c-format msgid "Error while parsing replacement text “%s” at char %lu: %s" msgstr "" @@ -5932,103 +5935,108 @@ msgid "Text was empty (or contained only whitespace)" msgstr "O texto estaba baleiro (ou só contiña espazos en branco)" -#: glib/gspawn.c:314 +#: glib/gspawn.c:319 #, c-format msgid "Failed to read data from child process (%s)" msgstr "Produciuse un erro ao ler datos desde un proceso fillo (%s)" -#: glib/gspawn.c:466 +#: glib/gspawn.c:471 #, c-format msgid "Unexpected error in reading data from a child process (%s)" msgstr "Produciuse un erro ao ler os datos dun proceso fillo (%s)" -#: glib/gspawn.c:551 +#: glib/gspawn.c:556 #, c-format msgid "Unexpected error in waitpid() (%s)" msgstr "Erro inesperado en waitpid() (%s)" -#: glib/gspawn.c:1170 glib/gspawn-win32.c:1488 +#: glib/gspawn.c:1175 glib/gspawn-win32.c:1503 #, c-format msgid "Child process exited with code %ld" msgstr "O proceso fillo rematou co código %ld" -#: glib/gspawn.c:1178 +#: glib/gspawn.c:1183 #, c-format msgid "Child process killed by signal %ld" msgstr "O proceso fillo rematou polo sinal %ld" -#: glib/gspawn.c:1185 +#: glib/gspawn.c:1190 #, c-format msgid "Child process stopped by signal %ld" msgstr "O proceso fillo detívose polo sinal %ld" -#: glib/gspawn.c:1192 +#: glib/gspawn.c:1197 #, c-format msgid "Child process exited abnormally" msgstr "O proceso fillo rematou de forma anormal" -#: glib/gspawn.c:1885 glib/gspawn-win32.c:393 glib/gspawn-win32.c:401 +#: glib/gspawn.c:2027 glib/gspawn-win32.c:393 glib/gspawn-win32.c:401 #, c-format msgid "Failed to read from child pipe (%s)" msgstr "Produciuse un erro ao ler desde a canalización filla (%s)" -#: glib/gspawn.c:2248 +#: glib/gspawn.c:2399 #, c-format msgid "Failed to spawn child process “%s” (%s)" msgstr "Produciuse un erro ao executar o proceso fillo «%s» (%s)" -#: glib/gspawn.c:2365 +#: glib/gspawn.c:2525 #, c-format msgid "Failed to fork (%s)" msgstr "Produciuse un erro ao facer fork (%s)" -#: glib/gspawn.c:2525 glib/gspawn-win32.c:424 +#: glib/gspawn.c:2685 glib/gspawn-win32.c:424 #, c-format msgid "Failed to change to directory “%s” (%s)" msgstr "Produciuse un erro ao cambiar ao directorio «%s» (%s)" -#: glib/gspawn.c:2535 +#: glib/gspawn.c:2695 #, c-format msgid "Failed to execute child process “%s” (%s)" msgstr "Produciuse un erro ao executar o proceso fillo «%s» (%s)" -#: glib/gspawn.c:2545 +#: glib/gspawn.c:2705 #, c-format msgid "Failed to open file to remap file descriptor (%s)" msgstr "" "Produciuse un erro ao abrir o ficheiro para remapear o descritor de ficheiro " "(%s)" -#: glib/gspawn.c:2553 +#: glib/gspawn.c:2713 #, c-format msgid "Failed to duplicate file descriptor for child process (%s)" msgstr "" "Produciuse un erro ao duplicar o descritor de ficheiro para o proceso fillo " "(%s)" -#: glib/gspawn.c:2562 +#: glib/gspawn.c:2722 #, c-format msgid "Failed to fork child process (%s)" msgstr "Produciuse un erro ao facer fork ao proceso fillo (%s)" -#: glib/gspawn.c:2570 +#: glib/gspawn.c:2730 #, c-format msgid "Failed to close file descriptor for child process (%s)" msgstr "" "Produciuse un erro ao pechar o descritor de ficheiro para o proceso fillo " "(%s)" -#: glib/gspawn.c:2578 +#: glib/gspawn.c:2738 #, c-format msgid "Unknown error executing child process “%s”" msgstr "Produciuse un erro descoñecido ao executar o proceso fillo «%s»" -#: glib/gspawn.c:2602 +#: glib/gspawn.c:2762 #, c-format msgid "Failed to read enough data from child pid pipe (%s)" msgstr "" "Fallo de lectura de suficientes datos desde a canalización filla co PID (%s)" +#: glib/gspawn-private.h:134 +#, c-format +msgid "Invalid source FDs argument" +msgstr "Argumento de FDs de orixe non válido" + #: glib/gspawn-win32.c:337 msgid "Failed to read data from child process" msgstr "Produciuse un erro ao ler datos desde un proceso fillo" @@ -6048,27 +6056,27 @@ msgid "Invalid program name: %s" msgstr "Nome de programa non válido: %s" -#: glib/gspawn-win32.c:521 glib/gspawn-win32.c:853 +#: glib/gspawn-win32.c:521 glib/gspawn-win32.c:868 #, c-format msgid "Invalid string in argument vector at %d: %s" msgstr "Cadea non válida no vector de argumento en %d: %s" -#: glib/gspawn-win32.c:532 glib/gspawn-win32.c:869 +#: glib/gspawn-win32.c:532 glib/gspawn-win32.c:884 #, c-format msgid "Invalid string in environment: %s" msgstr "Cadea non válida no ambiente: %s" -#: glib/gspawn-win32.c:849 +#: glib/gspawn-win32.c:864 #, c-format msgid "Invalid working directory: %s" msgstr "Directorio de traballo non válido: %s" -#: glib/gspawn-win32.c:914 +#: glib/gspawn-win32.c:929 #, c-format msgid "Failed to execute helper program (%s)" msgstr "Produciuse un erro ao executar o programa asistente (%s)" -#: glib/gspawn-win32.c:1143 +#: glib/gspawn-win32.c:1158 msgid "" "Unexpected error in g_io_channel_win32_poll() reading data from a child " "process" @@ -6076,21 +6084,21 @@ "Erro inesperado en g_io_channel_win32_poll() ao ler datos desde un proceso " "fillo" -#: glib/gstrfuncs.c:3366 glib/gstrfuncs.c:3468 +#: glib/gstrfuncs.c:3373 glib/gstrfuncs.c:3475 msgid "Empty string is not a number" msgstr "A cadea baleira non é un número" -#: glib/gstrfuncs.c:3390 +#: glib/gstrfuncs.c:3397 #, c-format msgid "“%s” is not a signed number" msgstr "«%s» non é un número con signo" -#: glib/gstrfuncs.c:3400 glib/gstrfuncs.c:3504 +#: glib/gstrfuncs.c:3407 glib/gstrfuncs.c:3511 #, c-format msgid "Number “%s” is out of bounds %s, %s" msgstr "O número «%s» está fóra de rango %s, %s" -#: glib/gstrfuncs.c:3494 +#: glib/gstrfuncs.c:3501 #, c-format msgid "“%s” is not an unsigned number" msgstr "«%s» non é un número sen signo" @@ -6169,132 +6177,132 @@ msgstr "Carácter fóra de intervalo para UTF-16" #. Translators: A unit symbol for size formatting, showing for example: "13.0 kB" -#: glib/gutils.c:2857 +#: glib/gutils.c:2966 msgid "kB" msgstr "kB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 MB" -#: glib/gutils.c:2859 +#: glib/gutils.c:2968 msgid "MB" msgstr "MB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 GB" -#: glib/gutils.c:2861 +#: glib/gutils.c:2970 msgid "GB" msgstr "GB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 TB" -#: glib/gutils.c:2863 +#: glib/gutils.c:2972 msgid "TB" msgstr "TB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 PB" -#: glib/gutils.c:2865 +#: glib/gutils.c:2974 msgid "PB" msgstr "PB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 EB" -#: glib/gutils.c:2867 +#: glib/gutils.c:2976 msgid "EB" msgstr "EB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 KiB" -#: glib/gutils.c:2871 +#: glib/gutils.c:2980 msgid "KiB" msgstr "KiB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 MiB" -#: glib/gutils.c:2873 +#: glib/gutils.c:2982 msgid "MiB" msgstr "MiB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 GiB" -#: glib/gutils.c:2875 +#: glib/gutils.c:2984 msgid "GiB" msgstr "GiB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 TiB" -#: glib/gutils.c:2877 +#: glib/gutils.c:2986 msgid "TiB" msgstr "TiB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 PiB" -#: glib/gutils.c:2879 +#: glib/gutils.c:2988 msgid "PiB" -msgstr " " +msgstr "PiB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 EiB" -#: glib/gutils.c:2881 +#: glib/gutils.c:2990 msgid "EiB" msgstr "EiB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 kb" -#: glib/gutils.c:2885 +#: glib/gutils.c:2994 msgid "kb" msgstr "kb" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Mb" -#: glib/gutils.c:2887 +#: glib/gutils.c:2996 msgid "Mb" msgstr "Mb" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Gb" -#: glib/gutils.c:2889 +#: glib/gutils.c:2998 msgid "Gb" msgstr "Gb" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Tb" -#: glib/gutils.c:2891 +#: glib/gutils.c:3000 msgid "Tb" msgstr "Tb" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Pb" -#: glib/gutils.c:2893 +#: glib/gutils.c:3002 msgid "Pb" msgstr "Pb" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Eb" -#: glib/gutils.c:2895 +#: glib/gutils.c:3004 msgid "Eb" msgstr "Eb" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Kib" -#: glib/gutils.c:2899 +#: glib/gutils.c:3008 msgid "Kib" msgstr "Kib" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Mib" -#: glib/gutils.c:2901 +#: glib/gutils.c:3010 msgid "Mib" msgstr "Mib" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Gib" -#: glib/gutils.c:2903 +#: glib/gutils.c:3012 msgid "Gib" msgstr "Gib" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Tib" -#: glib/gutils.c:2905 +#: glib/gutils.c:3014 msgid "Tib" msgstr "Tib" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Pib" -#: glib/gutils.c:2907 +#: glib/gutils.c:3016 msgid "Pib" msgstr "Pib" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Eib" -#: glib/gutils.c:2909 +#: glib/gutils.c:3018 msgid "Eib" msgstr "Eib" -#: glib/gutils.c:2947 +#: glib/gutils.c:3056 msgid "byte" msgid_plural "bytes" msgstr0 "byte" -msgstr1 "%u bytes" +msgstr1 "bytes" -#: glib/gutils.c:2951 +#: glib/gutils.c:3060 msgid "bit" msgid_plural "bits" msgstr0 "bit" @@ -6302,7 +6310,7 @@ #. Translators: The "%u" is replaced with the size value, like "13"; it could #. * be part of "13 bytes", but only the number is requested this time. -#: glib/gutils.c:2959 +#: glib/gutils.c:3068 #, c-format msgctxt "format-size" msgid "%u" @@ -6310,7 +6318,7 @@ #. Translators: The first "%u" is replaced with the value, the "%s" with a unit of the value. #. * The order can be changed with "%$2s %$1u". An example: "13 bytes" -#: glib/gutils.c:2964 +#: glib/gutils.c:3073 #, c-format msgctxt "format-size" msgid "%u %s" @@ -6318,7 +6326,7 @@ #. Translators: The "%.1f" is replaced with the size value, like "13.0"; it could #. * be part of "13.0 MB", but only the number is requested this time. -#: glib/gutils.c:3000 +#: glib/gutils.c:3109 #, c-format msgctxt "format-size" msgid "%.1f" @@ -6327,14 +6335,14 @@ #. Translators: The first "%.1f" is replaced with the value, the "%s" with a unit of the value. #. * The order can be changed with "%$2s %$1.1f". Keep the no-break space between the value and #. * the unit symbol. An example: "13.0 MB" -#: glib/gutils.c:3006 +#: glib/gutils.c:3115 #, c-format msgctxt "format-size" msgid "%.1f %s" msgstr "%.1f %s" #. Translators: the %s in "%s bytes" will always be replaced by a number. -#: glib/gutils.c:3046 +#: glib/gutils.c:3155 #, c-format msgid "%s byte" msgid_plural "%s bytes" @@ -6342,14 +6350,14 @@ msgstr1 "%s bytes" #. Translators: the %s in "%s bits" will always be replaced by a number. -#: glib/gutils.c:3051 +#: glib/gutils.c:3160 #, c-format msgid "%s bit" msgid_plural "%s bits" msgstr0 "%s bit" msgstr1 "%s bit" -#: glib/gutils.c:3092 +#: glib/gutils.c:3201 #, c-format msgid "%u byte" msgid_plural "%u bytes" @@ -6361,32 +6369,32 @@ #. * compatibility. Users will not see this string unless a program is using this deprecated function. #. * Please translate as literally as possible. #. -#: glib/gutils.c:3105 +#: glib/gutils.c:3214 #, c-format msgid "%.1f KB" msgstr "%.1f KB" -#: glib/gutils.c:3110 +#: glib/gutils.c:3219 #, c-format msgid "%.1f MB" msgstr "%.1f MB" -#: glib/gutils.c:3115 +#: glib/gutils.c:3224 #, c-format msgid "%.1f GB" msgstr "%.1f GB" -#: glib/gutils.c:3120 +#: glib/gutils.c:3229 #, c-format msgid "%.1f TB" msgstr "%.1f TB" -#: glib/gutils.c:3125 +#: glib/gutils.c:3234 #, c-format msgid "%.1f PB" msgstr "%.1f PB" -#: glib/gutils.c:3130 +#: glib/gutils.c:3239 #, c-format msgid "%.1f EB" msgstr "%.1f EB"
View file
_service:tar_scm:glib-2.74.4.tar.xz/po/he.po -> _service:tar_scm:glib-2.76.4.tar.xz/po/he.po
Changed
@@ -8,14 +8,14 @@ # Gil 'Dolfin' Osher <dolfin@rpg.org.il>, 2002. # Gil Osher <dolfin@rpg.org.il>, 2004. # Yaron Shahrabani <sh.yaron@gmail.com>, 2010. -# Yosef Or Boczko <yoseforb@gmail.com>, 2014-2022. +# Yosef Or Boczko <yoseforb@gmail.com>, 2014-2023. # msgid "" msgstr "" "Project-Id-Version: glib.HEAD.he\n" "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/glib/issues\n" -"POT-Creation-Date: 2022-10-04 17:40+0000\n" -"PO-Revision-Date: 2022-10-06 16:22+0300\n" +"POT-Creation-Date: 2023-02-15 16:30+0000\n" +"PO-Revision-Date: 2023-02-17 11:51+0200\n" "Last-Translator: Yaron Shahrabani <sh.yaron@gmail.com>\n" "Language-Team: Hebrew <>\n" "Language: he\n" @@ -24,22 +24,22 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=4; plural=(n==1 ? 0 : n==2 ? 1 : n>10 && n%10==0 ? " "2 : 3);\n" -"X-Generator: Poedit 3.1.1\n" +"X-Generator: Poedit 3.2.2\n" -#: gio/gappinfo.c:335 +#: gio/gappinfo.c:339 msgid "Setting default applications not supported yet" msgstr "Setting default applications not supported yet" -#: gio/gappinfo.c:368 +#: gio/gappinfo.c:372 msgid "Setting application as last used for type not supported yet" msgstr "Setting application as last used for type not supported yet" -#: gio/gappinfo.c:810 +#: gio/gappinfo.c:814 #, c-format msgid "Failed to find default application for content type ‘%s’" msgstr "Failed to find default application for content type ‘%s’" -#: gio/gappinfo.c:870 +#: gio/gappinfo.c:874 #, c-format msgid "Failed to find default application for URI Scheme ‘%s’" msgstr "Failed to find default application for URI Scheme ‘%s’" @@ -236,11 +236,11 @@ msgid "error sending %s message to application: %s\n" msgstr "error sending %s message to application: %s\n" -#: gio/gapplication-tool.c:321 +#: gio/gapplication-tool.c:324 msgid "action name must be given after application id\n" msgstr "action name must be given after application id\n" -#: gio/gapplication-tool.c:329 +#: gio/gapplication-tool.c:332 #, c-format msgid "" "invalid action name: “%s”\n" @@ -249,25 +249,25 @@ "invalid action name: “%s”\n" "action names must consist of only alphanumerics, “-” and “.”\n" -#: gio/gapplication-tool.c:348 +#: gio/gapplication-tool.c:351 #, c-format msgid "error parsing action parameter: %s\n" msgstr "error parsing action parameter: %s\n" -#: gio/gapplication-tool.c:360 +#: gio/gapplication-tool.c:363 msgid "actions accept a maximum of one parameter\n" msgstr "actions accept a maximum of one parameter\n" -#: gio/gapplication-tool.c:415 +#: gio/gapplication-tool.c:418 msgid "list-actions command takes only the application id" msgstr "list-actions command takes only the application id" -#: gio/gapplication-tool.c:425 +#: gio/gapplication-tool.c:428 #, c-format msgid "unable to find desktop file for application %s\n" msgstr "unable to find desktop file for application %s\n" -#: gio/gapplication-tool.c:470 +#: gio/gapplication-tool.c:473 #, c-format msgid "" "unrecognised command: %s\n" @@ -302,7 +302,7 @@ msgid "Truncate not supported on base stream" msgstr "Truncate not supported on base stream" -#: gio/gcancellable.c:319 gio/gdbusconnection.c:1859 gio/gdbusprivate.c:1420 +#: gio/gcancellable.c:326 gio/gdbusconnection.c:1859 gio/gdbusprivate.c:1420 #: gio/gsimpleasyncresult.c:873 gio/gsimpleasyncresult.c:899 #, c-format msgid "Operation was cancelled" @@ -322,13 +322,13 @@ #: gio/gcharsetconverter.c:344 gio/gdatainputstream.c:850 #: gio/gdatainputstream.c:1268 glib/gconvert.c:451 glib/gconvert.c:883 -#: glib/giochannel.c:1576 glib/giochannel.c:1618 glib/giochannel.c:2473 +#: glib/giochannel.c:1576 glib/giochannel.c:1618 glib/giochannel.c:2478 #: glib/gutf8.c:892 glib/gutf8.c:1346 msgid "Invalid byte sequence in conversion input" msgstr "Invalid byte sequence in conversion input" #: gio/gcharsetconverter.c:349 glib/gconvert.c:459 glib/gconvert.c:797 -#: glib/giochannel.c:1583 glib/giochannel.c:2485 +#: glib/giochannel.c:1583 glib/giochannel.c:2493 #, c-format msgid "Error during conversion: %s" msgstr "Error during conversion: %s" @@ -387,17 +387,17 @@ msgid "Unexpected early end-of-stream" msgstr "Unexpected early end-of-stream" -#: gio/gdbusaddress.c:164 gio/gdbusaddress.c:238 gio/gdbusaddress.c:327 +#: gio/gdbusaddress.c:162 gio/gdbusaddress.c:234 gio/gdbusaddress.c:321 #, c-format msgid "Unsupported key “%s” in address entry “%s”" msgstr "Unsupported key “%s” in address entry “%s”" -#: gio/gdbusaddress.c:177 +#: gio/gdbusaddress.c:175 #, c-format msgid "Meaningless key/value pair combination in address entry “%s”" msgstr "Meaningless key/value pair combination in address entry “%s”" -#: gio/gdbusaddress.c:186 +#: gio/gdbusaddress.c:184 #, c-format msgid "" "Address “%s” is invalid (need exactly one of path, dir, tmpdir, or abstract " @@ -406,28 +406,28 @@ "Address “%s” is invalid (need exactly one of path, dir, tmpdir, or abstract " "keys)" -#: gio/gdbusaddress.c:253 gio/gdbusaddress.c:264 gio/gdbusaddress.c:279 -#: gio/gdbusaddress.c:342 gio/gdbusaddress.c:353 +#: gio/gdbusaddress.c:249 gio/gdbusaddress.c:260 gio/gdbusaddress.c:275 +#: gio/gdbusaddress.c:336 gio/gdbusaddress.c:347 #, c-format msgid "Error in address “%s” — the “%s” attribute is malformed" msgstr "Error in address “%s” — the “%s” attribute is malformed" -#: gio/gdbusaddress.c:423 gio/gdbusaddress.c:682 +#: gio/gdbusaddress.c:417 gio/gdbusaddress.c:676 #, c-format msgid "Unknown or unsupported transport “%s” for address “%s”" msgstr "Unknown or unsupported transport “%s” for address “%s”" -#: gio/gdbusaddress.c:467 +#: gio/gdbusaddress.c:461 #, c-format msgid "Address element “%s” does not contain a colon (:)" msgstr "Address element “%s” does not contain a colon (:)" -#: gio/gdbusaddress.c:476 +#: gio/gdbusaddress.c:470 #, c-format msgid "Transport name in address element “%s” must not be empty" msgstr "Transport name in address element “%s” must not be empty" -#: gio/gdbusaddress.c:497 +#: gio/gdbusaddress.c:491 #, c-format msgid "" "Key/Value pair %d, “%s”, in address element “%s” does not contain an equal " @@ -436,14 +436,14 @@ "Key/Value pair %d, “%s”, in address element “%s” does not contain an equal " "sign" -#: gio/gdbusaddress.c:508 +#: gio/gdbusaddress.c:502 #, c-format msgid "" "Key/Value pair %d, “%s”, in address element “%s” must not have an empty key" msgstr "" "Key/Value pair %d, “%s”, in address element “%s” must not have an empty key" -#: gio/gdbusaddress.c:522 +#: gio/gdbusaddress.c:516 #, c-format msgid "" "Error unescaping key or value in Key/Value pair %d, “%s”, in address element " @@ -452,7 +452,7 @@ "Error unescaping key or value in Key/Value pair %d, “%s”, in address element " "“%s”" -#: gio/gdbusaddress.c:590 +#: gio/gdbusaddress.c:584 #, c-format msgid "" "Error in address “%s” — the unix transport requires exactly one of the keys " @@ -461,75 +461,75 @@ "Error in address “%s” — the unix transport requires exactly one of the keys " "“path” or “abstract” to be set" -#: gio/gdbusaddress.c:625 +#: gio/gdbusaddress.c:619 #, c-format msgid "Error in address “%s” — the host attribute is missing or malformed" msgstr "Error in address “%s” — the host attribute is missing or malformed" -#: gio/gdbusaddress.c:639 +#: gio/gdbusaddress.c:633 #, c-format msgid "Error in address “%s” — the port attribute is missing or malformed" msgstr "Error in address “%s” — the port attribute is missing or malformed" -#: gio/gdbusaddress.c:653 +#: gio/gdbusaddress.c:647 #, c-format msgid "Error in address “%s” — the noncefile attribute is missing or malformed" msgstr "" "Error in address “%s” — the noncefile attribute is missing or malformed" -#: gio/gdbusaddress.c:674 +#: gio/gdbusaddress.c:668 msgid "Error auto-launching: " msgstr "Error auto-launching: " -#: gio/gdbusaddress.c:727 +#: gio/gdbusaddress.c:721 #, c-format msgid "Error opening nonce file “%s”: %s" msgstr "Error opening nonce file “%s”: %s" -#: gio/gdbusaddress.c:746 +#: gio/gdbusaddress.c:740 #, c-format msgid "Error reading from nonce file “%s”: %s" msgstr "Error reading from nonce file “%s”: %s" -#: gio/gdbusaddress.c:755 +#: gio/gdbusaddress.c:749 #, c-format msgid "Error reading from nonce file “%s”, expected 16 bytes, got %d" msgstr "Error reading from nonce file “%s”, expected 16 bytes, got %d" -#: gio/gdbusaddress.c:773 +#: gio/gdbusaddress.c:767 #, c-format msgid "Error writing contents of nonce file “%s” to stream:" msgstr "Error writing contents of nonce file “%s” to stream:" -#: gio/gdbusaddress.c:988 +#: gio/gdbusaddress.c:982 msgid "The given address is empty" msgstr "The given address is empty" -#: gio/gdbusaddress.c:1101 +#: gio/gdbusaddress.c:1095 #, c-format msgid "Cannot spawn a message bus when AT_SECURE is set" msgstr "לא ניתן לפצל אפיק הודעה כש־AT_SECURE מוגדר" -#: gio/gdbusaddress.c:1108 +#: gio/gdbusaddress.c:1102 msgid "Cannot spawn a message bus without a machine-id: " msgstr "Cannot spawn a message bus without a machine-id: " -#: gio/gdbusaddress.c:1115 +#: gio/gdbusaddress.c:1109 #, c-format msgid "Cannot autolaunch D-Bus without X11 $DISPLAY" msgstr "Cannot autolaunch D-Bus without X11 $DISPLAY" -#: gio/gdbusaddress.c:1157 +#: gio/gdbusaddress.c:1151 #, c-format msgid "Error spawning command line “%s”: " msgstr "Error spawning command line “%s”: " -#: gio/gdbusaddress.c:1226 +#: gio/gdbusaddress.c:1220 #, c-format msgid "Cannot determine session bus address (not implemented for this OS)" msgstr "Cannot determine session bus address (not implemented for this OS)" -#: gio/gdbusaddress.c:1375 gio/gdbusconnection.c:7321 +#: gio/gdbusaddress.c:1374 gio/gdbusconnection.c:7316 #, c-format msgid "" "Cannot determine bus address from DBUS_STARTER_BUS_TYPE environment variable " @@ -538,7 +538,7 @@ "Cannot determine bus address from DBUS_STARTER_BUS_TYPE environment variable " "— unknown value “%s”" -#: gio/gdbusaddress.c:1384 gio/gdbusconnection.c:7330 +#: gio/gdbusaddress.c:1383 gio/gdbusconnection.c:7325 msgid "" "Cannot determine bus address because the DBUS_STARTER_BUS_TYPE environment " "variable is not set" @@ -546,10 +546,10 @@ "Cannot determine bus address because the DBUS_STARTER_BUS_TYPE environment " "variable is not set" -#: gio/gdbusaddress.c:1394 +#: gio/gdbusaddress.c:1393 #, c-format msgid "Unknown bus type %d" -msgstr "Unknown bus type %d" +msgstr "סוג אפיק לא ידוע %d" #: gio/gdbusauth.c:294 msgid "Unexpected lack of content trying to read a line" @@ -566,11 +566,15 @@ msgstr "" "Exhausted all available authentication mechanisms (tried: %s) (available: %s)" -#: gio/gdbusauth.c:1178 +#: gio/gdbusauth.c:1045 +msgid "Unexpected lack of content trying to read a byte" +msgstr "העדר הקשר בלתי צפוי בניסיון לקרוא בית" + +#: gio/gdbusauth.c:1195 msgid "User IDs must be the same for peer and server" -msgstr "User IDs must be the same for peer and server" +msgstr "מזהי המשתמשים חייבים להיות זהים לעמית ולשרת" -#: gio/gdbusauth.c:1190 +#: gio/gdbusauth.c:1207 msgid "Cancelled via GDBusAuthObserver::authorize-authenticated-peer" msgstr "Cancelled via GDBusAuthObserver::authorize-authenticated-peer" @@ -660,7 +664,7 @@ msgid "(Additionally, releasing the lock for “%s” also failed: %s) " msgstr "(Additionally, releasing the lock for “%s” also failed: %s) " -#: gio/gdbusconnection.c:590 gio/gdbusconnection.c:2404 +#: gio/gdbusconnection.c:590 gio/gdbusconnection.c:2405 msgid "The connection is closed" msgstr "The connection is closed" @@ -668,116 +672,116 @@ msgid "Timeout was reached" msgstr "Timeout was reached" -#: gio/gdbusconnection.c:2527 +#: gio/gdbusconnection.c:2528 msgid "" "Unsupported flags encountered when constructing a client-side connection" msgstr "" "Unsupported flags encountered when constructing a client-side connection" -#: gio/gdbusconnection.c:4256 gio/gdbusconnection.c:4610 +#: gio/gdbusconnection.c:4257 gio/gdbusconnection.c:4611 #, c-format msgid "" "No such interface “org.freedesktop.DBus.Properties” on object at path %s" msgstr "" "No such interface “org.freedesktop.DBus.Properties” on object at path %s" -#: gio/gdbusconnection.c:4401 +#: gio/gdbusconnection.c:4402 #, c-format msgid "No such property “%s”" msgstr "No such property “%s”" -#: gio/gdbusconnection.c:4413 +#: gio/gdbusconnection.c:4414 #, c-format msgid "Property “%s” is not readable" msgstr "Property “%s” is not readable" -#: gio/gdbusconnection.c:4424 +#: gio/gdbusconnection.c:4425 #, c-format msgid "Property “%s” is not writable" msgstr "Property “%s” is not writable" -#: gio/gdbusconnection.c:4444 +#: gio/gdbusconnection.c:4445 #, c-format msgid "Error setting property “%s”: Expected type “%s” but got “%s”" msgstr "Error setting property “%s”: Expected type “%s” but got “%s”" -#: gio/gdbusconnection.c:4549 gio/gdbusconnection.c:4764 -#: gio/gdbusconnection.c:6747 +#: gio/gdbusconnection.c:4550 gio/gdbusconnection.c:4765 +#: gio/gdbusconnection.c:6742 #, c-format msgid "No such interface “%s”" msgstr "No such interface “%s”" -#: gio/gdbusconnection.c:4986 gio/gdbusconnection.c:7261 +#: gio/gdbusconnection.c:4981 gio/gdbusconnection.c:7256 #, c-format msgid "No such interface “%s” on object at path %s" msgstr "No such interface “%s” on object at path %s" -#: gio/gdbusconnection.c:5087 +#: gio/gdbusconnection.c:5082 #, c-format msgid "No such method “%s”" msgstr "No such method “%s”" -#: gio/gdbusconnection.c:5118 +#: gio/gdbusconnection.c:5113 #, c-format msgid "Type of message, “%s”, does not match expected type “%s”" msgstr "Type of message, “%s”, does not match expected type “%s”" -#: gio/gdbusconnection.c:5321 +#: gio/gdbusconnection.c:5316 #, c-format msgid "An object is already exported for the interface %s at %s" msgstr "An object is already exported for the interface %s at %s" -#: gio/gdbusconnection.c:5548 +#: gio/gdbusconnection.c:5543 #, c-format msgid "Unable to retrieve property %s.%s" msgstr "Unable to retrieve property %s.%s" -#: gio/gdbusconnection.c:5604 +#: gio/gdbusconnection.c:5599 #, c-format msgid "Unable to set property %s.%s" msgstr "Unable to set property %s.%s" -#: gio/gdbusconnection.c:5783 +#: gio/gdbusconnection.c:5778 #, c-format msgid "Method “%s” returned type “%s”, but expected “%s”" msgstr "Method “%s” returned type “%s”, but expected “%s”" -#: gio/gdbusconnection.c:6859 +#: gio/gdbusconnection.c:6854 #, c-format msgid "Method “%s” on interface “%s” with signature “%s” does not exist" msgstr "Method “%s” on interface “%s” with signature “%s” does not exist" -#: gio/gdbusconnection.c:6980 +#: gio/gdbusconnection.c:6975 #, c-format msgid "A subtree is already exported for %s" msgstr "A subtree is already exported for %s" -#: gio/gdbusconnection.c:7269 +#: gio/gdbusconnection.c:7264 #, c-format msgid "Object does not exist at path “%s”" msgstr "Object does not exist at path “%s”" -#: gio/gdbusmessage.c:1303 +#: gio/gdbusmessage.c:1306 msgid "type is INVALID" -msgstr "type is INVALID" +msgstr "הסוג שגוי" -#: gio/gdbusmessage.c:1314 +#: gio/gdbusmessage.c:1317 msgid "METHOD_CALL message: PATH or MEMBER header field is missing" msgstr "METHOD_CALL message: PATH or MEMBER header field is missing" -#: gio/gdbusmessage.c:1325 +#: gio/gdbusmessage.c:1328 msgid "METHOD_RETURN message: REPLY_SERIAL header field is missing" msgstr "METHOD_RETURN message: REPLY_SERIAL header field is missing" -#: gio/gdbusmessage.c:1337 +#: gio/gdbusmessage.c:1340 msgid "ERROR message: REPLY_SERIAL or ERROR_NAME header field is missing" msgstr "ERROR message: REPLY_SERIAL or ERROR_NAME header field is missing" -#: gio/gdbusmessage.c:1350 +#: gio/gdbusmessage.c:1353 msgid "SIGNAL message: PATH, INTERFACE or MEMBER header field is missing" msgstr "SIGNAL message: PATH, INTERFACE or MEMBER header field is missing" -#: gio/gdbusmessage.c:1358 +#: gio/gdbusmessage.c:1361 msgid "" "SIGNAL message: The PATH header field is using the reserved value /org/" "freedesktop/DBus/Local" @@ -785,7 +789,7 @@ "SIGNAL message: The PATH header field is using the reserved value /org/" "freedesktop/DBus/Local" -#: gio/gdbusmessage.c:1366 +#: gio/gdbusmessage.c:1369 msgid "" "SIGNAL message: The INTERFACE header field is using the reserved value org." "freedesktop.DBus.Local" @@ -793,7 +797,7 @@ "SIGNAL message: The INTERFACE header field is using the reserved value org." "freedesktop.DBus.Local" -#: gio/gdbusmessage.c:1414 gio/gdbusmessage.c:1474 +#: gio/gdbusmessage.c:1417 gio/gdbusmessage.c:1477 #, c-format msgid "Wanted to read %lu byte but only got %lu" msgid_plural "Wanted to read %lu bytes but only got %lu" @@ -802,12 +806,12 @@ msgstr2 "Wanted to read %lu bytes but only got %lu" msgstr3 "Wanted to read %lu bytes but only got %lu" -#: gio/gdbusmessage.c:1428 +#: gio/gdbusmessage.c:1431 #, c-format msgid "Expected NUL byte after the string “%s” but found byte %d" msgstr "Expected NUL byte after the string “%s” but found byte %d" -#: gio/gdbusmessage.c:1447 +#: gio/gdbusmessage.c:1450 #, c-format msgid "" "Expected valid UTF-8 string but found invalid bytes at byte offset %d " @@ -816,21 +820,21 @@ "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”" -#: gio/gdbusmessage.c:1511 gio/gdbusmessage.c:1787 gio/gdbusmessage.c:1998 +#: gio/gdbusmessage.c:1514 gio/gdbusmessage.c:1790 gio/gdbusmessage.c:2001 msgid "Value nested too deeply" msgstr "Value nested too deeply" -#: gio/gdbusmessage.c:1679 +#: gio/gdbusmessage.c:1682 #, c-format msgid "Parsed value “%s” is not a valid D-Bus object path" msgstr "Parsed value “%s” is not a valid D-Bus object path" -#: gio/gdbusmessage.c:1703 +#: gio/gdbusmessage.c:1706 #, c-format msgid "Parsed value “%s” is not a valid D-Bus signature" msgstr "Parsed value “%s” is not a valid D-Bus signature" -#: gio/gdbusmessage.c:1754 +#: gio/gdbusmessage.c:1757 #, c-format msgid "" "Encountered array of length %u byte. Maximum length is 2<<26 bytes (64 MiB)." @@ -845,7 +849,7 @@ msgstr3 "" "Encountered array of length %u bytes. Maximum length is 2<<26 bytes (64 MiB)." -#: gio/gdbusmessage.c:1774 +#: gio/gdbusmessage.c:1777 #, c-format msgid "" "Encountered array of type “a%c”, expected to have a length a multiple of %u " @@ -854,23 +858,23 @@ "Encountered array of type “a%c”, expected to have a length a multiple of %u " "bytes, but found to be %u bytes in length" -#: gio/gdbusmessage.c:1928 gio/gdbusmessage.c:2647 +#: gio/gdbusmessage.c:1931 gio/gdbusmessage.c:2650 msgid "Empty structures (tuples) are not allowed in D-Bus" msgstr "Empty structures (tuples) are not allowed in D-Bus" -#: gio/gdbusmessage.c:1982 +#: gio/gdbusmessage.c:1985 #, c-format msgid "Parsed value “%s” for variant is not a valid D-Bus signature" msgstr "Parsed value “%s” for variant is not a valid D-Bus signature" -#: gio/gdbusmessage.c:2023 +#: gio/gdbusmessage.c:2026 #, c-format msgid "" "Error deserializing GVariant with type string “%s” from the D-Bus wire format" msgstr "" "Error deserializing GVariant with type string “%s” from the D-Bus wire format" -#: gio/gdbusmessage.c:2208 +#: gio/gdbusmessage.c:2211 #, c-format msgid "" "Invalid endianness value. Expected 0x6c (“l”) or 0x42 (“B”) but found value " @@ -879,26 +883,26 @@ "Invalid endianness value. Expected 0x6c (“l”) or 0x42 (“B”) but found value " "0x%02x" -#: gio/gdbusmessage.c:2227 +#: gio/gdbusmessage.c:2230 #, c-format msgid "Invalid major protocol version. Expected 1 but found %d" msgstr "Invalid major protocol version. Expected 1 but found %d" -#: gio/gdbusmessage.c:2285 gio/gdbusmessage.c:2883 +#: gio/gdbusmessage.c:2288 gio/gdbusmessage.c:2886 msgid "Signature header found but is not of type signature" msgstr "Signature header found but is not of type signature" -#: gio/gdbusmessage.c:2297 +#: gio/gdbusmessage.c:2300 #, c-format msgid "Signature header with signature “%s” found but message body is empty" msgstr "Signature header with signature “%s” found but message body is empty" -#: gio/gdbusmessage.c:2312 +#: gio/gdbusmessage.c:2315 #, c-format msgid "Parsed value “%s” is not a valid D-Bus signature (for body)" msgstr "Parsed value “%s” is not a valid D-Bus signature (for body)" -#: gio/gdbusmessage.c:2344 +#: gio/gdbusmessage.c:2347 #, 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" @@ -907,34 +911,34 @@ msgstr2 "No signature header in message but the message body is %u byte" msgstr3 "No signature header in message but the message body is %u byte" -#: gio/gdbusmessage.c:2354 +#: gio/gdbusmessage.c:2357 msgid "Cannot deserialize message: " msgstr "Cannot deserialize message: " -#: gio/gdbusmessage.c:2700 +#: gio/gdbusmessage.c:2703 #, c-format msgid "" "Error serializing GVariant with type string “%s” to the D-Bus wire format" msgstr "" "Error serializing GVariant with type string “%s” to the D-Bus wire format" -#: gio/gdbusmessage.c:2837 +#: gio/gdbusmessage.c:2840 #, c-format msgid "" "Number of file descriptors in message (%d) differs from header field (%d)" msgstr "" "Number of file descriptors in message (%d) differs from header field (%d)" -#: gio/gdbusmessage.c:2845 +#: gio/gdbusmessage.c:2848 msgid "Cannot serialize message: " msgstr "Cannot serialize message: " -#: gio/gdbusmessage.c:2898 +#: gio/gdbusmessage.c:2901 #, c-format msgid "Message body has signature “%s” but there is no signature header" msgstr "Message body has signature “%s” but there is no signature header" -#: gio/gdbusmessage.c:2908 +#: gio/gdbusmessage.c:2911 #, c-format msgid "" "Message body has type signature “%s” but signature in the header field is " @@ -943,17 +947,17 @@ "Message body has type signature “%s” but signature in the header field is " "“%s”" -#: gio/gdbusmessage.c:2924 +#: gio/gdbusmessage.c:2927 #, c-format msgid "Message body is empty but signature in the header field is “(%s)”" msgstr "Message body is empty but signature in the header field is “(%s)”" -#: gio/gdbusmessage.c:3479 +#: gio/gdbusmessage.c:3482 #, c-format msgid "Error return with body of type “%s”" msgstr "Error return with body of type “%s”" -#: gio/gdbusmessage.c:3487 +#: gio/gdbusmessage.c:3490 msgid "Error return with empty body" msgstr "Error return with empty body" @@ -978,17 +982,17 @@ msgid "Unable to load %s or %s: " msgstr "Unable to load %s or %s: " -#: gio/gdbusproxy.c:1575 +#: gio/gdbusproxy.c:1568 #, c-format msgid "Error calling StartServiceByName for %s: " msgstr "Error calling StartServiceByName for %s: " -#: gio/gdbusproxy.c:1598 +#: gio/gdbusproxy.c:1591 #, c-format msgid "Unexpected reply %d from StartServiceByName(\"%s\") method" msgstr "Unexpected reply %d from StartServiceByName(\"%s\") method" -#: gio/gdbusproxy.c:2709 gio/gdbusproxy.c:2844 +#: gio/gdbusproxy.c:2702 gio/gdbusproxy.c:2837 #, c-format msgid "" "Cannot invoke method; proxy is for the well-known name %s without an owner, " @@ -997,25 +1001,25 @@ "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" -#: gio/gdbusserver.c:765 +#: gio/gdbusserver.c:758 msgid "Abstract namespace not supported" msgstr "Abstract namespace not supported" -#: gio/gdbusserver.c:857 +#: gio/gdbusserver.c:850 msgid "Cannot specify nonce file when creating a server" msgstr "Cannot specify nonce file when creating a server" -#: gio/gdbusserver.c:939 +#: gio/gdbusserver.c:932 #, c-format msgid "Error writing nonce file at “%s”: %s" msgstr "Error writing nonce file at “%s”: %s" -#: gio/gdbusserver.c:1114 +#: gio/gdbusserver.c:1107 #, c-format msgid "The string “%s” is not a valid D-Bus GUID" msgstr "The string “%s” is not a valid D-Bus GUID" -#: gio/gdbusserver.c:1152 +#: gio/gdbusserver.c:1145 #, c-format msgid "Cannot listen on unsupported transport “%s”" msgstr "Cannot listen on unsupported transport “%s”" @@ -1043,14 +1047,14 @@ "\n" "Use “%s COMMAND --help” to get help on each command.\n" -#: gio/gdbus-tool.c:204 gio/gdbus-tool.c:276 gio/gdbus-tool.c:348 -#: gio/gdbus-tool.c:372 gio/gdbus-tool.c:862 gio/gdbus-tool.c:1247 -#: gio/gdbus-tool.c:1734 +#: gio/gdbus-tool.c:204 gio/gdbus-tool.c:276 gio/gdbus-tool.c:347 +#: gio/gdbus-tool.c:371 gio/gdbus-tool.c:861 gio/gdbus-tool.c:1246 +#: gio/gdbus-tool.c:1733 #, c-format msgid "Error: %s\n" -msgstr "Error: %s\n" +msgstr "שגיאה: %s\n" -#: gio/gdbus-tool.c:215 gio/gdbus-tool.c:289 gio/gdbus-tool.c:1750 +#: gio/gdbus-tool.c:215 gio/gdbus-tool.c:289 gio/gdbus-tool.c:1749 #, c-format msgid "Error parsing introspection XML: %s\n" msgstr "Error parsing introspection XML: %s\n" @@ -1060,50 +1064,50 @@ msgid "Error: %s is not a valid name\n" msgstr "Error: %s is not a valid name\n" -#: gio/gdbus-tool.c:258 gio/gdbus-tool.c:748 gio/gdbus-tool.c:1066 -#: gio/gdbus-tool.c:1900 gio/gdbus-tool.c:2140 +#: gio/gdbus-tool.c:258 gio/gdbus-tool.c:747 gio/gdbus-tool.c:1065 +#: gio/gdbus-tool.c:1899 gio/gdbus-tool.c:2139 #, c-format msgid "Error: %s is not a valid object path\n" msgstr "Error: %s is not a valid object path\n" -#: gio/gdbus-tool.c:406 +#: gio/gdbus-tool.c:405 msgid "Connect to the system bus" msgstr "Connect to the system bus" -#: gio/gdbus-tool.c:407 +#: gio/gdbus-tool.c:406 msgid "Connect to the session bus" msgstr "Connect to the session bus" -#: gio/gdbus-tool.c:408 +#: gio/gdbus-tool.c:407 msgid "Connect to given D-Bus address" msgstr "Connect to given D-Bus address" -#: gio/gdbus-tool.c:418 +#: gio/gdbus-tool.c:417 msgid "Connection Endpoint Options:" msgstr "Connection Endpoint Options:" -#: gio/gdbus-tool.c:419 +#: gio/gdbus-tool.c:418 msgid "Options specifying the connection endpoint" msgstr "Options specifying the connection endpoint" -#: gio/gdbus-tool.c:442 +#: gio/gdbus-tool.c:441 #, c-format msgid "No connection endpoint specified" msgstr "No connection endpoint specified" -#: gio/gdbus-tool.c:452 +#: gio/gdbus-tool.c:451 #, c-format msgid "Multiple connection endpoints specified" msgstr "Multiple connection endpoints specified" -#: gio/gdbus-tool.c:525 +#: gio/gdbus-tool.c:524 #, c-format msgid "" "Warning: According to introspection data, interface “%s” does not exist\n" msgstr "" "Warning: According to introspection data, interface “%s” does not exist\n" -#: gio/gdbus-tool.c:534 +#: gio/gdbus-tool.c:533 #, c-format msgid "" "Warning: According to introspection data, method “%s” does not exist on " @@ -1112,164 +1116,164 @@ "Warning: According to introspection data, method “%s” does not exist on " "interface “%s”\n" -#: gio/gdbus-tool.c:596 +#: gio/gdbus-tool.c:595 msgid "Optional destination for signal (unique name)" msgstr "Optional destination for signal (unique name)" -#: gio/gdbus-tool.c:597 +#: gio/gdbus-tool.c:596 msgid "Object path to emit signal on" msgstr "Object path to emit signal on" -#: gio/gdbus-tool.c:598 +#: gio/gdbus-tool.c:597 msgid "Signal and interface name" msgstr "Signal and interface name" -#: gio/gdbus-tool.c:631 +#: gio/gdbus-tool.c:630 msgid "Emit a signal." msgstr "Emit a signal." -#: gio/gdbus-tool.c:686 gio/gdbus-tool.c:1003 gio/gdbus-tool.c:1837 -#: gio/gdbus-tool.c:2069 gio/gdbus-tool.c:2289 +#: gio/gdbus-tool.c:685 gio/gdbus-tool.c:1002 gio/gdbus-tool.c:1836 +#: gio/gdbus-tool.c:2068 gio/gdbus-tool.c:2288 #, c-format msgid "Error connecting: %s\n" -msgstr "Error connecting: %s\n" +msgstr "שגיאת התחברות: %s\n" -#: gio/gdbus-tool.c:706 +#: gio/gdbus-tool.c:705 #, c-format msgid "Error: %s is not a valid unique bus name.\n" msgstr "Error: %s is not a valid unique bus name.\n" -#: gio/gdbus-tool.c:725 gio/gdbus-tool.c:1046 gio/gdbus-tool.c:1880 +#: gio/gdbus-tool.c:724 gio/gdbus-tool.c:1045 gio/gdbus-tool.c:1879 msgid "Error: Object path is not specified\n" msgstr "Error: Object path is not specified\n" -#: gio/gdbus-tool.c:768 +#: gio/gdbus-tool.c:767 msgid "Error: Signal name is not specified\n" msgstr "Error: Signal name is not specified\n" -#: gio/gdbus-tool.c:782 +#: gio/gdbus-tool.c:781 #, c-format msgid "Error: Signal name “%s” is invalid\n" msgstr "Error: Signal name “%s” is invalid\n" -#: gio/gdbus-tool.c:794 +#: gio/gdbus-tool.c:793 #, c-format msgid "Error: %s is not a valid interface name\n" msgstr "Error: %s is not a valid interface name\n" -#: gio/gdbus-tool.c:800 +#: gio/gdbus-tool.c:799 #, c-format msgid "Error: %s is not a valid member name\n" msgstr "Error: %s is not a valid member name\n" #. Use the original non-"parse-me-harder" error -#: gio/gdbus-tool.c:837 gio/gdbus-tool.c:1178 +#: gio/gdbus-tool.c:836 gio/gdbus-tool.c:1177 #, c-format msgid "Error parsing parameter %d: %s\n" msgstr "Error parsing parameter %d: %s\n" -#: gio/gdbus-tool.c:869 +#: gio/gdbus-tool.c:868 #, c-format msgid "Error flushing connection: %s\n" msgstr "Error flushing connection: %s\n" -#: gio/gdbus-tool.c:897 +#: gio/gdbus-tool.c:896 msgid "Destination name to invoke method on" msgstr "Destination name to invoke method on" -#: gio/gdbus-tool.c:898 +#: gio/gdbus-tool.c:897 msgid "Object path to invoke method on" msgstr "Object path to invoke method on" -#: gio/gdbus-tool.c:899 +#: gio/gdbus-tool.c:898 msgid "Method and interface name" msgstr "Method and interface name" -#: gio/gdbus-tool.c:900 +#: gio/gdbus-tool.c:899 msgid "Timeout in seconds" msgstr "Timeout in seconds" -#: gio/gdbus-tool.c:901 +#: gio/gdbus-tool.c:900 msgid "Allow interactive authorization" msgstr "Allow interactive authorization" -#: gio/gdbus-tool.c:948 +#: gio/gdbus-tool.c:947 msgid "Invoke a method on a remote object." msgstr "Invoke a method on a remote object." -#: gio/gdbus-tool.c:1020 gio/gdbus-tool.c:1854 gio/gdbus-tool.c:2094 +#: gio/gdbus-tool.c:1019 gio/gdbus-tool.c:1853 gio/gdbus-tool.c:2093 msgid "Error: Destination is not specified\n" msgstr "Error: Destination is not specified\n" -#: gio/gdbus-tool.c:1031 gio/gdbus-tool.c:1871 gio/gdbus-tool.c:2105 +#: gio/gdbus-tool.c:1030 gio/gdbus-tool.c:1870 gio/gdbus-tool.c:2104 #, c-format msgid "Error: %s is not a valid bus name\n" msgstr "Error: %s is not a valid bus name\n" -#: gio/gdbus-tool.c:1081 +#: gio/gdbus-tool.c:1080 msgid "Error: Method name is not specified\n" msgstr "Error: Method name is not specified\n" -#: gio/gdbus-tool.c:1092 +#: gio/gdbus-tool.c:1091 #, c-format msgid "Error: Method name “%s” is invalid\n" msgstr "Error: Method name “%s” is invalid\n" -#: gio/gdbus-tool.c:1170 +#: gio/gdbus-tool.c:1169 #, c-format msgid "Error parsing parameter %d of type “%s”: %s\n" msgstr "Error parsing parameter %d of type “%s”: %s\n" -#: gio/gdbus-tool.c:1196 +#: gio/gdbus-tool.c:1195 #, c-format msgid "Error adding handle %d: %s\n" msgstr "Error adding handle %d: %s\n" -#: gio/gdbus-tool.c:1696 +#: gio/gdbus-tool.c:1695 msgid "Destination name to introspect" msgstr "Destination name to introspect" -#: gio/gdbus-tool.c:1697 +#: gio/gdbus-tool.c:1696 msgid "Object path to introspect" msgstr "Object path to introspect" -#: gio/gdbus-tool.c:1698 +#: gio/gdbus-tool.c:1697 msgid "Print XML" -msgstr "Print XML" +msgstr "הצגת XML" -#: gio/gdbus-tool.c:1699 +#: gio/gdbus-tool.c:1698 msgid "Introspect children" msgstr "Introspect children" -#: gio/gdbus-tool.c:1700 +#: gio/gdbus-tool.c:1699 msgid "Only print properties" msgstr "Only print properties" -#: gio/gdbus-tool.c:1789 +#: gio/gdbus-tool.c:1788 msgid "Introspect a remote object." msgstr "Introspect a remote object." -#: gio/gdbus-tool.c:1995 +#: gio/gdbus-tool.c:1994 msgid "Destination name to monitor" msgstr "Destination name to monitor" -#: gio/gdbus-tool.c:1996 +#: gio/gdbus-tool.c:1995 msgid "Object path to monitor" msgstr "Object path to monitor" -#: gio/gdbus-tool.c:2021 +#: gio/gdbus-tool.c:2020 msgid "Monitor a remote object." msgstr "Monitor a remote object." -#: gio/gdbus-tool.c:2079 +#: gio/gdbus-tool.c:2078 msgid "Error: can’t monitor a non-message-bus connection\n" msgstr "Error: can’t monitor a non-message-bus connection\n" -#: gio/gdbus-tool.c:2203 +#: gio/gdbus-tool.c:2202 msgid "Service to activate before waiting for the other one (well-known name)" msgstr "Service to activate before waiting for the other one (well-known name)" -#: gio/gdbus-tool.c:2206 +#: gio/gdbus-tool.c:2205 msgid "" "Timeout to wait for before exiting with an error (seconds); 0 for no timeout " "(default)" @@ -1277,27 +1281,27 @@ "Timeout to wait for before exiting with an error (seconds); 0 for no timeout " "(default)" -#: gio/gdbus-tool.c:2254 +#: gio/gdbus-tool.c:2253 msgid "OPTION… BUS-NAME" msgstr "OPTION… BUS-NAME" -#: gio/gdbus-tool.c:2255 +#: gio/gdbus-tool.c:2254 msgid "Wait for a bus name to appear." msgstr "Wait for a bus name to appear." -#: gio/gdbus-tool.c:2331 +#: gio/gdbus-tool.c:2330 msgid "Error: A service to activate for must be specified.\n" msgstr "Error: A service to activate for must be specified.\n" -#: gio/gdbus-tool.c:2336 +#: gio/gdbus-tool.c:2335 msgid "Error: A service to wait for must be specified.\n" msgstr "Error: A service to wait for must be specified.\n" -#: gio/gdbus-tool.c:2341 +#: gio/gdbus-tool.c:2340 msgid "Error: Too many arguments.\n" msgstr "Error: Too many arguments.\n" -#: gio/gdbus-tool.c:2349 gio/gdbus-tool.c:2356 +#: gio/gdbus-tool.c:2348 gio/gdbus-tool.c:2355 #, c-format msgid "Error: %s is not a valid well-known bus name.\n" msgstr "Error: %s is not a valid well-known bus name.\n" @@ -1307,38 +1311,43 @@ msgid "Not authorized to change debug settings" msgstr "Not authorized to change debug settings" -#: gio/gdesktopappinfo.c:2182 gio/gdesktopappinfo.c:5119 +#: gio/gdesktopappinfo.c:2242 gio/gdesktopappinfo.c:5223 msgid "Unnamed" -msgstr "Unnamed" +msgstr "ללא שם" -#: gio/gdesktopappinfo.c:2592 +#: gio/gdesktopappinfo.c:2652 msgid "Desktop file didn’t specify Exec field" msgstr "Desktop file didn’t specify Exec field" -#: gio/gdesktopappinfo.c:2891 +#: gio/gdesktopappinfo.c:2942 msgid "Unable to find terminal required for application" msgstr "Unable to find terminal required for application" -#: gio/gdesktopappinfo.c:3637 +#: gio/gdesktopappinfo.c:3002 +#, c-format +msgid "Program ‘%s’ not found in $PATH" +msgstr "Program ‘%s’ not found in $PATH" + +#: gio/gdesktopappinfo.c:3735 #, c-format msgid "Can’t create user application configuration folder %s: %s" msgstr "Can’t create user application configuration folder %s: %s" -#: gio/gdesktopappinfo.c:3641 +#: gio/gdesktopappinfo.c:3739 #, c-format msgid "Can’t create user MIME configuration folder %s: %s" msgstr "Can’t create user MIME configuration folder %s: %s" -#: gio/gdesktopappinfo.c:3883 gio/gdesktopappinfo.c:3907 +#: gio/gdesktopappinfo.c:3981 gio/gdesktopappinfo.c:4005 msgid "Application information lacks an identifier" msgstr "Application information lacks an identifier" -#: gio/gdesktopappinfo.c:4143 +#: gio/gdesktopappinfo.c:4241 #, c-format msgid "Can’t create user desktop file %s" msgstr "Can’t create user desktop file %s" -#: gio/gdesktopappinfo.c:4279 +#: gio/gdesktopappinfo.c:4377 #, c-format msgid "Custom definition for %s" msgstr "Custom definition for %s" @@ -1411,7 +1420,7 @@ msgid "Containing mount does not exist" msgstr "Containing mount does not exist" -#: gio/gfile.c:2641 gio/glocalfile.c:2500 +#: gio/gfile.c:2641 gio/glocalfile.c:2511 msgid "Can’t copy over directory" msgstr "Can’t copy over directory" @@ -1421,7 +1430,7 @@ #: gio/gfile.c:2709 msgid "Target file exists" -msgstr "Target file exists" +msgstr "קובץ יעד קיים" #: gio/gfile.c:2728 msgid "Can’t recursively copy directory" @@ -1456,7 +1465,7 @@ msgid "Invalid symlink value given" msgstr "Invalid symlink value given" -#: gio/gfile.c:4163 glib/gfileutils.c:2335 +#: gio/gfile.c:4163 glib/gfileutils.c:2392 msgid "Symbolic links not supported" msgstr "Symbolic links not supported" @@ -1526,7 +1535,7 @@ #: gio/ghttpproxy.c:93 gio/gresolver.c:460 gio/gresolver.c:613 #: glib/gconvert.c:1829 msgid "Invalid hostname" -msgstr "Invalid hostname" +msgstr "שם מארח שגוי" #: gio/ghttpproxy.c:145 msgid "Bad HTTP proxy reply" @@ -1557,37 +1566,37 @@ msgid "HTTP proxy server closed connection unexpectedly." msgstr "HTTP proxy server closed connection unexpectedly." -#: gio/gicon.c:300 +#: gio/gicon.c:299 #, c-format msgid "Wrong number of tokens (%d)" msgstr "Wrong number of tokens (%d)" -#: gio/gicon.c:320 +#: gio/gicon.c:319 #, c-format msgid "No type for class name %s" msgstr "No type for class name %s" -#: gio/gicon.c:330 +#: gio/gicon.c:329 #, c-format msgid "Type %s does not implement the GIcon interface" msgstr "Type %s does not implement the GIcon interface" -#: gio/gicon.c:341 +#: gio/gicon.c:340 #, c-format msgid "Type %s is not classed" msgstr "Type %s is not classed" -#: gio/gicon.c:355 +#: gio/gicon.c:354 #, c-format msgid "Malformed version number: %s" msgstr "Malformed version number: %s" -#: gio/gicon.c:369 +#: gio/gicon.c:368 #, c-format msgid "Type %s does not implement from_tokens() on the GIcon interface" msgstr "Type %s does not implement from_tokens() on the GIcon interface" -#: gio/gicon.c:471 +#: gio/gicon.c:470 msgid "Can’t handle the supplied version of the icon encoding" msgstr "Can’t handle the supplied version of the icon encoding" @@ -2384,7 +2393,7 @@ msgid "List contents of directories in a tree-like format." msgstr "List contents of directories in a tree-like format." -#: gio/glib-compile-resources.c:142 gio/glib-compile-schemas.c:1516 +#: gio/glib-compile-resources.c:142 gio/glib-compile-schemas.c:1513 #, c-format msgid "Element <%s> not allowed inside <%s>" msgstr "Element <%s> not allowed inside <%s>" @@ -2439,7 +2448,7 @@ msgid "text may not appear inside <%s>" msgstr "text may not appear inside <%s>" -#: gio/glib-compile-resources.c:821 gio/glib-compile-schemas.c:2174 +#: gio/glib-compile-resources.c:821 gio/glib-compile-schemas.c:2171 msgid "Show program version and exit" msgstr "Show program version and exit" @@ -2455,8 +2464,8 @@ "The directories to load files referenced in FILE from (default: current " "directory)" -#: gio/glib-compile-resources.c:823 gio/glib-compile-schemas.c:2175 -#: gio/glib-compile-schemas.c:2204 +#: gio/glib-compile-resources.c:823 gio/glib-compile-schemas.c:2172 +#: gio/glib-compile-schemas.c:2201 msgid "DIRECTORY" msgstr "DIRECTORY" @@ -2677,16 +2686,16 @@ msgid "<aliases> must contain at least one <alias>" msgstr "<aliases> must contain at least one <alias>" -#: gio/glib-compile-schemas.c:799 +#: gio/glib-compile-schemas.c:796 msgid "Empty names are not permitted" msgstr "Empty names are not permitted" -#: gio/glib-compile-schemas.c:809 +#: gio/glib-compile-schemas.c:806 #, c-format msgid "Invalid name “%s”: names must begin with a lowercase letter" msgstr "Invalid name “%s”: names must begin with a lowercase letter" -#: gio/glib-compile-schemas.c:821 +#: gio/glib-compile-schemas.c:818 #, c-format msgid "" "Invalid name “%s”: invalid character “%c”; only lowercase letters, numbers " @@ -2695,36 +2704,36 @@ "Invalid name “%s”: invalid character “%c”; only lowercase letters, numbers " "and hyphen (“-”) are permitted" -#: gio/glib-compile-schemas.c:830 +#: gio/glib-compile-schemas.c:827 #, c-format msgid "Invalid name “%s”: two successive hyphens (“--”) are not permitted" msgstr "Invalid name “%s”: two successive hyphens (“--”) are not permitted" -#: gio/glib-compile-schemas.c:839 +#: gio/glib-compile-schemas.c:836 #, c-format msgid "Invalid name “%s”: the last character may not be a hyphen (“-”)" msgstr "Invalid name “%s”: the last character may not be a hyphen (“-”)" -#: gio/glib-compile-schemas.c:847 +#: gio/glib-compile-schemas.c:844 #, c-format msgid "Invalid name “%s”: maximum length is 1024" msgstr "Invalid name “%s”: maximum length is 1024" -#: gio/glib-compile-schemas.c:919 +#: gio/glib-compile-schemas.c:916 #, c-format msgid "<child name='%s'> already specified" msgstr "<child name='%s'> already specified" -#: gio/glib-compile-schemas.c:945 +#: gio/glib-compile-schemas.c:942 msgid "Cannot add keys to a “list-of” schema" msgstr "Cannot add keys to a “list-of” schema" -#: gio/glib-compile-schemas.c:956 +#: gio/glib-compile-schemas.c:953 #, c-format msgid "<key name='%s'> already specified" msgstr "<key name='%s'> already specified" -#: gio/glib-compile-schemas.c:974 +#: gio/glib-compile-schemas.c:971 #, c-format msgid "" "<key name='%s'> shadows <key name='%s'> in <schema id='%s'>; use <override> " @@ -2733,7 +2742,7 @@ "<key name='%s'> shadows <key name='%s'> in <schema id='%s'>; use <override> " "to modify value" -#: gio/glib-compile-schemas.c:985 +#: gio/glib-compile-schemas.c:982 #, c-format msgid "" "Exactly one of “type”, “enum” or “flags” must be specified as an attribute " @@ -2742,63 +2751,63 @@ "Exactly one of “type”, “enum” or “flags” must be specified as an attribute " "to <key>" -#: gio/glib-compile-schemas.c:1004 +#: gio/glib-compile-schemas.c:1001 #, c-format msgid "<%s id='%s'> not (yet) defined." msgstr "<%s id='%s'> not (yet) defined." -#: gio/glib-compile-schemas.c:1019 +#: gio/glib-compile-schemas.c:1016 #, c-format msgid "Invalid GVariant type string “%s”" msgstr "Invalid GVariant type string “%s”" -#: gio/glib-compile-schemas.c:1049 +#: gio/glib-compile-schemas.c:1046 msgid "<override> given but schema isn’t extending anything" msgstr "<override> given but schema isn’t extending anything" -#: gio/glib-compile-schemas.c:1062 +#: gio/glib-compile-schemas.c:1059 #, c-format msgid "No <key name='%s'> to override" msgstr "No <key name='%s'> to override" -#: gio/glib-compile-schemas.c:1070 +#: gio/glib-compile-schemas.c:1067 #, c-format msgid "<override name='%s'> already specified" msgstr "<override name='%s'> already specified" -#: gio/glib-compile-schemas.c:1143 +#: gio/glib-compile-schemas.c:1140 #, c-format msgid "<schema id='%s'> already specified" msgstr "<schema id='%s'> already specified" -#: gio/glib-compile-schemas.c:1155 +#: gio/glib-compile-schemas.c:1152 #, c-format msgid "<schema id='%s'> extends not yet existing schema “%s”" msgstr "<schema id='%s'> extends not yet existing schema “%s”" -#: gio/glib-compile-schemas.c:1171 +#: gio/glib-compile-schemas.c:1168 #, c-format msgid "<schema id='%s'> is list of not yet existing schema “%s”" msgstr "<schema id='%s'> is list of not yet existing schema “%s”" -#: gio/glib-compile-schemas.c:1179 +#: gio/glib-compile-schemas.c:1176 #, c-format msgid "Cannot be a list of a schema with a path" msgstr "Cannot be a list of a schema with a path" -#: gio/glib-compile-schemas.c:1189 +#: gio/glib-compile-schemas.c:1186 #, c-format msgid "Cannot extend a schema with a path" msgstr "Cannot extend a schema with a path" -#: gio/glib-compile-schemas.c:1199 +#: gio/glib-compile-schemas.c:1196 #, c-format msgid "" "<schema id='%s'> is a list, extending <schema id='%s'> which is not a list" msgstr "" "<schema id='%s'> is a list, extending <schema id='%s'> which is not a list" -#: gio/glib-compile-schemas.c:1209 +#: gio/glib-compile-schemas.c:1206 #, c-format msgid "" "<schema id='%s' list-of='%s'> extends <schema id='%s' list-of='%s'> but “%s” " @@ -2807,17 +2816,17 @@ "<schema id='%s' list-of='%s'> extends <schema id='%s' list-of='%s'> but “%s” " "does not extend “%s”" -#: gio/glib-compile-schemas.c:1226 +#: gio/glib-compile-schemas.c:1223 #, c-format msgid "A path, if given, must begin and end with a slash" msgstr "A path, if given, must begin and end with a slash" -#: gio/glib-compile-schemas.c:1233 +#: gio/glib-compile-schemas.c:1230 #, c-format msgid "The path of a list must end with “:/”" msgstr "The path of a list must end with “:/”" -#: gio/glib-compile-schemas.c:1242 +#: gio/glib-compile-schemas.c:1239 #, c-format msgid "" "Warning: Schema “%s” has path “%s”. Paths starting with “/apps/”, “/" @@ -2826,49 +2835,49 @@ "Warning: Schema “%s” has path “%s”. Paths starting with “/apps/”, “/" "desktop/” or “/system/” are deprecated." -#: gio/glib-compile-schemas.c:1272 +#: gio/glib-compile-schemas.c:1269 #, c-format msgid "<%s id='%s'> already specified" msgstr "<%s id='%s'> already specified" -#: gio/glib-compile-schemas.c:1422 gio/glib-compile-schemas.c:1438 +#: gio/glib-compile-schemas.c:1419 gio/glib-compile-schemas.c:1435 #, c-format msgid "Only one <%s> element allowed inside <%s>" msgstr "Only one <%s> element allowed inside <%s>" -#: gio/glib-compile-schemas.c:1520 +#: gio/glib-compile-schemas.c:1517 #, c-format msgid "Element <%s> not allowed at the top level" msgstr "Element <%s> not allowed at the top level" -#: gio/glib-compile-schemas.c:1538 +#: gio/glib-compile-schemas.c:1535 msgid "Element <default> is required in <key>" msgstr "Element <default> is required in <key>" -#: gio/glib-compile-schemas.c:1628 +#: gio/glib-compile-schemas.c:1625 #, c-format msgid "Text may not appear inside <%s>" msgstr "Text may not appear inside <%s>" -#: gio/glib-compile-schemas.c:1696 +#: gio/glib-compile-schemas.c:1693 #, c-format msgid "Warning: undefined reference to <schema id='%s'/>" msgstr "Warning: undefined reference to <schema id='%s'/>" #. Translators: Do not translate "--strict". -#: gio/glib-compile-schemas.c:1835 gio/glib-compile-schemas.c:1914 +#: gio/glib-compile-schemas.c:1832 gio/glib-compile-schemas.c:1911 msgid "--strict was specified; exiting." msgstr "--strict was specified; exiting." -#: gio/glib-compile-schemas.c:1847 +#: gio/glib-compile-schemas.c:1844 msgid "This entire file has been ignored." msgstr "This entire file has been ignored." -#: gio/glib-compile-schemas.c:1910 +#: gio/glib-compile-schemas.c:1907 msgid "Ignoring this file." msgstr "Ignoring this file." -#: gio/glib-compile-schemas.c:1965 +#: gio/glib-compile-schemas.c:1962 #, c-format msgid "" "No such key “%s” in schema “%s” as specified in override file “%s”; ignoring " @@ -2877,7 +2886,7 @@ "No such key “%s” in schema “%s” as specified in override file “%s”; ignoring " "override for this key." -#: gio/glib-compile-schemas.c:1973 +#: gio/glib-compile-schemas.c:1970 #, c-format msgid "" "No such key “%s” in schema “%s” as specified in override file “%s” and --" @@ -2886,7 +2895,7 @@ "No such key “%s” in schema “%s” as specified in override file “%s” and --" "strict was specified; exiting." -#: gio/glib-compile-schemas.c:1995 +#: gio/glib-compile-schemas.c:1992 #, c-format msgid "" "Cannot provide per-desktop overrides for localized key “%s” in schema " @@ -2895,7 +2904,7 @@ "Cannot provide per-desktop overrides for localized key “%s” in schema " "“%s” (override file “%s”); ignoring override for this key." -#: gio/glib-compile-schemas.c:2004 +#: gio/glib-compile-schemas.c:2001 #, c-format msgid "" "Cannot provide per-desktop overrides for localized key “%s” in schema " @@ -2904,7 +2913,7 @@ "Cannot provide per-desktop overrides for localized key “%s” in schema " "“%s” (override file “%s”) and --strict was specified; exiting." -#: gio/glib-compile-schemas.c:2028 +#: gio/glib-compile-schemas.c:2025 #, c-format msgid "" "Error parsing key “%s” in schema “%s” as specified in override file “%s”: " @@ -2913,7 +2922,7 @@ "Error parsing key “%s” in schema “%s” as specified in override file “%s”: " "%s. Ignoring override for this key." -#: gio/glib-compile-schemas.c:2040 +#: gio/glib-compile-schemas.c:2037 #, c-format msgid "" "Error parsing key “%s” in schema “%s” as specified in override file “%s”: " @@ -2922,7 +2931,7 @@ "Error parsing key “%s” in schema “%s” as specified in override file “%s”: " "%s. --strict was specified; exiting." -#: gio/glib-compile-schemas.c:2067 +#: gio/glib-compile-schemas.c:2064 #, c-format msgid "" "Override for key “%s” in schema “%s” in override file “%s” is outside the " @@ -2931,7 +2940,7 @@ "Override for key “%s” in schema “%s” in override file “%s” is outside the " "range given in the schema; ignoring override for this key." -#: gio/glib-compile-schemas.c:2077 +#: gio/glib-compile-schemas.c:2074 #, c-format msgid "" "Override for key “%s” in schema “%s” in override file “%s” is outside the " @@ -2940,7 +2949,7 @@ "Override for key “%s” in schema “%s” in override file “%s” is outside the " "range given in the schema and --strict was specified; exiting." -#: gio/glib-compile-schemas.c:2103 +#: gio/glib-compile-schemas.c:2100 #, c-format msgid "" "Override for key “%s” in schema “%s” in override file “%s” is not in the " @@ -2949,7 +2958,7 @@ "Override for key “%s” in schema “%s” in override file “%s” is not in the " "list of valid choices; ignoring override for this key." -#: gio/glib-compile-schemas.c:2113 +#: gio/glib-compile-schemas.c:2110 #, c-format msgid "" "Override for key “%s” in schema “%s” in override file “%s” is not in the " @@ -2958,23 +2967,23 @@ "Override for key “%s” in schema “%s” in override file “%s” is not in the " "list of valid choices and --strict was specified; exiting." -#: gio/glib-compile-schemas.c:2175 +#: gio/glib-compile-schemas.c:2172 msgid "Where to store the gschemas.compiled file" msgstr "Where to store the gschemas.compiled file" -#: gio/glib-compile-schemas.c:2176 +#: gio/glib-compile-schemas.c:2173 msgid "Abort on any errors in schemas" msgstr "Abort on any errors in schemas" -#: gio/glib-compile-schemas.c:2177 +#: gio/glib-compile-schemas.c:2174 msgid "Do not write the gschema.compiled file" msgstr "Do not write the gschema.compiled file" -#: gio/glib-compile-schemas.c:2178 +#: gio/glib-compile-schemas.c:2175 msgid "Do not enforce key name restrictions" msgstr "Do not enforce key name restrictions" -#: gio/glib-compile-schemas.c:2207 +#: gio/glib-compile-schemas.c:2204 msgid "" "Compile all GSettings schema files into a schema cache.\n" "Schema files are required to have the extension .gschema.xml,\n" @@ -2984,15 +2993,15 @@ "Schema files are required to have the extension .gschema.xml,\n" "and the cache file is called gschemas.compiled." -#: gio/glib-compile-schemas.c:2228 +#: gio/glib-compile-schemas.c:2225 msgid "You should give exactly one directory name" msgstr "You should give exactly one directory name" -#: gio/glib-compile-schemas.c:2271 +#: gio/glib-compile-schemas.c:2268 msgid "No schema files found: doing nothing." msgstr "No schema files found: doing nothing." -#: gio/glib-compile-schemas.c:2273 +#: gio/glib-compile-schemas.c:2270 msgid "No schema files found: removed existing output file." msgstr "No schema files found: removed existing output file." @@ -3001,7 +3010,7 @@ msgid "Invalid filename %s" msgstr "Invalid filename %s" -#: gio/glocalfile.c:996 +#: gio/glocalfile.c:1005 #, c-format msgid "Error getting filesystem info for %s: %s" msgstr "Error getting filesystem info for %s: %s" @@ -3010,124 +3019,124 @@ #. * the enclosing (user visible) mount of a file, but none #. * exists. #. -#: gio/glocalfile.c:1137 +#: gio/glocalfile.c:1141 #, c-format msgid "Containing mount for file %s not found" msgstr "Containing mount for file %s not found" -#: gio/glocalfile.c:1160 +#: gio/glocalfile.c:1164 msgid "Can’t rename root directory" msgstr "Can’t rename root directory" -#: gio/glocalfile.c:1178 gio/glocalfile.c:1201 +#: gio/glocalfile.c:1182 gio/glocalfile.c:1205 #, c-format msgid "Error renaming file %s: %s" msgstr "Error renaming file %s: %s" -#: gio/glocalfile.c:1185 +#: gio/glocalfile.c:1189 msgid "Can’t rename file, filename already exists" msgstr "Can’t rename file, filename already exists" -#: gio/glocalfile.c:1198 gio/glocalfile.c:2394 gio/glocalfile.c:2422 -#: gio/glocalfile.c:2561 gio/glocalfileoutputstream.c:658 +#: gio/glocalfile.c:1202 gio/glocalfile.c:2405 gio/glocalfile.c:2433 +#: gio/glocalfile.c:2572 gio/glocalfileoutputstream.c:658 msgid "Invalid filename" msgstr "Invalid filename" -#: gio/glocalfile.c:1366 gio/glocalfile.c:1377 +#: gio/glocalfile.c:1370 gio/glocalfile.c:1381 #, c-format msgid "Error opening file %s: %s" msgstr "Error opening file %s: %s" -#: gio/glocalfile.c:1502 +#: gio/glocalfile.c:1506 #, c-format msgid "Error removing file %s: %s" msgstr "Error removing file %s: %s" -#: gio/glocalfile.c:1996 gio/glocalfile.c:2007 gio/glocalfile.c:2034 +#: gio/glocalfile.c:2000 gio/glocalfile.c:2011 gio/glocalfile.c:2038 #, c-format msgid "Error trashing file %s: %s" msgstr "Error trashing file %s: %s" -#: gio/glocalfile.c:2054 +#: gio/glocalfile.c:2058 #, c-format msgid "Unable to create trash directory %s: %s" msgstr "Unable to create trash directory %s: %s" -#: gio/glocalfile.c:2075 +#: gio/glocalfile.c:2079 #, c-format msgid "Unable to find toplevel directory to trash %s" msgstr "Unable to find toplevel directory to trash %s" -#: gio/glocalfile.c:2083 +#: gio/glocalfile.c:2087 #, c-format msgid "Trashing on system internal mounts is not supported" msgstr "Trashing on system internal mounts is not supported" -#: gio/glocalfile.c:2169 gio/glocalfile.c:2197 +#: gio/glocalfile.c:2173 gio/glocalfile.c:2201 #, c-format msgid "Unable to find or create trash directory %s to trash %s" msgstr "Unable to find or create trash directory %s to trash %s" -#: gio/glocalfile.c:2243 +#: gio/glocalfile.c:2245 #, c-format msgid "Unable to create trashing info file for %s: %s" msgstr "Unable to create trashing info file for %s: %s" -#: gio/glocalfile.c:2305 +#: gio/glocalfile.c:2316 #, c-format msgid "Unable to trash file %s across filesystem boundaries" msgstr "Unable to trash file %s across filesystem boundaries" -#: gio/glocalfile.c:2309 gio/glocalfile.c:2365 +#: gio/glocalfile.c:2320 gio/glocalfile.c:2376 #, c-format msgid "Unable to trash file %s: %s" msgstr "Unable to trash file %s: %s" -#: gio/glocalfile.c:2371 +#: gio/glocalfile.c:2382 #, c-format msgid "Unable to trash file %s" msgstr "Unable to trash file %s" -#: gio/glocalfile.c:2397 +#: gio/glocalfile.c:2408 #, c-format msgid "Error creating directory %s: %s" msgstr "Error creating directory %s: %s" -#: gio/glocalfile.c:2426 +#: gio/glocalfile.c:2437 #, c-format msgid "Filesystem does not support symbolic links" msgstr "Filesystem does not support symbolic links" -#: gio/glocalfile.c:2429 +#: gio/glocalfile.c:2440 #, c-format msgid "Error making symbolic link %s: %s" msgstr "Error making symbolic link %s: %s" -#: gio/glocalfile.c:2472 gio/glocalfile.c:2507 gio/glocalfile.c:2564 +#: gio/glocalfile.c:2483 gio/glocalfile.c:2518 gio/glocalfile.c:2575 #, c-format msgid "Error moving file %s: %s" msgstr "Error moving file %s: %s" -#: gio/glocalfile.c:2495 +#: gio/glocalfile.c:2506 msgid "Can’t move directory over directory" msgstr "Can’t move directory over directory" -#: gio/glocalfile.c:2521 gio/glocalfileoutputstream.c:1110 +#: gio/glocalfile.c:2532 gio/glocalfileoutputstream.c:1110 #: gio/glocalfileoutputstream.c:1124 gio/glocalfileoutputstream.c:1139 #: gio/glocalfileoutputstream.c:1156 gio/glocalfileoutputstream.c:1170 msgid "Backup file creation failed" msgstr "Backup file creation failed" -#: gio/glocalfile.c:2540 +#: gio/glocalfile.c:2551 #, c-format msgid "Error removing target file: %s" msgstr "Error removing target file: %s" -#: gio/glocalfile.c:2554 +#: gio/glocalfile.c:2565 msgid "Move between mounts not supported" msgstr "Move between mounts not supported" -#: gio/glocalfile.c:2728 +#: gio/glocalfile.c:2741 #, c-format msgid "Could not determine the disk usage of %s: %s" msgstr "Could not determine the disk usage of %s: %s" @@ -3149,116 +3158,116 @@ msgid "Error setting extended attribute “%s”: %s" msgstr "Error setting extended attribute “%s”: %s" -#: gio/glocalfileinfo.c:1738 gio/win32/gwinhttpfile.c:191 +#: gio/glocalfileinfo.c:1819 gio/win32/gwinhttpfile.c:191 msgid " (invalid encoding)" msgstr " (invalid encoding)" -#: gio/glocalfileinfo.c:1897 gio/glocalfileoutputstream.c:945 +#: gio/glocalfileinfo.c:1978 gio/glocalfileoutputstream.c:945 #: gio/glocalfileoutputstream.c:997 #, c-format msgid "Error when getting information for file “%s”: %s" msgstr "Error when getting information for file “%s”: %s" -#: gio/glocalfileinfo.c:2163 +#: gio/glocalfileinfo.c:2281 #, c-format msgid "Error when getting information for file descriptor: %s" msgstr "Error when getting information for file descriptor: %s" -#: gio/glocalfileinfo.c:2208 +#: gio/glocalfileinfo.c:2326 msgid "Invalid attribute type (uint32 expected)" msgstr "Invalid attribute type (uint32 expected)" -#: gio/glocalfileinfo.c:2226 +#: gio/glocalfileinfo.c:2344 msgid "Invalid attribute type (uint64 expected)" msgstr "Invalid attribute type (uint64 expected)" -#: gio/glocalfileinfo.c:2245 gio/glocalfileinfo.c:2264 +#: gio/glocalfileinfo.c:2363 gio/glocalfileinfo.c:2382 msgid "Invalid attribute type (byte string expected)" msgstr "Invalid attribute type (byte string expected)" -#: gio/glocalfileinfo.c:2311 +#: gio/glocalfileinfo.c:2429 msgid "Cannot set permissions on symlinks" msgstr "Cannot set permissions on symlinks" -#: gio/glocalfileinfo.c:2327 +#: gio/glocalfileinfo.c:2445 #, c-format msgid "Error setting permissions: %s" msgstr "Error setting permissions: %s" -#: gio/glocalfileinfo.c:2378 +#: gio/glocalfileinfo.c:2496 #, c-format msgid "Error setting owner: %s" msgstr "Error setting owner: %s" -#: gio/glocalfileinfo.c:2401 +#: gio/glocalfileinfo.c:2519 msgid "symlink must be non-NULL" msgstr "symlink must be non-NULL" -#: gio/glocalfileinfo.c:2411 gio/glocalfileinfo.c:2430 -#: gio/glocalfileinfo.c:2441 +#: gio/glocalfileinfo.c:2529 gio/glocalfileinfo.c:2548 +#: gio/glocalfileinfo.c:2559 #, c-format msgid "Error setting symlink: %s" msgstr "Error setting symlink: %s" -#: gio/glocalfileinfo.c:2420 +#: gio/glocalfileinfo.c:2538 msgid "Error setting symlink: file is not a symlink" msgstr "Error setting symlink: file is not a symlink" -#: gio/glocalfileinfo.c:2492 +#: gio/glocalfileinfo.c:2630 #, c-format msgid "Extra nanoseconds %d for UNIX timestamp %lld are negative" msgstr "Extra nanoseconds %d for UNIX timestamp %lld are negative" -#: gio/glocalfileinfo.c:2501 +#: gio/glocalfileinfo.c:2639 #, c-format msgid "Extra nanoseconds %d for UNIX timestamp %lld reach 1 second" msgstr "Extra nanoseconds %d for UNIX timestamp %lld reach 1 second" -#: gio/glocalfileinfo.c:2511 +#: gio/glocalfileinfo.c:2649 #, c-format msgid "UNIX timestamp %lld does not fit into 64 bits" msgstr "UNIX timestamp %lld does not fit into 64 bits" -#: gio/glocalfileinfo.c:2522 +#: gio/glocalfileinfo.c:2660 #, c-format msgid "UNIX timestamp %lld is outside of the range supported by Windows" msgstr "UNIX timestamp %lld is outside of the range supported by Windows" -#: gio/glocalfileinfo.c:2625 +#: gio/glocalfileinfo.c:2792 #, c-format msgid "File name “%s” cannot be converted to UTF-16" msgstr "File name “%s” cannot be converted to UTF-16" -#: gio/glocalfileinfo.c:2644 +#: gio/glocalfileinfo.c:2811 #, c-format msgid "File “%s” cannot be opened: Windows Error %lu" msgstr "File “%s” cannot be opened: Windows Error %lu" -#: gio/glocalfileinfo.c:2657 +#: gio/glocalfileinfo.c:2824 #, c-format msgid "Error setting modification or access time for file “%s”: %lu" msgstr "Error setting modification or access time for file “%s”: %lu" -#: gio/glocalfileinfo.c:2798 gio/glocalfileinfo.c:2810 +#: gio/glocalfileinfo.c:2981 #, c-format msgid "Error setting modification or access time: %s" msgstr "Error setting modification or access time: %s" # c-format -#: gio/glocalfileinfo.c:2833 +#: gio/glocalfileinfo.c:3004 msgid "SELinux context must be non-NULL" msgstr "SELinux context must be non-NULL" -#: gio/glocalfileinfo.c:2840 +#: gio/glocalfileinfo.c:3011 msgid "SELinux is not enabled on this system" msgstr "SELinux is not enabled on this system" -#: gio/glocalfileinfo.c:2850 +#: gio/glocalfileinfo.c:3021 #, c-format msgid "Error setting SELinux context: %s" msgstr "Error setting SELinux context: %s" -#: gio/glocalfileinfo.c:2947 +#: gio/glocalfileinfo.c:3118 #, c-format msgid "Setting attribute %s not supported" msgstr "Setting attribute %s not supported" @@ -3475,8 +3484,8 @@ #. Translators: the first placeholder is a domain name, the #. * second is an error message #: gio/gresolver.c:403 gio/gthreadedresolver.c:152 gio/gthreadedresolver.c:170 -#: gio/gthreadedresolver.c:782 gio/gthreadedresolver.c:806 -#: gio/gthreadedresolver.c:831 gio/gthreadedresolver.c:846 +#: gio/gthreadedresolver.c:798 gio/gthreadedresolver.c:822 +#: gio/gthreadedresolver.c:847 gio/gthreadedresolver.c:862 #, c-format msgid "Error resolving “%s”: %s" msgstr "Error resolving “%s”: %s" @@ -4187,35 +4196,35 @@ #. Translators: the placeholder is a DNS record type, such as ‘MX’ or ‘SRV’ #: gio/gthreadedresolver.c:552 gio/gthreadedresolver.c:574 -#: gio/gthreadedresolver.c:612 gio/gthreadedresolver.c:659 -#: gio/gthreadedresolver.c:688 gio/gthreadedresolver.c:700 +#: gio/gthreadedresolver.c:628 gio/gthreadedresolver.c:675 +#: gio/gthreadedresolver.c:704 gio/gthreadedresolver.c:716 #, c-format msgid "Error parsing DNS %s record: malformed DNS packet" msgstr "Error parsing DNS %s record: malformed DNS packet" -#: gio/gthreadedresolver.c:758 gio/gthreadedresolver.c:895 -#: gio/gthreadedresolver.c:993 gio/gthreadedresolver.c:1043 +#: gio/gthreadedresolver.c:774 gio/gthreadedresolver.c:911 +#: gio/gthreadedresolver.c:1009 gio/gthreadedresolver.c:1059 #, c-format msgid "No DNS record of the requested type for “%s”" msgstr "No DNS record of the requested type for “%s”" -#: gio/gthreadedresolver.c:763 gio/gthreadedresolver.c:998 +#: gio/gthreadedresolver.c:779 gio/gthreadedresolver.c:1014 #, c-format msgid "Temporarily unable to resolve “%s”" msgstr "Temporarily unable to resolve “%s”" -#: gio/gthreadedresolver.c:768 gio/gthreadedresolver.c:1003 -#: gio/gthreadedresolver.c:1113 +#: gio/gthreadedresolver.c:784 gio/gthreadedresolver.c:1019 +#: gio/gthreadedresolver.c:1129 #, c-format msgid "Error resolving “%s”" msgstr "Error resolving “%s”" -#: gio/gthreadedresolver.c:782 gio/gthreadedresolver.c:806 -#: gio/gthreadedresolver.c:831 gio/gthreadedresolver.c:846 +#: gio/gthreadedresolver.c:798 gio/gthreadedresolver.c:822 +#: gio/gthreadedresolver.c:847 gio/gthreadedresolver.c:862 msgid "Malformed DNS packet" msgstr "Malformed DNS packet" -#: gio/gthreadedresolver.c:888 +#: gio/gthreadedresolver.c:904 #, c-format msgid "Failed to parse DNS response for “%s”: " msgstr "Failed to parse DNS response for “%s”: " @@ -4353,7 +4362,7 @@ msgid "Error closing file descriptor: %s" msgstr "Error closing file descriptor: %s" -#: gio/gunixmounts.c:2815 gio/gunixmounts.c:2868 +#: gio/gunixmounts.c:2817 gio/gunixmounts.c:2870 msgid "Filesystem root" msgstr "Filesystem root" @@ -4435,77 +4444,77 @@ msgid "Wrong args\n" msgstr "Wrong args\n" -#: glib/gbookmarkfile.c:779 +#: glib/gbookmarkfile.c:861 #, c-format msgid "Unexpected attribute “%s” for element “%s”" msgstr "Unexpected attribute “%s” for element “%s”" -#: glib/gbookmarkfile.c:790 glib/gbookmarkfile.c:870 glib/gbookmarkfile.c:880 -#: glib/gbookmarkfile.c:993 +#: glib/gbookmarkfile.c:872 glib/gbookmarkfile.c:952 glib/gbookmarkfile.c:962 +#: glib/gbookmarkfile.c:1075 #, c-format msgid "Attribute “%s” of element “%s” not found" msgstr "Attribute “%s” of element “%s” not found" -#: glib/gbookmarkfile.c:1202 glib/gbookmarkfile.c:1267 -#: glib/gbookmarkfile.c:1331 glib/gbookmarkfile.c:1341 +#: glib/gbookmarkfile.c:1284 glib/gbookmarkfile.c:1349 +#: glib/gbookmarkfile.c:1413 glib/gbookmarkfile.c:1423 #, c-format msgid "Unexpected tag “%s”, tag “%s” expected" msgstr "Unexpected tag “%s”, tag “%s” expected" -#: glib/gbookmarkfile.c:1227 glib/gbookmarkfile.c:1241 -#: glib/gbookmarkfile.c:1309 glib/gbookmarkfile.c:1355 +#: glib/gbookmarkfile.c:1309 glib/gbookmarkfile.c:1323 +#: glib/gbookmarkfile.c:1391 glib/gbookmarkfile.c:1437 #, c-format msgid "Unexpected tag “%s” inside “%s”" msgstr "Unexpected tag “%s” inside “%s”" -#: glib/gbookmarkfile.c:1635 +#: glib/gbookmarkfile.c:1717 #, c-format msgid "Invalid date/time ‘%s’ in bookmark file" msgstr "Invalid date/time ‘%s’ in bookmark file" -#: glib/gbookmarkfile.c:1838 +#: glib/gbookmarkfile.c:1956 msgid "No valid bookmark file found in data dirs" msgstr "No valid bookmark file found in data dirs" -#: glib/gbookmarkfile.c:2039 +#: glib/gbookmarkfile.c:2157 #, c-format msgid "A bookmark for URI “%s” already exists" msgstr "A bookmark for URI “%s” already exists" -#: glib/gbookmarkfile.c:2088 glib/gbookmarkfile.c:2246 -#: glib/gbookmarkfile.c:2331 glib/gbookmarkfile.c:2411 -#: glib/gbookmarkfile.c:2496 glib/gbookmarkfile.c:2630 -#: glib/gbookmarkfile.c:2763 glib/gbookmarkfile.c:2898 -#: glib/gbookmarkfile.c:2940 glib/gbookmarkfile.c:3037 -#: glib/gbookmarkfile.c:3158 glib/gbookmarkfile.c:3352 -#: glib/gbookmarkfile.c:3493 glib/gbookmarkfile.c:3712 -#: glib/gbookmarkfile.c:3801 glib/gbookmarkfile.c:3890 -#: glib/gbookmarkfile.c:4009 +#: glib/gbookmarkfile.c:2206 glib/gbookmarkfile.c:2364 +#: glib/gbookmarkfile.c:2449 glib/gbookmarkfile.c:2529 +#: glib/gbookmarkfile.c:2614 glib/gbookmarkfile.c:2748 +#: glib/gbookmarkfile.c:2881 glib/gbookmarkfile.c:3016 +#: glib/gbookmarkfile.c:3058 glib/gbookmarkfile.c:3155 +#: glib/gbookmarkfile.c:3276 glib/gbookmarkfile.c:3470 +#: glib/gbookmarkfile.c:3611 glib/gbookmarkfile.c:3830 +#: glib/gbookmarkfile.c:3919 glib/gbookmarkfile.c:4008 +#: glib/gbookmarkfile.c:4127 #, c-format msgid "No bookmark found for URI “%s”" msgstr "No bookmark found for URI “%s”" -#: glib/gbookmarkfile.c:2420 +#: glib/gbookmarkfile.c:2538 #, c-format msgid "No MIME type defined in the bookmark for URI “%s”" msgstr "No MIME type defined in the bookmark for URI “%s”" -#: glib/gbookmarkfile.c:2505 +#: glib/gbookmarkfile.c:2623 #, c-format msgid "No private flag has been defined in bookmark for URI “%s”" msgstr "No private flag has been defined in bookmark for URI “%s”" -#: glib/gbookmarkfile.c:3046 +#: glib/gbookmarkfile.c:3164 #, c-format msgid "No groups set in bookmark for URI “%s”" msgstr "No groups set in bookmark for URI “%s”" -#: glib/gbookmarkfile.c:3514 glib/gbookmarkfile.c:3722 +#: glib/gbookmarkfile.c:3632 glib/gbookmarkfile.c:3840 #, c-format msgid "No application with name “%s” registered a bookmark for “%s”" msgstr "No application with name “%s” registered a bookmark for “%s”" -#: glib/gbookmarkfile.c:3745 +#: glib/gbookmarkfile.c:3863 #, c-format msgid "Failed to expand exec line “%s” with URI “%s”" msgstr "Failed to expand exec line “%s” with URI “%s”" @@ -4980,7 +4989,7 @@ msgid "Error opening directory “%s”: %s" msgstr "Error opening directory “%s”: %s" -#: glib/gfileutils.c:735 glib/gfileutils.c:827 +#: glib/gfileutils.c:753 glib/gfileutils.c:845 #, c-format msgid "Could not allocate %lu byte to read file “%s”" msgid_plural "Could not allocate %lu bytes to read file “%s”" @@ -4989,72 +4998,72 @@ msgstr2 "Could not allocate %lu bytes to read file “%s”" msgstr3 "Could not allocate %lu bytes to read file “%s”" -#: glib/gfileutils.c:752 +#: glib/gfileutils.c:770 #, c-format msgid "Error reading file “%s”: %s" msgstr "Error reading file “%s”: %s" -#: glib/gfileutils.c:788 +#: glib/gfileutils.c:806 #, c-format msgid "File “%s” is too large" msgstr "File “%s” is too large" -#: glib/gfileutils.c:852 +#: glib/gfileutils.c:870 #, c-format msgid "Failed to read from file “%s”: %s" msgstr "Failed to read from file “%s”: %s" -#: glib/gfileutils.c:902 glib/gfileutils.c:977 glib/gfileutils.c:1449 +#: glib/gfileutils.c:920 glib/gfileutils.c:995 glib/gfileutils.c:1472 #, c-format msgid "Failed to open file “%s”: %s" msgstr "Failed to open file “%s”: %s" -#: glib/gfileutils.c:915 +#: glib/gfileutils.c:933 #, c-format msgid "Failed to get attributes of file “%s”: fstat() failed: %s" msgstr "Failed to get attributes of file “%s”: fstat() failed: %s" -#: glib/gfileutils.c:946 +#: glib/gfileutils.c:964 #, c-format msgid "Failed to open file “%s”: fdopen() failed: %s" msgstr "Failed to open file “%s”: fdopen() failed: %s" -#: glib/gfileutils.c:1047 +#: glib/gfileutils.c:1065 #, c-format msgid "Failed to rename file “%s” to “%s”: g_rename() failed: %s" msgstr "Failed to rename file “%s” to “%s”: g_rename() failed: %s" -#: glib/gfileutils.c:1156 +#: glib/gfileutils.c:1179 #, c-format msgid "Failed to write file “%s”: write() failed: %s" msgstr "Failed to write file “%s”: write() failed: %s" -#: glib/gfileutils.c:1177 +#: glib/gfileutils.c:1200 #, c-format msgid "Failed to write file “%s”: fsync() failed: %s" msgstr "Failed to write file “%s”: fsync() failed: %s" -#: glib/gfileutils.c:1338 glib/gfileutils.c:1753 +#: glib/gfileutils.c:1361 glib/gfileutils.c:1776 #, c-format msgid "Failed to create file “%s”: %s" msgstr "Failed to create file “%s”: %s" -#: glib/gfileutils.c:1383 +#: glib/gfileutils.c:1406 #, c-format msgid "Existing file “%s” could not be removed: g_unlink() failed: %s" msgstr "Existing file “%s” could not be removed: g_unlink() failed: %s" -#: glib/gfileutils.c:1718 +#: glib/gfileutils.c:1741 #, c-format msgid "Template “%s” invalid, should not contain a “%s”" msgstr "Template “%s” invalid, should not contain a “%s”" -#: glib/gfileutils.c:1731 +#: glib/gfileutils.c:1754 #, c-format msgid "Template “%s” doesn’t contain XXXXXX" msgstr "Template “%s” doesn’t contain XXXXXX" -#: glib/gfileutils.c:2291 glib/gfileutils.c:2320 +#: glib/gfileutils.c:2348 glib/gfileutils.c:2377 #, c-format msgid "Failed to read the symbolic link “%s”: %s" msgstr "Failed to read the symbolic link “%s”: %s" @@ -5115,8 +5124,8 @@ msgstr "Key file contains unsupported encoding “%s”" #: glib/gkeyfile.c:1679 glib/gkeyfile.c:1852 glib/gkeyfile.c:3299 -#: glib/gkeyfile.c:3363 glib/gkeyfile.c:3493 glib/gkeyfile.c:3625 -#: glib/gkeyfile.c:3771 glib/gkeyfile.c:4006 glib/gkeyfile.c:4073 +#: glib/gkeyfile.c:3363 glib/gkeyfile.c:3493 glib/gkeyfile.c:3622 +#: glib/gkeyfile.c:3768 glib/gkeyfile.c:4003 glib/gkeyfile.c:4070 #, c-format msgid "Key file does not have group “%s”" msgstr "Key file does not have group “%s”" @@ -5152,31 +5161,31 @@ msgid "Key “%s” in group “%s” has value “%s” where %s was expected" msgstr "Key “%s” in group “%s” has value “%s” where %s was expected" -#: glib/gkeyfile.c:4326 +#: glib/gkeyfile.c:4323 msgid "Key file contains escape character at end of line" msgstr "Key file contains escape character at end of line" -#: glib/gkeyfile.c:4348 +#: glib/gkeyfile.c:4345 #, c-format msgid "Key file contains invalid escape sequence “%s”" msgstr "Key file contains invalid escape sequence “%s”" -#: glib/gkeyfile.c:4493 +#: glib/gkeyfile.c:4490 #, c-format msgid "Value “%s” cannot be interpreted as a number." msgstr "Value “%s” cannot be interpreted as a number." -#: glib/gkeyfile.c:4507 +#: glib/gkeyfile.c:4504 #, c-format msgid "Integer value “%s” out of range" msgstr "Integer value “%s” out of range" -#: glib/gkeyfile.c:4540 +#: glib/gkeyfile.c:4537 #, c-format msgid "Value “%s” cannot be interpreted as a float number." msgstr "Value “%s” cannot be interpreted as a float number." -#: glib/gkeyfile.c:4579 +#: glib/gkeyfile.c:4576 #, c-format msgid "Value “%s” cannot be interpreted as a boolean." msgstr "Value “%s” cannot be interpreted as a boolean." @@ -5196,32 +5205,32 @@ msgid "Failed to open file “%s”: open() failed: %s" msgstr "Failed to open file “%s”: open() failed: %s" -#: glib/gmarkup.c:400 glib/gmarkup.c:442 +#: glib/gmarkup.c:393 glib/gmarkup.c:435 #, c-format msgid "Error on line %d char %d: " msgstr "Error on line %d char %d: " -#: glib/gmarkup.c:464 glib/gmarkup.c:547 +#: glib/gmarkup.c:457 glib/gmarkup.c:540 #, c-format msgid "Invalid UTF-8 encoded text in name — not valid “%s”" msgstr "Invalid UTF-8 encoded text in name — not valid “%s”" -#: glib/gmarkup.c:475 +#: glib/gmarkup.c:468 #, c-format msgid "“%s” is not a valid name" msgstr "“%s” is not a valid name" -#: glib/gmarkup.c:491 +#: glib/gmarkup.c:484 #, c-format msgid "“%s” is not a valid name: “%c”" msgstr "“%s” is not a valid name: “%c”" -#: glib/gmarkup.c:615 +#: glib/gmarkup.c:608 #, c-format msgid "Error on line %d: %s" msgstr "Error on line %d: %s" -#: glib/gmarkup.c:692 +#: glib/gmarkup.c:685 #, c-format msgid "" "Failed to parse “%-.*s”, which should have been a digit inside a character " @@ -5230,7 +5239,7 @@ "Failed to parse “%-.*s”, which should have been a digit inside a character " "reference (ê for example) — perhaps the digit is too large" -#: glib/gmarkup.c:704 +#: glib/gmarkup.c:697 msgid "" "Character reference did not end with a semicolon; most likely you used an " "ampersand character without intending to start an entity — escape ampersand " @@ -5240,23 +5249,23 @@ "ampersand character without intending to start an entity — escape ampersand " "as &" -#: glib/gmarkup.c:730 +#: glib/gmarkup.c:723 #, c-format msgid "Character reference “%-.*s” does not encode a permitted character" msgstr "Character reference “%-.*s” does not encode a permitted character" -#: glib/gmarkup.c:768 +#: glib/gmarkup.c:761 msgid "" "Empty entity “&;” seen; valid entities are: & " < > '" msgstr "" "Empty entity “&;” seen; valid entities are: & " < > '" -#: glib/gmarkup.c:776 +#: glib/gmarkup.c:769 #, c-format msgid "Entity name “%-.*s” is not known" msgstr "Entity name “%-.*s” is not known" -#: glib/gmarkup.c:781 +#: glib/gmarkup.c:774 msgid "" "Entity did not end with a semicolon; most likely you used an ampersand " "character without intending to start an entity — escape ampersand as &" @@ -5264,11 +5273,11 @@ "Entity did not end with a semicolon; most likely you used an ampersand " "character without intending to start an entity — escape ampersand as &" -#: glib/gmarkup.c:1195 +#: glib/gmarkup.c:1188 msgid "Document must begin with an element (e.g. <book>)" msgstr "Document must begin with an element (e.g. <book>)" -#: glib/gmarkup.c:1235 +#: glib/gmarkup.c:1228 #, c-format msgid "" "“%s” is not a valid character following a “<” character; it may not begin an " @@ -5278,7 +5287,7 @@ "element name" # c-format -#: glib/gmarkup.c:1278 +#: glib/gmarkup.c:1271 #, c-format msgid "" "Odd character “%s”, expected a “>” character to end the empty-element tag " @@ -5287,19 +5296,19 @@ "Odd character “%s”, expected a “>” character to end the empty-element tag " "“%s”" -#: glib/gmarkup.c:1348 +#: glib/gmarkup.c:1341 #, c-format msgid "Too many attributes in element “%s”" msgstr "Too many attributes in element “%s”" -#: glib/gmarkup.c:1368 +#: glib/gmarkup.c:1361 #, c-format msgid "" "Odd character “%s”, expected a “=” after attribute name “%s” of element “%s”" msgstr "" "Odd character “%s”, expected a “=” after attribute name “%s” of element “%s”" -#: glib/gmarkup.c:1410 +#: glib/gmarkup.c:1403 #, c-format msgid "" "Odd character “%s”, expected a “>” or “/” character to end the start tag of " @@ -5310,7 +5319,7 @@ "element “%s”, or optionally an attribute; perhaps you used an invalid " "character in an attribute name" -#: glib/gmarkup.c:1455 +#: glib/gmarkup.c:1448 #, c-format msgid "" "Odd character “%s”, expected an open quote mark after the equals sign when " @@ -5319,7 +5328,7 @@ "Odd character “%s”, expected an open quote mark after the equals sign when " "giving value for attribute “%s” of element “%s”" -#: glib/gmarkup.c:1589 +#: glib/gmarkup.c:1582 #, c-format msgid "" "“%s” is not a valid character following the characters “</”; “%s” may not " @@ -5328,7 +5337,7 @@ "“%s” is not a valid character following the characters “</”; “%s” may not " "begin an element name" -#: glib/gmarkup.c:1627 +#: glib/gmarkup.c:1620 #, c-format msgid "" "“%s” is not a valid character following the close element name “%s”; the " @@ -5337,25 +5346,25 @@ "“%s” is not a valid character following the close element name “%s”; the " "allowed character is “>”" -#: glib/gmarkup.c:1639 +#: glib/gmarkup.c:1632 #, c-format msgid "Element “%s” was closed, no element is currently open" msgstr "Element “%s” was closed, no element is currently open" -#: glib/gmarkup.c:1648 +#: glib/gmarkup.c:1641 #, c-format msgid "Element “%s” was closed, but the currently open element is “%s”" msgstr "Element “%s” was closed, but the currently open element is “%s”" -#: glib/gmarkup.c:1801 +#: glib/gmarkup.c:1794 msgid "Document was empty or contained only whitespace" msgstr "Document was empty or contained only whitespace" -#: glib/gmarkup.c:1815 +#: glib/gmarkup.c:1808 msgid "Document ended unexpectedly just after an open angle bracket “<”" msgstr "Document ended unexpectedly just after an open angle bracket “<”" -#: glib/gmarkup.c:1823 glib/gmarkup.c:1868 +#: glib/gmarkup.c:1816 glib/gmarkup.c:1861 #, c-format msgid "" "Document ended unexpectedly with elements still open — “%s” was the last " @@ -5364,7 +5373,7 @@ "Document ended unexpectedly with elements still open — “%s” was the last " "element opened" -#: glib/gmarkup.c:1831 +#: glib/gmarkup.c:1824 #, c-format msgid "" "Document ended unexpectedly, expected to see a close angle bracket ending " @@ -5373,19 +5382,19 @@ "Document ended unexpectedly, expected to see a close angle bracket ending " "the tag <%s/>" -#: glib/gmarkup.c:1837 +#: glib/gmarkup.c:1830 msgid "Document ended unexpectedly inside an element name" msgstr "Document ended unexpectedly inside an element name" -#: glib/gmarkup.c:1843 +#: glib/gmarkup.c:1836 msgid "Document ended unexpectedly inside an attribute name" msgstr "Document ended unexpectedly inside an attribute name" -#: glib/gmarkup.c:1848 +#: glib/gmarkup.c:1841 msgid "Document ended unexpectedly inside an element-opening tag." msgstr "Document ended unexpectedly inside an element-opening tag." -#: glib/gmarkup.c:1854 +#: glib/gmarkup.c:1847 msgid "" "Document ended unexpectedly after the equals sign following an attribute " "name; no attribute value" @@ -5393,22 +5402,22 @@ "Document ended unexpectedly after the equals sign following an attribute " "name; no attribute value" -#: glib/gmarkup.c:1861 +#: glib/gmarkup.c:1854 msgid "Document ended unexpectedly while inside an attribute value" msgstr "Document ended unexpectedly while inside an attribute value" -#: glib/gmarkup.c:1878 +#: glib/gmarkup.c:1871 #, c-format msgid "Document ended unexpectedly inside the close tag for element “%s”" msgstr "Document ended unexpectedly inside the close tag for element “%s”" -#: glib/gmarkup.c:1882 +#: glib/gmarkup.c:1875 msgid "" "Document ended unexpectedly inside the close tag for an unopened element" msgstr "" "Document ended unexpectedly inside the close tag for an unopened element" -#: glib/gmarkup.c:1888 +#: glib/gmarkup.c:1881 msgid "Document ended unexpectedly inside a comment or processing instruction" msgstr "Document ended unexpectedly inside a comment or processing instruction" @@ -5471,184 +5480,184 @@ msgid "Unknown option %s" msgstr "Unknown option %s" -#: glib/gregex.c:462 +#: glib/gregex.c:479 msgid "corrupted object" msgstr "corrupted object" -#: glib/gregex.c:464 +#: glib/gregex.c:481 msgid "out of memory" msgstr "out of memory" -#: glib/gregex.c:470 +#: glib/gregex.c:487 msgid "backtracking limit reached" msgstr "backtracking limit reached" -#: glib/gregex.c:481 glib/gregex.c:734 glib/gregex.c:763 +#: glib/gregex.c:498 msgid "internal error" msgstr "internal error" -#: glib/gregex.c:483 +#: glib/gregex.c:500 msgid "the pattern contains items not supported for partial matching" msgstr "the pattern contains items not supported for partial matching" -#: glib/gregex.c:485 +#: glib/gregex.c:502 msgid "back references as conditions are not supported for partial matching" msgstr "back references as conditions are not supported for partial matching" -#: glib/gregex.c:491 +#: glib/gregex.c:508 msgid "recursion limit reached" msgstr "recursion limit reached" -#: glib/gregex.c:493 +#: glib/gregex.c:510 msgid "bad offset" msgstr "bad offset" -#: glib/gregex.c:495 +#: glib/gregex.c:512 msgid "recursion loop" msgstr "recursion loop" #. should not happen in GRegex since we check modes before each match -#: glib/gregex.c:498 +#: glib/gregex.c:515 msgid "matching mode is requested that was not compiled for JIT" msgstr "התבקש מצב התאמה שלא הודר עבור JIT (הרצה ללא הידור)" -#: glib/gregex.c:502 +#: glib/gregex.c:536 glib/gregex.c:1838 msgid "unknown error" msgstr "unknown error" -#: glib/gregex.c:523 +#: glib/gregex.c:557 msgid "\\ at end of pattern" msgstr "\\ at end of pattern" -#: glib/gregex.c:527 +#: glib/gregex.c:561 msgid "\\c at end of pattern" msgstr "\\c at end of pattern" -#: glib/gregex.c:532 +#: glib/gregex.c:566 msgid "unrecognized character following \\" msgstr "unrecognized character following \\" -#: glib/gregex.c:536 +#: glib/gregex.c:570 msgid "numbers out of order in {} quantifier" msgstr "numbers out of order in {} quantifier" -#: glib/gregex.c:540 +#: glib/gregex.c:574 msgid "number too big in {} quantifier" msgstr "number too big in {} quantifier" -#: glib/gregex.c:544 +#: glib/gregex.c:578 msgid "missing terminating for character class" msgstr "missing terminating for character class" -#: glib/gregex.c:548 +#: glib/gregex.c:582 msgid "invalid escape sequence in character class" msgstr "invalid escape sequence in character class" -#: glib/gregex.c:552 +#: glib/gregex.c:586 msgid "range out of order in character class" msgstr "range out of order in character class" -#: glib/gregex.c:557 +#: glib/gregex.c:591 msgid "nothing to repeat" msgstr "nothing to repeat" -#: glib/gregex.c:561 +#: glib/gregex.c:595 msgid "unrecognized character after (? or (?-" msgstr "unrecognized character after (? or (?-" -#: glib/gregex.c:565 +#: glib/gregex.c:599 msgid "POSIX named classes are supported only within a class" msgstr "POSIX named classes are supported only within a class" -#: glib/gregex.c:569 +#: glib/gregex.c:603 msgid "POSIX collating elements are not supported" msgstr "POSIX collating elements are not supported" -#: glib/gregex.c:575 +#: glib/gregex.c:609 msgid "missing terminating )" msgstr "missing terminating )" -#: glib/gregex.c:579 +#: glib/gregex.c:613 msgid "reference to non-existent subpattern" msgstr "reference to non-existent subpattern" -#: glib/gregex.c:583 +#: glib/gregex.c:617 msgid "missing ) after comment" msgstr "missing ) after comment" -#: glib/gregex.c:587 +#: glib/gregex.c:621 msgid "regular expression is too large" msgstr "regular expression is too large" -#: glib/gregex.c:591 +#: glib/gregex.c:625 msgid "malformed number or name after (?(" msgstr "malformed number or name after (?(" -#: glib/gregex.c:595 +#: glib/gregex.c:629 msgid "lookbehind assertion is not fixed length" msgstr "lookbehind assertion is not fixed length" -#: glib/gregex.c:599 +#: glib/gregex.c:633 msgid "conditional group contains more than two branches" msgstr "conditional group contains more than two branches" -#: glib/gregex.c:603 +#: glib/gregex.c:637 msgid "assertion expected after (?(" msgstr "assertion expected after (?(" -#: glib/gregex.c:607 +#: glib/gregex.c:641 msgid "a numbered reference must not be zero" msgstr "a numbered reference must not be zero" -#: glib/gregex.c:611 +#: glib/gregex.c:645 msgid "unknown POSIX class name" msgstr "unknown POSIX class name" -#: glib/gregex.c:616 +#: glib/gregex.c:650 msgid "character value in \\x{...} sequence is too large" msgstr "character value in \\x{...} sequence is too large" -#: glib/gregex.c:620 +#: glib/gregex.c:654 msgid "\\C not allowed in lookbehind assertion" msgstr "\\C not allowed in lookbehind assertion" -#: glib/gregex.c:624 +#: glib/gregex.c:658 msgid "missing terminator in subpattern name" msgstr "missing terminator in subpattern name" -#: glib/gregex.c:628 +#: glib/gregex.c:662 msgid "two named subpatterns have the same name" msgstr "two named subpatterns have the same name" -#: glib/gregex.c:632 +#: glib/gregex.c:666 msgid "malformed \\P or \\p sequence" msgstr "malformed \\P or \\p sequence" -#: glib/gregex.c:636 +#: glib/gregex.c:670 msgid "unknown property name after \\P or \\p" msgstr "unknown property name after \\P or \\p" -#: glib/gregex.c:640 +#: glib/gregex.c:674 msgid "subpattern name is too long (maximum 32 characters)" msgstr "subpattern name is too long (maximum 32 characters)" -#: glib/gregex.c:644 +#: glib/gregex.c:678 msgid "too many named subpatterns (maximum 10,000)" msgstr "too many named subpatterns (maximum 10,000)" -#: glib/gregex.c:648 +#: glib/gregex.c:682 msgid "octal value is greater than \\377" msgstr "octal value is greater than \\377" -#: glib/gregex.c:652 +#: glib/gregex.c:686 msgid "DEFINE group contains more than one branch" msgstr "DEFINE group contains more than one branch" -#: glib/gregex.c:656 +#: glib/gregex.c:690 msgid "inconsistent NEWLINE options" msgstr "inconsistent NEWLINE options" -#: glib/gregex.c:660 +#: glib/gregex.c:694 msgid "" "\\g is not followed by a braced, angle-bracketed, or quoted name or number, " "or by a plain number" @@ -5656,117 +5665,117 @@ "\\g is not followed by a braced, angle-bracketed, or quoted name or number, " "or by a plain number" -#: glib/gregex.c:665 +#: glib/gregex.c:699 msgid "an argument is not allowed for (*ACCEPT), (*FAIL), or (*COMMIT)" msgstr "an argument is not allowed for (*ACCEPT), (*FAIL), or (*COMMIT)" -#: glib/gregex.c:669 +#: glib/gregex.c:703 msgid "(*VERB) not recognized" msgstr "(*VERB) not recognized" -#: glib/gregex.c:673 +#: glib/gregex.c:707 msgid "number is too big" msgstr "number is too big" -#: glib/gregex.c:677 +#: glib/gregex.c:711 msgid "missing subpattern name after (?&" msgstr "missing subpattern name after (?&" -#: glib/gregex.c:681 +#: glib/gregex.c:715 msgid "different names for subpatterns of the same number are not allowed" msgstr "different names for subpatterns of the same number are not allowed" -#: glib/gregex.c:685 +#: glib/gregex.c:719 msgid "(*MARK) must have an argument" msgstr "(*MARK) must have an argument" -#: glib/gregex.c:689 +#: glib/gregex.c:723 msgid "\\c must be followed by an ASCII character" msgstr "\\c must be followed by an ASCII character" -#: glib/gregex.c:693 +#: glib/gregex.c:727 msgid "\\k is not followed by a braced, angle-bracketed, or quoted name" msgstr "\\k is not followed by a braced, angle-bracketed, or quoted name" -#: glib/gregex.c:697 +#: glib/gregex.c:731 msgid "\\N is not supported in a class" msgstr "\\N is not supported in a class" -#: glib/gregex.c:701 +#: glib/gregex.c:735 msgid "name is too long in (*MARK), (*PRUNE), (*SKIP), or (*THEN)" msgstr "name is too long in (*MARK), (*PRUNE), (*SKIP), or (*THEN)" -#: glib/gregex.c:705 glib/gregex.c:844 +#: glib/gregex.c:739 glib/gregex.c:875 msgid "code overflow" msgstr "code overflow" -#: glib/gregex.c:709 +#: glib/gregex.c:743 msgid "unrecognized character after (?P" msgstr "unrecognized character after (?P" -#: glib/gregex.c:713 +#: glib/gregex.c:747 msgid "overran compiling workspace" msgstr "overran compiling workspace" -#: glib/gregex.c:717 +#: glib/gregex.c:751 msgid "previously-checked referenced subpattern not found" msgstr "previously-checked referenced subpattern not found" -#: glib/gregex.c:843 glib/gregex.c:1088 glib/gregex.c:2397 +#: glib/gregex.c:874 glib/gregex.c:1121 glib/gregex.c:2444 #, c-format msgid "Error while matching regular expression %s: %s" msgstr "Error while matching regular expression %s: %s" -#: glib/gregex.c:1687 +#: glib/gregex.c:1721 msgid "PCRE library is compiled without UTF8 support" msgstr "PCRE library is compiled without UTF8 support" -#: glib/gregex.c:1695 +#: glib/gregex.c:1729 msgid "PCRE library is compiled with incompatible options" msgstr "PCRE library is compiled with incompatible options" -#: glib/gregex.c:1804 +#: glib/gregex.c:1847 #, c-format msgid "Error while compiling regular expression ‘%s’ at char %s: %s" msgstr "שגיאה בהידור הביטוי הרגולרי ‚%s’ בתו %s: %s" -#: glib/gregex.c:2839 +#: glib/gregex.c:2887 msgid "hexadecimal digit or “}” expected" msgstr "hexadecimal digit or “}” expected" -#: glib/gregex.c:2855 +#: glib/gregex.c:2903 msgid "hexadecimal digit expected" msgstr "hexadecimal digit expected" -#: glib/gregex.c:2895 +#: glib/gregex.c:2943 msgid "missing “<” in symbolic reference" msgstr "missing “<” in symbolic reference" -#: glib/gregex.c:2904 +#: glib/gregex.c:2952 msgid "unfinished symbolic reference" msgstr "unfinished symbolic reference" -#: glib/gregex.c:2911 +#: glib/gregex.c:2959 msgid "zero-length symbolic reference" msgstr "zero-length symbolic reference" -#: glib/gregex.c:2922 +#: glib/gregex.c:2970 msgid "digit expected" msgstr "digit expected" -#: glib/gregex.c:2940 +#: glib/gregex.c:2988 msgid "illegal symbolic reference" msgstr "illegal symbolic reference" -#: glib/gregex.c:3003 +#: glib/gregex.c:3051 msgid "stray final “\\”" msgstr "stray final “\\”" -#: glib/gregex.c:3007 +#: glib/gregex.c:3055 msgid "unknown escape sequence" msgstr "unknown escape sequence" -#: glib/gregex.c:3017 +#: glib/gregex.c:3065 #, c-format msgid "Error while parsing replacement text “%s” at char %lu: %s" msgstr "Error while parsing replacement text “%s” at char %lu: %s" @@ -5793,96 +5802,101 @@ msgid "Text was empty (or contained only whitespace)" msgstr "Text was empty (or contained only whitespace)" -#: glib/gspawn.c:314 +#: glib/gspawn.c:319 #, c-format msgid "Failed to read data from child process (%s)" msgstr "Failed to read data from child process (%s)" -#: glib/gspawn.c:466 +#: glib/gspawn.c:471 #, c-format msgid "Unexpected error in reading data from a child process (%s)" msgstr "Unexpected error in reading data from a child process (%s)" -#: glib/gspawn.c:551 +#: glib/gspawn.c:556 #, c-format msgid "Unexpected error in waitpid() (%s)" msgstr "Unexpected error in waitpid() (%s)" -#: glib/gspawn.c:1170 glib/gspawn-win32.c:1488 +#: glib/gspawn.c:1175 glib/gspawn-win32.c:1503 #, c-format msgid "Child process exited with code %ld" msgstr "Child process exited with code %ld" -#: glib/gspawn.c:1178 +#: glib/gspawn.c:1183 #, c-format msgid "Child process killed by signal %ld" msgstr "Child process killed by signal %ld" -#: glib/gspawn.c:1185 +#: glib/gspawn.c:1190 #, c-format msgid "Child process stopped by signal %ld" msgstr "Child process stopped by signal %ld" -#: glib/gspawn.c:1192 +#: glib/gspawn.c:1197 #, c-format msgid "Child process exited abnormally" msgstr "Child process exited abnormally" -#: glib/gspawn.c:1885 glib/gspawn-win32.c:393 glib/gspawn-win32.c:401 +#: glib/gspawn.c:2027 glib/gspawn-win32.c:393 glib/gspawn-win32.c:401 #, c-format msgid "Failed to read from child pipe (%s)" msgstr "Failed to read from child pipe (%s)" -#: glib/gspawn.c:2248 +#: glib/gspawn.c:2399 #, c-format msgid "Failed to spawn child process “%s” (%s)" msgstr "Failed to spawn child process “%s” (%s)" -#: glib/gspawn.c:2365 +#: glib/gspawn.c:2525 #, c-format msgid "Failed to fork (%s)" msgstr "Failed to fork (%s)" -#: glib/gspawn.c:2525 glib/gspawn-win32.c:424 +#: glib/gspawn.c:2685 glib/gspawn-win32.c:424 #, c-format msgid "Failed to change to directory “%s” (%s)" msgstr "Failed to change to directory “%s” (%s)" -#: glib/gspawn.c:2535 +#: glib/gspawn.c:2695 #, c-format msgid "Failed to execute child process “%s” (%s)" msgstr "Failed to execute child process “%s” (%s)" -#: glib/gspawn.c:2545 +#: glib/gspawn.c:2705 #, c-format msgid "Failed to open file to remap file descriptor (%s)" msgstr "Failed to open file to remap file descriptor (%s)" -#: glib/gspawn.c:2553 +#: glib/gspawn.c:2713 #, c-format msgid "Failed to duplicate file descriptor for child process (%s)" msgstr "Failed to duplicate file descriptor for child process (%s)" -#: glib/gspawn.c:2562 +#: glib/gspawn.c:2722 #, c-format msgid "Failed to fork child process (%s)" msgstr "Failed to fork child process (%s)" -#: glib/gspawn.c:2570 +#: glib/gspawn.c:2730 #, c-format msgid "Failed to close file descriptor for child process (%s)" msgstr "Failed to close file descriptor for child process (%s)" -#: glib/gspawn.c:2578 +#: glib/gspawn.c:2738 #, c-format msgid "Unknown error executing child process “%s”" msgstr "Unknown error executing child process “%s”" -#: glib/gspawn.c:2602 +#: glib/gspawn.c:2762 #, c-format msgid "Failed to read enough data from child pid pipe (%s)" msgstr "Failed to read enough data from child pid pipe (%s)" +#: glib/gspawn-private.h:134 +#, c-format +msgid "Invalid source FDs argument" +msgstr "ארגומנט שגוי למקור מתארי קבצים (FDs)" + #: glib/gspawn-win32.c:337 msgid "Failed to read data from child process" msgstr "Failed to read data from child process" @@ -5902,27 +5916,27 @@ msgid "Invalid program name: %s" msgstr "Invalid program name: %s" -#: glib/gspawn-win32.c:521 glib/gspawn-win32.c:853 +#: glib/gspawn-win32.c:521 glib/gspawn-win32.c:868 #, c-format msgid "Invalid string in argument vector at %d: %s" msgstr "Invalid string in argument vector at %d: %s" -#: glib/gspawn-win32.c:532 glib/gspawn-win32.c:869 +#: glib/gspawn-win32.c:532 glib/gspawn-win32.c:884 #, c-format msgid "Invalid string in environment: %s" msgstr "Invalid string in environment: %s" -#: glib/gspawn-win32.c:849 +#: glib/gspawn-win32.c:864 #, c-format msgid "Invalid working directory: %s" msgstr "Invalid working directory: %s" -#: glib/gspawn-win32.c:914 +#: glib/gspawn-win32.c:929 #, c-format msgid "Failed to execute helper program (%s)" msgstr "Failed to execute helper program (%s)" -#: glib/gspawn-win32.c:1143 +#: glib/gspawn-win32.c:1158 msgid "" "Unexpected error in g_io_channel_win32_poll() reading data from a child " "process" @@ -5930,21 +5944,21 @@ "Unexpected error in g_io_channel_win32_poll() reading data from a child " "process" -#: glib/gstrfuncs.c:3372 glib/gstrfuncs.c:3474 +#: glib/gstrfuncs.c:3370 glib/gstrfuncs.c:3472 msgid "Empty string is not a number" msgstr "Empty string is not a number" -#: glib/gstrfuncs.c:3396 +#: glib/gstrfuncs.c:3394 #, c-format msgid "“%s” is not a signed number" msgstr "“%s” is not a signed number" -#: glib/gstrfuncs.c:3406 glib/gstrfuncs.c:3510 +#: glib/gstrfuncs.c:3404 glib/gstrfuncs.c:3508 #, c-format msgid "Number “%s” is out of bounds %s, %s" msgstr "Number “%s” is out of bounds %s, %s" -#: glib/gstrfuncs.c:3500 +#: glib/gstrfuncs.c:3498 #, c-format msgid "“%s” is not an unsigned number" msgstr "“%s” is not an unsigned number" @@ -6023,126 +6037,126 @@ msgstr "התו מחוץ לטווח עבור UTF-16" #. Translators: A unit symbol for size formatting, showing for example: "13.0 kB" -#: glib/gutils.c:2857 +#: glib/gutils.c:2966 msgid "kB" msgstr "ק״ב" #. Translators: A unit symbol for size formatting, showing for example: "13.0 MB" -#: glib/gutils.c:2859 +#: glib/gutils.c:2968 msgid "MB" msgstr "מ״ב" #. Translators: A unit symbol for size formatting, showing for example: "13.0 GB" -#: glib/gutils.c:2861 +#: glib/gutils.c:2970 msgid "GB" msgstr "ג״ב" #. Translators: A unit symbol for size formatting, showing for example: "13.0 TB" -#: glib/gutils.c:2863 +#: glib/gutils.c:2972 msgid "TB" msgstr "ט״ב" #. Translators: A unit symbol for size formatting, showing for example: "13.0 PB" -#: glib/gutils.c:2865 +#: glib/gutils.c:2974 msgid "PB" msgstr "פ\"ב" #. Translators: A unit symbol for size formatting, showing for example: "13.0 EB" -#: glib/gutils.c:2867 +#: glib/gutils.c:2976 msgid "EB" msgstr "א״ב" #. Translators: A unit symbol for size formatting, showing for example: "13.0 KiB" -#: glib/gutils.c:2871 +#: glib/gutils.c:2980 msgid "KiB" msgstr "קי״ב" #. Translators: A unit symbol for size formatting, showing for example: "13.0 MiB" -#: glib/gutils.c:2873 +#: glib/gutils.c:2982 msgid "MiB" msgstr "מבי״ב" #. Translators: A unit symbol for size formatting, showing for example: "13.0 GiB" -#: glib/gutils.c:2875 +#: glib/gutils.c:2984 msgid "GiB" msgstr "גיב״ב" #. Translators: A unit symbol for size formatting, showing for example: "13.0 TiB" -#: glib/gutils.c:2877 +#: glib/gutils.c:2986 msgid "TiB" msgstr "טבי״ב" #. Translators: A unit symbol for size formatting, showing for example: "13.0 PiB" -#: glib/gutils.c:2879 +#: glib/gutils.c:2988 msgid "PiB" msgstr "פבי״ב" #. Translators: A unit symbol for size formatting, showing for example: "13.0 EiB" -#: glib/gutils.c:2881 +#: glib/gutils.c:2990 msgid "EiB" msgstr "אק״ב" #. Translators: A unit symbol for size formatting, showing for example: "13.0 kb" -#: glib/gutils.c:2885 +#: glib/gutils.c:2994 msgid "kb" msgstr "ק״ס" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Mb" -#: glib/gutils.c:2887 +#: glib/gutils.c:2996 msgid "Mb" msgstr "מ״ס" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Gb" -#: glib/gutils.c:2889 +#: glib/gutils.c:2998 msgid "Gb" msgstr "ג״ס" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Tb" -#: glib/gutils.c:2891 +#: glib/gutils.c:3000 msgid "Tb" msgstr "ט״ס" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Pb" -#: glib/gutils.c:2893 +#: glib/gutils.c:3002 msgid "Pb" msgstr "פ״ס" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Eb" -#: glib/gutils.c:2895 +#: glib/gutils.c:3004 msgid "Eb" msgstr "א״ס" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Kib" -#: glib/gutils.c:2899 +#: glib/gutils.c:3008 msgid "Kib" msgstr "קי״ס" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Mib" -#: glib/gutils.c:2901 +#: glib/gutils.c:3010 msgid "Mib" msgstr "מבי״ס" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Gib" -#: glib/gutils.c:2903 +#: glib/gutils.c:3012 msgid "Gib" msgstr "גיב״ס" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Tib" -#: glib/gutils.c:2905 +#: glib/gutils.c:3014 msgid "Tib" msgstr "אבי״ס" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Pib" -#: glib/gutils.c:2907 +#: glib/gutils.c:3016 msgid "Pib" msgstr "פבי״ס" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Eib" -#: glib/gutils.c:2909 +#: glib/gutils.c:3018 msgid "Eib" msgstr "אק״ס" -#: glib/gutils.c:2947 +#: glib/gutils.c:3056 msgid "byte" msgid_plural "bytes" msgstr0 "בית" @@ -6150,7 +6164,7 @@ msgstr2 "בתים" msgstr3 "בתים" -#: glib/gutils.c:2951 +#: glib/gutils.c:3060 msgid "bit" msgid_plural "bits" msgstr0 "סיבית" @@ -6160,7 +6174,7 @@ #. Translators: The "%u" is replaced with the size value, like "13"; it could #. * be part of "13 bytes", but only the number is requested this time. -#: glib/gutils.c:2959 +#: glib/gutils.c:3068 #, c-format msgctxt "format-size" msgid "%u" @@ -6168,7 +6182,7 @@ #. Translators: The first "%u" is replaced with the value, the "%s" with a unit of the value. #. * The order can be changed with "%$2s %$1u". An example: "13 bytes" -#: glib/gutils.c:2964 +#: glib/gutils.c:3073 #, c-format msgctxt "format-size" msgid "%u %s" @@ -6176,7 +6190,7 @@ #. Translators: The "%.1f" is replaced with the size value, like "13.0"; it could #. * be part of "13.0 MB", but only the number is requested this time. -#: glib/gutils.c:3000 +#: glib/gutils.c:3109 #, c-format msgctxt "format-size" msgid "%.1f" @@ -6185,14 +6199,14 @@ #. Translators: The first "%.1f" is replaced with the value, the "%s" with a unit of the value. #. * The order can be changed with "%$2s %$1.1f". Keep the no-break space between the value and #. * the unit symbol. An example: "13.0 MB" -#: glib/gutils.c:3006 +#: glib/gutils.c:3115 #, c-format msgctxt "format-size" msgid "%.1f %s" msgstr "%.1f %s" #. Translators: the %s in "%s bytes" will always be replaced by a number. -#: glib/gutils.c:3046 +#: glib/gutils.c:3155 #, c-format msgid "%s byte" msgid_plural "%s bytes" @@ -6202,7 +6216,7 @@ msgstr3 "%s בתים" #. Translators: the %s in "%s bits" will always be replaced by a number. -#: glib/gutils.c:3051 +#: glib/gutils.c:3160 #, c-format msgid "%s bit" msgid_plural "%s bits" @@ -6211,7 +6225,7 @@ msgstr2 "%s סיביות" msgstr3 "%s סיביות" -#: glib/gutils.c:3092 +#: glib/gutils.c:3201 #, c-format msgid "%u byte" msgid_plural "%u bytes" @@ -6225,32 +6239,32 @@ #. * compatibility. Users will not see this string unless a program is using this deprecated function. #. * Please translate as literally as possible. #. -#: glib/gutils.c:3105 +#: glib/gutils.c:3214 #, c-format msgid "%.1f KB" msgstr "%.1f ק״ב" -#: glib/gutils.c:3110 +#: glib/gutils.c:3219 #, c-format msgid "%.1f MB" msgstr "%.1f מ״ב" -#: glib/gutils.c:3115 +#: glib/gutils.c:3224 #, c-format msgid "%.1f GB" msgstr "%.1f ג״ב" -#: glib/gutils.c:3120 +#: glib/gutils.c:3229 #, c-format msgid "%.1f TB" msgstr "%.1f ט״ב" -#: glib/gutils.c:3125 +#: glib/gutils.c:3234 #, c-format msgid "%.1f PB" msgstr "%.1f פ״ב" -#: glib/gutils.c:3130 +#: glib/gutils.c:3239 #, c-format msgid "%.1f EB" msgstr "%.1f א״ב"
View file
_service:tar_scm:glib-2.74.4.tar.xz/po/hu.po -> _service:tar_scm:glib-2.76.4.tar.xz/po/hu.po
Changed
@@ -1,17 +1,17 @@ # Hungarian translation for glib. -# Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022. Free Software Foundation, Inc. +# Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023 Free Software Foundation, Inc. # This file is distributed under the same license as the glib package. # # Szabolcs Varga <shirokuma at shirokuma dot hu>, 2005. # Gabor Kelemen <kelemeng at gnome dot hu>, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2016, 2017. -# Balázs Úr <ur.balazs at fsf dot hu>, 2013, 2014, 2015, 2016, 2018, 2019, 2020, 2021, 2022. +# Balázs Úr <ur.balazs at fsf dot hu>, 2013, 2014, 2015, 2016, 2018, 2019, 2020, 2021, 2022, 2023. # Balázs Meskó <mesko.balazs at fsf dot hu>, 2017, 2018, 2020, 2021. msgid "" msgstr "" "Project-Id-Version: glib master\n" "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/glib/issues\n" -"POT-Creation-Date: 2022-08-29 08:50+0000\n" -"PO-Revision-Date: 2022-09-01 01:43+0200\n" +"POT-Creation-Date: 2023-02-15 16:30+0000\n" +"PO-Revision-Date: 2023-03-02 02:34+0100\n" "Last-Translator: Balázs Úr <ur.balazs at fsf dot hu>\n" "Language-Team: Hungarian <gnome-hu-list at gnome dot org>\n" "Language: hu\n" @@ -19,28 +19,26 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Lokalize 19.12.3\n" +"X-Generator: Lokalize 22.08.2\n" -#: gio/gappinfo.c:335 +#: gio/gappinfo.c:339 msgid "Setting default applications not supported yet" msgstr "Az alapértelmezett alkalmazások beállítása még nem támogatott" -#: gio/gappinfo.c:368 +#: gio/gappinfo.c:372 msgid "Setting application as last used for type not supported yet" msgstr "" "Az alkalmazás legutóbb használtként beállítása egy adott típushoz még nem " "támogatott" -#: gio/gappinfo.c:810 +#: gio/gappinfo.c:814 #, c-format -#| msgid "No default applications for “%s”\n" msgid "Failed to find default application for content type ‘%s’" msgstr "" "Nem sikerült alapértelmezett alkalmazást találni a(z) „%s” tartalomtípushoz" -#: gio/gappinfo.c:870 +#: gio/gappinfo.c:874 #, c-format -#| msgid "No default applications for “%s”\n" msgid "Failed to find default application for URI Scheme ‘%s’" msgstr "Nem sikerült alapértelmezett alkalmazást találni a(z) „%s” URI-sémához" @@ -240,11 +238,11 @@ msgid "error sending %s message to application: %s\n" msgstr "hiba %s üzenet küldésekor az alkalmazásnak: %s\n" -#: gio/gapplication-tool.c:321 +#: gio/gapplication-tool.c:324 msgid "action name must be given after application id\n" msgstr "a műveletnevet meg kell adni az alkalmazásazonosító után\n" -#: gio/gapplication-tool.c:329 +#: gio/gapplication-tool.c:332 #, c-format msgid "" "invalid action name: “%s”\n" @@ -254,25 +252,25 @@ "a műveletnevek csak betűket, számokat, „-” és „.” karaktereket " "tartalmazhatnak\n" -#: gio/gapplication-tool.c:348 +#: gio/gapplication-tool.c:351 #, c-format msgid "error parsing action parameter: %s\n" msgstr "hiba a műveletparaméter feldolgozásakor: %s\n" -#: gio/gapplication-tool.c:360 +#: gio/gapplication-tool.c:363 msgid "actions accept a maximum of one parameter\n" msgstr "a műveletek legfeljebb egy paramétert várnak\n" -#: gio/gapplication-tool.c:415 +#: gio/gapplication-tool.c:418 msgid "list-actions command takes only the application id" msgstr "a list-actions parancs csak az alkalmazásazonosítót várja" -#: gio/gapplication-tool.c:425 +#: gio/gapplication-tool.c:428 #, c-format msgid "unable to find desktop file for application %s\n" msgstr "nem található desktop fájl a(z) %s alkalmazáshoz\n" -#: gio/gapplication-tool.c:470 +#: gio/gapplication-tool.c:473 #, c-format msgid "" "unrecognised command: %s\n" @@ -307,7 +305,7 @@ msgid "Truncate not supported on base stream" msgstr "Az alap adatfolyam csonkítása nem engedélyezett" -#: gio/gcancellable.c:319 gio/gdbusconnection.c:1859 gio/gdbusprivate.c:1420 +#: gio/gcancellable.c:326 gio/gdbusconnection.c:1859 gio/gdbusprivate.c:1420 #: gio/gsimpleasyncresult.c:873 gio/gsimpleasyncresult.c:899 #, c-format msgid "Operation was cancelled" @@ -327,13 +325,13 @@ #: gio/gcharsetconverter.c:344 gio/gdatainputstream.c:850 #: gio/gdatainputstream.c:1268 glib/gconvert.c:451 glib/gconvert.c:883 -#: glib/giochannel.c:1576 glib/giochannel.c:1618 glib/giochannel.c:2473 +#: glib/giochannel.c:1576 glib/giochannel.c:1618 glib/giochannel.c:2478 #: glib/gutf8.c:892 glib/gutf8.c:1346 msgid "Invalid byte sequence in conversion input" msgstr "Érvénytelen bájtsorrend az átalakítás bemenetében" #: gio/gcharsetconverter.c:349 glib/gconvert.c:459 glib/gconvert.c:797 -#: glib/giochannel.c:1583 glib/giochannel.c:2485 +#: glib/giochannel.c:1583 glib/giochannel.c:2493 #, c-format msgid "Error during conversion: %s" msgstr "Hiba az átalakításkor: %s" @@ -392,17 +390,17 @@ msgid "Unexpected early end-of-stream" msgstr "Váratlan korai adatfolyam vége" -#: gio/gdbusaddress.c:164 gio/gdbusaddress.c:238 gio/gdbusaddress.c:327 +#: gio/gdbusaddress.c:162 gio/gdbusaddress.c:234 gio/gdbusaddress.c:321 #, c-format msgid "Unsupported key “%s” in address entry “%s”" msgstr "Nem támogatott „%s” kulcs a(z) „%s” címbejegyzésben" -#: gio/gdbusaddress.c:177 +#: gio/gdbusaddress.c:175 #, c-format msgid "Meaningless key/value pair combination in address entry “%s”" msgstr "Értelmetlen kulcs-érték pár kombináció a(z) „%s” címbejegyzésben" -#: gio/gdbusaddress.c:186 +#: gio/gdbusaddress.c:184 #, c-format msgid "" "Address “%s” is invalid (need exactly one of path, dir, tmpdir, or abstract " @@ -411,28 +409,28 @@ "A(z) „%s” cím érvénytelen (csak az útvonal, könyvtár, tmp könyvtár vagy " "absztrakt kulcsok egyike lehet)" -#: gio/gdbusaddress.c:253 gio/gdbusaddress.c:264 gio/gdbusaddress.c:279 -#: gio/gdbusaddress.c:342 gio/gdbusaddress.c:353 +#: gio/gdbusaddress.c:249 gio/gdbusaddress.c:260 gio/gdbusaddress.c:275 +#: gio/gdbusaddress.c:336 gio/gdbusaddress.c:347 #, c-format msgid "Error in address “%s” — the “%s” attribute is malformed" msgstr "Hiba a(z) „%s” címben – a(z) „%s” attribútum rosszul formázott" -#: gio/gdbusaddress.c:423 gio/gdbusaddress.c:682 +#: gio/gdbusaddress.c:417 gio/gdbusaddress.c:676 #, c-format msgid "Unknown or unsupported transport “%s” for address “%s”" msgstr "Ismeretlen vagy nem támogatott szállítás („%s”) a címhez („%s”)" -#: gio/gdbusaddress.c:467 +#: gio/gdbusaddress.c:461 #, c-format msgid "Address element “%s” does not contain a colon (:)" msgstr "A(z) „%s” címelem nem tartalmaz kettőspontot (:)" -#: gio/gdbusaddress.c:476 +#: gio/gdbusaddress.c:470 #, c-format msgid "Transport name in address element “%s” must not be empty" msgstr "Az átvitel neve a(z) „%s” címelemben nem lehet üres" -#: gio/gdbusaddress.c:497 +#: gio/gdbusaddress.c:491 #, c-format msgid "" "Key/Value pair %d, “%s”, in address element “%s” does not contain an equal " @@ -440,14 +438,14 @@ msgstr "" "%d. kulcs-érték pár: „%s” a(z) „%s” címelemben nem tartalmaz egyenlőségjelet" -#: gio/gdbusaddress.c:508 +#: gio/gdbusaddress.c:502 #, c-format msgid "" "Key/Value pair %d, “%s”, in address element “%s” must not have an empty key" msgstr "" "%d. kulcs-érték pár: „%s” a(z) „%s” címelemben nem tartalmazhat üres kulcsot" -#: gio/gdbusaddress.c:522 +#: gio/gdbusaddress.c:516 #, c-format msgid "" "Error unescaping key or value in Key/Value pair %d, “%s”, in address element " @@ -456,7 +454,7 @@ "Hiba a(z) „%3$s” címelemben található a(z) %1$d. kulcs-érték párban lévő " "„%2$s” kulcs vagy érték értelmezésekor" -#: gio/gdbusaddress.c:590 +#: gio/gdbusaddress.c:584 #, c-format msgid "" "Error in address “%s” — the unix transport requires exactly one of the keys " @@ -465,81 +463,81 @@ "Hiba a(z) „%s” címben – a unix szállítás a „path” vagy „abstract” kulcsok " "pontosan egyikének jelenlétét igényli" -#: gio/gdbusaddress.c:625 +#: gio/gdbusaddress.c:619 #, c-format msgid "Error in address “%s” — the host attribute is missing or malformed" msgstr "" "Hiba a(z) „%s” címben – a host attribútum hiányzik vagy rosszul formázott" -#: gio/gdbusaddress.c:639 +#: gio/gdbusaddress.c:633 #, c-format msgid "Error in address “%s” — the port attribute is missing or malformed" msgstr "" "Hiba a(z) „%s” címben – a port attribútum hiányzik vagy rosszul formázott" -#: gio/gdbusaddress.c:653 +#: gio/gdbusaddress.c:647 #, c-format msgid "Error in address “%s” — the noncefile attribute is missing or malformed" msgstr "" "Hiba a(z) „%s” címben – a noncefile attribútum hiányzik vagy rosszul " "formázott" -#: gio/gdbusaddress.c:674 +#: gio/gdbusaddress.c:668 msgid "Error auto-launching: " msgstr "Hiba az automatikus indításkor: " -#: gio/gdbusaddress.c:727 +#: gio/gdbusaddress.c:721 #, c-format msgid "Error opening nonce file “%s”: %s" msgstr "Hiba a(z) „%s” ideiglenes fájl megnyitásakor: %s" -#: gio/gdbusaddress.c:746 +#: gio/gdbusaddress.c:740 #, c-format msgid "Error reading from nonce file “%s”: %s" msgstr "Hiba a(z) „%s” ideiglenes fájl olvasásakor: %s" -#: gio/gdbusaddress.c:755 +#: gio/gdbusaddress.c:749 #, c-format msgid "Error reading from nonce file “%s”, expected 16 bytes, got %d" msgstr "" "Hiba a(z) „%s” ideiglenes fájl olvasásakor, a várt 16 bájt helyett %d " "érkezett" -#: gio/gdbusaddress.c:773 +#: gio/gdbusaddress.c:767 #, c-format msgid "Error writing contents of nonce file “%s” to stream:" msgstr "Hiba az ideiglenes fájl („%s”) tartalmának írásakor az adatfolyamba:" -#: gio/gdbusaddress.c:988 +#: gio/gdbusaddress.c:982 msgid "The given address is empty" msgstr "A megadott cím üres" -#: gio/gdbusaddress.c:1101 +#: gio/gdbusaddress.c:1095 #, c-format msgid "Cannot spawn a message bus when AT_SECURE is set" msgstr "Nem indítható üzenetbusz, ha az AT_SECURE be van állítva" -#: gio/gdbusaddress.c:1108 +#: gio/gdbusaddress.c:1102 msgid "Cannot spawn a message bus without a machine-id: " msgstr "Nem indítható üzenetbusz gépazonosító nélkül: " -#: gio/gdbusaddress.c:1115 +#: gio/gdbusaddress.c:1109 #, c-format msgid "Cannot autolaunch D-Bus without X11 $DISPLAY" msgstr "Nem indítható automatikusan a D-Bus X11 $DISPLAY nélkül" -#: gio/gdbusaddress.c:1157 +#: gio/gdbusaddress.c:1151 #, c-format msgid "Error spawning command line “%s”: " msgstr "Hiba a(z) „%s” parancssor indításakor: " -#: gio/gdbusaddress.c:1226 +#: gio/gdbusaddress.c:1220 #, c-format msgid "Cannot determine session bus address (not implemented for this OS)" msgstr "" "Nem határozható meg a munkamenetbusz címe (nincs megvalósítva erre az OS-re)" -#: gio/gdbusaddress.c:1375 gio/gdbusconnection.c:7321 +#: gio/gdbusaddress.c:1374 gio/gdbusconnection.c:7316 #, c-format msgid "" "Cannot determine bus address from DBUS_STARTER_BUS_TYPE environment variable " @@ -548,7 +546,7 @@ "Nem határozható meg a busz címe a DBUS_STARTER_BUS_TYPE környezeti " "változóból – ismeretlen „%s” érték" -#: gio/gdbusaddress.c:1384 gio/gdbusconnection.c:7330 +#: gio/gdbusaddress.c:1383 gio/gdbusconnection.c:7325 msgid "" "Cannot determine bus address because the DBUS_STARTER_BUS_TYPE environment " "variable is not set" @@ -556,18 +554,19 @@ "Nem határozható meg a busz címe, mivel a DBUS_STARTER_BUS_TYPE környezeti " "változó nincs beállítva" -#: gio/gdbusaddress.c:1394 +#: gio/gdbusaddress.c:1393 #, c-format msgid "Unknown bus type %d" msgstr "Ismeretlen busztípus: %d" #: gio/gdbusauth.c:294 msgid "Unexpected lack of content trying to read a line" -msgstr "A tartalom váratlanul hiányzik a sor olvasásakor" +msgstr "A tartalom váratlanul hiányzik egy sor olvasásának kísérletekor" #: gio/gdbusauth.c:338 msgid "Unexpected lack of content trying to (safely) read a line" -msgstr "A tartalom váratlanul hiányzik a sor (biztonságos) olvasásakor" +msgstr "" +"A tartalom váratlanul hiányzik egy sor (biztonságos) olvasásának kísérletekor" #: gio/gdbusauth.c:482 #, c-format @@ -577,13 +576,18 @@ "Minden elérhető hitelesítési mechanizmus kimerítve (próbálva: %s, elérhető: " "%s)" -#: gio/gdbusauth.c:1178 +#: gio/gdbusauth.c:1045 +#| msgid "Unexpected lack of content trying to read a line" +msgid "Unexpected lack of content trying to read a byte" +msgstr "A tartalom váratlanul hiányzik egy bájt olvasásának kísérletekor" + +#: gio/gdbusauth.c:1195 msgid "User IDs must be the same for peer and server" msgstr "" "A felhasználói azonosítóknak ugyanannak kell lenniük a partnernél és a " "kiszolgálónál" -#: gio/gdbusauth.c:1190 +#: gio/gdbusauth.c:1207 msgid "Cancelled via GDBusAuthObserver::authorize-authenticated-peer" msgstr "" "Megszakítva a GDBusAuthObserver::authorize-authenticated-peer használatával" @@ -677,7 +681,7 @@ msgid "(Additionally, releasing the lock for “%s” also failed: %s) " msgstr "(Ezen kívül a(z) „%s” zárolásának feloldása is meghiúsult: %s) " -#: gio/gdbusconnection.c:590 gio/gdbusconnection.c:2404 +#: gio/gdbusconnection.c:590 gio/gdbusconnection.c:2405 msgid "The connection is closed" msgstr "A kapcsolat le van zárva" @@ -685,13 +689,13 @@ msgid "Timeout was reached" msgstr "Az időkorlát elérve" -#: gio/gdbusconnection.c:2527 +#: gio/gdbusconnection.c:2528 msgid "" "Unsupported flags encountered when constructing a client-side connection" msgstr "" "Nem támogatott jelzők találhatók a kliensoldali kapcsolat létrehozásakor" -#: gio/gdbusconnection.c:4256 gio/gdbusconnection.c:4610 +#: gio/gdbusconnection.c:4257 gio/gdbusconnection.c:4611 #, c-format msgid "" "No such interface “org.freedesktop.DBus.Properties” on object at path %s" @@ -699,105 +703,105 @@ "Nincs „org.freedesktop.DBus.Properties” interfész a(z) %s útvonalon lévő " "objektumon" -#: gio/gdbusconnection.c:4401 +#: gio/gdbusconnection.c:4402 #, c-format msgid "No such property “%s”" msgstr "Nincs „%s” tulajdonság" -#: gio/gdbusconnection.c:4413 +#: gio/gdbusconnection.c:4414 #, c-format msgid "Property “%s” is not readable" msgstr "A(z) „%s” tulajdonság nem olvasható" -#: gio/gdbusconnection.c:4424 +#: gio/gdbusconnection.c:4425 #, c-format msgid "Property “%s” is not writable" msgstr "A(z) „%s” tulajdonság nem írható" -#: gio/gdbusconnection.c:4444 +#: gio/gdbusconnection.c:4445 #, c-format msgid "Error setting property “%s”: Expected type “%s” but got “%s”" msgstr "" "Hiba a(z) „%s” tulajdonság beállításakor: a várt „%s” típus helyett „%s” " "érkezett" -#: gio/gdbusconnection.c:4549 gio/gdbusconnection.c:4764 -#: gio/gdbusconnection.c:6747 +#: gio/gdbusconnection.c:4550 gio/gdbusconnection.c:4765 +#: gio/gdbusconnection.c:6742 #, c-format msgid "No such interface “%s”" msgstr "Nincs ilyen interfész: „%s”" -#: gio/gdbusconnection.c:4986 gio/gdbusconnection.c:7261 +#: gio/gdbusconnection.c:4981 gio/gdbusconnection.c:7256 #, c-format msgid "No such interface “%s” on object at path %s" msgstr "Nincs „%s” interfész a(z) %s útvonalon lévő objektumon" -#: gio/gdbusconnection.c:5087 +#: gio/gdbusconnection.c:5082 #, c-format msgid "No such method “%s”" msgstr "Nincs „%s” metódus" -#: gio/gdbusconnection.c:5118 +#: gio/gdbusconnection.c:5113 #, c-format msgid "Type of message, “%s”, does not match expected type “%s”" msgstr "Az üzenet „%s” típusa nem felel meg a várt „%s” típusnak" -#: gio/gdbusconnection.c:5321 +#: gio/gdbusconnection.c:5316 #, c-format msgid "An object is already exported for the interface %s at %s" msgstr "Már exportálva van egy objektum a(z) %s interfészhez itt: %s" -#: gio/gdbusconnection.c:5548 +#: gio/gdbusconnection.c:5543 #, c-format msgid "Unable to retrieve property %s.%s" msgstr "Nem sikerült lekérni a tulajdonságot: %s.%s" -#: gio/gdbusconnection.c:5604 +#: gio/gdbusconnection.c:5599 #, c-format msgid "Unable to set property %s.%s" msgstr "Nem sikerült beállítani a tulajdonságot: %s.%s" -#: gio/gdbusconnection.c:5783 +#: gio/gdbusconnection.c:5778 #, c-format msgid "Method “%s” returned type “%s”, but expected “%s”" msgstr "A(z) „%s” metódus a(z) „%s” típust adta vissza a várt „%s” helyett" -#: gio/gdbusconnection.c:6859 +#: gio/gdbusconnection.c:6854 #, c-format msgid "Method “%s” on interface “%s” with signature “%s” does not exist" msgstr "A(z) „%s” metódus nem létezik a(z) „%s” interfészen „%s” aláírással" -#: gio/gdbusconnection.c:6980 +#: gio/gdbusconnection.c:6975 #, c-format msgid "A subtree is already exported for %s" msgstr "Egy részfa már exportálva van a következőhöz: %s" -#: gio/gdbusconnection.c:7269 +#: gio/gdbusconnection.c:7264 #, c-format msgid "Object does not exist at path “%s”" msgstr "Az objektum nem létezik a(z) „%s” útvonalon" -#: gio/gdbusmessage.c:1303 +#: gio/gdbusmessage.c:1306 msgid "type is INVALID" msgstr "a típus érvénytelen" -#: gio/gdbusmessage.c:1314 +#: gio/gdbusmessage.c:1317 msgid "METHOD_CALL message: PATH or MEMBER header field is missing" msgstr "METHOD_CALL üzenet: a PATH vagy MEMBER fejlécmező hiányzik" -#: gio/gdbusmessage.c:1325 +#: gio/gdbusmessage.c:1328 msgid "METHOD_RETURN message: REPLY_SERIAL header field is missing" msgstr "METHOD_RETURN üzenet: a REPLY_SERIAL fejlécmező hiányzik" -#: gio/gdbusmessage.c:1337 +#: gio/gdbusmessage.c:1340 msgid "ERROR message: REPLY_SERIAL or ERROR_NAME header field is missing" msgstr "ERROR üzenet: a REPLY_SERIAL vagy ERROR_NAME fejlécmező hiányzik" -#: gio/gdbusmessage.c:1350 +#: gio/gdbusmessage.c:1353 msgid "SIGNAL message: PATH, INTERFACE or MEMBER header field is missing" msgstr "SIGNAL üzenet: a PATH, INTERFACE vagy MEMBER fejlécmező hiányzik" -#: gio/gdbusmessage.c:1358 +#: gio/gdbusmessage.c:1361 msgid "" "SIGNAL message: The PATH header field is using the reserved value /org/" "freedesktop/DBus/Local" @@ -805,7 +809,7 @@ "SIGNAL üzenet: a PATH fejlécmező a fenntartott /org/freedesktop/DBus/Local " "értéket használja" -#: gio/gdbusmessage.c:1366 +#: gio/gdbusmessage.c:1369 msgid "" "SIGNAL message: The INTERFACE header field is using the reserved value org." "freedesktop.DBus.Local" @@ -813,19 +817,19 @@ "SIGNAL üzenet: az INTERFACE fejlécmező a fenntartott value org.freedesktop." "DBus.Local értéket használja" -#: gio/gdbusmessage.c:1414 gio/gdbusmessage.c:1474 +#: gio/gdbusmessage.c:1417 gio/gdbusmessage.c:1477 #, c-format msgid "Wanted to read %lu byte but only got %lu" msgid_plural "Wanted to read %lu bytes but only got %lu" msgstr0 "Az olvasandó %lu bájt helyett csak %lu érkezett" msgstr1 "Az olvasandó %lu bájt helyett csak %lu érkezett" -#: gio/gdbusmessage.c:1428 +#: gio/gdbusmessage.c:1431 #, c-format msgid "Expected NUL byte after the string “%s” but found byte %d" msgstr "A(z) „%s” karakterlánc után várt NULL bájt helyett %d bájt található" -#: gio/gdbusmessage.c:1447 +#: gio/gdbusmessage.c:1450 #, c-format msgid "" "Expected valid UTF-8 string but found invalid bytes at byte offset %d " @@ -835,21 +839,21 @@ "a(z) %d bájteltolásnál (a karakterlánc hossza: %d). Az érvényes UTF-8 " "karakterlánc az adott pontig: „%s”" -#: gio/gdbusmessage.c:1511 gio/gdbusmessage.c:1787 gio/gdbusmessage.c:1998 +#: gio/gdbusmessage.c:1514 gio/gdbusmessage.c:1790 gio/gdbusmessage.c:2001 msgid "Value nested too deeply" msgstr "Az érték túl mélyen van egymásba ágyazva" -#: gio/gdbusmessage.c:1679 +#: gio/gdbusmessage.c:1682 #, c-format msgid "Parsed value “%s” is not a valid D-Bus object path" msgstr "A feldolgozott „%s” érték nem érvényes D-Bus objektumútvonal" -#: gio/gdbusmessage.c:1703 +#: gio/gdbusmessage.c:1706 #, c-format msgid "Parsed value “%s” is not a valid D-Bus signature" msgstr "A feldolgozott „%s” érték nem érvényes D-Bus aláírás" -#: gio/gdbusmessage.c:1754 +#: gio/gdbusmessage.c:1757 #, c-format msgid "" "Encountered array of length %u byte. Maximum length is 2<<26 bytes (64 MiB)." @@ -860,7 +864,7 @@ msgstr1 "" "%u bájt hosszú tömb található. A maximális hossz 2<<26 bájt (64 MiB)." -#: gio/gdbusmessage.c:1774 +#: gio/gdbusmessage.c:1777 #, c-format msgid "" "Encountered array of type “a%c”, expected to have a length a multiple of %u " @@ -869,85 +873,85 @@ "Egy „a%c” típusú tömb található, az elvárt hossz a(z) %u bájt többszöröse, " "de %u bájt hosszú található" -#: gio/gdbusmessage.c:1928 gio/gdbusmessage.c:2647 +#: gio/gdbusmessage.c:1931 gio/gdbusmessage.c:2650 msgid "Empty structures (tuples) are not allowed in D-Bus" msgstr "Üres szerkezetek (rekordok) nem engedélyezettek a D-Buson" -#: gio/gdbusmessage.c:1982 +#: gio/gdbusmessage.c:1985 #, c-format msgid "Parsed value “%s” for variant is not a valid D-Bus signature" msgstr "A változat feldolgozott „%s” értéke nem érvényes D-Bus aláírás" -#: gio/gdbusmessage.c:2023 +#: gio/gdbusmessage.c:2026 #, c-format msgid "" "Error deserializing GVariant with type string “%s” from the D-Bus wire format" msgstr "" "Hiba a(z) „%s” típusú GVariant visszafejtésekor a D-Bus átviteli formátumból" -#: gio/gdbusmessage.c:2208 +#: gio/gdbusmessage.c:2211 #, c-format msgid "" "Invalid endianness value. Expected 0x6c (“l”) or 0x42 (“B”) but found value " "0x%02x" msgstr "" -"Érvénytelen bájtsorrend-érték. A várt 0x6c („l”) vagy 0x42 („B”) helyett 0x" -"%02x érték található" +"Érvénytelen bájtsorrend-érték. A várt 0x6c („l”) vagy 0x42 („B”) helyett " +"0x%02x érték található" -#: gio/gdbusmessage.c:2227 +#: gio/gdbusmessage.c:2230 #, c-format msgid "Invalid major protocol version. Expected 1 but found %d" msgstr "Érvénytelen fő protokollverzió. A várt 1 helyett %d található" -#: gio/gdbusmessage.c:2285 gio/gdbusmessage.c:2883 +#: gio/gdbusmessage.c:2288 gio/gdbusmessage.c:2886 msgid "Signature header found but is not of type signature" msgstr "Aláírásfejléc található, de nem aláírás típusú" -#: gio/gdbusmessage.c:2297 +#: gio/gdbusmessage.c:2300 #, c-format msgid "Signature header with signature “%s” found but message body is empty" msgstr "Aláírásfejléc található „%s” aláírással, de az üzenettörzs üres" -#: gio/gdbusmessage.c:2312 +#: gio/gdbusmessage.c:2315 #, c-format msgid "Parsed value “%s” is not a valid D-Bus signature (for body)" msgstr "A feldolgozott „%s” érték nem érvényes D-Bus aláírás (a törzshöz)" -#: gio/gdbusmessage.c:2344 +#: gio/gdbusmessage.c:2347 #, 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" msgstr0 "Nincs aláírásfejléc az üzenetben, de az üzenettörzs %u bájt" msgstr1 "Nincs aláírásfejléc az üzenetben, de az üzenettörzs %u bájt" -#: gio/gdbusmessage.c:2354 +#: gio/gdbusmessage.c:2357 msgid "Cannot deserialize message: " msgstr "Nem fejthető sorba az üzenet: " -#: gio/gdbusmessage.c:2700 +#: gio/gdbusmessage.c:2703 #, c-format msgid "" "Error serializing GVariant with type string “%s” to the D-Bus wire format" msgstr "" "Hiba a(z) „%s” típusú GVariant sorbafejtésekor a D-Bus átviteli formátumba" -#: gio/gdbusmessage.c:2837 +#: gio/gdbusmessage.c:2840 #, c-format msgid "" "Number of file descriptors in message (%d) differs from header field (%d)" msgstr "" "Az üzenetben található fájlleírók száma (%d) eltér a fejléc mezőtől (%d)" -#: gio/gdbusmessage.c:2845 +#: gio/gdbusmessage.c:2848 msgid "Cannot serialize message: " msgstr "Az üzenet nem fejthető sorba: " -#: gio/gdbusmessage.c:2898 +#: gio/gdbusmessage.c:2901 #, c-format msgid "Message body has signature “%s” but there is no signature header" msgstr "Az üzenettörzs „%s” aláírással rendelkezik, de nincs aláírásfejléc" -#: gio/gdbusmessage.c:2908 +#: gio/gdbusmessage.c:2911 #, c-format msgid "" "Message body has type signature “%s” but signature in the header field is " @@ -956,17 +960,17 @@ "Az üzenettörzs „%s” típusaláírással rendelkezik, de az aláírásfejlécben lévő " "aláírás: „%s”" -#: gio/gdbusmessage.c:2924 +#: gio/gdbusmessage.c:2927 #, c-format msgid "Message body is empty but signature in the header field is “(%s)”" msgstr "Az üzenettörzs üres, de az aláírásfejlécben lévő aláírás: „%s”" -#: gio/gdbusmessage.c:3479 +#: gio/gdbusmessage.c:3482 #, c-format msgid "Error return with body of type “%s”" msgstr "Hiba került visszaadásra a(z) „%s” típusú törzzsel" -#: gio/gdbusmessage.c:3487 +#: gio/gdbusmessage.c:3490 msgid "Error return with empty body" msgstr "Hiba került visszaadásra az üres törzzsel" @@ -991,17 +995,17 @@ msgid "Unable to load %s or %s: " msgstr "A(z) %s vagy a(z) %s nem tölthető be: " -#: gio/gdbusproxy.c:1575 +#: gio/gdbusproxy.c:1568 #, c-format msgid "Error calling StartServiceByName for %s: " msgstr "Hiba a StartServiceByName hívásakor ehhez: %s: " -#: gio/gdbusproxy.c:1598 +#: gio/gdbusproxy.c:1591 #, c-format msgid "Unexpected reply %d from StartServiceByName(\"%s\") method" msgstr "Váratlan válasz (%d) a StartServiceByName(\"%s\") metódustól" -#: gio/gdbusproxy.c:2709 gio/gdbusproxy.c:2844 +#: gio/gdbusproxy.c:2702 gio/gdbusproxy.c:2837 #, c-format msgid "" "Cannot invoke method; proxy is for the well-known name %s without an owner, " @@ -1010,25 +1014,25 @@ "A metódus nem hívható; a proxy a jól ismert %s névhez tartozik tulajdonos " "nélkül, és a proxy a G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START jelzővel készült" -#: gio/gdbusserver.c:765 +#: gio/gdbusserver.c:758 msgid "Abstract namespace not supported" msgstr "Az absztrakt névtér nem támogatott" -#: gio/gdbusserver.c:857 +#: gio/gdbusserver.c:850 msgid "Cannot specify nonce file when creating a server" msgstr "Kiszolgáló létrehozásakor nem adható meg az ideiglenes fájl" -#: gio/gdbusserver.c:939 +#: gio/gdbusserver.c:932 #, c-format msgid "Error writing nonce file at “%s”: %s" msgstr "Hiba az ideiglenes fájl („%s”) írásakor: %s" -#: gio/gdbusserver.c:1114 +#: gio/gdbusserver.c:1107 #, c-format msgid "The string “%s” is not a valid D-Bus GUID" msgstr "A(z) „%s” karakterlánc nem érvényes D-Bus GUID" -#: gio/gdbusserver.c:1152 +#: gio/gdbusserver.c:1145 #, c-format msgid "Cannot listen on unsupported transport “%s”" msgstr "Nem figyelhető a nem támogatott „%s” szállítás" @@ -1055,14 +1059,14 @@ "\n" "Az egyes parancsok súgója a „%s PARANCS --help” kiadásával érhető el.\n" -#: gio/gdbus-tool.c:204 gio/gdbus-tool.c:276 gio/gdbus-tool.c:348 -#: gio/gdbus-tool.c:372 gio/gdbus-tool.c:862 gio/gdbus-tool.c:1247 -#: gio/gdbus-tool.c:1734 +#: gio/gdbus-tool.c:204 gio/gdbus-tool.c:276 gio/gdbus-tool.c:347 +#: gio/gdbus-tool.c:371 gio/gdbus-tool.c:861 gio/gdbus-tool.c:1246 +#: gio/gdbus-tool.c:1733 #, c-format msgid "Error: %s\n" msgstr "Hiba: %s\n" -#: gio/gdbus-tool.c:215 gio/gdbus-tool.c:289 gio/gdbus-tool.c:1750 +#: gio/gdbus-tool.c:215 gio/gdbus-tool.c:289 gio/gdbus-tool.c:1749 #, c-format msgid "Error parsing introspection XML: %s\n" msgstr "Hiba a betekintési XML feldolgozásakor: %s\n" @@ -1072,43 +1076,43 @@ msgid "Error: %s is not a valid name\n" msgstr "Hiba: a(z) %s nem érvényes név\n" -#: gio/gdbus-tool.c:258 gio/gdbus-tool.c:748 gio/gdbus-tool.c:1066 -#: gio/gdbus-tool.c:1900 gio/gdbus-tool.c:2140 +#: gio/gdbus-tool.c:258 gio/gdbus-tool.c:747 gio/gdbus-tool.c:1065 +#: gio/gdbus-tool.c:1899 gio/gdbus-tool.c:2139 #, c-format msgid "Error: %s is not a valid object path\n" msgstr "Hiba: a(z) %s nem érvényes objektumútvonal\n" -#: gio/gdbus-tool.c:406 +#: gio/gdbus-tool.c:405 msgid "Connect to the system bus" msgstr "Csatlakozás a rendszerbuszhoz" -#: gio/gdbus-tool.c:407 +#: gio/gdbus-tool.c:406 msgid "Connect to the session bus" msgstr "Csatlakozás a munkamenetbuszhoz" -#: gio/gdbus-tool.c:408 +#: gio/gdbus-tool.c:407 msgid "Connect to given D-Bus address" msgstr "Csatlakozás a megadott D-Bus címhez" -#: gio/gdbus-tool.c:418 +#: gio/gdbus-tool.c:417 msgid "Connection Endpoint Options:" msgstr "Kapcsolatvégpont beállításai:" -#: gio/gdbus-tool.c:419 +#: gio/gdbus-tool.c:418 msgid "Options specifying the connection endpoint" msgstr "A kapcsolat végpontját megadó beállítások" -#: gio/gdbus-tool.c:442 +#: gio/gdbus-tool.c:441 #, c-format msgid "No connection endpoint specified" msgstr "Nincs megadva kapcsolatvégpont" -#: gio/gdbus-tool.c:452 +#: gio/gdbus-tool.c:451 #, c-format msgid "Multiple connection endpoints specified" msgstr "Több kapcsolatvégpontot adott meg" -#: gio/gdbus-tool.c:525 +#: gio/gdbus-tool.c:524 #, c-format msgid "" "Warning: According to introspection data, interface “%s” does not exist\n" @@ -1116,7 +1120,7 @@ "Figyelmeztetés: a betekintési adatok szerint a(z) „%s” interfész nem " "létezik\n" -#: gio/gdbus-tool.c:534 +#: gio/gdbus-tool.c:533 #, c-format msgid "" "Warning: According to introspection data, method “%s” does not exist on " @@ -1125,164 +1129,164 @@ "Figyelmeztetés: a betekintési adatok szerint a(z) „%2$s” interfészen nem " "létezik „%1$s” metódus\n" -#: gio/gdbus-tool.c:596 +#: gio/gdbus-tool.c:595 msgid "Optional destination for signal (unique name)" msgstr "A szignál elhagyható célja (egyedi név)" -#: gio/gdbus-tool.c:597 +#: gio/gdbus-tool.c:596 msgid "Object path to emit signal on" msgstr "Szignál kibocsátása ezen az objektumútvonalon" -#: gio/gdbus-tool.c:598 +#: gio/gdbus-tool.c:597 msgid "Signal and interface name" msgstr "Szignál és interfész neve" -#: gio/gdbus-tool.c:631 +#: gio/gdbus-tool.c:630 msgid "Emit a signal." msgstr "Szignál kibocsátása." -#: gio/gdbus-tool.c:686 gio/gdbus-tool.c:1003 gio/gdbus-tool.c:1837 -#: gio/gdbus-tool.c:2069 gio/gdbus-tool.c:2289 +#: gio/gdbus-tool.c:685 gio/gdbus-tool.c:1002 gio/gdbus-tool.c:1836 +#: gio/gdbus-tool.c:2068 gio/gdbus-tool.c:2288 #, c-format msgid "Error connecting: %s\n" msgstr "Hiba a csatlakozáskor: %s\n" -#: gio/gdbus-tool.c:706 +#: gio/gdbus-tool.c:705 #, c-format msgid "Error: %s is not a valid unique bus name.\n" msgstr "Hiba: a(z) %s nem érvényes egyedi busznév.\n" -#: gio/gdbus-tool.c:725 gio/gdbus-tool.c:1046 gio/gdbus-tool.c:1880 +#: gio/gdbus-tool.c:724 gio/gdbus-tool.c:1045 gio/gdbus-tool.c:1879 msgid "Error: Object path is not specified\n" msgstr "Hiba: az objektumútvonal nincs megadva\n" -#: gio/gdbus-tool.c:768 +#: gio/gdbus-tool.c:767 msgid "Error: Signal name is not specified\n" msgstr "Hiba: a szignálnév nincs megadva\n" -#: gio/gdbus-tool.c:782 +#: gio/gdbus-tool.c:781 #, c-format msgid "Error: Signal name “%s” is invalid\n" msgstr "Hiba: a szignálnév („%s”) érvénytelen\n" -#: gio/gdbus-tool.c:794 +#: gio/gdbus-tool.c:793 #, c-format msgid "Error: %s is not a valid interface name\n" msgstr "Hiba: a(z) %s nem érvényes interfésznév\n" -#: gio/gdbus-tool.c:800 +#: gio/gdbus-tool.c:799 #, c-format msgid "Error: %s is not a valid member name\n" msgstr "Hiba: a(z) %s nem érvényes tagnév\n" #. Use the original non-"parse-me-harder" error -#: gio/gdbus-tool.c:837 gio/gdbus-tool.c:1178 +#: gio/gdbus-tool.c:836 gio/gdbus-tool.c:1177 #, c-format msgid "Error parsing parameter %d: %s\n" msgstr "Hiba a(z) %d. paraméter feldolgozásakor: %s\n" -#: gio/gdbus-tool.c:869 +#: gio/gdbus-tool.c:868 #, c-format msgid "Error flushing connection: %s\n" msgstr "Hiba a kapcsolat kiürítésekor: %s\n" -#: gio/gdbus-tool.c:897 +#: gio/gdbus-tool.c:896 msgid "Destination name to invoke method on" msgstr "A cél neve a metódushíváshoz" -#: gio/gdbus-tool.c:898 +#: gio/gdbus-tool.c:897 msgid "Object path to invoke method on" msgstr "Objektum útvonala a metódushíváshoz" -#: gio/gdbus-tool.c:899 +#: gio/gdbus-tool.c:898 msgid "Method and interface name" msgstr "Metódus és interfész neve" -#: gio/gdbus-tool.c:900 +#: gio/gdbus-tool.c:899 msgid "Timeout in seconds" msgstr "Időkorlát másodpercben" -#: gio/gdbus-tool.c:901 +#: gio/gdbus-tool.c:900 msgid "Allow interactive authorization" msgstr "Interaktív engedélyezés bekapcsolása" -#: gio/gdbus-tool.c:948 +#: gio/gdbus-tool.c:947 msgid "Invoke a method on a remote object." msgstr "Metódus hívása távoli objektumon." -#: gio/gdbus-tool.c:1020 gio/gdbus-tool.c:1854 gio/gdbus-tool.c:2094 +#: gio/gdbus-tool.c:1019 gio/gdbus-tool.c:1853 gio/gdbus-tool.c:2093 msgid "Error: Destination is not specified\n" msgstr "Hiba: a cél nincs megadva\n" -#: gio/gdbus-tool.c:1031 gio/gdbus-tool.c:1871 gio/gdbus-tool.c:2105 +#: gio/gdbus-tool.c:1030 gio/gdbus-tool.c:1870 gio/gdbus-tool.c:2104 #, c-format msgid "Error: %s is not a valid bus name\n" msgstr "Hiba: a(z) %s nem érvényes busznév\n" -#: gio/gdbus-tool.c:1081 +#: gio/gdbus-tool.c:1080 msgid "Error: Method name is not specified\n" msgstr "Hiba: a metódusnév nincs megadva\n" -#: gio/gdbus-tool.c:1092 +#: gio/gdbus-tool.c:1091 #, c-format msgid "Error: Method name “%s” is invalid\n" msgstr "Hiba: a metódusnév („%s”) érvénytelen\n" -#: gio/gdbus-tool.c:1170 +#: gio/gdbus-tool.c:1169 #, c-format msgid "Error parsing parameter %d of type “%s”: %s\n" msgstr "Hiba a(z) „%2$s” típusú %1$d. paraméter feldolgozásakor: %3$s\n" -#: gio/gdbus-tool.c:1196 +#: gio/gdbus-tool.c:1195 #, c-format msgid "Error adding handle %d: %s\n" msgstr "Hiba a(z) „%d” leíró hozzáadásakor: %s\n" -#: gio/gdbus-tool.c:1696 +#: gio/gdbus-tool.c:1695 msgid "Destination name to introspect" msgstr "A cél neve a betekintéshez" -#: gio/gdbus-tool.c:1697 +#: gio/gdbus-tool.c:1696 msgid "Object path to introspect" msgstr "Az objektumútvonal a betekintéshez" -#: gio/gdbus-tool.c:1698 +#: gio/gdbus-tool.c:1697 msgid "Print XML" msgstr "XML kiírása" -#: gio/gdbus-tool.c:1699 +#: gio/gdbus-tool.c:1698 msgid "Introspect children" msgstr "Betekintés gyermekekbe" -#: gio/gdbus-tool.c:1700 +#: gio/gdbus-tool.c:1699 msgid "Only print properties" msgstr "Csak a tulajdonságok kiírása" -#: gio/gdbus-tool.c:1789 +#: gio/gdbus-tool.c:1788 msgid "Introspect a remote object." msgstr "Betekintés távoli objektumba." -#: gio/gdbus-tool.c:1995 +#: gio/gdbus-tool.c:1994 msgid "Destination name to monitor" msgstr "Megfigyelendő cél neve" -#: gio/gdbus-tool.c:1996 +#: gio/gdbus-tool.c:1995 msgid "Object path to monitor" msgstr "Megfigyelendő objektumútvonal" -#: gio/gdbus-tool.c:2021 +#: gio/gdbus-tool.c:2020 msgid "Monitor a remote object." msgstr "Távoli objektum megfigyelése." -#: gio/gdbus-tool.c:2079 +#: gio/gdbus-tool.c:2078 msgid "Error: can’t monitor a non-message-bus connection\n" msgstr "Hiba: nem figyelhető meg a nem üzenetbusz kapcsolat\n" -#: gio/gdbus-tool.c:2203 +#: gio/gdbus-tool.c:2202 msgid "Service to activate before waiting for the other one (well-known name)" msgstr "Az aktiválandó szolgáltatás, mielőtt a másikra várna (ismert név)" -#: gio/gdbus-tool.c:2206 +#: gio/gdbus-tool.c:2205 msgid "" "Timeout to wait for before exiting with an error (seconds); 0 for no timeout " "(default)" @@ -1290,27 +1294,27 @@ "Az időtúllépés, mielőtt hibával kilépne (másodpercben); 0, ha nincs " "időtúllépés (alapértelmezett)" -#: gio/gdbus-tool.c:2254 +#: gio/gdbus-tool.c:2253 msgid "OPTION… BUS-NAME" msgstr "KAPCSOLÓ… BUSZNÉV" -#: gio/gdbus-tool.c:2255 +#: gio/gdbus-tool.c:2254 msgid "Wait for a bus name to appear." msgstr "Várakozás egy busznévre." -#: gio/gdbus-tool.c:2331 +#: gio/gdbus-tool.c:2330 msgid "Error: A service to activate for must be specified.\n" msgstr "Hiba: az objektumútvonal nincs megadva.\n" -#: gio/gdbus-tool.c:2336 +#: gio/gdbus-tool.c:2335 msgid "Error: A service to wait for must be specified.\n" msgstr "Hiba: az objektumútvonal nincs megadva.\n" -#: gio/gdbus-tool.c:2341 +#: gio/gdbus-tool.c:2340 msgid "Error: Too many arguments.\n" msgstr "Hiba: Túl sok argumentum.\n" -#: gio/gdbus-tool.c:2349 gio/gdbus-tool.c:2356 +#: gio/gdbus-tool.c:2348 gio/gdbus-tool.c:2355 #, c-format msgid "Error: %s is not a valid well-known bus name.\n" msgstr "Hiba: a(z) %s nem érvényes busznév\n" @@ -1320,39 +1324,44 @@ msgid "Not authorized to change debug settings" msgstr "Nincs felhatalmazva a hibakeresési beállítások megváltoztatására" -#: gio/gdesktopappinfo.c:2182 gio/gdesktopappinfo.c:5112 +#: gio/gdesktopappinfo.c:2242 gio/gdesktopappinfo.c:5223 msgid "Unnamed" msgstr "Névtelen" -#: gio/gdesktopappinfo.c:2592 +#: gio/gdesktopappinfo.c:2652 msgid "Desktop file didn’t specify Exec field" msgstr "A desktop fájl nem adta meg az Exec mezőt" -#: gio/gdesktopappinfo.c:2891 +#: gio/gdesktopappinfo.c:2942 msgid "Unable to find terminal required for application" msgstr "Nem található az alkalmazáshoz szükséges terminál" -#: gio/gdesktopappinfo.c:3630 +#: gio/gdesktopappinfo.c:3002 +#, c-format +msgid "Program ‘%s’ not found in $PATH" +msgstr "A(z) „%s” program nem található a $PATH értékében" + +#: gio/gdesktopappinfo.c:3735 #, c-format msgid "Can’t create user application configuration folder %s: %s" msgstr "" "Nem hozható létre a(z) %s felhasználói alkalmazáskonfigurációs mappa: %s" -#: gio/gdesktopappinfo.c:3634 +#: gio/gdesktopappinfo.c:3739 #, c-format msgid "Can’t create user MIME configuration folder %s: %s" msgstr "Nem hozható létre a(z) %s felhasználói MIME konfigurációs mappa: %s" -#: gio/gdesktopappinfo.c:3876 gio/gdesktopappinfo.c:3900 +#: gio/gdesktopappinfo.c:3981 gio/gdesktopappinfo.c:4005 msgid "Application information lacks an identifier" msgstr "Az alkalmazásinformációkból hiányzik az azonosító" -#: gio/gdesktopappinfo.c:4136 +#: gio/gdesktopappinfo.c:4241 #, c-format msgid "Can’t create user desktop file %s" msgstr "Nem hozható létre a felhasználói desktop fájl (%s)" -#: gio/gdesktopappinfo.c:4272 +#: gio/gdesktopappinfo.c:4377 #, c-format msgid "Custom definition for %s" msgstr "%s egyéni meghatározása" @@ -1426,7 +1435,7 @@ msgid "Containing mount does not exist" msgstr "A tartalmazó csatolás nem létezik" -#: gio/gfile.c:2641 gio/glocalfile.c:2500 +#: gio/gfile.c:2641 gio/glocalfile.c:2511 msgid "Can’t copy over directory" msgstr "Nem lehet a könyvtárra másolni" @@ -1471,7 +1480,7 @@ msgid "Invalid symlink value given" msgstr "Érvénytelen szimbolikus link érték került megadásra" -#: gio/gfile.c:4163 glib/gfileutils.c:2335 +#: gio/gfile.c:4163 glib/gfileutils.c:2392 msgid "Symbolic links not supported" msgstr "A szimbolikus linkek használata nem támogatott" @@ -1486,7 +1495,6 @@ #: gio/gfile.c:6993 gio/gfile.c:7119 #, c-format -#| msgid "Failed to change to directory “%s” (%s)" msgid "Failed to create a temporary directory for template “%s”: %s" msgstr "Nem sikerült átmeneti könyvtárat létrehozni a(z) „%s” sablonhoz: %s" @@ -1573,38 +1581,38 @@ msgid "HTTP proxy server closed connection unexpectedly." msgstr "A HTTP proxykiszolgáló váratlanul lezárta a kapcsolatot." -#: gio/gicon.c:300 +#: gio/gicon.c:299 #, c-format msgid "Wrong number of tokens (%d)" msgstr "A jelsorok száma hibás (%d)" -#: gio/gicon.c:320 +#: gio/gicon.c:319 #, c-format msgid "No type for class name %s" msgstr "Nincs típus az osztálynévhez: %s" -#: gio/gicon.c:330 +#: gio/gicon.c:329 #, c-format msgid "Type %s does not implement the GIcon interface" msgstr "A(z) %s típus nem valósítja meg a GIcon interfészt" -#: gio/gicon.c:341 +#: gio/gicon.c:340 #, c-format msgid "Type %s is not classed" msgstr "A típus (%s) nem tartalmaz osztályokat" -#: gio/gicon.c:355 +#: gio/gicon.c:354 #, c-format msgid "Malformed version number: %s" msgstr "Rosszul formált verziószám: %s" -#: gio/gicon.c:369 +#: gio/gicon.c:368 #, c-format msgid "Type %s does not implement from_tokens() on the GIcon interface" msgstr "" "A(z) %s típus nem valósítja meg a from_tokens() függvényt a GIcon interfészen" -#: gio/gicon.c:471 +#: gio/gicon.c:470 msgid "Can’t handle the supplied version of the icon encoding" msgstr "Az ikonkódolás megadott verziója nem kezelhető" @@ -1754,7 +1762,7 @@ #: gio/gio-tool-cat.c:135 gio/gio-tool-info.c:379 gio/gio-tool-list.c:173 #: gio/gio-tool-mkdir.c:50 gio/gio-tool-monitor.c:39 gio/gio-tool-monitor.c:41 #: gio/gio-tool-monitor.c:43 gio/gio-tool-monitor.c:45 -#: gio/gio-tool-monitor.c:206 gio/gio-tool-mount.c:1202 gio/gio-tool-open.c:72 +#: gio/gio-tool-monitor.c:206 gio/gio-tool-mount.c:1210 gio/gio-tool-open.c:72 #: gio/gio-tool-remove.c:50 gio/gio-tool-rename.c:47 gio/gio-tool-set.c:95 #: gio/gio-tool-trash.c:222 gio/gio-tool-tree.c:241 msgid "LOCATION" @@ -1775,7 +1783,7 @@ "smb://kiszolgáló/erőforrás/fájl.txt." #: gio/gio-tool-cat.c:164 gio/gio-tool-info.c:410 gio/gio-tool-mkdir.c:78 -#: gio/gio-tool-monitor.c:231 gio/gio-tool-mount.c:1253 gio/gio-tool-open.c:98 +#: gio/gio-tool-monitor.c:231 gio/gio-tool-mount.c:1261 gio/gio-tool-open.c:98 #: gio/gio-tool-remove.c:74 gio/gio-tool-trash.c:303 msgid "No locations given" msgstr "Nincsenek megadva helyek" @@ -2190,19 +2198,19 @@ msgid "Mount a TCRYPT system volume" msgstr "TCRYPT rendszerkötet csatolása" -#: gio/gio-tool-mount.c:268 gio/gio-tool-mount.c:300 +#: gio/gio-tool-mount.c:276 gio/gio-tool-mount.c:308 msgid "Anonymous access denied" msgstr "Névtelen hozzáférés megtagadva" -#: gio/gio-tool-mount.c:525 +#: gio/gio-tool-mount.c:533 msgid "No drive for device file" msgstr "Nincs meghajtó az eszközfájlhoz" -#: gio/gio-tool-mount.c:1017 +#: gio/gio-tool-mount.c:1025 msgid "No volume for given ID" msgstr "Nincs kötet a megadott azonosítóhoz" -#: gio/gio-tool-mount.c:1206 +#: gio/gio-tool-mount.c:1214 msgid "Mount or unmount the locations." msgstr "A helyek csatolása vagy leválasztása." @@ -2322,7 +2330,6 @@ msgstr "Típus" #: gio/gio-tool-set.c:38 -#| msgid "Set a file attribute" msgid "Unset given attribute" msgstr "A megadott attribútum beállításának törlése" @@ -2408,7 +2415,7 @@ msgid "List contents of directories in a tree-like format." msgstr "Könyvtárak tartalmának felsorolása fa-szerű formátumban." -#: gio/glib-compile-resources.c:142 gio/glib-compile-schemas.c:1516 +#: gio/glib-compile-resources.c:142 gio/glib-compile-schemas.c:1513 #, c-format msgid "Element <%s> not allowed inside <%s>" msgstr "<%s> elem nem engedélyezett ezen belül: <%s>" @@ -2465,7 +2472,7 @@ msgid "text may not appear inside <%s>" msgstr "nem jelenhet meg szöveg ezen belül: <%s>" -#: gio/glib-compile-resources.c:821 gio/glib-compile-schemas.c:2174 +#: gio/glib-compile-resources.c:821 gio/glib-compile-schemas.c:2171 msgid "Show program version and exit" msgstr "A programverzió megjelenítése és kilépés" @@ -2481,8 +2488,8 @@ "A FILE-ban megadott fájlok olvasása ebből a könyvtárból (alapértelmezett: " "aktuális könyvtár)" -#: gio/glib-compile-resources.c:823 gio/glib-compile-schemas.c:2175 -#: gio/glib-compile-schemas.c:2204 +#: gio/glib-compile-resources.c:823 gio/glib-compile-schemas.c:2172 +#: gio/glib-compile-schemas.c:2201 msgid "DIRECTORY" msgstr "KÖNYVTÁR" @@ -2703,16 +2710,16 @@ msgid "<aliases> must contain at least one <alias>" msgstr "<aliases> legalább egy <alias> címkét kell tartalmazzon" -#: gio/glib-compile-schemas.c:799 +#: gio/glib-compile-schemas.c:796 msgid "Empty names are not permitted" msgstr "Az üres nevek nem engedélyezettek" -#: gio/glib-compile-schemas.c:809 +#: gio/glib-compile-schemas.c:806 #, c-format msgid "Invalid name “%s”: names must begin with a lowercase letter" msgstr "Érvénytelen név („%s”): a neveknek kisbetűvel kell kezdődniük" -#: gio/glib-compile-schemas.c:821 +#: gio/glib-compile-schemas.c:818 #, c-format msgid "" "Invalid name “%s”: invalid character “%c”; only lowercase letters, numbers " @@ -2721,37 +2728,37 @@ "Érvénytelen név („%s”): érvénytelen karakter: „%c”. Csak kisbetűk, számok és " "kötőjel („-”) engedélyezettek" -#: gio/glib-compile-schemas.c:830 +#: gio/glib-compile-schemas.c:827 #, c-format msgid "Invalid name “%s”: two successive hyphens (“--”) are not permitted" msgstr "" "Érvénytelen név („%s”): két egymást követő kötőjel („--”) nem engedélyezett" -#: gio/glib-compile-schemas.c:839 +#: gio/glib-compile-schemas.c:836 #, c-format msgid "Invalid name “%s”: the last character may not be a hyphen (“-”)" msgstr "Érvénytelen név („%s”): az utolsó karakter nem lehet kötőjel („-”)" -#: gio/glib-compile-schemas.c:847 +#: gio/glib-compile-schemas.c:844 #, c-format msgid "Invalid name “%s”: maximum length is 1024" msgstr "Érvénytelen név („%s”): a maximális hossz 1024 karakter" -#: gio/glib-compile-schemas.c:919 +#: gio/glib-compile-schemas.c:916 #, c-format msgid "<child name='%s'> already specified" msgstr "<child name='%s'> már meg van adva" -#: gio/glib-compile-schemas.c:945 +#: gio/glib-compile-schemas.c:942 msgid "Cannot add keys to a “list-of” schema" msgstr "Nem adhatók kulcsok „list-of” sémához" -#: gio/glib-compile-schemas.c:956 +#: gio/glib-compile-schemas.c:953 #, c-format msgid "<key name='%s'> already specified" msgstr "<key name='%s'> már meg van adva" -#: gio/glib-compile-schemas.c:974 +#: gio/glib-compile-schemas.c:971 #, c-format msgid "" "<key name='%s'> shadows <key name='%s'> in <schema id='%s'>; use <override> " @@ -2760,7 +2767,7 @@ "<key name='%s'> leárnyékolja ezt: <key name='%s'> ebben: <schema id='%s'>; " "az érték módosításához használja az <override> címkét" -#: gio/glib-compile-schemas.c:985 +#: gio/glib-compile-schemas.c:982 #, c-format msgid "" "Exactly one of “type”, “enum” or “flags” must be specified as an attribute " @@ -2768,63 +2775,63 @@ msgstr "" "A <key> attribútumaként csak a „type”, „enum” vagy „flags” egyike adható meg" -#: gio/glib-compile-schemas.c:1004 +#: gio/glib-compile-schemas.c:1001 #, c-format msgid "<%s id='%s'> not (yet) defined." msgstr "<%s id='%s'> (még) nincs megadva." -#: gio/glib-compile-schemas.c:1019 +#: gio/glib-compile-schemas.c:1016 #, c-format msgid "Invalid GVariant type string “%s”" msgstr "Érvénytelen GVariant típuskarakterlánc: „%s”" -#: gio/glib-compile-schemas.c:1049 +#: gio/glib-compile-schemas.c:1046 msgid "<override> given but schema isn’t extending anything" msgstr "Az <override> megadva, de a séma nem terjeszt ki semmit" -#: gio/glib-compile-schemas.c:1062 +#: gio/glib-compile-schemas.c:1059 #, c-format msgid "No <key name='%s'> to override" msgstr "Nincs felülírandó <key name='%s'>" -#: gio/glib-compile-schemas.c:1070 +#: gio/glib-compile-schemas.c:1067 #, c-format msgid "<override name='%s'> already specified" msgstr "<override name='%s'> már megadva" -#: gio/glib-compile-schemas.c:1143 +#: gio/glib-compile-schemas.c:1140 #, c-format msgid "<schema id='%s'> already specified" msgstr "<schema id='%s'> már megadva" -#: gio/glib-compile-schemas.c:1155 +#: gio/glib-compile-schemas.c:1152 #, c-format msgid "<schema id='%s'> extends not yet existing schema “%s”" msgstr "A <schema id='%s'> a még nem létező „%s” sémát terjeszti ki" -#: gio/glib-compile-schemas.c:1171 +#: gio/glib-compile-schemas.c:1168 #, c-format msgid "<schema id='%s'> is list of not yet existing schema “%s”" msgstr "A <schema id='%s'> a még nem létező „%s” séma listája" -#: gio/glib-compile-schemas.c:1179 +#: gio/glib-compile-schemas.c:1176 #, c-format msgid "Cannot be a list of a schema with a path" msgstr "Nem lehet séma listája útvonallal" -#: gio/glib-compile-schemas.c:1189 +#: gio/glib-compile-schemas.c:1186 #, c-format msgid "Cannot extend a schema with a path" msgstr "Nem terjeszthet ki sémát útvonallal" -#: gio/glib-compile-schemas.c:1199 +#: gio/glib-compile-schemas.c:1196 #, c-format msgid "" "<schema id='%s'> is a list, extending <schema id='%s'> which is not a list" msgstr "" "a <schema id='%s'> lista a nem lista <schema id='%s'> sémát terjeszti ki" -#: gio/glib-compile-schemas.c:1209 +#: gio/glib-compile-schemas.c:1206 #, c-format msgid "" "<schema id='%s' list-of='%s'> extends <schema id='%s' list-of='%s'> but “%s” " @@ -2833,18 +2840,18 @@ "A <schema id='%s' list-of='%s'> kiterjeszti ezt: <schema id='%s' list-" "of='%s'>, de „%s” nem terjeszti ki ezt: „%s”" -#: gio/glib-compile-schemas.c:1226 +#: gio/glib-compile-schemas.c:1223 #, c-format msgid "A path, if given, must begin and end with a slash" msgstr "" "Ha meg van adva útvonal, akkor osztásjellel kell kezdődnie és végződnie" -#: gio/glib-compile-schemas.c:1233 +#: gio/glib-compile-schemas.c:1230 #, c-format msgid "The path of a list must end with “:/”" msgstr "A lista útvonalának „:/” karakterekkel kell végződnie" -#: gio/glib-compile-schemas.c:1242 +#: gio/glib-compile-schemas.c:1239 #, c-format msgid "" "Warning: Schema “%s” has path “%s”. Paths starting with “/apps/”, “/" @@ -2853,49 +2860,49 @@ "Figyelmeztetés: „%s” sémához „%s” útvonal tartozik. Az „/apps/”, \"/" "desktop/” vagy „/system/” kezdetű útvonalak elavultak." -#: gio/glib-compile-schemas.c:1272 +#: gio/glib-compile-schemas.c:1269 #, c-format msgid "<%s id='%s'> already specified" msgstr "<%s id='%s'> már meg van adva" -#: gio/glib-compile-schemas.c:1422 gio/glib-compile-schemas.c:1438 +#: gio/glib-compile-schemas.c:1419 gio/glib-compile-schemas.c:1435 #, c-format msgid "Only one <%s> element allowed inside <%s>" msgstr "Csak egy <%s> elem engedélyezett ezen belül: <%s>" -#: gio/glib-compile-schemas.c:1520 +#: gio/glib-compile-schemas.c:1517 #, c-format msgid "Element <%s> not allowed at the top level" msgstr "<%s> elem nem engedélyezett a felső szinten" -#: gio/glib-compile-schemas.c:1538 +#: gio/glib-compile-schemas.c:1535 msgid "Element <default> is required in <key>" msgstr "A <default> elem kötelező a <key>-ben" -#: gio/glib-compile-schemas.c:1628 +#: gio/glib-compile-schemas.c:1625 #, c-format msgid "Text may not appear inside <%s>" msgstr "Nem jelenhet meg szöveg ezen belül: <%s>" -#: gio/glib-compile-schemas.c:1696 +#: gio/glib-compile-schemas.c:1693 #, c-format msgid "Warning: undefined reference to <schema id='%s'/>" msgstr "Figyelmeztetés: nem definiált hivatkozás erre: <schema id='%s'/>" #. Translators: Do not translate "--strict". -#: gio/glib-compile-schemas.c:1835 gio/glib-compile-schemas.c:1914 +#: gio/glib-compile-schemas.c:1832 gio/glib-compile-schemas.c:1911 msgid "--strict was specified; exiting." msgstr "a --strict meg lett adva, kilépés." -#: gio/glib-compile-schemas.c:1847 +#: gio/glib-compile-schemas.c:1844 msgid "This entire file has been ignored." msgstr "Ez az egész fájl figyelmen kívül marad." -#: gio/glib-compile-schemas.c:1910 +#: gio/glib-compile-schemas.c:1907 msgid "Ignoring this file." msgstr "Fájl figyelmen kívül hagyása." -#: gio/glib-compile-schemas.c:1965 +#: gio/glib-compile-schemas.c:1962 #, c-format msgid "" "No such key “%s” in schema “%s” as specified in override file “%s”; ignoring " @@ -2904,7 +2911,7 @@ "Nincs „%s” kulcs a(z) „%s” sémában a(z) „%s” felülbírálási fájlban megadott " "módon. Felülbírálás figyelmen kívül hagyása ennél a kulcsnál." -#: gio/glib-compile-schemas.c:1973 +#: gio/glib-compile-schemas.c:1970 #, c-format msgid "" "No such key “%s” in schema “%s” as specified in override file “%s” and --" @@ -2913,7 +2920,7 @@ "Nincs „%s” kulcs a(z) „%s” sémában a(z) „%s” felülbírálási fájlban megadott " "módon és --strict lett megadva. Kilépés." -#: gio/glib-compile-schemas.c:1995 +#: gio/glib-compile-schemas.c:1992 #, c-format msgid "" "Cannot provide per-desktop overrides for localized key “%s” in schema " @@ -2923,7 +2930,7 @@ "esetén a(z) „%s” sémában („%s” fájl felülírás). Felülbírálás figyelmen kívül " "hagyása ennél a kulcsnál." -#: gio/glib-compile-schemas.c:2004 +#: gio/glib-compile-schemas.c:2001 #, c-format msgid "" "Cannot provide per-desktop overrides for localized key “%s” in schema " @@ -2933,7 +2940,7 @@ "esetén a(z) „%s” sémában („%s” fájl felülírás) és --strict lett megadva. " "Kilépés." -#: gio/glib-compile-schemas.c:2028 +#: gio/glib-compile-schemas.c:2025 #, c-format msgid "" "Error parsing key “%s” in schema “%s” as specified in override file “%s”: " @@ -2943,7 +2950,7 @@ "felülbírálási fájlban megadott módon: %s. Felülbírálás figyelmen kívül " "hagyása ennél a kulcsnál." -#: gio/glib-compile-schemas.c:2040 +#: gio/glib-compile-schemas.c:2037 #, c-format msgid "" "Error parsing key “%s” in schema “%s” as specified in override file “%s”: " @@ -2952,7 +2959,7 @@ "Hiba a(z) „%s” kulcs feldolgozásakor a(z) „%s” sémában a(z) „%s” " "felülbírálási fájlban megadott módon: %s. A --strict meg lett adva. Kilépés." -#: gio/glib-compile-schemas.c:2067 +#: gio/glib-compile-schemas.c:2064 #, c-format msgid "" "Override for key “%s” in schema “%s” in override file “%s” is outside the " @@ -2962,7 +2969,7 @@ "fájlban a sémában megadott tartományon kívül esik. Felülbírálás figyelmen " "kívül hagyása ennél a kulcsnál." -#: gio/glib-compile-schemas.c:2077 +#: gio/glib-compile-schemas.c:2074 #, c-format msgid "" "Override for key “%s” in schema “%s” in override file “%s” is outside the " @@ -2972,7 +2979,7 @@ "fájlban a sémában megadott tartományon kívül esik és a --strict lett " "megadva. Kilépés." -#: gio/glib-compile-schemas.c:2103 +#: gio/glib-compile-schemas.c:2100 #, c-format msgid "" "Override for key “%s” in schema “%s” in override file “%s” is not in the " @@ -2982,7 +2989,7 @@ "fájlban nincs az érvényes lehetőségek listájában. Felülbírálás figyelmen " "kívül hagyása ennél a kulcsnál." -#: gio/glib-compile-schemas.c:2113 +#: gio/glib-compile-schemas.c:2110 #, c-format msgid "" "Override for key “%s” in schema “%s” in override file “%s” is not in the " @@ -2992,23 +2999,23 @@ "fájlban nincs az érvényes lehetőségek listájában és a --strict lett megadva. " "Kilépés." -#: gio/glib-compile-schemas.c:2175 +#: gio/glib-compile-schemas.c:2172 msgid "Where to store the gschemas.compiled file" msgstr "A gschemas.compiled fájl tárolási helye" -#: gio/glib-compile-schemas.c:2176 +#: gio/glib-compile-schemas.c:2173 msgid "Abort on any errors in schemas" msgstr "Megszakítás a sémák bármely hibája esetén" -#: gio/glib-compile-schemas.c:2177 +#: gio/glib-compile-schemas.c:2174 msgid "Do not write the gschema.compiled file" msgstr "Ne írja ki a gschema.compiled fájlt" -#: gio/glib-compile-schemas.c:2178 +#: gio/glib-compile-schemas.c:2175 msgid "Do not enforce key name restrictions" msgstr "Ne kényszerítse ki a kulcsnévmegszorításokat" -#: gio/glib-compile-schemas.c:2207 +#: gio/glib-compile-schemas.c:2204 msgid "" "Compile all GSettings schema files into a schema cache.\n" "Schema files are required to have the extension .gschema.xml,\n" @@ -3018,15 +3025,15 @@ "A sémafájloknak .gschema.xml kiterjesztéssel kell rendelkezniük,\n" "és a gyorsítótárfájl neve gschemas.compiled." -#: gio/glib-compile-schemas.c:2228 +#: gio/glib-compile-schemas.c:2225 msgid "You should give exactly one directory name" msgstr "Pontosan egy könyvtárnevet kell megadnia" -#: gio/glib-compile-schemas.c:2271 +#: gio/glib-compile-schemas.c:2268 msgid "No schema files found: doing nothing." msgstr "Nem találhatók sémafájlok: nincs mit tenni." -#: gio/glib-compile-schemas.c:2273 +#: gio/glib-compile-schemas.c:2270 msgid "No schema files found: removed existing output file." msgstr "Nem találhatók sémafájlok: meglévő kimeneti fájl eltávolítva." @@ -3035,7 +3042,7 @@ msgid "Invalid filename %s" msgstr "Érvénytelen fájlnév: %s" -#: gio/glocalfile.c:996 +#: gio/glocalfile.c:1005 #, c-format msgid "Error getting filesystem info for %s: %s" msgstr "Hiba a(z) %s fájlrendszer-információinak lekérésekor: %s" @@ -3044,126 +3051,126 @@ #. * the enclosing (user visible) mount of a file, but none #. * exists. #. -#: gio/glocalfile.c:1137 +#: gio/glocalfile.c:1141 #, c-format msgid "Containing mount for file %s not found" msgstr "A(z) %s fájlt tartalmazó csatolás nem található" -#: gio/glocalfile.c:1160 +#: gio/glocalfile.c:1164 msgid "Can’t rename root directory" msgstr "Nem nevezhető át a gyökérkönyvtár" -#: gio/glocalfile.c:1178 gio/glocalfile.c:1201 +#: gio/glocalfile.c:1182 gio/glocalfile.c:1205 #, c-format msgid "Error renaming file %s: %s" msgstr "Hiba a(z) %s fájl átnevezésekor: %s" -#: gio/glocalfile.c:1185 +#: gio/glocalfile.c:1189 msgid "Can’t rename file, filename already exists" msgstr "A fájl nem nevezhető át, a fájlnév már létezik" -#: gio/glocalfile.c:1198 gio/glocalfile.c:2394 gio/glocalfile.c:2422 -#: gio/glocalfile.c:2561 gio/glocalfileoutputstream.c:658 +#: gio/glocalfile.c:1202 gio/glocalfile.c:2405 gio/glocalfile.c:2433 +#: gio/glocalfile.c:2572 gio/glocalfileoutputstream.c:658 msgid "Invalid filename" msgstr "Érvénytelen fájlnév" -#: gio/glocalfile.c:1366 gio/glocalfile.c:1377 +#: gio/glocalfile.c:1370 gio/glocalfile.c:1381 #, c-format msgid "Error opening file %s: %s" msgstr "Hiba a(z) %s fájl megnyitásakor: %s" -#: gio/glocalfile.c:1502 +#: gio/glocalfile.c:1506 #, c-format msgid "Error removing file %s: %s" msgstr "Hiba a(z) %s fájl eltávolításakor: %s" -#: gio/glocalfile.c:1996 gio/glocalfile.c:2007 gio/glocalfile.c:2034 +#: gio/glocalfile.c:2000 gio/glocalfile.c:2011 gio/glocalfile.c:2038 #, c-format msgid "Error trashing file %s: %s" msgstr "Hiba a(z) %s fájl Kukába dobásakor: %s" -#: gio/glocalfile.c:2054 +#: gio/glocalfile.c:2058 #, c-format msgid "Unable to create trash directory %s: %s" msgstr "Nem sikerült létrehozni a(z) %s Kuka könyvtárat: %s" -#: gio/glocalfile.c:2075 +#: gio/glocalfile.c:2079 #, c-format msgid "Unable to find toplevel directory to trash %s" msgstr "Nem található a felső szintű könyvtár a(z) %s kidobásához" -#: gio/glocalfile.c:2083 +#: gio/glocalfile.c:2087 #, c-format msgid "Trashing on system internal mounts is not supported" msgstr "A rendszer belső csatolásain a Kukába dobás nem támogatott" -#: gio/glocalfile.c:2169 gio/glocalfile.c:2197 +#: gio/glocalfile.c:2173 gio/glocalfile.c:2201 #, c-format msgid "Unable to find or create trash directory %s to trash %s" msgstr "" "Nem található vagy nem hozható létre a(z) %s Kuka könyvtár a(z) %s " "kidobásához" -#: gio/glocalfile.c:2243 +#: gio/glocalfile.c:2245 #, c-format msgid "Unable to create trashing info file for %s: %s" msgstr "Nem sikerült létrehozni a(z) %s kukainformációs fájlját: %s" -#: gio/glocalfile.c:2305 +#: gio/glocalfile.c:2316 #, c-format msgid "Unable to trash file %s across filesystem boundaries" msgstr "Nem lehet fájlrendszer-határokon át Kukába dobni a(z) %s fájlt" -#: gio/glocalfile.c:2309 gio/glocalfile.c:2365 +#: gio/glocalfile.c:2320 gio/glocalfile.c:2376 #, c-format msgid "Unable to trash file %s: %s" msgstr "Nem lehet a Kukába dobni a(z) %s fájlt: %s" -#: gio/glocalfile.c:2371 +#: gio/glocalfile.c:2382 #, c-format msgid "Unable to trash file %s" msgstr "Nem lehet a Kukába dobni a(z) %s fájlt" -#: gio/glocalfile.c:2397 +#: gio/glocalfile.c:2408 #, c-format msgid "Error creating directory %s: %s" msgstr "Hiba a(z) %s könyvtár létrehozásakor: %s" -#: gio/glocalfile.c:2426 +#: gio/glocalfile.c:2437 #, c-format msgid "Filesystem does not support symbolic links" msgstr "A fájlrendszer nem támogatja a szimbolikus linkeket" -#: gio/glocalfile.c:2429 +#: gio/glocalfile.c:2440 #, c-format msgid "Error making symbolic link %s: %s" msgstr "Hiba a(z) %s szimbolikus link létrehozásakor: %s" -#: gio/glocalfile.c:2472 gio/glocalfile.c:2507 gio/glocalfile.c:2564 +#: gio/glocalfile.c:2483 gio/glocalfile.c:2518 gio/glocalfile.c:2575 #, c-format msgid "Error moving file %s: %s" msgstr "Hiba a(z) %s fájl áthelyezésekor: %s" -#: gio/glocalfile.c:2495 +#: gio/glocalfile.c:2506 msgid "Can’t move directory over directory" msgstr "A könyvtár nem helyezhető át könyvtárba" -#: gio/glocalfile.c:2521 gio/glocalfileoutputstream.c:1110 +#: gio/glocalfile.c:2532 gio/glocalfileoutputstream.c:1110 #: gio/glocalfileoutputstream.c:1124 gio/glocalfileoutputstream.c:1139 #: gio/glocalfileoutputstream.c:1156 gio/glocalfileoutputstream.c:1170 msgid "Backup file creation failed" msgstr "A mentési fájl létrehozása meghiúsult" -#: gio/glocalfile.c:2540 +#: gio/glocalfile.c:2551 #, c-format msgid "Error removing target file: %s" msgstr "Hiba a célfájl eltávolításakor: %s" -#: gio/glocalfile.c:2554 +#: gio/glocalfile.c:2565 msgid "Move between mounts not supported" msgstr "A csatolások közti áthelyezés nem támogatott" -#: gio/glocalfile.c:2728 +#: gio/glocalfile.c:2741 #, c-format msgid "Could not determine the disk usage of %s: %s" msgstr "Nem lehet meghatározni %s lemezhasználatát: %s" @@ -3173,7 +3180,6 @@ msgstr "Az attribútum értéke nem lehet NULL" #: gio/glocalfileinfo.c:782 -#| msgid "Invalid attribute type (string expected)" msgid "Invalid attribute type (string or invalid expected)" msgstr "" "Érvénytelen attribútumtípus (a várt karakterlánc vagy érvénytelen helyett)" @@ -3187,120 +3193,120 @@ msgid "Error setting extended attribute “%s”: %s" msgstr "Hiba a(z) „%s” kiterjesztett attribútum beállításakor: %s" -#: gio/glocalfileinfo.c:1738 gio/win32/gwinhttpfile.c:191 +#: gio/glocalfileinfo.c:1819 gio/win32/gwinhttpfile.c:191 msgid " (invalid encoding)" msgstr " (érvénytelen kódolás)" -#: gio/glocalfileinfo.c:1897 gio/glocalfileoutputstream.c:945 +#: gio/glocalfileinfo.c:1978 gio/glocalfileoutputstream.c:945 #: gio/glocalfileoutputstream.c:997 #, c-format msgid "Error when getting information for file “%s”: %s" msgstr "Hiba a(z) „%s” fájl információinak lekérésekor: %s" -#: gio/glocalfileinfo.c:2163 +#: gio/glocalfileinfo.c:2281 #, c-format msgid "Error when getting information for file descriptor: %s" msgstr "Hiba a fájlleíró információinak lekérésekor: %s" -#: gio/glocalfileinfo.c:2208 +#: gio/glocalfileinfo.c:2326 msgid "Invalid attribute type (uint32 expected)" msgstr "Érvénytelen attribútumtípus (a várt uint32 helyett)" -#: gio/glocalfileinfo.c:2226 +#: gio/glocalfileinfo.c:2344 msgid "Invalid attribute type (uint64 expected)" msgstr "Érvénytelen attribútumtípus (a várt uint64 helyett)" -#: gio/glocalfileinfo.c:2245 gio/glocalfileinfo.c:2264 +#: gio/glocalfileinfo.c:2363 gio/glocalfileinfo.c:2382 msgid "Invalid attribute type (byte string expected)" msgstr "Érvénytelen attribútumtípus (a várt bájtkarakterlánc helyett)" -#: gio/glocalfileinfo.c:2311 +#: gio/glocalfileinfo.c:2429 msgid "Cannot set permissions on symlinks" msgstr "Nem állíthatók be a szimbolikus linkek jogosultságai" -#: gio/glocalfileinfo.c:2327 +#: gio/glocalfileinfo.c:2445 #, c-format msgid "Error setting permissions: %s" msgstr "Hiba a jogosultságok beállításakor: %s" -#: gio/glocalfileinfo.c:2378 +#: gio/glocalfileinfo.c:2496 #, c-format msgid "Error setting owner: %s" msgstr "Hiba a tulajdonos beállításakor: %s" -#: gio/glocalfileinfo.c:2401 +#: gio/glocalfileinfo.c:2519 msgid "symlink must be non-NULL" msgstr "a szimbolikus link nem lehet NULL" -#: gio/glocalfileinfo.c:2411 gio/glocalfileinfo.c:2430 -#: gio/glocalfileinfo.c:2441 +#: gio/glocalfileinfo.c:2529 gio/glocalfileinfo.c:2548 +#: gio/glocalfileinfo.c:2559 #, c-format msgid "Error setting symlink: %s" msgstr "Hiba a szimbolikus link beállításakor: %s" -#: gio/glocalfileinfo.c:2420 +#: gio/glocalfileinfo.c:2538 msgid "Error setting symlink: file is not a symlink" msgstr "Hiba a szimbolikus link beállításakor: a fájl nem szimbolikus link" -#: gio/glocalfileinfo.c:2492 +#: gio/glocalfileinfo.c:2630 #, c-format msgid "Extra nanoseconds %d for UNIX timestamp %lld are negative" msgstr "" "A(z) %2$lld UNIX időbélyeghez tartozó további %1$d nanoszekundum negatív" -#: gio/glocalfileinfo.c:2501 +#: gio/glocalfileinfo.c:2639 #, c-format msgid "Extra nanoseconds %d for UNIX timestamp %lld reach 1 second" msgstr "" "A(z) %2$lld UNIX időbélyeghez tartozó további %1$d nanoszekundum eléri az 1 " "másodpercet" -#: gio/glocalfileinfo.c:2511 +#: gio/glocalfileinfo.c:2649 #, c-format msgid "UNIX timestamp %lld does not fit into 64 bits" msgstr "A(z) %lld UNIX időbélyeg nem fér el 64 biten" -#: gio/glocalfileinfo.c:2522 +#: gio/glocalfileinfo.c:2660 #, c-format msgid "UNIX timestamp %lld is outside of the range supported by Windows" msgstr "" "A(z) %lld UNIX időbélyeg kívül esik a Windows által támogatott tartományon" -#: gio/glocalfileinfo.c:2625 +#: gio/glocalfileinfo.c:2792 #, c-format msgid "File name “%s” cannot be converted to UTF-16" msgstr "A(z) „%s” fájlnév nem alakítható át UTF-16-as kódolásúra" -#: gio/glocalfileinfo.c:2644 +#: gio/glocalfileinfo.c:2811 #, c-format msgid "File “%s” cannot be opened: Windows Error %lu" msgstr "A(z) „%s” fájl nem nyitható meg: Windows hiba %lu" -#: gio/glocalfileinfo.c:2657 +#: gio/glocalfileinfo.c:2824 #, c-format msgid "Error setting modification or access time for file “%s”: %lu" msgstr "" "Hiba a(z) „%s” fájl módosítási vagy hozzáférési idejének beállításakor: %lu" -#: gio/glocalfileinfo.c:2798 gio/glocalfileinfo.c:2810 +#: gio/glocalfileinfo.c:2981 #, c-format msgid "Error setting modification or access time: %s" msgstr "Hiba a módosítási vagy hozzáférési idő beállításakor: %s" -#: gio/glocalfileinfo.c:2833 +#: gio/glocalfileinfo.c:3004 msgid "SELinux context must be non-NULL" msgstr "A SELinux környezet nem lehet NULL" -#: gio/glocalfileinfo.c:2840 +#: gio/glocalfileinfo.c:3011 msgid "SELinux is not enabled on this system" msgstr "A SELinux nem engedélyezett ezen rendszeren" -#: gio/glocalfileinfo.c:2850 +#: gio/glocalfileinfo.c:3021 #, c-format msgid "Error setting SELinux context: %s" msgstr "Hiba a SELinux környezet beállításakor: %s" -#: gio/glocalfileinfo.c:2947 +#: gio/glocalfileinfo.c:3118 #, c-format msgid "Setting attribute %s not supported" msgstr "A(z) %s attribútum beállítása nem támogatott" @@ -3347,13 +3353,13 @@ msgid "Error renaming temporary file: %s" msgstr "Hiba az ideiglenes fájl átnézésekor: %s" -#: gio/glocalfileoutputstream.c:611 gio/glocalfileoutputstream.c:1241 +#: gio/glocalfileoutputstream.c:611 gio/glocalfileoutputstream.c:1242 #, c-format msgid "Error truncating file: %s" msgstr "Hiba a fájl csonkításakor: %s" #: gio/glocalfileoutputstream.c:664 gio/glocalfileoutputstream.c:909 -#: gio/glocalfileoutputstream.c:1222 gio/gsubprocess.c:231 +#: gio/glocalfileoutputstream.c:1223 gio/gsubprocess.c:231 #, c-format msgid "Error opening file “%s”: %s" msgstr "Hiba a(z) %s fájl megnyitásakor: %s" @@ -3370,7 +3376,7 @@ msgid "The file was externally modified" msgstr "A fájlt külső program módosította" -#: gio/glocalfileoutputstream.c:1204 +#: gio/glocalfileoutputstream.c:1205 #, c-format msgid "Error removing old file: %s" msgstr "Hiba a régi fájl eltávolításakor: %s" @@ -3521,8 +3527,8 @@ #. Translators: the first placeholder is a domain name, the #. * second is an error message #: gio/gresolver.c:403 gio/gthreadedresolver.c:152 gio/gthreadedresolver.c:170 -#: gio/gthreadedresolver.c:782 gio/gthreadedresolver.c:806 -#: gio/gthreadedresolver.c:831 gio/gthreadedresolver.c:846 +#: gio/gthreadedresolver.c:798 gio/gthreadedresolver.c:822 +#: gio/gthreadedresolver.c:847 gio/gthreadedresolver.c:862 #, c-format msgid "Error resolving “%s”: %s" msgstr "Hiba a(z) „%s” feloldásakor: %s" @@ -4241,36 +4247,36 @@ #. Translators: the placeholder is a DNS record type, such as ‘MX’ or ‘SRV’ #: gio/gthreadedresolver.c:552 gio/gthreadedresolver.c:574 -#: gio/gthreadedresolver.c:612 gio/gthreadedresolver.c:659 -#: gio/gthreadedresolver.c:688 gio/gthreadedresolver.c:700 +#: gio/gthreadedresolver.c:628 gio/gthreadedresolver.c:675 +#: gio/gthreadedresolver.c:704 gio/gthreadedresolver.c:716 #, c-format msgid "Error parsing DNS %s record: malformed DNS packet" msgstr "" "Hiba a(z) %s DNS-rekord feldolgozásakor: helytelenül formázott DNS-csomag" -#: gio/gthreadedresolver.c:758 gio/gthreadedresolver.c:895 -#: gio/gthreadedresolver.c:993 gio/gthreadedresolver.c:1043 +#: gio/gthreadedresolver.c:774 gio/gthreadedresolver.c:911 +#: gio/gthreadedresolver.c:1009 gio/gthreadedresolver.c:1059 #, c-format msgid "No DNS record of the requested type for “%s”" msgstr "Nincs kért típusú DNS-rekord ehhez: „%s”" -#: gio/gthreadedresolver.c:763 gio/gthreadedresolver.c:998 +#: gio/gthreadedresolver.c:779 gio/gthreadedresolver.c:1014 #, c-format msgid "Temporarily unable to resolve “%s”" msgstr "Ideiglenesen nem oldható fel: „%s”" -#: gio/gthreadedresolver.c:768 gio/gthreadedresolver.c:1003 -#: gio/gthreadedresolver.c:1113 +#: gio/gthreadedresolver.c:784 gio/gthreadedresolver.c:1019 +#: gio/gthreadedresolver.c:1129 #, c-format msgid "Error resolving “%s”" msgstr "Hiba a(z) „%s” feloldásakor" -#: gio/gthreadedresolver.c:782 gio/gthreadedresolver.c:806 -#: gio/gthreadedresolver.c:831 gio/gthreadedresolver.c:846 +#: gio/gthreadedresolver.c:798 gio/gthreadedresolver.c:822 +#: gio/gthreadedresolver.c:847 gio/gthreadedresolver.c:862 msgid "Malformed DNS packet" msgstr "Helytelenül formázott DNS-csomag" -#: gio/gthreadedresolver.c:888 +#: gio/gthreadedresolver.c:904 #, c-format msgid "Failed to parse DNS response for “%s”: " msgstr "Nem sikerült feldolgozni a(z) „%s” DNS válaszát: " @@ -4398,7 +4404,7 @@ msgid "Error closing file descriptor: %s" msgstr "Hiba a fájlleíró lezárásakor: %s" -#: gio/gunixmounts.c:2815 gio/gunixmounts.c:2868 +#: gio/gunixmounts.c:2817 gio/gunixmounts.c:2870 msgid "Filesystem root" msgstr "Fájlrendszer gyökere" @@ -4482,79 +4488,79 @@ msgid "Wrong args\n" msgstr "Hibás argumentumok\n" -#: glib/gbookmarkfile.c:779 +#: glib/gbookmarkfile.c:861 #, c-format msgid "Unexpected attribute “%s” for element “%s”" msgstr "Váratlan attribútum („%s”) a(z) „%s” elemhez" -#: glib/gbookmarkfile.c:790 glib/gbookmarkfile.c:870 glib/gbookmarkfile.c:880 -#: glib/gbookmarkfile.c:993 +#: glib/gbookmarkfile.c:872 glib/gbookmarkfile.c:952 glib/gbookmarkfile.c:962 +#: glib/gbookmarkfile.c:1075 #, c-format msgid "Attribute “%s” of element “%s” not found" msgstr "A(z) „%2$s” elem „%1$s” attribútuma nem található" -#: glib/gbookmarkfile.c:1202 glib/gbookmarkfile.c:1267 -#: glib/gbookmarkfile.c:1331 glib/gbookmarkfile.c:1341 +#: glib/gbookmarkfile.c:1284 glib/gbookmarkfile.c:1349 +#: glib/gbookmarkfile.c:1413 glib/gbookmarkfile.c:1423 #, c-format msgid "Unexpected tag “%s”, tag “%s” expected" msgstr "Váratlan címke: „%s” a várt „%s” helyett" -#: glib/gbookmarkfile.c:1227 glib/gbookmarkfile.c:1241 -#: glib/gbookmarkfile.c:1309 glib/gbookmarkfile.c:1355 +#: glib/gbookmarkfile.c:1309 glib/gbookmarkfile.c:1323 +#: glib/gbookmarkfile.c:1391 glib/gbookmarkfile.c:1437 #, c-format msgid "Unexpected tag “%s” inside “%s”" msgstr "Váratlan címke: „%s” a következőn belül: „%s”" -#: glib/gbookmarkfile.c:1635 +#: glib/gbookmarkfile.c:1717 #, c-format msgid "Invalid date/time ‘%s’ in bookmark file" msgstr "Érvénytelen „%s” dátum vagy idő a könyvjelzőfájlban" -#: glib/gbookmarkfile.c:1838 +#: glib/gbookmarkfile.c:1956 msgid "No valid bookmark file found in data dirs" msgstr "Az adatkönyvtárakban nem található érvényes könyvjelzőfájl" -#: glib/gbookmarkfile.c:2039 +#: glib/gbookmarkfile.c:2157 #, c-format msgid "A bookmark for URI “%s” already exists" msgstr "Már létezik könyvjelző a következő URI címhez: „%s”" -#: glib/gbookmarkfile.c:2088 glib/gbookmarkfile.c:2246 -#: glib/gbookmarkfile.c:2331 glib/gbookmarkfile.c:2411 -#: glib/gbookmarkfile.c:2496 glib/gbookmarkfile.c:2630 -#: glib/gbookmarkfile.c:2763 glib/gbookmarkfile.c:2898 -#: glib/gbookmarkfile.c:2940 glib/gbookmarkfile.c:3037 -#: glib/gbookmarkfile.c:3158 glib/gbookmarkfile.c:3352 -#: glib/gbookmarkfile.c:3493 glib/gbookmarkfile.c:3712 -#: glib/gbookmarkfile.c:3801 glib/gbookmarkfile.c:3890 -#: glib/gbookmarkfile.c:4009 +#: glib/gbookmarkfile.c:2206 glib/gbookmarkfile.c:2364 +#: glib/gbookmarkfile.c:2449 glib/gbookmarkfile.c:2529 +#: glib/gbookmarkfile.c:2614 glib/gbookmarkfile.c:2748 +#: glib/gbookmarkfile.c:2881 glib/gbookmarkfile.c:3016 +#: glib/gbookmarkfile.c:3058 glib/gbookmarkfile.c:3155 +#: glib/gbookmarkfile.c:3276 glib/gbookmarkfile.c:3470 +#: glib/gbookmarkfile.c:3611 glib/gbookmarkfile.c:3830 +#: glib/gbookmarkfile.c:3919 glib/gbookmarkfile.c:4008 +#: glib/gbookmarkfile.c:4127 #, c-format msgid "No bookmark found for URI “%s”" msgstr "Nem található könyvjelző a következő URI címhez: „%s”" -#: glib/gbookmarkfile.c:2420 +#: glib/gbookmarkfile.c:2538 #, c-format msgid "No MIME type defined in the bookmark for URI “%s”" msgstr "Nincs MIME típus meghatározva a következő URI könyvjelzőjéhez: „%s”" -#: glib/gbookmarkfile.c:2505 +#: glib/gbookmarkfile.c:2623 #, c-format msgid "No private flag has been defined in bookmark for URI “%s”" msgstr "Nincs magán jelző meghatározva a következő URI könyvjelzőjéhez: „%s”" -#: glib/gbookmarkfile.c:3046 +#: glib/gbookmarkfile.c:3164 #, c-format msgid "No groups set in bookmark for URI “%s”" msgstr "Nincsenek csoportok beállítva a következő URI könyvjelzőjéhez: „%s”" # FIXME: hol jön ez elő? -#: glib/gbookmarkfile.c:3514 glib/gbookmarkfile.c:3722 +#: glib/gbookmarkfile.c:3632 glib/gbookmarkfile.c:3840 #, c-format msgid "No application with name “%s” registered a bookmark for “%s”" msgstr "" "Nincs „%s” nevű alkalmazás regisztrálva a következő könyvjelzőjéhez: „%s”" -#: glib/gbookmarkfile.c:3745 +#: glib/gbookmarkfile.c:3863 #, c-format msgid "Failed to expand exec line “%s” with URI “%s”" msgstr "" @@ -5031,82 +5037,82 @@ msgid "Error opening directory “%s”: %s" msgstr "Hiba a(z) „%s” könyvtár megnyitásakor: %s" -#: glib/gfileutils.c:735 glib/gfileutils.c:827 +#: glib/gfileutils.c:753 glib/gfileutils.c:845 #, c-format msgid "Could not allocate %lu byte to read file “%s”" msgid_plural "Could not allocate %lu bytes to read file “%s”" msgstr0 "Nem sikerült %lu bájtot lefoglalni a(z) „%s” fájl olvasásához" msgstr1 "Nem sikerült %lu bájtot lefoglalni a(z) „%s” fájl olvasásához" -#: glib/gfileutils.c:752 +#: glib/gfileutils.c:770 #, c-format msgid "Error reading file “%s”: %s" msgstr "Hiba a(z) „%s” fájl olvasásakor: %s" -#: glib/gfileutils.c:788 +#: glib/gfileutils.c:806 #, c-format msgid "File “%s” is too large" msgstr "A fájl („%s”) túl nagy" -#: glib/gfileutils.c:852 +#: glib/gfileutils.c:870 #, c-format msgid "Failed to read from file “%s”: %s" msgstr "Nem sikerült olvasni a(z) „%s” fájlból: %s" -#: glib/gfileutils.c:902 glib/gfileutils.c:977 glib/gfileutils.c:1449 +#: glib/gfileutils.c:920 glib/gfileutils.c:995 glib/gfileutils.c:1472 #, c-format msgid "Failed to open file “%s”: %s" msgstr "Nem sikerült megnyitni a(z) „%s” fájlt: %s" -#: glib/gfileutils.c:915 +#: glib/gfileutils.c:933 #, c-format msgid "Failed to get attributes of file “%s”: fstat() failed: %s" msgstr "" "Nem sikerült lekérni a(z) „%s” fájl attribútumait. Az fstat() sikertelen: %s" -#: glib/gfileutils.c:946 +#: glib/gfileutils.c:964 #, c-format msgid "Failed to open file “%s”: fdopen() failed: %s" msgstr "Nem sikerült megnyitni a(z) „%s” fájlt. Az fdopen() sikertelen: %s" -#: glib/gfileutils.c:1047 +#: glib/gfileutils.c:1065 #, c-format msgid "Failed to rename file “%s” to “%s”: g_rename() failed: %s" msgstr "" "Nem sikerült átnevezni a(z) „%s” fájlt erre: „%s”. A g_rename() sikertelen: " "%s" -#: glib/gfileutils.c:1156 +#: glib/gfileutils.c:1179 #, c-format msgid "Failed to write file “%s”: write() failed: %s" msgstr "Nem sikerült írni a(z) „%s” fájlt: a write() sikertelen: %s" -#: glib/gfileutils.c:1177 +#: glib/gfileutils.c:1200 #, c-format msgid "Failed to write file “%s”: fsync() failed: %s" msgstr "Nem sikerült írni a(z) „%s” fájlt: az fsync() sikertelen: %s" -#: glib/gfileutils.c:1338 glib/gfileutils.c:1753 +#: glib/gfileutils.c:1361 glib/gfileutils.c:1776 #, c-format msgid "Failed to create file “%s”: %s" msgstr "Nem sikerült létrehozni a(z) „%s” fájlt: %s" -#: glib/gfileutils.c:1383 +#: glib/gfileutils.c:1406 #, c-format msgid "Existing file “%s” could not be removed: g_unlink() failed: %s" msgstr "A létező „%s” fájl nem távolítható el: a g_unlink() sikertelen: %s" -#: glib/gfileutils.c:1718 +#: glib/gfileutils.c:1741 #, c-format msgid "Template “%s” invalid, should not contain a “%s”" msgstr "A(z) „%s” sablon érvénytelen, „%s” nem lehet benne" -#: glib/gfileutils.c:1731 +#: glib/gfileutils.c:1754 #, c-format msgid "Template “%s” doesn’t contain XXXXXX" msgstr "A(z) „%s” sablon nem tartalmaz XXXXXX karaktersorozatot" -#: glib/gfileutils.c:2291 glib/gfileutils.c:2320 +#: glib/gfileutils.c:2348 glib/gfileutils.c:2377 #, c-format msgid "Failed to read the symbolic link “%s”: %s" msgstr "Nem sikerült kiolvasni a(z) „%s” szimbolikus linket: %s" @@ -5169,8 +5175,8 @@ msgstr "A kulcsfájl a nem támogatott „%s” kódolást tartalmazza" #: glib/gkeyfile.c:1679 glib/gkeyfile.c:1852 glib/gkeyfile.c:3299 -#: glib/gkeyfile.c:3363 glib/gkeyfile.c:3493 glib/gkeyfile.c:3625 -#: glib/gkeyfile.c:3771 glib/gkeyfile.c:4006 glib/gkeyfile.c:4073 +#: glib/gkeyfile.c:3363 glib/gkeyfile.c:3493 glib/gkeyfile.c:3622 +#: glib/gkeyfile.c:3768 glib/gkeyfile.c:4003 glib/gkeyfile.c:4070 #, c-format msgid "Key file does not have group “%s”" msgstr "A kulcsfájlból hiányzik a(z) „%s” csoport" @@ -5210,31 +5216,31 @@ "A(z) „%s” kulcs a(z) „%s” csoportban „%s” értékkel rendelkezik a várt %s " "helyett" -#: glib/gkeyfile.c:4326 +#: glib/gkeyfile.c:4323 msgid "Key file contains escape character at end of line" msgstr "A kulcsfájl escape sorozattal megadott karaktert tartalmaz a sor végén" -#: glib/gkeyfile.c:4348 +#: glib/gkeyfile.c:4345 #, c-format msgid "Key file contains invalid escape sequence “%s”" msgstr "A kulcsfájl érvénytelen escape sorozatot tartalmaz („%s”)" -#: glib/gkeyfile.c:4493 +#: glib/gkeyfile.c:4490 #, c-format msgid "Value “%s” cannot be interpreted as a number." msgstr "A(z) „%s” érték nem értelmezhető számként." -#: glib/gkeyfile.c:4507 +#: glib/gkeyfile.c:4504 #, c-format msgid "Integer value “%s” out of range" msgstr "A(z) „%s” egész érték a tartományon kívülre esik" -#: glib/gkeyfile.c:4540 +#: glib/gkeyfile.c:4537 #, c-format msgid "Value “%s” cannot be interpreted as a float number." msgstr "A(z) „%s” érték nem értelmezhető lebegőpontos számként." -#: glib/gkeyfile.c:4579 +#: glib/gkeyfile.c:4576 #, c-format msgid "Value “%s” cannot be interpreted as a boolean." msgstr "A(z) „%s” érték nem értelmezhető logikai értékként." @@ -5256,32 +5262,32 @@ msgid "Failed to open file “%s”: open() failed: %s" msgstr "Nem sikerült megnyitni a(z) „%s” fájlt: az open() sikertelen: %s" -#: glib/gmarkup.c:400 glib/gmarkup.c:442 +#: glib/gmarkup.c:393 glib/gmarkup.c:435 #, c-format msgid "Error on line %d char %d: " msgstr "Hiba a(z) %d. sor %d. karakterénél: " -#: glib/gmarkup.c:464 glib/gmarkup.c:547 +#: glib/gmarkup.c:457 glib/gmarkup.c:540 #, c-format msgid "Invalid UTF-8 encoded text in name — not valid “%s”" msgstr "Érvénytelen UTF-8 kódolású szöveg a névben - nem érvényes „%s”" -#: glib/gmarkup.c:475 +#: glib/gmarkup.c:468 #, c-format msgid "“%s” is not a valid name" msgstr "A(z) „%s” nem érvényes név" -#: glib/gmarkup.c:491 +#: glib/gmarkup.c:484 #, c-format msgid "“%s” is not a valid name: “%c”" msgstr "A(z) „%s” nem érvényes név: „%c”" -#: glib/gmarkup.c:615 +#: glib/gmarkup.c:608 #, c-format msgid "Error on line %d: %s" msgstr "Hiba a(z) %d. sorban: %s" -#: glib/gmarkup.c:692 +#: glib/gmarkup.c:685 #, c-format msgid "" "Failed to parse “%-.*s”, which should have been a digit inside a character " @@ -5290,7 +5296,7 @@ "Nem sikerült feldolgozni ezt: „%-.*s”. Valószínűleg számjegy lett volna egy " "karakterhivatkozáson (mint az ê) belül - lehet, hogy túl nagy a számjegy" -#: glib/gmarkup.c:704 +#: glib/gmarkup.c:697 msgid "" "Character reference did not end with a semicolon; most likely you used an " "ampersand character without intending to start an entity — escape ampersand " @@ -5299,23 +5305,23 @@ "A karakterhivatkozás nem pontosvesszővel ért véget; valószínűleg egy &-jelet " "használt anélkül, hogy entitást akart volna kezdeni - írja & formában." -#: glib/gmarkup.c:730 +#: glib/gmarkup.c:723 #, c-format msgid "Character reference “%-.*s” does not encode a permitted character" msgstr "A(z) „%-.*s” karakterhivatkozás nem engedélyezett karaktert kódol" -#: glib/gmarkup.c:768 +#: glib/gmarkup.c:761 msgid "" "Empty entity “&;” seen; valid entities are: & " < > '" msgstr "" "Üres „&;” entitás; az érvényes entitások: & " < > '" -#: glib/gmarkup.c:776 +#: glib/gmarkup.c:769 #, c-format msgid "Entity name “%-.*s” is not known" msgstr "A(z) „%-.*s” entitásnév ismeretlen" -#: glib/gmarkup.c:781 +#: glib/gmarkup.c:774 msgid "" "Entity did not end with a semicolon; most likely you used an ampersand " "character without intending to start an entity — escape ampersand as &" @@ -5323,11 +5329,11 @@ "Az entitás neve nem pontosvesszővel ért véget; valószínűleg egy &-jelet " "használt anélkül, hogy entitást akart volna kezdeni - írja & formában." -#: glib/gmarkup.c:1195 +#: glib/gmarkup.c:1188 msgid "Document must begin with an element (e.g. <book>)" msgstr "A dokumentumnak egy elemmel kell kezdődnie (például: <book>)" -#: glib/gmarkup.c:1235 +#: glib/gmarkup.c:1228 #, c-format msgid "" "“%s” is not a valid character following a “<” character; it may not begin an " @@ -5336,7 +5342,7 @@ "A(z) „%s” nem érvényes karakter a „<” karakter után; elem neve nem kezdődhet " "vele" -#: glib/gmarkup.c:1278 +#: glib/gmarkup.c:1271 #, c-format msgid "" "Odd character “%s”, expected a “>” character to end the empty-element tag " @@ -5345,12 +5351,12 @@ "Furcsa karakter („%s”), „>” karakternek kellett volna jönnie, hogy lezárja " "a(z) „%s” üres elemcímkét" -#: glib/gmarkup.c:1348 +#: glib/gmarkup.c:1341 #, c-format msgid "Too many attributes in element “%s”" msgstr "Túl sok attribútum a(z) „%s” elemben" -#: glib/gmarkup.c:1368 +#: glib/gmarkup.c:1361 #, c-format msgid "" "Odd character “%s”, expected a “=” after attribute name “%s” of element “%s”" @@ -5358,7 +5364,7 @@ "Furcsa karakter („%s”), „=” karakternek kellett volna jönnie a(z) „%s” elem " "„%s” attribútumneve után" -#: glib/gmarkup.c:1410 +#: glib/gmarkup.c:1403 #, c-format msgid "" "Odd character “%s”, expected a “>” or “/” character to end the start tag of " @@ -5369,7 +5375,7 @@ "„%s” elem kezdő címkéje után, esetleg egy attribútumnak; lehet, hogy " "érvénytelen karaktert használt az attribútum nevében" -#: glib/gmarkup.c:1455 +#: glib/gmarkup.c:1448 #, c-format msgid "" "Odd character “%s”, expected an open quote mark after the equals sign when " @@ -5378,7 +5384,7 @@ "Furcsa karakter („%s”), egy nyitó idézőjelnek kellene jönnie az " "egyenlőségjel után, ha értéket ad a(z) „%s” attribútumnak „%s” elemben" -#: glib/gmarkup.c:1589 +#: glib/gmarkup.c:1582 #, c-format msgid "" "“%s” is not a valid character following the characters “</”; “%s” may not " @@ -5387,7 +5393,7 @@ "A(z) „%s” nem érvényes karakter a „</” karakterek után; „%s” karakterrel nem " "kezdődhet egy elem neve" -#: glib/gmarkup.c:1627 +#: glib/gmarkup.c:1620 #, c-format msgid "" "“%s” is not a valid character following the close element name “%s”; the " @@ -5396,26 +5402,26 @@ "A(z) „%s” nem érvényes karakter a(z) „%s” lezáró elemnév után; az " "engedélyezett karakter egyedül a „>”." -#: glib/gmarkup.c:1639 +#: glib/gmarkup.c:1632 #, c-format msgid "Element “%s” was closed, no element is currently open" msgstr "A(z) „%s” elem le lett lezárva, jelenleg egy elem sincs nyitva" -#: glib/gmarkup.c:1648 +#: glib/gmarkup.c:1641 #, c-format msgid "Element “%s” was closed, but the currently open element is “%s”" msgstr "A(z) „%s” elem le lett lezárva, de a jelenleg nyitott elem a(z) „%s”" -#: glib/gmarkup.c:1801 +#: glib/gmarkup.c:1794 msgid "Document was empty or contained only whitespace" msgstr "A dokumentum üres volt, vagy csak üres hely karaktereket tartalmazott" -#: glib/gmarkup.c:1815 +#: glib/gmarkup.c:1808 msgid "Document ended unexpectedly just after an open angle bracket “<”" msgstr "" "A dokumentum váratlanul véget ért egy nyitott hegyes zárójel („<”) után" -#: glib/gmarkup.c:1823 glib/gmarkup.c:1868 +#: glib/gmarkup.c:1816 glib/gmarkup.c:1861 #, c-format msgid "" "Document ended unexpectedly with elements still open — “%s” was the last " @@ -5424,7 +5430,7 @@ "A dokumentum váratlanul véget ért, pedig még nyitva vannak elemek - „%s” az " "utoljára megnyitott elem" -#: glib/gmarkup.c:1831 +#: glib/gmarkup.c:1824 #, c-format msgid "" "Document ended unexpectedly, expected to see a close angle bracket ending " @@ -5433,19 +5439,19 @@ "A dokumentum váratlanul véget ért; a(z) <%s/> elemet lezáró hegyes " "zárójelnek kellett volna következnie" -#: glib/gmarkup.c:1837 +#: glib/gmarkup.c:1830 msgid "Document ended unexpectedly inside an element name" msgstr "A dokumentum váratlanul véget ért egy elemnéven belül" -#: glib/gmarkup.c:1843 +#: glib/gmarkup.c:1836 msgid "Document ended unexpectedly inside an attribute name" msgstr "A dokumentum váratlanul véget ért egy attribútumnéven belül" -#: glib/gmarkup.c:1848 +#: glib/gmarkup.c:1841 msgid "Document ended unexpectedly inside an element-opening tag." msgstr "A dokumentum váratlanul véget ért egy elemnyitó címkén belül" -#: glib/gmarkup.c:1854 +#: glib/gmarkup.c:1847 msgid "" "Document ended unexpectedly after the equals sign following an attribute " "name; no attribute value" @@ -5453,22 +5459,22 @@ "A dokumentum váratlanul véget ért egy az attribútumnevet követő " "egyenlőségjel után; az attribútum értéke nem lett megadva" -#: glib/gmarkup.c:1861 +#: glib/gmarkup.c:1854 msgid "Document ended unexpectedly while inside an attribute value" msgstr "A dokumentum váratlanul véget ért egy attribútumértéken belül" -#: glib/gmarkup.c:1878 +#: glib/gmarkup.c:1871 #, c-format msgid "Document ended unexpectedly inside the close tag for element “%s”" msgstr "A dokumentum váratlanul véget ért a(z) „%s” elem lezáró címkéjén belül" -#: glib/gmarkup.c:1882 +#: glib/gmarkup.c:1875 msgid "" "Document ended unexpectedly inside the close tag for an unopened element" msgstr "" "A dokumentum váratlanul véget ért egy nem nyitott elem lezáró címkéjén belül" -#: glib/gmarkup.c:1888 +#: glib/gmarkup.c:1881 msgid "Document ended unexpectedly inside a comment or processing instruction" msgstr "" "A dokumentum váratlanul véget ért egy megjegyzésen vagy feldolgozási " @@ -5535,187 +5541,187 @@ msgid "Unknown option %s" msgstr "Ismeretlen kapcsoló: %s" -#: glib/gregex.c:436 +#: glib/gregex.c:479 msgid "corrupted object" msgstr "sérült objektum" -#: glib/gregex.c:438 +#: glib/gregex.c:481 msgid "out of memory" msgstr "elfogyott a memória" -#: glib/gregex.c:443 +#: glib/gregex.c:487 msgid "backtracking limit reached" msgstr "a visszakövetési korlát elérve" -#: glib/gregex.c:454 glib/gregex.c:707 glib/gregex.c:736 +#: glib/gregex.c:498 msgid "internal error" msgstr "belső hiba" -#: glib/gregex.c:456 +#: glib/gregex.c:500 msgid "the pattern contains items not supported for partial matching" msgstr "" "a minta a részleges mintaillesztés esetén nem támogatott elemeket tartalmaz" -#: glib/gregex.c:458 +#: glib/gregex.c:502 msgid "back references as conditions are not supported for partial matching" msgstr "" "a visszahivatkozások használata feltételekként nem támogatott a részleges " "mintaillesztéshez" -#: glib/gregex.c:464 +#: glib/gregex.c:508 msgid "recursion limit reached" msgstr "az ismétlési korlát elérve" -#: glib/gregex.c:466 +#: glib/gregex.c:510 msgid "bad offset" msgstr "hibás eltolás" -#: glib/gregex.c:468 +#: glib/gregex.c:512 msgid "recursion loop" msgstr "rekurzív ciklus" #. should not happen in GRegex since we check modes before each match -#: glib/gregex.c:471 +#: glib/gregex.c:515 msgid "matching mode is requested that was not compiled for JIT" msgstr "illesztési mód lett kérve, amely nem lett lefordítva a JIT-hez" -#: glib/gregex.c:475 +#: glib/gregex.c:536 glib/gregex.c:1838 msgid "unknown error" msgstr "ismeretlen hiba" -#: glib/gregex.c:496 +#: glib/gregex.c:557 msgid "\\ at end of pattern" msgstr "\\ a minta végén" -#: glib/gregex.c:500 +#: glib/gregex.c:561 msgid "\\c at end of pattern" msgstr "\\c a minta végén" -#: glib/gregex.c:505 +#: glib/gregex.c:566 msgid "unrecognized character following \\" msgstr "ismeretlen karakter következik a \\ után" -#: glib/gregex.c:509 +#: glib/gregex.c:570 msgid "numbers out of order in {} quantifier" msgstr "a számok nincsenek sorrendben a {} kvantálóban" -#: glib/gregex.c:513 +#: glib/gregex.c:574 msgid "number too big in {} quantifier" msgstr "a szám túl nagy a a {} kvantálóban" -#: glib/gregex.c:517 +#: glib/gregex.c:578 msgid "missing terminating for character class" msgstr "a karakterosztály befejező jele hiányzik" -#: glib/gregex.c:521 +#: glib/gregex.c:582 msgid "invalid escape sequence in character class" msgstr "érvénytelen escape-sorozat a karakterosztályban" -#: glib/gregex.c:525 +#: glib/gregex.c:586 msgid "range out of order in character class" msgstr "a tartomány kívül esik a karakterosztály nagyságán" -#: glib/gregex.c:530 +#: glib/gregex.c:591 msgid "nothing to repeat" msgstr "nincs mit ismételni" -#: glib/gregex.c:534 +#: glib/gregex.c:595 msgid "unrecognized character after (? or (?-" msgstr "ismeretlen karakter a (? vagy (?- után" -#: glib/gregex.c:538 +#: glib/gregex.c:599 msgid "POSIX named classes are supported only within a class" msgstr "a POSIX elnevezett osztályok csak osztályon belül támogatottak" -#: glib/gregex.c:542 +#: glib/gregex.c:603 msgid "POSIX collating elements are not supported" msgstr "a POSIX leválogató elemek nem támogatottak" -#: glib/gregex.c:548 +#: glib/gregex.c:609 msgid "missing terminating )" msgstr "hiányzó befejező )" -#: glib/gregex.c:552 +#: glib/gregex.c:613 msgid "reference to non-existent subpattern" msgstr "hivatkozás nem létező almintára" -#: glib/gregex.c:556 +#: glib/gregex.c:617 msgid "missing ) after comment" msgstr "a megjegyzés utáni ) hiányzik" -#: glib/gregex.c:560 +#: glib/gregex.c:621 msgid "regular expression is too large" msgstr "a reguláris kifejezés túl nagy" -#: glib/gregex.c:564 +#: glib/gregex.c:625 msgid "malformed number or name after (?(" msgstr "hibásan formázott szám vagy név a (?( után" -#: glib/gregex.c:568 +#: glib/gregex.c:629 msgid "lookbehind assertion is not fixed length" msgstr "a lookbehind kijelentés nem rögzített hosszúságú" -#: glib/gregex.c:572 +#: glib/gregex.c:633 msgid "conditional group contains more than two branches" msgstr "a feltételes csoport kettőnél több ágat tartalmaz" -#: glib/gregex.c:576 +#: glib/gregex.c:637 msgid "assertion expected after (?(" msgstr "a (?( után kijelentésnek kellene állnia" -#: glib/gregex.c:580 +#: glib/gregex.c:641 msgid "a numbered reference must not be zero" msgstr "számozott hivatkozás nem lehet nulla" -#: glib/gregex.c:584 +#: glib/gregex.c:645 msgid "unknown POSIX class name" msgstr "ismeretlen POSIX osztálynév" -#: glib/gregex.c:589 +#: glib/gregex.c:650 msgid "character value in \\x{...} sequence is too large" msgstr "a \\x{...} sorozaton belüli karakterérték túl nagy" -#: glib/gregex.c:593 +#: glib/gregex.c:654 msgid "\\C not allowed in lookbehind assertion" msgstr "A \\C nem engedélyezett a lookbehind kijelentésben" -#: glib/gregex.c:597 +#: glib/gregex.c:658 msgid "missing terminator in subpattern name" msgstr "hiányzó befejező az alminta nevében" -#: glib/gregex.c:601 +#: glib/gregex.c:662 msgid "two named subpatterns have the same name" msgstr "két elnevezett alminta neve azonos" -#: glib/gregex.c:605 +#: glib/gregex.c:666 msgid "malformed \\P or \\p sequence" msgstr "rosszul formázott \\P vagy \\p sorozat" -#: glib/gregex.c:609 +#: glib/gregex.c:670 msgid "unknown property name after \\P or \\p" msgstr "ismeretlen tulajdonságnév a \\P vagy \\p után" -#: glib/gregex.c:613 +#: glib/gregex.c:674 msgid "subpattern name is too long (maximum 32 characters)" msgstr "az alminta neve túl hosszú (legfeljebb 32 karakter)" -#: glib/gregex.c:617 +#: glib/gregex.c:678 msgid "too many named subpatterns (maximum 10,000)" msgstr "túl sok elnevezett alminta (legfeljebb 10 000)" -#: glib/gregex.c:621 +#: glib/gregex.c:682 msgid "octal value is greater than \\377" msgstr "az oktális érték nagyobb, mint \\377" -#: glib/gregex.c:625 +#: glib/gregex.c:686 msgid "DEFINE group contains more than one branch" msgstr "a DEFINE csoport több ágat tartalmaz" -#: glib/gregex.c:629 +#: glib/gregex.c:690 msgid "inconsistent NEWLINE options" msgstr "inkonzisztens NEWLINE beállítások" -#: glib/gregex.c:633 +#: glib/gregex.c:694 msgid "" "\\g is not followed by a braced, angle-bracketed, or quoted name or number, " "or by a plain number" @@ -5723,121 +5729,120 @@ "a \\g után nem egy (szögletes) zárójelezett név, idézőjelezett név vagy szám " "vagy egyszerű szám áll" -#: glib/gregex.c:638 +#: glib/gregex.c:699 msgid "an argument is not allowed for (*ACCEPT), (*FAIL), or (*COMMIT)" msgstr "" "nem engedélyezett argumentum a (*ACCEPT), (*FAIL) vagy (*COMMIT) egyikéhez " "sem" -#: glib/gregex.c:642 +#: glib/gregex.c:703 msgid "(*VERB) not recognized" msgstr "(*VERB) ismeretlen" -#: glib/gregex.c:646 +#: glib/gregex.c:707 msgid "number is too big" msgstr "a szám túl nagy" -#: glib/gregex.c:650 +#: glib/gregex.c:711 msgid "missing subpattern name after (?&" msgstr "hiányzó almintanév a (?& után" -#: glib/gregex.c:654 +#: glib/gregex.c:715 msgid "different names for subpatterns of the same number are not allowed" msgstr "ugyanazon szám almintáihoz nem engedélyezettek különböző nevek" -#: glib/gregex.c:658 +#: glib/gregex.c:719 msgid "(*MARK) must have an argument" msgstr "a (*MARK) után argumentumnak kell állnia" -#: glib/gregex.c:662 +#: glib/gregex.c:723 msgid "\\c must be followed by an ASCII character" msgstr "a \\c után ASCII karakternek kell állnia" -#: glib/gregex.c:666 +#: glib/gregex.c:727 msgid "\\k is not followed by a braced, angle-bracketed, or quoted name" msgstr "a \\k után nem egy (szögletes) zárójelezett vagy idézőjelezett név áll" -#: glib/gregex.c:670 +#: glib/gregex.c:731 msgid "\\N is not supported in a class" msgstr "a \\N nem támogatott osztályban" -#: glib/gregex.c:674 +#: glib/gregex.c:735 msgid "name is too long in (*MARK), (*PRUNE), (*SKIP), or (*THEN)" msgstr "a név túl hosszú a (*MARK), (*PRUNE), (*SKIP) vagy (*THEN) egyikében" -#: glib/gregex.c:678 glib/gregex.c:809 +#: glib/gregex.c:739 glib/gregex.c:875 msgid "code overflow" msgstr "kódtúlcsordulás" -#: glib/gregex.c:682 +#: glib/gregex.c:743 msgid "unrecognized character after (?P" msgstr "ismeretlen karakter a (?P után" -#: glib/gregex.c:686 +#: glib/gregex.c:747 msgid "overran compiling workspace" msgstr "a fordítási munkaterület túlcsordult" -#: glib/gregex.c:690 +#: glib/gregex.c:751 msgid "previously-checked referenced subpattern not found" msgstr "a korábban ellenőrzött hivatkozott alminta nem található" -#: glib/gregex.c:808 glib/gregex.c:1041 glib/gregex.c:2342 +#: glib/gregex.c:874 glib/gregex.c:1121 glib/gregex.c:2444 #, c-format msgid "Error while matching regular expression %s: %s" msgstr "Hiba a(z) %s reguláris kifejezés illesztésekor: %s" -#: glib/gregex.c:1618 +#: glib/gregex.c:1721 msgid "PCRE library is compiled without UTF8 support" msgstr "A PRCE programkönyvtár UTF-8 támogatás nélkül lett fordítva" -#: glib/gregex.c:1626 +#: glib/gregex.c:1729 msgid "PCRE library is compiled with incompatible options" msgstr "A PRCE programkönyvtár inkompatibilis beállításokkal lett fordítva" -#: glib/gregex.c:1751 +#: glib/gregex.c:1847 #, c-format -#| msgid "Error while compiling regular expression %s at char %d: %s" msgid "Error while compiling regular expression ‘%s’ at char %s: %s" msgstr "" "Hiba a(z) „%s” reguláris kifejezés fordításakor a(z) %s karakternél: %s" -#: glib/gregex.c:2786 +#: glib/gregex.c:2887 msgid "hexadecimal digit or “}” expected" msgstr "a program hexadecimális számjegyet vagy „}” jelet várt" -#: glib/gregex.c:2802 +#: glib/gregex.c:2903 msgid "hexadecimal digit expected" msgstr "a program hexadecimális számjegyet várt" -#: glib/gregex.c:2842 +#: glib/gregex.c:2943 msgid "missing “<” in symbolic reference" msgstr "hiányzó „<” jel a szimbolikus hivatkozásban" -#: glib/gregex.c:2851 +#: glib/gregex.c:2952 msgid "unfinished symbolic reference" msgstr "befejezetlen szimbolikus hivatkozás" -#: glib/gregex.c:2858 +#: glib/gregex.c:2959 msgid "zero-length symbolic reference" msgstr "nulla hosszúságú szimbolikus hivatkozás" -#: glib/gregex.c:2869 +#: glib/gregex.c:2970 msgid "digit expected" msgstr "re rendszer számjegyet várt" -#: glib/gregex.c:2887 +#: glib/gregex.c:2988 msgid "illegal symbolic reference" msgstr "illegális szimbolikus hivatkozás" -#: glib/gregex.c:2950 +#: glib/gregex.c:3051 msgid "stray final “\\”" msgstr "a záró „\\” helye nem megfelelő" -#: glib/gregex.c:2954 +#: glib/gregex.c:3055 msgid "unknown escape sequence" msgstr "ismeretlen escape sorozat" -#: glib/gregex.c:2964 +#: glib/gregex.c:3065 #, c-format msgid "Error while parsing replacement text “%s” at char %lu: %s" msgstr "" @@ -5869,96 +5874,102 @@ msgstr "" "A szöveg üres volt (vagy legfeljebb üres hely karaktereket tartalmazott)" -#: glib/gspawn.c:314 +#: glib/gspawn.c:319 #, c-format msgid "Failed to read data from child process (%s)" msgstr "Nem sikerült adatokat olvasni a gyermekfolyamatból (%s)" -#: glib/gspawn.c:466 +#: glib/gspawn.c:471 #, c-format msgid "Unexpected error in reading data from a child process (%s)" msgstr "Váratlan hiba egy gyermekfolyamatból történő adatolvasás közben (%s)" -#: glib/gspawn.c:551 +#: glib/gspawn.c:556 #, c-format msgid "Unexpected error in waitpid() (%s)" msgstr "Váratlan hiba a waitpid()-ben (%s)" -#: glib/gspawn.c:1170 glib/gspawn-win32.c:1488 +#: glib/gspawn.c:1175 glib/gspawn-win32.c:1503 #, c-format msgid "Child process exited with code %ld" msgstr "A gyermekfolyamat a következő kóddal lépett ki: %ld" -#: glib/gspawn.c:1178 +#: glib/gspawn.c:1183 #, c-format msgid "Child process killed by signal %ld" msgstr "A gyermekfolyamat kilőve %ld szignállal" -#: glib/gspawn.c:1185 +#: glib/gspawn.c:1190 #, c-format msgid "Child process stopped by signal %ld" msgstr "A gyermekfolyamat megállítva %ld szignállal" -#: glib/gspawn.c:1192 +#: glib/gspawn.c:1197 #, c-format msgid "Child process exited abnormally" msgstr "A gyermekfolyamat abnormálisan lépett ki" -#: glib/gspawn.c:1885 glib/gspawn-win32.c:393 glib/gspawn-win32.c:401 +#: glib/gspawn.c:2027 glib/gspawn-win32.c:393 glib/gspawn-win32.c:401 #, c-format msgid "Failed to read from child pipe (%s)" msgstr "Nem sikerült olvasni a gyermek csővezetékből (%s)" -#: glib/gspawn.c:2248 +#: glib/gspawn.c:2399 #, c-format msgid "Failed to spawn child process “%s” (%s)" msgstr "Nem sikerült a(z) „%s” gyermekfolyamat végrehajtása (%s)" -#: glib/gspawn.c:2365 +#: glib/gspawn.c:2525 #, c-format msgid "Failed to fork (%s)" msgstr "Nem sikerült folyamatot indítani (%s)" -#: glib/gspawn.c:2525 glib/gspawn-win32.c:424 +#: glib/gspawn.c:2685 glib/gspawn-win32.c:424 #, c-format msgid "Failed to change to directory “%s” (%s)" msgstr "Nem sikerült átváltani a(z) „%s” könyvtárra (%s)" -#: glib/gspawn.c:2535 +#: glib/gspawn.c:2695 #, c-format msgid "Failed to execute child process “%s” (%s)" msgstr "Nem sikerült a gyermekfolyamat („%s”) végrehajtása (%s)" -#: glib/gspawn.c:2545 +#: glib/gspawn.c:2705 #, c-format msgid "Failed to open file to remap file descriptor (%s)" msgstr "Nem sikerült megnyitni a fájlt a fájlleíró ismételt leképezéséhez (%s)" -#: glib/gspawn.c:2553 +#: glib/gspawn.c:2713 #, c-format msgid "Failed to duplicate file descriptor for child process (%s)" msgstr "Nem sikerült kettőzni a gyermekfolyamat fájlleíróját (%s)" -#: glib/gspawn.c:2562 +#: glib/gspawn.c:2722 #, c-format msgid "Failed to fork child process (%s)" msgstr "Nem sikerült a gyermekfolyamat elindítása (%s)" -#: glib/gspawn.c:2570 +#: glib/gspawn.c:2730 #, c-format msgid "Failed to close file descriptor for child process (%s)" msgstr "Nem sikerült lezárni a gyermekfolyamat fájlleíróját (%s)" -#: glib/gspawn.c:2578 +#: glib/gspawn.c:2738 #, c-format msgid "Unknown error executing child process “%s”" msgstr "Ismeretlen hiba a gyermekfolyamat („%s”) végrehajtásakor" -#: glib/gspawn.c:2602 +#: glib/gspawn.c:2762 #, c-format msgid "Failed to read enough data from child pid pipe (%s)" msgstr "Nem sikerült elég adatot kiolvasni a gyermek pid csővezetékből (%s)" +#: glib/gspawn-private.h:134 +#, c-format +#| msgid "Invalid seek request" +msgid "Invalid source FDs argument" +msgstr "Érvénytelen forrás-fájlleírók argumentum" + #: glib/gspawn-win32.c:337 msgid "Failed to read data from child process" msgstr "Nem sikerült adatokat kiolvasni a gyermekfolyamatból" @@ -5978,27 +5989,27 @@ msgid "Invalid program name: %s" msgstr "Érvénytelen programnév: %s" -#: glib/gspawn-win32.c:521 glib/gspawn-win32.c:853 +#: glib/gspawn-win32.c:521 glib/gspawn-win32.c:868 #, c-format msgid "Invalid string in argument vector at %d: %s" msgstr "Érvénytelen karaktersorozat a paraméterben a következő helyen: %d: %s" -#: glib/gspawn-win32.c:532 glib/gspawn-win32.c:869 +#: glib/gspawn-win32.c:532 glib/gspawn-win32.c:884 #, c-format msgid "Invalid string in environment: %s" msgstr "Érvénytelen karaktersorozat a környezetben: %s" -#: glib/gspawn-win32.c:849 +#: glib/gspawn-win32.c:864 #, c-format msgid "Invalid working directory: %s" msgstr "Érvénytelen munkakönyvtár: %s" -#: glib/gspawn-win32.c:914 +#: glib/gspawn-win32.c:929 #, c-format msgid "Failed to execute helper program (%s)" msgstr "Nem sikerült végrehajtani a segítő programot (%s)" -#: glib/gspawn-win32.c:1143 +#: glib/gspawn-win32.c:1158 msgid "" "Unexpected error in g_io_channel_win32_poll() reading data from a child " "process" @@ -6006,21 +6017,21 @@ "Váratlan hiba, miközben a g_io_channel_win32_poll() adatokat olvasott egy " "gyermekfolyamatból" -#: glib/gstrfuncs.c:3366 glib/gstrfuncs.c:3468 +#: glib/gstrfuncs.c:3370 glib/gstrfuncs.c:3472 msgid "Empty string is not a number" msgstr "Az üres karakterlánc nem szám" -#: glib/gstrfuncs.c:3390 +#: glib/gstrfuncs.c:3394 #, c-format msgid "“%s” is not a signed number" msgstr "„%s” nem érvényes név" -#: glib/gstrfuncs.c:3400 glib/gstrfuncs.c:3504 +#: glib/gstrfuncs.c:3404 glib/gstrfuncs.c:3508 #, c-format msgid "Number “%s” is out of bounds %s, %s" msgstr "A(z) „%s” a(z) %s, %s intervallumon kívül esik." -#: glib/gstrfuncs.c:3494 +#: glib/gstrfuncs.c:3498 #, c-format msgid "“%s” is not an unsigned number" msgstr "„%s” nem érvényes név" @@ -6099,136 +6110,132 @@ msgstr "A karakter az UTF-16 tartományon kívülre esik" #. Translators: A unit symbol for size formatting, showing for example: "13.0 kB" -#: glib/gutils.c:2857 +#: glib/gutils.c:2966 msgid "kB" msgstr "kB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 MB" -#: glib/gutils.c:2859 +#: glib/gutils.c:2968 msgid "MB" msgstr "MB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 GB" -#: glib/gutils.c:2861 +#: glib/gutils.c:2970 msgid "GB" msgstr "GB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 TB" -#: glib/gutils.c:2863 +#: glib/gutils.c:2972 msgid "TB" msgstr "TB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 PB" -#: glib/gutils.c:2865 +#: glib/gutils.c:2974 msgid "PB" msgstr "PB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 EB" -#: glib/gutils.c:2867 +#: glib/gutils.c:2976 msgid "EB" msgstr "EB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 KiB" -#: glib/gutils.c:2871 +#: glib/gutils.c:2980 msgid "KiB" msgstr "KiB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 MiB" -#: glib/gutils.c:2873 +#: glib/gutils.c:2982 msgid "MiB" msgstr "MiB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 GiB" -#: glib/gutils.c:2875 +#: glib/gutils.c:2984 msgid "GiB" msgstr "GiB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 TiB" -#: glib/gutils.c:2877 +#: glib/gutils.c:2986 msgid "TiB" msgstr "TiB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 PiB" -#: glib/gutils.c:2879 +#: glib/gutils.c:2988 msgid "PiB" msgstr "PiB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 EiB" -#: glib/gutils.c:2881 +#: glib/gutils.c:2990 msgid "EiB" msgstr "EiB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 kb" -#: glib/gutils.c:2885 +#: glib/gutils.c:2994 msgid "kb" msgstr "kb" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Mb" -#: glib/gutils.c:2887 +#: glib/gutils.c:2996 msgid "Mb" msgstr "Mb" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Gb" -#: glib/gutils.c:2889 +#: glib/gutils.c:2998 msgid "Gb" msgstr "Gb" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Tb" -#: glib/gutils.c:2891 +#: glib/gutils.c:3000 msgid "Tb" msgstr "Tb" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Pb" -#: glib/gutils.c:2893 +#: glib/gutils.c:3002 msgid "Pb" msgstr "Pb" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Eb" -#: glib/gutils.c:2895 +#: glib/gutils.c:3004 msgid "Eb" msgstr "Eb" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Kib" -#: glib/gutils.c:2899 +#: glib/gutils.c:3008 msgid "Kib" msgstr "Kib" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Mib" -#: glib/gutils.c:2901 +#: glib/gutils.c:3010 msgid "Mib" msgstr "Mib" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Gib" -#: glib/gutils.c:2903 +#: glib/gutils.c:3012 msgid "Gib" msgstr "Gib" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Tib" -#: glib/gutils.c:2905 +#: glib/gutils.c:3014 msgid "Tib" msgstr "Tib" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Pib" -#: glib/gutils.c:2907 +#: glib/gutils.c:3016 msgid "Pib" msgstr "Pib" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Eib" -#: glib/gutils.c:2909 +#: glib/gutils.c:3018 msgid "Eib" msgstr "Eib" -#: glib/gutils.c:2947 -#| msgid "%u byte" -#| msgid_plural "%u bytes" +#: glib/gutils.c:3056 msgid "byte" msgid_plural "bytes" msgstr0 "bájt" msgstr1 "bájt" -#: glib/gutils.c:2951 -#| msgid "%u bit" -#| msgid_plural "%u bits" +#: glib/gutils.c:3060 msgid "bit" msgid_plural "bits" msgstr0 "bit" @@ -6236,7 +6243,7 @@ #. Translators: The "%u" is replaced with the size value, like "13"; it could #. * be part of "13 bytes", but only the number is requested this time. -#: glib/gutils.c:2959 +#: glib/gutils.c:3068 #, c-format msgctxt "format-size" msgid "%u" @@ -6244,7 +6251,7 @@ #. Translators: The first "%u" is replaced with the value, the "%s" with a unit of the value. #. * The order can be changed with "%$2s %$1u". An example: "13 bytes" -#: glib/gutils.c:2964 +#: glib/gutils.c:3073 #, c-format msgctxt "format-size" msgid "%u %s" @@ -6252,9 +6259,8 @@ #. Translators: The "%.1f" is replaced with the size value, like "13.0"; it could #. * be part of "13.0 MB", but only the number is requested this time. -#: glib/gutils.c:3000 +#: glib/gutils.c:3109 #, c-format -#| msgid "%.1f KB" msgctxt "format-size" msgid "%.1f" msgstr "%.1f" @@ -6262,15 +6268,14 @@ #. Translators: The first "%.1f" is replaced with the value, the "%s" with a unit of the value. #. * The order can be changed with "%$2s %$1.1f". Keep the no-break space between the value and #. * the unit symbol. An example: "13.0 MB" -#: glib/gutils.c:3006 +#: glib/gutils.c:3115 #, c-format -#| msgid "%.1f kB" msgctxt "format-size" msgid "%.1f %s" msgstr "%.1f %s" #. Translators: the %s in "%s bytes" will always be replaced by a number. -#: glib/gutils.c:3046 +#: glib/gutils.c:3155 #, c-format msgid "%s byte" msgid_plural "%s bytes" @@ -6278,14 +6283,14 @@ msgstr1 "%s bájt" #. Translators: the %s in "%s bits" will always be replaced by a number. -#: glib/gutils.c:3051 +#: glib/gutils.c:3160 #, c-format msgid "%s bit" msgid_plural "%s bits" msgstr0 "%s bit" msgstr1 "%s bit" -#: glib/gutils.c:3092 +#: glib/gutils.c:3201 #, c-format msgid "%u byte" msgid_plural "%u bytes" @@ -6297,32 +6302,32 @@ #. * compatibility. Users will not see this string unless a program is using this deprecated function. #. * Please translate as literally as possible. #. -#: glib/gutils.c:3105 +#: glib/gutils.c:3214 #, c-format msgid "%.1f KB" msgstr "%.1f KB" -#: glib/gutils.c:3110 +#: glib/gutils.c:3219 #, c-format msgid "%.1f MB" msgstr "%.1f MB" -#: glib/gutils.c:3115 +#: glib/gutils.c:3224 #, c-format msgid "%.1f GB" msgstr "%.1f GB" -#: glib/gutils.c:3120 +#: glib/gutils.c:3229 #, c-format msgid "%.1f TB" msgstr "%.1f TB" -#: glib/gutils.c:3125 +#: glib/gutils.c:3234 #, c-format msgid "%.1f PB" msgstr "%.1f PB" -#: glib/gutils.c:3130 +#: glib/gutils.c:3239 #, c-format msgid "%.1f EB" msgstr "%.1f EB"
View file
_service:tar_scm:glib-2.74.4.tar.xz/po/id.po -> _service:tar_scm:glib-2.76.4.tar.xz/po/id.po
Changed
@@ -5,13 +5,13 @@ # Mohammad DAMT <mdamt@bisnisweb.com>, 2005. # Dirgita <dirgitadevina@yahoo.co.id>, 2010, 2012. # Andika Triwidada <andika@gmail.com>, 2010-2013, 2015, 2018, 2022. -# Kukuh Syafaat <kukuhsyafaat@gnome.org>, 2017-2022. +# Kukuh Syafaat <kukuhsyafaat@gnome.org>, 2017-2023. msgid "" msgstr "" "Project-Id-Version: glib main\n" "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/glib/issues\n" -"POT-Creation-Date: 2022-08-15 20:23+0000\n" -"PO-Revision-Date: 2022-08-26 09:12+0700\n" +"POT-Creation-Date: 2023-02-15 16:30+0000\n" +"PO-Revision-Date: 2023-02-16 10:29+0700\n" "Last-Translator: Kukuh Syafaat <kukuhsyafaat@gnome.org>\n" "Language-Team: Indonesian <gnome@i15n.org>\n" "Language: id\n" @@ -19,23 +19,23 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Poedit 3.1.1\n" +"X-Generator: Poedit 3.2.2\n" -#: gio/gappinfo.c:335 +#: gio/gappinfo.c:339 msgid "Setting default applications not supported yet" msgstr "Menata aplikasi baku belum didukung" -#: gio/gappinfo.c:368 +#: gio/gappinfo.c:372 msgid "Setting application as last used for type not supported yet" msgstr "" "Menata aplikasi sebagai yang terakhir digunakan untuk tipe belum didukung" -#: gio/gappinfo.c:808 +#: gio/gappinfo.c:814 #, c-format msgid "Failed to find default application for content type ‘%s’" msgstr "Gagal menemukan aplikasi bawaan untuk jenis konten '%s'" -#: gio/gappinfo.c:868 +#: gio/gappinfo.c:874 #, c-format msgid "Failed to find default application for URI Scheme ‘%s’" msgstr "Gagal menemukan aplikasi bawaan untuk Skema URI '%s'" @@ -234,11 +234,11 @@ msgid "error sending %s message to application: %s\n" msgstr "galat saat mengirim pesan %s ke aplikasi: %s\n" -#: gio/gapplication-tool.c:321 +#: gio/gapplication-tool.c:324 msgid "action name must be given after application id\n" msgstr "nama aksi mesti diberikan setelah id aplikasi\n" -#: gio/gapplication-tool.c:329 +#: gio/gapplication-tool.c:332 #, c-format msgid "" "invalid action name: “%s”\n" @@ -247,25 +247,25 @@ "nama aksi tak valid: \"%s\"\n" "nama mesti hanya terdiri dari alfanumerik, \"-\", dan \".\"\n" -#: gio/gapplication-tool.c:348 +#: gio/gapplication-tool.c:351 #, c-format msgid "error parsing action parameter: %s\n" msgstr "galat saat mengurai parameter aksi: %s\n" -#: gio/gapplication-tool.c:360 +#: gio/gapplication-tool.c:363 msgid "actions accept a maximum of one parameter\n" msgstr "aksi menerima maksimum satu parameter\n" -#: gio/gapplication-tool.c:415 +#: gio/gapplication-tool.c:418 msgid "list-actions command takes only the application id" msgstr "perintah list-actions hanya menerima id aplikasi" -#: gio/gapplication-tool.c:425 +#: gio/gapplication-tool.c:428 #, c-format msgid "unable to find desktop file for application %s\n" msgstr "tak bisa temukan berkas desktop bagi aplikasi %s\n" -#: gio/gapplication-tool.c:470 +#: gio/gapplication-tool.c:473 #, c-format msgid "" "unrecognised command: %s\n" @@ -300,7 +300,7 @@ msgid "Truncate not supported on base stream" msgstr "Pemenggalan tak didukung pada stream basis" -#: gio/gcancellable.c:319 gio/gdbusconnection.c:1859 gio/gdbusprivate.c:1420 +#: gio/gcancellable.c:326 gio/gdbusconnection.c:1859 gio/gdbusprivate.c:1420 #: gio/gsimpleasyncresult.c:873 gio/gsimpleasyncresult.c:899 #, c-format msgid "Operation was cancelled" @@ -320,13 +320,13 @@ #: gio/gcharsetconverter.c:344 gio/gdatainputstream.c:850 #: gio/gdatainputstream.c:1268 glib/gconvert.c:451 glib/gconvert.c:883 -#: glib/giochannel.c:1576 glib/giochannel.c:1618 glib/giochannel.c:2473 +#: glib/giochannel.c:1576 glib/giochannel.c:1618 glib/giochannel.c:2478 #: glib/gutf8.c:892 glib/gutf8.c:1346 msgid "Invalid byte sequence in conversion input" msgstr "Rangkaian bita dalam input konversi tidak benar" #: gio/gcharsetconverter.c:349 glib/gconvert.c:459 glib/gconvert.c:797 -#: glib/giochannel.c:1583 glib/giochannel.c:2485 +#: glib/giochannel.c:1583 glib/giochannel.c:2493 #, c-format msgid "Error during conversion: %s" msgstr "Galat ketika konversi: %s" @@ -383,17 +383,17 @@ msgid "Unexpected early end-of-stream" msgstr "Akhir stream terlalu dini, tak diharapkan" -#: gio/gdbusaddress.c:164 gio/gdbusaddress.c:238 gio/gdbusaddress.c:327 +#: gio/gdbusaddress.c:162 gio/gdbusaddress.c:234 gio/gdbusaddress.c:321 #, c-format msgid "Unsupported key “%s” in address entry “%s”" msgstr "Kunci \"%s\" tak didukung pada entri alamat \"%s\"" -#: gio/gdbusaddress.c:177 +#: gio/gdbusaddress.c:175 #, c-format msgid "Meaningless key/value pair combination in address entry “%s”" msgstr "Kombinasi pasangan kunci/nilai tanpa arti di entri alamat \"%s\"" -#: gio/gdbusaddress.c:186 +#: gio/gdbusaddress.c:184 #, c-format msgid "" "Address “%s” is invalid (need exactly one of path, dir, tmpdir, or abstract " @@ -402,28 +402,28 @@ "Alamat \"%s\" tak valid (perlu hanya salah satu dari path, dir, tmpdir, atau " "kunci abstrak)" -#: gio/gdbusaddress.c:253 gio/gdbusaddress.c:264 gio/gdbusaddress.c:279 -#: gio/gdbusaddress.c:342 gio/gdbusaddress.c:353 +#: gio/gdbusaddress.c:249 gio/gdbusaddress.c:260 gio/gdbusaddress.c:275 +#: gio/gdbusaddress.c:336 gio/gdbusaddress.c:347 #, c-format msgid "Error in address “%s” — the “%s” attribute is malformed" msgstr "Galat dalam alamat \"%s\" — atribut \"%s\" salah bentuk" -#: gio/gdbusaddress.c:423 gio/gdbusaddress.c:682 +#: gio/gdbusaddress.c:417 gio/gdbusaddress.c:676 #, c-format msgid "Unknown or unsupported transport “%s” for address “%s”" msgstr "Transport \"%s\" tak dikenal atau tak didukung bagi alamat \"%s\"" -#: gio/gdbusaddress.c:467 +#: gio/gdbusaddress.c:461 #, c-format msgid "Address element “%s” does not contain a colon (:)" msgstr "Elemen alamat \"%s\" tak memuat titik dua (:)" -#: gio/gdbusaddress.c:476 +#: gio/gdbusaddress.c:470 #, c-format msgid "Transport name in address element “%s” must not be empty" msgstr "Nama transport dalam elemen alamat “%s” tidak boleh kosong" -#: gio/gdbusaddress.c:497 +#: gio/gdbusaddress.c:491 #, c-format msgid "" "Key/Value pair %d, “%s”, in address element “%s” does not contain an equal " @@ -432,7 +432,7 @@ "Pasangan kunci/nilai %d, \"%s\", dalam elemen alamat \"%s\" tak memuat tanda " "sama dengan" -#: gio/gdbusaddress.c:508 +#: gio/gdbusaddress.c:502 #, c-format msgid "" "Key/Value pair %d, “%s”, in address element “%s” must not have an empty key" @@ -440,7 +440,7 @@ "Pasangan kunci/nilai %d, \"%s\", dalam elemen alamat \"%s\" tak boleh " "memiliki kunci kosong" -#: gio/gdbusaddress.c:522 +#: gio/gdbusaddress.c:516 #, c-format msgid "" "Error unescaping key or value in Key/Value pair %d, “%s”, in address element " @@ -449,7 +449,7 @@ "Galat saat membongkar kunci atau nilai dalam pasangan Key/Value %d, \"%s\", " "dalam elemen alamat \"%s\"" -#: gio/gdbusaddress.c:590 +#: gio/gdbusaddress.c:584 #, c-format msgid "" "Error in address “%s” — the unix transport requires exactly one of the keys " @@ -458,74 +458,74 @@ "Galat dalam alamat \"%s\" — transport unix memerlukan hanya satu dari kunci " "\"path\" atau \"abstract\" untuk ditata" -#: gio/gdbusaddress.c:625 +#: gio/gdbusaddress.c:619 #, c-format msgid "Error in address “%s” — the host attribute is missing or malformed" msgstr "Galat dalam alamat \"%s\" — atribut host kurang atau salah bentuk" -#: gio/gdbusaddress.c:639 +#: gio/gdbusaddress.c:633 #, c-format msgid "Error in address “%s” — the port attribute is missing or malformed" msgstr "Galat dalam alamat \"%s\" — atribut portt kurang atau salah bentuk" -#: gio/gdbusaddress.c:653 +#: gio/gdbusaddress.c:647 #, c-format msgid "Error in address “%s” — the noncefile attribute is missing or malformed" msgstr "Galat di alamat \"%s\" — atribut berkas nonce kurang atau salah bentuk" -#: gio/gdbusaddress.c:674 +#: gio/gdbusaddress.c:668 msgid "Error auto-launching: " msgstr "Galat saat meluncurkan otomatis: " -#: gio/gdbusaddress.c:727 +#: gio/gdbusaddress.c:721 #, c-format msgid "Error opening nonce file “%s”: %s" msgstr "Galat saat membuka berkas nonce \"%s\": %s" -#: gio/gdbusaddress.c:746 +#: gio/gdbusaddress.c:740 #, c-format msgid "Error reading from nonce file “%s”: %s" msgstr "Galat saat membaca berkas nonce \"%s\": %s" -#: gio/gdbusaddress.c:755 +#: gio/gdbusaddress.c:749 #, c-format msgid "Error reading from nonce file “%s”, expected 16 bytes, got %d" msgstr "Galat saat membaca berkas nonce \"%s\", berharap 16 bita, mendapat %d" -#: gio/gdbusaddress.c:773 +#: gio/gdbusaddress.c:767 #, c-format msgid "Error writing contents of nonce file “%s” to stream:" msgstr "Galat saat menulis isi dari berkas nonce \"%s\" ke stream:" -#: gio/gdbusaddress.c:988 +#: gio/gdbusaddress.c:982 msgid "The given address is empty" msgstr "Tidak ada alamat yang diberikan" -#: gio/gdbusaddress.c:1101 +#: gio/gdbusaddress.c:1095 #, c-format msgid "Cannot spawn a message bus when AT_SECURE is set" msgstr "Tak bisa spawn suatu bus pesan ketika AT_SECURE ditata" -#: gio/gdbusaddress.c:1108 +#: gio/gdbusaddress.c:1102 msgid "Cannot spawn a message bus without a machine-id: " msgstr "Tak bisa spawn suatu bus pesan tanpa id-mesin: " -#: gio/gdbusaddress.c:1115 +#: gio/gdbusaddress.c:1109 #, c-format msgid "Cannot autolaunch D-Bus without X11 $DISPLAY" msgstr "Tak bisa meluncurkan mandiri D-Bus tanpa $DISPLAY X11" -#: gio/gdbusaddress.c:1157 +#: gio/gdbusaddress.c:1151 #, c-format msgid "Error spawning command line “%s”: " msgstr "Galat saat spawn baris perintah \"%s\": " -#: gio/gdbusaddress.c:1226 +#: gio/gdbusaddress.c:1220 #, c-format msgid "Cannot determine session bus address (not implemented for this OS)" msgstr "Tak bisa menentukan alamat bus sesi (tidak diimplementasi bagi OS ini)" -#: gio/gdbusaddress.c:1375 gio/gdbusconnection.c:7321 +#: gio/gdbusaddress.c:1374 gio/gdbusconnection.c:7316 #, c-format msgid "" "Cannot determine bus address from DBUS_STARTER_BUS_TYPE environment variable " @@ -534,7 +534,7 @@ "Tak bisa menentukan alamat bus dari variabel lingkungan " "DBUS_STARTER_BUS_TYPE — nilai tak dikenal \"%s\"" -#: gio/gdbusaddress.c:1384 gio/gdbusconnection.c:7330 +#: gio/gdbusaddress.c:1383 gio/gdbusconnection.c:7325 msgid "" "Cannot determine bus address because the DBUS_STARTER_BUS_TYPE environment " "variable is not set" @@ -542,7 +542,7 @@ "Tak bisa menentukan alamat bus karena variabel lingkungan " "DBUS_STARTER_BUS_TYPE tak diisi" -#: gio/gdbusaddress.c:1394 +#: gio/gdbusaddress.c:1393 #, c-format msgid "Unknown bus type %d" msgstr "Tipe bus %d tak dikenal" @@ -564,11 +564,15 @@ "Menghabiskan semua mekanisme autentikasi yang tersedia (dicoba: %s) " "(tersedia: %s)" -#: gio/gdbusauth.c:1178 +#: gio/gdbusauth.c:1045 +msgid "Unexpected lack of content trying to read a byte" +msgstr "Ketiadaan isi yang tak diharapkan ketika membaca suatu bita" + +#: gio/gdbusauth.c:1195 msgid "User IDs must be the same for peer and server" msgstr "ID Pengguna harus sama untuk rakan (peer) dan peladen" -#: gio/gdbusauth.c:1190 +#: gio/gdbusauth.c:1207 msgid "Cancelled via GDBusAuthObserver::authorize-authenticated-peer" msgstr "Dibatalkan melalui GDBusAuthObserver::authorize-authenticated-peer" @@ -660,7 +664,7 @@ msgid "(Additionally, releasing the lock for “%s” also failed: %s) " msgstr "(Selain itu, melepas kunci bagi \"%s\" juga gagal: %s) " -#: gio/gdbusconnection.c:590 gio/gdbusconnection.c:2404 +#: gio/gdbusconnection.c:590 gio/gdbusconnection.c:2405 msgid "The connection is closed" msgstr "Sambungan tertutup" @@ -668,13 +672,13 @@ msgid "Timeout was reached" msgstr "Kehabisan waktu" -#: gio/gdbusconnection.c:2527 +#: gio/gdbusconnection.c:2528 msgid "" "Unsupported flags encountered when constructing a client-side connection" msgstr "" "Ditemui tanda yang tak didukung ketika membangun sambungan di sisi klien" -#: gio/gdbusconnection.c:4256 gio/gdbusconnection.c:4610 +#: gio/gdbusconnection.c:4257 gio/gdbusconnection.c:4611 #, c-format msgid "" "No such interface “org.freedesktop.DBus.Properties” on object at path %s" @@ -682,106 +686,106 @@ "Tidak ada antarmuka \"org.freedesktop.DBus.Properties\" pada objek pada path " "%s" -#: gio/gdbusconnection.c:4401 +#: gio/gdbusconnection.c:4402 #, c-format msgid "No such property “%s”" msgstr "Tak ada properti \"%s\"" -#: gio/gdbusconnection.c:4413 +#: gio/gdbusconnection.c:4414 #, c-format msgid "Property “%s” is not readable" msgstr "Properti \"%s\" tidak dapat dibaca" -#: gio/gdbusconnection.c:4424 +#: gio/gdbusconnection.c:4425 #, c-format msgid "Property “%s” is not writable" msgstr "Properti \"%s\" tidak dapat ditulisi" -#: gio/gdbusconnection.c:4444 +#: gio/gdbusconnection.c:4445 #, c-format msgid "Error setting property “%s”: Expected type “%s” but got “%s”" msgstr "" "Galat menata properti \"%s\": Tipe yang diharapkan \"%s\" tapi diperoleh \"%s" "\"" -#: gio/gdbusconnection.c:4549 gio/gdbusconnection.c:4764 -#: gio/gdbusconnection.c:6747 +#: gio/gdbusconnection.c:4550 gio/gdbusconnection.c:4765 +#: gio/gdbusconnection.c:6742 #, c-format msgid "No such interface “%s”" msgstr "Tak ada antarmuka \"%s\"" -#: gio/gdbusconnection.c:4986 gio/gdbusconnection.c:7261 +#: gio/gdbusconnection.c:4981 gio/gdbusconnection.c:7256 #, c-format msgid "No such interface “%s” on object at path %s" msgstr "Tak ada antarmuka \"%s\" pada objek di lokasi %s" -#: gio/gdbusconnection.c:5087 +#: gio/gdbusconnection.c:5082 #, c-format msgid "No such method “%s”" msgstr "Tidak ada metode seperti \"%s\"" -#: gio/gdbusconnection.c:5118 +#: gio/gdbusconnection.c:5113 #, c-format msgid "Type of message, “%s”, does not match expected type “%s”" msgstr "Tipe pesan \"%s\" tak cocok dengan tipe yang diharapkan \"%s\"" -#: gio/gdbusconnection.c:5321 +#: gio/gdbusconnection.c:5316 #, c-format msgid "An object is already exported for the interface %s at %s" msgstr "Suatu objek telah diekspor bagi antar muka %s pada %s" -#: gio/gdbusconnection.c:5548 +#: gio/gdbusconnection.c:5543 #, c-format msgid "Unable to retrieve property %s.%s" msgstr "Tak bisa mengambil properti %s.%s" -#: gio/gdbusconnection.c:5604 +#: gio/gdbusconnection.c:5599 #, c-format msgid "Unable to set property %s.%s" msgstr "Tak bisa menata properti %s.%s" -#: gio/gdbusconnection.c:5783 +#: gio/gdbusconnection.c:5778 #, c-format msgid "Method “%s” returned type “%s”, but expected “%s”" msgstr "Metode \"%s\" mengembalikan tipe \"%s\", tapi yang diharapkan \"%s\"" -#: gio/gdbusconnection.c:6859 +#: gio/gdbusconnection.c:6854 #, c-format msgid "Method “%s” on interface “%s” with signature “%s” does not exist" msgstr "" "Metode \"%s\" pada antar muka \"%s\" dengan tanda tangan \"%s\"' tak ada" -#: gio/gdbusconnection.c:6980 +#: gio/gdbusconnection.c:6975 #, c-format msgid "A subtree is already exported for %s" msgstr "Subtree telah diekspor bagi %s" -#: gio/gdbusconnection.c:7269 +#: gio/gdbusconnection.c:7264 #, c-format msgid "Object does not exist at path “%s”" msgstr "Objek tidak ada di path \"%s\"" -#: gio/gdbusmessage.c:1303 +#: gio/gdbusmessage.c:1306 msgid "type is INVALID" msgstr "jenisnya INVALID" -#: gio/gdbusmessage.c:1314 +#: gio/gdbusmessage.c:1317 msgid "METHOD_CALL message: PATH or MEMBER header field is missing" msgstr "Pesan METHOD_CALL: ruas header PATH atau MEMBER hilang" -#: gio/gdbusmessage.c:1325 +#: gio/gdbusmessage.c:1328 msgid "METHOD_RETURN message: REPLY_SERIAL header field is missing" msgstr "Pesan METHOD_RETURN: ruas header REPLY_SERIAL hilang" -#: gio/gdbusmessage.c:1337 +#: gio/gdbusmessage.c:1340 msgid "ERROR message: REPLY_SERIAL or ERROR_NAME header field is missing" msgstr "Pesan ERROR: ruas header REPLY_SERIAL atau ERRORN_NAME hilang" -#: gio/gdbusmessage.c:1350 +#: gio/gdbusmessage.c:1353 msgid "SIGNAL message: PATH, INTERFACE or MEMBER header field is missing" msgstr "Pesan SIGNAL: ruas header PATH, INTERFACE, atau MEMBER hilang" -#: gio/gdbusmessage.c:1358 +#: gio/gdbusmessage.c:1361 msgid "" "SIGNAL message: The PATH header field is using the reserved value /org/" "freedesktop/DBus/Local" @@ -789,7 +793,7 @@ "Pesan SIGNAL: ruas header PATH memakai nilai khusus /org/freedesktop/DBus/" "Local" -#: gio/gdbusmessage.c:1366 +#: gio/gdbusmessage.c:1369 msgid "" "SIGNAL message: The INTERFACE header field is using the reserved value org." "freedesktop.DBus.Local" @@ -797,18 +801,18 @@ "Pesan SIGNAL: ruas header INTERFACE memakai nilai khusus org.freedesktop." "DBus.Local" -#: gio/gdbusmessage.c:1414 gio/gdbusmessage.c:1474 +#: gio/gdbusmessage.c:1417 gio/gdbusmessage.c:1477 #, c-format msgid "Wanted to read %lu byte but only got %lu" msgid_plural "Wanted to read %lu bytes but only got %lu" msgstr0 "Ingin membaca %lu bita tapi hanya memperoleh %lu" -#: gio/gdbusmessage.c:1428 +#: gio/gdbusmessage.c:1431 #, c-format msgid "Expected NUL byte after the string “%s” but found byte %d" msgstr "Mengharapkan bita NUL setelah string \"%s\" tapi menemui bita %d" -#: gio/gdbusmessage.c:1447 +#: gio/gdbusmessage.c:1450 #, c-format msgid "" "Expected valid UTF-8 string but found invalid bytes at byte offset %d " @@ -818,21 +822,21 @@ "%d (panjang string adalah %d). String UTF-8 yang valid sampai titik itu " "adalah \"%s\"" -#: gio/gdbusmessage.c:1511 gio/gdbusmessage.c:1787 gio/gdbusmessage.c:1998 +#: gio/gdbusmessage.c:1514 gio/gdbusmessage.c:1790 gio/gdbusmessage.c:2001 msgid "Value nested too deeply" msgstr "Nilai bersarang terlalu dalam" -#: gio/gdbusmessage.c:1679 +#: gio/gdbusmessage.c:1682 #, c-format msgid "Parsed value “%s” is not a valid D-Bus object path" msgstr "Nilai terurai \"%s\" bukan lokasi objek D-Bus yang valid" -#: gio/gdbusmessage.c:1703 +#: gio/gdbusmessage.c:1706 #, c-format msgid "Parsed value “%s” is not a valid D-Bus signature" msgstr "Nilai terurai \"%s\" bukan tanda tangan D-Bus yang valid" -#: gio/gdbusmessage.c:1754 +#: gio/gdbusmessage.c:1757 #, c-format msgid "" "Encountered array of length %u byte. Maximum length is 2<<26 bytes (64 MiB)." @@ -842,7 +846,7 @@ "Menjumpai larik dengan panjang %u bita. Panjang maksimal adalah 2<<26 bita " "(64 MiB)." -#: gio/gdbusmessage.c:1774 +#: gio/gdbusmessage.c:1777 #, c-format msgid "" "Encountered array of type “a%c”, expected to have a length a multiple of %u " @@ -851,16 +855,16 @@ "Menemui larik bertipe \"a%c\", mengharapkan punya panjang kelipatan %u bita, " "tapi menemui panjang %u bita" -#: gio/gdbusmessage.c:1928 gio/gdbusmessage.c:2647 +#: gio/gdbusmessage.c:1931 gio/gdbusmessage.c:2650 msgid "Empty structures (tuples) are not allowed in D-Bus" msgstr "Struktur kosong (tuple) tidak diperbolehkan di D-Bus" -#: gio/gdbusmessage.c:1982 +#: gio/gdbusmessage.c:1985 #, c-format msgid "Parsed value “%s” for variant is not a valid D-Bus signature" msgstr "Nilai terurai \"%s\" bagi varian bukan tanda tangan D-Bus yang valid" -#: gio/gdbusmessage.c:2023 +#: gio/gdbusmessage.c:2026 #, c-format msgid "" "Error deserializing GVariant with type string “%s” from the D-Bus wire format" @@ -868,7 +872,7 @@ "Galat saat deserialisasi GVariant dengan type string \"%s\" dari format " "kabel D-Bus" -#: gio/gdbusmessage.c:2208 +#: gio/gdbusmessage.c:2211 #, c-format msgid "" "Invalid endianness value. Expected 0x6c (“l”) or 0x42 (“B”) but found value " @@ -877,28 +881,28 @@ "Nilai ke-endian-an tak valid. Berharap 0x6c (\"l\") atau (0x42) \"B\" tapi " "menemui 0x%02x" -#: gio/gdbusmessage.c:2227 +#: gio/gdbusmessage.c:2230 #, c-format msgid "Invalid major protocol version. Expected 1 but found %d" msgstr "Versi protokol mayor tak valid. Berharap 1 tapi menemui %d" -#: gio/gdbusmessage.c:2285 gio/gdbusmessage.c:2883 +#: gio/gdbusmessage.c:2288 gio/gdbusmessage.c:2886 msgid "Signature header found but is not of type signature" msgstr "Tajuk tanda tangan ditemukan tetapi bukan tipe tanda tangan" -#: gio/gdbusmessage.c:2297 +#: gio/gdbusmessage.c:2300 #, c-format msgid "Signature header with signature “%s” found but message body is empty" msgstr "" "Header tanda tangan dengan tanda tangan \"%s\" ditemukan tapi body pesan " "kosong" -#: gio/gdbusmessage.c:2312 +#: gio/gdbusmessage.c:2315 #, c-format msgid "Parsed value “%s” is not a valid D-Bus signature (for body)" msgstr "Nilai terurai \"%s\" bukan tanda tangan D-Bus yang valid (bagi body)" -#: gio/gdbusmessage.c:2344 +#: gio/gdbusmessage.c:2347 #, 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" @@ -906,11 +910,11 @@ "Tidak terdapat tajuk tanda tangan pada pesan, tetapi panjang badan pesan " "adalah %u bita" -#: gio/gdbusmessage.c:2354 +#: gio/gdbusmessage.c:2357 msgid "Cannot deserialize message: " msgstr "Tak bisa men-deserialisasi pesan: " -#: gio/gdbusmessage.c:2700 +#: gio/gdbusmessage.c:2703 #, c-format msgid "" "Error serializing GVariant with type string “%s” to the D-Bus wire format" @@ -918,23 +922,23 @@ "Kesalahan serialisasi GVariant dengan type string \"%s\" ke format kabel D-" "Bus" -#: gio/gdbusmessage.c:2837 +#: gio/gdbusmessage.c:2840 #, c-format msgid "" "Number of file descriptors in message (%d) differs from header field (%d)" msgstr "" "Jumlah deskriptor berkas dalam pesan (%d) berbeda dari field header (%d)" -#: gio/gdbusmessage.c:2845 +#: gio/gdbusmessage.c:2848 msgid "Cannot serialize message: " msgstr "Tak bisa men-serialisasi pesan: " -#: gio/gdbusmessage.c:2898 +#: gio/gdbusmessage.c:2901 #, c-format msgid "Message body has signature “%s” but there is no signature header" msgstr "Body pesan punya tanda tangan \"%s\" tapi tak ada header tanda tangan" -#: gio/gdbusmessage.c:2908 +#: gio/gdbusmessage.c:2911 #, c-format msgid "" "Message body has type signature “%s” but signature in the header field is " @@ -943,17 +947,17 @@ "Tubuh pesan memiliki tanda tangan tipe \"%s\" tapi tanda tangan di ruas " "header adalah \"(%s)\"" -#: gio/gdbusmessage.c:2924 +#: gio/gdbusmessage.c:2927 #, c-format msgid "Message body is empty but signature in the header field is “(%s)”" msgstr "Tubuh pesan kosong tapi tanda tangan pada ruas header adalah \"(%s)\"" -#: gio/gdbusmessage.c:3479 +#: gio/gdbusmessage.c:3482 #, c-format msgid "Error return with body of type “%s”" msgstr "Galat balikan dengan tubuh bertipe \"%s\"" -#: gio/gdbusmessage.c:3487 +#: gio/gdbusmessage.c:3490 msgid "Error return with empty body" msgstr "Galat balikan dengan body kosong" @@ -978,17 +982,17 @@ msgid "Unable to load %s or %s: " msgstr "Tak bisa memuat %s or %s: " -#: gio/gdbusproxy.c:1575 +#: gio/gdbusproxy.c:1568 #, c-format msgid "Error calling StartServiceByName for %s: " msgstr "Galat sewaktu memanggil StartServiceByName untuk %s: " -#: gio/gdbusproxy.c:1598 +#: gio/gdbusproxy.c:1591 #, c-format msgid "Unexpected reply %d from StartServiceByName(\"%s\") method" msgstr "Balasan tak diharapkan %d dari metode StartServiceByName(\"%s\")" -#: gio/gdbusproxy.c:2709 gio/gdbusproxy.c:2844 +#: gio/gdbusproxy.c:2702 gio/gdbusproxy.c:2837 #, c-format msgid "" "Cannot invoke method; proxy is for the well-known name %s without an owner, " @@ -997,25 +1001,25 @@ "Tak bisa menjalankan metode; proksi adalah nama terkenal %s tanpa pemilik " "dan proksi dibangun dengan tanda G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START" -#: gio/gdbusserver.c:765 +#: gio/gdbusserver.c:758 msgid "Abstract namespace not supported" msgstr "Ruang nama abstrak tak didukung" -#: gio/gdbusserver.c:857 +#: gio/gdbusserver.c:850 msgid "Cannot specify nonce file when creating a server" msgstr "Tak bisa menyatakan berkas nonce ketika membuat suatu peladen" -#: gio/gdbusserver.c:939 +#: gio/gdbusserver.c:932 #, c-format msgid "Error writing nonce file at “%s”: %s" msgstr "Galat saat menulis berkas nonce pada \"%s\": %s" -#: gio/gdbusserver.c:1114 +#: gio/gdbusserver.c:1107 #, c-format msgid "The string “%s” is not a valid D-Bus GUID" msgstr "String \"%s\" bukan suatu GUID D-Bus yang valid" -#: gio/gdbusserver.c:1152 +#: gio/gdbusserver.c:1145 #, c-format msgid "Cannot listen on unsupported transport “%s”" msgstr "Tak bisa mendengarkan pada transport yang tak didukung \"%s\"" @@ -1044,14 +1048,14 @@ "Gunakan \"%s PERINTAH --help\" untuk memperoleh bantuan pada setiap " "perintah.\n" -#: gio/gdbus-tool.c:204 gio/gdbus-tool.c:276 gio/gdbus-tool.c:348 -#: gio/gdbus-tool.c:372 gio/gdbus-tool.c:862 gio/gdbus-tool.c:1247 -#: gio/gdbus-tool.c:1734 +#: gio/gdbus-tool.c:204 gio/gdbus-tool.c:276 gio/gdbus-tool.c:347 +#: gio/gdbus-tool.c:371 gio/gdbus-tool.c:861 gio/gdbus-tool.c:1246 +#: gio/gdbus-tool.c:1733 #, c-format msgid "Error: %s\n" msgstr "Galat: %s\n" -#: gio/gdbus-tool.c:215 gio/gdbus-tool.c:289 gio/gdbus-tool.c:1750 +#: gio/gdbus-tool.c:215 gio/gdbus-tool.c:289 gio/gdbus-tool.c:1749 #, c-format msgid "Error parsing introspection XML: %s\n" msgstr "Galat saat mengurai XML introspeksi: %s\n" @@ -1061,49 +1065,49 @@ msgid "Error: %s is not a valid name\n" msgstr "Galat: %s bukan nama yang valid\n" -#: gio/gdbus-tool.c:258 gio/gdbus-tool.c:748 gio/gdbus-tool.c:1066 -#: gio/gdbus-tool.c:1900 gio/gdbus-tool.c:2140 +#: gio/gdbus-tool.c:258 gio/gdbus-tool.c:747 gio/gdbus-tool.c:1065 +#: gio/gdbus-tool.c:1899 gio/gdbus-tool.c:2139 #, c-format msgid "Error: %s is not a valid object path\n" msgstr "Galat: '%s' bukan suatu lokasi objek yang valid\n" -#: gio/gdbus-tool.c:406 +#: gio/gdbus-tool.c:405 msgid "Connect to the system bus" msgstr "Menyambung ke bus sistem" -#: gio/gdbus-tool.c:407 +#: gio/gdbus-tool.c:406 msgid "Connect to the session bus" msgstr "Menyambung ke bus sesi" -#: gio/gdbus-tool.c:408 +#: gio/gdbus-tool.c:407 msgid "Connect to given D-Bus address" msgstr "Menyambung ke alamat D-Bus yang diberikan" -#: gio/gdbus-tool.c:418 +#: gio/gdbus-tool.c:417 msgid "Connection Endpoint Options:" msgstr "Opsi Titik Ujung Sambungan:" -#: gio/gdbus-tool.c:419 +#: gio/gdbus-tool.c:418 msgid "Options specifying the connection endpoint" msgstr "Opsi yang menyatakan titik ujung sambungan" -#: gio/gdbus-tool.c:442 +#: gio/gdbus-tool.c:441 #, c-format msgid "No connection endpoint specified" msgstr "Titik ujung sambungan tak dinyatakan" -#: gio/gdbus-tool.c:452 +#: gio/gdbus-tool.c:451 #, c-format msgid "Multiple connection endpoints specified" msgstr "Telah dinyatakan titik ujung sambungan berganda" -#: gio/gdbus-tool.c:525 +#: gio/gdbus-tool.c:524 #, c-format msgid "" "Warning: According to introspection data, interface “%s” does not exist\n" msgstr "Peringatan: Menurut data introspeksi, antar muka \"%s\" tak ada\n" -#: gio/gdbus-tool.c:534 +#: gio/gdbus-tool.c:533 #, c-format msgid "" "Warning: According to introspection data, method “%s” does not exist on " @@ -1112,166 +1116,166 @@ "Peringatan: Menurut data introspeksi, metode \"%s\" tak ada pada antar muka " "\"%s\"\n" -#: gio/gdbus-tool.c:596 +#: gio/gdbus-tool.c:595 msgid "Optional destination for signal (unique name)" msgstr "Tujuan opsional bagi sinyal (nama unik)" -#: gio/gdbus-tool.c:597 +#: gio/gdbus-tool.c:596 msgid "Object path to emit signal on" msgstr "Path objek untuk dipancari sinyal" -#: gio/gdbus-tool.c:598 +#: gio/gdbus-tool.c:597 msgid "Signal and interface name" msgstr "Nama antar muka dan sinyal" -#: gio/gdbus-tool.c:631 +#: gio/gdbus-tool.c:630 msgid "Emit a signal." msgstr "Pancarkan sinyal." -#: gio/gdbus-tool.c:686 gio/gdbus-tool.c:1003 gio/gdbus-tool.c:1837 -#: gio/gdbus-tool.c:2069 gio/gdbus-tool.c:2289 +#: gio/gdbus-tool.c:685 gio/gdbus-tool.c:1002 gio/gdbus-tool.c:1836 +#: gio/gdbus-tool.c:2068 gio/gdbus-tool.c:2288 #, c-format msgid "Error connecting: %s\n" msgstr "Galat saat menyambung: %s\n" -#: gio/gdbus-tool.c:706 +#: gio/gdbus-tool.c:705 #, c-format msgid "Error: %s is not a valid unique bus name.\n" msgstr "Galat: '%s' bukan nama bus unik yang valid\n" -#: gio/gdbus-tool.c:725 gio/gdbus-tool.c:1046 gio/gdbus-tool.c:1880 +#: gio/gdbus-tool.c:724 gio/gdbus-tool.c:1045 gio/gdbus-tool.c:1879 msgid "Error: Object path is not specified\n" msgstr "Galat: Lokasi objek tak dinyatakan\n" -#: gio/gdbus-tool.c:768 +#: gio/gdbus-tool.c:767 msgid "Error: Signal name is not specified\n" msgstr "Galat: Nama sinyal tak dinyatakan\n" -#: gio/gdbus-tool.c:782 +#: gio/gdbus-tool.c:781 #, c-format msgid "Error: Signal name “%s” is invalid\n" msgstr "Galat: Nama sinyal \"%s\" tak valid\n" -#: gio/gdbus-tool.c:794 +#: gio/gdbus-tool.c:793 #, c-format msgid "Error: %s is not a valid interface name\n" msgstr "Galat: '%s' bukan nama antar muka yang valid\n" -#: gio/gdbus-tool.c:800 +#: gio/gdbus-tool.c:799 #, c-format msgid "Error: %s is not a valid member name\n" msgstr "Galat: '%s' bukan nama anggota yang valid\n" #. Use the original non-"parse-me-harder" error -#: gio/gdbus-tool.c:837 gio/gdbus-tool.c:1178 +#: gio/gdbus-tool.c:836 gio/gdbus-tool.c:1177 #, c-format msgid "Error parsing parameter %d: %s\n" msgstr "Galat saat mengurai parameter %d: %s\n" -#: gio/gdbus-tool.c:869 +#: gio/gdbus-tool.c:868 #, c-format msgid "Error flushing connection: %s\n" msgstr "Galat saat menggelontor sambungan: %s\n" -#: gio/gdbus-tool.c:897 +#: gio/gdbus-tool.c:896 msgid "Destination name to invoke method on" msgstr "Nama tujuan tempat menjalankan metode" -#: gio/gdbus-tool.c:898 +#: gio/gdbus-tool.c:897 msgid "Object path to invoke method on" msgstr "Lokasi objek tempat menjalankan metode" -#: gio/gdbus-tool.c:899 +#: gio/gdbus-tool.c:898 msgid "Method and interface name" msgstr "Nama metode dan antar muka" -#: gio/gdbus-tool.c:900 +#: gio/gdbus-tool.c:899 msgid "Timeout in seconds" msgstr "Tenggat waktu dalam detik" -#: gio/gdbus-tool.c:901 +#: gio/gdbus-tool.c:900 msgid "Allow interactive authorization" msgstr "Perbolehkan otorisasi interaktif" -#: gio/gdbus-tool.c:948 +#: gio/gdbus-tool.c:947 msgid "Invoke a method on a remote object." msgstr "Jalankan suatu metode pada suatu objek jauh." -#: gio/gdbus-tool.c:1020 gio/gdbus-tool.c:1854 gio/gdbus-tool.c:2094 +#: gio/gdbus-tool.c:1019 gio/gdbus-tool.c:1853 gio/gdbus-tool.c:2093 msgid "Error: Destination is not specified\n" msgstr "Galat: Tujuan tak dinyatakan\n" -#: gio/gdbus-tool.c:1031 gio/gdbus-tool.c:1871 gio/gdbus-tool.c:2105 +#: gio/gdbus-tool.c:1030 gio/gdbus-tool.c:1870 gio/gdbus-tool.c:2104 #, c-format msgid "Error: %s is not a valid bus name\n" msgstr "Galat: %s bukan nama bus yang valid\n" -#: gio/gdbus-tool.c:1081 +#: gio/gdbus-tool.c:1080 msgid "Error: Method name is not specified\n" msgstr "Galat: Nama metode tak dinyatakan\n" -#: gio/gdbus-tool.c:1092 +#: gio/gdbus-tool.c:1091 #, c-format msgid "Error: Method name “%s” is invalid\n" msgstr "Galat: Nama metode \"%s\" tak valid\n" -#: gio/gdbus-tool.c:1170 +#: gio/gdbus-tool.c:1169 #, c-format msgid "Error parsing parameter %d of type “%s”: %s\n" msgstr "Galat ketika mengurai parameter ke-%d bertipe \"%s\": %s\n" -#: gio/gdbus-tool.c:1196 +#: gio/gdbus-tool.c:1195 #, c-format msgid "Error adding handle %d: %s\n" msgstr "Galat saat menambahkan %d handle: %s\n" -#: gio/gdbus-tool.c:1696 +#: gio/gdbus-tool.c:1695 msgid "Destination name to introspect" msgstr "Nama tujuan untuk introspeksi" -#: gio/gdbus-tool.c:1697 +#: gio/gdbus-tool.c:1696 msgid "Object path to introspect" msgstr "Lokasi objek untuk introspeksi" -#: gio/gdbus-tool.c:1698 +#: gio/gdbus-tool.c:1697 msgid "Print XML" msgstr "Cetak XML" -#: gio/gdbus-tool.c:1699 +#: gio/gdbus-tool.c:1698 msgid "Introspect children" msgstr "Introspeksi anak" -#: gio/gdbus-tool.c:1700 +#: gio/gdbus-tool.c:1699 msgid "Only print properties" msgstr "Hanya cetak properti" -#: gio/gdbus-tool.c:1789 +#: gio/gdbus-tool.c:1788 msgid "Introspect a remote object." msgstr "Introspeksi suatu objek jauh." -#: gio/gdbus-tool.c:1995 +#: gio/gdbus-tool.c:1994 msgid "Destination name to monitor" msgstr "Nama tujuan untuk dipantau" -#: gio/gdbus-tool.c:1996 +#: gio/gdbus-tool.c:1995 msgid "Object path to monitor" msgstr "Lokasi objek untuk dipantau" -#: gio/gdbus-tool.c:2021 +#: gio/gdbus-tool.c:2020 msgid "Monitor a remote object." msgstr "Memantau suatu objek jauh." -#: gio/gdbus-tool.c:2079 +#: gio/gdbus-tool.c:2078 msgid "Error: can’t monitor a non-message-bus connection\n" msgstr "Galat: tidak dapat memonitor koneksi non bus pesan\n" -#: gio/gdbus-tool.c:2203 +#: gio/gdbus-tool.c:2202 msgid "Service to activate before waiting for the other one (well-known name)" msgstr "" "Layanan yang akan diaktifkan sebelum menunggu yang lain (nama yang dikenal " "baik)" -#: gio/gdbus-tool.c:2206 +#: gio/gdbus-tool.c:2205 msgid "" "Timeout to wait for before exiting with an error (seconds); 0 for no timeout " "(default)" @@ -1279,27 +1283,27 @@ "Tenggat waktu menunggu sebelum keluar dengan suatu kesalahan (detik); 0 " "untuk tanpa tenggat (baku)" -#: gio/gdbus-tool.c:2254 +#: gio/gdbus-tool.c:2253 msgid "OPTION… BUS-NAME" msgstr "OPSI… NAMA-BUS" -#: gio/gdbus-tool.c:2255 +#: gio/gdbus-tool.c:2254 msgid "Wait for a bus name to appear." msgstr "Tunggu suatu nama bus muncul." -#: gio/gdbus-tool.c:2331 +#: gio/gdbus-tool.c:2330 msgid "Error: A service to activate for must be specified.\n" msgstr "Galat: Suatu layanan yang akan diaktifkan mesti dinyatakan\n" -#: gio/gdbus-tool.c:2336 +#: gio/gdbus-tool.c:2335 msgid "Error: A service to wait for must be specified.\n" msgstr "Galat: Suatu layanan yang mesti ditunggu harus dinyatakan\n" -#: gio/gdbus-tool.c:2341 +#: gio/gdbus-tool.c:2340 msgid "Error: Too many arguments.\n" msgstr "Galat: Terlalu banyak argumen.\n" -#: gio/gdbus-tool.c:2349 gio/gdbus-tool.c:2356 +#: gio/gdbus-tool.c:2348 gio/gdbus-tool.c:2355 #, c-format msgid "Error: %s is not a valid well-known bus name.\n" msgstr "Galat: %s bukan nama bus yang dikenal baik dan valid\n" @@ -1309,39 +1313,44 @@ msgid "Not authorized to change debug settings" msgstr "Tidak berwenang untuk mengubah pengaturan awakutu" -#: gio/gdesktopappinfo.c:2182 gio/gdesktopappinfo.c:5113 +#: gio/gdesktopappinfo.c:2242 gio/gdesktopappinfo.c:5223 msgid "Unnamed" msgstr "Tanpa nama" -#: gio/gdesktopappinfo.c:2592 +#: gio/gdesktopappinfo.c:2652 msgid "Desktop file didn’t specify Exec field" msgstr "Berkas desktop tak menyatakan ruas Exec" -#: gio/gdesktopappinfo.c:2891 +#: gio/gdesktopappinfo.c:2942 msgid "Unable to find terminal required for application" msgstr "Tak bisa temukan terminal yang diperlukan bagi aplikasi" -#: gio/gdesktopappinfo.c:3631 +#: gio/gdesktopappinfo.c:3002 +#, c-format +msgid "Program ‘%s’ not found in $PATH" +msgstr "Program '%s' tidak ditemukan di $PATH" + +#: gio/gdesktopappinfo.c:3735 #, c-format msgid "Can’t create user application configuration folder %s: %s" msgstr "" "Tak bisa membuat folder %s untuk konfigurasi aplikasi bagi pengguna: %s" -#: gio/gdesktopappinfo.c:3635 +#: gio/gdesktopappinfo.c:3739 #, c-format msgid "Can’t create user MIME configuration folder %s: %s" msgstr "Tak bisa membuat folder %s untuk konfigurasi MIME bagi pengguna: %s" -#: gio/gdesktopappinfo.c:3877 gio/gdesktopappinfo.c:3901 +#: gio/gdesktopappinfo.c:3981 gio/gdesktopappinfo.c:4005 msgid "Application information lacks an identifier" msgstr "Informasi aplikasi tak punya identifier" -#: gio/gdesktopappinfo.c:4137 +#: gio/gdesktopappinfo.c:4241 #, c-format msgid "Can’t create user desktop file %s" msgstr "Tak bisa membuat berkas desktop pengguna %s" -#: gio/gdesktopappinfo.c:4273 +#: gio/gdesktopappinfo.c:4377 #, c-format msgid "Custom definition for %s" msgstr "Definisi gubahan bagi %s" @@ -1414,7 +1423,7 @@ msgid "Containing mount does not exist" msgstr "Kait yang memuat tak ada" -#: gio/gfile.c:2641 gio/glocalfile.c:2500 +#: gio/gfile.c:2641 gio/glocalfile.c:2511 msgid "Can’t copy over directory" msgstr "Tak bisa menyalin direktori atas direktori" @@ -1459,7 +1468,7 @@ msgid "Invalid symlink value given" msgstr "Diberikan nilai link simbolik yang tak valid" -#: gio/gfile.c:4163 glib/gfileutils.c:2335 +#: gio/gfile.c:4163 glib/gfileutils.c:2392 msgid "Symbolic links not supported" msgstr "Taut simbolik tidak didukung" @@ -1560,37 +1569,37 @@ msgid "HTTP proxy server closed connection unexpectedly." msgstr "Peladen proksi HTTP menutup koneksi secara tak terduga." -#: gio/gicon.c:300 +#: gio/gicon.c:299 #, c-format msgid "Wrong number of tokens (%d)" msgstr "Cacah token yang salah (%d)" -#: gio/gicon.c:320 +#: gio/gicon.c:319 #, c-format msgid "No type for class name %s" msgstr "Tak ada tipe bagi nama kelas %s" -#: gio/gicon.c:330 +#: gio/gicon.c:329 #, c-format msgid "Type %s does not implement the GIcon interface" msgstr "Tipe %s tak mengimplementasi antar muka GIcon" -#: gio/gicon.c:341 +#: gio/gicon.c:340 #, c-format msgid "Type %s is not classed" msgstr "Tipe %s tak dikelaskan" -#: gio/gicon.c:355 +#: gio/gicon.c:354 #, c-format msgid "Malformed version number: %s" msgstr "Nomor versi salah bentuk: %s" -#: gio/gicon.c:369 +#: gio/gicon.c:368 #, c-format msgid "Type %s does not implement from_tokens() on the GIcon interface" msgstr "Tipe %s tak mengimplementasi from_tokens() pada antar muka GIcon" -#: gio/gicon.c:471 +#: gio/gicon.c:470 msgid "Can’t handle the supplied version of the icon encoding" msgstr "Tak bisa menangani versi pengkodean ikon yang diberikan" @@ -1740,7 +1749,7 @@ #: gio/gio-tool-cat.c:135 gio/gio-tool-info.c:379 gio/gio-tool-list.c:173 #: gio/gio-tool-mkdir.c:50 gio/gio-tool-monitor.c:39 gio/gio-tool-monitor.c:41 #: gio/gio-tool-monitor.c:43 gio/gio-tool-monitor.c:45 -#: gio/gio-tool-monitor.c:206 gio/gio-tool-mount.c:1202 gio/gio-tool-open.c:72 +#: gio/gio-tool-monitor.c:206 gio/gio-tool-mount.c:1210 gio/gio-tool-open.c:72 #: gio/gio-tool-remove.c:50 gio/gio-tool-rename.c:47 gio/gio-tool-set.c:95 #: gio/gio-tool-trash.c:222 gio/gio-tool-tree.c:241 msgid "LOCATION" @@ -1761,7 +1770,7 @@ "seperti smb://peladen/sumberdaya/berkas.txt sebagai lokasi." #: gio/gio-tool-cat.c:164 gio/gio-tool-info.c:410 gio/gio-tool-mkdir.c:78 -#: gio/gio-tool-monitor.c:231 gio/gio-tool-mount.c:1253 gio/gio-tool-open.c:98 +#: gio/gio-tool-monitor.c:231 gio/gio-tool-mount.c:1261 gio/gio-tool-open.c:98 #: gio/gio-tool-remove.c:74 gio/gio-tool-trash.c:303 msgid "No locations given" msgstr "Tidak ada lokasi yang diberikan" @@ -2178,19 +2187,19 @@ msgid "Mount a TCRYPT system volume" msgstr "Kaitkan volume sistem TCRYPT" -#: gio/gio-tool-mount.c:268 gio/gio-tool-mount.c:300 +#: gio/gio-tool-mount.c:276 gio/gio-tool-mount.c:308 msgid "Anonymous access denied" msgstr "Akses anonim ditolak" -#: gio/gio-tool-mount.c:525 +#: gio/gio-tool-mount.c:533 msgid "No drive for device file" msgstr "Tidak ada kandar bagi berkas perangkat" -#: gio/gio-tool-mount.c:1017 +#: gio/gio-tool-mount.c:1025 msgid "No volume for given ID" msgstr "Tidak ada volume untuk ID yang diberikan" -#: gio/gio-tool-mount.c:1206 +#: gio/gio-tool-mount.c:1214 msgid "Mount or unmount the locations." msgstr "Kait atau lepas kait lokasi." @@ -2394,7 +2403,7 @@ msgid "List contents of directories in a tree-like format." msgstr "Tampilkan daftar isi direktori dalam format mirip pohon." -#: gio/glib-compile-resources.c:142 gio/glib-compile-schemas.c:1516 +#: gio/glib-compile-resources.c:142 gio/glib-compile-schemas.c:1513 #, c-format msgid "Element <%s> not allowed inside <%s>" msgstr "Elemen <%s> tidak diijinkan di dalam <%s>" @@ -2449,7 +2458,7 @@ msgid "text may not appear inside <%s>" msgstr "teks tidak boleh muncul di dalam <%s>" -#: gio/glib-compile-resources.c:821 gio/glib-compile-schemas.c:2174 +#: gio/glib-compile-resources.c:821 gio/glib-compile-schemas.c:2171 msgid "Show program version and exit" msgstr "Tampilkan versi program dan keluar" @@ -2465,8 +2474,8 @@ "Direktori untuk memuat berkas yang direferensikan dalam FILE darinya " "(bawaan: direktori saat ini)" -#: gio/glib-compile-resources.c:823 gio/glib-compile-schemas.c:2175 -#: gio/glib-compile-schemas.c:2204 +#: gio/glib-compile-resources.c:823 gio/glib-compile-schemas.c:2172 +#: gio/glib-compile-schemas.c:2201 msgid "DIRECTORY" msgstr "DIREKTORI" @@ -2691,16 +2700,16 @@ msgid "<aliases> must contain at least one <alias>" msgstr "<aliases> harus berisi setidaknya satu <alias>" -#: gio/glib-compile-schemas.c:799 +#: gio/glib-compile-schemas.c:796 msgid "Empty names are not permitted" msgstr "Nama yang kosong tidak diperbolehkan" -#: gio/glib-compile-schemas.c:809 +#: gio/glib-compile-schemas.c:806 #, c-format msgid "Invalid name “%s”: names must begin with a lowercase letter" msgstr "Nama \"%s\" tak valid: nama mesti diawali dengan huruf kecil" -#: gio/glib-compile-schemas.c:821 +#: gio/glib-compile-schemas.c:818 #, c-format msgid "" "Invalid name “%s”: invalid character “%c”; only lowercase letters, numbers " @@ -2709,38 +2718,38 @@ "Nama \"%s\" tak valid: karakter \"%c\" tak valid; hanya huruf kecil, angka, " "dan tanda hubung (\"-\") yang diijinkan" -#: gio/glib-compile-schemas.c:830 +#: gio/glib-compile-schemas.c:827 #, c-format msgid "Invalid name “%s”: two successive hyphens (“--”) are not permitted" msgstr "" "Nama \"%s\" tak valid: dua tanda hubung berturutan (\"--\") tak diijinkan" -#: gio/glib-compile-schemas.c:839 +#: gio/glib-compile-schemas.c:836 #, c-format msgid "Invalid name “%s”: the last character may not be a hyphen (“-”)" msgstr "" "Nama \"%s\" tak valid: karakter terakhir tak boleh tanda hubung (\"-\")." -#: gio/glib-compile-schemas.c:847 +#: gio/glib-compile-schemas.c:844 #, c-format msgid "Invalid name “%s”: maximum length is 1024" msgstr "Nama \"%s\" tak valid: panjang maksimum 1024" -#: gio/glib-compile-schemas.c:919 +#: gio/glib-compile-schemas.c:916 #, c-format msgid "<child name='%s'> already specified" msgstr "<child name='%s'> telah dinyatakan" -#: gio/glib-compile-schemas.c:945 +#: gio/glib-compile-schemas.c:942 msgid "Cannot add keys to a “list-of” schema" msgstr "Tak bisa menambah kunci ke skema \"list-of\"" -#: gio/glib-compile-schemas.c:956 +#: gio/glib-compile-schemas.c:953 #, c-format msgid "<key name='%s'> already specified" msgstr "<key name='%s'> telah dinyatakan" -#: gio/glib-compile-schemas.c:974 +#: gio/glib-compile-schemas.c:971 #, c-format msgid "" "<key name='%s'> shadows <key name='%s'> in <schema id='%s'>; use <override> " @@ -2749,7 +2758,7 @@ "<key name='%s'> membayangi <key name='%s'> di <schema id='%s'>; gunakan " "<override> untuk mengubah nilai" -#: gio/glib-compile-schemas.c:985 +#: gio/glib-compile-schemas.c:982 #, c-format msgid "" "Exactly one of “type”, “enum” or “flags” must be specified as an attribute " @@ -2758,63 +2767,63 @@ "Persis satu dari 'type', 'enum', atau 'flags' mesti dinyatakan sebagai " "atribut dari <key>" -#: gio/glib-compile-schemas.c:1004 +#: gio/glib-compile-schemas.c:1001 #, c-format msgid "<%s id='%s'> not (yet) defined." msgstr "<%s id='%s'> belum didefinisikan." -#: gio/glib-compile-schemas.c:1019 +#: gio/glib-compile-schemas.c:1016 #, c-format msgid "Invalid GVariant type string “%s”" msgstr "String jenis GVariant \"%s\" tidak sah" -#: gio/glib-compile-schemas.c:1049 +#: gio/glib-compile-schemas.c:1046 msgid "<override> given but schema isn’t extending anything" msgstr "<override> diberikan tapi skema tak memperluas apapun" -#: gio/glib-compile-schemas.c:1062 +#: gio/glib-compile-schemas.c:1059 #, c-format msgid "No <key name='%s'> to override" msgstr "Tak ada <key name='%s'> untuk ditimpa" -#: gio/glib-compile-schemas.c:1070 +#: gio/glib-compile-schemas.c:1067 #, c-format msgid "<override name='%s'> already specified" msgstr "<override name='%s'> telah dinyatakan" -#: gio/glib-compile-schemas.c:1143 +#: gio/glib-compile-schemas.c:1140 #, c-format msgid "<schema id='%s'> already specified" msgstr "<schema id='%s'> sudah ditentukan" -#: gio/glib-compile-schemas.c:1155 +#: gio/glib-compile-schemas.c:1152 #, c-format msgid "<schema id='%s'> extends not yet existing schema “%s”" msgstr "<schema id='%s'> memperluas skema \"%s\" yang belum ada" -#: gio/glib-compile-schemas.c:1171 +#: gio/glib-compile-schemas.c:1168 #, c-format msgid "<schema id='%s'> is list of not yet existing schema “%s”" msgstr "<schema id='%s'> adalah daftar dari skema \"%s\"' yang belum ada" -#: gio/glib-compile-schemas.c:1179 +#: gio/glib-compile-schemas.c:1176 #, c-format msgid "Cannot be a list of a schema with a path" msgstr "Tak mungkin berupa suatu daftar skema dengan path" -#: gio/glib-compile-schemas.c:1189 +#: gio/glib-compile-schemas.c:1186 #, c-format msgid "Cannot extend a schema with a path" msgstr "Tak bisa memperluas suatu skema dengan path" -#: gio/glib-compile-schemas.c:1199 +#: gio/glib-compile-schemas.c:1196 #, c-format msgid "" "<schema id='%s'> is a list, extending <schema id='%s'> which is not a list" msgstr "" "<schema id='%s'> adalah daftar, memperluas <schema id='%s'> yang bukan daftar" -#: gio/glib-compile-schemas.c:1209 +#: gio/glib-compile-schemas.c:1206 #, c-format msgid "" "<schema id='%s' list-of='%s'> extends <schema id='%s' list-of='%s'> but “%s” " @@ -2823,18 +2832,18 @@ "<schema id='%s' list-of='%s'> memperluas <schema id='%s' list-of='%s'> tapi " "\"%s\" tak memperluas \"%s\"" -#: gio/glib-compile-schemas.c:1226 +#: gio/glib-compile-schemas.c:1223 #, c-format msgid "A path, if given, must begin and end with a slash" msgstr "" "Suatu path, bila diberikan, harus dimulai dan diakhiri dengan garis miring" -#: gio/glib-compile-schemas.c:1233 +#: gio/glib-compile-schemas.c:1230 #, c-format msgid "The path of a list must end with “:/”" msgstr "Path dari suatu daftar mesti diakhiri dengan “:/”" -#: gio/glib-compile-schemas.c:1242 +#: gio/glib-compile-schemas.c:1239 #, c-format msgid "" "Warning: Schema “%s” has path “%s”. Paths starting with “/apps/”, “/" @@ -2843,49 +2852,49 @@ "Peringatan: Skema \"%s\" memiliki path \"%s\". Path yang dimulai dengan \"/" "apps/\", \"/desktop/\" atau \"/system/\" tidak digunakan lagi." -#: gio/glib-compile-schemas.c:1272 +#: gio/glib-compile-schemas.c:1269 #, c-format msgid "<%s id='%s'> already specified" msgstr "<%s id='%s'> sudah ditentukan" -#: gio/glib-compile-schemas.c:1422 gio/glib-compile-schemas.c:1438 +#: gio/glib-compile-schemas.c:1419 gio/glib-compile-schemas.c:1435 #, c-format msgid "Only one <%s> element allowed inside <%s>" msgstr "Hanya satu elemen <%s> diizinkan di dalam <%s>" -#: gio/glib-compile-schemas.c:1520 +#: gio/glib-compile-schemas.c:1517 #, c-format msgid "Element <%s> not allowed at the top level" msgstr "Elemen <%s> tidak diijinkan pada aras puncak" -#: gio/glib-compile-schemas.c:1538 +#: gio/glib-compile-schemas.c:1535 msgid "Element <default> is required in <key>" msgstr "Elemen <default> diperlukan di <key>" -#: gio/glib-compile-schemas.c:1628 +#: gio/glib-compile-schemas.c:1625 #, c-format msgid "Text may not appear inside <%s>" msgstr "Teks tidak boleh muncul di dalam <%s>" -#: gio/glib-compile-schemas.c:1696 +#: gio/glib-compile-schemas.c:1693 #, c-format msgid "Warning: undefined reference to <schema id='%s'/>" msgstr "Peringatan: referensi terdefinisi ke <schema id='%s'/>" #. Translators: Do not translate "--strict". -#: gio/glib-compile-schemas.c:1835 gio/glib-compile-schemas.c:1914 +#: gio/glib-compile-schemas.c:1832 gio/glib-compile-schemas.c:1911 msgid "--strict was specified; exiting." msgstr "--strict dinyatakan; keluar." -#: gio/glib-compile-schemas.c:1847 +#: gio/glib-compile-schemas.c:1844 msgid "This entire file has been ignored." msgstr "Seluruh berkas telah diabaikan." -#: gio/glib-compile-schemas.c:1910 +#: gio/glib-compile-schemas.c:1907 msgid "Ignoring this file." msgstr "Mengabaikan berkas ini." -#: gio/glib-compile-schemas.c:1965 +#: gio/glib-compile-schemas.c:1962 #, c-format msgid "" "No such key “%s” in schema “%s” as specified in override file “%s”; ignoring " @@ -2894,7 +2903,7 @@ "Tak ada kunci “%s” dalam skema “%s” sebagaimana dinyatakan di berkas penimpa " "“%s”; mengabaikan penimpa untuk kunci ini." -#: gio/glib-compile-schemas.c:1973 +#: gio/glib-compile-schemas.c:1970 #, c-format msgid "" "No such key “%s” in schema “%s” as specified in override file “%s” and --" @@ -2903,7 +2912,7 @@ "Tak ada kunci “%s” dalam skema “%s” sebagaimana dinyatakan di berkas penimpa " "“%s” dan --strict dinyatakan; keluar." -#: gio/glib-compile-schemas.c:1995 +#: gio/glib-compile-schemas.c:1992 #, c-format msgid "" "Cannot provide per-desktop overrides for localized key “%s” in schema " @@ -2913,7 +2922,7 @@ "dalam skema \"%s\" (menimpa berkas \"%s\"); mengabaikan penimpa untuk kunci " "ini." -#: gio/glib-compile-schemas.c:2004 +#: gio/glib-compile-schemas.c:2001 #, c-format msgid "" "Cannot provide per-desktop overrides for localized key “%s” in schema " @@ -2922,7 +2931,7 @@ "Tak bisa menyediakan penimpa per-destop untuk kunci \"%s\" yang dilokalkan " "dalam skema \"%s\" (menimpa berkas \"%s\") dan --strict dinyatakan; keluar." -#: gio/glib-compile-schemas.c:2028 +#: gio/glib-compile-schemas.c:2025 #, c-format msgid "" "Error parsing key “%s” in schema “%s” as specified in override file “%s”: " @@ -2931,7 +2940,7 @@ "Galat saat mengurai kunci “%s” dalam skema “%s” sebagaimana dinyatakan di " "berkas penimpa “%s”: %s. Mengabaikan penimpa untuk kunci ini." -#: gio/glib-compile-schemas.c:2040 +#: gio/glib-compile-schemas.c:2037 #, c-format msgid "" "Error parsing key “%s” in schema “%s” as specified in override file “%s”: " @@ -2940,7 +2949,7 @@ "Galat saat mengurai kunci “%s” dalam skema “%s” sebagaimana dinyatakan di " "berkas penimpa “%s”: %s. dan --strict dinyatakan; keluar." -#: gio/glib-compile-schemas.c:2067 +#: gio/glib-compile-schemas.c:2064 #, c-format msgid "" "Override for key “%s” in schema “%s” in override file “%s” is outside the " @@ -2949,7 +2958,7 @@ "Penimpa bagi kunci “%s” dalam skema “%s” di berkas penimpa “%s” di luar " "jangkauan yang diberikan di dalam skema; mengabaikan penimpa untuk kunci ini." -#: gio/glib-compile-schemas.c:2077 +#: gio/glib-compile-schemas.c:2074 #, c-format msgid "" "Override for key “%s” in schema “%s” in override file “%s” is outside the " @@ -2958,7 +2967,7 @@ "Penimpa bagi kunci “%s” dalam skema “%s” di berkas penimpa “%s” di luar " "jangkauan yang diberikan di dalam skema dan --strict dinyatakan; keluar." -#: gio/glib-compile-schemas.c:2103 +#: gio/glib-compile-schemas.c:2100 #, c-format msgid "" "Override for key “%s” in schema “%s” in override file “%s” is not in the " @@ -2967,7 +2976,7 @@ "Penimpa bagi kunci “%s” dalam skema “%s” di berkas penimpa “%s” tak ada di " "dalam daftar pilihan yang valid; mengabaikan penimpa untuk kunci ini." -#: gio/glib-compile-schemas.c:2113 +#: gio/glib-compile-schemas.c:2110 #, c-format msgid "" "Override for key “%s” in schema “%s” in override file “%s” is not in the " @@ -2976,23 +2985,23 @@ "Penimpa bagi kunci “%s” dalam skema “%s” di berkas penimpa “%s” tak ada di " "dalam daftar pilihan yang valid dan --strict dinyatakan; keluar." -#: gio/glib-compile-schemas.c:2175 +#: gio/glib-compile-schemas.c:2172 msgid "Where to store the gschemas.compiled file" msgstr "Dimana menyimpan berkas gschemas.compiled" -#: gio/glib-compile-schemas.c:2176 +#: gio/glib-compile-schemas.c:2173 msgid "Abort on any errors in schemas" msgstr "Gugurkan pada sebarang galat dalam skema" -#: gio/glib-compile-schemas.c:2177 +#: gio/glib-compile-schemas.c:2174 msgid "Do not write the gschema.compiled file" msgstr "Jangan menulis berkas gschema.compiled" -#: gio/glib-compile-schemas.c:2178 +#: gio/glib-compile-schemas.c:2175 msgid "Do not enforce key name restrictions" msgstr "Jangan paksakan pembatasan nama kunci" -#: gio/glib-compile-schemas.c:2207 +#: gio/glib-compile-schemas.c:2204 msgid "" "Compile all GSettings schema files into a schema cache.\n" "Schema files are required to have the extension .gschema.xml,\n" @@ -3002,15 +3011,15 @@ "Berkas skema diharuskan memiliki ekstensi .gschema.xml,\n" "dan berkas singgahan dinamai gschemas.compiled." -#: gio/glib-compile-schemas.c:2228 +#: gio/glib-compile-schemas.c:2225 msgid "You should give exactly one directory name" msgstr "Anda mesti memberikan hanya satu nama direktori" -#: gio/glib-compile-schemas.c:2271 +#: gio/glib-compile-schemas.c:2268 msgid "No schema files found: doing nothing." msgstr "Tidak ada berkas skema yang ditemukan: tidak melakukan apa pun." -#: gio/glib-compile-schemas.c:2273 +#: gio/glib-compile-schemas.c:2270 msgid "No schema files found: removed existing output file." msgstr "" "Tidak ada berkas skema yang ditemukan: menghapus berkas keluaran yang telah " @@ -3021,7 +3030,7 @@ msgid "Invalid filename %s" msgstr "Nama berkas tak valid: %s" -#: gio/glocalfile.c:996 +#: gio/glocalfile.c:1005 #, c-format msgid "Error getting filesystem info for %s: %s" msgstr "Galat saat mengambil info sistem berkas bagi %s: %s" @@ -3030,126 +3039,126 @@ #. * the enclosing (user visible) mount of a file, but none #. * exists. #. -#: gio/glocalfile.c:1137 +#: gio/glocalfile.c:1141 #, c-format msgid "Containing mount for file %s not found" msgstr "Kait wadah bagi berkas %s tak ditemukan" -#: gio/glocalfile.c:1160 +#: gio/glocalfile.c:1164 msgid "Can’t rename root directory" msgstr "Tak bisa mengubah nama direktori root" -#: gio/glocalfile.c:1178 gio/glocalfile.c:1201 +#: gio/glocalfile.c:1182 gio/glocalfile.c:1205 #, c-format msgid "Error renaming file %s: %s" msgstr "Galat saat mengubah nama berkas %s: %s" -#: gio/glocalfile.c:1185 +#: gio/glocalfile.c:1189 msgid "Can’t rename file, filename already exists" msgstr "Tak bisa mengubah nama berkas, nama telah dipakai" -#: gio/glocalfile.c:1198 gio/glocalfile.c:2394 gio/glocalfile.c:2422 -#: gio/glocalfile.c:2561 gio/glocalfileoutputstream.c:658 +#: gio/glocalfile.c:1202 gio/glocalfile.c:2405 gio/glocalfile.c:2433 +#: gio/glocalfile.c:2572 gio/glocalfileoutputstream.c:658 msgid "Invalid filename" msgstr "Nama berkas tak valid" -#: gio/glocalfile.c:1366 gio/glocalfile.c:1377 +#: gio/glocalfile.c:1370 gio/glocalfile.c:1381 #, c-format msgid "Error opening file %s: %s" msgstr "Galat saat membuka berkas %s: %s" -#: gio/glocalfile.c:1502 +#: gio/glocalfile.c:1506 #, c-format msgid "Error removing file %s: %s" msgstr "Galat saat menghapus berkas %s: %s" -#: gio/glocalfile.c:1996 gio/glocalfile.c:2007 gio/glocalfile.c:2034 +#: gio/glocalfile.c:2000 gio/glocalfile.c:2011 gio/glocalfile.c:2038 #, c-format msgid "Error trashing file %s: %s" msgstr "Galat saat memindah berkas %s ke tempat sampah: %s" -#: gio/glocalfile.c:2054 +#: gio/glocalfile.c:2058 #, c-format msgid "Unable to create trash directory %s: %s" msgstr "Tak bisa membuat direktori tempat sampah %s: %s" -#: gio/glocalfile.c:2075 +#: gio/glocalfile.c:2079 #, c-format msgid "Unable to find toplevel directory to trash %s" msgstr "" "Tak bisa menemukan direktori puncak %s yang akan dibuang ke tempat sampah" -#: gio/glocalfile.c:2083 +#: gio/glocalfile.c:2087 #, c-format msgid "Trashing on system internal mounts is not supported" msgstr "Penyampahan pada kandar internal sistem tidak didukung" -#: gio/glocalfile.c:2169 gio/glocalfile.c:2197 +#: gio/glocalfile.c:2173 gio/glocalfile.c:2201 #, c-format msgid "Unable to find or create trash directory %s to trash %s" msgstr "Tak bisa menemukan atau membuat direktori %s ke tempat %s" -#: gio/glocalfile.c:2243 +#: gio/glocalfile.c:2245 #, c-format msgid "Unable to create trashing info file for %s: %s" msgstr "Tak bisa membuat berkas info pembuangan ke tempat sampah bagi %s: %s" -#: gio/glocalfile.c:2305 +#: gio/glocalfile.c:2316 #, c-format msgid "Unable to trash file %s across filesystem boundaries" msgstr "" "Tak bisa membuang berkas %s ke tempat sampah menyeberang batas sistem berkas" -#: gio/glocalfile.c:2309 gio/glocalfile.c:2365 +#: gio/glocalfile.c:2320 gio/glocalfile.c:2376 #, c-format msgid "Unable to trash file %s: %s" msgstr "Tak bisa membuang berkas %s ke tempat sampah: %s" -#: gio/glocalfile.c:2371 +#: gio/glocalfile.c:2382 #, c-format msgid "Unable to trash file %s" msgstr "Tak bisa membuang berkas ke tempat sampah %s" -#: gio/glocalfile.c:2397 +#: gio/glocalfile.c:2408 #, c-format msgid "Error creating directory %s: %s" msgstr "Galat saat membuat direktori %s: %s" -#: gio/glocalfile.c:2426 +#: gio/glocalfile.c:2437 #, c-format msgid "Filesystem does not support symbolic links" msgstr "Sistem berkas tak mendukung taut simbolik" -#: gio/glocalfile.c:2429 +#: gio/glocalfile.c:2440 #, c-format msgid "Error making symbolic link %s: %s" msgstr "Galat saat membuat taut simbolis %s: %s" -#: gio/glocalfile.c:2472 gio/glocalfile.c:2507 gio/glocalfile.c:2564 +#: gio/glocalfile.c:2483 gio/glocalfile.c:2518 gio/glocalfile.c:2575 #, c-format msgid "Error moving file %s: %s" msgstr "Galat saat memindah berkas %s: %s" -#: gio/glocalfile.c:2495 +#: gio/glocalfile.c:2506 msgid "Can’t move directory over directory" msgstr "Tak bisa memindah direktori atas direktori" -#: gio/glocalfile.c:2521 gio/glocalfileoutputstream.c:1110 +#: gio/glocalfile.c:2532 gio/glocalfileoutputstream.c:1110 #: gio/glocalfileoutputstream.c:1124 gio/glocalfileoutputstream.c:1139 #: gio/glocalfileoutputstream.c:1156 gio/glocalfileoutputstream.c:1170 msgid "Backup file creation failed" msgstr "Pembuatan berkas cadangan gagal" -#: gio/glocalfile.c:2540 +#: gio/glocalfile.c:2551 #, c-format msgid "Error removing target file: %s" msgstr "Galat saat menghapus berkas tujuan: %s" -#: gio/glocalfile.c:2554 +#: gio/glocalfile.c:2565 msgid "Move between mounts not supported" msgstr "Perpindahan antar kait tak didukung" -#: gio/glocalfile.c:2728 +#: gio/glocalfile.c:2741 #, c-format msgid "Could not determine the disk usage of %s: %s" msgstr "Tak bisa menentukan penggunaan diska dari %s: %s" @@ -3171,116 +3180,116 @@ msgid "Error setting extended attribute “%s”: %s" msgstr "Galat saat menata atribut yang diperluas \"%s\": %s" -#: gio/glocalfileinfo.c:1738 gio/win32/gwinhttpfile.c:191 +#: gio/glocalfileinfo.c:1819 gio/win32/gwinhttpfile.c:191 msgid " (invalid encoding)" msgstr " (pengkodean tak valid)" -#: gio/glocalfileinfo.c:1897 gio/glocalfileoutputstream.c:945 +#: gio/glocalfileinfo.c:1978 gio/glocalfileoutputstream.c:945 #: gio/glocalfileoutputstream.c:997 #, c-format msgid "Error when getting information for file “%s”: %s" msgstr "Galat saat mengambil informasi bagi berkas \"%s\": %s" -#: gio/glocalfileinfo.c:2163 +#: gio/glocalfileinfo.c:2281 #, c-format msgid "Error when getting information for file descriptor: %s" msgstr "Galat saat mengambil informasi bagi descriptor berkas: %s" -#: gio/glocalfileinfo.c:2208 +#: gio/glocalfileinfo.c:2326 msgid "Invalid attribute type (uint32 expected)" msgstr "Tipe atribut tak valid (diharapkan uint32)" -#: gio/glocalfileinfo.c:2226 +#: gio/glocalfileinfo.c:2344 msgid "Invalid attribute type (uint64 expected)" msgstr "Tipe atribut tak valid (diharapkan uint64)" -#: gio/glocalfileinfo.c:2245 gio/glocalfileinfo.c:2264 +#: gio/glocalfileinfo.c:2363 gio/glocalfileinfo.c:2382 msgid "Invalid attribute type (byte string expected)" msgstr "Jenis atribut tidak sah (diharapkan bita berjenis string)" -#: gio/glocalfileinfo.c:2311 +#: gio/glocalfileinfo.c:2429 msgid "Cannot set permissions on symlinks" msgstr "Tak bisa menata ijin pada taut simbolik" -#: gio/glocalfileinfo.c:2327 +#: gio/glocalfileinfo.c:2445 #, c-format msgid "Error setting permissions: %s" msgstr "Galat saat menata ijin: %s" -#: gio/glocalfileinfo.c:2378 +#: gio/glocalfileinfo.c:2496 #, c-format msgid "Error setting owner: %s" msgstr "Galat saat menata pemilik: %s" -#: gio/glocalfileinfo.c:2401 +#: gio/glocalfileinfo.c:2519 msgid "symlink must be non-NULL" msgstr "symlink tak boleh NULL" -#: gio/glocalfileinfo.c:2411 gio/glocalfileinfo.c:2430 -#: gio/glocalfileinfo.c:2441 +#: gio/glocalfileinfo.c:2529 gio/glocalfileinfo.c:2548 +#: gio/glocalfileinfo.c:2559 #, c-format msgid "Error setting symlink: %s" msgstr "Galat saat menata taut simbolis: %s" -#: gio/glocalfileinfo.c:2420 +#: gio/glocalfileinfo.c:2538 msgid "Error setting symlink: file is not a symlink" msgstr "Galat saat menata symlink: berkas bukan suatu link simbolik" -#: gio/glocalfileinfo.c:2492 +#: gio/glocalfileinfo.c:2630 #, c-format msgid "Extra nanoseconds %d for UNIX timestamp %lld are negative" msgstr "Nanodetik ekstra %d untuk stempel waktu UNIX %lld negatif" -#: gio/glocalfileinfo.c:2501 +#: gio/glocalfileinfo.c:2639 #, c-format msgid "Extra nanoseconds %d for UNIX timestamp %lld reach 1 second" msgstr "Nanodetik ekstra %d untuk stempel waktu UNIX %lld mencapai 1 detik" -#: gio/glocalfileinfo.c:2511 +#: gio/glocalfileinfo.c:2649 #, c-format msgid "UNIX timestamp %lld does not fit into 64 bits" msgstr "Stempel waktu UNIX %lld tidak muat ke dalam 64 bit" -#: gio/glocalfileinfo.c:2522 +#: gio/glocalfileinfo.c:2660 #, c-format msgid "UNIX timestamp %lld is outside of the range supported by Windows" msgstr "" "Stempel waktu UNIX %lld berada di luar rentang yang didukung oleh Windows" -#: gio/glocalfileinfo.c:2625 +#: gio/glocalfileinfo.c:2792 #, c-format msgid "File name “%s” cannot be converted to UTF-16" msgstr "Nama berkas \"%s\" tidak dapat dikonversi ke UTF-16" -#: gio/glocalfileinfo.c:2644 +#: gio/glocalfileinfo.c:2811 #, c-format msgid "File “%s” cannot be opened: Windows Error %lu" msgstr "Berkas “%s” tidak dapat dibuka: Galat Windows %lu" -#: gio/glocalfileinfo.c:2657 +#: gio/glocalfileinfo.c:2824 #, c-format msgid "Error setting modification or access time for file “%s”: %lu" msgstr "Galat saat menata waktu modifikasi atau akses untuk berkas “%s”: %lu" -#: gio/glocalfileinfo.c:2798 gio/glocalfileinfo.c:2810 +#: gio/glocalfileinfo.c:2981 #, c-format msgid "Error setting modification or access time: %s" msgstr "Galat saat menata waktu modifikasi atau akses: %s" -#: gio/glocalfileinfo.c:2833 +#: gio/glocalfileinfo.c:3004 msgid "SELinux context must be non-NULL" msgstr "Konteks SELinux tak boleh NULL" -#: gio/glocalfileinfo.c:2840 +#: gio/glocalfileinfo.c:3011 msgid "SELinux is not enabled on this system" msgstr "SELinux tak diaktifkan di sistem ini" -#: gio/glocalfileinfo.c:2850 +#: gio/glocalfileinfo.c:3021 #, c-format msgid "Error setting SELinux context: %s" msgstr "Galat saat menata konteks SELinux: %s" -#: gio/glocalfileinfo.c:2947 +#: gio/glocalfileinfo.c:3118 #, c-format msgid "Setting attribute %s not supported" msgstr "Penataan atribut %s tak didukung" @@ -3327,13 +3336,13 @@ msgid "Error renaming temporary file: %s" msgstr "Galat saat mengubah nama berkas sementara: %s" -#: gio/glocalfileoutputstream.c:611 gio/glocalfileoutputstream.c:1241 +#: gio/glocalfileoutputstream.c:611 gio/glocalfileoutputstream.c:1242 #, c-format msgid "Error truncating file: %s" msgstr "Galat saat memenggal berkas: %s" #: gio/glocalfileoutputstream.c:664 gio/glocalfileoutputstream.c:909 -#: gio/glocalfileoutputstream.c:1222 gio/gsubprocess.c:231 +#: gio/glocalfileoutputstream.c:1223 gio/gsubprocess.c:231 #, c-format msgid "Error opening file “%s”: %s" msgstr "Galat saat membuka berkas \"%s\": %s" @@ -3350,7 +3359,7 @@ msgid "The file was externally modified" msgstr "Berkas telah diubah secara eksternal" -#: gio/glocalfileoutputstream.c:1204 +#: gio/glocalfileoutputstream.c:1205 #, c-format msgid "Error removing old file: %s" msgstr "Galat saat menghapus berkas lama: %s" @@ -3497,8 +3506,8 @@ #. Translators: the first placeholder is a domain name, the #. * second is an error message #: gio/gresolver.c:403 gio/gthreadedresolver.c:152 gio/gthreadedresolver.c:170 -#: gio/gthreadedresolver.c:782 gio/gthreadedresolver.c:806 -#: gio/gthreadedresolver.c:831 gio/gthreadedresolver.c:846 +#: gio/gthreadedresolver.c:798 gio/gthreadedresolver.c:822 +#: gio/gthreadedresolver.c:847 gio/gthreadedresolver.c:862 #, c-format msgid "Error resolving “%s”: %s" msgstr "Galat saat mengurai \"%s\": %s" @@ -4210,35 +4219,35 @@ #. Translators: the placeholder is a DNS record type, such as ‘MX’ or ‘SRV’ #: gio/gthreadedresolver.c:552 gio/gthreadedresolver.c:574 -#: gio/gthreadedresolver.c:612 gio/gthreadedresolver.c:659 -#: gio/gthreadedresolver.c:688 gio/gthreadedresolver.c:700 +#: gio/gthreadedresolver.c:628 gio/gthreadedresolver.c:675 +#: gio/gthreadedresolver.c:704 gio/gthreadedresolver.c:716 #, c-format msgid "Error parsing DNS %s record: malformed DNS packet" msgstr "Galat saat mengurai record %s DNS: paket DNS salah bentuk" -#: gio/gthreadedresolver.c:758 gio/gthreadedresolver.c:895 -#: gio/gthreadedresolver.c:993 gio/gthreadedresolver.c:1043 +#: gio/gthreadedresolver.c:774 gio/gthreadedresolver.c:911 +#: gio/gthreadedresolver.c:1009 gio/gthreadedresolver.c:1059 #, c-format msgid "No DNS record of the requested type for “%s”" msgstr "Tidak ada record DNS dengan tipe yang diminta bagi \"%s\"" -#: gio/gthreadedresolver.c:763 gio/gthreadedresolver.c:998 +#: gio/gthreadedresolver.c:779 gio/gthreadedresolver.c:1014 #, c-format msgid "Temporarily unable to resolve “%s”" msgstr "Sementara tidak dapat mengurai \"%s\"" -#: gio/gthreadedresolver.c:768 gio/gthreadedresolver.c:1003 -#: gio/gthreadedresolver.c:1113 +#: gio/gthreadedresolver.c:784 gio/gthreadedresolver.c:1019 +#: gio/gthreadedresolver.c:1129 #, c-format msgid "Error resolving “%s”" msgstr "Galat saat mengurai \"%s\"" -#: gio/gthreadedresolver.c:782 gio/gthreadedresolver.c:806 -#: gio/gthreadedresolver.c:831 gio/gthreadedresolver.c:846 +#: gio/gthreadedresolver.c:798 gio/gthreadedresolver.c:822 +#: gio/gthreadedresolver.c:847 gio/gthreadedresolver.c:862 msgid "Malformed DNS packet" msgstr "Paket DNS salah bentuk" -#: gio/gthreadedresolver.c:888 +#: gio/gthreadedresolver.c:904 #, c-format msgid "Failed to parse DNS response for “%s”: " msgstr "Gagal mengurai respon DNS untuk \"%s\": " @@ -4363,7 +4372,7 @@ msgid "Error closing file descriptor: %s" msgstr "Galat saat menutup descriptor berkas: %s" -#: gio/gunixmounts.c:2815 gio/gunixmounts.c:2868 +#: gio/gunixmounts.c:2817 gio/gunixmounts.c:2870 msgid "Filesystem root" msgstr "Akar sistem berkas" @@ -4445,77 +4454,77 @@ msgid "Wrong args\n" msgstr "Arg salah\n" -#: glib/gbookmarkfile.c:779 +#: glib/gbookmarkfile.c:861 #, c-format msgid "Unexpected attribute “%s” for element “%s”" msgstr "Atribut \"%s\" yang tidak diharapkan untuk elemen \"%s\"" -#: glib/gbookmarkfile.c:790 glib/gbookmarkfile.c:870 glib/gbookmarkfile.c:880 -#: glib/gbookmarkfile.c:993 +#: glib/gbookmarkfile.c:872 glib/gbookmarkfile.c:952 glib/gbookmarkfile.c:962 +#: glib/gbookmarkfile.c:1075 #, c-format msgid "Attribute “%s” of element “%s” not found" msgstr "Atribut \"%s\" dari elemen \"%s\" tak ditemukan" -#: glib/gbookmarkfile.c:1202 glib/gbookmarkfile.c:1267 -#: glib/gbookmarkfile.c:1331 glib/gbookmarkfile.c:1341 +#: glib/gbookmarkfile.c:1284 glib/gbookmarkfile.c:1349 +#: glib/gbookmarkfile.c:1413 glib/gbookmarkfile.c:1423 #, c-format msgid "Unexpected tag “%s”, tag “%s” expected" msgstr "Tag \"%s\" yang tak diharapkan, diharapkan tag \"%s\"" -#: glib/gbookmarkfile.c:1227 glib/gbookmarkfile.c:1241 -#: glib/gbookmarkfile.c:1309 glib/gbookmarkfile.c:1355 +#: glib/gbookmarkfile.c:1309 glib/gbookmarkfile.c:1323 +#: glib/gbookmarkfile.c:1391 glib/gbookmarkfile.c:1437 #, c-format msgid "Unexpected tag “%s” inside “%s”" msgstr "Tag \"%s\" yang tak diharapkan di dalam \"%s\"" -#: glib/gbookmarkfile.c:1635 +#: glib/gbookmarkfile.c:1717 #, c-format msgid "Invalid date/time ‘%s’ in bookmark file" msgstr "Tanggal/waktu ‘%s’ tidak valid dalam berkas markah" -#: glib/gbookmarkfile.c:1838 +#: glib/gbookmarkfile.c:1956 msgid "No valid bookmark file found in data dirs" msgstr "Tak ditemukan markah yang valid di direktori data" -#: glib/gbookmarkfile.c:2039 +#: glib/gbookmarkfile.c:2157 #, c-format msgid "A bookmark for URI “%s” already exists" msgstr "Markah untuk URI \"%s\" telah ada" -#: glib/gbookmarkfile.c:2088 glib/gbookmarkfile.c:2246 -#: glib/gbookmarkfile.c:2331 glib/gbookmarkfile.c:2411 -#: glib/gbookmarkfile.c:2496 glib/gbookmarkfile.c:2630 -#: glib/gbookmarkfile.c:2763 glib/gbookmarkfile.c:2898 -#: glib/gbookmarkfile.c:2940 glib/gbookmarkfile.c:3037 -#: glib/gbookmarkfile.c:3158 glib/gbookmarkfile.c:3352 -#: glib/gbookmarkfile.c:3493 glib/gbookmarkfile.c:3712 -#: glib/gbookmarkfile.c:3801 glib/gbookmarkfile.c:3890 -#: glib/gbookmarkfile.c:4009 +#: glib/gbookmarkfile.c:2206 glib/gbookmarkfile.c:2364 +#: glib/gbookmarkfile.c:2449 glib/gbookmarkfile.c:2529 +#: glib/gbookmarkfile.c:2614 glib/gbookmarkfile.c:2748 +#: glib/gbookmarkfile.c:2881 glib/gbookmarkfile.c:3016 +#: glib/gbookmarkfile.c:3058 glib/gbookmarkfile.c:3155 +#: glib/gbookmarkfile.c:3276 glib/gbookmarkfile.c:3470 +#: glib/gbookmarkfile.c:3611 glib/gbookmarkfile.c:3830 +#: glib/gbookmarkfile.c:3919 glib/gbookmarkfile.c:4008 +#: glib/gbookmarkfile.c:4127 #, c-format msgid "No bookmark found for URI “%s”" msgstr "Tak ditemukan markah untuk URI \"%s\"" -#: glib/gbookmarkfile.c:2420 +#: glib/gbookmarkfile.c:2538 #, c-format msgid "No MIME type defined in the bookmark for URI “%s”" msgstr "Tidak ada jenis MIME yang didefinisikan pada markah untuk URI \"%s\"" -#: glib/gbookmarkfile.c:2505 +#: glib/gbookmarkfile.c:2623 #, c-format msgid "No private flag has been defined in bookmark for URI “%s”" msgstr "Tidak ada tanda privat yang ditetapkan dalam markah untuk URI \"%s\"" -#: glib/gbookmarkfile.c:3046 +#: glib/gbookmarkfile.c:3164 #, c-format msgid "No groups set in bookmark for URI “%s”" msgstr "Tidak ada grup yang ditetapkan dalam markah untuk URI \"%s\"" -#: glib/gbookmarkfile.c:3514 glib/gbookmarkfile.c:3722 +#: glib/gbookmarkfile.c:3632 glib/gbookmarkfile.c:3840 #, c-format msgid "No application with name “%s” registered a bookmark for “%s”" msgstr "Tak ditemukan aplikasi terdaftar dengan nama \"%s\" bagi markah \"%s\"" -#: glib/gbookmarkfile.c:3745 +#: glib/gbookmarkfile.c:3863 #, c-format msgid "Failed to expand exec line “%s” with URI “%s”" msgstr "Gagal mengembangkan baris eksekusi \"%s\" dengan URI \"%s\"" @@ -4990,78 +4999,78 @@ msgid "Error opening directory “%s”: %s" msgstr "Galat saat membuka direktori \"%s\": %s" -#: glib/gfileutils.c:735 glib/gfileutils.c:827 +#: glib/gfileutils.c:753 glib/gfileutils.c:845 #, c-format msgid "Could not allocate %lu byte to read file “%s”" msgid_plural "Could not allocate %lu bytes to read file “%s”" msgstr0 "Tak bisa mengalokasikan %lu bita untuk membaca berkas \"%s\"" -#: glib/gfileutils.c:752 +#: glib/gfileutils.c:770 #, c-format msgid "Error reading file “%s”: %s" msgstr "Galat saat membaca berkas \"%s\": %s" -#: glib/gfileutils.c:788 +#: glib/gfileutils.c:806 #, c-format msgid "File “%s” is too large" msgstr "Berkas \"%s\" terlalu besar" -#: glib/gfileutils.c:852 +#: glib/gfileutils.c:870 #, c-format msgid "Failed to read from file “%s”: %s" msgstr "Gagal membaca dari berkas \"%s\": %s" -#: glib/gfileutils.c:902 glib/gfileutils.c:977 glib/gfileutils.c:1449 +#: glib/gfileutils.c:920 glib/gfileutils.c:995 glib/gfileutils.c:1472 #, c-format msgid "Failed to open file “%s”: %s" msgstr "Gagal membuka berkas \"%s\": %s" -#: glib/gfileutils.c:915 +#: glib/gfileutils.c:933 #, c-format msgid "Failed to get attributes of file “%s”: fstat() failed: %s" msgstr "Gagal mendapat atribut berkas \"%s\": fstat() gagal: %s" -#: glib/gfileutils.c:946 +#: glib/gfileutils.c:964 #, c-format msgid "Failed to open file “%s”: fdopen() failed: %s" msgstr "Gagal membuka berkas \"%s\": fdopen() gagal: %s" -#: glib/gfileutils.c:1047 +#: glib/gfileutils.c:1065 #, c-format msgid "Failed to rename file “%s” to “%s”: g_rename() failed: %s" msgstr "Gagal mengubah nama berkas \"%s\" menjadi \"%s\": g_rename() gagal: %s" -#: glib/gfileutils.c:1156 +#: glib/gfileutils.c:1179 #, c-format msgid "Failed to write file “%s”: write() failed: %s" msgstr "Gagal menulis berkas \"%s\": write() gagal: %s" -#: glib/gfileutils.c:1177 +#: glib/gfileutils.c:1200 #, c-format msgid "Failed to write file “%s”: fsync() failed: %s" msgstr "Gagal menulis berkas \"%s\": fsync() gagal: %s" -#: glib/gfileutils.c:1338 glib/gfileutils.c:1753 +#: glib/gfileutils.c:1361 glib/gfileutils.c:1776 #, c-format msgid "Failed to create file “%s”: %s" msgstr "Gagal membuat berkas \"%s\": %s" -#: glib/gfileutils.c:1383 +#: glib/gfileutils.c:1406 #, c-format msgid "Existing file “%s” could not be removed: g_unlink() failed: %s" msgstr "Berkas \"%s\" yang ada tidak dapat dibuang: g_unlink() gagal: %s" -#: glib/gfileutils.c:1718 +#: glib/gfileutils.c:1741 #, c-format msgid "Template “%s” invalid, should not contain a “%s”" msgstr "Templat \"%s\" tidak valid, tidak boleh mengandung \"%s\"" -#: glib/gfileutils.c:1731 +#: glib/gfileutils.c:1754 #, c-format msgid "Template “%s” doesn’t contain XXXXXX" msgstr "Templat \"%s\" tidak memuat XXXXXX" -#: glib/gfileutils.c:2291 glib/gfileutils.c:2320 +#: glib/gfileutils.c:2348 glib/gfileutils.c:2377 #, c-format msgid "Failed to read the symbolic link “%s”: %s" msgstr "Gagal membaca taut simbolik \"%s\": %s" @@ -5124,8 +5133,8 @@ msgstr "Berkas kunci mengandung enkoding \"%s\" yang tidak didukung" #: glib/gkeyfile.c:1679 glib/gkeyfile.c:1852 glib/gkeyfile.c:3299 -#: glib/gkeyfile.c:3363 glib/gkeyfile.c:3493 glib/gkeyfile.c:3625 -#: glib/gkeyfile.c:3771 glib/gkeyfile.c:4006 glib/gkeyfile.c:4073 +#: glib/gkeyfile.c:3363 glib/gkeyfile.c:3493 glib/gkeyfile.c:3622 +#: glib/gkeyfile.c:3768 glib/gkeyfile.c:4003 glib/gkeyfile.c:4070 #, c-format msgid "Key file does not have group “%s”" msgstr "Berkas kunci tidak memiliki grup \"%s\"" @@ -5162,31 +5171,31 @@ msgid "Key “%s” in group “%s” has value “%s” where %s was expected" msgstr "Kunci \"%s\" dalam grup \"%s\" bernilai \"%s\" padahal diharapkan %s" -#: glib/gkeyfile.c:4326 +#: glib/gkeyfile.c:4323 msgid "Key file contains escape character at end of line" msgstr "Berkas kunci mengandung karakter escape pada akhir baris" -#: glib/gkeyfile.c:4348 +#: glib/gkeyfile.c:4345 #, c-format msgid "Key file contains invalid escape sequence “%s”" msgstr "Berkas kunci memuat urutan escape \"%s\" yang tidak valid" -#: glib/gkeyfile.c:4493 +#: glib/gkeyfile.c:4490 #, c-format msgid "Value “%s” cannot be interpreted as a number." msgstr "Nilai \"%s\" tidak bisa diterjemahkan sebagai sebuah bilangan." -#: glib/gkeyfile.c:4507 +#: glib/gkeyfile.c:4504 #, c-format msgid "Integer value “%s” out of range" msgstr "Nilai bilangan bulat \"%s\" di luar jangkauan" -#: glib/gkeyfile.c:4540 +#: glib/gkeyfile.c:4537 #, c-format msgid "Value “%s” cannot be interpreted as a float number." msgstr "Nilai \"%s\" tidak dapat diterjemahkan sebagai sebuah bilangan float." -#: glib/gkeyfile.c:4579 +#: glib/gkeyfile.c:4576 #, c-format msgid "Value “%s” cannot be interpreted as a boolean." msgstr "Nilai \"%s\" tidak dapat diterjemahkan sebagai sebuah boolean." @@ -5206,32 +5215,32 @@ msgid "Failed to open file “%s”: open() failed: %s" msgstr "Gagal membuka berkas \"%s\": open() gagal: %s" -#: glib/gmarkup.c:400 glib/gmarkup.c:442 +#: glib/gmarkup.c:393 glib/gmarkup.c:435 #, c-format msgid "Error on line %d char %d: " msgstr "Galat pada baris %d karakter ke-%d: " -#: glib/gmarkup.c:464 glib/gmarkup.c:547 +#: glib/gmarkup.c:457 glib/gmarkup.c:540 #, c-format msgid "Invalid UTF-8 encoded text in name — not valid “%s”" msgstr "Teks UTF-8 dalam nama tak valid — bukan “%s” yang valid" -#: glib/gmarkup.c:475 +#: glib/gmarkup.c:468 #, c-format msgid "“%s” is not a valid name" msgstr "“%s” bukan suatu nama yang valid" -#: glib/gmarkup.c:491 +#: glib/gmarkup.c:484 #, c-format msgid "“%s” is not a valid name: “%c”" msgstr "“%s” bukan suatu nama yang valid: \"%c\"" -#: glib/gmarkup.c:615 +#: glib/gmarkup.c:608 #, c-format msgid "Error on line %d: %s" msgstr "Galat pada baris ke-%d: %s" -#: glib/gmarkup.c:692 +#: glib/gmarkup.c:685 #, c-format msgid "" "Failed to parse “%-.*s”, which should have been a digit inside a character " @@ -5240,7 +5249,7 @@ "Gagal saat mengurai \"%-.*s\", yang seharusnya sebuah digit dalam referensi " "karakter (misalnya ê) — mungkin digitnya terlalu besar" -#: glib/gmarkup.c:704 +#: glib/gmarkup.c:697 msgid "" "Character reference did not end with a semicolon; most likely you used an " "ampersand character without intending to start an entity — escape ampersand " @@ -5250,25 +5259,25 @@ "menggunakan karakter ampersand tanpa bermaksud menjadikannya sebagai entitas " "— escape ampersand sebagai &" -#: glib/gmarkup.c:730 +#: glib/gmarkup.c:723 #, c-format msgid "Character reference “%-.*s” does not encode a permitted character" msgstr "" "Referensi karakter \"%-.*s\" tidak mengenkode karakter yang diperbolehkan" -#: glib/gmarkup.c:768 +#: glib/gmarkup.c:761 msgid "" "Empty entity “&;” seen; valid entities are: & " < > '" msgstr "" "Ada entitas \"&;\" yang kosong; entitas yang benar antara lain adalah: & " "" < > '" -#: glib/gmarkup.c:776 +#: glib/gmarkup.c:769 #, c-format msgid "Entity name “%-.*s” is not known" msgstr "Nama entitas \"%-.*s\" tak dikenal" -#: glib/gmarkup.c:781 +#: glib/gmarkup.c:774 msgid "" "Entity did not end with a semicolon; most likely you used an ampersand " "character without intending to start an entity — escape ampersand as &" @@ -5277,11 +5286,11 @@ "ampersand tanpa bermaksud menjadikannya sebagai entitas — escape ampersand " "sebagai &" -#: glib/gmarkup.c:1195 +#: glib/gmarkup.c:1188 msgid "Document must begin with an element (e.g. <book>)" msgstr "Dokumen harus dimulai dengan elemen (misalnya <book>)" -#: glib/gmarkup.c:1235 +#: glib/gmarkup.c:1228 #, c-format msgid "" "“%s” is not a valid character following a “<” character; it may not begin an " @@ -5290,7 +5299,7 @@ "“%s” bukanlah karakter yang benar bila diikuti dengan karakter \"<\". Ini " "tidak boleh menjadi nama elemen" -#: glib/gmarkup.c:1278 +#: glib/gmarkup.c:1271 #, c-format msgid "" "Odd character “%s”, expected a “>” character to end the empty-element tag " @@ -5299,12 +5308,12 @@ "Ada karakter aneh “%s”, seharusnya ada \">\" untuk mengakhiri tag elemen " "kosong “%s”" -#: glib/gmarkup.c:1348 +#: glib/gmarkup.c:1341 #, c-format msgid "Too many attributes in element “%s”" msgstr "Terlalu banyak atribut dalam elemen \"%s\"" -#: glib/gmarkup.c:1368 +#: glib/gmarkup.c:1361 #, c-format msgid "" "Odd character “%s”, expected a “=” after attribute name “%s” of element “%s”" @@ -5312,7 +5321,7 @@ "Ada karakter aneh “%s”. Seharusnya ada karakter '=' setelah nama atribut " "“%s” pada elemen “%s”" -#: glib/gmarkup.c:1410 +#: glib/gmarkup.c:1403 #, c-format msgid "" "Odd character “%s”, expected a “>” or “/” character to end the start tag of " @@ -5323,7 +5332,7 @@ "padaelemen “%s”, atau bisa juga ada atribut lain. Mungkin Anda menggunakan " "karakter yang tidak diperbolehkan pada nama atribut" -#: glib/gmarkup.c:1455 +#: glib/gmarkup.c:1448 #, c-format msgid "" "Odd character “%s”, expected an open quote mark after the equals sign when " @@ -5332,7 +5341,7 @@ "Ada karakter aneh “%s”. Seharusnya ada tanda kutip buka setelah tanda sama " "dengan saat memberikan nilai atribut “%s” pada elemen “%s”" -#: glib/gmarkup.c:1589 +#: glib/gmarkup.c:1582 #, c-format msgid "" "“%s” is not a valid character following the characters “</”; “%s” may not " @@ -5341,7 +5350,7 @@ "“%s” bukan karakter yang benar bila diikuti dengan karakter \"</\". Karena " "itu “%s” tidak boleh dijadikan awal nama elemen" -#: glib/gmarkup.c:1627 +#: glib/gmarkup.c:1620 #, c-format msgid "" "“%s” is not a valid character following the close element name “%s”; the " @@ -5350,26 +5359,26 @@ "“%s” bukan karakter yang benar bila diikuti elemen penutup “%s”. Karakter " "yang diperbolehkan adalah \">\"" -#: glib/gmarkup.c:1639 +#: glib/gmarkup.c:1632 #, c-format msgid "Element “%s” was closed, no element is currently open" msgstr "Elemen “%s” sudah ditutup, tidak ada elemen yang masih terbuka" -#: glib/gmarkup.c:1648 +#: glib/gmarkup.c:1641 #, c-format msgid "Element “%s” was closed, but the currently open element is “%s”" msgstr "Elemen “%s” sudah ditutup, tapi elemen yang masih terbuka adalah “%s”" -#: glib/gmarkup.c:1801 +#: glib/gmarkup.c:1794 msgid "Document was empty or contained only whitespace" msgstr "Dokumen kosong atau berisi whitespace saja" -#: glib/gmarkup.c:1815 +#: glib/gmarkup.c:1808 msgid "Document ended unexpectedly just after an open angle bracket “<”" msgstr "" "Dokumen terpotong tidak sempurna sesaat setelah membuka kurung siku \"<\"" -#: glib/gmarkup.c:1823 glib/gmarkup.c:1868 +#: glib/gmarkup.c:1816 glib/gmarkup.c:1861 #, c-format msgid "" "Document ended unexpectedly with elements still open — “%s” was the last " @@ -5378,7 +5387,7 @@ "Dokumen terpotong tidak sempurna dengan elemen yang masih terbuka — “%s” " "adalah elemen terakhir yang dibuka" -#: glib/gmarkup.c:1831 +#: glib/gmarkup.c:1824 #, c-format msgid "" "Document ended unexpectedly, expected to see a close angle bracket ending " @@ -5387,19 +5396,19 @@ "Dokumen terpotong tidak sempurna, seharusnya ada kurung siku penutup untuk " "mengakhiri tag <%s/>" -#: glib/gmarkup.c:1837 +#: glib/gmarkup.c:1830 msgid "Document ended unexpectedly inside an element name" msgstr "Dokumen terpotong tidak sempurna pada dalam nama elemen" -#: glib/gmarkup.c:1843 +#: glib/gmarkup.c:1836 msgid "Document ended unexpectedly inside an attribute name" msgstr "Dokumen terpotong tidak sempurna di dalam nama atribut" -#: glib/gmarkup.c:1848 +#: glib/gmarkup.c:1841 msgid "Document ended unexpectedly inside an element-opening tag." msgstr "Dokumen terpotong tidak sempurna di dalam tag pembukaan elemen." -#: glib/gmarkup.c:1854 +#: glib/gmarkup.c:1847 msgid "" "Document ended unexpectedly after the equals sign following an attribute " "name; no attribute value" @@ -5407,23 +5416,23 @@ "Dokumen terpotong tidak sempurna setelah tanda sama dengan mengikuti nama " "atribut. Tidak ada nilai atribut yang diperoleh" -#: glib/gmarkup.c:1861 +#: glib/gmarkup.c:1854 msgid "Document ended unexpectedly while inside an attribute value" msgstr "Dokumen tidak sempura saat ada dalam nilai atribut" -#: glib/gmarkup.c:1878 +#: glib/gmarkup.c:1871 #, c-format msgid "Document ended unexpectedly inside the close tag for element “%s”" msgstr "Dokumen terpotong tidak sempurna di dalam tag penutup elemen “%s”" -#: glib/gmarkup.c:1882 +#: glib/gmarkup.c:1875 msgid "" "Document ended unexpectedly inside the close tag for an unopened element" msgstr "" "Dokumen terpotong tidak sempurna di dalam tag penutup untuk elemen yang " "belum dibuka" -#: glib/gmarkup.c:1888 +#: glib/gmarkup.c:1881 msgid "Document ended unexpectedly inside a comment or processing instruction" msgstr "" "Dokumen terpotong tidak sempurna di dalam keterangan atau instruksi " @@ -5488,184 +5497,184 @@ msgid "Unknown option %s" msgstr "Pilihan tidak diketahui %s" -#: glib/gregex.c:436 +#: glib/gregex.c:479 msgid "corrupted object" msgstr "objek rusak" -#: glib/gregex.c:438 +#: glib/gregex.c:481 msgid "out of memory" msgstr "kehabisan memori" -#: glib/gregex.c:443 +#: glib/gregex.c:487 msgid "backtracking limit reached" msgstr "batas pelacakan balik tercapai" -#: glib/gregex.c:454 glib/gregex.c:707 glib/gregex.c:736 +#: glib/gregex.c:498 msgid "internal error" msgstr "kesalahan internal" -#: glib/gregex.c:456 +#: glib/gregex.c:500 msgid "the pattern contains items not supported for partial matching" msgstr "pola memuat butir yang tak didukung bagi pencocokan sebagian" -#: glib/gregex.c:458 +#: glib/gregex.c:502 msgid "back references as conditions are not supported for partial matching" msgstr "acuan balik sebagai persyaratan tak didukung bagi pencocokan sebagian" -#: glib/gregex.c:464 +#: glib/gregex.c:508 msgid "recursion limit reached" msgstr "batas rekursi dicapai" -#: glib/gregex.c:466 +#: glib/gregex.c:510 msgid "bad offset" msgstr "nilai offset salah" -#: glib/gregex.c:468 +#: glib/gregex.c:512 msgid "recursion loop" msgstr "pengulangan rekursi" #. should not happen in GRegex since we check modes before each match -#: glib/gregex.c:471 +#: glib/gregex.c:515 msgid "matching mode is requested that was not compiled for JIT" msgstr "mode pencocokan diminta yang tidak dikompilasi untuk JIT" -#: glib/gregex.c:475 +#: glib/gregex.c:536 glib/gregex.c:1838 msgid "unknown error" msgstr "galat tak dikenal" -#: glib/gregex.c:496 +#: glib/gregex.c:557 msgid "\\ at end of pattern" msgstr "\\ di akhir pola" -#: glib/gregex.c:500 +#: glib/gregex.c:561 msgid "\\c at end of pattern" msgstr "\\c di akhir pola" -#: glib/gregex.c:505 +#: glib/gregex.c:566 msgid "unrecognized character following \\" msgstr "karakter tak dikenal setelah \\" -#: glib/gregex.c:509 +#: glib/gregex.c:570 msgid "numbers out of order in {} quantifier" msgstr "angka tak urut di quantifier {}" -#: glib/gregex.c:513 +#: glib/gregex.c:574 msgid "number too big in {} quantifier" msgstr "angka terlalu besar di quantifier {}" -#: glib/gregex.c:517 +#: glib/gregex.c:578 msgid "missing terminating for character class" msgstr "pengakhiran hilang bagi kelas karakter" -#: glib/gregex.c:521 +#: glib/gregex.c:582 msgid "invalid escape sequence in character class" msgstr "rangkaian escape tak valid dalam kelas karakter" -#: glib/gregex.c:525 +#: glib/gregex.c:586 msgid "range out of order in character class" msgstr "jangkauan tak terurut dalam kelas karakter" -#: glib/gregex.c:530 +#: glib/gregex.c:591 msgid "nothing to repeat" msgstr "tak ada yang dapat diulang" -#: glib/gregex.c:534 +#: glib/gregex.c:595 msgid "unrecognized character after (? or (?-" msgstr "karakter tak dikenal setelah (? atau (?-" -#: glib/gregex.c:538 +#: glib/gregex.c:599 msgid "POSIX named classes are supported only within a class" msgstr "kelas POSIX bernama hanya didukung di dalam suatu kelas" -#: glib/gregex.c:542 +#: glib/gregex.c:603 msgid "POSIX collating elements are not supported" msgstr "elemen kolasi POSIX tak didukung" -#: glib/gregex.c:548 +#: glib/gregex.c:609 msgid "missing terminating )" msgstr "pengakhiran ) hilang" -#: glib/gregex.c:552 +#: glib/gregex.c:613 msgid "reference to non-existent subpattern" msgstr "acuan ke sub pola yang tak ada" -#: glib/gregex.c:556 +#: glib/gregex.c:617 msgid "missing ) after comment" msgstr "tak ada ) setelah komentar" -#: glib/gregex.c:560 +#: glib/gregex.c:621 msgid "regular expression is too large" msgstr "ekspresi reguler terlalu besar" -#: glib/gregex.c:564 +#: glib/gregex.c:625 msgid "malformed number or name after (?(" msgstr "angka atau nama salah bentuk setelah (?(" -#: glib/gregex.c:568 +#: glib/gregex.c:629 msgid "lookbehind assertion is not fixed length" msgstr "panjang asersi lookbehind tak tetap" -#: glib/gregex.c:572 +#: glib/gregex.c:633 msgid "conditional group contains more than two branches" msgstr "grup bersyarat mengandung lebih dari dua cabang" -#: glib/gregex.c:576 +#: glib/gregex.c:637 msgid "assertion expected after (?(" msgstr "berharap asersi setelah (?(" -#: glib/gregex.c:580 +#: glib/gregex.c:641 msgid "a numbered reference must not be zero" msgstr "acuan bernomor tak boleh nol" -#: glib/gregex.c:584 +#: glib/gregex.c:645 msgid "unknown POSIX class name" msgstr "nama kelas POSIX tak dikenal" -#: glib/gregex.c:589 +#: glib/gregex.c:650 msgid "character value in \\x{...} sequence is too large" msgstr "nilai karakter dalam urutan \\x{...} terlalu besar" -#: glib/gregex.c:593 +#: glib/gregex.c:654 msgid "\\C not allowed in lookbehind assertion" msgstr "\\C tak diijinkan di asersi lookbehind" -#: glib/gregex.c:597 +#: glib/gregex.c:658 msgid "missing terminator in subpattern name" msgstr "terminator di nama sub pola hilang" -#: glib/gregex.c:601 +#: glib/gregex.c:662 msgid "two named subpatterns have the same name" msgstr "dua sub pola yang bernama memiliki nama sama" -#: glib/gregex.c:605 +#: glib/gregex.c:666 msgid "malformed \\P or \\p sequence" msgstr "urutan \\P atau \\p salah bentuk" -#: glib/gregex.c:609 +#: glib/gregex.c:670 msgid "unknown property name after \\P or \\p" msgstr "nama properti tak dikenal setelah \\P atau \\p" -#: glib/gregex.c:613 +#: glib/gregex.c:674 msgid "subpattern name is too long (maximum 32 characters)" msgstr "nama sub pola terlalu panjang (maksimum 32 karakter)" -#: glib/gregex.c:617 +#: glib/gregex.c:678 msgid "too many named subpatterns (maximum 10,000)" msgstr "terlalu banyak sub pola yang dinamai (maksimum 10.000)" -#: glib/gregex.c:621 +#: glib/gregex.c:682 msgid "octal value is greater than \\377" msgstr "nilai oktal lebih dari \\377" -#: glib/gregex.c:625 +#: glib/gregex.c:686 msgid "DEFINE group contains more than one branch" msgstr "grup DEFINE mengandung lebih dari satu cabang" -#: glib/gregex.c:629 +#: glib/gregex.c:690 msgid "inconsistent NEWLINE options" msgstr "opsi NEWLINE tak konsisten" -#: glib/gregex.c:633 +#: glib/gregex.c:694 msgid "" "\\g is not followed by a braced, angle-bracketed, or quoted name or number, " "or by a plain number" @@ -5673,119 +5682,119 @@ "\\g tak diikuti oleh bilangan atau nama dalam tanda kutip, kurung siku, atau " "kurung kurawal, atau bilangan polos" -#: glib/gregex.c:638 +#: glib/gregex.c:699 msgid "an argument is not allowed for (*ACCEPT), (*FAIL), or (*COMMIT)" msgstr "argumen tak diijinkan bagi (*ACCEPT), (*FAIL), atau (*COMMIT)" -#: glib/gregex.c:642 +#: glib/gregex.c:703 msgid "(*VERB) not recognized" msgstr "(*VERB) tak dikenal" -#: glib/gregex.c:646 +#: glib/gregex.c:707 msgid "number is too big" msgstr "angka terlalu besar" -#: glib/gregex.c:650 +#: glib/gregex.c:711 msgid "missing subpattern name after (?&" msgstr "kurang nama sub pola setelah (?&" -#: glib/gregex.c:654 +#: glib/gregex.c:715 msgid "different names for subpatterns of the same number are not allowed" msgstr "nama-nama berbeda bagi sub pola dari bilangan yang sama tak diijinkan" -#: glib/gregex.c:658 +#: glib/gregex.c:719 msgid "(*MARK) must have an argument" msgstr "(*MARK) mesti punya argumen" -#: glib/gregex.c:662 +#: glib/gregex.c:723 msgid "\\c must be followed by an ASCII character" msgstr "\\c mesti diikuti oleh sebuah karakter ASCII" -#: glib/gregex.c:666 +#: glib/gregex.c:727 msgid "\\k is not followed by a braced, angle-bracketed, or quoted name" msgstr "" "\\k tak diikuti oleh nama yang diapit tanda kutip, kurung siku, atau kurung " "kurawal" -#: glib/gregex.c:670 +#: glib/gregex.c:731 msgid "\\N is not supported in a class" msgstr "\\N tak didukung dalam suatu kelas" -#: glib/gregex.c:674 +#: glib/gregex.c:735 msgid "name is too long in (*MARK), (*PRUNE), (*SKIP), or (*THEN)" msgstr "nama terlalu panjang dalam (*MARK), (*PRUNE), (*SKIP), atau (*THEN)" -#: glib/gregex.c:678 glib/gregex.c:809 +#: glib/gregex.c:739 glib/gregex.c:875 msgid "code overflow" msgstr "kode tumpah (overflow)" -#: glib/gregex.c:682 +#: glib/gregex.c:743 msgid "unrecognized character after (?P" msgstr "karakter tak dikenal setelah (?P" -#: glib/gregex.c:686 +#: glib/gregex.c:747 msgid "overran compiling workspace" msgstr "menimpa ruang kerja kompilasi" -#: glib/gregex.c:690 +#: glib/gregex.c:751 msgid "previously-checked referenced subpattern not found" msgstr "sub pola yang diacu yang sebelumnya diperiksa tak ditemukan" -#: glib/gregex.c:808 glib/gregex.c:1041 glib/gregex.c:2342 +#: glib/gregex.c:874 glib/gregex.c:1121 glib/gregex.c:2444 #, c-format msgid "Error while matching regular expression %s: %s" msgstr "Galat saat mencocokkan ekspresi reguler %s: %s" -#: glib/gregex.c:1618 +#: glib/gregex.c:1721 msgid "PCRE library is compiled without UTF8 support" msgstr "Pustaka PCRE dikompail tanpa dukungan UTF-8" -#: glib/gregex.c:1626 +#: glib/gregex.c:1729 msgid "PCRE library is compiled with incompatible options" msgstr "Pustaka PCRE dikompail dengan opsi yang tak kompatibel" -#: glib/gregex.c:1751 +#: glib/gregex.c:1847 #, c-format msgid "Error while compiling regular expression ‘%s’ at char %s: %s" msgstr "Galat saat mengkompail ekspresi reguler ‘%s’ pada karakter %s: %s" -#: glib/gregex.c:2786 +#: glib/gregex.c:2887 msgid "hexadecimal digit or “}” expected" msgstr "digit heksadesimal atau \"}\" diharapkan" -#: glib/gregex.c:2802 +#: glib/gregex.c:2903 msgid "hexadecimal digit expected" msgstr "digit heksadesimal diharapkan" -#: glib/gregex.c:2842 +#: glib/gregex.c:2943 msgid "missing “<” in symbolic reference" msgstr "kurang \"<\" dalam acuan simbolis" -#: glib/gregex.c:2851 +#: glib/gregex.c:2952 msgid "unfinished symbolic reference" msgstr "acuan simbolis yang belum selesai" -#: glib/gregex.c:2858 +#: glib/gregex.c:2959 msgid "zero-length symbolic reference" msgstr "acuan simbolis dengan panjang nol" -#: glib/gregex.c:2869 +#: glib/gregex.c:2970 msgid "digit expected" msgstr "diharapkan digit" -#: glib/gregex.c:2887 +#: glib/gregex.c:2988 msgid "illegal symbolic reference" msgstr "acuan simbolis yang tak legal" -#: glib/gregex.c:2950 +#: glib/gregex.c:3051 msgid "stray final “\\”" msgstr "\"\\\" akhir yang tersesat" -#: glib/gregex.c:2954 +#: glib/gregex.c:3055 msgid "unknown escape sequence" msgstr "urutan escape tak dikenal" -#: glib/gregex.c:2964 +#: glib/gregex.c:3065 #, c-format msgid "Error while parsing replacement text “%s” at char %lu: %s" msgstr "Galat saat mengurai teks pengganti \"%s\" pada karakter %lu: %s" @@ -5816,96 +5825,101 @@ msgid "Text was empty (or contained only whitespace)" msgstr "Teksnya kosong (atau hanya berisi whitespace)" -#: glib/gspawn.c:314 +#: glib/gspawn.c:319 #, c-format msgid "Failed to read data from child process (%s)" msgstr "Gagal saat membaca data dari proses anak (%s)" -#: glib/gspawn.c:466 +#: glib/gspawn.c:471 #, c-format msgid "Unexpected error in reading data from a child process (%s)" msgstr "Galat tak terduga dalam membaca data dari proses anak (%s)" -#: glib/gspawn.c:551 +#: glib/gspawn.c:556 #, c-format msgid "Unexpected error in waitpid() (%s)" msgstr "Terjadi galat pada fungsi waitpid() (%s)" -#: glib/gspawn.c:1170 glib/gspawn-win32.c:1488 +#: glib/gspawn.c:1175 glib/gspawn-win32.c:1503 #, c-format msgid "Child process exited with code %ld" msgstr "Proses anak keluar dengan kode %ld" -#: glib/gspawn.c:1178 +#: glib/gspawn.c:1183 #, c-format msgid "Child process killed by signal %ld" msgstr "Proses anak dimatikan oleh sinyal %ld" -#: glib/gspawn.c:1185 +#: glib/gspawn.c:1190 #, c-format msgid "Child process stopped by signal %ld" msgstr "Proses anak dihentikan oleh sinyal %ld" -#: glib/gspawn.c:1192 +#: glib/gspawn.c:1197 #, c-format msgid "Child process exited abnormally" msgstr "Proses anak keluar secara tak normal" -#: glib/gspawn.c:1885 glib/gspawn-win32.c:393 glib/gspawn-win32.c:401 +#: glib/gspawn.c:2027 glib/gspawn-win32.c:393 glib/gspawn-win32.c:401 #, c-format msgid "Failed to read from child pipe (%s)" msgstr "Gagal saat membaca dari pipe anak (%s)" -#: glib/gspawn.c:2248 +#: glib/gspawn.c:2399 #, c-format msgid "Failed to spawn child process “%s” (%s)" msgstr "Gagal menelurkan proses anak \"%s\" (%s)" -#: glib/gspawn.c:2365 +#: glib/gspawn.c:2525 #, c-format msgid "Failed to fork (%s)" msgstr "Gagal saat fork (%s)" -#: glib/gspawn.c:2525 glib/gspawn-win32.c:424 +#: glib/gspawn.c:2685 glib/gspawn-win32.c:424 #, c-format msgid "Failed to change to directory “%s” (%s)" msgstr "Gagal pindah ke direktori \"%s\" (%s)" -#: glib/gspawn.c:2535 +#: glib/gspawn.c:2695 #, c-format msgid "Failed to execute child process “%s” (%s)" msgstr "Gagal menjalankan proses anak \"%s\" (%s)" -#: glib/gspawn.c:2545 +#: glib/gspawn.c:2705 #, c-format msgid "Failed to open file to remap file descriptor (%s)" msgstr "Gagal membuka berkas untuk memetakan ulang deskriptor berkas (%s)" -#: glib/gspawn.c:2553 +#: glib/gspawn.c:2713 #, c-format msgid "Failed to duplicate file descriptor for child process (%s)" msgstr "Gagal menduplikasi deskriptor berkas untuk proses anak (%s)" -#: glib/gspawn.c:2562 +#: glib/gspawn.c:2722 #, c-format msgid "Failed to fork child process (%s)" msgstr "Gagal saat fork proses anak (%s)" -#: glib/gspawn.c:2570 +#: glib/gspawn.c:2730 #, c-format msgid "Failed to close file descriptor for child process (%s)" msgstr "Gagal menutup deskriptor berkas untuk proses anak (%s)" -#: glib/gspawn.c:2578 +#: glib/gspawn.c:2738 #, c-format msgid "Unknown error executing child process “%s”" msgstr "Galat tak dikenal ketika menjalankan proses anak \"%s\"" -#: glib/gspawn.c:2602 +#: glib/gspawn.c:2762 #, c-format msgid "Failed to read enough data from child pid pipe (%s)" msgstr "Gagal saat membaca data yang dibutuhkan dai pipe pid anak (%s)" +#: glib/gspawn-private.h:134 +#, c-format +msgid "Invalid source FDs argument" +msgstr "Argumen FDs sumber tidak valid" + #: glib/gspawn-win32.c:337 msgid "Failed to read data from child process" msgstr "Gagal untuk membaca data dari proses anak" @@ -5925,27 +5939,27 @@ msgid "Invalid program name: %s" msgstr "Nama program salah: %s" -#: glib/gspawn-win32.c:521 glib/gspawn-win32.c:853 +#: glib/gspawn-win32.c:521 glib/gspawn-win32.c:868 #, c-format msgid "Invalid string in argument vector at %d: %s" msgstr "String tidak benar pada vektor argumen pada %d: %s" -#: glib/gspawn-win32.c:532 glib/gspawn-win32.c:869 +#: glib/gspawn-win32.c:532 glib/gspawn-win32.c:884 #, c-format msgid "Invalid string in environment: %s" msgstr "String tidak benar pada variabel lingkungan: %s" -#: glib/gspawn-win32.c:849 +#: glib/gspawn-win32.c:864 #, c-format msgid "Invalid working directory: %s" msgstr "Direktori aktif salah: %s" -#: glib/gspawn-win32.c:914 +#: glib/gspawn-win32.c:929 #, c-format msgid "Failed to execute helper program (%s)" msgstr "Gagal saat menjalankan program bantuan (%s)" -#: glib/gspawn-win32.c:1143 +#: glib/gspawn-win32.c:1158 msgid "" "Unexpected error in g_io_channel_win32_poll() reading data from a child " "process" @@ -5953,21 +5967,21 @@ "Terjadi galat pada g_io_channel_win32_poll() ketika membaca data dari anak " "proses" -#: glib/gstrfuncs.c:3366 glib/gstrfuncs.c:3468 +#: glib/gstrfuncs.c:3370 glib/gstrfuncs.c:3472 msgid "Empty string is not a number" msgstr "String kosong bukan angka" -#: glib/gstrfuncs.c:3390 +#: glib/gstrfuncs.c:3394 #, c-format msgid "“%s” is not a signed number" msgstr "\"%s\" bukan bilangan bertanda" -#: glib/gstrfuncs.c:3400 glib/gstrfuncs.c:3504 +#: glib/gstrfuncs.c:3404 glib/gstrfuncs.c:3508 #, c-format msgid "Number “%s” is out of bounds %s, %s" msgstr "Nomor \"%s\" berada di luar batas %s, %s" -#: glib/gstrfuncs.c:3494 +#: glib/gstrfuncs.c:3498 #, c-format msgid "“%s” is not an unsigned number" msgstr "\"%s\" bukan bilangan tak bertanda" @@ -6046,138 +6060,138 @@ msgstr "Karakter di luar jangkauan UTF-16" #. Translators: A unit symbol for size formatting, showing for example: "13.0 kB" -#: glib/gutils.c:2857 +#: glib/gutils.c:2966 msgid "kB" msgstr "kB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 MB" -#: glib/gutils.c:2859 +#: glib/gutils.c:2968 msgid "MB" msgstr "MB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 GB" -#: glib/gutils.c:2861 +#: glib/gutils.c:2970 msgid "GB" msgstr "GB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 TB" -#: glib/gutils.c:2863 +#: glib/gutils.c:2972 msgid "TB" msgstr "TB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 PB" -#: glib/gutils.c:2865 +#: glib/gutils.c:2974 msgid "PB" msgstr "PB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 EB" -#: glib/gutils.c:2867 +#: glib/gutils.c:2976 msgid "EB" msgstr "EB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 KiB" -#: glib/gutils.c:2871 +#: glib/gutils.c:2980 msgid "KiB" msgstr "KiB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 MiB" -#: glib/gutils.c:2873 +#: glib/gutils.c:2982 msgid "MiB" msgstr "MiB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 GiB" -#: glib/gutils.c:2875 +#: glib/gutils.c:2984 msgid "GiB" msgstr "GiB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 TiB" -#: glib/gutils.c:2877 +#: glib/gutils.c:2986 msgid "TiB" msgstr "TiB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 PiB" -#: glib/gutils.c:2879 +#: glib/gutils.c:2988 msgid "PiB" msgstr "PiB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 EiB" -#: glib/gutils.c:2881 +#: glib/gutils.c:2990 msgid "EiB" msgstr "EiB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 kb" -#: glib/gutils.c:2885 +#: glib/gutils.c:2994 msgid "kb" msgstr "kb" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Mb" -#: glib/gutils.c:2887 +#: glib/gutils.c:2996 msgid "Mb" msgstr "Mb" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Gb" -#: glib/gutils.c:2889 +#: glib/gutils.c:2998 msgid "Gb" msgstr "Gb" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Tb" -#: glib/gutils.c:2891 +#: glib/gutils.c:3000 msgid "Tb" msgstr "Tb" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Pb" -#: glib/gutils.c:2893 +#: glib/gutils.c:3002 msgid "Pb" msgstr "Pb" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Eb" -#: glib/gutils.c:2895 +#: glib/gutils.c:3004 msgid "Eb" msgstr "Eb" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Kib" -#: glib/gutils.c:2899 +#: glib/gutils.c:3008 msgid "Kib" msgstr "Kib" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Mib" -#: glib/gutils.c:2901 +#: glib/gutils.c:3010 msgid "Mib" msgstr "Mib" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Gib" -#: glib/gutils.c:2903 +#: glib/gutils.c:3012 msgid "Gib" msgstr "Gib" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Tib" -#: glib/gutils.c:2905 +#: glib/gutils.c:3014 msgid "Tib" msgstr "Tib" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Pib" -#: glib/gutils.c:2907 +#: glib/gutils.c:3016 msgid "Pib" msgstr "Pib" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Eib" -#: glib/gutils.c:2909 +#: glib/gutils.c:3018 msgid "Eib" msgstr "Eib" -#: glib/gutils.c:2947 +#: glib/gutils.c:3056 msgid "byte" msgid_plural "bytes" msgstr0 "bita" -#: glib/gutils.c:2951 +#: glib/gutils.c:3060 msgid "bit" msgid_plural "bits" msgstr0 "bita" #. Translators: The "%u" is replaced with the size value, like "13"; it could #. * be part of "13 bytes", but only the number is requested this time. -#: glib/gutils.c:2959 +#: glib/gutils.c:3068 #, c-format msgctxt "format-size" msgid "%u" @@ -6185,7 +6199,7 @@ #. Translators: The first "%u" is replaced with the value, the "%s" with a unit of the value. #. * The order can be changed with "%$2s %$1u". An example: "13 bytes" -#: glib/gutils.c:2964 +#: glib/gutils.c:3073 #, c-format msgctxt "format-size" msgid "%u %s" @@ -6193,7 +6207,7 @@ #. Translators: The "%.1f" is replaced with the size value, like "13.0"; it could #. * be part of "13.0 MB", but only the number is requested this time. -#: glib/gutils.c:3000 +#: glib/gutils.c:3109 #, c-format msgctxt "format-size" msgid "%.1f" @@ -6202,27 +6216,27 @@ #. Translators: The first "%.1f" is replaced with the value, the "%s" with a unit of the value. #. * The order can be changed with "%$2s %$1.1f". Keep the no-break space between the value and #. * the unit symbol. An example: "13.0 MB" -#: glib/gutils.c:3006 +#: glib/gutils.c:3115 #, c-format msgctxt "format-size" msgid "%.1f %s" msgstr "%.1f %s" #. Translators: the %s in "%s bytes" will always be replaced by a number. -#: glib/gutils.c:3046 +#: glib/gutils.c:3155 #, c-format msgid "%s byte" msgid_plural "%s bytes" msgstr0 "%s bita" #. Translators: the %s in "%s bits" will always be replaced by a number. -#: glib/gutils.c:3051 +#: glib/gutils.c:3160 #, c-format msgid "%s bit" msgid_plural "%s bits" msgstr0 "%s bita" -#: glib/gutils.c:3092 +#: glib/gutils.c:3201 #, c-format msgid "%u byte" msgid_plural "%u bytes" @@ -6233,32 +6247,32 @@ #. * compatibility. Users will not see this string unless a program is using this deprecated function. #. * Please translate as literally as possible. #. -#: glib/gutils.c:3105 +#: glib/gutils.c:3214 #, c-format msgid "%.1f KB" msgstr "%.1f KB" -#: glib/gutils.c:3110 +#: glib/gutils.c:3219 #, c-format msgid "%.1f MB" msgstr "%.1f MB" -#: glib/gutils.c:3115 +#: glib/gutils.c:3224 #, c-format msgid "%.1f GB" msgstr "%.1f GB" -#: glib/gutils.c:3120 +#: glib/gutils.c:3229 #, c-format msgid "%.1f TB" msgstr "%.1f TB" -#: glib/gutils.c:3125 +#: glib/gutils.c:3234 #, c-format msgid "%.1f PB" msgstr "%.1f PB" -#: glib/gutils.c:3130 +#: glib/gutils.c:3239 #, c-format msgid "%.1f EB" msgstr "%.1f EB"
View file
_service:tar_scm:glib-2.74.4.tar.xz/po/ka.po -> _service:tar_scm:glib-2.76.4.tar.xz/po/ka.po
Changed
@@ -1,152 +1,163 @@ -# Georgian transaltion for glib -# Copyright (C) 2022, glib authors -# This file is distributed under the same license as the glib package. -# Ekaterine Papava <papava.e@gtu.ge>, 2022 +# Georgian translation for glib +# Copyright (C) 2023 glib's authors. +# This file is distributed under the same license as the PACKAGE package. +# Ekaterine Papava <papava.e@gtu.ge>, 2023. # msgid "" msgstr "" -"Project-Id-Version: \n" +"Project-Id-Version: glib\n" "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/glib/issues\n" -"POT-Creation-Date: 2022-08-08 10:41+0000\n" -"PO-Revision-Date: 2022-12-13 07:04+0100\n" +"POT-Creation-Date: 2023-02-13 18:29+0000\n" +"PO-Revision-Date: 2023-02-14 08:32+0100\n" "Last-Translator: Ekaterine Papava <papava.e@gtu.ge>\n" -"Language-Team: \n" +"Language-Team: Georgian <(nothing)>\n" "Language: ka\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Poedit 3.2.2\n" -#: gio/gappinfo.c:333 +#: gio/gappinfo.c:339 msgid "Setting default applications not supported yet" msgstr "" -#: gio/gappinfo.c:366 +#: gio/gappinfo.c:372 msgid "Setting application as last used for type not supported yet" msgstr "" -#: gio/gapplication.c:500 +#: gio/gappinfo.c:814 +#, c-format +msgid "Failed to find default application for content type ‘%s’" +msgstr "" + +#: gio/gappinfo.c:874 +#, c-format +msgid "Failed to find default application for URI Scheme ‘%s’" +msgstr "" + +#: gio/gapplication.c:502 msgid "GApplication options" msgstr "GApplication-ის მორგება" -#: gio/gapplication.c:500 +#: gio/gapplication.c:502 msgid "Show GApplication options" msgstr "GApplication პარამეტრების ჩვენება" -#: gio/gapplication.c:545 +#: gio/gapplication.c:547 msgid "Enter GApplication service mode (use from D-Bus service files)" msgstr "" -#: gio/gapplication.c:557 +#: gio/gapplication.c:559 msgid "Override the application’s ID" msgstr "აპლიკაციის ID-ის გადაფარვა" -#: gio/gapplication.c:569 +#: gio/gapplication.c:571 msgid "Replace the running instance" msgstr "გაშვებული ინტერფეისის შეცვლა" -#: gio/gapplication-tool.c:45 gio/gapplication-tool.c:46 gio/gio-tool.c:227 -#: gio/gresource-tool.c:494 gio/gsettings-tool.c:584 +#: gio/gapplication-tool.c:47 gio/gapplication-tool.c:48 gio/gio-tool.c:229 +#: gio/gresource-tool.c:496 gio/gsettings-tool.c:586 msgid "Print help" msgstr "დახმარების ჩვენება" -#: gio/gapplication-tool.c:47 gio/gresource-tool.c:495 gio/gresource-tool.c:563 +#: gio/gapplication-tool.c:49 gio/gresource-tool.c:497 gio/gresource-tool.c:565 msgid "COMMAND" msgstr "ბრძანება" -#: gio/gapplication-tool.c:49 gio/gio-tool.c:228 +#: gio/gapplication-tool.c:51 gio/gio-tool.c:230 msgid "Print version" msgstr "მიმდინარე ვერსიის დაბეჭდვა" -#: gio/gapplication-tool.c:50 gio/gsettings-tool.c:590 +#: gio/gapplication-tool.c:52 gio/gsettings-tool.c:592 msgid "Print version information and exit" msgstr "ვერსიის ჩვენება და გასვლა" -#: gio/gapplication-tool.c:53 +#: gio/gapplication-tool.c:55 msgid "List applications" msgstr "აპლიკაციების სია" -#: gio/gapplication-tool.c:54 +#: gio/gapplication-tool.c:56 msgid "List the installed D-Bus activatable applications (by .desktop files)" msgstr "" -#: gio/gapplication-tool.c:57 +#: gio/gapplication-tool.c:59 msgid "Launch an application" msgstr "აპლიკაციის გაშვება" -#: gio/gapplication-tool.c:58 +#: gio/gapplication-tool.c:60 msgid "Launch the application (with optional files to open)" msgstr "" -#: gio/gapplication-tool.c:59 +#: gio/gapplication-tool.c:61 msgid "APPID FILE…" msgstr "" -#: gio/gapplication-tool.c:61 +#: gio/gapplication-tool.c:63 msgid "Activate an action" msgstr "ქმედების აქტივაცია" -#: gio/gapplication-tool.c:62 +#: gio/gapplication-tool.c:64 msgid "Invoke an action on the application" msgstr "" -#: gio/gapplication-tool.c:63 +#: gio/gapplication-tool.c:65 msgid "APPID ACTION PARAMETER" msgstr "" -#: gio/gapplication-tool.c:65 +#: gio/gapplication-tool.c:67 msgid "List available actions" msgstr "" -#: gio/gapplication-tool.c:66 +#: gio/gapplication-tool.c:68 msgid "List static actions for an application (from .desktop file)" msgstr "" -#: gio/gapplication-tool.c:67 gio/gapplication-tool.c:73 +#: gio/gapplication-tool.c:69 gio/gapplication-tool.c:75 msgid "APPID" msgstr "აპისID" -#: gio/gapplication-tool.c:72 gio/gapplication-tool.c:135 gio/gdbus-tool.c:106 -#: gio/gio-tool.c:224 +#: gio/gapplication-tool.c:74 gio/gapplication-tool.c:137 gio/gdbus-tool.c:108 +#: gio/gio-tool.c:226 msgid "COMMAND" msgstr "ბრძანება" -#: gio/gapplication-tool.c:72 +#: gio/gapplication-tool.c:74 msgid "The command to print detailed help for" msgstr "" -#: gio/gapplication-tool.c:73 +#: gio/gapplication-tool.c:75 msgid "Application identifier in D-Bus format (eg: org.example.viewer)" msgstr "" -#: gio/gapplication-tool.c:74 gio/glib-compile-resources.c:820 -#: gio/glib-compile-resources.c:826 gio/glib-compile-resources.c:855 -#: gio/gresource-tool.c:501 gio/gresource-tool.c:567 +#: gio/gapplication-tool.c:76 gio/glib-compile-resources.c:822 +#: gio/glib-compile-resources.c:828 gio/glib-compile-resources.c:857 +#: gio/gresource-tool.c:503 gio/gresource-tool.c:569 msgid "FILE" -msgstr "ფაილი" +msgstr "PROFILEID" -#: gio/gapplication-tool.c:74 +#: gio/gapplication-tool.c:76 msgid "Optional relative or absolute filenames, or URIs to open" msgstr "" -#: gio/gapplication-tool.c:75 +#: gio/gapplication-tool.c:77 msgid "ACTION" msgstr "ქმედება" -#: gio/gapplication-tool.c:75 +#: gio/gapplication-tool.c:77 msgid "The action name to invoke" msgstr "" -#: gio/gapplication-tool.c:76 +#: gio/gapplication-tool.c:78 msgid "PARAMETER" msgstr "პარამეტრი" -#: gio/gapplication-tool.c:76 +#: gio/gapplication-tool.c:78 msgid "Optional parameter to the action invocation, in GVariant format" msgstr "" -#: gio/gapplication-tool.c:98 gio/gresource-tool.c:532 gio/gsettings-tool.c:676 +#: gio/gapplication-tool.c:100 gio/gresource-tool.c:534 +#: gio/gsettings-tool.c:678 #, c-format msgid "" "Unknown command %s\n" @@ -155,46 +166,46 @@ "უცნობი ბრძანება: %s\n" "\n" -#: gio/gapplication-tool.c:103 +#: gio/gapplication-tool.c:105 msgid "Usage:\n" msgstr "გამოყენება:\n" -#: gio/gapplication-tool.c:116 gio/gresource-tool.c:557 -#: gio/gsettings-tool.c:711 +#: gio/gapplication-tool.c:118 gio/gresource-tool.c:559 +#: gio/gsettings-tool.c:713 msgid "Arguments:\n" msgstr "არგუმენტები:\n" -#: gio/gapplication-tool.c:135 gio/gio-tool.c:224 +#: gio/gapplication-tool.c:137 gio/gio-tool.c:226 msgid "ARGS…" msgstr "არგუმენტები…" -#: gio/gapplication-tool.c:136 +#: gio/gapplication-tool.c:138 #, c-format msgid "Commands:\n" msgstr "ბრძანებები:\n" #. Translators: do not translate 'help', but please translate 'COMMAND'. -#: gio/gapplication-tool.c:148 +#: gio/gapplication-tool.c:150 #, c-format msgid "" "Use “%s help COMMAND” to get detailed help.\n" "\n" msgstr "" -#: gio/gapplication-tool.c:167 +#: gio/gapplication-tool.c:169 #, c-format msgid "" "%s command requires an application id to directly follow\n" "\n" msgstr "" -#: gio/gapplication-tool.c:173 +#: gio/gapplication-tool.c:175 #, 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:184 +#: gio/gapplication-tool.c:186 #, c-format msgid "" "“%s” takes no arguments\n" @@ -203,46 +214,46 @@ "“%s” -ს არგუმენტები არ მიეთითება\n" "\n" -#: gio/gapplication-tool.c:268 +#: gio/gapplication-tool.c:270 #, c-format msgid "unable to connect to D-Bus: %s\n" msgstr "d-bus-თან მიერთების შეცდომა: %s\n" -#: gio/gapplication-tool.c:288 +#: gio/gapplication-tool.c:290 #, c-format msgid "error sending %s message to application: %s\n" msgstr "" -#: gio/gapplication-tool.c:319 +#: gio/gapplication-tool.c:324 msgid "action name must be given after application id\n" msgstr "" -#: gio/gapplication-tool.c:327 +#: gio/gapplication-tool.c:332 #, c-format msgid "" "invalid action name: “%s”\n" "action names must consist of only alphanumerics, “-” and “.”\n" msgstr "" -#: gio/gapplication-tool.c:346 +#: gio/gapplication-tool.c:351 #, c-format msgid "error parsing action parameter: %s\n" msgstr "" -#: gio/gapplication-tool.c:358 +#: gio/gapplication-tool.c:363 msgid "actions accept a maximum of one parameter\n" msgstr "" -#: gio/gapplication-tool.c:413 +#: gio/gapplication-tool.c:418 msgid "list-actions command takes only the application id" msgstr "" -#: gio/gapplication-tool.c:423 +#: gio/gapplication-tool.c:428 #, c-format msgid "unable to find desktop file for application %s\n" msgstr "" -#: gio/gapplication-tool.c:468 +#: gio/gapplication-tool.c:473 #, c-format msgid "" "unrecognised command: %s\n" @@ -251,116 +262,116 @@ "უცნობი ბრძანება: %s\n" "\n" -#: gio/gbufferedinputstream.c:420 gio/gbufferedinputstream.c:498 -#: gio/ginputstream.c:179 gio/ginputstream.c:379 gio/ginputstream.c:648 -#: gio/ginputstream.c:1050 gio/goutputstream.c:223 gio/goutputstream.c:1049 -#: gio/gpollableinputstream.c:205 gio/gpollableoutputstream.c:277 +#: gio/gbufferedinputstream.c:422 gio/gbufferedinputstream.c:500 +#: gio/ginputstream.c:181 gio/ginputstream.c:381 gio/ginputstream.c:650 +#: gio/ginputstream.c:1052 gio/goutputstream.c:225 gio/goutputstream.c:1051 +#: gio/gpollableinputstream.c:207 gio/gpollableoutputstream.c:279 #, c-format msgid "Too large count value passed to %s" msgstr "" -#: gio/gbufferedinputstream.c:891 gio/gbufferedoutputstream.c:575 -#: gio/gdataoutputstream.c:562 +#: gio/gbufferedinputstream.c:893 gio/gbufferedoutputstream.c:577 +#: gio/gdataoutputstream.c:564 msgid "Seek not supported on base stream" msgstr "" -#: gio/gbufferedinputstream.c:938 +#: gio/gbufferedinputstream.c:940 msgid "Cannot truncate GBufferedInputStream" msgstr "" -#: gio/gbufferedinputstream.c:983 gio/ginputstream.c:1239 gio/giostream.c:300 -#: gio/goutputstream.c:2198 +#: gio/gbufferedinputstream.c:985 gio/ginputstream.c:1241 gio/giostream.c:302 +#: gio/goutputstream.c:2200 msgid "Stream is already closed" msgstr "ნაკადი უკვე დახურულია" -#: gio/gbufferedoutputstream.c:612 gio/gdataoutputstream.c:592 +#: gio/gbufferedoutputstream.c:614 gio/gdataoutputstream.c:594 msgid "Truncate not supported on base stream" msgstr "" -#: gio/gcancellable.c:319 gio/gdbusconnection.c:1857 gio/gdbusprivate.c:1418 -#: gio/gsimpleasyncresult.c:871 gio/gsimpleasyncresult.c:897 +#: gio/gcancellable.c:326 gio/gdbusconnection.c:1859 gio/gdbusprivate.c:1420 +#: gio/gsimpleasyncresult.c:873 gio/gsimpleasyncresult.c:899 #, c-format msgid "Operation was cancelled" msgstr "ოპერაცია გაუქმდა" -#: gio/gcharsetconverter.c:260 +#: gio/gcharsetconverter.c:262 msgid "Invalid object, not initialized" msgstr "ობიექტი არასწორია. ინიციალიზებული არაა" -#: gio/gcharsetconverter.c:281 gio/gcharsetconverter.c:309 +#: gio/gcharsetconverter.c:283 gio/gcharsetconverter.c:311 msgid "Incomplete multibyte sequence in input" msgstr "შეტანილ ტექსტში ბაიტების მიმდევრობა მცდარია" -#: gio/gcharsetconverter.c:315 gio/gcharsetconverter.c:324 +#: gio/gcharsetconverter.c:317 gio/gcharsetconverter.c:326 msgid "Not enough space in destination" msgstr "დანიშნულების წერტილში საკმარისი ადგილი არაა" -#: gio/gcharsetconverter.c:342 gio/gdatainputstream.c:848 -#: gio/gdatainputstream.c:1266 glib/gconvert.c:449 glib/gconvert.c:879 -#: glib/giochannel.c:1573 glib/giochannel.c:1615 glib/giochannel.c:2470 -#: glib/gutf8.c:890 glib/gutf8.c:1344 +#: gio/gcharsetconverter.c:344 gio/gdatainputstream.c:850 +#: gio/gdatainputstream.c:1268 glib/gconvert.c:451 glib/gconvert.c:883 +#: glib/giochannel.c:1576 glib/giochannel.c:1618 glib/giochannel.c:2478 +#: glib/gutf8.c:892 glib/gutf8.c:1346 msgid "Invalid byte sequence in conversion input" msgstr "შეტანილ ტექსტში ბაიტების მიმდევრობა მცდარია" -#: gio/gcharsetconverter.c:347 glib/gconvert.c:457 glib/gconvert.c:793 -#: glib/giochannel.c:1580 glib/giochannel.c:2482 +#: gio/gcharsetconverter.c:349 glib/gconvert.c:459 glib/gconvert.c:797 +#: glib/giochannel.c:1583 glib/giochannel.c:2493 #, c-format msgid "Error during conversion: %s" msgstr "გარდაქმნის შეცდომა: %s" -#: gio/gcharsetconverter.c:445 gio/gsocket.c:1147 +#: gio/gcharsetconverter.c:447 gio/gsocket.c:1151 msgid "Cancellable initialization not supported" msgstr "გაუქმებადი ინიციალიზაცია მხარდაჭერილი არაა" -#: gio/gcharsetconverter.c:456 glib/gconvert.c:322 glib/giochannel.c:1401 +#: gio/gcharsetconverter.c:458 glib/gconvert.c:324 glib/giochannel.c:1404 #, c-format msgid "Conversion from character set “%s” to “%s” is not supported" msgstr "კოდური გვერდის \"%s\" გარდაქმნა \"%s\" კოდირებაში მხარდაუჭერელია" -#: gio/gcharsetconverter.c:460 glib/gconvert.c:326 +#: gio/gcharsetconverter.c:462 glib/gconvert.c:328 #, c-format msgid "Could not open converter from “%s” to “%s”" msgstr "ვერ ხერხდება \"%s\" - \"%s\" გარდამქმნელის გახსნა" -#: gio/gcontenttype.c:470 +#: gio/gcontenttype.c:472 #, c-format msgid "%s type" msgstr "ტიპი %s" -#: gio/gcontenttype-win32.c:196 +#: gio/gcontenttype-win32.c:198 msgid "Unknown type" msgstr "უცნობი ტიპი" -#: gio/gcontenttype-win32.c:198 +#: gio/gcontenttype-win32.c:200 #, c-format msgid "%s filetype" msgstr "ფაილის ტიპი %s" -#: gio/gcredentials.c:335 +#: gio/gcredentials.c:337 msgid "GCredentials contains invalid data" msgstr "" -#: gio/gcredentials.c:395 gio/gcredentials.c:686 +#: gio/gcredentials.c:397 gio/gcredentials.c:688 msgid "GCredentials is not implemented on this OS" msgstr "" -#: gio/gcredentials.c:550 gio/gcredentials.c:568 +#: gio/gcredentials.c:552 gio/gcredentials.c:570 msgid "There is no GCredentials support for your platform" msgstr "" -#: gio/gcredentials.c:626 +#: gio/gcredentials.c:628 msgid "GCredentials does not contain a process ID on this OS" msgstr "" -#: gio/gcredentials.c:680 +#: gio/gcredentials.c:682 msgid "Credentials spoofing is not possible on this OS" msgstr "" -#: gio/gdatainputstream.c:304 +#: gio/gdatainputstream.c:306 msgid "Unexpected early end-of-stream" msgstr "" -#: gio/gdbusaddress.c:162 gio/gdbusaddress.c:236 gio/gdbusaddress.c:325 +#: gio/gdbusaddress.c:162 gio/gdbusaddress.c:234 gio/gdbusaddress.c:321 #, c-format msgid "Unsupported key “%s” in address entry “%s”" msgstr "" @@ -377,135 +388,135 @@ "keys)" msgstr "" -#: gio/gdbusaddress.c:251 gio/gdbusaddress.c:262 gio/gdbusaddress.c:277 -#: gio/gdbusaddress.c:340 gio/gdbusaddress.c:351 +#: gio/gdbusaddress.c:249 gio/gdbusaddress.c:260 gio/gdbusaddress.c:275 +#: gio/gdbusaddress.c:336 gio/gdbusaddress.c:347 #, c-format msgid "Error in address “%s” — the “%s” attribute is malformed" msgstr "" -#: gio/gdbusaddress.c:421 gio/gdbusaddress.c:680 +#: gio/gdbusaddress.c:417 gio/gdbusaddress.c:676 #, c-format msgid "Unknown or unsupported transport “%s” for address “%s”" msgstr "" -#: gio/gdbusaddress.c:465 +#: gio/gdbusaddress.c:461 #, c-format msgid "Address element “%s” does not contain a colon (:)" msgstr "" -#: gio/gdbusaddress.c:474 +#: gio/gdbusaddress.c:470 #, c-format msgid "Transport name in address element “%s” must not be empty" msgstr "" -#: gio/gdbusaddress.c:495 +#: gio/gdbusaddress.c:491 #, c-format msgid "" "Key/Value pair %d, “%s”, in address element “%s” does not contain an equal " "sign" msgstr "" -#: gio/gdbusaddress.c:506 +#: gio/gdbusaddress.c:502 #, c-format msgid "" "Key/Value pair %d, “%s”, in address element “%s” must not have an empty key" msgstr "" -#: gio/gdbusaddress.c:520 +#: gio/gdbusaddress.c:516 #, c-format msgid "" "Error unescaping key or value in Key/Value pair %d, “%s”, in address element " "“%s”" msgstr "" -#: gio/gdbusaddress.c:588 +#: gio/gdbusaddress.c:584 #, c-format msgid "" "Error in address “%s” — the unix transport requires exactly one of the keys " "“path” or “abstract” to be set" msgstr "" -#: gio/gdbusaddress.c:623 +#: gio/gdbusaddress.c:619 #, c-format msgid "Error in address “%s” — the host attribute is missing or malformed" msgstr "" -#: gio/gdbusaddress.c:637 +#: gio/gdbusaddress.c:633 #, c-format msgid "Error in address “%s” — the port attribute is missing or malformed" msgstr "" -#: gio/gdbusaddress.c:651 +#: gio/gdbusaddress.c:647 #, c-format msgid "Error in address “%s” — the noncefile attribute is missing or malformed" msgstr "" -#: gio/gdbusaddress.c:672 +#: gio/gdbusaddress.c:668 msgid "Error auto-launching: " msgstr "ავტომატურად გაშვების შეცდომა: " -#: gio/gdbusaddress.c:725 +#: gio/gdbusaddress.c:721 #, c-format msgid "Error opening nonce file “%s”: %s" msgstr "ერთჯერადი ფაილის (%s) გახსნის შეცდომა: %s" -#: gio/gdbusaddress.c:744 +#: gio/gdbusaddress.c:740 #, c-format msgid "Error reading from nonce file “%s”: %s" msgstr "ერთჯერადი ფაილიდან (%s) წაკითხვის შეცდომა: %s" -#: gio/gdbusaddress.c:753 +#: gio/gdbusaddress.c:749 #, c-format msgid "Error reading from nonce file “%s”, expected 16 bytes, got %d" msgstr "" -#: gio/gdbusaddress.c:771 +#: gio/gdbusaddress.c:767 #, c-format msgid "Error writing contents of nonce file “%s” to stream:" msgstr "" -#: gio/gdbusaddress.c:986 +#: gio/gdbusaddress.c:982 msgid "The given address is empty" msgstr "მითითებული მისამართი ცარიელია" -#: gio/gdbusaddress.c:1099 +#: gio/gdbusaddress.c:1095 #, c-format msgid "Cannot spawn a message bus when AT_SECURE is set" msgstr "" -#: gio/gdbusaddress.c:1106 +#: gio/gdbusaddress.c:1102 msgid "Cannot spawn a message bus without a machine-id: " msgstr "" -#: gio/gdbusaddress.c:1113 +#: gio/gdbusaddress.c:1109 #, c-format msgid "Cannot autolaunch D-Bus without X11 $DISPLAY" msgstr "" -#: gio/gdbusaddress.c:1155 +#: gio/gdbusaddress.c:1151 #, c-format msgid "Error spawning command line “%s”: " msgstr "" -#: gio/gdbusaddress.c:1224 +#: gio/gdbusaddress.c:1220 #, c-format msgid "Cannot determine session bus address (not implemented for this OS)" msgstr "" -#: gio/gdbusaddress.c:1373 gio/gdbusconnection.c:7318 +#: gio/gdbusaddress.c:1374 gio/gdbusconnection.c:7316 #, c-format msgid "" "Cannot determine bus address from DBUS_STARTER_BUS_TYPE environment variable " "— unknown value “%s”" msgstr "" -#: gio/gdbusaddress.c:1382 gio/gdbusconnection.c:7327 +#: gio/gdbusaddress.c:1383 gio/gdbusconnection.c:7325 msgid "" "Cannot determine bus address because the DBUS_STARTER_BUS_TYPE environment " "variable is not set" msgstr "" -#: gio/gdbusaddress.c:1392 +#: gio/gdbusaddress.c:1393 #, c-format msgid "Unknown bus type %d" msgstr "მატარებლის უცნობი ტიპი %d" @@ -524,429 +535,426 @@ "Exhausted all available authentication mechanisms (tried: %s) (available: %s)" msgstr "" -#: gio/gdbusauth.c:1171 +#: gio/gdbusauth.c:1178 msgid "User IDs must be the same for peer and server" msgstr "" -#: gio/gdbusauth.c:1183 +#: gio/gdbusauth.c:1190 msgid "Cancelled via GDBusAuthObserver::authorize-authenticated-peer" msgstr "" -#: gio/gdbusauthmechanismsha1.c:300 +#: gio/gdbusauthmechanismsha1.c:303 #, c-format msgid "Error when getting information for directory “%s”: %s" msgstr "" -#: gio/gdbusauthmechanismsha1.c:315 +#: gio/gdbusauthmechanismsha1.c:318 #, c-format msgid "" "Permissions on directory “%s” are malformed. Expected mode 0700, got 0%o" msgstr "" -#: gio/gdbusauthmechanismsha1.c:348 gio/gdbusauthmechanismsha1.c:359 +#: gio/gdbusauthmechanismsha1.c:351 gio/gdbusauthmechanismsha1.c:362 #, c-format msgid "Error creating directory “%s”: %s" msgstr "" -#: gio/gdbusauthmechanismsha1.c:361 gio/gfile.c:1080 gio/gfile.c:1318 -#: gio/gfile.c:1456 gio/gfile.c:1694 gio/gfile.c:1749 gio/gfile.c:1807 -#: gio/gfile.c:1891 gio/gfile.c:1948 gio/gfile.c:2012 gio/gfile.c:2067 -#: gio/gfile.c:3772 gio/gfile.c:3912 gio/gfile.c:4205 gio/gfile.c:4675 -#: gio/gfile.c:5086 gio/gfile.c:5171 gio/gfile.c:5261 gio/gfile.c:5358 -#: gio/gfile.c:5445 gio/gfile.c:5546 gio/gfile.c:8375 gio/gfile.c:8465 -#: gio/gfile.c:8549 gio/win32/gwinhttpfile.c:453 +#: gio/gdbusauthmechanismsha1.c:364 gio/gfile.c:1095 gio/gfile.c:1333 +#: gio/gfile.c:1471 gio/gfile.c:1709 gio/gfile.c:1764 gio/gfile.c:1822 +#: gio/gfile.c:1906 gio/gfile.c:1963 gio/gfile.c:2027 gio/gfile.c:2082 +#: gio/gfile.c:3787 gio/gfile.c:3927 gio/gfile.c:4339 gio/gfile.c:4809 +#: gio/gfile.c:5220 gio/gfile.c:5305 gio/gfile.c:5395 gio/gfile.c:5492 +#: gio/gfile.c:5579 gio/gfile.c:5680 gio/gfile.c:8809 gio/gfile.c:8899 +#: gio/gfile.c:8983 gio/win32/gwinhttpfile.c:453 msgid "Operation not supported" msgstr "ოპერაცია მხარდაუჭერელია" -#: gio/gdbusauthmechanismsha1.c:404 +#: gio/gdbusauthmechanismsha1.c:407 #, c-format msgid "Error opening keyring “%s” for reading: " msgstr "" -#: gio/gdbusauthmechanismsha1.c:427 gio/gdbusauthmechanismsha1.c:769 +#: gio/gdbusauthmechanismsha1.c:430 gio/gdbusauthmechanismsha1.c:771 #, c-format msgid "Line %d of the keyring at “%s” with content “%s” is malformed" msgstr "" -#: gio/gdbusauthmechanismsha1.c:441 gio/gdbusauthmechanismsha1.c:783 +#: gio/gdbusauthmechanismsha1.c:444 gio/gdbusauthmechanismsha1.c:785 #, c-format msgid "" "First token of line %d of the keyring at “%s” with content “%s” is malformed" msgstr "" -#: gio/gdbusauthmechanismsha1.c:455 gio/gdbusauthmechanismsha1.c:797 +#: gio/gdbusauthmechanismsha1.c:458 gio/gdbusauthmechanismsha1.c:799 #, c-format msgid "" "Second token of line %d of the keyring at “%s” with content “%s” is malformed" msgstr "" -#: gio/gdbusauthmechanismsha1.c:479 +#: gio/gdbusauthmechanismsha1.c:482 #, c-format msgid "Didn’t find cookie with id %d in the keyring at “%s”" msgstr "" -#: gio/gdbusauthmechanismsha1.c:536 +#: gio/gdbusauthmechanismsha1.c:539 #, c-format msgid "Error creating lock file “%s”: %s" msgstr "" -#: gio/gdbusauthmechanismsha1.c:609 +#: gio/gdbusauthmechanismsha1.c:612 #, c-format msgid "Error deleting stale lock file “%s”: %s" msgstr "" -#: gio/gdbusauthmechanismsha1.c:648 +#: gio/gdbusauthmechanismsha1.c:651 #, c-format msgid "Error closing (unlinked) lock file “%s”: %s" msgstr "" -#: gio/gdbusauthmechanismsha1.c:659 +#: gio/gdbusauthmechanismsha1.c:662 #, c-format msgid "Error unlinking lock file “%s”: %s" msgstr "" -#: gio/gdbusauthmechanismsha1.c:736 +#: gio/gdbusauthmechanismsha1.c:738 #, c-format msgid "Error opening keyring “%s” for writing: " msgstr "" -#: gio/gdbusauthmechanismsha1.c:930 +#: gio/gdbusauthmechanismsha1.c:932 #, c-format msgid "(Additionally, releasing the lock for “%s” also failed: %s) " msgstr "" -#: gio/gdbusconnection.c:588 gio/gdbusconnection.c:2402 +#: gio/gdbusconnection.c:590 gio/gdbusconnection.c:2405 msgid "The connection is closed" msgstr "შეერთება არ დახურულა" -#: gio/gdbusconnection.c:1887 +#: gio/gdbusconnection.c:1889 msgid "Timeout was reached" msgstr "" -#: gio/gdbusconnection.c:2525 +#: gio/gdbusconnection.c:2528 msgid "" "Unsupported flags encountered when constructing a client-side connection" msgstr "" -#: gio/gdbusconnection.c:4253 gio/gdbusconnection.c:4607 +#: gio/gdbusconnection.c:4257 gio/gdbusconnection.c:4611 #, c-format msgid "" "No such interface “org.freedesktop.DBus.Properties” on object at path %s" msgstr "" -#: gio/gdbusconnection.c:4398 +#: gio/gdbusconnection.c:4402 #, c-format msgid "No such property “%s”" msgstr "" -#: gio/gdbusconnection.c:4410 +#: gio/gdbusconnection.c:4414 #, c-format msgid "Property “%s” is not readable" msgstr "" -#: gio/gdbusconnection.c:4421 +#: gio/gdbusconnection.c:4425 #, c-format msgid "Property “%s” is not writable" msgstr "" -#: gio/gdbusconnection.c:4441 +#: gio/gdbusconnection.c:4445 #, c-format msgid "Error setting property “%s”: Expected type “%s” but got “%s”" msgstr "" -#: gio/gdbusconnection.c:4546 gio/gdbusconnection.c:4761 -#: gio/gdbusconnection.c:6744 +#: gio/gdbusconnection.c:4550 gio/gdbusconnection.c:4765 +#: gio/gdbusconnection.c:6742 #, c-format msgid "No such interface “%s”" msgstr "" -#: gio/gdbusconnection.c:4983 gio/gdbusconnection.c:7258 +#: gio/gdbusconnection.c:4981 gio/gdbusconnection.c:7256 #, c-format msgid "No such interface “%s” on object at path %s" msgstr "" -#: gio/gdbusconnection.c:5084 +#: gio/gdbusconnection.c:5082 #, c-format msgid "No such method “%s”" msgstr "" -#: gio/gdbusconnection.c:5115 +#: gio/gdbusconnection.c:5113 #, c-format msgid "Type of message, “%s”, does not match expected type “%s”" msgstr "" -#: gio/gdbusconnection.c:5318 +#: gio/gdbusconnection.c:5316 #, c-format msgid "An object is already exported for the interface %s at %s" msgstr "" -#: gio/gdbusconnection.c:5545 +#: gio/gdbusconnection.c:5543 #, c-format msgid "Unable to retrieve property %s.%s" msgstr "თვისების შექმნის შეცდომა: %s.%s" -#: gio/gdbusconnection.c:5601 +#: gio/gdbusconnection.c:5599 #, c-format msgid "Unable to set property %s.%s" msgstr "თვისების დაყენების შეცდომა: %s.%s" -#: gio/gdbusconnection.c:5780 +#: gio/gdbusconnection.c:5778 #, c-format msgid "Method “%s” returned type “%s”, but expected “%s”" msgstr "" -#: gio/gdbusconnection.c:6856 +#: gio/gdbusconnection.c:6854 #, c-format msgid "Method “%s” on interface “%s” with signature “%s” does not exist" msgstr "" -#: gio/gdbusconnection.c:6977 +#: gio/gdbusconnection.c:6975 #, c-format msgid "A subtree is already exported for %s" msgstr "" -#: gio/gdbusconnection.c:7266 +#: gio/gdbusconnection.c:7264 #, c-format msgid "Object does not exist at path “%s”" msgstr "" -#: gio/gdbusmessage.c:1301 +#: gio/gdbusmessage.c:1306 msgid "type is INVALID" msgstr "ტიპი არასწორია" -#: gio/gdbusmessage.c:1312 +#: gio/gdbusmessage.c:1317 msgid "METHOD_CALL message: PATH or MEMBER header field is missing" msgstr "" -#: gio/gdbusmessage.c:1323 +#: gio/gdbusmessage.c:1328 msgid "METHOD_RETURN message: REPLY_SERIAL header field is missing" msgstr "" -#: gio/gdbusmessage.c:1335 +#: gio/gdbusmessage.c:1340 msgid "ERROR message: REPLY_SERIAL or ERROR_NAME header field is missing" msgstr "" -#: gio/gdbusmessage.c:1348 +#: gio/gdbusmessage.c:1353 msgid "SIGNAL message: PATH, INTERFACE or MEMBER header field is missing" msgstr "" -#: gio/gdbusmessage.c:1356 +#: gio/gdbusmessage.c:1361 msgid "" "SIGNAL message: The PATH header field is using the reserved value /org/" "freedesktop/DBus/Local" msgstr "" -#: gio/gdbusmessage.c:1364 +#: gio/gdbusmessage.c:1369 msgid "" "SIGNAL message: The INTERFACE header field is using the reserved value org." "freedesktop.DBus.Local" msgstr "" -#: gio/gdbusmessage.c:1412 gio/gdbusmessage.c:1472 +#: gio/gdbusmessage.c:1417 gio/gdbusmessage.c:1477 #, c-format msgid "Wanted to read %lu byte but only got %lu" msgid_plural "Wanted to read %lu bytes but only got %lu" msgstr0 "" -msgstr1 "" -#: gio/gdbusmessage.c:1426 +#: gio/gdbusmessage.c:1431 #, c-format msgid "Expected NUL byte after the string “%s” but found byte %d" msgstr "" -#: gio/gdbusmessage.c:1445 +#: gio/gdbusmessage.c:1450 #, 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”" msgstr "" -#: gio/gdbusmessage.c:1509 gio/gdbusmessage.c:1785 gio/gdbusmessage.c:1996 +#: gio/gdbusmessage.c:1514 gio/gdbusmessage.c:1790 gio/gdbusmessage.c:2001 msgid "Value nested too deeply" msgstr "" -#: gio/gdbusmessage.c:1677 +#: gio/gdbusmessage.c:1682 #, c-format msgid "Parsed value “%s” is not a valid D-Bus object path" msgstr "" -#: gio/gdbusmessage.c:1701 +#: gio/gdbusmessage.c:1706 #, c-format msgid "Parsed value “%s” is not a valid D-Bus signature" msgstr "" -#: gio/gdbusmessage.c:1752 +#: gio/gdbusmessage.c:1757 #, c-format msgid "" "Encountered array of length %u byte. Maximum length is 2<<26 bytes (64 MiB)." msgid_plural "" "Encountered array of length %u bytes. Maximum length is 2<<26 bytes (64 MiB)." msgstr0 "" -msgstr1 "" -#: gio/gdbusmessage.c:1772 +#: gio/gdbusmessage.c:1777 #, c-format msgid "" "Encountered array of type “a%c”, expected to have a length a multiple of %u " "bytes, but found to be %u bytes in length" msgstr "" -#: gio/gdbusmessage.c:1926 gio/gdbusmessage.c:2645 +#: gio/gdbusmessage.c:1931 gio/gdbusmessage.c:2650 msgid "Empty structures (tuples) are not allowed in D-Bus" msgstr "" -#: gio/gdbusmessage.c:1980 +#: gio/gdbusmessage.c:1985 #, c-format msgid "Parsed value “%s” for variant is not a valid D-Bus signature" msgstr "" -#: gio/gdbusmessage.c:2021 +#: gio/gdbusmessage.c:2026 #, c-format msgid "" "Error deserializing GVariant with type string “%s” from the D-Bus wire format" msgstr "" -#: gio/gdbusmessage.c:2206 +#: gio/gdbusmessage.c:2211 #, c-format msgid "" "Invalid endianness value. Expected 0x6c (“l”) or 0x42 (“B”) but found value " "0x%02x" msgstr "" -#: gio/gdbusmessage.c:2225 +#: gio/gdbusmessage.c:2230 #, c-format msgid "Invalid major protocol version. Expected 1 but found %d" msgstr "" -#: gio/gdbusmessage.c:2283 gio/gdbusmessage.c:2881 +#: gio/gdbusmessage.c:2288 gio/gdbusmessage.c:2886 msgid "Signature header found but is not of type signature" msgstr "" -#: gio/gdbusmessage.c:2295 +#: gio/gdbusmessage.c:2300 #, c-format msgid "Signature header with signature “%s” found but message body is empty" msgstr "" -#: gio/gdbusmessage.c:2310 +#: gio/gdbusmessage.c:2315 #, c-format msgid "Parsed value “%s” is not a valid D-Bus signature (for body)" msgstr "" -#: gio/gdbusmessage.c:2342 +#: gio/gdbusmessage.c:2347 #, 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" msgstr0 "" -msgstr1 "" -#: gio/gdbusmessage.c:2352 +#: gio/gdbusmessage.c:2357 msgid "Cannot deserialize message: " msgstr "" -#: gio/gdbusmessage.c:2698 +#: gio/gdbusmessage.c:2703 #, c-format msgid "" "Error serializing GVariant with type string “%s” to the D-Bus wire format" msgstr "" -#: gio/gdbusmessage.c:2835 +#: gio/gdbusmessage.c:2840 #, c-format msgid "" "Number of file descriptors in message (%d) differs from header field (%d)" msgstr "" -#: gio/gdbusmessage.c:2843 +#: gio/gdbusmessage.c:2848 msgid "Cannot serialize message: " msgstr "" -#: gio/gdbusmessage.c:2896 +#: gio/gdbusmessage.c:2901 #, c-format msgid "Message body has signature “%s” but there is no signature header" msgstr "" -#: gio/gdbusmessage.c:2906 +#: gio/gdbusmessage.c:2911 #, c-format msgid "" "Message body has type signature “%s” but signature in the header field is " "“%s”" msgstr "" -#: gio/gdbusmessage.c:2922 +#: gio/gdbusmessage.c:2927 #, c-format msgid "Message body is empty but signature in the header field is “(%s)”" msgstr "" -#: gio/gdbusmessage.c:3477 +#: gio/gdbusmessage.c:3482 #, c-format msgid "Error return with body of type “%s”" msgstr "" -#: gio/gdbusmessage.c:3485 +#: gio/gdbusmessage.c:3490 msgid "Error return with empty body" msgstr "შეცდომა ცარიელი სხეულით დაბრუნდა" -#: gio/gdbusprivate.c:2185 +#: gio/gdbusprivate.c:2187 #, c-format msgid "(Type any character to close this window)\n" msgstr "(ფანჯრის დასახურად დააჭირეთ ნებისმიერ კლავიშას)\n" -#: gio/gdbusprivate.c:2371 +#: gio/gdbusprivate.c:2373 #, c-format msgid "Session dbus not running, and autolaunch failed" msgstr "" -#: gio/gdbusprivate.c:2394 +#: gio/gdbusprivate.c:2396 #, c-format msgid "Unable to get Hardware profile: %s" msgstr "აპარატურის პროფილის მიღების შეცდომა: %s" #. Translators: Both placeholders are file paths -#: gio/gdbusprivate.c:2445 +#: gio/gdbusprivate.c:2447 #, c-format msgid "Unable to load %s or %s: " msgstr "%s-ის ან %s-ის ჩატვირთვის შეცდომა: " -#: gio/gdbusproxy.c:1573 +#: gio/gdbusproxy.c:1568 #, c-format msgid "Error calling StartServiceByName for %s: " msgstr "" -#: gio/gdbusproxy.c:1596 +#: gio/gdbusproxy.c:1591 #, c-format msgid "Unexpected reply %d from StartServiceByName(\"%s\") method" msgstr "" -#: gio/gdbusproxy.c:2707 gio/gdbusproxy.c:2842 +#: gio/gdbusproxy.c:2702 gio/gdbusproxy.c:2837 #, c-format msgid "" "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 "" -#: gio/gdbusserver.c:767 +#: gio/gdbusserver.c:758 msgid "Abstract namespace not supported" msgstr "" -#: gio/gdbusserver.c:860 +#: gio/gdbusserver.c:850 msgid "Cannot specify nonce file when creating a server" msgstr "" -#: gio/gdbusserver.c:942 +#: gio/gdbusserver.c:932 #, c-format msgid "Error writing nonce file at “%s”: %s" msgstr "" -#: gio/gdbusserver.c:1117 +#: gio/gdbusserver.c:1107 #, c-format msgid "The string “%s” is not a valid D-Bus GUID" msgstr "" -#: gio/gdbusserver.c:1157 +#: gio/gdbusserver.c:1145 #, c-format msgid "Cannot listen on unsupported transport “%s”" msgstr "" -#: gio/gdbus-tool.c:111 +#: gio/gdbus-tool.c:113 #, c-format msgid "" "Commands:\n" @@ -960,181 +968,181 @@ "Use “%s COMMAND --help” to get help on each command.\n" msgstr "" -#: gio/gdbus-tool.c:202 gio/gdbus-tool.c:274 gio/gdbus-tool.c:346 -#: gio/gdbus-tool.c:370 gio/gdbus-tool.c:860 gio/gdbus-tool.c:1245 +#: gio/gdbus-tool.c:204 gio/gdbus-tool.c:276 gio/gdbus-tool.c:347 +#: gio/gdbus-tool.c:371 gio/gdbus-tool.c:861 gio/gdbus-tool.c:1246 #: gio/gdbus-tool.c:1733 #, c-format msgid "Error: %s\n" msgstr "შეცდომა: %s\n" -#: gio/gdbus-tool.c:213 gio/gdbus-tool.c:287 gio/gdbus-tool.c:1749 +#: gio/gdbus-tool.c:215 gio/gdbus-tool.c:289 gio/gdbus-tool.c:1749 #, c-format msgid "Error parsing introspection XML: %s\n" msgstr "" -#: gio/gdbus-tool.c:251 +#: gio/gdbus-tool.c:253 #, c-format msgid "Error: %s is not a valid name\n" msgstr "შეცდომა: არასწორი სახელი: \"%s\"\n" -#: gio/gdbus-tool.c:256 gio/gdbus-tool.c:746 gio/gdbus-tool.c:1064 +#: gio/gdbus-tool.c:258 gio/gdbus-tool.c:747 gio/gdbus-tool.c:1065 #: gio/gdbus-tool.c:1899 gio/gdbus-tool.c:2139 #, c-format msgid "Error: %s is not a valid object path\n" msgstr "" -#: gio/gdbus-tool.c:404 +#: gio/gdbus-tool.c:405 msgid "Connect to the system bus" msgstr "სისტემურ მატარებელთან მიერთება" -#: gio/gdbus-tool.c:405 +#: gio/gdbus-tool.c:406 msgid "Connect to the session bus" msgstr "სესიის მატარებელთან მიერთება" -#: gio/gdbus-tool.c:406 +#: gio/gdbus-tool.c:407 msgid "Connect to given D-Bus address" msgstr "მითითებულ D-Bus-ს მისამართზე მიერთება" -#: gio/gdbus-tool.c:416 +#: gio/gdbus-tool.c:417 msgid "Connection Endpoint Options:" msgstr "" -#: gio/gdbus-tool.c:417 +#: gio/gdbus-tool.c:418 msgid "Options specifying the connection endpoint" msgstr "" -#: gio/gdbus-tool.c:440 +#: gio/gdbus-tool.c:441 #, c-format msgid "No connection endpoint specified" msgstr "" -#: gio/gdbus-tool.c:450 +#: gio/gdbus-tool.c:451 #, c-format msgid "Multiple connection endpoints specified" msgstr "" -#: gio/gdbus-tool.c:523 +#: gio/gdbus-tool.c:524 #, c-format msgid "" "Warning: According to introspection data, interface “%s” does not exist\n" msgstr "" -#: gio/gdbus-tool.c:532 +#: gio/gdbus-tool.c:533 #, c-format msgid "" "Warning: According to introspection data, method “%s” does not exist on " "interface “%s”\n" msgstr "" -#: gio/gdbus-tool.c:594 +#: gio/gdbus-tool.c:595 msgid "Optional destination for signal (unique name)" msgstr "" -#: gio/gdbus-tool.c:595 +#: gio/gdbus-tool.c:596 msgid "Object path to emit signal on" msgstr "" -#: gio/gdbus-tool.c:596 +#: gio/gdbus-tool.c:597 msgid "Signal and interface name" msgstr "" -#: gio/gdbus-tool.c:629 +#: gio/gdbus-tool.c:630 msgid "Emit a signal." msgstr "სიგნალის გამოცემა." -#: gio/gdbus-tool.c:684 gio/gdbus-tool.c:1001 gio/gdbus-tool.c:1836 +#: gio/gdbus-tool.c:685 gio/gdbus-tool.c:1002 gio/gdbus-tool.c:1836 #: gio/gdbus-tool.c:2068 gio/gdbus-tool.c:2288 #, c-format msgid "Error connecting: %s\n" msgstr "შეერთების შეცდომა: %s\n" -#: gio/gdbus-tool.c:704 +#: gio/gdbus-tool.c:705 #, c-format msgid "Error: %s is not a valid unique bus name.\n" msgstr "შეცდომა: %s მატარებლის უნიკალურ სახელს არ წარმოადგენს.\n" -#: gio/gdbus-tool.c:723 gio/gdbus-tool.c:1044 gio/gdbus-tool.c:1879 +#: gio/gdbus-tool.c:724 gio/gdbus-tool.c:1045 gio/gdbus-tool.c:1879 msgid "Error: Object path is not specified\n" msgstr "შეცდომა: ობიექტის ბილიკი მითითებული არაა\n" -#: gio/gdbus-tool.c:766 +#: gio/gdbus-tool.c:767 msgid "Error: Signal name is not specified\n" msgstr "შეცდომა: სიგნალის სახელი მითითებული არაა\n" -#: gio/gdbus-tool.c:780 +#: gio/gdbus-tool.c:781 #, c-format msgid "Error: Signal name “%s” is invalid\n" msgstr "შეცდომა: სიგნალის სახელი \"%s\" არასწორია\n" -#: gio/gdbus-tool.c:792 +#: gio/gdbus-tool.c:793 #, c-format msgid "Error: %s is not a valid interface name\n" msgstr "შეცდომა: %s ინტერფეისის სწორ სახელს არ წარმოადგენს\n" -#: gio/gdbus-tool.c:798 +#: gio/gdbus-tool.c:799 #, c-format msgid "Error: %s is not a valid member name\n" msgstr "შეცდომა: %s წევრის არასწორი სახელია\n" #. Use the original non-"parse-me-harder" error -#: gio/gdbus-tool.c:835 gio/gdbus-tool.c:1176 +#: gio/gdbus-tool.c:836 gio/gdbus-tool.c:1177 #, c-format msgid "Error parsing parameter %d: %s\n" msgstr "შეცდომა %d პარამეტრის დამუშავებისას: %s\n" -#: gio/gdbus-tool.c:867 +#: gio/gdbus-tool.c:868 #, c-format msgid "Error flushing connection: %s\n" msgstr "შეერთების მოცილების შეცდომა: %s\n" -#: gio/gdbus-tool.c:895 +#: gio/gdbus-tool.c:896 msgid "Destination name to invoke method on" msgstr "" -#: gio/gdbus-tool.c:896 +#: gio/gdbus-tool.c:897 msgid "Object path to invoke method on" msgstr "" -#: gio/gdbus-tool.c:897 +#: gio/gdbus-tool.c:898 msgid "Method and interface name" msgstr "" -#: gio/gdbus-tool.c:898 +#: gio/gdbus-tool.c:899 msgid "Timeout in seconds" msgstr "ვადა წამებში" -#: gio/gdbus-tool.c:899 +#: gio/gdbus-tool.c:900 msgid "Allow interactive authorization" msgstr "" -#: gio/gdbus-tool.c:946 +#: gio/gdbus-tool.c:947 msgid "Invoke a method on a remote object." msgstr "" -#: gio/gdbus-tool.c:1018 gio/gdbus-tool.c:1853 gio/gdbus-tool.c:2093 +#: gio/gdbus-tool.c:1019 gio/gdbus-tool.c:1853 gio/gdbus-tool.c:2093 msgid "Error: Destination is not specified\n" msgstr "" -#: gio/gdbus-tool.c:1029 gio/gdbus-tool.c:1870 gio/gdbus-tool.c:2104 +#: gio/gdbus-tool.c:1030 gio/gdbus-tool.c:1870 gio/gdbus-tool.c:2104 #, c-format msgid "Error: %s is not a valid bus name\n" msgstr "შეცდომა: %s მატარებლის სწორ სახელს არ წარმოადგენს.\n" -#: gio/gdbus-tool.c:1079 +#: gio/gdbus-tool.c:1080 msgid "Error: Method name is not specified\n" msgstr "" -#: gio/gdbus-tool.c:1090 +#: gio/gdbus-tool.c:1091 #, c-format msgid "Error: Method name “%s” is invalid\n" msgstr "" -#: gio/gdbus-tool.c:1168 +#: gio/gdbus-tool.c:1169 #, c-format msgid "Error parsing parameter %d of type “%s”: %s\n" msgstr "" -#: gio/gdbus-tool.c:1194 +#: gio/gdbus-tool.c:1195 #, c-format msgid "Error adding handle %d: %s\n" msgstr "ფაილის \"%d\" წაკითხვის შეცდომა: %s\n" @@ -1214,104 +1222,109 @@ msgid "Error: %s is not a valid well-known bus name.\n" msgstr "შეცდომა: %s მატარებლის ცნობილ სახელს არ წარმოადგენს.\n" -#: gio/gdebugcontrollerdbus.c:358 +#: gio/gdebugcontrollerdbus.c:360 #, c-format msgid "Not authorized to change debug settings" msgstr "" -#: gio/gdesktopappinfo.c:2178 gio/gdesktopappinfo.c:5105 +#: gio/gdesktopappinfo.c:2242 gio/gdesktopappinfo.c:5223 msgid "Unnamed" msgstr "უსახელო" -#: gio/gdesktopappinfo.c:2588 +#: gio/gdesktopappinfo.c:2652 msgid "Desktop file didn’t specify Exec field" msgstr "" -#: gio/gdesktopappinfo.c:2896 +#: gio/gdesktopappinfo.c:2942 msgid "Unable to find terminal required for application" msgstr "" -#: gio/gdesktopappinfo.c:3625 +#: gio/gdesktopappinfo.c:3002 +#, c-format +msgid "Program ‘%s’ not found in $PATH" +msgstr "" + +#: gio/gdesktopappinfo.c:3735 #, c-format msgid "Can’t create user application configuration folder %s: %s" msgstr "" -#: gio/gdesktopappinfo.c:3629 +#: gio/gdesktopappinfo.c:3739 #, c-format msgid "Can’t create user MIME configuration folder %s: %s" msgstr "" -#: gio/gdesktopappinfo.c:3871 gio/gdesktopappinfo.c:3895 +#: gio/gdesktopappinfo.c:3981 gio/gdesktopappinfo.c:4005 msgid "Application information lacks an identifier" msgstr "" -#: gio/gdesktopappinfo.c:4131 +#: gio/gdesktopappinfo.c:4241 #, c-format msgid "Can’t create user desktop file %s" msgstr "" -#: gio/gdesktopappinfo.c:4267 +#: gio/gdesktopappinfo.c:4377 #, c-format msgid "Custom definition for %s" msgstr "" -#: gio/gdrive.c:417 +#: gio/gdrive.c:419 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 +#: gio/gdrive.c:497 msgid "drive doesn’t implement eject or eject_with_operation" msgstr "" -#: gio/gdrive.c:571 +#: gio/gdrive.c:573 msgid "drive doesn’t implement polling for media" msgstr "" -#: gio/gdrive.c:778 +#: gio/gdrive.c:780 msgid "drive doesn’t implement start" msgstr "" -#: gio/gdrive.c:880 +#: gio/gdrive.c:882 msgid "drive doesn’t implement stop" msgstr "" -#: gio/gdtlsconnection.c:1186 gio/gtlsconnection.c:955 +#: gio/gdtlsconnection.c:1188 gio/gtlsconnection.c:957 msgid "TLS backend does not implement TLS binding retrieval" msgstr "" -#: gio/gdummytlsbackend.c:195 gio/gdummytlsbackend.c:321 -#: gio/gdummytlsbackend.c:513 +#: gio/gdummytlsbackend.c:197 gio/gdummytlsbackend.c:323 +#: gio/gdummytlsbackend.c:515 msgid "TLS support is not available" msgstr "" -#: gio/gdummytlsbackend.c:423 +#: gio/gdummytlsbackend.c:425 msgid "DTLS support is not available" msgstr "" -#: gio/gemblem.c:323 +#: gio/gemblem.c:325 #, c-format msgid "Can’t handle version %d of GEmblem encoding" msgstr "" -#: gio/gemblem.c:333 +#: gio/gemblem.c:335 #, c-format msgid "Malformed number of tokens (%d) in GEmblem encoding" msgstr "" -#: gio/gemblemedicon.c:362 +#: gio/gemblemedicon.c:364 #, c-format msgid "Can’t handle version %d of GEmblemedIcon encoding" msgstr "" -#: gio/gemblemedicon.c:372 +#: gio/gemblemedicon.c:374 #, c-format msgid "Malformed number of tokens (%d) in GEmblemedIcon encoding" msgstr "" -#: gio/gemblemedicon.c:395 +#: gio/gemblemedicon.c:397 msgid "Expected a GEmblem for GEmblemedIcon" msgstr "" @@ -1319,213 +1332,218 @@ #. * trying to find the enclosing (user visible) #. * mount of a file, but none exists. #. -#: gio/gfile.c:1579 +#: gio/gfile.c:1594 msgid "Containing mount does not exist" msgstr "" -#: gio/gfile.c:2626 gio/glocalfile.c:2486 +#: gio/gfile.c:2641 gio/glocalfile.c:2511 msgid "Can’t copy over directory" msgstr "" -#: gio/gfile.c:2686 +#: gio/gfile.c:2701 msgid "Can’t copy directory over directory" msgstr "საქაღალდის საქაღალდეზე კოპირება შეუძლებელია" -#: gio/gfile.c:2694 +#: gio/gfile.c:2709 msgid "Target file exists" msgstr "სამიზნე ფაილი უკვე არსებობს" -#: gio/gfile.c:2713 +#: gio/gfile.c:2728 msgid "Can’t recursively copy directory" msgstr "საქაღალდის რეკურსიულად კოპირება შეუძლებელია" -#: gio/gfile.c:3014 +#: gio/gfile.c:3029 msgid "Splice not supported" msgstr "" -#: gio/gfile.c:3018 +#: gio/gfile.c:3033 #, c-format msgid "Error splicing file: %s" msgstr "" -#: gio/gfile.c:3170 +#: gio/gfile.c:3185 msgid "Copy (reflink/clone) between mounts is not supported" msgstr "" -#: gio/gfile.c:3174 +#: gio/gfile.c:3189 msgid "Copy (reflink/clone) is not supported or invalid" msgstr "" -#: gio/gfile.c:3179 +#: gio/gfile.c:3194 msgid "Copy (reflink/clone) is not supported or didn’t work" msgstr "" -#: gio/gfile.c:3244 +#: gio/gfile.c:3259 msgid "Can’t copy special file" msgstr "სპეციალური ფაილის კოპირება შეუძლებელია" -#: gio/gfile.c:4138 +#: gio/gfile.c:4153 msgid "Invalid symlink value given" msgstr "სიმბმბულის მითითებული მნიშვნელობა არასწორია" -#: gio/gfile.c:4148 glib/gfileutils.c:2333 +#: gio/gfile.c:4163 glib/gfileutils.c:2392 msgid "Symbolic links not supported" msgstr "სიმბოლური ბმების გამოყენება არაა რეალიზებული" -#: gio/gfile.c:4316 +#: gio/gfile.c:4450 msgid "Trash not supported" msgstr "ნაგავი მხარდაუჭერელია" -#: gio/gfile.c:4428 +#: gio/gfile.c:4562 #, c-format msgid "File names cannot contain “%c”" msgstr "" -#: gio/gfile.c:7028 gio/gvolume.c:364 +#: gio/gfile.c:6993 gio/gfile.c:7119 +#, c-format +msgid "Failed to create a temporary directory for template “%s”: %s" +msgstr "შაბლონისთვის \"%s\" დროებითი საქაღალდის შექმნის შეცდომა: %s" + +#: gio/gfile.c:7408 gio/gvolume.c:366 msgid "volume doesn’t implement mount" msgstr "" -#: gio/gfile.c:7142 gio/gfile.c:7190 +#: gio/gfile.c:7522 gio/gfile.c:7599 msgid "No application is registered as handling this file" msgstr "ამ ფაილის გასახსნელი პროგრამა დარეგისტრირებული არაა" -#: gio/gfileenumerator.c:212 +#: gio/gfileenumerator.c:214 msgid "Enumerator is closed" msgstr "" -#: gio/gfileenumerator.c:219 gio/gfileenumerator.c:278 -#: gio/gfileenumerator.c:377 gio/gfileenumerator.c:476 +#: gio/gfileenumerator.c:221 gio/gfileenumerator.c:280 +#: gio/gfileenumerator.c:379 gio/gfileenumerator.c:478 msgid "File enumerator has outstanding operation" msgstr "" -#: gio/gfileenumerator.c:368 gio/gfileenumerator.c:467 +#: gio/gfileenumerator.c:370 gio/gfileenumerator.c:469 msgid "File enumerator is already closed" msgstr "" -#: gio/gfileicon.c:250 +#: gio/gfileicon.c:252 #, c-format msgid "Can’t handle version %d of GFileIcon encoding" msgstr "" -#: gio/gfileicon.c:260 +#: gio/gfileicon.c:262 msgid "Malformed input data for GFileIcon" msgstr "" -#: gio/gfileinputstream.c:149 gio/gfileinputstream.c:394 -#: gio/gfileiostream.c:167 gio/gfileoutputstream.c:164 -#: gio/gfileoutputstream.c:497 +#: gio/gfileinputstream.c:151 gio/gfileinputstream.c:396 +#: gio/gfileiostream.c:169 gio/gfileoutputstream.c:166 +#: gio/gfileoutputstream.c:499 msgid "Stream doesn’t support query_info" msgstr "" -#: gio/gfileinputstream.c:325 gio/gfileiostream.c:379 -#: gio/gfileoutputstream.c:371 +#: gio/gfileinputstream.c:327 gio/gfileiostream.c:381 +#: gio/gfileoutputstream.c:373 msgid "Seek not supported on stream" msgstr "ნაკადში გადახვევა მხარდაუჭერელია" -#: gio/gfileinputstream.c:369 +#: gio/gfileinputstream.c:371 msgid "Truncate not allowed on input stream" msgstr "" -#: gio/gfileiostream.c:455 gio/gfileoutputstream.c:447 +#: gio/gfileiostream.c:457 gio/gfileoutputstream.c:449 msgid "Truncate not supported on stream" msgstr "ნაკადის მოკვეთა მხარდაუჭერელია" -#: gio/ghttpproxy.c:91 gio/gresolver.c:458 gio/gresolver.c:611 -#: glib/gconvert.c:1825 +#: gio/ghttpproxy.c:93 gio/gresolver.c:460 gio/gresolver.c:613 +#: glib/gconvert.c:1829 msgid "Invalid hostname" msgstr "ჰოსტის არასწორი სახელი" -#: gio/ghttpproxy.c:143 +#: gio/ghttpproxy.c:145 msgid "Bad HTTP proxy reply" msgstr "" -#: gio/ghttpproxy.c:159 +#: gio/ghttpproxy.c:161 msgid "HTTP proxy connection not allowed" msgstr "" -#: gio/ghttpproxy.c:164 +#: gio/ghttpproxy.c:166 msgid "HTTP proxy authentication failed" msgstr "" -#: gio/ghttpproxy.c:167 +#: gio/ghttpproxy.c:169 msgid "HTTP proxy authentication required" msgstr "" -#: gio/ghttpproxy.c:171 +#: gio/ghttpproxy.c:173 #, c-format msgid "HTTP proxy connection failed: %i" msgstr "" -#: gio/ghttpproxy.c:266 +#: gio/ghttpproxy.c:268 msgid "HTTP proxy response too big" msgstr "" -#: gio/ghttpproxy.c:283 +#: gio/ghttpproxy.c:285 msgid "HTTP proxy server closed connection unexpectedly." msgstr "" -#: gio/gicon.c:298 +#: gio/gicon.c:299 #, c-format msgid "Wrong number of tokens (%d)" msgstr "" -#: gio/gicon.c:318 +#: gio/gicon.c:319 #, c-format msgid "No type for class name %s" msgstr "" -#: gio/gicon.c:328 +#: gio/gicon.c:329 #, c-format msgid "Type %s does not implement the GIcon interface" msgstr "" -#: gio/gicon.c:339 +#: gio/gicon.c:340 #, c-format msgid "Type %s is not classed" msgstr "" -#: gio/gicon.c:353 +#: gio/gicon.c:354 #, c-format msgid "Malformed version number: %s" msgstr "" -#: gio/gicon.c:367 +#: gio/gicon.c:368 #, c-format msgid "Type %s does not implement from_tokens() on the GIcon interface" msgstr "" -#: gio/gicon.c:469 +#: gio/gicon.c:470 msgid "Can’t handle the supplied version of the icon encoding" msgstr "" -#: gio/ginetaddressmask.c:182 +#: gio/ginetaddressmask.c:184 msgid "No address specified" msgstr "მისამართი მითითებული არაა" -#: gio/ginetaddressmask.c:190 +#: gio/ginetaddressmask.c:192 #, c-format msgid "Length %u is too long for address" msgstr "" -#: gio/ginetaddressmask.c:223 +#: gio/ginetaddressmask.c:225 msgid "Address has bits set beyond prefix length" msgstr "" -#: gio/ginetaddressmask.c:300 +#: gio/ginetaddressmask.c:302 #, c-format msgid "Could not parse “%s” as IP address mask" msgstr "" -#: gio/ginetsocketaddress.c:203 gio/ginetsocketaddress.c:220 -#: gio/gnativesocketaddress.c:109 gio/gunixsocketaddress.c:228 +#: gio/ginetsocketaddress.c:205 gio/ginetsocketaddress.c:222 +#: gio/gnativesocketaddress.c:111 gio/gunixsocketaddress.c:230 msgid "Not enough space for socket address" msgstr "" -#: gio/ginetsocketaddress.c:235 +#: gio/ginetsocketaddress.c:237 msgid "Unsupported socket address" msgstr "" -#: gio/ginputstream.c:188 +#: gio/ginputstream.c:190 msgid "Input stream doesn’t implement read" msgstr "" @@ -1535,284 +1553,277 @@ #. Translators: This is an error you get if there is #. * already an operation running against this stream when #. * you try to start one -#: gio/ginputstream.c:1249 gio/giostream.c:310 gio/goutputstream.c:2208 +#: gio/ginputstream.c:1251 gio/giostream.c:312 gio/goutputstream.c:2210 msgid "Stream has outstanding operation" msgstr "" -#: gio/gio-tool.c:160 +#: gio/gio-tool.c:162 msgid "Copy with file" msgstr "ფაილით კოპირება" -#: gio/gio-tool.c:164 +#: gio/gio-tool.c:166 msgid "Keep with file when moved" msgstr "" -#: gio/gio-tool.c:205 +#: gio/gio-tool.c:207 msgid "“version” takes no arguments" msgstr "\"version\"-ს არგუმენტები არ აქვს" -#: gio/gio-tool.c:207 gio/gio-tool.c:223 glib/goption.c:869 +#: gio/gio-tool.c:209 gio/gio-tool.c:225 glib/goption.c:871 msgid "Usage:" msgstr "გამოყენება:" -#: gio/gio-tool.c:210 +#: gio/gio-tool.c:212 msgid "Print version information and exit." msgstr "ვერსიის ინფორმაციის გამოტანა და გასვლა." -#: gio/gio-tool.c:226 +#: gio/gio-tool.c:228 msgid "Commands:" msgstr "ბრძანებები:" -#: gio/gio-tool.c:229 +#: gio/gio-tool.c:231 msgid "Concatenate files to standard output" msgstr "" -#: gio/gio-tool.c:230 +#: gio/gio-tool.c:232 msgid "Copy one or more files" msgstr "ერთი ან მეტი ფაილის კოპირება" -#: gio/gio-tool.c:231 +#: gio/gio-tool.c:233 msgid "Show information about locations" msgstr "" -#: gio/gio-tool.c:232 +#: gio/gio-tool.c:234 msgid "Launch an application from a desktop file" msgstr "" -#: gio/gio-tool.c:233 +#: gio/gio-tool.c:235 msgid "List the contents of locations" msgstr "" -#: gio/gio-tool.c:234 +#: gio/gio-tool.c:236 msgid "Get or set the handler for a mimetype" msgstr "" -#: gio/gio-tool.c:235 +#: gio/gio-tool.c:237 msgid "Create directories" msgstr "საქაღალდეების შექმნა" -#: gio/gio-tool.c:236 +#: gio/gio-tool.c:238 msgid "Monitor files and directories for changes" msgstr "" -#: gio/gio-tool.c:237 +#: gio/gio-tool.c:239 msgid "Mount or unmount the locations" msgstr "" -#: gio/gio-tool.c:238 +#: gio/gio-tool.c:240 msgid "Move one or more files" msgstr "ერთი ან მეტი ფაილის გადატანა" -#: gio/gio-tool.c:239 +#: gio/gio-tool.c:241 msgid "Open files with the default application" msgstr "" -#: gio/gio-tool.c:240 +#: gio/gio-tool.c:242 msgid "Rename a file" msgstr "" -#: gio/gio-tool.c:241 +#: gio/gio-tool.c:243 msgid "Delete one or more files" msgstr "" -#: gio/gio-tool.c:242 +#: gio/gio-tool.c:244 msgid "Read from standard input and save" msgstr "" -#: gio/gio-tool.c:243 +#: gio/gio-tool.c:245 msgid "Set a file attribute" msgstr "" -#: gio/gio-tool.c:244 +#: gio/gio-tool.c:246 msgid "Move files or directories to the trash" msgstr "" -#: gio/gio-tool.c:245 +#: gio/gio-tool.c:247 msgid "Lists the contents of locations in a tree" msgstr "" -#: gio/gio-tool.c:247 +#: gio/gio-tool.c:249 #, c-format msgid "Use %s to get detailed help.\n" msgstr "" -#: gio/gio-tool-cat.c:87 +#: gio/gio-tool-cat.c:89 msgid "Error writing to stdout" msgstr "" #. Translators: commandline placeholder -#: gio/gio-tool-cat.c:133 gio/gio-tool-info.c:340 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:204 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:91 -#: gio/gio-tool-trash.c:220 gio/gio-tool-tree.c:239 +#: gio/gio-tool-cat.c:135 gio/gio-tool-info.c:379 gio/gio-tool-list.c:173 +#: gio/gio-tool-mkdir.c:50 gio/gio-tool-monitor.c:39 gio/gio-tool-monitor.c:41 +#: gio/gio-tool-monitor.c:43 gio/gio-tool-monitor.c:45 +#: gio/gio-tool-monitor.c:206 gio/gio-tool-mount.c:1210 gio/gio-tool-open.c:72 +#: gio/gio-tool-remove.c:50 gio/gio-tool-rename.c:47 gio/gio-tool-set.c:95 +#: gio/gio-tool-trash.c:222 gio/gio-tool-tree.c:241 msgid "LOCATION" msgstr "მდებარეობა" -#: gio/gio-tool-cat.c:138 +#: gio/gio-tool-cat.c:140 msgid "Concatenate files and print to standard output." msgstr "" -#: gio/gio-tool-cat.c:140 +#: gio/gio-tool-cat.c:142 msgid "" "gio cat works just like the traditional cat utility, but using GIO\n" "locations instead of local files: for example, you can use something\n" "like smb://server/resource/file.txt as location." msgstr "" -#: gio/gio-tool-cat.c:162 gio/gio-tool-info.c:371 gio/gio-tool-mkdir.c:76 -#: gio/gio-tool-monitor.c:229 gio/gio-tool-mount.c:1250 gio/gio-tool-open.c:96 -#: gio/gio-tool-remove.c:72 gio/gio-tool-trash.c:303 +#: gio/gio-tool-cat.c:164 gio/gio-tool-info.c:410 gio/gio-tool-mkdir.c:78 +#: gio/gio-tool-monitor.c:231 gio/gio-tool-mount.c:1261 gio/gio-tool-open.c:98 +#: gio/gio-tool-remove.c:74 gio/gio-tool-trash.c:303 msgid "No locations given" msgstr "მდებარეობები მითითებული არაა" -#: gio/gio-tool-copy.c:43 gio/gio-tool-move.c:38 +#: gio/gio-tool-copy.c:45 gio/gio-tool-move.c:40 msgid "No target directory" msgstr "სამიზნე საქაღალდის გარეშე" -#: gio/gio-tool-copy.c:44 gio/gio-tool-move.c:39 +#: gio/gio-tool-copy.c:46 gio/gio-tool-move.c:41 msgid "Show progress" msgstr "მიმდინარეობის ჩვენება" -#: gio/gio-tool-copy.c:45 gio/gio-tool-move.c:40 +#: gio/gio-tool-copy.c:47 gio/gio-tool-move.c:42 msgid "Prompt before overwrite" msgstr "კითხვა თავზე გადაწერამდე" -#: gio/gio-tool-copy.c:46 +#: gio/gio-tool-copy.c:48 msgid "Preserve all attributes" msgstr "ყველა ატრიბუტის შენარჩუნება" -#: gio/gio-tool-copy.c:47 gio/gio-tool-move.c:41 gio/gio-tool-save.c:49 +#: gio/gio-tool-copy.c:49 gio/gio-tool-move.c:43 gio/gio-tool-save.c:51 msgid "Backup existing destination files" msgstr "" -#: gio/gio-tool-copy.c:48 +#: gio/gio-tool-copy.c:50 msgid "Never follow symbolic links" msgstr "" -#: gio/gio-tool-copy.c:49 +#: gio/gio-tool-copy.c:51 msgid "Use default permissions for the destination" msgstr "" -#: gio/gio-tool-copy.c:74 gio/gio-tool-move.c:67 +#: gio/gio-tool-copy.c:76 gio/gio-tool-move.c:69 #, c-format msgid "Transferred %s out of %s (%s/s)" msgstr "" #. Translators: commandline placeholder -#: gio/gio-tool-copy.c:100 gio/gio-tool-move.c:94 +#: gio/gio-tool-copy.c:102 gio/gio-tool-move.c:96 msgid "SOURCE" msgstr "წყარო" #. Translators: commandline placeholder -#: gio/gio-tool-copy.c:100 gio/gio-tool-move.c:94 gio/gio-tool-save.c:160 +#: gio/gio-tool-copy.c:102 gio/gio-tool-move.c:96 gio/gio-tool-save.c:162 msgid "DESTINATION" msgstr "დანიშნულება" -#: gio/gio-tool-copy.c:105 +#: gio/gio-tool-copy.c:107 msgid "Copy one or more files from SOURCE to DESTINATION." msgstr "" -#: gio/gio-tool-copy.c:107 +#: gio/gio-tool-copy.c:109 msgid "" "gio copy is similar to the traditional cp utility, but using GIO\n" "locations instead of local files: for example, you can use something\n" "like smb://server/resource/file.txt as location." msgstr "" -#: gio/gio-tool-copy.c:149 +#: gio/gio-tool-copy.c:151 #, c-format msgid "Destination %s is not a directory" msgstr "" -#: gio/gio-tool-copy.c:196 gio/gio-tool-move.c:186 +#: gio/gio-tool-copy.c:198 gio/gio-tool-move.c:188 #, c-format msgid "%s: overwrite “%s”? " msgstr "" -#: gio/gio-tool-info.c:37 +#: gio/gio-tool-info.c:39 msgid "List writable attributes" msgstr "" -#: gio/gio-tool-info.c:38 +#: gio/gio-tool-info.c:40 msgid "Get file system info" msgstr "სისტემის ინფორმაციის მიღების შეცდომა" -#: gio/gio-tool-info.c:39 gio/gio-tool-list.c:36 +#: gio/gio-tool-info.c:41 gio/gio-tool-list.c:37 msgid "The attributes to get" msgstr "" -#: gio/gio-tool-info.c:39 gio/gio-tool-list.c:36 +#: gio/gio-tool-info.c:41 gio/gio-tool-list.c:37 msgid "ATTRIBUTES" msgstr "ატრიბუტები" -#: gio/gio-tool-info.c:40 gio/gio-tool-list.c:39 gio/gio-tool-set.c:34 +#: gio/gio-tool-info.c:42 gio/gio-tool-list.c:40 gio/gio-tool-set.c:37 msgid "Don’t follow symbolic links" msgstr "სიმბმულების არ-მიყოლა" -#: gio/gio-tool-info.c:78 +#: gio/gio-tool-info.c:105 msgid "attributes:\n" msgstr "ატრიბუტები:\n" -#. Translators: This is a noun and represents and attribute of a file -#: gio/gio-tool-info.c:134 +#: gio/gio-tool-info.c:165 gio/gio-tool-info.c:174 #, 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:139 -#, c-format -msgid "edit name: %s\n" -msgstr "სახელის ჩასწორება: %s\n" - -#: gio/gio-tool-info.c:145 +#: gio/gio-tool-info.c:182 #, c-format msgid "name: %s\n" msgstr "სახელი: %s\n" -#: gio/gio-tool-info.c:152 +#: gio/gio-tool-info.c:189 #, c-format msgid "type: %s\n" msgstr "ტიპი : %s\n" -#: gio/gio-tool-info.c:158 +#: gio/gio-tool-info.c:195 msgid "size: " msgstr "ზომა: " -#: gio/gio-tool-info.c:163 +#: gio/gio-tool-info.c:200 msgid "hidden\n" msgstr "დამალული\n" -#: gio/gio-tool-info.c:166 +#: gio/gio-tool-info.c:203 #, c-format msgid "uri: %s\n" msgstr "uri: %s\n" -#: gio/gio-tool-info.c:172 +#: gio/gio-tool-info.c:210 #, c-format msgid "local path: %s\n" msgstr "ლოკალური ბილიკი: %s\n" -#: gio/gio-tool-info.c:205 +#: gio/gio-tool-info.c:244 #, c-format msgid "unix mount: %s%s %s %s %s\n" msgstr "" -#: gio/gio-tool-info.c:286 +#: gio/gio-tool-info.c:325 msgid "Settable attributes:\n" msgstr "" -#: gio/gio-tool-info.c:310 +#: gio/gio-tool-info.c:349 msgid "Writable attribute namespaces:\n" msgstr "" -#: gio/gio-tool-info.c:345 +#: gio/gio-tool-info.c:384 msgid "Show information about locations." msgstr "" -#: gio/gio-tool-info.c:347 +#: gio/gio-tool-info.c:386 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" @@ -1822,60 +1833,60 @@ msgstr "" #. Translators: commandline placeholder -#: gio/gio-tool-launch.c:54 +#: gio/gio-tool-launch.c:56 msgid "DESKTOP-FILE FILE-ARG …" msgstr "" -#: gio/gio-tool-launch.c:57 +#: gio/gio-tool-launch.c:59 msgid "" "Launch an application from a desktop file, passing optional filename " "arguments to it." msgstr "" -#: gio/gio-tool-launch.c:77 +#: gio/gio-tool-launch.c:79 msgid "No desktop file given" msgstr "" -#: gio/gio-tool-launch.c:85 +#: gio/gio-tool-launch.c:87 msgid "The launch command is not currently supported on this platform" msgstr "" -#: gio/gio-tool-launch.c:98 +#: gio/gio-tool-launch.c:100 #, c-format msgid "Unable to load ‘%s‘: %s" msgstr "%s-ის ჩატვირთვის შეცდომა: %s" -#: gio/gio-tool-launch.c:107 +#: gio/gio-tool-launch.c:109 #, c-format msgid "Unable to load application information for ‘%s‘" msgstr "" -#: gio/gio-tool-launch.c:119 +#: gio/gio-tool-launch.c:121 #, c-format msgid "Unable to launch application ‘%s’: %s" msgstr "" -#: gio/gio-tool-list.c:37 gio/gio-tool-tree.c:32 +#: gio/gio-tool-list.c:38 gio/gio-tool-tree.c:34 msgid "Show hidden files" msgstr "დამალული ფაილების ჩვენება" -#: gio/gio-tool-list.c:38 +#: gio/gio-tool-list.c:39 msgid "Use a long listing format" msgstr "" -#: gio/gio-tool-list.c:40 +#: gio/gio-tool-list.c:41 msgid "Print display names" msgstr "" -#: gio/gio-tool-list.c:41 +#: gio/gio-tool-list.c:42 msgid "Print full URIs" msgstr "" -#: gio/gio-tool-list.c:177 +#: gio/gio-tool-list.c:178 msgid "List the contents of the locations." msgstr "" -#: gio/gio-tool-list.c:179 +#: gio/gio-tool-list.c:180 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" @@ -1884,410 +1895,414 @@ msgstr "" #. Translators: commandline placeholder -#: gio/gio-tool-mime.c:71 +#: gio/gio-tool-mime.c:73 msgid "MIMETYPE" msgstr "" -#: gio/gio-tool-mime.c:71 +#: gio/gio-tool-mime.c:73 msgid "HANDLER" msgstr "" -#: gio/gio-tool-mime.c:76 +#: gio/gio-tool-mime.c:78 msgid "Get or set the handler for a mimetype." msgstr "" -#: gio/gio-tool-mime.c:78 +#: gio/gio-tool-mime.c:80 msgid "" "If no handler is given, lists registered and recommended applications\n" "for the mimetype. If a handler is given, it is set as the default\n" "handler for the mimetype." msgstr "" -#: gio/gio-tool-mime.c:100 +#: gio/gio-tool-mime.c:102 msgid "Must specify a single mimetype, and maybe a handler" msgstr "" -#: gio/gio-tool-mime.c:116 +#: gio/gio-tool-mime.c:118 #, c-format msgid "No default applications for “%s”\n" msgstr "" -#: gio/gio-tool-mime.c:122 +#: gio/gio-tool-mime.c:124 #, c-format msgid "Default application for “%s”: %s\n" msgstr "" -#: gio/gio-tool-mime.c:127 +#: gio/gio-tool-mime.c:129 msgid "Registered applications:\n" msgstr "" -#: gio/gio-tool-mime.c:129 +#: gio/gio-tool-mime.c:131 msgid "No registered applications\n" msgstr "" -#: gio/gio-tool-mime.c:140 +#: gio/gio-tool-mime.c:142 msgid "Recommended applications:\n" msgstr "" -#: gio/gio-tool-mime.c:142 +#: gio/gio-tool-mime.c:144 msgid "No recommended applications\n" msgstr "" -#: gio/gio-tool-mime.c:162 +#: gio/gio-tool-mime.c:164 #, c-format msgid "Failed to load info for handler “%s”" msgstr "" -#: gio/gio-tool-mime.c:168 +#: gio/gio-tool-mime.c:170 #, c-format msgid "Failed to set “%s” as the default handler for “%s”: %s\n" msgstr "" -#: gio/gio-tool-mkdir.c:31 +#: gio/gio-tool-mkdir.c:33 msgid "Create parent directories" msgstr "" -#: gio/gio-tool-mkdir.c:52 +#: gio/gio-tool-mkdir.c:54 msgid "Create directories." msgstr "" -#: gio/gio-tool-mkdir.c:54 +#: gio/gio-tool-mkdir.c:56 msgid "" "gio mkdir is similar to the traditional mkdir utility, but using GIO\n" "locations instead of local files: for example, you can use something\n" "like smb://server/resource/mydir as location." msgstr "" -#: gio/gio-tool-monitor.c:37 +#: gio/gio-tool-monitor.c:39 msgid "Monitor a directory (default: depends on type)" msgstr "" -#: gio/gio-tool-monitor.c:39 +#: gio/gio-tool-monitor.c:41 msgid "Monitor a file (default: depends on type)" msgstr "" -#: gio/gio-tool-monitor.c:41 +#: gio/gio-tool-monitor.c:43 msgid "Monitor a file directly (notices changes made via hardlinks)" msgstr "" -#: gio/gio-tool-monitor.c:43 +#: gio/gio-tool-monitor.c:45 msgid "Monitors a file directly, but doesn’t report changes" msgstr "" -#: gio/gio-tool-monitor.c:45 +#: gio/gio-tool-monitor.c:47 msgid "Report moves and renames as simple deleted/created events" msgstr "" -#: gio/gio-tool-monitor.c:47 +#: gio/gio-tool-monitor.c:49 msgid "Watch for mount events" msgstr "" -#: gio/gio-tool-monitor.c:209 +#: gio/gio-tool-monitor.c:211 msgid "Monitor files or directories for changes." msgstr "" -#: gio/gio-tool-mount.c:63 +#: gio/gio-tool-mount.c:65 msgid "Mount as mountable" msgstr "" -#: gio/gio-tool-mount.c:64 +#: gio/gio-tool-mount.c:66 msgid "Mount volume with device file, or other identifier" msgstr "" -#: gio/gio-tool-mount.c:64 +#: gio/gio-tool-mount.c:66 msgid "ID" -msgstr "აიდი" +msgstr "ID" -#: gio/gio-tool-mount.c:65 +#: gio/gio-tool-mount.c:67 msgid "Unmount" msgstr "მოხსნა" -#: gio/gio-tool-mount.c:66 +#: gio/gio-tool-mount.c:68 msgid "Eject" -msgstr "მოხსნა" +msgstr "გამოღება" -#: gio/gio-tool-mount.c:67 +#: gio/gio-tool-mount.c:69 msgid "Stop drive with device file" msgstr "" -#: gio/gio-tool-mount.c:67 +#: gio/gio-tool-mount.c:69 msgid "DEVICE" msgstr "მოწყობილობა" -#: gio/gio-tool-mount.c:68 +#: gio/gio-tool-mount.c:70 msgid "Unmount all mounts with the given scheme" msgstr "" -#: gio/gio-tool-mount.c:68 +#: gio/gio-tool-mount.c:70 msgid "SCHEME" msgstr "სქემა" -#: gio/gio-tool-mount.c:69 +#: gio/gio-tool-mount.c:71 msgid "Ignore outstanding file operations when unmounting or ejecting" msgstr "" -#: gio/gio-tool-mount.c:70 +#: gio/gio-tool-mount.c:72 msgid "Use an anonymous user when authenticating" msgstr "" #. Translator: List here is a verb as in 'List all mounts' -#: gio/gio-tool-mount.c:72 +#: gio/gio-tool-mount.c:74 msgid "List" msgstr "სია" -#: gio/gio-tool-mount.c:73 +#: gio/gio-tool-mount.c:75 msgid "Monitor events" msgstr "" -#: gio/gio-tool-mount.c:74 +#: gio/gio-tool-mount.c:76 msgid "Show extra information" msgstr "დამატებითი ინფორმაციის ჩვენება" -#: gio/gio-tool-mount.c:75 +#: gio/gio-tool-mount.c:77 msgid "The numeric PIM when unlocking a VeraCrypt volume" msgstr "" -#: gio/gio-tool-mount.c:75 +#: gio/gio-tool-mount.c:77 msgid "PIM" msgstr "PIM" -#: gio/gio-tool-mount.c:76 +#: gio/gio-tool-mount.c:78 msgid "Mount a TCRYPT hidden volume" msgstr "" -#: gio/gio-tool-mount.c:77 +#: gio/gio-tool-mount.c:79 msgid "Mount a TCRYPT system volume" msgstr "" -#: gio/gio-tool-mount.c:265 gio/gio-tool-mount.c:297 +#: gio/gio-tool-mount.c:276 gio/gio-tool-mount.c:308 msgid "Anonymous access denied" msgstr "" -#: gio/gio-tool-mount.c:522 +#: gio/gio-tool-mount.c:533 msgid "No drive for device file" msgstr "" -#: gio/gio-tool-mount.c:1014 +#: gio/gio-tool-mount.c:1025 msgid "No volume for given ID" msgstr "" -#: gio/gio-tool-mount.c:1203 +#: gio/gio-tool-mount.c:1214 msgid "Mount or unmount the locations." msgstr "" -#: gio/gio-tool-move.c:42 +#: gio/gio-tool-move.c:44 msgid "Don’t use copy and delete fallback" msgstr "" -#: gio/gio-tool-move.c:99 +#: gio/gio-tool-move.c:101 msgid "Move one or more files from SOURCE to DEST." msgstr "" -#: gio/gio-tool-move.c:101 +#: gio/gio-tool-move.c:103 msgid "" "gio move is similar to the traditional mv utility, but using GIO\n" "locations instead of local files: for example, you can use something\n" "like smb://server/resource/file.txt as location" msgstr "" -#: gio/gio-tool-move.c:143 +#: gio/gio-tool-move.c:145 #, c-format msgid "Target %s is not a directory" msgstr "სამიზნე %s საქაღალდეს არ წარმოადგენს" -#: gio/gio-tool-open.c:75 +#: gio/gio-tool-open.c:77 msgid "" "Open files with the default application that\n" "is registered to handle files of this type." msgstr "" -#: gio/gio-tool-remove.c:31 gio/gio-tool-trash.c:33 +#: gio/gio-tool-remove.c:33 gio/gio-tool-trash.c:35 msgid "Ignore nonexistent files, never prompt" msgstr "" -#: gio/gio-tool-remove.c:52 +#: gio/gio-tool-remove.c:54 msgid "Delete the given files." msgstr "" -#: gio/gio-tool-rename.c:45 +#: gio/gio-tool-rename.c:47 msgid "NAME" -msgstr "სახელი" +msgstr "" -#: gio/gio-tool-rename.c:50 +#: gio/gio-tool-rename.c:52 msgid "Rename a file." msgstr "ფაილის სახელის გადარქმევა." -#: gio/gio-tool-rename.c:70 +#: gio/gio-tool-rename.c:72 msgid "Missing argument" msgstr "ნაკლული არგუმენტი" -#: gio/gio-tool-rename.c:76 gio/gio-tool-save.c:190 gio/gio-tool-set.c:139 +#: gio/gio-tool-rename.c:78 gio/gio-tool-save.c:192 gio/gio-tool-set.c:150 msgid "Too many arguments" msgstr "მეტისმეტად ბევრი არგუმენტი" -#: gio/gio-tool-rename.c:95 +#: gio/gio-tool-rename.c:97 #, c-format msgid "Rename successful. New uri: %s\n" msgstr "სახელის გადარქმევა წარმატებულია. ახალი URI: %s\n" -#: gio/gio-tool-save.c:50 +#: gio/gio-tool-save.c:52 msgid "Only create if not existing" msgstr "" -#: gio/gio-tool-save.c:51 +#: gio/gio-tool-save.c:53 msgid "Append to end of file" msgstr "" -#: gio/gio-tool-save.c:52 +#: gio/gio-tool-save.c:54 msgid "When creating, restrict access to the current user" msgstr "" -#: gio/gio-tool-save.c:53 +#: gio/gio-tool-save.c:55 msgid "When replacing, replace as if the destination did not exist" msgstr "" #. Translators: The "etag" is a token allowing to verify whether a file has been modified -#: gio/gio-tool-save.c:55 +#: gio/gio-tool-save.c:57 msgid "Print new etag at end" msgstr "" #. Translators: The "etag" is a token allowing to verify whether a file has been modified -#: gio/gio-tool-save.c:57 +#: gio/gio-tool-save.c:59 msgid "The etag of the file being overwritten" msgstr "" -#: gio/gio-tool-save.c:57 +#: gio/gio-tool-save.c:59 msgid "ETAG" msgstr "" -#: gio/gio-tool-save.c:113 +#: gio/gio-tool-save.c:115 msgid "Error reading from standard input" msgstr "" #. Translators: The "etag" is a token allowing to verify whether a file has been modified -#: gio/gio-tool-save.c:139 +#: gio/gio-tool-save.c:141 msgid "Etag not available\n" msgstr "" -#: gio/gio-tool-save.c:163 +#: gio/gio-tool-save.c:165 msgid "Read from standard input and save to DEST." msgstr "" -#: gio/gio-tool-save.c:183 +#: gio/gio-tool-save.c:185 msgid "No destination given" msgstr "" -#: gio/gio-tool-set.c:33 +#: gio/gio-tool-set.c:36 msgid "Type of the attribute" msgstr "" -#: gio/gio-tool-set.c:33 +#: gio/gio-tool-set.c:36 msgid "TYPE" msgstr "ტიპი" -#: gio/gio-tool-set.c:91 +#: gio/gio-tool-set.c:38 +msgid "Unset given attribute" +msgstr "ყველა ატრიბუტის მოხსნა" + +#: gio/gio-tool-set.c:95 msgid "ATTRIBUTE" msgstr "" -#: gio/gio-tool-set.c:91 +#: gio/gio-tool-set.c:95 msgid "VALUE" msgstr "მნიშვნელობა" -#: gio/gio-tool-set.c:95 +#: gio/gio-tool-set.c:99 msgid "Set a file attribute of LOCATION." msgstr "" -#: gio/gio-tool-set.c:115 +#: gio/gio-tool-set.c:119 msgid "Location not specified" msgstr "მდებარეობა მითითებული არაა" -#: gio/gio-tool-set.c:122 +#: gio/gio-tool-set.c:126 msgid "Attribute not specified" msgstr "" -#: gio/gio-tool-set.c:132 +#: gio/gio-tool-set.c:143 msgid "Value not specified" msgstr "" -#: gio/gio-tool-set.c:182 +#: gio/gio-tool-set.c:193 #, c-format msgid "Invalid attribute type “%s”" msgstr "ატრიბუტის არასწორი ტიპი: %s" -#: gio/gio-tool-trash.c:34 +#: gio/gio-tool-trash.c:36 msgid "Empty the trash" msgstr "" -#: gio/gio-tool-trash.c:35 +#: gio/gio-tool-trash.c:37 msgid "List files in the trash with their original locations" msgstr "" -#: gio/gio-tool-trash.c:36 +#: gio/gio-tool-trash.c:38 msgid "" "Restore a file from trash to its original location (possibly recreating the " "directory)" msgstr "" -#: gio/gio-tool-trash.c:106 +#: gio/gio-tool-trash.c:108 msgid "Unable to find original path" msgstr "" -#: gio/gio-tool-trash.c:123 +#: gio/gio-tool-trash.c:125 msgid "Unable to recreate original location: " msgstr "საწყისი მდებარეობის თავიდან შექმნის შეცდომა: " -#: gio/gio-tool-trash.c:136 +#: gio/gio-tool-trash.c:138 msgid "Unable to move file to its original location: " msgstr "" -#: gio/gio-tool-trash.c:225 +#: gio/gio-tool-trash.c:227 msgid "Move/Restore files or directories to the trash." msgstr "" -#: gio/gio-tool-trash.c:227 +#: gio/gio-tool-trash.c:229 msgid "" "Note: for --restore switch, if the original location of the trashed file \n" "already exists, it will not be overwritten unless --force is set." msgstr "" -#: gio/gio-tool-trash.c:258 +#: gio/gio-tool-trash.c:260 msgid "Location given doesn't start with trash:///" msgstr "" -#: gio/gio-tool-tree.c:33 +#: gio/gio-tool-tree.c:35 msgid "Follow symbolic links, mounts and shortcuts" msgstr "" -#: gio/gio-tool-tree.c:244 +#: gio/gio-tool-tree.c:246 msgid "List contents of directories in a tree-like format." msgstr "" -#: gio/glib-compile-resources.c:140 gio/glib-compile-schemas.c:1514 +#: gio/glib-compile-resources.c:142 gio/glib-compile-schemas.c:1513 #, c-format msgid "Element <%s> not allowed inside <%s>" msgstr "ელემენტი <%s> <%s>-ის შიგნით დაუშვებელია" -#: gio/glib-compile-resources.c:144 +#: gio/glib-compile-resources.c:146 #, c-format msgid "Element <%s> not allowed at toplevel" msgstr "ელემენტი <%s> შეუძლებელია, სიის თავში იყოს" -#: gio/glib-compile-resources.c:234 +#: gio/glib-compile-resources.c:236 #, c-format msgid "File %s appears multiple times in the resource" msgstr "" -#: gio/glib-compile-resources.c:245 +#: gio/glib-compile-resources.c:247 #, c-format msgid "Failed to locate “%s” in any source directory" msgstr "" -#: gio/glib-compile-resources.c:256 +#: gio/glib-compile-resources.c:258 #, c-format msgid "Failed to locate “%s” in current directory" msgstr "" -#: gio/glib-compile-resources.c:290 +#: gio/glib-compile-resources.c:292 #, c-format msgid "Unknown processing option “%s”" msgstr "დამუშავების უცნობი პარამეტრი %s" @@ -2296,543 +2311,543 @@ #. * 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 +#: gio/glib-compile-resources.c:312 gio/glib-compile-resources.c:369 +#: gio/glib-compile-resources.c:426 #, c-format msgid "%s preprocessing requested, but %s is not set, and %s is not in PATH" msgstr "" -#: gio/glib-compile-resources.c:457 +#: gio/glib-compile-resources.c:459 #, c-format msgid "Error reading file %s: %s" msgstr "" -#: gio/glib-compile-resources.c:477 +#: gio/glib-compile-resources.c:479 #, c-format msgid "Error compressing file %s" msgstr "" -#: gio/glib-compile-resources.c:541 +#: gio/glib-compile-resources.c:543 #, c-format msgid "text may not appear inside <%s>" msgstr "" -#: gio/glib-compile-resources.c:819 gio/glib-compile-schemas.c:2172 +#: gio/glib-compile-resources.c:821 gio/glib-compile-schemas.c:2171 msgid "Show program version and exit" msgstr "" -#: gio/glib-compile-resources.c:820 +#: gio/glib-compile-resources.c:822 msgid "Name of the output file" msgstr "" -#: gio/glib-compile-resources.c:821 +#: gio/glib-compile-resources.c:823 msgid "" "The directories to load files referenced in FILE from (default: current " "directory)" msgstr "" -#: gio/glib-compile-resources.c:821 gio/glib-compile-schemas.c:2173 -#: gio/glib-compile-schemas.c:2202 +#: gio/glib-compile-resources.c:823 gio/glib-compile-schemas.c:2172 +#: gio/glib-compile-schemas.c:2201 msgid "DIRECTORY" msgstr "DIRECTORY" -#: gio/glib-compile-resources.c:822 +#: gio/glib-compile-resources.c:824 msgid "" "Generate output in the format selected for by the target filename extension" msgstr "" -#: gio/glib-compile-resources.c:823 +#: gio/glib-compile-resources.c:825 msgid "Generate source header" msgstr "" -#: gio/glib-compile-resources.c:824 +#: gio/glib-compile-resources.c:826 msgid "Generate source code used to link in the resource file into your code" msgstr "" -#: gio/glib-compile-resources.c:825 +#: gio/glib-compile-resources.c:827 msgid "Generate dependency list" msgstr "" -#: gio/glib-compile-resources.c:826 +#: gio/glib-compile-resources.c:828 msgid "Name of the dependency file to generate" msgstr "" -#: gio/glib-compile-resources.c:827 +#: gio/glib-compile-resources.c:829 msgid "Include phony targets in the generated dependency file" msgstr "" -#: gio/glib-compile-resources.c:828 +#: gio/glib-compile-resources.c:830 msgid "Don’t automatically create and register resource" msgstr "" -#: gio/glib-compile-resources.c:829 +#: gio/glib-compile-resources.c:831 msgid "Don’t export functions; declare them G_GNUC_INTERNAL" msgstr "" -#: gio/glib-compile-resources.c:830 +#: gio/glib-compile-resources.c:832 msgid "" "Don’t embed resource data in the C file; assume it's linked externally " "instead" msgstr "" -#: gio/glib-compile-resources.c:831 +#: gio/glib-compile-resources.c:833 msgid "C identifier name used for the generated source code" msgstr "" -#: gio/glib-compile-resources.c:832 +#: gio/glib-compile-resources.c:834 msgid "The target C compiler (default: the CC environment variable)" msgstr "" -#: gio/glib-compile-resources.c:858 +#: gio/glib-compile-resources.c:860 msgid "" "Compile a resource specification into a resource file.\n" "Resource specification files have the extension .gresource.xml,\n" "and the resource file have the extension called .gresource." msgstr "" -#: gio/glib-compile-resources.c:880 +#: gio/glib-compile-resources.c:882 msgid "You should give exactly one file name\n" msgstr "" -#: gio/glib-compile-schemas.c:92 +#: gio/glib-compile-schemas.c:94 #, c-format msgid "nick must be a minimum of 2 characters" msgstr "" -#: gio/glib-compile-schemas.c:103 +#: gio/glib-compile-schemas.c:105 #, c-format msgid "Invalid numeric value" msgstr "არასწორი რიცხვითი მნიშვნელობა" -#: gio/glib-compile-schemas.c:111 +#: gio/glib-compile-schemas.c:113 #, c-format msgid "<value nick='%s'/> already specified" msgstr "" -#: gio/glib-compile-schemas.c:119 +#: gio/glib-compile-schemas.c:121 #, c-format msgid "value='%s' already specified" msgstr "" -#: gio/glib-compile-schemas.c:133 +#: gio/glib-compile-schemas.c:135 #, c-format msgid "flags values must have at most 1 bit set" msgstr "" -#: gio/glib-compile-schemas.c:158 +#: gio/glib-compile-schemas.c:160 #, c-format msgid "<%s> must contain at least one <value>" msgstr "" -#: gio/glib-compile-schemas.c:314 +#: gio/glib-compile-schemas.c:316 #, c-format msgid "<%s> is not contained in the specified range" msgstr "" -#: gio/glib-compile-schemas.c:326 +#: gio/glib-compile-schemas.c:328 #, c-format msgid "<%s> is not a valid member of the specified enumerated type" msgstr "" -#: gio/glib-compile-schemas.c:332 +#: gio/glib-compile-schemas.c:334 #, c-format msgid "<%s> contains string not in the specified flags type" msgstr "" -#: gio/glib-compile-schemas.c:338 +#: gio/glib-compile-schemas.c:340 #, c-format msgid "<%s> contains a string not in <choices>" msgstr "" -#: gio/glib-compile-schemas.c:372 +#: gio/glib-compile-schemas.c:374 msgid "<range/> already specified for this key" msgstr "" -#: gio/glib-compile-schemas.c:390 +#: gio/glib-compile-schemas.c:392 #, c-format msgid "<range> not allowed for keys of type “%s”" msgstr "" -#: gio/glib-compile-schemas.c:407 +#: gio/glib-compile-schemas.c:409 #, c-format msgid "<range> specified minimum is greater than maximum" msgstr "" -#: gio/glib-compile-schemas.c:432 +#: gio/glib-compile-schemas.c:434 #, c-format msgid "unsupported l10n category: %s" msgstr "" -#: gio/glib-compile-schemas.c:440 +#: gio/glib-compile-schemas.c:442 msgid "l10n requested, but no gettext domain given" msgstr "" -#: gio/glib-compile-schemas.c:452 +#: gio/glib-compile-schemas.c:454 msgid "translation context given for value without l10n enabled" msgstr "" -#: gio/glib-compile-schemas.c:474 +#: gio/glib-compile-schemas.c:476 #, c-format msgid "Failed to parse <default> value of type “%s”: " msgstr "" -#: gio/glib-compile-schemas.c:491 +#: gio/glib-compile-schemas.c:493 msgid "" "<choices> cannot be specified for keys tagged as having an enumerated type" msgstr "" -#: gio/glib-compile-schemas.c:500 +#: gio/glib-compile-schemas.c:502 msgid "<choices> already specified for this key" msgstr "" -#: gio/glib-compile-schemas.c:512 +#: gio/glib-compile-schemas.c:514 #, c-format msgid "<choices> not allowed for keys of type “%s”" msgstr "" -#: gio/glib-compile-schemas.c:528 +#: gio/glib-compile-schemas.c:530 #, c-format msgid "<choice value='%s'/> already given" msgstr "" -#: gio/glib-compile-schemas.c:543 +#: gio/glib-compile-schemas.c:545 #, c-format msgid "<choices> must contain at least one <choice>" msgstr "" -#: gio/glib-compile-schemas.c:557 +#: gio/glib-compile-schemas.c:559 msgid "<aliases> already specified for this key" msgstr "" -#: gio/glib-compile-schemas.c:561 +#: gio/glib-compile-schemas.c:563 msgid "" "<aliases> can only be specified for keys with enumerated or flags types or " "after <choices>" msgstr "" -#: gio/glib-compile-schemas.c:580 +#: gio/glib-compile-schemas.c:582 #, c-format msgid "" "<alias value='%s'/> given when “%s” is already a member of the enumerated " "type" msgstr "" -#: gio/glib-compile-schemas.c:586 +#: gio/glib-compile-schemas.c:588 #, c-format msgid "<alias value='%s'/> given when <choice value='%s'/> was already given" msgstr "" -#: gio/glib-compile-schemas.c:594 +#: gio/glib-compile-schemas.c:596 #, c-format msgid "<alias value='%s'/> already specified" msgstr "" -#: gio/glib-compile-schemas.c:604 +#: gio/glib-compile-schemas.c:606 #, c-format msgid "alias target “%s” is not in enumerated type" msgstr "" -#: gio/glib-compile-schemas.c:605 +#: gio/glib-compile-schemas.c:607 #, c-format msgid "alias target “%s” is not in <choices>" msgstr "" -#: gio/glib-compile-schemas.c:620 +#: gio/glib-compile-schemas.c:622 #, c-format msgid "<aliases> must contain at least one <alias>" msgstr "" -#: gio/glib-compile-schemas.c:797 +#: gio/glib-compile-schemas.c:796 msgid "Empty names are not permitted" msgstr "ცარელი სახელები დაუშვებელია" -#: gio/glib-compile-schemas.c:807 +#: gio/glib-compile-schemas.c:806 #, c-format msgid "Invalid name “%s”: names must begin with a lowercase letter" msgstr "" -#: gio/glib-compile-schemas.c:819 +#: gio/glib-compile-schemas.c:818 #, c-format msgid "" "Invalid name “%s”: invalid character “%c”; only lowercase letters, numbers " "and hyphen (“-”) are permitted" msgstr "" -#: gio/glib-compile-schemas.c:828 +#: gio/glib-compile-schemas.c:827 #, c-format msgid "Invalid name “%s”: two successive hyphens (“--”) are not permitted" msgstr "" -#: gio/glib-compile-schemas.c:837 +#: gio/glib-compile-schemas.c:836 #, c-format msgid "Invalid name “%s”: the last character may not be a hyphen (“-”)" msgstr "" -#: gio/glib-compile-schemas.c:845 +#: gio/glib-compile-schemas.c:844 #, c-format msgid "Invalid name “%s”: maximum length is 1024" msgstr "" -#: gio/glib-compile-schemas.c:917 +#: gio/glib-compile-schemas.c:916 #, c-format msgid "<child name='%s'> already specified" msgstr "" -#: gio/glib-compile-schemas.c:943 +#: gio/glib-compile-schemas.c:942 msgid "Cannot add keys to a “list-of” schema" msgstr "" -#: gio/glib-compile-schemas.c:954 +#: gio/glib-compile-schemas.c:953 #, c-format msgid "<key name='%s'> already specified" msgstr "" -#: gio/glib-compile-schemas.c:972 +#: gio/glib-compile-schemas.c:971 #, c-format msgid "" "<key name='%s'> shadows <key name='%s'> in <schema id='%s'>; use <override> " "to modify value" msgstr "" -#: gio/glib-compile-schemas.c:983 +#: gio/glib-compile-schemas.c:982 #, c-format msgid "" "Exactly one of “type”, “enum” or “flags” must be specified as an attribute " "to <key>" msgstr "" -#: gio/glib-compile-schemas.c:1002 +#: gio/glib-compile-schemas.c:1001 #, c-format msgid "<%s id='%s'> not (yet) defined." msgstr "" -#: gio/glib-compile-schemas.c:1017 +#: gio/glib-compile-schemas.c:1016 #, c-format msgid "Invalid GVariant type string “%s”" msgstr "" -#: gio/glib-compile-schemas.c:1047 +#: gio/glib-compile-schemas.c:1046 msgid "<override> given but schema isn’t extending anything" msgstr "" -#: gio/glib-compile-schemas.c:1060 +#: gio/glib-compile-schemas.c:1059 #, c-format msgid "No <key name='%s'> to override" msgstr "" -#: gio/glib-compile-schemas.c:1068 +#: gio/glib-compile-schemas.c:1067 #, c-format msgid "<override name='%s'> already specified" msgstr "" -#: gio/glib-compile-schemas.c:1141 +#: gio/glib-compile-schemas.c:1140 #, c-format msgid "<schema id='%s'> already specified" msgstr "" -#: gio/glib-compile-schemas.c:1153 +#: gio/glib-compile-schemas.c:1152 #, c-format msgid "<schema id='%s'> extends not yet existing schema “%s”" msgstr "" -#: gio/glib-compile-schemas.c:1169 +#: gio/glib-compile-schemas.c:1168 #, c-format msgid "<schema id='%s'> is list of not yet existing schema “%s”" msgstr "" -#: gio/glib-compile-schemas.c:1177 +#: gio/glib-compile-schemas.c:1176 #, c-format msgid "Cannot be a list of a schema with a path" msgstr "" -#: gio/glib-compile-schemas.c:1187 +#: gio/glib-compile-schemas.c:1186 #, c-format msgid "Cannot extend a schema with a path" msgstr "" -#: gio/glib-compile-schemas.c:1197 +#: gio/glib-compile-schemas.c:1196 #, c-format msgid "" "<schema id='%s'> is a list, extending <schema id='%s'> which is not a list" msgstr "" -#: gio/glib-compile-schemas.c:1207 +#: gio/glib-compile-schemas.c:1206 #, c-format msgid "" "<schema id='%s' list-of='%s'> extends <schema id='%s' list-of='%s'> but “%s” " "does not extend “%s”" msgstr "" -#: gio/glib-compile-schemas.c:1224 +#: gio/glib-compile-schemas.c:1223 #, c-format msgid "A path, if given, must begin and end with a slash" msgstr "" -#: gio/glib-compile-schemas.c:1231 +#: gio/glib-compile-schemas.c:1230 #, c-format msgid "The path of a list must end with “:/”" msgstr "" -#: gio/glib-compile-schemas.c:1240 +#: gio/glib-compile-schemas.c:1239 #, c-format msgid "" "Warning: Schema “%s” has path “%s”. Paths starting with “/apps/”, “/" "desktop/” or “/system/” are deprecated." msgstr "" -#: gio/glib-compile-schemas.c:1270 +#: gio/glib-compile-schemas.c:1269 #, c-format msgid "<%s id='%s'> already specified" msgstr "" -#: gio/glib-compile-schemas.c:1420 gio/glib-compile-schemas.c:1436 +#: gio/glib-compile-schemas.c:1419 gio/glib-compile-schemas.c:1435 #, c-format msgid "Only one <%s> element allowed inside <%s>" msgstr "" -#: gio/glib-compile-schemas.c:1518 +#: gio/glib-compile-schemas.c:1517 #, c-format msgid "Element <%s> not allowed at the top level" msgstr "" -#: gio/glib-compile-schemas.c:1536 +#: gio/glib-compile-schemas.c:1535 msgid "Element <default> is required in <key>" msgstr "" -#: gio/glib-compile-schemas.c:1626 +#: gio/glib-compile-schemas.c:1625 #, c-format msgid "Text may not appear inside <%s>" msgstr "<%s>-ის შიგნით შეუძლებელია, ტექსტი გამოჩნდეს" -#: gio/glib-compile-schemas.c:1694 +#: gio/glib-compile-schemas.c:1693 #, c-format msgid "Warning: undefined reference to <schema id='%s'/>" msgstr "" #. Translators: Do not translate "--strict". -#: gio/glib-compile-schemas.c:1833 gio/glib-compile-schemas.c:1912 +#: gio/glib-compile-schemas.c:1832 gio/glib-compile-schemas.c:1911 msgid "--strict was specified; exiting." msgstr "" -#: gio/glib-compile-schemas.c:1845 +#: gio/glib-compile-schemas.c:1844 msgid "This entire file has been ignored." msgstr "" -#: gio/glib-compile-schemas.c:1908 +#: gio/glib-compile-schemas.c:1907 msgid "Ignoring this file." msgstr "" -#: gio/glib-compile-schemas.c:1963 +#: gio/glib-compile-schemas.c:1962 #, c-format msgid "" "No such key “%s” in schema “%s” as specified in override file “%s”; ignoring " "override for this key." msgstr "" -#: gio/glib-compile-schemas.c:1971 +#: gio/glib-compile-schemas.c:1970 #, c-format msgid "" "No such key “%s” in schema “%s” as specified in override file “%s” and --" "strict was specified; exiting." msgstr "" -#: gio/glib-compile-schemas.c:1993 +#: gio/glib-compile-schemas.c:1992 #, c-format 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:2002 +#: gio/glib-compile-schemas.c:2001 #, c-format msgid "" "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:2026 +#: gio/glib-compile-schemas.c:2025 #, c-format msgid "" "Error parsing key “%s” in schema “%s” as specified in override file “%s”: " "%s. Ignoring override for this key." msgstr "" -#: gio/glib-compile-schemas.c:2038 +#: gio/glib-compile-schemas.c:2037 #, c-format msgid "" "Error parsing key “%s” in schema “%s” as specified in override file “%s”: " "%s. --strict was specified; exiting." msgstr "" -#: gio/glib-compile-schemas.c:2065 +#: gio/glib-compile-schemas.c:2064 #, c-format msgid "" "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 "" -#: gio/glib-compile-schemas.c:2075 +#: gio/glib-compile-schemas.c:2074 #, 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 "" -#: gio/glib-compile-schemas.c:2101 +#: gio/glib-compile-schemas.c:2100 #, 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 "" -#: gio/glib-compile-schemas.c:2111 +#: gio/glib-compile-schemas.c:2110 #, c-format msgid "" "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 "" -#: gio/glib-compile-schemas.c:2173 +#: gio/glib-compile-schemas.c:2172 msgid "Where to store the gschemas.compiled file" msgstr "" -#: gio/glib-compile-schemas.c:2174 +#: gio/glib-compile-schemas.c:2173 msgid "Abort on any errors in schemas" msgstr "" -#: gio/glib-compile-schemas.c:2175 +#: gio/glib-compile-schemas.c:2174 msgid "Do not write the gschema.compiled file" msgstr "" -#: gio/glib-compile-schemas.c:2176 +#: gio/glib-compile-schemas.c:2175 msgid "Do not enforce key name restrictions" msgstr "" -#: gio/glib-compile-schemas.c:2205 +#: gio/glib-compile-schemas.c:2204 msgid "" "Compile all GSettings schema files into a schema cache.\n" "Schema files are required to have the extension .gschema.xml,\n" "and the cache file is called gschemas.compiled." msgstr "" -#: gio/glib-compile-schemas.c:2226 +#: gio/glib-compile-schemas.c:2225 msgid "You should give exactly one directory name" msgstr "" -#: gio/glib-compile-schemas.c:2269 +#: gio/glib-compile-schemas.c:2268 msgid "No schema files found: doing nothing." msgstr "" -#: gio/glib-compile-schemas.c:2271 +#: gio/glib-compile-schemas.c:2270 msgid "No schema files found: removed existing output file." msgstr "" -#: gio/glocalfile.c:549 gio/win32/gwinhttpfile.c:436 +#: gio/glocalfile.c:563 gio/win32/gwinhttpfile.c:436 #, c-format msgid "Invalid filename %s" msgstr "ფაილის არასწორი სახელი: %s" -#: gio/glocalfile.c:982 +#: gio/glocalfile.c:1005 #, c-format msgid "Error getting filesystem info for %s: %s" msgstr "" @@ -2841,522 +2856,530 @@ #. * the enclosing (user visible) mount of a file, but none #. * exists. #. -#: gio/glocalfile.c:1123 +#: gio/glocalfile.c:1141 #, c-format msgid "Containing mount for file %s not found" msgstr "" -#: gio/glocalfile.c:1146 +#: gio/glocalfile.c:1164 msgid "Can’t rename root directory" msgstr "" -#: gio/glocalfile.c:1164 gio/glocalfile.c:1187 +#: gio/glocalfile.c:1182 gio/glocalfile.c:1205 #, c-format msgid "Error renaming file %s: %s" msgstr "" -#: gio/glocalfile.c:1171 +#: gio/glocalfile.c:1189 msgid "Can’t rename file, filename already exists" msgstr "" -#: gio/glocalfile.c:1184 gio/glocalfile.c:2380 gio/glocalfile.c:2408 -#: gio/glocalfile.c:2547 gio/glocalfileoutputstream.c:656 +#: gio/glocalfile.c:1202 gio/glocalfile.c:2405 gio/glocalfile.c:2433 +#: gio/glocalfile.c:2572 gio/glocalfileoutputstream.c:658 msgid "Invalid filename" msgstr "ფაილის არასწორი სახელი" -#: gio/glocalfile.c:1352 gio/glocalfile.c:1363 +#: gio/glocalfile.c:1370 gio/glocalfile.c:1381 #, c-format msgid "Error opening file %s: %s" msgstr "" -#: gio/glocalfile.c:1488 +#: gio/glocalfile.c:1506 #, c-format msgid "Error removing file %s: %s" msgstr "" -#: gio/glocalfile.c:1982 gio/glocalfile.c:1993 gio/glocalfile.c:2020 +#: gio/glocalfile.c:2000 gio/glocalfile.c:2011 gio/glocalfile.c:2038 #, c-format msgid "Error trashing file %s: %s" msgstr "" -#: gio/glocalfile.c:2040 +#: gio/glocalfile.c:2058 #, c-format msgid "Unable to create trash directory %s: %s" msgstr "სანაგვის საქაღალდის (%s) შექმნის შეცდომა: %s" -#: gio/glocalfile.c:2061 +#: gio/glocalfile.c:2079 #, c-format msgid "Unable to find toplevel directory to trash %s" msgstr "%s-ის წასაშლელად ზედა საქაღალდის პოვნა შეუძლებელი იყო" -#: gio/glocalfile.c:2069 +#: gio/glocalfile.c:2087 #, c-format msgid "Trashing on system internal mounts is not supported" msgstr "" -#: gio/glocalfile.c:2155 gio/glocalfile.c:2183 +#: gio/glocalfile.c:2173 gio/glocalfile.c:2201 #, c-format msgid "Unable to find or create trash directory %s to trash %s" msgstr "სანაგვე საქაღალდის (%s) შექმნა შეუძლებელია %s-ის წასაშლელად" -#: gio/glocalfile.c:2229 +#: gio/glocalfile.c:2245 #, c-format msgid "Unable to create trashing info file for %s: %s" msgstr "წაშლის ინფორმაციის ფაილის (%s) შექმნის შეცდომა: %s" -#: gio/glocalfile.c:2291 +#: gio/glocalfile.c:2316 #, c-format msgid "Unable to trash file %s across filesystem boundaries" msgstr "ფაილის (%s) წაშლა ფაილური სისტემის საზღვრებს მიღმა შეუძლებელია" -#: gio/glocalfile.c:2295 gio/glocalfile.c:2351 +#: gio/glocalfile.c:2320 gio/glocalfile.c:2376 #, c-format msgid "Unable to trash file %s: %s" msgstr "ფაილის (%s) წაშლა შეუძლებელია: %s" -#: gio/glocalfile.c:2357 +#: gio/glocalfile.c:2382 #, c-format msgid "Unable to trash file %s" msgstr "ფაილის (%s) წაშლა შეუძლებელია" -#: gio/glocalfile.c:2383 +#: gio/glocalfile.c:2408 #, c-format msgid "Error creating directory %s: %s" msgstr "საქაღალდის (%s) შექმნის შეცდომა: %s" -#: gio/glocalfile.c:2412 +#: gio/glocalfile.c:2437 #, c-format msgid "Filesystem does not support symbolic links" msgstr "ფაილურ სისტემას სიმბმულების მხარდაჭერა არ გააჩნია" -#: gio/glocalfile.c:2415 +#: gio/glocalfile.c:2440 #, c-format msgid "Error making symbolic link %s: %s" msgstr "" -#: gio/glocalfile.c:2458 gio/glocalfile.c:2493 gio/glocalfile.c:2550 +#: gio/glocalfile.c:2483 gio/glocalfile.c:2518 gio/glocalfile.c:2575 #, c-format msgid "Error moving file %s: %s" msgstr "" -#: gio/glocalfile.c:2481 +#: gio/glocalfile.c:2506 msgid "Can’t move directory over directory" msgstr "საქაღალდის საქაღალდეზე გადატანა შეუძლებელია" -#: gio/glocalfile.c:2507 gio/glocalfileoutputstream.c:1108 -#: gio/glocalfileoutputstream.c:1122 gio/glocalfileoutputstream.c:1137 -#: gio/glocalfileoutputstream.c:1154 gio/glocalfileoutputstream.c:1168 +#: gio/glocalfile.c:2532 gio/glocalfileoutputstream.c:1110 +#: gio/glocalfileoutputstream.c:1124 gio/glocalfileoutputstream.c:1139 +#: gio/glocalfileoutputstream.c:1156 gio/glocalfileoutputstream.c:1170 msgid "Backup file creation failed" msgstr "მარქაფის ფაილის შექმნის შეცდომა" -#: gio/glocalfile.c:2526 +#: gio/glocalfile.c:2551 #, c-format msgid "Error removing target file: %s" msgstr "" -#: gio/glocalfile.c:2540 +#: gio/glocalfile.c:2565 msgid "Move between mounts not supported" msgstr "" -#: gio/glocalfile.c:2714 +#: gio/glocalfile.c:2741 #, c-format msgid "Could not determine the disk usage of %s: %s" msgstr "დისკზე %s-ის მიერ დაკავებული ადგილის გამოთვლის შეცდომა: %s" -#: gio/glocalfileinfo.c:767 +#: gio/glocalfileinfo.c:775 msgid "Attribute value must be non-NULL" msgstr "" -#: gio/glocalfileinfo.c:774 -msgid "Invalid attribute type (string expected)" -msgstr "" +#: gio/glocalfileinfo.c:782 +msgid "Invalid attribute type (string or invalid expected)" +msgstr "ატრიბუტის არასწორი ტიპი (მოველოდი სტრიქონს ან არასწორს)" -#: gio/glocalfileinfo.c:781 +#: gio/glocalfileinfo.c:789 msgid "Invalid extended attribute name" msgstr "გაფართოებული ატრიბუტის არასწორი სახელი" -#: gio/glocalfileinfo.c:821 +#: gio/glocalfileinfo.c:840 #, c-format msgid "Error setting extended attribute “%s”: %s" msgstr "" -#: gio/glocalfileinfo.c:1709 gio/win32/gwinhttpfile.c:191 +#: gio/glocalfileinfo.c:1819 gio/win32/gwinhttpfile.c:191 msgid " (invalid encoding)" msgstr " (არასწორი კოდირება)" -#: gio/glocalfileinfo.c:1868 gio/glocalfileoutputstream.c:943 -#: gio/glocalfileoutputstream.c:995 +#: gio/glocalfileinfo.c:1978 gio/glocalfileoutputstream.c:945 +#: gio/glocalfileoutputstream.c:997 #, c-format msgid "Error when getting information for file “%s”: %s" msgstr "" -#: gio/glocalfileinfo.c:2134 +#: gio/glocalfileinfo.c:2281 #, c-format msgid "Error when getting information for file descriptor: %s" msgstr "" -#: gio/glocalfileinfo.c:2179 +#: gio/glocalfileinfo.c:2326 msgid "Invalid attribute type (uint32 expected)" msgstr "ატრიბუტის არასწორი ტიპი (მოველოდი uint32-ს)" -#: gio/glocalfileinfo.c:2197 +#: gio/glocalfileinfo.c:2344 msgid "Invalid attribute type (uint64 expected)" msgstr "" -#: gio/glocalfileinfo.c:2216 gio/glocalfileinfo.c:2235 +#: gio/glocalfileinfo.c:2363 gio/glocalfileinfo.c:2382 msgid "Invalid attribute type (byte string expected)" msgstr "" -#: gio/glocalfileinfo.c:2282 +#: gio/glocalfileinfo.c:2429 msgid "Cannot set permissions on symlinks" msgstr "სიმბმულებზე წვდომების დაყენების შეცდომა" -#: gio/glocalfileinfo.c:2298 +#: gio/glocalfileinfo.c:2445 #, c-format msgid "Error setting permissions: %s" msgstr "წვდომის დაყენების შეცდომა: %s" -#: gio/glocalfileinfo.c:2349 +#: gio/glocalfileinfo.c:2496 #, c-format msgid "Error setting owner: %s" msgstr "მფლობლის დაყენების შეცდომა: %s" -#: gio/glocalfileinfo.c:2372 +#: gio/glocalfileinfo.c:2519 msgid "symlink must be non-NULL" msgstr "" -#: gio/glocalfileinfo.c:2382 gio/glocalfileinfo.c:2401 -#: gio/glocalfileinfo.c:2412 +#: gio/glocalfileinfo.c:2529 gio/glocalfileinfo.c:2548 +#: gio/glocalfileinfo.c:2559 #, c-format msgid "Error setting symlink: %s" msgstr "სიმბმულის დაყენების შეცდომა: %s" -#: gio/glocalfileinfo.c:2391 +#: gio/glocalfileinfo.c:2538 msgid "Error setting symlink: file is not a symlink" msgstr "" -#: gio/glocalfileinfo.c:2463 +#: gio/glocalfileinfo.c:2630 #, c-format msgid "Extra nanoseconds %d for UNIX timestamp %lld are negative" msgstr "" -#: gio/glocalfileinfo.c:2472 +#: gio/glocalfileinfo.c:2639 #, c-format msgid "Extra nanoseconds %d for UNIX timestamp %lld reach 1 second" msgstr "" -#: gio/glocalfileinfo.c:2482 +#: gio/glocalfileinfo.c:2649 #, c-format msgid "UNIX timestamp %lld does not fit into 64 bits" msgstr "" -#: gio/glocalfileinfo.c:2493 +#: gio/glocalfileinfo.c:2660 #, c-format msgid "UNIX timestamp %lld is outside of the range supported by Windows" msgstr "" -#: gio/glocalfileinfo.c:2570 +#: gio/glocalfileinfo.c:2792 #, c-format msgid "File name “%s” cannot be converted to UTF-16" msgstr "" -#: gio/glocalfileinfo.c:2589 +#: gio/glocalfileinfo.c:2811 #, c-format msgid "File “%s” cannot be opened: Windows Error %lu" msgstr "" -#: gio/glocalfileinfo.c:2602 +#: gio/glocalfileinfo.c:2824 #, c-format msgid "Error setting modification or access time for file “%s”: %lu" msgstr "%s-ისთვის შეცვლის ან წვდომის დროის დაყენების შეცდომა: %lu" -#: gio/glocalfileinfo.c:2703 +#: gio/glocalfileinfo.c:2981 #, c-format msgid "Error setting modification or access time: %s" msgstr "ცვლილების ან წვდომის დროის დაყენების შეცდომა: %s" -#: gio/glocalfileinfo.c:2726 +#: gio/glocalfileinfo.c:3004 msgid "SELinux context must be non-NULL" msgstr "" -#: gio/glocalfileinfo.c:2733 +#: gio/glocalfileinfo.c:3011 msgid "SELinux is not enabled on this system" msgstr "" -#: gio/glocalfileinfo.c:2743 +#: gio/glocalfileinfo.c:3021 #, c-format msgid "Error setting SELinux context: %s" msgstr "SELinux-ის კონტექსტის დაყენების შეცდომა: %s" -#: gio/glocalfileinfo.c:2836 +#: gio/glocalfileinfo.c:3118 #, c-format msgid "Setting attribute %s not supported" msgstr "ატრიბუტის (%s) დაყენება მხარდაუჭერელია" -#: gio/glocalfileinputstream.c:163 gio/glocalfileoutputstream.c:801 +#: gio/glocalfileinputstream.c:165 gio/glocalfileoutputstream.c:803 #, c-format msgid "Error reading from file: %s" msgstr "" -#: gio/glocalfileinputstream.c:194 gio/glocalfileoutputstream.c:353 -#: gio/glocalfileoutputstream.c:447 +#: gio/glocalfileinputstream.c:196 gio/glocalfileoutputstream.c:355 +#: gio/glocalfileoutputstream.c:449 #, c-format msgid "Error closing file: %s" msgstr "ფაილის (%s) დახურვის შეცდომა" -#: gio/glocalfileinputstream.c:272 gio/glocalfileoutputstream.c:563 -#: gio/glocalfileoutputstream.c:1186 +#: gio/glocalfileinputstream.c:274 gio/glocalfileoutputstream.c:565 +#: gio/glocalfileoutputstream.c:1188 #, c-format msgid "Error seeking in file: %s" msgstr "" -#: gio/glocalfilemonitor.c:879 +#: gio/glocalfilemonitor.c:882 msgid "Unable to find default local file monitor type" msgstr "" -#: gio/glocalfileoutputstream.c:220 gio/glocalfileoutputstream.c:298 -#: gio/glocalfileoutputstream.c:334 gio/glocalfileoutputstream.c:822 +#: gio/glocalfileoutputstream.c:222 gio/glocalfileoutputstream.c:300 +#: gio/glocalfileoutputstream.c:336 gio/glocalfileoutputstream.c:824 #, c-format msgid "Error writing to file: %s" msgstr "" -#: gio/glocalfileoutputstream.c:380 +#: gio/glocalfileoutputstream.c:382 #, c-format msgid "Error removing old backup link: %s" msgstr "" -#: gio/glocalfileoutputstream.c:394 gio/glocalfileoutputstream.c:407 +#: gio/glocalfileoutputstream.c:396 gio/glocalfileoutputstream.c:409 #, c-format msgid "Error creating backup copy: %s" msgstr "" -#: gio/glocalfileoutputstream.c:425 +#: gio/glocalfileoutputstream.c:427 #, c-format msgid "Error renaming temporary file: %s" msgstr "" -#: gio/glocalfileoutputstream.c:609 gio/glocalfileoutputstream.c:1239 +#: gio/glocalfileoutputstream.c:611 gio/glocalfileoutputstream.c:1242 #, c-format msgid "Error truncating file: %s" msgstr "" -#: gio/glocalfileoutputstream.c:662 gio/glocalfileoutputstream.c:907 -#: gio/glocalfileoutputstream.c:1220 gio/gsubprocess.c:229 +#: gio/glocalfileoutputstream.c:664 gio/glocalfileoutputstream.c:909 +#: gio/glocalfileoutputstream.c:1223 gio/gsubprocess.c:231 #, c-format msgid "Error opening file “%s”: %s" msgstr "" -#: gio/glocalfileoutputstream.c:957 +#: gio/glocalfileoutputstream.c:959 msgid "Target file is a directory" msgstr "სამიზნე ფაილი საქაღალდეა" -#: gio/glocalfileoutputstream.c:971 +#: gio/glocalfileoutputstream.c:973 msgid "Target file is not a regular file" msgstr "სამიზნე საქაღალდე ჩვეულებრივი არაა" -#: gio/glocalfileoutputstream.c:1013 +#: gio/glocalfileoutputstream.c:1015 msgid "The file was externally modified" msgstr "ფაილი გარედან შეიცვალა" -#: gio/glocalfileoutputstream.c:1202 +#: gio/glocalfileoutputstream.c:1205 #, c-format msgid "Error removing old file: %s" msgstr "" -#: gio/gmemoryinputstream.c:474 gio/gmemoryoutputstream.c:762 +#: gio/gmemoryinputstream.c:476 gio/gmemoryoutputstream.c:764 msgid "Invalid GSeekType supplied" msgstr "" -#: gio/gmemoryinputstream.c:484 +#: gio/gmemoryinputstream.c:486 msgid "Invalid seek request" msgstr "გადახვევის არასწორი მოთხოვნა" -#: gio/gmemoryinputstream.c:508 +#: gio/gmemoryinputstream.c:510 msgid "Cannot truncate GMemoryInputStream" msgstr "" -#: gio/gmemoryoutputstream.c:568 +#: gio/gmemoryoutputstream.c:570 msgid "Memory output stream not resizable" msgstr "" -#: gio/gmemoryoutputstream.c:584 +#: gio/gmemoryoutputstream.c:586 msgid "Failed to resize memory output stream" msgstr "" -#: gio/gmemoryoutputstream.c:663 +#: gio/gmemoryoutputstream.c:665 msgid "" "Amount of memory required to process the write is larger than available " "address space" msgstr "" -#: gio/gmemoryoutputstream.c:772 +#: gio/gmemoryoutputstream.c:774 msgid "Requested seek before the beginning of the stream" msgstr "" -#: gio/gmemoryoutputstream.c:787 +#: gio/gmemoryoutputstream.c:789 msgid "Requested seek beyond the end of the stream" msgstr "" #. Translators: This is an error #. * message for mount objects that #. * don't implement unmount. -#: gio/gmount.c:399 +#: gio/gmount.c:401 msgid "mount doesn’t implement “unmount”" msgstr "" #. Translators: This is an error #. * message for mount objects that #. * don't implement eject. -#: gio/gmount.c:475 +#: gio/gmount.c:477 msgid "mount doesn’t implement “eject”" msgstr "" #. Translators: This is an error #. * message for mount objects that #. * don't implement any of unmount or unmount_with_operation. -#: gio/gmount.c:553 +#: gio/gmount.c:555 msgid "mount doesn’t implement “unmount” or “unmount_with_operation”" msgstr "" #. Translators: This is an error #. * message for mount objects that #. * don't implement any of eject or eject_with_operation. -#: gio/gmount.c:638 +#: gio/gmount.c:640 msgid "mount doesn’t implement “eject” or “eject_with_operation”" msgstr "" #. Translators: This is an error #. * message for mount objects that #. * don't implement remount. -#: gio/gmount.c:726 +#: gio/gmount.c:728 msgid "mount doesn’t implement “remount”" msgstr "" #. Translators: This is an error #. * message for mount objects that #. * don't implement content type guessing. -#: gio/gmount.c:808 +#: gio/gmount.c:810 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:895 +#: gio/gmount.c:897 msgid "mount doesn’t implement synchronous content type guessing" msgstr "" -#: gio/gnetworkaddress.c:415 +#: gio/gnetworkaddress.c:417 #, c-format msgid "Hostname “%s” contains “” but not “”" msgstr "" -#: gio/gnetworkmonitorbase.c:219 gio/gnetworkmonitorbase.c:323 +#: gio/gnetworkmonitorbase.c:221 gio/gnetworkmonitorbase.c:325 msgid "Network unreachable" msgstr "ქსელი მიუწვდომელია" -#: gio/gnetworkmonitorbase.c:257 gio/gnetworkmonitorbase.c:287 +#: gio/gnetworkmonitorbase.c:259 gio/gnetworkmonitorbase.c:289 msgid "Host unreachable" msgstr "ჰოსტი მიუწვდომელია" -#: gio/gnetworkmonitornetlink.c:99 gio/gnetworkmonitornetlink.c:111 -#: gio/gnetworkmonitornetlink.c:130 +#: gio/gnetworkmonitornetlink.c:101 gio/gnetworkmonitornetlink.c:113 +#: gio/gnetworkmonitornetlink.c:132 #, c-format msgid "Could not create network monitor: %s" msgstr "" -#: gio/gnetworkmonitornetlink.c:120 +#: gio/gnetworkmonitornetlink.c:122 msgid "Could not create network monitor: " msgstr "" -#: gio/gnetworkmonitornetlink.c:183 +#: gio/gnetworkmonitornetlink.c:185 msgid "Could not get network status: " msgstr "" -#: gio/gnetworkmonitornm.c:311 +#: gio/gnetworkmonitornm.c:313 #, c-format msgid "NetworkManager not running" msgstr "NetworkManager-ი გაშვებული არაა" -#: gio/gnetworkmonitornm.c:322 +#: gio/gnetworkmonitornm.c:324 #, c-format msgid "NetworkManager version too old" msgstr "" -#: gio/goutputstream.c:232 gio/goutputstream.c:775 +#: gio/goutputstream.c:234 gio/goutputstream.c:777 msgid "Output stream doesn’t implement write" msgstr "" -#: gio/goutputstream.c:472 gio/goutputstream.c:1533 +#: gio/goutputstream.c:474 gio/goutputstream.c:1535 #, c-format msgid "Sum of vectors passed to %s too large" msgstr "" -#: gio/goutputstream.c:736 gio/goutputstream.c:1761 +#: gio/goutputstream.c:738 gio/goutputstream.c:1763 msgid "Source stream is already closed" msgstr "" +#: gio/gproxyaddressenumerator.c:324 gio/gproxyaddressenumerator.c:342 +msgid "Unspecified proxy lookup failure" +msgstr "" + #. Translators: the first placeholder is a domain name, the #. * second is an error message -#: gio/gresolver.c:401 gio/gthreadedresolver.c:150 gio/gthreadedresolver.c:168 -#: gio/gthreadedresolver.c:780 gio/gthreadedresolver.c:804 -#: gio/gthreadedresolver.c:829 gio/gthreadedresolver.c:844 +#: gio/gresolver.c:403 gio/gthreadedresolver.c:152 gio/gthreadedresolver.c:170 +#: gio/gthreadedresolver.c:798 gio/gthreadedresolver.c:822 +#: gio/gthreadedresolver.c:847 gio/gthreadedresolver.c:862 #, c-format msgid "Error resolving “%s”: %s" msgstr "" #. Translators: The placeholder is for a function name. -#: gio/gresolver.c:470 gio/gresolver.c:630 +#: gio/gresolver.c:472 gio/gresolver.c:632 #, c-format msgid "%s not implemented" msgstr "" -#: gio/gresolver.c:999 gio/gresolver.c:1051 +#: gio/gresolver.c:1001 gio/gresolver.c:1053 msgid "Invalid domain" msgstr "დომენის არასწორი სახელი" -#: gio/gresource.c:681 gio/gresource.c:943 gio/gresource.c:983 -#: gio/gresource.c:1107 gio/gresource.c:1179 gio/gresource.c:1253 -#: gio/gresource.c:1334 gio/gresourcefile.c:476 gio/gresourcefile.c:599 -#: gio/gresourcefile.c:736 +#: gio/gresource.c:683 gio/gresource.c:945 gio/gresource.c:985 +#: gio/gresource.c:1109 gio/gresource.c:1181 gio/gresource.c:1255 +#: gio/gresource.c:1336 gio/gresourcefile.c:478 gio/gresourcefile.c:601 +#: gio/gresourcefile.c:752 #, c-format msgid "The resource at “%s” does not exist" msgstr "" -#: gio/gresource.c:848 +#: gio/gresource.c:850 #, c-format msgid "The resource at “%s” failed to decompress" msgstr "" -#: gio/gresourcefile.c:732 +#: gio/gresourcefile.c:658 +msgid "Resource files cannot be renamed" +msgstr "" + +#: gio/gresourcefile.c:748 #, c-format msgid "The resource at “%s” is not a directory" msgstr "" -#: gio/gresourcefile.c:940 +#: gio/gresourcefile.c:956 msgid "Input stream doesn’t implement seek" msgstr "" -#: gio/gresource-tool.c:500 +#: gio/gresource-tool.c:502 msgid "List sections containing resources in an elf FILE" msgstr "" -#: gio/gresource-tool.c:506 +#: gio/gresource-tool.c:508 msgid "" "List resources\n" "If SECTION is given, only list resources in this section\n" "If PATH is given, only list matching resources" msgstr "" -#: gio/gresource-tool.c:509 gio/gresource-tool.c:519 +#: gio/gresource-tool.c:511 gio/gresource-tool.c:521 msgid "FILE PATH" msgstr "" -#: gio/gresource-tool.c:510 gio/gresource-tool.c:520 gio/gresource-tool.c:527 +#: gio/gresource-tool.c:512 gio/gresource-tool.c:522 gio/gresource-tool.c:529 msgid "SECTION" msgstr "სექცია" -#: gio/gresource-tool.c:515 +#: gio/gresource-tool.c:517 msgid "" "List resources with details\n" "If SECTION is given, only list resources in this section\n" @@ -3364,15 +3387,15 @@ "Details include the section, size and compression" msgstr "" -#: gio/gresource-tool.c:525 +#: gio/gresource-tool.c:527 msgid "Extract a resource file to stdout" msgstr "" -#: gio/gresource-tool.c:526 +#: gio/gresource-tool.c:528 msgid "FILE PATH" msgstr "ფაილის ბილიკი" -#: gio/gresource-tool.c:540 +#: gio/gresource-tool.c:542 msgid "" "Usage:\n" " gresource --section SECTION COMMAND ARGS…\n" @@ -3388,7 +3411,7 @@ "\n" msgstr "" -#: gio/gresource-tool.c:554 +#: gio/gresource-tool.c:556 #, c-format msgid "" "Usage:\n" @@ -3398,158 +3421,158 @@ "\n" msgstr "" -#: gio/gresource-tool.c:561 +#: gio/gresource-tool.c:563 msgid " SECTION An (optional) elf section name\n" msgstr "" -#: gio/gresource-tool.c:565 gio/gsettings-tool.c:718 +#: gio/gresource-tool.c:567 gio/gsettings-tool.c:720 msgid " COMMAND The (optional) command to explain\n" msgstr "" -#: gio/gresource-tool.c:571 +#: gio/gresource-tool.c:573 msgid " FILE An elf file (a binary or a shared library)\n" msgstr "" -#: gio/gresource-tool.c:574 +#: gio/gresource-tool.c:576 msgid "" " FILE An elf file (a binary or a shared library)\n" " or a compiled resource file\n" msgstr "" -#: gio/gresource-tool.c:578 +#: gio/gresource-tool.c:580 msgid "PATH" msgstr "ბილიკი" -#: gio/gresource-tool.c:580 +#: gio/gresource-tool.c:582 msgid " PATH An (optional) resource path (may be partial)\n" msgstr "" -#: gio/gresource-tool.c:581 +#: gio/gresource-tool.c:583 msgid "PATH" msgstr "ბილიკი" -#: gio/gresource-tool.c:583 +#: gio/gresource-tool.c:585 msgid " PATH A resource path\n" msgstr "" -#: gio/gsettings-tool.c:49 gio/gsettings-tool.c:70 gio/gsettings-tool.c:923 +#: gio/gsettings-tool.c:51 gio/gsettings-tool.c:72 gio/gsettings-tool.c:925 #, c-format msgid "No such schema “%s”\n" msgstr "" -#: gio/gsettings-tool.c:55 +#: gio/gsettings-tool.c:57 #, c-format msgid "Schema “%s” is not relocatable (path must not be specified)\n" msgstr "" -#: gio/gsettings-tool.c:76 +#: gio/gsettings-tool.c:78 #, c-format msgid "Schema “%s” is relocatable (path must be specified)\n" msgstr "" -#: gio/gsettings-tool.c:90 +#: gio/gsettings-tool.c:92 msgid "Empty path given.\n" msgstr "" -#: gio/gsettings-tool.c:96 +#: gio/gsettings-tool.c:98 msgid "Path must begin with a slash (/)\n" msgstr "" -#: gio/gsettings-tool.c:102 +#: gio/gsettings-tool.c:104 msgid "Path must end with a slash (/)\n" msgstr "" -#: gio/gsettings-tool.c:108 +#: gio/gsettings-tool.c:110 msgid "Path must not contain two adjacent slashes (//)\n" msgstr "" -#: gio/gsettings-tool.c:553 +#: gio/gsettings-tool.c:555 msgid "The provided value is outside of the valid range\n" msgstr "" -#: gio/gsettings-tool.c:560 +#: gio/gsettings-tool.c:562 msgid "The key is not writable\n" msgstr "" -#: gio/gsettings-tool.c:596 +#: gio/gsettings-tool.c:598 msgid "List the installed (non-relocatable) schemas" msgstr "" -#: gio/gsettings-tool.c:602 +#: gio/gsettings-tool.c:604 msgid "List the installed relocatable schemas" msgstr "" -#: gio/gsettings-tool.c:608 +#: gio/gsettings-tool.c:610 msgid "List the keys in SCHEMA" msgstr "" -#: gio/gsettings-tool.c:609 gio/gsettings-tool.c:615 gio/gsettings-tool.c:658 +#: gio/gsettings-tool.c:611 gio/gsettings-tool.c:617 gio/gsettings-tool.c:660 msgid "SCHEMA:PATH" msgstr "" -#: gio/gsettings-tool.c:614 +#: gio/gsettings-tool.c:616 msgid "List the children of SCHEMA" msgstr "" -#: gio/gsettings-tool.c:620 +#: gio/gsettings-tool.c:622 msgid "" "List keys and values, recursively\n" "If no SCHEMA is given, list all keys\n" msgstr "" -#: gio/gsettings-tool.c:622 +#: gio/gsettings-tool.c:624 msgid "SCHEMA:PATH" msgstr "" -#: gio/gsettings-tool.c:627 +#: gio/gsettings-tool.c:629 msgid "Get the value of KEY" msgstr "" -#: gio/gsettings-tool.c:628 gio/gsettings-tool.c:634 gio/gsettings-tool.c:640 -#: gio/gsettings-tool.c:652 gio/gsettings-tool.c:664 +#: gio/gsettings-tool.c:630 gio/gsettings-tool.c:636 gio/gsettings-tool.c:642 +#: gio/gsettings-tool.c:654 gio/gsettings-tool.c:666 msgid "SCHEMA:PATH KEY" msgstr "" -#: gio/gsettings-tool.c:633 +#: gio/gsettings-tool.c:635 msgid "Query the range of valid values for KEY" msgstr "" -#: gio/gsettings-tool.c:639 +#: gio/gsettings-tool.c:641 msgid "Query the description for KEY" msgstr "" -#: gio/gsettings-tool.c:645 +#: gio/gsettings-tool.c:647 msgid "Set the value of KEY to VALUE" msgstr "" -#: gio/gsettings-tool.c:646 +#: gio/gsettings-tool.c:648 msgid "SCHEMA:PATH KEY VALUE" msgstr "" -#: gio/gsettings-tool.c:651 +#: gio/gsettings-tool.c:653 msgid "Reset KEY to its default value" msgstr "" -#: gio/gsettings-tool.c:657 +#: gio/gsettings-tool.c:659 msgid "Reset all keys in SCHEMA to their defaults" msgstr "" -#: gio/gsettings-tool.c:663 +#: gio/gsettings-tool.c:665 msgid "Check if KEY is writable" msgstr "" -#: gio/gsettings-tool.c:669 +#: gio/gsettings-tool.c:671 msgid "" "Monitor KEY for changes.\n" "If no KEY is specified, monitor all keys in SCHEMA.\n" "Use ^C to stop monitoring.\n" msgstr "" -#: gio/gsettings-tool.c:672 +#: gio/gsettings-tool.c:674 msgid "SCHEMA:PATH KEY" msgstr "" -#: gio/gsettings-tool.c:684 +#: gio/gsettings-tool.c:686 msgid "" "Usage:\n" " gsettings --version\n" @@ -3575,7 +3598,7 @@ "\n" msgstr "" -#: gio/gsettings-tool.c:708 +#: gio/gsettings-tool.c:710 #, c-format msgid "" "Usage:\n" @@ -3585,428 +3608,428 @@ "\n" msgstr "" -#: gio/gsettings-tool.c:714 +#: gio/gsettings-tool.c:716 msgid " SCHEMADIR A directory to search for additional schemas\n" msgstr "" -#: gio/gsettings-tool.c:722 +#: gio/gsettings-tool.c:724 msgid "" " SCHEMA The name of the schema\n" " PATH The path, for relocatable schemas\n" msgstr "" -#: gio/gsettings-tool.c:727 +#: gio/gsettings-tool.c:729 msgid " KEY The (optional) key within the schema\n" msgstr "" -#: gio/gsettings-tool.c:731 +#: gio/gsettings-tool.c:733 msgid " KEY The key within the schema\n" msgstr "" -#: gio/gsettings-tool.c:735 +#: gio/gsettings-tool.c:737 msgid " VALUE The value to set\n" msgstr "" -#: gio/gsettings-tool.c:790 +#: gio/gsettings-tool.c:792 #, c-format msgid "Could not load schemas from %s: %s\n" msgstr "%s-დან სქემების ჩატვირთვის შეცდომა: %s\n" -#: gio/gsettings-tool.c:802 +#: gio/gsettings-tool.c:804 msgid "No schemas installed\n" msgstr "" -#: gio/gsettings-tool.c:881 +#: gio/gsettings-tool.c:883 msgid "Empty schema name given\n" msgstr "" -#: gio/gsettings-tool.c:936 +#: gio/gsettings-tool.c:938 #, c-format msgid "No such key “%s”\n" msgstr "" -#: gio/gsocket.c:417 +#: gio/gsocket.c:419 msgid "Invalid socket, not initialized" msgstr "" -#: gio/gsocket.c:424 +#: gio/gsocket.c:426 #, c-format msgid "Invalid socket, initialization failed due to: %s" msgstr "" -#: gio/gsocket.c:432 +#: gio/gsocket.c:434 msgid "Socket is already closed" msgstr "" -#: gio/gsocket.c:447 gio/gsocket.c:3194 gio/gsocket.c:4427 gio/gsocket.c:4485 +#: gio/gsocket.c:449 gio/gsocket.c:3201 gio/gsocket.c:4434 gio/gsocket.c:4492 msgid "Socket I/O timed out" msgstr "სოკეტის I/O ვადა გავიდა" -#: gio/gsocket.c:582 +#: gio/gsocket.c:586 #, c-format msgid "creating GSocket from fd: %s" msgstr "" -#: gio/gsocket.c:611 gio/gsocket.c:675 gio/gsocket.c:682 +#: gio/gsocket.c:615 gio/gsocket.c:679 gio/gsocket.c:686 #, c-format msgid "Unable to create socket: %s" msgstr "სოკეტის შექმნის შეცდომა: %s" -#: gio/gsocket.c:675 +#: gio/gsocket.c:679 msgid "Unknown family was specified" msgstr "" -#: gio/gsocket.c:682 +#: gio/gsocket.c:686 msgid "Unknown protocol was specified" msgstr "" -#: gio/gsocket.c:1173 +#: gio/gsocket.c:1177 #, c-format msgid "Cannot use datagram operations on a non-datagram socket." msgstr "" -#: gio/gsocket.c:1190 +#: gio/gsocket.c:1194 #, c-format msgid "Cannot use datagram operations on a socket with a timeout set." msgstr "" -#: gio/gsocket.c:1997 +#: gio/gsocket.c:2001 #, c-format msgid "could not get local address: %s" msgstr "" -#: gio/gsocket.c:2043 +#: gio/gsocket.c:2047 #, c-format msgid "could not get remote address: %s" msgstr "" -#: gio/gsocket.c:2109 +#: gio/gsocket.c:2113 #, c-format msgid "could not listen: %s" msgstr "" -#: gio/gsocket.c:2213 +#: gio/gsocket.c:2217 #, c-format msgid "Error binding to address %s: %s" msgstr "" -#: gio/gsocket.c:2389 gio/gsocket.c:2426 gio/gsocket.c:2536 gio/gsocket.c:2561 -#: gio/gsocket.c:2624 gio/gsocket.c:2682 gio/gsocket.c:2700 +#: gio/gsocket.c:2392 gio/gsocket.c:2429 gio/gsocket.c:2539 gio/gsocket.c:2564 +#: gio/gsocket.c:2631 gio/gsocket.c:2689 gio/gsocket.c:2707 #, c-format msgid "Error joining multicast group: %s" msgstr "" -#: gio/gsocket.c:2390 gio/gsocket.c:2427 gio/gsocket.c:2537 gio/gsocket.c:2562 -#: gio/gsocket.c:2625 gio/gsocket.c:2683 gio/gsocket.c:2701 +#: gio/gsocket.c:2393 gio/gsocket.c:2430 gio/gsocket.c:2540 gio/gsocket.c:2565 +#: gio/gsocket.c:2632 gio/gsocket.c:2690 gio/gsocket.c:2708 #, c-format msgid "Error leaving multicast group: %s" msgstr "" -#: gio/gsocket.c:2391 +#: gio/gsocket.c:2394 msgid "No support for source-specific multicast" msgstr "" -#: gio/gsocket.c:2538 +#: gio/gsocket.c:2541 msgid "Unsupported socket family" msgstr "" -#: gio/gsocket.c:2563 +#: gio/gsocket.c:2566 msgid "source-specific not an IPv4 address" msgstr "" -#: gio/gsocket.c:2587 +#: gio/gsocket.c:2590 #, c-format msgid "Interface name too long" msgstr "" -#: gio/gsocket.c:2600 gio/gsocket.c:2650 +#: gio/gsocket.c:2603 gio/gsocket.c:2657 #, c-format msgid "Interface not found: %s" msgstr "" -#: gio/gsocket.c:2626 +#: gio/gsocket.c:2633 msgid "No support for IPv4 source-specific multicast" msgstr "" -#: gio/gsocket.c:2684 +#: gio/gsocket.c:2691 msgid "No support for IPv6 source-specific multicast" msgstr "" -#: gio/gsocket.c:2893 +#: gio/gsocket.c:2900 #, c-format msgid "Error accepting connection: %s" msgstr "შეერთების მიღების შეცდომა: %s" -#: gio/gsocket.c:3019 +#: gio/gsocket.c:3026 msgid "Connection in progress" msgstr "" -#: gio/gsocket.c:3070 +#: gio/gsocket.c:3077 msgid "Unable to get pending error: " msgstr "დარჩენილი შეცდომის მიღება შეუძლებელია: " -#: gio/gsocket.c:3259 +#: gio/gsocket.c:3266 #, c-format msgid "Error receiving data: %s" msgstr "" -#: gio/gsocket.c:3456 +#: gio/gsocket.c:3463 #, c-format msgid "Error sending data: %s" msgstr "" -#: gio/gsocket.c:3643 +#: gio/gsocket.c:3650 #, c-format msgid "Unable to shutdown socket: %s" msgstr "სოკეტის გამორთვის შეცდომა: %s" -#: gio/gsocket.c:3724 +#: gio/gsocket.c:3731 #, c-format msgid "Error closing socket: %s" msgstr "" -#: gio/gsocket.c:4420 +#: gio/gsocket.c:4427 #, c-format msgid "Waiting for socket condition: %s" msgstr "" -#: gio/gsocket.c:4810 gio/gsocket.c:4826 gio/gsocket.c:4839 +#: gio/gsocket.c:4817 gio/gsocket.c:4833 gio/gsocket.c:4846 #, c-format msgid "Unable to send message: %s" msgstr "შეუძლებელია შეტყობინების გაგზავნა: %s" -#: gio/gsocket.c:4811 gio/gsocket.c:4827 gio/gsocket.c:4840 +#: gio/gsocket.c:4818 gio/gsocket.c:4834 gio/gsocket.c:4847 msgid "Message vectors too large" msgstr "" -#: gio/gsocket.c:4856 gio/gsocket.c:4858 gio/gsocket.c:5005 gio/gsocket.c:5090 -#: gio/gsocket.c:5268 gio/gsocket.c:5308 gio/gsocket.c:5310 +#: gio/gsocket.c:4863 gio/gsocket.c:4865 gio/gsocket.c:5012 gio/gsocket.c:5097 +#: gio/gsocket.c:5275 gio/gsocket.c:5315 gio/gsocket.c:5317 #, c-format msgid "Error sending message: %s" msgstr "" -#: gio/gsocket.c:5032 +#: gio/gsocket.c:5039 msgid "GSocketControlMessage not supported on Windows" msgstr "" -#: gio/gsocket.c:5505 gio/gsocket.c:5581 gio/gsocket.c:5807 +#: gio/gsocket.c:5512 gio/gsocket.c:5588 gio/gsocket.c:5814 #, c-format msgid "Error receiving message: %s" msgstr "" -#: gio/gsocket.c:6092 gio/gsocket.c:6103 gio/gsocket.c:6166 +#: gio/gsocket.c:6099 gio/gsocket.c:6110 gio/gsocket.c:6173 #, c-format msgid "Unable to read socket credentials: %s" msgstr "სოკეტის მომხმარებლის/პაროლის წაკითხვის შეცდომა: %s" -#: gio/gsocket.c:6175 +#: gio/gsocket.c:6182 msgid "g_socket_get_credentials not implemented for this OS" msgstr "" -#: gio/gsocketclient.c:191 +#: gio/gsocketclient.c:193 #, c-format msgid "Could not connect to proxy server %s: " msgstr "" -#: gio/gsocketclient.c:205 +#: gio/gsocketclient.c:207 #, c-format msgid "Could not connect to %s: " msgstr "%s-სთან მიერთების შეცდომა: " -#: gio/gsocketclient.c:207 +#: gio/gsocketclient.c:209 msgid "Could not connect: " msgstr "" -#: gio/gsocketclient.c:1202 gio/gsocketclient.c:1805 +#: gio/gsocketclient.c:1204 gio/gsocketclient.c:1807 msgid "Proxying over a non-TCP connection is not supported." msgstr "არა-TCP შეერთების ზემოდან პროქსი მხარდაუჭერელია." -#: gio/gsocketclient.c:1234 gio/gsocketclient.c:1834 +#: gio/gsocketclient.c:1236 gio/gsocketclient.c:1836 #, c-format msgid "Proxy protocol “%s” is not supported." msgstr "პროქსი პროტოკოლი \"%s\" მხარდაუჭერელია." -#: gio/gsocketlistener.c:230 +#: gio/gsocketlistener.c:232 msgid "Listener is already closed" msgstr "" -#: gio/gsocketlistener.c:276 +#: gio/gsocketlistener.c:278 msgid "Added socket is closed" msgstr "" -#: gio/gsocks4aproxy.c:118 +#: gio/gsocks4aproxy.c:120 #, c-format msgid "SOCKSv4 does not support IPv6 address “%s”" msgstr "" -#: gio/gsocks4aproxy.c:136 +#: gio/gsocks4aproxy.c:138 msgid "Username is too long for SOCKSv4 protocol" msgstr "" -#: gio/gsocks4aproxy.c:153 +#: gio/gsocks4aproxy.c:155 #, c-format msgid "Hostname “%s” is too long for SOCKSv4 protocol" msgstr "" -#: gio/gsocks4aproxy.c:179 +#: gio/gsocks4aproxy.c:181 msgid "The server is not a SOCKSv4 proxy server." msgstr "" -#: gio/gsocks4aproxy.c:186 +#: gio/gsocks4aproxy.c:188 msgid "Connection through SOCKSv4 server was rejected" msgstr "" -#: gio/gsocks5proxy.c:153 gio/gsocks5proxy.c:338 gio/gsocks5proxy.c:348 +#: gio/gsocks5proxy.c:155 gio/gsocks5proxy.c:340 gio/gsocks5proxy.c:350 msgid "The server is not a SOCKSv5 proxy server." msgstr "" -#: gio/gsocks5proxy.c:167 gio/gsocks5proxy.c:184 +#: gio/gsocks5proxy.c:169 gio/gsocks5proxy.c:186 msgid "The SOCKSv5 proxy requires authentication." msgstr "" -#: gio/gsocks5proxy.c:191 +#: gio/gsocks5proxy.c:193 msgid "" "The SOCKSv5 proxy requires an authentication method that is not supported by " "GLib." msgstr "" -#: gio/gsocks5proxy.c:220 +#: gio/gsocks5proxy.c:222 msgid "Username or password is too long for SOCKSv5 protocol." msgstr "" -#: gio/gsocks5proxy.c:250 +#: gio/gsocks5proxy.c:252 msgid "SOCKSv5 authentication failed due to wrong username or password." msgstr "" -#: gio/gsocks5proxy.c:300 +#: gio/gsocks5proxy.c:302 #, c-format msgid "Hostname “%s” is too long for SOCKSv5 protocol" msgstr "" -#: gio/gsocks5proxy.c:362 +#: gio/gsocks5proxy.c:364 msgid "The SOCKSv5 proxy server uses unknown address type." msgstr "" -#: gio/gsocks5proxy.c:369 +#: gio/gsocks5proxy.c:371 msgid "Internal SOCKSv5 proxy server error." msgstr "" -#: gio/gsocks5proxy.c:375 +#: gio/gsocks5proxy.c:377 msgid "SOCKSv5 connection not allowed by ruleset." msgstr "" -#: gio/gsocks5proxy.c:382 +#: gio/gsocks5proxy.c:384 msgid "Host unreachable through SOCKSv5 server." msgstr "" -#: gio/gsocks5proxy.c:388 +#: gio/gsocks5proxy.c:390 msgid "Network unreachable through SOCKSv5 proxy." msgstr "" -#: gio/gsocks5proxy.c:394 +#: gio/gsocks5proxy.c:396 msgid "Connection refused through SOCKSv5 proxy." msgstr "" -#: gio/gsocks5proxy.c:400 +#: gio/gsocks5proxy.c:402 msgid "SOCKSv5 proxy does not support “connect” command." msgstr "" -#: gio/gsocks5proxy.c:406 +#: gio/gsocks5proxy.c:408 msgid "SOCKSv5 proxy does not support provided address type." msgstr "" -#: gio/gsocks5proxy.c:412 +#: gio/gsocks5proxy.c:414 msgid "Unknown SOCKSv5 proxy error." msgstr "" -#: gio/gtestdbus.c:612 glib/gspawn-win32.c:314 +#: gio/gtestdbus.c:614 glib/gspawn-win32.c:354 #, c-format msgid "Failed to create pipe for communicating with child process (%s)" msgstr "არხის შექმნა ქვეპროცესთან დასაკავშირებლად ვერ მოხერხდა (%s)" -#: gio/gtestdbus.c:619 +#: gio/gtestdbus.c:621 #, c-format msgid "Pipes are not supported in this platform" msgstr "" -#: gio/gthemedicon.c:595 +#: gio/gthemedicon.c:597 #, c-format msgid "Can’t handle version %d of GThemedIcon encoding" msgstr "" -#: gio/gthreadedresolver.c:152 +#: gio/gthreadedresolver.c:154 msgid "No valid addresses were found" msgstr "" -#: gio/gthreadedresolver.c:337 +#: gio/gthreadedresolver.c:339 #, c-format msgid "Error reverse-resolving “%s”: %s" msgstr "" #. Translators: the placeholder is a DNS record type, such as ‘MX’ or ‘SRV’ -#: gio/gthreadedresolver.c:550 gio/gthreadedresolver.c:572 -#: gio/gthreadedresolver.c:610 gio/gthreadedresolver.c:657 -#: gio/gthreadedresolver.c:686 gio/gthreadedresolver.c:698 +#: gio/gthreadedresolver.c:552 gio/gthreadedresolver.c:574 +#: gio/gthreadedresolver.c:628 gio/gthreadedresolver.c:675 +#: gio/gthreadedresolver.c:704 gio/gthreadedresolver.c:716 #, c-format msgid "Error parsing DNS %s record: malformed DNS packet" msgstr "" -#: gio/gthreadedresolver.c:756 gio/gthreadedresolver.c:893 -#: gio/gthreadedresolver.c:991 gio/gthreadedresolver.c:1041 +#: gio/gthreadedresolver.c:774 gio/gthreadedresolver.c:911 +#: gio/gthreadedresolver.c:1009 gio/gthreadedresolver.c:1059 #, c-format msgid "No DNS record of the requested type for “%s”" msgstr "" -#: gio/gthreadedresolver.c:761 gio/gthreadedresolver.c:996 +#: gio/gthreadedresolver.c:779 gio/gthreadedresolver.c:1014 #, c-format msgid "Temporarily unable to resolve “%s”" msgstr "" -#: gio/gthreadedresolver.c:766 gio/gthreadedresolver.c:1001 -#: gio/gthreadedresolver.c:1111 +#: gio/gthreadedresolver.c:784 gio/gthreadedresolver.c:1019 +#: gio/gthreadedresolver.c:1129 #, c-format msgid "Error resolving “%s”" msgstr "" -#: gio/gthreadedresolver.c:780 gio/gthreadedresolver.c:804 -#: gio/gthreadedresolver.c:829 gio/gthreadedresolver.c:844 +#: gio/gthreadedresolver.c:798 gio/gthreadedresolver.c:822 +#: gio/gthreadedresolver.c:847 gio/gthreadedresolver.c:862 msgid "Malformed DNS packet" msgstr "არასწორი DNS პაკეტი" -#: gio/gthreadedresolver.c:886 +#: gio/gthreadedresolver.c:904 #, c-format msgid "Failed to parse DNS response for “%s”: " msgstr "" -#: gio/gtlscertificate.c:478 +#: gio/gtlscertificate.c:480 msgid "No PEM-encoded private key found" msgstr "" -#: gio/gtlscertificate.c:488 +#: gio/gtlscertificate.c:490 msgid "Cannot decrypt PEM-encoded private key" msgstr "" -#: gio/gtlscertificate.c:499 +#: gio/gtlscertificate.c:501 msgid "Could not parse PEM-encoded private key" msgstr "" -#: gio/gtlscertificate.c:526 +#: gio/gtlscertificate.c:528 msgid "No PEM-encoded certificate found" msgstr "" -#: gio/gtlscertificate.c:535 +#: gio/gtlscertificate.c:537 msgid "Could not parse PEM-encoded certificate" msgstr "" -#: gio/gtlscertificate.c:796 +#: gio/gtlscertificate.c:800 msgid "The current TLS backend does not support PKCS #12" msgstr "" -#: gio/gtlscertificate.c:1013 +#: gio/gtlscertificate.c:1017 msgid "This GTlsBackend does not support creating PKCS #11 certificates" msgstr "" -#: gio/gtlspassword.c:111 +#: gio/gtlspassword.c:113 msgid "" "This is the last chance to enter the password correctly before your access " "is locked out." @@ -4014,141 +4037,139 @@ #. 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 +#: gio/gtlspassword.c:117 msgid "" "Several passwords entered have been incorrect, and your access will be " "locked out after further failures." msgstr "" -#: gio/gtlspassword.c:117 +#: gio/gtlspassword.c:119 msgid "The password entered is incorrect." msgstr "" -#: gio/gunixconnection.c:125 +#: gio/gunixconnection.c:127 msgid "Sending FD is not supported" msgstr "FD-ის გაგზავნა მხარდაუჭერელია" -#: gio/gunixconnection.c:178 gio/gunixconnection.c:596 +#: gio/gunixconnection.c:180 gio/gunixconnection.c:598 #, c-format msgid "Expecting 1 control message, got %d" msgid_plural "Expecting 1 control message, got %d" msgstr0 "" -msgstr1 "" -#: gio/gunixconnection.c:194 gio/gunixconnection.c:608 +#: gio/gunixconnection.c:196 gio/gunixconnection.c:610 msgid "Unexpected type of ancillary data" msgstr "" -#: gio/gunixconnection.c:212 +#: gio/gunixconnection.c:214 #, c-format msgid "Expecting one fd, but got %d\n" msgid_plural "Expecting one fd, but got %d\n" msgstr0 "" -msgstr1 "" -#: gio/gunixconnection.c:231 +#: gio/gunixconnection.c:233 msgid "Received invalid fd" msgstr "" -#: gio/gunixconnection.c:238 +#: gio/gunixconnection.c:240 msgid "Receiving FD is not supported" msgstr "FD-ის მიღება მხარდაუჭერელია" -#: gio/gunixconnection.c:380 +#: gio/gunixconnection.c:382 msgid "Error sending credentials: " msgstr "" -#: gio/gunixconnection.c:537 +#: gio/gunixconnection.c:539 #, c-format msgid "Error checking if SO_PASSCRED is enabled for socket: %s" msgstr "" -#: gio/gunixconnection.c:553 +#: gio/gunixconnection.c:555 #, c-format msgid "Error enabling SO_PASSCRED: %s" msgstr "" -#: gio/gunixconnection.c:582 +#: gio/gunixconnection.c:584 msgid "" "Expecting to read a single byte for receiving credentials but read zero bytes" msgstr "" -#: gio/gunixconnection.c:622 +#: gio/gunixconnection.c:624 #, c-format msgid "Not expecting control message, but got %d" msgstr "" -#: gio/gunixconnection.c:647 +#: gio/gunixconnection.c:649 #, c-format msgid "Error while disabling SO_PASSCRED: %s" msgstr "" -#: gio/gunixinputstream.c:357 gio/gunixinputstream.c:378 +#: gio/gunixinputstream.c:359 gio/gunixinputstream.c:380 #, c-format msgid "Error reading from file descriptor: %s" msgstr "" -#: gio/gunixinputstream.c:411 gio/gunixoutputstream.c:520 -#: gio/gwin32inputstream.c:217 gio/gwin32outputstream.c:204 +#: gio/gunixinputstream.c:413 gio/gunixoutputstream.c:522 +#: gio/gwin32inputstream.c:219 gio/gwin32outputstream.c:206 #, c-format msgid "Error closing file descriptor: %s" msgstr "" -#: gio/gunixmounts.c:2809 gio/gunixmounts.c:2862 +#: gio/gunixmounts.c:2817 gio/gunixmounts.c:2870 msgid "Filesystem root" msgstr "ფაილური სისტემის საწყისი საქაღალდე" -#: gio/gunixoutputstream.c:357 gio/gunixoutputstream.c:377 -#: gio/gunixoutputstream.c:464 gio/gunixoutputstream.c:484 -#: gio/gunixoutputstream.c:630 +#: gio/gunixoutputstream.c:359 gio/gunixoutputstream.c:379 +#: gio/gunixoutputstream.c:466 gio/gunixoutputstream.c:486 +#: gio/gunixoutputstream.c:632 #, c-format msgid "Error writing to file descriptor: %s" msgstr "" -#: gio/gunixsocketaddress.c:251 +#: gio/gunixsocketaddress.c:253 msgid "Abstract UNIX domain socket addresses not supported on this system" msgstr "" -#: gio/gvolume.c:438 +#: gio/gvolume.c:440 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:515 +#: gio/gvolume.c:517 msgid "volume doesn’t implement eject or eject_with_operation" msgstr "" -#: gio/gwin32inputstream.c:185 +#: gio/gwin32inputstream.c:187 #, c-format msgid "Error reading from handle: %s" msgstr "" -#: gio/gwin32inputstream.c:232 gio/gwin32outputstream.c:219 +#: gio/gwin32inputstream.c:234 gio/gwin32outputstream.c:221 #, c-format msgid "Error closing handle: %s" msgstr "" -#: gio/gwin32outputstream.c:172 +#: gio/gwin32outputstream.c:174 #, c-format msgid "Error writing to handle: %s" msgstr "" -#: gio/gzlibcompressor.c:394 gio/gzlibdecompressor.c:347 +#: gio/gzlibcompressor.c:396 gio/gzlibdecompressor.c:349 msgid "Not enough memory" msgstr "მეხსიერება საკმარისი არ არის" -#: gio/gzlibcompressor.c:401 gio/gzlibdecompressor.c:354 +#: gio/gzlibcompressor.c:403 gio/gzlibdecompressor.c:356 #, c-format msgid "Internal error: %s" msgstr "შიდა შეცდომა: %s" -#: gio/gzlibcompressor.c:414 gio/gzlibdecompressor.c:368 +#: gio/gzlibcompressor.c:416 gio/gzlibdecompressor.c:370 msgid "Need more input" msgstr "საჭიროა მეტი შეტანა" -#: gio/gzlibdecompressor.c:340 +#: gio/gzlibdecompressor.c:342 msgid "Invalid compressed data" msgstr "არასწორი შეკუმშული მონაცემები" @@ -4176,156 +4197,156 @@ msgid "Wrong args\n" msgstr "არასწორი არგუმენტები\n" -#: glib/gbookmarkfile.c:777 +#: glib/gbookmarkfile.c:861 #, c-format msgid "Unexpected attribute “%s” for element “%s”" msgstr "მოულოდნელი ატრიბუტი '%s' ელემენტ '%s'-თვის" -#: glib/gbookmarkfile.c:788 glib/gbookmarkfile.c:868 glib/gbookmarkfile.c:878 -#: glib/gbookmarkfile.c:991 +#: glib/gbookmarkfile.c:872 glib/gbookmarkfile.c:952 glib/gbookmarkfile.c:962 +#: glib/gbookmarkfile.c:1075 #, c-format msgid "Attribute “%s” of element “%s” not found" msgstr "ატრიბუტი'%s' ელემენტისთვის '%s' ვერ მოიძებნა" -#: glib/gbookmarkfile.c:1200 glib/gbookmarkfile.c:1265 -#: glib/gbookmarkfile.c:1329 glib/gbookmarkfile.c:1339 +#: glib/gbookmarkfile.c:1284 glib/gbookmarkfile.c:1349 +#: glib/gbookmarkfile.c:1413 glib/gbookmarkfile.c:1423 #, c-format msgid "Unexpected tag “%s”, tag “%s” expected" msgstr "უცნობი ჭდე '%s', მოსალოდნელი იყო '%s'" -#: glib/gbookmarkfile.c:1225 glib/gbookmarkfile.c:1239 -#: glib/gbookmarkfile.c:1307 glib/gbookmarkfile.c:1353 +#: glib/gbookmarkfile.c:1309 glib/gbookmarkfile.c:1323 +#: glib/gbookmarkfile.c:1391 glib/gbookmarkfile.c:1437 #, c-format msgid "Unexpected tag “%s” inside “%s”" msgstr "უცნობი ჭდე '%s' - '%s'-ში" -#: glib/gbookmarkfile.c:1633 +#: glib/gbookmarkfile.c:1717 #, c-format msgid "Invalid date/time ‘%s’ in bookmark file" msgstr "" -#: glib/gbookmarkfile.c:1836 +#: glib/gbookmarkfile.c:1956 msgid "No valid bookmark file found in data dirs" msgstr "მონაცემთა დასტებში მართებული საკვანძო ფაილი ვერ მოიძებნა" -#: glib/gbookmarkfile.c:2037 +#: glib/gbookmarkfile.c:2157 #, c-format msgid "A bookmark for URI “%s” already exists" msgstr "სანიშნე URI-სთვის '%s' უკვე არსებობს" -#: glib/gbookmarkfile.c:2086 glib/gbookmarkfile.c:2244 -#: glib/gbookmarkfile.c:2329 glib/gbookmarkfile.c:2409 -#: glib/gbookmarkfile.c:2494 glib/gbookmarkfile.c:2628 -#: glib/gbookmarkfile.c:2761 glib/gbookmarkfile.c:2896 -#: glib/gbookmarkfile.c:2938 glib/gbookmarkfile.c:3035 -#: glib/gbookmarkfile.c:3156 glib/gbookmarkfile.c:3350 -#: glib/gbookmarkfile.c:3491 glib/gbookmarkfile.c:3710 -#: glib/gbookmarkfile.c:3799 glib/gbookmarkfile.c:3888 -#: glib/gbookmarkfile.c:4007 +#: glib/gbookmarkfile.c:2206 glib/gbookmarkfile.c:2364 +#: glib/gbookmarkfile.c:2449 glib/gbookmarkfile.c:2529 +#: glib/gbookmarkfile.c:2614 glib/gbookmarkfile.c:2748 +#: glib/gbookmarkfile.c:2881 glib/gbookmarkfile.c:3016 +#: glib/gbookmarkfile.c:3058 glib/gbookmarkfile.c:3155 +#: glib/gbookmarkfile.c:3276 glib/gbookmarkfile.c:3470 +#: glib/gbookmarkfile.c:3611 glib/gbookmarkfile.c:3830 +#: glib/gbookmarkfile.c:3919 glib/gbookmarkfile.c:4008 +#: glib/gbookmarkfile.c:4127 #, c-format msgid "No bookmark found for URI “%s”" msgstr "URI '%s'-თვის სანიშნე ვერ მოიძებნა" -#: glib/gbookmarkfile.c:2418 +#: glib/gbookmarkfile.c:2538 #, c-format msgid "No MIME type defined in the bookmark for URI “%s”" msgstr "URI '%s' სანიშნეში MIME ტიპი მითითებული არაა" -#: glib/gbookmarkfile.c:2503 +#: glib/gbookmarkfile.c:2623 #, c-format msgid "No private flag has been defined in bookmark for URI “%s”" msgstr "URI '%s' სანიშნეში პირადი ალამი არ მითითებულა" -#: glib/gbookmarkfile.c:3044 +#: glib/gbookmarkfile.c:3164 #, c-format msgid "No groups set in bookmark for URI “%s”" msgstr "URI '%s' სანიშნეში ჯგუფები დაყენებული არაა" -#: glib/gbookmarkfile.c:3512 glib/gbookmarkfile.c:3720 +#: glib/gbookmarkfile.c:3632 glib/gbookmarkfile.c:3840 #, c-format msgid "No application with name “%s” registered a bookmark for “%s”" msgstr "პროგრამას სახელით \"%s\" სანიშნე \"%s\" არ დაურეგისტრირებია" -#: glib/gbookmarkfile.c:3743 +#: glib/gbookmarkfile.c:3863 #, c-format msgid "Failed to expand exec line “%s” with URI “%s”" msgstr "" -#: glib/gconvert.c:468 +#: glib/gconvert.c:470 msgid "Unrepresentable character in conversion input" msgstr "" -#: glib/gconvert.c:495 glib/gutf8.c:886 glib/gutf8.c:1099 glib/gutf8.c:1236 -#: glib/gutf8.c:1340 +#: glib/gconvert.c:497 glib/gutf8.c:888 glib/gutf8.c:1101 glib/gutf8.c:1238 +#: glib/gutf8.c:1342 msgid "Partial character sequence at end of input" msgstr "არასრული სიმბოლო შეტანის ტექსტის ბოლოს" -#: glib/gconvert.c:764 +#: glib/gconvert.c:768 #, c-format msgid "Cannot convert fallback “%s” to codeset “%s”" msgstr "ვერ ხერხდება \"%s\" სიმბოლოს გარდაქმნა კოდირებაში \"%s\"" -#: glib/gconvert.c:936 +#: glib/gconvert.c:940 msgid "Embedded NUL byte in conversion input" msgstr "გადაყვანისას შეყვანაში ჩაშენებული NUL ბაიტი" -#: glib/gconvert.c:957 +#: glib/gconvert.c:961 msgid "Embedded NUL byte in conversion output" msgstr "გადაყვანისას გამოტანაში ჩაშენებული NUL ბაიტი" -#: glib/gconvert.c:1688 +#: glib/gconvert.c:1692 #, c-format msgid "The URI “%s” is not an absolute URI using the “file” scheme" msgstr "" "URI \"%s\" არ გახლავთ აბსოლუტური იდენტიფიკატორი \"file\" სქემის გამოყენებისას" -#: glib/gconvert.c:1698 +#: glib/gconvert.c:1702 #, c-format msgid "The local file URI “%s” may not include a “#”" msgstr "" "ლოკალური ფაილის URI იდენტიფიკატორი \"%s\" არ შეიძლება შეიცავდეს სიმბოლოს " "\"#\"" -#: glib/gconvert.c:1715 +#: glib/gconvert.c:1719 #, c-format msgid "The URI “%s” is invalid" msgstr "URI იდენტიფიკატორი \"%s\" მცდარია" -#: glib/gconvert.c:1727 +#: glib/gconvert.c:1731 #, c-format msgid "The hostname of the URI “%s” is invalid" msgstr "URI იდენტიფიკატორის \"%s\" ჰოსტის სახელი მცდარია" -#: glib/gconvert.c:1743 +#: glib/gconvert.c:1747 #, c-format msgid "The URI “%s” contains invalidly escaped characters" msgstr "URI იდენტიფიკატორი \"%s\" შეიცავ მცდარ საკონტროლო სიმბოლოებს" -#: glib/gconvert.c:1815 +#: glib/gconvert.c:1819 #, c-format msgid "The pathname “%s” is not an absolute path" msgstr "ბილიკი \"%s\" აბსოლუტური არ გახლავთ" #. Translators: this is the preferred format for expressing the date and the time -#: glib/gdatetime.c:226 +#: glib/gdatetime.c:228 msgctxt "GDateTime" msgid "%a %b %e %H:%M:%S %Y" msgstr "%Y წლის %d %B, %T %Z" #. Translators: this is the preferred format for expressing the date -#: glib/gdatetime.c:229 +#: glib/gdatetime.c:231 msgctxt "GDateTime" msgid "%m/%d/%y" msgstr "%m/%d/%Y" #. Translators: this is the preferred format for expressing the time -#: glib/gdatetime.c:232 +#: glib/gdatetime.c:234 msgctxt "GDateTime" msgid "%H:%M:%S" msgstr "%T" #. Translators: this is the preferred format for expressing 12 hour time -#: glib/gdatetime.c:235 +#: glib/gdatetime.c:237 msgctxt "GDateTime" msgid "%I:%M:%S %p" msgstr "%I:%M:%S %p" @@ -4346,62 +4367,62 @@ #. * non-European) there is no difference between the standalone and #. * complete date form. #. -#: glib/gdatetime.c:274 +#: glib/gdatetime.c:276 msgctxt "full month name" msgid "January" msgstr "იანვარი" -#: glib/gdatetime.c:276 +#: glib/gdatetime.c:278 msgctxt "full month name" msgid "February" msgstr "თებერვალი" -#: glib/gdatetime.c:278 +#: glib/gdatetime.c:280 msgctxt "full month name" msgid "March" msgstr "მარტი" -#: glib/gdatetime.c:280 +#: glib/gdatetime.c:282 msgctxt "full month name" msgid "April" msgstr "აპრილი" -#: glib/gdatetime.c:282 +#: glib/gdatetime.c:284 msgctxt "full month name" msgid "May" msgstr "მაისი" -#: glib/gdatetime.c:284 +#: glib/gdatetime.c:286 msgctxt "full month name" msgid "June" msgstr "ივნისი" -#: glib/gdatetime.c:286 +#: glib/gdatetime.c:288 msgctxt "full month name" msgid "July" msgstr "ივლისი" -#: glib/gdatetime.c:288 +#: glib/gdatetime.c:290 msgctxt "full month name" msgid "August" msgstr "აგვისტო" -#: glib/gdatetime.c:290 +#: glib/gdatetime.c:292 msgctxt "full month name" msgid "September" msgstr "სექტემბერი" -#: glib/gdatetime.c:292 +#: glib/gdatetime.c:294 msgctxt "full month name" msgid "October" msgstr "ოქტომბერი" -#: glib/gdatetime.c:294 +#: glib/gdatetime.c:296 msgctxt "full month name" msgid "November" msgstr "ნოემბერი" -#: glib/gdatetime.c:296 +#: glib/gdatetime.c:298 msgctxt "full month name" msgid "December" msgstr "დეკემბერი" @@ -4423,132 +4444,132 @@ #. * other platform. Here are abbreviated month names in a form #. * appropriate when they are used standalone. #. -#: glib/gdatetime.c:328 +#: glib/gdatetime.c:330 msgctxt "abbreviated month name" msgid "Jan" msgstr "იან" -#: glib/gdatetime.c:330 +#: glib/gdatetime.c:332 msgctxt "abbreviated month name" msgid "Feb" msgstr "თებ" -#: glib/gdatetime.c:332 +#: glib/gdatetime.c:334 msgctxt "abbreviated month name" msgid "Mar" msgstr "მარ" -#: glib/gdatetime.c:334 +#: glib/gdatetime.c:336 msgctxt "abbreviated month name" msgid "Apr" msgstr "აპრ" -#: glib/gdatetime.c:336 +#: glib/gdatetime.c:338 msgctxt "abbreviated month name" msgid "May" msgstr "მაისი" -#: glib/gdatetime.c:338 +#: glib/gdatetime.c:340 msgctxt "abbreviated month name" msgid "Jun" msgstr "ივნ" -#: glib/gdatetime.c:340 +#: glib/gdatetime.c:342 msgctxt "abbreviated month name" msgid "Jul" msgstr "ივლ" -#: glib/gdatetime.c:342 +#: glib/gdatetime.c:344 msgctxt "abbreviated month name" msgid "Aug" msgstr "აგვ" -#: glib/gdatetime.c:344 +#: glib/gdatetime.c:346 msgctxt "abbreviated month name" msgid "Sep" msgstr "სექ" -#: glib/gdatetime.c:346 +#: glib/gdatetime.c:348 msgctxt "abbreviated month name" msgid "Oct" msgstr "ოქტ" -#: glib/gdatetime.c:348 +#: glib/gdatetime.c:350 msgctxt "abbreviated month name" msgid "Nov" msgstr "ნოე" -#: glib/gdatetime.c:350 +#: glib/gdatetime.c:352 msgctxt "abbreviated month name" msgid "Dec" msgstr "დეკ" -#: glib/gdatetime.c:365 +#: glib/gdatetime.c:367 msgctxt "full weekday name" msgid "Monday" msgstr "ორშაბათი" -#: glib/gdatetime.c:367 +#: glib/gdatetime.c:369 msgctxt "full weekday name" msgid "Tuesday" msgstr "სამშაბათი" -#: glib/gdatetime.c:369 +#: glib/gdatetime.c:371 msgctxt "full weekday name" msgid "Wednesday" msgstr "ოთხშაბათი" -#: glib/gdatetime.c:371 +#: glib/gdatetime.c:373 msgctxt "full weekday name" msgid "Thursday" msgstr "ხუთშაბათი" -#: glib/gdatetime.c:373 +#: glib/gdatetime.c:375 msgctxt "full weekday name" msgid "Friday" msgstr "პარასკევი" -#: glib/gdatetime.c:375 +#: glib/gdatetime.c:377 msgctxt "full weekday name" msgid "Saturday" msgstr "შაბათი" -#: glib/gdatetime.c:377 +#: glib/gdatetime.c:379 msgctxt "full weekday name" msgid "Sunday" msgstr "კვირა" -#: glib/gdatetime.c:392 +#: glib/gdatetime.c:394 msgctxt "abbreviated weekday name" msgid "Mon" msgstr "ორშ" -#: glib/gdatetime.c:394 +#: glib/gdatetime.c:396 msgctxt "abbreviated weekday name" msgid "Tue" msgstr "სამ" -#: glib/gdatetime.c:396 +#: glib/gdatetime.c:398 msgctxt "abbreviated weekday name" msgid "Wed" msgstr "ოთხ" -#: glib/gdatetime.c:398 +#: glib/gdatetime.c:400 msgctxt "abbreviated weekday name" msgid "Thu" msgstr "ხუთ" -#: glib/gdatetime.c:400 +#: glib/gdatetime.c:402 msgctxt "abbreviated weekday name" msgid "Fri" msgstr "პარ" -#: glib/gdatetime.c:402 +#: glib/gdatetime.c:404 msgctxt "abbreviated weekday name" msgid "Sat" msgstr "შაბ" -#: glib/gdatetime.c:404 +#: glib/gdatetime.c:406 msgctxt "abbreviated weekday name" msgid "Sun" msgstr "კვი" @@ -4570,62 +4591,62 @@ #. * (western European, non-European) there is no difference between the #. * standalone and complete date form. #. -#: glib/gdatetime.c:468 +#: glib/gdatetime.c:470 msgctxt "full month name with day" msgid "January" msgstr "იანვარი" -#: glib/gdatetime.c:470 +#: glib/gdatetime.c:472 msgctxt "full month name with day" msgid "February" msgstr "თებერვალი" -#: glib/gdatetime.c:472 +#: glib/gdatetime.c:474 msgctxt "full month name with day" msgid "March" msgstr "მარტი" -#: glib/gdatetime.c:474 +#: glib/gdatetime.c:476 msgctxt "full month name with day" msgid "April" msgstr "აპრილი" -#: glib/gdatetime.c:476 +#: glib/gdatetime.c:478 msgctxt "full month name with day" msgid "May" msgstr "მაისი" -#: glib/gdatetime.c:478 +#: glib/gdatetime.c:480 msgctxt "full month name with day" msgid "June" msgstr "ივნისი" -#: glib/gdatetime.c:480 +#: glib/gdatetime.c:482 msgctxt "full month name with day" msgid "July" msgstr "ივლისი" -#: glib/gdatetime.c:482 +#: glib/gdatetime.c:484 msgctxt "full month name with day" msgid "August" msgstr "აგვისტო" -#: glib/gdatetime.c:484 +#: glib/gdatetime.c:486 msgctxt "full month name with day" msgid "September" msgstr "სექტემბერი" -#: glib/gdatetime.c:486 +#: glib/gdatetime.c:488 msgctxt "full month name with day" msgid "October" msgstr "ოქტომბერი" -#: glib/gdatetime.c:488 +#: glib/gdatetime.c:490 msgctxt "full month name with day" msgid "November" msgstr "ნოემბერი" -#: glib/gdatetime.c:490 +#: glib/gdatetime.c:492 msgctxt "full month name with day" msgid "December" msgstr "დეკემბერი" @@ -4647,190 +4668,189 @@ #. * 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:555 +#: glib/gdatetime.c:557 msgctxt "abbreviated month name with day" msgid "Jan" msgstr "იან" -#: glib/gdatetime.c:557 +#: glib/gdatetime.c:559 msgctxt "abbreviated month name with day" msgid "Feb" msgstr "თებ" -#: glib/gdatetime.c:559 +#: glib/gdatetime.c:561 msgctxt "abbreviated month name with day" msgid "Mar" msgstr "მარ" -#: glib/gdatetime.c:561 +#: glib/gdatetime.c:563 msgctxt "abbreviated month name with day" msgid "Apr" msgstr "აპრ" -#: glib/gdatetime.c:563 +#: glib/gdatetime.c:565 msgctxt "abbreviated month name with day" msgid "May" msgstr "მაისი" -#: glib/gdatetime.c:565 +#: glib/gdatetime.c:567 msgctxt "abbreviated month name with day" msgid "Jun" msgstr "ივნ" -#: glib/gdatetime.c:567 +#: glib/gdatetime.c:569 msgctxt "abbreviated month name with day" msgid "Jul" msgstr "ივლ" -#: glib/gdatetime.c:569 +#: glib/gdatetime.c:571 msgctxt "abbreviated month name with day" msgid "Aug" msgstr "აგვ" -#: glib/gdatetime.c:571 +#: glib/gdatetime.c:573 msgctxt "abbreviated month name with day" msgid "Sep" msgstr "სექ" -#: glib/gdatetime.c:573 +#: glib/gdatetime.c:575 msgctxt "abbreviated month name with day" msgid "Oct" msgstr "ოქტ" -#: glib/gdatetime.c:575 +#: glib/gdatetime.c:577 msgctxt "abbreviated month name with day" msgid "Nov" msgstr "ნოე" -#: glib/gdatetime.c:577 +#: glib/gdatetime.c:579 msgctxt "abbreviated month name with day" msgid "Dec" msgstr "დეკ" #. Translators: 'before midday' indicator -#: glib/gdatetime.c:594 +#: glib/gdatetime.c:596 msgctxt "GDateTime" msgid "AM" msgstr "AM" #. Translators: 'after midday' indicator -#: glib/gdatetime.c:597 +#: glib/gdatetime.c:599 msgctxt "GDateTime" msgid "PM" msgstr "PM" -#: glib/gdir.c:156 +#: glib/gdir.c:158 #, c-format msgid "Error opening directory “%s”: %s" msgstr "" -#: glib/gfileutils.c:733 glib/gfileutils.c:825 +#: glib/gfileutils.c:753 glib/gfileutils.c:845 #, c-format msgid "Could not allocate %lu byte to read file “%s”" msgid_plural "Could not allocate %lu bytes to read file “%s”" msgstr0 "ვერ ხერხდება %lu ბაიტის გამოყოფა \"%s\" ფაილის წასაკითხად" -msgstr1 "ვერ ხერხდება %lu ბაიტის გამოყოფა \"%s\" ფაილის წასაკითხად" -#: glib/gfileutils.c:750 +#: glib/gfileutils.c:770 #, c-format msgid "Error reading file “%s”: %s" msgstr "" -#: glib/gfileutils.c:786 +#: glib/gfileutils.c:806 #, c-format msgid "File “%s” is too large" msgstr "" -#: glib/gfileutils.c:850 +#: glib/gfileutils.c:870 #, c-format msgid "Failed to read from file “%s”: %s" msgstr "" -#: glib/gfileutils.c:900 glib/gfileutils.c:975 glib/gfileutils.c:1447 +#: glib/gfileutils.c:920 glib/gfileutils.c:995 glib/gfileutils.c:1472 #, c-format msgid "Failed to open file “%s”: %s" msgstr "ფაილის (%s) გახსნა შეუძლებელია: %s" -#: glib/gfileutils.c:913 +#: glib/gfileutils.c:933 #, c-format msgid "Failed to get attributes of file “%s”: fstat() failed: %s" msgstr "" -#: glib/gfileutils.c:944 +#: glib/gfileutils.c:964 #, c-format msgid "Failed to open file “%s”: fdopen() failed: %s" msgstr "" -#: glib/gfileutils.c:1045 +#: glib/gfileutils.c:1065 #, c-format msgid "Failed to rename file “%s” to “%s”: g_rename() failed: %s" msgstr "ვერ მოხერხდა '%s' ფაილის გადარქმევა - '%s': g_rename() ვერ შედგა: %s" -#: glib/gfileutils.c:1154 +#: glib/gfileutils.c:1179 #, c-format msgid "Failed to write file “%s”: write() failed: %s" msgstr "ვერ ვწერ '%s' ფაილს: fwrite() ვერ შედგა: %s" -#: glib/gfileutils.c:1175 +#: glib/gfileutils.c:1200 #, c-format msgid "Failed to write file “%s”: fsync() failed: %s" msgstr "ვერ ვწერ '%s' ფაილს: fsync() ვერ შედგა: %s" -#: glib/gfileutils.c:1336 glib/gfileutils.c:1751 +#: glib/gfileutils.c:1361 glib/gfileutils.c:1776 #, c-format msgid "Failed to create file “%s”: %s" msgstr "ვერ ვქმნი '%s' ფაილს: %s" -#: glib/gfileutils.c:1381 +#: glib/gfileutils.c:1406 #, c-format msgid "Existing file “%s” could not be removed: g_unlink() failed: %s" msgstr "არსებული '%s' ფაილი ვერ ამოიშლება: g_unlink() ვერ შედგა: %s" -#: glib/gfileutils.c:1716 +#: glib/gfileutils.c:1741 #, c-format msgid "Template “%s” invalid, should not contain a “%s”" msgstr "შაბლონი '%s' მცდარია და '%s'-ს არ უნდა შეიცავდეს" -#: glib/gfileutils.c:1729 +#: glib/gfileutils.c:1754 #, c-format msgid "Template “%s” doesn’t contain XXXXXX" msgstr "შაბლონი '%s' არ შეიცავს XXXXXX" -#: glib/gfileutils.c:2289 glib/gfileutils.c:2318 +#: glib/gfileutils.c:2348 glib/gfileutils.c:2377 #, c-format msgid "Failed to read the symbolic link “%s”: %s" msgstr "სიმბოლური ბმის \"%s\" წაკითხვის შეცდომა: %s" -#: glib/giochannel.c:1405 +#: glib/giochannel.c:1408 #, c-format msgid "Could not open converter from “%s” to “%s”: %s" msgstr "ვერ ხერხდება გარდამქმნელის გახსნა '%s' - '%s': %s" -#: glib/giochannel.c:1758 +#: glib/giochannel.c:1761 msgid "Can’t do a raw read in g_io_channel_read_line_string" msgstr "უშუალოდ წაკითხვა ფუნქციაში g_io_channel_read_line_string ვერ ხერხდება" -#: glib/giochannel.c:1805 glib/giochannel.c:2063 glib/giochannel.c:2150 +#: glib/giochannel.c:1808 glib/giochannel.c:2066 glib/giochannel.c:2153 msgid "Leftover unconverted data in read buffer" msgstr "გარდაუქმნელი მონაცემები წაკითხვის ბუფერში დარჩა" -#: glib/giochannel.c:1886 glib/giochannel.c:1963 +#: glib/giochannel.c:1889 glib/giochannel.c:1966 msgid "Channel terminates in a partial character" msgstr "არხი არასრული სიმბოლოთი იხურება" -#: glib/giochannel.c:1949 +#: glib/giochannel.c:1952 msgid "Can’t do a raw read in g_io_channel_read_to_end" msgstr "უშუალოდ წაკითხვა ფუნქციაში g_io_channel_read_to_end ვერ ხერხდება" -#: glib/gkeyfile.c:794 +#: glib/gkeyfile.c:796 msgid "Valid key file could not be found in search dirs" msgstr "ძიების კატალოგებში შეუძლებელია დამოწმებული გასაღების პოვნა" -#: glib/gkeyfile.c:831 +#: glib/gkeyfile.c:833 msgid "Not a regular file" msgstr "ფაილი ჩვეულებრივი არაა" -#: glib/gkeyfile.c:1289 +#: glib/gkeyfile.c:1291 #, c-format msgid "" "Key file contains line “%s” which is not a key-value pair, group, or comment" @@ -4838,50 +4858,50 @@ "გასაღების ფაილი '%s' შეიცავს სტრიქონს, რომელიც არ წარმოადგენს გასაღები-" "მნიშვნელობას, ჯგუფს ან კომენტარს" -#: glib/gkeyfile.c:1346 +#: glib/gkeyfile.c:1348 #, c-format msgid "Invalid group name: %s" msgstr "ჯგუფის მიუღებელი სახელი: %s" -#: glib/gkeyfile.c:1370 +#: glib/gkeyfile.c:1372 msgid "Key file does not start with a group" msgstr "საკვანძო ფაილი ჯგუფით არ იწყება" -#: glib/gkeyfile.c:1394 +#: glib/gkeyfile.c:1396 #, c-format msgid "Invalid key name: %.*s" msgstr "გასაღების მიუღებელი სახელი: %.*s" -#: glib/gkeyfile.c:1422 +#: glib/gkeyfile.c:1424 #, c-format msgid "Key file contains unsupported encoding “%s”" msgstr "გასაღების ფაილი შეიცავს მხარდაუჭერელ კოდირებას '%s'" -#: glib/gkeyfile.c:1677 glib/gkeyfile.c:1850 glib/gkeyfile.c:3297 -#: glib/gkeyfile.c:3361 glib/gkeyfile.c:3491 glib/gkeyfile.c:3623 -#: glib/gkeyfile.c:3769 glib/gkeyfile.c:4004 glib/gkeyfile.c:4071 +#: glib/gkeyfile.c:1679 glib/gkeyfile.c:1852 glib/gkeyfile.c:3299 +#: glib/gkeyfile.c:3363 glib/gkeyfile.c:3493 glib/gkeyfile.c:3622 +#: glib/gkeyfile.c:3768 glib/gkeyfile.c:4003 glib/gkeyfile.c:4070 #, c-format msgid "Key file does not have group “%s”" msgstr "გასაღების ფაილი არ შეიცავს ჯგუფს '%s'" -#: glib/gkeyfile.c:1805 +#: glib/gkeyfile.c:1807 #, c-format msgid "Key file does not have key “%s” in group “%s”" msgstr "გასაღების ფაილი არ შეიცავს გასაღებს '%s' ჯგუფში '%s'" -#: glib/gkeyfile.c:1967 glib/gkeyfile.c:2083 +#: glib/gkeyfile.c:1969 glib/gkeyfile.c:2085 #, c-format msgid "Key file contains key “%s” with value “%s” which is not UTF-8" msgstr "" "ფაილი შეიცავს გასაღებს '%s', რომლის მნიშვნელობაც '%s' UTF-8 კოდირებაში არაა" -#: glib/gkeyfile.c:1987 glib/gkeyfile.c:2103 glib/gkeyfile.c:2542 +#: glib/gkeyfile.c:1989 glib/gkeyfile.c:2105 glib/gkeyfile.c:2544 #, c-format msgid "" "Key file contains key “%s” which has a value that cannot be interpreted." msgstr "ფაილი შეიცავს გასაღებს '%s', რომლის მნიშვნელობაც ვერ იშიფრება." -#: glib/gkeyfile.c:2757 glib/gkeyfile.c:3126 +#: glib/gkeyfile.c:2759 glib/gkeyfile.c:3128 #, c-format msgid "" "Key file contains key “%s” in group “%s” which has a value that cannot be " @@ -4889,81 +4909,81 @@ msgstr "" "ფაილი შეიცავს გასაღებს '%s' ჯგუფში '%s', რომლის მნიშვნელობაც ვერ იშიფრება." -#: glib/gkeyfile.c:2835 glib/gkeyfile.c:2912 +#: glib/gkeyfile.c:2837 glib/gkeyfile.c:2914 #, c-format msgid "Key “%s” in group “%s” has value “%s” where %s was expected" msgstr "" -#: glib/gkeyfile.c:4324 +#: glib/gkeyfile.c:4323 msgid "Key file contains escape character at end of line" msgstr "გასაღების ფაილი სტრიქონის ბოლოს escape სიმბოლოს შეიცავს" -#: glib/gkeyfile.c:4346 +#: glib/gkeyfile.c:4345 #, c-format msgid "Key file contains invalid escape sequence “%s”" msgstr "გასაღების ფაილი მცდარ escape მიმდევრობას '%s' შეიცავს" -#: glib/gkeyfile.c:4491 +#: glib/gkeyfile.c:4490 #, c-format msgid "Value “%s” cannot be interpreted as a number." msgstr "მნიშვნელობა '%s' ვერ აღიქმება, როგორც რიცხვი." -#: glib/gkeyfile.c:4505 +#: glib/gkeyfile.c:4504 #, c-format msgid "Integer value “%s” out of range" msgstr "მთელი მნიშვნელობა '%s' დიაპაზონს გარეთაა" -#: glib/gkeyfile.c:4538 +#: glib/gkeyfile.c:4537 #, c-format msgid "Value “%s” cannot be interpreted as a float number." msgstr "მნიშვნელობა '%s' ვერ აღიქმება, როგორც წილადი." -#: glib/gkeyfile.c:4577 +#: glib/gkeyfile.c:4576 #, c-format msgid "Value “%s” cannot be interpreted as a boolean." msgstr "მნიშვნელობა '%s' ვერ აღიქმება, როგორც ლოგიკური ოპერატორი." -#: glib/gmappedfile.c:129 +#: glib/gmappedfile.c:131 #, c-format msgid "Failed to get attributes of file “%s%s%s%s”: fstat() failed: %s" msgstr "" -#: glib/gmappedfile.c:195 +#: glib/gmappedfile.c:197 #, c-format msgid "Failed to map %s%s%s%s: mmap() failed: %s" msgstr "ვერ მოხერხდა '%s%s%s%s:' ფაილის განთავსება: mmap() ვერ შედგა: %s" -#: glib/gmappedfile.c:262 +#: glib/gmappedfile.c:264 #, c-format msgid "Failed to open file “%s”: open() failed: %s" msgstr "ვერ მოხერხდა '%s' ფაილის გახსნა: open() ვერ შედგა: %s" -#: glib/gmarkup.c:398 glib/gmarkup.c:440 +#: glib/gmarkup.c:393 glib/gmarkup.c:435 #, c-format msgid "Error on line %d char %d: " msgstr "" -#: glib/gmarkup.c:462 glib/gmarkup.c:545 +#: glib/gmarkup.c:457 glib/gmarkup.c:540 #, c-format msgid "Invalid UTF-8 encoded text in name — not valid “%s”" msgstr "ტექსტი მიუღებელი UTF-8 კოდირებით - მიუღებელი '%s'" -#: glib/gmarkup.c:473 +#: glib/gmarkup.c:468 #, c-format msgid "“%s” is not a valid name" msgstr "არასწორი სახელი: %s" -#: glib/gmarkup.c:489 +#: glib/gmarkup.c:484 #, c-format msgid "“%s” is not a valid name: “%c”" msgstr "" -#: glib/gmarkup.c:613 +#: glib/gmarkup.c:608 #, c-format msgid "Error on line %d: %s" msgstr "შეცდომა სტრიქონში %d: %s" -#: glib/gmarkup.c:690 +#: glib/gmarkup.c:685 #, c-format msgid "" "Failed to parse “%-.*s”, which should have been a digit inside a character " @@ -4972,30 +4992,30 @@ "ვერ მუშავდება სტრიქონი '%-.*s', რომელშიც უნდა იყოს სიმბოლოს ნომერი " "(მაგალითად, ê): შესაძლოა რიცხვი მეტისმეტად დიდია" -#: glib/gmarkup.c:702 +#: glib/gmarkup.c:697 msgid "" "Character reference did not end with a semicolon; most likely you used an " "ampersand character without intending to start an entity — escape ampersand " "as &" msgstr "" -#: glib/gmarkup.c:728 +#: glib/gmarkup.c:723 #, c-format msgid "Character reference “%-.*s” does not encode a permitted character" msgstr "" -#: glib/gmarkup.c:766 +#: glib/gmarkup.c:761 msgid "" "Empty entity “&;” seen; valid entities are: & " < > '" msgstr "" "ცარიელი ერთეული \"&;\"; შესაძლო ერთეულებია: & " < > '" -#: glib/gmarkup.c:774 +#: glib/gmarkup.c:769 #, c-format msgid "Entity name “%-.*s” is not known" msgstr "ერთეულის სახელი \"%-.*s\" უცნობია" -#: glib/gmarkup.c:779 +#: glib/gmarkup.c:774 msgid "" "Entity did not end with a semicolon; most likely you used an ampersand " "character without intending to start an entity — escape ampersand as &" @@ -5003,11 +5023,11 @@ "ერთეული არ მთავრდება წერტილ-მძიმით; როგორც ჩანს, სახელის დასაწყისში " "გამოყენებულია სიმბოლო \"&\". გამოსახეთ იგი, როგორც &" -#: glib/gmarkup.c:1193 +#: glib/gmarkup.c:1188 msgid "Document must begin with an element (e.g. <book>)" msgstr "დოკუმენტი უნდა დაიწყოს ელემეტით (მაგალითად <book>)" -#: glib/gmarkup.c:1233 +#: glib/gmarkup.c:1228 #, c-format msgid "" "“%s” is not a valid character following a “<” character; it may not begin an " @@ -5016,7 +5036,7 @@ "სიმბოლო \"%s\" დაუშვებელია \"<\" სიმბოლოს შემდეგ; ამ სიმბოლოთი ელემენტის " "სახელის დაწყება არ შეიძლება" -#: glib/gmarkup.c:1276 +#: glib/gmarkup.c:1271 #, c-format msgid "" "Odd character “%s”, expected a “>” character to end the empty-element tag " @@ -5025,12 +5045,12 @@ "უცნაური სიმბოლო \"%s\". მოველოდი სიმბოლოს \">\" ცარიელი ელემენტის ჭდის (%s) " "დასასრულებლად" -#: glib/gmarkup.c:1346 +#: glib/gmarkup.c:1341 #, c-format msgid "Too many attributes in element “%s”" msgstr "" -#: glib/gmarkup.c:1366 +#: glib/gmarkup.c:1361 #, c-format msgid "" "Odd character “%s”, expected a “=” after attribute name “%s” of element “%s”" @@ -5038,7 +5058,7 @@ "უცნაური სიმბოლო \"%s\". მოველოდი \"=\"-ს ატრიბუტის (%s) სახელის შემდეგ " "ელემენტისთვის \"%s\"" -#: glib/gmarkup.c:1408 +#: glib/gmarkup.c:1403 #, c-format msgid "" "Odd character “%s”, expected a “>” or “/” character to end the start tag of " @@ -5049,7 +5069,7 @@ "საწყისი ჭდის დასასრულებლად, ან ატრიბუტს. ალბათ ატრიბუტის სახელში არასწორი " "სიმბოლო გამოიყენეთ" -#: glib/gmarkup.c:1453 +#: glib/gmarkup.c:1448 #, c-format msgid "" "Odd character “%s”, expected an open quote mark after the equals sign when " @@ -5058,7 +5078,7 @@ "ზედმეტი სიმბოლო \"%s\", მოსალოდნელია გახსნილი ბრჭყალები ტოლობის ნიშნის " "შემდეგ ატრიბუტისთვის \"%s\" მნიშვნელობის მისანიჭებლად ელემენტისთვის \"%s\"" -#: glib/gmarkup.c:1587 +#: glib/gmarkup.c:1582 #, c-format msgid "" "“%s” is not a valid character following the characters “</”; “%s” may not " @@ -5067,7 +5087,7 @@ "სიმბოლო \"%s\" დაუშვებელია \"</\" შემდეგ; სიმბოლო \"%s\" არ შეიძლება იყოს " "ელემენტის სახელის დასაწყისში" -#: glib/gmarkup.c:1625 +#: glib/gmarkup.c:1620 #, c-format msgid "" "“%s” is not a valid character following the close element name “%s”; the " @@ -5076,25 +5096,25 @@ "სიმბოლო \"%s\" დაუშვებელია ელემენტის \"%s\" დახურვის ჭდის შემდეგ; დასაშვები " "სიმბოლოა \">\"" -#: glib/gmarkup.c:1637 +#: glib/gmarkup.c:1632 #, c-format msgid "Element “%s” was closed, no element is currently open" msgstr "ელემენტი \"%s\" დაიხურა, არცერთი ელემენტი არაა გახსნილი" -#: glib/gmarkup.c:1646 +#: glib/gmarkup.c:1641 #, c-format msgid "Element “%s” was closed, but the currently open element is “%s”" msgstr "ელემენტი \"%s\" დაიხურა, მაგრამ გახსნილია ელემენტი \"%s\"" -#: glib/gmarkup.c:1799 +#: glib/gmarkup.c:1794 msgid "Document was empty or contained only whitespace" msgstr "დოკუმენტი ცარიელია ან მხოლოდ ხარეებს შეიცავს" -#: glib/gmarkup.c:1813 +#: glib/gmarkup.c:1808 msgid "Document ended unexpectedly just after an open angle bracket “<”" msgstr "დოკუმენტი დასრულდა უშუალოდ კუთხოვანი ფრჩხილის \"<\" შემდეგ" -#: glib/gmarkup.c:1821 glib/gmarkup.c:1866 +#: glib/gmarkup.c:1816 glib/gmarkup.c:1861 #, c-format msgid "" "Document ended unexpectedly with elements still open — “%s” was the last " @@ -5103,7 +5123,7 @@ "დოკუმენტი მოულოდნელად დასრულდა გახსნილი ელემენტებით - \"%s\" ბოლო გახსნილი " "ელემენტია" -#: glib/gmarkup.c:1829 +#: glib/gmarkup.c:1824 #, c-format msgid "" "Document ended unexpectedly, expected to see a close angle bracket ending " @@ -5111,19 +5131,19 @@ msgstr "" "დოკუმენტი მოულოდნელად დასრულდა, მოსალოდნელია ჩამკეტი კუთხოვანი ფრჩხილი <%s/>" -#: glib/gmarkup.c:1835 +#: glib/gmarkup.c:1830 msgid "Document ended unexpectedly inside an element name" msgstr "დოკუმენტი მოულოდნელად დასრულდა ელემენტის სახელის შიგნით" -#: glib/gmarkup.c:1841 +#: glib/gmarkup.c:1836 msgid "Document ended unexpectedly inside an attribute name" msgstr "დოკუმენტი მოულოდნელად დასრულდა ატრიბუტის სახელის შიგნით" -#: glib/gmarkup.c:1846 +#: glib/gmarkup.c:1841 msgid "Document ended unexpectedly inside an element-opening tag." msgstr "დოკუმენტი მოულოდნელად დასრულდა ელემენტის გამხსნელი ჭდის შიგნით." -#: glib/gmarkup.c:1852 +#: glib/gmarkup.c:1847 msgid "" "Document ended unexpectedly after the equals sign following an attribute " "name; no attribute value" @@ -5131,489 +5151,422 @@ "დოკუმენტი მოულოდნელად დასრულდა ატრიბუტის სახელის შემდგომი ტოლობის ნიშნის " "შემდეგ; ატრიბუტის მნიშვნელობა არ მითითებულა" -#: glib/gmarkup.c:1859 +#: glib/gmarkup.c:1854 msgid "Document ended unexpectedly while inside an attribute value" msgstr "დოკუმენტი მოულოდნელად დასრულდა ატრიბუტის მნიშვნელობის შიგნით" -#: glib/gmarkup.c:1876 +#: glib/gmarkup.c:1871 #, c-format msgid "Document ended unexpectedly inside the close tag for element “%s”" msgstr "დოკუმენტი მოულოდნელად დასრულდა ელემენტის \"%s\" ჩამკეტი ჭდის შიგნით" -#: glib/gmarkup.c:1880 +#: glib/gmarkup.c:1875 msgid "" "Document ended unexpectedly inside the close tag for an unopened element" msgstr "დოკუმენტი მოულოდნელად დასრულდა გაუხსნელი ელემენტის ჩამკეტი ჭდის შიგნით" -#: glib/gmarkup.c:1886 +#: glib/gmarkup.c:1881 msgid "Document ended unexpectedly inside a comment or processing instruction" msgstr "" "დოკუმენტი მოულოდნელად დასრულდა კომენტარის ან დამუშავების ინსტრუქციის შიგნით" -#: glib/goption.c:873 +#: glib/goption.c:875 msgid "OPTION…" msgstr "პარამეტრი..." -#: glib/goption.c:989 +#: glib/goption.c:991 msgid "Help Options:" msgstr "დახმარების პარამეტრები:" -#: glib/goption.c:990 +#: glib/goption.c:992 msgid "Show help options" msgstr "დახმარების პარამეტრების ჩვენება" -#: glib/goption.c:996 +#: glib/goption.c:998 msgid "Show all help options" msgstr "დახმარების ყველა პარამეტრის ჩვენება" -#: glib/goption.c:1059 +#: glib/goption.c:1061 msgid "Application Options:" msgstr "პროგრამის პარამეტრები:" -#: glib/goption.c:1061 +#: glib/goption.c:1063 msgid "Options:" msgstr "პარამეტრები:" -#: glib/goption.c:1125 glib/goption.c:1195 +#: glib/goption.c:1127 glib/goption.c:1197 #, c-format msgid "Cannot parse integer value “%s” for %s" msgstr "მთელი მნიშვნელობის \"%s\" დამუშავების შეცდომა %s-თვის" -#: glib/goption.c:1135 glib/goption.c:1203 +#: glib/goption.c:1137 glib/goption.c:1205 #, c-format msgid "Integer value “%s” for %s out of range" msgstr "მთელი მნიშვნელობა '%s' ელემენტისთვის %s დიაპაზონს გარეთაა" -#: glib/goption.c:1160 +#: glib/goption.c:1162 #, c-format msgid "Cannot parse double value “%s” for %s" msgstr "ორმაგი მნიშვნელობის \"%s\" დამუშავების შეცდომა %s-თვის" -#: glib/goption.c:1168 +#: glib/goption.c:1170 #, c-format msgid "Double value “%s” for %s out of range" msgstr "ორმაგი მნიშვნელობა '%s' ელემენტისთვის %s დიაპაზონს გარეთაა" -#: glib/goption.c:1460 glib/goption.c:1539 +#: glib/goption.c:1462 glib/goption.c:1541 #, c-format msgid "Error parsing option %s" msgstr "შეცდომის გაანალიზების პარამეტრი: %s" -#: glib/goption.c:1561 glib/goption.c:1674 +#: glib/goption.c:1563 glib/goption.c:1676 #, c-format msgid "Missing argument for %s" msgstr "არ არსებული არგუმენტი - %s-თვის" -#: glib/goption.c:2184 +#: glib/goption.c:2186 #, c-format msgid "Unknown option %s" msgstr "უცნობი პარამეტრი %s" -#: glib/gregex.c:255 +#: glib/gregex.c:479 msgid "corrupted object" msgstr "დაზიანებული ობიექტი" -#: glib/gregex.c:257 -msgid "internal error or corrupted object" -msgstr "შიდა შეცდომა ან დაზიანებული ობიექტი" - -#: glib/gregex.c:259 +#: glib/gregex.c:481 msgid "out of memory" -msgstr "მეხსიერებას გარეთ" +msgstr "არასაკმარისი მეხსიერება" -#: glib/gregex.c:264 +#: glib/gregex.c:487 msgid "backtracking limit reached" msgstr "უკან დაბრუნების ლიმიტი ამოწურულია" -#: glib/gregex.c:276 glib/gregex.c:284 -msgid "the pattern contains items not supported for partial matching" -msgstr "თარგი შეიცავს ნაწილობრივი დამთხვევისთვის მხარდაუჭერელ ელემეტებს" - -#: glib/gregex.c:278 +#: glib/gregex.c:498 msgid "internal error" msgstr "შიდა შეცდომა" -#: glib/gregex.c:286 +#: glib/gregex.c:500 +msgid "the pattern contains items not supported for partial matching" +msgstr "თარგი შეიცავს ნაწილობრივი დამთხვევისთვის მხარდაუჭერელ ელემეტებს" + +#: glib/gregex.c:502 msgid "back references as conditions are not supported for partial matching" msgstr "უკუ მიმართვა პირობების სახით მხარდაუჭერელია ნაწილობრივი დამთხვევისთვის" -#: glib/gregex.c:295 +#: glib/gregex.c:508 msgid "recursion limit reached" msgstr "რეკურსიის ლიმიტი მიღწეულია" -#: glib/gregex.c:297 -msgid "invalid combination of newline flags" -msgstr "სტრიქონების გადაყვანის ალმების არასწორი კომბინაცია" - -#: glib/gregex.c:299 +#: glib/gregex.c:510 msgid "bad offset" msgstr "არასწორი წანაცვლება" -#: glib/gregex.c:301 -msgid "short utf8" -msgstr "მოკლე utf8" - -#: glib/gregex.c:303 +#: glib/gregex.c:512 msgid "recursion loop" msgstr "რეკურსიის მარყუჟი" -#: glib/gregex.c:307 +#. should not happen in GRegex since we check modes before each match +#: glib/gregex.c:515 +msgid "matching mode is requested that was not compiled for JIT" +msgstr "" + +#: glib/gregex.c:536 glib/gregex.c:1838 msgid "unknown error" msgstr "უცნობი შეცდომა" -#: glib/gregex.c:327 +#: glib/gregex.c:557 msgid "\\ at end of pattern" msgstr "\\ ნიმუშის ბოლოში" -#: glib/gregex.c:330 +#: glib/gregex.c:561 msgid "\\c at end of pattern" msgstr "\\c ნიმუშის ბოლოში" -#: glib/gregex.c:333 +#: glib/gregex.c:566 msgid "unrecognized character following \\" msgstr "" -#: glib/gregex.c:336 +#: glib/gregex.c:570 msgid "numbers out of order in {} quantifier" msgstr "მთვლელში რიცხვები დაულაგებელია {}" -#: glib/gregex.c:339 +#: glib/gregex.c:574 msgid "number too big in {} quantifier" msgstr "მთვლელში {} რიცხვები ძალიან დიდია" -#: glib/gregex.c:342 +#: glib/gregex.c:578 msgid "missing terminating for character class" msgstr "სიმბოლოების კლასს დამაბოლოებელი აკლია" -#: glib/gregex.c:345 +#: glib/gregex.c:582 msgid "invalid escape sequence in character class" msgstr "სიმბოლოების კლასის არასწორი დამაბოლოებელი თანამიმდევრობა" -#: glib/gregex.c:348 +#: glib/gregex.c:586 msgid "range out of order in character class" msgstr "სიმბოლოების კლასის დიაპაზონი მიმდევრობის გარეთაა" -#: glib/gregex.c:351 +#: glib/gregex.c:591 msgid "nothing to repeat" msgstr "გასამეორებელი არაფერია" -#: glib/gregex.c:355 -msgid "unexpected repeat" -msgstr "" - -#: glib/gregex.c:358 +#: glib/gregex.c:595 msgid "unrecognized character after (? or (?-" msgstr "უცნობი სიმბლოები (? ან (?- ის შემდეგ" -#: glib/gregex.c:361 +#: glib/gregex.c:599 msgid "POSIX named classes are supported only within a class" msgstr "POSIX-ის დასახელებული კლასები მხოლოდ კლასის შიგნითაა ხელმისაწვდომი" -#: glib/gregex.c:364 +#: glib/gregex.c:603 +msgid "POSIX collating elements are not supported" +msgstr "POSIX-ის გადაფარვადი ელემენტები მხარდაუჭერელია" + +#: glib/gregex.c:609 msgid "missing terminating )" msgstr "" -#: glib/gregex.c:367 +#: glib/gregex.c:613 msgid "reference to non-existent subpattern" msgstr "ბმა არარსებულ ქვეშაბლონთან" -#: glib/gregex.c:370 +#: glib/gregex.c:617 msgid "missing ) after comment" msgstr "კომენტარის შემდეგ ) აკლია" -#: glib/gregex.c:373 +#: glib/gregex.c:621 msgid "regular expression is too large" msgstr "რეგულარული გამოსახულება ძალიან გრძელია" -#: glib/gregex.c:376 -msgid "failed to get memory" -msgstr "მეხსიერებს მიღება შეუძლეებლია" - -#: glib/gregex.c:380 -msgid ") without opening (" -msgstr "" - -#: glib/gregex.c:384 -msgid "code overflow" -msgstr "" - -#: glib/gregex.c:388 -msgid "unrecognized character after (?<" -msgstr "(?< ის შემდეგ უცნობი სიმბოლოა" +#: glib/gregex.c:625 +msgid "malformed number or name after (?(" +msgstr "(?(-ის შემდეგ არასწორი რიცხვი ან სახელია" -#: glib/gregex.c:391 +#: glib/gregex.c:629 msgid "lookbehind assertion is not fixed length" msgstr "lookbehind assertion is not fixed length" -#: glib/gregex.c:394 -msgid "malformed number or name after (?(" -msgstr "(?(-ის შემდეგ არასწორი რიცხვი ან სახელია" - -#: glib/gregex.c:397 +#: glib/gregex.c:633 msgid "conditional group contains more than two branches" msgstr "პირობითი ჯგუფი ორ ბრენჩზე მეტს შეიცავს" -#: glib/gregex.c:400 +#: glib/gregex.c:637 msgid "assertion expected after (?(" msgstr "assertion expected after (?(" -#. translators: '(?R' and '(?+-digits' are both meant as (groups of) -#. * sequences here, '(?-54' would be an example for the second group. -#. -#: glib/gregex.c:407 -msgid "(?R or (?+-digits must be followed by )" -msgstr "(?R or (?+-digits must be followed by )" +#: glib/gregex.c:641 +msgid "a numbered reference must not be zero" +msgstr "" -#: glib/gregex.c:410 +#: glib/gregex.c:645 msgid "unknown POSIX class name" msgstr "posix-ის უცნობი კლასის სახელი" -#: glib/gregex.c:413 -msgid "POSIX collating elements are not supported" -msgstr "POSIX-ის გადაფარვადი ელემენტები მხარდაუჭერელია" - -#: glib/gregex.c:416 +#: glib/gregex.c:650 msgid "character value in \\x{...} sequence is too large" msgstr "character value in \\x{...} sequence is too large" -#: glib/gregex.c:419 -msgid "invalid condition (?(0)" -msgstr "არასწორი პირობა (?(0)" - -#: glib/gregex.c:422 +#: glib/gregex.c:654 msgid "\\C not allowed in lookbehind assertion" msgstr "\\C not allowed in lookbehind assertion" -#: glib/gregex.c:429 -msgid "escapes \\L, \\l, \\N{name}, \\U, and \\u are not supported" -msgstr "" - -#: glib/gregex.c:432 -msgid "recursive call could loop indefinitely" -msgstr "რეკურსიული გამოძახება შეიძლება უსასრულოდ გაგრძელდეს" - -#: glib/gregex.c:436 -msgid "unrecognized character after (?P" -msgstr "უცნობი სიმბოლო (?P-ის შემდეგ" - -#: glib/gregex.c:439 +#: glib/gregex.c:658 msgid "missing terminator in subpattern name" msgstr "" -#: glib/gregex.c:442 +#: glib/gregex.c:662 msgid "two named subpatterns have the same name" msgstr "ორ სხვადასხვა ქვეშაბლონს ერთი და იგივე სახელი აქვთ" -#: glib/gregex.c:445 +#: glib/gregex.c:666 msgid "malformed \\P or \\p sequence" msgstr "არასწორი \\P ან \\p მიმდევრობა" -#: glib/gregex.c:448 +#: glib/gregex.c:670 msgid "unknown property name after \\P or \\p" msgstr "უცნობი თვისების სახელი \\P-ის ან \\p-ის შემდეგ" -#: glib/gregex.c:451 +#: glib/gregex.c:674 msgid "subpattern name is too long (maximum 32 characters)" msgstr "ქვეშაბლონის სახელი ძალიან გრძელია (მაქს 32 სიმბოლო)" -#: glib/gregex.c:454 +#: glib/gregex.c:678 msgid "too many named subpatterns (maximum 10,000)" msgstr "" -#: glib/gregex.c:457 +#: glib/gregex.c:682 msgid "octal value is greater than \\377" msgstr "" -#: glib/gregex.c:461 -msgid "overran compiling workspace" -msgstr "" - -#: glib/gregex.c:465 -msgid "previously-checked referenced subpattern not found" -msgstr "" - -#: glib/gregex.c:468 +#: glib/gregex.c:686 msgid "DEFINE group contains more than one branch" msgstr "" -#: glib/gregex.c:471 +#: glib/gregex.c:690 msgid "inconsistent NEWLINE options" msgstr "" -#: glib/gregex.c:474 +#: glib/gregex.c:694 msgid "" "\\g is not followed by a braced, angle-bracketed, or quoted name or number, " "or by a plain number" msgstr "" -#: glib/gregex.c:478 -msgid "a numbered reference must not be zero" -msgstr "" - -#: glib/gregex.c:481 +#: glib/gregex.c:699 msgid "an argument is not allowed for (*ACCEPT), (*FAIL), or (*COMMIT)" msgstr "" -#: glib/gregex.c:484 +#: glib/gregex.c:703 msgid "(*VERB) not recognized" msgstr "(*VERB) უცნობია" -#: glib/gregex.c:487 +#: glib/gregex.c:707 msgid "number is too big" msgstr "რიცხვი ძალიან დიდია" -#: glib/gregex.c:490 +#: glib/gregex.c:711 msgid "missing subpattern name after (?&" msgstr "" -#: glib/gregex.c:493 -msgid "digit expected after (?+" -msgstr "(?+ -ის შემდეგ მოველოდი ციფრს" - -#: glib/gregex.c:496 -msgid " is an invalid data character in JavaScript compatibility mode" -msgstr "" - -#: glib/gregex.c:499 +#: glib/gregex.c:715 msgid "different names for subpatterns of the same number are not allowed" msgstr "" -#: glib/gregex.c:502 +#: glib/gregex.c:719 msgid "(*MARK) must have an argument" msgstr "" -#: glib/gregex.c:505 +#: glib/gregex.c:723 msgid "\\c must be followed by an ASCII character" msgstr "" -#: glib/gregex.c:508 +#: glib/gregex.c:727 msgid "\\k is not followed by a braced, angle-bracketed, or quoted name" msgstr "" -#: glib/gregex.c:511 +#: glib/gregex.c:731 msgid "\\N is not supported in a class" msgstr "კლასში \\N მხარდაუჭერელია" -#: glib/gregex.c:514 -msgid "too many forward references" -msgstr "" - -#: glib/gregex.c:517 +#: glib/gregex.c:735 msgid "name is too long in (*MARK), (*PRUNE), (*SKIP), or (*THEN)" msgstr "სახელი ძალიან გრძელია (*MARK), (*PRUNE), (*SKIP) ან (*THEN)" -#: glib/gregex.c:520 -msgid "character value in \\u.... sequence is too large" +#: glib/gregex.c:739 glib/gregex.c:875 +msgid "code overflow" msgstr "" -#: glib/gregex.c:743 glib/gregex.c:1988 +#: glib/gregex.c:743 +msgid "unrecognized character after (?P" +msgstr "უცნობი სიმბოლო (?P-ის შემდეგ" + +#: glib/gregex.c:747 +msgid "overran compiling workspace" +msgstr "" + +#: glib/gregex.c:751 +msgid "previously-checked referenced subpattern not found" +msgstr "" + +#: glib/gregex.c:874 glib/gregex.c:1121 glib/gregex.c:2444 #, c-format msgid "Error while matching regular expression %s: %s" msgstr "დაიშვა შეცდომა სტანდარტული გამოსახულების %s დამთხვევის ძიების დროს: %s" -#: glib/gregex.c:1321 +#: glib/gregex.c:1721 msgid "PCRE library is compiled without UTF8 support" msgstr "ბიბლიოთეკა PCRE-ს არ გააჩნია UTF8-ის მხარდაჭერა" -#: glib/gregex.c:1325 -msgid "PCRE library is compiled without UTF8 properties support" -msgstr "" -"PCRE ბიბლიოთეკა კომპილირებულია UTF8 კოდირების პარამეტრების მხარდაჭერის გარეშე" - -#: glib/gregex.c:1333 +#: glib/gregex.c:1729 msgid "PCRE library is compiled with incompatible options" msgstr "PCRE ბიბლიოთეკა კომპილირებულია შეუთავსებელი პარამეტრებით" -#: glib/gregex.c:1362 +#: glib/gregex.c:1847 #, c-format -msgid "Error while optimizing regular expression %s: %s" -msgstr "შეცდომა სტანდარტული გამოსახულების ოპტიმიზირებისას %s: %s" - -#: glib/gregex.c:1442 -#, c-format -msgid "Error while compiling regular expression %s at char %d: %s" +msgid "Error while compiling regular expression ‘%s’ at char %s: %s" msgstr "" -"შეცდომა სტანდარტული გამოსახულება %s-ის კომპილირებისას, სიმბოლო ნომრით %d: %s" +"შეცდომა რეგულარული გამოსახულება %s-ის კომპილირებისას, სიმბოლოსთან %s: %s" -#: glib/gregex.c:2427 +#: glib/gregex.c:2887 msgid "hexadecimal digit or “}” expected" msgstr "მოსალოდნელია თექვსმეტობითი რიცხვი, ან '}'" -#: glib/gregex.c:2443 +#: glib/gregex.c:2903 msgid "hexadecimal digit expected" msgstr "მოსალოდნელია თექვსმეტობითი სიმბოლო" -#: glib/gregex.c:2483 +#: glib/gregex.c:2943 msgid "missing “<” in symbolic reference" msgstr "არ მოიძებნა '<', სიმბოლურ მითითებაში" -#: glib/gregex.c:2492 +#: glib/gregex.c:2952 msgid "unfinished symbolic reference" msgstr "დაუსრულებელი სიმბოლური მითითება" -#: glib/gregex.c:2499 +#: glib/gregex.c:2959 msgid "zero-length symbolic reference" msgstr "ნულოვანი სიგრძის სიმბოლური მითითება" -#: glib/gregex.c:2510 +#: glib/gregex.c:2970 msgid "digit expected" msgstr "მოველოდი ციფრს" -#: glib/gregex.c:2528 +#: glib/gregex.c:2988 msgid "illegal symbolic reference" msgstr "მიუღებელი სიმბოლური მითითება" -#: glib/gregex.c:2591 +#: glib/gregex.c:3051 msgid "stray final “\\”" -msgstr "" +msgstr "დაბოლოვება '\\'" -#: glib/gregex.c:2595 +#: glib/gregex.c:3055 msgid "unknown escape sequence" msgstr "უცნობი escape სეკვენცია" -#: glib/gregex.c:2605 +#: glib/gregex.c:3065 #, c-format msgid "Error while parsing replacement text “%s” at char %lu: %s" msgstr "" +"შეცდომა ჩასანაცვლებელი ტექსტის \"%s\" განაალიზებისას, სიმბოლო ნომრით %lu: %s" -#: glib/gshell.c:96 +#: glib/gshell.c:98 msgid "Quoted text doesn’t begin with a quotation mark" msgstr "ციტირებული ტექსტი ბრჭყალებით არ იწყება" -#: glib/gshell.c:186 +#: glib/gshell.c:188 msgid "Unmatched quotation mark in command line or other shell-quoted text" msgstr "უმართებლო ბრჭყალი ბრძანებაში ან სხვა ტექსტურ გარსში" -#: glib/gshell.c:592 +#: glib/gshell.c:594 #, c-format msgid "Text ended just after a “\\” character. (The text was “%s”)" msgstr "ტექსტი დასრულდა უშუალოდ \"\\\" სიმბოლოს შემდეგ. (ტექსტი - \"%s\")" -#: glib/gshell.c:599 +#: glib/gshell.c:601 #, c-format msgid "Text ended before matching quote was found for %c. (The text was “%s”)" msgstr "ტექსტი დასრულდა %c შესაბამისი ბრჭყალის წინ. (ტექსტი - \"%s\")" -#: glib/gshell.c:611 +#: glib/gshell.c:613 msgid "Text was empty (or contained only whitespace)" msgstr "ტექსტი ცარიელი იყო (ან მხოლოდ ხარეებს შეიცავდა)" -#: glib/gspawn.c:310 +#: glib/gspawn.c:319 #, c-format msgid "Failed to read data from child process (%s)" msgstr "მონაცემთა წაკითხვა ქვეპროცესიდან ვერ მოხერხდა (%s)" -#: glib/gspawn.c:462 +#: glib/gspawn.c:471 #, c-format msgid "Unexpected error in reading data from a child process (%s)" msgstr "შვილეული პროცესიდან (%s) მონაცემების წაკითხვის შეცდომა" -#: glib/gspawn.c:547 +#: glib/gspawn.c:556 #, c-format msgid "Unexpected error in waitpid() (%s)" msgstr "მოულოდნელი შეცდომა ფუნქციაში waitpid() (%s)" -#: glib/gspawn.c:1175 glib/gspawn-win32.c:1438 +#: glib/gspawn.c:1175 glib/gspawn-win32.c:1503 #, c-format msgid "Child process exited with code %ld" msgstr "" @@ -5633,101 +5586,106 @@ msgid "Child process exited abnormally" msgstr "" -#: glib/gspawn.c:1890 glib/gspawn-win32.c:353 glib/gspawn-win32.c:361 +#: glib/gspawn.c:2027 glib/gspawn-win32.c:393 glib/gspawn-win32.c:401 #, c-format msgid "Failed to read from child pipe (%s)" msgstr "მონაცემთა წაკითხვა ქვეპროცესის არხიდან ვერ მოხერხდა (%s)" -#: glib/gspawn.c:2253 +#: glib/gspawn.c:2399 #, c-format msgid "Failed to spawn child process “%s” (%s)" msgstr "ქვეპროცესის (%s) განტოტვის შეცდომა (%s)" -#: glib/gspawn.c:2370 +#: glib/gspawn.c:2525 #, c-format msgid "Failed to fork (%s)" -msgstr "პროცესის განტოტვის შეცდომა (%s)" +msgstr "განტოტების შეცდომა (%s)" -#: glib/gspawn.c:2530 glib/gspawn-win32.c:384 +#: glib/gspawn.c:2685 glib/gspawn-win32.c:424 #, c-format msgid "Failed to change to directory “%s” (%s)" msgstr "საქაღალდის ცვლილების შეცდომა \"%s\" (%s)" -#: glib/gspawn.c:2540 +#: glib/gspawn.c:2695 #, c-format msgid "Failed to execute child process “%s” (%s)" msgstr "შვილობილი პროცესის %s გაშვების შეცდომა %s" -#: glib/gspawn.c:2550 +#: glib/gspawn.c:2705 #, c-format msgid "Failed to open file to remap file descriptor (%s)" msgstr "დესკრიპტორისთვის ფაილის გადამაგრების შეცდომა (%s)" -#: glib/gspawn.c:2558 +#: glib/gspawn.c:2713 #, c-format msgid "Failed to duplicate file descriptor for child process (%s)" msgstr "შვილეული პროცესისთვის (%s) ფაილის დესკრიპტორის დუბლირების შეცდომა" -#: glib/gspawn.c:2567 +#: glib/gspawn.c:2722 #, c-format msgid "Failed to fork child process (%s)" msgstr "დამხმარე პროცესის გაშვების შეცდომა (%s)" -#: glib/gspawn.c:2575 +#: glib/gspawn.c:2730 #, c-format msgid "Failed to close file descriptor for child process (%s)" msgstr "შვილეული პროცესის (%s) ფაილის დესკრიპტორის დახურვის შეცდომა" -#: glib/gspawn.c:2583 +#: glib/gspawn.c:2738 #, c-format msgid "Unknown error executing child process “%s”" msgstr "შეცდომა შვილეული პროცესის (%s) შესრულებისას" -#: glib/gspawn.c:2607 +#: glib/gspawn.c:2762 #, c-format msgid "Failed to read enough data from child pid pipe (%s)" msgstr "ქვეპროცესის არხიდან საკმარის მონაცემთა წაკითხვა ვერ მოხერხდა (%s)" -#: glib/gspawn-win32.c:297 +#: glib/gspawn-private.h:134 +#, c-format +msgid "Invalid source FDs argument" +msgstr "წყაროს FD-ების არასწორი არგუმენტი" + +#: glib/gspawn-win32.c:337 msgid "Failed to read data from child process" msgstr "მონაცემთა წაკითხვა ქვეპროცესიდან ვერ მოხერხდა" -#: glib/gspawn-win32.c:390 glib/gspawn-win32.c:395 glib/gspawn-win32.c:521 +#: glib/gspawn-win32.c:430 glib/gspawn-win32.c:435 glib/gspawn-win32.c:561 #, c-format msgid "Failed to execute child process (%s)" msgstr "ქვეპროცესის გამოყენება ვერ მოხერხდა (%s)" -#: glib/gspawn-win32.c:400 +#: glib/gspawn-win32.c:440 #, c-format msgid "Failed to dup() in child process (%s)" msgstr "ქვეპროცესში dup()-ის შეცდომა (%s)" -#: glib/gspawn-win32.c:471 +#: glib/gspawn-win32.c:511 #, c-format msgid "Invalid program name: %s" msgstr "პროგრამის მცდარი სახელი: %s" -#: glib/gspawn-win32.c:481 glib/gspawn-win32.c:807 +#: glib/gspawn-win32.c:521 glib/gspawn-win32.c:868 #, c-format msgid "Invalid string in argument vector at %d: %s" msgstr "მცდარი სტრიქონი არგუმენტის ვექტორში - %d: %s" -#: glib/gspawn-win32.c:492 glib/gspawn-win32.c:823 +#: glib/gspawn-win32.c:532 glib/gspawn-win32.c:884 #, c-format msgid "Invalid string in environment: %s" msgstr "მცდარი სტრიქონი გარემოში: %s" -#: glib/gspawn-win32.c:803 +#: glib/gspawn-win32.c:864 #, c-format msgid "Invalid working directory: %s" msgstr "უმართებლო სამუშაო დასტა: %s" -#: glib/gspawn-win32.c:868 +#: glib/gspawn-win32.c:929 #, c-format msgid "Failed to execute helper program (%s)" msgstr "დახმარების პროგრამის (%s) გამოყენება ვერ მოხერხდა" -#: glib/gspawn-win32.c:1096 +#: glib/gspawn-win32.c:1158 msgid "" "Unexpected error in g_io_channel_win32_poll() reading data from a child " "process" @@ -5735,303 +5693,312 @@ "მოულოდნელი შეცდომა ფუნქციაში g_io_channel_win32_poll() ქვეპროცესიდან " "მონაცემთა წაკითხვისას" -#: glib/gstrfuncs.c:3351 glib/gstrfuncs.c:3453 +#: glib/gstrfuncs.c:3370 glib/gstrfuncs.c:3472 msgid "Empty string is not a number" msgstr "" -#: glib/gstrfuncs.c:3375 +#: glib/gstrfuncs.c:3394 #, c-format msgid "“%s” is not a signed number" msgstr "" -#: glib/gstrfuncs.c:3385 glib/gstrfuncs.c:3489 +#: glib/gstrfuncs.c:3404 glib/gstrfuncs.c:3508 #, c-format msgid "Number “%s” is out of bounds %s, %s" msgstr "" -#: glib/gstrfuncs.c:3479 +#: glib/gstrfuncs.c:3498 #, c-format msgid "“%s” is not an unsigned number" msgstr "" -#: glib/guri.c:315 +#: glib/guri.c:317 #, no-c-format msgid "Invalid %-encoding in URI" msgstr "" -#: glib/guri.c:332 +#: glib/guri.c:334 msgid "Illegal character in URI" msgstr "" -#: glib/guri.c:366 +#: glib/guri.c:368 msgid "Non-UTF-8 characters in URI" msgstr "" -#: glib/guri.c:546 +#: glib/guri.c:548 #, c-format msgid "Invalid IPv6 address ‘%.*s’ in URI" msgstr "" -#: glib/guri.c:601 +#: glib/guri.c:603 #, c-format msgid "Illegal encoded IP address ‘%.*s’ in URI" msgstr "" -#: glib/guri.c:613 +#: glib/guri.c:615 #, c-format msgid "Illegal internationalized hostname ‘%.*s’ in URI" msgstr "" -#: glib/guri.c:645 glib/guri.c:657 +#: glib/guri.c:647 glib/guri.c:659 #, c-format msgid "Could not parse port ‘%.*s’ in URI" msgstr "" -#: glib/guri.c:664 +#: glib/guri.c:666 #, c-format msgid "Port ‘%.*s’ in URI is out of range" msgstr "" -#: glib/guri.c:1224 glib/guri.c:1288 +#: glib/guri.c:1226 glib/guri.c:1290 #, c-format msgid "URI ‘%s’ is not an absolute URI" msgstr "URI \"%s\" აბსოლუტური იდენტიფიკატორი არ გახლავთ" -#: glib/guri.c:1230 +#: glib/guri.c:1232 #, c-format msgid "URI ‘%s’ has no host component" msgstr "" -#: glib/guri.c:1460 +#: glib/guri.c:1462 msgid "URI is not absolute, and no base URI was provided" msgstr "" -#: glib/guri.c:2238 +#: glib/guri.c:2248 msgid "Missing ‘=’ and parameter value" msgstr "" -#: glib/gutf8.c:832 +#: glib/gutf8.c:834 msgid "Failed to allocate memory" msgstr "მეხსიერების გამოყოფის შეცდომა" -#: glib/gutf8.c:965 +#: glib/gutf8.c:967 msgid "Character out of range for UTF-8" msgstr "სიმბოლო UTF-8 რანგს გარეთაა" -#: glib/gutf8.c:1067 glib/gutf8.c:1076 glib/gutf8.c:1206 glib/gutf8.c:1215 -#: glib/gutf8.c:1354 glib/gutf8.c:1451 +#: glib/gutf8.c:1069 glib/gutf8.c:1078 glib/gutf8.c:1208 glib/gutf8.c:1217 +#: glib/gutf8.c:1356 glib/gutf8.c:1453 msgid "Invalid sequence in conversion input" msgstr "შეტანის ტექსტის გარდაქმნის მცდარი მიმდევრობა" -#: glib/gutf8.c:1365 glib/gutf8.c:1462 +#: glib/gutf8.c:1367 glib/gutf8.c:1464 msgid "Character out of range for UTF-16" msgstr "სიმბოლო UTF-16 რანგს გარეთაა" -#. Translators: Keep the no-break space between %.1f and the unit symbol -#: glib/gutils.c:2849 -#, c-format -msgid "%.1f kB" -msgstr "%.1f კბ" - -#. Translators: Keep the no-break space between %.1f and the unit symbol -#: glib/gutils.c:2851 -#, c-format -msgid "%.1f MB" -msgstr "%.1f მბ" - -#. Translators: Keep the no-break space between %.1f and the unit symbol -#: glib/gutils.c:2853 -#, c-format -msgid "%.1f GB" -msgstr "%.1f გბ" - -#. Translators: Keep the no-break space between %.1f and the unit symbol -#: glib/gutils.c:2855 -#, c-format -msgid "%.1f TB" -msgstr "%.1f ტბ" - -#. Translators: Keep the no-break space between %.1f and the unit symbol -#: glib/gutils.c:2857 -#, c-format -msgid "%.1f PB" -msgstr "%.1f პბ" - -#. Translators: Keep the no-break space between %.1f and the unit symbol -#: glib/gutils.c:2859 -#, c-format -msgid "%.1f EB" -msgstr "%.1f ებ" - -#. Translators: Keep the no-break space between %.1f and the unit symbol -#: glib/gutils.c:2863 -#, c-format -msgid "%.1f KiB" -msgstr "%.1f კიბ" - -#. Translators: Keep the no-break space between %.1f and the unit symbol -#: glib/gutils.c:2865 -#, c-format -msgid "%.1f MiB" -msgstr "%.1f მიბ" - -#. Translators: Keep the no-break space between %.1f and the unit symbol -#: glib/gutils.c:2867 -#, c-format -msgid "%.1f GiB" -msgstr "%.1f გიბ" - -#. Translators: Keep the no-break space between %.1f and the unit symbol -#: glib/gutils.c:2869 -#, c-format -msgid "%.1f TiB" -msgstr "%.1f ტიბ" - -#. Translators: Keep the no-break space between %.1f and the unit symbol -#: glib/gutils.c:2871 -#, c-format -msgid "%.1f PiB" -msgstr "%.1f პიბ" - -#. Translators: Keep the no-break space between %.1f and the unit symbol -#: glib/gutils.c:2873 -#, c-format -msgid "%.1f EiB" -msgstr "%.1f ეიბ" - -#. Translators: Keep the no-break space between %.1f and the unit symbol -#: glib/gutils.c:2877 -#, c-format -msgid "%.1f kb" -msgstr "%.1f კბ" - -#. Translators: Keep the no-break space between %.1f and the unit symbol -#: glib/gutils.c:2879 -#, c-format -msgid "%.1f Mb" -msgstr "%.1f მბ" - -#. Translators: Keep the no-break space between %.1f and the unit symbol -#: glib/gutils.c:2881 -#, c-format -msgid "%.1f Gb" -msgstr "%.1f გბ" - -#. Translators: Keep the no-break space between %.1f and the unit symbol -#: glib/gutils.c:2883 -#, c-format -msgid "%.1f Tb" -msgstr "%.1f ტბ" - -#. Translators: Keep the no-break space between %.1f and the unit symbol -#: glib/gutils.c:2885 -#, c-format -msgid "%.1f Pb" -msgstr "%.1f პბ" - -#. Translators: Keep the no-break space between %.1f and the unit symbol -#: glib/gutils.c:2887 -#, c-format -msgid "%.1f Eb" -msgstr "%.1f ებ" - -#. Translators: Keep the no-break space between %.1f and the unit symbol -#: glib/gutils.c:2891 -#, c-format -msgid "%.1f Kib" -msgstr "%.1f Kკიბ" - -#. Translators: Keep the no-break space between %.1f and the unit symbol -#: glib/gutils.c:2893 -#, c-format -msgid "%.1f Mib" -msgstr "%.1f მიბ" - -#. Translators: Keep the no-break space between %.1f and the unit symbol -#: glib/gutils.c:2895 -#, c-format -msgid "%.1f Gib" -msgstr "%.1f გიბ" - -#. Translators: Keep the no-break space between %.1f and the unit symbol -#: glib/gutils.c:2897 -#, c-format -msgid "%.1f Tib" -msgstr "%.1f ტიბ" - -#. Translators: Keep the no-break space between %.1f and the unit symbol -#: glib/gutils.c:2899 -#, c-format -msgid "%.1f Pib" -msgstr "%.1f პიბ" - -#. Translators: Keep the no-break space between %.1f and the unit symbol -#: glib/gutils.c:2901 -#, c-format -msgid "%.1f Eib" -msgstr "%.1f ეიბ" - -#: glib/gutils.c:2935 glib/gutils.c:3052 -#, c-format -msgid "%u byte" -msgid_plural "%u bytes" -msgstr0 "%u ბაიტი" -msgstr1 "%u ბაიტი" - -#: glib/gutils.c:2939 -#, c-format -msgid "%u bit" -msgid_plural "%u bits" -msgstr0 "%u ბიტი" -msgstr1 "%u ბიტი" +#. Translators: A unit symbol for size formatting, showing for example: "13.0 kB" +#: glib/gutils.c:2966 +msgid "kB" +msgstr "კბ" + +#. Translators: A unit symbol for size formatting, showing for example: "13.0 MB" +#: glib/gutils.c:2968 +msgid "MB" +msgstr "მბ" + +#. Translators: A unit symbol for size formatting, showing for example: "13.0 GB" +#: glib/gutils.c:2970 +msgid "GB" +msgstr "გბ" + +#. Translators: A unit symbol for size formatting, showing for example: "13.0 TB" +#: glib/gutils.c:2972 +msgid "TB" +msgstr "ტბ" + +#. Translators: A unit symbol for size formatting, showing for example: "13.0 PB" +#: glib/gutils.c:2974 +msgid "PB" +msgstr "პბ" + +#. Translators: A unit symbol for size formatting, showing for example: "13.0 EB" +#: glib/gutils.c:2976 +msgid "EB" +msgstr "ებ" + +#. Translators: A unit symbol for size formatting, showing for example: "13.0 KiB" +#: glib/gutils.c:2980 +msgid "KiB" +msgstr "კიბ" + +#. Translators: A unit symbol for size formatting, showing for example: "13.0 MiB" +#: glib/gutils.c:2982 +msgid "MiB" +msgstr "მიბ" + +#. Translators: A unit symbol for size formatting, showing for example: "13.0 GiB" +#: glib/gutils.c:2984 +msgid "GiB" +msgstr "გიბ" + +#. Translators: A unit symbol for size formatting, showing for example: "13.0 TiB" +#: glib/gutils.c:2986 +msgid "TiB" +msgstr "ტიბ" + +#. Translators: A unit symbol for size formatting, showing for example: "13.0 PiB" +#: glib/gutils.c:2988 +msgid "PiB" +msgstr "პიბ" + +#. Translators: A unit symbol for size formatting, showing for example: "13.0 EiB" +#: glib/gutils.c:2990 +msgid "EiB" +msgstr "EiB" + +#. Translators: A unit symbol for size formatting, showing for example: "13.0 kb" +#: glib/gutils.c:2994 +msgid "kb" +msgstr "კბ" + +#. Translators: A unit symbol for size formatting, showing for example: "13.0 Mb" +#: glib/gutils.c:2996 +msgid "Mb" +msgstr "მბ" + +#. Translators: A unit symbol for size formatting, showing for example: "13.0 Gb" +#: glib/gutils.c:2998 +msgid "Gb" +msgstr "გბ" + +#. Translators: A unit symbol for size formatting, showing for example: "13.0 Tb" +#: glib/gutils.c:3000 +msgid "Tb" +msgstr "ტბ" + +#. Translators: A unit symbol for size formatting, showing for example: "13.0 Pb" +#: glib/gutils.c:3002 +msgid "Pb" +msgstr "პბ" + +#. Translators: A unit symbol for size formatting, showing for example: "13.0 Eb" +#: glib/gutils.c:3004 +msgid "Eb" +msgstr "ებ" + +#. Translators: A unit symbol for size formatting, showing for example: "13.0 Kib" +#: glib/gutils.c:3008 +msgid "Kib" +msgstr "კიბ" + +#. Translators: A unit symbol for size formatting, showing for example: "13.0 Mib" +#: glib/gutils.c:3010 +msgid "Mib" +msgstr "მიბ" + +#. Translators: A unit symbol for size formatting, showing for example: "13.0 Gib" +#: glib/gutils.c:3012 +msgid "Gib" +msgstr "გიბ" + +#. Translators: A unit symbol for size formatting, showing for example: "13.0 Tib" +#: glib/gutils.c:3014 +msgid "Tib" +msgstr "ტიბ" + +#. Translators: A unit symbol for size formatting, showing for example: "13.0 Pib" +#: glib/gutils.c:3016 +msgid "Pib" +msgstr "პიბ" + +#. Translators: A unit symbol for size formatting, showing for example: "13.0 Eib" +#: glib/gutils.c:3018 +msgid "Eib" +msgstr "ეიბ" + +#: glib/gutils.c:3056 +msgid "byte" +msgid_plural "bytes" +msgstr0 "ბაიტი" + +#: glib/gutils.c:3060 +msgid "bit" +msgid_plural "bits" +msgstr0 "ბიტი" + +#. Translators: The "%u" is replaced with the size value, like "13"; it could +#. * be part of "13 bytes", but only the number is requested this time. +#: glib/gutils.c:3068 +#, c-format +msgctxt "format-size" +msgid "%u" +msgstr "%u" + +#. Translators: The first "%u" is replaced with the value, the "%s" with a unit of the value. +#. * The order can be changed with "%$2s %$1u". An example: "13 bytes" +#: glib/gutils.c:3073 +#, c-format +msgctxt "format-size" +msgid "%u %s" +msgstr "%u %s" + +#. Translators: The "%.1f" is replaced with the size value, like "13.0"; it could +#. * be part of "13.0 MB", but only the number is requested this time. +#: glib/gutils.c:3109 +#, c-format +msgctxt "format-size" +msgid "%.1f" +msgstr "%.1f" + +#. Translators: The first "%.1f" is replaced with the value, the "%s" with a unit of the value. +#. * The order can be changed with "%$2s %$1.1f". Keep the no-break space between the value and +#. * the unit symbol. An example: "13.0 MB" +#: glib/gutils.c:3115 +#, c-format +msgctxt "format-size" +msgid "%.1f %s" +msgstr "%.1f %s" #. Translators: the %s in "%s bytes" will always be replaced by a number. -#: glib/gutils.c:3006 +#: glib/gutils.c:3155 #, c-format msgid "%s byte" msgid_plural "%s bytes" msgstr0 "%s ბაიტი" -msgstr1 "%s ბაიტი" #. Translators: the %s in "%s bits" will always be replaced by a number. -#: glib/gutils.c:3011 +#: glib/gutils.c:3160 #, c-format msgid "%s bit" msgid_plural "%s bits" msgstr0 "%s ბიტი" -msgstr1 "%s ბიტი" + +#: glib/gutils.c:3201 +#, c-format +msgid "%u byte" +msgid_plural "%u bytes" +msgstr0 "%u ბაიტი" #. 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:3065 +#: glib/gutils.c:3214 #, c-format msgid "%.1f KB" msgstr "%.1f კბ" -#: glib/gutils.c:3070 +#: glib/gutils.c:3219 #, c-format msgid "%.1f MB" msgstr "%.1f მბ" -#: glib/gutils.c:3075 +#: glib/gutils.c:3224 #, c-format msgid "%.1f GB" msgstr "%.1f გბ" -#: glib/gutils.c:3080 +#: glib/gutils.c:3229 #, c-format msgid "%.1f TB" msgstr "%.1f ტბ" -#: glib/gutils.c:3085 +#: glib/gutils.c:3234 #, c-format msgid "%.1f PB" msgstr "%.1f პბ" -#: glib/gutils.c:3090 +#: glib/gutils.c:3239 #, c-format msgid "%.1f EB" msgstr "%.1f ებ"
View file
_service:tar_scm:glib-2.74.4.tar.xz/po/ko.po -> _service:tar_scm:glib-2.76.4.tar.xz/po/ko.po
Changed
@@ -4,7 +4,7 @@ # Young-Ho Cha <ganadist@chollian.net>, 2002. # Eunju Kim <eukim@redhat.com>, 2007. # Seong-ho Cho <darkcircle.0426@gmail.com>, 2011-2012. -# Changwoo Ryu <cwryu@debian.org>, 2002, 2004-2006, 2007-2011, 2013-2022. +# Changwoo Ryu <cwryu@debian.org>, 2002, 2004-2006, 2007-2011, 2013-2023. # # # 용어: @@ -16,8 +16,8 @@ msgstr "" "Project-Id-Version: glib\n" "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/glib/issues\n" -"POT-Creation-Date: 2022-08-05 19:22+0000\n" -"PO-Revision-Date: 2022-09-04 01:25+0900\n" +"POT-Creation-Date: 2023-02-15 16:30+0000\n" +"PO-Revision-Date: 2023-03-01 23:36+0900\n" "Last-Translator: Changwoo Ryu <cwryu@debian.org>\n" "Language-Team: GNOME Korea <gnome-kr@googlegroups.com>\n" "Language: ko\n" @@ -26,20 +26,20 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: gio/gappinfo.c:335 +#: gio/gappinfo.c:339 msgid "Setting default applications not supported yet" msgstr "기본 프로그램 설정은 아직 지원하지 않습니다" -#: gio/gappinfo.c:368 +#: gio/gappinfo.c:372 msgid "Setting application as last used for type not supported yet" msgstr "타입에 대해 최근 사용한 프로그램 설정은 아직 지원하지 않습니다" -#: gio/gappinfo.c:808 +#: gio/gappinfo.c:814 #, c-format msgid "Failed to find default application for content type ‘%s’" msgstr "내용 유형 ‘%s’에 대한 기본 프로그램을 찾는데 실패했습니다" -#: gio/gappinfo.c:868 +#: gio/gappinfo.c:874 #, c-format msgid "Failed to find default application for URI Scheme ‘%s’" msgstr "URI 스킴 ‘%s’에 대한 기본 프로그램을 찾는데 실패했습니다" @@ -237,11 +237,11 @@ msgid "error sending %s message to application: %s\n" msgstr "프로그램에 %s 메시지를 보내는 중 오류: %s\n" -#: gio/gapplication-tool.c:321 +#: gio/gapplication-tool.c:324 msgid "action name must be given after application id\n" msgstr "프로그램 ID 뒤에 동작 이름을 써야 합니다\n" -#: gio/gapplication-tool.c:329 +#: gio/gapplication-tool.c:332 #, c-format msgid "" "invalid action name: “%s”\n" @@ -250,25 +250,25 @@ "동작 이름이 잘못되었습니다: “%s”\n" "동작 이름은 알파벳, 숫자, “-”, “.”만 쓸 수 있습니다\n" -#: gio/gapplication-tool.c:348 +#: gio/gapplication-tool.c:351 #, c-format msgid "error parsing action parameter: %s\n" msgstr "동작 파라미터 해석 오류: %s\n" -#: gio/gapplication-tool.c:360 +#: gio/gapplication-tool.c:363 msgid "actions accept a maximum of one parameter\n" msgstr "최대 1개 인수를 받는 동작\n" -#: gio/gapplication-tool.c:415 +#: gio/gapplication-tool.c:418 msgid "list-actions command takes only the application id" msgstr "list-actions 명령은 프로그램 ID만 받습니다" -#: gio/gapplication-tool.c:425 +#: gio/gapplication-tool.c:428 #, c-format msgid "unable to find desktop file for application %s\n" msgstr "%s 프로그램에 대한 desktop 파일을 찾을 수 없습니다\n" -#: gio/gapplication-tool.c:470 +#: gio/gapplication-tool.c:473 #, c-format msgid "" "unrecognised command: %s\n" @@ -303,7 +303,7 @@ msgid "Truncate not supported on base stream" msgstr "기반 스트림에서 자르기를 지원하지 않습니다" -#: gio/gcancellable.c:319 gio/gdbusconnection.c:1859 gio/gdbusprivate.c:1420 +#: gio/gcancellable.c:326 gio/gdbusconnection.c:1859 gio/gdbusprivate.c:1420 #: gio/gsimpleasyncresult.c:873 gio/gsimpleasyncresult.c:899 #, c-format msgid "Operation was cancelled" @@ -323,13 +323,13 @@ #: gio/gcharsetconverter.c:344 gio/gdatainputstream.c:850 #: gio/gdatainputstream.c:1268 glib/gconvert.c:451 glib/gconvert.c:883 -#: glib/giochannel.c:1576 glib/giochannel.c:1618 glib/giochannel.c:2473 +#: glib/giochannel.c:1576 glib/giochannel.c:1618 glib/giochannel.c:2478 #: glib/gutf8.c:892 glib/gutf8.c:1346 msgid "Invalid byte sequence in conversion input" msgstr "변환 입력에서 잘못된 바이트 순서" #: gio/gcharsetconverter.c:349 glib/gconvert.c:459 glib/gconvert.c:797 -#: glib/giochannel.c:1583 glib/giochannel.c:2485 +#: glib/giochannel.c:1583 glib/giochannel.c:2493 #, c-format msgid "Error during conversion: %s" msgstr "변환 중 오류: %s" @@ -386,17 +386,17 @@ msgid "Unexpected early end-of-stream" msgstr "예기치 않게 일찍 스트림이 끝났습니다" -#: gio/gdbusaddress.c:164 gio/gdbusaddress.c:238 gio/gdbusaddress.c:327 +#: gio/gdbusaddress.c:162 gio/gdbusaddress.c:234 gio/gdbusaddress.c:321 #, c-format msgid "Unsupported key “%s” in address entry “%s”" msgstr "“%s” 키를 주소 항목 “%s”에서 지원하지 않습니다" -#: gio/gdbusaddress.c:177 +#: gio/gdbusaddress.c:175 #, c-format msgid "Meaningless key/value pair combination in address entry “%s”" msgstr "“%s” 주소 항목에서 의미 없는 키/값의 쌍" -#: gio/gdbusaddress.c:186 +#: gio/gdbusaddress.c:184 #, c-format msgid "" "Address “%s” is invalid (need exactly one of path, dir, tmpdir, or abstract " @@ -405,50 +405,50 @@ "“%s” 주소는 올바르지 않습니다 (정확히 1개의 경로, 폴더, 임시 폴더, 절대 키 " "중 하나가 필요합니다)" -#: gio/gdbusaddress.c:253 gio/gdbusaddress.c:264 gio/gdbusaddress.c:279 -#: gio/gdbusaddress.c:342 gio/gdbusaddress.c:353 +#: gio/gdbusaddress.c:249 gio/gdbusaddress.c:260 gio/gdbusaddress.c:275 +#: gio/gdbusaddress.c:336 gio/gdbusaddress.c:347 #, c-format msgid "Error in address “%s” — the “%s” attribute is malformed" msgstr "“%s” 주소에서 오류 — “%s” 속성의 형식이 잘못되었습니다" -#: gio/gdbusaddress.c:423 gio/gdbusaddress.c:682 +#: gio/gdbusaddress.c:417 gio/gdbusaddress.c:676 #, c-format msgid "Unknown or unsupported transport “%s” for address “%s”" msgstr "" "주소 “%2$s”에 대한 “%1$s” 트랜스포트는 알려지지 않았거나 지원하지 않습니다." -#: gio/gdbusaddress.c:467 +#: gio/gdbusaddress.c:461 #, c-format msgid "Address element “%s” does not contain a colon (:)" msgstr "주소 항목 “%s”에 콜론(:)이 없습니다" -#: gio/gdbusaddress.c:476 +#: gio/gdbusaddress.c:470 #, c-format msgid "Transport name in address element “%s” must not be empty" msgstr "주소 항목 “%s”에서 트랜스포트 이름이 비어 있으면 안 됩니다" -#: gio/gdbusaddress.c:497 +#: gio/gdbusaddress.c:491 #, c-format msgid "" "Key/Value pair %d, “%s”, in address element “%s” does not contain an equal " "sign" msgstr "키/값 쌍 %d번, “%s”에 (주소 항목 “%s”) 등호 기호가 없습니다" -#: gio/gdbusaddress.c:508 +#: gio/gdbusaddress.c:502 #, c-format msgid "" "Key/Value pair %d, “%s”, in address element “%s” must not have an empty key" msgstr "" "키/값 쌍 %d번, “%s”에 (주소 항목 “%s”) 비어 있는 키가 들어 있을 수 없습니다" -#: gio/gdbusaddress.c:522 +#: gio/gdbusaddress.c:516 #, c-format msgid "" "Error unescaping key or value in Key/Value pair %d, “%s”, in address element " "“%s”" msgstr "키/값 쌍 %d번, “%s”에 (주소 항목 “%s”) 키/값의 이스케이프 제거 오류" -#: gio/gdbusaddress.c:590 +#: gio/gdbusaddress.c:584 #, c-format msgid "" "Error in address “%s” — the unix transport requires exactly one of the keys " @@ -457,75 +457,75 @@ "“%s” 주소에서 오류 — unix 트랜스포트에서는 'path'나 'abstract' 키 중 하나를 " "설정해야 합니다." -#: gio/gdbusaddress.c:625 +#: gio/gdbusaddress.c:619 #, c-format msgid "Error in address “%s” — the host attribute is missing or malformed" msgstr "“%s” 주소에서 오류 — host 속성이 없거나 형식이 잘못되었습니다" -#: gio/gdbusaddress.c:639 +#: gio/gdbusaddress.c:633 #, c-format msgid "Error in address “%s” — the port attribute is missing or malformed" msgstr "“%s” 주소에서 오류 — port 속성이 없거나 형식이 잘못되었습니다" -#: gio/gdbusaddress.c:653 +#: gio/gdbusaddress.c:647 #, c-format msgid "Error in address “%s” — the noncefile attribute is missing or malformed" msgstr "“%s” 주소에서 오류 — noncefile 속성이 없거나 형식이 잘못되었습니다" -#: gio/gdbusaddress.c:674 +#: gio/gdbusaddress.c:668 msgid "Error auto-launching: " msgstr "자동 실행 오류: " -#: gio/gdbusaddress.c:727 +#: gio/gdbusaddress.c:721 #, c-format msgid "Error opening nonce file “%s”: %s" msgstr "“%s” nonce 파일을 여는 중 오류: %s" -#: gio/gdbusaddress.c:746 +#: gio/gdbusaddress.c:740 #, c-format msgid "Error reading from nonce file “%s”: %s" msgstr "“%s” nonce 파일을 읽는 중 오류: %s" -#: gio/gdbusaddress.c:755 +#: gio/gdbusaddress.c:749 #, c-format msgid "Error reading from nonce file “%s”, expected 16 bytes, got %d" msgstr "“%s” nonce 파일을 읽는 중 오류, 16바이트가 있어야 하지만 %d바이트" -#: gio/gdbusaddress.c:773 +#: gio/gdbusaddress.c:767 #, c-format msgid "Error writing contents of nonce file “%s” to stream:" msgstr "“%s” nonce 파일의 내용을 스트림에 쓰는 중 오류:" -#: gio/gdbusaddress.c:988 +#: gio/gdbusaddress.c:982 msgid "The given address is empty" msgstr "지정된 주소가 빈 문자열입니다" -#: gio/gdbusaddress.c:1101 +#: gio/gdbusaddress.c:1095 #, c-format msgid "Cannot spawn a message bus when AT_SECURE is set" msgstr "AT_SECURE가 설정되었을 때 메시지 버스를 시작할 수 없습니다:" -#: gio/gdbusaddress.c:1108 +#: gio/gdbusaddress.c:1102 msgid "Cannot spawn a message bus without a machine-id: " msgstr "machine-id 없이 메시지 버스를 시작할 수 없습니다: " -#: gio/gdbusaddress.c:1115 +#: gio/gdbusaddress.c:1109 #, c-format msgid "Cannot autolaunch D-Bus without X11 $DISPLAY" msgstr "X11 $DISPLAY 없이 D-Bus 자동 실행할 수 없습니다" -#: gio/gdbusaddress.c:1157 +#: gio/gdbusaddress.c:1151 #, c-format msgid "Error spawning command line “%s”: " msgstr "“%s” 명령을 시작하는데 오류: " -#: gio/gdbusaddress.c:1226 +#: gio/gdbusaddress.c:1220 #, c-format msgid "Cannot determine session bus address (not implemented for this OS)" msgstr "" "세션 버스 주소를 알아낼 수 없습니다 (이 운영체제에서는 구현되지 않았습니다)" -#: gio/gdbusaddress.c:1375 gio/gdbusconnection.c:7321 +#: gio/gdbusaddress.c:1374 gio/gdbusconnection.c:7316 #, c-format msgid "" "Cannot determine bus address from DBUS_STARTER_BUS_TYPE environment variable " @@ -534,7 +534,7 @@ "DBUS_STARTER_BUS_TYPE 환경 변수에서 세션 버스 주소를 알아낼 수 없습니다 — 알 " "수 없는 값 “%s”" -#: gio/gdbusaddress.c:1384 gio/gdbusconnection.c:7330 +#: gio/gdbusaddress.c:1383 gio/gdbusconnection.c:7325 msgid "" "Cannot determine bus address because the DBUS_STARTER_BUS_TYPE environment " "variable is not set" @@ -542,7 +542,7 @@ "DBUS_STARTER_BUS_TYPE 환경 변수를 설정하지 않았으므로 세션 버스 주소를 알아" "낼 수 없습니다" -#: gio/gdbusaddress.c:1394 +#: gio/gdbusaddress.c:1393 #, c-format msgid "Unknown bus type %d" msgstr "알 수 없는 버스 형식 (%d)" @@ -562,11 +562,15 @@ "Exhausted all available authentication mechanisms (tried: %s) (available: %s)" msgstr "사용 가능한 모든 인증 방법을 시도했습니다 (시도: %s) (사용 가능: %s)" -#: gio/gdbusauth.c:1178 +#: gio/gdbusauth.c:1045 +msgid "Unexpected lack of content trying to read a byte" +msgstr "한 바이트를 읽으려고 시도하는 중 예상치 못하게 읽을 내용이 부족합니다." + +#: gio/gdbusauth.c:1195 msgid "User IDs must be the same for peer and server" msgstr "상대와 서버의 사용자 아이디는 같아야 합니다" -#: gio/gdbusauth.c:1190 +#: gio/gdbusauth.c:1207 msgid "Cancelled via GDBusAuthObserver::authorize-authenticated-peer" msgstr "GDBusAuthObserver::authorize-authenticated-peer를 통해 취소됨" @@ -657,7 +661,7 @@ msgid "(Additionally, releasing the lock for “%s” also failed: %s) " msgstr "(추가로 “%s”에 대한 잠금 해제도 실패했습니다: %s)" -#: gio/gdbusconnection.c:590 gio/gdbusconnection.c:2404 +#: gio/gdbusconnection.c:590 gio/gdbusconnection.c:2405 msgid "The connection is closed" msgstr "연결이 닫혔습니다" @@ -665,115 +669,115 @@ msgid "Timeout was reached" msgstr "시간 제한을 넘었습니다" -#: gio/gdbusconnection.c:2527 +#: gio/gdbusconnection.c:2528 msgid "" "Unsupported flags encountered when constructing a client-side connection" msgstr "클라이언트 연결을 만드는 중 지원하지 않는 플래그가 있습니다" -#: gio/gdbusconnection.c:4256 gio/gdbusconnection.c:4610 +#: gio/gdbusconnection.c:4257 gio/gdbusconnection.c:4611 #, c-format msgid "" "No such interface “org.freedesktop.DBus.Properties” on object at path %s" msgstr "" "경로 %s의 객체에 “org.freedesktop.DBus.Properties” 인터페이스가 없습니다" -#: gio/gdbusconnection.c:4401 +#: gio/gdbusconnection.c:4402 #, c-format msgid "No such property “%s”" msgstr "“%s” 속성이 없습니다" -#: gio/gdbusconnection.c:4413 +#: gio/gdbusconnection.c:4414 #, c-format msgid "Property “%s” is not readable" msgstr "“%s” 속성을 읽을 수 없습니다" -#: gio/gdbusconnection.c:4424 +#: gio/gdbusconnection.c:4425 #, c-format msgid "Property “%s” is not writable" msgstr "“%s” 속성을 쓸 수 없습니다" -#: gio/gdbusconnection.c:4444 +#: gio/gdbusconnection.c:4445 #, c-format msgid "Error setting property “%s”: Expected type “%s” but got “%s”" msgstr "“%s” 속성 설정 오류: “%s” 형식이어야 하지만 “%s”입니다" -#: gio/gdbusconnection.c:4549 gio/gdbusconnection.c:4764 -#: gio/gdbusconnection.c:6747 +#: gio/gdbusconnection.c:4550 gio/gdbusconnection.c:4765 +#: gio/gdbusconnection.c:6742 #, c-format msgid "No such interface “%s”" msgstr "“%s” 인터페이스가 없습니다" -#: gio/gdbusconnection.c:4986 gio/gdbusconnection.c:7261 +#: gio/gdbusconnection.c:4981 gio/gdbusconnection.c:7256 #, c-format msgid "No such interface “%s” on object at path %s" msgstr "경로 “%2$s”의 객체에 “%1$s” 인터페이스가 없습니다" -#: gio/gdbusconnection.c:5087 +#: gio/gdbusconnection.c:5082 #, c-format msgid "No such method “%s”" msgstr "“%s” 키가 없습니다" -#: gio/gdbusconnection.c:5118 +#: gio/gdbusconnection.c:5113 #, c-format msgid "Type of message, “%s”, does not match expected type “%s”" msgstr "메시지 형식이(“%s”) 예상한 “%s” 형식에 맞지 않습니다." -#: gio/gdbusconnection.c:5321 +#: gio/gdbusconnection.c:5316 #, c-format msgid "An object is already exported for the interface %s at %s" msgstr "%2$s의 %1$s 인터페이스 용도로 객체를 이미 내보냈습니다" -#: gio/gdbusconnection.c:5548 +#: gio/gdbusconnection.c:5543 #, c-format msgid "Unable to retrieve property %s.%s" msgstr "%s.%s 속성을 가져올 수 없습니다" -#: gio/gdbusconnection.c:5604 +#: gio/gdbusconnection.c:5599 #, c-format msgid "Unable to set property %s.%s" msgstr "%s.%s 속성을 설정할 수 없습니다" -#: gio/gdbusconnection.c:5783 +#: gio/gdbusconnection.c:5778 #, c-format msgid "Method “%s” returned type “%s”, but expected “%s”" msgstr "“%s” 메소드가 “%s” 형식을 리턴했지만, “%s” 형식이어야 합니다" -#: gio/gdbusconnection.c:6859 +#: gio/gdbusconnection.c:6854 #, c-format msgid "Method “%s” on interface “%s” with signature “%s” does not exist" msgstr "“%3$s” 서명이 있는 “%2$s” 인터페이스의 “%1$s” 메서드가 없습니다" -#: gio/gdbusconnection.c:6980 +#: gio/gdbusconnection.c:6975 #, c-format msgid "A subtree is already exported for %s" msgstr "하위 트리를 이미 %s 용도로 내보냈습니다" -#: gio/gdbusconnection.c:7269 +#: gio/gdbusconnection.c:7264 #, c-format msgid "Object does not exist at path “%s”" msgstr "“%s” 경로에 오브젝트가 없습니다" -#: gio/gdbusmessage.c:1303 +#: gio/gdbusmessage.c:1306 msgid "type is INVALID" msgstr "형식이 올바르지 않습니다" -#: gio/gdbusmessage.c:1314 +#: gio/gdbusmessage.c:1317 msgid "METHOD_CALL message: PATH or MEMBER header field is missing" msgstr "METHOD_CALL 메시지: PATH 혹은 MEMBER 헤더 필드가 없습니다" -#: gio/gdbusmessage.c:1325 +#: gio/gdbusmessage.c:1328 msgid "METHOD_RETURN message: REPLY_SERIAL header field is missing" msgstr "METHOD_CALL 메시지: REPLY_SERIAL 헤더 필드가 없습니다" -#: gio/gdbusmessage.c:1337 +#: gio/gdbusmessage.c:1340 msgid "ERROR message: REPLY_SERIAL or ERROR_NAME header field is missing" msgstr "ERROR 메시지: REPLY_SERIAL 혹은 ERROR_NAME 헤더 필드가 없습니다" -#: gio/gdbusmessage.c:1350 +#: gio/gdbusmessage.c:1353 msgid "SIGNAL message: PATH, INTERFACE or MEMBER header field is missing" msgstr "SIGNAL 메시지: PATH, INTERFACE 혹은 MEMBER 헤더 필드가 없습니다" -#: gio/gdbusmessage.c:1358 +#: gio/gdbusmessage.c:1361 msgid "" "SIGNAL message: The PATH header field is using the reserved value /org/" "freedesktop/DBus/Local" @@ -781,7 +785,7 @@ "SIGNAL 메시지: PATH 헤더 필드가 /org/freedesktop/DBus/Local 예약 값을 사용하" "고 있습니다" -#: gio/gdbusmessage.c:1366 +#: gio/gdbusmessage.c:1369 msgid "" "SIGNAL message: The INTERFACE header field is using the reserved value org." "freedesktop.DBus.Local" @@ -789,18 +793,18 @@ "SIGNAL 메시지: INTERFACE 헤더 필드가 org.freedesktop.DBus.Local 예약 값을 사" "용하고 있습니다" -#: gio/gdbusmessage.c:1414 gio/gdbusmessage.c:1474 +#: gio/gdbusmessage.c:1417 gio/gdbusmessage.c:1477 #, c-format msgid "Wanted to read %lu byte but only got %lu" msgid_plural "Wanted to read %lu bytes but only got %lu" msgstr0 "%lu 바이트를 읽어야 하지만 %lu 바이트만 받았습니다" -#: gio/gdbusmessage.c:1428 +#: gio/gdbusmessage.c:1431 #, c-format msgid "Expected NUL byte after the string “%s” but found byte %d" msgstr "“%s” 문자열 뒤에 NUL 바이트가 와야 하지만 %d바이트가 있습니다" -#: gio/gdbusmessage.c:1447 +#: gio/gdbusmessage.c:1450 #, c-format msgid "" "Expected valid UTF-8 string but found invalid bytes at byte offset %d " @@ -809,21 +813,21 @@ "올바른 UTF-8 문자열이 와야 하지만 오프셋 %d에(문자열 길이 %d) 잘못된 바이트" "가 있습니다. 그 부분까지 올바른 UTF-8 문자열은 “%s”입니다." -#: gio/gdbusmessage.c:1511 gio/gdbusmessage.c:1787 gio/gdbusmessage.c:1998 +#: gio/gdbusmessage.c:1514 gio/gdbusmessage.c:1790 gio/gdbusmessage.c:2001 msgid "Value nested too deeply" msgstr "값이 너무 깊숙히 끼워 넣어져 있습니다" -#: gio/gdbusmessage.c:1679 +#: gio/gdbusmessage.c:1682 #, c-format msgid "Parsed value “%s” is not a valid D-Bus object path" msgstr "해석한 “%s” 값이 올바른 D-Bus 객체 경로가 아닙니다" -#: gio/gdbusmessage.c:1703 +#: gio/gdbusmessage.c:1706 #, c-format msgid "Parsed value “%s” is not a valid D-Bus signature" msgstr "해석한 “%s” 값이 올바른 D-Bus 시그너쳐가 아닙니다" -#: gio/gdbusmessage.c:1754 +#: gio/gdbusmessage.c:1757 #, c-format msgid "" "Encountered array of length %u byte. Maximum length is 2<<26 bytes (64 MiB)." @@ -832,7 +836,7 @@ msgstr0 "" "길이가 %u 바이트인 배열이 있습니다. 최대 길이는 2<<26 바이트입니다. (64MiB)" -#: gio/gdbusmessage.c:1774 +#: gio/gdbusmessage.c:1777 #, c-format msgid "" "Encountered array of type “a%c”, expected to have a length a multiple of %u " @@ -841,22 +845,22 @@ "타입이 “a%c”인 배열은 길이가 %u 바이트의 배수여야 하지만, 길이가 %u 바이트입" "니다." -#: gio/gdbusmessage.c:1928 gio/gdbusmessage.c:2647 +#: gio/gdbusmessage.c:1931 gio/gdbusmessage.c:2650 msgid "Empty structures (tuples) are not allowed in D-Bus" msgstr "D-Bus에서 빈 구조체(튜플)는 지원하지 않습니다" -#: gio/gdbusmessage.c:1982 +#: gio/gdbusmessage.c:1985 #, c-format msgid "Parsed value “%s” for variant is not a valid D-Bus signature" msgstr "variant에 대해 해석한 값 “%s”은(는) 올바른 D-Bus 시그너쳐가 아닙니다." -#: gio/gdbusmessage.c:2023 +#: gio/gdbusmessage.c:2026 #, c-format msgid "" "Error deserializing GVariant with type string “%s” from the D-Bus wire format" msgstr "“%s” 형식 문자열로 GVariant를 D-Bus 전송 형식에서 재구성하는데 오류" -#: gio/gdbusmessage.c:2208 +#: gio/gdbusmessage.c:2211 #, c-format msgid "" "Invalid endianness value. Expected 0x6c (“l”) or 0x42 (“B”) but found value " @@ -865,57 +869,57 @@ "엔디안 값이 잘못되었습니다. 0x6c(“l”) 또는 0x42 (“B”)가 와야 하지만 0x%02x 값" "이 있습니다" -#: gio/gdbusmessage.c:2227 +#: gio/gdbusmessage.c:2230 #, c-format msgid "Invalid major protocol version. Expected 1 but found %d" msgstr "메이저 프로토콜 버전이 잘못되었습니다. 1이어야 하지만 %d입니다." -#: gio/gdbusmessage.c:2285 gio/gdbusmessage.c:2883 +#: gio/gdbusmessage.c:2288 gio/gdbusmessage.c:2886 msgid "Signature header found but is not of type signature" msgstr "시그너쳐 헤더가 있지만 타입 시그너쳐 헤더가 아닙니다" -#: gio/gdbusmessage.c:2297 +#: gio/gdbusmessage.c:2300 #, c-format msgid "Signature header with signature “%s” found but message body is empty" msgstr "시그너쳐 “%s”인 시그너쳐 헤더가 있지만 메시지 본문이 비었습니다" -#: gio/gdbusmessage.c:2312 +#: gio/gdbusmessage.c:2315 #, c-format msgid "Parsed value “%s” is not a valid D-Bus signature (for body)" msgstr "해석한 “%s” 값이 (본문에 대해) 올바른 D-Bus 시그너쳐가 아닙니다" -#: gio/gdbusmessage.c:2344 +#: gio/gdbusmessage.c:2347 #, 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" msgstr0 "메시지에 시그너쳐 헤더가 없지만 메시지 본문이 %u 바이트입니다" -#: gio/gdbusmessage.c:2354 +#: gio/gdbusmessage.c:2357 msgid "Cannot deserialize message: " msgstr "메시지를 재구성할 수 없습니다: " -#: gio/gdbusmessage.c:2700 +#: gio/gdbusmessage.c:2703 #, c-format msgid "" "Error serializing GVariant with type string “%s” to the D-Bus wire format" msgstr "“%s” 형식 문자열로 GVariant를 D-Bus 전송 형식으로 만드는데 오류" -#: gio/gdbusmessage.c:2837 +#: gio/gdbusmessage.c:2840 #, c-format msgid "" "Number of file descriptors in message (%d) differs from header field (%d)" msgstr "메시지의 파일 디스크립터 개수가 (%d) 헤더 필드의 개수와 (%d) 다릅니다" -#: gio/gdbusmessage.c:2845 +#: gio/gdbusmessage.c:2848 msgid "Cannot serialize message: " msgstr "메시지를 전송 형식으로 만들 수 없습니다: " -#: gio/gdbusmessage.c:2898 +#: gio/gdbusmessage.c:2901 #, c-format msgid "Message body has signature “%s” but there is no signature header" msgstr "메시지 본문에 “%s” 시그너쳐가 있지만 시그너쳐 헤더가 없습니다" -#: gio/gdbusmessage.c:2908 +#: gio/gdbusmessage.c:2911 #, c-format msgid "" "Message body has type signature “%s” but signature in the header field is " @@ -923,17 +927,17 @@ msgstr "" "메시지 본문에 “%s” 형식 시그너쳐가 있지만 헤더 필드의 시그너쳐가 “%s”입니다" -#: gio/gdbusmessage.c:2924 +#: gio/gdbusmessage.c:2927 #, c-format msgid "Message body is empty but signature in the header field is “(%s)”" msgstr "메시지 본문이 비었지만 헤더 필드의 시그너쳐가 “(%s)”입니다" -#: gio/gdbusmessage.c:3479 +#: gio/gdbusmessage.c:3482 #, c-format msgid "Error return with body of type “%s”" msgstr "오류 리턴, “%s” 형식의 본문" -#: gio/gdbusmessage.c:3487 +#: gio/gdbusmessage.c:3490 msgid "Error return with empty body" msgstr "오류 리턴, 빈 본문" @@ -958,17 +962,17 @@ msgid "Unable to load %s or %s: " msgstr "%s 또는 %s을(를) 읽어들일 수 없습니다: " -#: gio/gdbusproxy.c:1575 +#: gio/gdbusproxy.c:1568 #, c-format msgid "Error calling StartServiceByName for %s: " msgstr "%s에 대해 StartServiceByName 호출이 실패했습니다: " -#: gio/gdbusproxy.c:1598 +#: gio/gdbusproxy.c:1591 #, c-format msgid "Unexpected reply %d from StartServiceByName(\"%s\") method" msgstr " StartServiceByName(\"%2$s\") 메소드에서 예상치 못한 응답 %1$d번" -#: gio/gdbusproxy.c:2709 gio/gdbusproxy.c:2844 +#: gio/gdbusproxy.c:2702 gio/gdbusproxy.c:2837 #, c-format msgid "" "Cannot invoke method; proxy is for the well-known name %s without an owner, " @@ -977,25 +981,25 @@ "메소드를 호출할 수 없습니다. 프록시는 소유자 없는 알려진 이름이고 (%s) 프록시" "가 G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START 플래그를 갖고 만들어졌습니다" -#: gio/gdbusserver.c:765 +#: gio/gdbusserver.c:758 msgid "Abstract namespace not supported" msgstr "추상 네임스페이스를 지원하지 않습니다" -#: gio/gdbusserver.c:857 +#: gio/gdbusserver.c:850 msgid "Cannot specify nonce file when creating a server" msgstr "서버를 만들 때 nonce 파일을 지정할 수 없습니다" -#: gio/gdbusserver.c:939 +#: gio/gdbusserver.c:932 #, c-format msgid "Error writing nonce file at “%s”: %s" msgstr "“%s”의 nonce 파일에 쓰는 중 오류: %s" -#: gio/gdbusserver.c:1114 +#: gio/gdbusserver.c:1107 #, c-format msgid "The string “%s” is not a valid D-Bus GUID" msgstr "“%s” 문자열은 올바른 D-BUS GUID가 아닙니다" -#: gio/gdbusserver.c:1152 +#: gio/gdbusserver.c:1145 #, c-format msgid "Cannot listen on unsupported transport “%s”" msgstr "지원하지 않는 transport “%s”에서 연결을 받아들일 수 없습니다" @@ -1023,14 +1027,14 @@ "\n" "각 명령어의 도움말을 보려면 “%s <명령> --help” 명령을 사용하십시오.\n" -#: gio/gdbus-tool.c:204 gio/gdbus-tool.c:276 gio/gdbus-tool.c:348 -#: gio/gdbus-tool.c:372 gio/gdbus-tool.c:862 gio/gdbus-tool.c:1247 -#: gio/gdbus-tool.c:1734 +#: gio/gdbus-tool.c:204 gio/gdbus-tool.c:276 gio/gdbus-tool.c:347 +#: gio/gdbus-tool.c:371 gio/gdbus-tool.c:861 gio/gdbus-tool.c:1246 +#: gio/gdbus-tool.c:1733 #, c-format msgid "Error: %s\n" msgstr "오류: %s\n" -#: gio/gdbus-tool.c:215 gio/gdbus-tool.c:289 gio/gdbus-tool.c:1750 +#: gio/gdbus-tool.c:215 gio/gdbus-tool.c:289 gio/gdbus-tool.c:1749 #, c-format msgid "Error parsing introspection XML: %s\n" msgstr "introspection XML을 해석하는 중에 오류: %s\n" @@ -1040,49 +1044,49 @@ msgid "Error: %s is not a valid name\n" msgstr "오류: “%s”은(는) 올바른 이름이 아닙니다\n" -#: gio/gdbus-tool.c:258 gio/gdbus-tool.c:748 gio/gdbus-tool.c:1066 -#: gio/gdbus-tool.c:1900 gio/gdbus-tool.c:2140 +#: gio/gdbus-tool.c:258 gio/gdbus-tool.c:747 gio/gdbus-tool.c:1065 +#: gio/gdbus-tool.c:1899 gio/gdbus-tool.c:2139 #, c-format msgid "Error: %s is not a valid object path\n" msgstr "오류: “%s”은(는) 올바른 객체 경로가 아닙니다\n" -#: gio/gdbus-tool.c:406 +#: gio/gdbus-tool.c:405 msgid "Connect to the system bus" msgstr "시스템 버스에 연결" -#: gio/gdbus-tool.c:407 +#: gio/gdbus-tool.c:406 msgid "Connect to the session bus" msgstr "세션 버스에 연결" -#: gio/gdbus-tool.c:408 +#: gio/gdbus-tool.c:407 msgid "Connect to given D-Bus address" msgstr "지정된 D-Bus 주소에 연결" -#: gio/gdbus-tool.c:418 +#: gio/gdbus-tool.c:417 msgid "Connection Endpoint Options:" msgstr "연결 종점 옵션:" -#: gio/gdbus-tool.c:419 +#: gio/gdbus-tool.c:418 msgid "Options specifying the connection endpoint" msgstr "연결 종점을 지정하는 옵션" -#: gio/gdbus-tool.c:442 +#: gio/gdbus-tool.c:441 #, c-format msgid "No connection endpoint specified" msgstr "연결 종점을 지정하지 않았습니다" -#: gio/gdbus-tool.c:452 +#: gio/gdbus-tool.c:451 #, c-format msgid "Multiple connection endpoints specified" msgstr "여러 개의 연결 종점을 지정했습니다" -#: gio/gdbus-tool.c:525 +#: gio/gdbus-tool.c:524 #, c-format msgid "" "Warning: According to introspection data, interface “%s” does not exist\n" msgstr "경고: introspection 데이터에 따르면 “%s” 인터페이스가 없습니다\n" -#: gio/gdbus-tool.c:534 +#: gio/gdbus-tool.c:533 #, c-format msgid "" "Warning: According to introspection data, method “%s” does not exist on " @@ -1091,191 +1095,191 @@ "경고: introspection 데이터에 따르면 “%s” 메소드가 “%s” 인터페이스에 없습니" "다\n" -#: gio/gdbus-tool.c:596 +#: gio/gdbus-tool.c:595 msgid "Optional destination for signal (unique name)" msgstr "추가로 지정할 수 있는 시그널의 대상 (고유 이름)" -#: gio/gdbus-tool.c:597 +#: gio/gdbus-tool.c:596 msgid "Object path to emit signal on" msgstr "시그널을 발생할 객체 경로" -#: gio/gdbus-tool.c:598 +#: gio/gdbus-tool.c:597 msgid "Signal and interface name" msgstr "시그널 및 인터페이스 이름" -#: gio/gdbus-tool.c:631 +#: gio/gdbus-tool.c:630 msgid "Emit a signal." msgstr "시그널을 발생합니다." -#: gio/gdbus-tool.c:686 gio/gdbus-tool.c:1003 gio/gdbus-tool.c:1837 -#: gio/gdbus-tool.c:2069 gio/gdbus-tool.c:2289 +#: gio/gdbus-tool.c:685 gio/gdbus-tool.c:1002 gio/gdbus-tool.c:1836 +#: gio/gdbus-tool.c:2068 gio/gdbus-tool.c:2288 #, c-format msgid "Error connecting: %s\n" msgstr "연결하는데 오류: %s\n" -#: gio/gdbus-tool.c:706 +#: gio/gdbus-tool.c:705 #, c-format msgid "Error: %s is not a valid unique bus name.\n" msgstr "오류: “%s”은(는) 올바른 고유 버스 이름이 아닙니다.\n" -#: gio/gdbus-tool.c:725 gio/gdbus-tool.c:1046 gio/gdbus-tool.c:1880 +#: gio/gdbus-tool.c:724 gio/gdbus-tool.c:1045 gio/gdbus-tool.c:1879 msgid "Error: Object path is not specified\n" msgstr "오류: 객체 경로를 지정하지 않았습니다\n" -#: gio/gdbus-tool.c:768 +#: gio/gdbus-tool.c:767 msgid "Error: Signal name is not specified\n" msgstr "오류: 시그널 이름을 지정하지 않았습니다\n" -#: gio/gdbus-tool.c:782 +#: gio/gdbus-tool.c:781 #, c-format msgid "Error: Signal name “%s” is invalid\n" msgstr "오류: 시그널 이름 “%s”이(가) 올바르지 않습니다\n" -#: gio/gdbus-tool.c:794 +#: gio/gdbus-tool.c:793 #, c-format msgid "Error: %s is not a valid interface name\n" msgstr "오류: “%s”은(는) 올바른 인터페이스 이름이 아닙니다\n" -#: gio/gdbus-tool.c:800 +#: gio/gdbus-tool.c:799 #, c-format msgid "Error: %s is not a valid member name\n" msgstr "오류: “%s”은(는) 올바른 멤버 이름이 아닙니다\n" #. Use the original non-"parse-me-harder" error -#: gio/gdbus-tool.c:837 gio/gdbus-tool.c:1178 +#: gio/gdbus-tool.c:836 gio/gdbus-tool.c:1177 #, c-format msgid "Error parsing parameter %d: %s\n" msgstr "파라미터 %d번 해석 오류: %s\n" -#: gio/gdbus-tool.c:869 +#: gio/gdbus-tool.c:868 #, c-format msgid "Error flushing connection: %s\n" msgstr "연결의 버퍼 내용을 적용하는데 오류: %s\n" -#: gio/gdbus-tool.c:897 +#: gio/gdbus-tool.c:896 msgid "Destination name to invoke method on" msgstr "메소드를 호출할 대상 이름" -#: gio/gdbus-tool.c:898 +#: gio/gdbus-tool.c:897 msgid "Object path to invoke method on" msgstr "메소드를 호출할 객체 경로" -#: gio/gdbus-tool.c:899 +#: gio/gdbus-tool.c:898 msgid "Method and interface name" msgstr "메소드 및 인터페이스 이름" -#: gio/gdbus-tool.c:900 +#: gio/gdbus-tool.c:899 msgid "Timeout in seconds" msgstr "시간 제한, 초 단위" -#: gio/gdbus-tool.c:901 +#: gio/gdbus-tool.c:900 msgid "Allow interactive authorization" msgstr "동적 권한 부여를 허용" -#: gio/gdbus-tool.c:948 +#: gio/gdbus-tool.c:947 msgid "Invoke a method on a remote object." msgstr "원격 객체에 대해 메소드를 호출합니다." -#: gio/gdbus-tool.c:1020 gio/gdbus-tool.c:1854 gio/gdbus-tool.c:2094 +#: gio/gdbus-tool.c:1019 gio/gdbus-tool.c:1853 gio/gdbus-tool.c:2093 msgid "Error: Destination is not specified\n" msgstr "오류: 대상을 지정하지 않았습니다\n" -#: gio/gdbus-tool.c:1031 gio/gdbus-tool.c:1871 gio/gdbus-tool.c:2105 +#: gio/gdbus-tool.c:1030 gio/gdbus-tool.c:1870 gio/gdbus-tool.c:2104 #, c-format msgid "Error: %s is not a valid bus name\n" msgstr "오류: “%s”은(는) 올바른 버스 이름이 아닙니다\n" -#: gio/gdbus-tool.c:1081 +#: gio/gdbus-tool.c:1080 msgid "Error: Method name is not specified\n" msgstr "오류: 메소드 이름을 지정하지 않았습니다\n" -#: gio/gdbus-tool.c:1092 +#: gio/gdbus-tool.c:1091 #, c-format msgid "Error: Method name “%s” is invalid\n" msgstr "오류: 메소드 이름 “%s”이(가) 올바르지 않습니다\n" -#: gio/gdbus-tool.c:1170 +#: gio/gdbus-tool.c:1169 #, c-format msgid "Error parsing parameter %d of type “%s”: %s\n" msgstr "형식 “%2$s”의 파라미터 %1$d번 해석 오류: %3$s\n" -#: gio/gdbus-tool.c:1196 +#: gio/gdbus-tool.c:1195 #, c-format msgid "Error adding handle %d: %s\n" msgstr "핸들 %d번 추가하는 중 오류: %s\n" -#: gio/gdbus-tool.c:1696 +#: gio/gdbus-tool.c:1695 msgid "Destination name to introspect" msgstr "조사할 대상 이름" -#: gio/gdbus-tool.c:1697 +#: gio/gdbus-tool.c:1696 msgid "Object path to introspect" msgstr "조사할 객체 경로" -#: gio/gdbus-tool.c:1698 +#: gio/gdbus-tool.c:1697 msgid "Print XML" msgstr "XML을 표시합니다" -#: gio/gdbus-tool.c:1699 +#: gio/gdbus-tool.c:1698 msgid "Introspect children" msgstr "하위 항목에 인트로스펙트 적용" -#: gio/gdbus-tool.c:1700 +#: gio/gdbus-tool.c:1699 msgid "Only print properties" msgstr "속성을 표시하기만 합니다" -#: gio/gdbus-tool.c:1789 +#: gio/gdbus-tool.c:1788 msgid "Introspect a remote object." msgstr "원격 객체를 조사합니다." -#: gio/gdbus-tool.c:1995 +#: gio/gdbus-tool.c:1994 msgid "Destination name to monitor" msgstr "감시할 대상 이름" -#: gio/gdbus-tool.c:1996 +#: gio/gdbus-tool.c:1995 msgid "Object path to monitor" msgstr "감시할 객체 경로" -#: gio/gdbus-tool.c:2021 +#: gio/gdbus-tool.c:2020 msgid "Monitor a remote object." msgstr "원격 객체를 감시합니다." -#: gio/gdbus-tool.c:2079 +#: gio/gdbus-tool.c:2078 msgid "Error: can’t monitor a non-message-bus connection\n" msgstr "오류: 메시지 버스가 아닌 연결을 감시할 수 없습니다\n" -#: gio/gdbus-tool.c:2203 +#: gio/gdbus-tool.c:2202 msgid "Service to activate before waiting for the other one (well-known name)" msgstr "(알려진 이름의) 다른 서비스를 기다리기 전에 활성화할 서비스" -#: gio/gdbus-tool.c:2206 +#: gio/gdbus-tool.c:2205 msgid "" "Timeout to wait for before exiting with an error (seconds); 0 for no timeout " "(default)" msgstr "" "오류로 끝날 때까지 대기할 시간 제한 (초 단위), 0이면 시간 무제한 (기본값)" -#: gio/gdbus-tool.c:2254 +#: gio/gdbus-tool.c:2253 msgid "OPTION… BUS-NAME" msgstr "옵션… <버스-이름>" -#: gio/gdbus-tool.c:2255 +#: gio/gdbus-tool.c:2254 msgid "Wait for a bus name to appear." msgstr "버스 이름이 나타날 때까지 대기합니다." -#: gio/gdbus-tool.c:2331 +#: gio/gdbus-tool.c:2330 msgid "Error: A service to activate for must be specified.\n" msgstr "오류: 활성화할 서비스를 지정해야 합니다.\n" -#: gio/gdbus-tool.c:2336 +#: gio/gdbus-tool.c:2335 msgid "Error: A service to wait for must be specified.\n" msgstr "오류: 대기할 서비스를 지정해야 합니다.\n" -#: gio/gdbus-tool.c:2341 +#: gio/gdbus-tool.c:2340 msgid "Error: Too many arguments.\n" msgstr "오류: 인자가 너무 많습니다.\n" -#: gio/gdbus-tool.c:2349 gio/gdbus-tool.c:2356 +#: gio/gdbus-tool.c:2348 gio/gdbus-tool.c:2355 #, c-format msgid "Error: %s is not a valid well-known bus name.\n" msgstr "오류: “%s”은(는) 올바른 알려진 버스 이름이 아닙니다.\n" @@ -1285,38 +1289,43 @@ msgid "Not authorized to change debug settings" msgstr "디버깅 설정을 바꿀 권한이 없습니다" -#: gio/gdesktopappinfo.c:2182 gio/gdesktopappinfo.c:5113 +#: gio/gdesktopappinfo.c:2242 gio/gdesktopappinfo.c:5223 msgid "Unnamed" msgstr "이름없음" -#: gio/gdesktopappinfo.c:2592 +#: gio/gdesktopappinfo.c:2652 msgid "Desktop file didn’t specify Exec field" msgstr "desktop 파일에 Exec 필드를 지정하지 않았습니다" -#: gio/gdesktopappinfo.c:2891 +#: gio/gdesktopappinfo.c:2942 msgid "Unable to find terminal required for application" msgstr "프로그램에 필요한 터미널을 찾을 수 없습니다" -#: gio/gdesktopappinfo.c:3631 +#: gio/gdesktopappinfo.c:3002 +#, c-format +msgid "Program ‘%s’ not found in $PATH" +msgstr "$PATH 안에 ‘%s’ 프로그램이 없습니다" + +#: gio/gdesktopappinfo.c:3735 #, c-format msgid "Can’t create user application configuration folder %s: %s" msgstr "사용자 프로그램 설정 폴더(%s)를 만들 수 없습니다: %s" -#: gio/gdesktopappinfo.c:3635 +#: gio/gdesktopappinfo.c:3739 #, c-format msgid "Can’t create user MIME configuration folder %s: %s" msgstr "사용자 MIME 설정 폴더(%s)를 만들 수 없습니다: %s" -#: gio/gdesktopappinfo.c:3877 gio/gdesktopappinfo.c:3901 +#: gio/gdesktopappinfo.c:3981 gio/gdesktopappinfo.c:4005 msgid "Application information lacks an identifier" msgstr "프로그램 정보에 아이디가 없습니다" -#: gio/gdesktopappinfo.c:4137 +#: gio/gdesktopappinfo.c:4241 #, c-format msgid "Can’t create user desktop file %s" msgstr "%s 사용자 desktop 파일을 만들 수 없습니다" -#: gio/gdesktopappinfo.c:4273 +#: gio/gdesktopappinfo.c:4377 #, c-format msgid "Custom definition for %s" msgstr "%s에 대한 사용자 설정 정의" @@ -1389,7 +1398,7 @@ msgid "Containing mount does not exist" msgstr "들어 있는 마운트가 없습니다" -#: gio/gfile.c:2641 gio/glocalfile.c:2500 +#: gio/gfile.c:2641 gio/glocalfile.c:2511 msgid "Can’t copy over directory" msgstr "디렉터리를 덮어 써서 복사할 수 없습니다" @@ -1435,7 +1444,7 @@ msgid "Invalid symlink value given" msgstr "잘못된 심볼릭 링크 값이 주어졌습니다" -#: gio/gfile.c:4163 glib/gfileutils.c:2335 +#: gio/gfile.c:4163 glib/gfileutils.c:2392 msgid "Symbolic links not supported" msgstr "심볼릭 링크를 지원하지 않습니다" @@ -1536,37 +1545,37 @@ msgid "HTTP proxy server closed connection unexpectedly." msgstr "HTTP 프록시 서버가 예상치 못하게 연결을 닫았습니다." -#: gio/gicon.c:300 +#: gio/gicon.c:299 #, c-format msgid "Wrong number of tokens (%d)" msgstr "토큰 수가 (%d개) 잘못되었습니다" -#: gio/gicon.c:320 +#: gio/gicon.c:319 #, c-format msgid "No type for class name %s" msgstr "클래스 이름 \"%s\"에 대한 형식이 없습니다" -#: gio/gicon.c:330 +#: gio/gicon.c:329 #, c-format msgid "Type %s does not implement the GIcon interface" msgstr "\"%s\" 형식은 GIcon 인터페이스를 구현하지 않습니다" -#: gio/gicon.c:341 +#: gio/gicon.c:340 #, c-format msgid "Type %s is not classed" msgstr "\"%s\" 형식에 대한 클래스가 없습니다" -#: gio/gicon.c:355 +#: gio/gicon.c:354 #, c-format msgid "Malformed version number: %s" msgstr "버전 형식이 잘못되었습니다: %s" -#: gio/gicon.c:369 +#: gio/gicon.c:368 #, c-format msgid "Type %s does not implement from_tokens() on the GIcon interface" msgstr "\"%s\" 형식은 GIcon 인터페이스에서 from_token()를 구현하지 않습니다" -#: gio/gicon.c:471 +#: gio/gicon.c:470 msgid "Can’t handle the supplied version of the icon encoding" msgstr "아이콘 인코딩에 저장한 버전을 처리할 수 없습니다" @@ -1716,7 +1725,7 @@ #: gio/gio-tool-cat.c:135 gio/gio-tool-info.c:379 gio/gio-tool-list.c:173 #: gio/gio-tool-mkdir.c:50 gio/gio-tool-monitor.c:39 gio/gio-tool-monitor.c:41 #: gio/gio-tool-monitor.c:43 gio/gio-tool-monitor.c:45 -#: gio/gio-tool-monitor.c:206 gio/gio-tool-mount.c:1202 gio/gio-tool-open.c:72 +#: gio/gio-tool-monitor.c:206 gio/gio-tool-mount.c:1210 gio/gio-tool-open.c:72 #: gio/gio-tool-remove.c:50 gio/gio-tool-rename.c:47 gio/gio-tool-set.c:95 #: gio/gio-tool-trash.c:222 gio/gio-tool-tree.c:241 msgid "LOCATION" @@ -1737,7 +1746,7 @@ "smb://server/resource/file.txt와 같이 쓸 수 있습니다." #: gio/gio-tool-cat.c:164 gio/gio-tool-info.c:410 gio/gio-tool-mkdir.c:78 -#: gio/gio-tool-monitor.c:231 gio/gio-tool-mount.c:1253 gio/gio-tool-open.c:98 +#: gio/gio-tool-monitor.c:231 gio/gio-tool-mount.c:1261 gio/gio-tool-open.c:98 #: gio/gio-tool-remove.c:74 gio/gio-tool-trash.c:303 msgid "No locations given" msgstr "위치를 지정하지 않았습니다" @@ -2149,19 +2158,19 @@ msgid "Mount a TCRYPT system volume" msgstr "TCRYPT 시스템 볼륨 마운트" -#: gio/gio-tool-mount.c:268 gio/gio-tool-mount.c:300 +#: gio/gio-tool-mount.c:276 gio/gio-tool-mount.c:308 msgid "Anonymous access denied" msgstr "익명 접근이 거절되었습니다" -#: gio/gio-tool-mount.c:525 +#: gio/gio-tool-mount.c:533 msgid "No drive for device file" msgstr "디바이스 파일에 대한 드라이브가 없습니다" -#: gio/gio-tool-mount.c:1017 +#: gio/gio-tool-mount.c:1025 msgid "No volume for given ID" msgstr "지정한 ID에 대한 볼륨이 없습니다" -#: gio/gio-tool-mount.c:1206 +#: gio/gio-tool-mount.c:1214 msgid "Mount or unmount the locations." msgstr "위치를 마운트하거나 해제합니다." @@ -2364,7 +2373,7 @@ msgid "List contents of directories in a tree-like format." msgstr "디렉터리의 내용을 트리 형식으로 표시합니다." -#: gio/glib-compile-resources.c:142 gio/glib-compile-schemas.c:1516 +#: gio/glib-compile-resources.c:142 gio/glib-compile-schemas.c:1513 #, c-format msgid "Element <%s> not allowed inside <%s>" msgstr "<%s> 요소는 <%s> 안에 쓸 수 없습니다" @@ -2420,7 +2429,7 @@ msgid "text may not appear inside <%s>" msgstr "<%s> 안에는 문자가 들어갈 수 없습니다" -#: gio/glib-compile-resources.c:821 gio/glib-compile-schemas.c:2174 +#: gio/glib-compile-resources.c:821 gio/glib-compile-schemas.c:2171 msgid "Show program version and exit" msgstr "프로그램 버전을 표시하고 끝납니다" @@ -2434,8 +2443,8 @@ "directory)" msgstr "FILE에 참조된 파일을 읽어들일 디렉터리 (기본값: 현재 디렉터리)" -#: gio/glib-compile-resources.c:823 gio/glib-compile-schemas.c:2175 -#: gio/glib-compile-schemas.c:2204 +#: gio/glib-compile-resources.c:823 gio/glib-compile-schemas.c:2172 +#: gio/glib-compile-schemas.c:2201 msgid "DIRECTORY" msgstr "<디렉터리>" @@ -2660,16 +2669,16 @@ msgid "<aliases> must contain at least one <alias>" msgstr "<aliases>에 최소 하나의 <alias>가 들어 있어야 합니다" -#: gio/glib-compile-schemas.c:799 +#: gio/glib-compile-schemas.c:796 msgid "Empty names are not permitted" msgstr "빈 이름은 허용하지 않습니다" -#: gio/glib-compile-schemas.c:809 +#: gio/glib-compile-schemas.c:806 #, c-format msgid "Invalid name “%s”: names must begin with a lowercase letter" msgstr "잘못된 이름 “%s”: 소문자로 시작해야 합니다" -#: gio/glib-compile-schemas.c:821 +#: gio/glib-compile-schemas.c:818 #, c-format msgid "" "Invalid name “%s”: invalid character “%c”; only lowercase letters, numbers " @@ -2678,36 +2687,36 @@ "잘못된 이름 “%s”: “%c” 문자가 잘못되었습니다. 소문자, 숫자, 빼기 문자(“-”)만 " "허용합니다." -#: gio/glib-compile-schemas.c:830 +#: gio/glib-compile-schemas.c:827 #, c-format msgid "Invalid name “%s”: two successive hyphens (“--”) are not permitted" msgstr "잘못된 이름 “%s”: 두 개 연속된 빼기 기호는 (“--”) 허용하지 않습니다." -#: gio/glib-compile-schemas.c:839 +#: gio/glib-compile-schemas.c:836 #, c-format msgid "Invalid name “%s”: the last character may not be a hyphen (“-”)" msgstr "잘못된 이름 “%s”: 마지막 문자로 빼기 기호는 (“-”) 안됩니다." -#: gio/glib-compile-schemas.c:847 +#: gio/glib-compile-schemas.c:844 #, c-format msgid "Invalid name “%s”: maximum length is 1024" msgstr "잘못된 이름 “%s”: 최대 길이는 1024입니다" -#: gio/glib-compile-schemas.c:919 +#: gio/glib-compile-schemas.c:916 #, c-format msgid "<child name='%s'> already specified" msgstr "<child name='%s'> 태그를 이미 지정했습니다" -#: gio/glib-compile-schemas.c:945 +#: gio/glib-compile-schemas.c:942 msgid "Cannot add keys to a “list-of” schema" msgstr "“list-of” 스키마에 키를 추가할 수 없습니다" -#: gio/glib-compile-schemas.c:956 +#: gio/glib-compile-schemas.c:953 #, c-format msgid "<key name='%s'> already specified" msgstr "<key name='%s'> 태그가 이미 있습니다" -#: gio/glib-compile-schemas.c:974 +#: gio/glib-compile-schemas.c:971 #, c-format msgid "" "<key name='%s'> shadows <key name='%s'> in <schema id='%s'>; use <override> " @@ -2716,7 +2725,7 @@ "<key name='%s'> 태그는 <key name='%s'> 태그를(<schema id='%s'> 스키마) 감춥니" "다. 값을 수정하려면 <override> 태그를 사용하십시오" -#: gio/glib-compile-schemas.c:985 +#: gio/glib-compile-schemas.c:982 #, c-format msgid "" "Exactly one of “type”, “enum” or “flags” must be specified as an attribute " @@ -2724,56 +2733,56 @@ msgstr "" "<key>의 속성으로 “type”, “enum”, “flags” 중에 정확히 하나를 지정해야 합니다" -#: gio/glib-compile-schemas.c:1004 +#: gio/glib-compile-schemas.c:1001 #, c-format msgid "<%s id='%s'> not (yet) defined." msgstr "<%s id='%s'> 태그를(아직) 정의하지 않았습니다." -#: gio/glib-compile-schemas.c:1019 +#: gio/glib-compile-schemas.c:1016 #, c-format msgid "Invalid GVariant type string “%s”" msgstr "GVariant 형식 문자열(“%s”)이 올바르지 않습니다" -#: gio/glib-compile-schemas.c:1049 +#: gio/glib-compile-schemas.c:1046 msgid "<override> given but schema isn’t extending anything" msgstr "<override> 태그가 있지만 스키마는 아무 것도 확장하지 않습니다" -#: gio/glib-compile-schemas.c:1062 +#: gio/glib-compile-schemas.c:1059 #, c-format msgid "No <key name='%s'> to override" msgstr "덮어쓸 <key name='%s'> 태그가 없습니다" -#: gio/glib-compile-schemas.c:1070 +#: gio/glib-compile-schemas.c:1067 #, c-format msgid "<override name='%s'> already specified" msgstr "<override name='%s'> 태그가 이미 있습니다" -#: gio/glib-compile-schemas.c:1143 +#: gio/glib-compile-schemas.c:1140 #, c-format msgid "<schema id='%s'> already specified" msgstr "<schema id='%s'> 태그가 이미 있습니다" -#: gio/glib-compile-schemas.c:1155 +#: gio/glib-compile-schemas.c:1152 #, c-format msgid "<schema id='%s'> extends not yet existing schema “%s”" msgstr "<schema id='%s'> 태그는 아직 없는 “%s” 스키마를 확장합니다" -#: gio/glib-compile-schemas.c:1171 +#: gio/glib-compile-schemas.c:1168 #, c-format msgid "<schema id='%s'> is list of not yet existing schema “%s”" msgstr "<schema id='%s'> 태그는 아직 없는 “%s” 스키마의 목록입니다" -#: gio/glib-compile-schemas.c:1179 +#: gio/glib-compile-schemas.c:1176 #, c-format msgid "Cannot be a list of a schema with a path" msgstr "경로가 있는 스키마의 목록은 있으면 안 됩니다" -#: gio/glib-compile-schemas.c:1189 +#: gio/glib-compile-schemas.c:1186 #, c-format msgid "Cannot extend a schema with a path" msgstr "경로가 있는 스키마를 확장할 수 없습니다" -#: gio/glib-compile-schemas.c:1199 +#: gio/glib-compile-schemas.c:1196 #, c-format msgid "" "<schema id='%s'> is a list, extending <schema id='%s'> which is not a list" @@ -2781,7 +2790,7 @@ "<schema id='%s'> 태그는 목록이 아닌 <schema id='%s'> 스키마를 확장하는 목록입" "니다" -#: gio/glib-compile-schemas.c:1209 +#: gio/glib-compile-schemas.c:1206 #, c-format msgid "" "<schema id='%s' list-of='%s'> extends <schema id='%s' list-of='%s'> but “%s” " @@ -2790,17 +2799,17 @@ "<schema id='%s' list-of='%s'> 태그는 <schema id='%s' list-of='%s'> 스키마를 " "확장하지만, “%s”은(는) “%s”을(를) 확장하지 않습니다." -#: gio/glib-compile-schemas.c:1226 +#: gio/glib-compile-schemas.c:1223 #, c-format msgid "A path, if given, must begin and end with a slash" msgstr "경로를 지정할 경우 슬래시로 시작하고 끝나야 합니다" -#: gio/glib-compile-schemas.c:1233 +#: gio/glib-compile-schemas.c:1230 #, c-format msgid "The path of a list must end with “:/”" msgstr "목록의 경로는 “:/”로 끝나야 합니다" -#: gio/glib-compile-schemas.c:1242 +#: gio/glib-compile-schemas.c:1239 #, c-format msgid "" "Warning: Schema “%s” has path “%s”. Paths starting with “/apps/”, “/" @@ -2809,49 +2818,49 @@ "주의: “%s” 스키마에 “%s” 경로가 있습니다. “/apps/”, “/desktop/” 또는 “/" "system/”으로 시작하는 경로는 사용이 중지될 예정입니다." -#: gio/glib-compile-schemas.c:1272 +#: gio/glib-compile-schemas.c:1269 #, c-format msgid "<%s id='%s'> already specified" msgstr "<%s id='%s'> 태그가 이미 있습니다" -#: gio/glib-compile-schemas.c:1422 gio/glib-compile-schemas.c:1438 +#: gio/glib-compile-schemas.c:1419 gio/glib-compile-schemas.c:1435 #, c-format msgid "Only one <%s> element allowed inside <%s>" msgstr "<%2$s> 안에는 <%1$s> 요소를 하나만 쓸 수 있습니다" -#: gio/glib-compile-schemas.c:1520 +#: gio/glib-compile-schemas.c:1517 #, c-format msgid "Element <%s> not allowed at the top level" msgstr "<%s> 요소는 최상위에 사용할 수 없습니다" -#: gio/glib-compile-schemas.c:1538 +#: gio/glib-compile-schemas.c:1535 msgid "Element <default> is required in <key>" msgstr "<default> 엘리먼트가 <key>에 필요합니다" -#: gio/glib-compile-schemas.c:1628 +#: gio/glib-compile-schemas.c:1625 #, c-format msgid "Text may not appear inside <%s>" msgstr "<%s> 안에는 문자가 들어갈 수 없습니다" -#: gio/glib-compile-schemas.c:1696 +#: gio/glib-compile-schemas.c:1693 #, c-format msgid "Warning: undefined reference to <schema id='%s'/>" msgstr "주의: <schema id='%s'/>에 정의되지 않은 참조" #. Translators: Do not translate "--strict". -#: gio/glib-compile-schemas.c:1835 gio/glib-compile-schemas.c:1914 +#: gio/glib-compile-schemas.c:1832 gio/glib-compile-schemas.c:1911 msgid "--strict was specified; exiting." msgstr "--strict 옵션을 지정했습니다. 끝냅니다." -#: gio/glib-compile-schemas.c:1847 +#: gio/glib-compile-schemas.c:1844 msgid "This entire file has been ignored." msgstr "이 파일 전체를 무시합니다." -#: gio/glib-compile-schemas.c:1910 +#: gio/glib-compile-schemas.c:1907 msgid "Ignoring this file." msgstr "이 파일을 무시합니다." -#: gio/glib-compile-schemas.c:1965 +#: gio/glib-compile-schemas.c:1962 #, c-format msgid "" "No such key “%s” in schema “%s” as specified in override file “%s”; ignoring " @@ -2860,7 +2869,7 @@ "“%s” 키가 “%s” 스키마에 없습니다 (오버라이드 파일 “%s”). 이 키에 대한 오버라" "이드를 무시합니다." -#: gio/glib-compile-schemas.c:1973 +#: gio/glib-compile-schemas.c:1970 #, c-format msgid "" "No such key “%s” in schema “%s” as specified in override file “%s” and --" @@ -2869,7 +2878,7 @@ "“%s” 키가 “%s” 스키마에 없고 (오버라이드 파일 “%s”), --strict 옵션을 지정했으" "므로 끝납니다." -#: gio/glib-compile-schemas.c:1995 +#: gio/glib-compile-schemas.c:1992 #, c-format msgid "" "Cannot provide per-desktop overrides for localized key “%s” in schema " @@ -2878,7 +2887,7 @@ "지역화 키 “%s”에 (스키마 “%s”, 오버라이드 파일 “%s”) 대한 데스크톱별 오버라이" "드를 제공할 수 없습니다. 이 키에 대한 오버라이드를 무시합니다." -#: gio/glib-compile-schemas.c:2004 +#: gio/glib-compile-schemas.c:2001 #, c-format msgid "" "Cannot provide per-desktop overrides for localized key “%s” in schema " @@ -2887,7 +2896,7 @@ "지역화 키 “%s”에 (스키마 “%s”, 오버라이드 파일 “%s”) 대한 데스크톱별 오버라이" "드를 제공할 수 없고, --strict 옵션을 지정했으므로 끝납니다." -#: gio/glib-compile-schemas.c:2028 +#: gio/glib-compile-schemas.c:2025 #, c-format msgid "" "Error parsing key “%s” in schema “%s” as specified in override file “%s”: " @@ -2896,7 +2905,7 @@ "“%s” 키를 (“%s” 스키마) 해석하는데 오류 (오버라이드 파일 “%s”): %s. 이 키에 " "대한 오버라이드를 무시합니다." -#: gio/glib-compile-schemas.c:2040 +#: gio/glib-compile-schemas.c:2037 #, c-format msgid "" "Error parsing key “%s” in schema “%s” as specified in override file “%s”: " @@ -2905,7 +2914,7 @@ "“%s” 키를 (“%s” 스키마) 해석하는데 오류 (오버라이드 파일 “%s”): %s. --strict " "옵션을 지정했으므로 끝납니다." -#: gio/glib-compile-schemas.c:2067 +#: gio/glib-compile-schemas.c:2064 #, c-format msgid "" "Override for key “%s” in schema “%s” in override file “%s” is outside the " @@ -2914,7 +2923,7 @@ "오버라이드 파일 “%3$s”, “%2$s” 스키마의 “%1$s” 키 오버라이드는 주어진 스키마" "의 범위에서 벗어납니다. 이 키에 대한 오버라이드를 무시합니다." -#: gio/glib-compile-schemas.c:2077 +#: gio/glib-compile-schemas.c:2074 #, c-format msgid "" "Override for key “%s” in schema “%s” in override file “%s” is outside the " @@ -2923,7 +2932,7 @@ "덮어 쓸 파일 “%3$s”, “%2$s” 스키마의 “%1$s” 키 오버라이드는 주어진 스키마의 " "범위에서 벗어나고, --strict 옵션을 지정했으므로 끝납니다." -#: gio/glib-compile-schemas.c:2103 +#: gio/glib-compile-schemas.c:2100 #, c-format msgid "" "Override for key “%s” in schema “%s” in override file “%s” is not in the " @@ -2932,7 +2941,7 @@ "오버라이드 파일 “%3$s”, “%2$s” 스키마의 “%1$s” 키는 올바른 값 중 하나가 아닙" "니다. 이 키에 대한 오버라이드를 무시합니다." -#: gio/glib-compile-schemas.c:2113 +#: gio/glib-compile-schemas.c:2110 #, c-format msgid "" "Override for key “%s” in schema “%s” in override file “%s” is not in the " @@ -2941,26 +2950,26 @@ "오버라이드 파일 “%3$s”, “%2$s” 스키마의 “%1$s” 키는 올바른 값 중 하나가 아니" "고, --strict 옵션을 지정했으므로 끝납니다." -#: gio/glib-compile-schemas.c:2175 +#: gio/glib-compile-schemas.c:2172 msgid "Where to store the gschemas.compiled file" msgstr "gschemas.compiled 파일을 저장할 위치" # 옵션 설명 -#: gio/glib-compile-schemas.c:2176 +#: gio/glib-compile-schemas.c:2173 msgid "Abort on any errors in schemas" msgstr "스키마에 오류가 하나라도 있으면 중지합니다" # 옵션 설명 -#: gio/glib-compile-schemas.c:2177 +#: gio/glib-compile-schemas.c:2174 msgid "Do not write the gschema.compiled file" msgstr "gschema.compiled 파일을 쓰지 않습니다" # 옵션 설명 -#: gio/glib-compile-schemas.c:2178 +#: gio/glib-compile-schemas.c:2175 msgid "Do not enforce key name restrictions" msgstr "키 이름을 제한하지 않습니다" -#: gio/glib-compile-schemas.c:2207 +#: gio/glib-compile-schemas.c:2204 msgid "" "Compile all GSettings schema files into a schema cache.\n" "Schema files are required to have the extension .gschema.xml,\n" @@ -2970,15 +2979,15 @@ "스키마 파일 확장자는 .schema.xml이어야 하고,\n" "캐시 파일 이름은 gschemas.compile이어야 합니다." -#: gio/glib-compile-schemas.c:2228 +#: gio/glib-compile-schemas.c:2225 msgid "You should give exactly one directory name" msgstr "정확히 디렉터리 이름을 하나 지정해야 합니다" -#: gio/glib-compile-schemas.c:2271 +#: gio/glib-compile-schemas.c:2268 msgid "No schema files found: doing nothing." msgstr "스키마 파일이 없습니다: 아무 것도 하지 않습니다." -#: gio/glib-compile-schemas.c:2273 +#: gio/glib-compile-schemas.c:2270 msgid "No schema files found: removed existing output file." msgstr "스키마 파일이 없습니다: 현재 출력 파일을 제거합니다." @@ -2987,7 +2996,7 @@ msgid "Invalid filename %s" msgstr "잘못된 파일 이름 %s" -#: gio/glocalfile.c:996 +#: gio/glocalfile.c:1005 #, c-format msgid "Error getting filesystem info for %s: %s" msgstr "%s의 파일 시스템 정보를 가져오는 중 오류: %s" @@ -2996,125 +3005,125 @@ #. * the enclosing (user visible) mount of a file, but none #. * exists. #. -#: gio/glocalfile.c:1137 +#: gio/glocalfile.c:1141 #, c-format msgid "Containing mount for file %s not found" msgstr "%s 파일이 들어 있는 마운트가 없습니다" -#: gio/glocalfile.c:1160 +#: gio/glocalfile.c:1164 msgid "Can’t rename root directory" msgstr "루트 디렉터리의 이름을 바꿀 수 없습니다" -#: gio/glocalfile.c:1178 gio/glocalfile.c:1201 +#: gio/glocalfile.c:1182 gio/glocalfile.c:1205 #, c-format msgid "Error renaming file %s: %s" msgstr "%s 파일의 이름 바꾸는 중 오류: %s" -#: gio/glocalfile.c:1185 +#: gio/glocalfile.c:1189 msgid "Can’t rename file, filename already exists" msgstr "파일 이름을 바꿀 수 없습니다. 파일이 이미 있습니다" -#: gio/glocalfile.c:1198 gio/glocalfile.c:2394 gio/glocalfile.c:2422 -#: gio/glocalfile.c:2561 gio/glocalfileoutputstream.c:658 +#: gio/glocalfile.c:1202 gio/glocalfile.c:2405 gio/glocalfile.c:2433 +#: gio/glocalfile.c:2572 gio/glocalfileoutputstream.c:658 msgid "Invalid filename" msgstr "잘못된 파일 이름" -#: gio/glocalfile.c:1366 gio/glocalfile.c:1377 +#: gio/glocalfile.c:1370 gio/glocalfile.c:1381 #, c-format msgid "Error opening file %s: %s" msgstr "%s 파일을 여는 중 오류: %s" -#: gio/glocalfile.c:1502 +#: gio/glocalfile.c:1506 #, c-format msgid "Error removing file %s: %s" msgstr "%s 파일 제거하는 중 오류: %s" -#: gio/glocalfile.c:1996 gio/glocalfile.c:2007 gio/glocalfile.c:2034 +#: gio/glocalfile.c:2000 gio/glocalfile.c:2011 gio/glocalfile.c:2038 #, c-format msgid "Error trashing file %s: %s" msgstr "%s 파일 버리는 중 오류: %s" -#: gio/glocalfile.c:2054 +#: gio/glocalfile.c:2058 #, c-format msgid "Unable to create trash directory %s: %s" msgstr "휴지통 디렉터리(%s)를 만들 수 없습니다: %s" -#: gio/glocalfile.c:2075 +#: gio/glocalfile.c:2079 #, c-format msgid "Unable to find toplevel directory to trash %s" msgstr "%s 휴지통의 상위 디렉터리를 찾을 수 없습니다" # reflink/clone은 btrfs에서 임시 복사하는 걸 말한다 -#: gio/glocalfile.c:2083 +#: gio/glocalfile.c:2087 #, c-format msgid "Trashing on system internal mounts is not supported" msgstr "시스템 내부 마운트에 대해 휴지통은 지원하지 않습니다" -#: gio/glocalfile.c:2169 gio/glocalfile.c:2197 +#: gio/glocalfile.c:2173 gio/glocalfile.c:2201 #, c-format msgid "Unable to find or create trash directory %s to trash %s" msgstr "%s 휴지통 디렉터리를 (%s 버리기) 찾을 수 없거나 만들 수 없습니다" -#: gio/glocalfile.c:2243 +#: gio/glocalfile.c:2245 #, c-format msgid "Unable to create trashing info file for %s: %s" msgstr "%s에 대한 휴지통 정보 파일을 만들 수 없습니다: %s" -#: gio/glocalfile.c:2305 +#: gio/glocalfile.c:2316 #, c-format msgid "Unable to trash file %s across filesystem boundaries" msgstr "%s 파일을 파일 시스템 경계를 넘어서서 버릴 수 없습니다" -#: gio/glocalfile.c:2309 gio/glocalfile.c:2365 +#: gio/glocalfile.c:2320 gio/glocalfile.c:2376 #, c-format msgid "Unable to trash file %s: %s" msgstr "%s 파일을 버릴 수 없습니다: %s" -#: gio/glocalfile.c:2371 +#: gio/glocalfile.c:2382 #, c-format msgid "Unable to trash file %s" msgstr "%s 파일을 버릴 수 없습니다" -#: gio/glocalfile.c:2397 +#: gio/glocalfile.c:2408 #, c-format msgid "Error creating directory %s: %s" msgstr "%s 디렉터리를 만드는 중 오류: %s" -#: gio/glocalfile.c:2426 +#: gio/glocalfile.c:2437 #, c-format msgid "Filesystem does not support symbolic links" msgstr "파일 시스템이 심볼릭 링크를 지원하지 않습니다" -#: gio/glocalfile.c:2429 +#: gio/glocalfile.c:2440 #, c-format msgid "Error making symbolic link %s: %s" msgstr "%s 심볼릭 링크를 만드는 중 오류: %s" -#: gio/glocalfile.c:2472 gio/glocalfile.c:2507 gio/glocalfile.c:2564 +#: gio/glocalfile.c:2483 gio/glocalfile.c:2518 gio/glocalfile.c:2575 #, c-format msgid "Error moving file %s: %s" msgstr "%s 파일 옮기는 중 오류: %s" -#: gio/glocalfile.c:2495 +#: gio/glocalfile.c:2506 msgid "Can’t move directory over directory" msgstr "디렉터리를 덮어 써서 디렉터리를 옮길 수 없습니다" -#: gio/glocalfile.c:2521 gio/glocalfileoutputstream.c:1110 +#: gio/glocalfile.c:2532 gio/glocalfileoutputstream.c:1110 #: gio/glocalfileoutputstream.c:1124 gio/glocalfileoutputstream.c:1139 #: gio/glocalfileoutputstream.c:1156 gio/glocalfileoutputstream.c:1170 msgid "Backup file creation failed" msgstr "백업 파일 만들기가 실패했습니다" -#: gio/glocalfile.c:2540 +#: gio/glocalfile.c:2551 #, c-format msgid "Error removing target file: %s" msgstr "대상 파일을 제거하는 중 오류: %s" -#: gio/glocalfile.c:2554 +#: gio/glocalfile.c:2565 msgid "Move between mounts not supported" msgstr "다른 마운트 사이에 옮기기는 지원하지 않습니다" -#: gio/glocalfile.c:2728 +#: gio/glocalfile.c:2741 #, c-format msgid "Could not determine the disk usage of %s: %s" msgstr "%s의 디스크 사용량을 알아낼 수 없습니다: %s" @@ -3136,116 +3145,116 @@ msgid "Error setting extended attribute “%s”: %s" msgstr "확장 속성 “%s” 설정 중 오류: %s" -#: gio/glocalfileinfo.c:1738 gio/win32/gwinhttpfile.c:191 +#: gio/glocalfileinfo.c:1819 gio/win32/gwinhttpfile.c:191 msgid " (invalid encoding)" msgstr " (잘못된 인코딩)" -#: gio/glocalfileinfo.c:1897 gio/glocalfileoutputstream.c:945 +#: gio/glocalfileinfo.c:1978 gio/glocalfileoutputstream.c:945 #: gio/glocalfileoutputstream.c:997 #, c-format msgid "Error when getting information for file “%s”: %s" msgstr "“%s” 파일 정보를 가져오는 중 오류: %s" -#: gio/glocalfileinfo.c:2163 +#: gio/glocalfileinfo.c:2281 #, c-format msgid "Error when getting information for file descriptor: %s" msgstr "파일 서술자 정보를 가져오는 중 오류: %s" -#: gio/glocalfileinfo.c:2208 +#: gio/glocalfileinfo.c:2326 msgid "Invalid attribute type (uint32 expected)" msgstr "잘못된 속성 형식 (uint32 필요)" -#: gio/glocalfileinfo.c:2226 +#: gio/glocalfileinfo.c:2344 msgid "Invalid attribute type (uint64 expected)" msgstr "잘못된 속성 형식 (uint64 필요)" -#: gio/glocalfileinfo.c:2245 gio/glocalfileinfo.c:2264 +#: gio/glocalfileinfo.c:2363 gio/glocalfileinfo.c:2382 msgid "Invalid attribute type (byte string expected)" msgstr "잘못된 속성 형식 (바이트 문자열 필요)" -#: gio/glocalfileinfo.c:2311 +#: gio/glocalfileinfo.c:2429 msgid "Cannot set permissions on symlinks" msgstr "심볼릭 링크에는 권한을 설정할 수 없습니다" -#: gio/glocalfileinfo.c:2327 +#: gio/glocalfileinfo.c:2445 #, c-format msgid "Error setting permissions: %s" msgstr "권한 설정 중 오류: %s" -#: gio/glocalfileinfo.c:2378 +#: gio/glocalfileinfo.c:2496 #, c-format msgid "Error setting owner: %s" msgstr "소유자 설정 중 오류: %s" -#: gio/glocalfileinfo.c:2401 +#: gio/glocalfileinfo.c:2519 msgid "symlink must be non-NULL" msgstr "심볼릭 링크는 NULL이 아니어야 합니다" -#: gio/glocalfileinfo.c:2411 gio/glocalfileinfo.c:2430 -#: gio/glocalfileinfo.c:2441 +#: gio/glocalfileinfo.c:2529 gio/glocalfileinfo.c:2548 +#: gio/glocalfileinfo.c:2559 #, c-format msgid "Error setting symlink: %s" msgstr "심볼릭 링크 설정 중 오류: %s" -#: gio/glocalfileinfo.c:2420 +#: gio/glocalfileinfo.c:2538 msgid "Error setting symlink: file is not a symlink" msgstr "심볼릭 링크 설정 중 오류: 파일이 심볼릭 링크가 아닙니다" -#: gio/glocalfileinfo.c:2492 +#: gio/glocalfileinfo.c:2630 #, c-format msgid "Extra nanoseconds %d for UNIX timestamp %lld are negative" msgstr "유닉스 타임스탬프 %2$lld에 대해 추가 나노초 %1$d 값이 음수입니다" -#: gio/glocalfileinfo.c:2501 +#: gio/glocalfileinfo.c:2639 #, c-format msgid "Extra nanoseconds %d for UNIX timestamp %lld reach 1 second" msgstr "" "유닉스 타임스탬프 %2$lld에 대해 추가 나노초 %1$d 값이 1초에 도달했습니다" -#: gio/glocalfileinfo.c:2511 +#: gio/glocalfileinfo.c:2649 #, c-format msgid "UNIX timestamp %lld does not fit into 64 bits" msgstr "유닉스 타임스탬프 %lld 값이 64비트에 들어가지 않습니다" -#: gio/glocalfileinfo.c:2522 +#: gio/glocalfileinfo.c:2660 #, c-format msgid "UNIX timestamp %lld is outside of the range supported by Windows" msgstr "유닉스 타임스탬프 %lld 값이 윈도우에서 지원하는 범위 밖에 있습니다" -#: gio/glocalfileinfo.c:2625 +#: gio/glocalfileinfo.c:2792 #, c-format msgid "File name “%s” cannot be converted to UTF-16" msgstr "“%s” 파일이름을 UTF-16으로 변환할 수 없습니다." -#: gio/glocalfileinfo.c:2644 +#: gio/glocalfileinfo.c:2811 #, c-format msgid "File “%s” cannot be opened: Windows Error %lu" msgstr "“%s” 파일을 열 수 없습니다: 윈도우 오류 %lu" -#: gio/glocalfileinfo.c:2657 +#: gio/glocalfileinfo.c:2824 #, c-format msgid "Error setting modification or access time for file “%s”: %lu" msgstr "“%s” 파일에 대해 수정 시각 또는 접근 시각 설정에 오류: %lu" -#: gio/glocalfileinfo.c:2798 gio/glocalfileinfo.c:2810 +#: gio/glocalfileinfo.c:2981 #, c-format msgid "Error setting modification or access time: %s" msgstr "수정 시각이나 접근 시각을 설정하는데 오류: %s" -#: gio/glocalfileinfo.c:2833 +#: gio/glocalfileinfo.c:3004 msgid "SELinux context must be non-NULL" msgstr "SELinux 컨텍스트는 NULL이 아니어야 합니다" -#: gio/glocalfileinfo.c:2840 +#: gio/glocalfileinfo.c:3011 msgid "SELinux is not enabled on this system" msgstr "이 시스템은 SELinux를 사용하지 않습니다" -#: gio/glocalfileinfo.c:2850 +#: gio/glocalfileinfo.c:3021 #, c-format msgid "Error setting SELinux context: %s" msgstr "SELinux 컨텍스트 설정 중 오류: %s" -#: gio/glocalfileinfo.c:2947 +#: gio/glocalfileinfo.c:3118 #, c-format msgid "Setting attribute %s not supported" msgstr "%s 속성 설정은 지원하지 않습니다" @@ -3292,13 +3301,13 @@ msgid "Error renaming temporary file: %s" msgstr "임시 파일의 이름을 바꾸는 오류: %s" -#: gio/glocalfileoutputstream.c:611 gio/glocalfileoutputstream.c:1241 +#: gio/glocalfileoutputstream.c:611 gio/glocalfileoutputstream.c:1242 #, c-format msgid "Error truncating file: %s" msgstr "파일을 자르는 중 오류: %s" #: gio/glocalfileoutputstream.c:664 gio/glocalfileoutputstream.c:909 -#: gio/glocalfileoutputstream.c:1222 gio/gsubprocess.c:231 +#: gio/glocalfileoutputstream.c:1223 gio/gsubprocess.c:231 #, c-format msgid "Error opening file “%s”: %s" msgstr "“%s” 파일을 여는 중 오류: %s" @@ -3315,7 +3324,7 @@ msgid "The file was externally modified" msgstr "파일이 외부에서 바뀌었습니다" -#: gio/glocalfileoutputstream.c:1204 +#: gio/glocalfileoutputstream.c:1205 #, c-format msgid "Error removing old file: %s" msgstr "예전 파일을 제거하는 중 오류: %s" @@ -3462,8 +3471,8 @@ #. Translators: the first placeholder is a domain name, the #. * second is an error message #: gio/gresolver.c:403 gio/gthreadedresolver.c:152 gio/gthreadedresolver.c:170 -#: gio/gthreadedresolver.c:782 gio/gthreadedresolver.c:806 -#: gio/gthreadedresolver.c:831 gio/gthreadedresolver.c:846 +#: gio/gthreadedresolver.c:798 gio/gthreadedresolver.c:822 +#: gio/gthreadedresolver.c:847 gio/gthreadedresolver.c:862 #, c-format msgid "Error resolving “%s”: %s" msgstr "“%s”의 주소를 알아내는 데 오류: %s" @@ -4173,35 +4182,35 @@ #. Translators: the placeholder is a DNS record type, such as ‘MX’ or ‘SRV’ #: gio/gthreadedresolver.c:552 gio/gthreadedresolver.c:574 -#: gio/gthreadedresolver.c:612 gio/gthreadedresolver.c:659 -#: gio/gthreadedresolver.c:688 gio/gthreadedresolver.c:700 +#: gio/gthreadedresolver.c:628 gio/gthreadedresolver.c:675 +#: gio/gthreadedresolver.c:704 gio/gthreadedresolver.c:716 #, c-format msgid "Error parsing DNS %s record: malformed DNS packet" msgstr "DNS %s 레코드 파싱에 오류: 잘못된 형식의 DNS 패킷" -#: gio/gthreadedresolver.c:758 gio/gthreadedresolver.c:895 -#: gio/gthreadedresolver.c:993 gio/gthreadedresolver.c:1043 +#: gio/gthreadedresolver.c:774 gio/gthreadedresolver.c:911 +#: gio/gthreadedresolver.c:1009 gio/gthreadedresolver.c:1059 #, c-format msgid "No DNS record of the requested type for “%s”" msgstr "“%s”에 대한 요청 형식에 DNS 레코드가 없습니다" -#: gio/gthreadedresolver.c:763 gio/gthreadedresolver.c:998 +#: gio/gthreadedresolver.c:779 gio/gthreadedresolver.c:1014 #, c-format msgid "Temporarily unable to resolve “%s”" msgstr "일시적으로 “%s” 주소를 알아낼 수 없습니다" -#: gio/gthreadedresolver.c:768 gio/gthreadedresolver.c:1003 -#: gio/gthreadedresolver.c:1113 +#: gio/gthreadedresolver.c:784 gio/gthreadedresolver.c:1019 +#: gio/gthreadedresolver.c:1129 #, c-format msgid "Error resolving “%s”" msgstr "“%s”의 주소를 알아내는 데 오류" -#: gio/gthreadedresolver.c:782 gio/gthreadedresolver.c:806 -#: gio/gthreadedresolver.c:831 gio/gthreadedresolver.c:846 +#: gio/gthreadedresolver.c:798 gio/gthreadedresolver.c:822 +#: gio/gthreadedresolver.c:847 gio/gthreadedresolver.c:862 msgid "Malformed DNS packet" msgstr "잘못된 형식의 DNS 패킷" -#: gio/gthreadedresolver.c:888 +#: gio/gthreadedresolver.c:904 #, c-format msgid "Failed to parse DNS response for “%s”: " msgstr "“%s”에 대한 DNS 응답을 파싱하는데 실패했습니다: " @@ -4320,7 +4329,7 @@ msgid "Error closing file descriptor: %s" msgstr "파일 서술자를 닫는 중 오류: %s" -#: gio/gunixmounts.c:2815 gio/gunixmounts.c:2868 +#: gio/gunixmounts.c:2817 gio/gunixmounts.c:2870 msgid "Filesystem root" msgstr "파일 시스템 루트" @@ -4403,77 +4412,77 @@ msgid "Wrong args\n" msgstr "잘못된 인자\n" -#: glib/gbookmarkfile.c:779 +#: glib/gbookmarkfile.c:861 #, c-format msgid "Unexpected attribute “%s” for element “%s”" msgstr "예상치 못하게 “%2$s” 요소에 '%1$s' 속성이 있습니다" -#: glib/gbookmarkfile.c:790 glib/gbookmarkfile.c:870 glib/gbookmarkfile.c:880 -#: glib/gbookmarkfile.c:993 +#: glib/gbookmarkfile.c:872 glib/gbookmarkfile.c:952 glib/gbookmarkfile.c:962 +#: glib/gbookmarkfile.c:1075 #, c-format msgid "Attribute “%s” of element “%s” not found" msgstr "“%2$s” 요소에 “%1$s” 속성이 없습니다" -#: glib/gbookmarkfile.c:1202 glib/gbookmarkfile.c:1267 -#: glib/gbookmarkfile.c:1331 glib/gbookmarkfile.c:1341 +#: glib/gbookmarkfile.c:1284 glib/gbookmarkfile.c:1349 +#: glib/gbookmarkfile.c:1413 glib/gbookmarkfile.c:1423 #, c-format msgid "Unexpected tag “%s”, tag “%s” expected" msgstr "예상치 못하게 “%s” 태그가 있습니다. “%s” 태그가 있어야 합니다" -#: glib/gbookmarkfile.c:1227 glib/gbookmarkfile.c:1241 -#: glib/gbookmarkfile.c:1309 glib/gbookmarkfile.c:1355 +#: glib/gbookmarkfile.c:1309 glib/gbookmarkfile.c:1323 +#: glib/gbookmarkfile.c:1391 glib/gbookmarkfile.c:1437 #, c-format msgid "Unexpected tag “%s” inside “%s”" msgstr "예상치 못하게 “%2$s” 안에 “%1$s” 태그가 있습니다" -#: glib/gbookmarkfile.c:1635 +#: glib/gbookmarkfile.c:1717 #, c-format msgid "Invalid date/time ‘%s’ in bookmark file" msgstr "북마크 파일에서 잘못된 날짜/시각 ‘%s’" -#: glib/gbookmarkfile.c:1838 +#: glib/gbookmarkfile.c:1956 msgid "No valid bookmark file found in data dirs" msgstr "데이터 디렉터리에 올바른 북마크 파일이 없습니다" -#: glib/gbookmarkfile.c:2039 +#: glib/gbookmarkfile.c:2157 #, c-format msgid "A bookmark for URI “%s” already exists" msgstr "“%s” URL에 대한 북마크가 이미 있습니다" -#: glib/gbookmarkfile.c:2088 glib/gbookmarkfile.c:2246 -#: glib/gbookmarkfile.c:2331 glib/gbookmarkfile.c:2411 -#: glib/gbookmarkfile.c:2496 glib/gbookmarkfile.c:2630 -#: glib/gbookmarkfile.c:2763 glib/gbookmarkfile.c:2898 -#: glib/gbookmarkfile.c:2940 glib/gbookmarkfile.c:3037 -#: glib/gbookmarkfile.c:3158 glib/gbookmarkfile.c:3352 -#: glib/gbookmarkfile.c:3493 glib/gbookmarkfile.c:3712 -#: glib/gbookmarkfile.c:3801 glib/gbookmarkfile.c:3890 -#: glib/gbookmarkfile.c:4009 +#: glib/gbookmarkfile.c:2206 glib/gbookmarkfile.c:2364 +#: glib/gbookmarkfile.c:2449 glib/gbookmarkfile.c:2529 +#: glib/gbookmarkfile.c:2614 glib/gbookmarkfile.c:2748 +#: glib/gbookmarkfile.c:2881 glib/gbookmarkfile.c:3016 +#: glib/gbookmarkfile.c:3058 glib/gbookmarkfile.c:3155 +#: glib/gbookmarkfile.c:3276 glib/gbookmarkfile.c:3470 +#: glib/gbookmarkfile.c:3611 glib/gbookmarkfile.c:3830 +#: glib/gbookmarkfile.c:3919 glib/gbookmarkfile.c:4008 +#: glib/gbookmarkfile.c:4127 #, c-format msgid "No bookmark found for URI “%s”" msgstr "“%s” URL에 대한 북마크가 없습니다" -#: glib/gbookmarkfile.c:2420 +#: glib/gbookmarkfile.c:2538 #, c-format msgid "No MIME type defined in the bookmark for URI “%s”" msgstr "“%s” URL에 대한 북마크에 MIME 형식이 없습니다" -#: glib/gbookmarkfile.c:2505 +#: glib/gbookmarkfile.c:2623 #, c-format msgid "No private flag has been defined in bookmark for URI “%s”" msgstr "“%s” URL에 대한 북마크에 개인 플래그가 없습니다" -#: glib/gbookmarkfile.c:3046 +#: glib/gbookmarkfile.c:3164 #, c-format msgid "No groups set in bookmark for URI “%s”" msgstr "“%s” URL에 대한 북마크에 그룹이 설정되어 있지 않습니다" -#: glib/gbookmarkfile.c:3514 glib/gbookmarkfile.c:3722 +#: glib/gbookmarkfile.c:3632 glib/gbookmarkfile.c:3840 #, c-format msgid "No application with name “%s” registered a bookmark for “%s”" msgstr "“%s”에 대해 북마크를 등록한 “%s” 이름을 가진 프로그램이 없습니다" -#: glib/gbookmarkfile.c:3745 +#: glib/gbookmarkfile.c:3863 #, c-format msgid "Failed to expand exec line “%s” with URI “%s”" msgstr "URI “%s”을(를) 사용해 “%s” 실행 명령 확장하기에 실패했습니다" @@ -4948,78 +4957,78 @@ msgid "Error opening directory “%s”: %s" msgstr "디렉터리 “%s” 여는 중 오류 : %s" -#: glib/gfileutils.c:735 glib/gfileutils.c:827 +#: glib/gfileutils.c:753 glib/gfileutils.c:845 #, c-format msgid "Could not allocate %lu byte to read file “%s”" msgid_plural "Could not allocate %lu bytes to read file “%s”" msgstr0 "“%2$s” 파일을 읽는데 %1$lu 바이트를 할당할 수 없습니다" -#: glib/gfileutils.c:752 +#: glib/gfileutils.c:770 #, c-format msgid "Error reading file “%s”: %s" msgstr "“%s” 파일 읽는 중 오류: %s" -#: glib/gfileutils.c:788 +#: glib/gfileutils.c:806 #, c-format msgid "File “%s” is too large" msgstr "“%s” 파일이 너무 큽니다" -#: glib/gfileutils.c:852 +#: glib/gfileutils.c:870 #, c-format msgid "Failed to read from file “%s”: %s" msgstr "파일 “%s”에서 읽기 실패: %s" -#: glib/gfileutils.c:902 glib/gfileutils.c:977 glib/gfileutils.c:1449 +#: glib/gfileutils.c:920 glib/gfileutils.c:995 glib/gfileutils.c:1472 #, c-format msgid "Failed to open file “%s”: %s" msgstr "파일 “%s” 열기 실패: %s" -#: glib/gfileutils.c:915 +#: glib/gfileutils.c:933 #, c-format msgid "Failed to get attributes of file “%s”: fstat() failed: %s" msgstr "파일 “%s”의 속성 가져오기 실패: fstat() 실패: %s" -#: glib/gfileutils.c:946 +#: glib/gfileutils.c:964 #, c-format msgid "Failed to open file “%s”: fdopen() failed: %s" msgstr "파일 “%s” 열기 실패: fdopen() 실패: %s" -#: glib/gfileutils.c:1047 +#: glib/gfileutils.c:1065 #, c-format msgid "Failed to rename file “%s” to “%s”: g_rename() failed: %s" msgstr "파일 “%s”의 이름을 “%s”(으)로 바꾸는데 실패: g_rename() 실패: %s" -#: glib/gfileutils.c:1156 +#: glib/gfileutils.c:1179 #, c-format msgid "Failed to write file “%s”: write() failed: %s" msgstr "파일 “%s” 쓰기 실패: write() 실패: %s" -#: glib/gfileutils.c:1177 +#: glib/gfileutils.c:1200 #, c-format msgid "Failed to write file “%s”: fsync() failed: %s" msgstr "파일 “%s” 쓰기 실패: fsync() 실패: %s" -#: glib/gfileutils.c:1338 glib/gfileutils.c:1753 +#: glib/gfileutils.c:1361 glib/gfileutils.c:1776 #, c-format msgid "Failed to create file “%s”: %s" msgstr "파일 “%s” 만들기 실패: %s" -#: glib/gfileutils.c:1383 +#: glib/gfileutils.c:1406 #, c-format msgid "Existing file “%s” could not be removed: g_unlink() failed: %s" msgstr "기존의 “%s” 파일을 지울 수 없습니다: g_unlink() 실패: %s" -#: glib/gfileutils.c:1718 +#: glib/gfileutils.c:1741 #, c-format msgid "Template “%s” invalid, should not contain a “%s”" msgstr "“%s” 서식이 잘못되었습니다. “%s”이(가) 들어 있으면 안 됩니다" -#: glib/gfileutils.c:1731 +#: glib/gfileutils.c:1754 #, c-format msgid "Template “%s” doesn’t contain XXXXXX" msgstr "“%s” 서식에 XXXXXX가 없습니다" -#: glib/gfileutils.c:2291 glib/gfileutils.c:2320 +#: glib/gfileutils.c:2348 glib/gfileutils.c:2377 #, c-format msgid "Failed to read the symbolic link “%s”: %s" msgstr "심볼릭 링크 “%s” 읽기 실패: %s" @@ -5081,8 +5090,8 @@ msgstr "키 파일에 지원하지 않는 “%s” 인코딩이 들어 있습니다" #: glib/gkeyfile.c:1679 glib/gkeyfile.c:1852 glib/gkeyfile.c:3299 -#: glib/gkeyfile.c:3363 glib/gkeyfile.c:3493 glib/gkeyfile.c:3625 -#: glib/gkeyfile.c:3771 glib/gkeyfile.c:4006 glib/gkeyfile.c:4073 +#: glib/gkeyfile.c:3363 glib/gkeyfile.c:3493 glib/gkeyfile.c:3622 +#: glib/gkeyfile.c:3768 glib/gkeyfile.c:4003 glib/gkeyfile.c:4070 #, c-format msgid "Key file does not have group “%s”" msgstr "키 파일에 “%s” 그룹이 없습니다" @@ -5118,31 +5127,31 @@ msgstr "" "%4$s 값이 있어야 할 “%2$s” 그룹의 “%1$s” 키가 “%3$s” 값을 지니고 있습니다" -#: glib/gkeyfile.c:4326 +#: glib/gkeyfile.c:4323 msgid "Key file contains escape character at end of line" msgstr "키 파일의 줄 끝에 이스케이프 문자가 있습니다" -#: glib/gkeyfile.c:4348 +#: glib/gkeyfile.c:4345 #, c-format msgid "Key file contains invalid escape sequence “%s”" msgstr "키 파일에 잘못된 이스케이프 시퀀스 “%s”이(가) 들어 있습니다" -#: glib/gkeyfile.c:4493 +#: glib/gkeyfile.c:4490 #, c-format msgid "Value “%s” cannot be interpreted as a number." msgstr "값 “%s”을(를) 숫자로 해석할 수 없습니다." -#: glib/gkeyfile.c:4507 +#: glib/gkeyfile.c:4504 #, c-format msgid "Integer value “%s” out of range" msgstr "정수 값 “%s”이(가) 범위를 벗어났습니다" -#: glib/gkeyfile.c:4540 +#: glib/gkeyfile.c:4537 #, c-format msgid "Value “%s” cannot be interpreted as a float number." msgstr "값 “%s”을(를) 단정도 실수로 해석할 수 없습니다." -#: glib/gkeyfile.c:4579 +#: glib/gkeyfile.c:4576 #, c-format msgid "Value “%s” cannot be interpreted as a boolean." msgstr "값 “%s”을(를) 불리언 값으로 해석할 수 없습니다." @@ -5162,32 +5171,32 @@ msgid "Failed to open file “%s”: open() failed: %s" msgstr "파일 “%s” 열기 실패: dopen() 실패: %s" -#: glib/gmarkup.c:400 glib/gmarkup.c:442 +#: glib/gmarkup.c:393 glib/gmarkup.c:435 #, c-format msgid "Error on line %d char %d: " msgstr "%d째 줄 %d 문자에서 오류: " -#: glib/gmarkup.c:464 glib/gmarkup.c:547 +#: glib/gmarkup.c:457 glib/gmarkup.c:540 #, c-format msgid "Invalid UTF-8 encoded text in name — not valid “%s”" msgstr "이름에 잘못 UTF-8 인코딩된 텍스트 — “%s” 부분이 올바르지 않습니다" -#: glib/gmarkup.c:475 +#: glib/gmarkup.c:468 #, c-format msgid "“%s” is not a valid name" msgstr "“%s”은(는) 올바른 이름이 아닙니다" -#: glib/gmarkup.c:491 +#: glib/gmarkup.c:484 #, c-format msgid "“%s” is not a valid name: “%c”" msgstr "“%s”은(는) 올바른 이름이 아닙니다: “%c”" -#: glib/gmarkup.c:615 +#: glib/gmarkup.c:608 #, c-format msgid "Error on line %d: %s" msgstr "%d째 줄에서 오류: %s" -#: glib/gmarkup.c:692 +#: glib/gmarkup.c:685 #, c-format msgid "" "Failed to parse “%-.*s”, which should have been a digit inside a character " @@ -5196,7 +5205,7 @@ "“%-.*s”의 구문 해석에 실패했습니다. 문자 참조에는 숫자를 써야 합니다 (예를 " "들어 ê) — 숫자가 너무 클 수도 있습니다" -#: glib/gmarkup.c:704 +#: glib/gmarkup.c:697 msgid "" "Character reference did not end with a semicolon; most likely you used an " "ampersand character without intending to start an entity — escape ampersand " @@ -5205,24 +5214,24 @@ "문자 참조가 세미콜론으로 끝나지 않습니다. 보통 엔티티 시작에 사용하려고 하지 " "않은 곳에서 & 기호를 사용한 경우입니다 — 이런 경우 & 라고 쓰십시오" -#: glib/gmarkup.c:730 +#: glib/gmarkup.c:723 #, c-format msgid "Character reference “%-.*s” does not encode a permitted character" msgstr "문자 참조 “%-.*s”에 대응되는 문자는 허용되지 않습니다" -#: glib/gmarkup.c:768 +#: glib/gmarkup.c:761 msgid "" "Empty entity “&;” seen; valid entities are: & " < > '" msgstr "" "비어있는 엔티티 “&;”를 찾았습니다. 올바른 엔티티는 & " < > " "' 입니다" -#: glib/gmarkup.c:776 +#: glib/gmarkup.c:769 #, c-format msgid "Entity name “%-.*s” is not known" msgstr "엔티티 이름 “%-.*s”이(가) 알려져 있지 않습니다" -#: glib/gmarkup.c:781 +#: glib/gmarkup.c:774 msgid "" "Entity did not end with a semicolon; most likely you used an ampersand " "character without intending to start an entity — escape ampersand as &" @@ -5231,11 +5240,11 @@ "고 하지 않은 곳에서 & 기호를 사용한 경우입니다 — 이런 경우 & 라고 쓰십시" "오" -#: glib/gmarkup.c:1195 +#: glib/gmarkup.c:1188 msgid "Document must begin with an element (e.g. <book>)" msgstr "문서는 요소로 시작하여야 합니다 (예 <book>)" -#: glib/gmarkup.c:1235 +#: glib/gmarkup.c:1228 #, c-format msgid "" "“%s” is not a valid character following a “<” character; it may not begin an " @@ -5244,7 +5253,7 @@ "“%s”은(는) “<” 문자 다음에 쓸 수 없습니다. 이 문자로는 요소 이름을 시작할 수 " "없습니다" -#: glib/gmarkup.c:1278 +#: glib/gmarkup.c:1271 #, c-format msgid "" "Odd character “%s”, expected a “>” character to end the empty-element tag " @@ -5252,12 +5261,12 @@ msgstr "" "이상한 문자 “%s”. 빈 요소 “%s” 태그를 끝내는 “>” 문자가 나타나야 합니다" -#: glib/gmarkup.c:1348 +#: glib/gmarkup.c:1341 #, c-format msgid "Too many attributes in element “%s”" msgstr "“%s” 요소에 속성이 너무 많습니다" -#: glib/gmarkup.c:1368 +#: glib/gmarkup.c:1361 #, c-format msgid "" "Odd character “%s”, expected a “=” after attribute name “%s” of element “%s”" @@ -5265,7 +5274,7 @@ "이상한 문자 “%1$s”. 요소 “%3$s”의 속성 이름 “%2$s” 다음에 “=”이 나타나야 합" "니다" -#: glib/gmarkup.c:1410 +#: glib/gmarkup.c:1403 #, c-format msgid "" "Odd character “%s”, expected a “>” or “/” character to end the start tag of " @@ -5275,7 +5284,7 @@ "이상한 문자 “%s”. 요소 “%s”의 시작 태그를 끝내는 “>” 혹은 “/”가 나타나거나, " "속성이 나와야 합니다. 아마도 속성 이름에 잘못된 문자를 쓴 경우입니다." -#: glib/gmarkup.c:1455 +#: glib/gmarkup.c:1448 #, c-format msgid "" "Odd character “%s”, expected an open quote mark after the equals sign when " @@ -5284,7 +5293,7 @@ "이상한 문자 “%1$s”. 요소 “%3$s”의 속성 “%2$s”의 값을 부여할 때 “=” 기호 다음" "에 따옴표가 나타나야 합니다" -#: glib/gmarkup.c:1589 +#: glib/gmarkup.c:1582 #, c-format msgid "" "“%s” is not a valid character following the characters “</”; “%s” may not " @@ -5293,7 +5302,7 @@ "“%s”은(는) “</” 다음에 쓸 수 있는 문자가 아닙니다. “%s”은(는) 요소 이름을 시" "작할 수 없습니다" -#: glib/gmarkup.c:1627 +#: glib/gmarkup.c:1620 #, c-format msgid "" "“%s” is not a valid character following the close element name “%s”; the " @@ -5302,25 +5311,25 @@ "“%s”은(는) 요소 “%s”을(를) 닫은 다음에 쓸 수 있는 문자가 아닙니다. “>” 문자" "를 쓸 수 있습니다" -#: glib/gmarkup.c:1639 +#: glib/gmarkup.c:1632 #, c-format msgid "Element “%s” was closed, no element is currently open" msgstr "“%s” 요소는 닫혔고, 현재 아무 요소도 열려 있지 않습니다" -#: glib/gmarkup.c:1648 +#: glib/gmarkup.c:1641 #, c-format msgid "Element “%s” was closed, but the currently open element is “%s”" msgstr "“%s” 요소는 닫혔고, 현재 열려 있는 요소는 “%s”입니다" -#: glib/gmarkup.c:1801 +#: glib/gmarkup.c:1794 msgid "Document was empty or contained only whitespace" msgstr "문서가 비어있거나 공백문자만 들어 있습니다" -#: glib/gmarkup.c:1815 +#: glib/gmarkup.c:1808 msgid "Document ended unexpectedly just after an open angle bracket “<”" msgstr "“<” 바로 다음에 문서가 갑작스럽게 끝났습니다" -#: glib/gmarkup.c:1823 glib/gmarkup.c:1868 +#: glib/gmarkup.c:1816 glib/gmarkup.c:1861 #, c-format msgid "" "Document ended unexpectedly with elements still open — “%s” was the last " @@ -5329,7 +5338,7 @@ "요소가 열려 있는 상태로 문서가 갑작스럽게 끝났습니다 — 마지막에 열려 있던 요" "소는 “%s”입니다" -#: glib/gmarkup.c:1831 +#: glib/gmarkup.c:1824 #, c-format msgid "" "Document ended unexpectedly, expected to see a close angle bracket ending " @@ -5337,19 +5346,19 @@ msgstr "" "문서가 갑작스럽게 끝났습니다. <%s/> 태그를 끝내는 > 기호가 나타나야 합니다" -#: glib/gmarkup.c:1837 +#: glib/gmarkup.c:1830 msgid "Document ended unexpectedly inside an element name" msgstr "요소 이름에서 문서가 갑작스럽게 끝났습니다" -#: glib/gmarkup.c:1843 +#: glib/gmarkup.c:1836 msgid "Document ended unexpectedly inside an attribute name" msgstr "에트리뷰트 이름에서 문서가 갑작스럽게 끝났습니다" -#: glib/gmarkup.c:1848 +#: glib/gmarkup.c:1841 msgid "Document ended unexpectedly inside an element-opening tag." msgstr "요소의 열기 태그 안에서 문서가 갑작스럽게 끝났습니다." -#: glib/gmarkup.c:1854 +#: glib/gmarkup.c:1847 msgid "" "Document ended unexpectedly after the equals sign following an attribute " "name; no attribute value" @@ -5357,22 +5366,22 @@ "속성 이름 다음의 = 기호 다음에서 문서가 갑작스럽게 끝났습니다. 속성 값이 없습" "니다" -#: glib/gmarkup.c:1861 +#: glib/gmarkup.c:1854 msgid "Document ended unexpectedly while inside an attribute value" msgstr "속성 값 안에서 문서가 갑작스럽게 끝났습니다" -#: glib/gmarkup.c:1878 +#: glib/gmarkup.c:1871 #, c-format msgid "Document ended unexpectedly inside the close tag for element “%s”" msgstr "“%s” 요소의 닫기 태그 안에서 문서가 갑작스럽게 끝났습니다" -#: glib/gmarkup.c:1882 +#: glib/gmarkup.c:1875 msgid "" "Document ended unexpectedly inside the close tag for an unopened element" msgstr "“%s” 요소의 닫기 태그 안에서 문서가 갑작스럽게 끝났습니다" # FIXME: processing instruction? -#: glib/gmarkup.c:1888 +#: glib/gmarkup.c:1881 msgid "Document ended unexpectedly inside a comment or processing instruction" msgstr "주석문 혹은 처리 안내자 태그 안에서 문서가 갑작스럽게 끝났습니다" @@ -5435,184 +5444,184 @@ msgid "Unknown option %s" msgstr "알 수 없는 옵션 %s" -#: glib/gregex.c:436 +#: glib/gregex.c:479 msgid "corrupted object" msgstr "개체가 손상되었습니다" -#: glib/gregex.c:438 +#: glib/gregex.c:481 msgid "out of memory" msgstr "메모리 부족" -#: glib/gregex.c:443 +#: glib/gregex.c:487 msgid "backtracking limit reached" msgstr "역추적 최대값에 도달했습니다" -#: glib/gregex.c:454 glib/gregex.c:707 glib/gregex.c:736 +#: glib/gregex.c:498 msgid "internal error" msgstr "내부 오류" -#: glib/gregex.c:456 +#: glib/gregex.c:500 msgid "the pattern contains items not supported for partial matching" msgstr "패턴 안에 부분 매치에서 지원하지 않는 항목이 들어 있습니다." -#: glib/gregex.c:458 +#: glib/gregex.c:502 msgid "back references as conditions are not supported for partial matching" msgstr "후위 참조를 조건으로 사용하면 부분 매치에서 지원하지 않습니다." -#: glib/gregex.c:464 +#: glib/gregex.c:508 msgid "recursion limit reached" msgstr "재귀 최대값에 도달했습니다" -#: glib/gregex.c:466 +#: glib/gregex.c:510 msgid "bad offset" msgstr "오프셋이 잘못되었습니다" -#: glib/gregex.c:468 +#: glib/gregex.c:512 msgid "recursion loop" msgstr "재귀 순환" #. should not happen in GRegex since we check modes before each match -#: glib/gregex.c:471 +#: glib/gregex.c:515 msgid "matching mode is requested that was not compiled for JIT" msgstr "일치 모드를 요청했지만 JIT 용도로 컴파일되지 않았습니다." -#: glib/gregex.c:475 +#: glib/gregex.c:536 glib/gregex.c:1838 msgid "unknown error" msgstr "알 수 없는 오류" -#: glib/gregex.c:496 +#: glib/gregex.c:557 msgid "\\ at end of pattern" msgstr "패턴 끝에 \\" -#: glib/gregex.c:500 +#: glib/gregex.c:561 msgid "\\c at end of pattern" msgstr "패턴 끝에 \\c" -#: glib/gregex.c:505 +#: glib/gregex.c:566 msgid "unrecognized character following \\" msgstr "\\ 다음에 인식할 수 없는 문자가 있습니다" -#: glib/gregex.c:509 +#: glib/gregex.c:570 msgid "numbers out of order in {} quantifier" msgstr "{} 안의 숫자가 순서를 벗어났습니다" -#: glib/gregex.c:513 +#: glib/gregex.c:574 msgid "number too big in {} quantifier" msgstr "{} 안의 숫자가 너무 큽니다" -#: glib/gregex.c:517 +#: glib/gregex.c:578 msgid "missing terminating for character class" msgstr "문자 클래스에서 끝나는 괄호가 빠졌습니다" -#: glib/gregex.c:521 +#: glib/gregex.c:582 msgid "invalid escape sequence in character class" msgstr "문자 클래스에서 이스케이프 시퀀스가 잘못되었습니다" -#: glib/gregex.c:525 +#: glib/gregex.c:586 msgid "range out of order in character class" msgstr "문자 클래스에서 범위가 순서를 벗어났습니다" -#: glib/gregex.c:530 +#: glib/gregex.c:591 msgid "nothing to repeat" msgstr "반복할 사항 없음" -#: glib/gregex.c:534 +#: glib/gregex.c:595 msgid "unrecognized character after (? or (?-" msgstr "(? 또는 (?- 다음에 알 수 없는 문자가 있습니다" -#: glib/gregex.c:538 +#: glib/gregex.c:599 msgid "POSIX named classes are supported only within a class" msgstr "POSIX 네임드 클래스는 클래스 안에서만 지원합니다" -#: glib/gregex.c:542 +#: glib/gregex.c:603 msgid "POSIX collating elements are not supported" msgstr "POSIX 사전 순서 항목은 지원하지 않습니다" -#: glib/gregex.c:548 +#: glib/gregex.c:609 msgid "missing terminating )" msgstr "끝나는 ) 괄호가 없습니다" -#: glib/gregex.c:552 +#: glib/gregex.c:613 msgid "reference to non-existent subpattern" msgstr "없는 하위 패턴을 참조합니다" -#: glib/gregex.c:556 +#: glib/gregex.c:617 msgid "missing ) after comment" msgstr "주석 다음에 ) 괄호가 빠졌습니다" -#: glib/gregex.c:560 +#: glib/gregex.c:621 msgid "regular expression is too large" msgstr "정규식이 너무 깁니다" -#: glib/gregex.c:564 +#: glib/gregex.c:625 msgid "malformed number or name after (?(" msgstr "(?( 다음에 숫자나 이름의 형식이 잘못되었습니다" -#: glib/gregex.c:568 +#: glib/gregex.c:629 msgid "lookbehind assertion is not fixed length" msgstr "룩비하인드 어서션이 고정된 길이가 아닙니다" -#: glib/gregex.c:572 +#: glib/gregex.c:633 msgid "conditional group contains more than two branches" msgstr "조건문 그룹에 브랜치가 2개보다 많이 들어 있습니다" -#: glib/gregex.c:576 +#: glib/gregex.c:637 msgid "assertion expected after (?(" msgstr "(?( 다음에 어서션이 이와야 합니다" -#: glib/gregex.c:580 +#: glib/gregex.c:641 msgid "a numbered reference must not be zero" msgstr "번호를 매긴 참조는 0이 되어서는 안됩니다" -#: glib/gregex.c:584 +#: glib/gregex.c:645 msgid "unknown POSIX class name" msgstr "알 수 없는 POSIX 클래스 이름" -#: glib/gregex.c:589 +#: glib/gregex.c:650 msgid "character value in \\x{...} sequence is too large" msgstr "\\x{...} 시퀀스의 문자 값이 너무 큽니다" -#: glib/gregex.c:593 +#: glib/gregex.c:654 msgid "\\C not allowed in lookbehind assertion" msgstr "\\C는 룩비하인드 어서션에서 사용할 수 없습니다" -#: glib/gregex.c:597 +#: glib/gregex.c:658 msgid "missing terminator in subpattern name" msgstr "하위 패턴 이름에 끝나는 글자가 빠졌습니다" -#: glib/gregex.c:601 +#: glib/gregex.c:662 msgid "two named subpatterns have the same name" msgstr "이름 있는 2개의 하위 패턴의 이름이 같습니다" -#: glib/gregex.c:605 +#: glib/gregex.c:666 msgid "malformed \\P or \\p sequence" msgstr "\\P 혹은 \\p 시퀀스의 형식이 잘못되었습니다" -#: glib/gregex.c:609 +#: glib/gregex.c:670 msgid "unknown property name after \\P or \\p" msgstr "\\P 혹은 \\p 다음에 속성 이름을 알 수 없습니다" -#: glib/gregex.c:613 +#: glib/gregex.c:674 msgid "subpattern name is too long (maximum 32 characters)" msgstr "하위 패턴 이름이 너무 깁니다 (최대 32글자)" -#: glib/gregex.c:617 +#: glib/gregex.c:678 msgid "too many named subpatterns (maximum 10,000)" msgstr "이름 있는 하위 패턴이 너무 많습니다 (최대 10,000개)" -#: glib/gregex.c:621 +#: glib/gregex.c:682 msgid "octal value is greater than \\377" msgstr "8진수값이 \\377보다 큽니다" -#: glib/gregex.c:625 +#: glib/gregex.c:686 msgid "DEFINE group contains more than one branch" msgstr "DEFINE 그룹에 브랜치가 여러 개 들어 있습니다" -#: glib/gregex.c:629 +#: glib/gregex.c:690 msgid "inconsistent NEWLINE options" msgstr "일관성 없는 NEWLINE 옵션" -#: glib/gregex.c:633 +#: glib/gregex.c:694 msgid "" "\\g is not followed by a braced, angle-bracketed, or quoted name or number, " "or by a plain number" @@ -5620,117 +5629,117 @@ "중괄호, 각괄호, 따옴표가 붙은 이름 또는 숫자, 또는 순수한 숫자가 따라오지 않" "았습니다" -#: glib/gregex.c:638 +#: glib/gregex.c:699 msgid "an argument is not allowed for (*ACCEPT), (*FAIL), or (*COMMIT)" msgstr "(*ACCEPT), (*FAIL), 또는 (*COMMIT)을 감안하여 인자를 허용하지 않습니다" -#: glib/gregex.c:642 +#: glib/gregex.c:703 msgid "(*VERB) not recognized" msgstr "(*VERB)를 인식하지 않았습니다" -#: glib/gregex.c:646 +#: glib/gregex.c:707 msgid "number is too big" msgstr "숫자가 너무 큽니다" -#: glib/gregex.c:650 +#: glib/gregex.c:711 msgid "missing subpattern name after (?&" msgstr "(?& 다음에 하위 패턴 이름이 빠졌습니다" -#: glib/gregex.c:654 +#: glib/gregex.c:715 msgid "different names for subpatterns of the same number are not allowed" msgstr "동일한 갯수의 하위 패턴에 대해 다른 이름을 허용하지 않습니다" -#: glib/gregex.c:658 +#: glib/gregex.c:719 msgid "(*MARK) must have an argument" msgstr "(*MARK)에 인자가 있어야 합니다" -#: glib/gregex.c:662 +#: glib/gregex.c:723 msgid "\\c must be followed by an ASCII character" msgstr "\\c 다음에 아스키 문자가 있어야 합니다" -#: glib/gregex.c:666 +#: glib/gregex.c:727 msgid "\\k is not followed by a braced, angle-bracketed, or quoted name" msgstr "\\k 다음에 중괄호, 각괄호, 따옴표가 붙은 이름이 따라오지 않았습니다" -#: glib/gregex.c:670 +#: glib/gregex.c:731 msgid "\\N is not supported in a class" msgstr "클래스에서 \\N을 지원하지 않습니다" -#: glib/gregex.c:674 +#: glib/gregex.c:735 msgid "name is too long in (*MARK), (*PRUNE), (*SKIP), or (*THEN)" msgstr "(*MARK), (*PRUNE), (*SKIP), 또는 (*THEN)의 이름이 너무 깁니다" -#: glib/gregex.c:678 glib/gregex.c:809 +#: glib/gregex.c:739 glib/gregex.c:875 msgid "code overflow" msgstr "코드 오버플로우" -#: glib/gregex.c:682 +#: glib/gregex.c:743 msgid "unrecognized character after (?P" msgstr "(?P 다음에 알 수 없는 문자" -#: glib/gregex.c:686 +#: glib/gregex.c:747 msgid "overran compiling workspace" msgstr "컴파일 작업 공간을 넘어갔습니다" -#: glib/gregex.c:690 +#: glib/gregex.c:751 msgid "previously-checked referenced subpattern not found" msgstr "이전에 검사한 참조할 하위 패턴이 없습니다" -#: glib/gregex.c:808 glib/gregex.c:1041 glib/gregex.c:2342 +#: glib/gregex.c:874 glib/gregex.c:1121 glib/gregex.c:2444 #, c-format msgid "Error while matching regular expression %s: %s" msgstr "정규 표현식 %s을(를) 맞추는 도중 오류가 발생했습니다: %s" -#: glib/gregex.c:1618 +#: glib/gregex.c:1721 msgid "PCRE library is compiled without UTF8 support" msgstr "PCRE 라이브러리가 UTF8 지원 없이 컴파일되었습니다" -#: glib/gregex.c:1626 +#: glib/gregex.c:1729 msgid "PCRE library is compiled with incompatible options" msgstr "비호환 옵션을 사용하여 PCRE 라이브러리 컴파일했습니다" -#: glib/gregex.c:1751 +#: glib/gregex.c:1847 #, c-format msgid "Error while compiling regular expression ‘%s’ at char %s: %s" msgstr "‘%s’ 정규 표현식을 컴파일하는 중 %s 문자에서 오류가 발생했습니다: %s" -#: glib/gregex.c:2786 +#: glib/gregex.c:2887 msgid "hexadecimal digit or “}” expected" msgstr "16 진수 또는 “}”가 있어야 합니다" -#: glib/gregex.c:2802 +#: glib/gregex.c:2903 msgid "hexadecimal digit expected" msgstr "16 진수가 있어야 합니다" -#: glib/gregex.c:2842 +#: glib/gregex.c:2943 msgid "missing “<” in symbolic reference" msgstr "심볼 참조에 “<” 기호가 없습니다" -#: glib/gregex.c:2851 +#: glib/gregex.c:2952 msgid "unfinished symbolic reference" msgstr "심볼 참조가 끝나지 않았습니다" -#: glib/gregex.c:2858 +#: glib/gregex.c:2959 msgid "zero-length symbolic reference" msgstr "심볼 참조에 내용이 없습니다" -#: glib/gregex.c:2869 +#: glib/gregex.c:2970 msgid "digit expected" msgstr "숫자가 있어야 합니다" -#: glib/gregex.c:2887 +#: glib/gregex.c:2988 msgid "illegal symbolic reference" msgstr "심볼 참조가 잘못되었습니다" -#: glib/gregex.c:2950 +#: glib/gregex.c:3051 msgid "stray final “\\”" msgstr "마지막 “\\”가 없습니다" -#: glib/gregex.c:2954 +#: glib/gregex.c:3055 msgid "unknown escape sequence" msgstr "알 수 없는 이스케이프 시퀀스" -#: glib/gregex.c:2964 +#: glib/gregex.c:3065 #, c-format msgid "Error while parsing replacement text “%s” at char %lu: %s" msgstr "“%s” 바꿀 문자열을 읽는 중 %lu번째 문자에서 오류가 발생했습니다: %s" @@ -5762,96 +5771,101 @@ msgid "Text was empty (or contained only whitespace)" msgstr "텍스트가 비어 있음(또는 공백만 들어 있음)" -#: glib/gspawn.c:314 +#: glib/gspawn.c:319 #, c-format msgid "Failed to read data from child process (%s)" msgstr "하위 프로세스에서 데이터를 읽기 실패 (%s)" -#: glib/gspawn.c:466 +#: glib/gspawn.c:471 #, c-format msgid "Unexpected error in reading data from a child process (%s)" msgstr "하위 프로세스에서 데이터를 읽는 중 예상치 못한 오류 (%s)" -#: glib/gspawn.c:551 +#: glib/gspawn.c:556 #, c-format msgid "Unexpected error in waitpid() (%s)" msgstr "waitpid()에서 예상치 못한 오류 (%s)" -#: glib/gspawn.c:1170 glib/gspawn-win32.c:1488 +#: glib/gspawn.c:1175 glib/gspawn-win32.c:1503 #, c-format msgid "Child process exited with code %ld" msgstr "하위 프로세스가 %ld 코드로 끝났습니다" -#: glib/gspawn.c:1178 +#: glib/gspawn.c:1183 #, c-format msgid "Child process killed by signal %ld" msgstr "하위 프로세스가 %ld 시그널로 죽었습니다" -#: glib/gspawn.c:1185 +#: glib/gspawn.c:1190 #, c-format msgid "Child process stopped by signal %ld" msgstr "하위 프로세스가 %ld 시그널로 멈췄습니다" -#: glib/gspawn.c:1192 +#: glib/gspawn.c:1197 #, c-format msgid "Child process exited abnormally" msgstr "하위 프로세스가 예기치 않게 끝났습니다" -#: glib/gspawn.c:1885 glib/gspawn-win32.c:393 glib/gspawn-win32.c:401 +#: glib/gspawn.c:2027 glib/gspawn-win32.c:393 glib/gspawn-win32.c:401 #, c-format msgid "Failed to read from child pipe (%s)" msgstr "하위 파이프로 부터 읽기 실패 (%s)" -#: glib/gspawn.c:2248 +#: glib/gspawn.c:2399 #, c-format msgid "Failed to spawn child process “%s” (%s)" msgstr "하위 프로세스 “%s”을(를) 실행하기 실패 (%s)" -#: glib/gspawn.c:2365 +#: glib/gspawn.c:2525 #, c-format msgid "Failed to fork (%s)" msgstr "포크 실패 (%s)" -#: glib/gspawn.c:2525 glib/gspawn-win32.c:424 +#: glib/gspawn.c:2685 glib/gspawn-win32.c:424 #, c-format msgid "Failed to change to directory “%s” (%s)" msgstr "디렉터리 “%s”(으)로 바꾸기 실패 (%s)" -#: glib/gspawn.c:2535 +#: glib/gspawn.c:2695 #, c-format msgid "Failed to execute child process “%s” (%s)" msgstr "하위 프로세스 “%s”을(를) 실행하기 실패 (%s)" -#: glib/gspawn.c:2545 +#: glib/gspawn.c:2705 #, c-format msgid "Failed to open file to remap file descriptor (%s)" msgstr "파일 디스크립터 리맵하기 위한 파일 열기 실패 (%s)" -#: glib/gspawn.c:2553 +#: glib/gspawn.c:2713 #, c-format msgid "Failed to duplicate file descriptor for child process (%s)" msgstr "하위 프로세스에 대한 파일 디스크립터 복제 실패 (%s)" -#: glib/gspawn.c:2562 +#: glib/gspawn.c:2722 #, c-format msgid "Failed to fork child process (%s)" msgstr "하위 프로세스(%s) 생성 실패" -#: glib/gspawn.c:2570 +#: glib/gspawn.c:2730 #, c-format msgid "Failed to close file descriptor for child process (%s)" msgstr "하위 프로세스에 대한 파일 디스크립터 닫기 실패 (%s)" -#: glib/gspawn.c:2578 +#: glib/gspawn.c:2738 #, c-format msgid "Unknown error executing child process “%s”" msgstr "하위 프로세스 “%s”을(를) 실행하는 중 알 수 없는 오류" -#: glib/gspawn.c:2602 +#: glib/gspawn.c:2762 #, c-format msgid "Failed to read enough data from child pid pipe (%s)" msgstr "하위 PID 파이프에서 필요한 데이터를 읽는데 실패했습니다 (%s)" +#: glib/gspawn-private.h:134 +#, c-format +msgid "Invalid source FDs argument" +msgstr "잘못된 원본 FD 인자" + #: glib/gspawn-win32.c:337 msgid "Failed to read data from child process" msgstr "하위 프로세스에서 데이터 읽기 실패" @@ -5871,27 +5885,27 @@ msgid "Invalid program name: %s" msgstr "잘못된 프로그램 이름: %s" -#: glib/gspawn-win32.c:521 glib/gspawn-win32.c:853 +#: glib/gspawn-win32.c:521 glib/gspawn-win32.c:868 #, c-format msgid "Invalid string in argument vector at %d: %s" msgstr "인자에서 잘못된 문자열, %d: %s" -#: glib/gspawn-win32.c:532 glib/gspawn-win32.c:869 +#: glib/gspawn-win32.c:532 glib/gspawn-win32.c:884 #, c-format msgid "Invalid string in environment: %s" msgstr "환경에서 잘못된 문자열: %s" -#: glib/gspawn-win32.c:849 +#: glib/gspawn-win32.c:864 #, c-format msgid "Invalid working directory: %s" msgstr "잘못된 현재 디렉터리: %s" -#: glib/gspawn-win32.c:914 +#: glib/gspawn-win32.c:929 #, c-format msgid "Failed to execute helper program (%s)" msgstr "도움 프로그램 실행 실패 (%s)" -#: glib/gspawn-win32.c:1143 +#: glib/gspawn-win32.c:1158 msgid "" "Unexpected error in g_io_channel_win32_poll() reading data from a child " "process" @@ -5899,21 +5913,21 @@ "하위 프로세스에서 데이터를 읽는중 g_io_channel_win32_poll()에서 예기치 못한 " "오류" -#: glib/gstrfuncs.c:3366 glib/gstrfuncs.c:3468 +#: glib/gstrfuncs.c:3370 glib/gstrfuncs.c:3472 msgid "Empty string is not a number" msgstr "빈 문자열은 숫자가 아닙니다" -#: glib/gstrfuncs.c:3390 +#: glib/gstrfuncs.c:3394 #, c-format msgid "“%s” is not a signed number" msgstr "“%s”은(는) 부호 있는 숫자가 아닙니다" -#: glib/gstrfuncs.c:3400 glib/gstrfuncs.c:3504 +#: glib/gstrfuncs.c:3404 glib/gstrfuncs.c:3508 #, c-format msgid "Number “%s” is out of bounds %s, %s" msgstr "“%s” 숫자가 %s, %s 범위를 벗어납니다" -#: glib/gstrfuncs.c:3494 +#: glib/gstrfuncs.c:3498 #, c-format msgid "“%s” is not an unsigned number" msgstr "“%s”은(는) 부호 없는 숫자가 아닙니다" @@ -5992,138 +6006,138 @@ msgstr "UTF-16 문자 범위를 벗어났습니다" #. Translators: A unit symbol for size formatting, showing for example: "13.0 kB" -#: glib/gutils.c:2857 +#: glib/gutils.c:2966 msgid "kB" msgstr "kB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 MB" -#: glib/gutils.c:2859 +#: glib/gutils.c:2968 msgid "MB" msgstr "MB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 GB" -#: glib/gutils.c:2861 +#: glib/gutils.c:2970 msgid "GB" msgstr "GB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 TB" -#: glib/gutils.c:2863 +#: glib/gutils.c:2972 msgid "TB" msgstr "TB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 PB" -#: glib/gutils.c:2865 +#: glib/gutils.c:2974 msgid "PB" msgstr "PB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 EB" -#: glib/gutils.c:2867 +#: glib/gutils.c:2976 msgid "EB" msgstr "EB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 KiB" -#: glib/gutils.c:2871 +#: glib/gutils.c:2980 msgid "KiB" msgstr "KiB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 MiB" -#: glib/gutils.c:2873 +#: glib/gutils.c:2982 msgid "MiB" msgstr "MiB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 GiB" -#: glib/gutils.c:2875 +#: glib/gutils.c:2984 msgid "GiB" msgstr "GiB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 TiB" -#: glib/gutils.c:2877 +#: glib/gutils.c:2986 msgid "TiB" msgstr "TiB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 PiB" -#: glib/gutils.c:2879 +#: glib/gutils.c:2988 msgid "PiB" msgstr "PiB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 EiB" -#: glib/gutils.c:2881 +#: glib/gutils.c:2990 msgid "EiB" msgstr "EiB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 kb" -#: glib/gutils.c:2885 +#: glib/gutils.c:2994 msgid "kb" msgstr "kb" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Mb" -#: glib/gutils.c:2887 +#: glib/gutils.c:2996 msgid "Mb" msgstr "Mb" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Gb" -#: glib/gutils.c:2889 +#: glib/gutils.c:2998 msgid "Gb" msgstr "Gb" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Tb" -#: glib/gutils.c:2891 +#: glib/gutils.c:3000 msgid "Tb" msgstr "Tb" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Pb" -#: glib/gutils.c:2893 +#: glib/gutils.c:3002 msgid "Pb" msgstr "Pb" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Eb" -#: glib/gutils.c:2895 +#: glib/gutils.c:3004 msgid "Eb" msgstr "Eb" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Kib" -#: glib/gutils.c:2899 +#: glib/gutils.c:3008 msgid "Kib" msgstr "Kib" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Mib" -#: glib/gutils.c:2901 +#: glib/gutils.c:3010 msgid "Mib" msgstr "Mib" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Gib" -#: glib/gutils.c:2903 +#: glib/gutils.c:3012 msgid "Gib" msgstr "Gib" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Tib" -#: glib/gutils.c:2905 +#: glib/gutils.c:3014 msgid "Tib" msgstr "Tib" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Pib" -#: glib/gutils.c:2907 +#: glib/gutils.c:3016 msgid "Pib" msgstr "Pib" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Eib" -#: glib/gutils.c:2909 +#: glib/gutils.c:3018 msgid "Eib" msgstr "Eib" -#: glib/gutils.c:2947 +#: glib/gutils.c:3056 msgid "byte" msgid_plural "bytes" msgstr0 "바이트" -#: glib/gutils.c:2951 +#: glib/gutils.c:3060 msgid "bit" msgid_plural "bits" msgstr0 "비트" #. Translators: The "%u" is replaced with the size value, like "13"; it could #. * be part of "13 bytes", but only the number is requested this time. -#: glib/gutils.c:2959 +#: glib/gutils.c:3068 #, c-format msgctxt "format-size" msgid "%u" @@ -6131,7 +6145,7 @@ #. Translators: The first "%u" is replaced with the value, the "%s" with a unit of the value. #. * The order can be changed with "%$2s %$1u". An example: "13 bytes" -#: glib/gutils.c:2964 +#: glib/gutils.c:3073 #, c-format msgctxt "format-size" msgid "%u %s" @@ -6139,7 +6153,7 @@ #. Translators: The "%.1f" is replaced with the size value, like "13.0"; it could #. * be part of "13.0 MB", but only the number is requested this time. -#: glib/gutils.c:3000 +#: glib/gutils.c:3109 #, c-format msgctxt "format-size" msgid "%.1f" @@ -6148,27 +6162,27 @@ #. Translators: The first "%.1f" is replaced with the value, the "%s" with a unit of the value. #. * The order can be changed with "%$2s %$1.1f". Keep the no-break space between the value and #. * the unit symbol. An example: "13.0 MB" -#: glib/gutils.c:3006 +#: glib/gutils.c:3115 #, c-format msgctxt "format-size" msgid "%.1f %s" msgstr "%.1f %s" #. Translators: the %s in "%s bytes" will always be replaced by a number. -#: glib/gutils.c:3046 +#: glib/gutils.c:3155 #, c-format msgid "%s byte" msgid_plural "%s bytes" msgstr0 "%s 바이트" #. Translators: the %s in "%s bits" will always be replaced by a number. -#: glib/gutils.c:3051 +#: glib/gutils.c:3160 #, c-format msgid "%s bit" msgid_plural "%s bits" msgstr0 "%s 비트" -#: glib/gutils.c:3092 +#: glib/gutils.c:3201 #, c-format msgid "%u byte" msgid_plural "%u bytes" @@ -6179,32 +6193,32 @@ #. * compatibility. Users will not see this string unless a program is using this deprecated function. #. * Please translate as literally as possible. #. -#: glib/gutils.c:3105 +#: glib/gutils.c:3214 #, c-format msgid "%.1f KB" msgstr "%.1f KB" -#: glib/gutils.c:3110 +#: glib/gutils.c:3219 #, c-format msgid "%.1f MB" msgstr "%.1f MB" -#: glib/gutils.c:3115 +#: glib/gutils.c:3224 #, c-format msgid "%.1f GB" msgstr "%.1f GB" -#: glib/gutils.c:3120 +#: glib/gutils.c:3229 #, c-format msgid "%.1f TB" msgstr "%.1f TB" -#: glib/gutils.c:3125 +#: glib/gutils.c:3234 #, c-format msgid "%.1f PB" msgstr "%.1f PB" -#: glib/gutils.c:3130 +#: glib/gutils.c:3239 #, c-format msgid "%.1f EB" msgstr "%.1f EB"
View file
_service:tar_scm:glib-2.74.4.tar.xz/po/lt.po -> _service:tar_scm:glib-2.76.4.tar.xz/po/lt.po
Changed
@@ -7,14 +7,14 @@ # Gintautas Miliauskas <gintas@akl.lt>, 2007, 2008. # Rimas Kudelis <rq@akl.lt>, 2010. # Algimantas Margevičius <gymka@mail.ru>, 2011. -# Aurimas Černius <aurisc4@gmail.com>, 2010-2022. +# Aurimas Černius <aurisc4@gmail.com>, 2010-2023. # msgid "" msgstr "" "Project-Id-Version: lt\n" "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/glib/issues\n" -"POT-Creation-Date: 2022-08-15 20:23+0000\n" -"PO-Revision-Date: 2022-08-22 23:17+0300\n" +"POT-Creation-Date: 2023-02-18 14:49+0000\n" +"PO-Revision-Date: 2023-02-19 21:13+0200\n" "Last-Translator: Aurimas Černius <aurisc4@gmail.com>\n" "Language-Team: Lietuvių <gnome-lt@lists.akl.lt>\n" "Language: lt\n" @@ -23,23 +23,23 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && " "(n%100<10 || n%100>=20) ? 1 : 2)\n" -"X-Generator: Gtranslator 40.0\n" +"X-Generator: Gtranslator 42.0\n" "X-Project-Style: gnome\n" -#: gio/gappinfo.c:335 +#: gio/gappinfo.c:339 msgid "Setting default applications not supported yet" msgstr "Numatytųjų programų nustatymas dar nepalaikomas" -#: gio/gappinfo.c:368 +#: gio/gappinfo.c:372 msgid "Setting application as last used for type not supported yet" msgstr "Programos nustatymas kaip paskutinės naudotos dar nepalaikomas" -#: gio/gappinfo.c:808 +#: gio/gappinfo.c:814 #, c-format msgid "Failed to find default application for content type ‘%s’" msgstr "Nepavyko rasti turinio tipui „%s“ numatytos programos" -#: gio/gappinfo.c:868 +#: gio/gappinfo.c:874 #, c-format msgid "Failed to find default application for URI Scheme ‘%s’" msgstr "Nepavyko rasti URI schemai „%s“ numatytos programos" @@ -233,11 +233,11 @@ msgid "error sending %s message to application: %s\n" msgstr "klaida siunčiant %s pranešimą programai: %s\n" -#: gio/gapplication-tool.c:321 +#: gio/gapplication-tool.c:324 msgid "action name must be given after application id\n" msgstr "veiksmo pavadinimas turi būti pateiktas po programos id\n" -#: gio/gapplication-tool.c:329 +#: gio/gapplication-tool.c:332 #, c-format msgid "" "invalid action name: “%s”\n" @@ -246,25 +246,25 @@ "netinkamas veiksmo pavadinimas: „%s“\n" "veiksmų pavadinimai turi susidėti tik iš alfaskaitmenų, „-“ ir „.“\n" -#: gio/gapplication-tool.c:348 +#: gio/gapplication-tool.c:351 #, c-format msgid "error parsing action parameter: %s\n" msgstr "klaida skaitant veiksmo parametrą: %s\n" -#: gio/gapplication-tool.c:360 +#: gio/gapplication-tool.c:363 msgid "actions accept a maximum of one parameter\n" msgstr "veiksmai priima ne daugiau kaip vieną parametrą\n" -#: gio/gapplication-tool.c:415 +#: gio/gapplication-tool.c:418 msgid "list-actions command takes only the application id" msgstr "list-actions komanda priima tik programos id" -#: gio/gapplication-tool.c:425 +#: gio/gapplication-tool.c:428 #, c-format msgid "unable to find desktop file for application %s\n" msgstr "nepavyksta rasti desktop failo programai %s\n" -#: gio/gapplication-tool.c:470 +#: gio/gapplication-tool.c:473 #, c-format msgid "" "unrecognised command: %s\n" @@ -299,7 +299,7 @@ msgid "Truncate not supported on base stream" msgstr "Trumpinimas sraute nepalaikomas" -#: gio/gcancellable.c:319 gio/gdbusconnection.c:1859 gio/gdbusprivate.c:1420 +#: gio/gcancellable.c:326 gio/gdbusconnection.c:1859 gio/gdbusprivate.c:1420 #: gio/gsimpleasyncresult.c:873 gio/gsimpleasyncresult.c:899 #, c-format msgid "Operation was cancelled" @@ -319,13 +319,13 @@ #: gio/gcharsetconverter.c:344 gio/gdatainputstream.c:850 #: gio/gdatainputstream.c:1268 glib/gconvert.c:451 glib/gconvert.c:883 -#: glib/giochannel.c:1576 glib/giochannel.c:1618 glib/giochannel.c:2473 +#: glib/giochannel.c:1576 glib/giochannel.c:1618 glib/giochannel.c:2478 #: glib/gutf8.c:892 glib/gutf8.c:1346 msgid "Invalid byte sequence in conversion input" msgstr "Klaidinga baitų seka keitimo įvedime" #: gio/gcharsetconverter.c:349 glib/gconvert.c:459 glib/gconvert.c:797 -#: glib/giochannel.c:1583 glib/giochannel.c:2485 +#: glib/giochannel.c:1583 glib/giochannel.c:2493 #, c-format msgid "Error during conversion: %s" msgstr "Klaida keitimo metu: %s" @@ -382,17 +382,17 @@ msgid "Unexpected early end-of-stream" msgstr "Netikėta ankstyva srauto pabaiga" -#: gio/gdbusaddress.c:164 gio/gdbusaddress.c:238 gio/gdbusaddress.c:327 +#: gio/gdbusaddress.c:162 gio/gdbusaddress.c:234 gio/gdbusaddress.c:321 #, c-format msgid "Unsupported key “%s” in address entry “%s”" msgstr "Nepalaikomas raktas „%s“ adreso įvestyje „%s“" -#: gio/gdbusaddress.c:177 +#: gio/gdbusaddress.c:175 #, c-format msgid "Meaningless key/value pair combination in address entry “%s”" msgstr "Beprasmė rakto/reikšmės poros kombinacija adreso įvestyje „%s“" -#: gio/gdbusaddress.c:186 +#: gio/gdbusaddress.c:184 #, c-format msgid "" "Address “%s” is invalid (need exactly one of path, dir, tmpdir, or abstract " @@ -401,28 +401,28 @@ "Adresas „%s“ nėra tinkamas (reikia įvesti vienintelį path, dir, tmpdir arba " "abstract raktą)" -#: gio/gdbusaddress.c:253 gio/gdbusaddress.c:264 gio/gdbusaddress.c:279 -#: gio/gdbusaddress.c:342 gio/gdbusaddress.c:353 +#: gio/gdbusaddress.c:249 gio/gdbusaddress.c:260 gio/gdbusaddress.c:275 +#: gio/gdbusaddress.c:336 gio/gdbusaddress.c:347 #, c-format msgid "Error in address “%s” — the “%s” attribute is malformed" msgstr "Klaida adrese „%s“ — neteisingai suformuotas atributas „%s“" -#: gio/gdbusaddress.c:423 gio/gdbusaddress.c:682 +#: gio/gdbusaddress.c:417 gio/gdbusaddress.c:676 #, c-format msgid "Unknown or unsupported transport “%s” for address “%s”" msgstr "Nežinomas arba nepalaikomas duomenų perdavimas „%s“ adresui „%s“" -#: gio/gdbusaddress.c:467 +#: gio/gdbusaddress.c:461 #, c-format msgid "Address element “%s” does not contain a colon (:)" msgstr "Adreso elementas „%s“ neturi dvitaškio (:)" -#: gio/gdbusaddress.c:476 +#: gio/gdbusaddress.c:470 #, c-format msgid "Transport name in address element “%s” must not be empty" msgstr "Transporto pavadinimas adreso elemente „%s“ negali būti tuščias" -#: gio/gdbusaddress.c:497 +#: gio/gdbusaddress.c:491 #, c-format msgid "" "Key/Value pair %d, “%s”, in address element “%s” does not contain an equal " @@ -430,7 +430,7 @@ msgstr "" "Rakto/reikšmės pora %d, „%s“, adreso elementas „%s“ neturi lygybės ženklo" -#: gio/gdbusaddress.c:508 +#: gio/gdbusaddress.c:502 #, c-format msgid "" "Key/Value pair %d, “%s”, in address element “%s” must not have an empty key" @@ -438,7 +438,7 @@ "Rakto/reikšmės pora %d, „%s“, adreso elemente „%s“ negali turėti lygybės " "ženklo" -#: gio/gdbusaddress.c:522 +#: gio/gdbusaddress.c:516 #, c-format msgid "" "Error unescaping key or value in Key/Value pair %d, “%s”, in address element " @@ -447,7 +447,7 @@ "Klaida šalinant kaitą rakte ar reikšmėje rakto/reikšmės poroje %d, „%s“ " "adreso elemente „%s“" -#: gio/gdbusaddress.c:590 +#: gio/gdbusaddress.c:584 #, c-format msgid "" "Error in address “%s” — the unix transport requires exactly one of the keys " @@ -456,82 +456,82 @@ "Klaida adrese „%s“ - unix duomenų perdavimas reikalauja nustatyti vienintelį " "iš raktų 'path' arba 'abstract'" -#: gio/gdbusaddress.c:625 +#: gio/gdbusaddress.c:619 #, c-format msgid "Error in address “%s” — the host attribute is missing or malformed" msgstr "" "Klaida adrese „%s“ - pagrindinio kompiuterio atributas neįvestas arba blogai " "suformuotas" -#: gio/gdbusaddress.c:639 +#: gio/gdbusaddress.c:633 #, c-format msgid "Error in address “%s” — the port attribute is missing or malformed" msgstr "" "Klaida adrese „%s“ - prievado atributas neįvestas arba blogai suformuotas" -#: gio/gdbusaddress.c:653 +#: gio/gdbusaddress.c:647 #, c-format msgid "Error in address “%s” — the noncefile attribute is missing or malformed" msgstr "" "Klaida adrese „%s“ - laikino failo atributas neįvestas arba blogai " "suformuotas" -#: gio/gdbusaddress.c:674 +#: gio/gdbusaddress.c:668 msgid "Error auto-launching: " msgstr "Klaida automatiškai paleidžiant: " -#: gio/gdbusaddress.c:727 +#: gio/gdbusaddress.c:721 #, c-format msgid "Error opening nonce file “%s”: %s" msgstr "Klaida atveriant vienkartinio kodo failą „%s“: %s" -#: gio/gdbusaddress.c:746 +#: gio/gdbusaddress.c:740 #, c-format msgid "Error reading from nonce file “%s”: %s" msgstr "Klaida skaitant iš vienkartinio kodo failo „%s“: %s" -#: gio/gdbusaddress.c:755 +#: gio/gdbusaddress.c:749 #, c-format msgid "Error reading from nonce file “%s”, expected 16 bytes, got %d" msgstr "" "Klaida skaitant iš vienkartinio kodo failo „%s“, tikėtasi 16 baitų, gauta %d" -#: gio/gdbusaddress.c:773 +#: gio/gdbusaddress.c:767 #, c-format msgid "Error writing contents of nonce file “%s” to stream:" msgstr "Klaida rašant vienkartinio kodo failo turinį „%s“ į srautą:" -#: gio/gdbusaddress.c:988 +#: gio/gdbusaddress.c:982 msgid "The given address is empty" msgstr "Pateiktasis adresas yra tuščias" -#: gio/gdbusaddress.c:1101 +#: gio/gdbusaddress.c:1095 #, c-format msgid "Cannot spawn a message bus when AT_SECURE is set" msgstr "Negalima paleisti pranešimų magistralės kai nustatyta AT_SECURE" -#: gio/gdbusaddress.c:1108 +#: gio/gdbusaddress.c:1102 msgid "Cannot spawn a message bus without a machine-id: " msgstr "Negalima paleisti pranešimų magistralės be mašinos id: " -#: gio/gdbusaddress.c:1115 +#: gio/gdbusaddress.c:1109 #, c-format msgid "Cannot autolaunch D-Bus without X11 $DISPLAY" msgstr "Negalima automatiškai paleisti D-Bus be X11 $DISPLAY" -#: gio/gdbusaddress.c:1157 +#: gio/gdbusaddress.c:1151 #, c-format msgid "Error spawning command line “%s”: " msgstr "Klaida paleidžiant komandų eilutę „%s“: " -#: gio/gdbusaddress.c:1226 +#: gio/gdbusaddress.c:1220 #, c-format msgid "Cannot determine session bus address (not implemented for this OS)" msgstr "" "Nepavyko nustatyti sesijos magistralės adreso (nerealizuota šiai operacinei " "sistemai)" -#: gio/gdbusaddress.c:1375 gio/gdbusconnection.c:7321 +#: gio/gdbusaddress.c:1374 gio/gdbusconnection.c:7316 #, c-format msgid "" "Cannot determine bus address from DBUS_STARTER_BUS_TYPE environment variable " @@ -540,7 +540,7 @@ "Nepavyko nustatyti magistralės adreso iš DBUS_STARTER_BUS_TYPE aplinkos " "kintamojo - nežinoma reikšmė „%s“" -#: gio/gdbusaddress.c:1384 gio/gdbusconnection.c:7330 +#: gio/gdbusaddress.c:1383 gio/gdbusconnection.c:7325 msgid "" "Cannot determine bus address because the DBUS_STARTER_BUS_TYPE environment " "variable is not set" @@ -548,7 +548,7 @@ "Nepavyko nustatyti magistralės adreso, kadangi DBUS_STARTER_BUS_TYPE " "aplinkos kintamasis nenustatytas" -#: gio/gdbusaddress.c:1394 +#: gio/gdbusaddress.c:1393 #, c-format msgid "Unknown bus type %d" msgstr "Nežinomas magistralės tipas %d" @@ -569,11 +569,15 @@ "Baigėsi visi turimi tapatybės patvirtinimo mechanizmai (bandyta: %s) " "(turimi: %s)" -#: gio/gdbusauth.c:1178 +#: gio/gdbusauth.c:1045 +msgid "Unexpected lack of content trying to read a byte" +msgstr "Netikėtas turinio trūkumas bandant nuskaityti baitą" + +#: gio/gdbusauth.c:1195 msgid "User IDs must be the same for peer and server" msgstr "Naudotojų ID turi sutapti porininkui bei serveriui" -#: gio/gdbusauth.c:1190 +#: gio/gdbusauth.c:1207 msgid "Cancelled via GDBusAuthObserver::authorize-authenticated-peer" msgstr "Atšaukta per GDBusAuthObserver::authorize-authenticated-peer" @@ -667,7 +671,7 @@ msgid "(Additionally, releasing the lock for “%s” also failed: %s) " msgstr "(Papildomai, užrakto atlaisvinimas „%s“ taip pat nepavyko: %s) " -#: gio/gdbusconnection.c:590 gio/gdbusconnection.c:2404 +#: gio/gdbusconnection.c:590 gio/gdbusconnection.c:2405 msgid "The connection is closed" msgstr "Ryšys yra užvertas" @@ -675,115 +679,115 @@ msgid "Timeout was reached" msgstr "Baigėsi laikas" -#: gio/gdbusconnection.c:2527 +#: gio/gdbusconnection.c:2528 msgid "" "Unsupported flags encountered when constructing a client-side connection" msgstr "Nepalaikomi požymiai aptikti konstruojant kliento pusės ryšį" -#: gio/gdbusconnection.c:4256 gio/gdbusconnection.c:4610 +#: gio/gdbusconnection.c:4257 gio/gdbusconnection.c:4611 #, c-format msgid "" "No such interface “org.freedesktop.DBus.Properties” on object at path %s" msgstr "" "Nėra sąsajos „org.freedesktop.DBus.Properties“ objektui, kurio kelias %s" -#: gio/gdbusconnection.c:4401 +#: gio/gdbusconnection.c:4402 #, c-format msgid "No such property “%s”" msgstr "Nėra savybės „%s“" -#: gio/gdbusconnection.c:4413 +#: gio/gdbusconnection.c:4414 #, c-format msgid "Property “%s” is not readable" msgstr "Savybė „%s“ yra neskaitoma" -#: gio/gdbusconnection.c:4424 +#: gio/gdbusconnection.c:4425 #, c-format msgid "Property “%s” is not writable" msgstr "Savybė „%s“ nėra rašoma" -#: gio/gdbusconnection.c:4444 +#: gio/gdbusconnection.c:4445 #, c-format msgid "Error setting property “%s”: Expected type “%s” but got “%s”" msgstr "Klaida nustatant savybę „%s“: tikėtasi tipo „%s“, bet gauta „%s“" -#: gio/gdbusconnection.c:4549 gio/gdbusconnection.c:4764 -#: gio/gdbusconnection.c:6747 +#: gio/gdbusconnection.c:4550 gio/gdbusconnection.c:4765 +#: gio/gdbusconnection.c:6742 #, c-format msgid "No such interface “%s”" msgstr "Nėra sąsajos „%s“" -#: gio/gdbusconnection.c:4986 gio/gdbusconnection.c:7261 +#: gio/gdbusconnection.c:4981 gio/gdbusconnection.c:7256 #, c-format msgid "No such interface “%s” on object at path %s" msgstr "Nėra sąsajos „%s“ objektui, kurio kelias %s" -#: gio/gdbusconnection.c:5087 +#: gio/gdbusconnection.c:5082 #, c-format msgid "No such method “%s”" msgstr "Nėra metodo „%s“" -#: gio/gdbusconnection.c:5118 +#: gio/gdbusconnection.c:5113 #, c-format msgid "Type of message, “%s”, does not match expected type “%s”" msgstr "Pranešimo tipas „%s“ neatitinka laukiamo tipo „%s“" -#: gio/gdbusconnection.c:5321 +#: gio/gdbusconnection.c:5316 #, c-format msgid "An object is already exported for the interface %s at %s" msgstr "Jau yra eksportuotas objektas sąsajai %s vietoje %s" -#: gio/gdbusconnection.c:5548 +#: gio/gdbusconnection.c:5543 #, c-format msgid "Unable to retrieve property %s.%s" msgstr "Nepavyko gauti savybės: %s.%s" -#: gio/gdbusconnection.c:5604 +#: gio/gdbusconnection.c:5599 #, c-format msgid "Unable to set property %s.%s" msgstr "Nepavyko nustatyti savybės: %s.%s" -#: gio/gdbusconnection.c:5783 +#: gio/gdbusconnection.c:5778 #, c-format msgid "Method “%s” returned type “%s”, but expected “%s”" msgstr "Metodas „%s“ grąžino tipą „%s“, bet laukta „%s“" -#: gio/gdbusconnection.c:6859 +#: gio/gdbusconnection.c:6854 #, c-format msgid "Method “%s” on interface “%s” with signature “%s” does not exist" msgstr "Metodas „%s“ sąsajoje „%s“ su signatūra „%s“ neegzistuoja" -#: gio/gdbusconnection.c:6980 +#: gio/gdbusconnection.c:6975 #, c-format msgid "A subtree is already exported for %s" msgstr "Pomedis %s jau yra eksportuotas" -#: gio/gdbusconnection.c:7269 +#: gio/gdbusconnection.c:7264 #, c-format msgid "Object does not exist at path “%s”" msgstr "Objekto kelyje „%s“ nėra" -#: gio/gdbusmessage.c:1303 +#: gio/gdbusmessage.c:1306 msgid "type is INVALID" msgstr "tipas yra NETINKAMAS" -#: gio/gdbusmessage.c:1314 +#: gio/gdbusmessage.c:1317 msgid "METHOD_CALL message: PATH or MEMBER header field is missing" msgstr "METHOD_CALL pranešimas: trūksta antraštės lauko PATH arba MEMBER" -#: gio/gdbusmessage.c:1325 +#: gio/gdbusmessage.c:1328 msgid "METHOD_RETURN message: REPLY_SERIAL header field is missing" msgstr "METHOD_RETURN pranešimas: trūksta REPLY_SERIAL antraštės" -#: gio/gdbusmessage.c:1337 +#: gio/gdbusmessage.c:1340 msgid "ERROR message: REPLY_SERIAL or ERROR_NAME header field is missing" msgstr "ERROR pranešimas: antraštės lauke trūksta REPLY_SERIAL arba ERROR_NAME" -#: gio/gdbusmessage.c:1350 +#: gio/gdbusmessage.c:1353 msgid "SIGNAL message: PATH, INTERFACE or MEMBER header field is missing" msgstr "SIGNAL pranešimas: trūksta antraštės lauko PATH, INTERFACE arba MEMBER" -#: gio/gdbusmessage.c:1358 +#: gio/gdbusmessage.c:1361 msgid "" "SIGNAL message: The PATH header field is using the reserved value /org/" "freedesktop/DBus/Local" @@ -791,7 +795,7 @@ "SIGNAL pranešimas: antraštės laukas PATH naudoja rezervuotą reikšmę /org/" "freedesktop/DBus/Local" -#: gio/gdbusmessage.c:1366 +#: gio/gdbusmessage.c:1369 msgid "" "SIGNAL message: The INTERFACE header field is using the reserved value org." "freedesktop.DBus.Local" @@ -799,7 +803,7 @@ "SIGNAL pranešimas: antraštės laukas INTERFACE naudoja rezervuotą reikšmę org." "freedesktop.DBus.Local" -#: gio/gdbusmessage.c:1414 gio/gdbusmessage.c:1474 +#: gio/gdbusmessage.c:1417 gio/gdbusmessage.c:1477 #, c-format msgid "Wanted to read %lu byte but only got %lu" msgid_plural "Wanted to read %lu bytes but only got %lu" @@ -807,12 +811,12 @@ msgstr1 "Norėta nuskaityti %lu baitus, bet gauta tik %lu" msgstr2 "Norėta nuskaityti %lu baitų, bet gauta tik %lu" -#: gio/gdbusmessage.c:1428 +#: gio/gdbusmessage.c:1431 #, c-format msgid "Expected NUL byte after the string “%s” but found byte %d" msgstr "Tikėtasi NUL baito po simbolių eilutės „%s“, bet rastas baitas %d" -#: gio/gdbusmessage.c:1447 +#: gio/gdbusmessage.c:1450 #, c-format msgid "" "Expected valid UTF-8 string but found invalid bytes at byte offset %d " @@ -821,21 +825,21 @@ "Tikėtasi teisingos UTF-8 eilutės, bet rasta neteisingų baitų poslinkiu %d " "(eilutės ilgis yra %d). Teisinga UTF-8 eilutė iki tos vietos buvo „%s“" -#: gio/gdbusmessage.c:1511 gio/gdbusmessage.c:1787 gio/gdbusmessage.c:1998 +#: gio/gdbusmessage.c:1514 gio/gdbusmessage.c:1790 gio/gdbusmessage.c:2001 msgid "Value nested too deeply" msgstr "Vertė yra per giliai" -#: gio/gdbusmessage.c:1679 +#: gio/gdbusmessage.c:1682 #, c-format msgid "Parsed value “%s” is not a valid D-Bus object path" msgstr "Perskaityta reikšmė „%s“ nėra tinkamas D-Bus objekto kelias" -#: gio/gdbusmessage.c:1703 +#: gio/gdbusmessage.c:1706 #, c-format msgid "Parsed value “%s” is not a valid D-Bus signature" msgstr "Perskaityta reikšmė „%s“ nėra tinkama D-Bus signatūra" -#: gio/gdbusmessage.c:1754 +#: gio/gdbusmessage.c:1757 #, c-format msgid "" "Encountered array of length %u byte. Maximum length is 2<<26 bytes (64 MiB)." @@ -848,7 +852,7 @@ msgstr2 "" "Aptiktas %u baitų ilgio masyvas. Maksimalus ilgis yra 2<<26 baitų (64 MiB)." -#: gio/gdbusmessage.c:1774 +#: gio/gdbusmessage.c:1777 #, c-format msgid "" "Encountered array of type “a%c”, expected to have a length a multiple of %u " @@ -857,23 +861,23 @@ "Aptiktas „a%c“ tipo masyvas, tikėtasi %u kartotinio baitų ilgio, bet rasta " "%u baitų ilgyje" -#: gio/gdbusmessage.c:1928 gio/gdbusmessage.c:2647 +#: gio/gdbusmessage.c:1931 gio/gdbusmessage.c:2650 msgid "Empty structures (tuples) are not allowed in D-Bus" msgstr "Tuščios struktūros (junginiai) D-Bus neleidžiamos" -#: gio/gdbusmessage.c:1982 +#: gio/gdbusmessage.c:1985 #, c-format msgid "Parsed value “%s” for variant is not a valid D-Bus signature" msgstr "Perskaityta reikšmė „%s“ variantui nėra tinkama D-Bus signatūra" -#: gio/gdbusmessage.c:2023 +#: gio/gdbusmessage.c:2026 #, c-format msgid "" "Error deserializing GVariant with type string “%s” from the D-Bus wire format" msgstr "" "Klaida atstatant GVariant su tipo eilute „%s“ iš D-Bus telegramos formato" -#: gio/gdbusmessage.c:2208 +#: gio/gdbusmessage.c:2211 #, c-format msgid "" "Invalid endianness value. Expected 0x6c (“l”) or 0x42 (“B”) but found value " @@ -882,29 +886,29 @@ "Netinkama baitų eiliškumo reikšmė. Tikėtasi 0x6c („l“) arba 0x42 („B“), bet " "rasta 0x%02x" -#: gio/gdbusmessage.c:2227 +#: gio/gdbusmessage.c:2230 #, c-format msgid "Invalid major protocol version. Expected 1 but found %d" msgstr "Netinkama pagrindinė protokolo versija. Tikėtasi 1, bet rasta %d" -#: gio/gdbusmessage.c:2285 gio/gdbusmessage.c:2883 +#: gio/gdbusmessage.c:2288 gio/gdbusmessage.c:2886 msgid "Signature header found but is not of type signature" msgstr "Rasta signatūros antraštė, bet ji nėra signatūros tipo" -#: gio/gdbusmessage.c:2297 +#: gio/gdbusmessage.c:2300 #, c-format msgid "Signature header with signature “%s” found but message body is empty" msgstr "" "Signatūros antraštė su signatūra „%s“ rasta, bet pranešimo pagrindinė dalis " "tuščia" -#: gio/gdbusmessage.c:2312 +#: gio/gdbusmessage.c:2315 #, c-format msgid "Parsed value “%s” is not a valid D-Bus signature (for body)" msgstr "" "Perskaityta reikšmė „%s“ nėra tinkama D-Bus signatūra (pagrindinei daliai)" -#: gio/gdbusmessage.c:2344 +#: gio/gdbusmessage.c:2347 #, 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" @@ -918,35 +922,35 @@ "Nėra signatūros antraštės pranešime, bet pranešimo pagrindinė dalis yra %u " "baitų" -#: gio/gdbusmessage.c:2354 +#: gio/gdbusmessage.c:2357 msgid "Cannot deserialize message: " msgstr "Nepavyko atstatyti pranešimo: " -#: gio/gdbusmessage.c:2700 +#: gio/gdbusmessage.c:2703 #, c-format msgid "" "Error serializing GVariant with type string “%s” to the D-Bus wire format" msgstr "" "Klaida paverčiant GVariant su tipo eilute „%s“ į D-Bus telegramos formatą" -#: gio/gdbusmessage.c:2837 +#: gio/gdbusmessage.c:2840 #, c-format msgid "" "Number of file descriptors in message (%d) differs from header field (%d)" msgstr "" "Failo deskriptorių skaičius žinutėje (%d) skiriasi nuo antraštės lauko (%d)" -#: gio/gdbusmessage.c:2845 +#: gio/gdbusmessage.c:2848 msgid "Cannot serialize message: " msgstr "Nepavyko išsaugoti pranešimo: " -#: gio/gdbusmessage.c:2898 +#: gio/gdbusmessage.c:2901 #, c-format msgid "Message body has signature “%s” but there is no signature header" msgstr "" "Pranešimo pagrindinė dalis turi signatūrą „%s“, bet nėra signatūros antraštės" -#: gio/gdbusmessage.c:2908 +#: gio/gdbusmessage.c:2911 #, c-format msgid "" "Message body has type signature “%s” but signature in the header field is " @@ -955,19 +959,19 @@ "Pranešimo pagrindinė dalis turi tipo signatūrą „%s“, bet signatūra antraštės " "lauke yra „%s“" -#: gio/gdbusmessage.c:2924 +#: gio/gdbusmessage.c:2927 #, c-format msgid "Message body is empty but signature in the header field is “(%s)”" msgstr "" "Pranešimo pagrindinė dalis yra tuščia, bet signatūra antraštės lauke yra " "„(%s)“" -#: gio/gdbusmessage.c:3479 +#: gio/gdbusmessage.c:3482 #, c-format msgid "Error return with body of type “%s”" msgstr "Klaidos grąžinimas su pagrindinės dalies tipu „%s“" -#: gio/gdbusmessage.c:3487 +#: gio/gdbusmessage.c:3490 msgid "Error return with empty body" msgstr "Klaidos grąžinimas su tuščia pagrindine dalimi" @@ -992,17 +996,17 @@ msgid "Unable to load %s or %s: " msgstr "Nepavyko įkelti %s arba %s: " -#: gio/gdbusproxy.c:1575 +#: gio/gdbusproxy.c:1568 #, c-format msgid "Error calling StartServiceByName for %s: " msgstr "Klaida kviečiant StartServiceByName elementui %s: " -#: gio/gdbusproxy.c:1598 +#: gio/gdbusproxy.c:1591 #, c-format msgid "Unexpected reply %d from StartServiceByName(\"%s\") method" msgstr "Nelauktas atsakas %d iš StartServiceByName(\"%s\") metodo" -#: gio/gdbusproxy.c:2709 gio/gdbusproxy.c:2844 +#: gio/gdbusproxy.c:2702 gio/gdbusproxy.c:2837 #, c-format msgid "" "Cannot invoke method; proxy is for the well-known name %s without an owner, " @@ -1012,25 +1016,25 @@ "savininko ir proxy buvo sukonstruotas su " "G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START požymiu" -#: gio/gdbusserver.c:765 +#: gio/gdbusserver.c:758 msgid "Abstract namespace not supported" msgstr "Abstrakti vardų sritis nepalaikoma" -#: gio/gdbusserver.c:857 +#: gio/gdbusserver.c:850 msgid "Cannot specify nonce file when creating a server" msgstr "Negalima nurodyti laikino failo kuriant serverį" -#: gio/gdbusserver.c:939 +#: gio/gdbusserver.c:932 #, c-format msgid "Error writing nonce file at “%s”: %s" msgstr "Klaida rašant vienkartinio kodo failą vietoje „%s“: %s" -#: gio/gdbusserver.c:1114 +#: gio/gdbusserver.c:1107 #, c-format msgid "The string “%s” is not a valid D-Bus GUID" msgstr "Eilutė „%s“ nėra tinkamas D-Bus GUID" -#: gio/gdbusserver.c:1152 +#: gio/gdbusserver.c:1145 #, c-format msgid "Cannot listen on unsupported transport “%s”" msgstr "Negalima laukti duomenų iš nepalaikomo perdavimo „%s“" @@ -1058,14 +1062,14 @@ "\n" "Naudokite „%s KOMANDA --help“ kiekvienos komandos pagalbos gavimui.\n" -#: gio/gdbus-tool.c:204 gio/gdbus-tool.c:276 gio/gdbus-tool.c:348 -#: gio/gdbus-tool.c:372 gio/gdbus-tool.c:862 gio/gdbus-tool.c:1247 -#: gio/gdbus-tool.c:1734 +#: gio/gdbus-tool.c:204 gio/gdbus-tool.c:276 gio/gdbus-tool.c:347 +#: gio/gdbus-tool.c:371 gio/gdbus-tool.c:861 gio/gdbus-tool.c:1246 +#: gio/gdbus-tool.c:1733 #, c-format msgid "Error: %s\n" msgstr "Klaida: %s\n" -#: gio/gdbus-tool.c:215 gio/gdbus-tool.c:289 gio/gdbus-tool.c:1750 +#: gio/gdbus-tool.c:215 gio/gdbus-tool.c:289 gio/gdbus-tool.c:1749 #, c-format msgid "Error parsing introspection XML: %s\n" msgstr "Klaida skaitant introspekcijos XML: %s\n" @@ -1075,49 +1079,49 @@ msgid "Error: %s is not a valid name\n" msgstr "Klaida: %s nėra tinkamas vardas\n" -#: gio/gdbus-tool.c:258 gio/gdbus-tool.c:748 gio/gdbus-tool.c:1066 -#: gio/gdbus-tool.c:1900 gio/gdbus-tool.c:2140 +#: gio/gdbus-tool.c:258 gio/gdbus-tool.c:747 gio/gdbus-tool.c:1065 +#: gio/gdbus-tool.c:1899 gio/gdbus-tool.c:2139 #, c-format msgid "Error: %s is not a valid object path\n" msgstr "Klaida: %s nėra tinkamas objekto kelias\n" -#: gio/gdbus-tool.c:406 +#: gio/gdbus-tool.c:405 msgid "Connect to the system bus" msgstr "Prisijungti prie sistemos magistralės" -#: gio/gdbus-tool.c:407 +#: gio/gdbus-tool.c:406 msgid "Connect to the session bus" msgstr "Prisijungti prie sesijos magistralės" -#: gio/gdbus-tool.c:408 +#: gio/gdbus-tool.c:407 msgid "Connect to given D-Bus address" msgstr "Prisijungti prie pateikto D-Bus adreso" -#: gio/gdbus-tool.c:418 +#: gio/gdbus-tool.c:417 msgid "Connection Endpoint Options:" msgstr "Ryšio pabaigos parametrai:" -#: gio/gdbus-tool.c:419 +#: gio/gdbus-tool.c:418 msgid "Options specifying the connection endpoint" msgstr "Parametrai, nurodantys ryšio pabaigą" -#: gio/gdbus-tool.c:442 +#: gio/gdbus-tool.c:441 #, c-format msgid "No connection endpoint specified" msgstr "Nėra nurodytos ryšio pabaigos" -#: gio/gdbus-tool.c:452 +#: gio/gdbus-tool.c:451 #, c-format msgid "Multiple connection endpoints specified" msgstr "Nurodytos kelio ryšio pabaigos" -#: gio/gdbus-tool.c:525 +#: gio/gdbus-tool.c:524 #, c-format msgid "" "Warning: According to introspection data, interface “%s” does not exist\n" msgstr "Perspėjimas: pagal introspekcijos duomenis, sąsaja „%s“ neegzistuoja\n" -#: gio/gdbus-tool.c:534 +#: gio/gdbus-tool.c:533 #, c-format msgid "" "Warning: According to introspection data, method “%s” does not exist on " @@ -1126,164 +1130,164 @@ "Perspėjimas: pagal introspekcijos duomenis, metodas „%s“ neegzistuoja " "sąsajoje „%s“\n" -#: gio/gdbus-tool.c:596 +#: gio/gdbus-tool.c:595 msgid "Optional destination for signal (unique name)" msgstr "Nebūtinas signalo tikslas (unikalus vardas)" -#: gio/gdbus-tool.c:597 +#: gio/gdbus-tool.c:596 msgid "Object path to emit signal on" msgstr "Objekto, kuriame siunčiamas signalas, kelias" -#: gio/gdbus-tool.c:598 +#: gio/gdbus-tool.c:597 msgid "Signal and interface name" msgstr "Signalo ir sąsajos vardai" -#: gio/gdbus-tool.c:631 +#: gio/gdbus-tool.c:630 msgid "Emit a signal." msgstr "Siųsti signalą." -#: gio/gdbus-tool.c:686 gio/gdbus-tool.c:1003 gio/gdbus-tool.c:1837 -#: gio/gdbus-tool.c:2069 gio/gdbus-tool.c:2289 +#: gio/gdbus-tool.c:685 gio/gdbus-tool.c:1002 gio/gdbus-tool.c:1836 +#: gio/gdbus-tool.c:2068 gio/gdbus-tool.c:2288 #, c-format msgid "Error connecting: %s\n" msgstr "Klaida prisijungiant: %s\n" -#: gio/gdbus-tool.c:706 +#: gio/gdbus-tool.c:705 #, c-format msgid "Error: %s is not a valid unique bus name.\n" msgstr "Klaida: %s nėra tinkamas unikalus magistralės pavadinimas.\n" -#: gio/gdbus-tool.c:725 gio/gdbus-tool.c:1046 gio/gdbus-tool.c:1880 +#: gio/gdbus-tool.c:724 gio/gdbus-tool.c:1045 gio/gdbus-tool.c:1879 msgid "Error: Object path is not specified\n" msgstr "Klaida: nenurodytas objekto kelias\n" -#: gio/gdbus-tool.c:768 +#: gio/gdbus-tool.c:767 msgid "Error: Signal name is not specified\n" msgstr "Klaida: nenurodytas signalo pavadinimas\n" -#: gio/gdbus-tool.c:782 +#: gio/gdbus-tool.c:781 #, c-format msgid "Error: Signal name “%s” is invalid\n" msgstr "Klaida: signalo pavadinimas „%s“ yra netinkamas\n" -#: gio/gdbus-tool.c:794 +#: gio/gdbus-tool.c:793 #, c-format msgid "Error: %s is not a valid interface name\n" msgstr "Klaida: %s nėra tinkamas sąsajos pavadinimas\n" -#: gio/gdbus-tool.c:800 +#: gio/gdbus-tool.c:799 #, c-format msgid "Error: %s is not a valid member name\n" msgstr "Klaida: %s nėra tinkamas nario pavadinimas\n" #. Use the original non-"parse-me-harder" error -#: gio/gdbus-tool.c:837 gio/gdbus-tool.c:1178 +#: gio/gdbus-tool.c:836 gio/gdbus-tool.c:1177 #, c-format msgid "Error parsing parameter %d: %s\n" msgstr "Klaida skaitant parametrą %d: %s\n" -#: gio/gdbus-tool.c:869 +#: gio/gdbus-tool.c:868 #, c-format msgid "Error flushing connection: %s\n" msgstr "Klaida išsiunčiant ryšį: %s\n" -#: gio/gdbus-tool.c:897 +#: gio/gdbus-tool.c:896 msgid "Destination name to invoke method on" msgstr "Tikslo pavadinimas metodo iškvietimui" -#: gio/gdbus-tool.c:898 +#: gio/gdbus-tool.c:897 msgid "Object path to invoke method on" msgstr "Objekto kelias metodo iškvietimui" -#: gio/gdbus-tool.c:899 +#: gio/gdbus-tool.c:898 msgid "Method and interface name" msgstr "Metodo ir sąsajos pavadinimai" -#: gio/gdbus-tool.c:900 +#: gio/gdbus-tool.c:899 msgid "Timeout in seconds" msgstr "Laiko limitas sekundėmis" -#: gio/gdbus-tool.c:901 +#: gio/gdbus-tool.c:900 msgid "Allow interactive authorization" msgstr "Rodyti interaktyvią autorizaciją" -#: gio/gdbus-tool.c:948 +#: gio/gdbus-tool.c:947 msgid "Invoke a method on a remote object." msgstr "Iškviesti metodą nutolusiame objekte." -#: gio/gdbus-tool.c:1020 gio/gdbus-tool.c:1854 gio/gdbus-tool.c:2094 +#: gio/gdbus-tool.c:1019 gio/gdbus-tool.c:1853 gio/gdbus-tool.c:2093 msgid "Error: Destination is not specified\n" msgstr "Klaida: nenurodytas tikslas\n" -#: gio/gdbus-tool.c:1031 gio/gdbus-tool.c:1871 gio/gdbus-tool.c:2105 +#: gio/gdbus-tool.c:1030 gio/gdbus-tool.c:1870 gio/gdbus-tool.c:2104 #, c-format msgid "Error: %s is not a valid bus name\n" msgstr "Klaida: %s nėra tinkamas magistralės pavadinimas\n" -#: gio/gdbus-tool.c:1081 +#: gio/gdbus-tool.c:1080 msgid "Error: Method name is not specified\n" msgstr "Klaida: nenurodytas metodo vardas\n" -#: gio/gdbus-tool.c:1092 +#: gio/gdbus-tool.c:1091 #, c-format msgid "Error: Method name “%s” is invalid\n" msgstr "Klaida: metodo vardas „%s“ yra netinkamas\n" -#: gio/gdbus-tool.c:1170 +#: gio/gdbus-tool.c:1169 #, c-format msgid "Error parsing parameter %d of type “%s”: %s\n" msgstr "Klaida skaitant parametrą %d, kurio tipas „%s“: %s\n" -#: gio/gdbus-tool.c:1196 +#: gio/gdbus-tool.c:1195 #, c-format msgid "Error adding handle %d: %s\n" msgstr "Klaida pridedant rankenėlę %d: %s\n" -#: gio/gdbus-tool.c:1696 +#: gio/gdbus-tool.c:1695 msgid "Destination name to introspect" msgstr "Tikslo vardas introspekcijai" -#: gio/gdbus-tool.c:1697 +#: gio/gdbus-tool.c:1696 msgid "Object path to introspect" msgstr "Objekto kelias introspekcijai" -#: gio/gdbus-tool.c:1698 +#: gio/gdbus-tool.c:1697 msgid "Print XML" msgstr "Spausdinti XML" -#: gio/gdbus-tool.c:1699 +#: gio/gdbus-tool.c:1698 msgid "Introspect children" msgstr "Nagrinėti vaiką" -#: gio/gdbus-tool.c:1700 +#: gio/gdbus-tool.c:1699 msgid "Only print properties" msgstr "Spausdinti tik savybes" -#: gio/gdbus-tool.c:1789 +#: gio/gdbus-tool.c:1788 msgid "Introspect a remote object." msgstr "Introspekcija nutolusiam objektui." -#: gio/gdbus-tool.c:1995 +#: gio/gdbus-tool.c:1994 msgid "Destination name to monitor" msgstr "Tikslo vardas stebėjimui" -#: gio/gdbus-tool.c:1996 +#: gio/gdbus-tool.c:1995 msgid "Object path to monitor" msgstr "Objekto kelias stebėjimui" -#: gio/gdbus-tool.c:2021 +#: gio/gdbus-tool.c:2020 msgid "Monitor a remote object." msgstr "Stebėti nutolusį objektą." -#: gio/gdbus-tool.c:2079 +#: gio/gdbus-tool.c:2078 msgid "Error: can’t monitor a non-message-bus connection\n" msgstr "Klaida: nepavyksta stebėti ne žinučių magistralės ryšio\n" -#: gio/gdbus-tool.c:2203 +#: gio/gdbus-tool.c:2202 msgid "Service to activate before waiting for the other one (well-known name)" msgstr "Aktyvuotina tarnyba prieš laukiant kitos (gerai žinomas pavadinimas)" -#: gio/gdbus-tool.c:2206 +#: gio/gdbus-tool.c:2205 msgid "" "Timeout to wait for before exiting with an error (seconds); 0 for no timeout " "(default)" @@ -1291,29 +1295,29 @@ "Kiek laiko laukti prieš išeinant su klaida (sekundėmis); 0 reiškia neribotai " "(numatyta)" -#: gio/gdbus-tool.c:2254 +#: gio/gdbus-tool.c:2253 msgid "OPTION… BUS-NAME" msgstr "PARAMETRAS… MAGISTRALĖS-PAVADINIMAS" -#: gio/gdbus-tool.c:2255 +#: gio/gdbus-tool.c:2254 msgid "Wait for a bus name to appear." msgstr "Laukti, kol pasirodys magistralės pavadinimas." -#: gio/gdbus-tool.c:2331 +#: gio/gdbus-tool.c:2330 msgid "Error: A service to activate for must be specified.\n" msgstr "" "Klaida: reikia nurodyti aktyvuojamą tarnybą.\n" "\n" -#: gio/gdbus-tool.c:2336 +#: gio/gdbus-tool.c:2335 msgid "Error: A service to wait for must be specified.\n" msgstr "Klaida: turi būti nurodyta tarnyba, kurios laukti.\n" -#: gio/gdbus-tool.c:2341 +#: gio/gdbus-tool.c:2340 msgid "Error: Too many arguments.\n" msgstr "Klaida: per daug argumentų.\n" -#: gio/gdbus-tool.c:2349 gio/gdbus-tool.c:2356 +#: gio/gdbus-tool.c:2348 gio/gdbus-tool.c:2355 #, c-format msgid "Error: %s is not a valid well-known bus name.\n" msgstr "Klaida: %s nėra tinkamas gerai žinomas magistralės pavadinimas.\n" @@ -1323,38 +1327,43 @@ msgid "Not authorized to change debug settings" msgstr "Neleidžiama keisti derinimo nuostatų" -#: gio/gdesktopappinfo.c:2182 gio/gdesktopappinfo.c:5113 +#: gio/gdesktopappinfo.c:2242 gio/gdesktopappinfo.c:5223 msgid "Unnamed" msgstr "Nepavadinta" -#: gio/gdesktopappinfo.c:2592 +#: gio/gdesktopappinfo.c:2652 msgid "Desktop file didn’t specify Exec field" msgstr "Darbalaukio failas nenurodė Exec lauko" -#: gio/gdesktopappinfo.c:2891 +#: gio/gdesktopappinfo.c:2942 msgid "Unable to find terminal required for application" msgstr "Nerastas terminalas, reikalingas programai" -#: gio/gdesktopappinfo.c:3631 +#: gio/gdesktopappinfo.c:3002 +#, c-format +msgid "Program ‘%s’ not found in $PATH" +msgstr "Programa „%s“ nerasta $PATH" + +#: gio/gdesktopappinfo.c:3735 #, c-format msgid "Can’t create user application configuration folder %s: %s" msgstr "Nepavyko sukurti naudotojo nustatymų aplanko %s: %s" -#: gio/gdesktopappinfo.c:3635 +#: gio/gdesktopappinfo.c:3739 #, c-format msgid "Can’t create user MIME configuration folder %s: %s" msgstr "Nepavyko sukurti naudotojo MIME nustatymų aplanko %s: %s" -#: gio/gdesktopappinfo.c:3877 gio/gdesktopappinfo.c:3901 +#: gio/gdesktopappinfo.c:3981 gio/gdesktopappinfo.c:4005 msgid "Application information lacks an identifier" msgstr "Programos informacijai trūksta identifikatoriaus" -#: gio/gdesktopappinfo.c:4137 +#: gio/gdesktopappinfo.c:4241 #, c-format msgid "Can’t create user desktop file %s" msgstr "Nepavyko sukurti naudotojo darbalaukio failo %s" -#: gio/gdesktopappinfo.c:4273 +#: gio/gdesktopappinfo.c:4377 #, c-format msgid "Custom definition for %s" msgstr "Specialus apibrėžimas %s" @@ -1428,7 +1437,7 @@ msgid "Containing mount does not exist" msgstr "Tėvinis prijungimo taškas neegzistuoja" -#: gio/gfile.c:2641 gio/glocalfile.c:2500 +#: gio/gfile.c:2641 gio/glocalfile.c:2511 msgid "Can’t copy over directory" msgstr "Negalima kopijuoti ant aplanko viršaus" @@ -1473,7 +1482,7 @@ msgid "Invalid symlink value given" msgstr "Netaisyklinga simbolinės nuorodos reikšmė" -#: gio/gfile.c:4163 glib/gfileutils.c:2335 +#: gio/gfile.c:4163 glib/gfileutils.c:2392 msgid "Symbolic links not supported" msgstr "Simbolinės nuorodos nepalaikomos" @@ -1574,37 +1583,37 @@ msgid "HTTP proxy server closed connection unexpectedly." msgstr "Ryšys su HTTP tarpiniu serveriu netikėtai užvertas." -#: gio/gicon.c:300 +#: gio/gicon.c:299 #, c-format msgid "Wrong number of tokens (%d)" msgstr "Neteisingas leksemų skaičius (%d)" -#: gio/gicon.c:320 +#: gio/gicon.c:319 #, c-format msgid "No type for class name %s" msgstr "Nėra tipo klasės pavadinimui %s" -#: gio/gicon.c:330 +#: gio/gicon.c:329 #, c-format msgid "Type %s does not implement the GIcon interface" msgstr "Tipas %s nerealizuoja GIcon sąsajos" -#: gio/gicon.c:341 +#: gio/gicon.c:340 #, c-format msgid "Type %s is not classed" msgstr "Tipas %s neklasifikuotas" -#: gio/gicon.c:355 +#: gio/gicon.c:354 #, c-format msgid "Malformed version number: %s" msgstr "Netinkamas versijos numeris: %s" -#: gio/gicon.c:369 +#: gio/gicon.c:368 #, c-format msgid "Type %s does not implement from_tokens() on the GIcon interface" msgstr "Tipas %s nerealizuoja from_tokens() GIcon sąsajoje" -#: gio/gicon.c:471 +#: gio/gicon.c:470 msgid "Can’t handle the supplied version of the icon encoding" msgstr "Nepavyko apdoroti pateiktosios piktogramos koduotės versijos" @@ -1754,7 +1763,7 @@ #: gio/gio-tool-cat.c:135 gio/gio-tool-info.c:379 gio/gio-tool-list.c:173 #: gio/gio-tool-mkdir.c:50 gio/gio-tool-monitor.c:39 gio/gio-tool-monitor.c:41 #: gio/gio-tool-monitor.c:43 gio/gio-tool-monitor.c:45 -#: gio/gio-tool-monitor.c:206 gio/gio-tool-mount.c:1202 gio/gio-tool-open.c:72 +#: gio/gio-tool-monitor.c:206 gio/gio-tool-mount.c:1210 gio/gio-tool-open.c:72 #: gio/gio-tool-remove.c:50 gio/gio-tool-rename.c:47 gio/gio-tool-set.c:95 #: gio/gio-tool-trash.c:222 gio/gio-tool-tree.c:241 msgid "LOCATION" @@ -1775,7 +1784,7 @@ "smb://serveris/išteklius/failas.txt." #: gio/gio-tool-cat.c:164 gio/gio-tool-info.c:410 gio/gio-tool-mkdir.c:78 -#: gio/gio-tool-monitor.c:231 gio/gio-tool-mount.c:1253 gio/gio-tool-open.c:98 +#: gio/gio-tool-monitor.c:231 gio/gio-tool-mount.c:1261 gio/gio-tool-open.c:98 #: gio/gio-tool-remove.c:74 gio/gio-tool-trash.c:303 msgid "No locations given" msgstr "Nepateikta vietų" @@ -2189,19 +2198,19 @@ msgid "Mount a TCRYPT system volume" msgstr "Prijungti TCRYPT sisteminį tomą" -#: gio/gio-tool-mount.c:268 gio/gio-tool-mount.c:300 +#: gio/gio-tool-mount.c:276 gio/gio-tool-mount.c:308 msgid "Anonymous access denied" msgstr "Neleidžiama anoniminė prieiga" -#: gio/gio-tool-mount.c:525 +#: gio/gio-tool-mount.c:533 msgid "No drive for device file" msgstr "Nėra laikmenos ar įrenginio failo" -#: gio/gio-tool-mount.c:1017 +#: gio/gio-tool-mount.c:1025 msgid "No volume for given ID" msgstr "Nėra laikmenos pateiktam ID" -#: gio/gio-tool-mount.c:1206 +#: gio/gio-tool-mount.c:1214 msgid "Mount or unmount the locations." msgstr "Prijungti ar atjungti vietas." @@ -2321,7 +2330,6 @@ msgstr "TYPE" #: gio/gio-tool-set.c:38 -#| msgid "Set a file attribute" msgid "Unset given attribute" msgstr "Atstatyti nurodytą atributą" @@ -2405,7 +2413,7 @@ msgid "List contents of directories in a tree-like format." msgstr "Išvardinti katalogų turinį medžio pavidalo formatu." -#: gio/glib-compile-resources.c:142 gio/glib-compile-schemas.c:1516 +#: gio/glib-compile-resources.c:142 gio/glib-compile-schemas.c:1513 #, c-format msgid "Element <%s> not allowed inside <%s>" msgstr "Elementas <%s> neleidžiamas viduje <%s>" @@ -2460,7 +2468,7 @@ msgid "text may not appear inside <%s>" msgstr "tekstas negali būti viduje <%s>" -#: gio/glib-compile-resources.c:821 gio/glib-compile-schemas.c:2174 +#: gio/glib-compile-resources.c:821 gio/glib-compile-schemas.c:2171 msgid "Show program version and exit" msgstr "Parodyti programos versiją ir išeiti" @@ -2476,8 +2484,8 @@ "Katalogai, iš kurių skaityti faile nurodytus failus (numatyta iš esamo " "katalogo)" -#: gio/glib-compile-resources.c:823 gio/glib-compile-schemas.c:2175 -#: gio/glib-compile-schemas.c:2204 +#: gio/glib-compile-resources.c:823 gio/glib-compile-schemas.c:2172 +#: gio/glib-compile-schemas.c:2201 msgid "DIRECTORY" msgstr "KATALOGAS" @@ -2696,17 +2704,17 @@ msgid "<aliases> must contain at least one <alias>" msgstr "<aliases> turi turėti bent vieną <alias>" -#: gio/glib-compile-schemas.c:799 +#: gio/glib-compile-schemas.c:796 msgid "Empty names are not permitted" msgstr "Neleidžiami tušti pavadinimai" -#: gio/glib-compile-schemas.c:809 +#: gio/glib-compile-schemas.c:806 #, c-format msgid "Invalid name “%s”: names must begin with a lowercase letter" msgstr "" "Netinkamas pavadinimas „%s“: pavadinimai turi prasidėti mažosiomis raidėmis" -#: gio/glib-compile-schemas.c:821 +#: gio/glib-compile-schemas.c:818 #, c-format msgid "" "Invalid name “%s”: invalid character “%c”; only lowercase letters, numbers " @@ -2715,38 +2723,38 @@ "Netinkamas pavadinimas „%s“: netinkamas simbolis „%c“; leidžiamos tik " "mažosios raidės, skaitmenys ir brūkšniai („-“)" -#: gio/glib-compile-schemas.c:830 +#: gio/glib-compile-schemas.c:827 #, c-format msgid "Invalid name “%s”: two successive hyphens (“--”) are not permitted" msgstr "" "Netinkamas pavadinimas „%s“: du brūkšniai („--“) vienos po kito neleidžiami." -#: gio/glib-compile-schemas.c:839 +#: gio/glib-compile-schemas.c:836 #, c-format msgid "Invalid name “%s”: the last character may not be a hyphen (“-”)" msgstr "" "Netinkamas pavadinimas „%s“: paskutinis simbolis negali būti brūkšnys („-“)." -#: gio/glib-compile-schemas.c:847 +#: gio/glib-compile-schemas.c:844 #, c-format msgid "Invalid name “%s”: maximum length is 1024" msgstr "Netinkamas pavadinimas „%s“: didžiausias leistinas ilgis yra 1024" -#: gio/glib-compile-schemas.c:919 +#: gio/glib-compile-schemas.c:916 #, c-format msgid "<child name='%s'> already specified" msgstr "<child name='%s'> jau nurodyta" -#: gio/glib-compile-schemas.c:945 +#: gio/glib-compile-schemas.c:942 msgid "Cannot add keys to a “list-of” schema" msgstr "Nepavyko pridėti raktų į „list-of“ schemą" -#: gio/glib-compile-schemas.c:956 +#: gio/glib-compile-schemas.c:953 #, c-format msgid "<key name='%s'> already specified" msgstr "<key name='%s'> jau nurodytas" -#: gio/glib-compile-schemas.c:974 +#: gio/glib-compile-schemas.c:971 #, c-format msgid "" "<key name='%s'> shadows <key name='%s'> in <schema id='%s'>; use <override> " @@ -2755,7 +2763,7 @@ "<key name='%s'> paslėpia <key name='%s'> elemente <schema id='%s'>; " "naudokite <override> reikšmei pakeisti" -#: gio/glib-compile-schemas.c:985 +#: gio/glib-compile-schemas.c:982 #, c-format msgid "" "Exactly one of “type”, “enum” or “flags” must be specified as an attribute " @@ -2764,56 +2772,56 @@ "Kaip atributas elementui <key> turi būti nurodytas vienintelis iš „type“, " "„enum“ arba „flags“" -#: gio/glib-compile-schemas.c:1004 +#: gio/glib-compile-schemas.c:1001 #, c-format msgid "<%s id='%s'> not (yet) defined." msgstr "<%s id='%s'> (dar) neapibrėžta." -#: gio/glib-compile-schemas.c:1019 +#: gio/glib-compile-schemas.c:1016 #, c-format msgid "Invalid GVariant type string “%s”" msgstr "Netinkama GVariant tipo eilutė „%s“" -#: gio/glib-compile-schemas.c:1049 +#: gio/glib-compile-schemas.c:1046 msgid "<override> given but schema isn’t extending anything" msgstr "<override> nurodytas, bet schema nieko neišplečia" -#: gio/glib-compile-schemas.c:1062 +#: gio/glib-compile-schemas.c:1059 #, c-format msgid "No <key name='%s'> to override" msgstr "Nėra perrašomo <key name='%s'>" -#: gio/glib-compile-schemas.c:1070 +#: gio/glib-compile-schemas.c:1067 #, c-format msgid "<override name='%s'> already specified" msgstr "<override name='%s'> jau nurodytas" -#: gio/glib-compile-schemas.c:1143 +#: gio/glib-compile-schemas.c:1140 #, c-format msgid "<schema id='%s'> already specified" msgstr "<schema id='%s'> jau nurodytas" -#: gio/glib-compile-schemas.c:1155 +#: gio/glib-compile-schemas.c:1152 #, c-format msgid "<schema id='%s'> extends not yet existing schema “%s”" msgstr "<schema id='%s'> išplečia dar neegzistuojančią schemą „%s“" -#: gio/glib-compile-schemas.c:1171 +#: gio/glib-compile-schemas.c:1168 #, c-format msgid "<schema id='%s'> is list of not yet existing schema “%s”" msgstr "<schema id='%s'> yra sąrašas iš dar neegzistuojančios schemos „%s“" -#: gio/glib-compile-schemas.c:1179 +#: gio/glib-compile-schemas.c:1176 #, c-format msgid "Cannot be a list of a schema with a path" msgstr "Negali būti schemos sąrašas su keliu" -#: gio/glib-compile-schemas.c:1189 +#: gio/glib-compile-schemas.c:1186 #, c-format msgid "Cannot extend a schema with a path" msgstr "Negalima išplėsti schemos su keliu" -#: gio/glib-compile-schemas.c:1199 +#: gio/glib-compile-schemas.c:1196 #, c-format msgid "" "<schema id='%s'> is a list, extending <schema id='%s'> which is not a list" @@ -2821,7 +2829,7 @@ "<schema id='%s'> yra sąrašas, išplečiantis <schema id='%s'>, kuris nėra " "sąrašas" -#: gio/glib-compile-schemas.c:1209 +#: gio/glib-compile-schemas.c:1206 #, c-format msgid "" "<schema id='%s' list-of='%s'> extends <schema id='%s' list-of='%s'> but “%s” " @@ -2830,17 +2838,17 @@ "<schema id='%s' list-of='%s'> išplečia <schema id='%s' list-of='%s'>, bet " "„%s“ neišplečia „%s“" -#: gio/glib-compile-schemas.c:1226 +#: gio/glib-compile-schemas.c:1223 #, c-format msgid "A path, if given, must begin and end with a slash" msgstr "Kelias, jei pateiktas, turi prasidėti ir baigtis pasviruoju brūkšniu" -#: gio/glib-compile-schemas.c:1233 +#: gio/glib-compile-schemas.c:1230 #, c-format msgid "The path of a list must end with “:/”" msgstr "Sąrašo kelias turi baigtis „:/“" -#: gio/glib-compile-schemas.c:1242 +#: gio/glib-compile-schemas.c:1239 #, c-format msgid "" "Warning: Schema “%s” has path “%s”. Paths starting with “/apps/”, “/" @@ -2849,49 +2857,49 @@ "Įspėjimas: schema „%s“ turi kelią „%s“. Keliai, prasidedantys „/apps/“, „/" "desktop/“ ar „/system“ yra pasenę." -#: gio/glib-compile-schemas.c:1272 +#: gio/glib-compile-schemas.c:1269 #, c-format msgid "<%s id='%s'> already specified" msgstr "<%s id='%s'> jau nurodytas" -#: gio/glib-compile-schemas.c:1422 gio/glib-compile-schemas.c:1438 +#: gio/glib-compile-schemas.c:1419 gio/glib-compile-schemas.c:1435 #, c-format msgid "Only one <%s> element allowed inside <%s>" msgstr "Tik vienas elementas <%s> leidžiamas <%s> viduje" -#: gio/glib-compile-schemas.c:1520 +#: gio/glib-compile-schemas.c:1517 #, c-format msgid "Element <%s> not allowed at the top level" msgstr "Elementas <%s> neleidžiamas aukščiausiame lygyje" -#: gio/glib-compile-schemas.c:1538 +#: gio/glib-compile-schemas.c:1535 msgid "Element <default> is required in <key>" msgstr "Elementas <default> yra būtinas elemente <key>" -#: gio/glib-compile-schemas.c:1628 +#: gio/glib-compile-schemas.c:1625 #, c-format msgid "Text may not appear inside <%s>" msgstr "Tekstas negali būti viduje <%s>" -#: gio/glib-compile-schemas.c:1696 +#: gio/glib-compile-schemas.c:1693 #, c-format msgid "Warning: undefined reference to <schema id='%s'/>" msgstr "Įspėjimas: neapibrėžta nuoroda į <schema id='%s'/>" #. Translators: Do not translate "--strict". -#: gio/glib-compile-schemas.c:1835 gio/glib-compile-schemas.c:1914 +#: gio/glib-compile-schemas.c:1832 gio/glib-compile-schemas.c:1911 msgid "--strict was specified; exiting." msgstr "--strict buvo nurodyta; išeinama." -#: gio/glib-compile-schemas.c:1847 +#: gio/glib-compile-schemas.c:1844 msgid "This entire file has been ignored." msgstr "Visas failas nepaisomas." -#: gio/glib-compile-schemas.c:1910 +#: gio/glib-compile-schemas.c:1907 msgid "Ignoring this file." msgstr "Nepaisoma šio failo." -#: gio/glib-compile-schemas.c:1965 +#: gio/glib-compile-schemas.c:1962 #, c-format msgid "" "No such key “%s” in schema “%s” as specified in override file “%s”; ignoring " @@ -2900,7 +2908,7 @@ "Nėra rakto „%s“ schemoje „%s“ kaip nurodyta perrašančiame faile „%s“; " "nepaisoma šio rakto." -#: gio/glib-compile-schemas.c:1973 +#: gio/glib-compile-schemas.c:1970 #, c-format msgid "" "No such key “%s” in schema “%s” as specified in override file “%s” and --" @@ -2909,7 +2917,7 @@ "Nėra rakto „%s“ schemoje „%s“ kaip nurodyta perrašančiame faile „%s“ ir buvo " "nurodyta --strict; išeinama." -#: gio/glib-compile-schemas.c:1995 +#: gio/glib-compile-schemas.c:1992 #, c-format msgid "" "Cannot provide per-desktop overrides for localized key “%s” in schema " @@ -2918,7 +2926,7 @@ "Negalima pateikti darbalaukio pakeitimų lokalizuotam raktui „%s“ schemoje " "„%s“ (perrašomas failas „%s“); nepaisoma šio rakto perrašymo." -#: gio/glib-compile-schemas.c:2004 +#: gio/glib-compile-schemas.c:2001 #, c-format msgid "" "Cannot provide per-desktop overrides for localized key “%s” in schema " @@ -2927,7 +2935,7 @@ "Negalima pateikti darbalaukio pakeitimų lokalizuotam raktui „%s“ schemoje " "„%s“ (perrašomas failas „%s“) ir buvo nurodyta --strict; išeinama." -#: gio/glib-compile-schemas.c:2028 +#: gio/glib-compile-schemas.c:2025 #, c-format msgid "" "Error parsing key “%s” in schema “%s” as specified in override file “%s”: " @@ -2936,7 +2944,7 @@ "klaida skaitant raktą „%s“ schemoje „%s“, kaip nurodyta perrašančiame faile " "„%s“: %s. Nepaisoma šio rakto perrašymo." -#: gio/glib-compile-schemas.c:2040 +#: gio/glib-compile-schemas.c:2037 #, c-format msgid "" "Error parsing key “%s” in schema “%s” as specified in override file “%s”: " @@ -2945,7 +2953,7 @@ "klaida skaitant raktą „%s“ schemoje „%s“, kaip nurodyta perrašančiame faile " "„%s“: %s. Buvo nurodyta --strict; išeinama." -#: gio/glib-compile-schemas.c:2067 +#: gio/glib-compile-schemas.c:2064 #, c-format msgid "" "Override for key “%s” in schema “%s” in override file “%s” is outside the " @@ -2954,7 +2962,7 @@ "rakto „%s“ perrašymas schemoje „%s“ perrašančiame faile „%s“ yra už schemoje " "nurodytų ribų; nepaisoma šio rakto perrašymo." -#: gio/glib-compile-schemas.c:2077 +#: gio/glib-compile-schemas.c:2074 #, c-format msgid "" "Override for key “%s” in schema “%s” in override file “%s” is outside the " @@ -2963,7 +2971,7 @@ "rakto „%s“ perrašymas schemoje „%s“ perrašančiame faile „%s“ yra už schemoje " "nurodytų ribų ir buvo nurodyta --strict; išeinama." -#: gio/glib-compile-schemas.c:2103 +#: gio/glib-compile-schemas.c:2100 #, c-format msgid "" "Override for key “%s” in schema “%s” in override file “%s” is not in the " @@ -2972,7 +2980,7 @@ "rakto „%s“ perrašymas schemoje „%s“ perrašančiame faile „%s“ nėra iš " "leistinų pasirinkimų; nepaisoma šio rakto perrašymo." -#: gio/glib-compile-schemas.c:2113 +#: gio/glib-compile-schemas.c:2110 #, c-format msgid "" "Override for key “%s” in schema “%s” in override file “%s” is not in the " @@ -2981,23 +2989,23 @@ "rakto „%s“ perrašymas schemoje „%s“ perrašančiame faile „%s“ nėra iš " "leistinų pasirinkimų ir buvo nurodyta --strict; išeinama." -#: gio/glib-compile-schemas.c:2175 +#: gio/glib-compile-schemas.c:2172 msgid "Where to store the gschemas.compiled file" msgstr "Kur saugoti gschemas.compiled failą" -#: gio/glib-compile-schemas.c:2176 +#: gio/glib-compile-schemas.c:2173 msgid "Abort on any errors in schemas" msgstr "Nutraukti darbą esant bet kokiai klaidai schemoje" -#: gio/glib-compile-schemas.c:2177 +#: gio/glib-compile-schemas.c:2174 msgid "Do not write the gschema.compiled file" msgstr "Nerašyti gschema.compiled failo" -#: gio/glib-compile-schemas.c:2178 +#: gio/glib-compile-schemas.c:2175 msgid "Do not enforce key name restrictions" msgstr "Nereikalauti raktų vardų apribojimų" -#: gio/glib-compile-schemas.c:2207 +#: gio/glib-compile-schemas.c:2204 msgid "" "Compile all GSettings schema files into a schema cache.\n" "Schema files are required to have the extension .gschema.xml,\n" @@ -3007,15 +3015,15 @@ "Schemų failai turi turėti plėtinį .gschema.xml,\n" "o podėlio failas yra vadinamas gschemas.compiled." -#: gio/glib-compile-schemas.c:2228 +#: gio/glib-compile-schemas.c:2225 msgid "You should give exactly one directory name" msgstr "Turite nurodyti vienintelį katalogo pavadinimą" -#: gio/glib-compile-schemas.c:2271 +#: gio/glib-compile-schemas.c:2268 msgid "No schema files found: doing nothing." msgstr "Nerasti schemų failai: nieko nedaroma." -#: gio/glib-compile-schemas.c:2273 +#: gio/glib-compile-schemas.c:2270 msgid "No schema files found: removed existing output file." msgstr "Nerasti schemų failai: pašalintas egzistuojanti išvesties failas." @@ -3024,7 +3032,7 @@ msgid "Invalid filename %s" msgstr "Netaisyklingas failo vardas %s" -#: gio/glocalfile.c:996 +#: gio/glocalfile.c:1005 #, c-format msgid "Error getting filesystem info for %s: %s" msgstr "Klaida gaunant %s failų sistemos informaciją: %s" @@ -3033,124 +3041,124 @@ #. * the enclosing (user visible) mount of a file, but none #. * exists. #. -#: gio/glocalfile.c:1137 +#: gio/glocalfile.c:1141 #, c-format msgid "Containing mount for file %s not found" msgstr "Nerastas tėvinis prijungimo taškas %s" -#: gio/glocalfile.c:1160 +#: gio/glocalfile.c:1164 msgid "Can’t rename root directory" msgstr "Negalima pervadinti šakninio aplanko" -#: gio/glocalfile.c:1178 gio/glocalfile.c:1201 +#: gio/glocalfile.c:1182 gio/glocalfile.c:1205 #, c-format msgid "Error renaming file %s: %s" msgstr "Klaida pervadinant failą %s: %s" -#: gio/glocalfile.c:1185 +#: gio/glocalfile.c:1189 msgid "Can’t rename file, filename already exists" msgstr "Nepavyko pervadinti failo, failo vardas jau užimtas" -#: gio/glocalfile.c:1198 gio/glocalfile.c:2394 gio/glocalfile.c:2422 -#: gio/glocalfile.c:2561 gio/glocalfileoutputstream.c:658 +#: gio/glocalfile.c:1202 gio/glocalfile.c:2405 gio/glocalfile.c:2433 +#: gio/glocalfile.c:2572 gio/glocalfileoutputstream.c:658 msgid "Invalid filename" msgstr "Netaisyklingas failo vardas" -#: gio/glocalfile.c:1366 gio/glocalfile.c:1377 +#: gio/glocalfile.c:1370 gio/glocalfile.c:1381 #, c-format msgid "Error opening file %s: %s" msgstr "Klaida atveriant failą %s: %s" -#: gio/glocalfile.c:1502 +#: gio/glocalfile.c:1506 #, c-format msgid "Error removing file %s: %s" msgstr "Klaida trinant failą %s: %s" -#: gio/glocalfile.c:1996 gio/glocalfile.c:2007 gio/glocalfile.c:2034 +#: gio/glocalfile.c:2000 gio/glocalfile.c:2011 gio/glocalfile.c:2038 #, c-format msgid "Error trashing file %s: %s" msgstr "Klaida perkeliant failą %s į šiukšlinę: %s" -#: gio/glocalfile.c:2054 +#: gio/glocalfile.c:2058 #, c-format msgid "Unable to create trash directory %s: %s" msgstr "Nepavyko sukurti šiukšlių aplanko %s: %s" -#: gio/glocalfile.c:2075 +#: gio/glocalfile.c:2079 #, c-format msgid "Unable to find toplevel directory to trash %s" msgstr "Nepavyko rasti šakninio aplanko %s išmesti" -#: gio/glocalfile.c:2083 +#: gio/glocalfile.c:2087 #, c-format msgid "Trashing on system internal mounts is not supported" msgstr "Išmetimas tarp sistemos vidinių prijungimo taškų nepalaikomas" -#: gio/glocalfile.c:2169 gio/glocalfile.c:2197 +#: gio/glocalfile.c:2173 gio/glocalfile.c:2201 #, c-format msgid "Unable to find or create trash directory %s to trash %s" msgstr "Nepavyko rasti ar sukurti šiukšlių aplanko %s %s išmesti" -#: gio/glocalfile.c:2243 +#: gio/glocalfile.c:2245 #, c-format msgid "Unable to create trashing info file for %s: %s" msgstr "Nepavyko sukurti šiukšlinės informacijos failo %s: %s" -#: gio/glocalfile.c:2305 +#: gio/glocalfile.c:2316 #, c-format msgid "Unable to trash file %s across filesystem boundaries" msgstr "Nepavyko perkelti failo %s į šiukšlinę per failų sistemos ribas" -#: gio/glocalfile.c:2309 gio/glocalfile.c:2365 +#: gio/glocalfile.c:2320 gio/glocalfile.c:2376 #, c-format msgid "Unable to trash file %s: %s" msgstr "Nepavyko failo %s išmesti į šiukšlinę: %s" -#: gio/glocalfile.c:2371 +#: gio/glocalfile.c:2382 #, c-format msgid "Unable to trash file %s" msgstr "Nepavyko išmesti į šiukšlinę failo %s" -#: gio/glocalfile.c:2397 +#: gio/glocalfile.c:2408 #, c-format msgid "Error creating directory %s: %s" msgstr "Klaida kuriant katalogą %s: %s" -#: gio/glocalfile.c:2426 +#: gio/glocalfile.c:2437 #, c-format msgid "Filesystem does not support symbolic links" msgstr "Failų sistema nepalaiko simbolinių nuorodų" -#: gio/glocalfile.c:2429 +#: gio/glocalfile.c:2440 #, c-format msgid "Error making symbolic link %s: %s" msgstr "Klaida kuriant simbolinę nuorodą %s: %s" -#: gio/glocalfile.c:2472 gio/glocalfile.c:2507 gio/glocalfile.c:2564 +#: gio/glocalfile.c:2483 gio/glocalfile.c:2518 gio/glocalfile.c:2575 #, c-format msgid "Error moving file %s: %s" msgstr "Klaida perkeliant failą %s: %s" -#: gio/glocalfile.c:2495 +#: gio/glocalfile.c:2506 msgid "Can’t move directory over directory" msgstr "Negalima perkelti aplanko ant aplanko" -#: gio/glocalfile.c:2521 gio/glocalfileoutputstream.c:1110 +#: gio/glocalfile.c:2532 gio/glocalfileoutputstream.c:1110 #: gio/glocalfileoutputstream.c:1124 gio/glocalfileoutputstream.c:1139 #: gio/glocalfileoutputstream.c:1156 gio/glocalfileoutputstream.c:1170 msgid "Backup file creation failed" msgstr "Atsarginės kopijos sukūrimas nesėkmingas" -#: gio/glocalfile.c:2540 +#: gio/glocalfile.c:2551 #, c-format msgid "Error removing target file: %s" msgstr "Klaida trinant nurodytą failą: %s" -#: gio/glocalfile.c:2554 +#: gio/glocalfile.c:2565 msgid "Move between mounts not supported" msgstr "Perkėlimas tarp prijungimo taškų nepalaikomas" -#: gio/glocalfile.c:2728 +#: gio/glocalfile.c:2741 #, c-format msgid "Could not determine the disk usage of %s: %s" msgstr "Nepavyko nustatyti %s disko naudojimo: %s" @@ -3160,7 +3168,6 @@ msgstr "Atributo reikšmė turi būti netuščia" #: gio/glocalfileinfo.c:782 -#| msgid "Invalid attribute type (string expected)" msgid "Invalid attribute type (string or invalid expected)" msgstr "Netaisyklingas atributo tipas (tikimasi simbolių sekos)" @@ -3173,115 +3180,115 @@ msgid "Error setting extended attribute “%s”: %s" msgstr "Klaida nustatant išplėstinį atributą „%s“: %s" -#: gio/glocalfileinfo.c:1738 gio/win32/gwinhttpfile.c:191 +#: gio/glocalfileinfo.c:1819 gio/win32/gwinhttpfile.c:191 msgid " (invalid encoding)" msgstr " (netaisyklinga koduotė)" -#: gio/glocalfileinfo.c:1897 gio/glocalfileoutputstream.c:945 +#: gio/glocalfileinfo.c:1978 gio/glocalfileoutputstream.c:945 #: gio/glocalfileoutputstream.c:997 #, c-format msgid "Error when getting information for file “%s”: %s" msgstr "Klaida gaunant informaciją apie failą „%s“: %s" -#: gio/glocalfileinfo.c:2163 +#: gio/glocalfileinfo.c:2281 #, c-format msgid "Error when getting information for file descriptor: %s" msgstr "Klaida gaunant informaciją failo aprašymui: %s" -#: gio/glocalfileinfo.c:2208 +#: gio/glocalfileinfo.c:2326 msgid "Invalid attribute type (uint32 expected)" msgstr "Klaidingas atributo tipas (tikimasi uint32)" -#: gio/glocalfileinfo.c:2226 +#: gio/glocalfileinfo.c:2344 msgid "Invalid attribute type (uint64 expected)" msgstr "Klaidingas atributo tipas (tikimasi uint64)" -#: gio/glocalfileinfo.c:2245 gio/glocalfileinfo.c:2264 +#: gio/glocalfileinfo.c:2363 gio/glocalfileinfo.c:2382 msgid "Invalid attribute type (byte string expected)" msgstr "Klaidingas atributo tipas (tikimasi baitų sekos)" -#: gio/glocalfileinfo.c:2311 +#: gio/glocalfileinfo.c:2429 msgid "Cannot set permissions on symlinks" msgstr "Simbolinėms nuorodoms teisių nustatyti negalima" -#: gio/glocalfileinfo.c:2327 +#: gio/glocalfileinfo.c:2445 #, c-format msgid "Error setting permissions: %s" msgstr "Klaida nustatant teises: %s" -#: gio/glocalfileinfo.c:2378 +#: gio/glocalfileinfo.c:2496 #, c-format msgid "Error setting owner: %s" msgstr "Klaida nustatant savininką: %s" -#: gio/glocalfileinfo.c:2401 +#: gio/glocalfileinfo.c:2519 msgid "symlink must be non-NULL" msgstr "simbolinė nuoroda turi būti netuščia" -#: gio/glocalfileinfo.c:2411 gio/glocalfileinfo.c:2430 -#: gio/glocalfileinfo.c:2441 +#: gio/glocalfileinfo.c:2529 gio/glocalfileinfo.c:2548 +#: gio/glocalfileinfo.c:2559 #, c-format msgid "Error setting symlink: %s" msgstr "Klaida nustatant simbolinę nuorodą: %s" -#: gio/glocalfileinfo.c:2420 +#: gio/glocalfileinfo.c:2538 msgid "Error setting symlink: file is not a symlink" msgstr "Klaida, nustatant simbolinę nuorodą: failas nėra simbolinė nuoroda" -#: gio/glocalfileinfo.c:2492 +#: gio/glocalfileinfo.c:2630 #, c-format msgid "Extra nanoseconds %d for UNIX timestamp %lld are negative" msgstr "Papildomos nanosekundės %d UNIX laiko žymai %lld yra neigiamos" -#: gio/glocalfileinfo.c:2501 +#: gio/glocalfileinfo.c:2639 #, c-format msgid "Extra nanoseconds %d for UNIX timestamp %lld reach 1 second" msgstr "Papildomos nanosekundės %d UNIX laiko žymai %lld pasiekia 1 sekundę" -#: gio/glocalfileinfo.c:2511 +#: gio/glocalfileinfo.c:2649 #, c-format msgid "UNIX timestamp %lld does not fit into 64 bits" msgstr "UNIX laiko žyma %lld netelpa į 64 bitus" -#: gio/glocalfileinfo.c:2522 +#: gio/glocalfileinfo.c:2660 #, c-format msgid "UNIX timestamp %lld is outside of the range supported by Windows" msgstr "UNIX laiko žyma %lld yra už Windows palaikomų ribų" -#: gio/glocalfileinfo.c:2625 +#: gio/glocalfileinfo.c:2792 #, c-format msgid "File name “%s” cannot be converted to UTF-16" msgstr "Failo pavadinimo „%s“ negalima kontertuoti į UTF-16" -#: gio/glocalfileinfo.c:2644 +#: gio/glocalfileinfo.c:2811 #, c-format msgid "File “%s” cannot be opened: Windows Error %lu" msgstr "Failo „%s“ negalima atverti: Windows klaida %lu" -#: gio/glocalfileinfo.c:2657 +#: gio/glocalfileinfo.c:2824 #, c-format msgid "Error setting modification or access time for file “%s”: %lu" msgstr "Klaida nustatant pakeitimo arba prieigos laiką failui „%s“: %lu" -#: gio/glocalfileinfo.c:2798 gio/glocalfileinfo.c:2810 +#: gio/glocalfileinfo.c:2981 #, c-format msgid "Error setting modification or access time: %s" msgstr "Klaida nustatant pakeitimo arba prieigos laiką: %s" -#: gio/glocalfileinfo.c:2833 +#: gio/glocalfileinfo.c:3004 msgid "SELinux context must be non-NULL" msgstr "SELinux kontekstas būti nelygus NULL" -#: gio/glocalfileinfo.c:2840 +#: gio/glocalfileinfo.c:3011 msgid "SELinux is not enabled on this system" msgstr "SELinux šioje sistemoje neįjungtas" -#: gio/glocalfileinfo.c:2850 +#: gio/glocalfileinfo.c:3021 #, c-format msgid "Error setting SELinux context: %s" msgstr "Klaida nustatant SELinux kontekstą: %s" -#: gio/glocalfileinfo.c:2947 +#: gio/glocalfileinfo.c:3118 #, c-format msgid "Setting attribute %s not supported" msgstr "Atributo %s nustatymas nepalaikomas" @@ -3328,13 +3335,13 @@ msgid "Error renaming temporary file: %s" msgstr "Klaida pervadinant laikinąjį failą: %s" -#: gio/glocalfileoutputstream.c:611 gio/glocalfileoutputstream.c:1241 +#: gio/glocalfileoutputstream.c:611 gio/glocalfileoutputstream.c:1242 #, c-format msgid "Error truncating file: %s" msgstr "Klaida trumpinant failą: %s" #: gio/glocalfileoutputstream.c:664 gio/glocalfileoutputstream.c:909 -#: gio/glocalfileoutputstream.c:1222 gio/gsubprocess.c:231 +#: gio/glocalfileoutputstream.c:1223 gio/gsubprocess.c:231 #, c-format msgid "Error opening file “%s”: %s" msgstr "Klaida atveriant failą %s: %s" @@ -3351,7 +3358,7 @@ msgid "The file was externally modified" msgstr "Failas buvo pakeistas kitos programos" -#: gio/glocalfileoutputstream.c:1204 +#: gio/glocalfileoutputstream.c:1205 #, c-format msgid "Error removing old file: %s" msgstr "Klaida ištrinant senąjį failą: %s" @@ -3502,8 +3509,8 @@ #. Translators: the first placeholder is a domain name, the #. * second is an error message #: gio/gresolver.c:403 gio/gthreadedresolver.c:152 gio/gthreadedresolver.c:170 -#: gio/gthreadedresolver.c:782 gio/gthreadedresolver.c:806 -#: gio/gthreadedresolver.c:831 gio/gthreadedresolver.c:846 +#: gio/gthreadedresolver.c:798 gio/gthreadedresolver.c:822 +#: gio/gthreadedresolver.c:847 gio/gthreadedresolver.c:862 #, c-format msgid "Error resolving “%s”: %s" msgstr "Klaida surandant „%s“: %s" @@ -4219,35 +4226,35 @@ #. Translators: the placeholder is a DNS record type, such as ‘MX’ or ‘SRV’ #: gio/gthreadedresolver.c:552 gio/gthreadedresolver.c:574 -#: gio/gthreadedresolver.c:612 gio/gthreadedresolver.c:659 -#: gio/gthreadedresolver.c:688 gio/gthreadedresolver.c:700 +#: gio/gthreadedresolver.c:628 gio/gthreadedresolver.c:675 +#: gio/gthreadedresolver.c:704 gio/gthreadedresolver.c:716 #, c-format msgid "Error parsing DNS %s record: malformed DNS packet" msgstr "Klaida analizuojant DNS %s įrašą: blogai suformuotas DNS paketas" -#: gio/gthreadedresolver.c:758 gio/gthreadedresolver.c:895 -#: gio/gthreadedresolver.c:993 gio/gthreadedresolver.c:1043 +#: gio/gthreadedresolver.c:774 gio/gthreadedresolver.c:911 +#: gio/gthreadedresolver.c:1009 gio/gthreadedresolver.c:1059 #, c-format msgid "No DNS record of the requested type for “%s”" msgstr "Nėra DNS įrašo prašomam tipui „%s“" -#: gio/gthreadedresolver.c:763 gio/gthreadedresolver.c:998 +#: gio/gthreadedresolver.c:779 gio/gthreadedresolver.c:1014 #, c-format msgid "Temporarily unable to resolve “%s”" msgstr "Laikinai nepavyko surasti „%s“" -#: gio/gthreadedresolver.c:768 gio/gthreadedresolver.c:1003 -#: gio/gthreadedresolver.c:1113 +#: gio/gthreadedresolver.c:784 gio/gthreadedresolver.c:1019 +#: gio/gthreadedresolver.c:1129 #, c-format msgid "Error resolving “%s”" msgstr "Klaida surandant „%s“" -#: gio/gthreadedresolver.c:782 gio/gthreadedresolver.c:806 -#: gio/gthreadedresolver.c:831 gio/gthreadedresolver.c:846 +#: gio/gthreadedresolver.c:798 gio/gthreadedresolver.c:822 +#: gio/gthreadedresolver.c:847 gio/gthreadedresolver.c:862 msgid "Malformed DNS packet" msgstr "Blogai suformuotas DNS paketas" -#: gio/gthreadedresolver.c:888 +#: gio/gthreadedresolver.c:904 #, c-format msgid "Failed to parse DNS response for “%s”: " msgstr "Nepavyko išanalizuoti DNS atsakymo į „%s“: " @@ -4376,7 +4383,7 @@ msgid "Error closing file descriptor: %s" msgstr "Klaida užveriant failą: %s" -#: gio/gunixmounts.c:2815 gio/gunixmounts.c:2868 +#: gio/gunixmounts.c:2817 gio/gunixmounts.c:2870 msgid "Filesystem root" msgstr "Failų sistemos šaknis" @@ -4458,77 +4465,77 @@ msgid "Wrong args\n" msgstr "Blogi argumentai\n" -#: glib/gbookmarkfile.c:779 +#: glib/gbookmarkfile.c:861 #, c-format msgid "Unexpected attribute “%s” for element “%s”" msgstr "Netikėtas atributas „%s“ elementui „%s“" -#: glib/gbookmarkfile.c:790 glib/gbookmarkfile.c:870 glib/gbookmarkfile.c:880 -#: glib/gbookmarkfile.c:993 +#: glib/gbookmarkfile.c:872 glib/gbookmarkfile.c:952 glib/gbookmarkfile.c:962 +#: glib/gbookmarkfile.c:1075 #, c-format msgid "Attribute “%s” of element “%s” not found" msgstr "Nerastas elemento „%2$s“ atributas „%1$s“" -#: glib/gbookmarkfile.c:1202 glib/gbookmarkfile.c:1267 -#: glib/gbookmarkfile.c:1331 glib/gbookmarkfile.c:1341 +#: glib/gbookmarkfile.c:1284 glib/gbookmarkfile.c:1349 +#: glib/gbookmarkfile.c:1413 glib/gbookmarkfile.c:1423 #, c-format msgid "Unexpected tag “%s”, tag “%s” expected" msgstr "Netikėta žyma „%s“, tikėtasi žymos „%s“" -#: glib/gbookmarkfile.c:1227 glib/gbookmarkfile.c:1241 -#: glib/gbookmarkfile.c:1309 glib/gbookmarkfile.c:1355 +#: glib/gbookmarkfile.c:1309 glib/gbookmarkfile.c:1323 +#: glib/gbookmarkfile.c:1391 glib/gbookmarkfile.c:1437 #, c-format msgid "Unexpected tag “%s” inside “%s”" msgstr "Netikėta žyma „%s“ „%s“ viduje" -#: glib/gbookmarkfile.c:1635 +#: glib/gbookmarkfile.c:1717 #, c-format msgid "Invalid date/time ‘%s’ in bookmark file" msgstr "Netinkama data/laikas „%s“ gairių faile" -#: glib/gbookmarkfile.c:1838 +#: glib/gbookmarkfile.c:1956 msgid "No valid bookmark file found in data dirs" msgstr "Duomenų aplankuose nerasta tinkamo žymelių failo" -#: glib/gbookmarkfile.c:2039 +#: glib/gbookmarkfile.c:2157 #, c-format msgid "A bookmark for URI “%s” already exists" msgstr "URI „%s“ žymelė jau yra" -#: glib/gbookmarkfile.c:2088 glib/gbookmarkfile.c:2246 -#: glib/gbookmarkfile.c:2331 glib/gbookmarkfile.c:2411 -#: glib/gbookmarkfile.c:2496 glib/gbookmarkfile.c:2630 -#: glib/gbookmarkfile.c:2763 glib/gbookmarkfile.c:2898 -#: glib/gbookmarkfile.c:2940 glib/gbookmarkfile.c:3037 -#: glib/gbookmarkfile.c:3158 glib/gbookmarkfile.c:3352 -#: glib/gbookmarkfile.c:3493 glib/gbookmarkfile.c:3712 -#: glib/gbookmarkfile.c:3801 glib/gbookmarkfile.c:3890 -#: glib/gbookmarkfile.c:4009 +#: glib/gbookmarkfile.c:2206 glib/gbookmarkfile.c:2364 +#: glib/gbookmarkfile.c:2449 glib/gbookmarkfile.c:2529 +#: glib/gbookmarkfile.c:2614 glib/gbookmarkfile.c:2748 +#: glib/gbookmarkfile.c:2881 glib/gbookmarkfile.c:3016 +#: glib/gbookmarkfile.c:3058 glib/gbookmarkfile.c:3155 +#: glib/gbookmarkfile.c:3276 glib/gbookmarkfile.c:3470 +#: glib/gbookmarkfile.c:3611 glib/gbookmarkfile.c:3830 +#: glib/gbookmarkfile.c:3919 glib/gbookmarkfile.c:4008 +#: glib/gbookmarkfile.c:4127 #, c-format msgid "No bookmark found for URI “%s”" msgstr "Nerasta žymelė URI „%s“" -#: glib/gbookmarkfile.c:2420 +#: glib/gbookmarkfile.c:2538 #, c-format msgid "No MIME type defined in the bookmark for URI “%s”" msgstr "URI „%s“ žymelėje neapibrėžtas MIME tipas" -#: glib/gbookmarkfile.c:2505 +#: glib/gbookmarkfile.c:2623 #, c-format msgid "No private flag has been defined in bookmark for URI “%s”" msgstr "URI „%s“ žymelėje neapibrėžta privati vėliavėlė" -#: glib/gbookmarkfile.c:3046 +#: glib/gbookmarkfile.c:3164 #, c-format msgid "No groups set in bookmark for URI “%s”" msgstr "URI „%s“ žymelėje nenurodyta jokia grupė" -#: glib/gbookmarkfile.c:3514 glib/gbookmarkfile.c:3722 +#: glib/gbookmarkfile.c:3632 glib/gbookmarkfile.c:3840 #, c-format msgid "No application with name “%s” registered a bookmark for “%s”" msgstr "Nėra programos pavadinimu „%s“ registravusios „%s“ žymelę" -#: glib/gbookmarkfile.c:3745 +#: glib/gbookmarkfile.c:3863 #, c-format msgid "Failed to expand exec line “%s” with URI “%s”" msgstr "Nepavyko išskleisti vykdomosios eilutės „%s“ su URI „%s“" @@ -5003,7 +5010,7 @@ msgid "Error opening directory “%s”: %s" msgstr "Klaida atveriant aplanką „%s“: %s" -#: glib/gfileutils.c:735 glib/gfileutils.c:827 +#: glib/gfileutils.c:753 glib/gfileutils.c:845 #, c-format msgid "Could not allocate %lu byte to read file “%s”" msgid_plural "Could not allocate %lu bytes to read file “%s”" @@ -5011,72 +5018,72 @@ msgstr1 "Nepavyko išskirti %lu baitų failo „%s“ perskaitymui" msgstr2 "Nepavyko išskirti %lu baitų failo „%s“ perskaitymui" -#: glib/gfileutils.c:752 +#: glib/gfileutils.c:770 #, c-format msgid "Error reading file “%s”: %s" msgstr "Klaida skaitant failą „%s“: %s" -#: glib/gfileutils.c:788 +#: glib/gfileutils.c:806 #, c-format msgid "File “%s” is too large" msgstr "Failas „%s“ per didelis" -#: glib/gfileutils.c:852 +#: glib/gfileutils.c:870 #, c-format msgid "Failed to read from file “%s”: %s" msgstr "Nepavyko perskaityti failo „%s“: %s" -#: glib/gfileutils.c:902 glib/gfileutils.c:977 glib/gfileutils.c:1449 +#: glib/gfileutils.c:920 glib/gfileutils.c:995 glib/gfileutils.c:1472 #, c-format msgid "Failed to open file “%s”: %s" msgstr "Nepavyko atverti failo „%s“: %s" -#: glib/gfileutils.c:915 +#: glib/gfileutils.c:933 #, c-format msgid "Failed to get attributes of file “%s”: fstat() failed: %s" msgstr "Nepavyko gauti failo „%s“ atributų: fstat() klaida: %s" -#: glib/gfileutils.c:946 +#: glib/gfileutils.c:964 #, c-format msgid "Failed to open file “%s”: fdopen() failed: %s" msgstr "Nepavyko atverti failo „%s“: fdopen() klaida: %s" -#: glib/gfileutils.c:1047 +#: glib/gfileutils.c:1065 #, c-format msgid "Failed to rename file “%s” to “%s”: g_rename() failed: %s" msgstr "Nepavyko pervadinti failo „%s“ į „%s“: g_rename() klaida: %s" -#: glib/gfileutils.c:1156 +#: glib/gfileutils.c:1179 #, c-format msgid "Failed to write file “%s”: write() failed: %s" msgstr "Nepavyko įrašyti failo „%s“: write() klaida: %s" -#: glib/gfileutils.c:1177 +#: glib/gfileutils.c:1200 #, c-format msgid "Failed to write file “%s”: fsync() failed: %s" msgstr "Nepavyko įrašyti failo „%s“: fsync() klaida: %s" -#: glib/gfileutils.c:1338 glib/gfileutils.c:1753 +#: glib/gfileutils.c:1361 glib/gfileutils.c:1776 #, c-format msgid "Failed to create file “%s”: %s" msgstr "Nepavyko sukurti failo „%s“: %s" -#: glib/gfileutils.c:1383 +#: glib/gfileutils.c:1406 #, c-format msgid "Existing file “%s” could not be removed: g_unlink() failed: %s" msgstr "Nepavyko pašalinti egzistuojančio failo „%s“: g_unlink() klaida: %s" -#: glib/gfileutils.c:1718 +#: glib/gfileutils.c:1741 #, c-format msgid "Template “%s” invalid, should not contain a “%s”" msgstr "Šablonas „%s“ klaidingas, jame negali būti „%s“" -#: glib/gfileutils.c:1731 +#: glib/gfileutils.c:1754 #, c-format msgid "Template “%s” doesn’t contain XXXXXX" msgstr "Šablone „%s“ nėra XXXXXX" -#: glib/gfileutils.c:2291 glib/gfileutils.c:2320 +#: glib/gfileutils.c:2348 glib/gfileutils.c:2377 #, c-format msgid "Failed to read the symbolic link “%s”: %s" msgstr "Nepavyko perskaityti simbolinės nuorodos „%s“: %s" @@ -5138,8 +5145,8 @@ msgstr "Raktų faile yra nepalaikoma koduotė „%s“" #: glib/gkeyfile.c:1679 glib/gkeyfile.c:1852 glib/gkeyfile.c:3299 -#: glib/gkeyfile.c:3363 glib/gkeyfile.c:3493 glib/gkeyfile.c:3625 -#: glib/gkeyfile.c:3771 glib/gkeyfile.c:4006 glib/gkeyfile.c:4073 +#: glib/gkeyfile.c:3363 glib/gkeyfile.c:3493 glib/gkeyfile.c:3622 +#: glib/gkeyfile.c:3768 glib/gkeyfile.c:4003 glib/gkeyfile.c:4070 #, c-format msgid "Key file does not have group “%s”" msgstr "Raktų failas neturi grupės „%s“" @@ -5174,32 +5181,32 @@ msgid "Key “%s” in group “%s” has value “%s” where %s was expected" msgstr "Raktas „%s“ grupėje „%s“ turi reikšmę „%s“, nors tikimasi %s" -#: glib/gkeyfile.c:4326 +#: glib/gkeyfile.c:4323 msgid "Key file contains escape character at end of line" msgstr "Raktų faile, eilutės pabaigoje yra pabėgimo simbolis" -#: glib/gkeyfile.c:4348 +#: glib/gkeyfile.c:4345 #, c-format msgid "Key file contains invalid escape sequence “%s”" msgstr "Raktų faile yra klaidinga kaitos eilutė „%s“" -#: glib/gkeyfile.c:4493 +#: glib/gkeyfile.c:4490 #, c-format msgid "Value “%s” cannot be interpreted as a number." msgstr "Reikšmės „%s“ negalima interpretuoti kaip skaičiaus." -#: glib/gkeyfile.c:4507 +#: glib/gkeyfile.c:4504 #, c-format msgid "Integer value “%s” out of range" msgstr "Sveikoji reikšmė „%s“ viršija ribas" -#: glib/gkeyfile.c:4540 +#: glib/gkeyfile.c:4537 #, c-format msgid "Value “%s” cannot be interpreted as a float number." msgstr "" "Reikšmės „%s“ negalima interpretuoti kaip slankiojo kablelio skaičiaus." -#: glib/gkeyfile.c:4579 +#: glib/gkeyfile.c:4576 #, c-format msgid "Value “%s” cannot be interpreted as a boolean." msgstr "Reikšmės „%s“ negalima interpretuoti kaip loginės." @@ -5219,32 +5226,32 @@ msgid "Failed to open file “%s”: open() failed: %s" msgstr "Nepavyko atverti failo „%s“: open() klaida: %s" -#: glib/gmarkup.c:400 glib/gmarkup.c:442 +#: glib/gmarkup.c:393 glib/gmarkup.c:435 #, c-format msgid "Error on line %d char %d: " msgstr "Klaida eilutėje %d simbolyje %d: " -#: glib/gmarkup.c:464 glib/gmarkup.c:547 +#: glib/gmarkup.c:457 glib/gmarkup.c:540 #, c-format msgid "Invalid UTF-8 encoded text in name — not valid “%s”" msgstr "Klaidingai koduotas UTF-8 tekstas varde – netinkamas „%s“" -#: glib/gmarkup.c:475 +#: glib/gmarkup.c:468 #, c-format msgid "“%s” is not a valid name" msgstr "„%s“ nėra tinkamas vardas" -#: glib/gmarkup.c:491 +#: glib/gmarkup.c:484 #, c-format msgid "“%s” is not a valid name: “%c”" msgstr "„%s“ nėra tinkamas vardas: „%c“" -#: glib/gmarkup.c:615 +#: glib/gmarkup.c:608 #, c-format msgid "Error on line %d: %s" msgstr "Klaida eilutėje %d: %s" -#: glib/gmarkup.c:692 +#: glib/gmarkup.c:685 #, c-format msgid "" "Failed to parse “%-.*s”, which should have been a digit inside a character " @@ -5253,7 +5260,7 @@ "Nepavyko perskaityti „%-.*s“, kuris galėjo turėti skaičius simbolio aprašyme " "(pvz., ê) – gal skaičius per didelis" -#: glib/gmarkup.c:704 +#: glib/gmarkup.c:697 msgid "" "Character reference did not end with a semicolon; most likely you used an " "ampersand character without intending to start an entity — escape ampersand " @@ -5263,24 +5270,24 @@ "ampersendo simbolį nepradėdami elemento įvedimo – pakeiskite ampersendą " "įvesdami &" -#: glib/gmarkup.c:730 +#: glib/gmarkup.c:723 #, c-format msgid "Character reference “%-.*s” does not encode a permitted character" msgstr "Simbolio aprašymas „%-.*s“ neatitinka leistinų simbolių" -#: glib/gmarkup.c:768 +#: glib/gmarkup.c:761 msgid "" "Empty entity “&;” seen; valid entities are: & " < > '" msgstr "" "Aptiktas tuščias elementas '&;'; galimi elementai yra: & " < " "> '" -#: glib/gmarkup.c:776 +#: glib/gmarkup.c:769 #, c-format msgid "Entity name “%-.*s” is not known" msgstr "Elemento vardas „%-.*s“ nežinomas" -#: glib/gmarkup.c:781 +#: glib/gmarkup.c:774 msgid "" "Entity did not end with a semicolon; most likely you used an ampersand " "character without intending to start an entity — escape ampersand as &" @@ -5288,11 +5295,11 @@ "Elementas nepasibaigė kabliataškiu; greičiausiai Jūs panaudojote ampersendo " "simbolį nepradėdami elemento įvedimo – pakeiskite ampersendą įvesdami &" -#: glib/gmarkup.c:1195 +#: glib/gmarkup.c:1188 msgid "Document must begin with an element (e.g. <book>)" msgstr "Dokumentas turėtų prasidėti elementu (pvz., <book>)" -#: glib/gmarkup.c:1235 +#: glib/gmarkup.c:1228 #, c-format msgid "" "“%s” is not a valid character following a “<” character; it may not begin an " @@ -5300,7 +5307,7 @@ msgstr "" "„%s“ negali būti rašomas po „<“ simbolio; jis nepradeda jokio elemento vardo" -#: glib/gmarkup.c:1278 +#: glib/gmarkup.c:1271 #, c-format msgid "" "Odd character “%s”, expected a “>” character to end the empty-element tag " @@ -5309,12 +5316,12 @@ "Neįprastas simbolis „%s“, tikėtasi sulaukti „>“ simbolio, užbaigiančio " "tuščią žymą „%s“" -#: glib/gmarkup.c:1348 +#: glib/gmarkup.c:1341 #, c-format msgid "Too many attributes in element “%s”" msgstr "Per daug atributų elemente „%s“" -#: glib/gmarkup.c:1368 +#: glib/gmarkup.c:1361 #, c-format msgid "" "Odd character “%s”, expected a “=” after attribute name “%s” of element “%s”" @@ -5322,7 +5329,7 @@ "Neįprastas simbolis „%1$s“, tikėtasi sulaukti „=“ po elemento „%3$s“ " "atributo vardo „%2$s“" -#: glib/gmarkup.c:1410 +#: glib/gmarkup.c:1403 #, c-format msgid "" "Odd character “%s”, expected a “>” or “/” character to end the start tag of " @@ -5333,7 +5340,7 @@ "užbaigiančių elementą „%s“, arba papildomo požymio; gal Jūs panaudojote " "netinkama simbolį požymio varde" -#: glib/gmarkup.c:1455 +#: glib/gmarkup.c:1448 #, c-format msgid "" "Odd character “%s”, expected an open quote mark after the equals sign when " @@ -5342,7 +5349,7 @@ "Neįprastas simbolis „%1$s“, po lygybės tikėtasi sulaukti atidarančio " "citavimo simbolio pradedant „%3$s“ elemento „%2$s“ atributo reikšmę." -#: glib/gmarkup.c:1589 +#: glib/gmarkup.c:1582 #, c-format msgid "" "“%s” is not a valid character following the characters “</”; “%s” may not " @@ -5350,7 +5357,7 @@ msgstr "" "„%s“ negali būti rašomas po simbolių „</“; „%s“ negali pradėti elemento vardo" -#: glib/gmarkup.c:1627 +#: glib/gmarkup.c:1620 #, c-format msgid "" "“%s” is not a valid character following the close element name “%s”; the " @@ -5359,29 +5366,29 @@ "„%s“ negali būti rašomas po uždarančio elemento vardo „%s“; leistinas " "simbolis yra „>“" -#: glib/gmarkup.c:1639 +#: glib/gmarkup.c:1632 #, c-format msgid "Element “%s” was closed, no element is currently open" msgstr "" "Elemento „%s“ uždarymo simbolis sutiktas anksčiau už elemento atidarymo " "simbolį" -#: glib/gmarkup.c:1648 +#: glib/gmarkup.c:1641 #, c-format msgid "Element “%s” was closed, but the currently open element is “%s”" msgstr "" "Sutiktas elemento „%s“ uždarymo simbolis, tačiau šiuo metu atidarytas kitas " "elementas „%s“" -#: glib/gmarkup.c:1801 +#: glib/gmarkup.c:1794 msgid "Document was empty or contained only whitespace" msgstr "Dokumentas tuščias arba susideda tik iš tarpų" -#: glib/gmarkup.c:1815 +#: glib/gmarkup.c:1808 msgid "Document ended unexpectedly just after an open angle bracket “<”" msgstr "Dokumentas netikėtai pasibaigė tuoj po atidarančių skliaustų „<“" -#: glib/gmarkup.c:1823 glib/gmarkup.c:1868 +#: glib/gmarkup.c:1816 glib/gmarkup.c:1861 #, c-format msgid "" "Document ended unexpectedly with elements still open — “%s” was the last " @@ -5390,7 +5397,7 @@ "Dokumentas netikėtai pasibaigė neuždarius dalies elementų – „%s“ yra " "paskutinis atviras elementas" -#: glib/gmarkup.c:1831 +#: glib/gmarkup.c:1824 #, c-format msgid "" "Document ended unexpectedly, expected to see a close angle bracket ending " @@ -5399,19 +5406,19 @@ "Dokumentas netikėtai pasibaigė, tikėtasi uždarančių skliaustų simbolio, " "užbaigiančio žymą <%s/>" -#: glib/gmarkup.c:1837 +#: glib/gmarkup.c:1830 msgid "Document ended unexpectedly inside an element name" msgstr "Dokumentas netikėtai pasibaigė elemento varde" -#: glib/gmarkup.c:1843 +#: glib/gmarkup.c:1836 msgid "Document ended unexpectedly inside an attribute name" msgstr "Dokumentas netikėtai pasibaigė požymio varde" -#: glib/gmarkup.c:1848 +#: glib/gmarkup.c:1841 msgid "Document ended unexpectedly inside an element-opening tag." msgstr "Dokumentas netikėtai pasibaigė elemento atvėrimo žyma." -#: glib/gmarkup.c:1854 +#: glib/gmarkup.c:1847 msgid "" "Document ended unexpectedly after the equals sign following an attribute " "name; no attribute value" @@ -5419,21 +5426,21 @@ "Dokumentas netikėtai pasibaigė lygybės simboliu einančio po požymio vardo; " "nerasta požymio reikšmė" -#: glib/gmarkup.c:1861 +#: glib/gmarkup.c:1854 msgid "Document ended unexpectedly while inside an attribute value" msgstr "Dokumentas netikėtai pasibaigė požymio verte" -#: glib/gmarkup.c:1878 +#: glib/gmarkup.c:1871 #, c-format msgid "Document ended unexpectedly inside the close tag for element “%s”" msgstr "Dokumentas netikėtai pasibaigė žymos „%s“ uždarančiame simbolyje" -#: glib/gmarkup.c:1882 +#: glib/gmarkup.c:1875 msgid "" "Document ended unexpectedly inside the close tag for an unopened element" msgstr "Dokumentas netikėtai pasibaigė neatidaryto elemento uždarymo žymoje" -#: glib/gmarkup.c:1888 +#: glib/gmarkup.c:1881 msgid "Document ended unexpectedly inside a comment or processing instruction" msgstr "" "Dokumentas netikėtai pasibaigė komentaruose arba apdorojimo instrukcijose" @@ -5497,184 +5504,184 @@ msgid "Unknown option %s" msgstr "Nežinomas parametras %s" -#: glib/gregex.c:436 +#: glib/gregex.c:479 msgid "corrupted object" msgstr "sugadintas objektas" -#: glib/gregex.c:438 +#: glib/gregex.c:481 msgid "out of memory" msgstr "nebėra atminties" -#: glib/gregex.c:443 +#: glib/gregex.c:487 msgid "backtracking limit reached" msgstr "pasiekta atgalinio sekimo riba" -#: glib/gregex.c:454 glib/gregex.c:707 glib/gregex.c:736 +#: glib/gregex.c:498 msgid "internal error" msgstr "vidinė klaida" -#: glib/gregex.c:456 +#: glib/gregex.c:500 msgid "the pattern contains items not supported for partial matching" msgstr "šablone yra dalinio atitikimo nepalaikomų elementų" -#: glib/gregex.c:458 +#: glib/gregex.c:502 msgid "back references as conditions are not supported for partial matching" msgstr "atgalinės nuorodos kaip sąlygos nepalaikomos daliniam atitikimui" -#: glib/gregex.c:464 +#: glib/gregex.c:508 msgid "recursion limit reached" msgstr "pasiekta rekursijos riba" -#: glib/gregex.c:466 +#: glib/gregex.c:510 msgid "bad offset" msgstr "blogas poslinkis" -#: glib/gregex.c:468 +#: glib/gregex.c:512 msgid "recursion loop" msgstr "rekursijos ciklas" #. should not happen in GRegex since we check modes before each match -#: glib/gregex.c:471 +#: glib/gregex.c:515 msgid "matching mode is requested that was not compiled for JIT" msgstr "prašoma atitikties veiksena, kuri nebuvo sukompiliuota JIT" -#: glib/gregex.c:475 +#: glib/gregex.c:536 glib/gregex.c:1838 msgid "unknown error" msgstr "nežinoma klaida" -#: glib/gregex.c:496 +#: glib/gregex.c:557 msgid "\\ at end of pattern" msgstr "\\ šablono pabaigoje" -#: glib/gregex.c:500 +#: glib/gregex.c:561 msgid "\\c at end of pattern" msgstr "\\c šablono pabaigoje" -#: glib/gregex.c:505 +#: glib/gregex.c:566 msgid "unrecognized character following \\" msgstr "neatpažintas simbolis po \\" -#: glib/gregex.c:509 +#: glib/gregex.c:570 msgid "numbers out of order in {} quantifier" msgstr "skaičiai ne iš eilės {} kvantoriuje" -#: glib/gregex.c:513 +#: glib/gregex.c:574 msgid "number too big in {} quantifier" msgstr "skaičius per didelis {} kvantoriuje" -#: glib/gregex.c:517 +#: glib/gregex.c:578 msgid "missing terminating for character class" msgstr "trūksta baigiamojo simbolio klasei" -#: glib/gregex.c:521 +#: glib/gregex.c:582 msgid "invalid escape sequence in character class" msgstr "klaidinga speciali seka simbolio klasėje" -#: glib/gregex.c:525 +#: glib/gregex.c:586 msgid "range out of order in character class" msgstr "ruožas ne iš eilės simbolio klasėje" -#: glib/gregex.c:530 +#: glib/gregex.c:591 msgid "nothing to repeat" msgstr "nėra ką kartoti" -#: glib/gregex.c:534 +#: glib/gregex.c:595 msgid "unrecognized character after (? or (?-" msgstr "neatpažintas simbolis po (? arba (?-" -#: glib/gregex.c:538 +#: glib/gregex.c:599 msgid "POSIX named classes are supported only within a class" msgstr "klasės POSIX vardais leidžiamos tik klasių viduje" -#: glib/gregex.c:542 +#: glib/gregex.c:603 msgid "POSIX collating elements are not supported" msgstr "POSIX gretinimo elementai nepalaikomi" -#: glib/gregex.c:548 +#: glib/gregex.c:609 msgid "missing terminating )" msgstr "trūksta baigiamojo )" -#: glib/gregex.c:552 +#: glib/gregex.c:613 msgid "reference to non-existent subpattern" msgstr "nuoroda į neegzistuojantį pošablonį" -#: glib/gregex.c:556 +#: glib/gregex.c:617 msgid "missing ) after comment" msgstr "trūksta ) po komentaro" -#: glib/gregex.c:560 +#: glib/gregex.c:621 msgid "regular expression is too large" msgstr "reguliarioji išraiška per didelė" -#: glib/gregex.c:564 +#: glib/gregex.c:625 msgid "malformed number or name after (?(" msgstr "netaisyklingas skaičius ar vardas po (?(" -#: glib/gregex.c:568 +#: glib/gregex.c:629 msgid "lookbehind assertion is not fixed length" msgstr "žiūros atgal teiginys nefiksuoto ilgio" -#: glib/gregex.c:572 +#: glib/gregex.c:633 msgid "conditional group contains more than two branches" msgstr "sąlyginė grupė turi daugiau negu dvi šakas" -#: glib/gregex.c:576 +#: glib/gregex.c:637 msgid "assertion expected after (?(" msgstr "tikimasi teiginio po (?(" -#: glib/gregex.c:580 +#: glib/gregex.c:641 msgid "a numbered reference must not be zero" msgstr "numeruota nuoroda turi būti ne nulis" -#: glib/gregex.c:584 +#: glib/gregex.c:645 msgid "unknown POSIX class name" msgstr "nežinomas POSIX klasės vardas" -#: glib/gregex.c:589 +#: glib/gregex.c:650 msgid "character value in \\x{...} sequence is too large" msgstr "simbolio reikšmė \\x{…} sekoje per didelė" -#: glib/gregex.c:593 +#: glib/gregex.c:654 msgid "\\C not allowed in lookbehind assertion" msgstr "\\C neleistinas žiūros atgal teiginyje" -#: glib/gregex.c:597 +#: glib/gregex.c:658 msgid "missing terminator in subpattern name" msgstr "trūksta baigiamojo simbolio pošablonio pavadinime" -#: glib/gregex.c:601 +#: glib/gregex.c:662 msgid "two named subpatterns have the same name" msgstr "du vardiniai pošabloniai turi tą patį vardą" -#: glib/gregex.c:605 +#: glib/gregex.c:666 msgid "malformed \\P or \\p sequence" msgstr "netaisyklinga \\P arba \\p seka" -#: glib/gregex.c:609 +#: glib/gregex.c:670 msgid "unknown property name after \\P or \\p" msgstr "nežinomas savybės vardas po \\P arba \\p" -#: glib/gregex.c:613 +#: glib/gregex.c:674 msgid "subpattern name is too long (maximum 32 characters)" msgstr "pošablonio vardas per ilgas (turi būti iki 32 simbolių)" -#: glib/gregex.c:617 +#: glib/gregex.c:678 msgid "too many named subpatterns (maximum 10,000)" msgstr "per daug vardinių pošablonių (iki 10000)" -#: glib/gregex.c:621 +#: glib/gregex.c:682 msgid "octal value is greater than \\377" msgstr "aštuntainė reikšmė didesnė už \\377" -#: glib/gregex.c:625 +#: glib/gregex.c:686 msgid "DEFINE group contains more than one branch" msgstr "DEFINE grupėje yra daugiau negu viena šaka" -#: glib/gregex.c:629 +#: glib/gregex.c:690 msgid "inconsistent NEWLINE options" msgstr "nenuoseklūs NEWLINE parametrai" -#: glib/gregex.c:633 +#: glib/gregex.c:694 msgid "" "\\g is not followed by a braced, angle-bracketed, or quoted name or number, " "or by a plain number" @@ -5682,119 +5689,118 @@ "po \\g nėra vardo riestiniuose arba lenktiniuose skliaustuose ar teigiamo " "skaičiaus, ar tiesiog skaičiaus" -#: glib/gregex.c:638 +#: glib/gregex.c:699 msgid "an argument is not allowed for (*ACCEPT), (*FAIL), or (*COMMIT)" msgstr "argumentas neleidžiamas veiksmams (*ACCEPT), (*FAIL), ir (*COMMIT)" -#: glib/gregex.c:642 +#: glib/gregex.c:703 msgid "(*VERB) not recognized" msgstr "(*VERB) neatpažintas" -#: glib/gregex.c:646 +#: glib/gregex.c:707 msgid "number is too big" msgstr "numeris per didelis" -#: glib/gregex.c:650 +#: glib/gregex.c:711 msgid "missing subpattern name after (?&" msgstr "trūksta baigiamojo simbolio pošablonio po (?&" -#: glib/gregex.c:654 +#: glib/gregex.c:715 msgid "different names for subpatterns of the same number are not allowed" msgstr "skirtingi vardai to paties skaičiaus pošabloniams nėra leistini" -#: glib/gregex.c:658 +#: glib/gregex.c:719 msgid "(*MARK) must have an argument" msgstr "(*MARK) privalo turėti argumentą" -#: glib/gregex.c:662 +#: glib/gregex.c:723 msgid "\\c must be followed by an ASCII character" msgstr "Po \\c turi būti ASCII simbolis" -#: glib/gregex.c:666 +#: glib/gregex.c:727 msgid "\\k is not followed by a braced, angle-bracketed, or quoted name" msgstr "" "po \\k nėra vardo riestiniuose arba lenktiniuose skliaustuose arba kabutėse" -#: glib/gregex.c:670 +#: glib/gregex.c:731 msgid "\\N is not supported in a class" msgstr "\\N nepalaikomas klasėje" -#: glib/gregex.c:674 +#: glib/gregex.c:735 msgid "name is too long in (*MARK), (*PRUNE), (*SKIP), or (*THEN)" msgstr "pavadinimas yra per ilgas (*MARK), (*PRUNE), (*SKIP), ir (*THEN)" -#: glib/gregex.c:678 glib/gregex.c:809 +#: glib/gregex.c:739 glib/gregex.c:875 msgid "code overflow" msgstr "kodo perviršis" -#: glib/gregex.c:682 +#: glib/gregex.c:743 msgid "unrecognized character after (?P" msgstr "neatpažintas simbolis po (?P" -#: glib/gregex.c:686 +#: glib/gregex.c:747 msgid "overran compiling workspace" msgstr "perpildyta kompiliavimo darbo sritis" -#: glib/gregex.c:690 +#: glib/gregex.c:751 msgid "previously-checked referenced subpattern not found" msgstr "anksčiau tikrintas nurodytas pošablonis nerastas" -#: glib/gregex.c:808 glib/gregex.c:1041 glib/gregex.c:2342 +#: glib/gregex.c:874 glib/gregex.c:1121 glib/gregex.c:2444 #, c-format msgid "Error while matching regular expression %s: %s" msgstr "Klaida ieškant reguliariosios išraiškos %s atitikmens: %s" -#: glib/gregex.c:1618 +#: glib/gregex.c:1721 msgid "PCRE library is compiled without UTF8 support" msgstr "PCRE biblioteka sukompiliuota be UTF8 palaikymo" -#: glib/gregex.c:1626 +#: glib/gregex.c:1729 msgid "PCRE library is compiled with incompatible options" msgstr "PCRE biblioteka sukompiliuota su nesuderinamais parametrais" -#: glib/gregex.c:1751 +#: glib/gregex.c:1847 #, c-format -#| msgid "Error while compiling regular expression %s at char %d: %s" msgid "Error while compiling regular expression ‘%s’ at char %s: %s" msgstr "Klaida kompiliuojanti reguliarią išraišką `%s` ties simboliu %s: %s" -#: glib/gregex.c:2786 +#: glib/gregex.c:2887 msgid "hexadecimal digit or “}” expected" msgstr "laukta šešioliktainio skaitmens arba „}“" -#: glib/gregex.c:2802 +#: glib/gregex.c:2903 msgid "hexadecimal digit expected" msgstr "laukta šešioliktainio skaitmens" -#: glib/gregex.c:2842 +#: glib/gregex.c:2943 msgid "missing “<” in symbolic reference" msgstr "simbolinėje nuorodoje trūksta „<“" -#: glib/gregex.c:2851 +#: glib/gregex.c:2952 msgid "unfinished symbolic reference" msgstr "nebaigta simbolinė nuoroda" -#: glib/gregex.c:2858 +#: glib/gregex.c:2959 msgid "zero-length symbolic reference" msgstr "nulinio ilgio simbolinė nuoroda" -#: glib/gregex.c:2869 +#: glib/gregex.c:2970 msgid "digit expected" msgstr "laukta skaitmens" -#: glib/gregex.c:2887 +#: glib/gregex.c:2988 msgid "illegal symbolic reference" msgstr "neleistina simbolinė nuoroda" -#: glib/gregex.c:2950 +#: glib/gregex.c:3051 msgid "stray final “\\”" msgstr "nevietoje galutinis „\\“" -#: glib/gregex.c:2954 +#: glib/gregex.c:3055 msgid "unknown escape sequence" msgstr "nežinoma kaitos seka" -#: glib/gregex.c:2964 +#: glib/gregex.c:3065 #, c-format msgid "Error while parsing replacement text “%s” at char %lu: %s" msgstr "Klaida apdorojant pakeitimo tekstą „%s“ ties simboliu %lu: %s" @@ -5825,97 +5831,102 @@ msgid "Text was empty (or contained only whitespace)" msgstr "Tekstas buvo tuščias arba turėjo vien tik tarpo simbolius)" -#: glib/gspawn.c:314 +#: glib/gspawn.c:319 #, c-format msgid "Failed to read data from child process (%s)" msgstr "Nepavyko gauti duomenis iš antrinio proceso (%s)" -#: glib/gspawn.c:466 +#: glib/gspawn.c:471 #, c-format msgid "Unexpected error in reading data from a child process (%s)" msgstr "Netikėta klaida skaitant duomenis žiš antrinio proceso (%s)" -#: glib/gspawn.c:551 +#: glib/gspawn.c:556 #, c-format msgid "Unexpected error in waitpid() (%s)" msgstr "Netikėta waitpid() klaida (%s)" -#: glib/gspawn.c:1170 glib/gspawn-win32.c:1488 +#: glib/gspawn.c:1175 glib/gspawn-win32.c:1503 #, c-format msgid "Child process exited with code %ld" msgstr "Vaikinis procesas išėjo su kodu %ld" -#: glib/gspawn.c:1178 +#: glib/gspawn.c:1183 #, c-format msgid "Child process killed by signal %ld" msgstr "Vaikinis procesas nutrauktas signalu %ld" -#: glib/gspawn.c:1185 +#: glib/gspawn.c:1190 #, c-format msgid "Child process stopped by signal %ld" msgstr "Vaikinis procesas sustabdytas signalu %ld" -#: glib/gspawn.c:1192 +#: glib/gspawn.c:1197 #, c-format msgid "Child process exited abnormally" msgstr "Vaikinis procesas išėjo nenormaliai" -#: glib/gspawn.c:1885 glib/gspawn-win32.c:393 glib/gspawn-win32.c:401 +#: glib/gspawn.c:2027 glib/gspawn-win32.c:393 glib/gspawn-win32.c:401 #, c-format msgid "Failed to read from child pipe (%s)" msgstr "Nepavyko perskaityti duomenų iš antrinio konvejerio (%s)" -#: glib/gspawn.c:2248 +#: glib/gspawn.c:2399 #, c-format msgid "Failed to spawn child process “%s” (%s)" msgstr "Nepavyko paleisti antrinio proceso „%s“ (%s)" -#: glib/gspawn.c:2365 +#: glib/gspawn.c:2525 #, c-format msgid "Failed to fork (%s)" msgstr "Nepavyko atskirti (%s)" -#: glib/gspawn.c:2525 glib/gspawn-win32.c:424 +#: glib/gspawn.c:2685 glib/gspawn-win32.c:424 #, c-format msgid "Failed to change to directory “%s” (%s)" msgstr "Nepavyko pereiti į aplanką „%s“ (%s)" -#: glib/gspawn.c:2535 +#: glib/gspawn.c:2695 #, c-format msgid "Failed to execute child process “%s” (%s)" msgstr "Nepavyko paleisti antrinio proceso „%s“ (%s)" -#: glib/gspawn.c:2545 +#: glib/gspawn.c:2705 #, c-format msgid "Failed to open file to remap file descriptor (%s)" msgstr "Nepavyko atverti failo deskriptoriaus pakeitimui (%s)" -#: glib/gspawn.c:2553 +#: glib/gspawn.c:2713 #, c-format msgid "Failed to duplicate file descriptor for child process (%s)" msgstr "Nepavyko dubliuoti failo deskriptoriaus antriniam procesui (%s)" -#: glib/gspawn.c:2562 +#: glib/gspawn.c:2722 #, c-format msgid "Failed to fork child process (%s)" msgstr "Nepavyko atskirti antrinio proceso (%s)" -#: glib/gspawn.c:2570 +#: glib/gspawn.c:2730 #, c-format msgid "Failed to close file descriptor for child process (%s)" msgstr "Nepavyko užverti failo deskriptoriaus antriniam procesui (%s)" -#: glib/gspawn.c:2578 +#: glib/gspawn.c:2738 #, c-format msgid "Unknown error executing child process “%s”" msgstr "Nežinoma klaida vykdant antrinį procesą „%s“" -#: glib/gspawn.c:2602 +#: glib/gspawn.c:2762 #, c-format msgid "Failed to read enough data from child pid pipe (%s)" msgstr "" "Nepavyko perskaityti reikiamo duomenų kiekio iš antrinio pid konvejerio (%s)" +#: glib/gspawn-private.h:134 +#, c-format +msgid "Invalid source FDs argument" +msgstr "Netinkama šaltinio FD argumentas" + #: glib/gspawn-win32.c:337 msgid "Failed to read data from child process" msgstr "Nepavyko gauti duomenų iš antrinio proceso" @@ -5935,27 +5946,27 @@ msgid "Invalid program name: %s" msgstr "Netinkamas programos pavadinimas: %s" -#: glib/gspawn-win32.c:521 glib/gspawn-win32.c:853 +#: glib/gspawn-win32.c:521 glib/gspawn-win32.c:868 #, c-format msgid "Invalid string in argument vector at %d: %s" msgstr "Netinkama seka argumento vektoriuje, pozicijoje %d: %s" -#: glib/gspawn-win32.c:532 glib/gspawn-win32.c:869 +#: glib/gspawn-win32.c:532 glib/gspawn-win32.c:884 #, c-format msgid "Invalid string in environment: %s" msgstr "Netinka seka aplinkoje: %s" -#: glib/gspawn-win32.c:849 +#: glib/gspawn-win32.c:864 #, c-format msgid "Invalid working directory: %s" msgstr "Netinkamas darbinis katalogas: %s" -#: glib/gspawn-win32.c:914 +#: glib/gspawn-win32.c:929 #, c-format msgid "Failed to execute helper program (%s)" msgstr "Nepavyko paleisti pagalbinės programos (%s)" -#: glib/gspawn-win32.c:1143 +#: glib/gspawn-win32.c:1158 msgid "" "Unexpected error in g_io_channel_win32_poll() reading data from a child " "process" @@ -5963,21 +5974,21 @@ "Netikėta klaida tarp g_io_channel_win32_poll() funkcijos duomenų skaitymo iš " "antrinio proceso metu" -#: glib/gstrfuncs.c:3366 glib/gstrfuncs.c:3468 +#: glib/gstrfuncs.c:3370 glib/gstrfuncs.c:3472 msgid "Empty string is not a number" msgstr "Tuščia simbolių eilutė nėra skaičius" -#: glib/gstrfuncs.c:3390 +#: glib/gstrfuncs.c:3394 #, c-format msgid "“%s” is not a signed number" msgstr "„%s“ nėra skaičius su ženklu" -#: glib/gstrfuncs.c:3400 glib/gstrfuncs.c:3504 +#: glib/gstrfuncs.c:3404 glib/gstrfuncs.c:3508 #, c-format msgid "Number “%s” is out of bounds %s, %s" msgstr "Skaičius „%s“ yra už %s, %s ribų" -#: glib/gstrfuncs.c:3494 +#: glib/gstrfuncs.c:3498 #, c-format msgid "“%s” is not an unsigned number" msgstr "„%s“ nėra skaičius be ženklo" @@ -6056,133 +6067,133 @@ msgstr "Simbolis neatitinka UTF-16 simbolių diapazono" #. Translators: A unit symbol for size formatting, showing for example: "13.0 kB" -#: glib/gutils.c:2857 +#: glib/gutils.c:2966 msgid "kB" msgstr "kB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 MB" -#: glib/gutils.c:2859 +#: glib/gutils.c:2968 msgid "MB" msgstr "MB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 GB" -#: glib/gutils.c:2861 +#: glib/gutils.c:2970 msgid "GB" msgstr "GB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 TB" -#: glib/gutils.c:2863 +#: glib/gutils.c:2972 msgid "TB" msgstr "TB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 PB" -#: glib/gutils.c:2865 +#: glib/gutils.c:2974 msgid "PB" msgstr "PB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 EB" -#: glib/gutils.c:2867 +#: glib/gutils.c:2976 msgid "EB" msgstr "EB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 KiB" -#: glib/gutils.c:2871 +#: glib/gutils.c:2980 msgid "KiB" msgstr "KiB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 MiB" -#: glib/gutils.c:2873 +#: glib/gutils.c:2982 msgid "MiB" msgstr "MiB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 GiB" -#: glib/gutils.c:2875 +#: glib/gutils.c:2984 msgid "GiB" msgstr "GiB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 TiB" -#: glib/gutils.c:2877 +#: glib/gutils.c:2986 msgid "TiB" msgstr "TiB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 PiB" -#: glib/gutils.c:2879 +#: glib/gutils.c:2988 msgid "PiB" msgstr "PiB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 EiB" -#: glib/gutils.c:2881 +#: glib/gutils.c:2990 msgid "EiB" msgstr "EiB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 kb" -#: glib/gutils.c:2885 +#: glib/gutils.c:2994 msgid "kb" msgstr "kb" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Mb" -#: glib/gutils.c:2887 +#: glib/gutils.c:2996 msgid "Mb" msgstr "Mb" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Gb" -#: glib/gutils.c:2889 +#: glib/gutils.c:2998 msgid "Gb" msgstr "Gb" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Tb" -#: glib/gutils.c:2891 +#: glib/gutils.c:3000 msgid "Tb" msgstr "Tb" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Pb" -#: glib/gutils.c:2893 +#: glib/gutils.c:3002 msgid "Pb" msgstr "Pb" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Eb" -#: glib/gutils.c:2895 +#: glib/gutils.c:3004 msgid "Eb" msgstr "Eb" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Kib" -#: glib/gutils.c:2899 +#: glib/gutils.c:3008 msgid "Kib" msgstr "Kib" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Mib" -#: glib/gutils.c:2901 +#: glib/gutils.c:3010 msgid "Mib" msgstr "Mib" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Gib" -#: glib/gutils.c:2903 +#: glib/gutils.c:3012 msgid "Gib" msgstr "Gib" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Tib" -#: glib/gutils.c:2905 +#: glib/gutils.c:3014 msgid "Tib" msgstr "Tib" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Pib" -#: glib/gutils.c:2907 +#: glib/gutils.c:3016 msgid "Pib" msgstr "Pib" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Eib" -#: glib/gutils.c:2909 +#: glib/gutils.c:3018 msgid "Eib" msgstr "Eib" -#: glib/gutils.c:2947 +#: glib/gutils.c:3056 msgid "byte" msgid_plural "bytes" msgstr0 "baitas" msgstr1 "baitai" msgstr2 "baitų" -#: glib/gutils.c:2951 +#: glib/gutils.c:3060 msgid "bit" msgid_plural "bits" msgstr0 "bitas" @@ -6191,7 +6202,7 @@ #. Translators: The "%u" is replaced with the size value, like "13"; it could #. * be part of "13 bytes", but only the number is requested this time. -#: glib/gutils.c:2959 +#: glib/gutils.c:3068 #, c-format msgctxt "format-size" msgid "%u" @@ -6199,7 +6210,7 @@ #. Translators: The first "%u" is replaced with the value, the "%s" with a unit of the value. #. * The order can be changed with "%$2s %$1u". An example: "13 bytes" -#: glib/gutils.c:2964 +#: glib/gutils.c:3073 #, c-format msgctxt "format-size" msgid "%u %s" @@ -6207,7 +6218,7 @@ #. Translators: The "%.1f" is replaced with the size value, like "13.0"; it could #. * be part of "13.0 MB", but only the number is requested this time. -#: glib/gutils.c:3000 +#: glib/gutils.c:3109 #, c-format msgctxt "format-size" msgid "%.1f" @@ -6216,14 +6227,14 @@ #. Translators: The first "%.1f" is replaced with the value, the "%s" with a unit of the value. #. * The order can be changed with "%$2s %$1.1f". Keep the no-break space between the value and #. * the unit symbol. An example: "13.0 MB" -#: glib/gutils.c:3006 +#: glib/gutils.c:3115 #, c-format msgctxt "format-size" msgid "%.1f %s" msgstr "%.1f %s" #. Translators: the %s in "%s bytes" will always be replaced by a number. -#: glib/gutils.c:3046 +#: glib/gutils.c:3155 #, c-format msgid "%s byte" msgid_plural "%s bytes" @@ -6232,7 +6243,7 @@ msgstr2 "%s baitų" #. Translators: the %s in "%s bits" will always be replaced by a number. -#: glib/gutils.c:3051 +#: glib/gutils.c:3160 #, c-format msgid "%s bit" msgid_plural "%s bits" @@ -6240,7 +6251,7 @@ msgstr1 "%s bitai" msgstr2 "%s bitų" -#: glib/gutils.c:3092 +#: glib/gutils.c:3201 #, c-format msgid "%u byte" msgid_plural "%u bytes" @@ -6253,32 +6264,32 @@ #. * compatibility. Users will not see this string unless a program is using this deprecated function. #. * Please translate as literally as possible. #. -#: glib/gutils.c:3105 +#: glib/gutils.c:3214 #, c-format msgid "%.1f KB" msgstr "%.1f KB" -#: glib/gutils.c:3110 +#: glib/gutils.c:3219 #, c-format msgid "%.1f MB" msgstr "%.1f MB" -#: glib/gutils.c:3115 +#: glib/gutils.c:3224 #, c-format msgid "%.1f GB" msgstr "%.1f GB" -#: glib/gutils.c:3120 +#: glib/gutils.c:3229 #, c-format msgid "%.1f TB" msgstr "%.1f TB" -#: glib/gutils.c:3125 +#: glib/gutils.c:3234 #, c-format msgid "%.1f PB" msgstr "%.1f PB" -#: glib/gutils.c:3130 +#: glib/gutils.c:3239 #, c-format msgid "%.1f EB" msgstr "%.1f EB"
View file
_service:tar_scm:glib-2.74.4.tar.xz/po/pl.po -> _service:tar_scm:glib-2.76.4.tar.xz/po/pl.po
Changed
@@ -1,20 +1,20 @@ # Polish translation for glib. -# Copyright © 2002-2022 the glib authors. +# Copyright © 2002-2023 the glib authors. # This file is distributed under the same license as the glib package. # Zbigniew Chyla <chyla@alice.ci.pwr.wroc.pl>, 2002-2003. # Artur Flinta <aflinta@at.kernel.pl>, 2003-2006. # Tomasz Kłoczko <kloczek@rudy.mif.pg.gda.pl>, 2005. # Wadim Dziedzic <wdziedzic@aviary.pl>, 2007-2009. # Tomasz Dominikowski <dominikowski@gmail.com>, 2008-2009. -# Piotr Drąg <piotrdrag@gmail.com>, 2009-2022. -# Aviary.pl <community-poland@mozilla.org>, 2007-2022. +# Piotr Drąg <piotrdrag@gmail.com>, 2009-2023. +# Aviary.pl <community-poland@mozilla.org>, 2007-2023. # msgid "" msgstr "" "Project-Id-Version: glib\n" "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/glib/issues\n" -"POT-Creation-Date: 2022-08-05 19:22+0000\n" -"PO-Revision-Date: 2022-08-21 14:45+0200\n" +"POT-Creation-Date: 2023-02-15 16:30+0000\n" +"PO-Revision-Date: 2023-03-05 17:51+0100\n" "Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n" "Language-Team: Polish <community-poland@mozilla.org>\n" "Language: pl\n" @@ -24,23 +24,23 @@ "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2);\n" -#: gio/gappinfo.c:335 +#: gio/gappinfo.c:339 msgid "Setting default applications not supported yet" msgstr "Ustawianie domyślnych programów nie jest jeszcze obsługiwane" -#: gio/gappinfo.c:368 +#: gio/gappinfo.c:372 msgid "Setting application as last used for type not supported yet" msgstr "" "Ustawianie programu jako ostatnio używanego dla danego typu nie jest jeszcze " "obsługiwane" -#: gio/gappinfo.c:808 +#: gio/gappinfo.c:814 #, c-format msgid "Failed to find default application for content type ‘%s’" msgstr "" "Odnalezienie domyślnego programu dla typu zawartości „%s” się nie powiodło" -#: gio/gappinfo.c:868 +#: gio/gappinfo.c:874 #, c-format msgid "Failed to find default application for URI Scheme ‘%s’" msgstr "" @@ -243,11 +243,11 @@ msgid "error sending %s message to application: %s\n" msgstr "błąd podczas wysyłania komunikatu %s do programu: %s\n" -#: gio/gapplication-tool.c:321 +#: gio/gapplication-tool.c:324 msgid "action name must be given after application id\n" msgstr "nazwa działania musi zostać podana po identyfikatorze programu\n" -#: gio/gapplication-tool.c:329 +#: gio/gapplication-tool.c:332 #, c-format msgid "" "invalid action name: “%s”\n" @@ -256,25 +256,25 @@ "nieprawidłowa nazwa działania: „%s”\n" "nazwy działań mogą składać się tylko ze znaków alfanumerycznych, „-” i „.”\n" -#: gio/gapplication-tool.c:348 +#: gio/gapplication-tool.c:351 #, c-format msgid "error parsing action parameter: %s\n" msgstr "błąd podczas przetwarzania parametru działania: %s\n" -#: gio/gapplication-tool.c:360 +#: gio/gapplication-tool.c:363 msgid "actions accept a maximum of one parameter\n" msgstr "działania przyjmują maksymalnie jeden parametr\n" -#: gio/gapplication-tool.c:415 +#: gio/gapplication-tool.c:418 msgid "list-actions command takes only the application id" msgstr "polecenie „list-actions” przyjmuje tylko identyfikator programu" -#: gio/gapplication-tool.c:425 +#: gio/gapplication-tool.c:428 #, c-format msgid "unable to find desktop file for application %s\n" msgstr "nie można odnaleźć pliku .desktop dla programu %s\n" -#: gio/gapplication-tool.c:470 +#: gio/gapplication-tool.c:473 #, c-format msgid "" "unrecognised command: %s\n" @@ -309,7 +309,7 @@ msgid "Truncate not supported on base stream" msgstr "Skracanie nie jest dozwolone na podstawowym potoku" -#: gio/gcancellable.c:319 gio/gdbusconnection.c:1859 gio/gdbusprivate.c:1420 +#: gio/gcancellable.c:326 gio/gdbusconnection.c:1859 gio/gdbusprivate.c:1420 #: gio/gsimpleasyncresult.c:873 gio/gsimpleasyncresult.c:899 #, c-format msgid "Operation was cancelled" @@ -329,13 +329,13 @@ #: gio/gcharsetconverter.c:344 gio/gdatainputstream.c:850 #: gio/gdatainputstream.c:1268 glib/gconvert.c:451 glib/gconvert.c:883 -#: glib/giochannel.c:1576 glib/giochannel.c:1618 glib/giochannel.c:2473 +#: glib/giochannel.c:1576 glib/giochannel.c:1618 glib/giochannel.c:2478 #: glib/gutf8.c:892 glib/gutf8.c:1346 msgid "Invalid byte sequence in conversion input" msgstr "Nieprawidłowa sekwencja bajtów na wejściu konwersji" #: gio/gcharsetconverter.c:349 glib/gconvert.c:459 glib/gconvert.c:797 -#: glib/giochannel.c:1583 glib/giochannel.c:2485 +#: glib/giochannel.c:1583 glib/giochannel.c:2493 #, c-format msgid "Error during conversion: %s" msgstr "Błąd podczas konwersji: %s" @@ -395,17 +395,17 @@ msgid "Unexpected early end-of-stream" msgstr "Nieoczekiwany, przedwczesny koniec potoku" -#: gio/gdbusaddress.c:164 gio/gdbusaddress.c:238 gio/gdbusaddress.c:327 +#: gio/gdbusaddress.c:162 gio/gdbusaddress.c:234 gio/gdbusaddress.c:321 #, c-format msgid "Unsupported key “%s” in address entry “%s”" msgstr "Nieobsługiwany klucz „%s” we wpisie adresu „%s”" -#: gio/gdbusaddress.c:177 +#: gio/gdbusaddress.c:175 #, c-format msgid "Meaningless key/value pair combination in address entry “%s”" msgstr "Para klucz/wartość we wpisie adresu „%s” nie ma znaczenia" -#: gio/gdbusaddress.c:186 +#: gio/gdbusaddress.c:184 #, c-format msgid "" "Address “%s” is invalid (need exactly one of path, dir, tmpdir, or abstract " @@ -414,28 +414,28 @@ "Adres „%s” jest nieprawidłowy (wymaga dokładnie jednej ścieżki, katalogu, " "katalogu tymczasowego lub kluczy abstrakcyjnych)" -#: gio/gdbusaddress.c:253 gio/gdbusaddress.c:264 gio/gdbusaddress.c:279 -#: gio/gdbusaddress.c:342 gio/gdbusaddress.c:353 +#: gio/gdbusaddress.c:249 gio/gdbusaddress.c:260 gio/gdbusaddress.c:275 +#: gio/gdbusaddress.c:336 gio/gdbusaddress.c:347 #, c-format msgid "Error in address “%s” — the “%s” attribute is malformed" msgstr "Błąd w adresie „%s” — atrybut „%s” jest błędnie sformatowany" -#: gio/gdbusaddress.c:423 gio/gdbusaddress.c:682 +#: gio/gdbusaddress.c:417 gio/gdbusaddress.c:676 #, c-format msgid "Unknown or unsupported transport “%s” for address “%s”" msgstr "Nieznany lub nieobsługiwany transport „%s” dla adresu „%s”" -#: gio/gdbusaddress.c:467 +#: gio/gdbusaddress.c:461 #, c-format msgid "Address element “%s” does not contain a colon (:)" msgstr "Element adresu „%s” nie zawiera dwukropka (:)" -#: gio/gdbusaddress.c:476 +#: gio/gdbusaddress.c:470 #, c-format msgid "Transport name in address element “%s” must not be empty" msgstr "Nazwa transportu w elemencie adresu „%s” nie może być pusta" -#: gio/gdbusaddress.c:497 +#: gio/gdbusaddress.c:491 #, c-format msgid "" "Key/Value pair %d, “%s”, in address element “%s” does not contain an equal " @@ -444,7 +444,7 @@ "Para klucz/wartość %d, „%s” w elemencie adresu „%s” nie zawiera znaku " "równości" -#: gio/gdbusaddress.c:508 +#: gio/gdbusaddress.c:502 #, c-format msgid "" "Key/Value pair %d, “%s”, in address element “%s” must not have an empty key" @@ -452,7 +452,7 @@ "Para klucz/wartość %d, „%s” w elemencie adresu „%s” nie może mieć pustego " "klucza" -#: gio/gdbusaddress.c:522 +#: gio/gdbusaddress.c:516 #, c-format msgid "" "Error unescaping key or value in Key/Value pair %d, “%s”, in address element " @@ -461,7 +461,7 @@ "Błąd podczas usuwania znaku sterującego klucza lub wartości w parze klucz/" "wartość %d, „%s” w elemencie adresu „%s”" -#: gio/gdbusaddress.c:590 +#: gio/gdbusaddress.c:584 #, c-format msgid "" "Error in address “%s” — the unix transport requires exactly one of the keys " @@ -470,85 +470,85 @@ "Błąd w adresie „%s” — transport systemu UNIX wymaga ustawienia dokładnie " "jednego z kluczy „path” lub „abstract”" -#: gio/gdbusaddress.c:625 +#: gio/gdbusaddress.c:619 #, c-format msgid "Error in address “%s” — the host attribute is missing or malformed" msgstr "" "Błąd w adresie „%s” — brak atrybutu komputera lub jest błędnie sformatowany" -#: gio/gdbusaddress.c:639 +#: gio/gdbusaddress.c:633 #, c-format msgid "Error in address “%s” — the port attribute is missing or malformed" msgstr "" "Błąd w adresie „%s” — brak atrybutu portu lub jest błędnie sformatowany" -#: gio/gdbusaddress.c:653 +#: gio/gdbusaddress.c:647 #, c-format msgid "Error in address “%s” — the noncefile attribute is missing or malformed" msgstr "" "Błąd w adresie „%s” — brak atrybutu pliku nonce lub jest błędnie sformatowany" -#: gio/gdbusaddress.c:674 +#: gio/gdbusaddress.c:668 msgid "Error auto-launching: " msgstr "Błąd podczas automatycznego uruchamiania: " -#: gio/gdbusaddress.c:727 +#: gio/gdbusaddress.c:721 #, c-format msgid "Error opening nonce file “%s”: %s" msgstr "Błąd podczas otwierania pliku nonce „%s”: %s" -#: gio/gdbusaddress.c:746 +#: gio/gdbusaddress.c:740 #, c-format msgid "Error reading from nonce file “%s”: %s" msgstr "Błąd podczas odczytywania pliku nonce „%s”: %s" -#: gio/gdbusaddress.c:755 +#: gio/gdbusaddress.c:749 #, c-format msgid "Error reading from nonce file “%s”, expected 16 bytes, got %d" msgstr "" "Błąd podczas odczytywania pliku nonce „%s”, oczekiwano 16 bajtów, otrzymano " "%d" -#: gio/gdbusaddress.c:773 +#: gio/gdbusaddress.c:767 #, c-format msgid "Error writing contents of nonce file “%s” to stream:" msgstr "Błąd podczas zapisywania zawartości pliku nonce „%s” do potoku:" -#: gio/gdbusaddress.c:988 +#: gio/gdbusaddress.c:982 msgid "The given address is empty" msgstr "Podany adres jest pusty" -#: gio/gdbusaddress.c:1101 +#: gio/gdbusaddress.c:1095 #, c-format msgid "Cannot spawn a message bus when AT_SECURE is set" msgstr "" "Nie można wywołać magistrali komunikatów, kiedy AT_SECURE jest ustawione" -#: gio/gdbusaddress.c:1108 +#: gio/gdbusaddress.c:1102 msgid "Cannot spawn a message bus without a machine-id: " msgstr "" "Nie można wywołać magistrali komunikatów bez identyfikatora komputera: " -#: gio/gdbusaddress.c:1115 +#: gio/gdbusaddress.c:1109 #, c-format msgid "Cannot autolaunch D-Bus without X11 $DISPLAY" msgstr "" "Nie można automatycznie uruchomić usługi D-Bus bez zmiennej $DISPLAY " "środowiska X11" -#: gio/gdbusaddress.c:1157 +#: gio/gdbusaddress.c:1151 #, c-format msgid "Error spawning command line “%s”: " msgstr "Błąd podczas wywoływania wiersza poleceń „%s”: " -#: gio/gdbusaddress.c:1226 +#: gio/gdbusaddress.c:1220 #, c-format msgid "Cannot determine session bus address (not implemented for this OS)" msgstr "" "Nie można ustalić adresu magistrali sesji (nie jest zaimplementowane dla " "tego systemu operacyjnego)" -#: gio/gdbusaddress.c:1375 gio/gdbusconnection.c:7321 +#: gio/gdbusaddress.c:1374 gio/gdbusconnection.c:7316 #, c-format msgid "" "Cannot determine bus address from DBUS_STARTER_BUS_TYPE environment variable " @@ -557,7 +557,7 @@ "Nie można ustalić adresu magistrali ze zmiennej środowiskowej " "DBUS_STARTER_BUS_TYPE — nieznana wartość „%s”" -#: gio/gdbusaddress.c:1384 gio/gdbusconnection.c:7330 +#: gio/gdbusaddress.c:1383 gio/gdbusconnection.c:7325 msgid "" "Cannot determine bus address because the DBUS_STARTER_BUS_TYPE environment " "variable is not set" @@ -565,7 +565,7 @@ "Nie można ustalić adresu magistrali, ponieważ nie ustawiono zmiennej " "środowiskowej DBUS_STARTER_BUS_TYPE" -#: gio/gdbusaddress.c:1394 +#: gio/gdbusaddress.c:1393 #, c-format msgid "Unknown bus type %d" msgstr "Nieznany typ magistrali %d" @@ -587,11 +587,15 @@ "Wyczerpano wszystkie dostępne mechanizmy uwierzytelniania (próby: %s, " "dostępne: %s)" -#: gio/gdbusauth.c:1178 +#: gio/gdbusauth.c:1045 +msgid "Unexpected lack of content trying to read a byte" +msgstr "Oczekiwano braku zawartości podczas próby odczytania bajtu" + +#: gio/gdbusauth.c:1195 msgid "User IDs must be the same for peer and server" msgstr "Identyfikatory użytkownika muszą być takie same dla partnera i serwera" -#: gio/gdbusauth.c:1190 +#: gio/gdbusauth.c:1207 msgid "Cancelled via GDBusAuthObserver::authorize-authenticated-peer" msgstr "Anulowano przez GDBusAuthObserver::authorize-authenticated-peer" @@ -685,7 +689,7 @@ msgid "(Additionally, releasing the lock for “%s” also failed: %s) " msgstr "(Dodatkowo, uwolnienie blokady „%s” także się nie powiodło: %s) " -#: gio/gdbusconnection.c:590 gio/gdbusconnection.c:2404 +#: gio/gdbusconnection.c:590 gio/gdbusconnection.c:2405 msgid "The connection is closed" msgstr "Połączenie jest zamknięte" @@ -693,118 +697,118 @@ msgid "Timeout was reached" msgstr "Przekroczono czas oczekiwania" -#: gio/gdbusconnection.c:2527 +#: gio/gdbusconnection.c:2528 msgid "" "Unsupported flags encountered when constructing a client-side connection" msgstr "" "Wystąpiły nieobsługiwane flagi podczas tworzenia połączenia ze strony klienta" -#: gio/gdbusconnection.c:4256 gio/gdbusconnection.c:4610 +#: gio/gdbusconnection.c:4257 gio/gdbusconnection.c:4611 #, c-format msgid "" "No such interface “org.freedesktop.DBus.Properties” on object at path %s" msgstr "" "Brak interfejsu „org.freedesktop.DBus.Properties” w obiekcie w ścieżce %s" -#: gio/gdbusconnection.c:4401 +#: gio/gdbusconnection.c:4402 #, c-format msgid "No such property “%s”" msgstr "Brak właściwości „%s”" -#: gio/gdbusconnection.c:4413 +#: gio/gdbusconnection.c:4414 #, c-format msgid "Property “%s” is not readable" msgstr "Właściwość „%s” nie jest odczytywalna" -#: gio/gdbusconnection.c:4424 +#: gio/gdbusconnection.c:4425 #, c-format msgid "Property “%s” is not writable" msgstr "Właściwość „%s” nie jest zapisywalna" -#: gio/gdbusconnection.c:4444 +#: gio/gdbusconnection.c:4445 #, c-format msgid "Error setting property “%s”: Expected type “%s” but got “%s”" msgstr "" "Błąd podczas ustawiania właściwości „%s”: oczekiwano typ „%s”, ale otrzymano " "„%s”" -#: gio/gdbusconnection.c:4549 gio/gdbusconnection.c:4764 -#: gio/gdbusconnection.c:6747 +#: gio/gdbusconnection.c:4550 gio/gdbusconnection.c:4765 +#: gio/gdbusconnection.c:6742 #, c-format msgid "No such interface “%s”" msgstr "Brak interfejsu „%s”" -#: gio/gdbusconnection.c:4986 gio/gdbusconnection.c:7261 +#: gio/gdbusconnection.c:4981 gio/gdbusconnection.c:7256 #, c-format msgid "No such interface “%s” on object at path %s" msgstr "Brak interfejsu „%s” w obiekcie w ścieżce %s" -#: gio/gdbusconnection.c:5087 +#: gio/gdbusconnection.c:5082 #, c-format msgid "No such method “%s”" msgstr "Brak metody „%s”" -#: gio/gdbusconnection.c:5118 +#: gio/gdbusconnection.c:5113 #, c-format msgid "Type of message, “%s”, does not match expected type “%s”" msgstr "Typ komunikatu, „%s”, nie pasuje do oczekiwanego typu „%s”" -#: gio/gdbusconnection.c:5321 +#: gio/gdbusconnection.c:5316 #, c-format msgid "An object is already exported for the interface %s at %s" msgstr "Obiekt został już wyeksportowany dla interfejsu %s w %s" -#: gio/gdbusconnection.c:5548 +#: gio/gdbusconnection.c:5543 #, c-format msgid "Unable to retrieve property %s.%s" msgstr "Nie można pobrać właściwości %s.%s" -#: gio/gdbusconnection.c:5604 +#: gio/gdbusconnection.c:5599 #, c-format msgid "Unable to set property %s.%s" msgstr "Nie można ustawić właściwości %s.%s" -#: gio/gdbusconnection.c:5783 +#: gio/gdbusconnection.c:5778 #, c-format msgid "Method “%s” returned type “%s”, but expected “%s”" msgstr "Metoda „%s” zwróciła typ „%s”, ale oczekiwano „%s”" -#: gio/gdbusconnection.c:6859 +#: gio/gdbusconnection.c:6854 #, c-format msgid "Method “%s” on interface “%s” with signature “%s” does not exist" msgstr "Metoda „%s” w interfejsie „%s” z podpisem „%s” nie istnieje" -#: gio/gdbusconnection.c:6980 +#: gio/gdbusconnection.c:6975 #, c-format msgid "A subtree is already exported for %s" msgstr "Poddrzewo zostało już wyeksportowane dla %s" -#: gio/gdbusconnection.c:7269 +#: gio/gdbusconnection.c:7264 #, c-format msgid "Object does not exist at path “%s”" msgstr "Obiekt nie istnieje w ścieżce „%s”" -#: gio/gdbusmessage.c:1303 +#: gio/gdbusmessage.c:1306 msgid "type is INVALID" msgstr "typ jest NIEPRAWIDŁOWY" -#: gio/gdbusmessage.c:1314 +#: gio/gdbusmessage.c:1317 msgid "METHOD_CALL message: PATH or MEMBER header field is missing" msgstr "Komunikat METHOD_CALL: brak pola nagłówka PATH lub MEMBER" -#: gio/gdbusmessage.c:1325 +#: gio/gdbusmessage.c:1328 msgid "METHOD_RETURN message: REPLY_SERIAL header field is missing" msgstr "Komunikat METHOD_RETURN: brak pola nagłówka REPLY_SERIAL" -#: gio/gdbusmessage.c:1337 +#: gio/gdbusmessage.c:1340 msgid "ERROR message: REPLY_SERIAL or ERROR_NAME header field is missing" msgstr "Komunikat o BŁĘDZIE: brak pola nagłówka REPLY_SERIAL lub ERROR_NAME" -#: gio/gdbusmessage.c:1350 +#: gio/gdbusmessage.c:1353 msgid "SIGNAL message: PATH, INTERFACE or MEMBER header field is missing" msgstr "Komunikat SYGNAŁU: brak pola nagłówka PATH, INTERFACE lub MEMBER" -#: gio/gdbusmessage.c:1358 +#: gio/gdbusmessage.c:1361 msgid "" "SIGNAL message: The PATH header field is using the reserved value /org/" "freedesktop/DBus/Local" @@ -812,7 +816,7 @@ "Komunikat SYGNAŁU: pole nagłówka PATH używa zastrzeżonej wartości /org/" "freedesktop/DBus/Local" -#: gio/gdbusmessage.c:1366 +#: gio/gdbusmessage.c:1369 msgid "" "SIGNAL message: The INTERFACE header field is using the reserved value org." "freedesktop.DBus.Local" @@ -820,7 +824,7 @@ "Komunikat SYGNAŁU: pole nagłówka INTERFACE używa zastrzeżonej wartości org." "freedesktop.DBus.Local" -#: gio/gdbusmessage.c:1414 gio/gdbusmessage.c:1474 +#: gio/gdbusmessage.c:1417 gio/gdbusmessage.c:1477 #, c-format msgid "Wanted to read %lu byte but only got %lu" msgid_plural "Wanted to read %lu bytes but only got %lu" @@ -828,12 +832,12 @@ msgstr1 "Chciano odczytać %lu bajty, ale otrzymano tylko %lu" msgstr2 "Chciano odczytać %lu bajtów, ale otrzymano tylko %lu" -#: gio/gdbusmessage.c:1428 +#: gio/gdbusmessage.c:1431 #, c-format msgid "Expected NUL byte after the string “%s” but found byte %d" msgstr "Oczekiwano bajtu NUL po ciągu „%s”, ale odnaleziono bajt %d" -#: gio/gdbusmessage.c:1447 +#: gio/gdbusmessage.c:1450 #, c-format msgid "" "Expected valid UTF-8 string but found invalid bytes at byte offset %d " @@ -843,22 +847,22 @@ "w wyrównaniu bajtu %d (długość ciągu wynosi %d). Prawidłowy ciąg UTF-8 do " "tego miejsca to „%s”" -#: gio/gdbusmessage.c:1511 gio/gdbusmessage.c:1787 gio/gdbusmessage.c:1998 +#: gio/gdbusmessage.c:1514 gio/gdbusmessage.c:1790 gio/gdbusmessage.c:2001 msgid "Value nested too deeply" msgstr "Wartość jest zagnieżdżona za głęboko" -#: gio/gdbusmessage.c:1679 +#: gio/gdbusmessage.c:1682 #, c-format msgid "Parsed value “%s” is not a valid D-Bus object path" msgstr "" "Przetworzona wartość „%s” nie jest prawidłową ścieżką do obiektu usługi D-Bus" -#: gio/gdbusmessage.c:1703 +#: gio/gdbusmessage.c:1706 #, c-format msgid "Parsed value “%s” is not a valid D-Bus signature" msgstr "Przetworzona wartość „%s” nie jest prawidłowym podpisem usługi D-Bus" -#: gio/gdbusmessage.c:1754 +#: gio/gdbusmessage.c:1757 #, c-format msgid "" "Encountered array of length %u byte. Maximum length is 2<<26 bytes (64 MiB)." @@ -874,7 +878,7 @@ "Wystąpiła macierz o długości %u bajtów. Maksymalna długość to 2<<26 bajtów " "(64 MiB)." -#: gio/gdbusmessage.c:1774 +#: gio/gdbusmessage.c:1777 #, c-format msgid "" "Encountered array of type “a%c”, expected to have a length a multiple of %u " @@ -883,18 +887,18 @@ "Wystąpiła macierz typu „a%c”, której oczekiwana długość jest wielokrotnością " "%u B, ale wynosi %u B" -#: gio/gdbusmessage.c:1928 gio/gdbusmessage.c:2647 +#: gio/gdbusmessage.c:1931 gio/gdbusmessage.c:2650 msgid "Empty structures (tuples) are not allowed in D-Bus" msgstr "Puste struktury (krotki) nie są dozwolone na magistrali D-Bus" -#: gio/gdbusmessage.c:1982 +#: gio/gdbusmessage.c:1985 #, c-format msgid "Parsed value “%s” for variant is not a valid D-Bus signature" msgstr "" "Przetworzona wartość „%s” dla wariantu nie jest prawidłowym podpisem usługi " "D-Bus" -#: gio/gdbusmessage.c:2023 +#: gio/gdbusmessage.c:2026 #, c-format msgid "" "Error deserializing GVariant with type string “%s” from the D-Bus wire format" @@ -902,7 +906,7 @@ "Błąd podczas deserializowania GVariant za pomocą ciągu typu „%s” z formatu " "przewodu usługi D-Bus" -#: gio/gdbusmessage.c:2208 +#: gio/gdbusmessage.c:2211 #, c-format msgid "" "Invalid endianness value. Expected 0x6c (“l”) or 0x42 (“B”) but found value " @@ -911,30 +915,30 @@ "Nieprawidłowa wartość kolejności bajtów. Oczekiwano 0x6c („l”) lub 0x42 " "(„B”), ale odnaleziono wartość 0x%02x" -#: gio/gdbusmessage.c:2227 +#: gio/gdbusmessage.c:2230 #, c-format msgid "Invalid major protocol version. Expected 1 but found %d" msgstr "" "Nieprawidłowa główna wersja protokołu. Oczekiwano 1, ale odnaleziono %d" -#: gio/gdbusmessage.c:2285 gio/gdbusmessage.c:2883 +#: gio/gdbusmessage.c:2288 gio/gdbusmessage.c:2886 msgid "Signature header found but is not of type signature" msgstr "Odnaleziono nagłówek podpisu, ale nie jest podpisem typu" -#: gio/gdbusmessage.c:2297 +#: gio/gdbusmessage.c:2300 #, c-format msgid "Signature header with signature “%s” found but message body is empty" msgstr "" "Odnaleziono nagłówek podpisu z podpisem „%s”, ale treść komunikatu jest pusta" -#: gio/gdbusmessage.c:2312 +#: gio/gdbusmessage.c:2315 #, c-format msgid "Parsed value “%s” is not a valid D-Bus signature (for body)" msgstr "" "Przetworzona wartość „%s” nie jest prawidłowym podpisem usługi D-Bus (dla " "treści)" -#: gio/gdbusmessage.c:2344 +#: gio/gdbusmessage.c:2347 #, 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" @@ -945,11 +949,11 @@ msgstr2 "" "Brak nagłówka podpisu w komunikacie, ale treść komunikatu liczy %u bajtów" -#: gio/gdbusmessage.c:2354 +#: gio/gdbusmessage.c:2357 msgid "Cannot deserialize message: " msgstr "Nie można deserializować komunikatu: " -#: gio/gdbusmessage.c:2700 +#: gio/gdbusmessage.c:2703 #, c-format msgid "" "Error serializing GVariant with type string “%s” to the D-Bus wire format" @@ -957,23 +961,23 @@ "Błąd podczas serializowania GVariant za pomocą ciągu typu „%s” z formatu " "przewodu usługi D-Bus" -#: gio/gdbusmessage.c:2837 +#: gio/gdbusmessage.c:2840 #, c-format msgid "" "Number of file descriptors in message (%d) differs from header field (%d)" msgstr "" "Liczba deskryptorów plików w komunikacie (%d) różni się od pola nagłówka (%d)" -#: gio/gdbusmessage.c:2845 +#: gio/gdbusmessage.c:2848 msgid "Cannot serialize message: " msgstr "Nie można serializować komunikatu: " -#: gio/gdbusmessage.c:2898 +#: gio/gdbusmessage.c:2901 #, c-format msgid "Message body has signature “%s” but there is no signature header" msgstr "Treść komunikatu ma podpis „%s”, ale brak nagłówka podpisu" -#: gio/gdbusmessage.c:2908 +#: gio/gdbusmessage.c:2911 #, c-format msgid "" "Message body has type signature “%s” but signature in the header field is " @@ -981,17 +985,17 @@ msgstr "" "Treść komunikatu ma podpis typu „%s”, ale podpis w polu nagłówka to „%s”" -#: gio/gdbusmessage.c:2924 +#: gio/gdbusmessage.c:2927 #, c-format msgid "Message body is empty but signature in the header field is “(%s)”" msgstr "Treść komunikatu jest pusta, ale podpis w polu nagłówka to „(%s)”" -#: gio/gdbusmessage.c:3479 +#: gio/gdbusmessage.c:3482 #, c-format msgid "Error return with body of type “%s”" msgstr "Błąd zwrotu z treścią typu „%s”" -#: gio/gdbusmessage.c:3487 +#: gio/gdbusmessage.c:3490 msgid "Error return with empty body" msgstr "Błąd zwrotu z pustą treścią" @@ -1018,17 +1022,17 @@ msgid "Unable to load %s or %s: " msgstr "Nie można wczytać pliku %s ani %s: " -#: gio/gdbusproxy.c:1575 +#: gio/gdbusproxy.c:1568 #, c-format msgid "Error calling StartServiceByName for %s: " msgstr "Błąd podczas wywoływania metody StartServiceByName dla %s: " -#: gio/gdbusproxy.c:1598 +#: gio/gdbusproxy.c:1591 #, c-format msgid "Unexpected reply %d from StartServiceByName(\"%s\") method" msgstr "Nieoczekiwana odpowiedź %d od metody StartServiceByName(\"%s\")" -#: gio/gdbusproxy.c:2709 gio/gdbusproxy.c:2844 +#: gio/gdbusproxy.c:2702 gio/gdbusproxy.c:2837 #, c-format msgid "" "Cannot invoke method; proxy is for the well-known name %s without an owner, " @@ -1038,25 +1042,25 @@ "właściciela, a pośrednik został utworzony za pomocą flagi " "G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START" -#: gio/gdbusserver.c:765 +#: gio/gdbusserver.c:758 msgid "Abstract namespace not supported" msgstr "Przestrzeń nazw abstrakcyjnych jest nieobsługiwana" -#: gio/gdbusserver.c:857 +#: gio/gdbusserver.c:850 msgid "Cannot specify nonce file when creating a server" msgstr "Nie można określić pliku nonce podczas tworzenia serwera" -#: gio/gdbusserver.c:939 +#: gio/gdbusserver.c:932 #, c-format msgid "Error writing nonce file at “%s”: %s" msgstr "Błąd podczas zapisywania pliku nonce w „%s”: %s" -#: gio/gdbusserver.c:1114 +#: gio/gdbusserver.c:1107 #, c-format msgid "The string “%s” is not a valid D-Bus GUID" msgstr "Ciąg „%s” nie jest prawidłowym GUID usługi D-Bus" -#: gio/gdbusserver.c:1152 +#: gio/gdbusserver.c:1145 #, c-format msgid "Cannot listen on unsupported transport “%s”" msgstr "Nie można nasłuchiwać na nieobsługiwanym transporcie „%s”" @@ -1084,14 +1088,14 @@ "\n" "Polecenie „%s POLECENIE --help” wyświetla pomoc o każdym poleceniu.\n" -#: gio/gdbus-tool.c:204 gio/gdbus-tool.c:276 gio/gdbus-tool.c:348 -#: gio/gdbus-tool.c:372 gio/gdbus-tool.c:862 gio/gdbus-tool.c:1247 -#: gio/gdbus-tool.c:1734 +#: gio/gdbus-tool.c:204 gio/gdbus-tool.c:276 gio/gdbus-tool.c:347 +#: gio/gdbus-tool.c:371 gio/gdbus-tool.c:861 gio/gdbus-tool.c:1246 +#: gio/gdbus-tool.c:1733 #, c-format msgid "Error: %s\n" msgstr "Błąd: %s\n" -#: gio/gdbus-tool.c:215 gio/gdbus-tool.c:289 gio/gdbus-tool.c:1750 +#: gio/gdbus-tool.c:215 gio/gdbus-tool.c:289 gio/gdbus-tool.c:1749 #, c-format msgid "Error parsing introspection XML: %s\n" msgstr "Błąd podczas przetwarzania kodu XML introspekcji: %s\n" @@ -1101,49 +1105,49 @@ msgid "Error: %s is not a valid name\n" msgstr "Błąd: %s nie jest prawidłową nazwą\n" -#: gio/gdbus-tool.c:258 gio/gdbus-tool.c:748 gio/gdbus-tool.c:1066 -#: gio/gdbus-tool.c:1900 gio/gdbus-tool.c:2140 +#: gio/gdbus-tool.c:258 gio/gdbus-tool.c:747 gio/gdbus-tool.c:1065 +#: gio/gdbus-tool.c:1899 gio/gdbus-tool.c:2139 #, c-format msgid "Error: %s is not a valid object path\n" msgstr "Błąd: %s nie jest prawidłową ścieżką do obiektu\n" -#: gio/gdbus-tool.c:406 +#: gio/gdbus-tool.c:405 msgid "Connect to the system bus" msgstr "Łączy z magistralą systemową" -#: gio/gdbus-tool.c:407 +#: gio/gdbus-tool.c:406 msgid "Connect to the session bus" msgstr "Łączy z magistralą sesji" -#: gio/gdbus-tool.c:408 +#: gio/gdbus-tool.c:407 msgid "Connect to given D-Bus address" msgstr "Łączy z podanym adresem usługi D-Bus" -#: gio/gdbus-tool.c:418 +#: gio/gdbus-tool.c:417 msgid "Connection Endpoint Options:" msgstr "Opcje punktów końcowych połączenia:" -#: gio/gdbus-tool.c:419 +#: gio/gdbus-tool.c:418 msgid "Options specifying the connection endpoint" msgstr "Opcje określające punkt końcowy połączenia" -#: gio/gdbus-tool.c:442 +#: gio/gdbus-tool.c:441 #, c-format msgid "No connection endpoint specified" msgstr "Nie określono żadnych punktów końcowych połączenia" -#: gio/gdbus-tool.c:452 +#: gio/gdbus-tool.c:451 #, c-format msgid "Multiple connection endpoints specified" msgstr "Określono wiele punktów końcowych połączenia" -#: gio/gdbus-tool.c:525 +#: gio/gdbus-tool.c:524 #, c-format msgid "" "Warning: According to introspection data, interface “%s” does not exist\n" msgstr "Ostrzeżenie: według danych introspekcji, interfejs „%s” nie istnieje\n" -#: gio/gdbus-tool.c:534 +#: gio/gdbus-tool.c:533 #, c-format msgid "" "Warning: According to introspection data, method “%s” does not exist on " @@ -1152,165 +1156,165 @@ "Ostrzeżenie: według danych introspekcji, metoda „%s” nie istnieje " "w interfejsie „%s”\n" -#: gio/gdbus-tool.c:596 +#: gio/gdbus-tool.c:595 msgid "Optional destination for signal (unique name)" msgstr "Opcjonalny cel sygnału (unikalna nazwa)" -#: gio/gdbus-tool.c:597 +#: gio/gdbus-tool.c:596 msgid "Object path to emit signal on" msgstr "Ścieżka do obiektu do wyemitowania sygnału" -#: gio/gdbus-tool.c:598 +#: gio/gdbus-tool.c:597 msgid "Signal and interface name" msgstr "Nazwa sygnału i interfejsu" -#: gio/gdbus-tool.c:631 +#: gio/gdbus-tool.c:630 msgid "Emit a signal." msgstr "Emituje sygnał." -#: gio/gdbus-tool.c:686 gio/gdbus-tool.c:1003 gio/gdbus-tool.c:1837 -#: gio/gdbus-tool.c:2069 gio/gdbus-tool.c:2289 +#: gio/gdbus-tool.c:685 gio/gdbus-tool.c:1002 gio/gdbus-tool.c:1836 +#: gio/gdbus-tool.c:2068 gio/gdbus-tool.c:2288 #, c-format msgid "Error connecting: %s\n" msgstr "Błąd podczas łączenia: %s\n" -#: gio/gdbus-tool.c:706 +#: gio/gdbus-tool.c:705 #, c-format msgid "Error: %s is not a valid unique bus name.\n" msgstr "Błąd: %s nie jest prawidłową unikalną nazwą magistrali.\n" -#: gio/gdbus-tool.c:725 gio/gdbus-tool.c:1046 gio/gdbus-tool.c:1880 +#: gio/gdbus-tool.c:724 gio/gdbus-tool.c:1045 gio/gdbus-tool.c:1879 msgid "Error: Object path is not specified\n" msgstr "Błąd: nie podano ścieżki do obiektu\n" -#: gio/gdbus-tool.c:768 +#: gio/gdbus-tool.c:767 msgid "Error: Signal name is not specified\n" msgstr "Błąd: nie podano nazwy sygnału\n" -#: gio/gdbus-tool.c:782 +#: gio/gdbus-tool.c:781 #, c-format msgid "Error: Signal name “%s” is invalid\n" msgstr "Błąd: nazwa sygnału „%s” jest nieprawidłowa\n" -#: gio/gdbus-tool.c:794 +#: gio/gdbus-tool.c:793 #, c-format msgid "Error: %s is not a valid interface name\n" msgstr "Błąd: %s nie jest prawidłową nazwą interfejsu\n" -#: gio/gdbus-tool.c:800 +#: gio/gdbus-tool.c:799 #, c-format msgid "Error: %s is not a valid member name\n" msgstr "Błąd: %s nie jest prawidłową nazwą elementu\n" #. Use the original non-"parse-me-harder" error -#: gio/gdbus-tool.c:837 gio/gdbus-tool.c:1178 +#: gio/gdbus-tool.c:836 gio/gdbus-tool.c:1177 #, c-format msgid "Error parsing parameter %d: %s\n" msgstr "Błąd podczas przetwarzania parametru %d: %s\n" -#: gio/gdbus-tool.c:869 +#: gio/gdbus-tool.c:868 #, c-format msgid "Error flushing connection: %s\n" msgstr "Błąd podczas czyszczenia połączenia: %s\n" -#: gio/gdbus-tool.c:897 +#: gio/gdbus-tool.c:896 msgid "Destination name to invoke method on" msgstr "Nazwa docelowa do wywołania na niej metody" -#: gio/gdbus-tool.c:898 +#: gio/gdbus-tool.c:897 msgid "Object path to invoke method on" msgstr "Ścieżka do obiektu do wywołania na niej metody" -#: gio/gdbus-tool.c:899 +#: gio/gdbus-tool.c:898 msgid "Method and interface name" msgstr "Nazwa metody i interfejsu" -#: gio/gdbus-tool.c:900 +#: gio/gdbus-tool.c:899 msgid "Timeout in seconds" msgstr "Czas oczekiwania w sekundach" -#: gio/gdbus-tool.c:901 +#: gio/gdbus-tool.c:900 msgid "Allow interactive authorization" msgstr "Zezwala na interaktywne upoważnienie" -#: gio/gdbus-tool.c:948 +#: gio/gdbus-tool.c:947 msgid "Invoke a method on a remote object." msgstr "Wywołuje metodę na zdalnym obiekcie." -#: gio/gdbus-tool.c:1020 gio/gdbus-tool.c:1854 gio/gdbus-tool.c:2094 +#: gio/gdbus-tool.c:1019 gio/gdbus-tool.c:1853 gio/gdbus-tool.c:2093 msgid "Error: Destination is not specified\n" msgstr "Błąd: nie podano celu\n" -#: gio/gdbus-tool.c:1031 gio/gdbus-tool.c:1871 gio/gdbus-tool.c:2105 +#: gio/gdbus-tool.c:1030 gio/gdbus-tool.c:1870 gio/gdbus-tool.c:2104 #, c-format msgid "Error: %s is not a valid bus name\n" msgstr "Błąd: %s nie jest prawidłową nazwą magistrali\n" -#: gio/gdbus-tool.c:1081 +#: gio/gdbus-tool.c:1080 msgid "Error: Method name is not specified\n" msgstr "Błąd: nie podano nazwy metody\n" -#: gio/gdbus-tool.c:1092 +#: gio/gdbus-tool.c:1091 #, c-format msgid "Error: Method name “%s” is invalid\n" msgstr "Błąd: nazwa metody „%s” jest nieprawidłowa\n" -#: gio/gdbus-tool.c:1170 +#: gio/gdbus-tool.c:1169 #, c-format msgid "Error parsing parameter %d of type “%s”: %s\n" msgstr "Błąd podczas przetwarzania parametru %d typu „%s”: %s\n" -#: gio/gdbus-tool.c:1196 +#: gio/gdbus-tool.c:1195 #, c-format msgid "Error adding handle %d: %s\n" msgstr "Błąd podczas dodawania pliku obsługi %d: %s\n" -#: gio/gdbus-tool.c:1696 +#: gio/gdbus-tool.c:1695 msgid "Destination name to introspect" msgstr "Nazwa docelowa do zbadania" -#: gio/gdbus-tool.c:1697 +#: gio/gdbus-tool.c:1696 msgid "Object path to introspect" msgstr "Ścieżka do obiektu do zbadania" -#: gio/gdbus-tool.c:1698 +#: gio/gdbus-tool.c:1697 msgid "Print XML" msgstr "Wyświetla kod XML" -#: gio/gdbus-tool.c:1699 +#: gio/gdbus-tool.c:1698 msgid "Introspect children" msgstr "Bada elementy potomne" -#: gio/gdbus-tool.c:1700 +#: gio/gdbus-tool.c:1699 msgid "Only print properties" msgstr "Wyświetla tylko właściwości" -#: gio/gdbus-tool.c:1789 +#: gio/gdbus-tool.c:1788 msgid "Introspect a remote object." msgstr "Bada zdalny obiekt." -#: gio/gdbus-tool.c:1995 +#: gio/gdbus-tool.c:1994 msgid "Destination name to monitor" msgstr "Nazwa docelowa do monitorowania" -#: gio/gdbus-tool.c:1996 +#: gio/gdbus-tool.c:1995 msgid "Object path to monitor" msgstr "Ścieżka do obiektu do monitorowania" -#: gio/gdbus-tool.c:2021 +#: gio/gdbus-tool.c:2020 msgid "Monitor a remote object." msgstr "Monitoruje zdalny obiekt." -#: gio/gdbus-tool.c:2079 +#: gio/gdbus-tool.c:2078 msgid "Error: can’t monitor a non-message-bus connection\n" msgstr "" "Błąd: nie można monitorować połączenia niebędącego magistralą komunikatów\n" -#: gio/gdbus-tool.c:2203 +#: gio/gdbus-tool.c:2202 msgid "Service to activate before waiting for the other one (well-known name)" msgstr "Usługa do aktywowania przed oczekiwaniem na drugą (znaną nazwę)" -#: gio/gdbus-tool.c:2206 +#: gio/gdbus-tool.c:2205 msgid "" "Timeout to wait for before exiting with an error (seconds); 0 for no timeout " "(default)" @@ -1318,27 +1322,27 @@ "Czas oczekiwania przed zakończeniem z błędem (w sekundach), 0 oznacza brak " "ograniczenia (domyślne)" -#: gio/gdbus-tool.c:2254 +#: gio/gdbus-tool.c:2253 msgid "OPTION… BUS-NAME" msgstr "OPCJA… NAZWA-MAGISTRALI" -#: gio/gdbus-tool.c:2255 +#: gio/gdbus-tool.c:2254 msgid "Wait for a bus name to appear." msgstr "Oczekuje na pojawienie się nazwy magistrali." -#: gio/gdbus-tool.c:2331 +#: gio/gdbus-tool.c:2330 msgid "Error: A service to activate for must be specified.\n" msgstr "Błąd: należy podać usługę, dla której aktywować.\n" -#: gio/gdbus-tool.c:2336 +#: gio/gdbus-tool.c:2335 msgid "Error: A service to wait for must be specified.\n" msgstr "Błąd: należy podać usługę, na którą oczekiwać.\n" -#: gio/gdbus-tool.c:2341 +#: gio/gdbus-tool.c:2340 msgid "Error: Too many arguments.\n" msgstr "Błąd: za dużo parametrów.\n" -#: gio/gdbus-tool.c:2349 gio/gdbus-tool.c:2356 +#: gio/gdbus-tool.c:2348 gio/gdbus-tool.c:2355 #, c-format msgid "Error: %s is not a valid well-known bus name.\n" msgstr "Błąd: %s nie jest prawidłową znaną nazwą magistrali.\n" @@ -1348,39 +1352,44 @@ msgid "Not authorized to change debug settings" msgstr "Brak upoważnienia do zmiany ustawień debugowania" -#: gio/gdesktopappinfo.c:2182 gio/gdesktopappinfo.c:5113 +#: gio/gdesktopappinfo.c:2242 gio/gdesktopappinfo.c:5223 msgid "Unnamed" msgstr "Bez nazwy" -#: gio/gdesktopappinfo.c:2592 +#: gio/gdesktopappinfo.c:2652 msgid "Desktop file didn’t specify Exec field" msgstr "Plik .desktop nie określa pola Exec" -#: gio/gdesktopappinfo.c:2891 +#: gio/gdesktopappinfo.c:2942 msgid "Unable to find terminal required for application" msgstr "Nie można odnaleźć terminala wymaganego przez program" -#: gio/gdesktopappinfo.c:3631 +#: gio/gdesktopappinfo.c:3002 +#, c-format +msgid "Program ‘%s’ not found in $PATH" +msgstr "Nie odnaleziono programu „%s” w $PATH" + +#: gio/gdesktopappinfo.c:3735 #, c-format msgid "Can’t create user application configuration folder %s: %s" msgstr "" "Nie można utworzyć katalogu użytkownika dla konfiguracji programu %s: %s" -#: gio/gdesktopappinfo.c:3635 +#: gio/gdesktopappinfo.c:3739 #, c-format msgid "Can’t create user MIME configuration folder %s: %s" msgstr "Nie można utworzyć katalogu użytkownika dla konfiguracji MIME %s: %s" -#: gio/gdesktopappinfo.c:3877 gio/gdesktopappinfo.c:3901 +#: gio/gdesktopappinfo.c:3981 gio/gdesktopappinfo.c:4005 msgid "Application information lacks an identifier" msgstr "Brak identyfikatora w informacjach o programie" -#: gio/gdesktopappinfo.c:4137 +#: gio/gdesktopappinfo.c:4241 #, c-format msgid "Can’t create user desktop file %s" msgstr "Nie można utworzyć pliku .desktop dla użytkownika %s" -#: gio/gdesktopappinfo.c:4273 +#: gio/gdesktopappinfo.c:4377 #, c-format msgid "Custom definition for %s" msgstr "Niestandardowa definicja dla %s" @@ -1453,7 +1462,7 @@ msgid "Containing mount does not exist" msgstr "Nie istnieje zawierający punkt montowania" -#: gio/gfile.c:2641 gio/glocalfile.c:2500 +#: gio/gfile.c:2641 gio/glocalfile.c:2511 msgid "Can’t copy over directory" msgstr "Nie można skopiować na katalog" @@ -1499,7 +1508,7 @@ msgid "Invalid symlink value given" msgstr "Wprowadzono nieprawidłową wartość dowiązania symbolicznego" -#: gio/gfile.c:4163 glib/gfileutils.c:2335 +#: gio/gfile.c:4163 glib/gfileutils.c:2392 msgid "Symbolic links not supported" msgstr "Dowiązania symboliczne nie są obsługiwane" @@ -1601,37 +1610,37 @@ msgid "HTTP proxy server closed connection unexpectedly." msgstr "Serwer pośrednika HTTP nieoczekiwanie zamknął połączenie." -#: gio/gicon.c:300 +#: gio/gicon.c:299 #, c-format msgid "Wrong number of tokens (%d)" msgstr "Błędna liczba elementów (%d)" -#: gio/gicon.c:320 +#: gio/gicon.c:319 #, c-format msgid "No type for class name %s" msgstr "Brak typu dla nazwy klasy %s" -#: gio/gicon.c:330 +#: gio/gicon.c:329 #, c-format msgid "Type %s does not implement the GIcon interface" msgstr "Typ %s nie obsługuje interfejsu GIcon" -#: gio/gicon.c:341 +#: gio/gicon.c:340 #, c-format msgid "Type %s is not classed" msgstr "Typ %s nie jest klasowy" -#: gio/gicon.c:355 +#: gio/gicon.c:354 #, c-format msgid "Malformed version number: %s" msgstr "Błędny format numeru wersji: %s" -#: gio/gicon.c:369 +#: gio/gicon.c:368 #, c-format msgid "Type %s does not implement from_tokens() on the GIcon interface" msgstr "Typ %s nie obsługuje metody from_tokens() z interfejsu GIcon" -#: gio/gicon.c:471 +#: gio/gicon.c:470 msgid "Can’t handle the supplied version of the icon encoding" msgstr "Nie można obsłużyć podanej wersji kodowania ikony" @@ -1782,7 +1791,7 @@ #: gio/gio-tool-cat.c:135 gio/gio-tool-info.c:379 gio/gio-tool-list.c:173 #: gio/gio-tool-mkdir.c:50 gio/gio-tool-monitor.c:39 gio/gio-tool-monitor.c:41 #: gio/gio-tool-monitor.c:43 gio/gio-tool-monitor.c:45 -#: gio/gio-tool-monitor.c:206 gio/gio-tool-mount.c:1202 gio/gio-tool-open.c:72 +#: gio/gio-tool-monitor.c:206 gio/gio-tool-mount.c:1210 gio/gio-tool-open.c:72 #: gio/gio-tool-remove.c:50 gio/gio-tool-rename.c:47 gio/gio-tool-set.c:95 #: gio/gio-tool-trash.c:222 gio/gio-tool-tree.c:241 msgid "LOCATION" @@ -1803,7 +1812,7 @@ "smb://serwer/zasób/plik.txt jako położenia." #: gio/gio-tool-cat.c:164 gio/gio-tool-info.c:410 gio/gio-tool-mkdir.c:78 -#: gio/gio-tool-monitor.c:231 gio/gio-tool-mount.c:1253 gio/gio-tool-open.c:98 +#: gio/gio-tool-monitor.c:231 gio/gio-tool-mount.c:1261 gio/gio-tool-open.c:98 #: gio/gio-tool-remove.c:74 gio/gio-tool-trash.c:303 msgid "No locations given" msgstr "Nie podano położeń" @@ -2220,19 +2229,19 @@ msgid "Mount a TCRYPT system volume" msgstr "Montuje systemowy wolumin TCRYPT" -#: gio/gio-tool-mount.c:268 gio/gio-tool-mount.c:300 +#: gio/gio-tool-mount.c:276 gio/gio-tool-mount.c:308 msgid "Anonymous access denied" msgstr "Odmowa dostępu anonimowego" -#: gio/gio-tool-mount.c:525 +#: gio/gio-tool-mount.c:533 msgid "No drive for device file" msgstr "Brak napędu dla pliku urządzenia" -#: gio/gio-tool-mount.c:1017 +#: gio/gio-tool-mount.c:1025 msgid "No volume for given ID" msgstr "Brak woluminu dla podanego identyfikatora" -#: gio/gio-tool-mount.c:1206 +#: gio/gio-tool-mount.c:1214 msgid "Mount or unmount the locations." msgstr "Montuje lub odmontowuje położenia." @@ -2438,7 +2447,7 @@ msgid "List contents of directories in a tree-like format." msgstr "Wyświetla listę zawartości katalogów w formacie drzewa." -#: gio/glib-compile-resources.c:142 gio/glib-compile-schemas.c:1516 +#: gio/glib-compile-resources.c:142 gio/glib-compile-schemas.c:1513 #, c-format msgid "Element <%s> not allowed inside <%s>" msgstr "Element <%s> nie jest dozwolony wewnątrz <%s>" @@ -2496,7 +2505,7 @@ msgid "text may not appear inside <%s>" msgstr "tekst nie może znajdować się wewnątrz <%s>" -#: gio/glib-compile-resources.c:821 gio/glib-compile-schemas.c:2174 +#: gio/glib-compile-resources.c:821 gio/glib-compile-schemas.c:2171 msgid "Show program version and exit" msgstr "Wyświetla wersję programu i kończy działanie" @@ -2510,8 +2519,8 @@ "directory)" msgstr "Katalog, z którego wczytywać PLIKI (domyślnie bieżący katalog)" -#: gio/glib-compile-resources.c:823 gio/glib-compile-schemas.c:2175 -#: gio/glib-compile-schemas.c:2204 +#: gio/glib-compile-resources.c:823 gio/glib-compile-schemas.c:2172 +#: gio/glib-compile-schemas.c:2201 msgid "DIRECTORY" msgstr "KATALOG" @@ -2731,16 +2740,16 @@ msgid "<aliases> must contain at least one <alias>" msgstr "<aliases> musi zawierać co najmniej jeden znacznik <alias>" -#: gio/glib-compile-schemas.c:799 +#: gio/glib-compile-schemas.c:796 msgid "Empty names are not permitted" msgstr "Puste nazwy nie są dozwolone" -#: gio/glib-compile-schemas.c:809 +#: gio/glib-compile-schemas.c:806 #, c-format msgid "Invalid name “%s”: names must begin with a lowercase letter" msgstr "Nieprawidłowa nazwa „%s”: nazwy muszą rozpoczynać się od małej litery" -#: gio/glib-compile-schemas.c:821 +#: gio/glib-compile-schemas.c:818 #, c-format msgid "" "Invalid name “%s”: invalid character “%c”; only lowercase letters, numbers " @@ -2749,36 +2758,36 @@ "Nieprawidłowa nazwa „%s”: niedozwolony znak „%c”. Dozwolone są tylko małe " "litery, liczby i myślniki („-”)" -#: gio/glib-compile-schemas.c:830 +#: gio/glib-compile-schemas.c:827 #, c-format msgid "Invalid name “%s”: two successive hyphens (“--”) are not permitted" msgstr "Nieprawidłowa nazwa „%s”: dwa myślniki („--”) nie są dozwolone" -#: gio/glib-compile-schemas.c:839 +#: gio/glib-compile-schemas.c:836 #, c-format msgid "Invalid name “%s”: the last character may not be a hyphen (“-”)" msgstr "Nieprawidłowa nazwa „%s”: ostatni znak nie może być myślnikiem („-”)" -#: gio/glib-compile-schemas.c:847 +#: gio/glib-compile-schemas.c:844 #, c-format msgid "Invalid name “%s”: maximum length is 1024" msgstr "Nieprawidłowa nazwa „%s”: maksymalna długość to 1024" -#: gio/glib-compile-schemas.c:919 +#: gio/glib-compile-schemas.c:916 #, c-format msgid "<child name='%s'> already specified" msgstr "<child name='%s'> zostało już określone" -#: gio/glib-compile-schemas.c:945 +#: gio/glib-compile-schemas.c:942 msgid "Cannot add keys to a “list-of” schema" msgstr "Nie można dodać kluczy do schematu „list-of”" -#: gio/glib-compile-schemas.c:956 +#: gio/glib-compile-schemas.c:953 #, c-format msgid "<key name='%s'> already specified" msgstr "<key name='%s'> zostało już określone" -#: gio/glib-compile-schemas.c:974 +#: gio/glib-compile-schemas.c:971 #, c-format msgid "" "<key name='%s'> shadows <key name='%s'> in <schema id='%s'>; use <override> " @@ -2787,7 +2796,7 @@ "<key name='%s'> pokrywa <key name='%s'> w <schema id='%s'>; należy użyć " "znacznika <override>, aby zmodyfikować wartość" -#: gio/glib-compile-schemas.c:985 +#: gio/glib-compile-schemas.c:982 #, c-format msgid "" "Exactly one of “type”, “enum” or “flags” must be specified as an attribute " @@ -2796,56 +2805,56 @@ "Dokładnie jedna z wartości „type”, „enum” lub „flags” musi zostać określona " "jako atrybut znacznika <key>" -#: gio/glib-compile-schemas.c:1004 +#: gio/glib-compile-schemas.c:1001 #, c-format msgid "<%s id='%s'> not (yet) defined." msgstr "<%s id='%s'> nie zostało (jeszcze) określone." -#: gio/glib-compile-schemas.c:1019 +#: gio/glib-compile-schemas.c:1016 #, c-format msgid "Invalid GVariant type string “%s”" msgstr "Nieprawidłowy typ GVariant ciągu „%s”" -#: gio/glib-compile-schemas.c:1049 +#: gio/glib-compile-schemas.c:1046 msgid "<override> given but schema isn’t extending anything" msgstr "Podano znacznik <override>, ale schemat nic nie rozszerza" -#: gio/glib-compile-schemas.c:1062 +#: gio/glib-compile-schemas.c:1059 #, c-format msgid "No <key name='%s'> to override" msgstr "Brak znacznika <key name='%s'> do zastąpienia" -#: gio/glib-compile-schemas.c:1070 +#: gio/glib-compile-schemas.c:1067 #, c-format msgid "<override name='%s'> already specified" msgstr "<override name='%s'> zostało już określone" -#: gio/glib-compile-schemas.c:1143 +#: gio/glib-compile-schemas.c:1140 #, c-format msgid "<schema id='%s'> already specified" msgstr "<schema id='%s'> zostało już określone" -#: gio/glib-compile-schemas.c:1155 +#: gio/glib-compile-schemas.c:1152 #, c-format msgid "<schema id='%s'> extends not yet existing schema “%s”" msgstr "<schema id='%s'> rozszerza jeszcze nieistniejący schemat „%s”" -#: gio/glib-compile-schemas.c:1171 +#: gio/glib-compile-schemas.c:1168 #, c-format msgid "<schema id='%s'> is list of not yet existing schema “%s”" msgstr "<schema id='%s'> jest listą jeszcze nieistniejącego schematu „%s”" -#: gio/glib-compile-schemas.c:1179 +#: gio/glib-compile-schemas.c:1176 #, c-format msgid "Cannot be a list of a schema with a path" msgstr "Nie można być listą schematów ze ścieżkami" -#: gio/glib-compile-schemas.c:1189 +#: gio/glib-compile-schemas.c:1186 #, c-format msgid "Cannot extend a schema with a path" msgstr "Nie można rozszerzyć schematu ze ścieżką" -#: gio/glib-compile-schemas.c:1199 +#: gio/glib-compile-schemas.c:1196 #, c-format msgid "" "<schema id='%s'> is a list, extending <schema id='%s'> which is not a list" @@ -2853,7 +2862,7 @@ "<schema id='%s'> jest listą rozszerzającą znacznik <schema id='%s'>, który " "nie jest listą" -#: gio/glib-compile-schemas.c:1209 +#: gio/glib-compile-schemas.c:1206 #, c-format msgid "" "<schema id='%s' list-of='%s'> extends <schema id='%s' list-of='%s'> but “%s” " @@ -2862,18 +2871,18 @@ "<schema id='%s' list-of='%s'> rozszerza znacznik <schema id='%s' list-" "of='%s'>, ale „%s” nie rozszerza „%s”" -#: gio/glib-compile-schemas.c:1226 +#: gio/glib-compile-schemas.c:1223 #, c-format msgid "A path, if given, must begin and end with a slash" msgstr "" "Ścieżka, jeśli zostanie podana, musi rozpoczynać się i kończyć ukośnikiem" -#: gio/glib-compile-schemas.c:1233 +#: gio/glib-compile-schemas.c:1230 #, c-format msgid "The path of a list must end with “:/”" msgstr "Ścieżka do listy musi kończyć się „:/”" -#: gio/glib-compile-schemas.c:1242 +#: gio/glib-compile-schemas.c:1239 #, c-format msgid "" "Warning: Schema “%s” has path “%s”. Paths starting with “/apps/”, “/" @@ -2882,49 +2891,49 @@ "Ostrzeżenie: schemat „%s” ma ścieżkę „%s”. Ścieżki zaczynające się od „/" "apps/”, „/desktop/” i „/system/” są przestarzałe." -#: gio/glib-compile-schemas.c:1272 +#: gio/glib-compile-schemas.c:1269 #, c-format msgid "<%s id='%s'> already specified" msgstr "<%s id='%s'> zostało już określone" -#: gio/glib-compile-schemas.c:1422 gio/glib-compile-schemas.c:1438 +#: gio/glib-compile-schemas.c:1419 gio/glib-compile-schemas.c:1435 #, c-format msgid "Only one <%s> element allowed inside <%s>" msgstr "Tylko jeden element <%s> jest dozwolony wewnątrz <%s>" -#: gio/glib-compile-schemas.c:1520 +#: gio/glib-compile-schemas.c:1517 #, c-format msgid "Element <%s> not allowed at the top level" msgstr "Element <%s> nie jest dozwolony jako główny element" -#: gio/glib-compile-schemas.c:1538 +#: gio/glib-compile-schemas.c:1535 msgid "Element <default> is required in <key>" msgstr "Element <default> jest wymagany w znaczniku <key>" -#: gio/glib-compile-schemas.c:1628 +#: gio/glib-compile-schemas.c:1625 #, c-format msgid "Text may not appear inside <%s>" msgstr "Tekst nie może znajdować się wewnątrz <%s>" -#: gio/glib-compile-schemas.c:1696 +#: gio/glib-compile-schemas.c:1693 #, c-format msgid "Warning: undefined reference to <schema id='%s'/>" msgstr "Ostrzeżenie: nieokreślone odniesienie do znacznika <schema id='%s'/>" #. Translators: Do not translate "--strict". -#: gio/glib-compile-schemas.c:1835 gio/glib-compile-schemas.c:1914 +#: gio/glib-compile-schemas.c:1832 gio/glib-compile-schemas.c:1911 msgid "--strict was specified; exiting." msgstr "Podano opcję --strict; kończenie działania." -#: gio/glib-compile-schemas.c:1847 +#: gio/glib-compile-schemas.c:1844 msgid "This entire file has been ignored." msgstr "Cały plik został zignorowany." -#: gio/glib-compile-schemas.c:1910 +#: gio/glib-compile-schemas.c:1907 msgid "Ignoring this file." msgstr "Ignorowanie tego pliku." -#: gio/glib-compile-schemas.c:1965 +#: gio/glib-compile-schemas.c:1962 #, c-format msgid "" "No such key “%s” in schema “%s” as specified in override file “%s”; ignoring " @@ -2933,7 +2942,7 @@ "Brak klucza „%s” w schemacie „%s”, jak określono w pliku zastąpienia „%s”; " "ignorowanie zastąpienia dla tego klucza." -#: gio/glib-compile-schemas.c:1973 +#: gio/glib-compile-schemas.c:1970 #, c-format msgid "" "No such key “%s” in schema “%s” as specified in override file “%s” and --" @@ -2942,7 +2951,7 @@ "Brak klucza „%s” w schemacie „%s”, jak określono w pliku zastąpienia „%s”, " "oraz podano opcję --strict; kończenie działania." -#: gio/glib-compile-schemas.c:1995 +#: gio/glib-compile-schemas.c:1992 #, c-format msgid "" "Cannot provide per-desktop overrides for localized key “%s” in schema " @@ -2952,7 +2961,7 @@ "„%s” w schemacie „%s” (plik zastąpienia „%s”); ignorowanie zastąpienia dla " "tego klucza." -#: gio/glib-compile-schemas.c:2004 +#: gio/glib-compile-schemas.c:2001 #, c-format msgid "" "Cannot provide per-desktop overrides for localized key “%s” in schema " @@ -2962,7 +2971,7 @@ "„%s” w schemacie „%s” (plik zastąpienia „%s”) oraz podano opcję --strict; " "kończenie działania." -#: gio/glib-compile-schemas.c:2028 +#: gio/glib-compile-schemas.c:2025 #, c-format msgid "" "Error parsing key “%s” in schema “%s” as specified in override file “%s”: " @@ -2971,7 +2980,7 @@ "Błąd podczas przetwarzania klucza „%s” w schemacie „%s”, jak określono " "w pliku zastąpienia „%s”: %s. Ignorowanie zastąpienia dla tego klucza." -#: gio/glib-compile-schemas.c:2040 +#: gio/glib-compile-schemas.c:2037 #, c-format msgid "" "Error parsing key “%s” in schema “%s” as specified in override file “%s”: " @@ -2980,7 +2989,7 @@ "Błąd podczas przetwarzania klucza „%s” w schemacie „%s”, jak określono " "w pliku zastąpienia „%s”: %s. Podano opcję --strict; kończenie działania." -#: gio/glib-compile-schemas.c:2067 +#: gio/glib-compile-schemas.c:2064 #, c-format msgid "" "Override for key “%s” in schema “%s” in override file “%s” is outside the " @@ -2989,7 +2998,7 @@ "Zastąpienie dla klucza „%s” w schemacie „%s” w pliku zastąpienia „%s” jest " "poza zakresem podanym w schemacie; ignorowanie zastąpienia dla tego klucza." -#: gio/glib-compile-schemas.c:2077 +#: gio/glib-compile-schemas.c:2074 #, c-format msgid "" "Override for key “%s” in schema “%s” in override file “%s” is outside the " @@ -2999,7 +3008,7 @@ "poza zakresem podanym w schemacie oraz podano opcję --strict; kończenie " "działania." -#: gio/glib-compile-schemas.c:2103 +#: gio/glib-compile-schemas.c:2100 #, c-format msgid "" "Override for key “%s” in schema “%s” in override file “%s” is not in the " @@ -3009,7 +3018,7 @@ "znajduje się na liście prawidłowych wyborów; ignorowanie zastąpienia dla " "tego klucza." -#: gio/glib-compile-schemas.c:2113 +#: gio/glib-compile-schemas.c:2110 #, c-format msgid "" "Override for key “%s” in schema “%s” in override file “%s” is not in the " @@ -3019,23 +3028,23 @@ "znajduje się na liście prawidłowych wyborów oraz podano opcję --strict; " "kończenie działania." -#: gio/glib-compile-schemas.c:2175 +#: gio/glib-compile-schemas.c:2172 msgid "Where to store the gschemas.compiled file" msgstr "Gdzie przechowywać plik gschemas.compiled" -#: gio/glib-compile-schemas.c:2176 +#: gio/glib-compile-schemas.c:2173 msgid "Abort on any errors in schemas" msgstr "Przerywa po każdym błędzie w schematach" -#: gio/glib-compile-schemas.c:2177 +#: gio/glib-compile-schemas.c:2174 msgid "Do not write the gschema.compiled file" msgstr "Bez zapisywania pliku gschema.compiled" -#: gio/glib-compile-schemas.c:2178 +#: gio/glib-compile-schemas.c:2175 msgid "Do not enforce key name restrictions" msgstr "Bez wymuszania ograniczeń nazw kluczy" -#: gio/glib-compile-schemas.c:2207 +#: gio/glib-compile-schemas.c:2204 msgid "" "Compile all GSettings schema files into a schema cache.\n" "Schema files are required to have the extension .gschema.xml,\n" @@ -3046,15 +3055,15 @@ "rozszerzenie .gschema.xml, a pliki pamięci podręcznej\n" "nazywają się gschemas.compiled." -#: gio/glib-compile-schemas.c:2228 +#: gio/glib-compile-schemas.c:2225 msgid "You should give exactly one directory name" msgstr "Należy podać dokładnie jedną nazwę katalogu" -#: gio/glib-compile-schemas.c:2271 +#: gio/glib-compile-schemas.c:2268 msgid "No schema files found: doing nothing." msgstr "Nie odnaleziono plików schematów: nierobienie niczego." -#: gio/glib-compile-schemas.c:2273 +#: gio/glib-compile-schemas.c:2270 msgid "No schema files found: removed existing output file." msgstr "Nie odnaleziono plików schematów: usunięto istniejący plik wyjściowy." @@ -3063,7 +3072,7 @@ msgid "Invalid filename %s" msgstr "Nieprawidłowa nazwa pliku %s" -#: gio/glocalfile.c:996 +#: gio/glocalfile.c:1005 #, c-format msgid "Error getting filesystem info for %s: %s" msgstr "Błąd podczas pobierania informacji o systemie plików dla %s: %s" @@ -3072,126 +3081,126 @@ #. * the enclosing (user visible) mount of a file, but none #. * exists. #. -#: gio/glocalfile.c:1137 +#: gio/glocalfile.c:1141 #, c-format msgid "Containing mount for file %s not found" msgstr "Nie odnaleziono punktu montowania zawierającego plik %s" -#: gio/glocalfile.c:1160 +#: gio/glocalfile.c:1164 msgid "Can’t rename root directory" msgstr "Nie można zmienić nazwy katalogu głównego" -#: gio/glocalfile.c:1178 gio/glocalfile.c:1201 +#: gio/glocalfile.c:1182 gio/glocalfile.c:1205 #, c-format msgid "Error renaming file %s: %s" msgstr "Błąd podczas zmieniania nazwy pliku %s: %s" -#: gio/glocalfile.c:1185 +#: gio/glocalfile.c:1189 msgid "Can’t rename file, filename already exists" msgstr "Nie można zmienić nazwy pliku, plik o takiej nazwie już istnieje" -#: gio/glocalfile.c:1198 gio/glocalfile.c:2394 gio/glocalfile.c:2422 -#: gio/glocalfile.c:2561 gio/glocalfileoutputstream.c:658 +#: gio/glocalfile.c:1202 gio/glocalfile.c:2405 gio/glocalfile.c:2433 +#: gio/glocalfile.c:2572 gio/glocalfileoutputstream.c:658 msgid "Invalid filename" msgstr "Nieprawidłowa nazwa pliku" -#: gio/glocalfile.c:1366 gio/glocalfile.c:1377 +#: gio/glocalfile.c:1370 gio/glocalfile.c:1381 #, c-format msgid "Error opening file %s: %s" msgstr "Błąd podczas otwierania pliku %s: %s" -#: gio/glocalfile.c:1502 +#: gio/glocalfile.c:1506 #, c-format msgid "Error removing file %s: %s" msgstr "Błąd podczas usuwania pliku %s: %s" -#: gio/glocalfile.c:1996 gio/glocalfile.c:2007 gio/glocalfile.c:2034 +#: gio/glocalfile.c:2000 gio/glocalfile.c:2011 gio/glocalfile.c:2038 #, c-format msgid "Error trashing file %s: %s" msgstr "Błąd podczas przenoszenia pliku %s do kosza: %s" -#: gio/glocalfile.c:2054 +#: gio/glocalfile.c:2058 #, c-format msgid "Unable to create trash directory %s: %s" msgstr "Nie można utworzyć katalogu kosza %s: %s" -#: gio/glocalfile.c:2075 +#: gio/glocalfile.c:2079 #, c-format msgid "Unable to find toplevel directory to trash %s" msgstr "Nie można odnaleźć głównego katalogu dla kosza %s" -#: gio/glocalfile.c:2083 +#: gio/glocalfile.c:2087 #, c-format msgid "Trashing on system internal mounts is not supported" msgstr "" "Przenoszenie do kosza na wewnętrznych punktach montowania systemu nie jest " "obsługiwane" -#: gio/glocalfile.c:2169 gio/glocalfile.c:2197 +#: gio/glocalfile.c:2173 gio/glocalfile.c:2201 #, c-format msgid "Unable to find or create trash directory %s to trash %s" msgstr "Nie można odnaleźć lub utworzyć katalogu kosza %s do kosza %s" -#: gio/glocalfile.c:2243 +#: gio/glocalfile.c:2245 #, c-format msgid "Unable to create trashing info file for %s: %s" msgstr "Nie można utworzyć pliku informacji o koszu dla %s: %s" -#: gio/glocalfile.c:2305 +#: gio/glocalfile.c:2316 #, c-format msgid "Unable to trash file %s across filesystem boundaries" msgstr "Nie można przenieść pliku %s do kosza pomiędzy systemami plików" -#: gio/glocalfile.c:2309 gio/glocalfile.c:2365 +#: gio/glocalfile.c:2320 gio/glocalfile.c:2376 #, c-format msgid "Unable to trash file %s: %s" msgstr "Nie można przenieść pliku %s do kosza: %s" -#: gio/glocalfile.c:2371 +#: gio/glocalfile.c:2382 #, c-format msgid "Unable to trash file %s" msgstr "Nie można przenieść pliku %s do kosza" -#: gio/glocalfile.c:2397 +#: gio/glocalfile.c:2408 #, c-format msgid "Error creating directory %s: %s" msgstr "Błąd podczas tworzenia katalogu %s: %s" -#: gio/glocalfile.c:2426 +#: gio/glocalfile.c:2437 #, c-format msgid "Filesystem does not support symbolic links" msgstr "System plików nie obsługuje dowiązań symbolicznych" -#: gio/glocalfile.c:2429 +#: gio/glocalfile.c:2440 #, c-format msgid "Error making symbolic link %s: %s" msgstr "Błąd podczas tworzenia dowiązania symbolicznego %s: %s" -#: gio/glocalfile.c:2472 gio/glocalfile.c:2507 gio/glocalfile.c:2564 +#: gio/glocalfile.c:2483 gio/glocalfile.c:2518 gio/glocalfile.c:2575 #, c-format msgid "Error moving file %s: %s" msgstr "Błąd podczas przenoszenia pliku %s: %s" -#: gio/glocalfile.c:2495 +#: gio/glocalfile.c:2506 msgid "Can’t move directory over directory" msgstr "Nie można przenieść katalogu na katalog" -#: gio/glocalfile.c:2521 gio/glocalfileoutputstream.c:1110 +#: gio/glocalfile.c:2532 gio/glocalfileoutputstream.c:1110 #: gio/glocalfileoutputstream.c:1124 gio/glocalfileoutputstream.c:1139 #: gio/glocalfileoutputstream.c:1156 gio/glocalfileoutputstream.c:1170 msgid "Backup file creation failed" msgstr "Utworzenie pliku kopii zapasowej się nie powiodło" -#: gio/glocalfile.c:2540 +#: gio/glocalfile.c:2551 #, c-format msgid "Error removing target file: %s" msgstr "Błąd podczas usuwania pliku docelowego: %s" -#: gio/glocalfile.c:2554 +#: gio/glocalfile.c:2565 msgid "Move between mounts not supported" msgstr "Przenoszenie między punktami montowania nie jest obsługiwane" -#: gio/glocalfile.c:2728 +#: gio/glocalfile.c:2741 #, c-format msgid "Could not determine the disk usage of %s: %s" msgstr "Nie można ustalić wykorzystania dysku %s: %s" @@ -3213,118 +3222,118 @@ msgid "Error setting extended attribute “%s”: %s" msgstr "Błąd podczas ustawiania rozszerzonego atrybutu „%s”: %s" -#: gio/glocalfileinfo.c:1738 gio/win32/gwinhttpfile.c:191 +#: gio/glocalfileinfo.c:1819 gio/win32/gwinhttpfile.c:191 msgid " (invalid encoding)" msgstr " (nieprawidłowe kodowanie)" -#: gio/glocalfileinfo.c:1897 gio/glocalfileoutputstream.c:945 +#: gio/glocalfileinfo.c:1978 gio/glocalfileoutputstream.c:945 #: gio/glocalfileoutputstream.c:997 #, c-format msgid "Error when getting information for file “%s”: %s" msgstr "Błąd podczas pobierania informacji o pliku „%s”: %s" -#: gio/glocalfileinfo.c:2163 +#: gio/glocalfileinfo.c:2281 #, c-format msgid "Error when getting information for file descriptor: %s" msgstr "Błąd podczas pobierania informacji o deskryptorze pliku: %s" -#: gio/glocalfileinfo.c:2208 +#: gio/glocalfileinfo.c:2326 msgid "Invalid attribute type (uint32 expected)" msgstr "Nieprawidłowy typ atrybutu (oczekiwano „uint32”)" -#: gio/glocalfileinfo.c:2226 +#: gio/glocalfileinfo.c:2344 msgid "Invalid attribute type (uint64 expected)" msgstr "Nieprawidłowy typ atrybutu (oczekiwano „uint64”)" -#: gio/glocalfileinfo.c:2245 gio/glocalfileinfo.c:2264 +#: gio/glocalfileinfo.c:2363 gio/glocalfileinfo.c:2382 msgid "Invalid attribute type (byte string expected)" msgstr "Nieprawidłowy typ atrybutu (oczekiwano „byte string”)" -#: gio/glocalfileinfo.c:2311 +#: gio/glocalfileinfo.c:2429 msgid "Cannot set permissions on symlinks" msgstr "Nie można ustawić uprawnień na dowiązaniach symbolicznych" -#: gio/glocalfileinfo.c:2327 +#: gio/glocalfileinfo.c:2445 #, c-format msgid "Error setting permissions: %s" msgstr "Błąd podczas ustawiania uprawnień: %s" -#: gio/glocalfileinfo.c:2378 +#: gio/glocalfileinfo.c:2496 #, c-format msgid "Error setting owner: %s" msgstr "Błąd podczas ustawiania właściciela: %s" -#: gio/glocalfileinfo.c:2401 +#: gio/glocalfileinfo.c:2519 msgid "symlink must be non-NULL" msgstr "dowiązanie symboliczne nie może być puste" -#: gio/glocalfileinfo.c:2411 gio/glocalfileinfo.c:2430 -#: gio/glocalfileinfo.c:2441 +#: gio/glocalfileinfo.c:2529 gio/glocalfileinfo.c:2548 +#: gio/glocalfileinfo.c:2559 #, c-format msgid "Error setting symlink: %s" msgstr "Błąd podczas ustawiania dowiązania symbolicznego: %s" -#: gio/glocalfileinfo.c:2420 +#: gio/glocalfileinfo.c:2538 msgid "Error setting symlink: file is not a symlink" msgstr "" "Błąd podczas ustawiania dowiązania symbolicznego: plik nie jest dowiązaniem " "symbolicznym" -#: gio/glocalfileinfo.c:2492 +#: gio/glocalfileinfo.c:2630 #, c-format msgid "Extra nanoseconds %d for UNIX timestamp %lld are negative" msgstr "Dodatkowe nanosekundy %d dla czasu uniksowego %lld są ujemne" -#: gio/glocalfileinfo.c:2501 +#: gio/glocalfileinfo.c:2639 #, c-format msgid "Extra nanoseconds %d for UNIX timestamp %lld reach 1 second" msgstr "Dodatkowe nanosekundy %d dla czasu uniksowego %lld osiągają 1 sekundę" -#: gio/glocalfileinfo.c:2511 +#: gio/glocalfileinfo.c:2649 #, c-format msgid "UNIX timestamp %lld does not fit into 64 bits" msgstr "Czas uniksowy %lld nie mieści się w 64 bitach" -#: gio/glocalfileinfo.c:2522 +#: gio/glocalfileinfo.c:2660 #, c-format msgid "UNIX timestamp %lld is outside of the range supported by Windows" msgstr "" "Czas uniksowy %lld jest poza zakresem obsługiwanym przez system Windows" -#: gio/glocalfileinfo.c:2625 +#: gio/glocalfileinfo.c:2792 #, c-format msgid "File name “%s” cannot be converted to UTF-16" msgstr "Nie można skonwertować nazwy pliku „%s” na kodowanie UTF-16" -#: gio/glocalfileinfo.c:2644 +#: gio/glocalfileinfo.c:2811 #, c-format msgid "File “%s” cannot be opened: Windows Error %lu" msgstr "Nie można otworzyć pliku „%s”: błąd %lu systemu Windows" -#: gio/glocalfileinfo.c:2657 +#: gio/glocalfileinfo.c:2824 #, c-format msgid "Error setting modification or access time for file “%s”: %lu" msgstr "Błąd podczas ustawiania czasu modyfikacji lub dostępu pliku „%s”: %lu" -#: gio/glocalfileinfo.c:2798 gio/glocalfileinfo.c:2810 +#: gio/glocalfileinfo.c:2981 #, c-format msgid "Error setting modification or access time: %s" msgstr "Błąd podczas ustawiania czasu modyfikacji lub dostępu: %s" -#: gio/glocalfileinfo.c:2833 +#: gio/glocalfileinfo.c:3004 msgid "SELinux context must be non-NULL" msgstr "Kontekst SELinux nie może być pusty" -#: gio/glocalfileinfo.c:2840 +#: gio/glocalfileinfo.c:3011 msgid "SELinux is not enabled on this system" msgstr "SELinux nie jest włączony w tym systemie" -#: gio/glocalfileinfo.c:2850 +#: gio/glocalfileinfo.c:3021 #, c-format msgid "Error setting SELinux context: %s" msgstr "Błąd podczas ustawiania kontekstu SELinux: %s" -#: gio/glocalfileinfo.c:2947 +#: gio/glocalfileinfo.c:3118 #, c-format msgid "Setting attribute %s not supported" msgstr "Ustawianie atrybutu %s nie jest obsługiwane" @@ -3371,13 +3380,13 @@ msgid "Error renaming temporary file: %s" msgstr "Błąd podczas zmieniania nazwy pliku tymczasowego: %s" -#: gio/glocalfileoutputstream.c:611 gio/glocalfileoutputstream.c:1241 +#: gio/glocalfileoutputstream.c:611 gio/glocalfileoutputstream.c:1242 #, c-format msgid "Error truncating file: %s" msgstr "Błąd podczas skracania pliku: %s" #: gio/glocalfileoutputstream.c:664 gio/glocalfileoutputstream.c:909 -#: gio/glocalfileoutputstream.c:1222 gio/gsubprocess.c:231 +#: gio/glocalfileoutputstream.c:1223 gio/gsubprocess.c:231 #, c-format msgid "Error opening file “%s”: %s" msgstr "Błąd podczas otwierania pliku „%s”: %s" @@ -3394,7 +3403,7 @@ msgid "The file was externally modified" msgstr "Plik został zmieniony poza programem" -#: gio/glocalfileoutputstream.c:1204 +#: gio/glocalfileoutputstream.c:1205 #, c-format msgid "Error removing old file: %s" msgstr "Błąd podczas usuwania starego pliku: %s" @@ -3543,8 +3552,8 @@ #. Translators: the first placeholder is a domain name, the #. * second is an error message #: gio/gresolver.c:403 gio/gthreadedresolver.c:152 gio/gthreadedresolver.c:170 -#: gio/gthreadedresolver.c:782 gio/gthreadedresolver.c:806 -#: gio/gthreadedresolver.c:831 gio/gthreadedresolver.c:846 +#: gio/gthreadedresolver.c:798 gio/gthreadedresolver.c:822 +#: gio/gthreadedresolver.c:847 gio/gthreadedresolver.c:862 #, c-format msgid "Error resolving “%s”: %s" msgstr "Błąd podczas rozwiązywania „%s”: %s" @@ -4266,36 +4275,36 @@ #. Translators: the placeholder is a DNS record type, such as ‘MX’ or ‘SRV’ #: gio/gthreadedresolver.c:552 gio/gthreadedresolver.c:574 -#: gio/gthreadedresolver.c:612 gio/gthreadedresolver.c:659 -#: gio/gthreadedresolver.c:688 gio/gthreadedresolver.c:700 +#: gio/gthreadedresolver.c:628 gio/gthreadedresolver.c:675 +#: gio/gthreadedresolver.c:704 gio/gthreadedresolver.c:716 #, c-format msgid "Error parsing DNS %s record: malformed DNS packet" msgstr "" "Błąd podczas przetwarzania wpisu DNS %s: błędnie sformatowany pakiet DNS" -#: gio/gthreadedresolver.c:758 gio/gthreadedresolver.c:895 -#: gio/gthreadedresolver.c:993 gio/gthreadedresolver.c:1043 +#: gio/gthreadedresolver.c:774 gio/gthreadedresolver.c:911 +#: gio/gthreadedresolver.c:1009 gio/gthreadedresolver.c:1059 #, c-format msgid "No DNS record of the requested type for “%s”" msgstr "Brak wpisu DNS żądanego typu dla „%s”" -#: gio/gthreadedresolver.c:763 gio/gthreadedresolver.c:998 +#: gio/gthreadedresolver.c:779 gio/gthreadedresolver.c:1014 #, c-format msgid "Temporarily unable to resolve “%s”" msgstr "Nie można tymczasowo rozwiązać „%s”" -#: gio/gthreadedresolver.c:768 gio/gthreadedresolver.c:1003 -#: gio/gthreadedresolver.c:1113 +#: gio/gthreadedresolver.c:784 gio/gthreadedresolver.c:1019 +#: gio/gthreadedresolver.c:1129 #, c-format msgid "Error resolving “%s”" msgstr "Błąd podczas rozwiązywania „%s”" -#: gio/gthreadedresolver.c:782 gio/gthreadedresolver.c:806 -#: gio/gthreadedresolver.c:831 gio/gthreadedresolver.c:846 +#: gio/gthreadedresolver.c:798 gio/gthreadedresolver.c:822 +#: gio/gthreadedresolver.c:847 gio/gthreadedresolver.c:862 msgid "Malformed DNS packet" msgstr "Błędnie sformatowany pakiet DNS" -#: gio/gthreadedresolver.c:888 +#: gio/gthreadedresolver.c:904 #, c-format msgid "Failed to parse DNS response for “%s”: " msgstr "Przetworzenie odpowiedzi DNS na „%s” się nie powiodło: " @@ -4427,7 +4436,7 @@ msgid "Error closing file descriptor: %s" msgstr "Błąd podczas zamykania deskryptora pliku: %s" -#: gio/gunixmounts.c:2815 gio/gunixmounts.c:2868 +#: gio/gunixmounts.c:2817 gio/gunixmounts.c:2870 msgid "Filesystem root" msgstr "Katalog główny systemu plików" @@ -4511,77 +4520,77 @@ msgid "Wrong args\n" msgstr "Błędne parametry\n" -#: glib/gbookmarkfile.c:779 +#: glib/gbookmarkfile.c:861 #, c-format msgid "Unexpected attribute “%s” for element “%s”" msgstr "Nieoczekiwany atrybut „%s” dla elementu „%s”" -#: glib/gbookmarkfile.c:790 glib/gbookmarkfile.c:870 glib/gbookmarkfile.c:880 -#: glib/gbookmarkfile.c:993 +#: glib/gbookmarkfile.c:872 glib/gbookmarkfile.c:952 glib/gbookmarkfile.c:962 +#: glib/gbookmarkfile.c:1075 #, c-format msgid "Attribute “%s” of element “%s” not found" msgstr "Nie odnaleziono atrybutu „%s” dla elementu „%s”" -#: glib/gbookmarkfile.c:1202 glib/gbookmarkfile.c:1267 -#: glib/gbookmarkfile.c:1331 glib/gbookmarkfile.c:1341 +#: glib/gbookmarkfile.c:1284 glib/gbookmarkfile.c:1349 +#: glib/gbookmarkfile.c:1413 glib/gbookmarkfile.c:1423 #, c-format msgid "Unexpected tag “%s”, tag “%s” expected" msgstr "Nieoczekiwany znacznik „%s”, oczekiwano znacznika „%s”" -#: glib/gbookmarkfile.c:1227 glib/gbookmarkfile.c:1241 -#: glib/gbookmarkfile.c:1309 glib/gbookmarkfile.c:1355 +#: glib/gbookmarkfile.c:1309 glib/gbookmarkfile.c:1323 +#: glib/gbookmarkfile.c:1391 glib/gbookmarkfile.c:1437 #, c-format msgid "Unexpected tag “%s” inside “%s”" msgstr "Nieoczekiwany znacznik „%s” wewnątrz „%s”" -#: glib/gbookmarkfile.c:1635 +#: glib/gbookmarkfile.c:1717 #, c-format msgid "Invalid date/time ‘%s’ in bookmark file" msgstr "Nieprawidłowa data/czas „%s” w pliku zakładek" -#: glib/gbookmarkfile.c:1838 +#: glib/gbookmarkfile.c:1956 msgid "No valid bookmark file found in data dirs" msgstr "Nie można odnaleźć prawidłowego pliku zakładek w katalogach danych" -#: glib/gbookmarkfile.c:2039 +#: glib/gbookmarkfile.c:2157 #, c-format msgid "A bookmark for URI “%s” already exists" msgstr "Zakładka dla adresu URI „%s” już istnieje" -#: glib/gbookmarkfile.c:2088 glib/gbookmarkfile.c:2246 -#: glib/gbookmarkfile.c:2331 glib/gbookmarkfile.c:2411 -#: glib/gbookmarkfile.c:2496 glib/gbookmarkfile.c:2630 -#: glib/gbookmarkfile.c:2763 glib/gbookmarkfile.c:2898 -#: glib/gbookmarkfile.c:2940 glib/gbookmarkfile.c:3037 -#: glib/gbookmarkfile.c:3158 glib/gbookmarkfile.c:3352 -#: glib/gbookmarkfile.c:3493 glib/gbookmarkfile.c:3712 -#: glib/gbookmarkfile.c:3801 glib/gbookmarkfile.c:3890 -#: glib/gbookmarkfile.c:4009 +#: glib/gbookmarkfile.c:2206 glib/gbookmarkfile.c:2364 +#: glib/gbookmarkfile.c:2449 glib/gbookmarkfile.c:2529 +#: glib/gbookmarkfile.c:2614 glib/gbookmarkfile.c:2748 +#: glib/gbookmarkfile.c:2881 glib/gbookmarkfile.c:3016 +#: glib/gbookmarkfile.c:3058 glib/gbookmarkfile.c:3155 +#: glib/gbookmarkfile.c:3276 glib/gbookmarkfile.c:3470 +#: glib/gbookmarkfile.c:3611 glib/gbookmarkfile.c:3830 +#: glib/gbookmarkfile.c:3919 glib/gbookmarkfile.c:4008 +#: glib/gbookmarkfile.c:4127 #, c-format msgid "No bookmark found for URI “%s”" msgstr "Nie odnaleziono zakładki dla adresu URI „%s”" -#: glib/gbookmarkfile.c:2420 +#: glib/gbookmarkfile.c:2538 #, c-format msgid "No MIME type defined in the bookmark for URI “%s”" msgstr "Nie zdefiniowano typu MIME w zakładce dla adresu URI „%s”" -#: glib/gbookmarkfile.c:2505 +#: glib/gbookmarkfile.c:2623 #, c-format msgid "No private flag has been defined in bookmark for URI “%s”" msgstr "Nie zdefiniowano prywatnej flagi w zakładce dla adresu URI „%s”" -#: glib/gbookmarkfile.c:3046 +#: glib/gbookmarkfile.c:3164 #, c-format msgid "No groups set in bookmark for URI “%s”" msgstr "Nie ustawiono grup w zakładce dla adresu URI „%s”" -#: glib/gbookmarkfile.c:3514 glib/gbookmarkfile.c:3722 +#: glib/gbookmarkfile.c:3632 glib/gbookmarkfile.c:3840 #, c-format msgid "No application with name “%s” registered a bookmark for “%s”" msgstr "Żaden program o nazwie „%s” nie zarejestrował zakładki dla „%s”" -#: glib/gbookmarkfile.c:3745 +#: glib/gbookmarkfile.c:3863 #, c-format msgid "Failed to expand exec line “%s” with URI “%s”" msgstr "Rozwinięcie wiersza exec „%s” z adresem URI „%s” się nie powiodło" @@ -5057,7 +5066,7 @@ msgid "Error opening directory “%s”: %s" msgstr "Błąd podczas otwierania katalogu „%s”: %s" -#: glib/gfileutils.c:735 glib/gfileutils.c:827 +#: glib/gfileutils.c:753 glib/gfileutils.c:845 #, c-format msgid "Could not allocate %lu byte to read file “%s”" msgid_plural "Could not allocate %lu bytes to read file “%s”" @@ -5065,81 +5074,81 @@ msgstr1 "Nie można przydzielić %lu bajtów do odczytu pliku „%s”" msgstr2 "Nie można przydzielić %lu bajtów do odczytu pliku „%s”" -#: glib/gfileutils.c:752 +#: glib/gfileutils.c:770 #, c-format msgid "Error reading file “%s”: %s" msgstr "Błąd podczas odczytywania pliku „%s”: %s" -#: glib/gfileutils.c:788 +#: glib/gfileutils.c:806 #, c-format msgid "File “%s” is too large" msgstr "Plik „%s” jest za duży" -#: glib/gfileutils.c:852 +#: glib/gfileutils.c:870 #, c-format msgid "Failed to read from file “%s”: %s" msgstr "Odczytanie z pliku „%s” się nie powiodło: %s" -#: glib/gfileutils.c:902 glib/gfileutils.c:977 glib/gfileutils.c:1449 +#: glib/gfileutils.c:920 glib/gfileutils.c:995 glib/gfileutils.c:1472 #, c-format msgid "Failed to open file “%s”: %s" msgstr "Otwarcie pliku „%s” się nie powiodło: %s" -#: glib/gfileutils.c:915 +#: glib/gfileutils.c:933 #, c-format msgid "Failed to get attributes of file “%s”: fstat() failed: %s" msgstr "" "Uzyskanie atrybutów pliku „%s” się nie powiodło: funkcja fstat() zwróciła " "błąd: %s" -#: glib/gfileutils.c:946 +#: glib/gfileutils.c:964 #, c-format msgid "Failed to open file “%s”: fdopen() failed: %s" msgstr "" "Otwarcie pliku „%s” się nie powiodło: funkcja fdopen() zwróciła błąd: %s" -#: glib/gfileutils.c:1047 +#: glib/gfileutils.c:1065 #, c-format msgid "Failed to rename file “%s” to “%s”: g_rename() failed: %s" msgstr "" "Zmiana nazwy pliku „%s” na „%s” się nie powiodła: funkcja g_rename() " "zwróciła błąd: %s" -#: glib/gfileutils.c:1156 +#: glib/gfileutils.c:1179 #, c-format msgid "Failed to write file “%s”: write() failed: %s" msgstr "" "Zapisanie pliku „%s” się nie powiodło: funkcja write() zwróciła błąd: %s" -#: glib/gfileutils.c:1177 +#: glib/gfileutils.c:1200 #, c-format msgid "Failed to write file “%s”: fsync() failed: %s" msgstr "" "Zapisanie pliku „%s” się nie powiodło: funkcja fsync() zwróciła błąd: %s" -#: glib/gfileutils.c:1338 glib/gfileutils.c:1753 +#: glib/gfileutils.c:1361 glib/gfileutils.c:1776 #, c-format msgid "Failed to create file “%s”: %s" msgstr "Utworzenie pliku „%s” się nie powiodło: %s" -#: glib/gfileutils.c:1383 +#: glib/gfileutils.c:1406 #, c-format msgid "Existing file “%s” could not be removed: g_unlink() failed: %s" msgstr "" "Nie można usunąć istniejącego pliku „%s”: funkcja g_unlink() zwróciła błąd: " "%s" -#: glib/gfileutils.c:1718 +#: glib/gfileutils.c:1741 #, c-format msgid "Template “%s” invalid, should not contain a “%s”" msgstr "Szablon „%s” jest nieprawidłowy, nie powinien on zawierać „%s”" -#: glib/gfileutils.c:1731 +#: glib/gfileutils.c:1754 #, c-format msgid "Template “%s” doesn’t contain XXXXXX" msgstr "Szablon „%s” nie zawiera XXXXXX" -#: glib/gfileutils.c:2291 glib/gfileutils.c:2320 +#: glib/gfileutils.c:2348 glib/gfileutils.c:2377 #, c-format msgid "Failed to read the symbolic link “%s”: %s" msgstr "Odczytanie dowiązania symbolicznego „%s” się nie powiodło: %s" @@ -5203,8 +5212,8 @@ msgstr "Plik klucza zawiera nieobsługiwane kodowanie „%s”" #: glib/gkeyfile.c:1679 glib/gkeyfile.c:1852 glib/gkeyfile.c:3299 -#: glib/gkeyfile.c:3363 glib/gkeyfile.c:3493 glib/gkeyfile.c:3625 -#: glib/gkeyfile.c:3771 glib/gkeyfile.c:4006 glib/gkeyfile.c:4073 +#: glib/gkeyfile.c:3363 glib/gkeyfile.c:3493 glib/gkeyfile.c:3622 +#: glib/gkeyfile.c:3768 glib/gkeyfile.c:4003 glib/gkeyfile.c:4070 #, c-format msgid "Key file does not have group “%s”" msgstr "Plik klucza nie zawiera grupy „%s”" @@ -5243,31 +5252,31 @@ msgid "Key “%s” in group “%s” has value “%s” where %s was expected" msgstr "Klucz „%s” w grupie „%s” ma wartość „%s”, podczas gdy oczekiwano %s" -#: glib/gkeyfile.c:4326 +#: glib/gkeyfile.c:4323 msgid "Key file contains escape character at end of line" msgstr "Plik klucza zawiera znak sterujący na końcu linii" -#: glib/gkeyfile.c:4348 +#: glib/gkeyfile.c:4345 #, c-format msgid "Key file contains invalid escape sequence “%s”" msgstr "Plik klucza zawiera nieprawidłową sekwencję sterującą „%s”" -#: glib/gkeyfile.c:4493 +#: glib/gkeyfile.c:4490 #, c-format msgid "Value “%s” cannot be interpreted as a number." msgstr "Nie można zinterpretować „%s” jako liczby." -#: glib/gkeyfile.c:4507 +#: glib/gkeyfile.c:4504 #, c-format msgid "Integer value “%s” out of range" msgstr "Wartość całkowita „%s” jest spoza dopuszczalnego zakresu" -#: glib/gkeyfile.c:4540 +#: glib/gkeyfile.c:4537 #, c-format msgid "Value “%s” cannot be interpreted as a float number." msgstr "Nie można zinterpretować „%s” jako liczby zmiennoprzecinkowej." -#: glib/gkeyfile.c:4579 +#: glib/gkeyfile.c:4576 #, c-format msgid "Value “%s” cannot be interpreted as a boolean." msgstr "Nie można zinterpretować „%s” jako wartości logicznej." @@ -5290,34 +5299,34 @@ msgid "Failed to open file “%s”: open() failed: %s" msgstr "Otwarcie pliku „%s” się nie powiodło: funkcja open() zwróciła błąd: %s" -#: glib/gmarkup.c:400 glib/gmarkup.c:442 +#: glib/gmarkup.c:393 glib/gmarkup.c:435 #, c-format msgid "Error on line %d char %d: " msgstr "Błąd w %d. wierszu przy %d. znaku: " -#: glib/gmarkup.c:464 glib/gmarkup.c:547 +#: glib/gmarkup.c:457 glib/gmarkup.c:540 #, c-format msgid "Invalid UTF-8 encoded text in name — not valid “%s”" msgstr "" "Nazwa zawiera nieprawidłowy tekst zakodowany za pomocą UTF-8 — nieprawidłowe " "„%s”" -#: glib/gmarkup.c:475 +#: glib/gmarkup.c:468 #, c-format msgid "“%s” is not a valid name" msgstr "„%s” nie jest prawidłową nazwą" -#: glib/gmarkup.c:491 +#: glib/gmarkup.c:484 #, c-format msgid "“%s” is not a valid name: “%c”" msgstr "„%s” nie jest prawidłową nazwą: „%c”" -#: glib/gmarkup.c:615 +#: glib/gmarkup.c:608 #, c-format msgid "Error on line %d: %s" msgstr "Błąd w %d. wierszu: %s" -#: glib/gmarkup.c:692 +#: glib/gmarkup.c:685 #, c-format msgid "" "Failed to parse “%-.*s”, which should have been a digit inside a character " @@ -5327,7 +5336,7 @@ "liczba, będąca częścią odniesienia do znaku (np. ê) — być może liczba " "jest za duża" -#: glib/gmarkup.c:704 +#: glib/gmarkup.c:697 msgid "" "Character reference did not end with a semicolon; most likely you used an " "ampersand character without intending to start an entity — escape ampersand " @@ -5337,24 +5346,24 @@ "został użyty znak &, który nie miał oznaczać jednostki — należy go zapisać " "jako &" -#: glib/gmarkup.c:730 +#: glib/gmarkup.c:723 #, c-format msgid "Character reference “%-.*s” does not encode a permitted character" msgstr "Odniesienie do znaku „%-.*s” nie jest zapisem dozwolonego znaku" -#: glib/gmarkup.c:768 +#: glib/gmarkup.c:761 msgid "" "Empty entity “&;” seen; valid entities are: & " < > '" msgstr "" "Napotkano pustą jednostkę „&;”; poprawnymi jednostkami są: & " < " "> '" -#: glib/gmarkup.c:776 +#: glib/gmarkup.c:769 #, c-format msgid "Entity name “%-.*s” is not known" msgstr "Nazwa jednostki „%-.*s” nie jest znana" -#: glib/gmarkup.c:781 +#: glib/gmarkup.c:774 msgid "" "Entity did not end with a semicolon; most likely you used an ampersand " "character without intending to start an entity — escape ampersand as &" @@ -5362,11 +5371,11 @@ "Jednostka nie jest zakończona średnikiem; najprawdopodobniej został użyty " "znak &, który nie miał oznaczać jednostki — należy go zapisać jako &" -#: glib/gmarkup.c:1195 +#: glib/gmarkup.c:1188 msgid "Document must begin with an element (e.g. <book>)" msgstr "Dokument musi rozpoczynać się jakimś elementem (np. <book>)" -#: glib/gmarkup.c:1235 +#: glib/gmarkup.c:1228 #, c-format msgid "" "“%s” is not a valid character following a “<” character; it may not begin an " @@ -5375,7 +5384,7 @@ "Znak „%s” nie powinien występować po znaku „<”; nie może on rozpoczynać " "nazwy elementu" -#: glib/gmarkup.c:1278 +#: glib/gmarkup.c:1271 #, c-format msgid "" "Odd character “%s”, expected a “>” character to end the empty-element tag " @@ -5384,12 +5393,12 @@ "Nieoczekiwany znak „%s”, oczekiwano znaku „>”, aby zakończyć znacznik „%s” " "pustego elementu" -#: glib/gmarkup.c:1348 +#: glib/gmarkup.c:1341 #, c-format msgid "Too many attributes in element “%s”" msgstr "Za dużo atrybutów w elemencie „%s”" -#: glib/gmarkup.c:1368 +#: glib/gmarkup.c:1361 #, c-format msgid "" "Odd character “%s”, expected a “=” after attribute name “%s” of element “%s”" @@ -5397,7 +5406,7 @@ "Nieoczekiwany znak „%s”; po nazwie atrybutu „%s” elementu „%s” oczekiwano " "znaku „=”" -#: glib/gmarkup.c:1410 +#: glib/gmarkup.c:1403 #, c-format msgid "" "Odd character “%s”, expected a “>” or “/” character to end the start tag of " @@ -5408,7 +5417,7 @@ "początkowy elementu „%s” lub opcjonalnie atrybutu; być może w nazwie " "atrybutu został użyty nieprawidłowy znak" -#: glib/gmarkup.c:1455 +#: glib/gmarkup.c:1448 #, c-format msgid "" "Odd character “%s”, expected an open quote mark after the equals sign when " @@ -5417,7 +5426,7 @@ "Nieoczekiwany znak „%s”; oczekiwano otwierającego znaku cudzysłowu po znaku " "równości podczas podawania wartości atrybutu „%s” elementu „%s”" -#: glib/gmarkup.c:1589 +#: glib/gmarkup.c:1582 #, c-format msgid "" "“%s” is not a valid character following the characters “</”; “%s” may not " @@ -5426,7 +5435,7 @@ "Znak „%s” nie jest znakiem, który może pojawić się po sekwencji „</”; „%s” " "nie może rozpoczynać nazwy elementu" -#: glib/gmarkup.c:1627 +#: glib/gmarkup.c:1620 #, c-format msgid "" "“%s” is not a valid character following the close element name “%s”; the " @@ -5435,26 +5444,26 @@ "Znak „%s” nie jest znakiem, który może wystąpić po domykającej nazwie " "elementu „%s”; dopuszczalnym znakiem jest „>”" -#: glib/gmarkup.c:1639 +#: glib/gmarkup.c:1632 #, c-format msgid "Element “%s” was closed, no element is currently open" msgstr "Element „%s” został zamknięty, ale brak obecnie otwartego elementu" -#: glib/gmarkup.c:1648 +#: glib/gmarkup.c:1641 #, c-format msgid "Element “%s” was closed, but the currently open element is “%s”" msgstr "" "Element „%s” został zamknięty, ale obecnie otwartym elementem jest „%s”" -#: glib/gmarkup.c:1801 +#: glib/gmarkup.c:1794 msgid "Document was empty or contained only whitespace" msgstr "Dokument jest pusty lub zawiera tylko spacje" -#: glib/gmarkup.c:1815 +#: glib/gmarkup.c:1808 msgid "Document ended unexpectedly just after an open angle bracket “<”" msgstr "Zaraz po znaku „<” nastąpił nieoczekiwany koniec dokumentu" -#: glib/gmarkup.c:1823 glib/gmarkup.c:1868 +#: glib/gmarkup.c:1816 glib/gmarkup.c:1861 #, c-format msgid "" "Document ended unexpectedly with elements still open — “%s” was the last " @@ -5463,7 +5472,7 @@ "Nastąpił nieoczekiwany koniec dokumentu, gdy pewne elementy są wciąż otwarte " "— „%s” był ostatnim otwartym elementem" -#: glib/gmarkup.c:1831 +#: glib/gmarkup.c:1824 #, c-format msgid "" "Document ended unexpectedly, expected to see a close angle bracket ending " @@ -5472,21 +5481,21 @@ "Nastąpił nieoczekiwany koniec dokumentu; oczekiwano znaku „>”, kończącego " "znacznik <%s/>" -#: glib/gmarkup.c:1837 +#: glib/gmarkup.c:1830 msgid "Document ended unexpectedly inside an element name" msgstr "Nastąpił nieoczekiwany koniec dokumentu wewnątrz nazwy elementu" -#: glib/gmarkup.c:1843 +#: glib/gmarkup.c:1836 msgid "Document ended unexpectedly inside an attribute name" msgstr "Nastąpił nieoczekiwany koniec dokumentu wewnątrz nazwy atrybutu" -#: glib/gmarkup.c:1848 +#: glib/gmarkup.c:1841 msgid "Document ended unexpectedly inside an element-opening tag." msgstr "" "Nastąpił nieoczekiwany koniec dokumentu wewnątrz znacznika otwierającego " "element." -#: glib/gmarkup.c:1854 +#: glib/gmarkup.c:1847 msgid "" "Document ended unexpectedly after the equals sign following an attribute " "name; no attribute value" @@ -5494,25 +5503,25 @@ "Nastąpił nieoczekiwany koniec dokumentu po znaku równości występującym po " "nazwie atrybutu; brak wartości atrybutu" -#: glib/gmarkup.c:1861 +#: glib/gmarkup.c:1854 msgid "Document ended unexpectedly while inside an attribute value" msgstr "Nastąpił nieoczekiwany koniec dokumentu wewnątrz wartości atrybutu" -#: glib/gmarkup.c:1878 +#: glib/gmarkup.c:1871 #, c-format msgid "Document ended unexpectedly inside the close tag for element “%s”" msgstr "" "Nastąpił nieoczekiwany koniec dokumentu wewnątrz znacznika domykającego " "elementu „%s”" -#: glib/gmarkup.c:1882 +#: glib/gmarkup.c:1875 msgid "" "Document ended unexpectedly inside the close tag for an unopened element" msgstr "" "Nastąpił nieoczekiwany koniec dokumentu wewnątrz znacznika domykającego " "nieotwartego elementu" -#: glib/gmarkup.c:1888 +#: glib/gmarkup.c:1881 msgid "Document ended unexpectedly inside a comment or processing instruction" msgstr "" "Nastąpił nieoczekiwany koniec dokumentu wewnątrz komentarza lub instrukcji " @@ -5578,185 +5587,185 @@ msgid "Unknown option %s" msgstr "Nieznana opcja %s" -#: glib/gregex.c:436 +#: glib/gregex.c:479 msgid "corrupted object" msgstr "uszkodzony obiekt" -#: glib/gregex.c:438 +#: glib/gregex.c:481 msgid "out of memory" msgstr "brak pamięci" -#: glib/gregex.c:443 +#: glib/gregex.c:487 msgid "backtracking limit reached" msgstr "osiągnięto limit wyjątku" -#: glib/gregex.c:454 glib/gregex.c:707 glib/gregex.c:736 +#: glib/gregex.c:498 msgid "internal error" msgstr "błąd wewnętrzny" -#: glib/gregex.c:456 +#: glib/gregex.c:500 msgid "the pattern contains items not supported for partial matching" msgstr "wzorzec zawiera elementy nieobsługiwane w dopasowywaniu częściowym" -#: glib/gregex.c:458 +#: glib/gregex.c:502 msgid "back references as conditions are not supported for partial matching" msgstr "" "odniesienia wstecz jako warunki nie są obsługiwane w dopasowywaniu częściowym" -#: glib/gregex.c:464 +#: glib/gregex.c:508 msgid "recursion limit reached" msgstr "osiągnięto limit rekurencji" -#: glib/gregex.c:466 +#: glib/gregex.c:510 msgid "bad offset" msgstr "błędne wyrównanie" -#: glib/gregex.c:468 +#: glib/gregex.c:512 msgid "recursion loop" msgstr "pętla rekurencji" #. should not happen in GRegex since we check modes before each match -#: glib/gregex.c:471 +#: glib/gregex.c:515 msgid "matching mode is requested that was not compiled for JIT" msgstr "zażądano trybu dopasowywania, który nie został skompilowany dla JIT" -#: glib/gregex.c:475 +#: glib/gregex.c:536 glib/gregex.c:1838 msgid "unknown error" msgstr "nieznany błąd" -#: glib/gregex.c:496 +#: glib/gregex.c:557 msgid "\\ at end of pattern" msgstr "\\ na końcu wzoru" -#: glib/gregex.c:500 +#: glib/gregex.c:561 msgid "\\c at end of pattern" msgstr "\\c na końcu wzoru" -#: glib/gregex.c:505 +#: glib/gregex.c:566 msgid "unrecognized character following \\" msgstr "nierozpoznany znak po \\" -#: glib/gregex.c:509 +#: glib/gregex.c:570 msgid "numbers out of order in {} quantifier" msgstr "liczby w operatorze {} nie są w kolejności" -#: glib/gregex.c:513 +#: glib/gregex.c:574 msgid "number too big in {} quantifier" msgstr "liczba za duża w kwantyfikatorze {}" -#: glib/gregex.c:517 +#: glib/gregex.c:578 msgid "missing terminating for character class" msgstr "brak kończącego znaku „” dla klasy znaku" -#: glib/gregex.c:521 +#: glib/gregex.c:582 msgid "invalid escape sequence in character class" msgstr "nieprawidłowa sekwencja sterująca w klasie znaku" -#: glib/gregex.c:525 +#: glib/gregex.c:586 msgid "range out of order in character class" msgstr "zakres klasy znaków nie jest w kolejności" -#: glib/gregex.c:530 +#: glib/gregex.c:591 msgid "nothing to repeat" msgstr "nic do powtórzenia" -#: glib/gregex.c:534 +#: glib/gregex.c:595 msgid "unrecognized character after (? or (?-" msgstr "nierozpoznany znak po (? lub (?-" -#: glib/gregex.c:538 +#: glib/gregex.c:599 msgid "POSIX named classes are supported only within a class" msgstr "Klasy nazwane z użyciem POSIX są obsługiwane tylko wewnątrz klasy" -#: glib/gregex.c:542 +#: glib/gregex.c:603 msgid "POSIX collating elements are not supported" msgstr "elementy porównujące POSIX nie są obsługiwane" -#: glib/gregex.c:548 +#: glib/gregex.c:609 msgid "missing terminating )" msgstr "brak znaku kończącego )" -#: glib/gregex.c:552 +#: glib/gregex.c:613 msgid "reference to non-existent subpattern" msgstr "odniesienie do nieistniejącego podwzoru" -#: glib/gregex.c:556 +#: glib/gregex.c:617 msgid "missing ) after comment" msgstr "brakujący znak „)” po komentarzu" -#: glib/gregex.c:560 +#: glib/gregex.c:621 msgid "regular expression is too large" msgstr "wyrażenie regularne jest za duże" -#: glib/gregex.c:564 +#: glib/gregex.c:625 msgid "malformed number or name after (?(" msgstr "błędna liczba lub nazwa za (?(" -#: glib/gregex.c:568 +#: glib/gregex.c:629 msgid "lookbehind assertion is not fixed length" msgstr "asercja „lookbehind” nie ma stałej długości" -#: glib/gregex.c:572 +#: glib/gregex.c:633 msgid "conditional group contains more than two branches" msgstr "zależna grupa zawiera więcej niż dwie gałęzie" -#: glib/gregex.c:576 +#: glib/gregex.c:637 msgid "assertion expected after (?(" msgstr "za (?( oczekiwano asercji" -#: glib/gregex.c:580 +#: glib/gregex.c:641 msgid "a numbered reference must not be zero" msgstr "liczbowe odniesienie nie może wynosić zero" -#: glib/gregex.c:584 +#: glib/gregex.c:645 msgid "unknown POSIX class name" msgstr "nieznana nazwa klasy POSIX" -#: glib/gregex.c:589 +#: glib/gregex.c:650 msgid "character value in \\x{...} sequence is too large" msgstr "wartość znaku w sekwencji \\x{...} jest za duża" -#: glib/gregex.c:593 +#: glib/gregex.c:654 msgid "\\C not allowed in lookbehind assertion" msgstr "znak \\C nie jest dozwolony w asercji „lookbehind”" -#: glib/gregex.c:597 +#: glib/gregex.c:658 msgid "missing terminator in subpattern name" msgstr "brak terminatora w nazwie podwzoru" -#: glib/gregex.c:601 +#: glib/gregex.c:662 msgid "two named subpatterns have the same name" msgstr "dwa podwzory mają tę samą nazwę" -#: glib/gregex.c:605 +#: glib/gregex.c:666 msgid "malformed \\P or \\p sequence" msgstr "błędna sekwencja \\P lub \\p" -#: glib/gregex.c:609 +#: glib/gregex.c:670 msgid "unknown property name after \\P or \\p" msgstr "nieznana nazwa właściwości za \\P lub \\p" -#: glib/gregex.c:613 +#: glib/gregex.c:674 msgid "subpattern name is too long (maximum 32 characters)" msgstr "nazwa podwzoru jest za długa (maksymalnie 32 znaki)" -#: glib/gregex.c:617 +#: glib/gregex.c:678 msgid "too many named subpatterns (maximum 10,000)" msgstr "za dużo nazwanych podwzorów (maksymalnie 10000)" -#: glib/gregex.c:621 +#: glib/gregex.c:682 msgid "octal value is greater than \\377" msgstr "wartość ósemkowa jest większa niż \\377" -#: glib/gregex.c:625 +#: glib/gregex.c:686 msgid "DEFINE group contains more than one branch" msgstr "grupa DEFINE zawiera więcej niż jedną gałąź" -#: glib/gregex.c:629 +#: glib/gregex.c:690 msgid "inconsistent NEWLINE options" msgstr "niespójne opcje NEWLINE" -#: glib/gregex.c:633 +#: glib/gregex.c:694 msgid "" "\\g is not followed by a braced, angle-bracketed, or quoted name or number, " "or by a plain number" @@ -5764,118 +5773,118 @@ "po \\g nie następuje nazwa lub liczba w nawiasach, nawiasach ostrych, " "cytowana, ani zwykła liczba" -#: glib/gregex.c:638 +#: glib/gregex.c:699 msgid "an argument is not allowed for (*ACCEPT), (*FAIL), or (*COMMIT)" msgstr "parametr nie jest dozwolony dla (*ACCEPT), (*FAIL) lub (*COMMIT)" -#: glib/gregex.c:642 +#: glib/gregex.c:703 msgid "(*VERB) not recognized" msgstr "nie rozpoznano (*VERB)" -#: glib/gregex.c:646 +#: glib/gregex.c:707 msgid "number is too big" msgstr "liczba jest za duża" -#: glib/gregex.c:650 +#: glib/gregex.c:711 msgid "missing subpattern name after (?&" msgstr "brak nazwy podwzoru po (?&" -#: glib/gregex.c:654 +#: glib/gregex.c:715 msgid "different names for subpatterns of the same number are not allowed" msgstr "różne nazwy dla podwzorów tej samej liczby nie są dozwolone" -#: glib/gregex.c:658 +#: glib/gregex.c:719 msgid "(*MARK) must have an argument" msgstr "(*MARK) musi mieć parametr" -#: glib/gregex.c:662 +#: glib/gregex.c:723 msgid "\\c must be followed by an ASCII character" msgstr "po \\c musi być znak ASCII" -#: glib/gregex.c:666 +#: glib/gregex.c:727 msgid "\\k is not followed by a braced, angle-bracketed, or quoted name" msgstr "" "po \\k nie następuje nazwa w nawiasach, nawiasach ostrych, ani cytowana" -#: glib/gregex.c:670 +#: glib/gregex.c:731 msgid "\\N is not supported in a class" msgstr "\\N nie jest obsługiwane w klasie" -#: glib/gregex.c:674 +#: glib/gregex.c:735 msgid "name is too long in (*MARK), (*PRUNE), (*SKIP), or (*THEN)" msgstr "nazwa jest za długa w (*MARK), (*PRUNE), (*SKIP) lub (*THEN)" -#: glib/gregex.c:678 glib/gregex.c:809 +#: glib/gregex.c:739 glib/gregex.c:875 msgid "code overflow" msgstr "przepełnienie kodu" -#: glib/gregex.c:682 +#: glib/gregex.c:743 msgid "unrecognized character after (?P" msgstr "nierozpoznany znak po (?P" -#: glib/gregex.c:686 +#: glib/gregex.c:747 msgid "overran compiling workspace" msgstr "przekroczono przestrzeń roboczą kompilacji" -#: glib/gregex.c:690 +#: glib/gregex.c:751 msgid "previously-checked referenced subpattern not found" msgstr "nie odnaleziono wcześniej sprawdzonego podwzoru" -#: glib/gregex.c:808 glib/gregex.c:1041 glib/gregex.c:2342 +#: glib/gregex.c:874 glib/gregex.c:1121 glib/gregex.c:2444 #, c-format msgid "Error while matching regular expression %s: %s" msgstr "Błąd podczas dopasowywania wyrażenia regularnego %s: %s" -#: glib/gregex.c:1618 +#: glib/gregex.c:1721 msgid "PCRE library is compiled without UTF8 support" msgstr "Biblioteka PCRE została skompilowana bez obsługi UTF-8" -#: glib/gregex.c:1626 +#: glib/gregex.c:1729 msgid "PCRE library is compiled with incompatible options" msgstr "Biblioteka PCRE została skompilowana za pomocą niezgodnych opcji" -#: glib/gregex.c:1751 +#: glib/gregex.c:1847 #, c-format msgid "Error while compiling regular expression ‘%s’ at char %s: %s" msgstr "Błąd kompilacji wyrażenia regularnego „%s” przy znaku %s: %s" -#: glib/gregex.c:2786 +#: glib/gregex.c:2887 msgid "hexadecimal digit or “}” expected" msgstr "oczekiwano cyfry szesnastkowej lub znaku „}”" -#: glib/gregex.c:2802 +#: glib/gregex.c:2903 msgid "hexadecimal digit expected" msgstr "oczekiwano cyfry szesnastkowej" -#: glib/gregex.c:2842 +#: glib/gregex.c:2943 msgid "missing “<” in symbolic reference" msgstr "brak znaku „<” w odniesieniu symbolicznym" -#: glib/gregex.c:2851 +#: glib/gregex.c:2952 msgid "unfinished symbolic reference" msgstr "niezakończone odniesienie symboliczne" -#: glib/gregex.c:2858 +#: glib/gregex.c:2959 msgid "zero-length symbolic reference" msgstr "odniesienie symboliczne o zerowej długości" -#: glib/gregex.c:2869 +#: glib/gregex.c:2970 msgid "digit expected" msgstr "oczekiwano cyfry" -#: glib/gregex.c:2887 +#: glib/gregex.c:2988 msgid "illegal symbolic reference" msgstr "niedozwolone odniesienie symboliczne" -#: glib/gregex.c:2950 +#: glib/gregex.c:3051 msgid "stray final “\\”" msgstr "pominięto końcowe „\\”" -#: glib/gregex.c:2954 +#: glib/gregex.c:3055 msgid "unknown escape sequence" msgstr "nieznana sekwencja sterująca" -#: glib/gregex.c:2964 +#: glib/gregex.c:3065 #, c-format msgid "Error while parsing replacement text “%s” at char %lu: %s" msgstr "Błąd podczas przetwarzania tekstu zastępczego „%s” przy znaku %lu: %s" @@ -5907,104 +5916,109 @@ msgid "Text was empty (or contained only whitespace)" msgstr "Tekst jest pusty (lub zawiera tylko spacje)" -#: glib/gspawn.c:314 +#: glib/gspawn.c:319 #, c-format msgid "Failed to read data from child process (%s)" msgstr "Odczytanie danych z procesu potomnego (%s) się nie powiodło" -#: glib/gspawn.c:466 +#: glib/gspawn.c:471 #, c-format msgid "Unexpected error in reading data from a child process (%s)" msgstr "" "Nieoczekiwany błąd podczas odczytywania danych z procesu potomnego (%s)" -#: glib/gspawn.c:551 +#: glib/gspawn.c:556 #, c-format msgid "Unexpected error in waitpid() (%s)" msgstr "Nieoczekiwany błąd w waitpid() (%s)" -#: glib/gspawn.c:1170 glib/gspawn-win32.c:1488 +#: glib/gspawn.c:1175 glib/gspawn-win32.c:1503 #, c-format msgid "Child process exited with code %ld" msgstr "Proces potomny został zakończony z kodem %ld" -#: glib/gspawn.c:1178 +#: glib/gspawn.c:1183 #, c-format msgid "Child process killed by signal %ld" msgstr "Proces potomny został zakończony sygnałem %ld" -#: glib/gspawn.c:1185 +#: glib/gspawn.c:1190 #, c-format msgid "Child process stopped by signal %ld" msgstr "Proces potomny został zatrzymany sygnałem %ld" -#: glib/gspawn.c:1192 +#: glib/gspawn.c:1197 #, c-format msgid "Child process exited abnormally" msgstr "Proces potomny został nieprawidłowo zakończony" -#: glib/gspawn.c:1885 glib/gspawn-win32.c:393 glib/gspawn-win32.c:401 +#: glib/gspawn.c:2027 glib/gspawn-win32.c:393 glib/gspawn-win32.c:401 #, c-format msgid "Failed to read from child pipe (%s)" msgstr "" "Odczytanie danych z potoku łączącego z procesem potomnym (%s) się nie " "powiodło" -#: glib/gspawn.c:2248 +#: glib/gspawn.c:2399 #, c-format msgid "Failed to spawn child process “%s” (%s)" msgstr "Wywołanie procesu potomnego „%s” (%s) się nie powiodło" -#: glib/gspawn.c:2365 +#: glib/gspawn.c:2525 #, c-format msgid "Failed to fork (%s)" msgstr "Rozdzielenie procesu (%s) się nie powiodło" -#: glib/gspawn.c:2525 glib/gspawn-win32.c:424 +#: glib/gspawn.c:2685 glib/gspawn-win32.c:424 #, c-format msgid "Failed to change to directory “%s” (%s)" msgstr "Zmiana katalogu na „%s” (%s) się nie powiodła" -#: glib/gspawn.c:2535 +#: glib/gspawn.c:2695 #, c-format msgid "Failed to execute child process “%s” (%s)" msgstr "Wykonanie procesu potomnego „%s” (%s) się nie powiodło" -#: glib/gspawn.c:2545 +#: glib/gspawn.c:2705 #, c-format msgid "Failed to open file to remap file descriptor (%s)" msgstr "" "Otwarcie pliku do ponownego mapowania deskryptora pliku (%s) się nie powiodło" -#: glib/gspawn.c:2553 +#: glib/gspawn.c:2713 #, c-format msgid "Failed to duplicate file descriptor for child process (%s)" msgstr "" "Powielenie deskryptora pliku dla procesu potomnego (%s) się nie powiodło" -#: glib/gspawn.c:2562 +#: glib/gspawn.c:2722 #, c-format msgid "Failed to fork child process (%s)" msgstr "Rozdzielenie procesu potomnego (%s) się nie powiodło" -#: glib/gspawn.c:2570 +#: glib/gspawn.c:2730 #, c-format msgid "Failed to close file descriptor for child process (%s)" msgstr "" "Zamknięcie deskryptora pliku dla procesu potomnego (%s) się nie powiodło" -#: glib/gspawn.c:2578 +#: glib/gspawn.c:2738 #, c-format msgid "Unknown error executing child process “%s”" msgstr "Podczas wykonywania procesu potomnego „%s” wystąpił nieznany błąd" -#: glib/gspawn.c:2602 +#: glib/gspawn.c:2762 #, c-format msgid "Failed to read enough data from child pid pipe (%s)" msgstr "" "Odczytanie odpowiedniej liczby danych z potoku procesu potomnego (%s) się " "nie powiodło" +#: glib/gspawn-private.h:134 +#, c-format +msgid "Invalid source FDs argument" +msgstr "Nieprawidłowy parametr źródłowych DP" + #: glib/gspawn-win32.c:337 msgid "Failed to read data from child process" msgstr "Odczytanie danych z procesu potomnego się nie powiodło" @@ -6024,27 +6038,27 @@ msgid "Invalid program name: %s" msgstr "Nieprawidłowa nazwa programu: %s" -#: glib/gspawn-win32.c:521 glib/gspawn-win32.c:853 +#: glib/gspawn-win32.c:521 glib/gspawn-win32.c:868 #, c-format msgid "Invalid string in argument vector at %d: %s" msgstr "Nieprawidłowy ciąg w wektorze parametrów w %d: %s" -#: glib/gspawn-win32.c:532 glib/gspawn-win32.c:869 +#: glib/gspawn-win32.c:532 glib/gspawn-win32.c:884 #, c-format msgid "Invalid string in environment: %s" msgstr "Nieprawidłowa sekwencja w środowisku: %s" -#: glib/gspawn-win32.c:849 +#: glib/gspawn-win32.c:864 #, c-format msgid "Invalid working directory: %s" msgstr "Nieprawidłowy katalog roboczy: %s" -#: glib/gspawn-win32.c:914 +#: glib/gspawn-win32.c:929 #, c-format msgid "Failed to execute helper program (%s)" msgstr "Wykonanie programu pomocniczego (%s) się nie powiodło" -#: glib/gspawn-win32.c:1143 +#: glib/gspawn-win32.c:1158 msgid "" "Unexpected error in g_io_channel_win32_poll() reading data from a child " "process" @@ -6052,21 +6066,21 @@ "Podczas odczytu danych z procesu potomnego w g_io_channel_win32_poll() " "wystąpił nieznany błąd" -#: glib/gstrfuncs.c:3366 glib/gstrfuncs.c:3468 +#: glib/gstrfuncs.c:3370 glib/gstrfuncs.c:3472 msgid "Empty string is not a number" msgstr "Pusty ciąg nie jest liczbą" -#: glib/gstrfuncs.c:3390 +#: glib/gstrfuncs.c:3394 #, c-format msgid "“%s” is not a signed number" msgstr "„%s” nie jest liczbą ze znakiem" -#: glib/gstrfuncs.c:3400 glib/gstrfuncs.c:3504 +#: glib/gstrfuncs.c:3404 glib/gstrfuncs.c:3508 #, c-format msgid "Number “%s” is out of bounds %s, %s" msgstr "Liczba „%s” jest poza zakresem %s, %s" -#: glib/gstrfuncs.c:3494 +#: glib/gstrfuncs.c:3498 #, c-format msgid "“%s” is not an unsigned number" msgstr "„%s” nie jest liczbą bez znaku" @@ -6145,133 +6159,133 @@ msgstr "Znak jest poza zakresem dla UTF-16" #. Translators: A unit symbol for size formatting, showing for example: "13.0 kB" -#: glib/gutils.c:2857 +#: glib/gutils.c:2966 msgid "kB" msgstr "kB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 MB" -#: glib/gutils.c:2859 +#: glib/gutils.c:2968 msgid "MB" msgstr "MB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 GB" -#: glib/gutils.c:2861 +#: glib/gutils.c:2970 msgid "GB" msgstr "GB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 TB" -#: glib/gutils.c:2863 +#: glib/gutils.c:2972 msgid "TB" msgstr "TB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 PB" -#: glib/gutils.c:2865 +#: glib/gutils.c:2974 msgid "PB" msgstr "PB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 EB" -#: glib/gutils.c:2867 +#: glib/gutils.c:2976 msgid "EB" msgstr "EB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 KiB" -#: glib/gutils.c:2871 +#: glib/gutils.c:2980 msgid "KiB" msgstr "KiB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 MiB" -#: glib/gutils.c:2873 +#: glib/gutils.c:2982 msgid "MiB" msgstr "MiB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 GiB" -#: glib/gutils.c:2875 +#: glib/gutils.c:2984 msgid "GiB" msgstr "GiB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 TiB" -#: glib/gutils.c:2877 +#: glib/gutils.c:2986 msgid "TiB" msgstr "TiB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 PiB" -#: glib/gutils.c:2879 +#: glib/gutils.c:2988 msgid "PiB" msgstr "PiB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 EiB" -#: glib/gutils.c:2881 +#: glib/gutils.c:2990 msgid "EiB" msgstr "EiB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 kb" -#: glib/gutils.c:2885 +#: glib/gutils.c:2994 msgid "kb" msgstr "kb" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Mb" -#: glib/gutils.c:2887 +#: glib/gutils.c:2996 msgid "Mb" msgstr "Mb" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Gb" -#: glib/gutils.c:2889 +#: glib/gutils.c:2998 msgid "Gb" msgstr "Gb" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Tb" -#: glib/gutils.c:2891 +#: glib/gutils.c:3000 msgid "Tb" msgstr "Tb" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Pb" -#: glib/gutils.c:2893 +#: glib/gutils.c:3002 msgid "Pb" msgstr "Pb" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Eb" -#: glib/gutils.c:2895 +#: glib/gutils.c:3004 msgid "Eb" msgstr "Eb" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Kib" -#: glib/gutils.c:2899 +#: glib/gutils.c:3008 msgid "Kib" msgstr "Kib" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Mib" -#: glib/gutils.c:2901 +#: glib/gutils.c:3010 msgid "Mib" msgstr "Mib" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Gib" -#: glib/gutils.c:2903 +#: glib/gutils.c:3012 msgid "Gib" msgstr "Gib" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Tib" -#: glib/gutils.c:2905 +#: glib/gutils.c:3014 msgid "Tib" msgstr "Tib" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Pib" -#: glib/gutils.c:2907 +#: glib/gutils.c:3016 msgid "Pib" msgstr "Pib" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Eib" -#: glib/gutils.c:2909 +#: glib/gutils.c:3018 msgid "Eib" msgstr "Eib" -#: glib/gutils.c:2947 +#: glib/gutils.c:3056 msgid "byte" msgid_plural "bytes" msgstr0 "bajt" msgstr1 "bajty" msgstr2 "bajtów" -#: glib/gutils.c:2951 +#: glib/gutils.c:3060 msgid "bit" msgid_plural "bits" msgstr0 "bit" @@ -6280,7 +6294,7 @@ #. Translators: The "%u" is replaced with the size value, like "13"; it could #. * be part of "13 bytes", but only the number is requested this time. -#: glib/gutils.c:2959 +#: glib/gutils.c:3068 #, c-format msgctxt "format-size" msgid "%u" @@ -6288,7 +6302,7 @@ #. Translators: The first "%u" is replaced with the value, the "%s" with a unit of the value. #. * The order can be changed with "%$2s %$1u". An example: "13 bytes" -#: glib/gutils.c:2964 +#: glib/gutils.c:3073 #, c-format msgctxt "format-size" msgid "%u %s" @@ -6296,7 +6310,7 @@ #. Translators: The "%.1f" is replaced with the size value, like "13.0"; it could #. * be part of "13.0 MB", but only the number is requested this time. -#: glib/gutils.c:3000 +#: glib/gutils.c:3109 #, c-format msgctxt "format-size" msgid "%.1f" @@ -6305,14 +6319,14 @@ #. Translators: The first "%.1f" is replaced with the value, the "%s" with a unit of the value. #. * The order can be changed with "%$2s %$1.1f". Keep the no-break space between the value and #. * the unit symbol. An example: "13.0 MB" -#: glib/gutils.c:3006 +#: glib/gutils.c:3115 #, c-format msgctxt "format-size" msgid "%.1f %s" msgstr "%.1f %s" #. Translators: the %s in "%s bytes" will always be replaced by a number. -#: glib/gutils.c:3046 +#: glib/gutils.c:3155 #, c-format msgid "%s byte" msgid_plural "%s bytes" @@ -6321,7 +6335,7 @@ msgstr2 "%s bajtów" #. Translators: the %s in "%s bits" will always be replaced by a number. -#: glib/gutils.c:3051 +#: glib/gutils.c:3160 #, c-format msgid "%s bit" msgid_plural "%s bits" @@ -6329,7 +6343,7 @@ msgstr1 "%s bity" msgstr2 "%s bitów" -#: glib/gutils.c:3092 +#: glib/gutils.c:3201 #, c-format msgid "%u byte" msgid_plural "%u bytes" @@ -6342,32 +6356,32 @@ #. * compatibility. Users will not see this string unless a program is using this deprecated function. #. * Please translate as literally as possible. #. -#: glib/gutils.c:3105 +#: glib/gutils.c:3214 #, c-format msgid "%.1f KB" msgstr "%.1f KB" -#: glib/gutils.c:3110 +#: glib/gutils.c:3219 #, c-format msgid "%.1f MB" msgstr "%.1f MB" -#: glib/gutils.c:3115 +#: glib/gutils.c:3224 #, c-format msgid "%.1f GB" msgstr "%.1f GB" -#: glib/gutils.c:3120 +#: glib/gutils.c:3229 #, c-format msgid "%.1f TB" msgstr "%.1f TB" -#: glib/gutils.c:3125 +#: glib/gutils.c:3234 #, c-format msgid "%.1f PB" msgstr "%.1f PB" -#: glib/gutils.c:3130 +#: glib/gutils.c:3239 #, c-format msgid "%.1f EB" msgstr "%.1f EB"
View file
_service:tar_scm:glib-2.74.4.tar.xz/po/pt.po -> _service:tar_scm:glib-2.76.4.tar.xz/po/pt.po
Changed
@@ -1,19 +1,19 @@ -# glib's Portuguese Translation -# Copyright © 2001-2022 glib -# Distributed under the same licence as the glib package +# Portuguese Translation for glib. +# Copyright © 2001-2023 glib. +# Distributed under the same licence as the glib package. # Duarte Loreto <happyguy_pt@hotmail.com>, 2001-2014. # Pedro Albuquerque <palbuquerque73@gmail.com>, 2015. # Sérgio Cardeira <cardeira.sergio@gmail.com>, 2016. -# Tiago Santos <tiagofsantos81@sapo.pt>, 2014 - 2016. +# Tiago Santos <tiagofsantos81@sapo.pt>, 2014, 2015, 2016. # Juliano de Souza Camargo <julianosc@protonmail.com>, 2020. -# Hugo Carvalho <hugokarvalho@hotmail.com>, 2020, 2021, 2022. +# Hugo Carvalho <hugokarvalho@hotmail.com>, 2020, 2021, 2022, 2023. # msgid "" msgstr "" "Project-Id-Version: 3.12\n" "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/glib/issues\n" -"POT-Creation-Date: 2022-08-05 19:22+0000\n" -"PO-Revision-Date: 2022-08-07 21:30+0100\n" +"POT-Creation-Date: 2023-02-15 16:30+0000\n" +"PO-Revision-Date: 2023-02-16 18:33+0000\n" "Last-Translator: Hugo Carvalho <hugokarvalho@hotmail.com>\n" "Language-Team: Portuguese <https://l10n.gnome.org/teams/pt/>\n" "Language: pt\n" @@ -21,23 +21,23 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 3.1.1\n" +"X-Generator: Poedit 3.2.2\n" -#: gio/gappinfo.c:335 +#: gio/gappinfo.c:339 msgid "Setting default applications not supported yet" msgstr "Definição de aplicações predefinidas ainda não suportado" -#: gio/gappinfo.c:368 +#: gio/gappinfo.c:372 msgid "Setting application as last used for type not supported yet" msgstr "Definir aplicação como última utilizada para tipo ainda não suportado" -#: gio/gappinfo.c:808 +#: gio/gappinfo.c:814 #, c-format msgid "Failed to find default application for content type ‘%s’" msgstr "" "Falha ao encontrar uma aplicação predefinida para o tipo de conteúdo '%s'" -#: gio/gappinfo.c:868 +#: gio/gappinfo.c:874 #, c-format msgid "Failed to find default application for URI Scheme ‘%s’" msgstr "Falha ao encontrar uma aplicação predefinida para o esquema URI '%s'" @@ -239,11 +239,11 @@ msgid "error sending %s message to application: %s\n" msgstr "erro ao enviar a mensagem %s para a aplicação: %s\n" -#: gio/gapplication-tool.c:321 +#: gio/gapplication-tool.c:324 msgid "action name must be given after application id\n" msgstr "nome da ação tem de ser especificado após o id de aplicação\n" -#: gio/gapplication-tool.c:329 +#: gio/gapplication-tool.c:332 #, c-format msgid "" "invalid action name: “%s”\n" @@ -252,25 +252,25 @@ "nome de ação inválido: “%s”\n" "nomes de ações têm de consistir apenas de alfanuméricos, “-” e “.”\n" -#: gio/gapplication-tool.c:348 +#: gio/gapplication-tool.c:351 #, c-format msgid "error parsing action parameter: %s\n" msgstr "erro ao processar o parâmetro de ação: %s\n" -#: gio/gapplication-tool.c:360 +#: gio/gapplication-tool.c:363 msgid "actions accept a maximum of one parameter\n" msgstr "ação aceita no máximo um parâmetro\n" -#: gio/gapplication-tool.c:415 +#: gio/gapplication-tool.c:418 msgid "list-actions command takes only the application id" msgstr "o comando list-actions apenas aceita o id de aplicação" -#: gio/gapplication-tool.c:425 +#: gio/gapplication-tool.c:428 #, c-format msgid "unable to find desktop file for application %s\n" msgstr "impossível encontrar o ficheiro desktop da aplicação %s\n" -#: gio/gapplication-tool.c:470 +#: gio/gapplication-tool.c:473 #, c-format msgid "" "unrecognised command: %s\n" @@ -305,7 +305,7 @@ msgid "Truncate not supported on base stream" msgstr "Truncar não é suportado no fluxo base" -#: gio/gcancellable.c:319 gio/gdbusconnection.c:1859 gio/gdbusprivate.c:1420 +#: gio/gcancellable.c:326 gio/gdbusconnection.c:1859 gio/gdbusprivate.c:1420 #: gio/gsimpleasyncresult.c:873 gio/gsimpleasyncresult.c:899 #, c-format msgid "Operation was cancelled" @@ -325,13 +325,13 @@ #: gio/gcharsetconverter.c:344 gio/gdatainputstream.c:850 #: gio/gdatainputstream.c:1268 glib/gconvert.c:451 glib/gconvert.c:883 -#: glib/giochannel.c:1576 glib/giochannel.c:1618 glib/giochannel.c:2473 +#: glib/giochannel.c:1576 glib/giochannel.c:1618 glib/giochannel.c:2478 #: glib/gutf8.c:892 glib/gutf8.c:1346 msgid "Invalid byte sequence in conversion input" msgstr "Sequência de bytes inválida na origem da conversão" #: gio/gcharsetconverter.c:349 glib/gconvert.c:459 glib/gconvert.c:797 -#: glib/giochannel.c:1583 glib/giochannel.c:2485 +#: glib/giochannel.c:1583 glib/giochannel.c:2493 #, c-format msgid "Error during conversion: %s" msgstr "Erro durante a conversão: %s" @@ -388,17 +388,17 @@ msgid "Unexpected early end-of-stream" msgstr "Final precoce de fluxo inesperado" -#: gio/gdbusaddress.c:164 gio/gdbusaddress.c:238 gio/gdbusaddress.c:327 +#: gio/gdbusaddress.c:162 gio/gdbusaddress.c:234 gio/gdbusaddress.c:321 #, c-format msgid "Unsupported key “%s” in address entry “%s”" msgstr "Chave “%s” não suportada na entrada de endereço “%s”" -#: gio/gdbusaddress.c:177 +#: gio/gdbusaddress.c:175 #, c-format msgid "Meaningless key/value pair combination in address entry “%s”" msgstr "Combinação chave/valor sem sentido na entrada de endereço “%s”" -#: gio/gdbusaddress.c:186 +#: gio/gdbusaddress.c:184 #, c-format msgid "" "Address “%s” is invalid (need exactly one of path, dir, tmpdir, or abstract " @@ -407,28 +407,28 @@ "Endereço “%s” é inválido (é necessário um de caminho, dir, tmpdir ou chaves " "abstratas)" -#: gio/gdbusaddress.c:253 gio/gdbusaddress.c:264 gio/gdbusaddress.c:279 -#: gio/gdbusaddress.c:342 gio/gdbusaddress.c:353 +#: gio/gdbusaddress.c:249 gio/gdbusaddress.c:260 gio/gdbusaddress.c:275 +#: gio/gdbusaddress.c:336 gio/gdbusaddress.c:347 #, c-format msgid "Error in address “%s” — the “%s” attribute is malformed" msgstr "Erro no endereço “%s” - o atributo “%s” está mal formado" -#: gio/gdbusaddress.c:423 gio/gdbusaddress.c:682 +#: gio/gdbusaddress.c:417 gio/gdbusaddress.c:676 #, c-format msgid "Unknown or unsupported transport “%s” for address “%s”" msgstr "Transporte “%s” desconhecido ou não suportado para o endereço “%s”" -#: gio/gdbusaddress.c:467 +#: gio/gdbusaddress.c:461 #, c-format msgid "Address element “%s” does not contain a colon (:)" msgstr "Elemento “%s” de endereço não contém dois-pontos (:)" -#: gio/gdbusaddress.c:476 +#: gio/gdbusaddress.c:470 #, c-format msgid "Transport name in address element “%s” must not be empty" msgstr "Nome do transporte no elemento “%s” endereço não pode ser vazio" -#: gio/gdbusaddress.c:497 +#: gio/gdbusaddress.c:491 #, c-format msgid "" "Key/Value pair %d, “%s”, in address element “%s” does not contain an equal " @@ -437,14 +437,14 @@ "Par chave/valor %d, “%s”, no elemento “%s” de endereço, não contém um sinal " "de igual" -#: gio/gdbusaddress.c:508 +#: gio/gdbusaddress.c:502 #, c-format msgid "" "Key/Value pair %d, “%s”, in address element “%s” must not have an empty key" msgstr "" "Par chave/valor %d, “%s”, no elemento “%s” de endereço não pode ser vazio" -#: gio/gdbusaddress.c:522 +#: gio/gdbusaddress.c:516 #, c-format msgid "" "Error unescaping key or value in Key/Value pair %d, “%s”, in address element " @@ -453,7 +453,7 @@ "Erro ao desfazer o escape de chave ou valor no par Chave/Valor %d, “%s”, no " "elemento “%s” de endereço" -#: gio/gdbusaddress.c:590 +#: gio/gdbusaddress.c:584 #, c-format msgid "" "Error in address “%s” — the unix transport requires exactly one of the keys " @@ -462,78 +462,78 @@ "Erro no endereço “%s” — o transporte unix requer que exatamente uma das " "chaves “path” ou “abstract” esteja definida" -#: gio/gdbusaddress.c:625 +#: gio/gdbusaddress.c:619 #, c-format msgid "Error in address “%s” — the host attribute is missing or malformed" msgstr "Erro no endereço “%s” — o atributo host está em falta ou mal formado" -#: gio/gdbusaddress.c:639 +#: gio/gdbusaddress.c:633 #, c-format msgid "Error in address “%s” — the port attribute is missing or malformed" msgstr "Erro no endereço “%s” — o atributo port está em falta ou mal formado" -#: gio/gdbusaddress.c:653 +#: gio/gdbusaddress.c:647 #, c-format msgid "Error in address “%s” — the noncefile attribute is missing or malformed" msgstr "" "Erro no endereço “%s” — o atributo noncefile está em falta ou mal formado" -#: gio/gdbusaddress.c:674 +#: gio/gdbusaddress.c:668 msgid "Error auto-launching: " msgstr "Erro ao autoiniciar: " -#: gio/gdbusaddress.c:727 +#: gio/gdbusaddress.c:721 #, c-format msgid "Error opening nonce file “%s”: %s" msgstr "Erro ao abrir o ficheiro nonce “%s”: %s" -#: gio/gdbusaddress.c:746 +#: gio/gdbusaddress.c:740 #, c-format msgid "Error reading from nonce file “%s”: %s" msgstr "Erro ao ler do ficheiro nonce “%s”: %s" -#: gio/gdbusaddress.c:755 +#: gio/gdbusaddress.c:749 #, c-format msgid "Error reading from nonce file “%s”, expected 16 bytes, got %d" msgstr "Erro ao ler do ficheiro nonce “%s”, esperados 16 bytes, obtidos %d" -#: gio/gdbusaddress.c:773 +#: gio/gdbusaddress.c:767 #, c-format msgid "Error writing contents of nonce file “%s” to stream:" msgstr "Erro ao escrever o conteúdo do ficheiro nonce “%s” para o fluxo:" -#: gio/gdbusaddress.c:988 +#: gio/gdbusaddress.c:982 msgid "The given address is empty" msgstr "O endereço indicado está vazio" -#: gio/gdbusaddress.c:1101 +#: gio/gdbusaddress.c:1095 #, c-format msgid "Cannot spawn a message bus when AT_SECURE is set" msgstr "" "Impossível criar um canal de mensagem quando o AT_SECURE está configurado" -#: gio/gdbusaddress.c:1108 +#: gio/gdbusaddress.c:1102 msgid "Cannot spawn a message bus without a machine-id: " msgstr "Impossível criar um canal de mensagem sem um id de máquina: " -#: gio/gdbusaddress.c:1115 +#: gio/gdbusaddress.c:1109 #, c-format msgid "Cannot autolaunch D-Bus without X11 $DISPLAY" msgstr "Não foi possível lançar automaticamente o D-Bus sem o $DISPLAY X-11" -#: gio/gdbusaddress.c:1157 +#: gio/gdbusaddress.c:1151 #, c-format msgid "Error spawning command line “%s”: " msgstr "Erro ao criar uma linha de comando “%s”: " -#: gio/gdbusaddress.c:1226 +#: gio/gdbusaddress.c:1220 #, c-format msgid "Cannot determine session bus address (not implemented for this OS)" msgstr "" "Impossível determinar o endereço do canal de sessão (não implementado para " "este SO)" -#: gio/gdbusaddress.c:1375 gio/gdbusconnection.c:7321 +#: gio/gdbusaddress.c:1374 gio/gdbusconnection.c:7316 #, c-format msgid "" "Cannot determine bus address from DBUS_STARTER_BUS_TYPE environment variable " @@ -542,7 +542,7 @@ "Impossível determinar o endereço de canal a partir da variável de sessão " "DBUS_STARTER_BUS_TYPE — valor “%s” desconhecido" -#: gio/gdbusaddress.c:1384 gio/gdbusconnection.c:7330 +#: gio/gdbusaddress.c:1383 gio/gdbusconnection.c:7325 msgid "" "Cannot determine bus address because the DBUS_STARTER_BUS_TYPE environment " "variable is not set" @@ -550,7 +550,7 @@ "Impossível determinar o endereço do canal porque a variável de ambiente " "DBUS_STARTER_BUS_TYPE não está definida" -#: gio/gdbusaddress.c:1394 +#: gio/gdbusaddress.c:1393 #, c-format msgid "Unknown bus type %d" msgstr "Tipo de canal %d desconhecido" @@ -571,12 +571,16 @@ "Esgotados todos os mecanismos de autenticação disponíveis (tentados: %s) " "(disponíveis: %s)" -#: gio/gdbusauth.c:1178 +#: gio/gdbusauth.c:1045 +msgid "Unexpected lack of content trying to read a byte" +msgstr "Falta de conteúdo inesperada ao tentar ler um byte" + +#: gio/gdbusauth.c:1195 msgid "User IDs must be the same for peer and server" msgstr "" "As IDs dos utilizadores devem ser as mesmas para os pares e para o servidor" -#: gio/gdbusauth.c:1190 +#: gio/gdbusauth.c:1207 msgid "Cancelled via GDBusAuthObserver::authorize-authenticated-peer" msgstr "Cancelado via GDBusAuthObserver::authorize-authenticated-peer" @@ -669,7 +673,7 @@ msgid "(Additionally, releasing the lock for “%s” also failed: %s) " msgstr "(adicionalmente, também falhou a libertação para “%s”: %s) " -#: gio/gdbusconnection.c:590 gio/gdbusconnection.c:2404 +#: gio/gdbusconnection.c:590 gio/gdbusconnection.c:2405 msgid "The connection is closed" msgstr "A ligação está fechada" @@ -677,13 +681,13 @@ msgid "Timeout was reached" msgstr "Foi atingido o tempo de expiração" -#: gio/gdbusconnection.c:2527 +#: gio/gdbusconnection.c:2528 msgid "" "Unsupported flags encountered when constructing a client-side connection" msgstr "" "Foram encontrados parâmetros não suportados ao construir a ligação de cliente" -#: gio/gdbusconnection.c:4256 gio/gdbusconnection.c:4610 +#: gio/gdbusconnection.c:4257 gio/gdbusconnection.c:4611 #, c-format msgid "" "No such interface “org.freedesktop.DBus.Properties” on object at path %s" @@ -691,104 +695,104 @@ "Não existe o ambiente “org.freedesktop.DBus.Properties” no objeto no caminho " "%s" -#: gio/gdbusconnection.c:4401 +#: gio/gdbusconnection.c:4402 #, c-format msgid "No such property “%s”" msgstr "Não existe a propriedade “%s”" -#: gio/gdbusconnection.c:4413 +#: gio/gdbusconnection.c:4414 #, c-format msgid "Property “%s” is not readable" msgstr "A propriedade “%s” não pode ser lida" -#: gio/gdbusconnection.c:4424 +#: gio/gdbusconnection.c:4425 #, c-format msgid "Property “%s” is not writable" msgstr "A propriedade “%s” não pode ser escrita" -#: gio/gdbusconnection.c:4444 +#: gio/gdbusconnection.c:4445 #, c-format msgid "Error setting property “%s”: Expected type “%s” but got “%s”" msgstr "" "Erro ao definir a propriedade “%s”: esperado o tipo “%s”, obtido o “%s”" -#: gio/gdbusconnection.c:4549 gio/gdbusconnection.c:4764 -#: gio/gdbusconnection.c:6747 +#: gio/gdbusconnection.c:4550 gio/gdbusconnection.c:4765 +#: gio/gdbusconnection.c:6742 #, c-format msgid "No such interface “%s”" msgstr "Não existe o ambiente “%s”" -#: gio/gdbusconnection.c:4986 gio/gdbusconnection.c:7261 +#: gio/gdbusconnection.c:4981 gio/gdbusconnection.c:7256 #, c-format msgid "No such interface “%s” on object at path %s" msgstr "Não existe o ambiente “%s” no objeto no caminho %s" -#: gio/gdbusconnection.c:5087 +#: gio/gdbusconnection.c:5082 #, c-format msgid "No such method “%s”" msgstr "Não existe o método “%s”" -#: gio/gdbusconnection.c:5118 +#: gio/gdbusconnection.c:5113 #, c-format msgid "Type of message, “%s”, does not match expected type “%s”" msgstr "Tipo de mensagem, “%s”, não corresponde ao tipo “%s” esperado" -#: gio/gdbusconnection.c:5321 +#: gio/gdbusconnection.c:5316 #, c-format msgid "An object is already exported for the interface %s at %s" msgstr "Já existe um objeto exportado para o ambiente %s em %s" -#: gio/gdbusconnection.c:5548 +#: gio/gdbusconnection.c:5543 #, c-format msgid "Unable to retrieve property %s.%s" msgstr "Impossível obter propriedade %s.%s" -#: gio/gdbusconnection.c:5604 +#: gio/gdbusconnection.c:5599 #, c-format msgid "Unable to set property %s.%s" msgstr "Impossível definir propriedade %s.%s" -#: gio/gdbusconnection.c:5783 +#: gio/gdbusconnection.c:5778 #, c-format msgid "Method “%s” returned type “%s”, but expected “%s”" msgstr "O método “%s” devolveu o tipo “%s”, mas era esperado “%s”" -#: gio/gdbusconnection.c:6859 +#: gio/gdbusconnection.c:6854 #, c-format msgid "Method “%s” on interface “%s” with signature “%s” does not exist" msgstr "O método “%s” no ambiente “%s” com a assinatura “%s” não existe" -#: gio/gdbusconnection.c:6980 +#: gio/gdbusconnection.c:6975 #, c-format msgid "A subtree is already exported for %s" msgstr "Já existe uma subárvore exportada para %s" -#: gio/gdbusconnection.c:7269 +#: gio/gdbusconnection.c:7264 #, c-format msgid "Object does not exist at path “%s”" msgstr "O objeto não existe no caminho \"%s\"" -#: gio/gdbusmessage.c:1303 +#: gio/gdbusmessage.c:1306 msgid "type is INVALID" msgstr "tipo é INVÁLIDO" -#: gio/gdbusmessage.c:1314 +#: gio/gdbusmessage.c:1317 msgid "METHOD_CALL message: PATH or MEMBER header field is missing" msgstr "Mensagem METHOD_CALL: falta campo de cabeçalho PATH ou MEMBER" -#: gio/gdbusmessage.c:1325 +#: gio/gdbusmessage.c:1328 msgid "METHOD_RETURN message: REPLY_SERIAL header field is missing" msgstr "Mensagem ETHOD_RETURN: falta campo de cabeçalho REPLY_SERIAL" -#: gio/gdbusmessage.c:1337 +#: gio/gdbusmessage.c:1340 msgid "ERROR message: REPLY_SERIAL or ERROR_NAME header field is missing" msgstr "Mensagem ERROR: Falta campo de cabeçalho REPLY_SERIAL ou ERROR_NAME" -#: gio/gdbusmessage.c:1350 +#: gio/gdbusmessage.c:1353 msgid "SIGNAL message: PATH, INTERFACE or MEMBER header field is missing" msgstr "Mensagem SIGNAL: falta campo de cabeçalho PATH, INTERFACE ou MEMBER" -#: gio/gdbusmessage.c:1358 +#: gio/gdbusmessage.c:1361 msgid "" "SIGNAL message: The PATH header field is using the reserved value /org/" "freedesktop/DBus/Local" @@ -796,7 +800,7 @@ "Mensagem SIGNAL: o campo de cabeçalho PATH está a utilizar o valor " "reservado /org/freedesktop/DBus/Local" -#: gio/gdbusmessage.c:1366 +#: gio/gdbusmessage.c:1369 msgid "" "SIGNAL message: The INTERFACE header field is using the reserved value org." "freedesktop.DBus.Local" @@ -804,19 +808,19 @@ "Mensagem SIGNAL: o campo de cabeçalho INTERFACE está a utilizar o valor " "reservado org.freedesktop.DBus.Local" -#: gio/gdbusmessage.c:1414 gio/gdbusmessage.c:1474 +#: gio/gdbusmessage.c:1417 gio/gdbusmessage.c:1477 #, c-format msgid "Wanted to read %lu byte but only got %lu" msgid_plural "Wanted to read %lu bytes but only got %lu" msgstr0 "Tentativa de ler %lu byte mas só obtido %lu" msgstr1 "Tentativa de ler %lu bytes mas só obtidos %lu" -#: gio/gdbusmessage.c:1428 +#: gio/gdbusmessage.c:1431 #, c-format msgid "Expected NUL byte after the string “%s” but found byte %d" msgstr "Esperado o byte NUL após a cadeia “%s” mas encontrado o byte %d" -#: gio/gdbusmessage.c:1447 +#: gio/gdbusmessage.c:1450 #, c-format msgid "" "Expected valid UTF-8 string but found invalid bytes at byte offset %d " @@ -826,21 +830,21 @@ "de bytes %d (comprimento da cadeia é %d). A cadeia UTF-8 válida até esse " "ponto era “%s”" -#: gio/gdbusmessage.c:1511 gio/gdbusmessage.c:1787 gio/gdbusmessage.c:1998 +#: gio/gdbusmessage.c:1514 gio/gdbusmessage.c:1790 gio/gdbusmessage.c:2001 msgid "Value nested too deeply" msgstr "Origem do valor muito antiga" -#: gio/gdbusmessage.c:1679 +#: gio/gdbusmessage.c:1682 #, c-format msgid "Parsed value “%s” is not a valid D-Bus object path" msgstr "Valor processado “%s” não é um caminho de objeto D-Bus válido" -#: gio/gdbusmessage.c:1703 +#: gio/gdbusmessage.c:1706 #, c-format msgid "Parsed value “%s” is not a valid D-Bus signature" msgstr "Valor processado “%s” não é uma assinatura D-Bus válida" -#: gio/gdbusmessage.c:1754 +#: gio/gdbusmessage.c:1757 #, c-format msgid "" "Encountered array of length %u byte. Maximum length is 2<<26 bytes (64 MiB)." @@ -853,7 +857,7 @@ "Encontrado um vetor de %u bytes de comprimento. Tamanho máximo é 2<<26 bytes " "(64MiB)." -#: gio/gdbusmessage.c:1774 +#: gio/gdbusmessage.c:1777 #, c-format msgid "" "Encountered array of type “a%c”, expected to have a length a multiple of %u " @@ -862,16 +866,16 @@ "Encontrado um vetor de tipo \"a%c\", esperado um comprimento múltiplo de %u " "bytes, obtidos %u bytes de comprimento" -#: gio/gdbusmessage.c:1928 gio/gdbusmessage.c:2647 +#: gio/gdbusmessage.c:1931 gio/gdbusmessage.c:2650 msgid "Empty structures (tuples) are not allowed in D-Bus" msgstr "Estruturas vazias (tuples) não são permitidas no D-Bus" -#: gio/gdbusmessage.c:1982 +#: gio/gdbusmessage.c:1985 #, c-format msgid "Parsed value “%s” for variant is not a valid D-Bus signature" msgstr "Valor processado “%s” para variante não é uma assinatura D-Bus válida" -#: gio/gdbusmessage.c:2023 +#: gio/gdbusmessage.c:2026 #, c-format msgid "" "Error deserializing GVariant with type string “%s” from the D-Bus wire format" @@ -879,7 +883,7 @@ "Erro ao remover serialização GVariant com a cadeia de tipo “%s” do formato " "de ligação D-Bus" -#: gio/gdbusmessage.c:2208 +#: gio/gdbusmessage.c:2211 #, c-format msgid "" "Invalid endianness value. Expected 0x6c (“l”) or 0x42 (“B”) but found value " @@ -888,28 +892,28 @@ "Valor de \"endianness\" inválido. Esperado 0x6c (“l”) ou 0x42 (“B”) mas " "obtido o valor 0x%02x" -#: gio/gdbusmessage.c:2227 +#: gio/gdbusmessage.c:2230 #, c-format msgid "Invalid major protocol version. Expected 1 but found %d" msgstr "Versão principal de protocolo inválida. Esperada 1 mas obtida %d" -#: gio/gdbusmessage.c:2285 gio/gdbusmessage.c:2883 +#: gio/gdbusmessage.c:2288 gio/gdbusmessage.c:2886 msgid "Signature header found but is not of type signature" msgstr "Assinatura de cabeçalho encontrada, mas não do tipo assinatura" -#: gio/gdbusmessage.c:2297 +#: gio/gdbusmessage.c:2300 #, c-format msgid "Signature header with signature “%s” found but message body is empty" msgstr "" "Assinatura de cabeçalho com a assinatura “%s” encontrada, mas o corpo da " "mensagem está vazio" -#: gio/gdbusmessage.c:2312 +#: gio/gdbusmessage.c:2315 #, c-format msgid "Parsed value “%s” is not a valid D-Bus signature (for body)" msgstr "Valor processado “%s” não é uma assinatura D-Bus válida (para corpo)" -#: gio/gdbusmessage.c:2344 +#: gio/gdbusmessage.c:2347 #, 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" @@ -920,11 +924,11 @@ "Nenhum cabeçalho de assinatura na mensagem mas o corpo da mensagem tem %u " "bytes" -#: gio/gdbusmessage.c:2354 +#: gio/gdbusmessage.c:2357 msgid "Cannot deserialize message: " msgstr "Impossível remover serialização da mensagem: " -#: gio/gdbusmessage.c:2700 +#: gio/gdbusmessage.c:2703 #, c-format msgid "" "Error serializing GVariant with type string “%s” to the D-Bus wire format" @@ -932,7 +936,7 @@ "Erro ao serializar GVariant com a cadeia de tipo “%s” para o formato de " "ligação D-Bus" -#: gio/gdbusmessage.c:2837 +#: gio/gdbusmessage.c:2840 #, c-format msgid "" "Number of file descriptors in message (%d) differs from header field (%d)" @@ -940,18 +944,18 @@ "Número de descritores de ficheiro na mensagem (%d) difere do campo no " "cabeçalho (%d)" -#: gio/gdbusmessage.c:2845 +#: gio/gdbusmessage.c:2848 msgid "Cannot serialize message: " msgstr "Impossível serializar a mensagem: " -#: gio/gdbusmessage.c:2898 +#: gio/gdbusmessage.c:2901 #, c-format msgid "Message body has signature “%s” but there is no signature header" msgstr "" "O corpo da mensagem tem a assinatura “%s” mas não existe a assinatura de " "cabeçalho" -#: gio/gdbusmessage.c:2908 +#: gio/gdbusmessage.c:2911 #, c-format msgid "" "Message body has type signature “%s” but signature in the header field is " @@ -960,19 +964,19 @@ "O corpo da mensagem tem o tipo de assinatura “%s”, mas a assinatura no campo " "de cabeçalho é “%s”" -#: gio/gdbusmessage.c:2924 +#: gio/gdbusmessage.c:2927 #, c-format msgid "Message body is empty but signature in the header field is “(%s)”" msgstr "" "O corpo da mensagem está vazio mas a assinatura no campo de cabeçalho é " "“(%s)”" -#: gio/gdbusmessage.c:3479 +#: gio/gdbusmessage.c:3482 #, c-format msgid "Error return with body of type “%s”" msgstr "Resposta de erro com corpo do tipo “%s”" -#: gio/gdbusmessage.c:3487 +#: gio/gdbusmessage.c:3490 msgid "Error return with empty body" msgstr "Resposta de erro com corpo vazio" @@ -998,17 +1002,17 @@ msgid "Unable to load %s or %s: " msgstr "Incapaz de carregar %s ou %s: " -#: gio/gdbusproxy.c:1575 +#: gio/gdbusproxy.c:1568 #, c-format msgid "Error calling StartServiceByName for %s: " msgstr "Erro ao invocar StartServiceByName para %s: " -#: gio/gdbusproxy.c:1598 +#: gio/gdbusproxy.c:1591 #, c-format msgid "Unexpected reply %d from StartServiceByName(\"%s\") method" msgstr "Resposta %d inesperada do método StartServiceByName(“%s”)" -#: gio/gdbusproxy.c:2709 gio/gdbusproxy.c:2844 +#: gio/gdbusproxy.c:2702 gio/gdbusproxy.c:2837 #, c-format msgid "" "Cannot invoke method; proxy is for the well-known name %s without an owner, " @@ -1017,25 +1021,25 @@ "Impossível invocar o método; o proxy é para o nome conhecido %s sem um dono " "e o proxy foi construído com o parâmetro G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START" -#: gio/gdbusserver.c:765 +#: gio/gdbusserver.c:758 msgid "Abstract namespace not supported" msgstr "Não é suportado nome de espaço abstrato" -#: gio/gdbusserver.c:857 +#: gio/gdbusserver.c:850 msgid "Cannot specify nonce file when creating a server" msgstr "Impossível especificar ficheiro nonce ao criar um servidor" -#: gio/gdbusserver.c:939 +#: gio/gdbusserver.c:932 #, c-format msgid "Error writing nonce file at “%s”: %s" msgstr "Erro ao escrever no ficheiro nonce em “%s”: %s" -#: gio/gdbusserver.c:1114 +#: gio/gdbusserver.c:1107 #, c-format msgid "The string “%s” is not a valid D-Bus GUID" msgstr "A cadeia “%s” não é um GUID D-Bus válido" -#: gio/gdbusserver.c:1152 +#: gio/gdbusserver.c:1145 #, c-format msgid "Cannot listen on unsupported transport “%s”" msgstr "Impossível ouvir no transporte não suportado “%s”" @@ -1063,14 +1067,14 @@ "\n" "Utilize \"%s COMMAND --help\" para obter ajuda sobre cada comando.\n" -#: gio/gdbus-tool.c:204 gio/gdbus-tool.c:276 gio/gdbus-tool.c:348 -#: gio/gdbus-tool.c:372 gio/gdbus-tool.c:862 gio/gdbus-tool.c:1247 -#: gio/gdbus-tool.c:1734 +#: gio/gdbus-tool.c:204 gio/gdbus-tool.c:276 gio/gdbus-tool.c:347 +#: gio/gdbus-tool.c:371 gio/gdbus-tool.c:861 gio/gdbus-tool.c:1246 +#: gio/gdbus-tool.c:1733 #, c-format msgid "Error: %s\n" msgstr "Erro: %s\n" -#: gio/gdbus-tool.c:215 gio/gdbus-tool.c:289 gio/gdbus-tool.c:1750 +#: gio/gdbus-tool.c:215 gio/gdbus-tool.c:289 gio/gdbus-tool.c:1749 #, c-format msgid "Error parsing introspection XML: %s\n" msgstr "Erro ao processar XML de introspeção: %s\n" @@ -1080,50 +1084,50 @@ msgid "Error: %s is not a valid name\n" msgstr "Erro: %s não é um nome válido\n" -#: gio/gdbus-tool.c:258 gio/gdbus-tool.c:748 gio/gdbus-tool.c:1066 -#: gio/gdbus-tool.c:1900 gio/gdbus-tool.c:2140 +#: gio/gdbus-tool.c:258 gio/gdbus-tool.c:747 gio/gdbus-tool.c:1065 +#: gio/gdbus-tool.c:1899 gio/gdbus-tool.c:2139 #, c-format msgid "Error: %s is not a valid object path\n" msgstr "Erro: %s não é um caminho de objeto válido\n" -#: gio/gdbus-tool.c:406 +#: gio/gdbus-tool.c:405 msgid "Connect to the system bus" msgstr "Ligar ao bus de sistema" -#: gio/gdbus-tool.c:407 +#: gio/gdbus-tool.c:406 msgid "Connect to the session bus" msgstr "Ligar ao bus de sessão" -#: gio/gdbus-tool.c:408 +#: gio/gdbus-tool.c:407 msgid "Connect to given D-Bus address" msgstr "Ligar ao endereço D-Bus especificado" -#: gio/gdbus-tool.c:418 +#: gio/gdbus-tool.c:417 msgid "Connection Endpoint Options:" msgstr "Opções de destino da ligação:" -#: gio/gdbus-tool.c:419 +#: gio/gdbus-tool.c:418 msgid "Options specifying the connection endpoint" msgstr "Opções que especificam o destino da ligação" -#: gio/gdbus-tool.c:442 +#: gio/gdbus-tool.c:441 #, c-format msgid "No connection endpoint specified" msgstr "Nenhum destino de ligação especificado" -#: gio/gdbus-tool.c:452 +#: gio/gdbus-tool.c:451 #, c-format msgid "Multiple connection endpoints specified" msgstr "Múltiplos destinos de ligação especificados" -#: gio/gdbus-tool.c:525 +#: gio/gdbus-tool.c:524 #, c-format msgid "" "Warning: According to introspection data, interface “%s” does not exist\n" msgstr "" "Aviso: De acordo com os dados de introspeção, o ambiente “%s” não existe\n" -#: gio/gdbus-tool.c:534 +#: gio/gdbus-tool.c:533 #, c-format msgid "" "Warning: According to introspection data, method “%s” does not exist on " @@ -1132,164 +1136,164 @@ "Aviso: De acordo com os dados de introspeção, o método “%s” não existe no " "ambiente “%s”\n" -#: gio/gdbus-tool.c:596 +#: gio/gdbus-tool.c:595 msgid "Optional destination for signal (unique name)" msgstr "Destino opcional para o sinal (nome único)" -#: gio/gdbus-tool.c:597 +#: gio/gdbus-tool.c:596 msgid "Object path to emit signal on" msgstr "Caminho do objeto sobre o qual emitir sinal" -#: gio/gdbus-tool.c:598 +#: gio/gdbus-tool.c:597 msgid "Signal and interface name" msgstr "Nome do sinal e do ambiente" -#: gio/gdbus-tool.c:631 +#: gio/gdbus-tool.c:630 msgid "Emit a signal." msgstr "Emitir um sinal." -#: gio/gdbus-tool.c:686 gio/gdbus-tool.c:1003 gio/gdbus-tool.c:1837 -#: gio/gdbus-tool.c:2069 gio/gdbus-tool.c:2289 +#: gio/gdbus-tool.c:685 gio/gdbus-tool.c:1002 gio/gdbus-tool.c:1836 +#: gio/gdbus-tool.c:2068 gio/gdbus-tool.c:2288 #, c-format msgid "Error connecting: %s\n" msgstr "Erro ao ligar: %s\n" -#: gio/gdbus-tool.c:706 +#: gio/gdbus-tool.c:705 #, c-format msgid "Error: %s is not a valid unique bus name.\n" msgstr "Erro: %s não é um nome único de canal (bus) válido.\n" -#: gio/gdbus-tool.c:725 gio/gdbus-tool.c:1046 gio/gdbus-tool.c:1880 +#: gio/gdbus-tool.c:724 gio/gdbus-tool.c:1045 gio/gdbus-tool.c:1879 msgid "Error: Object path is not specified\n" msgstr "Erro: caminho de objeto não está especificado\n" -#: gio/gdbus-tool.c:768 +#: gio/gdbus-tool.c:767 msgid "Error: Signal name is not specified\n" msgstr "Erro: nome do sinal não é especificado\n" -#: gio/gdbus-tool.c:782 +#: gio/gdbus-tool.c:781 #, c-format msgid "Error: Signal name “%s” is invalid\n" msgstr "Erro: nome do sinal “%s” é inválido\n" -#: gio/gdbus-tool.c:794 +#: gio/gdbus-tool.c:793 #, c-format msgid "Error: %s is not a valid interface name\n" msgstr "Erro: %s não é um nome de ambiente válido\n" -#: gio/gdbus-tool.c:800 +#: gio/gdbus-tool.c:799 #, c-format msgid "Error: %s is not a valid member name\n" msgstr "Erro: %s não é um nome de membro válido\n" #. Use the original non-"parse-me-harder" error -#: gio/gdbus-tool.c:837 gio/gdbus-tool.c:1178 +#: gio/gdbus-tool.c:836 gio/gdbus-tool.c:1177 #, c-format msgid "Error parsing parameter %d: %s\n" msgstr "Erro ao processar o parâmetro %d: %s\n" -#: gio/gdbus-tool.c:869 +#: gio/gdbus-tool.c:868 #, c-format msgid "Error flushing connection: %s\n" msgstr "Erro ao despejar a ligação: %s\n" -#: gio/gdbus-tool.c:897 +#: gio/gdbus-tool.c:896 msgid "Destination name to invoke method on" msgstr "Nome de destino no qual invocar o método" -#: gio/gdbus-tool.c:898 +#: gio/gdbus-tool.c:897 msgid "Object path to invoke method on" msgstr "Caminho do objeto no qual invocar o método" -#: gio/gdbus-tool.c:899 +#: gio/gdbus-tool.c:898 msgid "Method and interface name" msgstr "Método e nome de ambiente" -#: gio/gdbus-tool.c:900 +#: gio/gdbus-tool.c:899 msgid "Timeout in seconds" msgstr "Tempo limite em segundos" -#: gio/gdbus-tool.c:901 +#: gio/gdbus-tool.c:900 msgid "Allow interactive authorization" msgstr "Permitir autorização interativa" -#: gio/gdbus-tool.c:948 +#: gio/gdbus-tool.c:947 msgid "Invoke a method on a remote object." msgstr "Invocar um método num objeto remoto." -#: gio/gdbus-tool.c:1020 gio/gdbus-tool.c:1854 gio/gdbus-tool.c:2094 +#: gio/gdbus-tool.c:1019 gio/gdbus-tool.c:1853 gio/gdbus-tool.c:2093 msgid "Error: Destination is not specified\n" msgstr "Erro: Destino não está especificado\n" -#: gio/gdbus-tool.c:1031 gio/gdbus-tool.c:1871 gio/gdbus-tool.c:2105 +#: gio/gdbus-tool.c:1030 gio/gdbus-tool.c:1870 gio/gdbus-tool.c:2104 #, c-format msgid "Error: %s is not a valid bus name\n" msgstr "Erro: %s não é um nome de canal válido\n" -#: gio/gdbus-tool.c:1081 +#: gio/gdbus-tool.c:1080 msgid "Error: Method name is not specified\n" msgstr "Erro: nome de método não é especificado\n" -#: gio/gdbus-tool.c:1092 +#: gio/gdbus-tool.c:1091 #, c-format msgid "Error: Method name “%s” is invalid\n" msgstr "Erro: nome de método “%s” é inválido\n" -#: gio/gdbus-tool.c:1170 +#: gio/gdbus-tool.c:1169 #, c-format msgid "Error parsing parameter %d of type “%s”: %s\n" msgstr "Erro ao processar o parâmetro %d do tipo “%s”: %s\n" -#: gio/gdbus-tool.c:1196 +#: gio/gdbus-tool.c:1195 #, c-format msgid "Error adding handle %d: %s\n" msgstr "Erro ao adicionar manipulador: %d: %s\n" -#: gio/gdbus-tool.c:1696 +#: gio/gdbus-tool.c:1695 msgid "Destination name to introspect" msgstr "Nome do destino sobre o qual realizar a introspeção" -#: gio/gdbus-tool.c:1697 +#: gio/gdbus-tool.c:1696 msgid "Object path to introspect" msgstr "Caminho do objeto sobre o qual realizar a introspeção" -#: gio/gdbus-tool.c:1698 +#: gio/gdbus-tool.c:1697 msgid "Print XML" msgstr "Imprimir XML" -#: gio/gdbus-tool.c:1699 +#: gio/gdbus-tool.c:1698 msgid "Introspect children" msgstr "Realizar introspeção dos sub processos" -#: gio/gdbus-tool.c:1700 +#: gio/gdbus-tool.c:1699 msgid "Only print properties" msgstr "Imprimir só propriedades" -#: gio/gdbus-tool.c:1789 +#: gio/gdbus-tool.c:1788 msgid "Introspect a remote object." msgstr "Realizar a introspeção de um objeto remoto." -#: gio/gdbus-tool.c:1995 +#: gio/gdbus-tool.c:1994 msgid "Destination name to monitor" msgstr "Nome do destino a monitorizar" -#: gio/gdbus-tool.c:1996 +#: gio/gdbus-tool.c:1995 msgid "Object path to monitor" msgstr "Caminho do objeto a monitorizar" -#: gio/gdbus-tool.c:2021 +#: gio/gdbus-tool.c:2020 msgid "Monitor a remote object." msgstr "Monitorizar um objeto remoto." -#: gio/gdbus-tool.c:2079 +#: gio/gdbus-tool.c:2078 msgid "Error: can’t monitor a non-message-bus connection\n" msgstr "Erro: impossível monitorizar um ligação non-message-bus\n" -#: gio/gdbus-tool.c:2203 +#: gio/gdbus-tool.c:2202 msgid "Service to activate before waiting for the other one (well-known name)" msgstr "Serviço a ativar enquanto espera por um outro (nome conhecido)" -#: gio/gdbus-tool.c:2206 +#: gio/gdbus-tool.c:2205 msgid "" "Timeout to wait for before exiting with an error (seconds); 0 for no timeout " "(default)" @@ -1297,27 +1301,27 @@ "Compasso de espera antes de sair com erro (segundos); 0 para nenhum " "(predefinição)" -#: gio/gdbus-tool.c:2254 +#: gio/gdbus-tool.c:2253 msgid "OPTION… BUS-NAME" msgstr "OPÇÃO… BUS-NAME" -#: gio/gdbus-tool.c:2255 +#: gio/gdbus-tool.c:2254 msgid "Wait for a bus name to appear." msgstr "Esperar por um nome de canal aparecer." -#: gio/gdbus-tool.c:2331 +#: gio/gdbus-tool.c:2330 msgid "Error: A service to activate for must be specified.\n" msgstr "Erro: um serviço para ser ativado precisa ser especificado.\n" -#: gio/gdbus-tool.c:2336 +#: gio/gdbus-tool.c:2335 msgid "Error: A service to wait for must be specified.\n" msgstr "Erro: um serviço a ser esperado precisa ser especificado\n" -#: gio/gdbus-tool.c:2341 +#: gio/gdbus-tool.c:2340 msgid "Error: Too many arguments.\n" msgstr "Erro: demasiados argumentos\n" -#: gio/gdbus-tool.c:2349 gio/gdbus-tool.c:2356 +#: gio/gdbus-tool.c:2348 gio/gdbus-tool.c:2355 #, c-format msgid "Error: %s is not a valid well-known bus name.\n" msgstr "Erro: %s não é um nome de canal válido\n" @@ -1327,39 +1331,44 @@ msgid "Not authorized to change debug settings" msgstr "Não autorizado a alterar as definições de depuração" -#: gio/gdesktopappinfo.c:2182 gio/gdesktopappinfo.c:5113 +#: gio/gdesktopappinfo.c:2242 gio/gdesktopappinfo.c:5223 msgid "Unnamed" msgstr "Sem nome" -#: gio/gdesktopappinfo.c:2592 +#: gio/gdesktopappinfo.c:2652 msgid "Desktop file didn’t specify Exec field" msgstr "Ficheiro do ambiente de trabalho não especificou campo Exec" -#: gio/gdesktopappinfo.c:2891 +#: gio/gdesktopappinfo.c:2942 msgid "Unable to find terminal required for application" msgstr "Impossível encontrar o terminal necessário à aplicação" -#: gio/gdesktopappinfo.c:3631 +#: gio/gdesktopappinfo.c:3002 +#, c-format +msgid "Program ‘%s’ not found in $PATH" +msgstr "Programa '%s' não encontrado em $PATH" + +#: gio/gdesktopappinfo.c:3735 #, c-format msgid "Can’t create user application configuration folder %s: %s" msgstr "" "Impossível criar a pasta de configurações de utilizador da aplicação %s: %s" -#: gio/gdesktopappinfo.c:3635 +#: gio/gdesktopappinfo.c:3739 #, c-format msgid "Can’t create user MIME configuration folder %s: %s" msgstr "Impossível criar a pasta de configurações MIME do utilizador %s: %s" -#: gio/gdesktopappinfo.c:3877 gio/gdesktopappinfo.c:3901 +#: gio/gdesktopappinfo.c:3981 gio/gdesktopappinfo.c:4005 msgid "Application information lacks an identifier" msgstr "Informação da aplicação não possui um identificador" -#: gio/gdesktopappinfo.c:4137 +#: gio/gdesktopappinfo.c:4241 #, c-format msgid "Can’t create user desktop file %s" msgstr "Impossível criar ficheiro do ambiente de trabalho do utilizador %s" -#: gio/gdesktopappinfo.c:4273 +#: gio/gdesktopappinfo.c:4377 #, c-format msgid "Custom definition for %s" msgstr "Definição personalizada de %s" @@ -1432,7 +1441,7 @@ msgid "Containing mount does not exist" msgstr "Montagem contida não existe" -#: gio/gfile.c:2641 gio/glocalfile.c:2500 +#: gio/gfile.c:2641 gio/glocalfile.c:2511 msgid "Can’t copy over directory" msgstr "Impossível copiar sobre um diretório" @@ -1477,7 +1486,7 @@ msgid "Invalid symlink value given" msgstr "Dado um valor de ligação simbólica inválida" -#: gio/gfile.c:4163 glib/gfileutils.c:2335 +#: gio/gfile.c:4163 glib/gfileutils.c:2392 msgid "Symbolic links not supported" msgstr "Ligações simbólicas não são suportadas" @@ -1578,37 +1587,37 @@ msgid "HTTP proxy server closed connection unexpectedly." msgstr "O servidor proxy HTTP fechou a ligação inesperadamente." -#: gio/gicon.c:300 +#: gio/gicon.c:299 #, c-format msgid "Wrong number of tokens (%d)" msgstr "Número incorreto de blocos (%d)" -#: gio/gicon.c:320 +#: gio/gicon.c:319 #, c-format msgid "No type for class name %s" msgstr "Nenhum tipo para o nome da classe %s" -#: gio/gicon.c:330 +#: gio/gicon.c:329 #, c-format msgid "Type %s does not implement the GIcon interface" msgstr "O tipo %s não implementa o ambiente GIcon" -#: gio/gicon.c:341 +#: gio/gicon.c:340 #, c-format msgid "Type %s is not classed" msgstr "O tipo %s não possui uma classe" -#: gio/gicon.c:355 +#: gio/gicon.c:354 #, c-format msgid "Malformed version number: %s" msgstr "Número de versão mal-formado: %s" -#: gio/gicon.c:369 +#: gio/gicon.c:368 #, c-format msgid "Type %s does not implement from_tokens() on the GIcon interface" msgstr "O tipo %s não implementa from_tokens() no ambiente GIcon" -#: gio/gicon.c:471 +#: gio/gicon.c:470 msgid "Can’t handle the supplied version of the icon encoding" msgstr "Impossível manipular a versão especificada da codificação do ícone" @@ -1758,7 +1767,7 @@ #: gio/gio-tool-cat.c:135 gio/gio-tool-info.c:379 gio/gio-tool-list.c:173 #: gio/gio-tool-mkdir.c:50 gio/gio-tool-monitor.c:39 gio/gio-tool-monitor.c:41 #: gio/gio-tool-monitor.c:43 gio/gio-tool-monitor.c:45 -#: gio/gio-tool-monitor.c:206 gio/gio-tool-mount.c:1202 gio/gio-tool-open.c:72 +#: gio/gio-tool-monitor.c:206 gio/gio-tool-mount.c:1210 gio/gio-tool-open.c:72 #: gio/gio-tool-remove.c:50 gio/gio-tool-rename.c:47 gio/gio-tool-set.c:95 #: gio/gio-tool-trash.c:222 gio/gio-tool-tree.c:241 msgid "LOCATION" @@ -1779,7 +1788,7 @@ "pode utilizar smb://server/resource/ficheiro.txt como localização." #: gio/gio-tool-cat.c:164 gio/gio-tool-info.c:410 gio/gio-tool-mkdir.c:78 -#: gio/gio-tool-monitor.c:231 gio/gio-tool-mount.c:1253 gio/gio-tool-open.c:98 +#: gio/gio-tool-monitor.c:231 gio/gio-tool-mount.c:1261 gio/gio-tool-open.c:98 #: gio/gio-tool-remove.c:74 gio/gio-tool-trash.c:303 msgid "No locations given" msgstr "Nenhuma localização fornecida" @@ -2193,19 +2202,19 @@ msgid "Mount a TCRYPT system volume" msgstr "Montar uma unidade TCRYPT de sistema" -#: gio/gio-tool-mount.c:268 gio/gio-tool-mount.c:300 +#: gio/gio-tool-mount.c:276 gio/gio-tool-mount.c:308 msgid "Anonymous access denied" msgstr "Acesso anónimo negado" -#: gio/gio-tool-mount.c:525 +#: gio/gio-tool-mount.c:533 msgid "No drive for device file" msgstr "Nenhum volume para o ficheiro de dispositivo" -#: gio/gio-tool-mount.c:1017 +#: gio/gio-tool-mount.c:1025 msgid "No volume for given ID" msgstr "Nenhum volume para o dado ID" -#: gio/gio-tool-mount.c:1206 +#: gio/gio-tool-mount.c:1214 msgid "Mount or unmount the locations." msgstr "Montar ou desmontar localizações." @@ -2410,7 +2419,7 @@ msgid "List contents of directories in a tree-like format." msgstr "Listar conteúdos de diretórios num formato tipo árvore." -#: gio/glib-compile-resources.c:142 gio/glib-compile-schemas.c:1516 +#: gio/glib-compile-resources.c:142 gio/glib-compile-schemas.c:1513 #, c-format msgid "Element <%s> not allowed inside <%s>" msgstr "Elemento <%s> não é permitido dentro de <%s>" @@ -2466,7 +2475,7 @@ msgid "text may not appear inside <%s>" msgstr "não pode surgir texto dentro de <%s>" -#: gio/glib-compile-resources.c:821 gio/glib-compile-schemas.c:2174 +#: gio/glib-compile-resources.c:821 gio/glib-compile-schemas.c:2171 msgid "Show program version and exit" msgstr "Mostrar a versão da aplicação e sair" @@ -2482,8 +2491,8 @@ "O diretório de onde ler os ficheiros referenciados no FICHEIRO do " "(predefinição: diretório atual)" -#: gio/glib-compile-resources.c:823 gio/glib-compile-schemas.c:2175 -#: gio/glib-compile-schemas.c:2204 +#: gio/glib-compile-resources.c:823 gio/glib-compile-schemas.c:2172 +#: gio/glib-compile-schemas.c:2201 msgid "DIRECTORY" msgstr "PASTA" @@ -2706,16 +2715,16 @@ msgid "<aliases> must contain at least one <alias>" msgstr "<aliases> devem conter ao menos uma <alias>" -#: gio/glib-compile-schemas.c:799 +#: gio/glib-compile-schemas.c:796 msgid "Empty names are not permitted" msgstr "Não são permitidos nomes vazios" -#: gio/glib-compile-schemas.c:809 +#: gio/glib-compile-schemas.c:806 #, c-format msgid "Invalid name “%s”: names must begin with a lowercase letter" msgstr "Nome “%s” inválido: nomes têm de começar com uma letra minúscula" -#: gio/glib-compile-schemas.c:821 +#: gio/glib-compile-schemas.c:818 #, c-format msgid "" "Invalid name “%s”: invalid character “%c”; only lowercase letters, numbers " @@ -2724,36 +2733,36 @@ "Nome “%s” inválido: carácter “%c” inválido; apenas são permitidas letras " "minúsculas, números e um traço (“-”)" -#: gio/glib-compile-schemas.c:830 +#: gio/glib-compile-schemas.c:827 #, c-format msgid "Invalid name “%s”: two successive hyphens (“--”) are not permitted" msgstr "Nome “%s” inválido: não são permitidos dois traços (“--”) consecutivos" -#: gio/glib-compile-schemas.c:839 +#: gio/glib-compile-schemas.c:836 #, c-format msgid "Invalid name “%s”: the last character may not be a hyphen (“-”)" msgstr "Nome “%s” inválido: o último carácter não pode ser um traço (“-”)" -#: gio/glib-compile-schemas.c:847 +#: gio/glib-compile-schemas.c:844 #, c-format msgid "Invalid name “%s”: maximum length is 1024" msgstr "Nome “%s” inválido: o tamanho máximo é 1024" -#: gio/glib-compile-schemas.c:919 +#: gio/glib-compile-schemas.c:916 #, c-format msgid "<child name='%s'> already specified" msgstr "<child name=“%s”> já especificado" -#: gio/glib-compile-schemas.c:945 +#: gio/glib-compile-schemas.c:942 msgid "Cannot add keys to a “list-of” schema" msgstr "Não é possível adicionar chaves a um esquema de “lista-de”" -#: gio/glib-compile-schemas.c:956 +#: gio/glib-compile-schemas.c:953 #, c-format msgid "<key name='%s'> already specified" msgstr "<key name=“%s”> já especificado" -#: gio/glib-compile-schemas.c:974 +#: gio/glib-compile-schemas.c:971 #, c-format msgid "" "<key name='%s'> shadows <key name='%s'> in <schema id='%s'>; use <override> " @@ -2762,7 +2771,7 @@ "<key name=“%s”> sobrepõe-se a <key name=“%s”> no <schema id=“%s”>; utilize " "<override> para alterar o valor" -#: gio/glib-compile-schemas.c:985 +#: gio/glib-compile-schemas.c:982 #, c-format msgid "" "Exactly one of “type”, “enum” or “flags” must be specified as an attribute " @@ -2771,56 +2780,56 @@ "Exatamente “type”, “enum” ou “flags” tem de ser especificado como um " "atributo de <key>" -#: gio/glib-compile-schemas.c:1004 +#: gio/glib-compile-schemas.c:1001 #, c-format msgid "<%s id='%s'> not (yet) defined." msgstr "<%s id=“%s”> (ainda) não definido." -#: gio/glib-compile-schemas.c:1019 +#: gio/glib-compile-schemas.c:1016 #, c-format msgid "Invalid GVariant type string “%s”" msgstr "Cadeia de tipo GVariante “%s” inválida" -#: gio/glib-compile-schemas.c:1049 +#: gio/glib-compile-schemas.c:1046 msgid "<override> given but schema isn’t extending anything" msgstr "<override> especificado mas o esquema não estende nada" -#: gio/glib-compile-schemas.c:1062 +#: gio/glib-compile-schemas.c:1059 #, c-format msgid "No <key name='%s'> to override" msgstr "Nenhum <key name='%s'> a sobrepor" -#: gio/glib-compile-schemas.c:1070 +#: gio/glib-compile-schemas.c:1067 #, c-format msgid "<override name='%s'> already specified" msgstr "<override name=“%s”> já especificado" -#: gio/glib-compile-schemas.c:1143 +#: gio/glib-compile-schemas.c:1140 #, c-format msgid "<schema id='%s'> already specified" msgstr "<schema id=“%s”> já especificado" -#: gio/glib-compile-schemas.c:1155 +#: gio/glib-compile-schemas.c:1152 #, c-format msgid "<schema id='%s'> extends not yet existing schema “%s”" msgstr "<schema id='%s'> estende-se a um esquema “%s” ainda não existente" -#: gio/glib-compile-schemas.c:1171 +#: gio/glib-compile-schemas.c:1168 #, c-format msgid "<schema id='%s'> is list of not yet existing schema “%s”" msgstr "<schema id='%s'> é uma lista do esquema “%s” que ainda não existe" -#: gio/glib-compile-schemas.c:1179 +#: gio/glib-compile-schemas.c:1176 #, c-format msgid "Cannot be a list of a schema with a path" msgstr "Não é possível ser uma lista de um esquema com um caminho" -#: gio/glib-compile-schemas.c:1189 +#: gio/glib-compile-schemas.c:1186 #, c-format msgid "Cannot extend a schema with a path" msgstr "Impossível estender um esquema com um caminho" -#: gio/glib-compile-schemas.c:1199 +#: gio/glib-compile-schemas.c:1196 #, c-format msgid "" "<schema id='%s'> is a list, extending <schema id='%s'> which is not a list" @@ -2828,7 +2837,7 @@ "<schema id=“%s”> é uma lista, que estende o <schema id=“%s”> que não é uma " "lista" -#: gio/glib-compile-schemas.c:1209 +#: gio/glib-compile-schemas.c:1206 #, c-format msgid "" "<schema id='%s' list-of='%s'> extends <schema id='%s' list-of='%s'> but “%s” " @@ -2837,17 +2846,17 @@ "<schema id='%s' list-of='%s'> estende <schema id='%s' list-of='%s'> mas “%s” " "não estende “%s”" -#: gio/glib-compile-schemas.c:1226 +#: gio/glib-compile-schemas.c:1223 #, c-format msgid "A path, if given, must begin and end with a slash" msgstr "Um caminho, se indicado, tem de começar e terminar com uma barra" -#: gio/glib-compile-schemas.c:1233 +#: gio/glib-compile-schemas.c:1230 #, c-format msgid "The path of a list must end with “:/”" msgstr "O caminho de uma lista tem de terminar com “:/”" -#: gio/glib-compile-schemas.c:1242 +#: gio/glib-compile-schemas.c:1239 #, c-format msgid "" "Warning: Schema “%s” has path “%s”. Paths starting with “/apps/”, “/" @@ -2856,49 +2865,49 @@ "Aviso: o esquema “%s” tem um caminho “%s”. Caminhos começando com “/apps/”, " "“/desktop/” ou “/system/” estão obsoletos." -#: gio/glib-compile-schemas.c:1272 +#: gio/glib-compile-schemas.c:1269 #, c-format msgid "<%s id='%s'> already specified" msgstr "<%s id=“%s”> já especificado" -#: gio/glib-compile-schemas.c:1422 gio/glib-compile-schemas.c:1438 +#: gio/glib-compile-schemas.c:1419 gio/glib-compile-schemas.c:1435 #, c-format msgid "Only one <%s> element allowed inside <%s>" msgstr "Elemento <%s> não é permitido dentro de <%s>" -#: gio/glib-compile-schemas.c:1520 +#: gio/glib-compile-schemas.c:1517 #, c-format msgid "Element <%s> not allowed at the top level" msgstr "Elemento <%s> não é permitido no nível de topo" -#: gio/glib-compile-schemas.c:1538 +#: gio/glib-compile-schemas.c:1535 msgid "Element <default> is required in <key>" msgstr "Elemento <default> é requerido em <key>" -#: gio/glib-compile-schemas.c:1628 +#: gio/glib-compile-schemas.c:1625 #, c-format msgid "Text may not appear inside <%s>" msgstr "Não pode surgir texto dentro de <%s>" -#: gio/glib-compile-schemas.c:1696 +#: gio/glib-compile-schemas.c:1693 #, c-format msgid "Warning: undefined reference to <schema id='%s'/>" msgstr "Aviso: referência unificada a <schema id='%s'/>" #. Translators: Do not translate "--strict". -#: gio/glib-compile-schemas.c:1835 gio/glib-compile-schemas.c:1914 +#: gio/glib-compile-schemas.c:1832 gio/glib-compile-schemas.c:1911 msgid "--strict was specified; exiting." msgstr "Foi especificado --strict; a terminar." -#: gio/glib-compile-schemas.c:1847 +#: gio/glib-compile-schemas.c:1844 msgid "This entire file has been ignored." msgstr "Todo este ficheiro foi ignorado." -#: gio/glib-compile-schemas.c:1910 +#: gio/glib-compile-schemas.c:1907 msgid "Ignoring this file." msgstr "A ignorar este ficheiro." -#: gio/glib-compile-schemas.c:1965 +#: gio/glib-compile-schemas.c:1962 #, c-format msgid "" "No such key “%s” in schema “%s” as specified in override file “%s”; ignoring " @@ -2907,7 +2916,7 @@ "Nenhuma chave “%s” no esquema “%s” tal como especificado no ficheiro de " "sobreposição “%s”; a ignorar sobreposição desta chave." -#: gio/glib-compile-schemas.c:1973 +#: gio/glib-compile-schemas.c:1970 #, c-format msgid "" "No such key “%s” in schema “%s” as specified in override file “%s” and --" @@ -2916,7 +2925,7 @@ "Nenhuma chave “%s” no esquema “%s” tal como especificado no ficheiro de " "sobreposição “%s” e --strict foi definido; a terminar." -#: gio/glib-compile-schemas.c:1995 +#: gio/glib-compile-schemas.c:1992 #, c-format msgid "" "Cannot provide per-desktop overrides for localized key “%s” in schema " @@ -2926,7 +2935,7 @@ "no esquema “%s” (ficheiro de sobreposição “%s”); a ignorar sobreposição para " "esta chave." -#: gio/glib-compile-schemas.c:2004 +#: gio/glib-compile-schemas.c:2001 #, c-format msgid "" "Cannot provide per-desktop overrides for localized key “%s” in schema " @@ -2936,7 +2945,7 @@ "no esquema “%s” (ficheiro de sobreposição “%s”) e --strict foi definido; a " "terminar." -#: gio/glib-compile-schemas.c:2028 +#: gio/glib-compile-schemas.c:2025 #, c-format msgid "" "Error parsing key “%s” in schema “%s” as specified in override file “%s”: " @@ -2945,7 +2954,7 @@ "Erro ao processar a chave “%s” no esquema “%s” tal como especificado no " "ficheiro de sobreposição “%s”: %s. A ignorar sobreposição para esta chave." -#: gio/glib-compile-schemas.c:2040 +#: gio/glib-compile-schemas.c:2037 #, c-format msgid "" "Error parsing key “%s” in schema “%s” as specified in override file “%s”: " @@ -2954,7 +2963,7 @@ "Erro ao processar a chave “%s” no esquema “%s” tal como especificado no " "ficheiro de sobreposição “%s”: %s. --strict foi definido; a terminar." -#: gio/glib-compile-schemas.c:2067 +#: gio/glib-compile-schemas.c:2064 #, c-format msgid "" "Override for key “%s” in schema “%s” in override file “%s” is outside the " @@ -2964,7 +2973,7 @@ "“%s” está fora do intervalo indicado no esquema; a ignorar sobreposição " "desta chave." -#: gio/glib-compile-schemas.c:2077 +#: gio/glib-compile-schemas.c:2074 #, c-format msgid "" "Override for key “%s” in schema “%s” in override file “%s” is outside the " @@ -2974,7 +2983,7 @@ "“%s” está fora do intervalo indicado no esquema e --strict foi definido; a " "terminar." -#: gio/glib-compile-schemas.c:2103 +#: gio/glib-compile-schemas.c:2100 #, c-format msgid "" "Override for key “%s” in schema “%s” in override file “%s” is not in the " @@ -2984,7 +2993,7 @@ "“%s” não pertence à lista de opções válidas; a ignorar sobreposição desta " "chave." -#: gio/glib-compile-schemas.c:2113 +#: gio/glib-compile-schemas.c:2110 #, c-format msgid "" "Override for key “%s” in schema “%s” in override file “%s” is not in the " @@ -2994,23 +3003,23 @@ "“%s” não pertence à lista de opções válidas e --strict foi definido; a " "terminar." -#: gio/glib-compile-schemas.c:2175 +#: gio/glib-compile-schemas.c:2172 msgid "Where to store the gschemas.compiled file" msgstr "Onde armazenar o ficheiro gschemas.compiled" -#: gio/glib-compile-schemas.c:2176 +#: gio/glib-compile-schemas.c:2173 msgid "Abort on any errors in schemas" msgstr "Abortar em qualquer erro nos esquemas" -#: gio/glib-compile-schemas.c:2177 +#: gio/glib-compile-schemas.c:2174 msgid "Do not write the gschema.compiled file" msgstr "Não escrever o ficheiro gschemas.compiled" -#: gio/glib-compile-schemas.c:2178 +#: gio/glib-compile-schemas.c:2175 msgid "Do not enforce key name restrictions" msgstr "Não forçar restrições de nomes de chaves" -#: gio/glib-compile-schemas.c:2207 +#: gio/glib-compile-schemas.c:2204 msgid "" "Compile all GSettings schema files into a schema cache.\n" "Schema files are required to have the extension .gschema.xml,\n" @@ -3020,15 +3029,15 @@ "Ficheiros de esquema têm de ter a extensão .gschema.xml,\n" "e o ficheiro de cache é designado gschemas.compiled." -#: gio/glib-compile-schemas.c:2228 +#: gio/glib-compile-schemas.c:2225 msgid "You should give exactly one directory name" msgstr "Deverá indicar apenas um nome de pasta" -#: gio/glib-compile-schemas.c:2271 +#: gio/glib-compile-schemas.c:2268 msgid "No schema files found: doing nothing." msgstr "Nenhum ficheiro de esquema encontrado: nada a fazer." -#: gio/glib-compile-schemas.c:2273 +#: gio/glib-compile-schemas.c:2270 msgid "No schema files found: removed existing output file." msgstr "" "Nenhum ficheiro de esquema encontrado: removido o ficheiro de resultado " @@ -3039,7 +3048,7 @@ msgid "Invalid filename %s" msgstr "Nome de ficheiro %s inválido" -#: gio/glocalfile.c:996 +#: gio/glocalfile.c:1005 #, c-format msgid "Error getting filesystem info for %s: %s" msgstr "Erro ao obter a informação do sistema de ficheiros para %s: %s" @@ -3048,126 +3057,126 @@ #. * the enclosing (user visible) mount of a file, but none #. * exists. #. -#: gio/glocalfile.c:1137 +#: gio/glocalfile.c:1141 #, c-format msgid "Containing mount for file %s not found" msgstr "Montagem que contém o ficheiro %s não encontrada" -#: gio/glocalfile.c:1160 +#: gio/glocalfile.c:1164 msgid "Can’t rename root directory" msgstr "Impossível renomear o diretório raiz" -#: gio/glocalfile.c:1178 gio/glocalfile.c:1201 +#: gio/glocalfile.c:1182 gio/glocalfile.c:1205 #, c-format msgid "Error renaming file %s: %s" msgstr "Erro ao renomear o ficheiro %s: %s" -#: gio/glocalfile.c:1185 +#: gio/glocalfile.c:1189 msgid "Can’t rename file, filename already exists" msgstr "Impossível renomear o ficheiro, o nome já existe" -#: gio/glocalfile.c:1198 gio/glocalfile.c:2394 gio/glocalfile.c:2422 -#: gio/glocalfile.c:2561 gio/glocalfileoutputstream.c:658 +#: gio/glocalfile.c:1202 gio/glocalfile.c:2405 gio/glocalfile.c:2433 +#: gio/glocalfile.c:2572 gio/glocalfileoutputstream.c:658 msgid "Invalid filename" msgstr "Nome de ficheiro inválido" -#: gio/glocalfile.c:1366 gio/glocalfile.c:1377 +#: gio/glocalfile.c:1370 gio/glocalfile.c:1381 #, c-format msgid "Error opening file %s: %s" msgstr "Erro ao abrir o ficheiro %s: %s" -#: gio/glocalfile.c:1502 +#: gio/glocalfile.c:1506 #, c-format msgid "Error removing file %s: %s" msgstr "Erro ao remover o ficheiro %s: %s" -#: gio/glocalfile.c:1996 gio/glocalfile.c:2007 gio/glocalfile.c:2034 +#: gio/glocalfile.c:2000 gio/glocalfile.c:2011 gio/glocalfile.c:2038 #, c-format msgid "Error trashing file %s: %s" msgstr "Erro ao enviar o ficheiro %s para o lixo: %s" -#: gio/glocalfile.c:2054 +#: gio/glocalfile.c:2058 #, c-format msgid "Unable to create trash directory %s: %s" msgstr "Impossível criar o diretório de lixo %s: %s" -#: gio/glocalfile.c:2075 +#: gio/glocalfile.c:2079 #, c-format msgid "Unable to find toplevel directory to trash %s" msgstr "Impossível encontrar o diretório de topo para o lixo %s" -#: gio/glocalfile.c:2083 +#: gio/glocalfile.c:2087 #, c-format msgid "Trashing on system internal mounts is not supported" msgstr "Impossível enviar para o lixo montagens internas do sistema" -#: gio/glocalfile.c:2169 gio/glocalfile.c:2197 +#: gio/glocalfile.c:2173 gio/glocalfile.c:2201 #, c-format msgid "Unable to find or create trash directory %s to trash %s" msgstr "Impossível encontrar ou criar o diretório de lixo %s para o lixo %s" -#: gio/glocalfile.c:2243 +#: gio/glocalfile.c:2245 #, c-format msgid "Unable to create trashing info file for %s: %s" msgstr "Impossível criar o ficheiro de informação do lixo para %s: %s" -#: gio/glocalfile.c:2305 +#: gio/glocalfile.c:2316 #, c-format msgid "Unable to trash file %s across filesystem boundaries" msgstr "" "Impossível enviar o ficheiro %s para o lixo através dos limites do sistema " "de ficheiros" -#: gio/glocalfile.c:2309 gio/glocalfile.c:2365 +#: gio/glocalfile.c:2320 gio/glocalfile.c:2376 #, c-format msgid "Unable to trash file %s: %s" msgstr "Impossível enviar o ficheiro %s para o lixo: %s" -#: gio/glocalfile.c:2371 +#: gio/glocalfile.c:2382 #, c-format msgid "Unable to trash file %s" msgstr "Impossível enviar o ficheiro %s para o lixo" -#: gio/glocalfile.c:2397 +#: gio/glocalfile.c:2408 #, c-format msgid "Error creating directory %s: %s" msgstr "Erro ao criar o diretório %s: %s" -#: gio/glocalfile.c:2426 +#: gio/glocalfile.c:2437 #, c-format msgid "Filesystem does not support symbolic links" msgstr "O sistema de ficheiros não suporta ligações simbólicas" -#: gio/glocalfile.c:2429 +#: gio/glocalfile.c:2440 #, c-format msgid "Error making symbolic link %s: %s" msgstr "Erro ao criar ligação simbólica %s: %s" -#: gio/glocalfile.c:2472 gio/glocalfile.c:2507 gio/glocalfile.c:2564 +#: gio/glocalfile.c:2483 gio/glocalfile.c:2518 gio/glocalfile.c:2575 #, c-format msgid "Error moving file %s: %s" msgstr "Erro ao mover o ficheiro %s: %s" -#: gio/glocalfile.c:2495 +#: gio/glocalfile.c:2506 msgid "Can’t move directory over directory" msgstr "Impossível mover uma pasta sobre uma pasta" -#: gio/glocalfile.c:2521 gio/glocalfileoutputstream.c:1110 +#: gio/glocalfile.c:2532 gio/glocalfileoutputstream.c:1110 #: gio/glocalfileoutputstream.c:1124 gio/glocalfileoutputstream.c:1139 #: gio/glocalfileoutputstream.c:1156 gio/glocalfileoutputstream.c:1170 msgid "Backup file creation failed" msgstr "Falha ao criar o ficheiro de cópia de segurança" -#: gio/glocalfile.c:2540 +#: gio/glocalfile.c:2551 #, c-format msgid "Error removing target file: %s" msgstr "Erro ao remover o ficheiro de destino: %s" -#: gio/glocalfile.c:2554 +#: gio/glocalfile.c:2565 msgid "Move between mounts not supported" msgstr "Não é suportado mover entre montados" -#: gio/glocalfile.c:2728 +#: gio/glocalfile.c:2741 #, c-format msgid "Could not determine the disk usage of %s: %s" msgstr "Impossível determinar a utilização de disco de %s: %s" @@ -3189,117 +3198,117 @@ msgid "Error setting extended attribute “%s”: %s" msgstr "Erro ao definir o atributo extendido “%s”: %s" -#: gio/glocalfileinfo.c:1738 gio/win32/gwinhttpfile.c:191 +#: gio/glocalfileinfo.c:1819 gio/win32/gwinhttpfile.c:191 msgid " (invalid encoding)" msgstr " (codificação inválida)" -#: gio/glocalfileinfo.c:1897 gio/glocalfileoutputstream.c:945 +#: gio/glocalfileinfo.c:1978 gio/glocalfileoutputstream.c:945 #: gio/glocalfileoutputstream.c:997 #, c-format msgid "Error when getting information for file “%s”: %s" msgstr "Erro ao obter informação para o ficheiro “%s”: %s" -#: gio/glocalfileinfo.c:2163 +#: gio/glocalfileinfo.c:2281 #, c-format msgid "Error when getting information for file descriptor: %s" msgstr "Erro ao obter informação sobre o descritor do ficheiro: %s" -#: gio/glocalfileinfo.c:2208 +#: gio/glocalfileinfo.c:2326 msgid "Invalid attribute type (uint32 expected)" msgstr "Tipo de atributo inválido (esperado um uint32)" -#: gio/glocalfileinfo.c:2226 +#: gio/glocalfileinfo.c:2344 msgid "Invalid attribute type (uint64 expected)" msgstr "Tipo de atributo inválido (esperado um uint64)" -#: gio/glocalfileinfo.c:2245 gio/glocalfileinfo.c:2264 +#: gio/glocalfileinfo.c:2363 gio/glocalfileinfo.c:2382 msgid "Invalid attribute type (byte string expected)" msgstr "Tipo de atributo inválido (esperado uma cadeia byte)" -#: gio/glocalfileinfo.c:2311 +#: gio/glocalfileinfo.c:2429 msgid "Cannot set permissions on symlinks" msgstr "Impossível definir permissões em ligações simbólicas" -#: gio/glocalfileinfo.c:2327 +#: gio/glocalfileinfo.c:2445 #, c-format msgid "Error setting permissions: %s" msgstr "Erro ao definir as permissões: %s" -#: gio/glocalfileinfo.c:2378 +#: gio/glocalfileinfo.c:2496 #, c-format msgid "Error setting owner: %s" msgstr "Erro ao definir o dono: %s" -#: gio/glocalfileinfo.c:2401 +#: gio/glocalfileinfo.c:2519 msgid "symlink must be non-NULL" msgstr "ligação simbólica tem de ser não-NULL" -#: gio/glocalfileinfo.c:2411 gio/glocalfileinfo.c:2430 -#: gio/glocalfileinfo.c:2441 +#: gio/glocalfileinfo.c:2529 gio/glocalfileinfo.c:2548 +#: gio/glocalfileinfo.c:2559 #, c-format msgid "Error setting symlink: %s" msgstr "Erro ao definir a ligação simbólica: %s" -#: gio/glocalfileinfo.c:2420 +#: gio/glocalfileinfo.c:2538 msgid "Error setting symlink: file is not a symlink" msgstr "" "Erro ao definir a ligação simbólica: ficheiro não é uma ligação simbólica" -#: gio/glocalfileinfo.c:2492 +#: gio/glocalfileinfo.c:2630 #, c-format msgid "Extra nanoseconds %d for UNIX timestamp %lld are negative" msgstr "Nanosegundos %d extras para a data/hora UNIX %lld são negativos" -#: gio/glocalfileinfo.c:2501 +#: gio/glocalfileinfo.c:2639 #, c-format msgid "Extra nanoseconds %d for UNIX timestamp %lld reach 1 second" msgstr "Nanosegundos %d extras para a data/hora UNIX %lld atinge 1 segundo" -#: gio/glocalfileinfo.c:2511 +#: gio/glocalfileinfo.c:2649 #, c-format msgid "UNIX timestamp %lld does not fit into 64 bits" msgstr "Data/hora UNIX %lld não cabem em 64 bits" -#: gio/glocalfileinfo.c:2522 +#: gio/glocalfileinfo.c:2660 #, c-format msgid "UNIX timestamp %lld is outside of the range supported by Windows" msgstr "Data/hora UNIX %lld estão fora do alcance suportado pelo Windows" -#: gio/glocalfileinfo.c:2625 +#: gio/glocalfileinfo.c:2792 #, c-format msgid "File name “%s” cannot be converted to UTF-16" msgstr "Nome de ficheiro “%s” não pode ser convertido para UTF-16" -#: gio/glocalfileinfo.c:2644 +#: gio/glocalfileinfo.c:2811 #, c-format msgid "File “%s” cannot be opened: Windows Error %lu" msgstr "Ficheiro “%s” não pode ser aberto: erro do Windows %lu" -#: gio/glocalfileinfo.c:2657 +#: gio/glocalfileinfo.c:2824 #, c-format msgid "Error setting modification or access time for file “%s”: %lu" msgstr "" "Erro ao definir ou modificar a hora de acesso para o ficheiro “%s”: %lu" -#: gio/glocalfileinfo.c:2798 gio/glocalfileinfo.c:2810 +#: gio/glocalfileinfo.c:2981 #, c-format msgid "Error setting modification or access time: %s" msgstr "Erro ao definir a hora de modificação ou acesso: %s" -#: gio/glocalfileinfo.c:2833 +#: gio/glocalfileinfo.c:3004 msgid "SELinux context must be non-NULL" msgstr "O contexto SELinux tem de ser não-NULL" -#: gio/glocalfileinfo.c:2840 +#: gio/glocalfileinfo.c:3011 msgid "SELinux is not enabled on this system" msgstr "O SELinux não está ativo neste sistema" -#: gio/glocalfileinfo.c:2850 +#: gio/glocalfileinfo.c:3021 #, c-format msgid "Error setting SELinux context: %s" msgstr "Erro ao definir o contexto SELinux: %s" -#: gio/glocalfileinfo.c:2947 +#: gio/glocalfileinfo.c:3118 #, c-format msgid "Setting attribute %s not supported" msgstr "Não é suportada a definição do atributo %s" @@ -3346,13 +3355,13 @@ msgid "Error renaming temporary file: %s" msgstr "Erro ao renomear ficheiro temporário: %s" -#: gio/glocalfileoutputstream.c:611 gio/glocalfileoutputstream.c:1241 +#: gio/glocalfileoutputstream.c:611 gio/glocalfileoutputstream.c:1242 #, c-format msgid "Error truncating file: %s" msgstr "Erro ao truncar ficheiro: %s" #: gio/glocalfileoutputstream.c:664 gio/glocalfileoutputstream.c:909 -#: gio/glocalfileoutputstream.c:1222 gio/gsubprocess.c:231 +#: gio/glocalfileoutputstream.c:1223 gio/gsubprocess.c:231 #, c-format msgid "Error opening file “%s”: %s" msgstr "Erro ao abrir o ficheiro “%s”: %s" @@ -3369,7 +3378,7 @@ msgid "The file was externally modified" msgstr "O ficheiro foi alterado externamente" -#: gio/glocalfileoutputstream.c:1204 +#: gio/glocalfileoutputstream.c:1205 #, c-format msgid "Error removing old file: %s" msgstr "Erro ao remover o ficheiro antigo: %s" @@ -3518,8 +3527,8 @@ #. Translators: the first placeholder is a domain name, the #. * second is an error message #: gio/gresolver.c:403 gio/gthreadedresolver.c:152 gio/gthreadedresolver.c:170 -#: gio/gthreadedresolver.c:782 gio/gthreadedresolver.c:806 -#: gio/gthreadedresolver.c:831 gio/gthreadedresolver.c:846 +#: gio/gthreadedresolver.c:798 gio/gthreadedresolver.c:822 +#: gio/gthreadedresolver.c:847 gio/gthreadedresolver.c:862 #, c-format msgid "Error resolving “%s”: %s" msgstr "Erro ao resolver “%s”: %s" @@ -4236,35 +4245,35 @@ #. Translators: the placeholder is a DNS record type, such as ‘MX’ or ‘SRV’ #: gio/gthreadedresolver.c:552 gio/gthreadedresolver.c:574 -#: gio/gthreadedresolver.c:612 gio/gthreadedresolver.c:659 -#: gio/gthreadedresolver.c:688 gio/gthreadedresolver.c:700 +#: gio/gthreadedresolver.c:628 gio/gthreadedresolver.c:675 +#: gio/gthreadedresolver.c:704 gio/gthreadedresolver.c:716 #, c-format msgid "Error parsing DNS %s record: malformed DNS packet" msgstr "Erro ao analisar o registo DNS %s: pacote DNS malformado" -#: gio/gthreadedresolver.c:758 gio/gthreadedresolver.c:895 -#: gio/gthreadedresolver.c:993 gio/gthreadedresolver.c:1043 +#: gio/gthreadedresolver.c:774 gio/gthreadedresolver.c:911 +#: gio/gthreadedresolver.c:1009 gio/gthreadedresolver.c:1059 #, c-format msgid "No DNS record of the requested type for “%s”" msgstr "Nenhum registo DNS do tipo pedido para “%s”" -#: gio/gthreadedresolver.c:763 gio/gthreadedresolver.c:998 +#: gio/gthreadedresolver.c:779 gio/gthreadedresolver.c:1014 #, c-format msgid "Temporarily unable to resolve “%s”" msgstr "Temporariamente indisponível para resolver “%s”" -#: gio/gthreadedresolver.c:768 gio/gthreadedresolver.c:1003 -#: gio/gthreadedresolver.c:1113 +#: gio/gthreadedresolver.c:784 gio/gthreadedresolver.c:1019 +#: gio/gthreadedresolver.c:1129 #, c-format msgid "Error resolving “%s”" msgstr "Erro ao resolver “%s”" -#: gio/gthreadedresolver.c:782 gio/gthreadedresolver.c:806 -#: gio/gthreadedresolver.c:831 gio/gthreadedresolver.c:846 +#: gio/gthreadedresolver.c:798 gio/gthreadedresolver.c:822 +#: gio/gthreadedresolver.c:847 gio/gthreadedresolver.c:862 msgid "Malformed DNS packet" msgstr "Pacote DNS malformado" -#: gio/gthreadedresolver.c:888 +#: gio/gthreadedresolver.c:904 #, c-format msgid "Failed to parse DNS response for “%s”: " msgstr "Falha ao analisar a resposta do DNS para \"%s\": " @@ -4390,7 +4399,7 @@ msgid "Error closing file descriptor: %s" msgstr "Erro ao fechar o descritor do ficheiro: %s" -#: gio/gunixmounts.c:2815 gio/gunixmounts.c:2868 +#: gio/gunixmounts.c:2817 gio/gunixmounts.c:2870 msgid "Filesystem root" msgstr "Raiz do sistema de ficheiros" @@ -4474,78 +4483,78 @@ msgid "Wrong args\n" msgstr "Argumentos incorretos\n" -#: glib/gbookmarkfile.c:779 +#: glib/gbookmarkfile.c:861 #, c-format msgid "Unexpected attribute “%s” for element “%s”" msgstr "Atributo “%s” inesperado para o elemento “%s”" -#: glib/gbookmarkfile.c:790 glib/gbookmarkfile.c:870 glib/gbookmarkfile.c:880 -#: glib/gbookmarkfile.c:993 +#: glib/gbookmarkfile.c:872 glib/gbookmarkfile.c:952 glib/gbookmarkfile.c:962 +#: glib/gbookmarkfile.c:1075 #, c-format msgid "Attribute “%s” of element “%s” not found" msgstr "Atributo “%s” do elemento “%s” não foi encontrado" -#: glib/gbookmarkfile.c:1202 glib/gbookmarkfile.c:1267 -#: glib/gbookmarkfile.c:1331 glib/gbookmarkfile.c:1341 +#: glib/gbookmarkfile.c:1284 glib/gbookmarkfile.c:1349 +#: glib/gbookmarkfile.c:1413 glib/gbookmarkfile.c:1423 #, c-format msgid "Unexpected tag “%s”, tag “%s” expected" msgstr "Etiqueta “%s” inesperada, esperada a etiqueta “%s”" -#: glib/gbookmarkfile.c:1227 glib/gbookmarkfile.c:1241 -#: glib/gbookmarkfile.c:1309 glib/gbookmarkfile.c:1355 +#: glib/gbookmarkfile.c:1309 glib/gbookmarkfile.c:1323 +#: glib/gbookmarkfile.c:1391 glib/gbookmarkfile.c:1437 #, c-format msgid "Unexpected tag “%s” inside “%s”" msgstr "Etiqueta “%s” inesperada dentro de “%s”" -#: glib/gbookmarkfile.c:1635 +#: glib/gbookmarkfile.c:1717 #, c-format msgid "Invalid date/time ‘%s’ in bookmark file" msgstr "Data/hora “%s” inválida no ficheiro marcado" -#: glib/gbookmarkfile.c:1838 +#: glib/gbookmarkfile.c:1956 msgid "No valid bookmark file found in data dirs" msgstr "" "Não foi encontrado nenhum ficheiro de marcador válido nos pastas de dados" -#: glib/gbookmarkfile.c:2039 +#: glib/gbookmarkfile.c:2157 #, c-format msgid "A bookmark for URI “%s” already exists" msgstr "Já existe um marcador para o URI “%s”" -#: glib/gbookmarkfile.c:2088 glib/gbookmarkfile.c:2246 -#: glib/gbookmarkfile.c:2331 glib/gbookmarkfile.c:2411 -#: glib/gbookmarkfile.c:2496 glib/gbookmarkfile.c:2630 -#: glib/gbookmarkfile.c:2763 glib/gbookmarkfile.c:2898 -#: glib/gbookmarkfile.c:2940 glib/gbookmarkfile.c:3037 -#: glib/gbookmarkfile.c:3158 glib/gbookmarkfile.c:3352 -#: glib/gbookmarkfile.c:3493 glib/gbookmarkfile.c:3712 -#: glib/gbookmarkfile.c:3801 glib/gbookmarkfile.c:3890 -#: glib/gbookmarkfile.c:4009 +#: glib/gbookmarkfile.c:2206 glib/gbookmarkfile.c:2364 +#: glib/gbookmarkfile.c:2449 glib/gbookmarkfile.c:2529 +#: glib/gbookmarkfile.c:2614 glib/gbookmarkfile.c:2748 +#: glib/gbookmarkfile.c:2881 glib/gbookmarkfile.c:3016 +#: glib/gbookmarkfile.c:3058 glib/gbookmarkfile.c:3155 +#: glib/gbookmarkfile.c:3276 glib/gbookmarkfile.c:3470 +#: glib/gbookmarkfile.c:3611 glib/gbookmarkfile.c:3830 +#: glib/gbookmarkfile.c:3919 glib/gbookmarkfile.c:4008 +#: glib/gbookmarkfile.c:4127 #, c-format msgid "No bookmark found for URI “%s”" msgstr "Não foi encontrado nenhum marcador para o URI “%s”" -#: glib/gbookmarkfile.c:2420 +#: glib/gbookmarkfile.c:2538 #, c-format msgid "No MIME type defined in the bookmark for URI “%s”" msgstr "Nenhum tipo MIME definido no marcador para o URI “%s”" -#: glib/gbookmarkfile.c:2505 +#: glib/gbookmarkfile.c:2623 #, c-format msgid "No private flag has been defined in bookmark for URI “%s”" msgstr "Nenhum sinal privado definido no marcador para o URI “%s”" -#: glib/gbookmarkfile.c:3046 +#: glib/gbookmarkfile.c:3164 #, c-format msgid "No groups set in bookmark for URI “%s”" msgstr "Nenhum grupo definido no marcador para o URI “%s”" -#: glib/gbookmarkfile.c:3514 glib/gbookmarkfile.c:3722 +#: glib/gbookmarkfile.c:3632 glib/gbookmarkfile.c:3840 #, c-format msgid "No application with name “%s” registered a bookmark for “%s”" msgstr "Nenhuma aplicação denominada “%s” registou um marcador para “%s”" -#: glib/gbookmarkfile.c:3745 +#: glib/gbookmarkfile.c:3863 #, c-format msgid "Failed to expand exec line “%s” with URI “%s”" msgstr "Falha ao expandir a linha de execução “%s” com o URI “%s”" @@ -5021,79 +5030,79 @@ msgid "Error opening directory “%s”: %s" msgstr "Erro ao abrir o diretório “%s”: %s" -#: glib/gfileutils.c:735 glib/gfileutils.c:827 +#: glib/gfileutils.c:753 glib/gfileutils.c:845 #, c-format msgid "Could not allocate %lu byte to read file “%s”" msgid_plural "Could not allocate %lu bytes to read file “%s”" msgstr0 "Impossível alocar %lu byte para ler o ficheiro “%s”" msgstr1 "Impossível alocar %lu bytes para ler o ficheiro “%s”" -#: glib/gfileutils.c:752 +#: glib/gfileutils.c:770 #, c-format msgid "Error reading file “%s”: %s" msgstr "Erro ao ler o ficheiro %s: %s" -#: glib/gfileutils.c:788 +#: glib/gfileutils.c:806 #, c-format msgid "File “%s” is too large" msgstr "Ficheiro “%s” é demasiado grande" -#: glib/gfileutils.c:852 +#: glib/gfileutils.c:870 #, c-format msgid "Failed to read from file “%s”: %s" msgstr "Falha ao ler do ficheiro “%s”: %s" -#: glib/gfileutils.c:902 glib/gfileutils.c:977 glib/gfileutils.c:1449 +#: glib/gfileutils.c:920 glib/gfileutils.c:995 glib/gfileutils.c:1472 #, c-format msgid "Failed to open file “%s”: %s" msgstr "Falha ao abrir o ficheiro “%s”: %s" -#: glib/gfileutils.c:915 +#: glib/gfileutils.c:933 #, c-format msgid "Failed to get attributes of file “%s”: fstat() failed: %s" msgstr "Falha ao obter atributos do ficheiro “%s”: falha no fstat(): %s" -#: glib/gfileutils.c:946 +#: glib/gfileutils.c:964 #, c-format msgid "Failed to open file “%s”: fdopen() failed: %s" msgstr "Falha ao abrir o ficheiro “%s”: falha no fdopen(): %s" -#: glib/gfileutils.c:1047 +#: glib/gfileutils.c:1065 #, c-format msgid "Failed to rename file “%s” to “%s”: g_rename() failed: %s" msgstr "Falha ao renomear o ficheiro “%s” para “%s”: falha no g_rename(): %s" -#: glib/gfileutils.c:1156 +#: glib/gfileutils.c:1179 #, c-format msgid "Failed to write file “%s”: write() failed: %s" msgstr "Falha ao escrever o ficheiro “%s”: falha no write(): %s" -#: glib/gfileutils.c:1177 +#: glib/gfileutils.c:1200 #, c-format msgid "Failed to write file “%s”: fsync() failed: %s" msgstr "Falha ao escrever o ficheiro “%s”: falha no fsync(): %s" -#: glib/gfileutils.c:1338 glib/gfileutils.c:1753 +#: glib/gfileutils.c:1361 glib/gfileutils.c:1776 #, c-format msgid "Failed to create file “%s”: %s" msgstr "Falha ao criar o ficheiro “%s”: %s" -#: glib/gfileutils.c:1383 +#: glib/gfileutils.c:1406 #, c-format msgid "Existing file “%s” could not be removed: g_unlink() failed: %s" msgstr "Impossível remover o ficheiro “%s” existente: falha no g_unlink(): %s" -#: glib/gfileutils.c:1718 +#: glib/gfileutils.c:1741 #, c-format msgid "Template “%s” invalid, should not contain a “%s”" msgstr "Modelo “%s” inválido, não deveria conter um “%s”" -#: glib/gfileutils.c:1731 +#: glib/gfileutils.c:1754 #, c-format msgid "Template “%s” doesn’t contain XXXXXX" msgstr "Modelo “%s” não contém XXXXXX" -#: glib/gfileutils.c:2291 glib/gfileutils.c:2320 +#: glib/gfileutils.c:2348 glib/gfileutils.c:2377 #, c-format msgid "Failed to read the symbolic link “%s”: %s" msgstr "Falha ao ler a ligação simbólica “%s”: %s" @@ -5156,8 +5165,8 @@ msgstr "Ficheiro de chave contém uma codificação não suportada “%s”" #: glib/gkeyfile.c:1679 glib/gkeyfile.c:1852 glib/gkeyfile.c:3299 -#: glib/gkeyfile.c:3363 glib/gkeyfile.c:3493 glib/gkeyfile.c:3625 -#: glib/gkeyfile.c:3771 glib/gkeyfile.c:4006 glib/gkeyfile.c:4073 +#: glib/gkeyfile.c:3363 glib/gkeyfile.c:3493 glib/gkeyfile.c:3622 +#: glib/gkeyfile.c:3768 glib/gkeyfile.c:4003 glib/gkeyfile.c:4070 #, c-format msgid "Key file does not have group “%s”" msgstr "Ficheiro de chave não possui um grupo “%s”" @@ -5192,32 +5201,32 @@ msgid "Key “%s” in group “%s” has value “%s” where %s was expected" msgstr "Chave “%s” no grupo “%s” tem o valor “%s” onde %s era esperado" -#: glib/gkeyfile.c:4326 +#: glib/gkeyfile.c:4323 msgid "Key file contains escape character at end of line" msgstr "Ficheiro de chave contém caracteres mascarados no final da linha" -#: glib/gkeyfile.c:4348 +#: glib/gkeyfile.c:4345 #, c-format msgid "Key file contains invalid escape sequence “%s”" msgstr "" "Ficheiro de chave contém uma sequência de caracteres mascarados inválida “%s”" -#: glib/gkeyfile.c:4493 +#: glib/gkeyfile.c:4490 #, c-format msgid "Value “%s” cannot be interpreted as a number." msgstr "Impossível interpretar o valor “%s” como um numérico." -#: glib/gkeyfile.c:4507 +#: glib/gkeyfile.c:4504 #, c-format msgid "Integer value “%s” out of range" msgstr "Valor inteiro “%s” para além do limite permitido" -#: glib/gkeyfile.c:4540 +#: glib/gkeyfile.c:4537 #, c-format msgid "Value “%s” cannot be interpreted as a float number." msgstr "Impossível interpretar o valor “%s” como um número vírgula flutuante." -#: glib/gkeyfile.c:4579 +#: glib/gkeyfile.c:4576 #, c-format msgid "Value “%s” cannot be interpreted as a boolean." msgstr "Impossível interpretar o valor “%s” como lógico." @@ -5237,32 +5246,32 @@ msgid "Failed to open file “%s”: open() failed: %s" msgstr "Falha ao abrir o ficheiro “%s”: falha no open(): %s" -#: glib/gmarkup.c:400 glib/gmarkup.c:442 +#: glib/gmarkup.c:393 glib/gmarkup.c:435 #, c-format msgid "Error on line %d char %d: " msgstr "Erro na linha %d, carácter %d: " -#: glib/gmarkup.c:464 glib/gmarkup.c:547 +#: glib/gmarkup.c:457 glib/gmarkup.c:540 #, c-format msgid "Invalid UTF-8 encoded text in name — not valid “%s”" msgstr "Texto codificado em UTF-8 no nome inválido — “%s” inválido" -#: glib/gmarkup.c:475 +#: glib/gmarkup.c:468 #, c-format msgid "“%s” is not a valid name" msgstr "“%s” não é um nome válido" -#: glib/gmarkup.c:491 +#: glib/gmarkup.c:484 #, c-format msgid "“%s” is not a valid name: “%c”" msgstr "“%s” não é um nome válido: “%c”" -#: glib/gmarkup.c:615 +#: glib/gmarkup.c:608 #, c-format msgid "Error on line %d: %s" msgstr "Erro na linha %d: %s" -#: glib/gmarkup.c:692 +#: glib/gmarkup.c:685 #, c-format msgid "" "Failed to parse “%-.*s”, which should have been a digit inside a character " @@ -5272,7 +5281,7 @@ "referência de carácter (ê por exemplo) — talvez o dígito seja demasiado " "grande" -#: glib/gmarkup.c:704 +#: glib/gmarkup.c:697 msgid "" "Character reference did not end with a semicolon; most likely you used an " "ampersand character without intending to start an entity — escape ampersand " @@ -5282,24 +5291,24 @@ "utilizado um carácter “i comercial” sem intenção de iniciar uma entidade — " "mascare-o como &" -#: glib/gmarkup.c:730 +#: glib/gmarkup.c:723 #, c-format msgid "Character reference “%-.*s” does not encode a permitted character" msgstr "Referência de carácter “%-.*s” não codifica um carácter permitido" -#: glib/gmarkup.c:768 +#: glib/gmarkup.c:761 msgid "" "Empty entity “&;” seen; valid entities are: & " < > '" msgstr "" "Entidade vazia “&;” avistada; entidades válidas são: & " < > " "'" -#: glib/gmarkup.c:776 +#: glib/gmarkup.c:769 #, c-format msgid "Entity name “%-.*s” is not known" msgstr "Nome de entidade “%-.*s” é desconhecido" -#: glib/gmarkup.c:781 +#: glib/gmarkup.c:774 msgid "" "Entity did not end with a semicolon; most likely you used an ampersand " "character without intending to start an entity — escape ampersand as &" @@ -5308,11 +5317,11 @@ "carácter “e comercial” sem intenção de iniciar uma entidade — mascare-o como " "&" -#: glib/gmarkup.c:1195 +#: glib/gmarkup.c:1188 msgid "Document must begin with an element (e.g. <book>)" msgstr "Documento tem de começar com um elemento (ex. <book>)" -#: glib/gmarkup.c:1235 +#: glib/gmarkup.c:1228 #, c-format msgid "" "“%s” is not a valid character following a “<” character; it may not begin an " @@ -5321,7 +5330,7 @@ "“%s” não é um carácter válido após um carácter “<”; pode não iniciar um nome " "de elemento" -#: glib/gmarkup.c:1278 +#: glib/gmarkup.c:1271 #, c-format msgid "" "Odd character “%s”, expected a “>” character to end the empty-element tag " @@ -5330,12 +5339,12 @@ "Carácter estranho “%s”, era esperado um carácter “>” para terminar a " "etiqueta de elemento vazio “%s”" -#: glib/gmarkup.c:1348 +#: glib/gmarkup.c:1341 #, c-format msgid "Too many attributes in element “%s”" msgstr "Demasiados atributos no elemento “%s”" -#: glib/gmarkup.c:1368 +#: glib/gmarkup.c:1361 #, c-format msgid "" "Odd character “%s”, expected a “=” after attribute name “%s” of element “%s”" @@ -5343,7 +5352,7 @@ "Carácter estranho “%s”, era esperado um “=” após o nome do atributo “%s” do " "elemento “%s”" -#: glib/gmarkup.c:1410 +#: glib/gmarkup.c:1403 #, c-format msgid "" "Odd character “%s”, expected a “>” or “/” character to end the start tag of " @@ -5354,7 +5363,7 @@ "etiqueta inicial do elemento “%s”, ou opcionalmente um atributo; talvez " "tenha sido utilizado um carácter inválido no nome de um atributo" -#: glib/gmarkup.c:1455 +#: glib/gmarkup.c:1448 #, c-format msgid "" "Odd character “%s”, expected an open quote mark after the equals sign when " @@ -5363,7 +5372,7 @@ "Carácter estranho “%s”, era esperada uma abertura de aspa após o sinal de " "igual ao atribuir valor ao atributo “%s” do elemento “%s”" -#: glib/gmarkup.c:1589 +#: glib/gmarkup.c:1582 #, c-format msgid "" "“%s” is not a valid character following the characters “</”; “%s” may not " @@ -5372,7 +5381,7 @@ "“%s” não é um carácter válido após os caracteres \"</\"; “%s” pode não " "iniciar o nome de um elemento" -#: glib/gmarkup.c:1627 +#: glib/gmarkup.c:1620 #, c-format msgid "" "“%s” is not a valid character following the close element name “%s”; the " @@ -5381,25 +5390,25 @@ "“%s” não é um carácter válido após o nome do elemento de fecho “%s”; o " "carácter permitido é “>”" -#: glib/gmarkup.c:1639 +#: glib/gmarkup.c:1632 #, c-format msgid "Element “%s” was closed, no element is currently open" msgstr "Elemento “%s” foi fechado, nenhum elemento está atualmente aberto" -#: glib/gmarkup.c:1648 +#: glib/gmarkup.c:1641 #, c-format msgid "Element “%s” was closed, but the currently open element is “%s”" msgstr "Elemento “%s” foi fechado, mas o elemento atualmente aberto é “%s”" -#: glib/gmarkup.c:1801 +#: glib/gmarkup.c:1794 msgid "Document was empty or contained only whitespace" msgstr "Documento estava vazio ou só continha espaços" -#: glib/gmarkup.c:1815 +#: glib/gmarkup.c:1808 msgid "Document ended unexpectedly just after an open angle bracket “<”" msgstr "Documento terminou inesperadamente logo após um carácter menor que “<”" -#: glib/gmarkup.c:1823 glib/gmarkup.c:1868 +#: glib/gmarkup.c:1816 glib/gmarkup.c:1861 #, c-format msgid "" "Document ended unexpectedly with elements still open — “%s” was the last " @@ -5408,7 +5417,7 @@ "Documento terminou inesperadamente com elementos ainda abertos — “%s” foi o " "último elemento aberto" -#: glib/gmarkup.c:1831 +#: glib/gmarkup.c:1824 #, c-format msgid "" "Document ended unexpectedly, expected to see a close angle bracket ending " @@ -5417,21 +5426,21 @@ "Documento terminou inesperadamente, era esperado um maior que \">\" para " "terminar a etiqueta <%s/>" -#: glib/gmarkup.c:1837 +#: glib/gmarkup.c:1830 msgid "Document ended unexpectedly inside an element name" msgstr "Documento terminou inesperadamente dentro do nome de um elemento" -#: glib/gmarkup.c:1843 +#: glib/gmarkup.c:1836 msgid "Document ended unexpectedly inside an attribute name" msgstr "Documento terminou inesperadamente dentro do nome de um atributo" -#: glib/gmarkup.c:1848 +#: glib/gmarkup.c:1841 msgid "Document ended unexpectedly inside an element-opening tag." msgstr "" "Documento terminou inesperadamente dentro da etiqueta de abertura de um " "elemento." -#: glib/gmarkup.c:1854 +#: glib/gmarkup.c:1847 msgid "" "Document ended unexpectedly after the equals sign following an attribute " "name; no attribute value" @@ -5439,25 +5448,25 @@ "Documento terminou inesperadamente após o sinal de igual posterior a um nome " "de atributo; nenhum valor de atributo" -#: glib/gmarkup.c:1861 +#: glib/gmarkup.c:1854 msgid "Document ended unexpectedly while inside an attribute value" msgstr "Documento terminou inesperadamente dentro do valor de um atributo" -#: glib/gmarkup.c:1878 +#: glib/gmarkup.c:1871 #, c-format msgid "Document ended unexpectedly inside the close tag for element “%s”" msgstr "" "Documento terminou inesperadamente dentro da etiqueta de fecho do elemento " "“%s”" -#: glib/gmarkup.c:1882 +#: glib/gmarkup.c:1875 msgid "" "Document ended unexpectedly inside the close tag for an unopened element" msgstr "" "Documento terminou inesperadamente dentro da etiqueta de fecho do elemento " "para um elemento não aberto" -#: glib/gmarkup.c:1888 +#: glib/gmarkup.c:1881 msgid "Document ended unexpectedly inside a comment or processing instruction" msgstr "" "Documento terminou inesperadamente dentro de um comentário ou instrução de " @@ -5522,187 +5531,187 @@ msgid "Unknown option %s" msgstr "Opção %s desconhecida" -#: glib/gregex.c:436 +#: glib/gregex.c:479 msgid "corrupted object" msgstr "objeto corrompido" -#: glib/gregex.c:438 +#: glib/gregex.c:481 msgid "out of memory" msgstr "sem memória livre" -#: glib/gregex.c:443 +#: glib/gregex.c:487 msgid "backtracking limit reached" msgstr "limite de retroceder alcançado" -#: glib/gregex.c:454 glib/gregex.c:707 glib/gregex.c:736 +#: glib/gregex.c:498 msgid "internal error" msgstr "erro interno" -#: glib/gregex.c:456 +#: glib/gregex.c:500 msgid "the pattern contains items not supported for partial matching" msgstr "o padrão contém itens não suportados para comparação parcial" -#: glib/gregex.c:458 +#: glib/gregex.c:502 msgid "back references as conditions are not supported for partial matching" msgstr "" "referências anteriores como condições não são suportadas para comparação " "parcial" -#: glib/gregex.c:464 +#: glib/gregex.c:508 msgid "recursion limit reached" msgstr "alcançado o limite de recursividade" -#: glib/gregex.c:466 +#: glib/gregex.c:510 msgid "bad offset" msgstr "desvio inválido" -#: glib/gregex.c:468 +#: glib/gregex.c:512 msgid "recursion loop" msgstr "recursão infinita" #. should not happen in GRegex since we check modes before each match -#: glib/gregex.c:471 +#: glib/gregex.c:515 msgid "matching mode is requested that was not compiled for JIT" msgstr "" "é solicitado o modo de correspondência que não foi compilado para o EIC" -#: glib/gregex.c:475 +#: glib/gregex.c:536 glib/gregex.c:1838 msgid "unknown error" msgstr "erro desconhecido" -#: glib/gregex.c:496 +#: glib/gregex.c:557 msgid "\\ at end of pattern" msgstr "\\ no final do padrão" -#: glib/gregex.c:500 +#: glib/gregex.c:561 msgid "\\c at end of pattern" msgstr "\\c no final do padrão" -#: glib/gregex.c:505 +#: glib/gregex.c:566 msgid "unrecognized character following \\" msgstr "carácter desconhecido após \\" -#: glib/gregex.c:509 +#: glib/gregex.c:570 msgid "numbers out of order in {} quantifier" msgstr "números fora da ordem no quantificador {}" -#: glib/gregex.c:513 +#: glib/gregex.c:574 msgid "number too big in {} quantifier" msgstr "número demasiado grande no quantificador {}" -#: glib/gregex.c:517 +#: glib/gregex.c:578 msgid "missing terminating for character class" msgstr "falta o de fecho da classe de carácter" -#: glib/gregex.c:521 +#: glib/gregex.c:582 msgid "invalid escape sequence in character class" msgstr "sequência de escape inválida na classe de carácter" -#: glib/gregex.c:525 +#: glib/gregex.c:586 msgid "range out of order in character class" msgstr "intervalo fora da ordem na classe de carácter" -#: glib/gregex.c:530 +#: glib/gregex.c:591 msgid "nothing to repeat" msgstr "nada a repetir" -#: glib/gregex.c:534 +#: glib/gregex.c:595 msgid "unrecognized character after (? or (?-" msgstr "carácter desconhecido após (? or (?-" -#: glib/gregex.c:538 +#: glib/gregex.c:599 msgid "POSIX named classes are supported only within a class" msgstr "Classes denominadas POSIX apenas são suportadas dentro de uma classe" -#: glib/gregex.c:542 +#: glib/gregex.c:603 msgid "POSIX collating elements are not supported" msgstr "Não são suportados os elementos de junção POSIX" -#: glib/gregex.c:548 +#: glib/gregex.c:609 msgid "missing terminating )" msgstr "falta o ) de fecho" -#: glib/gregex.c:552 +#: glib/gregex.c:613 msgid "reference to non-existent subpattern" msgstr "referência a padrão inexistente" -#: glib/gregex.c:556 +#: glib/gregex.c:617 msgid "missing ) after comment" msgstr "falta o ) após o comentário" -#: glib/gregex.c:560 +#: glib/gregex.c:621 msgid "regular expression is too large" msgstr "expressão regular demasiado extensa" -#: glib/gregex.c:564 +#: glib/gregex.c:625 msgid "malformed number or name after (?(" msgstr "número ou nome mal formado após (?(" -#: glib/gregex.c:568 +#: glib/gregex.c:629 msgid "lookbehind assertion is not fixed length" msgstr "asserção de verificação anterior não é de largura fixa" -#: glib/gregex.c:572 +#: glib/gregex.c:633 msgid "conditional group contains more than two branches" msgstr "grupo condicional contém mais de dois ramos" -#: glib/gregex.c:576 +#: glib/gregex.c:637 msgid "assertion expected after (?(" msgstr "esperada uma asserção após (?(" -#: glib/gregex.c:580 +#: glib/gregex.c:641 msgid "a numbered reference must not be zero" msgstr "uma referência numerada não pode ser zero" -#: glib/gregex.c:584 +#: glib/gregex.c:645 msgid "unknown POSIX class name" msgstr "nome de classe POSIX desconhecido" -#: glib/gregex.c:589 +#: glib/gregex.c:650 msgid "character value in \\x{...} sequence is too large" msgstr "valor do carácter na sequência \\x{...} é demasiado grande" -#: glib/gregex.c:593 +#: glib/gregex.c:654 msgid "\\C not allowed in lookbehind assertion" msgstr "\\C não é permitido numa asserção de verificação anterior" -#: glib/gregex.c:597 +#: glib/gregex.c:658 msgid "missing terminator in subpattern name" msgstr "falta o terminador no nome do subpadrão" -#: glib/gregex.c:601 +#: glib/gregex.c:662 msgid "two named subpatterns have the same name" msgstr "dois subpadrões denominados têm o mesmo nome" -#: glib/gregex.c:605 +#: glib/gregex.c:666 msgid "malformed \\P or \\p sequence" msgstr "sequência \\P ou \\p mal formada" -#: glib/gregex.c:609 +#: glib/gregex.c:670 msgid "unknown property name after \\P or \\p" msgstr "nome de propriedade desconhecido após \\P ou \\p" -#: glib/gregex.c:613 +#: glib/gregex.c:674 msgid "subpattern name is too long (maximum 32 characters)" msgstr "nome do subpadrão é demasiado extenso (máximo de 32 caracteres)" -#: glib/gregex.c:617 +#: glib/gregex.c:678 msgid "too many named subpatterns (maximum 10,000)" msgstr "demasiados subpadrões denominados (máximo de 10.000)" -#: glib/gregex.c:621 +#: glib/gregex.c:682 msgid "octal value is greater than \\377" msgstr "valor octal é maior do que \\377" -#: glib/gregex.c:625 +#: glib/gregex.c:686 msgid "DEFINE group contains more than one branch" msgstr "Grupo DEFINE contém mais de um ramo" -#: glib/gregex.c:629 +#: glib/gregex.c:690 msgid "inconsistent NEWLINE options" msgstr "opções de NEWLINE inconsistentes" -#: glib/gregex.c:633 +#: glib/gregex.c:694 msgid "" "\\g is not followed by a braced, angle-bracketed, or quoted name or number, " "or by a plain number" @@ -5710,119 +5719,119 @@ "\\g não é seguido de um nome ou número delimitado por chavetas, parenteses " "ou aspas ou um número simples" -#: glib/gregex.c:638 +#: glib/gregex.c:699 msgid "an argument is not allowed for (*ACCEPT), (*FAIL), or (*COMMIT)" msgstr "não é permitido um argumento para (*ACCEPT), (*FAIL), ou (*COMMIT)" -#: glib/gregex.c:642 +#: glib/gregex.c:703 msgid "(*VERB) not recognized" msgstr "(*VERB) não é reconhecido" -#: glib/gregex.c:646 +#: glib/gregex.c:707 msgid "number is too big" msgstr "número é demasiado grande" -#: glib/gregex.c:650 +#: glib/gregex.c:711 msgid "missing subpattern name after (?&" msgstr "falta o nome do subpadrão após (?&" -#: glib/gregex.c:654 +#: glib/gregex.c:715 msgid "different names for subpatterns of the same number are not allowed" msgstr "não são permitidos nomes diferentes para subpadrões do mesmo número" -#: glib/gregex.c:658 +#: glib/gregex.c:719 msgid "(*MARK) must have an argument" msgstr "(*MARK) tem de ter um argumento" -#: glib/gregex.c:662 +#: glib/gregex.c:723 msgid "\\c must be followed by an ASCII character" msgstr "\\c não pode ser seguido de um carácter ASCII" -#: glib/gregex.c:666 +#: glib/gregex.c:727 msgid "\\k is not followed by a braced, angle-bracketed, or quoted name" msgstr "" "\\k não é seguido de um nome delimitado por chavetas, parenteses angulares " "ou aspas" -#: glib/gregex.c:670 +#: glib/gregex.c:731 msgid "\\N is not supported in a class" msgstr "\\N não é suportado numa classe" -#: glib/gregex.c:674 +#: glib/gregex.c:735 msgid "name is too long in (*MARK), (*PRUNE), (*SKIP), or (*THEN)" msgstr "nome é demasiado extenso em (*MARK), (*PRUNE), (*SKIP), ou (*THEN)" -#: glib/gregex.c:678 glib/gregex.c:809 +#: glib/gregex.c:739 glib/gregex.c:875 msgid "code overflow" msgstr "código fora dos limites" -#: glib/gregex.c:682 +#: glib/gregex.c:743 msgid "unrecognized character after (?P" msgstr "carácter desconhecido após (?P" -#: glib/gregex.c:686 +#: glib/gregex.c:747 msgid "overran compiling workspace" msgstr "derramou fora da área de trabalho de compilação" -#: glib/gregex.c:690 +#: glib/gregex.c:751 msgid "previously-checked referenced subpattern not found" msgstr "subpadrão referenciado previamente verificado não foi encontrado" -#: glib/gregex.c:808 glib/gregex.c:1041 glib/gregex.c:2342 +#: glib/gregex.c:874 glib/gregex.c:1121 glib/gregex.c:2444 #, c-format msgid "Error while matching regular expression %s: %s" msgstr "Erro ao comparar a expressão regular %s: %s" -#: glib/gregex.c:1618 +#: glib/gregex.c:1721 msgid "PCRE library is compiled without UTF8 support" msgstr "Biblioteca PCRE está compilada sem suporte UTF8" -#: glib/gregex.c:1626 +#: glib/gregex.c:1729 msgid "PCRE library is compiled with incompatible options" msgstr "Biblioteca PCRE está compilada com opções incompatíveis" -#: glib/gregex.c:1751 +#: glib/gregex.c:1847 #, c-format msgid "Error while compiling regular expression ‘%s’ at char %s: %s" msgstr "Erro ao compilar a expressão regular '%s' no carácter %s: %s" -#: glib/gregex.c:2786 +#: glib/gregex.c:2887 msgid "hexadecimal digit or “}” expected" msgstr "esperado um dígito hexadecimal ou \"}\"" -#: glib/gregex.c:2802 +#: glib/gregex.c:2903 msgid "hexadecimal digit expected" msgstr "esperado um dígito hexadecimal" -#: glib/gregex.c:2842 +#: glib/gregex.c:2943 msgid "missing “<” in symbolic reference" msgstr "falta “<” na referência simbólica" -#: glib/gregex.c:2851 +#: glib/gregex.c:2952 msgid "unfinished symbolic reference" msgstr "referência simbólica por terminar" -#: glib/gregex.c:2858 +#: glib/gregex.c:2959 msgid "zero-length symbolic reference" msgstr "referência simbólica de tamanho zero" -#: glib/gregex.c:2869 +#: glib/gregex.c:2970 msgid "digit expected" msgstr "esperado um dígito" -#: glib/gregex.c:2887 +#: glib/gregex.c:2988 msgid "illegal symbolic reference" msgstr "referência simbólica ilegal" -#: glib/gregex.c:2950 +#: glib/gregex.c:3051 msgid "stray final “\\”" msgstr "“\\” final a mais" -#: glib/gregex.c:2954 +#: glib/gregex.c:3055 msgid "unknown escape sequence" msgstr "sequência de escape desconhecida" -#: glib/gregex.c:2964 +#: glib/gregex.c:3065 #, c-format msgid "Error while parsing replacement text “%s” at char %lu: %s" msgstr "Erro ao processar o texto de substituição “%s” no carácter %lu: %s" @@ -5851,95 +5860,100 @@ msgid "Text was empty (or contained only whitespace)" msgstr "Texto estava vazio (ou apenas continha espaços)" -#: glib/gspawn.c:314 +#: glib/gspawn.c:319 #, c-format msgid "Failed to read data from child process (%s)" msgstr "Falha ao ler dados de sub processo (%s)" -#: glib/gspawn.c:466 +#: glib/gspawn.c:471 #, c-format msgid "Unexpected error in reading data from a child process (%s)" msgstr "Erro inesperado ao ler dados de sub processo (%s)" -#: glib/gspawn.c:551 +#: glib/gspawn.c:556 #, c-format msgid "Unexpected error in waitpid() (%s)" msgstr "Erro inesperado em waitpid() (%s)" -#: glib/gspawn.c:1170 glib/gspawn-win32.c:1488 +#: glib/gspawn.c:1175 glib/gspawn-win32.c:1503 #, c-format msgid "Child process exited with code %ld" msgstr "Sub processo terminou com o código %ld" -#: glib/gspawn.c:1178 +#: glib/gspawn.c:1183 #, c-format msgid "Child process killed by signal %ld" msgstr "Sub processo morto com o sinal %ld" -#: glib/gspawn.c:1185 +#: glib/gspawn.c:1190 #, c-format msgid "Child process stopped by signal %ld" msgstr "Sub processo parado com o sinal %ld" -#: glib/gspawn.c:1192 +#: glib/gspawn.c:1197 #, c-format msgid "Child process exited abnormally" msgstr "O sub processo terminou anormalmente" -#: glib/gspawn.c:1885 glib/gspawn-win32.c:393 glib/gspawn-win32.c:401 +#: glib/gspawn.c:2027 glib/gspawn-win32.c:393 glib/gspawn-win32.c:401 #, c-format msgid "Failed to read from child pipe (%s)" msgstr "Falha ao ler de canal acima (%s)" -#: glib/gspawn.c:2248 +#: glib/gspawn.c:2399 #, c-format msgid "Failed to spawn child process “%s” (%s)" msgstr "Falha ao criar sub processo “%s” (%s)" -#: glib/gspawn.c:2365 +#: glib/gspawn.c:2525 #, c-format msgid "Failed to fork (%s)" msgstr "Falha ao bifurcar \"fork\" (%s)" -#: glib/gspawn.c:2525 glib/gspawn-win32.c:424 +#: glib/gspawn.c:2685 glib/gspawn-win32.c:424 #, c-format msgid "Failed to change to directory “%s” (%s)" msgstr "Falha ao ir para o diretório “%s” (%s)" -#: glib/gspawn.c:2535 +#: glib/gspawn.c:2695 #, c-format msgid "Failed to execute child process “%s” (%s)" msgstr "Falha ao executar o sub processo “%s” (%s)" -#: glib/gspawn.c:2545 +#: glib/gspawn.c:2705 #, c-format msgid "Failed to open file to remap file descriptor (%s)" msgstr "Falha ao abrir o ficheiro para remapear o descritor do ficheiro (%s)" -#: glib/gspawn.c:2553 +#: glib/gspawn.c:2713 #, c-format msgid "Failed to duplicate file descriptor for child process (%s)" msgstr "Falha ao duplicar descritor do ficheiro para o sub processo (%s)" -#: glib/gspawn.c:2562 +#: glib/gspawn.c:2722 #, c-format msgid "Failed to fork child process (%s)" msgstr "Falha ao efetuar fork de sub processo (%s)" -#: glib/gspawn.c:2570 +#: glib/gspawn.c:2730 #, c-format msgid "Failed to close file descriptor for child process (%s)" -msgstr "Falha em fechar o descritor de ficheiro para sub processo (%s)" +msgstr "Falha ao fechar o descritor de ficheiro para sub processo (%s)" -#: glib/gspawn.c:2578 +#: glib/gspawn.c:2738 #, c-format msgid "Unknown error executing child process “%s”" msgstr "Erro desconhecido ao executar sub processo “%s”" -#: glib/gspawn.c:2602 +#: glib/gspawn.c:2762 #, c-format msgid "Failed to read enough data from child pid pipe (%s)" -msgstr "Impossível ler dados suficientes de canal pid acima (%s)" +msgstr "Falha ao ler dados suficientes de canal pid acima (%s)" + +#: glib/gspawn-private.h:134 +#, c-format +msgid "Invalid source FDs argument" +msgstr "Argumento de fontes FDs inválido" #: glib/gspawn-win32.c:337 msgid "Failed to read data from child process" @@ -5960,48 +5974,48 @@ msgid "Invalid program name: %s" msgstr "Nome de programa inválido: %s" -#: glib/gspawn-win32.c:521 glib/gspawn-win32.c:853 +#: glib/gspawn-win32.c:521 glib/gspawn-win32.c:868 #, c-format msgid "Invalid string in argument vector at %d: %s" msgstr "Cadeia inválida no vetor de argumentos na posição %d: %s" -#: glib/gspawn-win32.c:532 glib/gspawn-win32.c:869 +#: glib/gspawn-win32.c:532 glib/gspawn-win32.c:884 #, c-format msgid "Invalid string in environment: %s" msgstr "Cadeia inválida no ambiente: %s" -#: glib/gspawn-win32.c:849 +#: glib/gspawn-win32.c:864 #, c-format msgid "Invalid working directory: %s" msgstr "Pasta de trabalho inválida: %s" -#: glib/gspawn-win32.c:914 +#: glib/gspawn-win32.c:929 #, c-format msgid "Failed to execute helper program (%s)" msgstr "Falha ao executar aplicação auxiliar (%s)" -#: glib/gspawn-win32.c:1143 +#: glib/gspawn-win32.c:1158 msgid "" "Unexpected error in g_io_channel_win32_poll() reading data from a child " "process" msgstr "" "Erro inesperado no g_io_channel_win32_poll() ao ler dados de um sub processo" -#: glib/gstrfuncs.c:3366 glib/gstrfuncs.c:3468 +#: glib/gstrfuncs.c:3370 glib/gstrfuncs.c:3472 msgid "Empty string is not a number" msgstr "Cadeia vazia não é um número" -#: glib/gstrfuncs.c:3390 +#: glib/gstrfuncs.c:3394 #, c-format msgid "“%s” is not a signed number" msgstr "“%s” não é um número com sinal" -#: glib/gstrfuncs.c:3400 glib/gstrfuncs.c:3504 +#: glib/gstrfuncs.c:3404 glib/gstrfuncs.c:3508 #, c-format msgid "Number “%s” is out of bounds %s, %s" msgstr "Número “%s” está fora do limite %s, %s" -#: glib/gstrfuncs.c:3494 +#: glib/gstrfuncs.c:3498 #, c-format msgid "“%s” is not an unsigned number" msgstr "“%s” não é um valor sem sinal" @@ -6080,132 +6094,132 @@ msgstr "Carácter fora do limite para UTF-16" #. Translators: A unit symbol for size formatting, showing for example: "13.0 kB" -#: glib/gutils.c:2857 +#: glib/gutils.c:2966 msgid "kB" msgstr "kB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 MB" -#: glib/gutils.c:2859 +#: glib/gutils.c:2968 msgid "MB" msgstr "MB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 GB" -#: glib/gutils.c:2861 +#: glib/gutils.c:2970 msgid "GB" msgstr "GB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 TB" -#: glib/gutils.c:2863 +#: glib/gutils.c:2972 msgid "TB" msgstr "TB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 PB" -#: glib/gutils.c:2865 +#: glib/gutils.c:2974 msgid "PB" msgstr "PB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 EB" -#: glib/gutils.c:2867 +#: glib/gutils.c:2976 msgid "EB" msgstr "EB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 KiB" -#: glib/gutils.c:2871 +#: glib/gutils.c:2980 msgid "KiB" msgstr "KiB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 MiB" -#: glib/gutils.c:2873 +#: glib/gutils.c:2982 msgid "MiB" msgstr "MiB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 GiB" -#: glib/gutils.c:2875 +#: glib/gutils.c:2984 msgid "GiB" msgstr "GiB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 TiB" -#: glib/gutils.c:2877 +#: glib/gutils.c:2986 msgid "TiB" msgstr "TiB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 PiB" -#: glib/gutils.c:2879 +#: glib/gutils.c:2988 msgid "PiB" msgstr "PiB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 EiB" -#: glib/gutils.c:2881 +#: glib/gutils.c:2990 msgid "EiB" msgstr "EiB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 kb" -#: glib/gutils.c:2885 +#: glib/gutils.c:2994 msgid "kb" msgstr "kb" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Mb" -#: glib/gutils.c:2887 +#: glib/gutils.c:2996 msgid "Mb" msgstr "Mb" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Gb" -#: glib/gutils.c:2889 +#: glib/gutils.c:2998 msgid "Gb" msgstr "Gb" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Tb" -#: glib/gutils.c:2891 +#: glib/gutils.c:3000 msgid "Tb" msgstr "Tb" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Pb" -#: glib/gutils.c:2893 +#: glib/gutils.c:3002 msgid "Pb" msgstr "Pb" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Eb" -#: glib/gutils.c:2895 +#: glib/gutils.c:3004 msgid "Eb" msgstr "Eb" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Kib" -#: glib/gutils.c:2899 +#: glib/gutils.c:3008 msgid "Kib" msgstr "Kib" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Mib" -#: glib/gutils.c:2901 +#: glib/gutils.c:3010 msgid "Mib" msgstr "Mib" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Gib" -#: glib/gutils.c:2903 +#: glib/gutils.c:3012 msgid "Gib" msgstr "Gib" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Tib" -#: glib/gutils.c:2905 +#: glib/gutils.c:3014 msgid "Tib" msgstr "Tib" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Pib" -#: glib/gutils.c:2907 +#: glib/gutils.c:3016 msgid "Pib" msgstr "Pib" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Eib" -#: glib/gutils.c:2909 +#: glib/gutils.c:3018 msgid "Eib" msgstr "Eib" -#: glib/gutils.c:2947 +#: glib/gutils.c:3056 msgid "byte" msgid_plural "bytes" msgstr0 "byte" msgstr1 "bytes" -#: glib/gutils.c:2951 +#: glib/gutils.c:3060 msgid "bit" msgid_plural "bits" msgstr0 "bit" @@ -6213,7 +6227,7 @@ #. Translators: The "%u" is replaced with the size value, like "13"; it could #. * be part of "13 bytes", but only the number is requested this time. -#: glib/gutils.c:2959 +#: glib/gutils.c:3068 #, c-format msgctxt "format-size" msgid "%u" @@ -6221,7 +6235,7 @@ #. Translators: The first "%u" is replaced with the value, the "%s" with a unit of the value. #. * The order can be changed with "%$2s %$1u". An example: "13 bytes" -#: glib/gutils.c:2964 +#: glib/gutils.c:3073 #, c-format msgctxt "format-size" msgid "%u %s" @@ -6229,7 +6243,7 @@ #. Translators: The "%.1f" is replaced with the size value, like "13.0"; it could #. * be part of "13.0 MB", but only the number is requested this time. -#: glib/gutils.c:3000 +#: glib/gutils.c:3109 #, c-format msgctxt "format-size" msgid "%.1f" @@ -6238,14 +6252,14 @@ #. Translators: The first "%.1f" is replaced with the value, the "%s" with a unit of the value. #. * The order can be changed with "%$2s %$1.1f". Keep the no-break space between the value and #. * the unit symbol. An example: "13.0 MB" -#: glib/gutils.c:3006 +#: glib/gutils.c:3115 #, c-format msgctxt "format-size" msgid "%.1f %s" msgstr "%.1f %s" #. Translators: the %s in "%s bytes" will always be replaced by a number. -#: glib/gutils.c:3046 +#: glib/gutils.c:3155 #, c-format msgid "%s byte" msgid_plural "%s bytes" @@ -6253,14 +6267,14 @@ msgstr1 "%s bytes" #. Translators: the %s in "%s bits" will always be replaced by a number. -#: glib/gutils.c:3051 +#: glib/gutils.c:3160 #, c-format msgid "%s bit" msgid_plural "%s bits" msgstr0 "%s bit" msgstr1 "%s bits" -#: glib/gutils.c:3092 +#: glib/gutils.c:3201 #, c-format msgid "%u byte" msgid_plural "%u bytes" @@ -6272,32 +6286,32 @@ #. * compatibility. Users will not see this string unless a program is using this deprecated function. #. * Please translate as literally as possible. #. -#: glib/gutils.c:3105 +#: glib/gutils.c:3214 #, c-format msgid "%.1f KB" msgstr "%.1f KB" -#: glib/gutils.c:3110 +#: glib/gutils.c:3219 #, c-format msgid "%.1f MB" msgstr "%.1f MB" -#: glib/gutils.c:3115 +#: glib/gutils.c:3224 #, c-format msgid "%.1f GB" msgstr "%.1f GB" -#: glib/gutils.c:3120 +#: glib/gutils.c:3229 #, c-format msgid "%.1f TB" msgstr "%.1f TB" -#: glib/gutils.c:3125 +#: glib/gutils.c:3234 #, c-format msgid "%.1f PB" msgstr "%.1f PB" -#: glib/gutils.c:3130 +#: glib/gutils.c:3239 #, c-format msgid "%.1f EB" msgstr "%.1f EB"
View file
_service:tar_scm:glib-2.74.4.tar.xz/po/pt_BR.po -> _service:tar_scm:glib-2.76.4.tar.xz/po/pt_BR.po
Changed
@@ -17,22 +17,22 @@ # Enrico Nicoletto <hiko@duck.com>, 2013-2014, 2016, 2021-2022. # Rafael Fontenelle <rafaelff@gnome.org>, 2013-2022. # Matheus Barbosa <mdpb.matheus@gmail.com>, 2022. -# Leônidas Araújo <leorusvellt@hotmail.com>, 2022. +# Leônidas Araújo <leorusvellt@hotmail.com>, 2022-2023. # msgid "" msgstr "" "Project-Id-Version: glib\n" "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/glib/issues\n" -"POT-Creation-Date: 2022-08-27 14:11+0000\n" -"PO-Revision-Date: 2022-08-05 13:11-0300\n" +"POT-Creation-Date: 2023-05-24 08:58+0000\n" +"PO-Revision-Date: 2023-06-01 08:00-0300\n" "Last-Translator: Leônidas Araújo <leorusvellt@hotmail.com>\n" -"Language-Team: Brazilian Portuguese <gnome-pt_br-list@gnome.org>\n" +"Language-Team: Brazilian Portuguese <https://br.gnome.org/traducao>\n" "Language: pt_BR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n > 1)\n" -"X-Generator: Gtranslator 40.0\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" +"X-Generator: Poedit 3.2.2\n" "X-Project-Style: gnome\n" "X-DL-Team: pt_BR\n" "X-DL-Module: glib\n" @@ -40,22 +40,22 @@ "X-DL-Domain: po\n" "X-DL-State: Translating\n" -#: gio/gappinfo.c:335 +#: gio/gappinfo.c:339 msgid "Setting default applications not supported yet" msgstr "Definir aplicativos padrão ainda não suportado" -#: gio/gappinfo.c:368 +#: gio/gappinfo.c:372 msgid "Setting application as last used for type not supported yet" msgstr "" "Definir o aplicativo como usado pela última vez para o tipo ainda não " "suportado" -#: gio/gappinfo.c:810 +#: gio/gappinfo.c:814 #, c-format msgid "Failed to find default application for content type ‘%s’" msgstr "Falha ao encontrar o aplicativo padrão para o tipo de conteúdo '%s'" -#: gio/gappinfo.c:870 +#: gio/gappinfo.c:874 #, c-format msgid "Failed to find default application for URI Scheme ‘%s’" msgstr "Falha ao encontrar o aplicativo padrão para o Esquema de URI “%s”" @@ -159,7 +159,7 @@ "Identificador do aplicativo em formato D-Bus (ex: org.exemplo.visualizador)" #: gio/gapplication-tool.c:76 gio/glib-compile-resources.c:822 -#: gio/glib-compile-resources.c:828 gio/glib-compile-resources.c:857 +#: gio/glib-compile-resources.c:828 gio/glib-compile-resources.c:858 #: gio/gresource-tool.c:503 gio/gresource-tool.c:569 msgid "FILE" msgstr "ARQUIVO" @@ -258,11 +258,11 @@ msgid "error sending %s message to application: %s\n" msgstr "erro ao enviar %s mensagens ao aplicativo: %s\n" -#: gio/gapplication-tool.c:321 +#: gio/gapplication-tool.c:324 msgid "action name must be given after application id\n" msgstr "o nome da ação deve ser fornecido após o id do aplicativo\n" -#: gio/gapplication-tool.c:329 +#: gio/gapplication-tool.c:332 #, c-format msgid "" "invalid action name: “%s”\n" @@ -272,25 +272,25 @@ "os nomes de ações devem consistir de apenas caracteres alfanuméricos, “-” e " "“.”\n" -#: gio/gapplication-tool.c:348 +#: gio/gapplication-tool.c:351 #, c-format msgid "error parsing action parameter: %s\n" msgstr "erro ao analisar o parâmetro da ação: %s\n" -#: gio/gapplication-tool.c:360 +#: gio/gapplication-tool.c:363 msgid "actions accept a maximum of one parameter\n" msgstr "as ações aceitam um máximo de um parâmetro\n" -#: gio/gapplication-tool.c:415 +#: gio/gapplication-tool.c:418 msgid "list-actions command takes only the application id" msgstr "o comando list-actions leva apenas um id de aplicativo" -#: gio/gapplication-tool.c:425 +#: gio/gapplication-tool.c:428 #, c-format msgid "unable to find desktop file for application %s\n" msgstr "não foi possível localizar o arquivo desktop para o aplicativo %s\n" -#: gio/gapplication-tool.c:470 +#: gio/gapplication-tool.c:473 #, c-format msgid "" "unrecognised command: %s\n" @@ -302,7 +302,7 @@ #: gio/gbufferedinputstream.c:422 gio/gbufferedinputstream.c:500 #: gio/ginputstream.c:181 gio/ginputstream.c:381 gio/ginputstream.c:650 #: gio/ginputstream.c:1052 gio/goutputstream.c:225 gio/goutputstream.c:1051 -#: gio/gpollableinputstream.c:207 gio/gpollableoutputstream.c:279 +#: gio/gpollableinputstream.c:221 gio/gpollableoutputstream.c:293 #, c-format msgid "Too large count value passed to %s" msgstr "Valor muito alto passado para %s" @@ -325,7 +325,7 @@ msgid "Truncate not supported on base stream" msgstr "Não há suporte para truncar fluxo base" -#: gio/gcancellable.c:319 gio/gdbusconnection.c:1859 gio/gdbusprivate.c:1420 +#: gio/gcancellable.c:326 gio/gdbusconnection.c:1867 gio/gdbusprivate.c:1434 #: gio/gsimpleasyncresult.c:873 gio/gsimpleasyncresult.c:899 #, c-format msgid "Operation was cancelled" @@ -345,13 +345,13 @@ #: gio/gcharsetconverter.c:344 gio/gdatainputstream.c:850 #: gio/gdatainputstream.c:1268 glib/gconvert.c:451 glib/gconvert.c:883 -#: glib/giochannel.c:1576 glib/giochannel.c:1618 glib/giochannel.c:2473 +#: glib/giochannel.c:1576 glib/giochannel.c:1618 glib/giochannel.c:2478 #: glib/gutf8.c:892 glib/gutf8.c:1346 msgid "Invalid byte sequence in conversion input" msgstr "Sequência de bytes inválida na entrada de conversão" #: gio/gcharsetconverter.c:349 glib/gconvert.c:459 glib/gconvert.c:797 -#: glib/giochannel.c:1583 glib/giochannel.c:2485 +#: glib/giochannel.c:1583 glib/giochannel.c:2493 #, c-format msgid "Error during conversion: %s" msgstr "Erro durante a conversão: %s" @@ -410,18 +410,18 @@ msgid "Unexpected early end-of-stream" msgstr "Fim do fluxo inesperadamente prematuro" -#: gio/gdbusaddress.c:164 gio/gdbusaddress.c:238 gio/gdbusaddress.c:327 +#: gio/gdbusaddress.c:168 gio/gdbusaddress.c:240 gio/gdbusaddress.c:327 #, c-format msgid "Unsupported key “%s” in address entry “%s”" msgstr "Não há suporte a chave “%s” na entrada de endereço “%s”" -#: gio/gdbusaddress.c:177 +#: gio/gdbusaddress.c:181 #, c-format msgid "Meaningless key/value pair combination in address entry “%s”" msgstr "" "Combinação de pares chave/valor sem sentido na entrada de endereço “%s”" -#: gio/gdbusaddress.c:186 +#: gio/gdbusaddress.c:190 #, c-format msgid "" "Address “%s” is invalid (need exactly one of path, dir, tmpdir, or abstract " @@ -430,7 +430,7 @@ "O endereço “%s” é inválido (é necessário exatamente um dentre: caminho, " "diretório, diretório temporário ou chaves abstratas)" -#: gio/gdbusaddress.c:253 gio/gdbusaddress.c:264 gio/gdbusaddress.c:279 +#: gio/gdbusaddress.c:255 gio/gdbusaddress.c:266 gio/gdbusaddress.c:281 #: gio/gdbusaddress.c:342 gio/gdbusaddress.c:353 #, c-format msgid "Error in address “%s” — the “%s” attribute is malformed" @@ -563,7 +563,7 @@ "Não foi possível determinar o endereço de barramento da sessão (sem " "implementação para este SO)" -#: gio/gdbusaddress.c:1375 gio/gdbusconnection.c:7321 +#: gio/gdbusaddress.c:1380 gio/gdbusconnection.c:7326 #, c-format msgid "" "Cannot determine bus address from DBUS_STARTER_BUS_TYPE environment variable " @@ -572,7 +572,7 @@ "Não foi possível determinar o endereço de barramento da variável de ambiente " "DBUS_STARTER_BUS_TYPE — valor desconhecido “%s”" -#: gio/gdbusaddress.c:1384 gio/gdbusconnection.c:7330 +#: gio/gdbusaddress.c:1389 gio/gdbusconnection.c:7335 msgid "" "Cannot determine bus address because the DBUS_STARTER_BUS_TYPE environment " "variable is not set" @@ -580,7 +580,7 @@ "Não foi possível determinar o endereço do barramento porque a variável de " "ambiente DBUS_STARTER_BUS_TYPE não está definida" -#: gio/gdbusaddress.c:1394 +#: gio/gdbusaddress.c:1399 #, c-format msgid "Unknown bus type %d" msgstr "Tipo de barramento %d desconhecido" @@ -601,20 +601,24 @@ "Foram esgotados todos mecanismos de autenticação disponíveis (tentado: %s) " "(disponível: %s)" -#: gio/gdbusauth.c:1178 +#: gio/gdbusauth.c:1045 +msgid "Unexpected lack of content trying to read a byte" +msgstr "Falta de conteúdo inesperada ao tentar ler um byte" + +#: gio/gdbusauth.c:1195 msgid "User IDs must be the same for peer and server" msgstr "IDs de usuário devem ser o mesmo para a ponta e o servidor" -#: gio/gdbusauth.c:1190 +#: gio/gdbusauth.c:1207 msgid "Cancelled via GDBusAuthObserver::authorize-authenticated-peer" msgstr "Cancelado via GDBusAuthObserver::authorize-authenticated-peer" -#: gio/gdbusauthmechanismsha1.c:303 +#: gio/gdbusauthmechanismsha1.c:307 #, c-format msgid "Error when getting information for directory “%s”: %s" msgstr "Erro ao obter informação para o diretório “%s”: %s" -#: gio/gdbusauthmechanismsha1.c:318 +#: gio/gdbusauthmechanismsha1.c:322 #, c-format msgid "" "Permissions on directory “%s” are malformed. Expected mode 0700, got 0%o" @@ -622,32 +626,32 @@ "As permissões no diretório “%s” estão malformadas. É esperado 0700, mas foi " "obtido 0%o" -#: gio/gdbusauthmechanismsha1.c:351 gio/gdbusauthmechanismsha1.c:362 +#: gio/gdbusauthmechanismsha1.c:355 gio/gdbusauthmechanismsha1.c:366 #, c-format msgid "Error creating directory “%s”: %s" msgstr "Erro ao criar o diretório “%s”: %s" -#: gio/gdbusauthmechanismsha1.c:364 gio/gfile.c:1095 gio/gfile.c:1333 +#: gio/gdbusauthmechanismsha1.c:368 gio/gfile.c:1095 gio/gfile.c:1333 #: gio/gfile.c:1471 gio/gfile.c:1709 gio/gfile.c:1764 gio/gfile.c:1822 #: gio/gfile.c:1906 gio/gfile.c:1963 gio/gfile.c:2027 gio/gfile.c:2082 -#: gio/gfile.c:3787 gio/gfile.c:3927 gio/gfile.c:4339 gio/gfile.c:4809 -#: gio/gfile.c:5220 gio/gfile.c:5305 gio/gfile.c:5395 gio/gfile.c:5492 -#: gio/gfile.c:5579 gio/gfile.c:5680 gio/gfile.c:8809 gio/gfile.c:8899 -#: gio/gfile.c:8983 gio/win32/gwinhttpfile.c:453 +#: gio/gfile.c:3797 gio/gfile.c:3937 gio/gfile.c:4349 gio/gfile.c:4819 +#: gio/gfile.c:5230 gio/gfile.c:5315 gio/gfile.c:5405 gio/gfile.c:5502 +#: gio/gfile.c:5589 gio/gfile.c:5690 gio/gfile.c:8819 gio/gfile.c:8909 +#: gio/gfile.c:8993 gio/win32/gwinhttpfile.c:453 msgid "Operation not supported" msgstr "Operação sem suporte" -#: gio/gdbusauthmechanismsha1.c:407 +#: gio/gdbusauthmechanismsha1.c:411 #, c-format msgid "Error opening keyring “%s” for reading: " msgstr "Erro ao abrir o chaveiro “%s” para leitura: " -#: gio/gdbusauthmechanismsha1.c:430 gio/gdbusauthmechanismsha1.c:771 +#: gio/gdbusauthmechanismsha1.c:434 gio/gdbusauthmechanismsha1.c:775 #, c-format msgid "Line %d of the keyring at “%s” with content “%s” is malformed" msgstr "A linha %d do chaveiro em “%s” com o conteúdo “%s” está malformado" -#: gio/gdbusauthmechanismsha1.c:444 gio/gdbusauthmechanismsha1.c:785 +#: gio/gdbusauthmechanismsha1.c:448 gio/gdbusauthmechanismsha1.c:789 #, c-format msgid "" "First token of line %d of the keyring at “%s” with content “%s” is malformed" @@ -655,7 +659,7 @@ "O primeiro símbolo da linha %d do chaveiro em “%s” com o conteúdo “%s” está " "malformado" -#: gio/gdbusauthmechanismsha1.c:458 gio/gdbusauthmechanismsha1.c:799 +#: gio/gdbusauthmechanismsha1.c:462 gio/gdbusauthmechanismsha1.c:803 #, c-format msgid "" "Second token of line %d of the keyring at “%s” with content “%s” is malformed" @@ -663,167 +667,167 @@ "O segundo símbolo da linha %d do chaveiro em “%s” com o conteúdo “%s” está " "malformado" -#: gio/gdbusauthmechanismsha1.c:482 +#: gio/gdbusauthmechanismsha1.c:486 #, c-format msgid "Didn’t find cookie with id %d in the keyring at “%s”" msgstr "Não foi possível localizar um anexo com o ID %d no chaveiro em “%s”" -#: gio/gdbusauthmechanismsha1.c:539 +#: gio/gdbusauthmechanismsha1.c:543 #, c-format msgid "Error creating lock file “%s”: %s" msgstr "Erro ao criar o arquivo de bloqueio “%s”: %s" -#: gio/gdbusauthmechanismsha1.c:612 +#: gio/gdbusauthmechanismsha1.c:616 #, c-format msgid "Error deleting stale lock file “%s”: %s" msgstr "Erro ao excluir o arquivo de bloqueio anterior “%s”: %s" -#: gio/gdbusauthmechanismsha1.c:651 +#: gio/gdbusauthmechanismsha1.c:655 #, c-format msgid "Error closing (unlinked) lock file “%s”: %s" msgstr "Erro ao fechar o arquivo de bloqueio (desvinculado) “%s”: %s" -#: gio/gdbusauthmechanismsha1.c:662 +#: gio/gdbusauthmechanismsha1.c:666 #, c-format msgid "Error unlinking lock file “%s”: %s" msgstr "Erro ao desvincular o arquivo de bloqueio “%s”: %s" -#: gio/gdbusauthmechanismsha1.c:738 +#: gio/gdbusauthmechanismsha1.c:742 #, c-format msgid "Error opening keyring “%s” for writing: " msgstr "Erro ao abrir o chaveiro “%s” para escrita: " -#: gio/gdbusauthmechanismsha1.c:932 +#: gio/gdbusauthmechanismsha1.c:936 #, c-format msgid "(Additionally, releasing the lock for “%s” also failed: %s) " msgstr "(Adicionalmente, liberar o bloqueio de “%s” também falhou: %s) " -#: gio/gdbusconnection.c:590 gio/gdbusconnection.c:2404 +#: gio/gdbusconnection.c:590 gio/gdbusconnection.c:2415 msgid "The connection is closed" msgstr "A conexão está fechada" -#: gio/gdbusconnection.c:1889 +#: gio/gdbusconnection.c:1899 msgid "Timeout was reached" msgstr "O tempo limite foi alcançado" -#: gio/gdbusconnection.c:2527 +#: gio/gdbusconnection.c:2538 msgid "" "Unsupported flags encountered when constructing a client-side connection" msgstr "" "Foram encontrados sinalizadores sem suporte ao construir uma conexão do lado " "do cliente" -#: gio/gdbusconnection.c:4256 gio/gdbusconnection.c:4610 +#: gio/gdbusconnection.c:4267 gio/gdbusconnection.c:4621 #, c-format msgid "" "No such interface “org.freedesktop.DBus.Properties” on object at path %s" msgstr "" "Nenhuma interface “org.freedesktop.DBus.Properties” no objeto no caminho %s" -#: gio/gdbusconnection.c:4401 +#: gio/gdbusconnection.c:4412 #, c-format msgid "No such property “%s”" msgstr "Nenhuma propriedade “%s”" -#: gio/gdbusconnection.c:4413 +#: gio/gdbusconnection.c:4424 #, c-format msgid "Property “%s” is not readable" msgstr "A propriedade “%s” não pode ser lida" -#: gio/gdbusconnection.c:4424 +#: gio/gdbusconnection.c:4435 #, c-format msgid "Property “%s” is not writable" msgstr "A propriedade “%s” não pode ser escrita" -#: gio/gdbusconnection.c:4444 +#: gio/gdbusconnection.c:4455 #, c-format msgid "Error setting property “%s”: Expected type “%s” but got “%s”" msgstr "" "Erro ao definir a propriedade “%s”: o tipo esperado é “%s”, mas obteve “%s”" -#: gio/gdbusconnection.c:4549 gio/gdbusconnection.c:4764 -#: gio/gdbusconnection.c:6747 +#: gio/gdbusconnection.c:4560 gio/gdbusconnection.c:4775 +#: gio/gdbusconnection.c:6752 #, c-format msgid "No such interface “%s”" msgstr "Nenhuma interface “%s”" -#: gio/gdbusconnection.c:4986 gio/gdbusconnection.c:7261 +#: gio/gdbusconnection.c:4991 gio/gdbusconnection.c:7266 #, c-format msgid "No such interface “%s” on object at path %s" msgstr "Nenhuma interface “%s” no objeto no caminho %s" -#: gio/gdbusconnection.c:5087 +#: gio/gdbusconnection.c:5092 #, c-format msgid "No such method “%s”" msgstr "Método inexistente “%s”" -#: gio/gdbusconnection.c:5118 +#: gio/gdbusconnection.c:5123 #, c-format msgid "Type of message, “%s”, does not match expected type “%s”" msgstr "O tipo da mensagem, “%s”, não equivale ao tipo esperado “%s”" -#: gio/gdbusconnection.c:5321 +#: gio/gdbusconnection.c:5326 #, c-format msgid "An object is already exported for the interface %s at %s" msgstr "Um objeto já foi exportado para a interface %s em %s" -#: gio/gdbusconnection.c:5548 +#: gio/gdbusconnection.c:5553 #, c-format msgid "Unable to retrieve property %s.%s" msgstr "Não foi possível obter a propriedade %s.%s" -#: gio/gdbusconnection.c:5604 +#: gio/gdbusconnection.c:5609 #, c-format msgid "Unable to set property %s.%s" msgstr "Não foi possível definir a propriedade %s.%s" -#: gio/gdbusconnection.c:5783 +#: gio/gdbusconnection.c:5788 #, c-format msgid "Method “%s” returned type “%s”, but expected “%s”" msgstr "O método “%s” retornou o tipo “%s”, mas é esperado “%s”" -#: gio/gdbusconnection.c:6859 +#: gio/gdbusconnection.c:6864 #, c-format msgid "Method “%s” on interface “%s” with signature “%s” does not exist" msgstr "O método “%s” na interface “%s” com a assinatura “%s” não existe" -#: gio/gdbusconnection.c:6980 +#: gio/gdbusconnection.c:6985 #, c-format msgid "A subtree is already exported for %s" msgstr "Uma subárvore já foi exportada para %s" -#: gio/gdbusconnection.c:7269 +#: gio/gdbusconnection.c:7274 #, c-format msgid "Object does not exist at path “%s”" msgstr "O objeto não existe no caminho “%s”" -#: gio/gdbusmessage.c:1303 +#: gio/gdbusmessage.c:1306 msgid "type is INVALID" msgstr "o tipo é INVALID" -#: gio/gdbusmessage.c:1314 +#: gio/gdbusmessage.c:1317 msgid "METHOD_CALL message: PATH or MEMBER header field is missing" msgstr "" "Mensagem de METHOD_CALL: O campo de cabeçalho PATH ou MEMBER está faltando" -#: gio/gdbusmessage.c:1325 +#: gio/gdbusmessage.c:1328 msgid "METHOD_RETURN message: REPLY_SERIAL header field is missing" msgstr "" "Mensagem de METHOD_RETURN: O campo de cabeçalho REPLY_SERIAL está faltando" -#: gio/gdbusmessage.c:1337 +#: gio/gdbusmessage.c:1340 msgid "ERROR message: REPLY_SERIAL or ERROR_NAME header field is missing" msgstr "" "Mensagem de ERROR: O campo de cabeçalho REPLY_SERIAL ou ERROR_NAME está " "faltando" -#: gio/gdbusmessage.c:1350 +#: gio/gdbusmessage.c:1353 msgid "SIGNAL message: PATH, INTERFACE or MEMBER header field is missing" msgstr "" "Mensagem de SIGNAL: O campo de cabeçalho PATH, INTERFACE ou MEMBER está " "faltando" -#: gio/gdbusmessage.c:1358 +#: gio/gdbusmessage.c:1361 msgid "" "SIGNAL message: The PATH header field is using the reserved value /org/" "freedesktop/DBus/Local" @@ -831,7 +835,7 @@ "Mensagem de SIGNAL: O campo de cabeçalho PATH está usando o valor reservado /" "org/freedesktop/DBus/Local" -#: gio/gdbusmessage.c:1366 +#: gio/gdbusmessage.c:1369 msgid "" "SIGNAL message: The INTERFACE header field is using the reserved value org." "freedesktop.DBus.Local" @@ -839,21 +843,21 @@ "Mensagem de SIGNAL: O campo de cabeçalho INTERFACE está usando o valor " "reservado org.freedesktop.DBus.Local" -#: gio/gdbusmessage.c:1414 gio/gdbusmessage.c:1474 +#: gio/gdbusmessage.c:1417 gio/gdbusmessage.c:1477 #, c-format msgid "Wanted to read %lu byte but only got %lu" msgid_plural "Wanted to read %lu bytes but only got %lu" msgstr0 "Ao tentar ler %lu byte obteve-se %lu" msgstr1 "Ao tentar ler %lu bytes obteve-se %lu" -#: gio/gdbusmessage.c:1428 +#: gio/gdbusmessage.c:1431 #, c-format msgid "Expected NUL byte after the string “%s” but found byte %d" msgstr "" "Era esperado um byte NUL (nulo) após o texto “%s”, mas foi localizado o byte " "%d" -#: gio/gdbusmessage.c:1447 +#: gio/gdbusmessage.c:1450 #, c-format msgid "" "Expected valid UTF-8 string but found invalid bytes at byte offset %d " @@ -863,21 +867,21 @@ "posição %d (tamanho do texto é %d). O texto UTF-8 válido até este ponto era " "“%s”" -#: gio/gdbusmessage.c:1511 gio/gdbusmessage.c:1787 gio/gdbusmessage.c:1998 +#: gio/gdbusmessage.c:1514 gio/gdbusmessage.c:1790 gio/gdbusmessage.c:2001 msgid "Value nested too deeply" msgstr "Valor aninhado profundo demais" -#: gio/gdbusmessage.c:1679 +#: gio/gdbusmessage.c:1682 #, c-format msgid "Parsed value “%s” is not a valid D-Bus object path" msgstr "O valor “%s” analisado não é um objeto de caminho D-Bus válido" -#: gio/gdbusmessage.c:1703 +#: gio/gdbusmessage.c:1706 #, c-format msgid "Parsed value “%s” is not a valid D-Bus signature" msgstr "O valor “%s” analisado não é uma assinatura D-Bus válida" -#: gio/gdbusmessage.c:1754 +#: gio/gdbusmessage.c:1757 #, c-format msgid "" "Encountered array of length %u byte. Maximum length is 2<<26 bytes (64 MiB)." @@ -890,7 +894,7 @@ "Foi encontrado um vetor com tamanho de %u bytes. O tamanho máximo é de 2<<26 " "bytes (64 MiB)." -#: gio/gdbusmessage.c:1774 +#: gio/gdbusmessage.c:1777 #, c-format msgid "" "Encountered array of type “a%c”, expected to have a length a multiple of %u " @@ -900,16 +904,16 @@ "comprimento múltiplo de %u bytes, porém foi localizado %u bytes em " "comprimento" -#: gio/gdbusmessage.c:1928 gio/gdbusmessage.c:2647 +#: gio/gdbusmessage.c:1931 gio/gdbusmessage.c:2650 msgid "Empty structures (tuples) are not allowed in D-Bus" msgstr "Estruturas (tuplas) vazias não são permitidas no D-Bus" -#: gio/gdbusmessage.c:1982 +#: gio/gdbusmessage.c:1985 #, c-format msgid "Parsed value “%s” for variant is not a valid D-Bus signature" msgstr "O valor “%s” analisado para variante não é uma assinatura D-Bus válida" -#: gio/gdbusmessage.c:2023 +#: gio/gdbusmessage.c:2026 #, c-format msgid "" "Error deserializing GVariant with type string “%s” from the D-Bus wire format" @@ -917,7 +921,7 @@ "Erro ao desserializar GVariant com o texto de tipo “%s” do formato " "delimitado pelo D-Bus" -#: gio/gdbusmessage.c:2208 +#: gio/gdbusmessage.c:2211 #, c-format msgid "" "Invalid endianness value. Expected 0x6c (“l”) or 0x42 (“B”) but found value " @@ -926,31 +930,31 @@ "Valor identificador de endian inválido. Era esperado 0x6c (“l”) ou 0x42 " "(“B”), mas foi localizado o valor 0x%02x" -#: gio/gdbusmessage.c:2227 +#: gio/gdbusmessage.c:2230 #, c-format msgid "Invalid major protocol version. Expected 1 but found %d" msgstr "" "Versão majoritária de protocolo inválida. Era esperado 1, mas foi localizado " "%d" -#: gio/gdbusmessage.c:2285 gio/gdbusmessage.c:2883 +#: gio/gdbusmessage.c:2288 gio/gdbusmessage.c:2886 msgid "Signature header found but is not of type signature" msgstr "Cabeçalho da assinatura localizado, mas não é do tipo assinatura" -#: gio/gdbusmessage.c:2297 +#: gio/gdbusmessage.c:2300 #, c-format msgid "Signature header with signature “%s” found but message body is empty" msgstr "" "O cabeçalho de assinatura foi localizado com a assinatura “%s”, mas o corpo " "da mensagem está vazio" -#: gio/gdbusmessage.c:2312 +#: gio/gdbusmessage.c:2315 #, c-format msgid "Parsed value “%s” is not a valid D-Bus signature (for body)" msgstr "" "O valor “%s” analisado não é uma assinatura D-Bus válida (para o corpo)" -#: gio/gdbusmessage.c:2344 +#: gio/gdbusmessage.c:2347 #, 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" @@ -961,11 +965,11 @@ "Nenhum cabeçalho de assinatura na mensagem, mas o corpo da mensagem tem %u " "bytes" -#: gio/gdbusmessage.c:2354 +#: gio/gdbusmessage.c:2357 msgid "Cannot deserialize message: " msgstr "Não foi possível desserializar a mensagem: " -#: gio/gdbusmessage.c:2700 +#: gio/gdbusmessage.c:2703 #, c-format msgid "" "Error serializing GVariant with type string “%s” to the D-Bus wire format" @@ -973,7 +977,7 @@ "Erro ao serializar GVariant com o texto de tipo “%s” para o formato " "delimitado pelo D-Bus" -#: gio/gdbusmessage.c:2837 +#: gio/gdbusmessage.c:2840 #, c-format msgid "" "Number of file descriptors in message (%d) differs from header field (%d)" @@ -981,18 +985,18 @@ "O número de descritores de arquivo na mensagem (%d) difere do campo de " "cabeçalho (%d)" -#: gio/gdbusmessage.c:2845 +#: gio/gdbusmessage.c:2848 msgid "Cannot serialize message: " msgstr "Não foi possível serializar a mensagem: " -#: gio/gdbusmessage.c:2898 +#: gio/gdbusmessage.c:2901 #, c-format msgid "Message body has signature “%s” but there is no signature header" msgstr "" "O corpo da mensagem tem a assinatura “%s”, mas não há um cabeçalho de " "assinatura" -#: gio/gdbusmessage.c:2908 +#: gio/gdbusmessage.c:2911 #, c-format msgid "" "Message body has type signature “%s” but signature in the header field is " @@ -1001,54 +1005,54 @@ "O corpo da mensagem tem o tipo de assinatura “%s”, mas a assinatura no campo " "de cabeçalho é “%s”" -#: gio/gdbusmessage.c:2924 +#: gio/gdbusmessage.c:2927 #, c-format msgid "Message body is empty but signature in the header field is “(%s)”" msgstr "" "O corpo da mensagem está vazio, mas a assinatura no campo de cabeçalho é " "“(%s)”" -#: gio/gdbusmessage.c:3479 +#: gio/gdbusmessage.c:3482 #, c-format msgid "Error return with body of type “%s”" msgstr "Retorno de erro com o corpo de tipo “%s”" -#: gio/gdbusmessage.c:3487 +#: gio/gdbusmessage.c:3490 msgid "Error return with empty body" msgstr "Retorno de erro com o corpo vazio" -#: gio/gdbusprivate.c:2187 +#: gio/gdbusprivate.c:2201 #, c-format msgid "(Type any character to close this window)\n" msgstr "(Digite qualquer tecla para fechar esta janela)\n" -#: gio/gdbusprivate.c:2373 +#: gio/gdbusprivate.c:2387 #, c-format msgid "Session dbus not running, and autolaunch failed" msgstr "A sessão dbus não está em execução, e o início automático falhou" -#: gio/gdbusprivate.c:2396 +#: gio/gdbusprivate.c:2410 #, c-format msgid "Unable to get Hardware profile: %s" msgstr "Não foi possível obter o perfil da máquina: %s" #. Translators: Both placeholders are file paths -#: gio/gdbusprivate.c:2447 +#: gio/gdbusprivate.c:2461 #, c-format msgid "Unable to load %s or %s: " msgstr "Não foi possível carregar %s ou %s: " -#: gio/gdbusproxy.c:1575 +#: gio/gdbusproxy.c:1568 #, c-format msgid "Error calling StartServiceByName for %s: " msgstr "Erro ao chamar StartServiceByName para %s: " -#: gio/gdbusproxy.c:1598 +#: gio/gdbusproxy.c:1591 #, c-format msgid "Unexpected reply %d from StartServiceByName(\"%s\") method" msgstr "Resposta %d inesperada do método StartServiceByName(\"%s\")" -#: gio/gdbusproxy.c:2709 gio/gdbusproxy.c:2844 +#: gio/gdbusproxy.c:2702 gio/gdbusproxy.c:2837 #, c-format msgid "" "Cannot invoke method; proxy is for the well-known name %s without an owner, " @@ -1058,27 +1062,27 @@ "dono e o proxy foi construído com o sinalizador " "G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START" -#: gio/gdbusserver.c:765 +#: gio/gdbusserver.c:758 msgid "Abstract namespace not supported" msgstr "Sem suporte a espaço de nome abstrato" -#: gio/gdbusserver.c:857 +#: gio/gdbusserver.c:850 msgid "Cannot specify nonce file when creating a server" msgstr "" "Não foi possível especificar o arquivo de valor de uso único ao criar um " "servidor" -#: gio/gdbusserver.c:939 +#: gio/gdbusserver.c:932 #, c-format msgid "Error writing nonce file at “%s”: %s" msgstr "Erro ao gravar o arquivo de valor de uso único em “%s”: %s" -#: gio/gdbusserver.c:1114 +#: gio/gdbusserver.c:1107 #, c-format msgid "The string “%s” is not a valid D-Bus GUID" msgstr "O texto “%s” não é válido para GUID D-Bus" -#: gio/gdbusserver.c:1152 +#: gio/gdbusserver.c:1145 #, c-format msgid "Cannot listen on unsupported transport “%s”" msgstr "Não é possível escutar no transporte “%s” por falta de suporte" @@ -1106,14 +1110,14 @@ "\n" "Use “%s COMANDO --help” para obter ajuda de cada comando.\n" -#: gio/gdbus-tool.c:204 gio/gdbus-tool.c:276 gio/gdbus-tool.c:348 -#: gio/gdbus-tool.c:372 gio/gdbus-tool.c:862 gio/gdbus-tool.c:1247 -#: gio/gdbus-tool.c:1734 +#: gio/gdbus-tool.c:204 gio/gdbus-tool.c:276 gio/gdbus-tool.c:347 +#: gio/gdbus-tool.c:371 gio/gdbus-tool.c:861 gio/gdbus-tool.c:1246 +#: gio/gdbus-tool.c:1733 #, c-format msgid "Error: %s\n" msgstr "Erro: %s\n" -#: gio/gdbus-tool.c:215 gio/gdbus-tool.c:289 gio/gdbus-tool.c:1750 +#: gio/gdbus-tool.c:215 gio/gdbus-tool.c:289 gio/gdbus-tool.c:1749 #, c-format msgid "Error parsing introspection XML: %s\n" msgstr "Erro ao analisar XML de introspecção: %s\n" @@ -1123,50 +1127,50 @@ msgid "Error: %s is not a valid name\n" msgstr "Erro: %s não é um nome válido\n" -#: gio/gdbus-tool.c:258 gio/gdbus-tool.c:748 gio/gdbus-tool.c:1066 -#: gio/gdbus-tool.c:1900 gio/gdbus-tool.c:2140 +#: gio/gdbus-tool.c:258 gio/gdbus-tool.c:747 gio/gdbus-tool.c:1065 +#: gio/gdbus-tool.c:1899 gio/gdbus-tool.c:2139 #, c-format msgid "Error: %s is not a valid object path\n" msgstr "Erro: %s não é um caminho de objeto válido\n" -#: gio/gdbus-tool.c:406 +#: gio/gdbus-tool.c:405 msgid "Connect to the system bus" msgstr "Conectar ao barramento de sistema" -#: gio/gdbus-tool.c:407 +#: gio/gdbus-tool.c:406 msgid "Connect to the session bus" msgstr "Conectar ao barramento de sessão" -#: gio/gdbus-tool.c:408 +#: gio/gdbus-tool.c:407 msgid "Connect to given D-Bus address" msgstr "Conectar ao endereço D-Bus escolhido" -#: gio/gdbus-tool.c:418 +#: gio/gdbus-tool.c:417 msgid "Connection Endpoint Options:" msgstr "Opções de conexão de ponto final:" -#: gio/gdbus-tool.c:419 +#: gio/gdbus-tool.c:418 msgid "Options specifying the connection endpoint" msgstr "Opções especificando a conexão de ponto final" -#: gio/gdbus-tool.c:442 +#: gio/gdbus-tool.c:441 #, c-format msgid "No connection endpoint specified" msgstr "Nenhuma conexão de ponto final especificada" -#: gio/gdbus-tool.c:452 +#: gio/gdbus-tool.c:451 #, c-format msgid "Multiple connection endpoints specified" msgstr "Múltiplas conexões de ponto final especificadas" -#: gio/gdbus-tool.c:525 +#: gio/gdbus-tool.c:524 #, c-format msgid "" "Warning: According to introspection data, interface “%s” does not exist\n" msgstr "" "Aviso: De acordo com os dados de introspecção a interface “%s” não existe\n" -#: gio/gdbus-tool.c:534 +#: gio/gdbus-tool.c:533 #, c-format msgid "" "Warning: According to introspection data, method “%s” does not exist on " @@ -1175,166 +1179,166 @@ "Aviso: De acordo com os dados de introspecção o método “%s” não existe na " "interface “%s”\n" -#: gio/gdbus-tool.c:596 +#: gio/gdbus-tool.c:595 msgid "Optional destination for signal (unique name)" msgstr "Destino opcional para o sinal (nome único)" -#: gio/gdbus-tool.c:597 +#: gio/gdbus-tool.c:596 msgid "Object path to emit signal on" msgstr "Caminho do objeto para emitir sinal" -#: gio/gdbus-tool.c:598 +#: gio/gdbus-tool.c:597 msgid "Signal and interface name" msgstr "Nome de sinal e de interface" -#: gio/gdbus-tool.c:631 +#: gio/gdbus-tool.c:630 msgid "Emit a signal." msgstr "Emitir um sinal." -#: gio/gdbus-tool.c:686 gio/gdbus-tool.c:1003 gio/gdbus-tool.c:1837 -#: gio/gdbus-tool.c:2069 gio/gdbus-tool.c:2289 +#: gio/gdbus-tool.c:685 gio/gdbus-tool.c:1002 gio/gdbus-tool.c:1836 +#: gio/gdbus-tool.c:2068 gio/gdbus-tool.c:2288 #, c-format msgid "Error connecting: %s\n" msgstr "Erro ao conectar: %s\n" -#: gio/gdbus-tool.c:706 +#: gio/gdbus-tool.c:705 #, c-format msgid "Error: %s is not a valid unique bus name.\n" msgstr "Erro: %s não é um nome válido de barramento exclusivo.\n" -#: gio/gdbus-tool.c:725 gio/gdbus-tool.c:1046 gio/gdbus-tool.c:1880 +#: gio/gdbus-tool.c:724 gio/gdbus-tool.c:1045 gio/gdbus-tool.c:1879 msgid "Error: Object path is not specified\n" msgstr "Erro: O caminho do objeto não foi especificado\n" -#: gio/gdbus-tool.c:768 +#: gio/gdbus-tool.c:767 msgid "Error: Signal name is not specified\n" msgstr "Erro: O nome do sinal não foi especificado\n" -#: gio/gdbus-tool.c:782 +#: gio/gdbus-tool.c:781 #, c-format msgid "Error: Signal name “%s” is invalid\n" msgstr "Erro: O nome do sinal “%s” é inválido\n" -#: gio/gdbus-tool.c:794 +#: gio/gdbus-tool.c:793 #, c-format msgid "Error: %s is not a valid interface name\n" msgstr "Erro: %s não é um nome de interface válido\n" -#: gio/gdbus-tool.c:800 +#: gio/gdbus-tool.c:799 #, c-format msgid "Error: %s is not a valid member name\n" msgstr "Erro: %s não é um nome de membro válido\n" #. Use the original non-"parse-me-harder" error -#: gio/gdbus-tool.c:837 gio/gdbus-tool.c:1178 +#: gio/gdbus-tool.c:836 gio/gdbus-tool.c:1177 #, c-format msgid "Error parsing parameter %d: %s\n" msgstr "Erro ao analisar o parâmetro %d: %s\n" -#: gio/gdbus-tool.c:869 +#: gio/gdbus-tool.c:868 #, c-format msgid "Error flushing connection: %s\n" msgstr "Erro limpando conexão: %s\n" -#: gio/gdbus-tool.c:897 +#: gio/gdbus-tool.c:896 msgid "Destination name to invoke method on" msgstr "Nome do destino para chamar um método" -#: gio/gdbus-tool.c:898 +#: gio/gdbus-tool.c:897 msgid "Object path to invoke method on" msgstr "Caminho do objeto para chamar um método" -#: gio/gdbus-tool.c:899 +#: gio/gdbus-tool.c:898 msgid "Method and interface name" msgstr "Nome de método e de interface" -#: gio/gdbus-tool.c:900 +#: gio/gdbus-tool.c:899 msgid "Timeout in seconds" msgstr "Tempo limite em segundos" -#: gio/gdbus-tool.c:901 +#: gio/gdbus-tool.c:900 msgid "Allow interactive authorization" msgstr "Permitir autorização interativa" -#: gio/gdbus-tool.c:948 +#: gio/gdbus-tool.c:947 msgid "Invoke a method on a remote object." msgstr "Chamar um método no objeto remoto." -#: gio/gdbus-tool.c:1020 gio/gdbus-tool.c:1854 gio/gdbus-tool.c:2094 +#: gio/gdbus-tool.c:1019 gio/gdbus-tool.c:1853 gio/gdbus-tool.c:2093 msgid "Error: Destination is not specified\n" msgstr "Erro: O destino não foi especificado\n" -#: gio/gdbus-tool.c:1031 gio/gdbus-tool.c:1871 gio/gdbus-tool.c:2105 +#: gio/gdbus-tool.c:1030 gio/gdbus-tool.c:1870 gio/gdbus-tool.c:2104 #, c-format msgid "Error: %s is not a valid bus name\n" msgstr "Erro: %s não é um nome de barramento válido\n" -#: gio/gdbus-tool.c:1081 +#: gio/gdbus-tool.c:1080 msgid "Error: Method name is not specified\n" msgstr "Erro: O nome do método não foi especificado\n" -#: gio/gdbus-tool.c:1092 +#: gio/gdbus-tool.c:1091 #, c-format msgid "Error: Method name “%s” is invalid\n" msgstr "Erro: O nome do método “%s” é inválido\n" -#: gio/gdbus-tool.c:1170 +#: gio/gdbus-tool.c:1169 #, c-format msgid "Error parsing parameter %d of type “%s”: %s\n" msgstr "Erro ao analisar o parâmetro %d do tipo “%s”: %s\n" -#: gio/gdbus-tool.c:1196 +#: gio/gdbus-tool.c:1195 #, c-format msgid "Error adding handle %d: %s\n" msgstr "Erro ao adicionar manipulador %d: %s\n" -#: gio/gdbus-tool.c:1696 +#: gio/gdbus-tool.c:1695 msgid "Destination name to introspect" msgstr "Nome do destino para introspecção" -#: gio/gdbus-tool.c:1697 +#: gio/gdbus-tool.c:1696 msgid "Object path to introspect" msgstr "Caminho do objeto para introspecção" -#: gio/gdbus-tool.c:1698 +#: gio/gdbus-tool.c:1697 msgid "Print XML" msgstr "Exibir XML" -#: gio/gdbus-tool.c:1699 +#: gio/gdbus-tool.c:1698 msgid "Introspect children" msgstr "Auto-examinar filhos" -#: gio/gdbus-tool.c:1700 +#: gio/gdbus-tool.c:1699 msgid "Only print properties" msgstr "Apenas imprimir as propriedades" -#: gio/gdbus-tool.c:1789 +#: gio/gdbus-tool.c:1788 msgid "Introspect a remote object." msgstr "Introspecção de um objeto remoto." -#: gio/gdbus-tool.c:1995 +#: gio/gdbus-tool.c:1994 msgid "Destination name to monitor" msgstr "Nome do destino para monitorar" -#: gio/gdbus-tool.c:1996 +#: gio/gdbus-tool.c:1995 msgid "Object path to monitor" msgstr "Caminho do objeto para monitorar" -#: gio/gdbus-tool.c:2021 +#: gio/gdbus-tool.c:2020 msgid "Monitor a remote object." msgstr "Monitora um objeto remoto." -#: gio/gdbus-tool.c:2079 +#: gio/gdbus-tool.c:2078 msgid "Error: can’t monitor a non-message-bus connection\n" msgstr "" "Erro: não é possível monitorar uma conexão que não seja de barramento de " "mensagem\n" -#: gio/gdbus-tool.c:2203 +#: gio/gdbus-tool.c:2202 msgid "Service to activate before waiting for the other one (well-known name)" msgstr "Serviço a ser ativado antes de esperar por uma outra (nome conhecido)" -#: gio/gdbus-tool.c:2206 +#: gio/gdbus-tool.c:2205 msgid "" "Timeout to wait for before exiting with an error (seconds); 0 for no timeout " "(default)" @@ -1342,69 +1346,74 @@ "Tempo limite de espera antes de sair com um erro (segundos); 0 para nenhum " "tempo limite (padrão)" -#: gio/gdbus-tool.c:2254 +#: gio/gdbus-tool.c:2253 msgid "OPTION… BUS-NAME" msgstr "OPÇÃO… NOME-BARRAMENTO" -#: gio/gdbus-tool.c:2255 +#: gio/gdbus-tool.c:2254 msgid "Wait for a bus name to appear." msgstr "Espera por um nome de barramento para aparecer." -#: gio/gdbus-tool.c:2331 +#: gio/gdbus-tool.c:2330 msgid "Error: A service to activate for must be specified.\n" msgstr "Erro: Um serviço a ser ativado deve ser especificado.\n" -#: gio/gdbus-tool.c:2336 +#: gio/gdbus-tool.c:2335 msgid "Error: A service to wait for must be specified.\n" msgstr "Erro: Um serviço a ser esperado deve ser especificado.\n" -#: gio/gdbus-tool.c:2341 +#: gio/gdbus-tool.c:2340 msgid "Error: Too many arguments.\n" msgstr "Erro: Número excessivo de argumentos.\n" -#: gio/gdbus-tool.c:2349 gio/gdbus-tool.c:2356 +#: gio/gdbus-tool.c:2348 gio/gdbus-tool.c:2355 #, c-format msgid "Error: %s is not a valid well-known bus name.\n" msgstr "Erro: %s não é um nome válido de barramento conhecido.\n" -#: gio/gdebugcontrollerdbus.c:360 +#: gio/gdebugcontrollerdbus.c:361 #, c-format msgid "Not authorized to change debug settings" msgstr "Não autorizado para alterar configurações de depuração" -#: gio/gdesktopappinfo.c:2182 gio/gdesktopappinfo.c:5112 +#: gio/gdesktopappinfo.c:2242 gio/gdesktopappinfo.c:5226 msgid "Unnamed" msgstr "Sem nome" -#: gio/gdesktopappinfo.c:2592 +#: gio/gdesktopappinfo.c:2652 msgid "Desktop file didn’t specify Exec field" msgstr "O arquivo da área de trabalho não especifica o campo Exec" -#: gio/gdesktopappinfo.c:2891 +#: gio/gdesktopappinfo.c:2942 msgid "Unable to find terminal required for application" msgstr "Não é possível localizar o terminal requerido para o aplicativo" -#: gio/gdesktopappinfo.c:3630 +#: gio/gdesktopappinfo.c:3002 +#, c-format +msgid "Program ‘%s’ not found in $PATH" +msgstr "Programa “%s” não encontrado em $PATH" + +#: gio/gdesktopappinfo.c:3738 #, c-format msgid "Can’t create user application configuration folder %s: %s" msgstr "" "Não é possível criar pasta de configuração do aplicativo do usuário %s: %s" -#: gio/gdesktopappinfo.c:3634 +#: gio/gdesktopappinfo.c:3742 #, c-format msgid "Can’t create user MIME configuration folder %s: %s" msgstr "Não é possível criar pasta de configuração MIME do usuário %s: %s" -#: gio/gdesktopappinfo.c:3876 gio/gdesktopappinfo.c:3900 +#: gio/gdesktopappinfo.c:3984 gio/gdesktopappinfo.c:4008 msgid "Application information lacks an identifier" msgstr "A informação do aplicativo carece de um identificador" -#: gio/gdesktopappinfo.c:4136 +#: gio/gdesktopappinfo.c:4244 #, c-format msgid "Can’t create user desktop file %s" msgstr "Não é possível criar arquivo %s da área de trabalho do usuário" -#: gio/gdesktopappinfo.c:4272 +#: gio/gdesktopappinfo.c:4380 #, c-format msgid "Custom definition for %s" msgstr "Definição personalizada para %s" @@ -1477,7 +1486,7 @@ msgid "Containing mount does not exist" msgstr "Ponto de montagem contido não existe" -#: gio/gfile.c:2641 gio/glocalfile.c:2500 +#: gio/gfile.c:2641 gio/glocalfile.c:2515 msgid "Can’t copy over directory" msgstr "Não é possível copiar sobre diretório" @@ -1502,49 +1511,49 @@ msgid "Error splicing file: %s" msgstr "Erro ao unir o arquivo: %s" -#: gio/gfile.c:3185 +#: gio/gfile.c:3195 msgid "Copy (reflink/clone) between mounts is not supported" msgstr "Não há suporte a copiar (reflink/clone) entre montagens" -#: gio/gfile.c:3189 +#: gio/gfile.c:3199 msgid "Copy (reflink/clone) is not supported or invalid" msgstr "Não há suporte a copiar (reflink/clone) ou é inválido" -#: gio/gfile.c:3194 +#: gio/gfile.c:3204 msgid "Copy (reflink/clone) is not supported or didn’t work" msgstr "Não há suporte a copiar (reflink/clone) ou não funcionou" -#: gio/gfile.c:3259 +#: gio/gfile.c:3269 msgid "Can’t copy special file" msgstr "Não é possível copiar o arquivo especial" -#: gio/gfile.c:4153 +#: gio/gfile.c:4163 msgid "Invalid symlink value given" msgstr "Fornecido valor inválido de link simbólico" -#: gio/gfile.c:4163 glib/gfileutils.c:2335 +#: gio/gfile.c:4173 glib/gfileutils.c:2392 msgid "Symbolic links not supported" msgstr "Não há suporte a links simbólicos" -#: gio/gfile.c:4450 +#: gio/gfile.c:4460 msgid "Trash not supported" msgstr "Não há suporte para lixeira" -#: gio/gfile.c:4562 +#: gio/gfile.c:4572 #, c-format msgid "File names cannot contain “%c”" msgstr "Nomes de arquivo não podem conter “%c”" -#: gio/gfile.c:6993 gio/gfile.c:7119 +#: gio/gfile.c:7003 gio/gfile.c:7129 #, c-format msgid "Failed to create a temporary directory for template “%s”: %s" msgstr "Falha ao criar um diretório temporário para o modelo “%s”: %s" -#: gio/gfile.c:7408 gio/gvolume.c:366 +#: gio/gfile.c:7418 gio/gvolume.c:366 msgid "volume doesn’t implement mount" msgstr "volume não implementa montagem" -#: gio/gfile.c:7522 gio/gfile.c:7599 +#: gio/gfile.c:7532 gio/gfile.c:7609 msgid "No application is registered as handling this file" msgstr "Nenhum aplicativo está registrado como manipulador deste arquivo" @@ -1553,11 +1562,11 @@ msgstr "O enumerador está fechado" #: gio/gfileenumerator.c:221 gio/gfileenumerator.c:280 -#: gio/gfileenumerator.c:379 gio/gfileenumerator.c:478 +#: gio/gfileenumerator.c:424 gio/gfileenumerator.c:523 msgid "File enumerator has outstanding operation" msgstr "O enumerador do arquivo tem operação pendente" -#: gio/gfileenumerator.c:370 gio/gfileenumerator.c:469 +#: gio/gfileenumerator.c:415 gio/gfileenumerator.c:514 msgid "File enumerator is already closed" msgstr "O enumerador do arquivo já está fechado" @@ -1623,37 +1632,37 @@ msgid "HTTP proxy server closed connection unexpectedly." msgstr "O servidor proxy HTTP fechou a conexão de forma inesperada." -#: gio/gicon.c:300 +#: gio/gicon.c:299 #, c-format msgid "Wrong number of tokens (%d)" msgstr "Número errado de tokens (%d)" -#: gio/gicon.c:320 +#: gio/gicon.c:319 #, c-format msgid "No type for class name %s" msgstr "Sem tipo para a classe chamada %s" -#: gio/gicon.c:330 +#: gio/gicon.c:329 #, c-format msgid "Type %s does not implement the GIcon interface" msgstr "O tipo %s não implementa a interface GIcon" -#: gio/gicon.c:341 +#: gio/gicon.c:340 #, c-format msgid "Type %s is not classed" msgstr "O tipo %s não tem classe" -#: gio/gicon.c:355 +#: gio/gicon.c:354 #, c-format msgid "Malformed version number: %s" msgstr "Número de versão malformado: %s" -#: gio/gicon.c:369 +#: gio/gicon.c:368 #, c-format msgid "Type %s does not implement from_tokens() on the GIcon interface" msgstr "O tipo %s não implementa from_tokens() na interface GIcon" -#: gio/gicon.c:471 +#: gio/gicon.c:470 msgid "Can’t handle the supplied version of the icon encoding" msgstr "Não é possível lidar com a versão fornecida da codificação do ícone" @@ -1800,12 +1809,12 @@ msgstr "Erro ao gravar para a saída padrão" #. Translators: commandline placeholder -#: gio/gio-tool-cat.c:135 gio/gio-tool-info.c:379 gio/gio-tool-list.c:173 +#: gio/gio-tool-cat.c:135 gio/gio-tool-info.c:382 gio/gio-tool-list.c:176 #: gio/gio-tool-mkdir.c:50 gio/gio-tool-monitor.c:39 gio/gio-tool-monitor.c:41 #: gio/gio-tool-monitor.c:43 gio/gio-tool-monitor.c:45 -#: gio/gio-tool-monitor.c:206 gio/gio-tool-mount.c:1202 gio/gio-tool-open.c:72 +#: gio/gio-tool-monitor.c:206 gio/gio-tool-mount.c:1210 gio/gio-tool-open.c:72 #: gio/gio-tool-remove.c:50 gio/gio-tool-rename.c:47 gio/gio-tool-set.c:95 -#: gio/gio-tool-trash.c:222 gio/gio-tool-tree.c:241 +#: gio/gio-tool-trash.c:222 gio/gio-tool-tree.c:246 msgid "LOCATION" msgstr "LOCAL" @@ -1823,8 +1832,8 @@ "usando locais GIO em vez de arquivos locais: por exemplo, você pode\n" "usar alguma coisa como smb://servidor/recurso/arquivo.txt como local." -#: gio/gio-tool-cat.c:164 gio/gio-tool-info.c:410 gio/gio-tool-mkdir.c:78 -#: gio/gio-tool-monitor.c:231 gio/gio-tool-mount.c:1253 gio/gio-tool-open.c:98 +#: gio/gio-tool-cat.c:164 gio/gio-tool-info.c:413 gio/gio-tool-mkdir.c:78 +#: gio/gio-tool-monitor.c:231 gio/gio-tool-mount.c:1261 gio/gio-tool-open.c:98 #: gio/gio-tool-remove.c:74 gio/gio-tool-trash.c:303 msgid "No locations given" msgstr "Nenhum local fornecido" @@ -1920,57 +1929,57 @@ msgid "attributes:\n" msgstr "atributos:\n" -#: gio/gio-tool-info.c:165 gio/gio-tool-info.c:174 +#: gio/gio-tool-info.c:166 gio/gio-tool-info.c:176 #, c-format msgid "display name: %s\n" msgstr "nome de exibição: %s\n" -#: gio/gio-tool-info.c:182 +#: gio/gio-tool-info.c:184 #, c-format msgid "name: %s\n" msgstr "nome: %s\n" -#: gio/gio-tool-info.c:189 +#: gio/gio-tool-info.c:191 #, c-format msgid "type: %s\n" msgstr "tipo: %s\n" -#: gio/gio-tool-info.c:195 +#: gio/gio-tool-info.c:197 msgid "size: " msgstr "tamanho: " -#: gio/gio-tool-info.c:200 +#: gio/gio-tool-info.c:203 msgid "hidden\n" msgstr "oculto\n" -#: gio/gio-tool-info.c:203 +#: gio/gio-tool-info.c:206 #, c-format msgid "uri: %s\n" msgstr "uri: %s\n" -#: gio/gio-tool-info.c:210 +#: gio/gio-tool-info.c:213 #, c-format msgid "local path: %s\n" msgstr "caminho local: %s\n" -#: gio/gio-tool-info.c:244 +#: gio/gio-tool-info.c:247 #, c-format msgid "unix mount: %s%s %s %s %s\n" msgstr "montagem unix: %s%s %s %s %s\n" -#: gio/gio-tool-info.c:325 +#: gio/gio-tool-info.c:328 msgid "Settable attributes:\n" msgstr "Atributos definíveis:\n" -#: gio/gio-tool-info.c:349 +#: gio/gio-tool-info.c:352 msgid "Writable attribute namespaces:\n" msgstr "Atributos graváveis no namespace:\n" -#: gio/gio-tool-info.c:384 +#: gio/gio-tool-info.c:387 msgid "Show information about locations." msgstr "Mostra informações sobre locais." -#: gio/gio-tool-info.c:386 +#: gio/gio-tool-info.c:389 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" @@ -2038,11 +2047,11 @@ msgid "Print full URIs" msgstr "Imprime URIs completas" -#: gio/gio-tool-list.c:178 +#: gio/gio-tool-list.c:181 msgid "List the contents of the locations." msgstr "Lista o conteúdo dos locais." -#: gio/gio-tool-list.c:180 +#: gio/gio-tool-list.c:183 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" @@ -2238,19 +2247,19 @@ msgid "Mount a TCRYPT system volume" msgstr "Mota um volume TCRYPT de sistema" -#: gio/gio-tool-mount.c:268 gio/gio-tool-mount.c:300 +#: gio/gio-tool-mount.c:276 gio/gio-tool-mount.c:308 msgid "Anonymous access denied" msgstr "Acesso anônimo negado" -#: gio/gio-tool-mount.c:525 +#: gio/gio-tool-mount.c:533 msgid "No drive for device file" msgstr "Nenhuma unidade para o arquivo de dispositivo" -#: gio/gio-tool-mount.c:1017 +#: gio/gio-tool-mount.c:1025 msgid "No volume for given ID" msgstr "Nenhum volume para o ID dado" -#: gio/gio-tool-mount.c:1206 +#: gio/gio-tool-mount.c:1214 msgid "Mount or unmount the locations." msgstr "Monta ou desmontar os locais." @@ -2450,11 +2459,11 @@ msgid "Follow symbolic links, mounts and shortcuts" msgstr "Segue links simbólicos, montagens e atalhos" -#: gio/gio-tool-tree.c:246 +#: gio/gio-tool-tree.c:251 msgid "List contents of directories in a tree-like format." msgstr "Lista conteúdos de diretórios em um formato tipo árvore." -#: gio/glib-compile-resources.c:142 gio/glib-compile-schemas.c:1516 +#: gio/glib-compile-resources.c:142 gio/glib-compile-schemas.c:1514 #, c-format msgid "Element <%s> not allowed inside <%s>" msgstr "O elemento <%s> não é permitido dentro de <%s>" @@ -2511,7 +2520,7 @@ msgid "text may not appear inside <%s>" msgstr "texto não pode aparecer dentro de <%s>" -#: gio/glib-compile-resources.c:821 gio/glib-compile-schemas.c:2174 +#: gio/glib-compile-resources.c:821 gio/glib-compile-schemas.c:2172 msgid "Show program version and exit" msgstr "Mostra a versão do programa e sai" @@ -2527,8 +2536,8 @@ "Os diretórios do quais serão carregados arquivos referenciados em ARQUIVO " "(padrão: diretório atual)" -#: gio/glib-compile-resources.c:823 gio/glib-compile-schemas.c:2175 -#: gio/glib-compile-schemas.c:2204 +#: gio/glib-compile-resources.c:823 gio/glib-compile-schemas.c:2173 +#: gio/glib-compile-schemas.c:2203 msgid "DIRECTORY" msgstr "DIRETÓRIO" @@ -2581,7 +2590,7 @@ msgid "The target C compiler (default: the CC environment variable)" msgstr "O compilador C alvo (padrão: a variável de ambiente CC)" -#: gio/glib-compile-resources.c:860 +#: gio/glib-compile-resources.c:861 msgid "" "Compile a resource specification into a resource file.\n" "Resource specification files have the extension .gresource.xml,\n" @@ -2591,123 +2600,123 @@ "Arquivos de especificação de recurso têm a extensão .gresource.xml,\n" "e um arquivo de recurso tem a extensão .gresource." -#: gio/glib-compile-resources.c:882 +#: gio/glib-compile-resources.c:893 msgid "You should give exactly one file name\n" msgstr "Você deve fornecer exatamente um arquivo\n" -#: gio/glib-compile-schemas.c:94 +#: gio/glib-compile-schemas.c:95 #, c-format msgid "nick must be a minimum of 2 characters" msgstr "o apelido deve ter um mínimo de 2 caracteres" -#: gio/glib-compile-schemas.c:105 +#: gio/glib-compile-schemas.c:106 #, c-format msgid "Invalid numeric value" msgstr "Valor numérico inválido" -#: gio/glib-compile-schemas.c:113 +#: gio/glib-compile-schemas.c:114 #, c-format msgid "<value nick='%s'/> already specified" msgstr "<value nick='%s'/> já especificado" -#: gio/glib-compile-schemas.c:121 +#: gio/glib-compile-schemas.c:122 #, c-format msgid "value='%s' already specified" msgstr "value='%s' já especificado" -#: gio/glib-compile-schemas.c:135 +#: gio/glib-compile-schemas.c:136 #, c-format msgid "flags values must have at most 1 bit set" msgstr "valores de sinalizadores devem ter no máximo 1 bit definido" -#: gio/glib-compile-schemas.c:160 +#: gio/glib-compile-schemas.c:161 #, c-format msgid "<%s> must contain at least one <value>" msgstr "<%s> deve conter pelo menos um <value>" -#: gio/glib-compile-schemas.c:316 +#: gio/glib-compile-schemas.c:317 #, c-format msgid "<%s> is not contained in the specified range" msgstr "<%s> não está contido no intervalo especificado" -#: gio/glib-compile-schemas.c:328 +#: gio/glib-compile-schemas.c:329 #, c-format msgid "<%s> is not a valid member of the specified enumerated type" msgstr "<%s> não é um membro válido do tipo enumerado especificado" -#: gio/glib-compile-schemas.c:334 +#: gio/glib-compile-schemas.c:335 #, c-format msgid "<%s> contains string not in the specified flags type" msgstr "<%s> contém string ausente no tipo de sinalizadores especializados" -#: gio/glib-compile-schemas.c:340 +#: gio/glib-compile-schemas.c:341 #, c-format msgid "<%s> contains a string not in <choices>" msgstr "<%s> contém uma string ausente em <choices>" -#: gio/glib-compile-schemas.c:374 +#: gio/glib-compile-schemas.c:375 msgid "<range/> already specified for this key" msgstr "<range/> já especificado para essa chave" -#: gio/glib-compile-schemas.c:392 +#: gio/glib-compile-schemas.c:393 #, c-format msgid "<range> not allowed for keys of type “%s”" msgstr "<range> não permitido para as chaves de tipo “%s”" -#: gio/glib-compile-schemas.c:409 +#: gio/glib-compile-schemas.c:410 #, c-format msgid "<range> specified minimum is greater than maximum" msgstr "o mínimo do <range> especificado é maior que o máximo" -#: gio/glib-compile-schemas.c:434 +#: gio/glib-compile-schemas.c:435 #, c-format msgid "unsupported l10n category: %s" msgstr "categoria de l10n sem suporte: %s" -#: gio/glib-compile-schemas.c:442 +#: gio/glib-compile-schemas.c:443 msgid "l10n requested, but no gettext domain given" msgstr "l10n requisitado, mas nenhum domínio gettext dado" -#: gio/glib-compile-schemas.c:454 +#: gio/glib-compile-schemas.c:455 msgid "translation context given for value without l10n enabled" msgstr "contexto de tradução dado para o valor sem l10n habilitado" -#: gio/glib-compile-schemas.c:476 +#: gio/glib-compile-schemas.c:477 #, c-format msgid "Failed to parse <default> value of type “%s”: " msgstr "Falha ao analisar o valor <default> de tipo “%s”: " -#: gio/glib-compile-schemas.c:493 +#: gio/glib-compile-schemas.c:494 msgid "" "<choices> cannot be specified for keys tagged as having an enumerated type" msgstr "" "<choices> não pode ser especificado para chaves marcadas como tendo um tipo " "enumerado" -#: gio/glib-compile-schemas.c:502 +#: gio/glib-compile-schemas.c:503 msgid "<choices> already specified for this key" msgstr "<choices> já especificado para essa chave" -#: gio/glib-compile-schemas.c:514 +#: gio/glib-compile-schemas.c:515 #, c-format msgid "<choices> not allowed for keys of type “%s”" msgstr "<choices> não permitido para as chaves de tipo “%s”" -#: gio/glib-compile-schemas.c:530 +#: gio/glib-compile-schemas.c:531 #, c-format msgid "<choice value='%s'/> already given" msgstr "<choice value='%s'/> já dado" -#: gio/glib-compile-schemas.c:545 +#: gio/glib-compile-schemas.c:546 #, c-format msgid "<choices> must contain at least one <choice>" msgstr "<choices> deve conter pelo menos um <choice>" -#: gio/glib-compile-schemas.c:559 +#: gio/glib-compile-schemas.c:560 msgid "<aliases> already specified for this key" msgstr "<aliases> já especificado para essa chave" -#: gio/glib-compile-schemas.c:563 +#: gio/glib-compile-schemas.c:564 msgid "" "<aliases> can only be specified for keys with enumerated or flags types or " "after <choices>" @@ -2715,49 +2724,49 @@ "<aliases> só pode ser especificado para chaves com tipos enumerados ou " "sinalizadores ou após <choices>" -#: gio/glib-compile-schemas.c:582 +#: gio/glib-compile-schemas.c:583 #, c-format msgid "" "<alias value='%s'/> given when “%s” is already a member of the enumerated " "type" msgstr "<alias value='%s'/> dado quando “%s” já é um membro do tipo enumerado" -#: gio/glib-compile-schemas.c:588 +#: gio/glib-compile-schemas.c:589 #, c-format msgid "<alias value='%s'/> given when <choice value='%s'/> was already given" msgstr "" "<alias value='%s'/> dado quando <choice value='%s'/> já tinha sido dado" -#: gio/glib-compile-schemas.c:596 +#: gio/glib-compile-schemas.c:597 #, c-format msgid "<alias value='%s'/> already specified" msgstr "<alias value='%s'/> já especificado" -#: gio/glib-compile-schemas.c:606 +#: gio/glib-compile-schemas.c:607 #, c-format msgid "alias target “%s” is not in enumerated type" msgstr "o alvo do alias “%s” não é um tipo enumerado" -#: gio/glib-compile-schemas.c:607 +#: gio/glib-compile-schemas.c:608 #, c-format msgid "alias target “%s” is not in <choices>" msgstr "o alvo alias “%s” não está em <choices>" -#: gio/glib-compile-schemas.c:622 +#: gio/glib-compile-schemas.c:623 #, c-format msgid "<aliases> must contain at least one <alias>" msgstr "<aliases> deve conter pelo menos um <alias>" -#: gio/glib-compile-schemas.c:799 +#: gio/glib-compile-schemas.c:797 msgid "Empty names are not permitted" msgstr "Nomes vazios não são permitidos" -#: gio/glib-compile-schemas.c:809 +#: gio/glib-compile-schemas.c:807 #, c-format msgid "Invalid name “%s”: names must begin with a lowercase letter" msgstr "Nome inválido “%s”: nomes precisam começar com uma letra minúscula" -#: gio/glib-compile-schemas.c:821 +#: gio/glib-compile-schemas.c:819 #, c-format msgid "" "Invalid name “%s”: invalid character “%c”; only lowercase letters, numbers " @@ -2766,36 +2775,36 @@ "Nome inválido “%s”: caractere inválido “%c”; apenas é permitido letras " "minúsculas, números e traços (”-”)" -#: gio/glib-compile-schemas.c:830 +#: gio/glib-compile-schemas.c:828 #, c-format msgid "Invalid name “%s”: two successive hyphens (“--”) are not permitted" msgstr "Nome inválido “%s”: dois hifens (”--”) consecutivos não são permitidos" -#: gio/glib-compile-schemas.c:839 +#: gio/glib-compile-schemas.c:837 #, c-format msgid "Invalid name “%s”: the last character may not be a hyphen (“-”)" msgstr "Nome inválido “%s”: o último caractere não pode ser um hífen (”-”)" -#: gio/glib-compile-schemas.c:847 +#: gio/glib-compile-schemas.c:845 #, c-format msgid "Invalid name “%s”: maximum length is 1024" msgstr "Nome inválido “%s”: o tamanho máximo é 1024" -#: gio/glib-compile-schemas.c:919 +#: gio/glib-compile-schemas.c:917 #, c-format msgid "<child name='%s'> already specified" msgstr "<child name='%s'> já especificado" -#: gio/glib-compile-schemas.c:945 +#: gio/glib-compile-schemas.c:943 msgid "Cannot add keys to a “list-of” schema" msgstr "Não é possível adicionar chaves ao esquema “list-of”" -#: gio/glib-compile-schemas.c:956 +#: gio/glib-compile-schemas.c:954 #, c-format msgid "<key name='%s'> already specified" msgstr "<key name='%s'> já especificado" -#: gio/glib-compile-schemas.c:974 +#: gio/glib-compile-schemas.c:972 #, c-format msgid "" "<key name='%s'> shadows <key name='%s'> in <schema id='%s'>; use <override> " @@ -2804,7 +2813,7 @@ "<key name='%s'> oculta <key name='%s'> em <schema id='%s'>; use <override> " "para modificar o valor" -#: gio/glib-compile-schemas.c:985 +#: gio/glib-compile-schemas.c:983 #, c-format msgid "" "Exactly one of “type”, “enum” or “flags” must be specified as an attribute " @@ -2813,63 +2822,63 @@ "Apenas um entre “type”, “enum” ou “flags” deve ser especificado como " "atributo para <key>" -#: gio/glib-compile-schemas.c:1004 +#: gio/glib-compile-schemas.c:1002 #, c-format msgid "<%s id='%s'> not (yet) defined." msgstr "<%s id='%s'> não está (ainda) definido." -#: gio/glib-compile-schemas.c:1019 +#: gio/glib-compile-schemas.c:1017 #, c-format msgid "Invalid GVariant type string “%s”" msgstr "Tipo inválido de texto GVariant “%s”" -#: gio/glib-compile-schemas.c:1049 +#: gio/glib-compile-schemas.c:1047 msgid "<override> given but schema isn’t extending anything" msgstr "<override> determinado, mas o esquema não está estendendo nada" -#: gio/glib-compile-schemas.c:1062 +#: gio/glib-compile-schemas.c:1060 #, c-format msgid "No <key name='%s'> to override" msgstr "Nenhum <key name='%s'> para sobrescrever" -#: gio/glib-compile-schemas.c:1070 +#: gio/glib-compile-schemas.c:1068 #, c-format msgid "<override name='%s'> already specified" msgstr "<override name='%s'> já especificado" -#: gio/glib-compile-schemas.c:1143 +#: gio/glib-compile-schemas.c:1141 #, c-format msgid "<schema id='%s'> already specified" msgstr "<schema id='%s'> já especificado" -#: gio/glib-compile-schemas.c:1155 +#: gio/glib-compile-schemas.c:1153 #, c-format msgid "<schema id='%s'> extends not yet existing schema “%s”" msgstr "<schema id='%s'> estende um esquema ainda não existente “%s”" -#: gio/glib-compile-schemas.c:1171 +#: gio/glib-compile-schemas.c:1169 #, c-format msgid "<schema id='%s'> is list of not yet existing schema “%s”" msgstr "<schema id='%s'> é uma lista de esquema ainda não existente “%s”" -#: gio/glib-compile-schemas.c:1179 +#: gio/glib-compile-schemas.c:1177 #, c-format msgid "Cannot be a list of a schema with a path" msgstr "Não pode ser uma lista de um esquema com um caminho" -#: gio/glib-compile-schemas.c:1189 +#: gio/glib-compile-schemas.c:1187 #, c-format msgid "Cannot extend a schema with a path" msgstr "Não é possível estender um esquema com um caminho" -#: gio/glib-compile-schemas.c:1199 +#: gio/glib-compile-schemas.c:1197 #, c-format msgid "" "<schema id='%s'> is a list, extending <schema id='%s'> which is not a list" msgstr "" "<schema id='%s'> é uma lista, estendendo <schema id='%s'> que não é uma lista" -#: gio/glib-compile-schemas.c:1209 +#: gio/glib-compile-schemas.c:1207 #, c-format msgid "" "<schema id='%s' list-of='%s'> extends <schema id='%s' list-of='%s'> but “%s” " @@ -2878,17 +2887,17 @@ "<schema id='%s' list-of='%s'> estende <schema id='%s' list-of='%s'>, mas " "“%s” não estende “%s”" -#: gio/glib-compile-schemas.c:1226 +#: gio/glib-compile-schemas.c:1224 #, c-format msgid "A path, if given, must begin and end with a slash" msgstr "Um caminho, se determinado, precisa começar e terminar com uma barra" -#: gio/glib-compile-schemas.c:1233 +#: gio/glib-compile-schemas.c:1231 #, c-format msgid "The path of a list must end with “:/”" msgstr "O caminho de uma lista precisa terminar com “:/”" -#: gio/glib-compile-schemas.c:1242 +#: gio/glib-compile-schemas.c:1240 #, c-format msgid "" "Warning: Schema “%s” has path “%s”. Paths starting with “/apps/”, “/" @@ -2897,49 +2906,49 @@ "Aviso: Esquema “%s” possui caminho “%s”. Caminhos iniciando com “/apps/”, “/" "desktop/” ou “/system/” são obsoletos." -#: gio/glib-compile-schemas.c:1272 +#: gio/glib-compile-schemas.c:1270 #, c-format msgid "<%s id='%s'> already specified" msgstr "<%s id='%s'> já especificado" -#: gio/glib-compile-schemas.c:1422 gio/glib-compile-schemas.c:1438 +#: gio/glib-compile-schemas.c:1420 gio/glib-compile-schemas.c:1436 #, c-format msgid "Only one <%s> element allowed inside <%s>" msgstr "Apenas um elemento <%s> é permitido dentro de um <%s>" -#: gio/glib-compile-schemas.c:1520 +#: gio/glib-compile-schemas.c:1518 #, c-format msgid "Element <%s> not allowed at the top level" msgstr "O elemento <%s> não é permitido no nível mais alto" -#: gio/glib-compile-schemas.c:1538 +#: gio/glib-compile-schemas.c:1536 msgid "Element <default> is required in <key>" msgstr "O elemento <default> é exigido por <key>" -#: gio/glib-compile-schemas.c:1628 +#: gio/glib-compile-schemas.c:1626 #, c-format msgid "Text may not appear inside <%s>" msgstr "Texto não pode aparecer dentro de <%s>" -#: gio/glib-compile-schemas.c:1696 +#: gio/glib-compile-schemas.c:1694 #, c-format msgid "Warning: undefined reference to <schema id='%s'/>" msgstr "Aviso: referência indefinida a <schema id='%s'/>" #. Translators: Do not translate "--strict". -#: gio/glib-compile-schemas.c:1835 gio/glib-compile-schemas.c:1914 +#: gio/glib-compile-schemas.c:1833 gio/glib-compile-schemas.c:1912 msgid "--strict was specified; exiting." msgstr "--strict foi especificado; saindo." -#: gio/glib-compile-schemas.c:1847 +#: gio/glib-compile-schemas.c:1845 msgid "This entire file has been ignored." msgstr "Todo o arquivo foi ignorado." -#: gio/glib-compile-schemas.c:1910 +#: gio/glib-compile-schemas.c:1908 msgid "Ignoring this file." msgstr "Ignorando este arquivo." -#: gio/glib-compile-schemas.c:1965 +#: gio/glib-compile-schemas.c:1963 #, c-format msgid "" "No such key “%s” in schema “%s” as specified in override file “%s”; ignoring " @@ -2948,7 +2957,7 @@ "Nenhuma chave “%s” no esquema “%s” como especificado no arquivo de " "sobrescrita “%s”; ignorando sobrescrita para essa chave." -#: gio/glib-compile-schemas.c:1973 +#: gio/glib-compile-schemas.c:1971 #, c-format msgid "" "No such key “%s” in schema “%s” as specified in override file “%s” and --" @@ -2957,7 +2966,7 @@ "Nenhuma chave “%s” no esquema “%s” como especificado no arquivo de " "sobrescrita “%s” e --strict foi especificado; saindo." -#: gio/glib-compile-schemas.c:1995 +#: gio/glib-compile-schemas.c:1993 #, c-format msgid "" "Cannot provide per-desktop overrides for localized key “%s” in schema " @@ -2967,7 +2976,7 @@ "“%s” no esquema “%s” (arquivo de substituição “%s”); ignorando substituição " "para esta chave." -#: gio/glib-compile-schemas.c:2004 +#: gio/glib-compile-schemas.c:2002 #, c-format msgid "" "Cannot provide per-desktop overrides for localized key “%s” in schema " @@ -2977,7 +2986,7 @@ "“%s” no esquema “%s” (arquivo de substituição “%s”) e --script foi " "especificado; saindo." -#: gio/glib-compile-schemas.c:2028 +#: gio/glib-compile-schemas.c:2026 #, c-format msgid "" "Error parsing key “%s” in schema “%s” as specified in override file “%s”: " @@ -2986,7 +2995,7 @@ "Erro ao analisar chave “%s” no esquema “%s” como especificado no arquivo de " "sobrescrita “%s”: %s. Ignorando sobrescrita para essa chave." -#: gio/glib-compile-schemas.c:2040 +#: gio/glib-compile-schemas.c:2038 #, c-format msgid "" "Error parsing key “%s” in schema “%s” as specified in override file “%s”: " @@ -2995,7 +3004,7 @@ "Erro ao analisar chave “%s” no esquema “%s” como especificado no arquivo de " "sobrescrita “%s”: %s. --script foi especificado; saindo." -#: gio/glib-compile-schemas.c:2067 +#: gio/glib-compile-schemas.c:2065 #, c-format msgid "" "Override for key “%s” in schema “%s” in override file “%s” is outside the " @@ -3005,7 +3014,7 @@ "está fora dos limites dado pelo esquema; ignorando sobrescrita para essa " "chave." -#: gio/glib-compile-schemas.c:2077 +#: gio/glib-compile-schemas.c:2075 #, c-format msgid "" "Override for key “%s” in schema “%s” in override file “%s” is outside the " @@ -3014,7 +3023,7 @@ "Sobrescrita para chave “%s” no esquema “%s” no arquivo de sobrescrita “%s” " "está fora dos limites dado pelo esquema e --script foi especificado; saindo." -#: gio/glib-compile-schemas.c:2103 +#: gio/glib-compile-schemas.c:2101 #, c-format msgid "" "Override for key “%s” in schema “%s” in override file “%s” is not in the " @@ -3023,7 +3032,7 @@ "Sobrescrita para a chave “%s” no esquema “%s” no arquivo de sobrescrita “%s” " "não está na lista de escolhas válidas; ignorando sobrescrita para essa chave." -#: gio/glib-compile-schemas.c:2113 +#: gio/glib-compile-schemas.c:2111 #, c-format msgid "" "Override for key “%s” in schema “%s” in override file “%s” is not in the " @@ -3032,23 +3041,23 @@ "Sobrescrita para a chave “%s” no esquema “%s” no arquivo de sobrescrita “%s” " "não está na lista de escolhas válidas e --scrict foi especificado; saindo." -#: gio/glib-compile-schemas.c:2175 +#: gio/glib-compile-schemas.c:2173 msgid "Where to store the gschemas.compiled file" msgstr "Onde armazenar o arquivo gschemas compilado" -#: gio/glib-compile-schemas.c:2176 +#: gio/glib-compile-schemas.c:2174 msgid "Abort on any errors in schemas" msgstr "Aborta se ocorrer erros nos esquemas" -#: gio/glib-compile-schemas.c:2177 +#: gio/glib-compile-schemas.c:2175 msgid "Do not write the gschema.compiled file" msgstr "Não escreve o arquivo gschema compilado" -#: gio/glib-compile-schemas.c:2178 +#: gio/glib-compile-schemas.c:2176 msgid "Do not enforce key name restrictions" msgstr "Não força restrições de nome de chave" -#: gio/glib-compile-schemas.c:2207 +#: gio/glib-compile-schemas.c:2206 msgid "" "Compile all GSettings schema files into a schema cache.\n" "Schema files are required to have the extension .gschema.xml,\n" @@ -3058,25 +3067,25 @@ "É necessário que os arquivos schema tenham a extensão\n" ".gschema.xml, e o arquivo de cache é chamado gschemas.compiled." -#: gio/glib-compile-schemas.c:2228 +#: gio/glib-compile-schemas.c:2238 msgid "You should give exactly one directory name" msgstr "Você deveria dar exatamente um nome de diretório" -#: gio/glib-compile-schemas.c:2271 +#: gio/glib-compile-schemas.c:2285 msgid "No schema files found: doing nothing." msgstr "Nenhum arquivo schema localizado: fazendo nada." -#: gio/glib-compile-schemas.c:2273 +#: gio/glib-compile-schemas.c:2287 msgid "No schema files found: removed existing output file." msgstr "" "Nenhum arquivo de schema encontrado: arquivo de saída existente removido." -#: gio/glocalfile.c:563 gio/win32/gwinhttpfile.c:436 +#: gio/glocalfile.c:567 gio/win32/gwinhttpfile.c:436 #, c-format msgid "Invalid filename %s" msgstr "Nome de arquivo inválido: %s" -#: gio/glocalfile.c:996 +#: gio/glocalfile.c:1009 #, c-format msgid "Error getting filesystem info for %s: %s" msgstr "Erro ao obter informações do sistema de arquivos para %s: %s" @@ -3085,262 +3094,262 @@ #. * the enclosing (user visible) mount of a file, but none #. * exists. #. -#: gio/glocalfile.c:1137 +#: gio/glocalfile.c:1145 #, c-format msgid "Containing mount for file %s not found" msgstr "Ponto de montagem contido para arquivo %s não existe" -#: gio/glocalfile.c:1160 +#: gio/glocalfile.c:1168 msgid "Can’t rename root directory" msgstr "Não é possível renomear o diretório root" -#: gio/glocalfile.c:1178 gio/glocalfile.c:1201 +#: gio/glocalfile.c:1186 gio/glocalfile.c:1209 #, c-format msgid "Error renaming file %s: %s" msgstr "Erro ao renomear arquivo %s: %s" -#: gio/glocalfile.c:1185 +#: gio/glocalfile.c:1193 msgid "Can’t rename file, filename already exists" msgstr "Não é possível renomear o arquivo, o nome do arquivo já existe" -#: gio/glocalfile.c:1198 gio/glocalfile.c:2394 gio/glocalfile.c:2422 -#: gio/glocalfile.c:2561 gio/glocalfileoutputstream.c:658 +#: gio/glocalfile.c:1206 gio/glocalfile.c:2409 gio/glocalfile.c:2437 +#: gio/glocalfile.c:2576 gio/glocalfileoutputstream.c:658 msgid "Invalid filename" msgstr "Nome de arquivo inválido" -#: gio/glocalfile.c:1366 gio/glocalfile.c:1377 +#: gio/glocalfile.c:1374 gio/glocalfile.c:1385 #, c-format msgid "Error opening file %s: %s" msgstr "Erro ao abrir arquivo %s: %s" -#: gio/glocalfile.c:1502 +#: gio/glocalfile.c:1510 #, c-format msgid "Error removing file %s: %s" msgstr "Erro ao remover arquivo %s: %s" -#: gio/glocalfile.c:1996 gio/glocalfile.c:2007 gio/glocalfile.c:2034 +#: gio/glocalfile.c:2004 gio/glocalfile.c:2015 gio/glocalfile.c:2042 #, c-format msgid "Error trashing file %s: %s" msgstr "Erro ao mover para a lixeira o arquivo %s: %s" -#: gio/glocalfile.c:2054 +#: gio/glocalfile.c:2062 #, c-format msgid "Unable to create trash directory %s: %s" msgstr "Não é possível criar o diretório da lixeira %s: %s" -#: gio/glocalfile.c:2075 +#: gio/glocalfile.c:2083 #, c-format msgid "Unable to find toplevel directory to trash %s" msgstr "Não é possível localizar diretório de nível superior para a lixeira %s" -#: gio/glocalfile.c:2083 +#: gio/glocalfile.c:2091 #, c-format msgid "Trashing on system internal mounts is not supported" msgstr "Não há suporte a mover para lixeira em montagens internas do sistema" -#: gio/glocalfile.c:2169 gio/glocalfile.c:2197 +#: gio/glocalfile.c:2177 gio/glocalfile.c:2205 #, c-format msgid "Unable to find or create trash directory %s to trash %s" msgstr "" "Não é possível localizar ou criar o diretório da lixeira %s para a lixeira %s" -#: gio/glocalfile.c:2243 +#: gio/glocalfile.c:2249 #, c-format msgid "Unable to create trashing info file for %s: %s" msgstr "Não é possível criar o arquivo de informações da lixeira para %s: %s" -#: gio/glocalfile.c:2305 +#: gio/glocalfile.c:2320 #, c-format msgid "Unable to trash file %s across filesystem boundaries" msgstr "" "Não é possível mover para a lixeira o arquivo %s entre os limites de sistema " "de arquivos" -#: gio/glocalfile.c:2309 gio/glocalfile.c:2365 +#: gio/glocalfile.c:2324 gio/glocalfile.c:2380 #, c-format msgid "Unable to trash file %s: %s" msgstr "Não é possível mover para a lixeira o arquivo %s: %s" -#: gio/glocalfile.c:2371 +#: gio/glocalfile.c:2386 #, c-format msgid "Unable to trash file %s" msgstr "Não é possível mover para a lixeira o arquivo %s" -#: gio/glocalfile.c:2397 +#: gio/glocalfile.c:2412 #, c-format msgid "Error creating directory %s: %s" msgstr "Erro ao criar o diretório %s: %s" -#: gio/glocalfile.c:2426 +#: gio/glocalfile.c:2441 #, c-format msgid "Filesystem does not support symbolic links" msgstr "O sistema de arquivos não tem suporte a links simbólicos" -#: gio/glocalfile.c:2429 +#: gio/glocalfile.c:2444 #, c-format msgid "Error making symbolic link %s: %s" msgstr "Erro ao criar link simbólico %s: %s" -#: gio/glocalfile.c:2472 gio/glocalfile.c:2507 gio/glocalfile.c:2564 +#: gio/glocalfile.c:2487 gio/glocalfile.c:2522 gio/glocalfile.c:2579 #, c-format msgid "Error moving file %s: %s" msgstr "Erro ao mover arquivo %s: %s" -#: gio/glocalfile.c:2495 +#: gio/glocalfile.c:2510 msgid "Can’t move directory over directory" msgstr "Não é possível mover diretório sobre diretório" -#: gio/glocalfile.c:2521 gio/glocalfileoutputstream.c:1110 +#: gio/glocalfile.c:2536 gio/glocalfileoutputstream.c:1110 #: gio/glocalfileoutputstream.c:1124 gio/glocalfileoutputstream.c:1139 #: gio/glocalfileoutputstream.c:1156 gio/glocalfileoutputstream.c:1170 msgid "Backup file creation failed" msgstr "Falha ao criar arquivo de backup" -#: gio/glocalfile.c:2540 +#: gio/glocalfile.c:2555 #, c-format msgid "Error removing target file: %s" msgstr "Erro ao remover arquivo alvo: %s" -#: gio/glocalfile.c:2554 +#: gio/glocalfile.c:2569 msgid "Move between mounts not supported" msgstr "Não há suporte a mover entre montagens" -#: gio/glocalfile.c:2728 +#: gio/glocalfile.c:2745 #, c-format msgid "Could not determine the disk usage of %s: %s" msgstr "Não foi possível determinar a utilização de disco de %s: %s" -#: gio/glocalfileinfo.c:775 +#: gio/glocalfileinfo.c:779 msgid "Attribute value must be non-NULL" msgstr "Valor de atributo deve ser não-NULO" -#: gio/glocalfileinfo.c:782 +#: gio/glocalfileinfo.c:786 msgid "Invalid attribute type (string or invalid expected)" msgstr "Tipo de atributo inválido (string ou inválido esperado)" -#: gio/glocalfileinfo.c:789 +#: gio/glocalfileinfo.c:793 msgid "Invalid extended attribute name" msgstr "Nome de atributo estendido inválido" -#: gio/glocalfileinfo.c:840 +#: gio/glocalfileinfo.c:844 #, c-format msgid "Error setting extended attribute “%s”: %s" msgstr "Erro ao definir atributo estendido “%s”: %s" -#: gio/glocalfileinfo.c:1738 gio/win32/gwinhttpfile.c:191 +#: gio/glocalfileinfo.c:1823 gio/win32/gwinhttpfile.c:191 msgid " (invalid encoding)" msgstr " (codificação inválida)" -#: gio/glocalfileinfo.c:1897 gio/glocalfileoutputstream.c:945 +#: gio/glocalfileinfo.c:1982 gio/glocalfileoutputstream.c:945 #: gio/glocalfileoutputstream.c:997 #, c-format msgid "Error when getting information for file “%s”: %s" msgstr "Erro ao obter informação para o arquivo “%s”: %s" -#: gio/glocalfileinfo.c:2163 +#: gio/glocalfileinfo.c:2288 #, c-format msgid "Error when getting information for file descriptor: %s" msgstr "Erro ao obter informação para o descritor de arquivo: %s" -#: gio/glocalfileinfo.c:2208 +#: gio/glocalfileinfo.c:2333 msgid "Invalid attribute type (uint32 expected)" msgstr "Tipo de atributo inválido (esperado uint32)" -#: gio/glocalfileinfo.c:2226 +#: gio/glocalfileinfo.c:2351 msgid "Invalid attribute type (uint64 expected)" msgstr "Tipo de atributo inválido (esperado uint64)" -#: gio/glocalfileinfo.c:2245 gio/glocalfileinfo.c:2264 +#: gio/glocalfileinfo.c:2370 gio/glocalfileinfo.c:2389 msgid "Invalid attribute type (byte string expected)" msgstr "Tipo de atributo inválido (expressão de byte esperada)" -#: gio/glocalfileinfo.c:2311 +#: gio/glocalfileinfo.c:2436 msgid "Cannot set permissions on symlinks" msgstr "Não foi possível definir permissões aos links simbólicos" -#: gio/glocalfileinfo.c:2327 +#: gio/glocalfileinfo.c:2452 #, c-format msgid "Error setting permissions: %s" msgstr "Erro ao definir permissões: %s" -#: gio/glocalfileinfo.c:2378 +#: gio/glocalfileinfo.c:2503 #, c-format msgid "Error setting owner: %s" msgstr "Erro ao definir proprietário: %s" -#: gio/glocalfileinfo.c:2401 +#: gio/glocalfileinfo.c:2526 msgid "symlink must be non-NULL" msgstr "o link simbólico deve ser não-NULO" -#: gio/glocalfileinfo.c:2411 gio/glocalfileinfo.c:2430 -#: gio/glocalfileinfo.c:2441 +#: gio/glocalfileinfo.c:2536 gio/glocalfileinfo.c:2555 +#: gio/glocalfileinfo.c:2566 #, c-format msgid "Error setting symlink: %s" msgstr "Erro ao definir link simbólico: %s" -#: gio/glocalfileinfo.c:2420 +#: gio/glocalfileinfo.c:2545 msgid "Error setting symlink: file is not a symlink" msgstr "Erro ao definir link simbólico: o arquivo não é um link simbólico" -#: gio/glocalfileinfo.c:2492 +#: gio/glocalfileinfo.c:2637 #, c-format msgid "Extra nanoseconds %d for UNIX timestamp %lld are negative" msgstr "" "Os nanossegundos extras %d para a marca de data/hora UNIX %lld são negativos" -#: gio/glocalfileinfo.c:2501 +#: gio/glocalfileinfo.c:2646 #, c-format msgid "Extra nanoseconds %d for UNIX timestamp %lld reach 1 second" msgstr "" "Os nanossegundos extras %d para a marca de data/hora UNIX %lld alcança 1 " "segundo" -#: gio/glocalfileinfo.c:2511 +#: gio/glocalfileinfo.c:2656 #, c-format msgid "UNIX timestamp %lld does not fit into 64 bits" msgstr "A marca de data/hora UNIX %lld não cabe em 64 bits" -#: gio/glocalfileinfo.c:2522 +#: gio/glocalfileinfo.c:2667 #, c-format msgid "UNIX timestamp %lld is outside of the range supported by Windows" msgstr "" "A marca de data/hora UNIX %lld está fora do intervalo suportado pelo Windows" -#: gio/glocalfileinfo.c:2625 +#: gio/glocalfileinfo.c:2799 #, c-format msgid "File name “%s” cannot be converted to UTF-16" msgstr "O nome de arquivo “%s” não pode ser convertido para UTF-16" -#: gio/glocalfileinfo.c:2644 +#: gio/glocalfileinfo.c:2818 #, c-format msgid "File “%s” cannot be opened: Windows Error %lu" msgstr "O arquivo “%s” não pôde ser aberto: Erro %lu do Windows" -#: gio/glocalfileinfo.c:2657 +#: gio/glocalfileinfo.c:2831 #, c-format msgid "Error setting modification or access time for file “%s”: %lu" msgstr "" "Erro ao definir data/hora de modificação ou acesso para o arquivo “%s”: %lu" -#: gio/glocalfileinfo.c:2798 gio/glocalfileinfo.c:2810 +#: gio/glocalfileinfo.c:2988 #, c-format msgid "Error setting modification or access time: %s" msgstr "Erro ao definir data/hora de modificação ou acesso: %s" -#: gio/glocalfileinfo.c:2833 +#: gio/glocalfileinfo.c:3011 msgid "SELinux context must be non-NULL" msgstr "O contexto SELinux deve ser não-NULO" -#: gio/glocalfileinfo.c:2840 +#: gio/glocalfileinfo.c:3018 msgid "SELinux is not enabled on this system" msgstr "SELinux não está habilitado neste sistema" -#: gio/glocalfileinfo.c:2850 +#: gio/glocalfileinfo.c:3028 #, c-format msgid "Error setting SELinux context: %s" msgstr "Erro ao definir o contexto SELinux: %s" -#: gio/glocalfileinfo.c:2947 +#: gio/glocalfileinfo.c:3125 #, c-format msgid "Setting attribute %s not supported" msgstr "Não há suporte à definição do atributo %s" @@ -3387,13 +3396,13 @@ msgid "Error renaming temporary file: %s" msgstr "Erro ao renomear arquivo temporário: %s" -#: gio/glocalfileoutputstream.c:611 gio/glocalfileoutputstream.c:1241 +#: gio/glocalfileoutputstream.c:611 gio/glocalfileoutputstream.c:1242 #, c-format msgid "Error truncating file: %s" msgstr "Erro ao truncar arquivo: %s" #: gio/glocalfileoutputstream.c:664 gio/glocalfileoutputstream.c:909 -#: gio/glocalfileoutputstream.c:1222 gio/gsubprocess.c:231 +#: gio/glocalfileoutputstream.c:1223 gio/gsubprocess.c:231 #, c-format msgid "Error opening file “%s”: %s" msgstr "Erro ao abrir arquivo “%s”: %s" @@ -3410,7 +3419,7 @@ msgid "The file was externally modified" msgstr "O arquivo foi modificado externamente" -#: gio/glocalfileoutputstream.c:1204 +#: gio/glocalfileoutputstream.c:1205 #, c-format msgid "Error removing old file: %s" msgstr "Erro ao remover arquivo antigo: %s" @@ -3559,8 +3568,8 @@ #. Translators: the first placeholder is a domain name, the #. * second is an error message #: gio/gresolver.c:403 gio/gthreadedresolver.c:152 gio/gthreadedresolver.c:170 -#: gio/gthreadedresolver.c:782 gio/gthreadedresolver.c:806 -#: gio/gthreadedresolver.c:831 gio/gthreadedresolver.c:846 +#: gio/gthreadedresolver.c:798 gio/gthreadedresolver.c:822 +#: gio/gthreadedresolver.c:847 gio/gthreadedresolver.c:862 #, c-format msgid "Error resolving “%s”: %s" msgstr "Erro ao resolver “%s”: %s" @@ -3577,8 +3586,8 @@ #: gio/gresource.c:683 gio/gresource.c:945 gio/gresource.c:985 #: gio/gresource.c:1109 gio/gresource.c:1181 gio/gresource.c:1255 -#: gio/gresource.c:1336 gio/gresourcefile.c:478 gio/gresourcefile.c:601 -#: gio/gresourcefile.c:752 +#: gio/gresource.c:1336 gio/gresourcefile.c:478 gio/gresourcefile.c:602 +#: gio/gresourcefile.c:753 #, c-format msgid "The resource at “%s” does not exist" msgstr "O recurso em “%s” não existe" @@ -3588,16 +3597,16 @@ msgid "The resource at “%s” failed to decompress" msgstr "Falha ao descompactar o recurso em “%s”" -#: gio/gresourcefile.c:658 +#: gio/gresourcefile.c:659 msgid "Resource files cannot be renamed" msgstr "Os arquivos de recursos não podem ser renomeados" -#: gio/gresourcefile.c:748 +#: gio/gresourcefile.c:749 #, c-format msgid "The resource at “%s” is not a directory" msgstr "O recurso em “%s” não é um diretório" -#: gio/gresourcefile.c:956 +#: gio/gresourcefile.c:957 msgid "Input stream doesn’t implement seek" msgstr "Fluxo de entrada não implementa busca" @@ -3963,7 +3972,7 @@ msgid "Socket is already closed" msgstr "O soquete já está fechado" -#: gio/gsocket.c:449 gio/gsocket.c:3201 gio/gsocket.c:4434 gio/gsocket.c:4492 +#: gio/gsocket.c:449 gio/gsocket.c:3225 gio/gsocket.c:4458 gio/gsocket.c:4516 msgid "Socket I/O timed out" msgstr "Tempo de E/S do soquete foi esgotado" @@ -4060,74 +4069,74 @@ msgid "No support for IPv6 source-specific multicast" msgstr "Não há suporte para multicast específico da origem IPv6" -#: gio/gsocket.c:2900 +#: gio/gsocket.c:2924 #, c-format msgid "Error accepting connection: %s" msgstr "Erro ao aceitar a conexão: %s" -#: gio/gsocket.c:3026 +#: gio/gsocket.c:3050 msgid "Connection in progress" msgstr "Conexão em progresso" -#: gio/gsocket.c:3077 +#: gio/gsocket.c:3101 msgid "Unable to get pending error: " msgstr "Não é possível obter erro pendente: " -#: gio/gsocket.c:3266 +#: gio/gsocket.c:3290 #, c-format msgid "Error receiving data: %s" msgstr "Erro ao receber dados: %s" -#: gio/gsocket.c:3463 +#: gio/gsocket.c:3487 #, c-format msgid "Error sending data: %s" msgstr "Erro ao enviar dados: %s" -#: gio/gsocket.c:3650 +#: gio/gsocket.c:3674 #, c-format msgid "Unable to shutdown socket: %s" msgstr "Não é possível encerrar soquete: %s" -#: gio/gsocket.c:3731 +#: gio/gsocket.c:3755 #, c-format msgid "Error closing socket: %s" msgstr "Erro ao fechar soquete: %s" -#: gio/gsocket.c:4427 +#: gio/gsocket.c:4451 #, c-format msgid "Waiting for socket condition: %s" msgstr "Aguardando pela condição do soquete: %s" -#: gio/gsocket.c:4817 gio/gsocket.c:4833 gio/gsocket.c:4846 +#: gio/gsocket.c:4841 gio/gsocket.c:4857 gio/gsocket.c:4870 #, c-format msgid "Unable to send message: %s" msgstr "Não foi possível enviar mensagem: %s" -#: gio/gsocket.c:4818 gio/gsocket.c:4834 gio/gsocket.c:4847 +#: gio/gsocket.c:4842 gio/gsocket.c:4858 gio/gsocket.c:4871 msgid "Message vectors too large" msgstr "Vetores da mensagem muito grandes" -#: gio/gsocket.c:4863 gio/gsocket.c:4865 gio/gsocket.c:5012 gio/gsocket.c:5097 -#: gio/gsocket.c:5275 gio/gsocket.c:5315 gio/gsocket.c:5317 +#: gio/gsocket.c:4887 gio/gsocket.c:4889 gio/gsocket.c:5036 gio/gsocket.c:5121 +#: gio/gsocket.c:5299 gio/gsocket.c:5339 gio/gsocket.c:5341 #, c-format msgid "Error sending message: %s" msgstr "Erro ao enviar mensagem: %s" -#: gio/gsocket.c:5039 +#: gio/gsocket.c:5063 msgid "GSocketControlMessage not supported on Windows" msgstr "Não há suporte a GSocketControlMessage no Windows" -#: gio/gsocket.c:5512 gio/gsocket.c:5588 gio/gsocket.c:5814 +#: gio/gsocket.c:5536 gio/gsocket.c:5612 gio/gsocket.c:5838 #, c-format msgid "Error receiving message: %s" msgstr "Erro ao receber mensagem: %s" -#: gio/gsocket.c:6099 gio/gsocket.c:6110 gio/gsocket.c:6173 +#: gio/gsocket.c:6123 gio/gsocket.c:6134 gio/gsocket.c:6197 #, c-format msgid "Unable to read socket credentials: %s" msgstr "Não é possível ler as credenciais do soquete: %s" -#: gio/gsocket.c:6182 +#: gio/gsocket.c:6206 msgid "g_socket_get_credentials not implemented for this OS" msgstr "g_socket_get_credentials não está implementado para este SO" @@ -4249,12 +4258,12 @@ msgid "Unknown SOCKSv5 proxy error." msgstr "Erro de proxy SOCKSv5 desconhecido." -#: gio/gtestdbus.c:614 glib/gspawn-win32.c:354 +#: gio/gtestdbus.c:615 glib/gspawn-win32.c:354 #, c-format msgid "Failed to create pipe for communicating with child process (%s)" msgstr "Falha ao criar canal para comunicar com processo filho (%s)" -#: gio/gtestdbus.c:621 +#: gio/gtestdbus.c:622 #, c-format msgid "Pipes are not supported in this platform" msgstr "Não há suporte a canais nesta plataforma" @@ -4275,35 +4284,35 @@ #. Translators: the placeholder is a DNS record type, such as ‘MX’ or ‘SRV’ #: gio/gthreadedresolver.c:552 gio/gthreadedresolver.c:574 -#: gio/gthreadedresolver.c:612 gio/gthreadedresolver.c:659 -#: gio/gthreadedresolver.c:688 gio/gthreadedresolver.c:700 +#: gio/gthreadedresolver.c:628 gio/gthreadedresolver.c:675 +#: gio/gthreadedresolver.c:704 gio/gthreadedresolver.c:716 #, c-format msgid "Error parsing DNS %s record: malformed DNS packet" msgstr "Erro ao analisar registro %s do DNS: pacote DNS mal formado" -#: gio/gthreadedresolver.c:758 gio/gthreadedresolver.c:895 -#: gio/gthreadedresolver.c:993 gio/gthreadedresolver.c:1043 +#: gio/gthreadedresolver.c:774 gio/gthreadedresolver.c:911 +#: gio/gthreadedresolver.c:1009 gio/gthreadedresolver.c:1059 #, c-format msgid "No DNS record of the requested type for “%s”" msgstr "Nenhum registro DNS do tipo de requisição para “%s”" -#: gio/gthreadedresolver.c:763 gio/gthreadedresolver.c:998 +#: gio/gthreadedresolver.c:779 gio/gthreadedresolver.c:1014 #, c-format msgid "Temporarily unable to resolve “%s”" msgstr "Temporariamente sem condições de resolver “%s”" -#: gio/gthreadedresolver.c:768 gio/gthreadedresolver.c:1003 -#: gio/gthreadedresolver.c:1113 +#: gio/gthreadedresolver.c:784 gio/gthreadedresolver.c:1019 +#: gio/gthreadedresolver.c:1129 #, c-format msgid "Error resolving “%s”" msgstr "Erro ao resolver “%s”" -#: gio/gthreadedresolver.c:782 gio/gthreadedresolver.c:806 -#: gio/gthreadedresolver.c:831 gio/gthreadedresolver.c:846 +#: gio/gthreadedresolver.c:798 gio/gthreadedresolver.c:822 +#: gio/gthreadedresolver.c:847 gio/gthreadedresolver.c:862 msgid "Malformed DNS packet" msgstr "Pacote DNS mal formado" -#: gio/gthreadedresolver.c:888 +#: gio/gthreadedresolver.c:904 #, c-format msgid "Failed to parse DNS response for “%s”: " msgstr "Falha ao analisar resposta DNS para “%s”: " @@ -4363,59 +4372,59 @@ msgid "Sending FD is not supported" msgstr "Não há suporte ao envio de FD" -#: gio/gunixconnection.c:180 gio/gunixconnection.c:598 +#: gio/gunixconnection.c:181 gio/gunixconnection.c:601 #, c-format msgid "Expecting 1 control message, got %d" msgid_plural "Expecting 1 control message, got %d" msgstr0 "Esperando 1 mensagem de controle, obtive %d" msgstr1 "Esperando 1 mensagem de controle, obtive %d" -#: gio/gunixconnection.c:196 gio/gunixconnection.c:610 +#: gio/gunixconnection.c:197 gio/gunixconnection.c:613 msgid "Unexpected type of ancillary data" msgstr "Tipo de dado auxiliar não esperado" -#: gio/gunixconnection.c:214 +#: gio/gunixconnection.c:216 #, c-format msgid "Expecting one fd, but got %d\n" msgid_plural "Expecting one fd, but got %d\n" msgstr0 "Esperando um fd, mas obtive %d\n" msgstr1 "Esperando um fd, mas obtive %d\n" -#: gio/gunixconnection.c:233 +#: gio/gunixconnection.c:235 msgid "Received invalid fd" msgstr "Recebido fd inválido" -#: gio/gunixconnection.c:240 +#: gio/gunixconnection.c:242 msgid "Receiving FD is not supported" msgstr "Não há suporte ao recebimento de FD" -#: gio/gunixconnection.c:382 +#: gio/gunixconnection.c:384 msgid "Error sending credentials: " msgstr "Erro ao enviar credenciais: " -#: gio/gunixconnection.c:539 +#: gio/gunixconnection.c:541 #, c-format msgid "Error checking if SO_PASSCRED is enabled for socket: %s" msgstr "Erro ao verificar se SO_PASSCRED está habilitado pelo soquete: %s" -#: gio/gunixconnection.c:555 +#: gio/gunixconnection.c:557 #, c-format msgid "Error enabling SO_PASSCRED: %s" msgstr "Erro ao habilitar SO_PASSCRED: %s" -#: gio/gunixconnection.c:584 +#: gio/gunixconnection.c:586 msgid "" "Expecting to read a single byte for receiving credentials but read zero bytes" msgstr "" "Era esperado ler apenas um byte para receber credenciais, mas foi lido zero " "byte" -#: gio/gunixconnection.c:624 +#: gio/gunixconnection.c:627 #, c-format msgid "Not expecting control message, but got %d" msgstr "Não esperava mensagem de controle, mas recebeu %d" -#: gio/gunixconnection.c:649 +#: gio/gunixconnection.c:652 #, c-format msgid "Error while disabling SO_PASSCRED: %s" msgstr "Erro ao desabilitar SO_PASSCRED: %s" @@ -4431,7 +4440,7 @@ msgid "Error closing file descriptor: %s" msgstr "Erro ao fechar o descritor de arquivo: %s" -#: gio/gunixmounts.c:2815 gio/gunixmounts.c:2868 +#: gio/gunixmounts.c:2817 gio/gunixmounts.c:2870 msgid "Filesystem root" msgstr "Sistema de arquivos root" @@ -4515,78 +4524,78 @@ msgid "Wrong args\n" msgstr "Args. incorretos\n" -#: glib/gbookmarkfile.c:779 +#: glib/gbookmarkfile.c:861 #, c-format msgid "Unexpected attribute “%s” for element “%s”" msgstr "Atributo “%s” inesperado para o elemento “%s”" -#: glib/gbookmarkfile.c:790 glib/gbookmarkfile.c:870 glib/gbookmarkfile.c:880 -#: glib/gbookmarkfile.c:993 +#: glib/gbookmarkfile.c:872 glib/gbookmarkfile.c:952 glib/gbookmarkfile.c:962 +#: glib/gbookmarkfile.c:1075 #, c-format msgid "Attribute “%s” of element “%s” not found" msgstr "Atributo “%s” do elemento “%s” não localizado" -#: glib/gbookmarkfile.c:1202 glib/gbookmarkfile.c:1267 -#: glib/gbookmarkfile.c:1331 glib/gbookmarkfile.c:1341 +#: glib/gbookmarkfile.c:1284 glib/gbookmarkfile.c:1349 +#: glib/gbookmarkfile.c:1413 glib/gbookmarkfile.c:1423 #, c-format msgid "Unexpected tag “%s”, tag “%s” expected" msgstr "Marca “%s” inesperada, esperava marca “%s”" -#: glib/gbookmarkfile.c:1227 glib/gbookmarkfile.c:1241 -#: glib/gbookmarkfile.c:1309 glib/gbookmarkfile.c:1355 +#: glib/gbookmarkfile.c:1309 glib/gbookmarkfile.c:1323 +#: glib/gbookmarkfile.c:1391 glib/gbookmarkfile.c:1437 #, c-format msgid "Unexpected tag “%s” inside “%s”" msgstr "Marca “%s” inesperada dentro de “%s”" -#: glib/gbookmarkfile.c:1635 +#: glib/gbookmarkfile.c:1717 #, c-format msgid "Invalid date/time ‘%s’ in bookmark file" msgstr "Data/hora “%s” inválida no arquivo de marcadores" -#: glib/gbookmarkfile.c:1838 +#: glib/gbookmarkfile.c:1956 msgid "No valid bookmark file found in data dirs" msgstr "" "Nenhum arquivo de marcadores válido foi localizado nos diretórios de dados" -#: glib/gbookmarkfile.c:2039 +#: glib/gbookmarkfile.c:2157 #, c-format msgid "A bookmark for URI “%s” already exists" msgstr "Já existe um marcador para o URI “%s”" -#: glib/gbookmarkfile.c:2088 glib/gbookmarkfile.c:2246 -#: glib/gbookmarkfile.c:2331 glib/gbookmarkfile.c:2411 -#: glib/gbookmarkfile.c:2496 glib/gbookmarkfile.c:2630 -#: glib/gbookmarkfile.c:2763 glib/gbookmarkfile.c:2898 -#: glib/gbookmarkfile.c:2940 glib/gbookmarkfile.c:3037 -#: glib/gbookmarkfile.c:3158 glib/gbookmarkfile.c:3352 -#: glib/gbookmarkfile.c:3493 glib/gbookmarkfile.c:3712 -#: glib/gbookmarkfile.c:3801 glib/gbookmarkfile.c:3890 -#: glib/gbookmarkfile.c:4009 +#: glib/gbookmarkfile.c:2206 glib/gbookmarkfile.c:2364 +#: glib/gbookmarkfile.c:2449 glib/gbookmarkfile.c:2529 +#: glib/gbookmarkfile.c:2614 glib/gbookmarkfile.c:2748 +#: glib/gbookmarkfile.c:2881 glib/gbookmarkfile.c:3016 +#: glib/gbookmarkfile.c:3058 glib/gbookmarkfile.c:3155 +#: glib/gbookmarkfile.c:3276 glib/gbookmarkfile.c:3470 +#: glib/gbookmarkfile.c:3611 glib/gbookmarkfile.c:3830 +#: glib/gbookmarkfile.c:3919 glib/gbookmarkfile.c:4008 +#: glib/gbookmarkfile.c:4127 #, c-format msgid "No bookmark found for URI “%s”" msgstr "Nenhum marcador localizado para o URI “%s”" -#: glib/gbookmarkfile.c:2420 +#: glib/gbookmarkfile.c:2538 #, c-format msgid "No MIME type defined in the bookmark for URI “%s”" msgstr "Não foi definido tipo MIME no marcador para o URI “%s”" -#: glib/gbookmarkfile.c:2505 +#: glib/gbookmarkfile.c:2623 #, c-format msgid "No private flag has been defined in bookmark for URI “%s”" msgstr "Não foi definido sinal de particular no marcador para o URI “%s”" -#: glib/gbookmarkfile.c:3046 +#: glib/gbookmarkfile.c:3164 #, c-format msgid "No groups set in bookmark for URI “%s”" msgstr "Não há grupos definidos no marcador para o URI “%s”" -#: glib/gbookmarkfile.c:3514 glib/gbookmarkfile.c:3722 +#: glib/gbookmarkfile.c:3632 glib/gbookmarkfile.c:3840 #, c-format msgid "No application with name “%s” registered a bookmark for “%s”" msgstr "Nenhum aplicativo chamado “%s” registrou um marcador para “%s”" -#: glib/gbookmarkfile.c:3745 +#: glib/gbookmarkfile.c:3863 #, c-format msgid "Failed to expand exec line “%s” with URI “%s”" msgstr "Falha em expandir linha de execução “%s” com URI “%s”" @@ -5062,79 +5071,79 @@ msgid "Error opening directory “%s”: %s" msgstr "Erro ao abrir o diretório “%s”: %s" -#: glib/gfileutils.c:735 glib/gfileutils.c:827 +#: glib/gfileutils.c:753 glib/gfileutils.c:845 #, c-format msgid "Could not allocate %lu byte to read file “%s”" msgid_plural "Could not allocate %lu bytes to read file “%s”" msgstr0 "Não foi possível alocar %lu byte para ler arquivo “%s”" msgstr1 "Não foi possível alocar %lu bytes para ler arquivo “%s”" -#: glib/gfileutils.c:752 +#: glib/gfileutils.c:770 #, c-format msgid "Error reading file “%s”: %s" msgstr "Ocorreu erro ao ler arquivo “%s”: %s" -#: glib/gfileutils.c:788 +#: glib/gfileutils.c:806 #, c-format msgid "File “%s” is too large" msgstr "Arquivo “%s” é muito grande" -#: glib/gfileutils.c:852 +#: glib/gfileutils.c:870 #, c-format msgid "Failed to read from file “%s”: %s" msgstr "Falha ao ler do arquivo “%s”: %s" -#: glib/gfileutils.c:902 glib/gfileutils.c:977 glib/gfileutils.c:1449 +#: glib/gfileutils.c:920 glib/gfileutils.c:995 glib/gfileutils.c:1472 #, c-format msgid "Failed to open file “%s”: %s" msgstr "Falha ao abrir arquivo “%s”: %s" -#: glib/gfileutils.c:915 +#: glib/gfileutils.c:933 #, c-format msgid "Failed to get attributes of file “%s”: fstat() failed: %s" msgstr "Falha ao obter atributos do arquivo “%s”: fstat() falhou: %s" -#: glib/gfileutils.c:946 +#: glib/gfileutils.c:964 #, c-format msgid "Failed to open file “%s”: fdopen() failed: %s" msgstr "Falha ao abrir arquivo “%s”: fdopen() falhou: %s" -#: glib/gfileutils.c:1047 +#: glib/gfileutils.c:1065 #, c-format msgid "Failed to rename file “%s” to “%s”: g_rename() failed: %s" msgstr "Falha ao renomear arquivo “%s” para “%s”: g_rename() falhou: %s" -#: glib/gfileutils.c:1156 +#: glib/gfileutils.c:1179 #, c-format msgid "Failed to write file “%s”: write() failed: %s" msgstr "Falha ao gravar o arquivo “%s”: write() falhou: %s" -#: glib/gfileutils.c:1177 +#: glib/gfileutils.c:1200 #, c-format msgid "Failed to write file “%s”: fsync() failed: %s" msgstr "Falha ao gravar o arquivo “%s”: fsync() falhou: %s" -#: glib/gfileutils.c:1338 glib/gfileutils.c:1753 +#: glib/gfileutils.c:1361 glib/gfileutils.c:1776 #, c-format msgid "Failed to create file “%s”: %s" msgstr "Falha ao criar arquivo “%s”: %s" -#: glib/gfileutils.c:1383 +#: glib/gfileutils.c:1406 #, c-format msgid "Existing file “%s” could not be removed: g_unlink() failed: %s" msgstr "O arquivo “%s” não pôde ser removido: g_unlink() falhou: %s" -#: glib/gfileutils.c:1718 +#: glib/gfileutils.c:1741 #, c-format msgid "Template “%s” invalid, should not contain a “%s”" msgstr "Modelo “%s” inválido, não deveria conter um “%s”" -#: glib/gfileutils.c:1731 +#: glib/gfileutils.c:1754 #, c-format msgid "Template “%s” doesn’t contain XXXXXX" msgstr "Modelo “%s” não contém XXXXXX" -#: glib/gfileutils.c:2291 glib/gfileutils.c:2320 +#: glib/gfileutils.c:2348 glib/gfileutils.c:2377 #, c-format msgid "Failed to read the symbolic link “%s”: %s" msgstr "Falha ao ler link simbólico “%s”: %s" @@ -5161,16 +5170,16 @@ msgid "Can’t do a raw read in g_io_channel_read_to_end" msgstr "Não é possível fazer uma leitura em bruto de g_io_channel_read_to_end" -#: glib/gkeyfile.c:796 +#: glib/gkeyfile.c:800 msgid "Valid key file could not be found in search dirs" msgstr "" "Não foi possível localizar arquivo de chave válido nos diretórios pesquisados" -#: glib/gkeyfile.c:833 +#: glib/gkeyfile.c:837 msgid "Not a regular file" msgstr "Não é um arquivo comum" -#: glib/gkeyfile.c:1291 +#: glib/gkeyfile.c:1295 #, c-format msgid "" "Key file contains line “%s” which is not a key-value pair, group, or comment" @@ -5178,50 +5187,50 @@ "Arquivo de chave contém a linha “%s” que não é um par chave-valor, grupo ou " "comentário" -#: glib/gkeyfile.c:1348 +#: glib/gkeyfile.c:1352 #, c-format msgid "Invalid group name: %s" msgstr "Nome de grupo inválido: %s" -#: glib/gkeyfile.c:1372 +#: glib/gkeyfile.c:1376 msgid "Key file does not start with a group" msgstr "Arquivo de chave não começa com um grupo" -#: glib/gkeyfile.c:1396 +#: glib/gkeyfile.c:1400 #, c-format msgid "Invalid key name: %.*s" msgstr "Nome de chave inválido: %.*s" -#: glib/gkeyfile.c:1424 +#: glib/gkeyfile.c:1428 #, c-format msgid "Key file contains unsupported encoding “%s”" msgstr "Arquivo de chave contém codificação “%s” sem suporte" -#: glib/gkeyfile.c:1679 glib/gkeyfile.c:1852 glib/gkeyfile.c:3299 -#: glib/gkeyfile.c:3363 glib/gkeyfile.c:3493 glib/gkeyfile.c:3625 -#: glib/gkeyfile.c:3771 glib/gkeyfile.c:4006 glib/gkeyfile.c:4073 +#: glib/gkeyfile.c:1683 glib/gkeyfile.c:1856 glib/gkeyfile.c:3303 +#: glib/gkeyfile.c:3367 glib/gkeyfile.c:3497 glib/gkeyfile.c:3626 +#: glib/gkeyfile.c:3772 glib/gkeyfile.c:4007 glib/gkeyfile.c:4074 #, c-format msgid "Key file does not have group “%s”" msgstr "Arquivo de chave não tem grupo “%s”" -#: glib/gkeyfile.c:1807 +#: glib/gkeyfile.c:1811 #, c-format msgid "Key file does not have key “%s” in group “%s”" msgstr "Arquivo de chave não tem chave “%s” no grupo “%s”" -#: glib/gkeyfile.c:1969 glib/gkeyfile.c:2085 +#: glib/gkeyfile.c:1973 glib/gkeyfile.c:2089 #, c-format msgid "Key file contains key “%s” with value “%s” which is not UTF-8" msgstr "Arquivo de chave contém chave “%s” com valor “%s” que não é UTF-8" -#: glib/gkeyfile.c:1989 glib/gkeyfile.c:2105 glib/gkeyfile.c:2544 +#: glib/gkeyfile.c:1993 glib/gkeyfile.c:2109 glib/gkeyfile.c:2548 #, c-format msgid "" "Key file contains key “%s” which has a value that cannot be interpreted." msgstr "" "Arquivo de chave contém chave “%s” cujo valor não pode ser interpretado." -#: glib/gkeyfile.c:2759 glib/gkeyfile.c:3128 +#: glib/gkeyfile.c:2763 glib/gkeyfile.c:3132 #, c-format msgid "" "Key file contains key “%s” in group “%s” which has a value that cannot be " @@ -5230,81 +5239,81 @@ "Arquivo de chave contém chave “%s” no grupo “%s” que tem um valor que não " "pode ser interpretado." -#: glib/gkeyfile.c:2837 glib/gkeyfile.c:2914 +#: glib/gkeyfile.c:2841 glib/gkeyfile.c:2918 #, c-format msgid "Key “%s” in group “%s” has value “%s” where %s was expected" msgstr "Chave “%s” no grupo “%s” tem o valor “%s” onde %s era esperado" -#: glib/gkeyfile.c:4326 +#: glib/gkeyfile.c:4327 msgid "Key file contains escape character at end of line" msgstr "Arquivo de chave contém caractere de escape no fim da linha" -#: glib/gkeyfile.c:4348 +#: glib/gkeyfile.c:4349 #, c-format msgid "Key file contains invalid escape sequence “%s”" msgstr "Arquivo de chave contém sequência de escape “%s” inválida" -#: glib/gkeyfile.c:4493 +#: glib/gkeyfile.c:4494 #, c-format msgid "Value “%s” cannot be interpreted as a number." msgstr "O valor “%s” não pode ser interpretado como um número." -#: glib/gkeyfile.c:4507 +#: glib/gkeyfile.c:4508 #, c-format msgid "Integer value “%s” out of range" msgstr "Valor inteiro “%s” fora dos limites" -#: glib/gkeyfile.c:4540 +#: glib/gkeyfile.c:4541 #, c-format msgid "Value “%s” cannot be interpreted as a float number." msgstr "O valor “%s” não pode ser interpretado como ponto flutuante." -#: glib/gkeyfile.c:4579 +#: glib/gkeyfile.c:4580 #, c-format msgid "Value “%s” cannot be interpreted as a boolean." msgstr "O valor “%s” não pode ser interpretado como um booleano." -#: glib/gmappedfile.c:131 +#: glib/gmappedfile.c:135 #, c-format msgid "Failed to get attributes of file “%s%s%s%s”: fstat() failed: %s" msgstr "Falha ao obter atributos do arquivo “%s%s%s%s”: fstat() falhou: %s" -#: glib/gmappedfile.c:197 +#: glib/gmappedfile.c:201 #, c-format msgid "Failed to map %s%s%s%s: mmap() failed: %s" msgstr "Falha ao mapear arquivo “%s%s%s%s”: mmap() falhou: %s" -#: glib/gmappedfile.c:264 +#: glib/gmappedfile.c:268 #, c-format msgid "Failed to open file “%s”: open() failed: %s" msgstr "Falha ao abrir arquivo “%s”: open() falhou: %s" -#: glib/gmarkup.c:400 glib/gmarkup.c:442 +#: glib/gmarkup.c:398 glib/gmarkup.c:440 #, c-format msgid "Error on line %d char %d: " msgstr "Erro na linha %d caractere %d: " -#: glib/gmarkup.c:464 glib/gmarkup.c:547 +#: glib/gmarkup.c:462 glib/gmarkup.c:545 #, c-format msgid "Invalid UTF-8 encoded text in name — not valid “%s”" msgstr "Texto do nome codificado em UTF-8 inválido — “%s” não válido" -#: glib/gmarkup.c:475 +#: glib/gmarkup.c:473 #, c-format msgid "“%s” is not a valid name" msgstr "“%s” não é um nome válido" -#: glib/gmarkup.c:491 +#: glib/gmarkup.c:489 #, c-format msgid "“%s” is not a valid name: “%c”" msgstr "“%s” não é um nome válido: “%c”" -#: glib/gmarkup.c:615 +#: glib/gmarkup.c:613 #, c-format msgid "Error on line %d: %s" msgstr "Erro na linha %d: %s" -#: glib/gmarkup.c:692 +#: glib/gmarkup.c:690 #, c-format msgid "" "Failed to parse “%-.*s”, which should have been a digit inside a character " @@ -5314,7 +5323,7 @@ "referência de caractere (ê por exemplo) — talvez o dígito seja grande " "demais" -#: glib/gmarkup.c:704 +#: glib/gmarkup.c:702 msgid "" "Character reference did not end with a semicolon; most likely you used an " "ampersand character without intending to start an entity — escape ampersand " @@ -5324,23 +5333,23 @@ "utilizou um caractere “e comercial” sem desejar iniciar uma entidade — " "escape-o com &" -#: glib/gmarkup.c:730 +#: glib/gmarkup.c:728 #, c-format msgid "Character reference “%-.*s” does not encode a permitted character" msgstr "Referência de caractere “%-.*s” não codifica um caractere permitido" -#: glib/gmarkup.c:768 +#: glib/gmarkup.c:766 msgid "" "Empty entity “&;” seen; valid entities are: & " < > '" msgstr "" "Entidade “&;” vazia; as entidades válidas são: & " < > '" -#: glib/gmarkup.c:776 +#: glib/gmarkup.c:774 #, c-format msgid "Entity name “%-.*s” is not known" msgstr "Nome de entidade “%-.*s” não é conhecido" -#: glib/gmarkup.c:781 +#: glib/gmarkup.c:779 msgid "" "Entity did not end with a semicolon; most likely you used an ampersand " "character without intending to start an entity — escape ampersand as &" @@ -5348,11 +5357,11 @@ "Entidade não termina com um ponto e vírgula; provavelmente você utilizou um " "“e comercial” sem desejar iniciar uma entidade — escape-o com &" -#: glib/gmarkup.c:1195 +#: glib/gmarkup.c:1193 msgid "Document must begin with an element (e.g. <book>)" msgstr "Documento tem de começar com um elemento (ex. <book>)" -#: glib/gmarkup.c:1235 +#: glib/gmarkup.c:1233 #, c-format msgid "" "“%s” is not a valid character following a “<” character; it may not begin an " @@ -5361,7 +5370,7 @@ "“%s” não é um caractere válido após um caractere “<”; não poderá começar um " "nome de elemento" -#: glib/gmarkup.c:1278 +#: glib/gmarkup.c:1276 #, c-format msgid "" "Odd character “%s”, expected a “>” character to end the empty-element tag " @@ -5370,12 +5379,12 @@ "Caractere estranho “%s”, esperado um caractere “>” para finalizar a marca " "“%s” de elemento vazio" -#: glib/gmarkup.c:1348 +#: glib/gmarkup.c:1346 #, c-format msgid "Too many attributes in element “%s”" msgstr "Número excessivo de atributos no elemento “%s”" -#: glib/gmarkup.c:1368 +#: glib/gmarkup.c:1366 #, c-format msgid "" "Odd character “%s”, expected a “=” after attribute name “%s” of element “%s”" @@ -5383,7 +5392,7 @@ "Caractere estranho “%s”, esperava-se um “=” após o nome do atributo “%s” do " "elemento “%s”" -#: glib/gmarkup.c:1410 +#: glib/gmarkup.c:1408 #, c-format msgid "" "Odd character “%s”, expected a “>” or “/” character to end the start tag of " @@ -5394,7 +5403,7 @@ "marca inicial do elemento “%s”, ou opcionalmente um atributo; talvez tenha " "utilizado um caractere inválido no nome de atributo" -#: glib/gmarkup.c:1455 +#: glib/gmarkup.c:1453 #, c-format msgid "" "Odd character “%s”, expected an open quote mark after the equals sign when " @@ -5403,7 +5412,7 @@ "Caractere estranho “%s”, esperava-se uma abertura de aspas após o sinal de " "igual ao atribuir o valor ao atributo “%s” do elemento “%s”" -#: glib/gmarkup.c:1589 +#: glib/gmarkup.c:1587 #, c-format msgid "" "“%s” is not a valid character following the characters “</”; “%s” may not " @@ -5412,7 +5421,7 @@ "“%s” não é um caractere válido após os caracteres “</”; “%s” não poderá " "começar o nome de um elemento" -#: glib/gmarkup.c:1627 +#: glib/gmarkup.c:1625 #, c-format msgid "" "“%s” is not a valid character following the close element name “%s”; the " @@ -5421,25 +5430,25 @@ "“%s” não é um caractere válido após o nome do elemento de fecho “%s”; o " "caractere permitido é “>”" -#: glib/gmarkup.c:1639 +#: glib/gmarkup.c:1637 #, c-format msgid "Element “%s” was closed, no element is currently open" msgstr "Elemento “%s” foi fechado, nenhum elemento está atualmente aberto" -#: glib/gmarkup.c:1648 +#: glib/gmarkup.c:1646 #, c-format msgid "Element “%s” was closed, but the currently open element is “%s”" msgstr "Elemento “%s” foi fechado, mas o elemento atualmente aberto é “%s”" -#: glib/gmarkup.c:1801 +#: glib/gmarkup.c:1799 msgid "Document was empty or contained only whitespace" msgstr "Documento estava vazio ou apenas continha espaços" -#: glib/gmarkup.c:1815 +#: glib/gmarkup.c:1813 msgid "Document ended unexpectedly just after an open angle bracket “<”" msgstr "Documento terminou inesperadamente logo após um menor que “<”" -#: glib/gmarkup.c:1823 glib/gmarkup.c:1868 +#: glib/gmarkup.c:1821 glib/gmarkup.c:1866 #, c-format msgid "" "Document ended unexpectedly with elements still open — “%s” was the last " @@ -5448,7 +5457,7 @@ "Documento terminou inesperadamente com elementos ainda abertos — “%s” foi o " "último elemento aberto" -#: glib/gmarkup.c:1831 +#: glib/gmarkup.c:1829 #, c-format msgid "" "Document ended unexpectedly, expected to see a close angle bracket ending " @@ -5457,21 +5466,21 @@ "Documento terminou inesperadamente, esperava-se ver um sinal de maior (“>”) " "para terminar a marca <%s/>" -#: glib/gmarkup.c:1837 +#: glib/gmarkup.c:1835 msgid "Document ended unexpectedly inside an element name" msgstr "Documento terminou inesperadamente dentro de um nome de elemento" -#: glib/gmarkup.c:1843 +#: glib/gmarkup.c:1841 msgid "Document ended unexpectedly inside an attribute name" msgstr "Documento terminou inesperadamente dentro de um nome de atributo" -#: glib/gmarkup.c:1848 +#: glib/gmarkup.c:1846 msgid "Document ended unexpectedly inside an element-opening tag." msgstr "" "Documento terminou inesperadamente dentro de uma marca de abertura de " "elemento." -#: glib/gmarkup.c:1854 +#: glib/gmarkup.c:1852 msgid "" "Document ended unexpectedly after the equals sign following an attribute " "name; no attribute value" @@ -5479,24 +5488,24 @@ "Documento terminou inesperadamente após o sinal de igual que se seguiu a um " "nome de atributo; nenhum valor de atributo" -#: glib/gmarkup.c:1861 +#: glib/gmarkup.c:1859 msgid "Document ended unexpectedly while inside an attribute value" msgstr "Documento terminou inesperadamente dentro de um valor de atributo" -#: glib/gmarkup.c:1878 +#: glib/gmarkup.c:1876 #, c-format msgid "Document ended unexpectedly inside the close tag for element “%s”" msgstr "" "Documento terminou inesperadamente dentro da marca de fechamento do elemento " "“%s”" -#: glib/gmarkup.c:1882 +#: glib/gmarkup.c:1880 msgid "" "Document ended unexpectedly inside the close tag for an unopened element" msgstr "" "Documento terminou inesperadamente dentro da marca de um elemento não aberto" -#: glib/gmarkup.c:1888 +#: glib/gmarkup.c:1886 msgid "Document ended unexpectedly inside a comment or processing instruction" msgstr "" "Documento terminou inesperadamente dentro de um comentário ou instrução de " @@ -5562,187 +5571,187 @@ msgid "Unknown option %s" msgstr "Opção %s desconhecida" -#: glib/gregex.c:436 +#: glib/gregex.c:479 msgid "corrupted object" msgstr "objeto corrompido" -#: glib/gregex.c:438 +#: glib/gregex.c:481 msgid "out of memory" msgstr "memória insuficiente" -#: glib/gregex.c:443 +#: glib/gregex.c:487 msgid "backtracking limit reached" msgstr "limite de backtracking alcançado" -#: glib/gregex.c:454 glib/gregex.c:707 glib/gregex.c:736 +#: glib/gregex.c:498 msgid "internal error" msgstr "erro interno" -#: glib/gregex.c:456 +#: glib/gregex.c:500 msgid "the pattern contains items not supported for partial matching" msgstr "o padrão contém itens sem suporte para correspondência parcial" -#: glib/gregex.c:458 +#: glib/gregex.c:502 msgid "back references as conditions are not supported for partial matching" msgstr "" "não há suporte à referência retroativa como condição para correspondência " "parcial" -#: glib/gregex.c:464 +#: glib/gregex.c:508 msgid "recursion limit reached" msgstr "limite de recursão alcançado" -#: glib/gregex.c:466 +#: glib/gregex.c:510 msgid "bad offset" msgstr "deslocamento ruim" -#: glib/gregex.c:468 +#: glib/gregex.c:512 msgid "recursion loop" msgstr "recursão infinita" #. should not happen in GRegex since we check modes before each match -#: glib/gregex.c:471 +#: glib/gregex.c:515 msgid "matching mode is requested that was not compiled for JIT" msgstr "é solicitado o modo de correspondência que não foi compilado para JIT" -#: glib/gregex.c:475 +#: glib/gregex.c:536 glib/gregex.c:1838 msgid "unknown error" msgstr "erro desconhecido" -#: glib/gregex.c:496 +#: glib/gregex.c:557 msgid "\\ at end of pattern" msgstr "\\ no fim do padrão" -#: glib/gregex.c:500 +#: glib/gregex.c:561 msgid "\\c at end of pattern" msgstr "\\c no fim do padrão" -#: glib/gregex.c:505 +#: glib/gregex.c:566 msgid "unrecognized character following \\" msgstr "caractere não reconhecido seguindo \\" -#: glib/gregex.c:509 +#: glib/gregex.c:570 msgid "numbers out of order in {} quantifier" msgstr "números fora de ordem no quantificador {}" -#: glib/gregex.c:513 +#: glib/gregex.c:574 msgid "number too big in {} quantifier" msgstr "número grande demais no quantificador {}" -#: glib/gregex.c:517 +#: glib/gregex.c:578 msgid "missing terminating for character class" msgstr "terminação em falta para classe de caracteres" -#: glib/gregex.c:521 +#: glib/gregex.c:582 msgid "invalid escape sequence in character class" msgstr "sequência de escape inválida na classe de caracteres" -#: glib/gregex.c:525 +#: glib/gregex.c:586 msgid "range out of order in character class" msgstr "intervalo fora de ordem na classe de caracteres" -#: glib/gregex.c:530 +#: glib/gregex.c:591 msgid "nothing to repeat" msgstr "nada a repetir" -#: glib/gregex.c:534 +#: glib/gregex.c:595 msgid "unrecognized character after (? or (?-" msgstr "caractere não reconhecido após (? ou (?-" -#: glib/gregex.c:538 +#: glib/gregex.c:599 msgid "POSIX named classes are supported only within a class" msgstr "Classes nomeadas POSIX têm suporte apenas dentro de uma classe" -#: glib/gregex.c:542 +#: glib/gregex.c:603 msgid "POSIX collating elements are not supported" msgstr "Elementos de arranjo POSIX sem suporte" -#: glib/gregex.c:548 +#: glib/gregex.c:609 msgid "missing terminating )" msgstr "faltando terminação )" -#: glib/gregex.c:552 +#: glib/gregex.c:613 msgid "reference to non-existent subpattern" msgstr "referência a subpadrão não existente" -#: glib/gregex.c:556 +#: glib/gregex.c:617 msgid "missing ) after comment" msgstr "faltando ) após o comentário" -#: glib/gregex.c:560 +#: glib/gregex.c:621 msgid "regular expression is too large" msgstr "expressão regular é grande demais" -#: glib/gregex.c:564 +#: glib/gregex.c:625 msgid "malformed number or name after (?(" msgstr "número mal formado ou nome após (?(" -#: glib/gregex.c:568 +#: glib/gregex.c:629 msgid "lookbehind assertion is not fixed length" msgstr "declaração de verificação anterior não é de largura fixa" -#: glib/gregex.c:572 +#: glib/gregex.c:633 msgid "conditional group contains more than two branches" msgstr "grupo condicional contém mais que duas ramificações" -#: glib/gregex.c:576 +#: glib/gregex.c:637 msgid "assertion expected after (?(" msgstr "esperava-se declaração após (?(" -#: glib/gregex.c:580 +#: glib/gregex.c:641 msgid "a numbered reference must not be zero" msgstr "uma referência numerada não pode ser zero" -#: glib/gregex.c:584 +#: glib/gregex.c:645 msgid "unknown POSIX class name" msgstr "nome de classe POSIX desconhecido" -#: glib/gregex.c:589 +#: glib/gregex.c:650 msgid "character value in \\x{...} sequence is too large" msgstr "valor de caractere na sequência \\x{...} é grande demais" -#: glib/gregex.c:593 +#: glib/gregex.c:654 msgid "\\C not allowed in lookbehind assertion" msgstr "\\C não permitido na declaração de verificação anterior" -#: glib/gregex.c:597 +#: glib/gregex.c:658 msgid "missing terminator in subpattern name" msgstr "terminação em falta no nome do subpadrão" -#: glib/gregex.c:601 +#: glib/gregex.c:662 msgid "two named subpatterns have the same name" msgstr "dois subpadrões nomeados têm o mesmo nome" -#: glib/gregex.c:605 +#: glib/gregex.c:666 msgid "malformed \\P or \\p sequence" msgstr "sequência \\P ou \\p mal formada" -#: glib/gregex.c:609 +#: glib/gregex.c:670 msgid "unknown property name after \\P or \\p" msgstr "nome de propriedade desconhecido após \\P ou \\p" -#: glib/gregex.c:613 +#: glib/gregex.c:674 msgid "subpattern name is too long (maximum 32 characters)" msgstr "nome de subpadrão é grande demais (máximo 32 caracteres)" -#: glib/gregex.c:617 +#: glib/gregex.c:678 msgid "too many named subpatterns (maximum 10,000)" msgstr "excesso de subpadrões nomeados (máximo 10.000)" -#: glib/gregex.c:621 +#: glib/gregex.c:682 msgid "octal value is greater than \\377" msgstr "valor octal é maior que \\377" -#: glib/gregex.c:625 +#: glib/gregex.c:686 msgid "DEFINE group contains more than one branch" msgstr "O grupo DEFINE contém mais que uma ramificação" -#: glib/gregex.c:629 +#: glib/gregex.c:690 msgid "inconsistent NEWLINE options" msgstr "opções do NEWLINE inconsistentes" # obs.: "angle-brackets" não existe no Brasil, mas existe brackets, que é '<' e '>' -#: glib/gregex.c:633 +#: glib/gregex.c:694 msgid "" "\\g is not followed by a braced, angle-bracketed, or quoted name or number, " "or by a plain number" @@ -5750,120 +5759,120 @@ "\\g não é seguido por um número ou nome entre aspas, chaves ou sinais de " "menor que ou maior que um número diferente de zero opcionalmente entre chaves" -#: glib/gregex.c:638 +#: glib/gregex.c:699 msgid "an argument is not allowed for (*ACCEPT), (*FAIL), or (*COMMIT)" msgstr "um argumento não é permitido para (*ACCEPT), (*FAIL) ou (*COMMIT)" -#: glib/gregex.c:642 +#: glib/gregex.c:703 msgid "(*VERB) not recognized" msgstr "(*VERB) não reconhecido" -#: glib/gregex.c:646 +#: glib/gregex.c:707 msgid "number is too big" msgstr "número é muito grande" -#: glib/gregex.c:650 +#: glib/gregex.c:711 msgid "missing subpattern name after (?&" msgstr "faltando o nome do subpadrão após (?&" -#: glib/gregex.c:654 +#: glib/gregex.c:715 msgid "different names for subpatterns of the same number are not allowed" msgstr "não é permitido dois subpadrões nomeados com o mesmo nome" -#: glib/gregex.c:658 +#: glib/gregex.c:719 msgid "(*MARK) must have an argument" msgstr "(*MARK) deve possuir um argumento" -#: glib/gregex.c:662 +#: glib/gregex.c:723 msgid "\\c must be followed by an ASCII character" msgstr "\\c pode ser seguido por um caractere ASCII" # obs.: "angle-brackets" não existe no Brasil, mas existe brackets, que é '<' e '>' -#: glib/gregex.c:666 +#: glib/gregex.c:727 msgid "\\k is not followed by a braced, angle-bracketed, or quoted name" msgstr "" "\\k não é seguido por um nome entre aspas, chaves ou sinais de menor que ou " "maior que" -#: glib/gregex.c:670 +#: glib/gregex.c:731 msgid "\\N is not supported in a class" msgstr "\\N não é suportado em uma classe" -#: glib/gregex.c:674 +#: glib/gregex.c:735 msgid "name is too long in (*MARK), (*PRUNE), (*SKIP), or (*THEN)" msgstr "nome é muito cumprido em (*MARK), (*PRUNE), (*SKIP) ou (*THEN)" -#: glib/gregex.c:678 glib/gregex.c:809 +#: glib/gregex.c:739 glib/gregex.c:875 msgid "code overflow" msgstr "estouro de código" -#: glib/gregex.c:682 +#: glib/gregex.c:743 msgid "unrecognized character after (?P" msgstr "caractere não reconhecido após (?P" -#: glib/gregex.c:686 +#: glib/gregex.c:747 msgid "overran compiling workspace" msgstr "espaço de trabalho de compilação invadido" -#: glib/gregex.c:690 +#: glib/gregex.c:751 msgid "previously-checked referenced subpattern not found" msgstr "subpadrão de referência verificado anteriormente não localizado" -#: glib/gregex.c:808 glib/gregex.c:1041 glib/gregex.c:2342 +#: glib/gregex.c:874 glib/gregex.c:1121 glib/gregex.c:2444 #, c-format msgid "Error while matching regular expression %s: %s" msgstr "Erro ao coincidir expressão regular %s: %s" -#: glib/gregex.c:1618 +#: glib/gregex.c:1721 msgid "PCRE library is compiled without UTF8 support" msgstr "Biblioteca PCRE compilada sem suporte a UTF-8" -#: glib/gregex.c:1626 +#: glib/gregex.c:1729 msgid "PCRE library is compiled with incompatible options" msgstr "Biblioteca PCRE compilada com opções incompatíveis" -#: glib/gregex.c:1751 +#: glib/gregex.c:1847 #, c-format msgid "Error while compiling regular expression ‘%s’ at char %s: %s" msgstr "Erro ao compilar a expressão regular “%s” no caractere %s: %s" -#: glib/gregex.c:2786 +#: glib/gregex.c:2887 msgid "hexadecimal digit or “}” expected" msgstr "esperava-se dígito hexadecimal ou “}”" -#: glib/gregex.c:2802 +#: glib/gregex.c:2903 msgid "hexadecimal digit expected" msgstr "esperava-se dígito hexadecimal" -#: glib/gregex.c:2842 +#: glib/gregex.c:2943 msgid "missing “<” in symbolic reference" msgstr "“<” em falta na referência simbólica" -#: glib/gregex.c:2851 +#: glib/gregex.c:2952 msgid "unfinished symbolic reference" msgstr "referência simbólica inacabada" -#: glib/gregex.c:2858 +#: glib/gregex.c:2959 msgid "zero-length symbolic reference" msgstr "referência simbólica de comprimento zero" -#: glib/gregex.c:2869 +#: glib/gregex.c:2970 msgid "digit expected" msgstr "esperava-se dígito" -#: glib/gregex.c:2887 +#: glib/gregex.c:2988 msgid "illegal symbolic reference" msgstr "referência simbólica ilegal" -#: glib/gregex.c:2950 +#: glib/gregex.c:3051 msgid "stray final “\\”" msgstr "“\\” final errado" -#: glib/gregex.c:2954 +#: glib/gregex.c:3055 msgid "unknown escape sequence" msgstr "sequência de escape desconhecida" -#: glib/gregex.c:2964 +#: glib/gregex.c:3065 #, c-format msgid "Error while parsing replacement text “%s” at char %lu: %s" msgstr "Erro ao analisar texto de substituição “%s” no caractere %lu: %s" @@ -5892,96 +5901,101 @@ msgid "Text was empty (or contained only whitespace)" msgstr "Texto estava vazio (ou apenas continha espaços)" -#: glib/gspawn.c:314 +#: glib/gspawn.c:319 #, c-format msgid "Failed to read data from child process (%s)" msgstr "Falha ao ler dados de processo filho (%s)" -#: glib/gspawn.c:466 +#: glib/gspawn.c:471 #, c-format msgid "Unexpected error in reading data from a child process (%s)" msgstr "Erro inesperado na leitura de dados de um processo filho (%s)" -#: glib/gspawn.c:551 +#: glib/gspawn.c:556 #, c-format msgid "Unexpected error in waitpid() (%s)" msgstr "Erro inesperado em waitpid() (%s)" -#: glib/gspawn.c:1170 glib/gspawn-win32.c:1488 +#: glib/gspawn.c:1175 glib/gspawn-win32.c:1503 #, c-format msgid "Child process exited with code %ld" msgstr "Processo filho concluiu com código %ld" -#: glib/gspawn.c:1178 +#: glib/gspawn.c:1183 #, c-format msgid "Child process killed by signal %ld" msgstr "Processo filho foi terminado pelo sinal %ld" -#: glib/gspawn.c:1185 +#: glib/gspawn.c:1190 #, c-format msgid "Child process stopped by signal %ld" msgstr "Processo filho foi parado pelo sinal %ld" -#: glib/gspawn.c:1192 +#: glib/gspawn.c:1197 #, c-format msgid "Child process exited abnormally" msgstr "Processo filho concluiu anormalmente" -#: glib/gspawn.c:1885 glib/gspawn-win32.c:393 glib/gspawn-win32.c:401 +#: glib/gspawn.c:2027 glib/gspawn-win32.c:393 glib/gspawn-win32.c:401 #, c-format msgid "Failed to read from child pipe (%s)" msgstr "Falha ao ler de canal filho (%s)" -#: glib/gspawn.c:2248 +#: glib/gspawn.c:2399 #, c-format msgid "Failed to spawn child process “%s” (%s)" msgstr "Falha ao criar processo filho “%s” (%s)" -#: glib/gspawn.c:2365 +#: glib/gspawn.c:2525 #, c-format msgid "Failed to fork (%s)" msgstr "Falha no fork (%s)" -#: glib/gspawn.c:2525 glib/gspawn-win32.c:424 +#: glib/gspawn.c:2685 glib/gspawn-win32.c:424 #, c-format msgid "Failed to change to directory “%s” (%s)" msgstr "Falha ao ir para diretório “%s” (%s)" -#: glib/gspawn.c:2535 +#: glib/gspawn.c:2695 #, c-format msgid "Failed to execute child process “%s” (%s)" msgstr "Falha ao executar processo filho “%s” (%s)" -#: glib/gspawn.c:2545 +#: glib/gspawn.c:2705 #, c-format msgid "Failed to open file to remap file descriptor (%s)" msgstr "Falha ao abrir o arquivo para remapear o descritor de arquivo (%s)" -#: glib/gspawn.c:2553 +#: glib/gspawn.c:2713 #, c-format msgid "Failed to duplicate file descriptor for child process (%s)" msgstr "Falha ao duplicar o descritor de arquivo para o processo filho (%s)" -#: glib/gspawn.c:2562 +#: glib/gspawn.c:2722 #, c-format msgid "Failed to fork child process (%s)" msgstr "Falha no fork de processo filho (%s)" -#: glib/gspawn.c:2570 +#: glib/gspawn.c:2730 #, c-format msgid "Failed to close file descriptor for child process (%s)" msgstr "Falha ao fechar o descritor de arquivo para o processo filho (%s)" -#: glib/gspawn.c:2578 +#: glib/gspawn.c:2738 #, c-format msgid "Unknown error executing child process “%s”" msgstr "Erro desconhecido ao executar processo filho “%s”" -#: glib/gspawn.c:2602 +#: glib/gspawn.c:2762 #, c-format msgid "Failed to read enough data from child pid pipe (%s)" msgstr "Falha ao ler dados suficientes de canal pid do filho (%s)" +#: glib/gspawn-private.h:134 +#, c-format +msgid "Invalid source FDs argument" +msgstr "Argumento de FDs de origem inválido" + #: glib/gspawn-win32.c:337 msgid "Failed to read data from child process" msgstr "Falha ao ler dados de processo filho" @@ -6001,27 +6015,27 @@ msgid "Invalid program name: %s" msgstr "Nome de programa inválido: %s" -#: glib/gspawn-win32.c:521 glib/gspawn-win32.c:853 +#: glib/gspawn-win32.c:521 glib/gspawn-win32.c:868 #, c-format msgid "Invalid string in argument vector at %d: %s" msgstr "String inválida no vetor de argumentos em %d: %s" -#: glib/gspawn-win32.c:532 glib/gspawn-win32.c:869 +#: glib/gspawn-win32.c:532 glib/gspawn-win32.c:884 #, c-format msgid "Invalid string in environment: %s" msgstr "String inválida no ambiente: %s" -#: glib/gspawn-win32.c:849 +#: glib/gspawn-win32.c:864 #, c-format msgid "Invalid working directory: %s" msgstr "Diretório de trabalho inválido: %s" -#: glib/gspawn-win32.c:914 +#: glib/gspawn-win32.c:929 #, c-format msgid "Failed to execute helper program (%s)" msgstr "Falha ao executar programa auxiliar (%s)" -#: glib/gspawn-win32.c:1143 +#: glib/gspawn-win32.c:1158 msgid "" "Unexpected error in g_io_channel_win32_poll() reading data from a child " "process" @@ -6029,21 +6043,21 @@ "Erro inesperado no g_io_channel_win32_poll() ao ler dados de um processo " "filho" -#: glib/gstrfuncs.c:3366 glib/gstrfuncs.c:3468 +#: glib/gstrfuncs.c:3373 glib/gstrfuncs.c:3475 msgid "Empty string is not a number" msgstr "Texto vazio não é um número" -#: glib/gstrfuncs.c:3390 +#: glib/gstrfuncs.c:3397 #, c-format msgid "“%s” is not a signed number" msgstr "“%s” não é um número assinado" -#: glib/gstrfuncs.c:3400 glib/gstrfuncs.c:3504 +#: glib/gstrfuncs.c:3407 glib/gstrfuncs.c:3511 #, c-format msgid "Number “%s” is out of bounds %s, %s" msgstr "O número “%s” está fora dos limites %s, %s" -#: glib/gstrfuncs.c:3494 +#: glib/gstrfuncs.c:3501 #, c-format msgid "“%s” is not an unsigned number" msgstr "“%s” não é um número não assinado" @@ -6122,132 +6136,132 @@ msgstr "Caractere fora do limite para UTF-16" #. Translators: A unit symbol for size formatting, showing for example: "13.0 kB" -#: glib/gutils.c:2857 +#: glib/gutils.c:2966 msgid "kB" msgstr "kB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 MB" -#: glib/gutils.c:2859 +#: glib/gutils.c:2968 msgid "MB" msgstr "MB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 GB" -#: glib/gutils.c:2861 +#: glib/gutils.c:2970 msgid "GB" msgstr "GB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 TB" -#: glib/gutils.c:2863 +#: glib/gutils.c:2972 msgid "TB" msgstr "TB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 PB" -#: glib/gutils.c:2865 +#: glib/gutils.c:2974 msgid "PB" msgstr "PB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 EB" -#: glib/gutils.c:2867 +#: glib/gutils.c:2976 msgid "EB" msgstr "EB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 KiB" -#: glib/gutils.c:2871 +#: glib/gutils.c:2980 msgid "KiB" msgstr "KiB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 MiB" -#: glib/gutils.c:2873 +#: glib/gutils.c:2982 msgid "MiB" msgstr "MiB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 GiB" -#: glib/gutils.c:2875 +#: glib/gutils.c:2984 msgid "GiB" msgstr "GiB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 TiB" -#: glib/gutils.c:2877 +#: glib/gutils.c:2986 msgid "TiB" msgstr "TiB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 PiB" -#: glib/gutils.c:2879 +#: glib/gutils.c:2988 msgid "PiB" msgstr "PiB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 EiB" -#: glib/gutils.c:2881 +#: glib/gutils.c:2990 msgid "EiB" msgstr "EiB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 kb" -#: glib/gutils.c:2885 +#: glib/gutils.c:2994 msgid "kb" msgstr "kb" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Mb" -#: glib/gutils.c:2887 +#: glib/gutils.c:2996 msgid "Mb" msgstr "Mb" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Gb" -#: glib/gutils.c:2889 +#: glib/gutils.c:2998 msgid "Gb" msgstr "Gb" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Tb" -#: glib/gutils.c:2891 +#: glib/gutils.c:3000 msgid "Tb" msgstr "Tb" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Pb" -#: glib/gutils.c:2893 +#: glib/gutils.c:3002 msgid "Pb" msgstr "Pb" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Eb" -#: glib/gutils.c:2895 +#: glib/gutils.c:3004 msgid "Eb" msgstr "Eb" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Kib" -#: glib/gutils.c:2899 +#: glib/gutils.c:3008 msgid "Kib" msgstr "Kib" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Mib" -#: glib/gutils.c:2901 +#: glib/gutils.c:3010 msgid "Mib" msgstr "Mib" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Gib" -#: glib/gutils.c:2903 +#: glib/gutils.c:3012 msgid "Gib" msgstr "Gib" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Tib" -#: glib/gutils.c:2905 +#: glib/gutils.c:3014 msgid "Tib" msgstr "Tib" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Pib" -#: glib/gutils.c:2907 +#: glib/gutils.c:3016 msgid "Pib" msgstr "Pib" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Eib" -#: glib/gutils.c:2909 +#: glib/gutils.c:3018 msgid "Eib" msgstr "Eib" -#: glib/gutils.c:2947 +#: glib/gutils.c:3056 msgid "byte" msgid_plural "bytes" msgstr0 "byte" msgstr1 "bytes" -#: glib/gutils.c:2951 +#: glib/gutils.c:3060 msgid "bit" msgid_plural "bits" msgstr0 "bit" @@ -6255,7 +6269,7 @@ #. Translators: The "%u" is replaced with the size value, like "13"; it could #. * be part of "13 bytes", but only the number is requested this time. -#: glib/gutils.c:2959 +#: glib/gutils.c:3068 #, c-format msgctxt "format-size" msgid "%u" @@ -6263,7 +6277,7 @@ #. Translators: The first "%u" is replaced with the value, the "%s" with a unit of the value. #. * The order can be changed with "%$2s %$1u". An example: "13 bytes" -#: glib/gutils.c:2964 +#: glib/gutils.c:3073 #, c-format msgctxt "format-size" msgid "%u %s" @@ -6271,7 +6285,7 @@ #. Translators: The "%.1f" is replaced with the size value, like "13.0"; it could #. * be part of "13.0 MB", but only the number is requested this time. -#: glib/gutils.c:3000 +#: glib/gutils.c:3109 #, c-format msgctxt "format-size" msgid "%.1f" @@ -6280,14 +6294,14 @@ #. Translators: The first "%.1f" is replaced with the value, the "%s" with a unit of the value. #. * The order can be changed with "%$2s %$1.1f". Keep the no-break space between the value and #. * the unit symbol. An example: "13.0 MB" -#: glib/gutils.c:3006 +#: glib/gutils.c:3115 #, c-format msgctxt "format-size" msgid "%.1f %s" msgstr "%.1f %s" #. Translators: the %s in "%s bytes" will always be replaced by a number. -#: glib/gutils.c:3046 +#: glib/gutils.c:3155 #, c-format msgid "%s byte" msgid_plural "%s bytes" @@ -6295,14 +6309,14 @@ msgstr1 "%s bytes" #. Translators: the %s in "%s bits" will always be replaced by a number. -#: glib/gutils.c:3051 +#: glib/gutils.c:3160 #, c-format msgid "%s bit" msgid_plural "%s bits" msgstr0 "%s bit" msgstr1 "%s bits" -#: glib/gutils.c:3092 +#: glib/gutils.c:3201 #, c-format msgid "%u byte" msgid_plural "%u bytes" @@ -6314,32 +6328,32 @@ #. * compatibility. Users will not see this string unless a program is using this deprecated function. #. * Please translate as literally as possible. #. -#: glib/gutils.c:3105 +#: glib/gutils.c:3214 #, c-format msgid "%.1f KB" msgstr "%.1f KB" -#: glib/gutils.c:3110 +#: glib/gutils.c:3219 #, c-format msgid "%.1f MB" msgstr "%.1f MB" -#: glib/gutils.c:3115 +#: glib/gutils.c:3224 #, c-format msgid "%.1f GB" msgstr "%.1f GB" -#: glib/gutils.c:3120 +#: glib/gutils.c:3229 #, c-format msgid "%.1f TB" msgstr "%.1f TB" -#: glib/gutils.c:3125 +#: glib/gutils.c:3234 #, c-format msgid "%.1f PB" msgstr "%.1f PB" -#: glib/gutils.c:3130 +#: glib/gutils.c:3239 #, c-format msgid "%.1f EB" msgstr "%.1f EB"
View file
_service:tar_scm:glib-2.74.4.tar.xz/po/ru.po -> _service:tar_scm:glib-2.76.4.tar.xz/po/ru.po
Changed
@@ -16,8 +16,8 @@ msgstr "" "Project-Id-Version: ru\n" "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/glib/issues\n" -"POT-Creation-Date: 2022-08-05 19:22+0000\n" -"PO-Revision-Date: 2022-08-05 23:07+0300\n" +"POT-Creation-Date: 2023-02-15 16:30+0000\n" +"PO-Revision-Date: 2023-02-15 19:57+0300\n" "Last-Translator: Aleksandr Melman <Alexmelman88@gmail.com>\n" "Language-Team: Русский <gnome-cyr@gnome.org>\n" "Language: ru\n" @@ -26,24 +26,24 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && " "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -"X-Generator: Poedit 3.1\n" +"X-Generator: Poedit 3.2.2\n" -#: gio/gappinfo.c:335 +#: gio/gappinfo.c:339 msgid "Setting default applications not supported yet" msgstr "Установка приложений по умолчанию пока не поддерживается" -#: gio/gappinfo.c:368 +#: gio/gappinfo.c:372 msgid "Setting application as last used for type not supported yet" msgstr "" "Установка приложения как последнего использованного для типа файла, который " "еще не поддерживается" -#: gio/gappinfo.c:808 +#: gio/gappinfo.c:814 #, c-format msgid "Failed to find default application for content type ‘%s’" msgstr "Не удалось найти приложение по умолчанию для типа содержимого '%s'" -#: gio/gappinfo.c:868 +#: gio/gappinfo.c:874 #, c-format msgid "Failed to find default application for URI Scheme ‘%s’" msgstr "Не удалось найти приложение по умолчанию для схемы URI '%s'" @@ -246,11 +246,11 @@ msgid "error sending %s message to application: %s\n" msgstr "ошибка отправки сообщения %s приложению: %s\n" -#: gio/gapplication-tool.c:321 +#: gio/gapplication-tool.c:324 msgid "action name must be given after application id\n" msgstr "имя действия должно указываться после идентификатора приложения\n" -#: gio/gapplication-tool.c:329 +#: gio/gapplication-tool.c:332 #, c-format msgid "" "invalid action name: “%s”\n" @@ -259,25 +259,25 @@ "недопустимое имя действия: «%s»\n" "имя может состоять только из букв, цифр и символов «-» и «.»\n" -#: gio/gapplication-tool.c:348 +#: gio/gapplication-tool.c:351 #, c-format msgid "error parsing action parameter: %s\n" msgstr "ошибка разбора параметра действия: %s\n" -#: gio/gapplication-tool.c:360 +#: gio/gapplication-tool.c:363 msgid "actions accept a maximum of one parameter\n" msgstr "действия принимают максимум один параметр\n" -#: gio/gapplication-tool.c:415 +#: gio/gapplication-tool.c:418 msgid "list-actions command takes only the application id" msgstr "команда list-actions принимает только идентификатор приложения" -#: gio/gapplication-tool.c:425 +#: gio/gapplication-tool.c:428 #, c-format msgid "unable to find desktop file for application %s\n" msgstr "невозможно найти desktop-файл для приложения %s\n" -#: gio/gapplication-tool.c:470 +#: gio/gapplication-tool.c:473 #, c-format msgid "" "unrecognised command: %s\n" @@ -312,7 +312,7 @@ msgid "Truncate not supported on base stream" msgstr "Усечение не поддерживается в базовом потоке" -#: gio/gcancellable.c:319 gio/gdbusconnection.c:1859 gio/gdbusprivate.c:1420 +#: gio/gcancellable.c:326 gio/gdbusconnection.c:1859 gio/gdbusprivate.c:1420 #: gio/gsimpleasyncresult.c:873 gio/gsimpleasyncresult.c:899 #, c-format msgid "Operation was cancelled" @@ -332,13 +332,13 @@ #: gio/gcharsetconverter.c:344 gio/gdatainputstream.c:850 #: gio/gdatainputstream.c:1268 glib/gconvert.c:451 glib/gconvert.c:883 -#: glib/giochannel.c:1576 glib/giochannel.c:1618 glib/giochannel.c:2473 +#: glib/giochannel.c:1576 glib/giochannel.c:1618 glib/giochannel.c:2478 #: glib/gutf8.c:892 glib/gutf8.c:1346 msgid "Invalid byte sequence in conversion input" msgstr "Недопустимая последовательность байтов во входных преобразуемых данных" #: gio/gcharsetconverter.c:349 glib/gconvert.c:459 glib/gconvert.c:797 -#: glib/giochannel.c:1583 glib/giochannel.c:2485 +#: glib/giochannel.c:1583 glib/giochannel.c:2493 #, c-format msgid "Error during conversion: %s" msgstr "Произошла ошибка при преобразовании: %s" @@ -395,17 +395,17 @@ msgid "Unexpected early end-of-stream" msgstr "Неожиданный ранний конец потока" -#: gio/gdbusaddress.c:164 gio/gdbusaddress.c:238 gio/gdbusaddress.c:327 +#: gio/gdbusaddress.c:162 gio/gdbusaddress.c:234 gio/gdbusaddress.c:321 #, c-format msgid "Unsupported key “%s” in address entry “%s”" msgstr "Неподдерживаемый ключ «%s» в элементе адреса «%s»" -#: gio/gdbusaddress.c:177 +#: gio/gdbusaddress.c:175 #, c-format msgid "Meaningless key/value pair combination in address entry “%s”" msgstr "Бессмысленная комбинация ключ/значение в элементе адреса «%s»" -#: gio/gdbusaddress.c:186 +#: gio/gdbusaddress.c:184 #, c-format msgid "" "Address “%s” is invalid (need exactly one of path, dir, tmpdir, or abstract " @@ -414,28 +414,28 @@ "Неправильный адрес «%s» (требуется путь, временный каталог или один из " "абстрактных ключей)" -#: gio/gdbusaddress.c:253 gio/gdbusaddress.c:264 gio/gdbusaddress.c:279 -#: gio/gdbusaddress.c:342 gio/gdbusaddress.c:353 +#: gio/gdbusaddress.c:249 gio/gdbusaddress.c:260 gio/gdbusaddress.c:275 +#: gio/gdbusaddress.c:336 gio/gdbusaddress.c:347 #, c-format msgid "Error in address “%s” — the “%s” attribute is malformed" msgstr "Ошибка в адресе «%s» — неправильный формат атрибута «%s»" -#: gio/gdbusaddress.c:423 gio/gdbusaddress.c:682 +#: gio/gdbusaddress.c:417 gio/gdbusaddress.c:676 #, c-format msgid "Unknown or unsupported transport “%s” for address “%s”" msgstr "Неизвестный или неподдерживаемый транспорт «%s» для адреса «%s»" -#: gio/gdbusaddress.c:467 +#: gio/gdbusaddress.c:461 #, c-format msgid "Address element “%s” does not contain a colon (:)" msgstr "В элементе адреса «%s» отсутствует двоеточие (:)" -#: gio/gdbusaddress.c:476 +#: gio/gdbusaddress.c:470 #, c-format msgid "Transport name in address element “%s” must not be empty" msgstr "Название протокола в элементе адреса “%s” не должен быть пустым" -#: gio/gdbusaddress.c:497 +#: gio/gdbusaddress.c:491 #, c-format msgid "" "Key/Value pair %d, “%s”, in address element “%s” does not contain an equal " @@ -444,7 +444,7 @@ "Пара ключ/значение %d, «%s», в элементе адреса «%s» не содержит знака " "равенства" -#: gio/gdbusaddress.c:508 +#: gio/gdbusaddress.c:502 #, c-format msgid "" "Key/Value pair %d, “%s”, in address element “%s” must not have an empty key" @@ -452,7 +452,7 @@ "Пара ключ/значение %d, «%s», в элементе адреса «%s» не должна иметь пустого " "ключа" -#: gio/gdbusaddress.c:522 +#: gio/gdbusaddress.c:516 #, c-format msgid "" "Error unescaping key or value in Key/Value pair %d, “%s”, in address element " @@ -461,7 +461,7 @@ "Ошибка снятия экранирования ключа или значения в паре ключ/значение %d, " "«%s», в элементе адреса «%s»" -#: gio/gdbusaddress.c:590 +#: gio/gdbusaddress.c:584 #, c-format msgid "" "Error in address “%s” — the unix transport requires exactly one of the keys " @@ -470,82 +470,82 @@ "Ошибка в адресе «%s» — для транспорта unix требуется только один " "установленный ключ «path» или «abstract»" -#: gio/gdbusaddress.c:625 +#: gio/gdbusaddress.c:619 #, c-format msgid "Error in address “%s” — the host attribute is missing or malformed" msgstr "" "Ошибка в адресе «%s» — атрибут узла отсутствует или имеет неправильный формат" -#: gio/gdbusaddress.c:639 +#: gio/gdbusaddress.c:633 #, c-format msgid "Error in address “%s” — the port attribute is missing or malformed" msgstr "" "Ошибка в адресе «%s» — атрибут порта отсутствует или имеет неправильный " "формат" -#: gio/gdbusaddress.c:653 +#: gio/gdbusaddress.c:647 #, c-format msgid "Error in address “%s” — the noncefile attribute is missing or malformed" msgstr "" "Ошибка в адресе «%s» — атрибут noncefile отсутствует или имеет неправильный " "формат" -#: gio/gdbusaddress.c:674 +#: gio/gdbusaddress.c:668 msgid "Error auto-launching: " msgstr "Ошибка автоматического запуска: " -#: gio/gdbusaddress.c:727 +#: gio/gdbusaddress.c:721 #, c-format msgid "Error opening nonce file “%s”: %s" msgstr "Произошла ошибка при открытии nonce-файла «%s»: %s" -#: gio/gdbusaddress.c:746 +#: gio/gdbusaddress.c:740 #, c-format msgid "Error reading from nonce file “%s”: %s" msgstr "Произошла ошибка при чтении nonce-файла «%s»: %s" -#: gio/gdbusaddress.c:755 +#: gio/gdbusaddress.c:749 #, c-format msgid "Error reading from nonce file “%s”, expected 16 bytes, got %d" msgstr "" "Произошла ошибка при чтении nonce-файла «%s», ожидалось 16 байт, получено %d" -#: gio/gdbusaddress.c:773 +#: gio/gdbusaddress.c:767 #, c-format msgid "Error writing contents of nonce file “%s” to stream:" msgstr "Произошла ошибка записи содержимого nonce-файла «%s» в поток:" -#: gio/gdbusaddress.c:988 +#: gio/gdbusaddress.c:982 msgid "The given address is empty" msgstr "Указанный адрес пуст" -#: gio/gdbusaddress.c:1101 +#: gio/gdbusaddress.c:1095 #, c-format msgid "Cannot spawn a message bus when AT_SECURE is set" msgstr "" "Невозможно создать шину сообщений, когда установлено значение AT_SECURE" -#: gio/gdbusaddress.c:1108 +#: gio/gdbusaddress.c:1102 msgid "Cannot spawn a message bus without a machine-id: " msgstr "Невозможно породить процесс шины сообщений без идентификатора машины: " -#: gio/gdbusaddress.c:1115 +#: gio/gdbusaddress.c:1109 #, c-format msgid "Cannot autolaunch D-Bus without X11 $DISPLAY" msgstr "Невозможно автоматически запустить D-Bus без X11 $DISPLAY" -#: gio/gdbusaddress.c:1157 +#: gio/gdbusaddress.c:1151 #, c-format msgid "Error spawning command line “%s”: " msgstr "Произошла ошибка при создании процесса командной строки «%s»: " -#: gio/gdbusaddress.c:1226 +#: gio/gdbusaddress.c:1220 #, c-format msgid "Cannot determine session bus address (not implemented for this OS)" msgstr "" "Не удалось определить адрес сеансовой шины (не реализовано для этой ОС)" -#: gio/gdbusaddress.c:1375 gio/gdbusconnection.c:7321 +#: gio/gdbusaddress.c:1374 gio/gdbusconnection.c:7316 #, c-format msgid "" "Cannot determine bus address from DBUS_STARTER_BUS_TYPE environment variable " @@ -554,7 +554,7 @@ "Не удалось определить адрес шины из значения переменной окружения " "DBUS_STARTER_BUS_TYPE — неизвестное значение «%s»" -#: gio/gdbusaddress.c:1384 gio/gdbusconnection.c:7330 +#: gio/gdbusaddress.c:1383 gio/gdbusconnection.c:7325 msgid "" "Cannot determine bus address because the DBUS_STARTER_BUS_TYPE environment " "variable is not set" @@ -562,7 +562,7 @@ "Не удалось определить адрес шины, т. к. значение переменной окружения " "DBUS_STARTER_BUS_TYPE не установлено" -#: gio/gdbusaddress.c:1394 +#: gio/gdbusaddress.c:1393 #, c-format msgid "Unknown bus type %d" msgstr "Неизвестный тип шины %d" @@ -583,11 +583,15 @@ "Перепробованы все доступные механизмы аутентификации (проведено: %s) " "(доступно: %s)" -#: gio/gdbusauth.c:1178 +#: gio/gdbusauth.c:1045 +msgid "Unexpected lack of content trying to read a byte" +msgstr "Неожиданное отсутствие содержимого при попытке прочитать байт" + +#: gio/gdbusauth.c:1195 msgid "User IDs must be the same for peer and server" msgstr "Идентификаторы пользователя должны быть и на клиенте и на сервере" -#: gio/gdbusauth.c:1190 +#: gio/gdbusauth.c:1207 msgid "Cancelled via GDBusAuthObserver::authorize-authenticated-peer" msgstr "Отменено через GDBusAuthObserver::authorize-authenticated-peer" @@ -678,7 +682,7 @@ msgid "(Additionally, releasing the lock for “%s” also failed: %s) " msgstr "(Также, не удалось освободить блокировку для «%s»: %s) " -#: gio/gdbusconnection.c:590 gio/gdbusconnection.c:2404 +#: gio/gdbusconnection.c:590 gio/gdbusconnection.c:2405 msgid "The connection is closed" msgstr "Соединение закрыто" @@ -686,117 +690,117 @@ msgid "Timeout was reached" msgstr "Время ожидания истекло" -#: gio/gdbusconnection.c:2527 +#: gio/gdbusconnection.c:2528 msgid "" "Unsupported flags encountered when constructing a client-side connection" msgstr "При создании клиентского соединения обнаружены неподдерживаемые флаги" -#: gio/gdbusconnection.c:4256 gio/gdbusconnection.c:4610 +#: gio/gdbusconnection.c:4257 gio/gdbusconnection.c:4611 #, c-format msgid "" "No such interface “org.freedesktop.DBus.Properties” on object at path %s" msgstr "" "Интерфейс «org.freedesktop.DBus.Properties» для пути %s объекта не найден" -#: gio/gdbusconnection.c:4401 +#: gio/gdbusconnection.c:4402 #, c-format msgid "No such property “%s”" msgstr "Свойство «%s» отсутствует" -#: gio/gdbusconnection.c:4413 +#: gio/gdbusconnection.c:4414 #, c-format msgid "Property “%s” is not readable" msgstr "Свойство «%s» недоступно для чтения" -#: gio/gdbusconnection.c:4424 +#: gio/gdbusconnection.c:4425 #, c-format msgid "Property “%s” is not writable" msgstr "Свойство «%s» недоступно для записи" -#: gio/gdbusconnection.c:4444 +#: gio/gdbusconnection.c:4445 #, c-format msgid "Error setting property “%s”: Expected type “%s” but got “%s”" msgstr "Ошибка установки свойства «%s»: ожидался тип «%s», но получен «%s»" -#: gio/gdbusconnection.c:4549 gio/gdbusconnection.c:4764 -#: gio/gdbusconnection.c:6747 +#: gio/gdbusconnection.c:4550 gio/gdbusconnection.c:4765 +#: gio/gdbusconnection.c:6742 #, c-format msgid "No such interface “%s”" msgstr "Интерфейс «%s» отсутствует" -#: gio/gdbusconnection.c:4986 gio/gdbusconnection.c:7261 +#: gio/gdbusconnection.c:4981 gio/gdbusconnection.c:7256 #, c-format msgid "No such interface “%s” on object at path %s" msgstr "Интерфейс «%s» для пути %s объекта не найден" -#: gio/gdbusconnection.c:5087 +#: gio/gdbusconnection.c:5082 #, c-format msgid "No such method “%s”" msgstr "Ключ «%s» отсутствует" -#: gio/gdbusconnection.c:5118 +#: gio/gdbusconnection.c:5113 #, c-format msgid "Type of message, “%s”, does not match expected type “%s”" msgstr "Тип сообщения «%s» не совпадает с ожидаемым типом «%s»" -#: gio/gdbusconnection.c:5321 +#: gio/gdbusconnection.c:5316 #, c-format msgid "An object is already exported for the interface %s at %s" msgstr "Объект интерфейса %s уже экспортирован как %s" -#: gio/gdbusconnection.c:5548 +#: gio/gdbusconnection.c:5543 #, c-format msgid "Unable to retrieve property %s.%s" msgstr "Невозможно получить свойство %s.%s" -#: gio/gdbusconnection.c:5604 +#: gio/gdbusconnection.c:5599 #, c-format msgid "Unable to set property %s.%s" msgstr "Невозможно установить свойство %s.%s" -#: gio/gdbusconnection.c:5783 +#: gio/gdbusconnection.c:5778 #, c-format msgid "Method “%s” returned type “%s”, but expected “%s”" msgstr "Метод «%s» вернул тип «%s», но ожидалось «%s»" -#: gio/gdbusconnection.c:6859 +#: gio/gdbusconnection.c:6854 #, c-format msgid "Method “%s” on interface “%s” with signature “%s” does not exist" msgstr "Метод «%s» интерфейса «%s» с сигнатурой «%s» не существует" -#: gio/gdbusconnection.c:6980 +#: gio/gdbusconnection.c:6975 #, c-format msgid "A subtree is already exported for %s" msgstr "Поддерево уже экспортировано для %s" -#: gio/gdbusconnection.c:7269 +#: gio/gdbusconnection.c:7264 #, c-format msgid "Object does not exist at path “%s”" msgstr "Объект по пути «%s» не существует" -#: gio/gdbusmessage.c:1303 +#: gio/gdbusmessage.c:1306 msgid "type is INVALID" msgstr "тип является НЕДОПУСТИМЫМ" -#: gio/gdbusmessage.c:1314 +#: gio/gdbusmessage.c:1317 msgid "METHOD_CALL message: PATH or MEMBER header field is missing" msgstr "Сообщение METHOD_CALL: отсутствует поле заголовка PATH или MEMBER" -#: gio/gdbusmessage.c:1325 +#: gio/gdbusmessage.c:1328 msgid "METHOD_RETURN message: REPLY_SERIAL header field is missing" msgstr "Сообщение METHOD_RETURN: отсутствует поле заголовка REPLY_SERIAL" -#: gio/gdbusmessage.c:1337 +#: gio/gdbusmessage.c:1340 msgid "ERROR message: REPLY_SERIAL or ERROR_NAME header field is missing" msgstr "" "Сообщение ERROR: отсутствует поле заголовка REPLY_SERIAL или ERROR_NAME" -#: gio/gdbusmessage.c:1350 +#: gio/gdbusmessage.c:1353 msgid "SIGNAL message: PATH, INTERFACE or MEMBER header field is missing" msgstr "" "Сообщение SIGNAL: отсутствует поле заголовка PATH, INTERFACE или MEMBER" -#: gio/gdbusmessage.c:1358 +#: gio/gdbusmessage.c:1361 msgid "" "SIGNAL message: The PATH header field is using the reserved value /org/" "freedesktop/DBus/Local" @@ -804,7 +808,7 @@ "Сообщение SIGNAL: поле заголовка PATH использует зарезервированное значение /" "org/freedesktop/DBus/Local" -#: gio/gdbusmessage.c:1366 +#: gio/gdbusmessage.c:1369 msgid "" "SIGNAL message: The INTERFACE header field is using the reserved value org." "freedesktop.DBus.Local" @@ -812,7 +816,7 @@ "Сообщение SIGNAL: поле заголовка INTERFACE использует зарезервированное " "значение org.freedesktop.DBus.Local" -#: gio/gdbusmessage.c:1414 gio/gdbusmessage.c:1474 +#: gio/gdbusmessage.c:1417 gio/gdbusmessage.c:1477 #, c-format msgid "Wanted to read %lu byte but only got %lu" msgid_plural "Wanted to read %lu bytes but only got %lu" @@ -820,12 +824,12 @@ msgstr1 "Требовалось прочитать %lu байта, но прочитано только %lu" msgstr2 "Требовалось прочитать %lu байт, но прочитано только %lu" -#: gio/gdbusmessage.c:1428 +#: gio/gdbusmessage.c:1431 #, c-format msgid "Expected NUL byte after the string “%s” but found byte %d" msgstr "Ожидался байт NUL после строки «%s», но найден байт %d" -#: gio/gdbusmessage.c:1447 +#: gio/gdbusmessage.c:1450 #, c-format msgid "" "Expected valid UTF-8 string but found invalid bytes at byte offset %d " @@ -835,21 +839,21 @@ "(смещение %d, длина строки %d). Корректная строка UTF-8 вплоть до тех байт: " "«%s»" -#: gio/gdbusmessage.c:1511 gio/gdbusmessage.c:1787 gio/gdbusmessage.c:1998 +#: gio/gdbusmessage.c:1514 gio/gdbusmessage.c:1790 gio/gdbusmessage.c:2001 msgid "Value nested too deeply" msgstr "Слишком глубокая иерархия" -#: gio/gdbusmessage.c:1679 +#: gio/gdbusmessage.c:1682 #, c-format msgid "Parsed value “%s” is not a valid D-Bus object path" msgstr "Разобранное значение «%s» не является допустимым путём объекта D-Bus" -#: gio/gdbusmessage.c:1703 +#: gio/gdbusmessage.c:1706 #, c-format msgid "Parsed value “%s” is not a valid D-Bus signature" msgstr "Разобранное значение «%s» не является допустимой подписью D-Bus" -#: gio/gdbusmessage.c:1754 +#: gio/gdbusmessage.c:1757 #, c-format msgid "" "Encountered array of length %u byte. Maximum length is 2<<26 bytes (64 MiB)." @@ -865,7 +869,7 @@ "Обнаружен массив длинной %u байт. Максимальная длина равна 2<<26 байт (64 " "МиБ)." -#: gio/gdbusmessage.c:1774 +#: gio/gdbusmessage.c:1777 #, c-format msgid "" "Encountered array of type “a%c”, expected to have a length a multiple of %u " @@ -874,24 +878,24 @@ "Получен массив типа «a%c», который должен иметь размер кратный %u (байт), но " "массив имеет длину %u (байт)" -#: gio/gdbusmessage.c:1928 gio/gdbusmessage.c:2647 +#: gio/gdbusmessage.c:1931 gio/gdbusmessage.c:2650 msgid "Empty structures (tuples) are not allowed in D-Bus" msgstr "Пустые структуры (записи) не допускаются в D-Bus" -#: gio/gdbusmessage.c:1982 +#: gio/gdbusmessage.c:1985 #, c-format msgid "Parsed value “%s” for variant is not a valid D-Bus signature" msgstr "" "Разобранное значение «%s» для варианта не является допустимой подписью D-Bus" -#: gio/gdbusmessage.c:2023 +#: gio/gdbusmessage.c:2026 #, c-format msgid "" "Error deserializing GVariant with type string “%s” from the D-Bus wire format" msgstr "" "Ошибка десериализации GVariant с типом строки «%s» из формата D-Bus wire" -#: gio/gdbusmessage.c:2208 +#: gio/gdbusmessage.c:2211 #, c-format msgid "" "Invalid endianness value. Expected 0x6c (“l”) or 0x42 (“B”) but found value " @@ -900,27 +904,27 @@ "Неправильный порядок байтов в значении. Ожидался 0x6c ('l') или 0x42 ('B'), " "но найдено значение 0x%02x" -#: gio/gdbusmessage.c:2227 +#: gio/gdbusmessage.c:2230 #, c-format msgid "Invalid major protocol version. Expected 1 but found %d" msgstr "Неправильный старший номер версии протокола. Ожидался 1, но найден %d" -#: gio/gdbusmessage.c:2285 gio/gdbusmessage.c:2883 +#: gio/gdbusmessage.c:2288 gio/gdbusmessage.c:2886 msgid "Signature header found but is not of type signature" msgstr "Заголовок подписи найден, но его тип отличается от подписи" -#: gio/gdbusmessage.c:2297 +#: gio/gdbusmessage.c:2300 #, c-format msgid "Signature header with signature “%s” found but message body is empty" msgstr "Найден заголовок подписи с подписью «%s», но тело сообщения пусто" -#: gio/gdbusmessage.c:2312 +#: gio/gdbusmessage.c:2315 #, c-format msgid "Parsed value “%s” is not a valid D-Bus signature (for body)" msgstr "" "Разобранное значение «%s» не является допустимой подписью D-Bus (для тела)" -#: gio/gdbusmessage.c:2344 +#: gio/gdbusmessage.c:2347 #, 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" @@ -932,17 +936,17 @@ msgstr2 "" "Отсутствует заголовок подписи в сообщении, но тело сообщения занимает %u байт" -#: gio/gdbusmessage.c:2354 +#: gio/gdbusmessage.c:2357 msgid "Cannot deserialize message: " msgstr "Не удалось выполнить извлечение сообщения: " -#: gio/gdbusmessage.c:2700 +#: gio/gdbusmessage.c:2703 #, c-format msgid "" "Error serializing GVariant with type string “%s” to the D-Bus wire format" msgstr "Ошибка сериализации GVariant с типом строки «%s» в формат D-Bus wire" -#: gio/gdbusmessage.c:2837 +#: gio/gdbusmessage.c:2840 #, c-format msgid "" "Number of file descriptors in message (%d) differs from header field (%d)" @@ -950,16 +954,16 @@ "Количество дескрипторов файлов в сообщении (%d) отличается от указанного в " "заголовке (%d)" -#: gio/gdbusmessage.c:2845 +#: gio/gdbusmessage.c:2848 msgid "Cannot serialize message: " msgstr "Не удалось сериализовать сообщение: " -#: gio/gdbusmessage.c:2898 +#: gio/gdbusmessage.c:2901 #, c-format msgid "Message body has signature “%s” but there is no signature header" msgstr "Тело сообщения имеет подпись «%s», но нет заголовка подписи" -#: gio/gdbusmessage.c:2908 +#: gio/gdbusmessage.c:2911 #, c-format msgid "" "Message body has type signature “%s” but signature in the header field is " @@ -968,18 +972,18 @@ "Тело сообщения имеет тип подписи «%s», но значение подписи в поле заголовка " "равно «%s»" -#: gio/gdbusmessage.c:2924 +#: gio/gdbusmessage.c:2927 #, c-format msgid "Message body is empty but signature in the header field is “(%s)”" msgstr "" "Тело сообщения пусто, но значение подписи в поле заголовка равно «(%s)»" -#: gio/gdbusmessage.c:3479 +#: gio/gdbusmessage.c:3482 #, c-format msgid "Error return with body of type “%s”" msgstr "Возвращена ошибка с телом типа «%s»" -#: gio/gdbusmessage.c:3487 +#: gio/gdbusmessage.c:3490 msgid "Error return with empty body" msgstr "Возвращена ошибка с пустым телом" @@ -1004,17 +1008,17 @@ msgid "Unable to load %s or %s: " msgstr "Не удалось загрузить %s или %s: " -#: gio/gdbusproxy.c:1575 +#: gio/gdbusproxy.c:1568 #, c-format msgid "Error calling StartServiceByName for %s: " msgstr "Ошибка вызова StartServiceByName для %s: " -#: gio/gdbusproxy.c:1598 +#: gio/gdbusproxy.c:1591 #, c-format msgid "Unexpected reply %d from StartServiceByName(\"%s\") method" msgstr "Неожиданный ответ %d из метода StartServiceByName(«%s»)" -#: gio/gdbusproxy.c:2709 gio/gdbusproxy.c:2844 +#: gio/gdbusproxy.c:2702 gio/gdbusproxy.c:2837 #, c-format msgid "" "Cannot invoke method; proxy is for the well-known name %s without an owner, " @@ -1023,25 +1027,25 @@ "Не удалось вызвать метод; у прокси с хорошо известным именем %s нет " "владельца и прокси создать с флагом G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START" -#: gio/gdbusserver.c:765 +#: gio/gdbusserver.c:758 msgid "Abstract namespace not supported" msgstr "Абстрактное пространство имён не поддерживается" -#: gio/gdbusserver.c:857 +#: gio/gdbusserver.c:850 msgid "Cannot specify nonce file when creating a server" msgstr "Не удалось задать nonce-файл при создании сервера" -#: gio/gdbusserver.c:939 +#: gio/gdbusserver.c:932 #, c-format msgid "Error writing nonce file at “%s”: %s" msgstr "Произошла ошибка при записи в nonce-файл у «%s»: %s" -#: gio/gdbusserver.c:1114 +#: gio/gdbusserver.c:1107 #, c-format msgid "The string “%s” is not a valid D-Bus GUID" msgstr "Строка «%s» не является допустимым D-Bus GUID" -#: gio/gdbusserver.c:1152 +#: gio/gdbusserver.c:1145 #, c-format msgid "Cannot listen on unsupported transport “%s”" msgstr "Невозможно прослушивать неподдерживаемый транспорт «%s»" @@ -1069,14 +1073,14 @@ "\n" "Для получения справки по команде используйте «%s КОМАНДА --help».\n" -#: gio/gdbus-tool.c:204 gio/gdbus-tool.c:276 gio/gdbus-tool.c:348 -#: gio/gdbus-tool.c:372 gio/gdbus-tool.c:862 gio/gdbus-tool.c:1247 -#: gio/gdbus-tool.c:1734 +#: gio/gdbus-tool.c:204 gio/gdbus-tool.c:276 gio/gdbus-tool.c:347 +#: gio/gdbus-tool.c:371 gio/gdbus-tool.c:861 gio/gdbus-tool.c:1246 +#: gio/gdbus-tool.c:1733 #, c-format msgid "Error: %s\n" msgstr "Ошибка: %s\n" -#: gio/gdbus-tool.c:215 gio/gdbus-tool.c:289 gio/gdbus-tool.c:1750 +#: gio/gdbus-tool.c:215 gio/gdbus-tool.c:289 gio/gdbus-tool.c:1749 #, c-format msgid "Error parsing introspection XML: %s\n" msgstr "Произошла ошибка при разборе интроспекции XML: %s\n" @@ -1086,50 +1090,50 @@ msgid "Error: %s is not a valid name\n" msgstr "Ошибка: %s не является допустимым именем\n" -#: gio/gdbus-tool.c:258 gio/gdbus-tool.c:748 gio/gdbus-tool.c:1066 -#: gio/gdbus-tool.c:1900 gio/gdbus-tool.c:2140 +#: gio/gdbus-tool.c:258 gio/gdbus-tool.c:747 gio/gdbus-tool.c:1065 +#: gio/gdbus-tool.c:1899 gio/gdbus-tool.c:2139 #, c-format msgid "Error: %s is not a valid object path\n" msgstr "Ошибка: %s не является допустимым объектным путём\n" -#: gio/gdbus-tool.c:406 +#: gio/gdbus-tool.c:405 msgid "Connect to the system bus" msgstr "Подключиться к системной шине" -#: gio/gdbus-tool.c:407 +#: gio/gdbus-tool.c:406 msgid "Connect to the session bus" msgstr "Подключиться к пользовательской шине" -#: gio/gdbus-tool.c:408 +#: gio/gdbus-tool.c:407 msgid "Connect to given D-Bus address" msgstr "Подключиться к заданному адресу D-Bus" -#: gio/gdbus-tool.c:418 +#: gio/gdbus-tool.c:417 msgid "Connection Endpoint Options:" msgstr "Параметры оконечной точки соединения:" -#: gio/gdbus-tool.c:419 +#: gio/gdbus-tool.c:418 msgid "Options specifying the connection endpoint" msgstr "Параметры, определяющие оконечную точку соединения" -#: gio/gdbus-tool.c:442 +#: gio/gdbus-tool.c:441 #, c-format msgid "No connection endpoint specified" msgstr "Оконечная точка соединения не указана" -#: gio/gdbus-tool.c:452 +#: gio/gdbus-tool.c:451 #, c-format msgid "Multiple connection endpoints specified" msgstr "Указано несколько оконечных точек соединения" -#: gio/gdbus-tool.c:525 +#: gio/gdbus-tool.c:524 #, c-format msgid "" "Warning: According to introspection data, interface “%s” does not exist\n" msgstr "" "Предупреждение: согласно данным интроспекции, интерфейс «%s» не существует\n" -#: gio/gdbus-tool.c:534 +#: gio/gdbus-tool.c:533 #, c-format msgid "" "Warning: According to introspection data, method “%s” does not exist on " @@ -1138,164 +1142,164 @@ "Предупреждение: согласно данным интроспекции, метод «%s» в интерфейсе «%s» " "не существует\n" -#: gio/gdbus-tool.c:596 +#: gio/gdbus-tool.c:595 msgid "Optional destination for signal (unique name)" msgstr "Необязательный получатель сигнала (уникальное имя)" -#: gio/gdbus-tool.c:597 +#: gio/gdbus-tool.c:596 msgid "Object path to emit signal on" msgstr "Объектный путь, для выпуска сигнала" -#: gio/gdbus-tool.c:598 +#: gio/gdbus-tool.c:597 msgid "Signal and interface name" msgstr "Название сигнала и интерфейса" -#: gio/gdbus-tool.c:631 +#: gio/gdbus-tool.c:630 msgid "Emit a signal." msgstr "Послать сигнал." -#: gio/gdbus-tool.c:686 gio/gdbus-tool.c:1003 gio/gdbus-tool.c:1837 -#: gio/gdbus-tool.c:2069 gio/gdbus-tool.c:2289 +#: gio/gdbus-tool.c:685 gio/gdbus-tool.c:1002 gio/gdbus-tool.c:1836 +#: gio/gdbus-tool.c:2068 gio/gdbus-tool.c:2288 #, c-format msgid "Error connecting: %s\n" msgstr "Произошла ошибка при соединении: %s\n" -#: gio/gdbus-tool.c:706 +#: gio/gdbus-tool.c:705 #, c-format msgid "Error: %s is not a valid unique bus name.\n" msgstr "Ошибка: %s не является допустимым уникальным именем шины.\n" -#: gio/gdbus-tool.c:725 gio/gdbus-tool.c:1046 gio/gdbus-tool.c:1880 +#: gio/gdbus-tool.c:724 gio/gdbus-tool.c:1045 gio/gdbus-tool.c:1879 msgid "Error: Object path is not specified\n" msgstr "Ошибка: не указан объектный путь\n" -#: gio/gdbus-tool.c:768 +#: gio/gdbus-tool.c:767 msgid "Error: Signal name is not specified\n" msgstr "Ошибка: не указано имя сигнала\n" -#: gio/gdbus-tool.c:782 +#: gio/gdbus-tool.c:781 #, c-format msgid "Error: Signal name “%s” is invalid\n" msgstr "Ошибка: неправильное имя сигнала «%s»\n" -#: gio/gdbus-tool.c:794 +#: gio/gdbus-tool.c:793 #, c-format msgid "Error: %s is not a valid interface name\n" msgstr "Ошибка: %s не является допустимым именем интерфейса\n" -#: gio/gdbus-tool.c:800 +#: gio/gdbus-tool.c:799 #, c-format msgid "Error: %s is not a valid member name\n" msgstr "Ошибка: %s не является допустимым именем члена\n" #. Use the original non-"parse-me-harder" error -#: gio/gdbus-tool.c:837 gio/gdbus-tool.c:1178 +#: gio/gdbus-tool.c:836 gio/gdbus-tool.c:1177 #, c-format msgid "Error parsing parameter %d: %s\n" msgstr "Произошла ошибка при разборе параметра %d: %s\n" -#: gio/gdbus-tool.c:869 +#: gio/gdbus-tool.c:868 #, c-format msgid "Error flushing connection: %s\n" msgstr "Произошла ошибка при сбросе подключения: %s\n" -#: gio/gdbus-tool.c:897 +#: gio/gdbus-tool.c:896 msgid "Destination name to invoke method on" msgstr "Имя назначения, для которого вызывается метод" -#: gio/gdbus-tool.c:898 +#: gio/gdbus-tool.c:897 msgid "Object path to invoke method on" msgstr "Объектный путь, для которого вызывается метод" -#: gio/gdbus-tool.c:899 +#: gio/gdbus-tool.c:898 msgid "Method and interface name" msgstr "Название метода или интерфейса" -#: gio/gdbus-tool.c:900 +#: gio/gdbus-tool.c:899 msgid "Timeout in seconds" msgstr "Время ожидания в секундах" -#: gio/gdbus-tool.c:901 +#: gio/gdbus-tool.c:900 msgid "Allow interactive authorization" msgstr "Разрешить интерактивную авторизацию" -#: gio/gdbus-tool.c:948 +#: gio/gdbus-tool.c:947 msgid "Invoke a method on a remote object." msgstr "Вызывает метод на удалённом объекте." -#: gio/gdbus-tool.c:1020 gio/gdbus-tool.c:1854 gio/gdbus-tool.c:2094 +#: gio/gdbus-tool.c:1019 gio/gdbus-tool.c:1853 gio/gdbus-tool.c:2093 msgid "Error: Destination is not specified\n" msgstr "Ошибка: не указано назначение\n" -#: gio/gdbus-tool.c:1031 gio/gdbus-tool.c:1871 gio/gdbus-tool.c:2105 +#: gio/gdbus-tool.c:1030 gio/gdbus-tool.c:1870 gio/gdbus-tool.c:2104 #, c-format msgid "Error: %s is not a valid bus name\n" msgstr "Ошибка: %s не является допустимым именем шины\n" -#: gio/gdbus-tool.c:1081 +#: gio/gdbus-tool.c:1080 msgid "Error: Method name is not specified\n" msgstr "Ошибка: не указано имя метода\n" -#: gio/gdbus-tool.c:1092 +#: gio/gdbus-tool.c:1091 #, c-format msgid "Error: Method name “%s” is invalid\n" msgstr "Ошибка: неправильное имя метода «%s»\n" -#: gio/gdbus-tool.c:1170 +#: gio/gdbus-tool.c:1169 #, c-format msgid "Error parsing parameter %d of type “%s”: %s\n" msgstr "Произошла ошибка при разборе параметра %d типа «%s»: %s\n" -#: gio/gdbus-tool.c:1196 +#: gio/gdbus-tool.c:1195 #, c-format msgid "Error adding handle %d: %s\n" msgstr "Произошла ошибка при добавлении дескриптора %d: %s\n" -#: gio/gdbus-tool.c:1696 +#: gio/gdbus-tool.c:1695 msgid "Destination name to introspect" msgstr "Имя назначения для интроспекции" -#: gio/gdbus-tool.c:1697 +#: gio/gdbus-tool.c:1696 msgid "Object path to introspect" msgstr "Объектный путь для интроспекции" -#: gio/gdbus-tool.c:1698 +#: gio/gdbus-tool.c:1697 msgid "Print XML" msgstr "Напечатать XML" -#: gio/gdbus-tool.c:1699 +#: gio/gdbus-tool.c:1698 msgid "Introspect children" msgstr "Интроспекция потомка" -#: gio/gdbus-tool.c:1700 +#: gio/gdbus-tool.c:1699 msgid "Only print properties" msgstr "Только свойства печати" -#: gio/gdbus-tool.c:1789 +#: gio/gdbus-tool.c:1788 msgid "Introspect a remote object." msgstr "Выполнить интроспекцию удалённого объекта." -#: gio/gdbus-tool.c:1995 +#: gio/gdbus-tool.c:1994 msgid "Destination name to monitor" msgstr "Имя назначения для наблюдения" -#: gio/gdbus-tool.c:1996 +#: gio/gdbus-tool.c:1995 msgid "Object path to monitor" msgstr "Объектный путь для наблюдения" -#: gio/gdbus-tool.c:2021 +#: gio/gdbus-tool.c:2020 msgid "Monitor a remote object." msgstr "Наблюдать за удалённым объектом." -#: gio/gdbus-tool.c:2079 +#: gio/gdbus-tool.c:2078 msgid "Error: can’t monitor a non-message-bus connection\n" msgstr "Ошибка: невозможно следить за соединением non-message-bus\n" -#: gio/gdbus-tool.c:2203 +#: gio/gdbus-tool.c:2202 msgid "Service to activate before waiting for the other one (well-known name)" msgstr "Сервис для активации перед ожиданием другого (хорошо известное имя)" -#: gio/gdbus-tool.c:2206 +#: gio/gdbus-tool.c:2205 msgid "" "Timeout to wait for before exiting with an error (seconds); 0 for no timeout " "(default)" @@ -1303,27 +1307,27 @@ "Срок ожидание до выхода с ошибкой (секунды); 0 для бесконечности (по " "умолчанию)" -#: gio/gdbus-tool.c:2254 +#: gio/gdbus-tool.c:2253 msgid "OPTION… BUS-NAME" msgstr "ПАРАМЕТР… ИМЯ-ШИНЫ" -#: gio/gdbus-tool.c:2255 +#: gio/gdbus-tool.c:2254 msgid "Wait for a bus name to appear." msgstr "Дождитесь появления имени шины." -#: gio/gdbus-tool.c:2331 +#: gio/gdbus-tool.c:2330 msgid "Error: A service to activate for must be specified.\n" msgstr "Ошибка: должен быть указан сервис для активации.\n" -#: gio/gdbus-tool.c:2336 +#: gio/gdbus-tool.c:2335 msgid "Error: A service to wait for must be specified.\n" msgstr "Ошибка: должен быть указан сервис для ожидания.\n" -#: gio/gdbus-tool.c:2341 +#: gio/gdbus-tool.c:2340 msgid "Error: Too many arguments.\n" msgstr "Ошибка: слишком много аргументов.\n" -#: gio/gdbus-tool.c:2349 gio/gdbus-tool.c:2356 +#: gio/gdbus-tool.c:2348 gio/gdbus-tool.c:2355 #, c-format msgid "Error: %s is not a valid well-known bus name.\n" msgstr "Ошибка: %s не является допустимым известным именем шины\n" @@ -1333,38 +1337,43 @@ msgid "Not authorized to change debug settings" msgstr "Не вправе изменять настройки отладки" -#: gio/gdesktopappinfo.c:2182 gio/gdesktopappinfo.c:5113 +#: gio/gdesktopappinfo.c:2242 gio/gdesktopappinfo.c:5223 msgid "Unnamed" msgstr "Без имени" -#: gio/gdesktopappinfo.c:2592 +#: gio/gdesktopappinfo.c:2652 msgid "Desktop file didn’t specify Exec field" msgstr "В desktop-файле не указано поле Exec" -#: gio/gdesktopappinfo.c:2891 +#: gio/gdesktopappinfo.c:2942 msgid "Unable to find terminal required for application" msgstr "Не удалось найти терминал, требуемый для приложения" -#: gio/gdesktopappinfo.c:3631 +#: gio/gdesktopappinfo.c:3002 +#, c-format +msgid "Program ‘%s’ not found in $PATH" +msgstr "Программа '%s' не найдена в $PATH" + +#: gio/gdesktopappinfo.c:3735 #, c-format msgid "Can’t create user application configuration folder %s: %s" msgstr "Не удалось создать пользовательскую папку настроек приложения %s: %s" -#: gio/gdesktopappinfo.c:3635 +#: gio/gdesktopappinfo.c:3739 #, c-format msgid "Can’t create user MIME configuration folder %s: %s" msgstr "Не удалось создать пользовательскую папку настроек MIME %s: %s" -#: gio/gdesktopappinfo.c:3877 gio/gdesktopappinfo.c:3901 +#: gio/gdesktopappinfo.c:3981 gio/gdesktopappinfo.c:4005 msgid "Application information lacks an identifier" msgstr "В информации о приложении отсутствует идентификатор" -#: gio/gdesktopappinfo.c:4137 +#: gio/gdesktopappinfo.c:4241 #, c-format msgid "Can’t create user desktop file %s" msgstr "Не удалось создать пользовательский desktop-файл %s" -#: gio/gdesktopappinfo.c:4273 +#: gio/gdesktopappinfo.c:4377 #, c-format msgid "Custom definition for %s" msgstr "Особое определение для %s" @@ -1437,7 +1446,7 @@ msgid "Containing mount does not exist" msgstr "Содержащая точка монтирования не существует" -#: gio/gfile.c:2641 gio/glocalfile.c:2500 +#: gio/gfile.c:2641 gio/glocalfile.c:2511 msgid "Can’t copy over directory" msgstr "Нельзя скопировать поверх каталога" @@ -1483,7 +1492,7 @@ msgid "Invalid symlink value given" msgstr "Дано неверное значение символьной ссылки" -#: gio/gfile.c:4163 glib/gfileutils.c:2335 +#: gio/gfile.c:4163 glib/gfileutils.c:2392 msgid "Symbolic links not supported" msgstr "Символьные ссылки не поддерживаются" @@ -1584,37 +1593,37 @@ msgid "HTTP proxy server closed connection unexpectedly." msgstr "Cервер прокси HTTP неожиданно закрыл соединение." -#: gio/gicon.c:300 +#: gio/gicon.c:299 #, c-format msgid "Wrong number of tokens (%d)" msgstr "Неверное число лексем (%d)" -#: gio/gicon.c:320 +#: gio/gicon.c:319 #, c-format msgid "No type for class name %s" msgstr "Нет типа для класса с именем %s" -#: gio/gicon.c:330 +#: gio/gicon.c:329 #, c-format msgid "Type %s does not implement the GIcon interface" msgstr "Тип %s не реализует интерфейс GIcon" -#: gio/gicon.c:341 +#: gio/gicon.c:340 #, c-format msgid "Type %s is not classed" msgstr "Тип %s не является классифицируемым" -#: gio/gicon.c:355 +#: gio/gicon.c:354 #, c-format msgid "Malformed version number: %s" msgstr "Некорректный номер версии: %s" -#: gio/gicon.c:369 +#: gio/gicon.c:368 #, c-format msgid "Type %s does not implement from_tokens() on the GIcon interface" msgstr "Тип %s не реализует from_tokens() интерфейса GIcon" -#: gio/gicon.c:471 +#: gio/gicon.c:470 msgid "Can’t handle the supplied version of the icon encoding" msgstr "Не удалось обработать данную версию текстового представления значка" @@ -1764,7 +1773,7 @@ #: gio/gio-tool-cat.c:135 gio/gio-tool-info.c:379 gio/gio-tool-list.c:173 #: gio/gio-tool-mkdir.c:50 gio/gio-tool-monitor.c:39 gio/gio-tool-monitor.c:41 #: gio/gio-tool-monitor.c:43 gio/gio-tool-monitor.c:45 -#: gio/gio-tool-monitor.c:206 gio/gio-tool-mount.c:1202 gio/gio-tool-open.c:72 +#: gio/gio-tool-monitor.c:206 gio/gio-tool-mount.c:1210 gio/gio-tool-open.c:72 #: gio/gio-tool-remove.c:50 gio/gio-tool-rename.c:47 gio/gio-tool-set.c:95 #: gio/gio-tool-trash.c:222 gio/gio-tool-tree.c:241 msgid "LOCATION" @@ -1785,7 +1794,7 @@ "то вроде smb://server/resource/file.txt в качестве расположения." #: gio/gio-tool-cat.c:164 gio/gio-tool-info.c:410 gio/gio-tool-mkdir.c:78 -#: gio/gio-tool-monitor.c:231 gio/gio-tool-mount.c:1253 gio/gio-tool-open.c:98 +#: gio/gio-tool-monitor.c:231 gio/gio-tool-mount.c:1261 gio/gio-tool-open.c:98 #: gio/gio-tool-remove.c:74 gio/gio-tool-trash.c:303 msgid "No locations given" msgstr "Не указаны адреса" @@ -2206,19 +2215,19 @@ msgid "Mount a TCRYPT system volume" msgstr "Подключить системный том TCRYPT" -#: gio/gio-tool-mount.c:268 gio/gio-tool-mount.c:300 +#: gio/gio-tool-mount.c:276 gio/gio-tool-mount.c:308 msgid "Anonymous access denied" msgstr "Анонимный доступ запрещён" -#: gio/gio-tool-mount.c:525 +#: gio/gio-tool-mount.c:533 msgid "No drive for device file" msgstr "Нет диска для файла устройства" -#: gio/gio-tool-mount.c:1017 +#: gio/gio-tool-mount.c:1025 msgid "No volume for given ID" msgstr "Нет тома для указанного идентификатора" -#: gio/gio-tool-mount.c:1206 +#: gio/gio-tool-mount.c:1214 msgid "Mount or unmount the locations." msgstr "Подключить или отключить адреса." @@ -2423,7 +2432,7 @@ msgid "List contents of directories in a tree-like format." msgstr "Вывести содержимое каталогов в виде дерева." -#: gio/glib-compile-resources.c:142 gio/glib-compile-schemas.c:1516 +#: gio/glib-compile-resources.c:142 gio/glib-compile-schemas.c:1513 #, c-format msgid "Element <%s> not allowed inside <%s>" msgstr "Элемент <%s> не может быть внутри <%s>" @@ -2480,7 +2489,7 @@ msgid "text may not appear inside <%s>" msgstr "текста не может быть внутри <%s>" -#: gio/glib-compile-resources.c:821 gio/glib-compile-schemas.c:2174 +#: gio/glib-compile-resources.c:821 gio/glib-compile-schemas.c:2171 msgid "Show program version and exit" msgstr "Показать версию программы и выйти" @@ -2496,8 +2505,8 @@ "Каталоги для загрузки файлов, указанных в параметре FILE (по умолчанию: " "текущий каталог)" -#: gio/glib-compile-resources.c:823 gio/glib-compile-schemas.c:2175 -#: gio/glib-compile-schemas.c:2204 +#: gio/glib-compile-resources.c:823 gio/glib-compile-schemas.c:2172 +#: gio/glib-compile-schemas.c:2201 msgid "DIRECTORY" msgstr "КАТАЛОГ" @@ -2720,16 +2729,16 @@ msgid "<aliases> must contain at least one <alias>" msgstr "<aliases> должны содержать хотя бы одно значение <alias>" -#: gio/glib-compile-schemas.c:799 +#: gio/glib-compile-schemas.c:796 msgid "Empty names are not permitted" msgstr "Пустые имена запрещены" -#: gio/glib-compile-schemas.c:809 +#: gio/glib-compile-schemas.c:806 #, c-format msgid "Invalid name “%s”: names must begin with a lowercase letter" msgstr "Неверное имя «%s»: имена должны начинаться со строчной буквы" -#: gio/glib-compile-schemas.c:821 +#: gio/glib-compile-schemas.c:818 #, c-format msgid "" "Invalid name “%s”: invalid character “%c”; only lowercase letters, numbers " @@ -2738,36 +2747,36 @@ "Неверное имя «%s»: неверный символ «%c»; допускаются только строчные буквы, " "числа и дефис («-»)" -#: gio/glib-compile-schemas.c:830 +#: gio/glib-compile-schemas.c:827 #, c-format msgid "Invalid name “%s”: two successive hyphens (“--”) are not permitted" msgstr "Неверное имя «%s»: нельзя указывать два дефиса одновременно («--»)" -#: gio/glib-compile-schemas.c:839 +#: gio/glib-compile-schemas.c:836 #, c-format msgid "Invalid name “%s”: the last character may not be a hyphen (“-”)" msgstr "Неверное имя «%s»: последний символ не может быть дефисом («-»)." -#: gio/glib-compile-schemas.c:847 +#: gio/glib-compile-schemas.c:844 #, c-format msgid "Invalid name “%s”: maximum length is 1024" msgstr "Неверное имя «%s»: максимальная длина равна 1024" -#: gio/glib-compile-schemas.c:919 +#: gio/glib-compile-schemas.c:916 #, c-format msgid "<child name='%s'> already specified" msgstr "<child name=«%s»> уже задан" -#: gio/glib-compile-schemas.c:945 +#: gio/glib-compile-schemas.c:942 msgid "Cannot add keys to a “list-of” schema" msgstr "Не удалось добавить ключи в схему «list-of»" -#: gio/glib-compile-schemas.c:956 +#: gio/glib-compile-schemas.c:953 #, c-format msgid "<key name='%s'> already specified" msgstr "<key name=«%s»> уже задан" -#: gio/glib-compile-schemas.c:974 +#: gio/glib-compile-schemas.c:971 #, c-format msgid "" "<key name='%s'> shadows <key name='%s'> in <schema id='%s'>; use <override> " @@ -2776,7 +2785,7 @@ "<key name=«%s»> оттеняет <key name=«%s»> в <schema id=«%s»>; для изменения " "значения используйте <override>" -#: gio/glib-compile-schemas.c:985 +#: gio/glib-compile-schemas.c:982 #, c-format msgid "" "Exactly one of “type”, “enum” or “flags” must be specified as an attribute " @@ -2784,56 +2793,56 @@ msgstr "" "В качестве атрибута <key> можно указать только «type», «enum» или «flags»" -#: gio/glib-compile-schemas.c:1004 +#: gio/glib-compile-schemas.c:1001 #, c-format msgid "<%s id='%s'> not (yet) defined." msgstr "<%s id=«%s»> не определён (пока)." -#: gio/glib-compile-schemas.c:1019 +#: gio/glib-compile-schemas.c:1016 #, c-format msgid "Invalid GVariant type string “%s”" msgstr "Недопустимая строка типа GVariant «%s»" -#: gio/glib-compile-schemas.c:1049 +#: gio/glib-compile-schemas.c:1046 msgid "<override> given but schema isn’t extending anything" msgstr "<override> указан, но схема ничего не расширяет" -#: gio/glib-compile-schemas.c:1062 +#: gio/glib-compile-schemas.c:1059 #, c-format msgid "No <key name='%s'> to override" msgstr "Не задан <key name='%s'> для замещения" -#: gio/glib-compile-schemas.c:1070 +#: gio/glib-compile-schemas.c:1067 #, c-format msgid "<override name='%s'> already specified" msgstr "<override name='%s'> уже задан" -#: gio/glib-compile-schemas.c:1143 +#: gio/glib-compile-schemas.c:1140 #, c-format msgid "<schema id='%s'> already specified" msgstr "<schema id='%s'> уже задан" -#: gio/glib-compile-schemas.c:1155 +#: gio/glib-compile-schemas.c:1152 #, c-format msgid "<schema id='%s'> extends not yet existing schema “%s”" msgstr "<schema id='%s'> расширяет пока не существующую схему «%s»" -#: gio/glib-compile-schemas.c:1171 +#: gio/glib-compile-schemas.c:1168 #, c-format msgid "<schema id='%s'> is list of not yet existing schema “%s”" msgstr "<schema id='%s'> является списком пока не существующей схемы «%s»" -#: gio/glib-compile-schemas.c:1179 +#: gio/glib-compile-schemas.c:1176 #, c-format msgid "Cannot be a list of a schema with a path" msgstr "Не может быть списком схемы с путём" -#: gio/glib-compile-schemas.c:1189 +#: gio/glib-compile-schemas.c:1186 #, c-format msgid "Cannot extend a schema with a path" msgstr "Не удалось расширить схему путём" -#: gio/glib-compile-schemas.c:1199 +#: gio/glib-compile-schemas.c:1196 #, c-format msgid "" "<schema id='%s'> is a list, extending <schema id='%s'> which is not a list" @@ -2841,7 +2850,7 @@ "<schema id='%s'> является списком, расширяющим <schema id='%s'>, который не " "является списком" -#: gio/glib-compile-schemas.c:1209 +#: gio/glib-compile-schemas.c:1206 #, c-format msgid "" "<schema id='%s' list-of='%s'> extends <schema id='%s' list-of='%s'> but “%s” " @@ -2850,19 +2859,19 @@ "<schema id='%s' list-of='%s'> расширяет <schema id='%s' list-of='%s'>, но " "«%s» не расширяет «%s»" -#: gio/glib-compile-schemas.c:1226 +#: gio/glib-compile-schemas.c:1223 #, c-format msgid "A path, if given, must begin and end with a slash" msgstr "" "Если указывается путь, то он должен начинаться и заканчиваться символом " "косой черты" -#: gio/glib-compile-schemas.c:1233 +#: gio/glib-compile-schemas.c:1230 #, c-format msgid "The path of a list must end with “:/”" msgstr "Путь в списке должен заканчиваться «:/»" -#: gio/glib-compile-schemas.c:1242 +#: gio/glib-compile-schemas.c:1239 #, c-format msgid "" "Warning: Schema “%s” has path “%s”. Paths starting with “/apps/”, “/" @@ -2871,63 +2880,63 @@ "Предупреждение: Схема «%s» содержит путь «%s». Пути, начинающиеся с «/" "apps/», «/desktop/» или «/system/» являются устаревшими." -#: gio/glib-compile-schemas.c:1272 +#: gio/glib-compile-schemas.c:1269 #, c-format msgid "<%s id='%s'> already specified" msgstr "<%s id='%s'> уже задан" -#: gio/glib-compile-schemas.c:1422 gio/glib-compile-schemas.c:1438 +#: gio/glib-compile-schemas.c:1419 gio/glib-compile-schemas.c:1435 #, c-format msgid "Only one <%s> element allowed inside <%s>" msgstr "Только один <%s> элемент может быть внутри <%s>" -#: gio/glib-compile-schemas.c:1520 +#: gio/glib-compile-schemas.c:1517 #, c-format msgid "Element <%s> not allowed at the top level" msgstr "Элемент <%s> не может быть самым верхним" -#: gio/glib-compile-schemas.c:1538 +#: gio/glib-compile-schemas.c:1535 msgid "Element <default> is required in <key>" msgstr "Элемент <default> требуется в <key>" -#: gio/glib-compile-schemas.c:1628 +#: gio/glib-compile-schemas.c:1625 #, c-format msgid "Text may not appear inside <%s>" msgstr "Текст не может быть внутри <%s>" -#: gio/glib-compile-schemas.c:1696 +#: gio/glib-compile-schemas.c:1693 #, c-format msgid "Warning: undefined reference to <schema id='%s'/>" msgstr "Предупреждение: не определена ссылка на <schema id='%s'/>" #. Translators: Do not translate "--strict". -#: gio/glib-compile-schemas.c:1835 gio/glib-compile-schemas.c:1914 +#: gio/glib-compile-schemas.c:1832 gio/glib-compile-schemas.c:1911 msgid "--strict was specified; exiting." msgstr "Был указан параметр --strict; завершение работы." -#: gio/glib-compile-schemas.c:1847 +#: gio/glib-compile-schemas.c:1844 msgid "This entire file has been ignored." msgstr "Всё содержимое файла было проигнорировано." -#: gio/glib-compile-schemas.c:1910 +#: gio/glib-compile-schemas.c:1907 msgid "Ignoring this file." msgstr "Этот файл игнорируется." -#: gio/glib-compile-schemas.c:1965 +#: gio/glib-compile-schemas.c:1962 #, c-format msgid "" "No such key “%s” in schema “%s” as specified in override file “%s”; ignoring " "override for this key." msgstr "Ключ «%s» в схеме «%s» отсутствует, хотя указан в файле замен «%s»." -#: gio/glib-compile-schemas.c:1973 +#: gio/glib-compile-schemas.c:1970 #, c-format msgid "" "No such key “%s” in schema “%s” as specified in override file “%s” and --" "strict was specified; exiting." msgstr "Ключ «%s» в схеме «%s» отсутствует, хотя указан в файле замен «%s»." -#: gio/glib-compile-schemas.c:1995 +#: gio/glib-compile-schemas.c:1992 #, c-format msgid "" "Cannot provide per-desktop overrides for localized key “%s” in schema " @@ -2936,7 +2945,7 @@ "Не удаётся предоставить замену для локализованного ключа «%s» в схеме " "«%s» (файл с определениями «%s»); переопределение ключа игнорируется." -#: gio/glib-compile-schemas.c:2004 +#: gio/glib-compile-schemas.c:2001 #, c-format msgid "" "Cannot provide per-desktop overrides for localized key “%s” in schema " @@ -2946,7 +2955,7 @@ "«%s» (файл с определениями «%s»), Кроме того был указан параметр --strict. " "Процесс прерван." -#: gio/glib-compile-schemas.c:2028 +#: gio/glib-compile-schemas.c:2025 #, c-format msgid "" "Error parsing key “%s” in schema “%s” as specified in override file “%s”: " @@ -2955,7 +2964,7 @@ "Ошибка разбора ключа «%s» в схеме «%s», которая определена в файле замен " "«%s»: %s." -#: gio/glib-compile-schemas.c:2040 +#: gio/glib-compile-schemas.c:2037 #, c-format msgid "" "Error parsing key “%s” in schema “%s” as specified in override file “%s”: " @@ -2964,7 +2973,7 @@ "Ошибка разбора ключа «%s» в схеме «%s», которая определена в файле замен " "«%s»: %s." -#: gio/glib-compile-schemas.c:2067 +#: gio/glib-compile-schemas.c:2064 #, c-format msgid "" "Override for key “%s” in schema “%s” in override file “%s” is outside the " @@ -2973,7 +2982,7 @@ "Замена ключа «%s» в схеме «%s» согласно файлу замен «%s» лежит вне диапазона " "данной схемы." -#: gio/glib-compile-schemas.c:2077 +#: gio/glib-compile-schemas.c:2074 #, c-format msgid "" "Override for key “%s” in schema “%s” in override file “%s” is outside the " @@ -2982,7 +2991,7 @@ "Замена ключа «%s» в схеме «%s» согласно файлу замен «%s» лежит вне диапазона " "данной схемы. Кроме того указан ключ --strict. Процесс прерван." -#: gio/glib-compile-schemas.c:2103 +#: gio/glib-compile-schemas.c:2100 #, c-format msgid "" "Override for key “%s” in schema “%s” in override file “%s” is not in the " @@ -2991,7 +3000,7 @@ "Замена ключа «%s» в схеме «%s» согласно файлу замен «%s» лежит вне списка " "допустимых значений. Переопределение ключа игнорируется." -#: gio/glib-compile-schemas.c:2113 +#: gio/glib-compile-schemas.c:2110 #, c-format msgid "" "Override for key “%s” in schema “%s” in override file “%s” is not in the " @@ -3000,23 +3009,23 @@ "Замена ключа «%s» в схеме «%s» согласно файлу замен «%s» лежит вне списка " "допустимых значений. Кроме того указан ключ --strict. Процесс прерван." -#: gio/glib-compile-schemas.c:2175 +#: gio/glib-compile-schemas.c:2172 msgid "Where to store the gschemas.compiled file" msgstr "Место сохранения файла gschemas.compiled" -#: gio/glib-compile-schemas.c:2176 +#: gio/glib-compile-schemas.c:2173 msgid "Abort on any errors in schemas" msgstr "Останавливать работу при возникновении ошибок в схемах" -#: gio/glib-compile-schemas.c:2177 +#: gio/glib-compile-schemas.c:2174 msgid "Do not write the gschema.compiled file" msgstr "Не записывать файл gschema.compiled" -#: gio/glib-compile-schemas.c:2178 +#: gio/glib-compile-schemas.c:2175 msgid "Do not enforce key name restrictions" msgstr "Не устанавливать ограничения на имя ключа" -#: gio/glib-compile-schemas.c:2207 +#: gio/glib-compile-schemas.c:2204 msgid "" "Compile all GSettings schema files into a schema cache.\n" "Schema files are required to have the extension .gschema.xml,\n" @@ -3026,15 +3035,15 @@ "Файлы схемы требуются для расширения .gschema.xml,\n" "а файл кэша называется gschemas.compiled." -#: gio/glib-compile-schemas.c:2228 +#: gio/glib-compile-schemas.c:2225 msgid "You should give exactly one directory name" msgstr "Должно быть указано только одно имя каталога" -#: gio/glib-compile-schemas.c:2271 +#: gio/glib-compile-schemas.c:2268 msgid "No schema files found: doing nothing." msgstr "Файлы схемы не найдены: процесс прерван." -#: gio/glib-compile-schemas.c:2273 +#: gio/glib-compile-schemas.c:2270 msgid "No schema files found: removed existing output file." msgstr "Не найден файл схемы: удалён существующий выходной файл." @@ -3043,7 +3052,7 @@ msgid "Invalid filename %s" msgstr "Недопустимое имя файла %s" -#: gio/glocalfile.c:996 +#: gio/glocalfile.c:1005 #, c-format msgid "Error getting filesystem info for %s: %s" msgstr "Произошла ошибка при получении сведений о файловой системе %s: %s" @@ -3052,125 +3061,125 @@ #. * the enclosing (user visible) mount of a file, but none #. * exists. #. -#: gio/glocalfile.c:1137 +#: gio/glocalfile.c:1141 #, c-format msgid "Containing mount for file %s not found" msgstr "Точка монтирования для файла %s не найдена" -#: gio/glocalfile.c:1160 +#: gio/glocalfile.c:1164 msgid "Can’t rename root directory" msgstr "Нельзя переименовать корневой каталог" -#: gio/glocalfile.c:1178 gio/glocalfile.c:1201 +#: gio/glocalfile.c:1182 gio/glocalfile.c:1205 #, c-format msgid "Error renaming file %s: %s" msgstr "Произошла ошибка при переименовании файла %s: %s" -#: gio/glocalfile.c:1185 +#: gio/glocalfile.c:1189 msgid "Can’t rename file, filename already exists" msgstr "Невозможно переименовать файл, имя файла уже существует" -#: gio/glocalfile.c:1198 gio/glocalfile.c:2394 gio/glocalfile.c:2422 -#: gio/glocalfile.c:2561 gio/glocalfileoutputstream.c:658 +#: gio/glocalfile.c:1202 gio/glocalfile.c:2405 gio/glocalfile.c:2433 +#: gio/glocalfile.c:2572 gio/glocalfileoutputstream.c:658 msgid "Invalid filename" msgstr "Недопустимое имя файла" -#: gio/glocalfile.c:1366 gio/glocalfile.c:1377 +#: gio/glocalfile.c:1370 gio/glocalfile.c:1381 #, c-format msgid "Error opening file %s: %s" msgstr "Произошла ошибка открытия файла %s: %s" -#: gio/glocalfile.c:1502 +#: gio/glocalfile.c:1506 #, c-format msgid "Error removing file %s: %s" msgstr "Произошла ошибка при удалении файла %s: %s" -#: gio/glocalfile.c:1996 gio/glocalfile.c:2007 gio/glocalfile.c:2034 +#: gio/glocalfile.c:2000 gio/glocalfile.c:2011 gio/glocalfile.c:2038 #, c-format msgid "Error trashing file %s: %s" msgstr "Произошла ошибка при удалении файла в корзину %s: %s" -#: gio/glocalfile.c:2054 +#: gio/glocalfile.c:2058 #, c-format msgid "Unable to create trash directory %s: %s" msgstr "Не удалось создать каталог корзины %s: %s" -#: gio/glocalfile.c:2075 +#: gio/glocalfile.c:2079 #, c-format msgid "Unable to find toplevel directory to trash %s" msgstr "Не удалось найти каталог верхнего уровня для корзины %s" -#: gio/glocalfile.c:2083 +#: gio/glocalfile.c:2087 #, c-format msgid "Trashing on system internal mounts is not supported" msgstr "Удаление в корзину на системных томах не поддерживается" -#: gio/glocalfile.c:2169 gio/glocalfile.c:2197 +#: gio/glocalfile.c:2173 gio/glocalfile.c:2201 #, c-format msgid "Unable to find or create trash directory %s to trash %s" msgstr "Не удалось найти или создать каталог корзины %s для удаления %s" -#: gio/glocalfile.c:2243 +#: gio/glocalfile.c:2245 #, c-format msgid "Unable to create trashing info file for %s: %s" msgstr "Не удалось создать запись о файле в корзине %s: %s" -#: gio/glocalfile.c:2305 +#: gio/glocalfile.c:2316 #, c-format msgid "Unable to trash file %s across filesystem boundaries" msgstr "" "Не удалось удалить файл %s в корзину, из-за ограничений файловой системы" -#: gio/glocalfile.c:2309 gio/glocalfile.c:2365 +#: gio/glocalfile.c:2320 gio/glocalfile.c:2376 #, c-format msgid "Unable to trash file %s: %s" msgstr "Не удалось удалить файл в корзину %s: %s" -#: gio/glocalfile.c:2371 +#: gio/glocalfile.c:2382 #, c-format msgid "Unable to trash file %s" msgstr "Не удалось удалить файл в корзину %s" -#: gio/glocalfile.c:2397 +#: gio/glocalfile.c:2408 #, c-format msgid "Error creating directory %s: %s" msgstr "Произошла ошибка при создании каталога %s: %s" -#: gio/glocalfile.c:2426 +#: gio/glocalfile.c:2437 #, c-format msgid "Filesystem does not support symbolic links" msgstr "Файловая система не поддерживает символьные ссылки" -#: gio/glocalfile.c:2429 +#: gio/glocalfile.c:2440 #, c-format msgid "Error making symbolic link %s: %s" msgstr "Произошла ошибка при создании символьной ссылки %s: %s" -#: gio/glocalfile.c:2472 gio/glocalfile.c:2507 gio/glocalfile.c:2564 +#: gio/glocalfile.c:2483 gio/glocalfile.c:2518 gio/glocalfile.c:2575 #, c-format msgid "Error moving file %s: %s" msgstr "Произошла ошибка при перемещении файла %s: %s" -#: gio/glocalfile.c:2495 +#: gio/glocalfile.c:2506 msgid "Can’t move directory over directory" msgstr "Нельзя переместить каталог поверх каталога" -#: gio/glocalfile.c:2521 gio/glocalfileoutputstream.c:1110 +#: gio/glocalfile.c:2532 gio/glocalfileoutputstream.c:1110 #: gio/glocalfileoutputstream.c:1124 gio/glocalfileoutputstream.c:1139 #: gio/glocalfileoutputstream.c:1156 gio/glocalfileoutputstream.c:1170 msgid "Backup file creation failed" msgstr "Не удалось создать резервный файл" -#: gio/glocalfile.c:2540 +#: gio/glocalfile.c:2551 #, c-format msgid "Error removing target file: %s" msgstr "Произошла ошибка при удалении целевого файла: %s" -#: gio/glocalfile.c:2554 +#: gio/glocalfile.c:2565 msgid "Move between mounts not supported" msgstr "Перемещение между точками монтирования не поддерживается" -#: gio/glocalfile.c:2728 +#: gio/glocalfile.c:2741 #, c-format msgid "Could not determine the disk usage of %s: %s" msgstr "Не удалось определить использование диска %s: %s" @@ -3193,123 +3202,123 @@ msgid "Error setting extended attribute “%s”: %s" msgstr "Произошла ошибка при установке расширенного атрибута «%s»: %s" -#: gio/glocalfileinfo.c:1738 gio/win32/gwinhttpfile.c:191 +#: gio/glocalfileinfo.c:1819 gio/win32/gwinhttpfile.c:191 msgid " (invalid encoding)" msgstr " (неверная кодировка)" -#: gio/glocalfileinfo.c:1897 gio/glocalfileoutputstream.c:945 +#: gio/glocalfileinfo.c:1978 gio/glocalfileoutputstream.c:945 #: gio/glocalfileoutputstream.c:997 #, c-format msgid "Error when getting information for file “%s”: %s" msgstr "Ошибка при получении информации о файле «%s»: %s" -#: gio/glocalfileinfo.c:2163 +#: gio/glocalfileinfo.c:2281 #, c-format msgid "Error when getting information for file descriptor: %s" msgstr "Ошибка при получении информации о файловом дескрипторе: %s" -#: gio/glocalfileinfo.c:2208 +#: gio/glocalfileinfo.c:2326 msgid "Invalid attribute type (uint32 expected)" msgstr "Неверный тип атрибута (ожидался uint32)" -#: gio/glocalfileinfo.c:2226 +#: gio/glocalfileinfo.c:2344 msgid "Invalid attribute type (uint64 expected)" msgstr "Неверный тип атрибута (ожидался uint64)" -#: gio/glocalfileinfo.c:2245 gio/glocalfileinfo.c:2264 +#: gio/glocalfileinfo.c:2363 gio/glocalfileinfo.c:2382 msgid "Invalid attribute type (byte string expected)" msgstr "Неверный тип атрибута (ожидалась строка byte)" -#: gio/glocalfileinfo.c:2311 +#: gio/glocalfileinfo.c:2429 msgid "Cannot set permissions on symlinks" msgstr "Не удалось установить права на символические ссылки" -#: gio/glocalfileinfo.c:2327 +#: gio/glocalfileinfo.c:2445 #, c-format msgid "Error setting permissions: %s" msgstr "Произошла ошибка при установке прав: %s" -#: gio/glocalfileinfo.c:2378 +#: gio/glocalfileinfo.c:2496 #, c-format msgid "Error setting owner: %s" msgstr "Произошла ошибка при установке владельца: %s" -#: gio/glocalfileinfo.c:2401 +#: gio/glocalfileinfo.c:2519 msgid "symlink must be non-NULL" msgstr "символьная ссылка не должна быть NULL" -#: gio/glocalfileinfo.c:2411 gio/glocalfileinfo.c:2430 -#: gio/glocalfileinfo.c:2441 +#: gio/glocalfileinfo.c:2529 gio/glocalfileinfo.c:2548 +#: gio/glocalfileinfo.c:2559 #, c-format msgid "Error setting symlink: %s" msgstr "Произошла ошибка при установке символьной ссылки: %s" -#: gio/glocalfileinfo.c:2420 +#: gio/glocalfileinfo.c:2538 msgid "Error setting symlink: file is not a symlink" msgstr "" "Произошла ошибка при установке символьной ссылки: файл не является " "символьной ссылкой" -#: gio/glocalfileinfo.c:2492 +#: gio/glocalfileinfo.c:2630 #, c-format msgid "Extra nanoseconds %d for UNIX timestamp %lld are negative" msgstr "" "Дополнительные нано-секунды %d во временной метке UNIX %lld имеют " "отрицательное значение" -#: gio/glocalfileinfo.c:2501 +#: gio/glocalfileinfo.c:2639 #, c-format msgid "Extra nanoseconds %d for UNIX timestamp %lld reach 1 second" msgstr "" "Дополнительные нано-секунды %d во временной метке UNIX %lld достигли одной " "секунды" -#: gio/glocalfileinfo.c:2511 +#: gio/glocalfileinfo.c:2649 #, c-format msgid "UNIX timestamp %lld does not fit into 64 bits" msgstr "Временная метка UNIX %lld не помещается в 64 бита" -#: gio/glocalfileinfo.c:2522 +#: gio/glocalfileinfo.c:2660 #, c-format msgid "UNIX timestamp %lld is outside of the range supported by Windows" msgstr "Временная метка UNIX %lld не входит в диапазон, поддерживаемый Windows" -#: gio/glocalfileinfo.c:2625 +#: gio/glocalfileinfo.c:2792 #, c-format msgid "File name “%s” cannot be converted to UTF-16" msgstr "Не удалось преобразовать имя файла «%s» в строку UTF-16" -#: gio/glocalfileinfo.c:2644 +#: gio/glocalfileinfo.c:2811 #, c-format msgid "File “%s” cannot be opened: Windows Error %lu" msgstr "Не удалось открыть файл «%s»: ошибка Windows %lu" -#: gio/glocalfileinfo.c:2657 +#: gio/glocalfileinfo.c:2824 #, c-format msgid "Error setting modification or access time for file “%s”: %lu" msgstr "" "Произошла ошибка при установке времени модификации или доступа файла «%s»: " "%lu" -#: gio/glocalfileinfo.c:2798 gio/glocalfileinfo.c:2810 +#: gio/glocalfileinfo.c:2981 #, c-format msgid "Error setting modification or access time: %s" msgstr "Произошла ошибка при установке времени модификации или доступа: %s" -#: gio/glocalfileinfo.c:2833 +#: gio/glocalfileinfo.c:3004 msgid "SELinux context must be non-NULL" msgstr "Контекст SELinux не должен быть равен NULL" -#: gio/glocalfileinfo.c:2840 +#: gio/glocalfileinfo.c:3011 msgid "SELinux is not enabled on this system" msgstr "В этой системе не включён SELinux" -#: gio/glocalfileinfo.c:2850 +#: gio/glocalfileinfo.c:3021 #, c-format msgid "Error setting SELinux context: %s" msgstr "Произошла ошибка при установке контекста SELinux: %s" -#: gio/glocalfileinfo.c:2947 +#: gio/glocalfileinfo.c:3118 #, c-format msgid "Setting attribute %s not supported" msgstr "Установка атрибута %s не поддерживается" @@ -3356,13 +3365,13 @@ msgid "Error renaming temporary file: %s" msgstr "Произошла ошибка при переименовании временного файла: %s" -#: gio/glocalfileoutputstream.c:611 gio/glocalfileoutputstream.c:1241 +#: gio/glocalfileoutputstream.c:611 gio/glocalfileoutputstream.c:1242 #, c-format msgid "Error truncating file: %s" msgstr "Произошла ошибка при усечении файла: %s" #: gio/glocalfileoutputstream.c:664 gio/glocalfileoutputstream.c:909 -#: gio/glocalfileoutputstream.c:1222 gio/gsubprocess.c:231 +#: gio/glocalfileoutputstream.c:1223 gio/gsubprocess.c:231 #, c-format msgid "Error opening file “%s”: %s" msgstr "Произошла ошибка при открытии файла «%s»: %s" @@ -3379,7 +3388,7 @@ msgid "The file was externally modified" msgstr "Файл был изменён извне" -#: gio/glocalfileoutputstream.c:1204 +#: gio/glocalfileoutputstream.c:1205 #, c-format msgid "Error removing old file: %s" msgstr "Произошла ошибка при удалении старого файла: %s" @@ -3532,8 +3541,8 @@ #. Translators: the first placeholder is a domain name, the #. * second is an error message #: gio/gresolver.c:403 gio/gthreadedresolver.c:152 gio/gthreadedresolver.c:170 -#: gio/gthreadedresolver.c:782 gio/gthreadedresolver.c:806 -#: gio/gthreadedresolver.c:831 gio/gthreadedresolver.c:846 +#: gio/gthreadedresolver.c:798 gio/gthreadedresolver.c:822 +#: gio/gthreadedresolver.c:847 gio/gthreadedresolver.c:862 #, c-format msgid "Error resolving “%s”: %s" msgstr "Ошибка разрешения «%s»: %s" @@ -4251,35 +4260,35 @@ #. Translators: the placeholder is a DNS record type, such as ‘MX’ or ‘SRV’ #: gio/gthreadedresolver.c:552 gio/gthreadedresolver.c:574 -#: gio/gthreadedresolver.c:612 gio/gthreadedresolver.c:659 -#: gio/gthreadedresolver.c:688 gio/gthreadedresolver.c:700 +#: gio/gthreadedresolver.c:628 gio/gthreadedresolver.c:675 +#: gio/gthreadedresolver.c:704 gio/gthreadedresolver.c:716 #, c-format msgid "Error parsing DNS %s record: malformed DNS packet" msgstr "Ошибка при разборе записи DNS %s: некорректный DNS-пакет" -#: gio/gthreadedresolver.c:758 gio/gthreadedresolver.c:895 -#: gio/gthreadedresolver.c:993 gio/gthreadedresolver.c:1043 +#: gio/gthreadedresolver.c:774 gio/gthreadedresolver.c:911 +#: gio/gthreadedresolver.c:1009 gio/gthreadedresolver.c:1059 #, c-format msgid "No DNS record of the requested type for “%s”" msgstr "Запись DNS с запрашиваемым типом «%s» отсутствует" -#: gio/gthreadedresolver.c:763 gio/gthreadedresolver.c:998 +#: gio/gthreadedresolver.c:779 gio/gthreadedresolver.c:1014 #, c-format msgid "Temporarily unable to resolve “%s”" msgstr "Временно невозможно разрешить «%s»" -#: gio/gthreadedresolver.c:768 gio/gthreadedresolver.c:1003 -#: gio/gthreadedresolver.c:1113 +#: gio/gthreadedresolver.c:784 gio/gthreadedresolver.c:1019 +#: gio/gthreadedresolver.c:1129 #, c-format msgid "Error resolving “%s”" msgstr "Произошла ошибка разрешения «%s»" -#: gio/gthreadedresolver.c:782 gio/gthreadedresolver.c:806 -#: gio/gthreadedresolver.c:831 gio/gthreadedresolver.c:846 +#: gio/gthreadedresolver.c:798 gio/gthreadedresolver.c:822 +#: gio/gthreadedresolver.c:847 gio/gthreadedresolver.c:862 msgid "Malformed DNS packet" msgstr "Некорректный DNS-пакет" -#: gio/gthreadedresolver.c:888 +#: gio/gthreadedresolver.c:904 #, c-format msgid "Failed to parse DNS response for “%s”: " msgstr "Не удалось разобрать ответ DNS для \"%s\": " @@ -4408,7 +4417,7 @@ msgid "Error closing file descriptor: %s" msgstr "Ошибка при закрытии файлового дескриптора: %s" -#: gio/gunixmounts.c:2815 gio/gunixmounts.c:2868 +#: gio/gunixmounts.c:2817 gio/gunixmounts.c:2870 msgid "Filesystem root" msgstr "Корень файловой системы" @@ -4491,77 +4500,77 @@ msgid "Wrong args\n" msgstr "Неверные параметры\n" -#: glib/gbookmarkfile.c:779 +#: glib/gbookmarkfile.c:861 #, c-format msgid "Unexpected attribute “%s” for element “%s”" msgstr "Неожиданный атрибут «%s» для элемента «%s»" -#: glib/gbookmarkfile.c:790 glib/gbookmarkfile.c:870 glib/gbookmarkfile.c:880 -#: glib/gbookmarkfile.c:993 +#: glib/gbookmarkfile.c:872 glib/gbookmarkfile.c:952 glib/gbookmarkfile.c:962 +#: glib/gbookmarkfile.c:1075 #, c-format msgid "Attribute “%s” of element “%s” not found" msgstr "Не найден атрибут «%s» элемента «%s»" -#: glib/gbookmarkfile.c:1202 glib/gbookmarkfile.c:1267 -#: glib/gbookmarkfile.c:1331 glib/gbookmarkfile.c:1341 +#: glib/gbookmarkfile.c:1284 glib/gbookmarkfile.c:1349 +#: glib/gbookmarkfile.c:1413 glib/gbookmarkfile.c:1423 #, c-format msgid "Unexpected tag “%s”, tag “%s” expected" msgstr "Неожиданный тэг «%s», ожидался тэг «%s»" -#: glib/gbookmarkfile.c:1227 glib/gbookmarkfile.c:1241 -#: glib/gbookmarkfile.c:1309 glib/gbookmarkfile.c:1355 +#: glib/gbookmarkfile.c:1309 glib/gbookmarkfile.c:1323 +#: glib/gbookmarkfile.c:1391 glib/gbookmarkfile.c:1437 #, c-format msgid "Unexpected tag “%s” inside “%s”" msgstr "Неожиданный тэг «%s» внутри «%s»" -#: glib/gbookmarkfile.c:1635 +#: glib/gbookmarkfile.c:1717 #, c-format msgid "Invalid date/time ‘%s’ in bookmark file" msgstr "Неверная дата и время ‘%s’ в файле закладок" -#: glib/gbookmarkfile.c:1838 +#: glib/gbookmarkfile.c:1956 msgid "No valid bookmark file found in data dirs" msgstr "Не удалось найти допустимый файл закладок в каталогах поиска" -#: glib/gbookmarkfile.c:2039 +#: glib/gbookmarkfile.c:2157 #, c-format msgid "A bookmark for URI “%s” already exists" msgstr "Закладка для ресурса URI «%s» уже существует" -#: glib/gbookmarkfile.c:2088 glib/gbookmarkfile.c:2246 -#: glib/gbookmarkfile.c:2331 glib/gbookmarkfile.c:2411 -#: glib/gbookmarkfile.c:2496 glib/gbookmarkfile.c:2630 -#: glib/gbookmarkfile.c:2763 glib/gbookmarkfile.c:2898 -#: glib/gbookmarkfile.c:2940 glib/gbookmarkfile.c:3037 -#: glib/gbookmarkfile.c:3158 glib/gbookmarkfile.c:3352 -#: glib/gbookmarkfile.c:3493 glib/gbookmarkfile.c:3712 -#: glib/gbookmarkfile.c:3801 glib/gbookmarkfile.c:3890 -#: glib/gbookmarkfile.c:4009 +#: glib/gbookmarkfile.c:2206 glib/gbookmarkfile.c:2364 +#: glib/gbookmarkfile.c:2449 glib/gbookmarkfile.c:2529 +#: glib/gbookmarkfile.c:2614 glib/gbookmarkfile.c:2748 +#: glib/gbookmarkfile.c:2881 glib/gbookmarkfile.c:3016 +#: glib/gbookmarkfile.c:3058 glib/gbookmarkfile.c:3155 +#: glib/gbookmarkfile.c:3276 glib/gbookmarkfile.c:3470 +#: glib/gbookmarkfile.c:3611 glib/gbookmarkfile.c:3830 +#: glib/gbookmarkfile.c:3919 glib/gbookmarkfile.c:4008 +#: glib/gbookmarkfile.c:4127 #, c-format msgid "No bookmark found for URI “%s”" msgstr "Для ресурса URI «%s» закладок не найдено" -#: glib/gbookmarkfile.c:2420 +#: glib/gbookmarkfile.c:2538 #, c-format msgid "No MIME type defined in the bookmark for URI “%s”" msgstr "В закладке на ресурс «%s» не определён тип MIME" -#: glib/gbookmarkfile.c:2505 +#: glib/gbookmarkfile.c:2623 #, c-format msgid "No private flag has been defined in bookmark for URI “%s”" msgstr "Отметка о приватности данных в закладке для URI «%s» не определена" -#: glib/gbookmarkfile.c:3046 +#: glib/gbookmarkfile.c:3164 #, c-format msgid "No groups set in bookmark for URI “%s”" msgstr "В закладке для URI «%s» не определена группа" -#: glib/gbookmarkfile.c:3514 glib/gbookmarkfile.c:3722 +#: glib/gbookmarkfile.c:3632 glib/gbookmarkfile.c:3840 #, c-format msgid "No application with name “%s” registered a bookmark for “%s”" msgstr "Нет приложения с именем «%s», создавшего закладку для «%s»" -#: glib/gbookmarkfile.c:3745 +#: glib/gbookmarkfile.c:3863 #, c-format msgid "Failed to expand exec line “%s” with URI “%s”" msgstr "Не удалось дополнить строку выполнения «%s» с помощью URI «%s»" @@ -5039,7 +5048,7 @@ msgid "Error opening directory “%s”: %s" msgstr "Произошла ошибка при открытии каталога «%s»: %s" -#: glib/gfileutils.c:735 glib/gfileutils.c:827 +#: glib/gfileutils.c:753 glib/gfileutils.c:845 #, c-format msgid "Could not allocate %lu byte to read file “%s”" msgid_plural "Could not allocate %lu bytes to read file “%s”" @@ -5047,74 +5056,74 @@ msgstr1 "Не удалось выделить %lu байта для чтения файла «%s»" msgstr2 "Не удалось выделить %lu байт для чтения файла «%s»" -#: glib/gfileutils.c:752 +#: glib/gfileutils.c:770 #, c-format msgid "Error reading file “%s”: %s" msgstr "Ошибка при чтении файла «%s»: %s" -#: glib/gfileutils.c:788 +#: glib/gfileutils.c:806 #, c-format msgid "File “%s” is too large" msgstr "Файл «%s» слишком велик" -#: glib/gfileutils.c:852 +#: glib/gfileutils.c:870 #, c-format msgid "Failed to read from file “%s”: %s" msgstr "Не удалось прочитать из файла «%s»: %s" -#: glib/gfileutils.c:902 glib/gfileutils.c:977 glib/gfileutils.c:1449 +#: glib/gfileutils.c:920 glib/gfileutils.c:995 glib/gfileutils.c:1472 #, c-format msgid "Failed to open file “%s”: %s" msgstr "Не удалось открыть файл «%s»: %s" -#: glib/gfileutils.c:915 +#: glib/gfileutils.c:933 #, c-format msgid "Failed to get attributes of file “%s”: fstat() failed: %s" msgstr "Не удалось получить атрибуты файла «%s»: сбой в функции fstat(): %s" -#: glib/gfileutils.c:946 +#: glib/gfileutils.c:964 #, c-format msgid "Failed to open file “%s”: fdopen() failed: %s" msgstr "Не удалось открыть файл «%s»: сбой в функции fdopen(): %s" -#: glib/gfileutils.c:1047 +#: glib/gfileutils.c:1065 #, c-format msgid "Failed to rename file “%s” to “%s”: g_rename() failed: %s" msgstr "" "Не удалось переименовать файл «%s» в «%s»: сбой в функции g_rename(): %s" -#: glib/gfileutils.c:1156 +#: glib/gfileutils.c:1179 #, c-format msgid "Failed to write file “%s”: write() failed: %s" msgstr "Не удалось записать файл «%s»: сбой в функции write(): %s" -#: glib/gfileutils.c:1177 +#: glib/gfileutils.c:1200 #, c-format msgid "Failed to write file “%s”: fsync() failed: %s" msgstr "Не удалось записать файл «%s»: сбой в функции fsync(): %s" -#: glib/gfileutils.c:1338 glib/gfileutils.c:1753 +#: glib/gfileutils.c:1361 glib/gfileutils.c:1776 #, c-format msgid "Failed to create file “%s”: %s" msgstr "Не удалось создать файл «%s»: %s" -#: glib/gfileutils.c:1383 +#: glib/gfileutils.c:1406 #, c-format msgid "Existing file “%s” could not be removed: g_unlink() failed: %s" msgstr "" "Не удалось удалить существующий файл «%s»: сбой в функции g_unlink(): %s" -#: glib/gfileutils.c:1718 +#: glib/gfileutils.c:1741 #, c-format msgid "Template “%s” invalid, should not contain a “%s”" msgstr "Шаблон «%s» недопустим: он не должен содержать «%s»" -#: glib/gfileutils.c:1731 +#: glib/gfileutils.c:1754 #, c-format msgid "Template “%s” doesn’t contain XXXXXX" msgstr "Шаблон «%s» не содержит XXXXXX" -#: glib/gfileutils.c:2291 glib/gfileutils.c:2320 +#: glib/gfileutils.c:2348 glib/gfileutils.c:2377 #, c-format msgid "Failed to read the symbolic link “%s”: %s" msgstr "Не удалось прочитать символьную ссылку «%s»: %s" @@ -5180,8 +5189,8 @@ msgstr "Файл ключей содержит неподдерживаемую кодировку «%s»" #: glib/gkeyfile.c:1679 glib/gkeyfile.c:1852 glib/gkeyfile.c:3299 -#: glib/gkeyfile.c:3363 glib/gkeyfile.c:3493 glib/gkeyfile.c:3625 -#: glib/gkeyfile.c:3771 glib/gkeyfile.c:4006 glib/gkeyfile.c:4073 +#: glib/gkeyfile.c:3363 glib/gkeyfile.c:3493 glib/gkeyfile.c:3622 +#: glib/gkeyfile.c:3768 glib/gkeyfile.c:4003 glib/gkeyfile.c:4070 #, c-format msgid "Key file does not have group “%s”" msgstr "Файл ключей не содержит группу «%s»" @@ -5219,31 +5228,31 @@ msgid "Key “%s” in group “%s” has value “%s” where %s was expected" msgstr "Значение ключа «%s» в группе «%s» имеет значение «%s», но ожидалось %s" -#: glib/gkeyfile.c:4326 +#: glib/gkeyfile.c:4323 msgid "Key file contains escape character at end of line" msgstr "Файл ключей содержит символ escape в конце строки" -#: glib/gkeyfile.c:4348 +#: glib/gkeyfile.c:4345 #, c-format msgid "Key file contains invalid escape sequence “%s”" msgstr "Файл ключей содержит неверную экранирующую последовательность «%s»" -#: glib/gkeyfile.c:4493 +#: glib/gkeyfile.c:4490 #, c-format msgid "Value “%s” cannot be interpreted as a number." msgstr "Не удалось преобразовать значение «%s» в число." -#: glib/gkeyfile.c:4507 +#: glib/gkeyfile.c:4504 #, c-format msgid "Integer value “%s” out of range" msgstr "Целочисленное значение «%s» выходит за пределы" -#: glib/gkeyfile.c:4540 +#: glib/gkeyfile.c:4537 #, c-format msgid "Value “%s” cannot be interpreted as a float number." msgstr "Не удалось преобразовать «%s» в число с плавающей запятой." -#: glib/gkeyfile.c:4579 +#: glib/gkeyfile.c:4576 #, c-format msgid "Value “%s” cannot be interpreted as a boolean." msgstr "Не удалось преобразовать «%s» в булево значение." @@ -5264,33 +5273,33 @@ msgid "Failed to open file “%s”: open() failed: %s" msgstr "Не удалось открыть файл «%s»: сбой в функции open(): %s" -#: glib/gmarkup.c:400 glib/gmarkup.c:442 +#: glib/gmarkup.c:393 glib/gmarkup.c:435 #, c-format msgid "Error on line %d char %d: " msgstr "Ошибка в строке %d на символе %d: " -#: glib/gmarkup.c:464 glib/gmarkup.c:547 +#: glib/gmarkup.c:457 glib/gmarkup.c:540 #, c-format msgid "Invalid UTF-8 encoded text in name — not valid “%s”" msgstr "" "Недопустимый UTF-8 текст в имени — неправильная последовательность «%s»" -#: glib/gmarkup.c:475 +#: glib/gmarkup.c:468 #, c-format msgid "“%s” is not a valid name" msgstr "Имя «%s» недопустимо" -#: glib/gmarkup.c:491 +#: glib/gmarkup.c:484 #, c-format msgid "“%s” is not a valid name: “%c”" msgstr "Имя «%s» недопустимо: «%c»" -#: glib/gmarkup.c:615 +#: glib/gmarkup.c:608 #, c-format msgid "Error on line %d: %s" msgstr "Ошибка в строке %d: %s" -#: glib/gmarkup.c:692 +#: glib/gmarkup.c:685 #, c-format msgid "" "Failed to parse “%-.*s”, which should have been a digit inside a character " @@ -5299,7 +5308,7 @@ "Не удалось разобрать строку «%-.*s», которая должна быть числом внутри кода " "символа (например ê) — возможно, число слишком велико" -#: glib/gmarkup.c:704 +#: glib/gmarkup.c:697 msgid "" "Character reference did not end with a semicolon; most likely you used an " "ampersand character without intending to start an entity — escape ampersand " @@ -5308,24 +5317,24 @@ "Код символа не оканчивается точкой с запятой; похоже, символ «&» был " "использован не для обозначения начала конструкции — экранируйте его как &" -#: glib/gmarkup.c:730 +#: glib/gmarkup.c:723 #, c-format msgid "Character reference “%-.*s” does not encode a permitted character" msgstr "Код «%-.*s» не определяет допустимый символ" -#: glib/gmarkup.c:768 +#: glib/gmarkup.c:761 msgid "" "Empty entity “&;” seen; valid entities are: & " < > '" msgstr "" "Обнаружена пустая конструкция «&;»; допустимыми конструкциями являются: " "& " < > '" -#: glib/gmarkup.c:776 +#: glib/gmarkup.c:769 #, c-format msgid "Entity name “%-.*s” is not known" msgstr "Имя сущности «%-.*s» неизвестно" -#: glib/gmarkup.c:781 +#: glib/gmarkup.c:774 msgid "" "Entity did not end with a semicolon; most likely you used an ampersand " "character without intending to start an entity — escape ampersand as &" @@ -5334,11 +5343,11 @@ "использован не для обозначения начала конструкции — экранируйте его как " "«&" -#: glib/gmarkup.c:1195 +#: glib/gmarkup.c:1188 msgid "Document must begin with an element (e.g. <book>)" msgstr "Документ должен начинаться с элемента (например <book>)" -#: glib/gmarkup.c:1235 +#: glib/gmarkup.c:1228 #, c-format msgid "" "“%s” is not a valid character following a “<” character; it may not begin an " @@ -5347,7 +5356,7 @@ "Символ «%s» является недопустимым после символа «<»; этот символ не может " "начинать имя элемента" -#: glib/gmarkup.c:1278 +#: glib/gmarkup.c:1271 #, c-format msgid "" "Odd character “%s”, expected a “>” character to end the empty-element tag " @@ -5356,12 +5365,12 @@ "Встретился лишний символ «%s», ожидался символ «>» для завершения пустого " "элемента тэга «%s»" -#: glib/gmarkup.c:1348 +#: glib/gmarkup.c:1341 #, c-format msgid "Too many attributes in element “%s”" msgstr "Слишком много атрибутов для элемента «%s»" -#: glib/gmarkup.c:1368 +#: glib/gmarkup.c:1361 #, c-format msgid "" "Odd character “%s”, expected a “=” after attribute name “%s” of element “%s”" @@ -5369,7 +5378,7 @@ "Встретился лишний символ «%s», ожидался символ «=» после имени атрибута «%s» " "элемента «%s»" -#: glib/gmarkup.c:1410 +#: glib/gmarkup.c:1403 #, c-format msgid "" "Odd character “%s”, expected a “>” or “/” character to end the start tag of " @@ -5380,7 +5389,7 @@ "открывающего тэга элемента «%s», либо, возможно, атрибут; может быть, был " "использован недопустимый символ в имени атрибута" -#: glib/gmarkup.c:1455 +#: glib/gmarkup.c:1448 #, c-format msgid "" "Odd character “%s”, expected an open quote mark after the equals sign when " @@ -5389,7 +5398,7 @@ "Встретился лишний символ «%s», ожидалась открывающая двойная кавычка после " "знака равенства при присваивании значения атрибуту «%s» элемента «%s»" -#: glib/gmarkup.c:1589 +#: glib/gmarkup.c:1582 #, c-format msgid "" "“%s” is not a valid character following the characters “</”; “%s” may not " @@ -5398,7 +5407,7 @@ "Символ «%s» недопустим после символов «</»; символ «%s» не может начинать " "имя элемента" -#: glib/gmarkup.c:1627 +#: glib/gmarkup.c:1620 #, c-format msgid "" "“%s” is not a valid character following the close element name “%s”; the " @@ -5407,27 +5416,27 @@ "Символ «%s» недопустим после закрывающего элемента имени «%s»; допустимым " "символом является «>»" -#: glib/gmarkup.c:1639 +#: glib/gmarkup.c:1632 #, c-format msgid "Element “%s” was closed, no element is currently open" msgstr "Элемент «%s» был закрыт, ни один элемент в настоящий момент не открыт" -#: glib/gmarkup.c:1648 +#: glib/gmarkup.c:1641 #, c-format msgid "Element “%s” was closed, but the currently open element is “%s”" msgstr "" "Элемент «%s» был закрыт, но открытым в настоящий момент является элемент «%s»" -#: glib/gmarkup.c:1801 +#: glib/gmarkup.c:1794 msgid "Document was empty or contained only whitespace" msgstr "Документ был пуст или содержал только пробелы" -#: glib/gmarkup.c:1815 +#: glib/gmarkup.c:1808 msgid "Document ended unexpectedly just after an open angle bracket “<”" msgstr "" "Документ неожиданно окончился сразу же после открывающей угловой скобки «<»" -#: glib/gmarkup.c:1823 glib/gmarkup.c:1868 +#: glib/gmarkup.c:1816 glib/gmarkup.c:1861 #, c-format msgid "" "Document ended unexpectedly with elements still open — “%s” was the last " @@ -5436,7 +5445,7 @@ "Документ неожиданно окончился, когда ещё были открыты элементы — «%s» был " "последним открытым элементом" -#: glib/gmarkup.c:1831 +#: glib/gmarkup.c:1824 #, c-format msgid "" "Document ended unexpectedly, expected to see a close angle bracket ending " @@ -5444,19 +5453,19 @@ msgstr "" "Документ неожиданно окончился, ожидалась закрывающая тэг <%s/> угловая скобка" -#: glib/gmarkup.c:1837 +#: glib/gmarkup.c:1830 msgid "Document ended unexpectedly inside an element name" msgstr "Документ неожиданно окончился внутри имени элемента" -#: glib/gmarkup.c:1843 +#: glib/gmarkup.c:1836 msgid "Document ended unexpectedly inside an attribute name" msgstr "Документ неожиданно окончился внутри имени атрибута" -#: glib/gmarkup.c:1848 +#: glib/gmarkup.c:1841 msgid "Document ended unexpectedly inside an element-opening tag." msgstr "Документ неожиданно окончился внутри открывающего элемент тэга." -#: glib/gmarkup.c:1854 +#: glib/gmarkup.c:1847 msgid "" "Document ended unexpectedly after the equals sign following an attribute " "name; no attribute value" @@ -5464,21 +5473,21 @@ "Документ неожиданно окончился после знака равенства, следующего за именем " "атрибута; значение атрибута не указано" -#: glib/gmarkup.c:1861 +#: glib/gmarkup.c:1854 msgid "Document ended unexpectedly while inside an attribute value" msgstr "Документ неожиданно окончился внутри значения атрибута" -#: glib/gmarkup.c:1878 +#: glib/gmarkup.c:1871 #, c-format msgid "Document ended unexpectedly inside the close tag for element “%s”" msgstr "Документ неожиданно окончился внутри тэга, закрывающего элемент «%s»" -#: glib/gmarkup.c:1882 +#: glib/gmarkup.c:1875 msgid "" "Document ended unexpectedly inside the close tag for an unopened element" msgstr "Документ неожиданно окончился внутри закрывающего элемент тэга" -#: glib/gmarkup.c:1888 +#: glib/gmarkup.c:1881 msgid "Document ended unexpectedly inside a comment or processing instruction" msgstr "" "Документ неожиданно окончился внутри комментария или инструкции обработки" @@ -5542,188 +5551,188 @@ msgid "Unknown option %s" msgstr "Неизвестный параметр %s" -#: glib/gregex.c:436 +#: glib/gregex.c:479 msgid "corrupted object" msgstr "повреждённый объект" -#: glib/gregex.c:438 +#: glib/gregex.c:481 msgid "out of memory" msgstr "закончилась память" -#: glib/gregex.c:443 +#: glib/gregex.c:487 msgid "backtracking limit reached" msgstr "достигнут предел обратного хода" -#: glib/gregex.c:454 glib/gregex.c:707 glib/gregex.c:736 +#: glib/gregex.c:498 msgid "internal error" msgstr "внутренняя ошибка" -#: glib/gregex.c:456 +#: glib/gregex.c:500 msgid "the pattern contains items not supported for partial matching" msgstr "" "шаблон содержит элементы, которые не поддерживаются при поиске частичного " "совпадения" -#: glib/gregex.c:458 +#: glib/gregex.c:502 msgid "back references as conditions are not supported for partial matching" msgstr "" "условия в виде обратных ссылок при поиске частичного совпадения не " "поддерживаются" -#: glib/gregex.c:464 +#: glib/gregex.c:508 msgid "recursion limit reached" msgstr "достигнут предел рекурсии" -#: glib/gregex.c:466 +#: glib/gregex.c:510 msgid "bad offset" msgstr "неправильное смещение" -#: glib/gregex.c:468 +#: glib/gregex.c:512 msgid "recursion loop" msgstr "зацикливание рекурсии" #. should not happen in GRegex since we check modes before each match -#: glib/gregex.c:471 +#: glib/gregex.c:515 msgid "matching mode is requested that was not compiled for JIT" msgstr "запрашивается режим согласования, который не был скомпилирован для JIT" -#: glib/gregex.c:475 +#: glib/gregex.c:536 glib/gregex.c:1838 msgid "unknown error" msgstr "неизвестная ошибка" -#: glib/gregex.c:496 +#: glib/gregex.c:557 msgid "\\ at end of pattern" msgstr "\\ в конце шаблона" -#: glib/gregex.c:500 +#: glib/gregex.c:561 msgid "\\c at end of pattern" msgstr "\\c в конце шаблона" -#: glib/gregex.c:505 +#: glib/gregex.c:566 msgid "unrecognized character following \\" msgstr "неопознанный символ следует за \\" -#: glib/gregex.c:509 +#: glib/gregex.c:570 msgid "numbers out of order in {} quantifier" msgstr "числа в квантификаторе {} в неправильном порядке" -#: glib/gregex.c:513 +#: glib/gregex.c:574 msgid "number too big in {} quantifier" msgstr "слишком большое число в квантификаторе {}" -#: glib/gregex.c:517 +#: glib/gregex.c:578 msgid "missing terminating for character class" msgstr "отсутствует завершающая для класса символов" -#: glib/gregex.c:521 +#: glib/gregex.c:582 msgid "invalid escape sequence in character class" msgstr "неверное экранирование в классе символов" -#: glib/gregex.c:525 +#: glib/gregex.c:586 msgid "range out of order in character class" msgstr "диапазон в классе символов в неправильном порядке" -#: glib/gregex.c:530 +#: glib/gregex.c:591 msgid "nothing to repeat" msgstr "нечего повторять" -#: glib/gregex.c:534 +#: glib/gregex.c:595 msgid "unrecognized character after (? or (?-" msgstr "неопознанный символ после (? или (?-" -#: glib/gregex.c:538 +#: glib/gregex.c:599 msgid "POSIX named classes are supported only within a class" msgstr "Именованные классы POSIX поддерживаются только внутри класса" -#: glib/gregex.c:542 +#: glib/gregex.c:603 msgid "POSIX collating elements are not supported" msgstr "Сортировочные элементы POSIX не поддерживаются" -#: glib/gregex.c:548 +#: glib/gregex.c:609 msgid "missing terminating )" msgstr "отсутствует завершающая )" -#: glib/gregex.c:552 +#: glib/gregex.c:613 msgid "reference to non-existent subpattern" msgstr "ссылка на несуществующий подшаблон" -#: glib/gregex.c:556 +#: glib/gregex.c:617 msgid "missing ) after comment" msgstr "отсутствует ) после комментария" -#: glib/gregex.c:560 +#: glib/gregex.c:621 msgid "regular expression is too large" msgstr "слишком длинное регулярное выражение" -#: glib/gregex.c:564 +#: glib/gregex.c:625 msgid "malformed number or name after (?(" msgstr "ошибочное число или имя после (?(" -#: glib/gregex.c:568 +#: glib/gregex.c:629 msgid "lookbehind assertion is not fixed length" msgstr "lookbehind-утверждение не имеет фиксированную длину" -#: glib/gregex.c:572 +#: glib/gregex.c:633 msgid "conditional group contains more than two branches" msgstr "условная группа содержит более двух ветвей" -#: glib/gregex.c:576 +#: glib/gregex.c:637 msgid "assertion expected after (?(" msgstr "ожидалось утверждение после (?(" -#: glib/gregex.c:580 +#: glib/gregex.c:641 msgid "a numbered reference must not be zero" msgstr "номерная ссылка не может быть нулём" -#: glib/gregex.c:584 +#: glib/gregex.c:645 msgid "unknown POSIX class name" msgstr "неизвестное имя класса POSIX" -#: glib/gregex.c:589 +#: glib/gregex.c:650 msgid "character value in \\x{...} sequence is too large" -msgstr "слишком большое значение символа в последовательности \\x{…}" +msgstr "значение символа в последовательности \\x{...} слишком велико" -#: glib/gregex.c:593 +#: glib/gregex.c:654 msgid "\\C not allowed in lookbehind assertion" msgstr "\\C запрещено в lookbehind-утверждениях" -#: glib/gregex.c:597 +#: glib/gregex.c:658 msgid "missing terminator in subpattern name" msgstr "отсутствует завершающий символ в имени подшаблона" -#: glib/gregex.c:601 +#: glib/gregex.c:662 msgid "two named subpatterns have the same name" msgstr "два именованных подшаблона имеют одинаковое имя" -#: glib/gregex.c:605 +#: glib/gregex.c:666 msgid "malformed \\P or \\p sequence" msgstr "ошибочная последовательность \\P или \\p" -#: glib/gregex.c:609 +#: glib/gregex.c:670 msgid "unknown property name after \\P or \\p" msgstr "неизвестное имя свойства после \\P или \\p" -#: glib/gregex.c:613 +#: glib/gregex.c:674 msgid "subpattern name is too long (maximum 32 characters)" msgstr "имя подшаблона слишком длинное (не должно превышать 32 символа)" -#: glib/gregex.c:617 +#: glib/gregex.c:678 msgid "too many named subpatterns (maximum 10,000)" msgstr "слишком много именованных подшаблонов (не должно быть больше 10 000)" -#: glib/gregex.c:621 +#: glib/gregex.c:682 msgid "octal value is greater than \\377" msgstr "восьмеричное значение превышает \\377" -#: glib/gregex.c:625 +#: glib/gregex.c:686 msgid "DEFINE group contains more than one branch" msgstr "Группа DEFINE содержит более одной ветви" -#: glib/gregex.c:629 +#: glib/gregex.c:690 msgid "inconsistent NEWLINE options" msgstr "противоречивые параметры NEWLINE" -#: glib/gregex.c:633 +#: glib/gregex.c:694 msgid "" "\\g is not followed by a braced, angle-bracketed, or quoted name or number, " "or by a plain number" @@ -5731,122 +5740,122 @@ "за \\g не следует имя или число в скобках, угловых скобках или кавычках, или " "просто число" -#: glib/gregex.c:638 +#: glib/gregex.c:699 msgid "an argument is not allowed for (*ACCEPT), (*FAIL), or (*COMMIT)" msgstr "нельзя указать параметр для (*ACCEPT), (*FAIL) или (*COMMIT)" -#: glib/gregex.c:642 +#: glib/gregex.c:703 msgid "(*VERB) not recognized" msgstr "значение (*VERB) не распознано" -#: glib/gregex.c:646 +#: glib/gregex.c:707 msgid "number is too big" msgstr "слишком большое число" -#: glib/gregex.c:650 +#: glib/gregex.c:711 msgid "missing subpattern name after (?&" msgstr "отсутствует имя подшаблона после (?&" -#: glib/gregex.c:654 +#: glib/gregex.c:715 msgid "different names for subpatterns of the same number are not allowed" msgstr "" "не допускаются использовать различные имена для подшаблонов с одинаковым " "номером" -#: glib/gregex.c:658 +#: glib/gregex.c:719 msgid "(*MARK) must have an argument" msgstr "для (*MARK) требуется параметр" -#: glib/gregex.c:662 +#: glib/gregex.c:723 msgid "\\c must be followed by an ASCII character" msgstr "за \\c должен быть символ ASCII" -#: glib/gregex.c:666 +#: glib/gregex.c:727 msgid "\\k is not followed by a braced, angle-bracketed, or quoted name" msgstr "за \\k не следует имя в скобках, угловых скобках или кавычках" -#: glib/gregex.c:670 +#: glib/gregex.c:731 msgid "\\N is not supported in a class" msgstr "\\N в классе не поддерживается" -#: glib/gregex.c:674 +#: glib/gregex.c:735 msgid "name is too long in (*MARK), (*PRUNE), (*SKIP), or (*THEN)" msgstr "слишком длинное имя в (*MARK), (*PRUNE), (*SKIP) или (*THEN)" -#: glib/gregex.c:678 glib/gregex.c:809 +#: glib/gregex.c:739 glib/gregex.c:875 msgid "code overflow" msgstr "переполнение кода" -#: glib/gregex.c:682 +#: glib/gregex.c:743 msgid "unrecognized character after (?P" msgstr "неопознанный символ после (?P" -#: glib/gregex.c:686 +#: glib/gregex.c:747 msgid "overran compiling workspace" msgstr "переполнение рабочего пространства компиляции" -#: glib/gregex.c:690 +#: glib/gregex.c:751 msgid "previously-checked referenced subpattern not found" msgstr "не найден ранее проверенный подшаблон со ссылкой" -#: glib/gregex.c:808 glib/gregex.c:1041 glib/gregex.c:2342 +#: glib/gregex.c:874 glib/gregex.c:1121 glib/gregex.c:2444 #, c-format msgid "Error while matching regular expression %s: %s" msgstr "" "Во время поиска совпадений с регулярным выражением %s возникла ошибка: %s" -#: glib/gregex.c:1618 +#: glib/gregex.c:1721 msgid "PCRE library is compiled without UTF8 support" msgstr "Библиотека PCRE собрана без поддержки UTF-8" -#: glib/gregex.c:1626 +#: glib/gregex.c:1729 msgid "PCRE library is compiled with incompatible options" msgstr "Библиотека PCRE собрана с несовместимыми параметрами" -#: glib/gregex.c:1751 +#: glib/gregex.c:1847 #, c-format msgid "Error while compiling regular expression ‘%s’ at char %s: %s" msgstr "" "Произошла ошибка при компиляции регулярного выражения '%s' у символа с " "номером %s: %s" -#: glib/gregex.c:2786 +#: glib/gregex.c:2887 msgid "hexadecimal digit or “}” expected" msgstr "ожидалась шестнадцатеричная цифра или символ «}»" -#: glib/gregex.c:2802 +#: glib/gregex.c:2903 msgid "hexadecimal digit expected" msgstr "ожидалась шестнадцатеричная цифра" -#: glib/gregex.c:2842 +#: glib/gregex.c:2943 msgid "missing “<” in symbolic reference" msgstr "в символьной ссылке отсутствует «<»" -#: glib/gregex.c:2851 +#: glib/gregex.c:2952 msgid "unfinished symbolic reference" msgstr "незаконченная символьная ссылка" -#: glib/gregex.c:2858 +#: glib/gregex.c:2959 msgid "zero-length symbolic reference" msgstr "символьная ссылка нулевой длины" -#: glib/gregex.c:2869 +#: glib/gregex.c:2970 msgid "digit expected" msgstr "ожидалась цифра" -#: glib/gregex.c:2887 +#: glib/gregex.c:2988 msgid "illegal symbolic reference" msgstr "недопустимая символьная ссылка" -#: glib/gregex.c:2950 +#: glib/gregex.c:3051 msgid "stray final “\\”" msgstr "лишний «\\» в конце" -#: glib/gregex.c:2954 +#: glib/gregex.c:3055 msgid "unknown escape sequence" msgstr "неизвестная экранирующая последовательность" -#: glib/gregex.c:2964 +#: glib/gregex.c:3065 #, c-format msgid "Error while parsing replacement text “%s” at char %lu: %s" msgstr "" @@ -5879,98 +5888,103 @@ msgid "Text was empty (or contained only whitespace)" msgstr "Текст был пуст (или содержал только пробелы)" -#: glib/gspawn.c:314 +#: glib/gspawn.c:319 #, c-format msgid "Failed to read data from child process (%s)" msgstr "Не удалось прочитать данные из дочернего процесса (%s)" -#: glib/gspawn.c:466 +#: glib/gspawn.c:471 #, c-format msgid "Unexpected error in reading data from a child process (%s)" msgstr "Неожиданная ошибка при чтении данных из дочернего процесса (%s)" -#: glib/gspawn.c:551 +#: glib/gspawn.c:556 #, c-format msgid "Unexpected error in waitpid() (%s)" msgstr "Произошла неожиданная ошибка в функции waitpid() (%s)" -#: glib/gspawn.c:1170 glib/gspawn-win32.c:1488 +#: glib/gspawn.c:1175 glib/gspawn-win32.c:1503 #, c-format msgid "Child process exited with code %ld" msgstr "Дочерний процесс завершился с кодом %ld" -#: glib/gspawn.c:1178 +#: glib/gspawn.c:1183 #, c-format msgid "Child process killed by signal %ld" msgstr "Дочерний процесс убит по сигналу %ld" -#: glib/gspawn.c:1185 +#: glib/gspawn.c:1190 #, c-format msgid "Child process stopped by signal %ld" msgstr "Дочерний процесс остановлен по сигналу %ld" -#: glib/gspawn.c:1192 +#: glib/gspawn.c:1197 #, c-format msgid "Child process exited abnormally" msgstr "Дочерний процесс аварийно завершил работу" -#: glib/gspawn.c:1885 glib/gspawn-win32.c:393 glib/gspawn-win32.c:401 +#: glib/gspawn.c:2027 glib/gspawn-win32.c:393 glib/gspawn-win32.c:401 #, c-format msgid "Failed to read from child pipe (%s)" msgstr "Не удалось выполнить чтение из дочернего канала (%s)" -#: glib/gspawn.c:2248 +#: glib/gspawn.c:2399 #, c-format msgid "Failed to spawn child process “%s” (%s)" msgstr "Не удалось запустить дочерний процесс \"%s\" (%s)" -#: glib/gspawn.c:2365 +#: glib/gspawn.c:2525 #, c-format msgid "Failed to fork (%s)" msgstr "Функция fork завершилась неудачно (%s)" -#: glib/gspawn.c:2525 glib/gspawn-win32.c:424 +#: glib/gspawn.c:2685 glib/gspawn-win32.c:424 #, c-format msgid "Failed to change to directory “%s” (%s)" msgstr "Не удалось сменить каталог на «%s» (%s)" -#: glib/gspawn.c:2535 +#: glib/gspawn.c:2695 #, c-format msgid "Failed to execute child process “%s” (%s)" msgstr "Не удалось выполнить дочерний процесс \"%s\" (%s)" -#: glib/gspawn.c:2545 +#: glib/gspawn.c:2705 #, c-format msgid "Failed to open file to remap file descriptor (%s)" msgstr "Не удалось открыть файл для изменения дескриптора файла (%s)" -#: glib/gspawn.c:2553 +#: glib/gspawn.c:2713 #, c-format msgid "Failed to duplicate file descriptor for child process (%s)" msgstr "Не удалось дублировать дескриптор файла для дочернего процесса (%s)" -#: glib/gspawn.c:2562 +#: glib/gspawn.c:2722 #, c-format msgid "Failed to fork child process (%s)" msgstr "При создании дочернего процесса функция fork завершилась неудачно (%s)" -#: glib/gspawn.c:2570 +#: glib/gspawn.c:2730 #, c-format msgid "Failed to close file descriptor for child process (%s)" msgstr "Не удалось закрыть дескриптор файла для дочернего процесса (%s)" -#: glib/gspawn.c:2578 +#: glib/gspawn.c:2738 #, c-format msgid "Unknown error executing child process “%s”" msgstr "Произошла неизвестная ошибка при выполнении дочернего процесса «%s»" -#: glib/gspawn.c:2602 +#: glib/gspawn.c:2762 #, c-format msgid "Failed to read enough data from child pid pipe (%s)" msgstr "" "Не удалось прочитать нужное количество данных из канала дочернего процесса " "(%s)" +#: glib/gspawn-private.h:134 +#, c-format +msgid "Invalid source FDs argument" +msgstr "Недопустимый аргумент источника FDs" + #: glib/gspawn-win32.c:337 msgid "Failed to read data from child process" msgstr "Не удалось прочитать данные из дочернего процесса" @@ -5990,27 +6004,27 @@ msgid "Invalid program name: %s" msgstr "Недопустимое имя программы: %s" -#: glib/gspawn-win32.c:521 glib/gspawn-win32.c:853 +#: glib/gspawn-win32.c:521 glib/gspawn-win32.c:868 #, c-format msgid "Invalid string in argument vector at %d: %s" msgstr "Недопустимая строка в векторе аргументов под номером %d: %s" -#: glib/gspawn-win32.c:532 glib/gspawn-win32.c:869 +#: glib/gspawn-win32.c:532 glib/gspawn-win32.c:884 #, c-format msgid "Invalid string in environment: %s" msgstr "Недопустимая строка в окружении: %s" -#: glib/gspawn-win32.c:849 +#: glib/gspawn-win32.c:864 #, c-format msgid "Invalid working directory: %s" msgstr "Недопустимый рабочий каталог: %s" -#: glib/gspawn-win32.c:914 +#: glib/gspawn-win32.c:929 #, c-format msgid "Failed to execute helper program (%s)" msgstr "Не удалось выполнить вспомогательную программу (%s)" -#: glib/gspawn-win32.c:1143 +#: glib/gspawn-win32.c:1158 msgid "" "Unexpected error in g_io_channel_win32_poll() reading data from a child " "process" @@ -6018,21 +6032,21 @@ "Произошла неожиданная ошибка в функции g_io_channel_win32_poll() при чтении " "данных из процесса-потомка" -#: glib/gstrfuncs.c:3366 glib/gstrfuncs.c:3468 +#: glib/gstrfuncs.c:3370 glib/gstrfuncs.c:3472 msgid "Empty string is not a number" msgstr "Пустая строка не является числом" -#: glib/gstrfuncs.c:3390 +#: glib/gstrfuncs.c:3394 #, c-format msgid "“%s” is not a signed number" msgstr "«%s» не является числом со знаком" -#: glib/gstrfuncs.c:3400 glib/gstrfuncs.c:3504 +#: glib/gstrfuncs.c:3404 glib/gstrfuncs.c:3508 #, c-format msgid "Number “%s” is out of bounds %s, %s" msgstr "Число «%s» is out of bounds %s, %s" -#: glib/gstrfuncs.c:3494 +#: glib/gstrfuncs.c:3498 #, c-format msgid "“%s” is not an unsigned number" msgstr "«%s» не является числом без знака" @@ -6113,133 +6127,133 @@ msgstr "Символ находится вне диапазона для UTF-16" #. Translators: A unit symbol for size formatting, showing for example: "13.0 kB" -#: glib/gutils.c:2857 +#: glib/gutils.c:2966 msgid "kB" msgstr "кБ" #. Translators: A unit symbol for size formatting, showing for example: "13.0 MB" -#: glib/gutils.c:2859 +#: glib/gutils.c:2968 msgid "MB" msgstr "МБ" #. Translators: A unit symbol for size formatting, showing for example: "13.0 GB" -#: glib/gutils.c:2861 +#: glib/gutils.c:2970 msgid "GB" msgstr "ГБ" #. Translators: A unit symbol for size formatting, showing for example: "13.0 TB" -#: glib/gutils.c:2863 +#: glib/gutils.c:2972 msgid "TB" msgstr "ТБ" #. Translators: A unit symbol for size formatting, showing for example: "13.0 PB" -#: glib/gutils.c:2865 +#: glib/gutils.c:2974 msgid "PB" msgstr "ПБ" #. Translators: A unit symbol for size formatting, showing for example: "13.0 EB" -#: glib/gutils.c:2867 +#: glib/gutils.c:2976 msgid "EB" msgstr "ЭБ" #. Translators: A unit symbol for size formatting, showing for example: "13.0 KiB" -#: glib/gutils.c:2871 +#: glib/gutils.c:2980 msgid "KiB" msgstr "КиБ" #. Translators: A unit symbol for size formatting, showing for example: "13.0 MiB" -#: glib/gutils.c:2873 +#: glib/gutils.c:2982 msgid "MiB" msgstr "МиБ" #. Translators: A unit symbol for size formatting, showing for example: "13.0 GiB" -#: glib/gutils.c:2875 +#: glib/gutils.c:2984 msgid "GiB" msgstr "ГиБ" #. Translators: A unit symbol for size formatting, showing for example: "13.0 TiB" -#: glib/gutils.c:2877 +#: glib/gutils.c:2986 msgid "TiB" msgstr "ТиБ" #. Translators: A unit symbol for size formatting, showing for example: "13.0 PiB" -#: glib/gutils.c:2879 +#: glib/gutils.c:2988 msgid "PiB" msgstr "ПиБ" #. Translators: A unit symbol for size formatting, showing for example: "13.0 EiB" -#: glib/gutils.c:2881 +#: glib/gutils.c:2990 msgid "EiB" msgstr "ЭиБ" #. Translators: A unit symbol for size formatting, showing for example: "13.0 kb" -#: glib/gutils.c:2885 +#: glib/gutils.c:2994 msgid "kb" msgstr "кбит" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Mb" -#: glib/gutils.c:2887 +#: glib/gutils.c:2996 msgid "Mb" msgstr "Мбит" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Gb" -#: glib/gutils.c:2889 +#: glib/gutils.c:2998 msgid "Gb" msgstr "Гбит" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Tb" -#: glib/gutils.c:2891 +#: glib/gutils.c:3000 msgid "Tb" msgstr "Тбит" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Pb" -#: glib/gutils.c:2893 +#: glib/gutils.c:3002 msgid "Pb" msgstr "Пбит" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Eb" -#: glib/gutils.c:2895 +#: glib/gutils.c:3004 msgid "Eb" msgstr "Эбит" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Kib" -#: glib/gutils.c:2899 +#: glib/gutils.c:3008 msgid "Kib" msgstr "Кибит" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Mib" -#: glib/gutils.c:2901 +#: glib/gutils.c:3010 msgid "Mib" msgstr "Мибит" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Gib" -#: glib/gutils.c:2903 +#: glib/gutils.c:3012 msgid "Gib" msgstr "Гибит" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Tib" -#: glib/gutils.c:2905 +#: glib/gutils.c:3014 msgid "Tib" msgstr "Тибит" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Pib" -#: glib/gutils.c:2907 +#: glib/gutils.c:3016 msgid "Pib" msgstr "Пибит" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Eib" -#: glib/gutils.c:2909 +#: glib/gutils.c:3018 msgid "Eib" msgstr "Эибит" -#: glib/gutils.c:2947 +#: glib/gutils.c:3056 msgid "byte" msgid_plural "bytes" msgstr0 "байт" msgstr1 "байта" msgstr2 "байт" -#: glib/gutils.c:2951 +#: glib/gutils.c:3060 msgid "bit" msgid_plural "bits" msgstr0 "бит" @@ -6248,7 +6262,7 @@ #. Translators: The "%u" is replaced with the size value, like "13"; it could #. * be part of "13 bytes", but only the number is requested this time. -#: glib/gutils.c:2959 +#: glib/gutils.c:3068 #, c-format msgctxt "format-size" msgid "%u" @@ -6256,7 +6270,7 @@ #. Translators: The first "%u" is replaced with the value, the "%s" with a unit of the value. #. * The order can be changed with "%$2s %$1u". An example: "13 bytes" -#: glib/gutils.c:2964 +#: glib/gutils.c:3073 #, c-format msgctxt "format-size" msgid "%u %s" @@ -6264,7 +6278,7 @@ #. Translators: The "%.1f" is replaced with the size value, like "13.0"; it could #. * be part of "13.0 MB", but only the number is requested this time. -#: glib/gutils.c:3000 +#: glib/gutils.c:3109 #, c-format msgctxt "format-size" msgid "%.1f" @@ -6273,14 +6287,14 @@ #. Translators: The first "%.1f" is replaced with the value, the "%s" with a unit of the value. #. * The order can be changed with "%$2s %$1.1f". Keep the no-break space between the value and #. * the unit symbol. An example: "13.0 MB" -#: glib/gutils.c:3006 +#: glib/gutils.c:3115 #, c-format msgctxt "format-size" msgid "%.1f %s" msgstr "%.1f %s" #. Translators: the %s in "%s bytes" will always be replaced by a number. -#: glib/gutils.c:3046 +#: glib/gutils.c:3155 #, c-format msgid "%s byte" msgid_plural "%s bytes" @@ -6289,7 +6303,7 @@ msgstr2 "%s байт" #. Translators: the %s in "%s bits" will always be replaced by a number. -#: glib/gutils.c:3051 +#: glib/gutils.c:3160 #, c-format msgid "%s bit" msgid_plural "%s bits" @@ -6297,7 +6311,7 @@ msgstr1 "%s бита" msgstr2 "%s бит" -#: glib/gutils.c:3092 +#: glib/gutils.c:3201 #, c-format msgid "%u byte" msgid_plural "%u bytes" @@ -6310,32 +6324,32 @@ #. * compatibility. Users will not see this string unless a program is using this deprecated function. #. * Please translate as literally as possible. #. -#: glib/gutils.c:3105 +#: glib/gutils.c:3214 #, c-format msgid "%.1f KB" msgstr "%.1f КБ" -#: glib/gutils.c:3110 +#: glib/gutils.c:3219 #, c-format msgid "%.1f MB" msgstr "%.1f МБ" -#: glib/gutils.c:3115 +#: glib/gutils.c:3224 #, c-format msgid "%.1f GB" msgstr "%.1f ГБ" -#: glib/gutils.c:3120 +#: glib/gutils.c:3229 #, c-format msgid "%.1f TB" msgstr "%.1f ТБ" -#: glib/gutils.c:3125 +#: glib/gutils.c:3234 #, c-format msgid "%.1f PB" msgstr "%.1f ПБ" -#: glib/gutils.c:3130 +#: glib/gutils.c:3239 #, c-format msgid "%.1f EB" msgstr "%.1f ЭБ"
View file
_service:tar_scm:glib-2.74.4.tar.xz/po/sk.po -> _service:tar_scm:glib-2.76.4.tar.xz/po/sk.po
Changed
@@ -12,146 +12,171 @@ msgstr "" "Project-Id-Version: glib\n" "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/glib/issues\n" -"POT-Creation-Date: 2021-07-19 15:52+0000\n" -"PO-Revision-Date: 2021-10-05 08:53+0200\n" +"POT-Creation-Date: 2023-04-14 16:57+0000\n" +"PO-Revision-Date: 2023-06-14 09:50-0400\n" "Last-Translator: Dušan Kazik <prescott66@gmail.com>\n" "Language-Team: Slovak <gnome-sk-list@gnome.org>\n" "Language: sk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0\n" -"X-Generator: Gtranslator 40.0\n" +"Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n" +"X-Generator: Poedit 3.3.1\n" -#: gio/gapplication.c:500 +#: gio/gappinfo.c:339 +#, fuzzy +#| msgid "Setting attribute %s not supported" +msgid "Setting default applications not supported yet" +msgstr "Nastavovanie atribútu %s nie je podporované" + +#: gio/gappinfo.c:372 +#, fuzzy +#| msgid "Setting attribute %s not supported" +msgid "Setting application as last used for type not supported yet" +msgstr "Nastavovanie atribútu %s nie je podporované" + +#: gio/gappinfo.c:814 +#, fuzzy, c-format +#| msgid "No default applications for “%s”\n" +msgid "Failed to find default application for content type ‘%s’" +msgstr "Žiadne predvolené aplikácie pre „%s“\n" + +#: gio/gappinfo.c:874 +#, fuzzy, c-format +#| msgid "No default applications for “%s”\n" +msgid "Failed to find default application for URI Scheme ‘%s’" +msgstr "Žiadne predvolené aplikácie pre „%s“\n" + +#: gio/gapplication.c:502 msgid "GApplication options" msgstr "Voľby GApplication" -#: gio/gapplication.c:500 +#: gio/gapplication.c:502 msgid "Show GApplication options" msgstr "Zobrazí voľby GApplication" -#: gio/gapplication.c:545 +#: gio/gapplication.c:547 msgid "Enter GApplication service mode (use from D-Bus service files)" msgstr "" "Vstúpi do režimu služby GApplication (použije súbory zo služby zbernice D-" "Bus)" -#: gio/gapplication.c:557 +#: gio/gapplication.c:559 msgid "Override the application’s ID" msgstr "Preváži ID aplikácie" -#: gio/gapplication.c:569 +#: gio/gapplication.c:571 msgid "Replace the running instance" msgstr "Nahradí spustenú inštanciu" -#: gio/gapplication-tool.c:45 gio/gapplication-tool.c:46 gio/gio-tool.c:227 -#: gio/gresource-tool.c:494 gio/gsettings-tool.c:572 +#: gio/gapplication-tool.c:47 gio/gapplication-tool.c:48 gio/gio-tool.c:229 +#: gio/gresource-tool.c:496 gio/gsettings-tool.c:586 msgid "Print help" msgstr "Zobrazí pomocníka" -#: gio/gapplication-tool.c:47 gio/gresource-tool.c:495 gio/gresource-tool.c:563 +#: gio/gapplication-tool.c:49 gio/gresource-tool.c:497 gio/gresource-tool.c:565 msgid "COMMAND" msgstr "PRÍKAZ" -#: gio/gapplication-tool.c:49 gio/gio-tool.c:228 +#: gio/gapplication-tool.c:51 gio/gio-tool.c:230 msgid "Print version" msgstr "Vypíše verziu" # MČ: „Vypíše …“, podobne ako nasledujúce reťazce. -#: gio/gapplication-tool.c:50 gio/gsettings-tool.c:578 +#: gio/gapplication-tool.c:52 gio/gsettings-tool.c:592 msgid "Print version information and exit" msgstr "Vypíše informácie o verzii a skončí" -#: gio/gapplication-tool.c:53 +#: gio/gapplication-tool.c:55 msgid "List applications" msgstr "Vypíše zoznam aplikácií" -#: gio/gapplication-tool.c:54 +#: gio/gapplication-tool.c:56 msgid "List the installed D-Bus activatable applications (by .desktop files)" msgstr "" "Vypíše zoznam nainštalovaných aplikácií aktivovateľných zbernicou D-Bus " "(podľa súborov typu .desktop)" # cmd desc -#: gio/gapplication-tool.c:57 +#: gio/gapplication-tool.c:59 msgid "Launch an application" msgstr "Spustí aplikáciu" -#: gio/gapplication-tool.c:58 +#: gio/gapplication-tool.c:60 msgid "Launch the application (with optional files to open)" msgstr "Spustí aplikáciu (s voliteľnými súbormi na otvorenie)" -#: gio/gapplication-tool.c:59 +#: gio/gapplication-tool.c:61 msgid "APPID FILE…" msgstr "IDAPLIKÁCIE SÚBOR…" -#: gio/gapplication-tool.c:61 +#: gio/gapplication-tool.c:63 msgid "Activate an action" msgstr "Aktivuje akciu" -#: gio/gapplication-tool.c:62 +#: gio/gapplication-tool.c:64 msgid "Invoke an action on the application" msgstr "Vyvolá akciu na aplikácii" -#: gio/gapplication-tool.c:63 +#: gio/gapplication-tool.c:65 msgid "APPID ACTION PARAMETER" msgstr "IDAPLIKÁCIE AKCIA PARAMETER" -#: gio/gapplication-tool.c:65 +#: gio/gapplication-tool.c:67 msgid "List available actions" msgstr "Vypíše zoznam dostupných akcií" -#: gio/gapplication-tool.c:66 +#: gio/gapplication-tool.c:68 msgid "List static actions for an application (from .desktop file)" msgstr "Vypíše zoznam statických akcií pre aplikáciu (zo súboru typu .desktop)" -#: gio/gapplication-tool.c:67 gio/gapplication-tool.c:73 +#: gio/gapplication-tool.c:69 gio/gapplication-tool.c:75 msgid "APPID" msgstr "IDAPLIKÁCIE" -#: gio/gapplication-tool.c:72 gio/gapplication-tool.c:135 gio/gdbus-tool.c:106 -#: gio/gio-tool.c:224 +#: gio/gapplication-tool.c:74 gio/gapplication-tool.c:137 gio/gdbus-tool.c:108 +#: gio/gio-tool.c:226 msgid "COMMAND" msgstr "PRÍKAZ" -#: gio/gapplication-tool.c:72 +#: gio/gapplication-tool.c:74 msgid "The command to print detailed help for" msgstr "Príkaz, pre ktorý sa má vypísať podrobný pomocník" -#: gio/gapplication-tool.c:73 +#: gio/gapplication-tool.c:75 msgid "Application identifier in D-Bus format (eg: org.example.viewer)" msgstr "" "Identifikátor aplikácie vo formáte zbernice D-Bus (napr.: org.príklad.viewer)" -#: gio/gapplication-tool.c:74 gio/glib-compile-resources.c:738 -#: gio/glib-compile-resources.c:744 gio/glib-compile-resources.c:772 -#: gio/gresource-tool.c:501 gio/gresource-tool.c:567 +#: gio/gapplication-tool.c:76 gio/glib-compile-resources.c:822 +#: gio/glib-compile-resources.c:828 gio/glib-compile-resources.c:857 +#: gio/gresource-tool.c:503 gio/gresource-tool.c:569 msgid "FILE" msgstr "SÚBOR" -#: gio/gapplication-tool.c:74 +#: gio/gapplication-tool.c:76 msgid "Optional relative or absolute filenames, or URIs to open" msgstr "" "Voliteľné relatívne alebo absolútne názvy súborov, alebo URI na otvorenie" -#: gio/gapplication-tool.c:75 +#: gio/gapplication-tool.c:77 msgid "ACTION" msgstr "AKCIA" -#: gio/gapplication-tool.c:75 +#: gio/gapplication-tool.c:77 msgid "The action name to invoke" msgstr "Názov akcie na vyvolanie" -#: gio/gapplication-tool.c:76 +#: gio/gapplication-tool.c:78 msgid "PARAMETER" msgstr "PARAMETER" -#: gio/gapplication-tool.c:76 +#: gio/gapplication-tool.c:78 msgid "Optional parameter to the action invocation, in GVariant format" msgstr "Voliteľný parameter pre vyvolanie akcie vo formáte GVariant" -#: gio/gapplication-tool.c:98 gio/gresource-tool.c:532 gio/gsettings-tool.c:664 +#: gio/gapplication-tool.c:100 gio/gresource-tool.c:534 +#: gio/gsettings-tool.c:678 #, c-format msgid "" "Unknown command %s\n" @@ -160,26 +185,26 @@ "Neznámy príkaz %s\n" "\n" -#: gio/gapplication-tool.c:103 +#: gio/gapplication-tool.c:105 msgid "Usage:\n" msgstr "Použitie:\n" -#: gio/gapplication-tool.c:116 gio/gresource-tool.c:557 -#: gio/gsettings-tool.c:699 +#: gio/gapplication-tool.c:118 gio/gresource-tool.c:559 +#: gio/gsettings-tool.c:713 msgid "Arguments:\n" msgstr "Parametre:\n" -#: gio/gapplication-tool.c:135 gio/gio-tool.c:224 +#: gio/gapplication-tool.c:137 gio/gio-tool.c:226 msgid "ARGS…" msgstr "PARAMETRE…" -#: gio/gapplication-tool.c:136 +#: gio/gapplication-tool.c:138 #, c-format msgid "Commands:\n" msgstr "Príkazy:\n" #. Translators: do not translate 'help', but please translate 'COMMAND'. -#: gio/gapplication-tool.c:148 +#: gio/gapplication-tool.c:150 #, c-format msgid "" "Use “%s help COMMAND” to get detailed help.\n" @@ -188,7 +213,7 @@ "Na získanie podrobnejšieho pomocníka, použite „%s help PRÍKAZ“.\n" "\n" -#: gio/gapplication-tool.c:167 +#: gio/gapplication-tool.c:169 #, c-format msgid "" "%s command requires an application id to directly follow\n" @@ -197,13 +222,13 @@ "príkaz %s vyžaduje, aby ihneď po ňom nasledoval identifikátor aplikácie\n" "\n" -#: gio/gapplication-tool.c:173 +#: gio/gapplication-tool.c:175 #, c-format msgid "invalid application id: “%s”\n" msgstr "neplatný identifikátor aplikácie: „%s“\n" #. Translators: %s is replaced with a command name like 'list-actions' -#: gio/gapplication-tool.c:184 +#: gio/gapplication-tool.c:186 #, c-format msgid "" "“%s” takes no arguments\n" @@ -212,21 +237,21 @@ "Príkaz „%s“ sa nedá použiť so žiadnymi parametrami\n" "\n" -#: gio/gapplication-tool.c:268 +#: gio/gapplication-tool.c:270 #, c-format msgid "unable to connect to D-Bus: %s\n" msgstr "nepodarilo sa pripojiť k zbernici D-Bus: %s\n" -#: gio/gapplication-tool.c:288 +#: gio/gapplication-tool.c:290 #, c-format msgid "error sending %s message to application: %s\n" msgstr "chyba pri odosielaní správy %s aplikácii: %s\n" -#: gio/gapplication-tool.c:319 +#: gio/gapplication-tool.c:324 msgid "action name must be given after application id\n" msgstr "názov akcie musí byť zadaný po identifikátore aplikácie\n" -#: gio/gapplication-tool.c:327 +#: gio/gapplication-tool.c:332 #, c-format msgid "" "invalid action name: “%s”\n" @@ -235,25 +260,25 @@ "neplatný názov akcie: „%s“\n" "názvy akcií musia pozostávať iba zo znakov, číslic, „-“ a „.“\n" -#: gio/gapplication-tool.c:346 +#: gio/gapplication-tool.c:351 #, c-format msgid "error parsing action parameter: %s\n" msgstr "chyba pri spracovaní parametra akcie: %s\n" -#: gio/gapplication-tool.c:358 +#: gio/gapplication-tool.c:363 msgid "actions accept a maximum of one parameter\n" msgstr "akcie prijímajú maximálne jeden parameter\n" -#: gio/gapplication-tool.c:413 +#: gio/gapplication-tool.c:418 msgid "list-actions command takes only the application id" msgstr "príkaz list-actions sa dá použiť iba s identifikátorom aplikácie" -#: gio/gapplication-tool.c:423 +#: gio/gapplication-tool.c:428 #, c-format msgid "unable to find desktop file for application %s\n" msgstr "nepodarilo sa nájsť súbor desktop pre aplikáciu %s\n" -#: gio/gapplication-tool.c:468 +#: gio/gapplication-tool.c:473 #, c-format msgid "" "unrecognised command: %s\n" @@ -262,131 +287,128 @@ "nerozpoznaný príkaz: %s\n" "\n" -#: gio/gbufferedinputstream.c:420 gio/gbufferedinputstream.c:498 -#: gio/ginputstream.c:179 gio/ginputstream.c:379 gio/ginputstream.c:648 -#: gio/ginputstream.c:1050 gio/goutputstream.c:223 gio/goutputstream.c:1049 -#: gio/gpollableinputstream.c:205 gio/gpollableoutputstream.c:277 +#: gio/gbufferedinputstream.c:422 gio/gbufferedinputstream.c:500 +#: gio/ginputstream.c:181 gio/ginputstream.c:381 gio/ginputstream.c:650 +#: gio/ginputstream.c:1052 gio/goutputstream.c:225 gio/goutputstream.c:1051 +#: gio/gpollableinputstream.c:221 gio/gpollableoutputstream.c:293 #, c-format msgid "Too large count value passed to %s" msgstr "Príliš vysoký počet hodnôt predaný do %s" -#: gio/gbufferedinputstream.c:891 gio/gbufferedoutputstream.c:575 -#: gio/gdataoutputstream.c:562 +#: gio/gbufferedinputstream.c:893 gio/gbufferedoutputstream.c:577 +#: gio/gdataoutputstream.c:564 msgid "Seek not supported on base stream" msgstr "Presúvanie v základnom prúde nie je podporované" -#: gio/gbufferedinputstream.c:938 +#: gio/gbufferedinputstream.c:940 msgid "Cannot truncate GBufferedInputStream" msgstr "GBufferedInputStream sa nedá skrátiť" -#: gio/gbufferedinputstream.c:983 gio/ginputstream.c:1239 gio/giostream.c:300 -#: gio/goutputstream.c:2198 +#: gio/gbufferedinputstream.c:985 gio/ginputstream.c:1241 gio/giostream.c:302 +#: gio/goutputstream.c:2200 msgid "Stream is already closed" msgstr "Prúd je už zatvorený" -#: gio/gbufferedoutputstream.c:612 gio/gdataoutputstream.c:592 +#: gio/gbufferedoutputstream.c:614 gio/gdataoutputstream.c:594 msgid "Truncate not supported on base stream" msgstr "Skrátenie nie je v základnom prúde podporované" -#: gio/gcancellable.c:319 gio/gdbusconnection.c:1872 gio/gdbusprivate.c:1416 -#: gio/gsimpleasyncresult.c:871 gio/gsimpleasyncresult.c:897 +#: gio/gcancellable.c:326 gio/gdbusconnection.c:1865 gio/gdbusprivate.c:1420 +#: gio/gsimpleasyncresult.c:873 gio/gsimpleasyncresult.c:899 #, c-format msgid "Operation was cancelled" msgstr "Operácia bola zrušená" -#: gio/gcharsetconverter.c:260 +#: gio/gcharsetconverter.c:262 msgid "Invalid object, not initialized" msgstr "Neplatný objekt, neinicializované" -#: gio/gcharsetconverter.c:281 gio/gcharsetconverter.c:309 +#: gio/gcharsetconverter.c:283 gio/gcharsetconverter.c:311 msgid "Incomplete multibyte sequence in input" msgstr "Neúplná viacbajtová sekvencia na vstupe" -#: gio/gcharsetconverter.c:315 gio/gcharsetconverter.c:324 +#: gio/gcharsetconverter.c:317 gio/gcharsetconverter.c:326 msgid "Not enough space in destination" msgstr "Nedostatok miesta v cieli" -#: gio/gcharsetconverter.c:342 gio/gdatainputstream.c:848 -#: gio/gdatainputstream.c:1266 glib/gconvert.c:449 glib/gconvert.c:879 -#: glib/giochannel.c:1573 glib/giochannel.c:1615 glib/giochannel.c:2470 -#: glib/gutf8.c:875 glib/gutf8.c:1328 +#: gio/gcharsetconverter.c:344 gio/gdatainputstream.c:850 +#: gio/gdatainputstream.c:1268 glib/gconvert.c:451 glib/gconvert.c:883 +#: glib/giochannel.c:1576 glib/giochannel.c:1618 glib/giochannel.c:2478 +#: glib/gutf8.c:892 glib/gutf8.c:1346 msgid "Invalid byte sequence in conversion input" msgstr "Neplatná sekvencia bajtov na vstupe prevodu" -#: gio/gcharsetconverter.c:347 glib/gconvert.c:457 glib/gconvert.c:793 -#: glib/giochannel.c:1580 glib/giochannel.c:2482 +#: gio/gcharsetconverter.c:349 glib/gconvert.c:459 glib/gconvert.c:797 +#: glib/giochannel.c:1583 glib/giochannel.c:2493 #, c-format msgid "Error during conversion: %s" msgstr "Chyba počas prevodu: %s" -#: gio/gcharsetconverter.c:445 gio/gsocket.c:1143 +#: gio/gcharsetconverter.c:447 gio/gsocket.c:1151 msgid "Cancellable initialization not supported" msgstr "Zrušiteľná inicializácia nie je podporovaná" -#: gio/gcharsetconverter.c:456 glib/gconvert.c:322 glib/giochannel.c:1401 +#: gio/gcharsetconverter.c:458 glib/gconvert.c:324 glib/giochannel.c:1404 #, c-format msgid "Conversion from character set “%s” to “%s” is not supported" msgstr "Prevod zo znakovej sady „%s“ do „%s“ nie je podporovaný" -#: gio/gcharsetconverter.c:460 glib/gconvert.c:326 +#: gio/gcharsetconverter.c:462 glib/gconvert.c:328 #, c-format msgid "Could not open converter from “%s” to “%s”" msgstr "Nepodarilo sa otvoriť program na prevod z „%s“ do „%s“" -#: gio/gcontenttype.c:454 +#: gio/gcontenttype.c:472 #, c-format msgid "%s type" msgstr "typ %s" -#: gio/gcontenttype-win32.c:192 +#: gio/gcontenttype-win32.c:198 msgid "Unknown type" msgstr "Neznámy typ" -#: gio/gcontenttype-win32.c:194 +#: gio/gcontenttype-win32.c:200 #, c-format msgid "%s filetype" msgstr "typ súboru %s" -#: gio/gcredentials.c:323 +#: gio/gcredentials.c:337 msgid "GCredentials contains invalid data" msgstr "GCredentials obsahuje neplatné údaje" -#: gio/gcredentials.c:383 gio/gcredentials.c:667 +#: gio/gcredentials.c:397 gio/gcredentials.c:688 msgid "GCredentials is not implemented on this OS" msgstr "GCredentials nie je implementované v tomto operačnom systéme" -#: gio/gcredentials.c:538 gio/gcredentials.c:556 +#: gio/gcredentials.c:552 gio/gcredentials.c:570 msgid "There is no GCredentials support for your platform" msgstr "Neexistuje podpora GCredentials pre vašu platformu" -#: gio/gcredentials.c:607 +#: gio/gcredentials.c:628 msgid "GCredentials does not contain a process ID on this OS" msgstr "" "GCredentials neobsahuje identifikátor procesu v tomto operačnom systéme" -#: gio/gcredentials.c:661 +#: gio/gcredentials.c:682 msgid "Credentials spoofing is not possible on this OS" msgstr "Zmena poverení nie je možná v tomto operačnom systéme" -#: gio/gdatainputstream.c:304 +#: gio/gdatainputstream.c:306 msgid "Unexpected early end-of-stream" msgstr "Neočakávane skorý koniec prúdu" -#: gio/gdbusaddress.c:159 gio/gdbusaddress.c:233 gio/gdbusaddress.c:322 +#: gio/gdbusaddress.c:168 gio/gdbusaddress.c:240 gio/gdbusaddress.c:327 #, c-format msgid "Unsupported key “%s” in address entry “%s”" msgstr "Nepodporovaný kľúč „%s“ v položke adresy „%s“" -#: gio/gdbusaddress.c:172 +#: gio/gdbusaddress.c:181 #, c-format msgid "Meaningless key/value pair combination in address entry “%s”" msgstr "Nezmyselná kombinácia kľúč/hodnota v položke adresy „%s“" -#: gio/gdbusaddress.c:181 +#: gio/gdbusaddress.c:190 #, c-format -#| msgid "" -#| "Address “%s” is invalid (need exactly one of path, tmpdir or abstract " -#| "keys)" msgid "" "Address “%s” is invalid (need exactly one of path, dir, tmpdir, or abstract " "keys)" @@ -394,46 +416,43 @@ "Adresa „%s“ je neplatná (je potrebný práve jeden kľúč path, dir, tmpdir " "alebo abstract)" -#: gio/gdbusaddress.c:248 gio/gdbusaddress.c:259 gio/gdbusaddress.c:274 -#: gio/gdbusaddress.c:337 gio/gdbusaddress.c:348 +#: gio/gdbusaddress.c:255 gio/gdbusaddress.c:266 gio/gdbusaddress.c:281 +#: gio/gdbusaddress.c:342 gio/gdbusaddress.c:353 #, c-format msgid "Error in address “%s” — the “%s” attribute is malformed" msgstr "Chyba v adrese „%s“ — atribút „%s“ má zlý formát" # first is transport name -#: gio/gdbusaddress.c:418 gio/gdbusaddress.c:682 +#: gio/gdbusaddress.c:423 gio/gdbusaddress.c:682 #, c-format msgid "Unknown or unsupported transport “%s” for address “%s”" msgstr "Neznámy alebo nepodporovaný transport typu „%s“ pre adresu „%s“" -#: gio/gdbusaddress.c:462 +#: gio/gdbusaddress.c:467 #, c-format msgid "Address element “%s” does not contain a colon (:)" msgstr "Prvok adresy „%s“ neobsahuje dvojbodku (:)" -#: gio/gdbusaddress.c:471 +#: gio/gdbusaddress.c:476 #, c-format msgid "Transport name in address element “%s” must not be empty" msgstr "" -#: gio/gdbusaddress.c:492 +#: gio/gdbusaddress.c:497 #, c-format msgid "" "Key/Value pair %d, “%s”, in address element “%s” does not contain an equal " "sign" msgstr "Pár kľúč/hodnota %d, „%s“ v prvku adresy „%s“ neobsahuje znak rovnosti" -#: gio/gdbusaddress.c:503 +#: gio/gdbusaddress.c:508 #, c-format -#| msgid "" -#| "Key/Value pair %d, “%s”, in address element “%s” does not contain an " -#| "equal sign" msgid "" "Key/Value pair %d, “%s”, in address element “%s” must not have an empty key" msgstr "" "Pár kľúč/hodnota %d, „%s“ v prvku adresy „%s“ nemôže obsahovať prázdny kľúč" -#: gio/gdbusaddress.c:517 +#: gio/gdbusaddress.c:522 #, c-format msgid "" "Error unescaping key or value in Key/Value pair %d, “%s”, in address element " @@ -442,7 +461,7 @@ "Chyba kľúča alebo hodnoty s nahradenými špeciálne uvedenými sekvenciami v " "páre kľúč/hodnota %d, „%s“ v prvku adresy „%s“" -#: gio/gdbusaddress.c:589 +#: gio/gdbusaddress.c:590 #, c-format msgid "" "Error in address “%s” — the unix transport requires exactly one of the keys " @@ -499,8 +518,9 @@ # MČ: Komentár v kóde: /* Don't run binaries as root if we're setuid. */ # MČ: v tomto prípade „spawn“ znamená: Spustí a posiela dáta, cez stdin a očakáva dáta cez stdout, takže by som skôr dal spustiť. #: gio/gdbusaddress.c:1101 -#, c-format -msgid "Cannot spawn a message bus when setuid" +#, fuzzy, c-format +#| msgid "Cannot spawn a message bus when setuid" +msgid "Cannot spawn a message bus when AT_SECURE is set" msgstr "Zbernica správ sa nedá spustiť pri setuid" # MČ: v tomto prípade „spawn“ znamená: Spustí a posiela dáta, cez stdin a očakáva dáta cez stdout, takže by som skôr dal spustiť. @@ -527,7 +547,7 @@ "Nedá sa určiť adresa relačnej zbernice (nie je implementovaná pre tento " "operačný systém)" -#: gio/gdbusaddress.c:1397 gio/gdbusconnection.c:7261 +#: gio/gdbusaddress.c:1380 gio/gdbusconnection.c:7324 #, c-format msgid "" "Cannot determine bus address from DBUS_STARTER_BUS_TYPE environment variable " @@ -536,7 +556,7 @@ "Nedá sa určiť adresa zbernice z premennej prostredia DBUS_STARTER_BUS_TYPE — " "neznáma hodnota „%s“" -#: gio/gdbusaddress.c:1406 gio/gdbusconnection.c:7270 +#: gio/gdbusaddress.c:1389 gio/gdbusconnection.c:7333 msgid "" "Cannot determine bus address because the DBUS_STARTER_BUS_TYPE environment " "variable is not set" @@ -544,7 +564,7 @@ "Nedá sa určiť adresa zbernice, pretože premenná prostredia " "DBUS_STARTER_BUS_TYPE nie je nastavená" -#: gio/gdbusaddress.c:1416 +#: gio/gdbusaddress.c:1399 #, c-format msgid "Unknown bus type %d" msgstr "Neznámy typ zbernice %d" @@ -565,20 +585,26 @@ "Vyčerpané všetky dostupné mechanizmy overenia totožnosti (pokusy: %s) " "(dostupné: %s)" -#: gio/gdbusauth.c:1171 +#: gio/gdbusauth.c:1045 +#, fuzzy +#| msgid "Unexpected lack of content trying to read a line" +msgid "Unexpected lack of content trying to read a byte" +msgstr "Nečakaný nedostatok obsahu pri pokuse čítať riadok" + +#: gio/gdbusauth.c:1195 msgid "User IDs must be the same for peer and server" msgstr "Identifikátory používateľa musia byť rovnaké pre partnera a server" -#: gio/gdbusauth.c:1183 +#: gio/gdbusauth.c:1207 msgid "Cancelled via GDBusAuthObserver::authorize-authenticated-peer" msgstr "Zrušené cez GDBusAuthObserver::authorize-authenticated-peer" -#: gio/gdbusauthmechanismsha1.c:298 +#: gio/gdbusauthmechanismsha1.c:307 #, c-format msgid "Error when getting information for directory “%s”: %s" msgstr "Chyba pri získavaní informácií pre adresár „%s“: %s" -#: gio/gdbusauthmechanismsha1.c:313 +#: gio/gdbusauthmechanismsha1.c:322 #, c-format msgid "" "Permissions on directory “%s” are malformed. Expected mode 0700, got 0%o" @@ -586,27 +612,27 @@ "Oprávnenia k adresáru „%s“ sú zle formátované. Očakávaný režim 0700, získaný " "0%o" -#: gio/gdbusauthmechanismsha1.c:346 gio/gdbusauthmechanismsha1.c:357 +#: gio/gdbusauthmechanismsha1.c:355 gio/gdbusauthmechanismsha1.c:366 #, c-format msgid "Error creating directory “%s”: %s" msgstr "Chyba pri vytváraní adresára %s: %s" -#: gio/gdbusauthmechanismsha1.c:359 gio/gfile.c:1062 gio/gfile.c:1300 -#: gio/gfile.c:1438 gio/gfile.c:1676 gio/gfile.c:1731 gio/gfile.c:1789 -#: gio/gfile.c:1873 gio/gfile.c:1930 gio/gfile.c:1994 gio/gfile.c:2049 -#: gio/gfile.c:3754 gio/gfile.c:3809 gio/gfile.c:4102 gio/gfile.c:4572 -#: gio/gfile.c:4983 gio/gfile.c:5068 gio/gfile.c:5158 gio/gfile.c:5255 -#: gio/gfile.c:5342 gio/gfile.c:5443 gio/gfile.c:8153 gio/gfile.c:8243 -#: gio/gfile.c:8327 gio/win32/gwinhttpfile.c:453 +#: gio/gdbusauthmechanismsha1.c:368 gio/gfile.c:1095 gio/gfile.c:1333 +#: gio/gfile.c:1471 gio/gfile.c:1709 gio/gfile.c:1764 gio/gfile.c:1822 +#: gio/gfile.c:1906 gio/gfile.c:1963 gio/gfile.c:2027 gio/gfile.c:2082 +#: gio/gfile.c:3797 gio/gfile.c:3937 gio/gfile.c:4349 gio/gfile.c:4819 +#: gio/gfile.c:5230 gio/gfile.c:5315 gio/gfile.c:5405 gio/gfile.c:5502 +#: gio/gfile.c:5589 gio/gfile.c:5690 gio/gfile.c:8819 gio/gfile.c:8909 +#: gio/gfile.c:8993 gio/win32/gwinhttpfile.c:453 msgid "Operation not supported" msgstr "Nepodporovaná operácia" -#: gio/gdbusauthmechanismsha1.c:402 +#: gio/gdbusauthmechanismsha1.c:411 #, c-format msgid "Error opening keyring “%s” for reading: " msgstr "Chyba pri otváraní zväzku kľúčov „%s“ na čítanie: " -#: gio/gdbusauthmechanismsha1.c:425 gio/gdbusauthmechanismsha1.c:747 +#: gio/gdbusauthmechanismsha1.c:434 gio/gdbusauthmechanismsha1.c:775 #, c-format msgid "Line %d of the keyring at “%s” with content “%s” is malformed" msgstr "Riadok č. %d zväzku kľúčov na „%s“ s obsahom „%s“ je zle formátovaný" @@ -614,7 +640,7 @@ # PK: token nie je nejaky znak? viacX # PM: token je napríklad "%s" ide o znaky ktoré môžu byt nahradené nejakým textom napr %u - meno používateľa # PK: token by mal byt string -#: gio/gdbusauthmechanismsha1.c:439 gio/gdbusauthmechanismsha1.c:761 +#: gio/gdbusauthmechanismsha1.c:448 gio/gdbusauthmechanismsha1.c:789 #, c-format msgid "" "First token of line %d of the keyring at “%s” with content “%s” is malformed" @@ -622,7 +648,7 @@ "Prvý token riadka č. %d zväzku kľúčov na „%s“ s obsahom „%s“ je zle " "formátovaný" -#: gio/gdbusauthmechanismsha1.c:453 gio/gdbusauthmechanismsha1.c:775 +#: gio/gdbusauthmechanismsha1.c:462 gio/gdbusauthmechanismsha1.c:803 #, c-format msgid "" "Second token of line %d of the keyring at “%s” with content “%s” is malformed" @@ -630,122 +656,122 @@ "Druhý token riadka č. %d zväzku kľúčov na „%s“ s obsahom „%s“ je zle " "formátovaný" -#: gio/gdbusauthmechanismsha1.c:477 +#: gio/gdbusauthmechanismsha1.c:486 #, c-format msgid "Didn’t find cookie with id %d in the keyring at “%s”" msgstr "Nenašlo sa cookie s identifikátorom %d vo zväzku kľúčov na „%s“" -#: gio/gdbusauthmechanismsha1.c:523 +#: gio/gdbusauthmechanismsha1.c:543 #, c-format msgid "Error creating lock file “%s”: %s" msgstr "Chyba pri vytváraní súboru uzamknutia „%s“: %s" -#: gio/gdbusauthmechanismsha1.c:587 +#: gio/gdbusauthmechanismsha1.c:616 #, c-format msgid "Error deleting stale lock file “%s”: %s" msgstr "Chyba pri odstraňovaní starého súboru uzamknutia „%s“: %s" # PM: Je to súbor určený na vymazanie ale vymaže sa až vtedy, keď ho zatvorí posledný, kto ho má otvorený -#: gio/gdbusauthmechanismsha1.c:626 +#: gio/gdbusauthmechanismsha1.c:655 #, c-format msgid "Error closing (unlinked) lock file “%s”: %s" msgstr "Chyba pri zatváraní (vymazávaného) súboru uzamknutia „%s“: %s" -#: gio/gdbusauthmechanismsha1.c:637 +#: gio/gdbusauthmechanismsha1.c:666 #, c-format msgid "Error unlinking lock file “%s”: %s" msgstr "Chyba pri mazaní súboru uzamknutia „%s“: %s" -#: gio/gdbusauthmechanismsha1.c:714 +#: gio/gdbusauthmechanismsha1.c:742 #, c-format msgid "Error opening keyring “%s” for writing: " msgstr "Chyba pri otváraní zväzku kľúčov „%s“ na zápis: " -#: gio/gdbusauthmechanismsha1.c:908 +#: gio/gdbusauthmechanismsha1.c:936 #, c-format msgid "(Additionally, releasing the lock for “%s” also failed: %s) " msgstr "(Okrem toho zlyhalo aj uvoľnenie zámky pre „%s“: %s) " -#: gio/gdbusconnection.c:603 gio/gdbusconnection.c:2417 +#: gio/gdbusconnection.c:590 gio/gdbusconnection.c:2413 msgid "The connection is closed" msgstr "Pripojenie je ukončené" -#: gio/gdbusconnection.c:1902 +#: gio/gdbusconnection.c:1897 msgid "Timeout was reached" msgstr "Vypršal časový limit" -#: gio/gdbusconnection.c:2540 +#: gio/gdbusconnection.c:2536 msgid "" "Unsupported flags encountered when constructing a client-side connection" msgstr "" "Pri vytváraní klientského pripojenia boli nájdené nepodporované príznaky" -#: gio/gdbusconnection.c:4189 gio/gdbusconnection.c:4536 +#: gio/gdbusconnection.c:4265 gio/gdbusconnection.c:4619 #, c-format msgid "" "No such interface “org.freedesktop.DBus.Properties” on object at path %s" msgstr "" "Rozhranie „org.freedesktop.DBus.Properties“ nie je v objekte na ceste %s" -#: gio/gdbusconnection.c:4331 +#: gio/gdbusconnection.c:4410 #, c-format msgid "No such property “%s”" msgstr "Neexistuje vlastnosť „%s“" -#: gio/gdbusconnection.c:4343 +#: gio/gdbusconnection.c:4422 #, c-format msgid "Property “%s” is not readable" msgstr "Vlastnosť „%s“ nie je čitateľná" -#: gio/gdbusconnection.c:4354 +#: gio/gdbusconnection.c:4433 #, c-format msgid "Property “%s” is not writable" msgstr "Vlastnosť „%s“ nie je zapisovateľná" -#: gio/gdbusconnection.c:4374 +#: gio/gdbusconnection.c:4453 #, c-format msgid "Error setting property “%s”: Expected type “%s” but got “%s”" msgstr "" "Chyba pri nastavovaní vlastnosti „%s“: Bol očakávaný typ „%s“, no získaný " "bol „%s“" -#: gio/gdbusconnection.c:4479 gio/gdbusconnection.c:4687 -#: gio/gdbusconnection.c:6689 +#: gio/gdbusconnection.c:4558 gio/gdbusconnection.c:4773 +#: gio/gdbusconnection.c:6750 #, c-format msgid "No such interface “%s”" msgstr "Neexistuje rozhranie „%s“" -#: gio/gdbusconnection.c:4905 gio/gdbusconnection.c:7201 +#: gio/gdbusconnection.c:4989 gio/gdbusconnection.c:7264 #, c-format msgid "No such interface “%s” on object at path %s" msgstr "Rozhranie „%s“ nie je v objekte na ceste %s" -#: gio/gdbusconnection.c:5003 +#: gio/gdbusconnection.c:5090 #, c-format msgid "No such method “%s”" msgstr "Neexistujúca metóda „%s“" -#: gio/gdbusconnection.c:5034 +#: gio/gdbusconnection.c:5121 #, c-format msgid "Type of message, “%s”, does not match expected type “%s”" msgstr "Typ správy „%s“ nezodpovedá očakávanému typu „%s“" -#: gio/gdbusconnection.c:5237 +#: gio/gdbusconnection.c:5324 #, c-format msgid "An object is already exported for the interface %s at %s" msgstr "Pre rozhranie %s je už exportovaný objekt na %s" -#: gio/gdbusconnection.c:5463 +#: gio/gdbusconnection.c:5551 #, c-format msgid "Unable to retrieve property %s.%s" msgstr "Nepodarilo sa získať vlastnosť %s.%s" -#: gio/gdbusconnection.c:5519 +#: gio/gdbusconnection.c:5607 #, c-format msgid "Unable to set property %s.%s" msgstr "Nepodarilo sa nastaviť vlastnosť %s.%s" -#: gio/gdbusconnection.c:5698 +#: gio/gdbusconnection.c:5786 #, c-format msgid "Method “%s” returned type “%s”, but expected “%s”" msgstr "Metóda „%s“ vrátila typ „%s“, no očakávaný bol „%s“" @@ -753,43 +779,42 @@ # MČ: mám k tomuto preklady výhrady, ale keď to tak chcete, môže byť. Keď signatúra nevyhovuje, tak skôr značka. Ak sa rozhodnete upraviť, tak pri všetkých výskytoch. # PK: http://dbus.freedesktop.org/doc/dbus-specification.html#message-protocol-signatures # PK: mozno oznacenie -#: gio/gdbusconnection.c:6800 +#: gio/gdbusconnection.c:6862 #, c-format msgid "Method “%s” on interface “%s” with signature “%s” does not exist" msgstr "Metóda „%s“ z rozhrania „%s“ s označením „%s“ neexistuje" -#: gio/gdbusconnection.c:6921 +#: gio/gdbusconnection.c:6983 #, c-format msgid "A subtree is already exported for %s" msgstr "Podstrom je už exportovaný do %s" -#: gio/gdbusconnection.c:7209 +#: gio/gdbusconnection.c:7272 #, c-format -#| msgid "Key file does not have group “%s”" msgid "Object does not exist at path “%s”" msgstr "Objekt neexistuje na ceste „%s“" -#: gio/gdbusmessage.c:1266 +#: gio/gdbusmessage.c:1306 msgid "type is INVALID" msgstr "typ je INVALID" -#: gio/gdbusmessage.c:1277 +#: gio/gdbusmessage.c:1317 msgid "METHOD_CALL message: PATH or MEMBER header field is missing" msgstr "Správa METHOD_CALL: chýba pole hlavičky PATH alebo MEMBER" -#: gio/gdbusmessage.c:1288 +#: gio/gdbusmessage.c:1328 msgid "METHOD_RETURN message: REPLY_SERIAL header field is missing" msgstr "Správa METHOD_RETURN: chýba pole hlavičky REPLY_SERIAL" -#: gio/gdbusmessage.c:1300 +#: gio/gdbusmessage.c:1340 msgid "ERROR message: REPLY_SERIAL or ERROR_NAME header field is missing" msgstr "Správa ERROR: chýba pole hlavičky REPLY_SERIAL alebo ERROR_NAME" -#: gio/gdbusmessage.c:1313 +#: gio/gdbusmessage.c:1353 msgid "SIGNAL message: PATH, INTERFACE or MEMBER header field is missing" msgstr "Správa SIGNAL: chýba pole hlavičky PATH, INTERFACE alebo MEMBER" -#: gio/gdbusmessage.c:1321 +#: gio/gdbusmessage.c:1361 msgid "" "SIGNAL message: The PATH header field is using the reserved value /org/" "freedesktop/DBus/Local" @@ -797,7 +822,7 @@ "Správa SIGNAL: pole hlavičky PATH používa vyhradenú hodnotu /org/freedesktop/" "DBus/Local" -#: gio/gdbusmessage.c:1329 +#: gio/gdbusmessage.c:1369 msgid "" "SIGNAL message: The INTERFACE header field is using the reserved value org." "freedesktop.DBus.Local" @@ -807,7 +832,7 @@ # MČ: Asi bude tre dať rozdeliť reťazec, nenapadá mi, ako by sa druhá časť dala preložiť neutrálne. Jedna vec je istá, pri druhom reťazci môže byť ozískaných“ len nula, keďže iba to je menej ako jedna. Prípadne všade použiť „získaných“, malo by to narobiť najmenej problémov. # JK: https://bugzilla.gnome.org/show_bug.cgi?id=695234 -#: gio/gdbusmessage.c:1377 gio/gdbusmessage.c:1437 +#: gio/gdbusmessage.c:1417 gio/gdbusmessage.c:1477 #, c-format msgid "Wanted to read %lu byte but only got %lu" msgid_plural "Wanted to read %lu bytes but only got %lu" @@ -817,12 +842,12 @@ # *https://bugzilla.gnome.org/show_bug.cgi?id=658913 # PM: tu je to hodnota znaku nie smerníka -#: gio/gdbusmessage.c:1391 +#: gio/gdbusmessage.c:1431 #, c-format msgid "Expected NUL byte after the string “%s” but found byte %d" msgstr "Očakávaný znak NUL za reťazcom „%s“, no nájdený bajt %d" -#: gio/gdbusmessage.c:1410 +#: gio/gdbusmessage.c:1450 #, c-format msgid "" "Expected valid UTF-8 string but found invalid bytes at byte offset %d " @@ -831,22 +856,22 @@ "Očakávaný platný UTF-8 reťazec, no nájdené neplatné bajty na pozícii %d " "(dĺžka reťazca je %d). Platný UTF-8 reťazec do toho miesta bol „%s“" -#: gio/gdbusmessage.c:1474 gio/gdbusmessage.c:1722 gio/gdbusmessage.c:1911 +#: gio/gdbusmessage.c:1514 gio/gdbusmessage.c:1790 gio/gdbusmessage.c:2001 msgid "Value nested too deeply" msgstr "" -#: gio/gdbusmessage.c:1620 +#: gio/gdbusmessage.c:1682 #, c-format msgid "Parsed value “%s” is not a valid D-Bus object path" msgstr "" "Analyzovaná hodnota „%s“ nie je platnou cestou k objektu zbernice D-Bus" -#: gio/gdbusmessage.c:1642 +#: gio/gdbusmessage.c:1706 #, c-format msgid "Parsed value “%s” is not a valid D-Bus signature" msgstr "Analyzovaná hodnota „%s“ nie je platným označením zbernice D-Bus" -#: gio/gdbusmessage.c:1689 +#: gio/gdbusmessage.c:1757 #, c-format msgid "" "Encountered array of length %u byte. Maximum length is 2<<26 bytes (64 MiB)." @@ -859,7 +884,7 @@ msgstr2 "" "Zistené pole s dĺžkou %u bajty. Maximálna dĺžka je 2<<26 bajtov (64 MiB)" -#: gio/gdbusmessage.c:1709 +#: gio/gdbusmessage.c:1777 #, c-format msgid "" "Encountered array of type “a%c”, expected to have a length a multiple of %u " @@ -868,13 +893,17 @@ "Zistené pole typu „a%c“, ktoré by malo mať dĺžku v násobkoch %u bajtov, ale " "reálna dĺžka je %u bajtov" -#: gio/gdbusmessage.c:1895 +#: gio/gdbusmessage.c:1931 gio/gdbusmessage.c:2650 +msgid "Empty structures (tuples) are not allowed in D-Bus" +msgstr "" + +#: gio/gdbusmessage.c:1985 #, c-format msgid "Parsed value “%s” for variant is not a valid D-Bus signature" msgstr "" "Analyzovaná hodnota „%s“ pre variant nie je platným označením zbernice D-Bus" -#: gio/gdbusmessage.c:1936 +#: gio/gdbusmessage.c:2026 #, c-format msgid "" "Error deserializing GVariant with type string “%s” from the D-Bus wire format" @@ -883,7 +912,7 @@ "formátu zbernice D-Bus" # tu musia byt taketo uvodzovky, kedze je to tak aj v C alebo Java -#: gio/gdbusmessage.c:2121 +#: gio/gdbusmessage.c:2211 #, c-format msgid "" "Invalid endianness value. Expected 0x6c (“l”) or 0x42 (“B”) but found value " @@ -893,29 +922,29 @@ "nájdená hodnota 0x%02x" # protocol version -#: gio/gdbusmessage.c:2134 +#: gio/gdbusmessage.c:2230 #, c-format msgid "Invalid major protocol version. Expected 1 but found %d" msgstr "Neplatná hlavná verzia protokolu. Očakávaná 1, no nájdená %d" -#: gio/gdbusmessage.c:2188 gio/gdbusmessage.c:2784 +#: gio/gdbusmessage.c:2288 gio/gdbusmessage.c:2886 msgid "Signature header found but is not of type signature" msgstr "" -#: gio/gdbusmessage.c:2200 +#: gio/gdbusmessage.c:2300 #, c-format msgid "Signature header with signature “%s” found but message body is empty" msgstr "" "Nájdená hlavička označenia s označením „%s“, no nájdené telo správy je " "prázdne" -#: gio/gdbusmessage.c:2215 +#: gio/gdbusmessage.c:2315 #, c-format msgid "Parsed value “%s” is not a valid D-Bus signature (for body)" msgstr "" "Analyzovaná hodnota „%s“ nie je platným označením zbernice D-Bus (pre telo)" -#: gio/gdbusmessage.c:2247 +#: gio/gdbusmessage.c:2347 #, 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" @@ -926,11 +955,11 @@ msgstr2 "" "V správe nie je žiadna hlavička označenia, no telo správy má %u bajty" -#: gio/gdbusmessage.c:2257 +#: gio/gdbusmessage.c:2357 msgid "Cannot deserialize message: " msgstr "Nedá sa deserializovať správa: " -#: gio/gdbusmessage.c:2601 +#: gio/gdbusmessage.c:2703 #, c-format msgid "" "Error serializing GVariant with type string “%s” to the D-Bus wire format" @@ -938,7 +967,7 @@ "Chyba pri serializovaní Gvariant pomocou reťazca typu „%s“ z prenosového " "formátu zbernice D-Bus" -#: gio/gdbusmessage.c:2738 +#: gio/gdbusmessage.c:2840 #, c-format msgid "" "Number of file descriptors in message (%d) differs from header field (%d)" @@ -946,16 +975,16 @@ "Počet popisovačov súboru v správe (%d) sa odlišuje od počtu v poli hlavička " "(%d)" -#: gio/gdbusmessage.c:2746 +#: gio/gdbusmessage.c:2848 msgid "Cannot serialize message: " msgstr "Nedá sa serializovať správa: " -#: gio/gdbusmessage.c:2799 +#: gio/gdbusmessage.c:2901 #, c-format msgid "Message body has signature “%s” but there is no signature header" msgstr "Telo správy má označenie „%s“, no neexistuje žiadna hlavička označenia" -#: gio/gdbusmessage.c:2809 +#: gio/gdbusmessage.c:2911 #, c-format msgid "" "Message body has type signature “%s” but signature in the header field is " @@ -963,54 +992,53 @@ msgstr "" "Telo správy má označenie typu „%s“, no označenie v poli hlavičky je „%s“" -#: gio/gdbusmessage.c:2825 +#: gio/gdbusmessage.c:2927 #, c-format msgid "Message body is empty but signature in the header field is “(%s)”" msgstr "Telo správy je prázdne, no označenie v poli hlavičky je „(%s)“" -#: gio/gdbusmessage.c:3380 +#: gio/gdbusmessage.c:3482 #, c-format msgid "Error return with body of type “%s”" msgstr "Chyba pri návrate s telom typu „%s“" -#: gio/gdbusmessage.c:3388 +#: gio/gdbusmessage.c:3490 msgid "Error return with empty body" msgstr "Chyba pri návrate s prázdnym telom" # PM: podľa mňa ked ide o zadanie treba na konci stlačiť enter, nie som si istý či je to tento prípad -#: gio/gdbusprivate.c:2246 +#: gio/gdbusprivate.c:2187 #, c-format msgid "(Type any character to close this window)\n" msgstr "(Toto okno zatvoríte zadaním ľubovolného znaku)\n" -#: gio/gdbusprivate.c:2420 +#: gio/gdbusprivate.c:2373 #, c-format msgid "Session dbus not running, and autolaunch failed" msgstr "Relácia dbus nebeží a automatické spustenie zlyhalo" -#: gio/gdbusprivate.c:2443 +#: gio/gdbusprivate.c:2396 #, c-format msgid "Unable to get Hardware profile: %s" msgstr "Nepodarilo sa získať hardvérový profil: %s" #. Translators: Both placeholders are file paths -#: gio/gdbusprivate.c:2494 +#: gio/gdbusprivate.c:2447 #, c-format -#| msgid "Unable to trash file %s: %s" msgid "Unable to load %s or %s: " -msgstr "Nie je možné načítať %s alebo %s:" +msgstr "Nie je možné načítať %s alebo %s: " -#: gio/gdbusproxy.c:1569 +#: gio/gdbusproxy.c:1568 #, c-format msgid "Error calling StartServiceByName for %s: " msgstr "Chyba pri volaní StartServiceByName pre %s: " -#: gio/gdbusproxy.c:1592 +#: gio/gdbusproxy.c:1591 #, c-format msgid "Unexpected reply %d from StartServiceByName(\"%s\") method" msgstr "Neočakávaná odpoveď %d z metódy StartServiceByName(„%s“)" -#: gio/gdbusproxy.c:2699 gio/gdbusproxy.c:2834 +#: gio/gdbusproxy.c:2702 gio/gdbusproxy.c:2837 #, fuzzy, c-format #| msgid "" #| "Cannot invoke method; proxy is for a well-known name without an owner and " @@ -1022,30 +1050,30 @@ "Nedá sa vyvolať metóda; proxy je pre dobre známy názov bez vlastníka a proxy " "bol vytvorený s príznakom G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START" -#: gio/gdbusserver.c:767 +#: gio/gdbusserver.c:758 msgid "Abstract namespace not supported" msgstr "Abstraktný menný priestor nie je podporovaný" -#: gio/gdbusserver.c:860 +#: gio/gdbusserver.c:850 msgid "Cannot specify nonce file when creating a server" msgstr "Pri vytváraní servera sa nedá zadať nonce súbor" -#: gio/gdbusserver.c:942 +#: gio/gdbusserver.c:932 #, c-format msgid "Error writing nonce file at “%s”: %s" msgstr "Chyba pri zápise do nonce súboru na „%s“: %s" -#: gio/gdbusserver.c:1117 +#: gio/gdbusserver.c:1107 #, c-format msgid "The string “%s” is not a valid D-Bus GUID" msgstr "Reťazec „%s“ nie je platný D-Bus GUID" -#: gio/gdbusserver.c:1157 +#: gio/gdbusserver.c:1145 #, c-format msgid "Cannot listen on unsupported transport “%s”" msgstr "Nedá sa počúvať na nepodporovanom transporte „%s“" -#: gio/gdbus-tool.c:111 +#: gio/gdbus-tool.c:113 #, c-format msgid "" "Commands:\n" @@ -1070,67 +1098,67 @@ "\n" "Pomocníka pre každý z príkazov získate zadaním „%s PRÍKAZ --help“.\n" -#: gio/gdbus-tool.c:201 gio/gdbus-tool.c:273 gio/gdbus-tool.c:345 -#: gio/gdbus-tool.c:369 gio/gdbus-tool.c:859 gio/gdbus-tool.c:1236 -#: gio/gdbus-tool.c:1724 +#: gio/gdbus-tool.c:204 gio/gdbus-tool.c:276 gio/gdbus-tool.c:347 +#: gio/gdbus-tool.c:371 gio/gdbus-tool.c:861 gio/gdbus-tool.c:1246 +#: gio/gdbus-tool.c:1733 #, c-format msgid "Error: %s\n" msgstr "Chyba: %s\n" -#: gio/gdbus-tool.c:212 gio/gdbus-tool.c:286 gio/gdbus-tool.c:1740 +#: gio/gdbus-tool.c:215 gio/gdbus-tool.c:289 gio/gdbus-tool.c:1749 #, c-format msgid "Error parsing introspection XML: %s\n" msgstr "Chyba pri analýze XML vútorného preskúmania: %s\n" -#: gio/gdbus-tool.c:250 +#: gio/gdbus-tool.c:253 #, c-format msgid "Error: %s is not a valid name\n" msgstr "Chyba: %s nie je platný názov\n" -#: gio/gdbus-tool.c:255 gio/gdbus-tool.c:745 gio/gdbus-tool.c:1060 -#: gio/gdbus-tool.c:1890 gio/gdbus-tool.c:2130 +#: gio/gdbus-tool.c:258 gio/gdbus-tool.c:747 gio/gdbus-tool.c:1065 +#: gio/gdbus-tool.c:1899 gio/gdbus-tool.c:2139 #, c-format msgid "Error: %s is not a valid object path\n" msgstr "Chyba: %s nie platná cesta objektu\n" -#: gio/gdbus-tool.c:403 +#: gio/gdbus-tool.c:405 msgid "Connect to the system bus" msgstr "Pripojiť k systémovej zbernici" -#: gio/gdbus-tool.c:404 +#: gio/gdbus-tool.c:406 msgid "Connect to the session bus" msgstr "Pripojiť k relačnej zbernici" -#: gio/gdbus-tool.c:405 +#: gio/gdbus-tool.c:407 msgid "Connect to given D-Bus address" msgstr "Pripojiť k danej adrese zbernice D-Bus" -#: gio/gdbus-tool.c:415 +#: gio/gdbus-tool.c:417 msgid "Connection Endpoint Options:" msgstr "Voľby koncového bodu pripojenia:" -#: gio/gdbus-tool.c:416 +#: gio/gdbus-tool.c:418 msgid "Options specifying the connection endpoint" msgstr "Voľby určujúce koncový bod pripojenia" -#: gio/gdbus-tool.c:439 +#: gio/gdbus-tool.c:441 #, c-format msgid "No connection endpoint specified" msgstr "Neurčený žiadny koncový bod pripojenia" -#: gio/gdbus-tool.c:449 +#: gio/gdbus-tool.c:451 #, c-format msgid "Multiple connection endpoints specified" msgstr "Určených viacero koncových bodov pripojenia" -#: gio/gdbus-tool.c:522 +#: gio/gdbus-tool.c:524 #, c-format msgid "" "Warning: According to introspection data, interface “%s” does not exist\n" msgstr "" "Upozornenie: Podľa údajov vnútorného preskúmania rozhranie „%s“ neexistuje\n" -#: gio/gdbus-tool.c:531 +#: gio/gdbus-tool.c:533 #, c-format msgid "" "Warning: According to introspection data, method “%s” does not exist on " @@ -1139,163 +1167,169 @@ "Upozornenie: Podľa údajov vnútorného preskúmania metóda „%s“ neexistuje na " "rozhraní „%s“\n" -#: gio/gdbus-tool.c:593 +#: gio/gdbus-tool.c:595 msgid "Optional destination for signal (unique name)" msgstr "Voliteľný cieľ pre signál (jedinečný názov)" -#: gio/gdbus-tool.c:594 +#: gio/gdbus-tool.c:596 msgid "Object path to emit signal on" msgstr "Cesta objektu, ktorému vyslať signál" -#: gio/gdbus-tool.c:595 +#: gio/gdbus-tool.c:597 msgid "Signal and interface name" msgstr "Názov signálu a rozhrania" -#: gio/gdbus-tool.c:628 +#: gio/gdbus-tool.c:630 msgid "Emit a signal." msgstr "Vyslať signál." -#: gio/gdbus-tool.c:683 gio/gdbus-tool.c:997 gio/gdbus-tool.c:1827 -#: gio/gdbus-tool.c:2059 gio/gdbus-tool.c:2279 +#: gio/gdbus-tool.c:685 gio/gdbus-tool.c:1002 gio/gdbus-tool.c:1836 +#: gio/gdbus-tool.c:2068 gio/gdbus-tool.c:2288 #, c-format msgid "Error connecting: %s\n" msgstr "Chyba pri pripájaní: %s\n" -#: gio/gdbus-tool.c:703 +#: gio/gdbus-tool.c:705 #, c-format msgid "Error: %s is not a valid unique bus name.\n" msgstr "Chyba: %s nie je platný jedinečný názov zbernice.\n" -#: gio/gdbus-tool.c:722 gio/gdbus-tool.c:1040 gio/gdbus-tool.c:1870 +#: gio/gdbus-tool.c:724 gio/gdbus-tool.c:1045 gio/gdbus-tool.c:1879 msgid "Error: Object path is not specified\n" msgstr "Chyba: Cesta objektu nie je určená\n" -#: gio/gdbus-tool.c:765 +#: gio/gdbus-tool.c:767 msgid "Error: Signal name is not specified\n" msgstr "Chyba: Názov signálu nie je určený\n" -#: gio/gdbus-tool.c:779 +#: gio/gdbus-tool.c:781 #, c-format msgid "Error: Signal name “%s” is invalid\n" msgstr "Chyba: Názov signálu „%s“ nie je platný\n" -#: gio/gdbus-tool.c:791 +#: gio/gdbus-tool.c:793 #, c-format msgid "Error: %s is not a valid interface name\n" msgstr "Chyba: %s nie je platný názov rozhrania\n" -#: gio/gdbus-tool.c:797 +#: gio/gdbus-tool.c:799 #, c-format msgid "Error: %s is not a valid member name\n" msgstr "Chyba: %s nie je platný názov člena objektu\n" #. Use the original non-"parse-me-harder" error -#: gio/gdbus-tool.c:834 gio/gdbus-tool.c:1172 +#: gio/gdbus-tool.c:836 gio/gdbus-tool.c:1177 #, c-format msgid "Error parsing parameter %d: %s\n" msgstr "Chyba pri spracovaní parametra %d: %s\n" -#: gio/gdbus-tool.c:866 +#: gio/gdbus-tool.c:868 #, c-format msgid "Error flushing connection: %s\n" msgstr "Chyba pri vyprázdnení pripojenia: %s\n" -#: gio/gdbus-tool.c:893 +#: gio/gdbus-tool.c:896 msgid "Destination name to invoke method on" msgstr "Názov cieľa, na ktorom sa má zavolať metóda" # PK: Nazov ciela, na ktorom zavolat metodu -#: gio/gdbus-tool.c:894 +#: gio/gdbus-tool.c:897 msgid "Object path to invoke method on" msgstr "Cesta objektu na zavolanie metódy" -#: gio/gdbus-tool.c:895 +#: gio/gdbus-tool.c:898 msgid "Method and interface name" msgstr "Názov metódy a rozhrania" -#: gio/gdbus-tool.c:896 +#: gio/gdbus-tool.c:899 msgid "Timeout in seconds" msgstr "Časový limit v sekundách" -#: gio/gdbus-tool.c:942 +#: gio/gdbus-tool.c:900 +#, fuzzy +#| msgid "Show information about locations" +msgid "Allow interactive authorization" +msgstr "Zobrazí informácie o umiestneniach" + +#: gio/gdbus-tool.c:947 msgid "Invoke a method on a remote object." msgstr "Zavolať metódu na vzdialenom objekte." -#: gio/gdbus-tool.c:1014 gio/gdbus-tool.c:1844 gio/gdbus-tool.c:2084 +#: gio/gdbus-tool.c:1019 gio/gdbus-tool.c:1853 gio/gdbus-tool.c:2093 msgid "Error: Destination is not specified\n" msgstr "Chyba: Cieľ nie je určený\n" -#: gio/gdbus-tool.c:1025 gio/gdbus-tool.c:1861 gio/gdbus-tool.c:2095 +#: gio/gdbus-tool.c:1030 gio/gdbus-tool.c:1870 gio/gdbus-tool.c:2104 #, c-format msgid "Error: %s is not a valid bus name\n" msgstr "Chyba: %s nie je platný názov zbernice\n" -#: gio/gdbus-tool.c:1075 +#: gio/gdbus-tool.c:1080 msgid "Error: Method name is not specified\n" msgstr "Chyba: Názov metódy nie je určený\n" -#: gio/gdbus-tool.c:1086 +#: gio/gdbus-tool.c:1091 #, c-format msgid "Error: Method name “%s” is invalid\n" msgstr "Chyba: Názov metódy „%s“ nie je platný\n" -#: gio/gdbus-tool.c:1164 +#: gio/gdbus-tool.c:1169 #, c-format msgid "Error parsing parameter %d of type “%s”: %s\n" msgstr "Chyba pri spracovaní parametra %d typu „%s“: %s\n" # PŠ: file handle (win32) je ekvivalent file descriptor - dovolil som si to preložiť rovnako. Keďže používané manipulátor, alebo rukoväť sú oba zlé preklady (obsluha je handler)... A dokonca aj v slovenskom preklade Správcu úloh vo win je použitý popisovač. -#: gio/gdbus-tool.c:1190 -#, fuzzy, c-format +#: gio/gdbus-tool.c:1195 +#, c-format #| msgid "Error reading from handle: %s" msgid "Error adding handle %d: %s\n" -msgstr "Chyba pri čítaní z popisovača: %s" +msgstr "Chyba počas pridávania popisovača %d: %s\n" -#: gio/gdbus-tool.c:1686 +#: gio/gdbus-tool.c:1695 msgid "Destination name to introspect" msgstr "Názov cieľa na vnútorné preskúmanie" -#: gio/gdbus-tool.c:1687 +#: gio/gdbus-tool.c:1696 msgid "Object path to introspect" msgstr "Cesta objektu na vnútorné preskúmanie" -#: gio/gdbus-tool.c:1688 +#: gio/gdbus-tool.c:1697 msgid "Print XML" msgstr "Vypísať XML" -#: gio/gdbus-tool.c:1689 +#: gio/gdbus-tool.c:1698 msgid "Introspect children" msgstr "Vnútorne preskúmať potomka" -#: gio/gdbus-tool.c:1690 +#: gio/gdbus-tool.c:1699 msgid "Only print properties" msgstr "Iba vypísať vlastnosti" -#: gio/gdbus-tool.c:1779 +#: gio/gdbus-tool.c:1788 msgid "Introspect a remote object." msgstr "Vnútorne preskúmať vzdialený objekt." -#: gio/gdbus-tool.c:1985 +#: gio/gdbus-tool.c:1994 msgid "Destination name to monitor" msgstr "Názov cieľa na sledovanie" -#: gio/gdbus-tool.c:1986 +#: gio/gdbus-tool.c:1995 msgid "Object path to monitor" msgstr "Cesta objektu na sledovanie" -#: gio/gdbus-tool.c:2011 +#: gio/gdbus-tool.c:2020 msgid "Monitor a remote object." msgstr "Sledovať vzdialený objekt." -#: gio/gdbus-tool.c:2069 +#: gio/gdbus-tool.c:2078 msgid "Error: can’t monitor a non-message-bus connection\n" msgstr "" -#: gio/gdbus-tool.c:2193 +#: gio/gdbus-tool.c:2202 msgid "Service to activate before waiting for the other one (well-known name)" msgstr "Služba, ktorá sa má aktivovať pred čakaním na inú (so známym menom)" -#: gio/gdbus-tool.c:2196 +#: gio/gdbus-tool.c:2205 msgid "" "Timeout to wait for before exiting with an error (seconds); 0 for no timeout " "(default)" @@ -1303,126 +1337,136 @@ "Časový limit (v sekundách) pre čakanie, po uplynutí ktorého sa ukončí " "chybou; 0 bez limitu (predvolené)" -#: gio/gdbus-tool.c:2244 +#: gio/gdbus-tool.c:2253 msgid "OPTION… BUS-NAME" msgstr "VOĽBA… NÁZOV_ZBERNICE" -#: gio/gdbus-tool.c:2245 +#: gio/gdbus-tool.c:2254 msgid "Wait for a bus name to appear." msgstr "Čakať na zjavenie názvu zbernice." -#: gio/gdbus-tool.c:2321 +#: gio/gdbus-tool.c:2330 msgid "Error: A service to activate for must be specified.\n" msgstr "Chyba: Musí byť určená služba, ktorá sa má aktivovať.\n" -#: gio/gdbus-tool.c:2326 +#: gio/gdbus-tool.c:2335 msgid "Error: A service to wait for must be specified.\n" msgstr "Chyba: Musí byť určená služba, na ktorú sa má čakať.\n" -#: gio/gdbus-tool.c:2331 +#: gio/gdbus-tool.c:2340 msgid "Error: Too many arguments.\n" msgstr "Chyba: Príliš veľa parametrov.\n" -#: gio/gdbus-tool.c:2339 gio/gdbus-tool.c:2346 +#: gio/gdbus-tool.c:2348 gio/gdbus-tool.c:2355 #, c-format msgid "Error: %s is not a valid well-known bus name.\n" msgstr "Chyba: %s nie je platný známy názov zbernice.\n" -#: gio/gdesktopappinfo.c:2106 gio/gdesktopappinfo.c:4932 +#: gio/gdebugcontrollerdbus.c:361 +#, c-format +msgid "Not authorized to change debug settings" +msgstr "" + +#: gio/gdesktopappinfo.c:2242 gio/gdesktopappinfo.c:5226 msgid "Unnamed" msgstr "Bez názvu" -#: gio/gdesktopappinfo.c:2516 +#: gio/gdesktopappinfo.c:2652 msgid "Desktop file didn’t specify Exec field" msgstr "V súbore desktop nie je určené pole Exec" -#: gio/gdesktopappinfo.c:2801 +#: gio/gdesktopappinfo.c:2942 msgid "Unable to find terminal required for application" msgstr "Nepodarilo sa nájsť terminál vyžadovaný pre aplikáciu" -#: gio/gdesktopappinfo.c:3452 +#: gio/gdesktopappinfo.c:3002 +#, c-format +msgid "Program ‘%s’ not found in $PATH" +msgstr "" + +#: gio/gdesktopappinfo.c:3738 #, c-format msgid "Can’t create user application configuration folder %s: %s" msgstr "Nedá sa vytvoriť používateľský konfiguračný priečinok aplikácie %s: %s" -#: gio/gdesktopappinfo.c:3456 +#: gio/gdesktopappinfo.c:3742 #, c-format msgid "Can’t create user MIME configuration folder %s: %s" msgstr "Nedá sa vytvoriť používateľský konfiguračný priečinok MIME %s: %s" -#: gio/gdesktopappinfo.c:3698 gio/gdesktopappinfo.c:3722 +#: gio/gdesktopappinfo.c:3984 gio/gdesktopappinfo.c:4008 msgid "Application information lacks an identifier" msgstr "V informáciách o aplikácii chýba identifikátor" -#: gio/gdesktopappinfo.c:3958 +#: gio/gdesktopappinfo.c:4244 #, c-format msgid "Can’t create user desktop file %s" msgstr "Nedá sa vytvoriť používateľský desktop súbor %s" -#: gio/gdesktopappinfo.c:4094 +#: gio/gdesktopappinfo.c:4380 #, c-format msgid "Custom definition for %s" msgstr "Vlastná definícia pre %s" -#: gio/gdrive.c:417 +#: gio/gdrive.c:419 msgid "drive doesn’t implement eject" msgstr "mechanika neimplementuje vysúvanie" #. Translators: This is an error #. * message for drive objects that #. * don't implement any of eject or eject_with_operation. -#: gio/gdrive.c:495 +#: gio/gdrive.c:497 msgid "drive doesn’t implement eject or eject_with_operation" msgstr "" "mechanika neimplementuje eject (vysunutie) ani eject_with_operation " "(vysunutie s operáciou)" -#: gio/gdrive.c:571 +#: gio/gdrive.c:573 msgid "drive doesn’t implement polling for media" msgstr "mechanika neimplementuje dotazovanie na vložené médium" -#: gio/gdrive.c:778 +#: gio/gdrive.c:780 msgid "drive doesn’t implement start" msgstr "mechanika neimplementuje spustenie" -#: gio/gdrive.c:880 +#: gio/gdrive.c:882 msgid "drive doesn’t implement stop" msgstr "mechanika neimplementuje zastavenie" -#: gio/gdtlsconnection.c:1153 gio/gtlsconnection.c:920 +#: gio/gdtlsconnection.c:1188 gio/gtlsconnection.c:957 msgid "TLS backend does not implement TLS binding retrieval" msgstr "" -#: gio/gdummytlsbackend.c:195 gio/gdummytlsbackend.c:321 -#: gio/gdummytlsbackend.c:513 +#: gio/gdummytlsbackend.c:197 gio/gdummytlsbackend.c:323 +#: gio/gdummytlsbackend.c:515 msgid "TLS support is not available" msgstr "Podpora TLS nie je dostupná" -#: gio/gdummytlsbackend.c:423 +#: gio/gdummytlsbackend.c:425 msgid "DTLS support is not available" msgstr "Podpora DTLS nie je dostupná" -#: gio/gemblem.c:323 +#: gio/gemblem.c:325 #, c-format msgid "Can’t handle version %d of GEmblem encoding" msgstr "Nedá sa spracovať kódovanie GEmblem verzie %d" -#: gio/gemblem.c:333 +#: gio/gemblem.c:335 #, c-format msgid "Malformed number of tokens (%d) in GEmblem encoding" msgstr "Chybný počet tokenov (%d) v kódovaní GEmblem" -#: gio/gemblemedicon.c:362 +#: gio/gemblemedicon.c:364 #, c-format msgid "Can’t handle version %d of GEmblemedIcon encoding" msgstr "Nedá sa spracovať kódovanie GEmblemedIcon verzie %d" -#: gio/gemblemedicon.c:372 +#: gio/gemblemedicon.c:374 #, c-format msgid "Malformed number of tokens (%d) in GEmblemedIcon encoding" msgstr "Chybný počet tokenov (%d) v kódovaní GEmblemedIcon" -#: gio/gemblemedicon.c:395 +#: gio/gemblemedicon.c:397 msgid "Expected a GEmblem for GEmblemedIcon" msgstr "Očakávaný GEmblem pre GEmblemedIcon" @@ -1430,200 +1474,204 @@ #. * trying to find the enclosing (user visible) #. * mount of a file, but none exists. #. -#: gio/gfile.c:1561 +#: gio/gfile.c:1594 msgid "Containing mount does not exist" msgstr "Obklopujúce pripojenie neexistuje" -#: gio/gfile.c:2608 gio/glocalfile.c:2477 +#: gio/gfile.c:2641 gio/glocalfile.c:2515 msgid "Can’t copy over directory" msgstr "Nedá sa prepísať adresár pri kopírovaní" -#: gio/gfile.c:2668 +#: gio/gfile.c:2701 msgid "Can’t copy directory over directory" msgstr "Nedá sa prepísať adresár adresárom pri kopírovaní" -#: gio/gfile.c:2676 +#: gio/gfile.c:2709 msgid "Target file exists" msgstr "Cieľový súbor existuje" -#: gio/gfile.c:2695 +#: gio/gfile.c:2728 msgid "Can’t recursively copy directory" msgstr "Adresár sa nedá kopírovať rekurzívne" -#: gio/gfile.c:2996 +#: gio/gfile.c:3029 msgid "Splice not supported" msgstr "Operácia zreťazovania vstupu s výstupom nie je podporovaná" # http://developer.gnome.org/gio/2.32/GOutputStream.html#g-output-stream-splice -#: gio/gfile.c:3000 +#: gio/gfile.c:3033 #, c-format msgid "Error splicing file: %s" msgstr "Chyba pri zreťazovaní súboru: %s" -#: gio/gfile.c:3152 +#: gio/gfile.c:3195 msgid "Copy (reflink/clone) between mounts is not supported" msgstr "Kopírovanie (odkaz/klon) medzi pripojeniami nie je podporované" -#: gio/gfile.c:3156 +#: gio/gfile.c:3199 msgid "Copy (reflink/clone) is not supported or invalid" msgstr "" "Kopírovanie (odkaz/klon) medzi pripojeniami nie je podporované alebo je " "neplatné" -#: gio/gfile.c:3161 +#: gio/gfile.c:3204 msgid "Copy (reflink/clone) is not supported or didn’t work" msgstr "" "Kopírovanie (odkaz/klon) medzi pripojeniami nie je podporované alebo " "nefunguje" -#: gio/gfile.c:3226 +#: gio/gfile.c:3269 msgid "Can’t copy special file" msgstr "Špeciálny súbor sa nedá kopírovať" -#: gio/gfile.c:4035 +#: gio/gfile.c:4163 msgid "Invalid symlink value given" msgstr "Neplatný daný symbolický odkaz" -#: gio/gfile.c:4045 glib/gfileutils.c:2354 +#: gio/gfile.c:4173 glib/gfileutils.c:2392 msgid "Symbolic links not supported" msgstr "Symbolické odkazy nie sú podporované" -#: gio/gfile.c:4213 +#: gio/gfile.c:4460 msgid "Trash not supported" msgstr "Zahodenie do Koša nie je podporované" # literal character -#: gio/gfile.c:4325 +#: gio/gfile.c:4572 #, c-format msgid "File names cannot contain “%c”" msgstr "Názvy súborov nemôžu obsahovať „%c“" -#: gio/gfile.c:6806 gio/gvolume.c:364 +#: gio/gfile.c:7003 gio/gfile.c:7129 +#, fuzzy, c-format +#| msgid "Failed to change to directory “%s” (%s)" +msgid "Failed to create a temporary directory for template “%s”: %s" +msgstr "Zlyhala zmena adresára na „%s“ (%s)" + +#: gio/gfile.c:7418 gio/gvolume.c:366 msgid "volume doesn’t implement mount" msgstr "zväzok neimplementuje pripojenie" -#: gio/gfile.c:6920 gio/gfile.c:6968 +#: gio/gfile.c:7532 gio/gfile.c:7609 msgid "No application is registered as handling this file" msgstr "Žiadna aplikácia nie je zaregistrovaná na spracovanie tohto súboru" # PK: vymenovavac hodnot, suborov # PM: som za zachovanie aktuálneho preklad, iterátor tiež nejako zvlášť neprekladáme -#: gio/gfileenumerator.c:212 +#: gio/gfileenumerator.c:214 msgid "Enumerator is closed" msgstr "Enumerátor je uzatvorený" -#: gio/gfileenumerator.c:219 gio/gfileenumerator.c:278 -#: gio/gfileenumerator.c:377 gio/gfileenumerator.c:476 +#: gio/gfileenumerator.c:221 gio/gfileenumerator.c:280 +#: gio/gfileenumerator.c:424 gio/gfileenumerator.c:523 msgid "File enumerator has outstanding operation" msgstr "Enumerátor súborov má nevykonanú operáciu" -#: gio/gfileenumerator.c:368 gio/gfileenumerator.c:467 +#: gio/gfileenumerator.c:415 gio/gfileenumerator.c:514 msgid "File enumerator is already closed" msgstr "Enumerátor súborov je už uzatvorený" -#: gio/gfileicon.c:250 +#: gio/gfileicon.c:252 #, c-format msgid "Can’t handle version %d of GFileIcon encoding" msgstr "Nedá sa spracovať kódovanie GFileIcon verzie %d" -#: gio/gfileicon.c:260 +#: gio/gfileicon.c:262 msgid "Malformed input data for GFileIcon" msgstr "Zle formátované vstupné údaje pre GFileIcon" -#: gio/gfileinputstream.c:149 gio/gfileinputstream.c:394 -#: gio/gfileiostream.c:167 gio/gfileoutputstream.c:164 -#: gio/gfileoutputstream.c:497 +#: gio/gfileinputstream.c:151 gio/gfileinputstream.c:396 +#: gio/gfileiostream.c:169 gio/gfileoutputstream.c:166 +#: gio/gfileoutputstream.c:499 msgid "Stream doesn’t support query_info" msgstr "Prúd nepodporuje query_info" -#: gio/gfileinputstream.c:325 gio/gfileiostream.c:379 -#: gio/gfileoutputstream.c:371 +#: gio/gfileinputstream.c:327 gio/gfileiostream.c:381 +#: gio/gfileoutputstream.c:373 msgid "Seek not supported on stream" msgstr "Presúvanie v prúde nie je podporované" -#: gio/gfileinputstream.c:369 +#: gio/gfileinputstream.c:371 msgid "Truncate not allowed on input stream" msgstr "Skrátenie vo vstupnom prúde nie je podporované" -#: gio/gfileiostream.c:455 gio/gfileoutputstream.c:447 +#: gio/gfileiostream.c:457 gio/gfileoutputstream.c:449 msgid "Truncate not supported on stream" msgstr "Skrátenie nie je v prúde podporované" -#: gio/ghttpproxy.c:91 gio/gresolver.c:443 gio/gresolver.c:596 -#: glib/gconvert.c:1825 +#: gio/ghttpproxy.c:93 gio/gresolver.c:460 gio/gresolver.c:613 +#: glib/gconvert.c:1829 msgid "Invalid hostname" msgstr "Neplatný názov hostiteľa" -#: gio/ghttpproxy.c:143 +#: gio/ghttpproxy.c:145 msgid "Bad HTTP proxy reply" msgstr "Nesprávna odpoveď sprostredkovateľa HTTP" -#: gio/ghttpproxy.c:159 +#: gio/ghttpproxy.c:161 msgid "HTTP proxy connection not allowed" msgstr "Pripojenie k sprostredkovateľovi HTTP nie je umožnené" -#: gio/ghttpproxy.c:164 +#: gio/ghttpproxy.c:166 msgid "HTTP proxy authentication failed" msgstr "Zlyhalo overenie totožnosti sprostredkovateľa HTTP" -#: gio/ghttpproxy.c:167 +#: gio/ghttpproxy.c:169 msgid "HTTP proxy authentication required" msgstr "Vyžaduje sa overenie totožnosti sprostredkovateľa HTTP" -#: gio/ghttpproxy.c:171 +#: gio/ghttpproxy.c:173 #, c-format msgid "HTTP proxy connection failed: %i" msgstr "Pripojenie k sprostredkovateľovi HTTP zlyhalo: %i" -#: gio/ghttpproxy.c:266 -#, fuzzy -#| msgid "HTTP proxy connection failed: %i" +#: gio/ghttpproxy.c:268 msgid "HTTP proxy response too big" -msgstr "Pripojenie k sprostredkovateľovi HTTP zlyhalo: %i" +msgstr "Odpoveď od sprostredkovateľa HTTP je príliš veľká" -#: gio/ghttpproxy.c:283 +#: gio/ghttpproxy.c:285 msgid "HTTP proxy server closed connection unexpectedly." msgstr "Server sprostredkovateľa HTTP neočakávane prerušil pripojenie." -#: gio/gicon.c:298 +#: gio/gicon.c:299 #, c-format msgid "Wrong number of tokens (%d)" msgstr "Nesprávny počet tokenov (%d)" -#: gio/gicon.c:318 +#: gio/gicon.c:319 #, c-format msgid "No type for class name %s" msgstr "Názov triedy %s nemá typ" -#: gio/gicon.c:328 +#: gio/gicon.c:329 #, c-format msgid "Type %s does not implement the GIcon interface" msgstr "Typ %s neimplementuje rozhranie GIcon" -#: gio/gicon.c:339 +#: gio/gicon.c:340 #, c-format msgid "Type %s is not classed" msgstr "Typ %s nemá triedu" -#: gio/gicon.c:353 +#: gio/gicon.c:354 #, c-format msgid "Malformed version number: %s" msgstr "Zlé číslo verzie: %s" -#: gio/gicon.c:367 +#: gio/gicon.c:368 #, c-format msgid "Type %s does not implement from_tokens() on the GIcon interface" msgstr "Typ %s neimplementuje from_tokens() na rozhraní GIcon" -#: gio/gicon.c:469 +#: gio/gicon.c:470 msgid "Can’t handle the supplied version of the icon encoding" msgstr "Nedá sa spracovať poskytnutá verzia kódovania ikon" -#: gio/ginetaddressmask.c:182 +#: gio/ginetaddressmask.c:184 msgid "No address specified" msgstr "Nebola zadaná žiadna adresa" -#: gio/ginetaddressmask.c:190 +#: gio/ginetaddressmask.c:192 #, c-format msgid "Length %u is too long for address" msgstr "Dĺžka %u je pre adresu príliš krátka" @@ -1633,25 +1681,25 @@ # PM: Predpona adresy sa mi zdá úplne zrozumiteľná, skôr som myslel či nepoužiť preklad ako napr. bity adresy presahujú sa hranicu stanovenú pre predponu adresy # MČ: Skôr tento druhý reťazec, „dĺžka predpony“ by bola osobne pre mňa šialene nepochopiteľná, keby som nemal k dispozícii anglický originál. # PK: to necham slovensky, lebo pre mna to je spanielska dedina -#: gio/ginetaddressmask.c:223 +#: gio/ginetaddressmask.c:225 msgid "Address has bits set beyond prefix length" msgstr "Adresa má bity nastavené za dĺžkou predpony" -#: gio/ginetaddressmask.c:300 +#: gio/ginetaddressmask.c:302 #, c-format msgid "Could not parse “%s” as IP address mask" msgstr "Nepodarilo sa analyzovať „%s“ ako masku adresy IP" -#: gio/ginetsocketaddress.c:203 gio/ginetsocketaddress.c:220 -#: gio/gnativesocketaddress.c:109 gio/gunixsocketaddress.c:221 +#: gio/ginetsocketaddress.c:205 gio/ginetsocketaddress.c:222 +#: gio/gnativesocketaddress.c:111 gio/gunixsocketaddress.c:230 msgid "Not enough space for socket address" msgstr "Nie je dostatok miesta pre adresu soketu" -#: gio/ginetsocketaddress.c:235 +#: gio/ginetsocketaddress.c:237 msgid "Unsupported socket address" msgstr "Nepodporovaná adresa soketu" -#: gio/ginputstream.c:188 +#: gio/ginputstream.c:190 msgid "Input stream doesn’t implement read" msgstr "Vstupný prúd neimplementuje čítanie" @@ -1661,129 +1709,129 @@ #. Translators: This is an error you get if there is #. * already an operation running against this stream when #. * you try to start one -#: gio/ginputstream.c:1249 gio/giostream.c:310 gio/goutputstream.c:2208 +#: gio/ginputstream.c:1251 gio/giostream.c:312 gio/goutputstream.c:2210 msgid "Stream has outstanding operation" msgstr "Prúd má nevykonanú operáciu" -#: gio/gio-tool.c:160 +#: gio/gio-tool.c:162 msgid "Copy with file" msgstr "Skopíruje so súborom" -#: gio/gio-tool.c:164 +#: gio/gio-tool.c:166 msgid "Keep with file when moved" msgstr "Ponechá so súborom pri presunutí" -#: gio/gio-tool.c:205 +#: gio/gio-tool.c:207 msgid "“version” takes no arguments" msgstr "Voľba „version“ neprijíma žiadne parametre" -#: gio/gio-tool.c:207 gio/gio-tool.c:223 glib/goption.c:869 +#: gio/gio-tool.c:209 gio/gio-tool.c:225 glib/goption.c:871 msgid "Usage:" msgstr "Použitie:" # MČ: „Vypíše …“, podobne ako nasledujúce reťazce. -#: gio/gio-tool.c:210 +#: gio/gio-tool.c:212 msgid "Print version information and exit." msgstr "Vypíše informácie o verzii a skončí." -#: gio/gio-tool.c:226 +#: gio/gio-tool.c:228 msgid "Commands:" msgstr "Príkazy:" -#: gio/gio-tool.c:229 +#: gio/gio-tool.c:231 msgid "Concatenate files to standard output" msgstr "Spojí súbory na štandardný výstup" -#: gio/gio-tool.c:230 +#: gio/gio-tool.c:232 msgid "Copy one or more files" msgstr "Skopíruje jeden alebo viac súborov" -#: gio/gio-tool.c:231 +#: gio/gio-tool.c:233 msgid "Show information about locations" msgstr "Zobrazí informácie o umiestneniach" -#: gio/gio-tool.c:232 +#: gio/gio-tool.c:234 #, fuzzy #| msgid "List static actions for an application (from .desktop file)" msgid "Launch an application from a desktop file" msgstr "Vypíše zoznam statických akcií pre aplikáciu (zo súboru typu .desktop)" -#: gio/gio-tool.c:233 +#: gio/gio-tool.c:235 msgid "List the contents of locations" msgstr "Vypíše obsah umiestnení" -#: gio/gio-tool.c:234 +#: gio/gio-tool.c:236 msgid "Get or set the handler for a mimetype" msgstr "Získa alebo nastaví obslužný program pre typ MIME" -#: gio/gio-tool.c:235 +#: gio/gio-tool.c:237 msgid "Create directories" msgstr "Vytvorí adresáre" -#: gio/gio-tool.c:236 +#: gio/gio-tool.c:238 msgid "Monitor files and directories for changes" msgstr "Sleduje zmeny súborov a adresárov" -#: gio/gio-tool.c:237 +#: gio/gio-tool.c:239 msgid "Mount or unmount the locations" msgstr "Pripojí alebo odpojí umiestnenia" -#: gio/gio-tool.c:238 +#: gio/gio-tool.c:240 msgid "Move one or more files" msgstr "Presunie jeden alebo viac súborov" -#: gio/gio-tool.c:239 +#: gio/gio-tool.c:241 msgid "Open files with the default application" msgstr "Otvorí súbory predvolenou aplikáciou" -#: gio/gio-tool.c:240 +#: gio/gio-tool.c:242 msgid "Rename a file" msgstr "Premenuje súbor" -#: gio/gio-tool.c:241 +#: gio/gio-tool.c:243 msgid "Delete one or more files" msgstr "Odstráni jeden alebo viac súborov" -#: gio/gio-tool.c:242 +#: gio/gio-tool.c:244 msgid "Read from standard input and save" msgstr "Číta z predvoleného vstupu a ukladá" -#: gio/gio-tool.c:243 +#: gio/gio-tool.c:245 msgid "Set a file attribute" msgstr "Nastaví atribút súboru" -#: gio/gio-tool.c:244 +#: gio/gio-tool.c:246 msgid "Move files or directories to the trash" msgstr "Presunie súbory alebo adresáre do Koša" -#: gio/gio-tool.c:245 +#: gio/gio-tool.c:247 msgid "Lists the contents of locations in a tree" msgstr "Vypíše obsah umiestnení v stromovom zobrazení" -#: gio/gio-tool.c:247 +#: gio/gio-tool.c:249 #, c-format msgid "Use %s to get detailed help.\n" msgstr "Na získanie podrobnejšieho pomocníka, použite %s.\n" -#: gio/gio-tool-cat.c:87 +#: gio/gio-tool-cat.c:89 msgid "Error writing to stdout" msgstr "Chyba pri zápise na štandardný výstup" #. Translators: commandline placeholder -#: gio/gio-tool-cat.c:133 gio/gio-tool-info.c:340 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:204 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:220 gio/gio-tool-tree.c:239 +#: gio/gio-tool-cat.c:135 gio/gio-tool-info.c:382 gio/gio-tool-list.c:176 +#: gio/gio-tool-mkdir.c:50 gio/gio-tool-monitor.c:39 gio/gio-tool-monitor.c:41 +#: gio/gio-tool-monitor.c:43 gio/gio-tool-monitor.c:45 +#: gio/gio-tool-monitor.c:206 gio/gio-tool-mount.c:1210 gio/gio-tool-open.c:72 +#: gio/gio-tool-remove.c:50 gio/gio-tool-rename.c:47 gio/gio-tool-set.c:95 +#: gio/gio-tool-trash.c:222 gio/gio-tool-tree.c:246 msgid "LOCATION" msgstr "UMIESTNENIE" -#: gio/gio-tool-cat.c:138 +#: gio/gio-tool-cat.c:140 msgid "Concatenate files and print to standard output." msgstr "Spojí súbory a vypíše na štandardný výstup." -#: gio/gio-tool-cat.c:140 +#: gio/gio-tool-cat.c:142 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" @@ -1794,60 +1842,60 @@ "použiť niečo ako \n" "smb://server/resource/file.txt ako umiestnenie." -#: gio/gio-tool-cat.c:162 gio/gio-tool-info.c:371 gio/gio-tool-mkdir.c:76 -#: gio/gio-tool-monitor.c:229 gio/gio-tool-mount.c:1250 gio/gio-tool-open.c:96 -#: gio/gio-tool-remove.c:72 gio/gio-tool-trash.c:303 +#: gio/gio-tool-cat.c:164 gio/gio-tool-info.c:413 gio/gio-tool-mkdir.c:78 +#: gio/gio-tool-monitor.c:231 gio/gio-tool-mount.c:1261 gio/gio-tool-open.c:98 +#: gio/gio-tool-remove.c:74 gio/gio-tool-trash.c:303 msgid "No locations given" msgstr "Neposkytnuté žiadne umiestnenia" -#: gio/gio-tool-copy.c:43 gio/gio-tool-move.c:38 +#: gio/gio-tool-copy.c:45 gio/gio-tool-move.c:40 msgid "No target directory" msgstr "Bez cieľového adresára" -#: gio/gio-tool-copy.c:44 gio/gio-tool-move.c:39 +#: gio/gio-tool-copy.c:46 gio/gio-tool-move.c:41 msgid "Show progress" msgstr "Zobrazí priebeh" -#: gio/gio-tool-copy.c:45 gio/gio-tool-move.c:40 +#: gio/gio-tool-copy.c:47 gio/gio-tool-move.c:42 msgid "Prompt before overwrite" msgstr "Pýta sa pred prepísaním" -#: gio/gio-tool-copy.c:46 +#: gio/gio-tool-copy.c:48 msgid "Preserve all attributes" msgstr "Zachová všetky atribúty" -#: gio/gio-tool-copy.c:47 gio/gio-tool-move.c:41 gio/gio-tool-save.c:49 +#: gio/gio-tool-copy.c:49 gio/gio-tool-move.c:43 gio/gio-tool-save.c:51 msgid "Backup existing destination files" msgstr "Zálohuje existujúce cieľové súbory" -#: gio/gio-tool-copy.c:48 +#: gio/gio-tool-copy.c:50 msgid "Never follow symbolic links" msgstr "Nikdy nenasleduje symbolické odkazy" -#: gio/gio-tool-copy.c:49 +#: gio/gio-tool-copy.c:51 msgid "Use default permissions for the destination" msgstr "" -#: gio/gio-tool-copy.c:74 gio/gio-tool-move.c:67 +#: gio/gio-tool-copy.c:76 gio/gio-tool-move.c:69 #, c-format msgid "Transferred %s out of %s (%s/s)" msgstr "Prenesených %s z %s (%s/s)" #. Translators: commandline placeholder -#: gio/gio-tool-copy.c:100 gio/gio-tool-move.c:94 +#: gio/gio-tool-copy.c:102 gio/gio-tool-move.c:96 msgid "SOURCE" msgstr "ZDROJ" #. Translators: commandline placeholder -#: gio/gio-tool-copy.c:100 gio/gio-tool-move.c:94 gio/gio-tool-save.c:160 +#: gio/gio-tool-copy.c:102 gio/gio-tool-move.c:96 gio/gio-tool-save.c:162 msgid "DESTINATION" msgstr "CIEĽ" -#: gio/gio-tool-copy.c:105 +#: gio/gio-tool-copy.c:107 msgid "Copy one or more files from SOURCE to DESTINATION." msgstr "Skopíruje jeden alebo viaceré súbory zo ZDROJA do CIEĽA." -#: gio/gio-tool-copy.c:107 +#: gio/gio-tool-copy.c:109 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" @@ -1859,98 +1907,91 @@ "smb://server/resource/file.txt ako umiestnenie." # %s je cesta -#: gio/gio-tool-copy.c:149 +#: gio/gio-tool-copy.c:151 #, c-format msgid "Destination %s is not a directory" msgstr "Cieľ %s nie je adresárom" -#: gio/gio-tool-copy.c:196 gio/gio-tool-move.c:186 +#: gio/gio-tool-copy.c:198 gio/gio-tool-move.c:188 #, c-format msgid "%s: overwrite “%s”? " msgstr "%s: prepísať „%s“? " -#: gio/gio-tool-info.c:37 +#: gio/gio-tool-info.c:39 msgid "List writable attributes" msgstr "Vypíše zapisovateľné atribúty" -#: gio/gio-tool-info.c:38 +#: gio/gio-tool-info.c:40 msgid "Get file system info" msgstr "Získa informácie o súborovom systéme" -#: gio/gio-tool-info.c:39 gio/gio-tool-list.c:36 +#: gio/gio-tool-info.c:41 gio/gio-tool-list.c:37 msgid "The attributes to get" msgstr "Atribúty, ktoré sa majú získať" -#: gio/gio-tool-info.c:39 gio/gio-tool-list.c:36 +#: gio/gio-tool-info.c:41 gio/gio-tool-list.c:37 msgid "ATTRIBUTES" msgstr "ATRIBÚTY" -#: gio/gio-tool-info.c:40 gio/gio-tool-list.c:39 gio/gio-tool-set.c:34 +#: gio/gio-tool-info.c:42 gio/gio-tool-list.c:40 gio/gio-tool-set.c:37 msgid "Don’t follow symbolic links" msgstr "Nenasleduje symbolické odkazy" -#: gio/gio-tool-info.c:78 +#: gio/gio-tool-info.c:105 msgid "attributes:\n" msgstr "atribúty:\n" -#. Translators: This is a noun and represents and attribute of a file -#: gio/gio-tool-info.c:134 +#: gio/gio-tool-info.c:166 gio/gio-tool-info.c:176 #, c-format msgid "display name: %s\n" msgstr "názov na zobrazenie: %s\n" -#. Translators: This is a noun and represents and attribute of a file -#: gio/gio-tool-info.c:139 -#, c-format -msgid "edit name: %s\n" -msgstr "názov na úpravu: %s\n" - -#: gio/gio-tool-info.c:145 +#: gio/gio-tool-info.c:184 #, c-format msgid "name: %s\n" msgstr "názov: %s\n" -#: gio/gio-tool-info.c:152 +#: gio/gio-tool-info.c:191 #, c-format msgid "type: %s\n" msgstr "typ: %s\n" -#: gio/gio-tool-info.c:158 +#: gio/gio-tool-info.c:197 msgid "size: " msgstr "veľkosť: " -#: gio/gio-tool-info.c:163 +#: gio/gio-tool-info.c:203 msgid "hidden\n" msgstr "skrytý\n" -#: gio/gio-tool-info.c:166 +#: gio/gio-tool-info.c:206 #, c-format msgid "uri: %s\n" msgstr "uri: %s\n" -#: gio/gio-tool-info.c:172 +#: gio/gio-tool-info.c:213 #, c-format msgid "local path: %s\n" msgstr "miestna cesta: %s\n" -#: gio/gio-tool-info.c:205 +#: gio/gio-tool-info.c:247 #, c-format msgid "unix mount: %s%s %s %s %s\n" msgstr "" -#: gio/gio-tool-info.c:286 +#: gio/gio-tool-info.c:328 msgid "Settable attributes:\n" msgstr "Nastaviteľné atribúty:\n" -#: gio/gio-tool-info.c:310 +#: gio/gio-tool-info.c:352 msgid "Writable attribute namespaces:\n" msgstr "Menné priestory zapisovateľného atribútu:\n" -#: gio/gio-tool-info.c:345 +#: gio/gio-tool-info.c:387 msgid "Show information about locations." msgstr "Zobrazí informácie o umiestneniach." -#: gio/gio-tool-info.c:347 +#: gio/gio-tool-info.c:389 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" @@ -1967,69 +2008,65 @@ "vlastnosti" #. Translators: commandline placeholder -#: gio/gio-tool-launch.c:54 +#: gio/gio-tool-launch.c:56 msgid "DESKTOP-FILE FILE-ARG …" msgstr "" -#: gio/gio-tool-launch.c:57 +#: gio/gio-tool-launch.c:59 msgid "" "Launch an application from a desktop file, passing optional filename " "arguments to it." msgstr "" -#: gio/gio-tool-launch.c:77 +#: gio/gio-tool-launch.c:79 #, fuzzy #| msgid "No files given" msgid "No desktop file given" msgstr "Neposkytnuté žiadne súbory" -#: gio/gio-tool-launch.c:85 -#, fuzzy -#| msgid "There is no GCredentials support for your platform" +#: gio/gio-tool-launch.c:87 msgid "The launch command is not currently supported on this platform" -msgstr "Neexistuje podpora GCredentials pre vašu platformu" +msgstr "Príkaz spustenia nie je momentálne podporovaný na tejto platforme" -#: gio/gio-tool-launch.c:98 -#, fuzzy, c-format -#| msgid "Unable to trash file %s: %s" +#: gio/gio-tool-launch.c:100 +#, c-format msgid "Unable to load ‘%s‘: %s" -msgstr "Nepodarilo sa zahodiť súbor %s do Koša: %s" +msgstr "Nie je možné načítať „%s“: %s" -#: gio/gio-tool-launch.c:107 -#, fuzzy, c-format -#| msgid "Failed to load info for handler “%s”" +#: gio/gio-tool-launch.c:109 +#, c-format msgid "Unable to load application information for ‘%s‘" -msgstr "Zlyhalo načítanie informácii pre obslužný program „%s“" +msgstr "Nie je možné načítať informácie o aplikácii pre „%s“" -#: gio/gio-tool-launch.c:119 +#: gio/gio-tool-launch.c:121 #, fuzzy, c-format #| msgid "Default application for “%s”: %s\n" msgid "Unable to launch application ‘%s’: %s" msgstr "Predvolená aplikácia pre „%s“: %s\n" -#: gio/gio-tool-list.c:37 gio/gio-tool-tree.c:32 +#: gio/gio-tool-list.c:38 gio/gio-tool-tree.c:34 msgid "Show hidden files" msgstr "Zobrazí skryté súbory" -#: gio/gio-tool-list.c:38 +#: gio/gio-tool-list.c:39 msgid "Use a long listing format" msgstr "Použije dlhý formát výpisu" -#: gio/gio-tool-list.c:40 +#: gio/gio-tool-list.c:41 #, fuzzy #| msgid "display name: %s\n" msgid "Print display names" msgstr "názov na zobrazenie: %s\n" -#: gio/gio-tool-list.c:41 +#: gio/gio-tool-list.c:42 msgid "Print full URIs" msgstr "Vypíše celé URI" -#: gio/gio-tool-list.c:177 +#: gio/gio-tool-list.c:181 msgid "List the contents of the locations." msgstr "Vypíše obsah umiestnení." -#: gio/gio-tool-list.c:179 +#: gio/gio-tool-list.c:183 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" @@ -2045,19 +2082,19 @@ "vlastnosti" #. Translators: commandline placeholder -#: gio/gio-tool-mime.c:71 +#: gio/gio-tool-mime.c:73 msgid "MIMETYPE" msgstr "TYP_MIME" -#: gio/gio-tool-mime.c:71 +#: gio/gio-tool-mime.c:73 msgid "HANDLER" msgstr "OBSLUŽNÝ_PROGRAM" -#: gio/gio-tool-mime.c:76 +#: gio/gio-tool-mime.c:78 msgid "Get or set the handler for a mimetype." msgstr "Získať alebo nastaviť obslužný program pre typ MIME." -#: gio/gio-tool-mime.c:78 +#: gio/gio-tool-mime.c:80 msgid "" "If no handler is given, lists registered and recommended applications\n" "for the mimetype. If a handler is given, it is set as the default\n" @@ -2068,56 +2105,56 @@ "pre typ mime. Ak je zadaný obslužný program, je nastavený ako predvolený\n" "obslužný program pre zadaný typ mime." -#: gio/gio-tool-mime.c:100 +#: gio/gio-tool-mime.c:102 msgid "Must specify a single mimetype, and maybe a handler" msgstr "Je potrebné zadať jeden typ mime a možno tiež obslužný program" -#: gio/gio-tool-mime.c:116 +#: gio/gio-tool-mime.c:118 #, c-format msgid "No default applications for “%s”\n" msgstr "Žiadne predvolené aplikácie pre „%s“\n" -#: gio/gio-tool-mime.c:122 +#: gio/gio-tool-mime.c:124 #, c-format msgid "Default application for “%s”: %s\n" msgstr "Predvolená aplikácia pre „%s“: %s\n" -#: gio/gio-tool-mime.c:127 +#: gio/gio-tool-mime.c:129 msgid "Registered applications:\n" msgstr "Registrované aplikácie:\n" -#: gio/gio-tool-mime.c:129 +#: gio/gio-tool-mime.c:131 msgid "No registered applications\n" msgstr "Neregistrované aplikácie\n" -#: gio/gio-tool-mime.c:140 +#: gio/gio-tool-mime.c:142 msgid "Recommended applications:\n" msgstr "Odporúčané aplikácie:\n" -#: gio/gio-tool-mime.c:142 +#: gio/gio-tool-mime.c:144 msgid "No recommended applications\n" msgstr "Žiadne odporúčané aplikácie\n" -#: gio/gio-tool-mime.c:162 +#: gio/gio-tool-mime.c:164 #, c-format msgid "Failed to load info for handler “%s”" msgstr "Zlyhalo načítanie informácii pre obslužný program „%s“" -#: gio/gio-tool-mime.c:168 +#: gio/gio-tool-mime.c:170 #, c-format msgid "Failed to set “%s” as the default handler for “%s”: %s\n" msgstr "" "Zlyhalo nastavenie „%s“ ako predvoleného obslužného programu pre „%s“: %s\n" -#: gio/gio-tool-mkdir.c:31 +#: gio/gio-tool-mkdir.c:33 msgid "Create parent directories" msgstr "Vytvorí nadradené adresáre" -#: gio/gio-tool-mkdir.c:52 +#: gio/gio-tool-mkdir.c:54 msgid "Create directories." msgstr "Vytvoriť adresáre." -#: gio/gio-tool-mkdir.c:54 +#: gio/gio-tool-mkdir.c:56 msgid "" "gio mkdir is similar to the traditional mkdir utility, but using GIO\n" "locations instead of local files: for example, you can use something\n" @@ -2128,140 +2165,138 @@ "použiť niečo ako \n" "smb://server/resource/mydir ako umiestnenie." -#: gio/gio-tool-monitor.c:37 +#: gio/gio-tool-monitor.c:39 msgid "Monitor a directory (default: depends on type)" msgstr "Sledovať adresár (predvolené: závisí od typu)" -#: gio/gio-tool-monitor.c:39 +#: gio/gio-tool-monitor.c:41 msgid "Monitor a file (default: depends on type)" msgstr "Sledovať súbor (predvolené: závisí od typu)" -#: gio/gio-tool-monitor.c:41 +#: gio/gio-tool-monitor.c:43 msgid "Monitor a file directly (notices changes made via hardlinks)" msgstr "Sledovať súbor priamo (zaznamenáva tiež zmeny cez hardlink)" -#: gio/gio-tool-monitor.c:43 +#: gio/gio-tool-monitor.c:45 msgid "Monitors a file directly, but doesn’t report changes" msgstr "Sleduje súbor priamo, ale oznamuje zmeny" -#: gio/gio-tool-monitor.c:45 +#: gio/gio-tool-monitor.c:47 msgid "Report moves and renames as simple deleted/created events" msgstr "" "Oznamovať premenovanie a presunutie ako jednoduché udalosti odstrániť a " "vytvoriť" -#: gio/gio-tool-monitor.c:47 +#: gio/gio-tool-monitor.c:49 msgid "Watch for mount events" msgstr "Sleduje udalosti pripojení" -#: gio/gio-tool-monitor.c:209 +#: gio/gio-tool-monitor.c:211 msgid "Monitor files or directories for changes." msgstr "Sledovať zmeny súborov a adresárov." -#: gio/gio-tool-mount.c:63 +#: gio/gio-tool-mount.c:65 msgid "Mount as mountable" msgstr "Pripojí ako pripojiteľné" -#: gio/gio-tool-mount.c:64 +#: gio/gio-tool-mount.c:66 #, fuzzy #| msgid "Mount volume with device file" msgid "Mount volume with device file, or other identifier" msgstr "Pripojí zväzok so súborom zariadenia" -#: gio/gio-tool-mount.c:64 +#: gio/gio-tool-mount.c:66 msgid "ID" msgstr "" -#: gio/gio-tool-mount.c:65 +#: gio/gio-tool-mount.c:67 msgid "Unmount" msgstr "Odpojí" -#: gio/gio-tool-mount.c:66 +#: gio/gio-tool-mount.c:68 msgid "Eject" msgstr "Vysunie" -#: gio/gio-tool-mount.c:67 +#: gio/gio-tool-mount.c:69 #, fuzzy #| msgid "Mount volume with device file" msgid "Stop drive with device file" msgstr "Pripojí zväzok so súborom zariadenia" -#: gio/gio-tool-mount.c:67 +#: gio/gio-tool-mount.c:69 msgid "DEVICE" msgstr "ZARIADENIE" -#: gio/gio-tool-mount.c:68 +#: gio/gio-tool-mount.c:70 msgid "Unmount all mounts with the given scheme" msgstr "Odpojí všetky pripojenia s danou schémou" -#: gio/gio-tool-mount.c:68 +#: gio/gio-tool-mount.c:70 msgid "SCHEME" msgstr "SCHÉMA" -#: gio/gio-tool-mount.c:69 +#: gio/gio-tool-mount.c:71 msgid "Ignore outstanding file operations when unmounting or ejecting" msgstr "Ignoruje nedokončené operácie so súbormi pri odpájaní alebo vysúvaní" -#: gio/gio-tool-mount.c:70 +#: gio/gio-tool-mount.c:72 msgid "Use an anonymous user when authenticating" msgstr "Použije anonymného používateľa pri autorizovaní" #. Translator: List here is a verb as in 'List all mounts' -#: gio/gio-tool-mount.c:72 +#: gio/gio-tool-mount.c:74 msgid "List" msgstr "Zoznam" -#: gio/gio-tool-mount.c:73 +#: gio/gio-tool-mount.c:75 msgid "Monitor events" msgstr "Sleduje udalosti" -#: gio/gio-tool-mount.c:74 +#: gio/gio-tool-mount.c:76 msgid "Show extra information" msgstr "Zobrazí ďalšie informácie" -#: gio/gio-tool-mount.c:75 +#: gio/gio-tool-mount.c:77 msgid "The numeric PIM when unlocking a VeraCrypt volume" msgstr "" -#: gio/gio-tool-mount.c:75 +#: gio/gio-tool-mount.c:77 msgid "PIM" msgstr "PIM" -#: gio/gio-tool-mount.c:76 +#: gio/gio-tool-mount.c:78 msgid "Mount a TCRYPT hidden volume" msgstr "" -#: gio/gio-tool-mount.c:77 +#: gio/gio-tool-mount.c:79 msgid "Mount a TCRYPT system volume" msgstr "" -#: gio/gio-tool-mount.c:265 gio/gio-tool-mount.c:297 +#: gio/gio-tool-mount.c:276 gio/gio-tool-mount.c:308 msgid "Anonymous access denied" msgstr "Anonymný prístup zamietnutý" -#: gio/gio-tool-mount.c:522 +#: gio/gio-tool-mount.c:533 msgid "No drive for device file" msgstr "Pre súbor zariadenia neexistuje jednotka" -#: gio/gio-tool-mount.c:1014 -#, fuzzy -#| msgid "No volume for device file" +#: gio/gio-tool-mount.c:1025 msgid "No volume for given ID" -msgstr "Pre súbor zariadenia neexistuje zväzok" +msgstr "Pre zadaný identifikátor neexistuje zväzok" -#: gio/gio-tool-mount.c:1203 +#: gio/gio-tool-mount.c:1214 msgid "Mount or unmount the locations." msgstr "Pripojí alebo odpojí umiestnenia." -#: gio/gio-tool-move.c:42 +#: gio/gio-tool-move.c:44 msgid "Don’t use copy and delete fallback" msgstr "Nepoužije sa záložný režim pri kopírovaní a odstraňovaní" -#: gio/gio-tool-move.c:99 +#: gio/gio-tool-move.c:101 msgid "Move one or more files from SOURCE to DEST." msgstr "Presunúť jeden alebo viac súborov zo ZDROJA do CIEĽA." -#: gio/gio-tool-move.c:101 +#: gio/gio-tool-move.c:103 msgid "" "gio move is similar to the traditional mv utility, but using GIO\n" "locations instead of local files: for example, you can use something\n" @@ -2272,12 +2307,12 @@ "použiť niečo ako \n" "smb://server/resource/file.txt ako umiestnenie" -#: gio/gio-tool-move.c:143 +#: gio/gio-tool-move.c:145 #, c-format msgid "Target %s is not a directory" msgstr "Cieľ %s nie je adresárom" -#: gio/gio-tool-open.c:75 +#: gio/gio-tool-open.c:77 msgid "" "Open files with the default application that\n" "is registered to handle files of this type." @@ -2285,204 +2320,204 @@ "Otvára súbory predvolenou aplikáciou, ktorá\n" "je zaregistrovanou na obsluhu súborov zadaného typu." -#: gio/gio-tool-remove.c:31 gio/gio-tool-trash.c:33 +#: gio/gio-tool-remove.c:33 gio/gio-tool-trash.c:35 msgid "Ignore nonexistent files, never prompt" msgstr "Ignoruje neexistujúce súbory, nepýta sa" -#: gio/gio-tool-remove.c:52 +#: gio/gio-tool-remove.c:54 msgid "Delete the given files." msgstr "Odstraňuje zadané súbory." -#: gio/gio-tool-rename.c:45 +#: gio/gio-tool-rename.c:47 msgid "NAME" msgstr "NÁZOV" -#: gio/gio-tool-rename.c:50 +#: gio/gio-tool-rename.c:52 msgid "Rename a file." msgstr "Premenuje súbor." -#: gio/gio-tool-rename.c:70 +#: gio/gio-tool-rename.c:72 msgid "Missing argument" msgstr "Chýbajúci parameter" -#: gio/gio-tool-rename.c:76 gio/gio-tool-save.c:190 gio/gio-tool-set.c:137 +#: gio/gio-tool-rename.c:78 gio/gio-tool-save.c:192 gio/gio-tool-set.c:150 msgid "Too many arguments" msgstr "Príliš veľa parametrov" -#: gio/gio-tool-rename.c:95 +#: gio/gio-tool-rename.c:97 #, c-format msgid "Rename successful. New uri: %s\n" msgstr "Premenovanie úspešné. Nové uri: %s\n" -#: gio/gio-tool-save.c:50 +#: gio/gio-tool-save.c:52 msgid "Only create if not existing" msgstr "Vytvorí len ak neexistuje" -#: gio/gio-tool-save.c:51 +#: gio/gio-tool-save.c:53 msgid "Append to end of file" msgstr "Pripojí na koniec súboru" -#: gio/gio-tool-save.c:52 +#: gio/gio-tool-save.c:54 msgid "When creating, restrict access to the current user" msgstr "Pri vytváraní súboru obmedzí prístup len na aktuálneho používateľa" -#: gio/gio-tool-save.c:53 +#: gio/gio-tool-save.c:55 msgid "When replacing, replace as if the destination did not exist" msgstr "Pri nahradení uskutoční nahradenie ako keby cieľ neexistoval" #. Translators: The "etag" is a token allowing to verify whether a file has been modified -#: gio/gio-tool-save.c:55 +#: gio/gio-tool-save.c:57 msgid "Print new etag at end" msgstr "Na konci vypíše nový etag" #. Translators: The "etag" is a token allowing to verify whether a file has been modified -#: gio/gio-tool-save.c:57 +#: gio/gio-tool-save.c:59 msgid "The etag of the file being overwritten" msgstr "Etag prepisovaného súboru" -#: gio/gio-tool-save.c:57 +#: gio/gio-tool-save.c:59 msgid "ETAG" msgstr "ETAG" # PŠ: file handle (win32) je ekvivalent file descriptor - dovolil som si to preložiť rovnako. Keďže používané manipulátor, alebo rukoväť sú oba zlé preklady (obsluha je handler)... A dokonca aj v slovenskom preklade Správcu úloh vo win je použitý popisovač. -#: gio/gio-tool-save.c:113 +#: gio/gio-tool-save.c:115 msgid "Error reading from standard input" msgstr "Chyba pri čítaní zo štandardného vstupu" #. Translators: The "etag" is a token allowing to verify whether a file has been modified -#: gio/gio-tool-save.c:139 +#: gio/gio-tool-save.c:141 msgid "Etag not available\n" msgstr "Etag nie je k dispozícii\n" -#: gio/gio-tool-save.c:163 +#: gio/gio-tool-save.c:165 msgid "Read from standard input and save to DEST." msgstr "Číta z predvoleného vstupu a ukladá do CIEĽA." -#: gio/gio-tool-save.c:183 +#: gio/gio-tool-save.c:185 msgid "No destination given" msgstr "Neposkytnutý žiadny cieľ" -#: gio/gio-tool-set.c:33 +#: gio/gio-tool-set.c:36 msgid "Type of the attribute" msgstr "Typ atribútu" -#: gio/gio-tool-set.c:33 +#: gio/gio-tool-set.c:36 msgid "TYPE" msgstr "TYP" -#: gio/gio-tool-set.c:89 +#: gio/gio-tool-set.c:38 +#, fuzzy +#| msgid "Set a file attribute" +msgid "Unset given attribute" +msgstr "Nastaví atribút súboru" + +#: gio/gio-tool-set.c:95 msgid "ATTRIBUTE" msgstr "ATRIBÚT" -#: gio/gio-tool-set.c:89 +#: gio/gio-tool-set.c:95 msgid "VALUE" msgstr "HODNOTA" -#: gio/gio-tool-set.c:93 +#: gio/gio-tool-set.c:99 msgid "Set a file attribute of LOCATION." msgstr "Nastavuje atribút súboru z UMIESTNENIA." -#: gio/gio-tool-set.c:113 +#: gio/gio-tool-set.c:119 msgid "Location not specified" msgstr "Umiestnenie neurčené" -#: gio/gio-tool-set.c:120 +#: gio/gio-tool-set.c:126 msgid "Attribute not specified" msgstr "Atribút neurčený" -#: gio/gio-tool-set.c:130 +#: gio/gio-tool-set.c:143 msgid "Value not specified" msgstr "Hodnota neurčená" -#: gio/gio-tool-set.c:180 +#: gio/gio-tool-set.c:193 #, c-format msgid "Invalid attribute type “%s”" msgstr "Neplatný typ atribútu „%s“" -#: gio/gio-tool-trash.c:34 +#: gio/gio-tool-trash.c:36 msgid "Empty the trash" msgstr "Vyprázdni Kôš" -#: gio/gio-tool-trash.c:35 +#: gio/gio-tool-trash.c:37 #, fuzzy #| msgid "List the contents of the locations." msgid "List files in the trash with their original locations" msgstr "Vypíše obsah umiestnení." -#: gio/gio-tool-trash.c:36 +#: gio/gio-tool-trash.c:38 msgid "" "Restore a file from trash to its original location (possibly recreating the " "directory)" msgstr "" -#: gio/gio-tool-trash.c:106 -#, fuzzy -#| msgid "Unable to find terminal required for application" +#: gio/gio-tool-trash.c:108 msgid "Unable to find original path" -msgstr "Nepodarilo sa nájsť terminál vyžadovaný pre aplikáciu" +msgstr "Nie je možné nájsť pôvodnú cestu" -#: gio/gio-tool-trash.c:123 -#, fuzzy -#| msgid "Unable to create socket: %s" +#: gio/gio-tool-trash.c:125 msgid "Unable to recreate original location: " -msgstr "Nepodarilo sa vytvoriť soket: %s" +msgstr "Nie je možné opätovne vytvoriť pôvodné umiestnenie: " -#: gio/gio-tool-trash.c:136 -#, fuzzy -#| msgid "unable to find desktop file for application %s\n" +#: gio/gio-tool-trash.c:138 msgid "Unable to move file to its original location: " -msgstr "nepodarilo sa nájsť súbor desktop pre aplikáciu %s\n" +msgstr "Nie je možné presunúť súbor do jeho pôvodného umiestnenia: " -#: gio/gio-tool-trash.c:225 +#: gio/gio-tool-trash.c:227 #, fuzzy #| msgid "Move files or directories to the trash." msgid "Move/Restore files or directories to the trash." msgstr "Presúva súbory alebo adresáre do Koša." -#: gio/gio-tool-trash.c:227 +#: gio/gio-tool-trash.c:229 msgid "" "Note: for --restore switch, if the original location of the trashed file \n" "already exists, it will not be overwritten unless --force is set." msgstr "" -#: gio/gio-tool-trash.c:258 +#: gio/gio-tool-trash.c:260 msgid "Location given doesn't start with trash:///" -msgstr "" +msgstr "Zadané umiestnenie nezačína s predponou trash:///" -#: gio/gio-tool-tree.c:33 +#: gio/gio-tool-tree.c:35 msgid "Follow symbolic links, mounts and shortcuts" msgstr "Nasleduje symbolické odkazy, pripojenia a skratky" -#: gio/gio-tool-tree.c:244 +#: gio/gio-tool-tree.c:251 msgid "List contents of directories in a tree-like format." msgstr "Vypíše obsah adresárov v stromovom zobrazení." -#: gio/glib-compile-resources.c:140 gio/glib-compile-schemas.c:1514 +#: gio/glib-compile-resources.c:142 gio/glib-compile-schemas.c:1513 #, c-format msgid "Element <%s> not allowed inside <%s>" msgstr "Prvok <%s> nie je dovolený vo vnútri <%s>" -#: gio/glib-compile-resources.c:144 +#: gio/glib-compile-resources.c:146 #, c-format msgid "Element <%s> not allowed at toplevel" msgstr "Prvok <%s> nie je dovolený na najvyššej úrovni" -#: gio/glib-compile-resources.c:234 +#: gio/glib-compile-resources.c:236 #, c-format msgid "File %s appears multiple times in the resource" msgstr "Súbor %s sa v zdroji objavil viackrát" -#: gio/glib-compile-resources.c:245 +#: gio/glib-compile-resources.c:247 #, c-format msgid "Failed to locate “%s” in any source directory" msgstr "Nepodarilo sa nájsť „%s“ v žiadnom zdrojovom adresári" -#: gio/glib-compile-resources.c:256 +#: gio/glib-compile-resources.c:258 #, c-format msgid "Failed to locate “%s” in current directory" msgstr "Zlyhalo hľadanie „%s“ v aktuálnom adresári" -#: gio/glib-compile-resources.c:290 +#: gio/glib-compile-resources.c:292 #, c-format msgid "Unknown processing option “%s”" msgstr "Neznáma voľba spracovania „%s“" @@ -2491,38 +2526,38 @@ #. * 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 +#: gio/glib-compile-resources.c:312 gio/glib-compile-resources.c:369 +#: gio/glib-compile-resources.c:426 #, c-format msgid "%s preprocessing requested, but %s is not set, and %s is not in PATH" msgstr "" -#: gio/glib-compile-resources.c:457 +#: gio/glib-compile-resources.c:459 #, c-format msgid "Error reading file %s: %s" msgstr "Chyba pri čítaní súboru %s: %s" -#: gio/glib-compile-resources.c:477 +#: gio/glib-compile-resources.c:479 #, c-format msgid "Error compressing file %s" msgstr "Chyba pri komprimovaní súboru %s" -#: gio/glib-compile-resources.c:541 +#: gio/glib-compile-resources.c:543 #, c-format msgid "text may not appear inside <%s>" msgstr "text sa nemôže nachádzať vo vnútri <%s>" -#: gio/glib-compile-resources.c:737 gio/glib-compile-schemas.c:2172 +#: gio/glib-compile-resources.c:821 gio/glib-compile-schemas.c:2171 msgid "Show program version and exit" msgstr "Zobrazí verziu programu a skončí" # cmd desc -#: gio/glib-compile-resources.c:738 +#: gio/glib-compile-resources.c:822 msgid "Name of the output file" msgstr "Názov výstupného súboru" # cmd desc -#: gio/glib-compile-resources.c:739 +#: gio/glib-compile-resources.c:823 msgid "" "The directories to load files referenced in FILE from (default: current " "directory)" @@ -2530,53 +2565,53 @@ "Adresáre odkiaľ sa majú čítať súbory odkazované v SÚBORe (predvolené: " "aktuálny adresár)" -#: gio/glib-compile-resources.c:739 gio/glib-compile-schemas.c:2173 -#: gio/glib-compile-schemas.c:2202 +#: gio/glib-compile-resources.c:823 gio/glib-compile-schemas.c:2172 +#: gio/glib-compile-schemas.c:2201 msgid "DIRECTORY" msgstr "ADRESÁR" # cmd desc -#: gio/glib-compile-resources.c:740 +#: gio/glib-compile-resources.c:824 msgid "" "Generate output in the format selected for by the target filename extension" msgstr "Vygeneruje výstup vo formáte stanovenom podľa prípony cieľového súboru" # cmd desc -#: gio/glib-compile-resources.c:741 +#: gio/glib-compile-resources.c:825 msgid "Generate source header" msgstr "Vygeneruje zdrojové hlavičky" # cmd desc -#: gio/glib-compile-resources.c:742 +#: gio/glib-compile-resources.c:826 msgid "Generate source code used to link in the resource file into your code" msgstr "" "Vygeneruje zdrojový kód použitý na prepojenie súboru zdrojov s vaším kódom" # cmd desc -#: gio/glib-compile-resources.c:743 +#: gio/glib-compile-resources.c:827 msgid "Generate dependency list" msgstr "Vygeneruje zoznam závislostí" -#: gio/glib-compile-resources.c:744 +#: gio/glib-compile-resources.c:828 msgid "Name of the dependency file to generate" msgstr "Názov súboru závislostí na vygenerovanie" # cmd line desc -#: gio/glib-compile-resources.c:745 +#: gio/glib-compile-resources.c:829 msgid "Include phony targets in the generated dependency file" msgstr "Zahrnie fiktívne ciele do vygenerovaného súboru závislosti" # cmd desc -#: gio/glib-compile-resources.c:746 +#: gio/glib-compile-resources.c:830 msgid "Don’t automatically create and register resource" msgstr "Nebude vytvárať a registrovať zdroj automaticky" # cmd desc -#: gio/glib-compile-resources.c:747 +#: gio/glib-compile-resources.c:831 msgid "Don’t export functions; declare them G_GNUC_INTERNAL" msgstr "Nebude exportovať funkcie; deklaruje ich pomocou G_GNUC_INTERNAL" -#: gio/glib-compile-resources.c:748 +#: gio/glib-compile-resources.c:832 msgid "" "Don’t embed resource data in the C file; assume it's linked externally " "instead" @@ -2585,12 +2620,16 @@ "prepojené externe" # cmd desc -#: gio/glib-compile-resources.c:749 +#: gio/glib-compile-resources.c:833 msgid "C identifier name used for the generated source code" msgstr "Identifikačný názov v jazyku C použitý pre generovaný zdrojový kód" +#: gio/glib-compile-resources.c:834 +msgid "The target C compiler (default: the CC environment variable)" +msgstr "" + # cmd program desc -#: gio/glib-compile-resources.c:775 +#: gio/glib-compile-resources.c:860 msgid "" "Compile a resource specification into a resource file.\n" "Resource specification files have the extension .gresource.xml,\n" @@ -2600,121 +2639,121 @@ "Súbory špecifikácie zdrojov majú príponu .gresource.xml,\n" "a súbor zdrojov má príponu s názvom .gresource." -#: gio/glib-compile-resources.c:797 +#: gio/glib-compile-resources.c:882 msgid "You should give exactly one file name\n" msgstr "Mali by ste zadať práve jeden názov súboru\n" -#: gio/glib-compile-schemas.c:92 +#: gio/glib-compile-schemas.c:94 #, c-format msgid "nick must be a minimum of 2 characters" msgstr "atribút nick musí mať najmenej 2 znaky" -#: gio/glib-compile-schemas.c:103 +#: gio/glib-compile-schemas.c:105 #, c-format msgid "Invalid numeric value" msgstr "Neplatná číselná hodnota" -#: gio/glib-compile-schemas.c:111 +#: gio/glib-compile-schemas.c:113 #, c-format msgid "<value nick='%s'/> already specified" msgstr "<value nick='%s'/> je už určený" -#: gio/glib-compile-schemas.c:119 +#: gio/glib-compile-schemas.c:121 #, c-format msgid "value='%s' already specified" msgstr "value='%s' je už určený" -#: gio/glib-compile-schemas.c:133 +#: gio/glib-compile-schemas.c:135 #, c-format msgid "flags values must have at most 1 bit set" msgstr "hodnoty príznakov musia mať nastavený najviac 1 bit" -#: gio/glib-compile-schemas.c:158 +#: gio/glib-compile-schemas.c:160 #, c-format msgid "<%s> must contain at least one <value>" msgstr "<%s> musí obsahovať aspoň jednu hodnotu <value>" -#: gio/glib-compile-schemas.c:314 +#: gio/glib-compile-schemas.c:316 #, c-format msgid "<%s> is not contained in the specified range" msgstr "<%s> sa nenachádza v určenom rozsahu" -#: gio/glib-compile-schemas.c:326 +#: gio/glib-compile-schemas.c:328 #, c-format msgid "<%s> is not a valid member of the specified enumerated type" msgstr "<%s> nie je platným členom určeného vymenovaného typu" -#: gio/glib-compile-schemas.c:332 +#: gio/glib-compile-schemas.c:334 #, c-format msgid "<%s> contains string not in the specified flags type" msgstr "<%s> obsiahnutý reťazec nie je medzi príznakmi určeného typu" -#: gio/glib-compile-schemas.c:338 +#: gio/glib-compile-schemas.c:340 #, c-format msgid "<%s> contains a string not in <choices>" msgstr "<%s> obsiahnutý reťazec sa nenachádza vo výbere <choices>" -#: gio/glib-compile-schemas.c:372 +#: gio/glib-compile-schemas.c:374 msgid "<range/> already specified for this key" msgstr "Rozsah <range/> je už pre tento kľúč určený" -#: gio/glib-compile-schemas.c:390 +#: gio/glib-compile-schemas.c:392 #, c-format msgid "<range> not allowed for keys of type “%s”" msgstr "<range> nie je povolený pre kľúče typu „%s“" -#: gio/glib-compile-schemas.c:407 +#: gio/glib-compile-schemas.c:409 #, c-format msgid "<range> specified minimum is greater than maximum" msgstr "Minimum určené pomocou <range> je väčšie ako maximum" -#: gio/glib-compile-schemas.c:432 +#: gio/glib-compile-schemas.c:434 #, c-format msgid "unsupported l10n category: %s" msgstr "nepodporovaná kategória l10n: %s" -#: gio/glib-compile-schemas.c:440 +#: gio/glib-compile-schemas.c:442 msgid "l10n requested, but no gettext domain given" msgstr "vyžadovaná l10n, no nebola zadaná doména gettext" -#: gio/glib-compile-schemas.c:452 +#: gio/glib-compile-schemas.c:454 msgid "translation context given for value without l10n enabled" msgstr "poskytnutý kontext pre prekladateľov pre hodnotu bez povolenej l10n" -#: gio/glib-compile-schemas.c:474 +#: gio/glib-compile-schemas.c:476 #, c-format msgid "Failed to parse <default> value of type “%s”: " msgstr "Zlyhalo spracovanie hodnoty <default> typu „%s“: " -#: gio/glib-compile-schemas.c:491 +#: gio/glib-compile-schemas.c:493 msgid "" "<choices> cannot be specified for keys tagged as having an enumerated type" msgstr "<choices> nemôžu byť určené pri kľúčoch, ktoré majú vymenovaný typ" -#: gio/glib-compile-schemas.c:500 +#: gio/glib-compile-schemas.c:502 msgid "<choices> already specified for this key" msgstr "<choices> je pre tento kľúč už určený" -#: gio/glib-compile-schemas.c:512 +#: gio/glib-compile-schemas.c:514 #, c-format msgid "<choices> not allowed for keys of type “%s”" msgstr "<choices> nie je povolený pre kľúče typu „%s“" -#: gio/glib-compile-schemas.c:528 +#: gio/glib-compile-schemas.c:530 #, c-format msgid "<choice value='%s'/> already given" msgstr "<choice value='%s'/> je už zadaný" -#: gio/glib-compile-schemas.c:543 +#: gio/glib-compile-schemas.c:545 #, c-format msgid "<choices> must contain at least one <choice>" msgstr "<choices> musí obsahovať aspoň jeden <choice>" -#: gio/glib-compile-schemas.c:557 +#: gio/glib-compile-schemas.c:559 msgid "<aliases> already specified for this key" msgstr "<aliases> je pre tento kľúč už určený" -#: gio/glib-compile-schemas.c:561 +#: gio/glib-compile-schemas.c:563 msgid "" "<aliases> can only be specified for keys with enumerated or flags types or " "after <choices>" @@ -2722,7 +2761,7 @@ "<aliases> môže byť určený iba pre kľúče s vymenovaným typom, príznakmi alebo " "za <choices>" -#: gio/glib-compile-schemas.c:580 +#: gio/glib-compile-schemas.c:582 #, c-format msgid "" "<alias value='%s'/> given when “%s” is already a member of the enumerated " @@ -2730,42 +2769,42 @@ msgstr "" "bol zadaný <alias value='%s'/> pričom „%s“ je už členom vymenovaného typu" -#: gio/glib-compile-schemas.c:586 +#: gio/glib-compile-schemas.c:588 #, c-format msgid "<alias value='%s'/> given when <choice value='%s'/> was already given" msgstr "" "bol zadaný <alias value='%s'/> pričom už bol zadaný <choice value='%s'/>" -#: gio/glib-compile-schemas.c:594 +#: gio/glib-compile-schemas.c:596 #, c-format msgid "<alias value='%s'/> already specified" msgstr "<alias value='%s'/> je už zadaný" -#: gio/glib-compile-schemas.c:604 +#: gio/glib-compile-schemas.c:606 #, c-format msgid "alias target “%s” is not in enumerated type" msgstr "cieľ aliasu „%s“ ne je vymenovaný typ" -#: gio/glib-compile-schemas.c:605 +#: gio/glib-compile-schemas.c:607 #, c-format msgid "alias target “%s” is not in <choices>" msgstr "cieľ aliasu „%s“ ne je v <choices>" -#: gio/glib-compile-schemas.c:620 +#: gio/glib-compile-schemas.c:622 #, c-format msgid "<aliases> must contain at least one <alias>" msgstr "<aliases> musí obsahovať aspoň jeden <alias>" -#: gio/glib-compile-schemas.c:797 +#: gio/glib-compile-schemas.c:796 msgid "Empty names are not permitted" msgstr "Prázdne názvy nie sú povolené" -#: gio/glib-compile-schemas.c:807 +#: gio/glib-compile-schemas.c:806 #, c-format msgid "Invalid name “%s”: names must begin with a lowercase letter" msgstr "Neplatný názov „%s“: názvy musia začínať malým písmenom" -#: gio/glib-compile-schemas.c:819 +#: gio/glib-compile-schemas.c:818 #, c-format msgid "" "Invalid name “%s”: invalid character “%c”; only lowercase letters, numbers " @@ -2774,38 +2813,38 @@ "Neplatný názov „%s“: neplatný znak „%c“: povolené sú iba malé písmená, čísla " "a spojovník („-“)" -#: gio/glib-compile-schemas.c:828 +#: gio/glib-compile-schemas.c:827 #, c-format msgid "Invalid name “%s”: two successive hyphens (“--”) are not permitted" msgstr "" "Neplatný názov „%s“: dva za sebou nasledujúce spojovníky („--“) nie sú " "povolené" -#: gio/glib-compile-schemas.c:837 +#: gio/glib-compile-schemas.c:836 #, c-format msgid "Invalid name “%s”: the last character may not be a hyphen (“-”)" msgstr "Neplatný názov „%s“: posledný znak nesmie byť spojovník („-“)." -#: gio/glib-compile-schemas.c:845 +#: gio/glib-compile-schemas.c:844 #, c-format msgid "Invalid name “%s”: maximum length is 1024" msgstr "Neplatný názov „%s“: maximálna dĺžka je 1024" -#: gio/glib-compile-schemas.c:917 +#: gio/glib-compile-schemas.c:916 #, c-format msgid "<child name='%s'> already specified" msgstr "<child name='%s'> je už určený" -#: gio/glib-compile-schemas.c:943 +#: gio/glib-compile-schemas.c:942 msgid "Cannot add keys to a “list-of” schema" msgstr "Nedajú sa pridať kľúče do schémy „list-of“" -#: gio/glib-compile-schemas.c:954 +#: gio/glib-compile-schemas.c:953 #, c-format msgid "<key name='%s'> already specified" msgstr "<key name='%s'> je už určený" -#: gio/glib-compile-schemas.c:972 +#: gio/glib-compile-schemas.c:971 #, c-format msgid "" "<key name='%s'> shadows <key name='%s'> in <schema id='%s'>; use <override> " @@ -2814,7 +2853,7 @@ "<key name='%s'> zatieni <key name='%s'> v <schema id='%s'>; na úpravu " "hodnoty použite <override>" -#: gio/glib-compile-schemas.c:983 +#: gio/glib-compile-schemas.c:982 #, c-format msgid "" "Exactly one of “type”, “enum” or “flags” must be specified as an attribute " @@ -2823,56 +2862,56 @@ "Ako atribút pre <key> musí byť určená práve jedna hodnota z „type“, „enum“ " "alebo „flags“" -#: gio/glib-compile-schemas.c:1002 +#: gio/glib-compile-schemas.c:1001 #, c-format msgid "<%s id='%s'> not (yet) defined." msgstr "<%s id='%s'> nie je (zatiaľ) definovaný." -#: gio/glib-compile-schemas.c:1017 +#: gio/glib-compile-schemas.c:1016 #, c-format msgid "Invalid GVariant type string “%s”" msgstr "Neplatný reťazec typu GVariant „%s“" -#: gio/glib-compile-schemas.c:1047 +#: gio/glib-compile-schemas.c:1046 msgid "<override> given but schema isn’t extending anything" msgstr "Zadaný <override>, no schéma nič nerozširuje" -#: gio/glib-compile-schemas.c:1060 +#: gio/glib-compile-schemas.c:1059 #, c-format msgid "No <key name='%s'> to override" msgstr "Žiadny <key name='%s'> na preváženie" -#: gio/glib-compile-schemas.c:1068 +#: gio/glib-compile-schemas.c:1067 #, c-format msgid "<override name='%s'> already specified" msgstr "<override name='%s'> je už určený" -#: gio/glib-compile-schemas.c:1141 +#: gio/glib-compile-schemas.c:1140 #, c-format msgid "<schema id='%s'> already specified" msgstr "<schema id='%s'> je už určený" -#: gio/glib-compile-schemas.c:1153 +#: gio/glib-compile-schemas.c:1152 #, c-format msgid "<schema id='%s'> extends not yet existing schema “%s”" msgstr "<schema id='%s'> rozširuje zatiaľ neexistujúcu schému „%s“" -#: gio/glib-compile-schemas.c:1169 +#: gio/glib-compile-schemas.c:1168 #, c-format msgid "<schema id='%s'> is list of not yet existing schema “%s”" msgstr "<schema id='%s'> je zoznamom zatiaľ neexistujúcej schémy „%s“" -#: gio/glib-compile-schemas.c:1177 +#: gio/glib-compile-schemas.c:1176 #, c-format msgid "Cannot be a list of a schema with a path" msgstr "Nemôže byť zoznamom schémy s cestou" -#: gio/glib-compile-schemas.c:1187 +#: gio/glib-compile-schemas.c:1186 #, c-format msgid "Cannot extend a schema with a path" msgstr "Nemôže rozšíriť schému s cestou" -#: gio/glib-compile-schemas.c:1197 +#: gio/glib-compile-schemas.c:1196 #, c-format msgid "" "<schema id='%s'> is a list, extending <schema id='%s'> which is not a list" @@ -2880,7 +2919,7 @@ "<schema id='%s'> je zoznamom rozširujúcim <schema id='%s'>, ktorý nie je " "zoznamom" -#: gio/glib-compile-schemas.c:1207 +#: gio/glib-compile-schemas.c:1206 #, c-format msgid "" "<schema id='%s' list-of='%s'> extends <schema id='%s' list-of='%s'> but “%s” " @@ -2889,17 +2928,17 @@ "<schema id='%s' list-of='%s'> rozširuje <schema id='%s' list-of='%s'>, no " "„%s“ nerozširuje „%s“" -#: gio/glib-compile-schemas.c:1224 +#: gio/glib-compile-schemas.c:1223 #, c-format msgid "A path, if given, must begin and end with a slash" msgstr "Cesta (ak je zadaná) musí začínať a končiť lomkou" -#: gio/glib-compile-schemas.c:1231 +#: gio/glib-compile-schemas.c:1230 #, c-format msgid "The path of a list must end with “:/”" msgstr "Cesta zoznamu musí končiť „:/“" -#: gio/glib-compile-schemas.c:1240 +#: gio/glib-compile-schemas.c:1239 #, c-format msgid "" "Warning: Schema “%s” has path “%s”. Paths starting with “/apps/”, “/" @@ -2908,49 +2947,49 @@ "Upozornenie: Schéma „%s“ má cestu „%s“. Cesty začínajúce „/apps/“, „/" "desktop/“ alebo „/system/“ sú zavrhnuté." -#: gio/glib-compile-schemas.c:1270 +#: gio/glib-compile-schemas.c:1269 #, c-format msgid "<%s id='%s'> already specified" msgstr "<%s id='%s'> je už určený" -#: gio/glib-compile-schemas.c:1420 gio/glib-compile-schemas.c:1436 +#: gio/glib-compile-schemas.c:1419 gio/glib-compile-schemas.c:1435 #, c-format msgid "Only one <%s> element allowed inside <%s>" msgstr "Iba jeden prvok <%s> je dovolený vo vnútri <%s>" -#: gio/glib-compile-schemas.c:1518 +#: gio/glib-compile-schemas.c:1517 #, c-format msgid "Element <%s> not allowed at the top level" msgstr "Prvok <%s> nie je dovolený na najvyššej úrovni" -#: gio/glib-compile-schemas.c:1536 +#: gio/glib-compile-schemas.c:1535 msgid "Element <default> is required in <key>" msgstr "Prvok <default> sa v <key> vyžaduje" -#: gio/glib-compile-schemas.c:1626 +#: gio/glib-compile-schemas.c:1625 #, c-format msgid "Text may not appear inside <%s>" msgstr "Text sa nemôže nachádzať vo vnútri <%s>" -#: gio/glib-compile-schemas.c:1694 +#: gio/glib-compile-schemas.c:1693 #, c-format msgid "Warning: undefined reference to <schema id='%s'/>" msgstr "Upozornenie: nedefinovaná referencia na <schema id='%s'/>" #. Translators: Do not translate "--strict". -#: gio/glib-compile-schemas.c:1833 gio/glib-compile-schemas.c:1912 +#: gio/glib-compile-schemas.c:1832 gio/glib-compile-schemas.c:1911 msgid "--strict was specified; exiting." msgstr "Bol určený parameter --strict. Ukončuje sa." -#: gio/glib-compile-schemas.c:1845 +#: gio/glib-compile-schemas.c:1844 msgid "This entire file has been ignored." msgstr "Celý tento súbor bol ignorovaný." -#: gio/glib-compile-schemas.c:1908 +#: gio/glib-compile-schemas.c:1907 msgid "Ignoring this file." msgstr "Ignoruje sa tento súbor." -#: gio/glib-compile-schemas.c:1963 +#: gio/glib-compile-schemas.c:1962 #, c-format msgid "" "No such key “%s” in schema “%s” as specified in override file “%s”; ignoring " @@ -2959,7 +2998,7 @@ "Kľúč „%s“ neexistuje v schéme „%s“ ako to bolo určené v súbore preváženia " "„%s“. Ignoruje sa preváženie tohto kľúča." -#: gio/glib-compile-schemas.c:1971 +#: gio/glib-compile-schemas.c:1970 #, c-format msgid "" "No such key “%s” in schema “%s” as specified in override file “%s” and --" @@ -2968,7 +3007,7 @@ "Kľúč „%s“ neexistuje v schéme „%s“ ako to bolo určené v súbore preváženia " "„%s“ a bol určený parameter --strict. Ukončuje sa." -#: gio/glib-compile-schemas.c:1993 +#: gio/glib-compile-schemas.c:1992 #, fuzzy, c-format #| msgid "" #| "override for key '%s' in schema '%s' in override file '%s' is not in the " @@ -2980,7 +3019,7 @@ "preváženie kľúča „%s“ v schéme „%s“ v súbore preváženia „%s“ nie je v " "zozname platných možností" -#: gio/glib-compile-schemas.c:2002 +#: gio/glib-compile-schemas.c:2001 #, fuzzy, c-format #| msgid "" #| "override for key '%s' in schema '%s' in override file '%s' is not in the " @@ -2992,7 +3031,7 @@ "preváženie kľúča „%s“ v schéme „%s“ v súbore preváženia „%s“ nie je v " "zozname platných možností" -#: gio/glib-compile-schemas.c:2026 +#: gio/glib-compile-schemas.c:2025 #, c-format msgid "" "Error parsing key “%s” in schema “%s” as specified in override file “%s”: " @@ -3001,7 +3040,7 @@ "Chyba pri analyzovaní kľúča „%s“ v schéme „%s“ ako bolo určené v súbore " "preváženia „%s“: %s. Ignoruje sa preváženie tohto kľúča." -#: gio/glib-compile-schemas.c:2038 +#: gio/glib-compile-schemas.c:2037 #, c-format msgid "" "Error parsing key “%s” in schema “%s” as specified in override file “%s”: " @@ -3010,7 +3049,7 @@ "Chyba pri analyzovaní kľúča „%s“ v schéme „%s“ ako bolo určené v súbore " "preváženia „%s“: %s. Bol určený parameter --strict. Ukončuje sa." -#: gio/glib-compile-schemas.c:2065 +#: gio/glib-compile-schemas.c:2064 #, c-format msgid "" "Override for key “%s” in schema “%s” in override file “%s” is outside the " @@ -3019,7 +3058,7 @@ "Preváženie kľúča „%s“ v schéme „%s“ v prevažujúcom súbore „%s“ je mimo " "rozsah daný schémou. Ignoruje sa preváženie tohto kľúča." -#: gio/glib-compile-schemas.c:2075 +#: gio/glib-compile-schemas.c:2074 #, c-format msgid "" "Override for key “%s” in schema “%s” in override file “%s” is outside the " @@ -3028,7 +3067,7 @@ "Preváženie kľúča „%s“ v schéme „%s“ v prevažujúcom súbore „%s“ je mimo " "rozsah daný schémou a bol určený parameter --strict. Ukončuje sa." -#: gio/glib-compile-schemas.c:2101 +#: gio/glib-compile-schemas.c:2100 #, c-format msgid "" "Override for key “%s” in schema “%s” in override file “%s” is not in the " @@ -3037,7 +3076,7 @@ "Preváženie kľúča „%s“ v schéme „%s“ v súbore preváženia „%s“ nie je v " "zozname platných možností. Ignoruje sa preváženie tohto kľúča." -#: gio/glib-compile-schemas.c:2111 +#: gio/glib-compile-schemas.c:2110 #, c-format msgid "" "Override for key “%s” in schema “%s” in override file “%s” is not in the " @@ -3047,26 +3086,26 @@ "zozname platných možností a bol určený parameter --strict. Ukončuje sa." # cmd desc -#: gio/glib-compile-schemas.c:2173 +#: gio/glib-compile-schemas.c:2172 msgid "Where to store the gschemas.compiled file" msgstr "Kam sa má uložiť súbor gschemas.compiled" # cmd desc -#: gio/glib-compile-schemas.c:2174 +#: gio/glib-compile-schemas.c:2173 msgid "Abort on any errors in schemas" msgstr "Preruší pri ľubovoľnej chybe v schémach" # cmd desc -#: gio/glib-compile-schemas.c:2175 +#: gio/glib-compile-schemas.c:2174 msgid "Do not write the gschema.compiled file" msgstr "Nezapíše súbor gschema.compiled" # cmd desc -#: gio/glib-compile-schemas.c:2176 +#: gio/glib-compile-schemas.c:2175 msgid "Do not enforce key name restrictions" msgstr "Nevynúti obmedzenia pre názvy kľúčov" -#: gio/glib-compile-schemas.c:2205 +#: gio/glib-compile-schemas.c:2204 msgid "" "Compile all GSettings schema files into a schema cache.\n" "Schema files are required to have the extension .gschema.xml,\n" @@ -3076,24 +3115,24 @@ "Súbory schém musia mať príponu .gschema.xml,\n" "a súbor vyrovnávacej pamäte sa nazýva gschemas.compiled." -#: gio/glib-compile-schemas.c:2226 +#: gio/glib-compile-schemas.c:2225 msgid "You should give exactly one directory name" msgstr "Mali by ste zadať práve jeden názov adresára" -#: gio/glib-compile-schemas.c:2269 +#: gio/glib-compile-schemas.c:2268 msgid "No schema files found: doing nothing." msgstr "Nenájdené žiadne súbory schém: neurobí sa nič." -#: gio/glib-compile-schemas.c:2271 +#: gio/glib-compile-schemas.c:2270 msgid "No schema files found: removed existing output file." msgstr "Nenájdené žiadne súbory schém: existujúci výstupný súbor odstránený." -#: gio/glocalfile.c:549 gio/win32/gwinhttpfile.c:436 +#: gio/glocalfile.c:567 gio/win32/gwinhttpfile.c:436 #, c-format msgid "Invalid filename %s" msgstr "Neplatný názov súboru %s" -#: gio/glocalfile.c:982 +#: gio/glocalfile.c:1009 #, c-format msgid "Error getting filesystem info for %s: %s" msgstr "Chyba pri získavaní informácií o súborovom systéme pre %s: %s" @@ -3102,356 +3141,358 @@ #. * the enclosing (user visible) mount of a file, but none #. * exists. #. -#: gio/glocalfile.c:1123 +#: gio/glocalfile.c:1145 #, c-format msgid "Containing mount for file %s not found" msgstr "Obklopujúce pripojenie pre súbor %s sa nepodarilo nájsť" -#: gio/glocalfile.c:1146 +#: gio/glocalfile.c:1168 msgid "Can’t rename root directory" msgstr "Koreňový adresár sa nedá premenovať" -#: gio/glocalfile.c:1164 gio/glocalfile.c:1187 +#: gio/glocalfile.c:1186 gio/glocalfile.c:1209 #, c-format msgid "Error renaming file %s: %s" msgstr "Chyba pri premenovaní súboru %s: %s" -#: gio/glocalfile.c:1171 +#: gio/glocalfile.c:1193 msgid "Can’t rename file, filename already exists" msgstr "Nedá sa premenovať súbor, názov súboru už existuje" -#: gio/glocalfile.c:1184 gio/glocalfile.c:2371 gio/glocalfile.c:2399 -#: gio/glocalfile.c:2538 gio/glocalfileoutputstream.c:656 +#: gio/glocalfile.c:1206 gio/glocalfile.c:2409 gio/glocalfile.c:2437 +#: gio/glocalfile.c:2576 gio/glocalfileoutputstream.c:658 msgid "Invalid filename" msgstr "Neplatný názov súboru" -#: gio/glocalfile.c:1352 gio/glocalfile.c:1363 +#: gio/glocalfile.c:1374 gio/glocalfile.c:1385 #, c-format msgid "Error opening file %s: %s" msgstr "Chyba pri otváraní súboru %s: %s" -#: gio/glocalfile.c:1488 +#: gio/glocalfile.c:1510 #, c-format msgid "Error removing file %s: %s" msgstr "Chyba pri odstraňovaní súboru %s: %s" -#: gio/glocalfile.c:1982 gio/glocalfile.c:1993 +#: gio/glocalfile.c:2004 gio/glocalfile.c:2015 gio/glocalfile.c:2042 #, c-format msgid "Error trashing file %s: %s" msgstr "Chyba pri zahadzovaní súboru %s do Koša: %s" -#: gio/glocalfile.c:2031 +#: gio/glocalfile.c:2062 #, fuzzy, c-format #| msgid "Unable to create trash dir %s: %s" msgid "Unable to create trash directory %s: %s" msgstr "Nepodarilo sa vytvoriť adresár Kôš %s: %s" -#: gio/glocalfile.c:2052 +#: gio/glocalfile.c:2083 #, c-format msgid "Unable to find toplevel directory to trash %s" msgstr "Nepodarilo sa nájsť adresár najvyššej úrovne pre Kôš %s" -#: gio/glocalfile.c:2060 +#: gio/glocalfile.c:2091 #, fuzzy, c-format #| msgid "Copy (reflink/clone) between mounts is not supported" msgid "Trashing on system internal mounts is not supported" msgstr "Kopírovanie (odkaz/klon) medzi pripojeniami nie je podporované" -#: gio/glocalfile.c:2146 gio/glocalfile.c:2174 +#: gio/glocalfile.c:2177 gio/glocalfile.c:2205 #, fuzzy, c-format #| msgid "Unable to find or create trash directory for %s" msgid "Unable to find or create trash directory %s to trash %s" msgstr "Nepodarilo sa nájsť ani vytvoriť adresár Kôš pre %s" -#: gio/glocalfile.c:2220 +#: gio/glocalfile.c:2249 #, c-format msgid "Unable to create trashing info file for %s: %s" msgstr "" "Nepodarilo sa vytvoriť informačný súbor o zahadzovaní do Koša pre %s: %s" -#: gio/glocalfile.c:2282 +#: gio/glocalfile.c:2320 #, c-format msgid "Unable to trash file %s across filesystem boundaries" msgstr "" "Nepodarilo sa zahodiť súbor do Koša cez hranice súborových systémov: %s" -#: gio/glocalfile.c:2286 gio/glocalfile.c:2342 +#: gio/glocalfile.c:2324 gio/glocalfile.c:2380 #, c-format msgid "Unable to trash file %s: %s" msgstr "Nepodarilo sa zahodiť súbor %s do Koša: %s" -#: gio/glocalfile.c:2348 +#: gio/glocalfile.c:2386 #, c-format msgid "Unable to trash file %s" msgstr "Nepodarilo sa zahodiť súbor %s do Koša" -#: gio/glocalfile.c:2374 +#: gio/glocalfile.c:2412 #, c-format msgid "Error creating directory %s: %s" msgstr "Chyba pri vytváraní adresára %s: %s" -#: gio/glocalfile.c:2403 +#: gio/glocalfile.c:2441 #, c-format msgid "Filesystem does not support symbolic links" msgstr "Súborový systém nepodporuje symbolické odkazy" -#: gio/glocalfile.c:2406 +#: gio/glocalfile.c:2444 #, c-format msgid "Error making symbolic link %s: %s" msgstr "Chyba pri vytváraní symbolického odkazu %s: %s" -#: gio/glocalfile.c:2449 gio/glocalfile.c:2484 gio/glocalfile.c:2541 +#: gio/glocalfile.c:2487 gio/glocalfile.c:2522 gio/glocalfile.c:2579 #, c-format msgid "Error moving file %s: %s" msgstr "Chyba pri presúvaní súboru %s: %s" -#: gio/glocalfile.c:2472 +#: gio/glocalfile.c:2510 msgid "Can’t move directory over directory" msgstr "Nedá sa prepísať adresár adresárom počas presúvania" -#: gio/glocalfile.c:2498 gio/glocalfileoutputstream.c:1108 -#: gio/glocalfileoutputstream.c:1122 gio/glocalfileoutputstream.c:1137 -#: gio/glocalfileoutputstream.c:1154 gio/glocalfileoutputstream.c:1168 +#: gio/glocalfile.c:2536 gio/glocalfileoutputstream.c:1110 +#: gio/glocalfileoutputstream.c:1124 gio/glocalfileoutputstream.c:1139 +#: gio/glocalfileoutputstream.c:1156 gio/glocalfileoutputstream.c:1170 msgid "Backup file creation failed" msgstr "Vytvorenie súboru zálohy zlyhalo" -#: gio/glocalfile.c:2517 +#: gio/glocalfile.c:2555 #, c-format msgid "Error removing target file: %s" msgstr "Chyba pri odstraňovaní cieľového súboru: %s" -#: gio/glocalfile.c:2531 +#: gio/glocalfile.c:2569 msgid "Move between mounts not supported" msgstr "Presun medzi pripojeniami nie je podporovaný" -#: gio/glocalfile.c:2705 +#: gio/glocalfile.c:2745 #, c-format msgid "Could not determine the disk usage of %s: %s" msgstr "Nepodarilo sa určiť využitie disku %s: %s" -#: gio/glocalfileinfo.c:767 +#: gio/glocalfileinfo.c:779 msgid "Attribute value must be non-NULL" msgstr "Hodnota atribútu nesmie byť NULL" -#: gio/glocalfileinfo.c:774 -msgid "Invalid attribute type (string expected)" +#: gio/glocalfileinfo.c:786 +#, fuzzy +#| msgid "Invalid attribute type (string expected)" +msgid "Invalid attribute type (string or invalid expected)" msgstr "Neplatný typ atribútu (očakávaný reťazec)" -#: gio/glocalfileinfo.c:781 +#: gio/glocalfileinfo.c:793 msgid "Invalid extended attribute name" msgstr "Neplatný názov rozšíreného atribútu" -#: gio/glocalfileinfo.c:821 +#: gio/glocalfileinfo.c:844 #, c-format msgid "Error setting extended attribute “%s”: %s" msgstr "Chyba pri nastavovaní rozšíreného atribútu „%s“: %s" -#: gio/glocalfileinfo.c:1709 gio/win32/gwinhttpfile.c:191 +#: gio/glocalfileinfo.c:1823 gio/win32/gwinhttpfile.c:191 msgid " (invalid encoding)" msgstr " (neplatné kódovanie)" -#: gio/glocalfileinfo.c:1868 gio/glocalfileoutputstream.c:943 -#: gio/glocalfileoutputstream.c:995 +#: gio/glocalfileinfo.c:1982 gio/glocalfileoutputstream.c:945 +#: gio/glocalfileoutputstream.c:997 #, c-format msgid "Error when getting information for file “%s”: %s" msgstr "Chyba pri získavaní informácií pre súbor „%s“: %s" -#: gio/glocalfileinfo.c:2134 +#: gio/glocalfileinfo.c:2288 #, c-format msgid "Error when getting information for file descriptor: %s" msgstr "Chyba pri získavaní informácií pre popisovač súboru: %s" -#: gio/glocalfileinfo.c:2179 +#: gio/glocalfileinfo.c:2333 msgid "Invalid attribute type (uint32 expected)" msgstr "Neplatný typ atribútu (očakávané uint32)" -#: gio/glocalfileinfo.c:2197 +#: gio/glocalfileinfo.c:2351 msgid "Invalid attribute type (uint64 expected)" msgstr "Neplatný typ atribútu (očakávané uint64)" -#: gio/glocalfileinfo.c:2216 gio/glocalfileinfo.c:2235 +#: gio/glocalfileinfo.c:2370 gio/glocalfileinfo.c:2389 msgid "Invalid attribute type (byte string expected)" msgstr "Neplatný typ atribútu (očakávaný bajtový reťazec)" -#: gio/glocalfileinfo.c:2282 +#: gio/glocalfileinfo.c:2436 msgid "Cannot set permissions on symlinks" msgstr "Pre symbolické odkazy sa nedajú nastaviť oprávnenia" -#: gio/glocalfileinfo.c:2298 +#: gio/glocalfileinfo.c:2452 #, c-format msgid "Error setting permissions: %s" msgstr "Chyba pri nastavovaní oprávnení: %s" -#: gio/glocalfileinfo.c:2349 +#: gio/glocalfileinfo.c:2503 #, c-format msgid "Error setting owner: %s" msgstr "Chyba pri nastavovaní vlastníka: %s" -#: gio/glocalfileinfo.c:2372 +#: gio/glocalfileinfo.c:2526 msgid "symlink must be non-NULL" msgstr "symbolický odkaz nesmie byť NULL" -#: gio/glocalfileinfo.c:2382 gio/glocalfileinfo.c:2401 -#: gio/glocalfileinfo.c:2412 +#: gio/glocalfileinfo.c:2536 gio/glocalfileinfo.c:2555 +#: gio/glocalfileinfo.c:2566 #, c-format msgid "Error setting symlink: %s" msgstr "Chyba pri nastavovaní symbolického odkazu: %s" -#: gio/glocalfileinfo.c:2391 +#: gio/glocalfileinfo.c:2545 msgid "Error setting symlink: file is not a symlink" msgstr "" "Chyba pri nastavovaní symbolického odkazu: súbor nie je symbolický odkaz" -#: gio/glocalfileinfo.c:2463 +#: gio/glocalfileinfo.c:2637 #, c-format msgid "Extra nanoseconds %d for UNIX timestamp %lld are negative" msgstr "%d nanosekúnd navyše pre UNIXovú časovú značku %lld je záporných" -#: gio/glocalfileinfo.c:2472 +#: gio/glocalfileinfo.c:2646 #, c-format msgid "Extra nanoseconds %d for UNIX timestamp %lld reach 1 second" msgstr "%d nanosekúnd navyše pre UNIXovú časovú značku %lld dosiahlo 1 sekundu" -#: gio/glocalfileinfo.c:2482 +#: gio/glocalfileinfo.c:2656 #, c-format msgid "UNIX timestamp %lld does not fit into 64 bits" msgstr "UNIXová časová značka %lld sa nevmestí do 64 bitov" -#: gio/glocalfileinfo.c:2493 +#: gio/glocalfileinfo.c:2667 #, c-format msgid "UNIX timestamp %lld is outside of the range supported by Windows" msgstr "" "UNIXová časová značka %lld je mimo rozsahu podporovaného systémom Windows" -#: gio/glocalfileinfo.c:2570 +#: gio/glocalfileinfo.c:2799 #, c-format msgid "File name “%s” cannot be converted to UTF-16" msgstr "Názov súboru „%s“ nemôže byť prevedený na kódovanie UTF-16" -#: gio/glocalfileinfo.c:2589 +#: gio/glocalfileinfo.c:2818 #, c-format msgid "File “%s” cannot be opened: Windows Error %lu" msgstr "Súbor „%s“ sa nedá otvoriť: Chyba systému Windows %lu" -#: gio/glocalfileinfo.c:2602 +#: gio/glocalfileinfo.c:2831 #, c-format msgid "Error setting modification or access time for file “%s”: %lu" msgstr "Chyba pri nastavovaní času prístupu alebo zmeny súboru „%s“: %lu" -#: gio/glocalfileinfo.c:2703 +#: gio/glocalfileinfo.c:2988 #, c-format msgid "Error setting modification or access time: %s" msgstr "Chyba pri nastavovaní času prístupu alebo zmeny: %s" -#: gio/glocalfileinfo.c:2726 +#: gio/glocalfileinfo.c:3011 msgid "SELinux context must be non-NULL" msgstr "Kontext pre SELinux nesmie byť NULL" -#: gio/glocalfileinfo.c:2733 +#: gio/glocalfileinfo.c:3018 msgid "SELinux is not enabled on this system" msgstr "SELinux nie je na tomto systéme povolený" -#: gio/glocalfileinfo.c:2743 +#: gio/glocalfileinfo.c:3028 #, c-format msgid "Error setting SELinux context: %s" msgstr "Chyba pri nastavovaní kontextu pre SELinux: %s" -#: gio/glocalfileinfo.c:2836 +#: gio/glocalfileinfo.c:3125 #, c-format msgid "Setting attribute %s not supported" msgstr "Nastavovanie atribútu %s nie je podporované" -#: gio/glocalfileinputstream.c:163 gio/glocalfileoutputstream.c:801 +#: gio/glocalfileinputstream.c:165 gio/glocalfileoutputstream.c:803 #, c-format msgid "Error reading from file: %s" msgstr "Chyba pri čítaní zo súboru: %s" -#: gio/glocalfileinputstream.c:194 gio/glocalfileoutputstream.c:353 -#: gio/glocalfileoutputstream.c:447 +#: gio/glocalfileinputstream.c:196 gio/glocalfileoutputstream.c:355 +#: gio/glocalfileoutputstream.c:449 #, c-format msgid "Error closing file: %s" msgstr "Chyba pri zatváraní súboru: %s" -#: gio/glocalfileinputstream.c:272 gio/glocalfileoutputstream.c:563 -#: gio/glocalfileoutputstream.c:1186 +#: gio/glocalfileinputstream.c:274 gio/glocalfileoutputstream.c:565 +#: gio/glocalfileoutputstream.c:1188 #, c-format msgid "Error seeking in file: %s" msgstr "Chyba pri presúvaní v súbore: %s" -#: gio/glocalfilemonitor.c:866 +#: gio/glocalfilemonitor.c:882 msgid "Unable to find default local file monitor type" msgstr "Nepodarilo sa nájsť predvolený typ sledovania lokálneho súboru" -#: gio/glocalfileoutputstream.c:220 gio/glocalfileoutputstream.c:298 -#: gio/glocalfileoutputstream.c:334 gio/glocalfileoutputstream.c:822 +#: gio/glocalfileoutputstream.c:222 gio/glocalfileoutputstream.c:300 +#: gio/glocalfileoutputstream.c:336 gio/glocalfileoutputstream.c:824 #, c-format msgid "Error writing to file: %s" msgstr "Chyba pri zápise do súboru: %s" -#: gio/glocalfileoutputstream.c:380 +#: gio/glocalfileoutputstream.c:382 #, c-format msgid "Error removing old backup link: %s" msgstr "Chyba pri odstraňovaní starého záložného odkazu: %s" -#: gio/glocalfileoutputstream.c:394 gio/glocalfileoutputstream.c:407 +#: gio/glocalfileoutputstream.c:396 gio/glocalfileoutputstream.c:409 #, c-format msgid "Error creating backup copy: %s" msgstr "Chyba pri vytváraní záložnej kópie: %s" -#: gio/glocalfileoutputstream.c:425 +#: gio/glocalfileoutputstream.c:427 #, c-format msgid "Error renaming temporary file: %s" msgstr "Chyba pri premenúvaní dočasného súboru: %s" -#: gio/glocalfileoutputstream.c:609 gio/glocalfileoutputstream.c:1237 +#: gio/glocalfileoutputstream.c:611 gio/glocalfileoutputstream.c:1242 #, c-format msgid "Error truncating file: %s" msgstr "Chyba pri skracovaní súboru: %s" -#: gio/glocalfileoutputstream.c:662 gio/glocalfileoutputstream.c:907 -#: gio/glocalfileoutputstream.c:1218 gio/gsubprocess.c:226 +#: gio/glocalfileoutputstream.c:664 gio/glocalfileoutputstream.c:909 +#: gio/glocalfileoutputstream.c:1223 gio/gsubprocess.c:231 #, c-format msgid "Error opening file “%s”: %s" msgstr "Chyba pri otváraní súboru %s: %s" -#: gio/glocalfileoutputstream.c:957 +#: gio/glocalfileoutputstream.c:959 msgid "Target file is a directory" msgstr "Cieľový súbor je adresár" -#: gio/glocalfileoutputstream.c:971 +#: gio/glocalfileoutputstream.c:973 msgid "Target file is not a regular file" msgstr "Cieľový súbor nie je obyčajný súbor" -#: gio/glocalfileoutputstream.c:1013 +#: gio/glocalfileoutputstream.c:1015 msgid "The file was externally modified" msgstr "Súbor bol externe zmenený" -#: gio/glocalfileoutputstream.c:1202 +#: gio/glocalfileoutputstream.c:1205 #, c-format msgid "Error removing old file: %s" msgstr "Chyba pri odstraňovaní starého súboru: %s" -#: gio/gmemoryinputstream.c:474 gio/gmemoryoutputstream.c:772 +#: gio/gmemoryinputstream.c:476 gio/gmemoryoutputstream.c:764 msgid "Invalid GSeekType supplied" msgstr "Poskytnutý neplatný GSeekType" -#: gio/gmemoryinputstream.c:484 +#: gio/gmemoryinputstream.c:486 msgid "Invalid seek request" msgstr "Neplatná požiadavka na presunutie" -#: gio/gmemoryinputstream.c:508 +#: gio/gmemoryinputstream.c:510 msgid "Cannot truncate GMemoryInputStream" msgstr "GMemoryInputStream sa nedá skrátiť" -#: gio/gmemoryoutputstream.c:567 +#: gio/gmemoryoutputstream.c:570 msgid "Memory output stream not resizable" msgstr "Pamäťový výstupný prúd nepodporuje zmenu veľkosti" -#: gio/gmemoryoutputstream.c:583 +#: gio/gmemoryoutputstream.c:586 msgid "Failed to resize memory output stream" msgstr "Zlyhala zmena veľkosti pamäťového výstupného prúdu" -#: gio/gmemoryoutputstream.c:673 +#: gio/gmemoryoutputstream.c:665 msgid "" "Amount of memory required to process the write is larger than available " "address space" @@ -3459,32 +3500,32 @@ "Veľkosť pamäte potrebná na vykonanie zápisu je väčšia ako dostupný adresný " "priestor" -#: gio/gmemoryoutputstream.c:782 +#: gio/gmemoryoutputstream.c:774 msgid "Requested seek before the beginning of the stream" msgstr "Požadovaný presun pred začiatok prúdu" -#: gio/gmemoryoutputstream.c:797 +#: gio/gmemoryoutputstream.c:789 msgid "Requested seek beyond the end of the stream" msgstr "Požadovaný presun za koniec prúdu" #. Translators: This is an error #. * message for mount objects that #. * don't implement unmount. -#: gio/gmount.c:399 +#: gio/gmount.c:401 msgid "mount doesn’t implement “unmount”" msgstr "pripojenie neimplementuje „unmount“ (odpojenie)" #. Translators: This is an error #. * message for mount objects that #. * don't implement eject. -#: gio/gmount.c:475 +#: gio/gmount.c:477 msgid "mount doesn’t implement “eject”" msgstr "pripojenie neimplementuje „eject“ (vysunutie)" #. Translators: This is an error #. * message for mount objects that #. * don't implement any of unmount or unmount_with_operation. -#: gio/gmount.c:553 +#: gio/gmount.c:555 msgid "mount doesn’t implement “unmount” or “unmount_with_operation”" msgstr "" "pripojenie neimplementuje „unmount“ (odpojenie) ani " @@ -3493,7 +3534,7 @@ #. Translators: This is an error #. * message for mount objects that #. * don't implement any of eject or eject_with_operation. -#: gio/gmount.c:638 +#: gio/gmount.c:640 msgid "mount doesn’t implement “eject” or “eject_with_operation”" msgstr "" "pripojenie neimplementuje „eject“ (vysunutie) ani " @@ -3502,106 +3543,118 @@ #. Translators: This is an error #. * message for mount objects that #. * don't implement remount. -#: gio/gmount.c:726 +#: gio/gmount.c:728 msgid "mount doesn’t implement “remount”" msgstr "pripojenie neimplementuje „remount“ (opätovné pripojenie)" #. Translators: This is an error #. * message for mount objects that #. * don't implement content type guessing. -#: gio/gmount.c:808 +#: gio/gmount.c:810 msgid "mount doesn’t implement content type guessing" msgstr "pripojenie neimplementuje odhad typu obsahu" #. Translators: This is an error #. * message for mount objects that #. * don't implement content type guessing. -#: gio/gmount.c:895 +#: gio/gmount.c:897 msgid "mount doesn’t implement synchronous content type guessing" msgstr "pripojenie neimplementuje synchrónny odhad typu obsahu" -#: gio/gnetworkaddress.c:415 +#: gio/gnetworkaddress.c:417 #, c-format msgid "Hostname “%s” contains “” but not “”" msgstr "Názov hostiteľa „%s“ obsahuje „“, ale neobsahuje „“" -#: gio/gnetworkmonitorbase.c:219 gio/gnetworkmonitorbase.c:323 +#: gio/gnetworkmonitorbase.c:221 gio/gnetworkmonitorbase.c:325 msgid "Network unreachable" msgstr "Sieť nedostupná" -#: gio/gnetworkmonitorbase.c:257 gio/gnetworkmonitorbase.c:287 +#: gio/gnetworkmonitorbase.c:259 gio/gnetworkmonitorbase.c:289 msgid "Host unreachable" msgstr "Hostiteľ nedostupný" -#: gio/gnetworkmonitornetlink.c:99 gio/gnetworkmonitornetlink.c:111 -#: gio/gnetworkmonitornetlink.c:130 +#: gio/gnetworkmonitornetlink.c:101 gio/gnetworkmonitornetlink.c:113 +#: gio/gnetworkmonitornetlink.c:132 #, c-format msgid "Could not create network monitor: %s" msgstr "Nepodarilo sa vytvoriť monitor siete: %s" -#: gio/gnetworkmonitornetlink.c:120 +#: gio/gnetworkmonitornetlink.c:122 msgid "Could not create network monitor: " msgstr "Nepodarilo sa vytvoriť monitor siete: " -#: gio/gnetworkmonitornetlink.c:183 +#: gio/gnetworkmonitornetlink.c:185 msgid "Could not get network status: " msgstr "Nepodarilo sa získať vzdialenú adresu: " -#: gio/gnetworkmonitornm.c:348 +#: gio/gnetworkmonitornm.c:313 #, c-format msgid "NetworkManager not running" msgstr "Program NetworkManager nie je spustený" -#: gio/gnetworkmonitornm.c:359 +#: gio/gnetworkmonitornm.c:324 #, c-format msgid "NetworkManager version too old" msgstr "Verzia programu NetworkManager je príliš stará" -#: gio/goutputstream.c:232 gio/goutputstream.c:775 +#: gio/goutputstream.c:234 gio/goutputstream.c:777 msgid "Output stream doesn’t implement write" msgstr "Výstupný prúd neimplementuje zápis" -#: gio/goutputstream.c:472 gio/goutputstream.c:1533 +#: gio/goutputstream.c:474 gio/goutputstream.c:1535 #, c-format msgid "Sum of vectors passed to %s too large" msgstr "Súčet vektorov predaných funkcii %s je príliš veľký" -#: gio/goutputstream.c:736 gio/goutputstream.c:1761 +#: gio/goutputstream.c:738 gio/goutputstream.c:1763 msgid "Source stream is already closed" msgstr "Zdrojový prúd je už zatvorený" -#: gio/gresolver.c:386 gio/gthreadedresolver.c:150 gio/gthreadedresolver.c:168 +#: gio/gproxyaddressenumerator.c:324 gio/gproxyaddressenumerator.c:342 +msgid "Unspecified proxy lookup failure" +msgstr "" + +#. Translators: the first placeholder is a domain name, the +#. * second is an error message +#: gio/gresolver.c:403 gio/gthreadedresolver.c:152 gio/gthreadedresolver.c:170 +#: gio/gthreadedresolver.c:798 gio/gthreadedresolver.c:822 +#: gio/gthreadedresolver.c:847 gio/gthreadedresolver.c:862 #, c-format msgid "Error resolving “%s”: %s" msgstr "Chyba pri preklade adresy „%s“: %s" #. Translators: The placeholder is for a function name. -#: gio/gresolver.c:455 gio/gresolver.c:615 +#: gio/gresolver.c:472 gio/gresolver.c:632 #, c-format msgid "%s not implemented" msgstr "Funkcia %s nie je implementovaná" -#: gio/gresolver.c:984 gio/gresolver.c:1036 +#: gio/gresolver.c:1001 gio/gresolver.c:1053 msgid "Invalid domain" msgstr "Neplatná doména" # %s je cesta -#: gio/gresource.c:681 gio/gresource.c:943 gio/gresource.c:983 -#: gio/gresource.c:1107 gio/gresource.c:1179 gio/gresource.c:1253 -#: gio/gresource.c:1334 gio/gresourcefile.c:476 gio/gresourcefile.c:599 -#: gio/gresourcefile.c:736 +#: gio/gresource.c:683 gio/gresource.c:945 gio/gresource.c:985 +#: gio/gresource.c:1109 gio/gresource.c:1181 gio/gresource.c:1255 +#: gio/gresource.c:1336 gio/gresourcefile.c:478 gio/gresourcefile.c:602 +#: gio/gresourcefile.c:753 #, c-format msgid "The resource at “%s” does not exist" msgstr "Zdroj v „%s“ neexistuje" # %s je cesta -#: gio/gresource.c:848 +#: gio/gresource.c:850 #, c-format msgid "The resource at “%s” failed to decompress" msgstr "Zdroj v „%s“ sa nepodarilo rozbaliť" +#: gio/gresourcefile.c:659 +msgid "Resource files cannot be renamed" +msgstr "" + # %s je cesta -#: gio/gresourcefile.c:732 +#: gio/gresourcefile.c:749 #, c-format msgid "The resource at “%s” is not a directory" msgstr "Zdroj v „%s“ nie je adresár" @@ -3609,15 +3662,15 @@ # MČ: všimol som si to na viacerých miestach, ale nepasuje mi to. Nemalo by byť skôr „posúvanie“? # PM: presúvaš sa na iné miesto posúvanie mi tiez nevadí, ak dalsí kontrolór uzná ze by to malo byt posúvanie môže zmeniť. # PK: necham presuvanie, lebo presuva sa kurzor, posuvanie mi evokuje ze sa data posuvaju -#: gio/gresourcefile.c:940 +#: gio/gresourcefile.c:957 msgid "Input stream doesn’t implement seek" msgstr "Vstupný prúd neimplementuje presúvanie" -#: gio/gresource-tool.c:500 +#: gio/gresource-tool.c:502 msgid "List sections containing resources in an elf FILE" msgstr "Zoznam častí obsahujúcich zdroje v SÚBORE vo formáte elf" -#: gio/gresource-tool.c:506 +#: gio/gresource-tool.c:508 msgid "" "List resources\n" "If SECTION is given, only list resources in this section\n" @@ -3627,15 +3680,15 @@ "Ak je zadaná ČASŤ, budú to iba zdroje tejto časti\n" "Ak je zadaná CESTA, bude to iba zoznam zodpovedajúcich zdrojov" -#: gio/gresource-tool.c:509 gio/gresource-tool.c:519 +#: gio/gresource-tool.c:511 gio/gresource-tool.c:521 msgid "FILE PATH" msgstr "SÚBOR CESTA" -#: gio/gresource-tool.c:510 gio/gresource-tool.c:520 gio/gresource-tool.c:527 +#: gio/gresource-tool.c:512 gio/gresource-tool.c:522 gio/gresource-tool.c:529 msgid "SECTION" msgstr "ČASŤ" -#: gio/gresource-tool.c:515 +#: gio/gresource-tool.c:517 msgid "" "List resources with details\n" "If SECTION is given, only list resources in this section\n" @@ -3647,15 +3700,15 @@ "Ak je zadaná CESTA, bude to iba zoznam zodpovedajúcich zdrojov\n" "Podrobnosti zahŕňajú časti, veľkosti a kompresie" -#: gio/gresource-tool.c:525 +#: gio/gresource-tool.c:527 msgid "Extract a resource file to stdout" msgstr "Extrahuje súbor zdrojov do stdout" -#: gio/gresource-tool.c:526 +#: gio/gresource-tool.c:528 msgid "FILE PATH" msgstr "CESTA SÚBORU" -#: gio/gresource-tool.c:540 +#: gio/gresource-tool.c:542 msgid "" "Usage:\n" " gresource --section SECTION COMMAND ARGS…\n" @@ -3680,7 +3733,7 @@ " details Zoznam zdrojov s podrobnosťami\n" " extract Extrahuje zdroj\n" -#: gio/gresource-tool.c:554 +#: gio/gresource-tool.c:556 #, c-format msgid "" "Usage:\n" @@ -3696,19 +3749,19 @@ "\n" # http://en.wikipedia.org/wiki/Executable_and_Linkable_Format -#: gio/gresource-tool.c:561 +#: gio/gresource-tool.c:563 msgid " SECTION An (optional) elf section name\n" msgstr " ČASŤ (voliteľný) názov časti elf\n" -#: gio/gresource-tool.c:565 gio/gsettings-tool.c:706 +#: gio/gresource-tool.c:567 gio/gsettings-tool.c:720 msgid " COMMAND The (optional) command to explain\n" msgstr " PRÍKAZ (voliteľný) príkaz na vysvetlenie\n" -#: gio/gresource-tool.c:571 +#: gio/gresource-tool.c:573 msgid " FILE An elf file (a binary or a shared library)\n" msgstr " SÚBOR elf súbor (binárny súbor alebo zdieľaná knižnica)\n" -#: gio/gresource-tool.c:574 +#: gio/gresource-tool.c:576 msgid "" " FILE An elf file (a binary or a shared library)\n" " or a compiled resource file\n" @@ -3716,82 +3769,82 @@ " SÚBOR Súbor vo formáte elf (binárny súbor alebo zdieľaná knižnica)\n" " alebo preložený súbor zdrojov\n" -#: gio/gresource-tool.c:578 +#: gio/gresource-tool.c:580 msgid "PATH" msgstr "CESTA" -#: gio/gresource-tool.c:580 +#: gio/gresource-tool.c:582 msgid " PATH An (optional) resource path (may be partial)\n" msgstr " CESTA (voliteľná) cesta k súboru zdrojov (môže byť čiastočná)\n" -#: gio/gresource-tool.c:581 +#: gio/gresource-tool.c:583 msgid "PATH" msgstr "CESTA" -#: gio/gresource-tool.c:583 +#: gio/gresource-tool.c:585 msgid " PATH A resource path\n" msgstr " CESTA Cesta k súboru zdrojov\n" -#: gio/gsettings-tool.c:49 gio/gsettings-tool.c:70 gio/gsettings-tool.c:911 +#: gio/gsettings-tool.c:51 gio/gsettings-tool.c:72 gio/gsettings-tool.c:925 #, c-format msgid "No such schema “%s”\n" msgstr "Neexistuje schéma „%s“\n" -#: gio/gsettings-tool.c:55 +#: gio/gsettings-tool.c:57 #, c-format msgid "Schema “%s” is not relocatable (path must not be specified)\n" msgstr "Schéma „%s“ nie je premiestniteľná (cesta nesmie byť určená)\n" -#: gio/gsettings-tool.c:76 +#: gio/gsettings-tool.c:78 #, c-format msgid "Schema “%s” is relocatable (path must be specified)\n" msgstr "Schéma „%s“ je premiestniteľná (cesta musí byť určená)\n" -#: gio/gsettings-tool.c:90 +#: gio/gsettings-tool.c:92 msgid "Empty path given.\n" msgstr "Poskytnutá prázdna cesta.\n" -#: gio/gsettings-tool.c:96 +#: gio/gsettings-tool.c:98 msgid "Path must begin with a slash (/)\n" msgstr "Cesta musí začínať lomkou (/)\n" -#: gio/gsettings-tool.c:102 +#: gio/gsettings-tool.c:104 msgid "Path must end with a slash (/)\n" msgstr "Cesta musí končiť lomkou (/)\n" -#: gio/gsettings-tool.c:108 +#: gio/gsettings-tool.c:110 msgid "Path must not contain two adjacent slashes (//)\n" msgstr "Cesta nesmie obsahovať dve po sebe nasledujúce lomky (//)\n" -#: gio/gsettings-tool.c:541 +#: gio/gsettings-tool.c:555 msgid "The provided value is outside of the valid range\n" msgstr "Poskytnutá hodnota nepatrí do platného rozsahu\n" -#: gio/gsettings-tool.c:548 +#: gio/gsettings-tool.c:562 msgid "The key is not writable\n" msgstr "Kľúč nie je zapisovateľný\n" -#: gio/gsettings-tool.c:584 +#: gio/gsettings-tool.c:598 msgid "List the installed (non-relocatable) schemas" msgstr "Vypíše nainštalované (nepremiestniteľné) schémy" -#: gio/gsettings-tool.c:590 +#: gio/gsettings-tool.c:604 msgid "List the installed relocatable schemas" msgstr "Vypíše nainštalované premiestniteľné schémy" -#: gio/gsettings-tool.c:596 +#: gio/gsettings-tool.c:610 msgid "List the keys in SCHEMA" msgstr "Vypíše kľúče v SCHÉME" -#: gio/gsettings-tool.c:597 gio/gsettings-tool.c:603 gio/gsettings-tool.c:646 +#: gio/gsettings-tool.c:611 gio/gsettings-tool.c:617 gio/gsettings-tool.c:660 msgid "SCHEMA:PATH" msgstr "SCHÉMA:CESTA" -#: gio/gsettings-tool.c:602 +#: gio/gsettings-tool.c:616 msgid "List the children of SCHEMA" msgstr "Vypíše potomkov SCHÉMY" -#: gio/gsettings-tool.c:608 +#: gio/gsettings-tool.c:622 msgid "" "List keys and values, recursively\n" "If no SCHEMA is given, list all keys\n" @@ -3799,48 +3852,48 @@ "Vypíše rekurzívne všetky kľúče a hodnoty\n" "Ak SCHÉMA nie je zadaná, vypíše všetky kľúče\n" -#: gio/gsettings-tool.c:610 +#: gio/gsettings-tool.c:624 msgid "SCHEMA:PATH" msgstr "SCHÉMA:CESTA" -#: gio/gsettings-tool.c:615 +#: gio/gsettings-tool.c:629 msgid "Get the value of KEY" msgstr "Získa hodnotu KĽÚČA" -#: gio/gsettings-tool.c:616 gio/gsettings-tool.c:622 gio/gsettings-tool.c:628 -#: gio/gsettings-tool.c:640 gio/gsettings-tool.c:652 +#: gio/gsettings-tool.c:630 gio/gsettings-tool.c:636 gio/gsettings-tool.c:642 +#: gio/gsettings-tool.c:654 gio/gsettings-tool.c:666 msgid "SCHEMA:PATH KEY" msgstr "SCHÉMA:CESTA KĽÚČ" -#: gio/gsettings-tool.c:621 +#: gio/gsettings-tool.c:635 msgid "Query the range of valid values for KEY" msgstr "Spýta sa na platný rozsah hodnôt KĽÚČA" -#: gio/gsettings-tool.c:627 +#: gio/gsettings-tool.c:641 msgid "Query the description for KEY" msgstr "Spýta sa na popis KĽÚČA" -#: gio/gsettings-tool.c:633 +#: gio/gsettings-tool.c:647 msgid "Set the value of KEY to VALUE" msgstr "Nastaví hodnotu KĽÚČA na HODNOTU" -#: gio/gsettings-tool.c:634 +#: gio/gsettings-tool.c:648 msgid "SCHEMA:PATH KEY VALUE" msgstr "SCHÉMA:CESTA KĽÚČ HODNOTA" -#: gio/gsettings-tool.c:639 +#: gio/gsettings-tool.c:653 msgid "Reset KEY to its default value" msgstr "Nastaví KĽÚČ na jeho predvolenú hodnotu" -#: gio/gsettings-tool.c:645 +#: gio/gsettings-tool.c:659 msgid "Reset all keys in SCHEMA to their defaults" msgstr "Nastaví všetky kľúče v SCHÉME na ich predvolené hodnoty" -#: gio/gsettings-tool.c:651 +#: gio/gsettings-tool.c:665 msgid "Check if KEY is writable" msgstr "Skontroluje, či je KĽÚČ zapisovateľný" -#: gio/gsettings-tool.c:657 +#: gio/gsettings-tool.c:671 msgid "" "Monitor KEY for changes.\n" "If no KEY is specified, monitor all keys in SCHEMA.\n" @@ -3850,11 +3903,11 @@ "Ak KĽÚČ nie určený, sleduje všetky kľúče v SCHÉME.\n" "Sledovanie zastavíte pomocou ^C.\n" -#: gio/gsettings-tool.c:660 +#: gio/gsettings-tool.c:674 msgid "SCHEMA:PATH KEY" msgstr "SCHÉMA:CESTA KĽÚČ" -#: gio/gsettings-tool.c:672 +#: gio/gsettings-tool.c:686 msgid "" "Usage:\n" " gsettings --version\n" @@ -3902,7 +3955,7 @@ "Podrobnejšieho pomocníka získate pomocou „gsettings help PRÍKAZ“.\n" "\n" -#: gio/gsettings-tool.c:696 +#: gio/gsettings-tool.c:710 #, c-format msgid "" "Usage:\n" @@ -3917,11 +3970,11 @@ "%s\n" "\n" -#: gio/gsettings-tool.c:702 +#: gio/gsettings-tool.c:716 msgid " SCHEMADIR A directory to search for additional schemas\n" msgstr " ADRESÁR_SCHÉMY Adresár, v ktorom sa majú hľadať dodatočné schémy\n" -#: gio/gsettings-tool.c:710 +#: gio/gsettings-tool.c:724 msgid "" " SCHEMA The name of the schema\n" " PATH The path, for relocatable schemas\n" @@ -3929,401 +3982,434 @@ " SCHÉMA Názov schémy\n" " CESTA Cesta pre premiestniteľné schémy\n" -#: gio/gsettings-tool.c:715 +#: gio/gsettings-tool.c:729 msgid " KEY The (optional) key within the schema\n" msgstr " KĽÚČ (voliteľný) kľúč vo vnútri schémy\n" -#: gio/gsettings-tool.c:719 +#: gio/gsettings-tool.c:733 msgid " KEY The key within the schema\n" msgstr " KĽÚČ Kľúč vo vnútri schémy\n" -#: gio/gsettings-tool.c:723 +#: gio/gsettings-tool.c:737 msgid " VALUE The value to set\n" msgstr " HODNOTA Hodnota, ktorá sa má nastaviť\n" -#: gio/gsettings-tool.c:778 +#: gio/gsettings-tool.c:792 #, c-format msgid "Could not load schemas from %s: %s\n" msgstr "Nepodarilo sa načítať schémy z %s: %s\n" -#: gio/gsettings-tool.c:790 +#: gio/gsettings-tool.c:804 msgid "No schemas installed\n" msgstr "Nie sú nainštalované žiadne schémy\n" -#: gio/gsettings-tool.c:869 +#: gio/gsettings-tool.c:883 msgid "Empty schema name given\n" msgstr "Poskytnutý prázdny názov schémy\n" -#: gio/gsettings-tool.c:924 +#: gio/gsettings-tool.c:938 #, c-format msgid "No such key “%s”\n" msgstr "Neexistuje kľúč „%s“\n" -#: gio/gsocket.c:413 +#: gio/gsocket.c:419 msgid "Invalid socket, not initialized" msgstr "Neplatný soket, neinicializované" -#: gio/gsocket.c:420 +#: gio/gsocket.c:426 #, c-format msgid "Invalid socket, initialization failed due to: %s" msgstr "Neplatný soket, inicializácia zlyhala kvôli: %s" -#: gio/gsocket.c:428 +#: gio/gsocket.c:434 msgid "Socket is already closed" msgstr "Soket je už zatvorený" -#: gio/gsocket.c:443 gio/gsocket.c:3190 gio/gsocket.c:4420 gio/gsocket.c:4478 +#: gio/gsocket.c:449 gio/gsocket.c:3225 gio/gsocket.c:4458 gio/gsocket.c:4516 msgid "Socket I/O timed out" msgstr "Vypršal časový limit V/V soketu" -#: gio/gsocket.c:578 +#: gio/gsocket.c:586 #, c-format msgid "creating GSocket from fd: %s" msgstr "vytvára sa GSocket z popisovanča súboru: %s" -#: gio/gsocket.c:607 gio/gsocket.c:671 gio/gsocket.c:678 +#: gio/gsocket.c:615 gio/gsocket.c:679 gio/gsocket.c:686 #, c-format msgid "Unable to create socket: %s" msgstr "Nepodarilo sa vytvoriť soket: %s" -#: gio/gsocket.c:671 +#: gio/gsocket.c:679 msgid "Unknown family was specified" msgstr "Bola zadaná neznáma rodina protokolov" -#: gio/gsocket.c:678 +#: gio/gsocket.c:686 msgid "Unknown protocol was specified" msgstr "Bol zadaný neznámy protokol" -#: gio/gsocket.c:1169 +#: gio/gsocket.c:1177 #, c-format msgid "Cannot use datagram operations on a non-datagram socket." msgstr "" "Nedajú sa použiť operácie soketu datagram na sokete nepodporujúcom datagram." -#: gio/gsocket.c:1186 +#: gio/gsocket.c:1194 #, c-format msgid "Cannot use datagram operations on a socket with a timeout set." msgstr "" "Nedajú sa použiť operácie soketu datagram na sokete s nastavením vypršaním " "času." -#: gio/gsocket.c:1993 +#: gio/gsocket.c:2001 #, c-format msgid "could not get local address: %s" msgstr "nepodarilo sa získať lokálnu adresu: %s" -#: gio/gsocket.c:2039 +#: gio/gsocket.c:2047 #, c-format msgid "could not get remote address: %s" msgstr "nepodarilo sa získať vzdialenú adresu: %s" -#: gio/gsocket.c:2105 +#: gio/gsocket.c:2113 #, c-format msgid "could not listen: %s" msgstr "nepodarilo sa počúvať: %s" -#: gio/gsocket.c:2209 +#: gio/gsocket.c:2217 #, c-format msgid "Error binding to address %s: %s" msgstr "Chyba pri viazaní sa na adresu %s: %s" -#: gio/gsocket.c:2385 gio/gsocket.c:2422 gio/gsocket.c:2532 gio/gsocket.c:2557 -#: gio/gsocket.c:2620 gio/gsocket.c:2678 gio/gsocket.c:2696 +#: gio/gsocket.c:2392 gio/gsocket.c:2429 gio/gsocket.c:2539 gio/gsocket.c:2564 +#: gio/gsocket.c:2631 gio/gsocket.c:2689 gio/gsocket.c:2707 #, c-format msgid "Error joining multicast group: %s" msgstr "Chyba pri pripájaní sa k multicast skupine: %s" -#: gio/gsocket.c:2386 gio/gsocket.c:2423 gio/gsocket.c:2533 gio/gsocket.c:2558 -#: gio/gsocket.c:2621 gio/gsocket.c:2679 gio/gsocket.c:2697 +#: gio/gsocket.c:2393 gio/gsocket.c:2430 gio/gsocket.c:2540 gio/gsocket.c:2565 +#: gio/gsocket.c:2632 gio/gsocket.c:2690 gio/gsocket.c:2708 #, c-format msgid "Error leaving multicast group: %s" msgstr "Chyba pri odpájaní sa od multicast skupiny: %s" # PM: SSM je termín neprekladal som to # http://en.wikipedia.org/wiki/Source-specific_multicast -#: gio/gsocket.c:2387 +#: gio/gsocket.c:2394 msgid "No support for source-specific multicast" msgstr "Nie je podpora pre source-specific multicast" -#: gio/gsocket.c:2534 +#: gio/gsocket.c:2541 msgid "Unsupported socket family" msgstr "Nepodporovaná rodina soketu" -#: gio/gsocket.c:2559 +#: gio/gsocket.c:2566 msgid "source-specific not an IPv4 address" msgstr "" -#: gio/gsocket.c:2583 +#: gio/gsocket.c:2590 #, c-format msgid "Interface name too long" msgstr "Názov rozhrania je príliš dlhý" -#: gio/gsocket.c:2596 gio/gsocket.c:2646 +#: gio/gsocket.c:2603 gio/gsocket.c:2657 #, c-format msgid "Interface not found: %s" msgstr "Nenašlo sa rozhranie: %s" # PM: SSM je termín neprekladal som to # http://en.wikipedia.org/wiki/Source-specific_multicast -#: gio/gsocket.c:2622 +#: gio/gsocket.c:2633 msgid "No support for IPv4 source-specific multicast" msgstr "Nie je podpora pre IPv4 source-specific multicast" # PM: SSM je termín neprekladal som to # http://en.wikipedia.org/wiki/Source-specific_multicast -#: gio/gsocket.c:2680 +#: gio/gsocket.c:2691 msgid "No support for IPv6 source-specific multicast" msgstr "Nie je podpora pre IPv6 source-specific multicast" -#: gio/gsocket.c:2889 +#: gio/gsocket.c:2924 #, c-format msgid "Error accepting connection: %s" msgstr "Chyba pri prijímaní pripojenia: %s" -#: gio/gsocket.c:3015 +#: gio/gsocket.c:3050 msgid "Connection in progress" msgstr "Prebieha pripájanie" -#: gio/gsocket.c:3066 +#: gio/gsocket.c:3101 msgid "Unable to get pending error: " msgstr "Nepodarilo sa získať chybu určenú na spracovanie: " -#: gio/gsocket.c:3255 +#: gio/gsocket.c:3290 #, c-format msgid "Error receiving data: %s" msgstr "Chyba pri prijímaní údajov: %s" -#: gio/gsocket.c:3452 +#: gio/gsocket.c:3487 #, c-format msgid "Error sending data: %s" msgstr "Chyba pri odosielaní údajov: %s" -#: gio/gsocket.c:3639 +#: gio/gsocket.c:3674 #, c-format msgid "Unable to shutdown socket: %s" msgstr "Nepodarilo sa vypnúť soket: %s" -#: gio/gsocket.c:3720 +#: gio/gsocket.c:3755 #, c-format msgid "Error closing socket: %s" msgstr "Chyba pri zatváraní soketu: %s" -#: gio/gsocket.c:4413 +#: gio/gsocket.c:4451 #, c-format msgid "Waiting for socket condition: %s" msgstr "Čaká sa na stav soketu: %s" -#: gio/gsocket.c:4804 gio/gsocket.c:4820 gio/gsocket.c:4833 -#, fuzzy, c-format -#| msgid "Error sending message: %s" +#: gio/gsocket.c:4841 gio/gsocket.c:4857 gio/gsocket.c:4870 +#, c-format msgid "Unable to send message: %s" -msgstr "Chyba pri odosielaní správy: %s" +msgstr "Nie je možné odoslať správu: %s" -#: gio/gsocket.c:4805 gio/gsocket.c:4821 gio/gsocket.c:4834 +#: gio/gsocket.c:4842 gio/gsocket.c:4858 gio/gsocket.c:4871 msgid "Message vectors too large" msgstr "" -#: gio/gsocket.c:4850 gio/gsocket.c:4852 gio/gsocket.c:4999 gio/gsocket.c:5084 -#: gio/gsocket.c:5262 gio/gsocket.c:5302 gio/gsocket.c:5304 +#: gio/gsocket.c:4887 gio/gsocket.c:4889 gio/gsocket.c:5036 gio/gsocket.c:5121 +#: gio/gsocket.c:5299 gio/gsocket.c:5339 gio/gsocket.c:5341 #, c-format msgid "Error sending message: %s" msgstr "Chyba pri odosielaní správy: %s" -#: gio/gsocket.c:5026 +#: gio/gsocket.c:5063 msgid "GSocketControlMessage not supported on Windows" msgstr "GSocketControlMessage nie je podporovaný vo Windows" -#: gio/gsocket.c:5495 gio/gsocket.c:5571 gio/gsocket.c:5797 +#: gio/gsocket.c:5536 gio/gsocket.c:5612 gio/gsocket.c:5838 #, c-format msgid "Error receiving message: %s" msgstr "Chyba pri prijímaní správy: %s" -#: gio/gsocket.c:6070 gio/gsocket.c:6081 gio/gsocket.c:6127 +#: gio/gsocket.c:6123 gio/gsocket.c:6134 gio/gsocket.c:6197 #, c-format msgid "Unable to read socket credentials: %s" msgstr "Nepodarilo sa prečítať poverenia soketu: %s" -#: gio/gsocket.c:6136 +#: gio/gsocket.c:6206 msgid "g_socket_get_credentials not implemented for this OS" msgstr "" "g_socket_get_credentials nie je pre tento operačný systém implementovaný" -#: gio/gsocketclient.c:191 +#: gio/gsocketclient.c:193 #, c-format msgid "Could not connect to proxy server %s: " msgstr "Nepodarilo sa pripojiť k proxy serveru %s: " -#: gio/gsocketclient.c:205 +#: gio/gsocketclient.c:207 #, c-format msgid "Could not connect to %s: " msgstr "Nepodarilo sa pripojiť k %s: " -#: gio/gsocketclient.c:207 +#: gio/gsocketclient.c:209 msgid "Could not connect: " msgstr "Nepodarilo sa pripojiť: " -#: gio/gsocketclient.c:1162 gio/gsocketclient.c:1749 +#: gio/gsocketclient.c:1204 gio/gsocketclient.c:1807 msgid "Proxying over a non-TCP connection is not supported." msgstr "Pripojenie cez proxy nepoužívajúce TCP nie je podporované." -#: gio/gsocketclient.c:1194 gio/gsocketclient.c:1778 +#: gio/gsocketclient.c:1236 gio/gsocketclient.c:1836 #, c-format msgid "Proxy protocol “%s” is not supported." msgstr "Protokol proxy „%s“ nie je podporovaný." -#: gio/gsocketlistener.c:230 +#: gio/gsocketlistener.c:232 msgid "Listener is already closed" msgstr "Poslucháč je už zatvorený" -#: gio/gsocketlistener.c:276 +#: gio/gsocketlistener.c:278 msgid "Added socket is closed" msgstr "Pridaný soket je zatvorený" -#: gio/gsocks4aproxy.c:118 +#: gio/gsocks4aproxy.c:120 #, c-format msgid "SOCKSv4 does not support IPv6 address “%s”" msgstr "SOCKSv4 nepodporuje adresu IPv6 „%s“" -#: gio/gsocks4aproxy.c:136 +#: gio/gsocks4aproxy.c:138 msgid "Username is too long for SOCKSv4 protocol" msgstr "Používateľské meno je príliš dlhé pre protokol SOCKSv4" -#: gio/gsocks4aproxy.c:153 +#: gio/gsocks4aproxy.c:155 #, c-format msgid "Hostname “%s” is too long for SOCKSv4 protocol" msgstr "Názov hostiteľa „%s“ je pre protokol SOCKSv4 príliš dlhý" -#: gio/gsocks4aproxy.c:179 +#: gio/gsocks4aproxy.c:181 msgid "The server is not a SOCKSv4 proxy server." msgstr "Server nie je proxy serverom SOCKSv4." -#: gio/gsocks4aproxy.c:186 +#: gio/gsocks4aproxy.c:188 msgid "Connection through SOCKSv4 server was rejected" msgstr "Pripojenie cez server SOCKSv4 bolo odmietnuté" -#: gio/gsocks5proxy.c:153 gio/gsocks5proxy.c:338 gio/gsocks5proxy.c:348 +#: gio/gsocks5proxy.c:155 gio/gsocks5proxy.c:340 gio/gsocks5proxy.c:350 msgid "The server is not a SOCKSv5 proxy server." msgstr "Server nie je proxy serverom SOCKSv5." -#: gio/gsocks5proxy.c:167 gio/gsocks5proxy.c:184 +#: gio/gsocks5proxy.c:169 gio/gsocks5proxy.c:186 msgid "The SOCKSv5 proxy requires authentication." msgstr "Proxy SOCKSv5 vyžaduje overenie totožnosti." -#: gio/gsocks5proxy.c:191 +#: gio/gsocks5proxy.c:193 msgid "" "The SOCKSv5 proxy requires an authentication method that is not supported by " "GLib." msgstr "" "Proxy SOCKSv5 vyžaduje metódu overenia totožnosti, ktorú nepodporuje GLib." -#: gio/gsocks5proxy.c:220 +#: gio/gsocks5proxy.c:222 msgid "Username or password is too long for SOCKSv5 protocol." msgstr "Používateľské meno alebo heslo je príliš dlhé pre protokol SOCKSv5." -#: gio/gsocks5proxy.c:250 +#: gio/gsocks5proxy.c:252 msgid "SOCKSv5 authentication failed due to wrong username or password." msgstr "" "Overenie totožnosti SOCKSv5 zlyhalo pre nesprávne používateľské meno alebo " "heslo." -#: gio/gsocks5proxy.c:300 +#: gio/gsocks5proxy.c:302 #, c-format msgid "Hostname “%s” is too long for SOCKSv5 protocol" msgstr "Názov hostiteľa „%s“ je pre protokol SOCKSv5 príliš dlhý" -#: gio/gsocks5proxy.c:362 +#: gio/gsocks5proxy.c:364 msgid "The SOCKSv5 proxy server uses unknown address type." msgstr "Proxy server SOCKSv5 používa neznámy typ adresy." -#: gio/gsocks5proxy.c:369 +#: gio/gsocks5proxy.c:371 msgid "Internal SOCKSv5 proxy server error." msgstr "Vnútorná chyba proxy servera SOCKSv5." -#: gio/gsocks5proxy.c:375 +#: gio/gsocks5proxy.c:377 msgid "SOCKSv5 connection not allowed by ruleset." msgstr "Pripojenie SOCKSv5 nie je povolené sadou pravidiel." -#: gio/gsocks5proxy.c:382 +#: gio/gsocks5proxy.c:384 msgid "Host unreachable through SOCKSv5 server." msgstr "Hostiteľ nie je dostupný cez server SOCKSv5." -#: gio/gsocks5proxy.c:388 +#: gio/gsocks5proxy.c:390 msgid "Network unreachable through SOCKSv5 proxy." msgstr "Sieť nie je dostupný cez proxy SOCKSv5." -#: gio/gsocks5proxy.c:394 +#: gio/gsocks5proxy.c:396 msgid "Connection refused through SOCKSv5 proxy." msgstr "Pripojenie cez proxy SOCKSv5 je odmietnuté." -#: gio/gsocks5proxy.c:400 +#: gio/gsocks5proxy.c:402 msgid "SOCKSv5 proxy does not support “connect” command." msgstr "Proxy SOCKSv5 nepodporuje príkaz „connect“." -#: gio/gsocks5proxy.c:406 +#: gio/gsocks5proxy.c:408 msgid "SOCKSv5 proxy does not support provided address type." msgstr "Proxy SOCKSv5 nepodporuje poskytnutý typ adresy." -#: gio/gsocks5proxy.c:412 +#: gio/gsocks5proxy.c:414 msgid "Unknown SOCKSv5 proxy error." msgstr "Neznáma chyba proxy SOCKSv5." -#: gio/gthemedicon.c:595 +#: gio/gtestdbus.c:615 glib/gspawn-win32.c:354 +#, c-format +msgid "Failed to create pipe for communicating with child process (%s)" +msgstr "Zlyhalo vytvorenie zreťazenia pre komunikáciu s dcérskym procesom (%s)" + +#: gio/gtestdbus.c:622 +#, fuzzy, c-format +#| msgid "Seek not supported on stream" +msgid "Pipes are not supported in this platform" +msgstr "Presúvanie v prúde nie je podporované" + +#: gio/gthemedicon.c:597 #, c-format msgid "Can’t handle version %d of GThemedIcon encoding" msgstr "Nedá sa spracovať kódovanie GThemedIcon verzie %d" -#: gio/gthreadedresolver.c:152 +#: gio/gthreadedresolver.c:154 msgid "No valid addresses were found" msgstr "Nenašli sa žiadne platné adresy" -#: gio/gthreadedresolver.c:337 +#: gio/gthreadedresolver.c:339 #, c-format msgid "Error reverse-resolving “%s”: %s" msgstr "Chyba pri pri spätnom preklade adresy „%s“: %s" -#: gio/gthreadedresolver.c:676 gio/gthreadedresolver.c:755 -#: gio/gthreadedresolver.c:853 gio/gthreadedresolver.c:903 +#. Translators: the placeholder is a DNS record type, such as ‘MX’ or ‘SRV’ +#: gio/gthreadedresolver.c:552 gio/gthreadedresolver.c:574 +#: gio/gthreadedresolver.c:628 gio/gthreadedresolver.c:675 +#: gio/gthreadedresolver.c:704 gio/gthreadedresolver.c:716 +#, c-format +msgid "Error parsing DNS %s record: malformed DNS packet" +msgstr "" + +#: gio/gthreadedresolver.c:774 gio/gthreadedresolver.c:911 +#: gio/gthreadedresolver.c:1009 gio/gthreadedresolver.c:1059 #, c-format msgid "No DNS record of the requested type for “%s”" msgstr "Neexistuje DNS záznam požadovaného typu pre „%s“" # DNS -#: gio/gthreadedresolver.c:681 gio/gthreadedresolver.c:858 +#: gio/gthreadedresolver.c:779 gio/gthreadedresolver.c:1014 #, c-format msgid "Temporarily unable to resolve “%s”" msgstr "Služba nie je dočasne schopná preložiť adresu „%s“" -#: gio/gthreadedresolver.c:686 gio/gthreadedresolver.c:863 -#: gio/gthreadedresolver.c:973 +#: gio/gthreadedresolver.c:784 gio/gthreadedresolver.c:1019 +#: gio/gthreadedresolver.c:1129 #, c-format msgid "Error resolving “%s”" msgstr "Chyba pri preklade adresy „%s“" -#: gio/gtlscertificate.c:419 +#: gio/gthreadedresolver.c:798 gio/gthreadedresolver.c:822 +#: gio/gthreadedresolver.c:847 gio/gthreadedresolver.c:862 +msgid "Malformed DNS packet" +msgstr "Paket servera DNS má zlý formát" + +#: gio/gthreadedresolver.c:904 +#, fuzzy, c-format +#| msgid "Failed to read from file “%s”: %s" +msgid "Failed to parse DNS response for “%s”: " +msgstr "Zlyhalo čítanie zo súboru „%s“: %s" + +#: gio/gtlscertificate.c:480 msgid "No PEM-encoded private key found" msgstr "Nenašiel sa súkromný kľúč v PEM kódovaní" -#: gio/gtlscertificate.c:429 +#: gio/gtlscertificate.c:490 msgid "Cannot decrypt PEM-encoded private key" msgstr "Nepodá sa rozšifrovať súkromný kľúč v kódovaní PEM" -#: gio/gtlscertificate.c:440 +#: gio/gtlscertificate.c:501 msgid "Could not parse PEM-encoded private key" msgstr "Nepodarilo sa analyzovať súkromný kľúč v kódovaní PEM" -#: gio/gtlscertificate.c:467 +#: gio/gtlscertificate.c:528 msgid "No PEM-encoded certificate found" msgstr "Nenašiel sa certifikát v kódovaní PEM" -#: gio/gtlscertificate.c:476 +#: gio/gtlscertificate.c:537 msgid "Could not parse PEM-encoded certificate" msgstr "Neporarilo sa analyzovať certifikát v kódovaní PEM" -#: gio/gtlscertificate.c:832 +#: gio/gtlscertificate.c:800 +msgid "The current TLS backend does not support PKCS #12" +msgstr "" + +#: gio/gtlscertificate.c:1017 msgid "This GTlsBackend does not support creating PKCS #11 certificates" msgstr "" -#: gio/gtlspassword.c:111 +#: gio/gtlspassword.c:113 msgid "" "This is the last chance to enter the password correctly before your access " "is locked out." @@ -4333,7 +4419,7 @@ #. 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 +#: gio/gtlspassword.c:117 msgid "" "Several passwords entered have been incorrect, and your access will be " "locked out after further failures." @@ -4341,13 +4427,19 @@ "Niekoľko zadaných hesiel bolo nesprávnych a po ďalších zlyhaniach bude váš " "prístup uzamknutý." -#: gio/gtlspassword.c:117 +#: gio/gtlspassword.c:119 msgid "The password entered is incorrect." msgstr "Zadané heslo je nesprávne." +#: gio/gunixconnection.c:127 +#, fuzzy +#| msgid "Setting attribute %s not supported" +msgid "Sending FD is not supported" +msgstr "Nastavovanie atribútu %s nie je podporované" + # PK: plural forms # JK: https://bugzilla.gnome.org/show_bug.cgi?id=695233 -#: gio/gunixconnection.c:166 gio/gunixconnection.c:579 +#: gio/gunixconnection.c:180 gio/gunixconnection.c:598 #, c-format msgid "Expecting 1 control message, got %d" msgid_plural "Expecting 1 control message, got %d" @@ -4355,14 +4447,14 @@ msgstr1 "Očakávaná jedna riadiaca správa, získaná %d" msgstr2 "Očakávaná jedna riadiaca správa, získané %d" -#: gio/gunixconnection.c:182 gio/gunixconnection.c:591 +#: gio/gunixconnection.c:196 gio/gunixconnection.c:610 msgid "Unexpected type of ancillary data" msgstr "Neočakávaný typ doplnkových údajov" # PK: plural forms # JK: https://bugzilla.gnome.org/show_bug.cgi?id=695233 # MČ: Myslím, že by malo byť získaný, keď ide o ten popisovač. -#: gio/gunixconnection.c:200 +#: gio/gunixconnection.c:214 #, c-format msgid "Expecting one fd, but got %d\n" msgid_plural "Expecting one fd, but got %d\n" @@ -4370,25 +4462,31 @@ msgstr1 "Očakávaný jeden popisovač súboru, no získaný %d\n" msgstr2 "Očakávaný jeden popisovač súboru, no získané %d\n" -#: gio/gunixconnection.c:219 +#: gio/gunixconnection.c:233 msgid "Received invalid fd" msgstr "Prijatý neplatný popisovač súboru" -#: gio/gunixconnection.c:363 +#: gio/gunixconnection.c:240 +#, fuzzy +#| msgid "URIs not supported" +msgid "Receiving FD is not supported" +msgstr "Identifikátory URI nie sú podporované" + +#: gio/gunixconnection.c:382 msgid "Error sending credentials: " msgstr "Chyba pri odosielaní poverení: " -#: gio/gunixconnection.c:520 +#: gio/gunixconnection.c:539 #, c-format msgid "Error checking if SO_PASSCRED is enabled for socket: %s" msgstr "Chyba pri kontrole, či je SO_PASSCRED povolené pre soket: %s" -#: gio/gunixconnection.c:536 +#: gio/gunixconnection.c:555 #, c-format msgid "Error enabling SO_PASSCRED: %s" msgstr "Chyba pri povoľovaní SO_PASSCRED: %s" -#: gio/gunixconnection.c:565 +#: gio/gunixconnection.c:584 msgid "" "Expecting to read a single byte for receiving credentials but read zero bytes" msgstr "" @@ -4396,86 +4494,86 @@ "nula bajtov" # https://bugzilla.gnome.org/show_bug.cgi?id=658713 -#: gio/gunixconnection.c:605 +#: gio/gunixconnection.c:624 #, c-format msgid "Not expecting control message, but got %d" msgstr "Neočakávala sa riadiaca správa, no získané %d" -#: gio/gunixconnection.c:630 +#: gio/gunixconnection.c:649 #, c-format msgid "Error while disabling SO_PASSCRED: %s" msgstr "Chyba počas zakazovania SO_PASSCRED: %s" -#: gio/gunixinputstream.c:357 gio/gunixinputstream.c:378 +#: gio/gunixinputstream.c:359 gio/gunixinputstream.c:380 #, c-format msgid "Error reading from file descriptor: %s" msgstr "Chyba pri čítaní z popisovača súboru: %s" -#: gio/gunixinputstream.c:411 gio/gunixoutputstream.c:520 -#: gio/gwin32inputstream.c:217 gio/gwin32outputstream.c:204 +#: gio/gunixinputstream.c:413 gio/gunixoutputstream.c:522 +#: gio/gwin32inputstream.c:219 gio/gwin32outputstream.c:206 #, c-format msgid "Error closing file descriptor: %s" msgstr "Chyba pri zatváraní popisovača súboru: %s" -#: gio/gunixmounts.c:2785 gio/gunixmounts.c:2838 +#: gio/gunixmounts.c:2817 gio/gunixmounts.c:2870 msgid "Filesystem root" msgstr "Koreň súborového systému" -#: gio/gunixoutputstream.c:357 gio/gunixoutputstream.c:377 -#: gio/gunixoutputstream.c:464 gio/gunixoutputstream.c:484 -#: gio/gunixoutputstream.c:630 +#: gio/gunixoutputstream.c:359 gio/gunixoutputstream.c:379 +#: gio/gunixoutputstream.c:466 gio/gunixoutputstream.c:486 +#: gio/gunixoutputstream.c:632 #, c-format msgid "Error writing to file descriptor: %s" msgstr "Chyba pri zápise do popisovača súboru: %s" -#: gio/gunixsocketaddress.c:244 +#: gio/gunixsocketaddress.c:253 msgid "Abstract UNIX domain socket addresses not supported on this system" msgstr "" "V tomto systéme nie sú podporované abstraktné adresy soketov unixových domén" -#: gio/gvolume.c:438 +#: gio/gvolume.c:440 msgid "volume doesn’t implement eject" msgstr "zväzok neimplementuje vysunutie" #. Translators: This is an error #. * message for volume objects that #. * don't implement any of eject or eject_with_operation. -#: gio/gvolume.c:515 +#: gio/gvolume.c:517 msgid "volume doesn’t implement eject or eject_with_operation" msgstr "" "zväzok neimplementuje eject (vysunutie) ani eject_with_operation (vysunutie " "s operáciou)" # PŠ: file handle (win32) je ekvivalent file descriptor - dovolil som si to preložiť rovnako. Keďže používané manipulátor, alebo rukoväť sú oba zlé preklady (obsluha je handler)... A dokonca aj v slovenskom preklade Správcu úloh vo win je použitý popisovač. -#: gio/gwin32inputstream.c:185 +#: gio/gwin32inputstream.c:187 #, c-format msgid "Error reading from handle: %s" msgstr "Chyba pri čítaní z popisovača: %s" -#: gio/gwin32inputstream.c:232 gio/gwin32outputstream.c:219 +#: gio/gwin32inputstream.c:234 gio/gwin32outputstream.c:221 #, c-format msgid "Error closing handle: %s" msgstr "Chyba pri zatváraní popisovača: %s" -#: gio/gwin32outputstream.c:172 +#: gio/gwin32outputstream.c:174 #, c-format msgid "Error writing to handle: %s" msgstr "Chyba pri zápise do popisovača: %s" -#: gio/gzlibcompressor.c:394 gio/gzlibdecompressor.c:347 +#: gio/gzlibcompressor.c:396 gio/gzlibdecompressor.c:349 msgid "Not enough memory" msgstr "Nedostatok pamäte" -#: gio/gzlibcompressor.c:401 gio/gzlibdecompressor.c:354 +#: gio/gzlibcompressor.c:403 gio/gzlibdecompressor.c:356 #, c-format msgid "Internal error: %s" msgstr "Vnútorná chyba: %s" -#: gio/gzlibcompressor.c:414 gio/gzlibdecompressor.c:368 +#: gio/gzlibcompressor.c:416 gio/gzlibdecompressor.c:370 msgid "Need more input" msgstr "Potrebných viac vstupov" -#: gio/gzlibdecompressor.c:340 +#: gio/gzlibdecompressor.c:342 msgid "Invalid compressed data" msgstr "Neplatné komprimované údaje" @@ -4505,160 +4603,160 @@ msgid "Wrong args\n" msgstr "Chybné parametre\n" -#: glib/gbookmarkfile.c:777 +#: glib/gbookmarkfile.c:861 #, c-format msgid "Unexpected attribute “%s” for element “%s”" msgstr "Neočakávaný atribút „%s“ prvku „%s“" -#: glib/gbookmarkfile.c:788 glib/gbookmarkfile.c:868 glib/gbookmarkfile.c:878 -#: glib/gbookmarkfile.c:991 +#: glib/gbookmarkfile.c:872 glib/gbookmarkfile.c:952 glib/gbookmarkfile.c:962 +#: glib/gbookmarkfile.c:1075 #, c-format msgid "Attribute “%s” of element “%s” not found" msgstr "Atribút „%s“ prvku „%s“ nenájdený" -#: glib/gbookmarkfile.c:1200 glib/gbookmarkfile.c:1265 -#: glib/gbookmarkfile.c:1329 glib/gbookmarkfile.c:1339 +#: glib/gbookmarkfile.c:1284 glib/gbookmarkfile.c:1349 +#: glib/gbookmarkfile.c:1413 glib/gbookmarkfile.c:1423 #, c-format msgid "Unexpected tag “%s”, tag “%s” expected" msgstr "Neočakávaná značka „%s“, bola očakávaná značka „%s“" -#: glib/gbookmarkfile.c:1225 glib/gbookmarkfile.c:1239 -#: glib/gbookmarkfile.c:1307 glib/gbookmarkfile.c:1353 +#: glib/gbookmarkfile.c:1309 glib/gbookmarkfile.c:1323 +#: glib/gbookmarkfile.c:1391 glib/gbookmarkfile.c:1437 #, c-format msgid "Unexpected tag “%s” inside “%s”" msgstr "Neočakávaná značka „%s“ vo vnútri „%s“" -#: glib/gbookmarkfile.c:1633 +#: glib/gbookmarkfile.c:1717 #, c-format msgid "Invalid date/time ‘%s’ in bookmark file" msgstr "Neplatný dátum alebo čas „%s“ v súbore záložky" -#: glib/gbookmarkfile.c:1836 +#: glib/gbookmarkfile.c:1956 msgid "No valid bookmark file found in data dirs" msgstr "V dátových adresároch nebol nájdený žiadny platný súbor záložiek" -#: glib/gbookmarkfile.c:2037 +#: glib/gbookmarkfile.c:2157 #, c-format msgid "A bookmark for URI “%s” already exists" msgstr "Záložka pre identifikátor URI „%s“ už existuje" -#: glib/gbookmarkfile.c:2086 glib/gbookmarkfile.c:2244 -#: glib/gbookmarkfile.c:2329 glib/gbookmarkfile.c:2409 -#: glib/gbookmarkfile.c:2494 glib/gbookmarkfile.c:2628 -#: glib/gbookmarkfile.c:2761 glib/gbookmarkfile.c:2896 -#: glib/gbookmarkfile.c:2938 glib/gbookmarkfile.c:3035 -#: glib/gbookmarkfile.c:3156 glib/gbookmarkfile.c:3350 -#: glib/gbookmarkfile.c:3491 glib/gbookmarkfile.c:3710 -#: glib/gbookmarkfile.c:3799 glib/gbookmarkfile.c:3888 -#: glib/gbookmarkfile.c:4007 +#: glib/gbookmarkfile.c:2206 glib/gbookmarkfile.c:2364 +#: glib/gbookmarkfile.c:2449 glib/gbookmarkfile.c:2529 +#: glib/gbookmarkfile.c:2614 glib/gbookmarkfile.c:2748 +#: glib/gbookmarkfile.c:2881 glib/gbookmarkfile.c:3016 +#: glib/gbookmarkfile.c:3058 glib/gbookmarkfile.c:3155 +#: glib/gbookmarkfile.c:3276 glib/gbookmarkfile.c:3470 +#: glib/gbookmarkfile.c:3611 glib/gbookmarkfile.c:3830 +#: glib/gbookmarkfile.c:3919 glib/gbookmarkfile.c:4008 +#: glib/gbookmarkfile.c:4127 #, c-format msgid "No bookmark found for URI “%s”" msgstr "Nebola nájedená záložka pre identifikátor URI „%s“" -#: glib/gbookmarkfile.c:2418 +#: glib/gbookmarkfile.c:2538 #, c-format msgid "No MIME type defined in the bookmark for URI “%s”" msgstr "V záložke pre identifikátor URI „%s“ nie je definovaný žiadny typ MIME" -#: glib/gbookmarkfile.c:2503 +#: glib/gbookmarkfile.c:2623 #, c-format msgid "No private flag has been defined in bookmark for URI “%s”" msgstr "" "V záložke pre identifikátor URI „%s“ nebol definovaný žiadny súkromný príznak" -#: glib/gbookmarkfile.c:3044 +#: glib/gbookmarkfile.c:3164 #, c-format msgid "No groups set in bookmark for URI “%s”" msgstr "V záložke pre identifikátor URI „%s“ neboli nastavené žiadne skupiny" -#: glib/gbookmarkfile.c:3512 glib/gbookmarkfile.c:3720 +#: glib/gbookmarkfile.c:3632 glib/gbookmarkfile.c:3840 #, c-format msgid "No application with name “%s” registered a bookmark for “%s”" msgstr "Žiadna aplikácia s názvom „%s“ nezaregistrovala záložku pre „%s“" -#: glib/gbookmarkfile.c:3743 +#: glib/gbookmarkfile.c:3863 #, c-format msgid "Failed to expand exec line “%s” with URI “%s”" msgstr "Zlyhalo rozvinutie spustiteľného riadka „%s“ o identifikátor URI „%s“" -#: glib/gconvert.c:468 +#: glib/gconvert.c:470 msgid "Unrepresentable character in conversion input" msgstr "Nezobraziteľný znak na vstupe prevodu" -#: glib/gconvert.c:495 glib/gutf8.c:871 glib/gutf8.c:1083 glib/gutf8.c:1220 -#: glib/gutf8.c:1324 +#: glib/gconvert.c:497 glib/gutf8.c:888 glib/gutf8.c:1101 glib/gutf8.c:1238 +#: glib/gutf8.c:1342 msgid "Partial character sequence at end of input" msgstr "Čiastočná sekvencia znakov na konci vstupu" -#: glib/gconvert.c:764 +#: glib/gconvert.c:768 #, c-format msgid "Cannot convert fallback “%s” to codeset “%s”" msgstr "Nedá sa previesť náhradné „%s“ do kódovej stránky „%s“" -#: glib/gconvert.c:936 +#: glib/gconvert.c:940 #, fuzzy #| msgid "Invalid byte sequence in conversion input" msgid "Embedded NUL byte in conversion input" msgstr "Neplatná sekvencia bajtov na vstupe prevodu" -#: glib/gconvert.c:957 +#: glib/gconvert.c:961 #, fuzzy #| msgid "Invalid byte sequence in conversion input" msgid "Embedded NUL byte in conversion output" msgstr "Neplatná sekvencia bajtov na vstupe prevodu" -#: glib/gconvert.c:1688 +#: glib/gconvert.c:1692 #, c-format msgid "The URI “%s” is not an absolute URI using the “file” scheme" msgstr "" "Identifikátor URI „%s“ nie je absolútny identifikátor URI používajúci schému " "„file“" -#: glib/gconvert.c:1698 +#: glib/gconvert.c:1702 #, c-format msgid "The local file URI “%s” may not include a “#”" msgstr "Identifikátor URI lokálneho súboru „%s“ nesmie obsahovať „#“" -#: glib/gconvert.c:1715 +#: glib/gconvert.c:1719 #, c-format msgid "The URI “%s” is invalid" msgstr "Identifikátor URI „%s“ je neplatný" -#: glib/gconvert.c:1727 +#: glib/gconvert.c:1731 #, c-format msgid "The hostname of the URI “%s” is invalid" msgstr "Názov hostiteľa URI „%s“ je neplatný" -#: glib/gconvert.c:1743 +#: glib/gconvert.c:1747 #, c-format msgid "The URI “%s” contains invalidly escaped characters" msgstr "Identifikátor URI „%s“ obsahuje neplatné špeciálne uvedené znaky" -#: glib/gconvert.c:1815 +#: glib/gconvert.c:1819 #, c-format msgid "The pathname “%s” is not an absolute path" msgstr "Cesta „%s“ nie je absolútna" #. Translators: this is the preferred format for expressing the date and the time -#: glib/gdatetime.c:226 +#: glib/gdatetime.c:228 msgctxt "GDateTime" msgid "%a %b %e %H:%M:%S %Y" msgstr "%a %-d. %B %Y, %H:%M:%S %Z" #. Translators: this is the preferred format for expressing the date -#: glib/gdatetime.c:229 +#: glib/gdatetime.c:231 msgctxt "GDateTime" msgid "%m/%d/%y" msgstr "%d.%m.%Y" #. Translators: this is the preferred format for expressing the time -#: glib/gdatetime.c:232 +#: glib/gdatetime.c:234 msgctxt "GDateTime" msgid "%H:%M:%S" msgstr "%H:%M:%S" #. Translators: this is the preferred format for expressing 12 hour time -#: glib/gdatetime.c:235 +#: glib/gdatetime.c:237 msgctxt "GDateTime" msgid "%I:%M:%S %p" msgstr "%H:%M:%S" @@ -4679,62 +4777,62 @@ #. * non-European) there is no difference between the standalone and #. * complete date form. #. -#: glib/gdatetime.c:274 +#: glib/gdatetime.c:276 msgctxt "full month name" msgid "January" msgstr "január" -#: glib/gdatetime.c:276 +#: glib/gdatetime.c:278 msgctxt "full month name" msgid "February" msgstr "február" -#: glib/gdatetime.c:278 +#: glib/gdatetime.c:280 msgctxt "full month name" msgid "March" msgstr "marec" -#: glib/gdatetime.c:280 +#: glib/gdatetime.c:282 msgctxt "full month name" msgid "April" msgstr "apríl" -#: glib/gdatetime.c:282 +#: glib/gdatetime.c:284 msgctxt "full month name" msgid "May" msgstr "máj" -#: glib/gdatetime.c:284 +#: glib/gdatetime.c:286 msgctxt "full month name" msgid "June" msgstr "jún" -#: glib/gdatetime.c:286 +#: glib/gdatetime.c:288 msgctxt "full month name" msgid "July" msgstr "júl" -#: glib/gdatetime.c:288 +#: glib/gdatetime.c:290 msgctxt "full month name" msgid "August" msgstr "august" -#: glib/gdatetime.c:290 +#: glib/gdatetime.c:292 msgctxt "full month name" msgid "September" msgstr "september" -#: glib/gdatetime.c:292 +#: glib/gdatetime.c:294 msgctxt "full month name" msgid "October" msgstr "október" -#: glib/gdatetime.c:294 +#: glib/gdatetime.c:296 msgctxt "full month name" msgid "November" msgstr "november" -#: glib/gdatetime.c:296 +#: glib/gdatetime.c:298 msgctxt "full month name" msgid "December" msgstr "december" @@ -4756,132 +4854,132 @@ #. * other platform. Here are abbreviated month names in a form #. * appropriate when they are used standalone. #. -#: glib/gdatetime.c:328 +#: glib/gdatetime.c:330 msgctxt "abbreviated month name" msgid "Jan" msgstr "jan" -#: glib/gdatetime.c:330 +#: glib/gdatetime.c:332 msgctxt "abbreviated month name" msgid "Feb" msgstr "feb" -#: glib/gdatetime.c:332 +#: glib/gdatetime.c:334 msgctxt "abbreviated month name" msgid "Mar" msgstr "mar" -#: glib/gdatetime.c:334 +#: glib/gdatetime.c:336 msgctxt "abbreviated month name" msgid "Apr" msgstr "apr" -#: glib/gdatetime.c:336 +#: glib/gdatetime.c:338 msgctxt "abbreviated month name" msgid "May" msgstr "máj" -#: glib/gdatetime.c:338 +#: glib/gdatetime.c:340 msgctxt "abbreviated month name" msgid "Jun" msgstr "jún" -#: glib/gdatetime.c:340 +#: glib/gdatetime.c:342 msgctxt "abbreviated month name" msgid "Jul" msgstr "júl" -#: glib/gdatetime.c:342 +#: glib/gdatetime.c:344 msgctxt "abbreviated month name" msgid "Aug" msgstr "aug" -#: glib/gdatetime.c:344 +#: glib/gdatetime.c:346 msgctxt "abbreviated month name" msgid "Sep" msgstr "sep" -#: glib/gdatetime.c:346 +#: glib/gdatetime.c:348 msgctxt "abbreviated month name" msgid "Oct" msgstr "okt" -#: glib/gdatetime.c:348 +#: glib/gdatetime.c:350 msgctxt "abbreviated month name" msgid "Nov" msgstr "nov" -#: glib/gdatetime.c:350 +#: glib/gdatetime.c:352 msgctxt "abbreviated month name" msgid "Dec" msgstr "dec" -#: glib/gdatetime.c:365 +#: glib/gdatetime.c:367 msgctxt "full weekday name" msgid "Monday" msgstr "pondelok" -#: glib/gdatetime.c:367 +#: glib/gdatetime.c:369 msgctxt "full weekday name" msgid "Tuesday" msgstr "utorok" -#: glib/gdatetime.c:369 +#: glib/gdatetime.c:371 msgctxt "full weekday name" msgid "Wednesday" msgstr "streda" -#: glib/gdatetime.c:371 +#: glib/gdatetime.c:373 msgctxt "full weekday name" msgid "Thursday" msgstr "štvrtok" -#: glib/gdatetime.c:373 +#: glib/gdatetime.c:375 msgctxt "full weekday name" msgid "Friday" msgstr "piatok" -#: glib/gdatetime.c:375 +#: glib/gdatetime.c:377 msgctxt "full weekday name" msgid "Saturday" msgstr "sobota" -#: glib/gdatetime.c:377 +#: glib/gdatetime.c:379 msgctxt "full weekday name" msgid "Sunday" msgstr "nedela" -#: glib/gdatetime.c:392 +#: glib/gdatetime.c:394 msgctxt "abbreviated weekday name" msgid "Mon" msgstr "po" -#: glib/gdatetime.c:394 +#: glib/gdatetime.c:396 msgctxt "abbreviated weekday name" msgid "Tue" msgstr "ut" -#: glib/gdatetime.c:396 +#: glib/gdatetime.c:398 msgctxt "abbreviated weekday name" msgid "Wed" msgstr "st" -#: glib/gdatetime.c:398 +#: glib/gdatetime.c:400 msgctxt "abbreviated weekday name" msgid "Thu" msgstr "št" -#: glib/gdatetime.c:400 +#: glib/gdatetime.c:402 msgctxt "abbreviated weekday name" msgid "Fri" msgstr "pi" -#: glib/gdatetime.c:402 +#: glib/gdatetime.c:404 msgctxt "abbreviated weekday name" msgid "Sat" msgstr "so" -#: glib/gdatetime.c:404 +#: glib/gdatetime.c:406 msgctxt "abbreviated weekday name" msgid "Sun" msgstr "ne" @@ -4903,62 +5001,62 @@ #. * (western European, non-European) there is no difference between the #. * standalone and complete date form. #. -#: glib/gdatetime.c:468 +#: glib/gdatetime.c:470 msgctxt "full month name with day" msgid "January" msgstr "januára" -#: glib/gdatetime.c:470 +#: glib/gdatetime.c:472 msgctxt "full month name with day" msgid "February" msgstr "februára" -#: glib/gdatetime.c:472 +#: glib/gdatetime.c:474 msgctxt "full month name with day" msgid "March" msgstr "marca" -#: glib/gdatetime.c:474 +#: glib/gdatetime.c:476 msgctxt "full month name with day" msgid "April" msgstr "apríla" -#: glib/gdatetime.c:476 +#: glib/gdatetime.c:478 msgctxt "full month name with day" msgid "May" msgstr "mája" -#: glib/gdatetime.c:478 +#: glib/gdatetime.c:480 msgctxt "full month name with day" msgid "June" msgstr "júna" -#: glib/gdatetime.c:480 +#: glib/gdatetime.c:482 msgctxt "full month name with day" msgid "July" msgstr "júla" -#: glib/gdatetime.c:482 +#: glib/gdatetime.c:484 msgctxt "full month name with day" msgid "August" msgstr "augusta" -#: glib/gdatetime.c:484 +#: glib/gdatetime.c:486 msgctxt "full month name with day" msgid "September" msgstr "septembra" -#: glib/gdatetime.c:486 +#: glib/gdatetime.c:488 msgctxt "full month name with day" msgid "October" msgstr "októbra" -#: glib/gdatetime.c:488 +#: glib/gdatetime.c:490 msgctxt "full month name with day" msgid "November" msgstr "novembra" -#: glib/gdatetime.c:490 +#: glib/gdatetime.c:492 msgctxt "full month name with day" msgid "December" msgstr "decembra" @@ -4980,85 +5078,85 @@ #. * 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:555 +#: glib/gdatetime.c:557 msgctxt "abbreviated month name with day" msgid "Jan" msgstr "jan" -#: glib/gdatetime.c:557 +#: glib/gdatetime.c:559 msgctxt "abbreviated month name with day" msgid "Feb" msgstr "feb" -#: glib/gdatetime.c:559 +#: glib/gdatetime.c:561 msgctxt "abbreviated month name with day" msgid "Mar" msgstr "mar" -#: glib/gdatetime.c:561 +#: glib/gdatetime.c:563 msgctxt "abbreviated month name with day" msgid "Apr" msgstr "apr" -#: glib/gdatetime.c:563 +#: glib/gdatetime.c:565 msgctxt "abbreviated month name with day" msgid "May" msgstr "máj" -#: glib/gdatetime.c:565 +#: glib/gdatetime.c:567 msgctxt "abbreviated month name with day" msgid "Jun" msgstr "jún" -#: glib/gdatetime.c:567 +#: glib/gdatetime.c:569 msgctxt "abbreviated month name with day" msgid "Jul" msgstr "júl" -#: glib/gdatetime.c:569 +#: glib/gdatetime.c:571 msgctxt "abbreviated month name with day" msgid "Aug" msgstr "aug" -#: glib/gdatetime.c:571 +#: glib/gdatetime.c:573 msgctxt "abbreviated month name with day" msgid "Sep" msgstr "sep" -#: glib/gdatetime.c:573 +#: glib/gdatetime.c:575 msgctxt "abbreviated month name with day" msgid "Oct" msgstr "okt" -#: glib/gdatetime.c:575 +#: glib/gdatetime.c:577 msgctxt "abbreviated month name with day" msgid "Nov" msgstr "nov" -#: glib/gdatetime.c:577 +#: glib/gdatetime.c:579 msgctxt "abbreviated month name with day" msgid "Dec" msgstr "dec" # PM: ale myslím si ze by to malo byť preložené, lebo ak si niekto v hodinách prepne na 12 hodinový formát tak si potom nebude vedieť nastaviť správny čas #. Translators: 'before midday' indicator -#: glib/gdatetime.c:594 +#: glib/gdatetime.c:596 msgctxt "GDateTime" msgid "AM" msgstr "Doobeda" #. Translators: 'after midday' indicator -#: glib/gdatetime.c:597 +#: glib/gdatetime.c:599 msgctxt "GDateTime" msgid "PM" msgstr "Poobede" -#: glib/gdir.c:156 +#: glib/gdir.c:158 #, c-format msgid "Error opening directory “%s”: %s" msgstr "Chyba pri otváraní adresára „%s“: %s" -#: glib/gfileutils.c:737 glib/gfileutils.c:829 +#: glib/gfileutils.c:753 glib/gfileutils.c:845 #, c-format msgid "Could not allocate %lu byte to read file “%s”" msgid_plural "Could not allocate %lu bytes to read file “%s”" @@ -5066,106 +5164,106 @@ msgstr1 "Nepodarilo sa alokovať %lu bajt na čítanie súboru „%s“" msgstr2 "Nepodarilo sa alokovať %lu bajty na čítanie súboru „%s“" -#: glib/gfileutils.c:754 +#: glib/gfileutils.c:770 #, c-format msgid "Error reading file “%s”: %s" msgstr "Chyba pri čítaní súboru %s: %s" -#: glib/gfileutils.c:790 +#: glib/gfileutils.c:806 #, c-format msgid "File “%s” is too large" msgstr "Súbor „%s“ je príliš veľký" -#: glib/gfileutils.c:854 +#: glib/gfileutils.c:870 #, c-format msgid "Failed to read from file “%s”: %s" msgstr "Zlyhalo čítanie zo súboru „%s“: %s" -#: glib/gfileutils.c:904 glib/gfileutils.c:979 glib/gfileutils.c:1468 +#: glib/gfileutils.c:920 glib/gfileutils.c:995 glib/gfileutils.c:1472 #, c-format msgid "Failed to open file “%s”: %s" msgstr "Zlyhalo otvorenie súboru „%s“: %s" -#: glib/gfileutils.c:917 +#: glib/gfileutils.c:933 #, c-format msgid "Failed to get attributes of file “%s”: fstat() failed: %s" msgstr "Zlyhalo získanie atribútov súboru „%s“: fstat() zlyhalo: %s" -#: glib/gfileutils.c:948 +#: glib/gfileutils.c:964 #, c-format msgid "Failed to open file “%s”: fdopen() failed: %s" msgstr "Zlyhalo otvorenie súboru „%s“: fdopen() zlyhalo: %s" -#: glib/gfileutils.c:1049 +#: glib/gfileutils.c:1065 #, c-format msgid "Failed to rename file “%s” to “%s”: g_rename() failed: %s" msgstr "Zlyhalo premenovanie súboru „%s“ na „%s“: g_rename() zlyhalo: %s" -#: glib/gfileutils.c:1175 +#: glib/gfileutils.c:1179 #, c-format msgid "Failed to write file “%s”: write() failed: %s" msgstr "Zlyhal zápis súboru „%s“: write() zlyhalo: %s" -#: glib/gfileutils.c:1196 +#: glib/gfileutils.c:1200 #, c-format msgid "Failed to write file “%s”: fsync() failed: %s" msgstr "Zlyhal zápis súboru „%s“: fsync() zlyhalo: %s" -#: glib/gfileutils.c:1357 glib/gfileutils.c:1772 +#: glib/gfileutils.c:1361 glib/gfileutils.c:1776 #, c-format msgid "Failed to create file “%s”: %s" msgstr "Zlyhalo vytvorenie súboru „%s“: %s" -#: glib/gfileutils.c:1402 +#: glib/gfileutils.c:1406 #, c-format msgid "Existing file “%s” could not be removed: g_unlink() failed: %s" msgstr "Existujúci súbor „%s“ nemohol byť odstránený: g_unlink() zlyhalo: %s" -#: glib/gfileutils.c:1737 +#: glib/gfileutils.c:1741 #, c-format msgid "Template “%s” invalid, should not contain a “%s”" msgstr "Šablóna „%s“ je neplatná, nesmie obsahovať „%s“" -#: glib/gfileutils.c:1750 +#: glib/gfileutils.c:1754 #, c-format msgid "Template “%s” doesn’t contain XXXXXX" msgstr "Šablóna „%s“ neobsahuje XXXXXX" -#: glib/gfileutils.c:2310 glib/gfileutils.c:2339 +#: glib/gfileutils.c:2348 glib/gfileutils.c:2377 #, c-format msgid "Failed to read the symbolic link “%s”: %s" msgstr "Zlyhalo načítanie symbolického odkazu „%s“: %s" -#: glib/giochannel.c:1405 +#: glib/giochannel.c:1408 #, c-format msgid "Could not open converter from “%s” to “%s”: %s" msgstr "Nepodarilo sa otvoriť program na prevod z „%s“ do „%s“: %s" -#: glib/giochannel.c:1758 +#: glib/giochannel.c:1761 msgid "Can’t do a raw read in g_io_channel_read_line_string" msgstr "Nedá sa urobiť priame čítanie v g_io_channel_read_line_string" -#: glib/giochannel.c:1805 glib/giochannel.c:2063 glib/giochannel.c:2150 +#: glib/giochannel.c:1808 glib/giochannel.c:2066 glib/giochannel.c:2153 msgid "Leftover unconverted data in read buffer" msgstr "Zanechané neprevedené údaje v zásobníku na čítanie" -#: glib/giochannel.c:1886 glib/giochannel.c:1963 +#: glib/giochannel.c:1889 glib/giochannel.c:1966 msgid "Channel terminates in a partial character" msgstr "Kanál skončil s neúplným znakom" -#: glib/giochannel.c:1949 +#: glib/giochannel.c:1952 msgid "Can’t do a raw read in g_io_channel_read_to_end" msgstr "Nedá sa urobiť priame čítanie v g_io_channel_read_to_end" -#: glib/gkeyfile.c:790 +#: glib/gkeyfile.c:800 msgid "Valid key file could not be found in search dirs" msgstr "Nepodarilo sa nájsť platný súbor kľúčov vo vyhľadávacích adresároch" -#: glib/gkeyfile.c:827 +#: glib/gkeyfile.c:837 msgid "Not a regular file" msgstr "Nie je bežný súbor" -#: glib/gkeyfile.c:1282 +#: glib/gkeyfile.c:1295 #, c-format msgid "" "Key file contains line “%s” which is not a key-value pair, group, or comment" @@ -5173,49 +5271,49 @@ "Súbor kľúčov obsahuje riadok „%s“, ktorý nie je párom kľúč-hodnota, " "skupinou, ani komentárom" -#: glib/gkeyfile.c:1339 +#: glib/gkeyfile.c:1352 #, c-format msgid "Invalid group name: %s" msgstr "Neplatný názov skupiny: %s" -#: glib/gkeyfile.c:1361 +#: glib/gkeyfile.c:1376 msgid "Key file does not start with a group" msgstr "Súbor kľúčov nezačína skupinou" -#: glib/gkeyfile.c:1387 +#: glib/gkeyfile.c:1400 #, c-format -msgid "Invalid key name: %s" -msgstr "Neplatný názov kľúča: %s" +msgid "Invalid key name: %.*s" +msgstr "Neplatný názov kľúča: %.*s" -#: glib/gkeyfile.c:1414 +#: glib/gkeyfile.c:1428 #, c-format msgid "Key file contains unsupported encoding “%s”" msgstr "Súbor kľúčov obsahuje nepodporované kódovane „%s“" -#: glib/gkeyfile.c:1663 glib/gkeyfile.c:1836 glib/gkeyfile.c:3289 -#: glib/gkeyfile.c:3353 glib/gkeyfile.c:3483 glib/gkeyfile.c:3615 -#: glib/gkeyfile.c:3761 glib/gkeyfile.c:3996 glib/gkeyfile.c:4063 +#: glib/gkeyfile.c:1683 glib/gkeyfile.c:1856 glib/gkeyfile.c:3303 +#: glib/gkeyfile.c:3367 glib/gkeyfile.c:3497 glib/gkeyfile.c:3626 +#: glib/gkeyfile.c:3772 glib/gkeyfile.c:4007 glib/gkeyfile.c:4074 #, c-format msgid "Key file does not have group “%s”" msgstr "Súbor kľúčov nemá skupinu „%s“" -#: glib/gkeyfile.c:1791 +#: glib/gkeyfile.c:1811 #, c-format msgid "Key file does not have key “%s” in group “%s”" msgstr "Súbor kľúčov nemá kľúč „%s“ v skupine „%s“" -#: glib/gkeyfile.c:1953 glib/gkeyfile.c:2069 +#: glib/gkeyfile.c:1973 glib/gkeyfile.c:2089 #, c-format msgid "Key file contains key “%s” with value “%s” which is not UTF-8" msgstr "Súbor kľúčov obsahuje kľúč „%s“ s hodnotou „%s“, ktorá nie je UTF-8" -#: glib/gkeyfile.c:1973 glib/gkeyfile.c:2089 glib/gkeyfile.c:2531 +#: glib/gkeyfile.c:1993 glib/gkeyfile.c:2109 glib/gkeyfile.c:2548 #, c-format msgid "" "Key file contains key “%s” which has a value that cannot be interpreted." msgstr "Súbor kľúčov obsahuje kľúč „%s“, ktorý má neinterpretovateľnú hodnotu." -#: glib/gkeyfile.c:2749 glib/gkeyfile.c:3118 +#: glib/gkeyfile.c:2763 glib/gkeyfile.c:3132 #, c-format msgid "" "Key file contains key “%s” in group “%s” which has a value that cannot be " @@ -5224,51 +5322,51 @@ "Súbor kľúčov obsahuje kľúč „%s“ v skupine „%s“, ktorý má neinterpretovateľnú " "hodnotu." -#: glib/gkeyfile.c:2827 glib/gkeyfile.c:2904 +#: glib/gkeyfile.c:2841 glib/gkeyfile.c:2918 #, c-format msgid "Key “%s” in group “%s” has value “%s” where %s was expected" msgstr "Kľúč „%s“ v skupine „%s“ má hodnotu „%s“, pričom bola očakávaná %s" -#: glib/gkeyfile.c:4306 +#: glib/gkeyfile.c:4327 msgid "Key file contains escape character at end of line" msgstr "Súbor kľúčov obsahuje znak escape na konci riadku" -#: glib/gkeyfile.c:4328 +#: glib/gkeyfile.c:4349 #, c-format msgid "Key file contains invalid escape sequence “%s”" msgstr "Súbor kľúčov obsahuje neplatnú špeciálnu (escape) sekvenciu „%s“" -#: glib/gkeyfile.c:4472 +#: glib/gkeyfile.c:4494 #, c-format msgid "Value “%s” cannot be interpreted as a number." msgstr "Hodnota „%s“ nemôže byť interpretovaná ako číslo." -#: glib/gkeyfile.c:4486 +#: glib/gkeyfile.c:4508 #, c-format msgid "Integer value “%s” out of range" msgstr "Celočíselná hodnota „%s“ je mimo rozsah" -#: glib/gkeyfile.c:4519 +#: glib/gkeyfile.c:4541 #, c-format msgid "Value “%s” cannot be interpreted as a float number." msgstr "Hodnota „%s“ nemôže byť interpretovaná ako reálne číslo." -#: glib/gkeyfile.c:4558 +#: glib/gkeyfile.c:4580 #, c-format msgid "Value “%s” cannot be interpreted as a boolean." msgstr "Hodnota „%s“ nemôže byť interpretovaná ako logická hodnota." -#: glib/gmappedfile.c:129 +#: glib/gmappedfile.c:135 #, c-format msgid "Failed to get attributes of file “%s%s%s%s”: fstat() failed: %s" msgstr "Zlyhalo získanie atribútov súboru „%s%s%s%s“: fstat() zlyhalo: %s" -#: glib/gmappedfile.c:195 +#: glib/gmappedfile.c:201 #, c-format msgid "Failed to map %s%s%s%s: mmap() failed: %s" msgstr "Zlyhalo mapovanie %s%s%s%s: mmap() zlyhalo: %s" -#: glib/gmappedfile.c:262 +#: glib/gmappedfile.c:268 #, c-format msgid "Failed to open file “%s”: open() failed: %s" msgstr "Zlyhalo otvorenie súboru „%s“: open() zlyhalo: %s" @@ -5524,301 +5622,247 @@ msgstr "" "Dokument neočakávane skončil v komentári alebo inštrukcii pre spracovanie" -#: glib/goption.c:873 +#: glib/goption.c:875 msgid "OPTION…" msgstr "VOĽBA…" -#: glib/goption.c:989 +#: glib/goption.c:991 msgid "Help Options:" msgstr "Voľby pomocníka:" -#: glib/goption.c:990 +#: glib/goption.c:992 msgid "Show help options" msgstr "Zobrazí voľby pomocníka" -#: glib/goption.c:996 +#: glib/goption.c:998 msgid "Show all help options" msgstr "Zobrazí všetky voľby pomocníka" -#: glib/goption.c:1059 +#: glib/goption.c:1061 msgid "Application Options:" msgstr "Voľby aplikácie:" -#: glib/goption.c:1061 +#: glib/goption.c:1063 msgid "Options:" msgstr "Voľby:" -#: glib/goption.c:1125 glib/goption.c:1195 +#: glib/goption.c:1127 glib/goption.c:1197 #, c-format msgid "Cannot parse integer value “%s” for %s" msgstr "Nedá sa analyzovať celočíselná hodnota „%s“ pre %s" -#: glib/goption.c:1135 glib/goption.c:1203 +#: glib/goption.c:1137 glib/goption.c:1205 #, c-format msgid "Integer value “%s” for %s out of range" msgstr "Celočíselná hodnota „%s“ pre %s je mimo rozsah" # PŠ: double je dvojitá presnosť (čísla s desatinnou čiarkou) -#: glib/goption.c:1160 +#: glib/goption.c:1162 #, c-format msgid "Cannot parse double value “%s” for %s" msgstr "Nedá sa analyzovať hodnota double „%s“ pre %s" -#: glib/goption.c:1168 +#: glib/goption.c:1170 #, c-format msgid "Double value “%s” for %s out of range" msgstr "Hodnota double „%s“ pre %s je mimo rozsah" -#: glib/goption.c:1460 glib/goption.c:1539 +#: glib/goption.c:1462 glib/goption.c:1541 #, c-format msgid "Error parsing option %s" msgstr "Chyba analyzovania voľby %s" -#: glib/goption.c:1561 glib/goption.c:1674 +#: glib/goption.c:1563 glib/goption.c:1676 #, c-format msgid "Missing argument for %s" msgstr "Chýbajúci parameter pre %s" -#: glib/goption.c:2185 +#: glib/goption.c:2186 #, c-format msgid "Unknown option %s" msgstr "Neznáma voľba %s" -#: glib/gregex.c:255 +#: glib/gregex.c:479 msgid "corrupted object" msgstr "poškodený objekt" -#: glib/gregex.c:257 -msgid "internal error or corrupted object" -msgstr "vnútorná chyba alebo poškodený objekt" - -#: glib/gregex.c:259 +#: glib/gregex.c:481 msgid "out of memory" msgstr "nedostatok pamäte" -#: glib/gregex.c:264 +#: glib/gregex.c:487 msgid "backtracking limit reached" msgstr "dosiahnutý limit spätného hľadania" -#: glib/gregex.c:276 glib/gregex.c:284 -msgid "the pattern contains items not supported for partial matching" -msgstr "vzor obsahuje položky nepodporované pri čiastočnom porovnávaní" - -#: glib/gregex.c:278 +#: glib/gregex.c:498 msgid "internal error" msgstr "vnútorná chyba" -#: glib/gregex.c:286 +#: glib/gregex.c:500 +msgid "the pattern contains items not supported for partial matching" +msgstr "vzor obsahuje položky nepodporované pri čiastočnom porovnávaní" + +#: glib/gregex.c:502 msgid "back references as conditions are not supported for partial matching" msgstr "" "spätné odkazy použité ako podmienky nie sú podporované pri čiastočnom " "porovnávaní" -#: glib/gregex.c:295 +#: glib/gregex.c:508 msgid "recursion limit reached" msgstr "dosiahnutý limit rekurzie" -#: glib/gregex.c:297 -msgid "invalid combination of newline flags" -msgstr "neplatná kombinácia príznakov nového riadka" - -#: glib/gregex.c:299 +#: glib/gregex.c:510 msgid "bad offset" msgstr "zlý ofset" -#: glib/gregex.c:301 -msgid "short utf8" -msgstr "krátke utf8" - # Ide o omyl programátora: case PCRE2_ERROR_RECURSELOOP: return _("recursion loop"); -#: glib/gregex.c:303 +#: glib/gregex.c:512 msgid "recursion loop" msgstr "rekurzívna slučka" -#: glib/gregex.c:307 +#. should not happen in GRegex since we check modes before each match +#: glib/gregex.c:515 +msgid "matching mode is requested that was not compiled for JIT" +msgstr "" + +#: glib/gregex.c:536 glib/gregex.c:1838 msgid "unknown error" msgstr "neznáma chyba" -#: glib/gregex.c:327 +#: glib/gregex.c:557 msgid "\\ at end of pattern" msgstr "\\ na konci vzoru" -#: glib/gregex.c:330 +#: glib/gregex.c:561 msgid "\\c at end of pattern" msgstr "\\c na konci vzoru" -#: glib/gregex.c:333 +#: glib/gregex.c:566 msgid "unrecognized character following \\" msgstr "nerozpoznaný znak nasledujúci za \\" -#: glib/gregex.c:336 +#: glib/gregex.c:570 msgid "numbers out of order in {} quantifier" msgstr "nesprávne poradie čísel v kvantifikátore {}" -#: glib/gregex.c:339 +#: glib/gregex.c:574 msgid "number too big in {} quantifier" msgstr "príliš veľké číslo v kvantifikátore {}" -#: glib/gregex.c:342 +#: glib/gregex.c:578 msgid "missing terminating for character class" msgstr "chýbajúca koncová pre triedu znakov" -#: glib/gregex.c:345 +#: glib/gregex.c:582 msgid "invalid escape sequence in character class" msgstr "neplatná špeciálna (escape) sekvencia v triede znakov" -#: glib/gregex.c:348 +#: glib/gregex.c:586 msgid "range out of order in character class" msgstr "nesprávne poradie rozsahu v triede znakov" -#: glib/gregex.c:351 +#: glib/gregex.c:591 msgid "nothing to repeat" msgstr "nie je čo opakovať" -#: glib/gregex.c:355 -msgid "unexpected repeat" -msgstr "neočakávané opakovanie" - -#: glib/gregex.c:358 +#: glib/gregex.c:595 msgid "unrecognized character after (? or (?-" msgstr "nerozpoznaný znak za (? alebo (?-" -#: glib/gregex.c:361 +#: glib/gregex.c:599 msgid "POSIX named classes are supported only within a class" msgstr "triedy s názvami POSIX sú podporované iba v triedach" -#: glib/gregex.c:364 +#: glib/gregex.c:603 +msgid "POSIX collating elements are not supported" +msgstr "porovnávacie POSIX prvky nie sú podporované" + +#: glib/gregex.c:609 msgid "missing terminating )" msgstr "chýbajúca koncová )" -#: glib/gregex.c:367 +#: glib/gregex.c:613 msgid "reference to non-existent subpattern" msgstr "odkaz na neexistujúci podvzor" -#: glib/gregex.c:370 +#: glib/gregex.c:617 msgid "missing ) after comment" msgstr "chýbajúca ) po komentári" -#: glib/gregex.c:373 +#: glib/gregex.c:621 msgid "regular expression is too large" msgstr "regulárny výraz je príliš veľký" -#: glib/gregex.c:376 -msgid "failed to get memory" -msgstr "nepodarilo sa získať pamäť" - -#: glib/gregex.c:380 -msgid ") without opening (" -msgstr ") bez otváracej (" - -#: glib/gregex.c:384 -msgid "code overflow" -msgstr "pretečenie kódu" - -#: glib/gregex.c:388 -msgid "unrecognized character after (?<" -msgstr "nerozpoznaný znak za (?<" +#: glib/gregex.c:625 +msgid "malformed number or name after (?(" +msgstr "zle formátované číslo alebo názov za (?(" -#: glib/gregex.c:391 +#: glib/gregex.c:629 msgid "lookbehind assertion is not fixed length" msgstr "spätné tvrdenie nemá pevnú dĺžku" -#: glib/gregex.c:394 -msgid "malformed number or name after (?(" -msgstr "zle formátované číslo alebo názov za (?(" - -#: glib/gregex.c:397 +#: glib/gregex.c:633 msgid "conditional group contains more than two branches" msgstr "podmienková skupina obsahuje viac ako dve zátvorky" -#: glib/gregex.c:400 +#: glib/gregex.c:637 msgid "assertion expected after (?(" msgstr "tvrdenie očakávané za (?(" -#. translators: '(?R' and '(?+-digits' are both meant as (groups of) -#. * sequences here, '(?-54' would be an example for the second group. -#. -#: glib/gregex.c:407 -msgid "(?R or (?+-digits must be followed by )" -msgstr "za (?R alebo (?+-číslice musí nasledovať )" +#: glib/gregex.c:641 +msgid "a numbered reference must not be zero" +msgstr "očíslovaný odkaz nesmie byť nula" -#: glib/gregex.c:410 +#: glib/gregex.c:645 msgid "unknown POSIX class name" msgstr "neznámy POSIX názov triedy" -#: glib/gregex.c:413 -msgid "POSIX collating elements are not supported" -msgstr "porovnávacie POSIX prvky nie sú podporované" - -#: glib/gregex.c:416 +#: glib/gregex.c:650 msgid "character value in \\x{...} sequence is too large" msgstr "hodnota znaku v postupnosti \\x{...} je príliš veľká" -#: glib/gregex.c:419 -msgid "invalid condition (?(0)" -msgstr "neplatná podmienka (?(0)" - -#: glib/gregex.c:422 +#: glib/gregex.c:654 msgid "\\C not allowed in lookbehind assertion" msgstr "\\C nie je povolené v spätnom tvrdení" -#: glib/gregex.c:429 -msgid "escapes \\L, \\l, \\N{name}, \\U, and \\u are not supported" -msgstr "\\L, \\l, \\N{name}, \\U, a \\u nie sú podporované" - -#: glib/gregex.c:432 -msgid "recursive call could loop indefinitely" -msgstr "rekurzívne volanie by sa mohlo donekonečna opakovať" - -#: glib/gregex.c:436 -msgid "unrecognized character after (?P" -msgstr "nerozpoznaný znak za (?P" - -#: glib/gregex.c:439 +#: glib/gregex.c:658 msgid "missing terminator in subpattern name" msgstr "chýba ukončovací člen v názve podvzoru" -#: glib/gregex.c:442 +#: glib/gregex.c:662 msgid "two named subpatterns have the same name" msgstr "dva pomenované podvzory majú rovnaký názov" -#: glib/gregex.c:445 +#: glib/gregex.c:666 msgid "malformed \\P or \\p sequence" msgstr "zle formátovaná postupnosť \\P alebo \\p" -#: glib/gregex.c:448 +#: glib/gregex.c:670 msgid "unknown property name after \\P or \\p" msgstr "neznámy názov vlastnosti za \\P alebo \\p" -#: glib/gregex.c:451 +#: glib/gregex.c:674 msgid "subpattern name is too long (maximum 32 characters)" msgstr "názov podvzoru je príliš dlhý (maximum je 32 znakov)" -#: glib/gregex.c:454 +#: glib/gregex.c:678 msgid "too many named subpatterns (maximum 10,000)" msgstr "príliš mnoho pomenovaných podvzorov (maximum je 10 000)" -#: glib/gregex.c:457 +#: glib/gregex.c:682 msgid "octal value is greater than \\377" msgstr "osmičková hodnota je väčšia ako \\377" -#: glib/gregex.c:461 -msgid "overran compiling workspace" -msgstr "pretečený priestor pre preklad" - -#: glib/gregex.c:465 -msgid "previously-checked referenced subpattern not found" -msgstr "predtým kontrolovaný odkazovaný podvzor nenájdený" - -#: glib/gregex.c:468 +#: glib/gregex.c:686 msgid "DEFINE group contains more than one branch" msgstr "skupina DEFINE obsahuje viac ako jednu vetvu" -#: glib/gregex.c:471 +#: glib/gregex.c:690 msgid "inconsistent NEWLINE options" msgstr "nekonzistentné voľby NEWLINE" -#: glib/gregex.c:474 +#: glib/gregex.c:694 msgid "" "\\g is not followed by a braced, angle-bracketed, or quoted name or number, " "or by a plain number" @@ -5826,285 +5870,290 @@ "za \\g nenasleduje názov v guľatých ani lomených zátvorkách, názov alebo " "číslo v úvodzovkách ani nekódované číslo" -#: glib/gregex.c:478 -msgid "a numbered reference must not be zero" -msgstr "očíslovaný odkaz nesmie byť nula" - -#: glib/gregex.c:481 +#: glib/gregex.c:699 msgid "an argument is not allowed for (*ACCEPT), (*FAIL), or (*COMMIT)" msgstr "parameter nie je pre (*ACCEPT), (*FAIL) a (*COMMIT) dovolený" -#: glib/gregex.c:484 +#: glib/gregex.c:703 msgid "(*VERB) not recognized" msgstr "(*VERB) nebolo rozpoznané" -#: glib/gregex.c:487 +#: glib/gregex.c:707 msgid "number is too big" msgstr "číslo je príliš veľké" -#: glib/gregex.c:490 +#: glib/gregex.c:711 msgid "missing subpattern name after (?&" msgstr "za (?& chýba názov podvzoru" -#: glib/gregex.c:493 -msgid "digit expected after (?+" -msgstr "za (?+ sa očakáva číslica" - -#: glib/gregex.c:496 -msgid " is an invalid data character in JavaScript compatibility mode" -msgstr "" -" nie je platný dátový znak v režime kompatibility s jazykom JavaScript" - -#: glib/gregex.c:499 +#: glib/gregex.c:715 msgid "different names for subpatterns of the same number are not allowed" msgstr "rôzne názvy pre podvzory s rovnakým číslom nie sú povolené" -#: glib/gregex.c:502 +#: glib/gregex.c:719 msgid "(*MARK) must have an argument" msgstr "(*MARK) musí mať parameter" -#: glib/gregex.c:505 +#: glib/gregex.c:723 msgid "\\c must be followed by an ASCII character" msgstr "za \\c musí nasledovať znak ASCII" -#: glib/gregex.c:508 +#: glib/gregex.c:727 msgid "\\k is not followed by a braced, angle-bracketed, or quoted name" msgstr "" "za \\k nenasleduje názov v zátvorkách, lomených zátvorkách alebo úvodzovkách" -#: glib/gregex.c:511 +#: glib/gregex.c:731 msgid "\\N is not supported in a class" msgstr "\\N nie je v triede podporované" -# PM:nie som si istý -# MČ: Hmm. Musel som pozrieť zdrojáky pcre, aby som sa trošku ztoho vymotal. Pri doprednom vyhľadávaní (lookahead) si stroj regulárneho výrazu odkladá odkazy na už asociované (zjednodušene nájdené) časti textu k regulárnemu výrazu. Ak je ich priveľa, nezmestia sa do pamäte, malloc zlyhá, vráti túto chybovú hlášku. Myslím, že preklad aj originál mi povedali rovnako veľa informácií. -#: glib/gregex.c:514 -msgid "too many forward references" -msgstr "príliš mnoho dopredných odkazov" - -#: glib/gregex.c:517 +#: glib/gregex.c:735 msgid "name is too long in (*MARK), (*PRUNE), (*SKIP), or (*THEN)" msgstr "názov v (*MARK), (*PRUNE), (*SKIP) alebo (*THEN) je príliš dlhý" -#: glib/gregex.c:520 -msgid "character value in \\u.... sequence is too large" -msgstr "hodnota znaku v postupnosti \\u.... je príliš veľká" +#: glib/gregex.c:739 glib/gregex.c:875 +msgid "code overflow" +msgstr "pretečenie kódu" + +#: glib/gregex.c:743 +msgid "unrecognized character after (?P" +msgstr "nerozpoznaný znak za (?P" -#: glib/gregex.c:743 glib/gregex.c:1988 +#: glib/gregex.c:747 +msgid "overran compiling workspace" +msgstr "pretečený priestor pre preklad" + +#: glib/gregex.c:751 +msgid "previously-checked referenced subpattern not found" +msgstr "predtým kontrolovaný odkazovaný podvzor nenájdený" + +#: glib/gregex.c:874 glib/gregex.c:1121 glib/gregex.c:2444 #, c-format msgid "Error while matching regular expression %s: %s" msgstr "Chyba počas porovnávania regulárneho výrazu %s: %s" -#: glib/gregex.c:1321 +#: glib/gregex.c:1721 msgid "PCRE library is compiled without UTF8 support" msgstr "Knižnica PCRE je preložená bez podpory UTF8" -#: glib/gregex.c:1325 -msgid "PCRE library is compiled without UTF8 properties support" -msgstr "Knižnica PCRE je preložená bez podpory vlastností UTF8" - -#: glib/gregex.c:1333 +#: glib/gregex.c:1729 msgid "PCRE library is compiled with incompatible options" msgstr "Knižnica PCRE je preložená s nekompatibilnými voľbami" -#: glib/gregex.c:1362 -#, c-format -msgid "Error while optimizing regular expression %s: %s" -msgstr "Chyba počas optimalizovania regulárneho výrazu %s: %s" - -#: glib/gregex.c:1442 -#, c-format -msgid "Error while compiling regular expression %s at char %d: %s" +#: glib/gregex.c:1847 +#, fuzzy, c-format +#| msgid "Error while compiling regular expression %s at char %d: %s" +msgid "Error while compiling regular expression ‘%s’ at char %s: %s" msgstr "Chyba počas prekladu regulárneho výrazu %s pri znaku %d: %s" -#: glib/gregex.c:2427 +#: glib/gregex.c:2887 msgid "hexadecimal digit or “}” expected" msgstr "očakávaná šestnástková číslica alebo „}“" -#: glib/gregex.c:2443 +#: glib/gregex.c:2903 msgid "hexadecimal digit expected" msgstr "očakávaná šestnástková číslica" -#: glib/gregex.c:2483 +#: glib/gregex.c:2943 msgid "missing “<” in symbolic reference" msgstr "chýba „<“ v symbolickom odkaze" -#: glib/gregex.c:2492 +#: glib/gregex.c:2952 msgid "unfinished symbolic reference" msgstr "neukončený symbolický odkaz" -#: glib/gregex.c:2499 +#: glib/gregex.c:2959 msgid "zero-length symbolic reference" msgstr "symbolický odkaz s nulovou dĺžkou" -#: glib/gregex.c:2510 +#: glib/gregex.c:2970 msgid "digit expected" msgstr "očakávaná číslica" -#: glib/gregex.c:2528 +#: glib/gregex.c:2988 msgid "illegal symbolic reference" msgstr "neplatný symbolický odkaz" -#: glib/gregex.c:2591 +#: glib/gregex.c:3051 msgid "stray final “\\”" msgstr "zabudnuté koncové „\\“" -#: glib/gregex.c:2595 +#: glib/gregex.c:3055 msgid "unknown escape sequence" msgstr "neznáma špeciálna (escape) sekvencia" -#: glib/gregex.c:2605 +#: glib/gregex.c:3065 #, c-format msgid "Error while parsing replacement text “%s” at char %lu: %s" msgstr "Chyba počas analyzovania nahrádzajúceho textu „%s“ pri znaku %lu: %s" -#: glib/gshell.c:94 +#: glib/gshell.c:98 msgid "Quoted text doesn’t begin with a quotation mark" msgstr "Citovaný text nezačína úvodzovkami" -#: glib/gshell.c:184 +#: glib/gshell.c:188 msgid "Unmatched quotation mark in command line or other shell-quoted text" msgstr "" "Prebytočné úvodzovky v príkazovom riadku alebo v inom texte shellu v " "úvodzovkách" -#: glib/gshell.c:580 +#: glib/gshell.c:594 #, c-format msgid "Text ended just after a “\\” character. (The text was “%s”)" msgstr "Text skončil hneď po znaku „\\“. (Text bol „%s“)" -#: glib/gshell.c:587 +#: glib/gshell.c:601 #, c-format msgid "Text ended before matching quote was found for %c. (The text was “%s”)" msgstr "" "Text skončil pred nájdením zodpovedajúcej úvodzovky znakom %c. (Text bol " "„%s“)" -#: glib/gshell.c:599 +#: glib/gshell.c:613 msgid "Text was empty (or contained only whitespace)" msgstr "Text bol prázdny (alebo obsahoval iba medzery)" -#: glib/gspawn.c:308 +#: glib/gspawn.c:319 #, c-format msgid "Failed to read data from child process (%s)" msgstr "Zlyhalo čítanie údajov z dcérskeho procesu (%s)" -#: glib/gspawn.c:458 +#: glib/gspawn.c:471 #, c-format msgid "Unexpected error in reading data from a child process (%s)" msgstr "Neočakávaná chyba pri čítaní údajov z dcérskeho procesu (%s)" -#: glib/gspawn.c:543 +#: glib/gspawn.c:556 #, c-format msgid "Unexpected error in waitpid() (%s)" msgstr "Neočakávaná chyba vo waitpid() (%s)" -#: glib/gspawn.c:1152 glib/gspawn-win32.c:1407 +#: glib/gspawn.c:1175 glib/gspawn-win32.c:1503 #, c-format msgid "Child process exited with code %ld" msgstr "Dcérsky proces skončil s kódom %ld" -#: glib/gspawn.c:1160 +#: glib/gspawn.c:1183 #, c-format msgid "Child process killed by signal %ld" msgstr "Dcérsky proces bol zabitý signálom %ld" -#: glib/gspawn.c:1167 +#: glib/gspawn.c:1190 #, c-format msgid "Child process stopped by signal %ld" msgstr "Dcérsky proces bol zastavený signálom %ld" -#: glib/gspawn.c:1174 +#: glib/gspawn.c:1197 #, c-format msgid "Child process exited abnormally" msgstr "Dcérsky proces skončil neobvykle" -#: glib/gspawn.c:1793 glib/gspawn-win32.c:350 glib/gspawn-win32.c:358 +#: glib/gspawn.c:2027 glib/gspawn-win32.c:393 glib/gspawn-win32.c:401 #, c-format msgid "Failed to read from child pipe (%s)" msgstr "Zlyhalo čítanie zo zreťazenia s potomkom (%s)" -#: glib/gspawn.c:2095 +#: glib/gspawn.c:2399 #, c-format msgid "Failed to spawn child process “%s” (%s)" msgstr "Zlyhalo vytvorenie dcérskeho procesu „%s“ (%s)" -#: glib/gspawn.c:2212 +#: glib/gspawn.c:2525 #, c-format msgid "Failed to fork (%s)" msgstr "Zlyhalo vytvorenie vetvy (%s)" -#: glib/gspawn.c:2372 glib/gspawn-win32.c:381 +#: glib/gspawn.c:2685 glib/gspawn-win32.c:424 #, c-format msgid "Failed to change to directory “%s” (%s)" msgstr "Zlyhala zmena adresára na „%s“ (%s)" -#: glib/gspawn.c:2382 +#: glib/gspawn.c:2695 #, c-format msgid "Failed to execute child process “%s” (%s)" msgstr "Zlyhalo spustenie dcérskeho procesu „%s“ (%s)" -#: glib/gspawn.c:2392 -#, c-format -msgid "Failed to redirect output or input of child process (%s)" +#: glib/gspawn.c:2705 +#, fuzzy, c-format +#| msgid "Failed to open file “%s”: open() failed: %s" +msgid "Failed to open file to remap file descriptor (%s)" +msgstr "Zlyhalo otvorenie súboru „%s“: open() zlyhalo: %s" + +#: glib/gspawn.c:2713 +#, fuzzy, c-format +#| msgid "Failed to redirect output or input of child process (%s)" +msgid "Failed to duplicate file descriptor for child process (%s)" msgstr "Zlyhalo presmerovanie vstupu alebo výstupu dcérskeho procesu (%s)" -#: glib/gspawn.c:2401 +#: glib/gspawn.c:2722 #, c-format msgid "Failed to fork child process (%s)" msgstr "Zlyhalo vytvorenie vetvy dcérskeho procesu (%s)" -#: glib/gspawn.c:2409 +#: glib/gspawn.c:2730 +#, fuzzy, c-format +#| msgid "Failed to read data from child process (%s)" +msgid "Failed to close file descriptor for child process (%s)" +msgstr "Zlyhalo čítanie údajov z dcérskeho procesu (%s)" + +#: glib/gspawn.c:2738 #, c-format msgid "Unknown error executing child process “%s”" msgstr "Neznáma chyba pri spúšťaní dcérskeho procesu „%s“" -#: glib/gspawn.c:2433 +#: glib/gspawn.c:2762 #, c-format msgid "Failed to read enough data from child pid pipe (%s)" msgstr "" "Nepodarilo sa prečítať dostatok údajov zo zreťazenia s dcérskym procesom (%s)" -#: glib/gspawn-win32.c:294 +#: glib/gspawn-private.h:134 +#, fuzzy, c-format +#| msgid "Invalid seek request" +msgid "Invalid source FDs argument" +msgstr "Neplatná požiadavka na presunutie" + +#: glib/gspawn-win32.c:337 msgid "Failed to read data from child process" msgstr "Zlyhalo čítanie údajov z dcérskeho procesu" -#: glib/gspawn-win32.c:311 -#, c-format -msgid "Failed to create pipe for communicating with child process (%s)" -msgstr "Zlyhalo vytvorenie zreťazenia pre komunikáciu s dcérskym procesom (%s)" - -#: glib/gspawn-win32.c:387 glib/gspawn-win32.c:392 glib/gspawn-win32.c:511 +#: glib/gspawn-win32.c:430 glib/gspawn-win32.c:435 glib/gspawn-win32.c:561 #, c-format msgid "Failed to execute child process (%s)" msgstr "Zlyhalo spustenie dcérskeho procesu (%s)" -#: glib/gspawn-win32.c:461 +#: glib/gspawn-win32.c:440 +#, fuzzy, c-format +#| msgid "Failed to fork child process (%s)" +msgid "Failed to dup() in child process (%s)" +msgstr "Zlyhalo vytvorenie vetvy dcérskeho procesu (%s)" + +#: glib/gspawn-win32.c:511 #, c-format msgid "Invalid program name: %s" msgstr "Neplatný názov programu: %s" -#: glib/gspawn-win32.c:471 glib/gspawn-win32.c:779 +#: glib/gspawn-win32.c:521 glib/gspawn-win32.c:868 #, c-format msgid "Invalid string in argument vector at %d: %s" msgstr "Neplatný reťazec vo vektore parametra na %d: %s" -#: glib/gspawn-win32.c:482 glib/gspawn-win32.c:794 +#: glib/gspawn-win32.c:532 glib/gspawn-win32.c:884 #, c-format msgid "Invalid string in environment: %s" msgstr "Neplatný reťazec v prostredí: %s" -#: glib/gspawn-win32.c:775 +#: glib/gspawn-win32.c:864 #, c-format msgid "Invalid working directory: %s" msgstr "Neplatný pracovný adresár: %s" -#: glib/gspawn-win32.c:837 +#: glib/gspawn-win32.c:929 #, c-format msgid "Failed to execute helper program (%s)" msgstr "Zlyhalo spustenie pomocného programu (%s)" -#: glib/gspawn-win32.c:1064 +#: glib/gspawn-win32.c:1158 msgid "" "Unexpected error in g_io_channel_win32_poll() reading data from a child " "process" @@ -6112,311 +6161,480 @@ "Neočakávaná chyba v g_io_channel_win32_poll() pri čítaní údajov z dcérskeho " "procesu" -#: glib/gstrfuncs.c:3338 glib/gstrfuncs.c:3440 +#: glib/gstrfuncs.c:3373 glib/gstrfuncs.c:3475 msgid "Empty string is not a number" msgstr "Prázdny reťazec nie je číslo" -#: glib/gstrfuncs.c:3362 +#: glib/gstrfuncs.c:3397 #, c-format msgid "“%s” is not a signed number" msgstr "„%s“ nie je číslo so znamienkom" -#: glib/gstrfuncs.c:3372 glib/gstrfuncs.c:3476 +#: glib/gstrfuncs.c:3407 glib/gstrfuncs.c:3511 #, c-format msgid "Number “%s” is out of bounds %s, %s" msgstr "Číslo „%s“ je mimo rozsah %s, %s" -#: glib/gstrfuncs.c:3466 +#: glib/gstrfuncs.c:3501 #, c-format msgid "“%s” is not an unsigned number" msgstr "„%s“ nie je číslo bez znamienka" -#: glib/guri.c:315 +#: glib/guri.c:317 #, no-c-format msgid "Invalid %-encoding in URI" msgstr "Neplatné kódovanie použitím znaku % v URI" -#: glib/guri.c:332 +#: glib/guri.c:334 msgid "Illegal character in URI" msgstr "Neplatný znak v URI" -#: glib/guri.c:366 +#: glib/guri.c:368 msgid "Non-UTF-8 characters in URI" msgstr "" -#: glib/guri.c:546 +#: glib/guri.c:548 #, c-format msgid "Invalid IPv6 address ‘%.*s’ in URI" -msgstr "" +msgstr "Neplatná adresa IPv6 „%.*s“ v URI" -#: glib/guri.c:601 +#: glib/guri.c:603 #, c-format msgid "Illegal encoded IP address ‘%.*s’ in URI" msgstr "" -#: glib/guri.c:613 -#, fuzzy, c-format -#| msgid "Could not parse port ‘%.*s’ in URI" +#: glib/guri.c:615 +#, c-format msgid "Illegal internationalized hostname ‘%.*s’ in URI" -msgstr "Nepodarilo sa analyzovať port „%.*s“ v URI" +msgstr "Neplatný zmedzinárodnený názov hostiteľa „%.*s“ v URI" -#: glib/guri.c:645 glib/guri.c:657 +#: glib/guri.c:647 glib/guri.c:659 #, c-format msgid "Could not parse port ‘%.*s’ in URI" msgstr "Nepodarilo sa analyzovať port „%.*s“ v URI" -#: glib/guri.c:664 +#: glib/guri.c:666 #, c-format msgid "Port ‘%.*s’ in URI is out of range" msgstr "Port „%.*s“ v URI je mimo rozsah" -#: glib/guri.c:1224 glib/guri.c:1288 +#: glib/guri.c:1226 glib/guri.c:1290 #, c-format msgid "URI ‘%s’ is not an absolute URI" msgstr "URI „%s“ nie je absolútnym URI" -#: glib/guri.c:1230 +#: glib/guri.c:1232 #, c-format msgid "URI ‘%s’ has no host component" msgstr "" -#: glib/guri.c:1435 +#: glib/guri.c:1462 msgid "URI is not absolute, and no base URI was provided" msgstr "" -#: glib/guri.c:2213 +#: glib/guri.c:2248 msgid "Missing ‘=’ and parameter value" msgstr "Chýba znak „=“ a hodnota parametra" -#: glib/gutf8.c:817 +#: glib/gutf8.c:834 msgid "Failed to allocate memory" msgstr "Zlyhalo alokovanie pamäte" -#: glib/gutf8.c:950 +#: glib/gutf8.c:967 msgid "Character out of range for UTF-8" msgstr "Znak mimo rozsah UTF-8" -#: glib/gutf8.c:1051 glib/gutf8.c:1060 glib/gutf8.c:1190 glib/gutf8.c:1199 -#: glib/gutf8.c:1338 glib/gutf8.c:1435 +#: glib/gutf8.c:1069 glib/gutf8.c:1078 glib/gutf8.c:1208 glib/gutf8.c:1217 +#: glib/gutf8.c:1356 glib/gutf8.c:1453 msgid "Invalid sequence in conversion input" msgstr "Neplatná sekvencia na vstupe prevodu" -#: glib/gutf8.c:1349 glib/gutf8.c:1446 +#: glib/gutf8.c:1367 glib/gutf8.c:1464 msgid "Character out of range for UTF-16" msgstr "Znak mimo rozsah UTF-16" -#. Translators: Keep the no-break space between %.1f and the unit symbol -#: glib/gutils.c:2727 +#. Translators: A unit symbol for size formatting, showing for example: "13.0 kB" +#: glib/gutils.c:2966 +msgid "kB" +msgstr "kB" + +#. Translators: A unit symbol for size formatting, showing for example: "13.0 MB" +#: glib/gutils.c:2968 +msgid "MB" +msgstr "MB" + +#. Translators: A unit symbol for size formatting, showing for example: "13.0 GB" +#: glib/gutils.c:2970 +msgid "GB" +msgstr "GB" + +#. Translators: A unit symbol for size formatting, showing for example: "13.0 TB" +#: glib/gutils.c:2972 +msgid "TB" +msgstr "TB" + +#. Translators: A unit symbol for size formatting, showing for example: "13.0 PB" +#: glib/gutils.c:2974 +msgid "PB" +msgstr "PB" + +#. Translators: A unit symbol for size formatting, showing for example: "13.0 EB" +#: glib/gutils.c:2976 +msgid "EB" +msgstr "EB" + +#. Translators: A unit symbol for size formatting, showing for example: "13.0 KiB" +#: glib/gutils.c:2980 +msgid "KiB" +msgstr "KiB" + +#. Translators: A unit symbol for size formatting, showing for example: "13.0 MiB" +#: glib/gutils.c:2982 +msgid "MiB" +msgstr "MiB" + +#. Translators: A unit symbol for size formatting, showing for example: "13.0 GiB" +#: glib/gutils.c:2984 +msgid "GiB" +msgstr "GiB" + +#. Translators: A unit symbol for size formatting, showing for example: "13.0 TiB" +#: glib/gutils.c:2986 +msgid "TiB" +msgstr "TiB" + +#. Translators: A unit symbol for size formatting, showing for example: "13.0 PiB" +#: glib/gutils.c:2988 +msgid "PiB" +msgstr "PiB" + +#. Translators: A unit symbol for size formatting, showing for example: "13.0 EiB" +#: glib/gutils.c:2990 +msgid "EiB" +msgstr "EiB" + +#. Translators: A unit symbol for size formatting, showing for example: "13.0 kb" +#: glib/gutils.c:2994 +msgid "kb" +msgstr "kb" + +#. Translators: A unit symbol for size formatting, showing for example: "13.0 Mb" +#: glib/gutils.c:2996 +msgid "Mb" +msgstr "Mb" + +#. Translators: A unit symbol for size formatting, showing for example: "13.0 Gb" +#: glib/gutils.c:2998 +msgid "Gb" +msgstr "Gb" + +#. Translators: A unit symbol for size formatting, showing for example: "13.0 Tb" +#: glib/gutils.c:3000 +msgid "Tb" +msgstr "Tb" + +#. Translators: A unit symbol for size formatting, showing for example: "13.0 Pb" +#: glib/gutils.c:3002 +msgid "Pb" +msgstr "Pb" + +#. Translators: A unit symbol for size formatting, showing for example: "13.0 Eb" +#: glib/gutils.c:3004 +msgid "Eb" +msgstr "Eb" + +#. Translators: A unit symbol for size formatting, showing for example: "13.0 Kib" +#: glib/gutils.c:3008 +msgid "Kib" +msgstr "Kib" + +#. Translators: A unit symbol for size formatting, showing for example: "13.0 Mib" +#: glib/gutils.c:3010 +msgid "Mib" +msgstr "Mib" + +#. Translators: A unit symbol for size formatting, showing for example: "13.0 Gib" +#: glib/gutils.c:3012 +msgid "Gib" +msgstr "Gib" + +#. Translators: A unit symbol for size formatting, showing for example: "13.0 Tib" +#: glib/gutils.c:3014 +msgid "Tib" +msgstr "Tib" + +#. Translators: A unit symbol for size formatting, showing for example: "13.0 Pib" +#: glib/gutils.c:3016 +msgid "Pib" +msgstr "Pib" + +#. Translators: A unit symbol for size formatting, showing for example: "13.0 Eib" +#: glib/gutils.c:3018 +msgid "Eib" +msgstr "Eib" + +#: glib/gutils.c:3056 +msgid "byte" +msgid_plural "bytes" +msgstr0 "bajtov" +msgstr1 "bajt" +msgstr2 "bajty" + +#: glib/gutils.c:3060 +#| msgid "%u bit" +#| msgid_plural "%u bits" +msgid "bit" +msgid_plural "bits" +msgstr0 "bitov" +msgstr1 "bit" +msgstr2 "bity" + +#. Translators: The "%u" is replaced with the size value, like "13"; it could +#. * be part of "13 bytes", but only the number is requested this time. +#: glib/gutils.c:3068 +#, c-format +msgctxt "format-size" +msgid "%u" +msgstr "%u" + +#. Translators: The first "%u" is replaced with the value, the "%s" with a unit of the value. +#. * The order can be changed with "%$2s %$1u". An example: "13 bytes" +#: glib/gutils.c:3073 +#, c-format +msgctxt "format-size" +msgid "%u %s" +msgstr "%u %s" + +#. Translators: The "%.1f" is replaced with the size value, like "13.0"; it could +#. * be part of "13.0 MB", but only the number is requested this time. +#: glib/gutils.c:3109 +#, c-format +#| msgid "%.1f KB" +msgctxt "format-size" +msgid "%.1f" +msgstr "%.1f" + +#. Translators: The first "%.1f" is replaced with the value, the "%s" with a unit of the value. +#. * The order can be changed with "%$2s %$1.1f". Keep the no-break space between the value and +#. * the unit symbol. An example: "13.0 MB" +#: glib/gutils.c:3115 +#, c-format +#| msgid "%.1f kB" +msgctxt "format-size" +msgid "%.1f %s" +msgstr "%.1f %s" + +#. Translators: the %s in "%s bytes" will always be replaced by a number. +#: glib/gutils.c:3155 #, c-format -msgid "%.1f kB" -msgstr "%.1f kB" +msgid "%s byte" +msgid_plural "%s bytes" +msgstr0 "%s bajtov" +msgstr1 "%s bajt" +msgstr2 "%s bajty" -#. Translators: Keep the no-break space between %.1f and the unit symbol -#: glib/gutils.c:2729 +#. Translators: the %s in "%s bits" will always be replaced by a number. +#: glib/gutils.c:3160 #, c-format -msgid "%.1f MB" -msgstr "%.1f MB" +msgid "%s bit" +msgid_plural "%s bits" +msgstr0 "%s bitov" +msgstr1 "%s bit" +msgstr2 "%s bity" -#. Translators: Keep the no-break space between %.1f and the unit symbol -#: glib/gutils.c:2731 +#: glib/gutils.c:3201 #, c-format -msgid "%.1f GB" -msgstr "%.1f GB" +msgid "%u byte" +msgid_plural "%u bytes" +msgstr0 "%u bajtov" +msgstr1 "%u bajt" +msgstr2 "%u bajty" -#. Translators: Keep the no-break space between %.1f and the unit symbol -#: glib/gutils.c:2733 +#. 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:3214 #, c-format -msgid "%.1f TB" -msgstr "%.1f TB" +msgid "%.1f KB" +msgstr "%.1f kB" -#. Translators: Keep the no-break space between %.1f and the unit symbol -#: glib/gutils.c:2735 +#: glib/gutils.c:3219 #, c-format -msgid "%.1f PB" -msgstr "%.1f PB" +msgid "%.1f MB" +msgstr "%.1f MB" -#. Translators: Keep the no-break space between %.1f and the unit symbol -#: glib/gutils.c:2737 +#: glib/gutils.c:3224 #, c-format -msgid "%.1f EB" -msgstr "%.1f EB" +msgid "%.1f GB" +msgstr "%.1f GB" -#. Translators: Keep the no-break space between %.1f and the unit symbol -#: glib/gutils.c:2741 +#: glib/gutils.c:3229 #, c-format -msgid "%.1f KiB" -msgstr "%.1f KiB" +msgid "%.1f TB" +msgstr "%.1f TB" -#. Translators: Keep the no-break space between %.1f and the unit symbol -#: glib/gutils.c:2743 +#: glib/gutils.c:3234 #, c-format -msgid "%.1f MiB" -msgstr "%.1f MiB" +msgid "%.1f PB" +msgstr "%.1f PB" -#. Translators: Keep the no-break space between %.1f and the unit symbol -#: glib/gutils.c:2745 +#: glib/gutils.c:3239 #, c-format -msgid "%.1f GiB" -msgstr "%.1f GiB" +msgid "%.1f EB" +msgstr "%.1f EB" -#. Translators: Keep the no-break space between %.1f and the unit symbol -#: glib/gutils.c:2747 #, c-format -msgid "%.1f TiB" -msgstr "%.1f TiB" +#~ msgid "edit name: %s\n" +#~ msgstr "názov na úpravu: %s\n" + +#~ msgid "internal error or corrupted object" +#~ msgstr "vnútorná chyba alebo poškodený objekt" + +#~ msgid "invalid combination of newline flags" +#~ msgstr "neplatná kombinácia príznakov nového riadka" + +#~ msgid "short utf8" +#~ msgstr "krátke utf8" + +#~ msgid "unexpected repeat" +#~ msgstr "neočakávané opakovanie" + +#~ msgid "failed to get memory" +#~ msgstr "nepodarilo sa získať pamäť" + +#~ msgid ") without opening (" +#~ msgstr ") bez otváracej (" + +#~ msgid "unrecognized character after (?<" +#~ msgstr "nerozpoznaný znak za (?<" + +#~ msgid "(?R or (?+-digits must be followed by )" +#~ msgstr "za (?R alebo (?+-číslice musí nasledovať )" + +#~ msgid "invalid condition (?(0)" +#~ msgstr "neplatná podmienka (?(0)" + +#~ msgid "escapes \\L, \\l, \\N{name}, \\U, and \\u are not supported" +#~ msgstr "\\L, \\l, \\N{name}, \\U, a \\u nie sú podporované" + +#~ msgid "recursive call could loop indefinitely" +#~ msgstr "rekurzívne volanie by sa mohlo donekonečna opakovať" + +#~ msgid "digit expected after (?+" +#~ msgstr "za (?+ sa očakáva číslica" + +#~ msgid " is an invalid data character in JavaScript compatibility mode" +#~ msgstr "" +#~ " nie je platný dátový znak v režime kompatibility s jazykom JavaScript" + +# PM:nie som si istý +# MČ: Hmm. Musel som pozrieť zdrojáky pcre, aby som sa trošku ztoho vymotal. Pri doprednom vyhľadávaní (lookahead) si stroj regulárneho výrazu odkladá odkazy na už asociované (zjednodušene nájdené) časti textu k regulárnemu výrazu. Ak je ich priveľa, nezmestia sa do pamäte, malloc zlyhá, vráti túto chybovú hlášku. Myslím, že preklad aj originál mi povedali rovnako veľa informácií. +#~ msgid "too many forward references" +#~ msgstr "príliš mnoho dopredných odkazov" + +#~ msgid "character value in \\u.... sequence is too large" +#~ msgstr "hodnota znaku v postupnosti \\u.... je príliš veľká" + +#~ msgid "PCRE library is compiled without UTF8 properties support" +#~ msgstr "Knižnica PCRE je preložená bez podpory vlastností UTF8" -#. Translators: Keep the no-break space between %.1f and the unit symbol -#: glib/gutils.c:2749 #, c-format -msgid "%.1f PiB" -msgstr "%.1f PiB" +#~ msgid "Error while optimizing regular expression %s: %s" +#~ msgstr "Chyba počas optimalizovania regulárneho výrazu %s: %s" -#. Translators: Keep the no-break space between %.1f and the unit symbol -#: glib/gutils.c:2751 #, c-format -msgid "%.1f EiB" -msgstr "%.1f EiB" +#~ msgid "%.1f MB" +#~ msgstr "%.1f MB" -#. Translators: Keep the no-break space between %.1f and the unit symbol -#: glib/gutils.c:2755 #, c-format -msgid "%.1f kb" -msgstr "%.1f kb" +#~ msgid "%.1f GB" +#~ msgstr "%.1f GB" -#. Translators: Keep the no-break space between %.1f and the unit symbol -#: glib/gutils.c:2757 #, c-format -msgid "%.1f Mb" -msgstr "%.1f Mb" +#~ msgid "%.1f TB" +#~ msgstr "%.1f TB" -#. Translators: Keep the no-break space between %.1f and the unit symbol -#: glib/gutils.c:2759 #, c-format -msgid "%.1f Gb" -msgstr "%.1f Gb" +#~ msgid "%.1f PB" +#~ msgstr "%.1f PB" -#. Translators: Keep the no-break space between %.1f and the unit symbol -#: glib/gutils.c:2761 #, c-format -msgid "%.1f Tb" -msgstr "%.1f Tb" +#~ msgid "%.1f EB" +#~ msgstr "%.1f EB" -#. Translators: Keep the no-break space between %.1f and the unit symbol -#: glib/gutils.c:2763 #, c-format -msgid "%.1f Pb" -msgstr "%.1f Pb" +#~ msgid "%.1f KiB" +#~ msgstr "%.1f KiB" -#. Translators: Keep the no-break space between %.1f and the unit symbol -#: glib/gutils.c:2765 #, c-format -msgid "%.1f Eb" -msgstr "%.1f Eb" +#~ msgid "%.1f MiB" +#~ msgstr "%.1f MiB" -#. Translators: Keep the no-break space between %.1f and the unit symbol -#: glib/gutils.c:2769 #, c-format -msgid "%.1f Kib" -msgstr "%.1f Kib" +#~ msgid "%.1f GiB" +#~ msgstr "%.1f GiB" -#. Translators: Keep the no-break space between %.1f and the unit symbol -#: glib/gutils.c:2771 #, c-format -msgid "%.1f Mib" -msgstr "%.1f Mib" +#~ msgid "%.1f TiB" +#~ msgstr "%.1f TiB" -#. Translators: Keep the no-break space between %.1f and the unit symbol -#: glib/gutils.c:2773 #, c-format -msgid "%.1f Gib" -msgstr "%.1f Gib" +#~ msgid "%.1f PiB" +#~ msgstr "%.1f PiB" -#. Translators: Keep the no-break space between %.1f and the unit symbol -#: glib/gutils.c:2775 #, c-format -msgid "%.1f Tib" -msgstr "%.1f Tib" +#~ msgid "%.1f EiB" +#~ msgstr "%.1f EiB" -#. Translators: Keep the no-break space between %.1f and the unit symbol -#: glib/gutils.c:2777 #, c-format -msgid "%.1f Pib" -msgstr "%.1f Pib" +#~ msgid "%.1f kb" +#~ msgstr "%.1f kb" -#. Translators: Keep the no-break space between %.1f and the unit symbol -#: glib/gutils.c:2779 #, c-format -msgid "%.1f Eib" -msgstr "%.1f Eib" +#~ msgid "%.1f Mb" +#~ msgstr "%.1f Mb" -#: glib/gutils.c:2813 glib/gutils.c:2930 #, c-format -msgid "%u byte" -msgid_plural "%u bytes" -msgstr0 "%u bajtov" -msgstr1 "%u bajt" -msgstr2 "%u bajty" +#~ msgid "%.1f Gb" +#~ msgstr "%.1f Gb" -#: glib/gutils.c:2817 #, c-format -msgid "%u bit" -msgid_plural "%u bits" -msgstr0 "%u bitov" -msgstr1 "%u bit" -msgstr2 "%u bity" +#~ msgid "%.1f Tb" +#~ msgstr "%.1f Tb" -#. Translators: the %s in "%s bytes" will always be replaced by a number. -#: glib/gutils.c:2884 #, c-format -msgid "%s byte" -msgid_plural "%s bytes" -msgstr0 "%s bajtov" -msgstr1 "%s bajt" -msgstr2 "%s bajty" +#~ msgid "%.1f Pb" +#~ msgstr "%.1f Pb" -#. Translators: the %s in "%s bits" will always be replaced by a number. -#: glib/gutils.c:2889 #, c-format -msgid "%s bit" -msgid_plural "%s bits" -msgstr0 "%s bitov" -msgstr1 "%s bit" -msgstr2 "%s bity" +#~ msgid "%.1f Eb" +#~ msgstr "%.1f Eb" -#. 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:2943 #, c-format -msgid "%.1f KB" -msgstr "%.1f kB" +#~ msgid "%.1f Kib" +#~ msgstr "%.1f Kib" -#: glib/gutils.c:2948 #, c-format -msgid "%.1f MB" -msgstr "%.1f MB" +#~ msgid "%.1f Mib" +#~ msgstr "%.1f Mib" -#: glib/gutils.c:2953 #, c-format -msgid "%.1f GB" -msgstr "%.1f GB" +#~ msgid "%.1f Gib" +#~ msgstr "%.1f Gib" -#: glib/gutils.c:2958 #, c-format -msgid "%.1f TB" -msgstr "%.1f TB" +#~ msgid "%.1f Tib" +#~ msgstr "%.1f Tib" -#: glib/gutils.c:2963 #, c-format -msgid "%.1f PB" -msgstr "%.1f PB" +#~ msgid "%.1f Pib" +#~ msgstr "%.1f Pib" -#: glib/gutils.c:2968 #, c-format -msgid "%.1f EB" -msgstr "%.1f EB" +#~ msgid "%.1f Eib" +#~ msgstr "%.1f Eib" #~ msgid "Unable to load /var/lib/dbus/machine-id or /etc/machine-id: " #~ msgstr "" @@ -6553,9 +6771,6 @@ #~ "Chyba pri spracovaní vstupného súboru pomocou to-pixdata:\n" #~ "%s" -#~ msgid "URIs not supported" -#~ msgstr "Identifikátory URI nie sú podporované" - #~ msgid "Key file does not have key '%s'" #~ msgstr "Súbor kľúčov neobsahuje kľúč „%s“"
View file
_service:tar_scm:glib-2.74.4.tar.xz/po/sl.po -> _service:tar_scm:glib-2.76.4.tar.xz/po/sl.po
Changed
@@ -3,14 +3,14 @@ # This file is distributed under the same license as the glib package. # # Andraž Tori <andraz.tori1@guest.arnes.si> 2000. -# Matej Urbančič <mateju@src.gnome.org>, 2007–2022 . +# Matej Urbančič <mateju@src.gnome.org>, 2007–2023. # msgid "" msgstr "" "Project-Id-Version: glib master\n" "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/glib/issues\n" -"POT-Creation-Date: 2022-09-10 09:05+0000\n" -"PO-Revision-Date: 2022-09-11 21:10+0200\n" +"POT-Creation-Date: 2023-02-26 10:53+0000\n" +"PO-Revision-Date: 2023-02-27 21:22+0100\n" "Last-Translator: Matej Urbančič <mateju@src.gnome.org>\n" "Language-Team: Slovenian GNOME Translation Team <gnome-si@googlegroups.com>\n" "Language: sl_SI\n" @@ -22,21 +22,21 @@ "X-Poedit-SourceCharset: utf-8\n" "X-Generator: Poedit 3.0.1\n" -#: gio/gappinfo.c:335 +#: gio/gappinfo.c:339 msgid "Setting default applications not supported yet" msgstr "Nastavljanje privzetih programov ni podprto" -#: gio/gappinfo.c:368 +#: gio/gappinfo.c:372 msgid "Setting application as last used for type not supported yet" msgstr "" "Nastavljanje programa kot nazadnje uporabljenega za vrsto datotek ni podprto" -#: gio/gappinfo.c:810 +#: gio/gappinfo.c:814 #, c-format msgid "Failed to find default application for content type ‘%s’" msgstr "Iskanje privzetega programa za vrsto vsebine »%s« je spodletelo" -#: gio/gappinfo.c:870 +#: gio/gappinfo.c:874 #, c-format msgid "Failed to find default application for URI Scheme ‘%s’" msgstr "Iskanje privzetega programa za shemo »%s« je spodletelo" @@ -237,11 +237,11 @@ msgid "error sending %s message to application: %s\n" msgstr "Napaka pri pošiljanju sporočila %s programu: %s\n" -#: gio/gapplication-tool.c:321 +#: gio/gapplication-tool.c:324 msgid "action name must be given after application id\n" msgstr "ime dejanja mora biti podano po določilu id programa\n" -#: gio/gapplication-tool.c:329 +#: gio/gapplication-tool.c:332 #, c-format msgid "" "invalid action name: “%s”\n" @@ -250,25 +250,25 @@ "neveljavno ime dejanja: »%s«\n" "imena dejanj lahko tvorijo le številke in črke, vezaj » - « in pika » . «.\n" -#: gio/gapplication-tool.c:348 +#: gio/gapplication-tool.c:351 #, c-format msgid "error parsing action parameter: %s\n" msgstr "napaka razčlenjevanja parametra dejanja: %s\n" -#: gio/gapplication-tool.c:360 +#: gio/gapplication-tool.c:363 msgid "actions accept a maximum of one parameter\n" msgstr "dejanja prejemajo največ en parameter\n" -#: gio/gapplication-tool.c:415 +#: gio/gapplication-tool.c:418 msgid "list-actions command takes only the application id" msgstr "ukaz list-actions zahteva le id programa" -#: gio/gapplication-tool.c:425 +#: gio/gapplication-tool.c:428 #, c-format msgid "unable to find desktop file for application %s\n" msgstr "ni mogoče najti datoteke namizja za program %s\n" -#: gio/gapplication-tool.c:470 +#: gio/gapplication-tool.c:473 #, c-format msgid "" "unrecognised command: %s\n" @@ -303,7 +303,7 @@ msgid "Truncate not supported on base stream" msgstr "Razčlenitev na osnovnem pretoku ni dovoljena" -#: gio/gcancellable.c:319 gio/gdbusconnection.c:1859 gio/gdbusprivate.c:1420 +#: gio/gcancellable.c:326 gio/gdbusconnection.c:1859 gio/gdbusprivate.c:1420 #: gio/gsimpleasyncresult.c:873 gio/gsimpleasyncresult.c:899 #, c-format msgid "Operation was cancelled" @@ -323,13 +323,13 @@ #: gio/gcharsetconverter.c:344 gio/gdatainputstream.c:850 #: gio/gdatainputstream.c:1268 glib/gconvert.c:451 glib/gconvert.c:883 -#: glib/giochannel.c:1576 glib/giochannel.c:1618 glib/giochannel.c:2473 +#: glib/giochannel.c:1576 glib/giochannel.c:1618 glib/giochannel.c:2478 #: glib/gutf8.c:892 glib/gutf8.c:1346 msgid "Invalid byte sequence in conversion input" msgstr "Neveljavno zaporedje bajtov na vhodu pretvorbe" #: gio/gcharsetconverter.c:349 glib/gconvert.c:459 glib/gconvert.c:797 -#: glib/giochannel.c:1583 glib/giochannel.c:2485 +#: glib/giochannel.c:1583 glib/giochannel.c:2493 #, c-format msgid "Error during conversion: %s" msgstr "Napaka med pretvorbo: %s" @@ -386,17 +386,17 @@ msgid "Unexpected early end-of-stream" msgstr "Nepričakovan prezgodnji konec pretoka" -#: gio/gdbusaddress.c:164 gio/gdbusaddress.c:238 gio/gdbusaddress.c:327 +#: gio/gdbusaddress.c:168 gio/gdbusaddress.c:240 gio/gdbusaddress.c:327 #, c-format msgid "Unsupported key “%s” in address entry “%s”" msgstr "Nepodprt ključ »%s« v vnosu naslova »%s«" -#: gio/gdbusaddress.c:177 +#: gio/gdbusaddress.c:181 #, c-format msgid "Meaningless key/value pair combination in address entry “%s”" msgstr "Nesmiselna kombinacija za par ključ/vrednost v vnosu naslova »%s«" -#: gio/gdbusaddress.c:186 +#: gio/gdbusaddress.c:190 #, c-format msgid "" "Address “%s” is invalid (need exactly one of path, dir, tmpdir, or abstract " @@ -404,7 +404,7 @@ msgstr "" "Naslov »%s« ni večkavem (zahtevana je pot, začasna mapa ali abstraktni ključ)" -#: gio/gdbusaddress.c:253 gio/gdbusaddress.c:264 gio/gdbusaddress.c:279 +#: gio/gdbusaddress.c:255 gio/gdbusaddress.c:266 gio/gdbusaddress.c:281 #: gio/gdbusaddress.c:342 gio/gdbusaddress.c:353 #, c-format msgid "Error in address “%s” — the “%s” attribute is malformed" @@ -534,7 +534,7 @@ msgid "Cannot determine session bus address (not implemented for this OS)" msgstr "Ni mogoče določiti naslova vodila seje (ni podprto v tem OS)" -#: gio/gdbusaddress.c:1375 gio/gdbusconnection.c:7321 +#: gio/gdbusaddress.c:1380 gio/gdbusconnection.c:7316 #, c-format msgid "" "Cannot determine bus address from DBUS_STARTER_BUS_TYPE environment variable " @@ -543,7 +543,7 @@ "Ni mogoče določiti naslova vodila iz okoljske spremenljivke " "DBUS_STARTER_BUS_TYPE – neznana vrednost »%s«" -#: gio/gdbusaddress.c:1384 gio/gdbusconnection.c:7330 +#: gio/gdbusaddress.c:1389 gio/gdbusconnection.c:7325 msgid "" "Cannot determine bus address because the DBUS_STARTER_BUS_TYPE environment " "variable is not set" @@ -551,7 +551,7 @@ "Ni mogoče določiti naslova vodila, kajti okoljska spremenljivka " "DBUS_STARTER_BUS_TYPE ni nastavljena" -#: gio/gdbusaddress.c:1394 +#: gio/gdbusaddress.c:1399 #, c-format msgid "Unknown bus type %d" msgstr "Neznana vrsta vodila %d" @@ -572,20 +572,24 @@ "Izčrpani so vsi razpoložljivi overitveni mehanizmi (poskusi: %s) " "(razpoložljivih: %s)" -#: gio/gdbusauth.c:1178 +#: gio/gdbusauth.c:1045 +msgid "Unexpected lack of content trying to read a byte" +msgstr "Nepričakovano pomanjkanje vsebine med branjem podatkov" + +#: gio/gdbusauth.c:1195 msgid "User IDs must be the same for peer and server" msgstr "Uporabniški ID mora biti enak za odjemalca in strežnik" -#: gio/gdbusauth.c:1190 +#: gio/gdbusauth.c:1207 msgid "Cancelled via GDBusAuthObserver::authorize-authenticated-peer" msgstr "Prekinjeno s strani GDBusAuthObserver::authorize-authenticated-peer" -#: gio/gdbusauthmechanismsha1.c:303 +#: gio/gdbusauthmechanismsha1.c:307 #, c-format msgid "Error when getting information for directory “%s”: %s" msgstr "Napaka med pridobivanjem podrobnosti mape »%s«: %s" -#: gio/gdbusauthmechanismsha1.c:318 +#: gio/gdbusauthmechanismsha1.c:322 #, c-format msgid "" "Permissions on directory “%s” are malformed. Expected mode 0700, got 0%o" @@ -593,12 +597,12 @@ "Dovoljenja na mapi »%s« so napačno oblikovana. Pričakovano je dovoljenje " "0700, pridobljeno pa 0%o" -#: gio/gdbusauthmechanismsha1.c:351 gio/gdbusauthmechanismsha1.c:362 +#: gio/gdbusauthmechanismsha1.c:355 gio/gdbusauthmechanismsha1.c:366 #, c-format msgid "Error creating directory “%s”: %s" msgstr "Napaka med ustvarjanjem mape »%s«: %s" -#: gio/gdbusauthmechanismsha1.c:364 gio/gfile.c:1095 gio/gfile.c:1333 +#: gio/gdbusauthmechanismsha1.c:368 gio/gfile.c:1095 gio/gfile.c:1333 #: gio/gfile.c:1471 gio/gfile.c:1709 gio/gfile.c:1764 gio/gfile.c:1822 #: gio/gfile.c:1906 gio/gfile.c:1963 gio/gfile.c:2027 gio/gfile.c:2082 #: gio/gfile.c:3787 gio/gfile.c:3927 gio/gfile.c:4339 gio/gfile.c:4809 @@ -608,17 +612,17 @@ msgid "Operation not supported" msgstr "Opravilo ni podprto" -#: gio/gdbusauthmechanismsha1.c:407 +#: gio/gdbusauthmechanismsha1.c:411 #, c-format msgid "Error opening keyring “%s” for reading: " msgstr "Napaka med odpiranjem zbirke ključev »%s« za branje: " -#: gio/gdbusauthmechanismsha1.c:430 gio/gdbusauthmechanismsha1.c:771 +#: gio/gdbusauthmechanismsha1.c:434 gio/gdbusauthmechanismsha1.c:775 #, c-format msgid "Line %d of the keyring at “%s” with content “%s” is malformed" msgstr "Vrstica %d zbirke ključev »%s« z vsebino »%s« je neustrezno oblikovana" -#: gio/gdbusauthmechanismsha1.c:444 gio/gdbusauthmechanismsha1.c:785 +#: gio/gdbusauthmechanismsha1.c:448 gio/gdbusauthmechanismsha1.c:789 #, c-format msgid "" "First token of line %d of the keyring at “%s” with content “%s” is malformed" @@ -626,7 +630,7 @@ "Prvi žeton vrstice %d zbirke ključev pri »%s« z vsebino »%s« je neustrezno " "oblikovan" -#: gio/gdbusauthmechanismsha1.c:458 gio/gdbusauthmechanismsha1.c:799 +#: gio/gdbusauthmechanismsha1.c:462 gio/gdbusauthmechanismsha1.c:803 #, c-format msgid "" "Second token of line %d of the keyring at “%s” with content “%s” is malformed" @@ -634,42 +638,42 @@ "Drugi žeton vrstice %d zbirke ključev pri »%s« z vsebino »%s« je neustrezno " "oblikovana" -#: gio/gdbusauthmechanismsha1.c:482 +#: gio/gdbusauthmechanismsha1.c:486 #, c-format msgid "Didn’t find cookie with id %d in the keyring at “%s”" msgstr "Piškotka z ID %d v zbirki ključev »%s« ni mogoče najti" -#: gio/gdbusauthmechanismsha1.c:539 +#: gio/gdbusauthmechanismsha1.c:543 #, c-format msgid "Error creating lock file “%s”: %s" msgstr "Napaka med ustvarjanjem datoteke zaklepa »%s«: %s" -#: gio/gdbusauthmechanismsha1.c:612 +#: gio/gdbusauthmechanismsha1.c:616 #, c-format msgid "Error deleting stale lock file “%s”: %s" msgstr "Napaka brisanja stare datoteke zaklepa »%s«: %s" -#: gio/gdbusauthmechanismsha1.c:651 +#: gio/gdbusauthmechanismsha1.c:655 #, c-format msgid "Error closing (unlinked) lock file “%s”: %s" msgstr "Napaka med zapiranjem (nepovezane) datoteke zaklepa »%s«: %s" -#: gio/gdbusauthmechanismsha1.c:662 +#: gio/gdbusauthmechanismsha1.c:666 #, c-format msgid "Error unlinking lock file “%s”: %s" msgstr "Napaka med razvezovanjem datoteke zaklepa »%s«: %s" -#: gio/gdbusauthmechanismsha1.c:738 +#: gio/gdbusauthmechanismsha1.c:742 #, c-format msgid "Error opening keyring “%s” for writing: " msgstr "Napaka med odpiranjem zbirke ključev »%s« za branje: " -#: gio/gdbusauthmechanismsha1.c:932 +#: gio/gdbusauthmechanismsha1.c:936 #, c-format msgid "(Additionally, releasing the lock for “%s” also failed: %s) " msgstr "(V nadaljevanju je spodletelo tudi sproščanje zaklepa »%s«: %s) " -#: gio/gdbusconnection.c:590 gio/gdbusconnection.c:2404 +#: gio/gdbusconnection.c:590 gio/gdbusconnection.c:2405 msgid "The connection is closed" msgstr "Povezava je zaprta" @@ -677,119 +681,119 @@ msgid "Timeout was reached" msgstr "Čas zakasnitve je potekel" -#: gio/gdbusconnection.c:2527 +#: gio/gdbusconnection.c:2528 msgid "" "Unsupported flags encountered when constructing a client-side connection" msgstr "" "Med izgrajevanjem povezave s strani odjemalca so bile odkrite nepodprte " "zastavice" -#: gio/gdbusconnection.c:4256 gio/gdbusconnection.c:4610 +#: gio/gdbusconnection.c:4257 gio/gdbusconnection.c:4611 #, c-format msgid "" "No such interface “org.freedesktop.DBus.Properties” on object at path %s" msgstr "" "Vmesnik »org.freedesktop.DBus.Properties« na predmetu na poti %s ne obstaja" -#: gio/gdbusconnection.c:4401 +#: gio/gdbusconnection.c:4402 #, c-format msgid "No such property “%s”" msgstr "Lastnost »%s« ne obstaja" -#: gio/gdbusconnection.c:4413 +#: gio/gdbusconnection.c:4414 #, c-format msgid "Property “%s” is not readable" msgstr "Lastnost »%s« ni berljiva" -#: gio/gdbusconnection.c:4424 +#: gio/gdbusconnection.c:4425 #, c-format msgid "Property “%s” is not writable" msgstr "Lastnost »%s« ni zapisljiva" -#: gio/gdbusconnection.c:4444 +#: gio/gdbusconnection.c:4445 #, c-format msgid "Error setting property “%s”: Expected type “%s” but got “%s”" msgstr "" "Napaka med nastavljanjem lastnosti »%s«: pričakovana je vrsta »%s«, javljena " "pa »%s«." -#: gio/gdbusconnection.c:4549 gio/gdbusconnection.c:4764 -#: gio/gdbusconnection.c:6747 +#: gio/gdbusconnection.c:4550 gio/gdbusconnection.c:4765 +#: gio/gdbusconnection.c:6742 #, c-format msgid "No such interface “%s”" msgstr "Vmesnik »%s« ne obstaja" -#: gio/gdbusconnection.c:4986 gio/gdbusconnection.c:7261 +#: gio/gdbusconnection.c:4981 gio/gdbusconnection.c:7256 #, c-format msgid "No such interface “%s” on object at path %s" msgstr "Vmesnik »%s« na predmetu na poti %s ne obstaja" -#: gio/gdbusconnection.c:5087 +#: gio/gdbusconnection.c:5082 #, c-format msgid "No such method “%s”" msgstr "Način »%s« ne obstaja" -#: gio/gdbusconnection.c:5118 +#: gio/gdbusconnection.c:5113 #, c-format msgid "Type of message, “%s”, does not match expected type “%s”" msgstr "Vrsta sporočila »%s« se ne sklada s pričakovano vrsto »%s«" -#: gio/gdbusconnection.c:5321 +#: gio/gdbusconnection.c:5316 #, c-format msgid "An object is already exported for the interface %s at %s" msgstr "Za vmesnik %s pri %s je predmet že izvožen" -#: gio/gdbusconnection.c:5548 +#: gio/gdbusconnection.c:5543 #, c-format msgid "Unable to retrieve property %s.%s" msgstr "Ni mogoče pridobiti lastnosti %s.%s" -#: gio/gdbusconnection.c:5604 +#: gio/gdbusconnection.c:5599 #, c-format msgid "Unable to set property %s.%s" msgstr "Ni mogoče določiti lastnosti %s.%s" -#: gio/gdbusconnection.c:5783 +#: gio/gdbusconnection.c:5778 #, c-format msgid "Method “%s” returned type “%s”, but expected “%s”" msgstr "Način »%s« je vrnil vrsto »%s«, pričakovana pa je vrsta »%s«" -#: gio/gdbusconnection.c:6859 +#: gio/gdbusconnection.c:6854 #, c-format msgid "Method “%s” on interface “%s” with signature “%s” does not exist" msgstr "Način »%s« na vmesniku »%s« s podpisom »%s« ne obstaja" -#: gio/gdbusconnection.c:6980 +#: gio/gdbusconnection.c:6975 #, c-format msgid "A subtree is already exported for %s" msgstr "Podrejeno drevo je že izvoženo za %s" -#: gio/gdbusconnection.c:7269 +#: gio/gdbusconnection.c:7264 #, c-format msgid "Object does not exist at path “%s”" msgstr "Predmeta na poti »%s« ni mogoče najti." -#: gio/gdbusmessage.c:1303 +#: gio/gdbusmessage.c:1306 msgid "type is INVALID" msgstr "vrsta je neveljavna" -#: gio/gdbusmessage.c:1314 +#: gio/gdbusmessage.c:1317 msgid "METHOD_CALL message: PATH or MEMBER header field is missing" msgstr "Sporočilo METHOD_CALL: manjka polje glave PATH ali MEMBER" -#: gio/gdbusmessage.c:1325 +#: gio/gdbusmessage.c:1328 msgid "METHOD_RETURN message: REPLY_SERIAL header field is missing" msgstr "Sporočilo METHOD_RETURN: manjka polje glave REPLY_SERIAL" -#: gio/gdbusmessage.c:1337 +#: gio/gdbusmessage.c:1340 msgid "ERROR message: REPLY_SERIAL or ERROR_NAME header field is missing" msgstr "Sporočilo ERROR: manjka polje glave REPLY_SERIAL ali ERROR_NAME" -#: gio/gdbusmessage.c:1350 +#: gio/gdbusmessage.c:1353 msgid "SIGNAL message: PATH, INTERFACE or MEMBER header field is missing" msgstr "Sporočilo SIGNAL: manjka polje glave PATH, INTERFACE ali MEMBER" -#: gio/gdbusmessage.c:1358 +#: gio/gdbusmessage.c:1361 msgid "" "SIGNAL message: The PATH header field is using the reserved value /org/" "freedesktop/DBus/Local" @@ -797,7 +801,7 @@ "Sporočilo SIGNAL: polje glave PATH uporablja rezervirano vrednost /org/" "freedesktop/DBus/Local" -#: gio/gdbusmessage.c:1366 +#: gio/gdbusmessage.c:1369 msgid "" "SIGNAL message: The INTERFACE header field is using the reserved value org." "freedesktop.DBus.Local" @@ -806,7 +810,7 @@ "freedesktop.DBus.Local" # Double multiple plural? -#: gio/gdbusmessage.c:1414 gio/gdbusmessage.c:1474 +#: gio/gdbusmessage.c:1417 gio/gdbusmessage.c:1477 #, c-format msgid "Wanted to read %lu byte but only got %lu" msgid_plural "Wanted to read %lu bytes but only got %lu" @@ -815,12 +819,12 @@ msgstr2 "Med poskusom branja %lu bajtov sta bila prejeta le %lu" msgstr3 "Med poskusom branja %lu bajtov so bili prejeti le %lu" -#: gio/gdbusmessage.c:1428 +#: gio/gdbusmessage.c:1431 #, c-format msgid "Expected NUL byte after the string “%s” but found byte %d" msgstr "Po nizu »%s« je pričakovan bajt NUL, vendar je bil zaznan %d" -#: gio/gdbusmessage.c:1447 +#: gio/gdbusmessage.c:1450 #, c-format msgid "" "Expected valid UTF-8 string but found invalid bytes at byte offset %d " @@ -830,21 +834,21 @@ "bajtov na bajtnem odmiku %d (dolžina niza %d). Do takrat veljaven UTF-8 niz " "je »%s«" -#: gio/gdbusmessage.c:1511 gio/gdbusmessage.c:1787 gio/gdbusmessage.c:1998 +#: gio/gdbusmessage.c:1514 gio/gdbusmessage.c:1790 gio/gdbusmessage.c:2001 msgid "Value nested too deeply" msgstr "Vrednost je gnezdene pregloboko" -#: gio/gdbusmessage.c:1679 +#: gio/gdbusmessage.c:1682 #, c-format msgid "Parsed value “%s” is not a valid D-Bus object path" msgstr "Razčlenjena vrednost »%s« ni veljavna pot predmeta vodila D-Bus" -#: gio/gdbusmessage.c:1703 +#: gio/gdbusmessage.c:1706 #, c-format msgid "Parsed value “%s” is not a valid D-Bus signature" msgstr "Razčlenjena vrednost »%s« ni veljaven podpis vodila D-Bus" -#: gio/gdbusmessage.c:1754 +#: gio/gdbusmessage.c:1757 #, c-format msgid "" "Encountered array of length %u byte. Maximum length is 2<<26 bytes (64 MiB)." @@ -863,7 +867,7 @@ "Najdeno je polje dolžine %u bajtov, največja dovoljena pa je 2<<26 bajtov " "(64 MiB)." -#: gio/gdbusmessage.c:1774 +#: gio/gdbusmessage.c:1777 #, c-format msgid "" "Encountered array of type “a%c”, expected to have a length a multiple of %u " @@ -872,16 +876,16 @@ "Zaznano je polje vrste »'a%c«, pričakovana pa je vrednost večkratnika %u " "bajtov, zaznanih pa je %u bajtov dolžine" -#: gio/gdbusmessage.c:1928 gio/gdbusmessage.c:2647 +#: gio/gdbusmessage.c:1931 gio/gdbusmessage.c:2650 msgid "Empty structures (tuples) are not allowed in D-Bus" msgstr "V vodilu D-Bus prazne vrednosti niso dovoljene" -#: gio/gdbusmessage.c:1982 +#: gio/gdbusmessage.c:1985 #, c-format msgid "Parsed value “%s” for variant is not a valid D-Bus signature" msgstr "Razčlenjena vrednost »%s« ni veljaven podpis vodila D-Bus" -#: gio/gdbusmessage.c:2023 +#: gio/gdbusmessage.c:2026 #, c-format msgid "" "Error deserializing GVariant with type string “%s” from the D-Bus wire format" @@ -889,7 +893,7 @@ "Napaka med ločevanjem GVariant iz zaporedja z vrsto niza »%s« iz D-Bus žične " "oblike" -#: gio/gdbusmessage.c:2208 +#: gio/gdbusmessage.c:2211 #, c-format msgid "" "Invalid endianness value. Expected 0x6c (“l”) or 0x42 (“B”) but found value " @@ -898,29 +902,29 @@ "Neveljavna vrednost vrstnega reda zlogov. Pričakovana je ali vrednost 0x6c " "(» l «) ali 0x42 (» B «), najdena pa je vrednost 0x%02x" -#: gio/gdbusmessage.c:2227 +#: gio/gdbusmessage.c:2230 #, c-format msgid "Invalid major protocol version. Expected 1 but found %d" msgstr "" "Neveljavna večja različica protokola. Pričakovana je 1, najdenih pa jih je " "več (%d)" -#: gio/gdbusmessage.c:2285 gio/gdbusmessage.c:2883 +#: gio/gdbusmessage.c:2288 gio/gdbusmessage.c:2886 msgid "Signature header found but is not of type signature" msgstr "Glava podpisa je najdena, vendar ni ustrezno oblikovana" -#: gio/gdbusmessage.c:2297 +#: gio/gdbusmessage.c:2300 #, c-format msgid "Signature header with signature “%s” found but message body is empty" msgstr "" "Glava podpisa s podpisom »%s« je najdena, vendar je telo sporočila prazno" -#: gio/gdbusmessage.c:2312 +#: gio/gdbusmessage.c:2315 #, c-format msgid "Parsed value “%s” is not a valid D-Bus signature (for body)" msgstr "Razčlenjena vrednost »%s« ni veljaven podpis vodila D-Bus (za telo)" -#: gio/gdbusmessage.c:2344 +#: gio/gdbusmessage.c:2347 #, 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" @@ -933,11 +937,11 @@ msgstr3 "" "V sporočilu ni glave podpisa, vendar je telo sporočila dolgo %u bajte" -#: gio/gdbusmessage.c:2354 +#: gio/gdbusmessage.c:2357 msgid "Cannot deserialize message: " msgstr "Sporočila ni mogoče ločiti iz zaporedja: " -#: gio/gdbusmessage.c:2700 +#: gio/gdbusmessage.c:2703 #, c-format msgid "" "Error serializing GVariant with type string “%s” to the D-Bus wire format" @@ -945,22 +949,22 @@ "Napaka pri združevanju GVariant v zaporedje z vrsto niza »%s« v D-Bus žično " "obliko" -#: gio/gdbusmessage.c:2837 +#: gio/gdbusmessage.c:2840 #, c-format msgid "" "Number of file descriptors in message (%d) differs from header field (%d)" msgstr "Število opisnikov v sporočilu (%d) se razlikuje od polja glave (%d)" -#: gio/gdbusmessage.c:2845 +#: gio/gdbusmessage.c:2848 msgid "Cannot serialize message: " msgstr "Sporočila ni bilo mogoče združiti v zaporedje: " -#: gio/gdbusmessage.c:2898 +#: gio/gdbusmessage.c:2901 #, c-format msgid "Message body has signature “%s” but there is no signature header" msgstr "Telo sporočila ima podpis »%s«, vendar v glavi ni podpisa" -#: gio/gdbusmessage.c:2908 +#: gio/gdbusmessage.c:2911 #, c-format msgid "" "Message body has type signature “%s” but signature in the header field is " @@ -968,17 +972,17 @@ msgstr "" "Telo sporočila ima podpis vrste »%s«, vendar je podpis v polju glave »%s«" -#: gio/gdbusmessage.c:2924 +#: gio/gdbusmessage.c:2927 #, c-format msgid "Message body is empty but signature in the header field is “(%s)”" msgstr "Telo sporočila je prazno, vendar je v polju glave podpis »(%s)«" -#: gio/gdbusmessage.c:3479 +#: gio/gdbusmessage.c:3482 #, c-format msgid "Error return with body of type “%s”" msgstr "Napaka vrnjena s telesom vrste »%s«" -#: gio/gdbusmessage.c:3487 +#: gio/gdbusmessage.c:3490 msgid "Error return with empty body" msgstr "Napaka vrnjena s praznim telesom" @@ -1003,17 +1007,17 @@ msgid "Unable to load %s or %s: " msgstr "Ni mogoče naložiti %s oziroma %s: " -#: gio/gdbusproxy.c:1575 +#: gio/gdbusproxy.c:1568 #, c-format msgid "Error calling StartServiceByName for %s: " msgstr "Napaka med klicanjem predmeta StartServiceByName za %s: " -#: gio/gdbusproxy.c:1598 +#: gio/gdbusproxy.c:1591 #, c-format msgid "Unexpected reply %d from StartServiceByName(\"%s\") method" msgstr "Nepričakovan odgovor %d iz načina StartServiceByName(»%s«)" -#: gio/gdbusproxy.c:2709 gio/gdbusproxy.c:2844 +#: gio/gdbusproxy.c:2702 gio/gdbusproxy.c:2837 #, c-format msgid "" "Cannot invoke method; proxy is for the well-known name %s without an owner, " @@ -1022,25 +1026,25 @@ "Ni mogoče sklicati načina; posredniški strežnik za znano ime %s brez " "lastnika je bil zgrajen z zastavico G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START" -#: gio/gdbusserver.c:765 +#: gio/gdbusserver.c:758 msgid "Abstract namespace not supported" msgstr "Abstraktni imenski prostor ni podprt" -#: gio/gdbusserver.c:857 +#: gio/gdbusserver.c:850 msgid "Cannot specify nonce file when creating a server" msgstr "Med ustvarjanjem strežnika ni mogoče določiti enkratne datoteke" -#: gio/gdbusserver.c:939 +#: gio/gdbusserver.c:932 #, c-format msgid "Error writing nonce file at “%s”: %s" msgstr "Napaka med zapisovanjem enkratne datoteke na »%s«: %s" -#: gio/gdbusserver.c:1114 +#: gio/gdbusserver.c:1107 #, c-format msgid "The string “%s” is not a valid D-Bus GUID" msgstr "Niz »%s« ni veljaven D-Bus GUID" -#: gio/gdbusserver.c:1152 +#: gio/gdbusserver.c:1145 #, c-format msgid "Cannot listen on unsupported transport “%s”" msgstr "Na nepodprtem načinu prenosa »%s« ni mogoče poslušati" @@ -1068,14 +1072,14 @@ "\n" "Uporabite »%s COMMAND --help« za pomoč o posameznem ukazu.\n" -#: gio/gdbus-tool.c:204 gio/gdbus-tool.c:276 gio/gdbus-tool.c:348 -#: gio/gdbus-tool.c:372 gio/gdbus-tool.c:862 gio/gdbus-tool.c:1247 -#: gio/gdbus-tool.c:1734 +#: gio/gdbus-tool.c:204 gio/gdbus-tool.c:276 gio/gdbus-tool.c:347 +#: gio/gdbus-tool.c:371 gio/gdbus-tool.c:861 gio/gdbus-tool.c:1246 +#: gio/gdbus-tool.c:1733 #, c-format msgid "Error: %s\n" msgstr "Napaka: %s\n" -#: gio/gdbus-tool.c:215 gio/gdbus-tool.c:289 gio/gdbus-tool.c:1750 +#: gio/gdbus-tool.c:215 gio/gdbus-tool.c:289 gio/gdbus-tool.c:1749 #, c-format msgid "Error parsing introspection XML: %s\n" msgstr "Napaka med samopreverjanjem XML: %s\n" @@ -1085,49 +1089,49 @@ msgid "Error: %s is not a valid name\n" msgstr "Napaka: %s ni veljavno ime\n" -#: gio/gdbus-tool.c:258 gio/gdbus-tool.c:748 gio/gdbus-tool.c:1066 -#: gio/gdbus-tool.c:1900 gio/gdbus-tool.c:2140 +#: gio/gdbus-tool.c:258 gio/gdbus-tool.c:747 gio/gdbus-tool.c:1065 +#: gio/gdbus-tool.c:1899 gio/gdbus-tool.c:2139 #, c-format msgid "Error: %s is not a valid object path\n" msgstr "Napaka: %s ni veljavna pot predmeta\n" -#: gio/gdbus-tool.c:406 +#: gio/gdbus-tool.c:405 msgid "Connect to the system bus" msgstr "Poveži s sistemskim vodilom" -#: gio/gdbus-tool.c:407 +#: gio/gdbus-tool.c:406 msgid "Connect to the session bus" msgstr "Poveži z vodilom seje" -#: gio/gdbus-tool.c:408 +#: gio/gdbus-tool.c:407 msgid "Connect to given D-Bus address" msgstr "Poveži s podanim naslovom vodila D-Bus" -#: gio/gdbus-tool.c:418 +#: gio/gdbus-tool.c:417 msgid "Connection Endpoint Options:" msgstr "Možnosti končnih točk povezave:" -#: gio/gdbus-tool.c:419 +#: gio/gdbus-tool.c:418 msgid "Options specifying the connection endpoint" msgstr "Možnosti, ki določajo končne točke povezave" -#: gio/gdbus-tool.c:442 +#: gio/gdbus-tool.c:441 #, c-format msgid "No connection endpoint specified" msgstr "Ni določene končne točke povezave" -#: gio/gdbus-tool.c:452 +#: gio/gdbus-tool.c:451 #, c-format msgid "Multiple connection endpoints specified" msgstr "Določenih je več povezav končne točke" -#: gio/gdbus-tool.c:525 +#: gio/gdbus-tool.c:524 #, c-format msgid "" "Warning: According to introspection data, interface “%s” does not exist\n" msgstr "Opozorilo: na osnovi podatkov samopregleda, vmesnik »%s« ne obstaja\n" -#: gio/gdbus-tool.c:534 +#: gio/gdbus-tool.c:533 #, c-format msgid "" "Warning: According to introspection data, method “%s” does not exist on " @@ -1136,164 +1140,164 @@ "Opozorilo: na osnovi podatkov samopregleda, način »%s« ne obstaja na " "vmesniku »%s«\n" -#: gio/gdbus-tool.c:596 +#: gio/gdbus-tool.c:595 msgid "Optional destination for signal (unique name)" msgstr "Izbirni cilj za signal (enoznačno ime)" -#: gio/gdbus-tool.c:597 +#: gio/gdbus-tool.c:596 msgid "Object path to emit signal on" msgstr "Pot predmeta za oddajanje signala" -#: gio/gdbus-tool.c:598 +#: gio/gdbus-tool.c:597 msgid "Signal and interface name" msgstr "Ime signala in vmesnika" -#: gio/gdbus-tool.c:631 +#: gio/gdbus-tool.c:630 msgid "Emit a signal." msgstr "Oddaj signal." -#: gio/gdbus-tool.c:686 gio/gdbus-tool.c:1003 gio/gdbus-tool.c:1837 -#: gio/gdbus-tool.c:2069 gio/gdbus-tool.c:2289 +#: gio/gdbus-tool.c:685 gio/gdbus-tool.c:1002 gio/gdbus-tool.c:1836 +#: gio/gdbus-tool.c:2068 gio/gdbus-tool.c:2288 #, c-format msgid "Error connecting: %s\n" msgstr "Napaka med povezovanjem: %s\n" -#: gio/gdbus-tool.c:706 +#: gio/gdbus-tool.c:705 #, c-format msgid "Error: %s is not a valid unique bus name.\n" msgstr "Napaka: %s ni veljavno enoznačno ime vodila.\n" -#: gio/gdbus-tool.c:725 gio/gdbus-tool.c:1046 gio/gdbus-tool.c:1880 +#: gio/gdbus-tool.c:724 gio/gdbus-tool.c:1045 gio/gdbus-tool.c:1879 msgid "Error: Object path is not specified\n" msgstr "Napaka: pot predmeta ni določena\n" -#: gio/gdbus-tool.c:768 +#: gio/gdbus-tool.c:767 msgid "Error: Signal name is not specified\n" msgstr "Napaka: ime signala ni določeno\n" -#: gio/gdbus-tool.c:782 +#: gio/gdbus-tool.c:781 #, c-format msgid "Error: Signal name “%s” is invalid\n" msgstr "Napaka: ime signala »%s« ni veljavno\n" -#: gio/gdbus-tool.c:794 +#: gio/gdbus-tool.c:793 #, c-format msgid "Error: %s is not a valid interface name\n" msgstr "Napaka: %s ni veljavno ime vmesnika.\n" -#: gio/gdbus-tool.c:800 +#: gio/gdbus-tool.c:799 #, c-format msgid "Error: %s is not a valid member name\n" msgstr "Napaka: %s ni veljavno ime predmeta.\n" #. Use the original non-"parse-me-harder" error -#: gio/gdbus-tool.c:837 gio/gdbus-tool.c:1178 +#: gio/gdbus-tool.c:836 gio/gdbus-tool.c:1177 #, c-format msgid "Error parsing parameter %d: %s\n" msgstr "Napaka med razčlenjevanjem parametra %d: %s\n" -#: gio/gdbus-tool.c:869 +#: gio/gdbus-tool.c:868 #, c-format msgid "Error flushing connection: %s\n" msgstr "Napaka med počiščenjem povezave: %s\n" -#: gio/gdbus-tool.c:897 +#: gio/gdbus-tool.c:896 msgid "Destination name to invoke method on" msgstr "Ime cilja za sklicanje načina" -#: gio/gdbus-tool.c:898 +#: gio/gdbus-tool.c:897 msgid "Object path to invoke method on" msgstr "Pot do predmeta za sklicanje načina" -#: gio/gdbus-tool.c:899 +#: gio/gdbus-tool.c:898 msgid "Method and interface name" msgstr "Ime načina in vmesnika" -#: gio/gdbus-tool.c:900 +#: gio/gdbus-tool.c:899 msgid "Timeout in seconds" msgstr "Časovni zamik v sekundah" -#: gio/gdbus-tool.c:901 +#: gio/gdbus-tool.c:900 msgid "Allow interactive authorization" msgstr "Dovoli interaktivno overjanje" -#: gio/gdbus-tool.c:948 +#: gio/gdbus-tool.c:947 msgid "Invoke a method on a remote object." msgstr "Skliči način na oddaljenem predmetu." -#: gio/gdbus-tool.c:1020 gio/gdbus-tool.c:1854 gio/gdbus-tool.c:2094 +#: gio/gdbus-tool.c:1019 gio/gdbus-tool.c:1853 gio/gdbus-tool.c:2093 msgid "Error: Destination is not specified\n" msgstr "Napaka: cilj ni določen\n" -#: gio/gdbus-tool.c:1031 gio/gdbus-tool.c:1871 gio/gdbus-tool.c:2105 +#: gio/gdbus-tool.c:1030 gio/gdbus-tool.c:1870 gio/gdbus-tool.c:2104 #, c-format msgid "Error: %s is not a valid bus name\n" msgstr "Napaka: %s ni veljavno ime vodila\n" -#: gio/gdbus-tool.c:1081 +#: gio/gdbus-tool.c:1080 msgid "Error: Method name is not specified\n" msgstr "Napaka: ime načina ni določeno\n" -#: gio/gdbus-tool.c:1092 +#: gio/gdbus-tool.c:1091 #, c-format msgid "Error: Method name “%s” is invalid\n" msgstr "Napaka: ime načina »%s« ni veljavno\n" -#: gio/gdbus-tool.c:1170 +#: gio/gdbus-tool.c:1169 #, c-format msgid "Error parsing parameter %d of type “%s”: %s\n" msgstr "Napaka med razčlenjevanjem parametra %d vrste »%s«: %s\n" -#: gio/gdbus-tool.c:1196 +#: gio/gdbus-tool.c:1195 #, c-format msgid "Error adding handle %d: %s\n" msgstr "Napaka med dodajanjem ročnika: %d: %s\n" -#: gio/gdbus-tool.c:1696 +#: gio/gdbus-tool.c:1695 msgid "Destination name to introspect" msgstr "Samopreverjanje ciljnega imena" -#: gio/gdbus-tool.c:1697 +#: gio/gdbus-tool.c:1696 msgid "Object path to introspect" msgstr "Samopreverjanje poti predmeta" -#: gio/gdbus-tool.c:1698 +#: gio/gdbus-tool.c:1697 msgid "Print XML" msgstr "Natisni XML" -#: gio/gdbus-tool.c:1699 +#: gio/gdbus-tool.c:1698 msgid "Introspect children" msgstr "Samopreverjanje podrejenih predmetov" -#: gio/gdbus-tool.c:1700 +#: gio/gdbus-tool.c:1699 msgid "Only print properties" msgstr "Natisni le lastnosti" -#: gio/gdbus-tool.c:1789 +#: gio/gdbus-tool.c:1788 msgid "Introspect a remote object." msgstr "Samopreverjanje oddaljenega predmeta." -#: gio/gdbus-tool.c:1995 +#: gio/gdbus-tool.c:1994 msgid "Destination name to monitor" msgstr "Nadzor ciljnega imena" -#: gio/gdbus-tool.c:1996 +#: gio/gdbus-tool.c:1995 msgid "Object path to monitor" msgstr "Nadzor poti predmeta" -#: gio/gdbus-tool.c:2021 +#: gio/gdbus-tool.c:2020 msgid "Monitor a remote object." msgstr "Nadzoruj oddaljeni predmet." -#: gio/gdbus-tool.c:2079 +#: gio/gdbus-tool.c:2078 msgid "Error: can’t monitor a non-message-bus connection\n" msgstr "Napaka: ni mogoče nadzirati povezav mimo sporočilnega vtiča\n" -#: gio/gdbus-tool.c:2203 +#: gio/gdbus-tool.c:2202 msgid "Service to activate before waiting for the other one (well-known name)" msgstr "Storitev, ki naj se začne, preden začne program čakati na drugo (ime)" -#: gio/gdbus-tool.c:2206 +#: gio/gdbus-tool.c:2205 msgid "" "Timeout to wait for before exiting with an error (seconds); 0 for no timeout " "(default)" @@ -1301,29 +1305,29 @@ "Časovni zamik, po katerem je program končan z napako (v sekundah); vrednost " "0 onemogoči zamik (privzeto)" -#: gio/gdbus-tool.c:2254 +#: gio/gdbus-tool.c:2253 msgid "OPTION… BUS-NAME" msgstr "MOŽNOST … IME-VODILA" -#: gio/gdbus-tool.c:2255 +#: gio/gdbus-tool.c:2254 msgid "Wait for a bus name to appear." msgstr "Počakaj na izpis imena vodila." -#: gio/gdbus-tool.c:2331 +#: gio/gdbus-tool.c:2330 msgid "Error: A service to activate for must be specified.\n" msgstr "Napaka: storitev za omogočanje mora biti določena.\n" -#: gio/gdbus-tool.c:2336 +#: gio/gdbus-tool.c:2335 msgid "Error: A service to wait for must be specified.\n" msgstr "" "Napaka: storitev za čakanje mora biti določena.\n" "\n" -#: gio/gdbus-tool.c:2341 +#: gio/gdbus-tool.c:2340 msgid "Error: Too many arguments.\n" msgstr "Napaka: navedenih je preveč argumentov.\n" -#: gio/gdbus-tool.c:2349 gio/gdbus-tool.c:2356 +#: gio/gdbus-tool.c:2348 gio/gdbus-tool.c:2355 #, c-format msgid "Error: %s is not a valid well-known bus name.\n" msgstr "Napaka: %s ni veljavno enoznačno ime vodila.\n" @@ -1334,38 +1338,43 @@ msgstr "" "Za spreminjanje nastavitev razhroščevanja so zahtevana posebna dovoljenja" -#: gio/gdesktopappinfo.c:2182 gio/gdesktopappinfo.c:5119 +#: gio/gdesktopappinfo.c:2242 gio/gdesktopappinfo.c:5223 msgid "Unnamed" msgstr "Neimenovano" -#: gio/gdesktopappinfo.c:2592 +#: gio/gdesktopappinfo.c:2652 msgid "Desktop file didn’t specify Exec field" msgstr "Namizna datoteka ne vsebuje določenega polja Exec" -#: gio/gdesktopappinfo.c:2891 +#: gio/gdesktopappinfo.c:2942 msgid "Unable to find terminal required for application" msgstr "Ni mogoče najti terminala, ki ga zahteva program" -#: gio/gdesktopappinfo.c:3637 +#: gio/gdesktopappinfo.c:3002 +#, c-format +msgid "Program ‘%s’ not found in $PATH" +msgstr "Programa »%s« na poti $PATH ni mogoče najti" + +#: gio/gdesktopappinfo.c:3735 #, c-format msgid "Can’t create user application configuration folder %s: %s" msgstr "Ni mogoče ustvariti nastavitvene mape uporabnikovega programa %s: %s" -#: gio/gdesktopappinfo.c:3641 +#: gio/gdesktopappinfo.c:3739 #, c-format msgid "Can’t create user MIME configuration folder %s: %s" msgstr "Ni mogoče ustvariti uporabnikove nastavitvene mape MIME %s: %s" -#: gio/gdesktopappinfo.c:3883 gio/gdesktopappinfo.c:3907 +#: gio/gdesktopappinfo.c:3981 gio/gdesktopappinfo.c:4005 msgid "Application information lacks an identifier" msgstr "Podatki programa so brez določila" -#: gio/gdesktopappinfo.c:4143 +#: gio/gdesktopappinfo.c:4241 #, c-format msgid "Can’t create user desktop file %s" msgstr "Ni mogoče ustvariti uporabnikove datoteke namizja %s" -#: gio/gdesktopappinfo.c:4279 +#: gio/gdesktopappinfo.c:4377 #, c-format msgid "Custom definition for %s" msgstr "Določilo po meri za %s" @@ -1438,7 +1447,7 @@ msgid "Containing mount does not exist" msgstr "Obstoječa enota ne obstaja" -#: gio/gfile.c:2641 gio/glocalfile.c:2500 +#: gio/gfile.c:2641 gio/glocalfile.c:2515 msgid "Can’t copy over directory" msgstr "Ni mogoče kopirati prek mape" @@ -1484,7 +1493,7 @@ msgid "Invalid symlink value given" msgstr "Neveljavna vrednost simbolne povezave" -#: gio/gfile.c:4163 glib/gfileutils.c:2335 +#: gio/gfile.c:4163 glib/gfileutils.c:2392 msgid "Symbolic links not supported" msgstr "Simbolne povezave niso podprte" @@ -1585,37 +1594,37 @@ msgid "HTTP proxy server closed connection unexpectedly." msgstr "Povezava s posredniškim strežnikom HTTP je nepričakovano končana." -#: gio/gicon.c:300 +#: gio/gicon.c:299 #, c-format msgid "Wrong number of tokens (%d)" msgstr "Napačno število znakov (%d)" -#: gio/gicon.c:320 +#: gio/gicon.c:319 #, c-format msgid "No type for class name %s" msgstr "Ni določenega imena razreda %s" -#: gio/gicon.c:330 +#: gio/gicon.c:329 #, c-format msgid "Type %s does not implement the GIcon interface" msgstr "Vrsta %s ne vstavlja vmesnika GIcon" -#: gio/gicon.c:341 +#: gio/gicon.c:340 #, c-format msgid "Type %s is not classed" msgstr "Vrste %s ni uvrščena v razred" -#: gio/gicon.c:355 +#: gio/gicon.c:354 #, c-format msgid "Malformed version number: %s" msgstr "Nepravilno oblikovana številka različice: %s" -#: gio/gicon.c:369 +#: gio/gicon.c:368 #, c-format msgid "Type %s does not implement from_tokens() on the GIcon interface" msgstr "Vrsta %s ne vstavlja from_tokens() vmesnika GIcon" -#: gio/gicon.c:471 +#: gio/gicon.c:470 msgid "Can’t handle the supplied version of the icon encoding" msgstr "Ni mogoče ravnati z navedeno različico kodiranja ikone" @@ -1762,7 +1771,7 @@ msgstr "Napaka med pisanjem v standardni odvod" #. Translators: commandline placeholder -#: gio/gio-tool-cat.c:135 gio/gio-tool-info.c:379 gio/gio-tool-list.c:173 +#: gio/gio-tool-cat.c:135 gio/gio-tool-info.c:380 gio/gio-tool-list.c:173 #: gio/gio-tool-mkdir.c:50 gio/gio-tool-monitor.c:39 gio/gio-tool-monitor.c:41 #: gio/gio-tool-monitor.c:43 gio/gio-tool-monitor.c:45 #: gio/gio-tool-monitor.c:206 gio/gio-tool-mount.c:1210 gio/gio-tool-open.c:72 @@ -1785,7 +1794,7 @@ "oddaljen GIO namesto krajevnih poti do datotek. Primer: kot pot je\n" "mogoče uporabiti smb://strežnik/vir/datoteka.txt." -#: gio/gio-tool-cat.c:164 gio/gio-tool-info.c:410 gio/gio-tool-mkdir.c:78 +#: gio/gio-tool-cat.c:164 gio/gio-tool-info.c:411 gio/gio-tool-mkdir.c:78 #: gio/gio-tool-monitor.c:231 gio/gio-tool-mount.c:1261 gio/gio-tool-open.c:98 #: gio/gio-tool-remove.c:74 gio/gio-tool-trash.c:303 msgid "No locations given" @@ -1901,38 +1910,38 @@ msgid "size: " msgstr "velikost: " -#: gio/gio-tool-info.c:200 +#: gio/gio-tool-info.c:201 msgid "hidden\n" msgstr "skrito\n" -#: gio/gio-tool-info.c:203 +#: gio/gio-tool-info.c:204 #, c-format msgid "uri: %s\n" msgstr "naslov URI: %s\n" -#: gio/gio-tool-info.c:210 +#: gio/gio-tool-info.c:211 #, c-format msgid "local path: %s\n" msgstr "Krajevna pot: %s\n" -#: gio/gio-tool-info.c:244 +#: gio/gio-tool-info.c:245 #, c-format msgid "unix mount: %s%s %s %s %s\n" msgstr "priklopna točka unix: %s%s %s %s %s\n" -#: gio/gio-tool-info.c:325 +#: gio/gio-tool-info.c:326 msgid "Settable attributes:\n" msgstr "Nastavljivi atributi:\n" -#: gio/gio-tool-info.c:349 +#: gio/gio-tool-info.c:350 msgid "Writable attribute namespaces:\n" msgstr "Imenski prostor zapisljivih atributov:\n" -#: gio/gio-tool-info.c:384 +#: gio/gio-tool-info.c:385 msgid "Show information about locations." msgstr "Pokaže podatke o mestih." -#: gio/gio-tool-info.c:386 +#: gio/gio-tool-info.c:387 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" @@ -2414,7 +2423,7 @@ msgid "List contents of directories in a tree-like format." msgstr "Izpiši seznam vsebine map v drevesni obliki." -#: gio/glib-compile-resources.c:142 gio/glib-compile-schemas.c:1516 +#: gio/glib-compile-resources.c:142 gio/glib-compile-schemas.c:1513 #, c-format msgid "Element <%s> not allowed inside <%s>" msgstr "Predmet <%s> ni dovoljen znotraj predmeta <%s>" @@ -2471,7 +2480,7 @@ msgid "text may not appear inside <%s>" msgstr "besedilo se ne sme pojaviti znotraj <%s>" -#: gio/glib-compile-resources.c:821 gio/glib-compile-schemas.c:2174 +#: gio/glib-compile-resources.c:821 gio/glib-compile-schemas.c:2171 msgid "Show program version and exit" msgstr "Izpiši podrobnosti različice in končaj" @@ -2486,8 +2495,8 @@ msgstr "" "Mape, iz katerih naj bodo prebrane datoteke (privzeto je to trenutna mapa)" -#: gio/glib-compile-resources.c:823 gio/glib-compile-schemas.c:2175 -#: gio/glib-compile-schemas.c:2204 +#: gio/glib-compile-resources.c:823 gio/glib-compile-schemas.c:2172 +#: gio/glib-compile-schemas.c:2201 msgid "DIRECTORY" msgstr "MAPA" @@ -2705,16 +2714,16 @@ msgid "<aliases> must contain at least one <alias>" msgstr "vrednost <aliases> mora vsebovati vsaj en <alias>" -#: gio/glib-compile-schemas.c:799 +#: gio/glib-compile-schemas.c:796 msgid "Empty names are not permitted" msgstr "Prazna polja imen niso dovoljena." -#: gio/glib-compile-schemas.c:809 +#: gio/glib-compile-schemas.c:806 #, c-format msgid "Invalid name “%s”: names must begin with a lowercase letter" msgstr "Neveljavno ime »%s«: imena se morajo začeti z malo črko." -#: gio/glib-compile-schemas.c:821 +#: gio/glib-compile-schemas.c:818 #, c-format msgid "" "Invalid name “%s”: invalid character “%c”; only lowercase letters, numbers " @@ -2723,36 +2732,36 @@ "Neveljavno ime »%s«: neveljaven znak »%c«; dovoljene so samo male črke, " "številke in vezaj (» - «)." -#: gio/glib-compile-schemas.c:830 +#: gio/glib-compile-schemas.c:827 #, c-format msgid "Invalid name “%s”: two successive hyphens (“--”) are not permitted" msgstr "Neveljavno ime »%s«: zaporedna vezaja (» -- «) nista dovoljena." -#: gio/glib-compile-schemas.c:839 +#: gio/glib-compile-schemas.c:836 #, c-format msgid "Invalid name “%s”: the last character may not be a hyphen (“-”)" msgstr "Neveljavno ime »%s«: zadnji znak ne sme biti vezaj (» - «)." -#: gio/glib-compile-schemas.c:847 +#: gio/glib-compile-schemas.c:844 #, c-format msgid "Invalid name “%s”: maximum length is 1024" msgstr "Neveljavno ime »%s«: največja dolžina je 1024" -#: gio/glib-compile-schemas.c:919 +#: gio/glib-compile-schemas.c:916 #, c-format msgid "<child name='%s'> already specified" msgstr "<child name=»%s«> je že določeno" -#: gio/glib-compile-schemas.c:945 +#: gio/glib-compile-schemas.c:942 msgid "Cannot add keys to a “list-of” schema" msgstr "Shemi »list-of« ni mogoče dodati ključev." -#: gio/glib-compile-schemas.c:956 +#: gio/glib-compile-schemas.c:953 #, c-format msgid "<key name='%s'> already specified" msgstr "<key name=»%s«> je že določeno" -#: gio/glib-compile-schemas.c:974 +#: gio/glib-compile-schemas.c:971 #, c-format msgid "" "<key name='%s'> shadows <key name='%s'> in <schema id='%s'>; use <override> " @@ -2761,7 +2770,7 @@ "<key name=»%s«> sence <key name=»%s«> v <schema id=»%s«>; za spreminjanje " "vrednosti uporabite <override>" -#: gio/glib-compile-schemas.c:985 +#: gio/glib-compile-schemas.c:982 #, c-format msgid "" "Exactly one of “type”, “enum” or “flags” must be specified as an attribute " @@ -2770,62 +2779,62 @@ "Natanko ena izmed možnosti »vrste«, »enum« ali »zastavice« mora biti " "določena kot lastnost ključa <key>" -#: gio/glib-compile-schemas.c:1004 +#: gio/glib-compile-schemas.c:1001 #, c-format msgid "<%s id='%s'> not (yet) defined." msgstr "<%s id=»%s«> (še) ni določen." -#: gio/glib-compile-schemas.c:1019 +#: gio/glib-compile-schemas.c:1016 #, c-format msgid "Invalid GVariant type string “%s”" msgstr "Neveljavna vrsta niza GVariant »%s«" -#: gio/glib-compile-schemas.c:1049 +#: gio/glib-compile-schemas.c:1046 msgid "<override> given but schema isn’t extending anything" msgstr "<override> je podan, vendar shema ne razširja ničesar" -#: gio/glib-compile-schemas.c:1062 +#: gio/glib-compile-schemas.c:1059 #, c-format msgid "No <key name='%s'> to override" msgstr "<key name='%s'> za prepis ni na voljo" -#: gio/glib-compile-schemas.c:1070 +#: gio/glib-compile-schemas.c:1067 #, c-format msgid "<override name='%s'> already specified" msgstr "<override name=»%s«> je že določeno" -#: gio/glib-compile-schemas.c:1143 +#: gio/glib-compile-schemas.c:1140 #, c-format msgid "<schema id='%s'> already specified" msgstr "<schema id=»%s«> je že določeno" -#: gio/glib-compile-schemas.c:1155 +#: gio/glib-compile-schemas.c:1152 #, c-format msgid "<schema id='%s'> extends not yet existing schema “%s”" msgstr "<schema id='%s'> razširja še neobstoječo shemo »%s«" -#: gio/glib-compile-schemas.c:1171 +#: gio/glib-compile-schemas.c:1168 #, c-format msgid "<schema id='%s'> is list of not yet existing schema “%s”" msgstr "<schema id='%s'> je seznam še neobstoječe sheme »%s«" -#: gio/glib-compile-schemas.c:1179 +#: gio/glib-compile-schemas.c:1176 #, c-format msgid "Cannot be a list of a schema with a path" msgstr "Seznam sheme s potjo ni mogoč" -#: gio/glib-compile-schemas.c:1189 +#: gio/glib-compile-schemas.c:1186 #, c-format msgid "Cannot extend a schema with a path" msgstr "Sheme ni mogoče razširiti s potjo" -#: gio/glib-compile-schemas.c:1199 +#: gio/glib-compile-schemas.c:1196 #, c-format msgid "" "<schema id='%s'> is a list, extending <schema id='%s'> which is not a list" msgstr "<schema id=»%s«> je seznam, ki razširja <schema id=»%s«>, ki ni seznam" -#: gio/glib-compile-schemas.c:1209 +#: gio/glib-compile-schemas.c:1206 #, c-format msgid "" "<schema id='%s' list-of='%s'> extends <schema id='%s' list-of='%s'> but “%s” " @@ -2834,17 +2843,17 @@ "<schema id='%s' list-of='%s'> razširja <schema id='%s' list-of='%s'> vendar " "»%s« ne razširja »%s«" -#: gio/glib-compile-schemas.c:1226 +#: gio/glib-compile-schemas.c:1223 #, c-format msgid "A path, if given, must begin and end with a slash" msgstr "Pot, če je podana, se mora začeti in končati s poševnico" -#: gio/glib-compile-schemas.c:1233 +#: gio/glib-compile-schemas.c:1230 #, c-format msgid "The path of a list must end with “:/”" msgstr "Pot seznama se mora končati z » :/ «" -#: gio/glib-compile-schemas.c:1242 +#: gio/glib-compile-schemas.c:1239 #, c-format msgid "" "Warning: Schema “%s” has path “%s”. Paths starting with “/apps/”, “/" @@ -2853,49 +2862,49 @@ "Opozorilo: shema »%s« ima določeno pot »%s«. Poti, ki se začnejo z »/apps/«, " "»/desktop/« ali »/system/« so opuščene." -#: gio/glib-compile-schemas.c:1272 +#: gio/glib-compile-schemas.c:1269 #, c-format msgid "<%s id='%s'> already specified" msgstr "<%s id=»%s«> je že določeno" -#: gio/glib-compile-schemas.c:1422 gio/glib-compile-schemas.c:1438 +#: gio/glib-compile-schemas.c:1419 gio/glib-compile-schemas.c:1435 #, c-format msgid "Only one <%s> element allowed inside <%s>" msgstr "Le en predmet <%s> je lahko znotraj predmeta <%s>" -#: gio/glib-compile-schemas.c:1520 +#: gio/glib-compile-schemas.c:1517 #, c-format msgid "Element <%s> not allowed at the top level" msgstr "Predmet <%s> na vrhnji ravni ni dovoljen" -#: gio/glib-compile-schemas.c:1538 +#: gio/glib-compile-schemas.c:1535 msgid "Element <default> is required in <key>" msgstr "Predmet <default> mora biti zapisan v ključu <key>" -#: gio/glib-compile-schemas.c:1628 +#: gio/glib-compile-schemas.c:1625 #, c-format msgid "Text may not appear inside <%s>" msgstr "Besedilo se ne sme pojaviti znotraj <%s>" -#: gio/glib-compile-schemas.c:1696 +#: gio/glib-compile-schemas.c:1693 #, c-format msgid "Warning: undefined reference to <schema id='%s'/>" msgstr "Opozorilo: neveljaven sklic na <schema id='%s'/>" #. Translators: Do not translate "--strict". -#: gio/glib-compile-schemas.c:1835 gio/glib-compile-schemas.c:1914 +#: gio/glib-compile-schemas.c:1832 gio/glib-compile-schemas.c:1911 msgid "--strict was specified; exiting." msgstr "določena je zastavica --strict; opravilo bo preklicano." -#: gio/glib-compile-schemas.c:1847 +#: gio/glib-compile-schemas.c:1844 msgid "This entire file has been ignored." msgstr "Celotna datoteka je prezrta." -#: gio/glib-compile-schemas.c:1910 +#: gio/glib-compile-schemas.c:1907 msgid "Ignoring this file." msgstr "Datoteka je prezrta." -#: gio/glib-compile-schemas.c:1965 +#: gio/glib-compile-schemas.c:1962 #, c-format msgid "" "No such key “%s” in schema “%s” as specified in override file “%s”; ignoring " @@ -2904,7 +2913,7 @@ "Ključ »%s« v shemi »%s« kot je določen v datoteki prepisa »%s« ne obstaja. " "Prepis za ta ključ bo prezrt." -#: gio/glib-compile-schemas.c:1973 +#: gio/glib-compile-schemas.c:1970 #, c-format msgid "" "No such key “%s” in schema “%s” as specified in override file “%s” and --" @@ -2913,7 +2922,7 @@ "Ključ »%s« v shemi »%s« kot je določen v datoteki prepisa »%s« ne obstaja, " "določena je tudi zastavica --strict. Opravilo je prekinjeno." -#: gio/glib-compile-schemas.c:1995 +#: gio/glib-compile-schemas.c:1992 #, c-format msgid "" "Cannot provide per-desktop overrides for localized key “%s” in schema " @@ -2922,7 +2931,7 @@ "Ni mogoče uporabiti prepisa jezikovno prilagojenega ključa »%s« za namizje v " "shemi »%s« (prepisna datoteka »%s«). Prepis za ta ključ bo prezrt." -#: gio/glib-compile-schemas.c:2004 +#: gio/glib-compile-schemas.c:2001 #, c-format msgid "" "Cannot provide per-desktop overrides for localized key “%s” in schema " @@ -2932,7 +2941,7 @@ "shemi »%s« (prepisna datoteka »%s«), določena je tudi zastavica --strict. " "Opravilo je prekinjeno." -#: gio/glib-compile-schemas.c:2028 +#: gio/glib-compile-schemas.c:2025 #, c-format msgid "" "Error parsing key “%s” in schema “%s” as specified in override file “%s”: " @@ -2941,7 +2950,7 @@ "Napaka razčlenjevanja ključa »%s« v shemi »%s« kot je določen v datoteki " "prepisa »%s«: %s. Prepis za ta ključ bo prezrt." -#: gio/glib-compile-schemas.c:2040 +#: gio/glib-compile-schemas.c:2037 #, c-format msgid "" "Error parsing key “%s” in schema “%s” as specified in override file “%s”: " @@ -2951,7 +2960,7 @@ "prepisa »%s«: %s. Določena je bila zastavica --strict; opravilo je " "preklicano." -#: gio/glib-compile-schemas.c:2067 +#: gio/glib-compile-schemas.c:2064 #, c-format msgid "" "Override for key “%s” in schema “%s” in override file “%s” is outside the " @@ -2960,7 +2969,7 @@ "Prepis za ključ »%s« v shemi »%s« v datoteki prepisa »%s« ni v obsegu, " "podanem v shemi. Prepis za ta ključ bo prezrt." -#: gio/glib-compile-schemas.c:2077 +#: gio/glib-compile-schemas.c:2074 #, c-format msgid "" "Override for key “%s” in schema “%s” in override file “%s” is outside the " @@ -2969,7 +2978,7 @@ "Prepis za ključ »%s« v shemi »%s« v datoteki prepisa »%s« ni v obsegu, " "podanem v shemi, določena je tudi zastavica --strict. Opravilo je prekinjeno." -#: gio/glib-compile-schemas.c:2103 +#: gio/glib-compile-schemas.c:2100 #, c-format msgid "" "Override for key “%s” in schema “%s” in override file “%s” is not in the " @@ -2978,7 +2987,7 @@ "Prepis za ključ »%s« v shemi »%s« v datoteki prepisa »%s« ni v seznamu " "veljavnih možnosti. Prepis za ta ključ bo prezrt." -#: gio/glib-compile-schemas.c:2113 +#: gio/glib-compile-schemas.c:2110 #, c-format msgid "" "Override for key “%s” in schema “%s” in override file “%s” is not in the " @@ -2988,23 +2997,23 @@ "veljavnih možnosti, določena je tudi zastavica --strict. Opravilo je " "prekinjeno." -#: gio/glib-compile-schemas.c:2175 +#: gio/glib-compile-schemas.c:2172 msgid "Where to store the gschemas.compiled file" msgstr "Kje naj se shrani datoteka gschemas.compiled" -#: gio/glib-compile-schemas.c:2176 +#: gio/glib-compile-schemas.c:2173 msgid "Abort on any errors in schemas" msgstr "Prekini ob vsakršni napaki v shemi" -#: gio/glib-compile-schemas.c:2177 +#: gio/glib-compile-schemas.c:2174 msgid "Do not write the gschema.compiled file" msgstr "Ne zapiši datoteke gschema.compiled" -#: gio/glib-compile-schemas.c:2178 +#: gio/glib-compile-schemas.c:2175 msgid "Do not enforce key name restrictions" msgstr "Ne vsili omejitev imena ključa" -#: gio/glib-compile-schemas.c:2207 +#: gio/glib-compile-schemas.c:2204 msgid "" "Compile all GSettings schema files into a schema cache.\n" "Schema files are required to have the extension .gschema.xml,\n" @@ -3014,25 +3023,25 @@ "sheme. Datoteke shem morajo imeti pripono .gschema.xml,\n" "datoteka predpomnilnika pa se imenuje gschemas.compiled." -#: gio/glib-compile-schemas.c:2228 +#: gio/glib-compile-schemas.c:2225 msgid "You should give exactly one directory name" msgstr "Podati je treba natanko eno ime mape" -#: gio/glib-compile-schemas.c:2271 +#: gio/glib-compile-schemas.c:2268 msgid "No schema files found: doing nothing." msgstr "Datotek sheme ni mogoče najti: opravilo bo preklicano." -#: gio/glib-compile-schemas.c:2273 +#: gio/glib-compile-schemas.c:2270 msgid "No schema files found: removed existing output file." msgstr "" "Datotek sheme ni mogoče najti: obstoječa odvodna datoteka je odstranjena." -#: gio/glocalfile.c:563 gio/win32/gwinhttpfile.c:436 +#: gio/glocalfile.c:567 gio/win32/gwinhttpfile.c:436 #, c-format msgid "Invalid filename %s" msgstr "Neveljavno ime datoteke %s" -#: gio/glocalfile.c:996 +#: gio/glocalfile.c:1009 #, c-format msgid "Error getting filesystem info for %s: %s" msgstr "Napaka med pridobivanjem podrobnosti datotečnega sistema za %s: %s" @@ -3041,258 +3050,258 @@ #. * the enclosing (user visible) mount of a file, but none #. * exists. #. -#: gio/glocalfile.c:1137 +#: gio/glocalfile.c:1145 #, c-format msgid "Containing mount for file %s not found" msgstr "Priklopne točke datoteke %s ni mogoče najti" -#: gio/glocalfile.c:1160 +#: gio/glocalfile.c:1168 msgid "Can’t rename root directory" msgstr "Ni mogoče preimenovati korenske mape" -#: gio/glocalfile.c:1178 gio/glocalfile.c:1201 +#: gio/glocalfile.c:1186 gio/glocalfile.c:1209 #, c-format msgid "Error renaming file %s: %s" msgstr "Napaka med preimenovanjem datoteke %s: %s" -#: gio/glocalfile.c:1185 +#: gio/glocalfile.c:1193 msgid "Can’t rename file, filename already exists" msgstr "Ni mogoče preimenovati datoteke, izbrano ime že obstaja" -#: gio/glocalfile.c:1198 gio/glocalfile.c:2394 gio/glocalfile.c:2422 -#: gio/glocalfile.c:2561 gio/glocalfileoutputstream.c:658 +#: gio/glocalfile.c:1206 gio/glocalfile.c:2409 gio/glocalfile.c:2437 +#: gio/glocalfile.c:2576 gio/glocalfileoutputstream.c:658 msgid "Invalid filename" msgstr "Neveljavno ime datoteke" -#: gio/glocalfile.c:1366 gio/glocalfile.c:1377 +#: gio/glocalfile.c:1374 gio/glocalfile.c:1385 #, c-format msgid "Error opening file %s: %s" msgstr "Napaka med odpiranjem datoteke %s: %s" -#: gio/glocalfile.c:1502 +#: gio/glocalfile.c:1510 #, c-format msgid "Error removing file %s: %s" msgstr "Napaka med odstranjevanjem datoteke %s: %s" -#: gio/glocalfile.c:1996 gio/glocalfile.c:2007 gio/glocalfile.c:2034 +#: gio/glocalfile.c:2004 gio/glocalfile.c:2015 gio/glocalfile.c:2042 #, c-format msgid "Error trashing file %s: %s" msgstr "Napaka med premikanjem datoteke %s v smeti: %s" -#: gio/glocalfile.c:2054 +#: gio/glocalfile.c:2062 #, c-format msgid "Unable to create trash directory %s: %s" msgstr "Ni mogoče ustvariti mape smeti %s: %s" -#: gio/glocalfile.c:2075 +#: gio/glocalfile.c:2083 #, c-format msgid "Unable to find toplevel directory to trash %s" msgstr "Ni mogoče najti vrhnje ravni smeti %s" -#: gio/glocalfile.c:2083 +#: gio/glocalfile.c:2091 #, c-format msgid "Trashing on system internal mounts is not supported" msgstr "" "Kopiranje (sklic povezave/kloniranje) med različnimi priklopi ni podprto" -#: gio/glocalfile.c:2169 gio/glocalfile.c:2197 +#: gio/glocalfile.c:2177 gio/glocalfile.c:2205 #, c-format msgid "Unable to find or create trash directory %s to trash %s" msgstr "Ni mogoče najti oziroma ustvariti mape smeti %s za brisanje %s" -#: gio/glocalfile.c:2243 +#: gio/glocalfile.c:2249 #, c-format msgid "Unable to create trashing info file for %s: %s" msgstr "Ni mogoče ustvariti datoteke podrobnosti smeti za %s: %s" -#: gio/glocalfile.c:2305 +#: gio/glocalfile.c:2320 #, c-format msgid "Unable to trash file %s across filesystem boundaries" msgstr "" "Datoteke %s ni mogoče premakniti v smeti prek različnih datotečnih sistemov" -#: gio/glocalfile.c:2309 gio/glocalfile.c:2365 +#: gio/glocalfile.c:2324 gio/glocalfile.c:2380 #, c-format msgid "Unable to trash file %s: %s" msgstr "Datoteke %s ni mogoče premakniti v smeti: %s" -#: gio/glocalfile.c:2371 +#: gio/glocalfile.c:2386 #, c-format msgid "Unable to trash file %s" msgstr "Datoteke %s ni mogoče premakniti v smeti" -#: gio/glocalfile.c:2397 +#: gio/glocalfile.c:2412 #, c-format msgid "Error creating directory %s: %s" msgstr "Napaka med ustvarjanjem mape %s: %s" -#: gio/glocalfile.c:2426 +#: gio/glocalfile.c:2441 #, c-format msgid "Filesystem does not support symbolic links" msgstr "Datotečni sistem ne podpira simbolnih povezav" -#: gio/glocalfile.c:2429 +#: gio/glocalfile.c:2444 #, c-format msgid "Error making symbolic link %s: %s" msgstr "Napaka med ustvarjanjem simbolne povezave %s: %s" -#: gio/glocalfile.c:2472 gio/glocalfile.c:2507 gio/glocalfile.c:2564 +#: gio/glocalfile.c:2487 gio/glocalfile.c:2522 gio/glocalfile.c:2579 #, c-format msgid "Error moving file %s: %s" msgstr "Napaka med premikanjem datoteke %s: %s" -#: gio/glocalfile.c:2495 +#: gio/glocalfile.c:2510 msgid "Can’t move directory over directory" msgstr "Ni mogoče premakniti mape čez mapo" -#: gio/glocalfile.c:2521 gio/glocalfileoutputstream.c:1110 +#: gio/glocalfile.c:2536 gio/glocalfileoutputstream.c:1110 #: gio/glocalfileoutputstream.c:1124 gio/glocalfileoutputstream.c:1139 #: gio/glocalfileoutputstream.c:1156 gio/glocalfileoutputstream.c:1170 msgid "Backup file creation failed" msgstr "Ustvarjanje varnostne kopije je spodletelo." -#: gio/glocalfile.c:2540 +#: gio/glocalfile.c:2555 #, c-format msgid "Error removing target file: %s" msgstr "Napaka med odstranjevanjem ciljne datoteke: %s" -#: gio/glocalfile.c:2554 +#: gio/glocalfile.c:2569 msgid "Move between mounts not supported" msgstr "Premikanje med priklopi ni podprto" -#: gio/glocalfile.c:2728 +#: gio/glocalfile.c:2745 #, c-format msgid "Could not determine the disk usage of %s: %s" msgstr "Ni mogoče določiti porabe diska %s: %s." -#: gio/glocalfileinfo.c:775 +#: gio/glocalfileinfo.c:779 msgid "Attribute value must be non-NULL" msgstr "Vrednost atributa ni mogoče določiti kot NULL" -#: gio/glocalfileinfo.c:782 +#: gio/glocalfileinfo.c:786 msgid "Invalid attribute type (string or invalid expected)" msgstr "Neveljavna vrsta atributa (pričakovan je niz ali neveljavna vrednost)" -#: gio/glocalfileinfo.c:789 +#: gio/glocalfileinfo.c:793 msgid "Invalid extended attribute name" msgstr "Neveljavno razširjeno ime atributa" -#: gio/glocalfileinfo.c:840 +#: gio/glocalfileinfo.c:844 #, c-format msgid "Error setting extended attribute “%s”: %s" msgstr "Napaka med določanjem razširjenega atributa »%s«: %s" -#: gio/glocalfileinfo.c:1738 gio/win32/gwinhttpfile.c:191 +#: gio/glocalfileinfo.c:1823 gio/win32/gwinhttpfile.c:191 msgid " (invalid encoding)" msgstr " (neveljavni nabor znakov)" -#: gio/glocalfileinfo.c:1897 gio/glocalfileoutputstream.c:945 +#: gio/glocalfileinfo.c:1982 gio/glocalfileoutputstream.c:945 #: gio/glocalfileoutputstream.c:997 #, c-format msgid "Error when getting information for file “%s”: %s" msgstr "Napaka med pridobivanjem podatkov za datoteko »%s«: %s" -#: gio/glocalfileinfo.c:2163 +#: gio/glocalfileinfo.c:2287 #, c-format msgid "Error when getting information for file descriptor: %s" msgstr "Napaka med potrjevanjem opisovalnika datoteke: %s" -#: gio/glocalfileinfo.c:2208 +#: gio/glocalfileinfo.c:2332 msgid "Invalid attribute type (uint32 expected)" msgstr "Neveljavna vrsta atributa (pričakovan uint32)" -#: gio/glocalfileinfo.c:2226 +#: gio/glocalfileinfo.c:2350 msgid "Invalid attribute type (uint64 expected)" msgstr "Neveljavna vrsta atributa (pričakovan uint64)" -#: gio/glocalfileinfo.c:2245 gio/glocalfileinfo.c:2264 +#: gio/glocalfileinfo.c:2369 gio/glocalfileinfo.c:2388 msgid "Invalid attribute type (byte string expected)" msgstr "Neveljavna vrsta atributa (pričakovan bitni niz)" -#: gio/glocalfileinfo.c:2311 +#: gio/glocalfileinfo.c:2435 msgid "Cannot set permissions on symlinks" msgstr "Ni mogoče določiti dovoljenj simbolnih povezav" -#: gio/glocalfileinfo.c:2327 +#: gio/glocalfileinfo.c:2451 #, c-format msgid "Error setting permissions: %s" msgstr "Napaka med določanjem dovoljenj: %s" -#: gio/glocalfileinfo.c:2378 +#: gio/glocalfileinfo.c:2502 #, c-format msgid "Error setting owner: %s" msgstr "Napaka med določanjem lastnika: %s" -#: gio/glocalfileinfo.c:2401 +#: gio/glocalfileinfo.c:2525 msgid "symlink must be non-NULL" msgstr "Simbolna povezava ne sme biti določena kot NULL" -#: gio/glocalfileinfo.c:2411 gio/glocalfileinfo.c:2430 -#: gio/glocalfileinfo.c:2441 +#: gio/glocalfileinfo.c:2535 gio/glocalfileinfo.c:2554 +#: gio/glocalfileinfo.c:2565 #, c-format msgid "Error setting symlink: %s" msgstr "Napaka med določanjem simbolne povezave: %s" -#: gio/glocalfileinfo.c:2420 +#: gio/glocalfileinfo.c:2544 msgid "Error setting symlink: file is not a symlink" msgstr "" "Napaka med določevanjem simbolne povezave; datoteka ni simbolna povezava" -#: gio/glocalfileinfo.c:2492 +#: gio/glocalfileinfo.c:2636 #, c-format msgid "Extra nanoseconds %d for UNIX timestamp %lld are negative" msgstr "Dodatne nanosekunde %d za časovni žig UNIX %lld so negativne" -#: gio/glocalfileinfo.c:2501 +#: gio/glocalfileinfo.c:2645 #, c-format msgid "Extra nanoseconds %d for UNIX timestamp %lld reach 1 second" msgstr "Dodatne nanosekunde %d za časovni žig UNIX %lld so dosegle 1 sekundo" -#: gio/glocalfileinfo.c:2511 +#: gio/glocalfileinfo.c:2655 #, c-format msgid "UNIX timestamp %lld does not fit into 64 bits" msgstr "Časovni žig UNIX %lld je prevelik za 64-bitni zapis" -#: gio/glocalfileinfo.c:2522 +#: gio/glocalfileinfo.c:2666 #, c-format msgid "UNIX timestamp %lld is outside of the range supported by Windows" msgstr "" "Časovni žig UNIX %lld je izven obsega, ki je podprt na sistemih MS Windows" -#: gio/glocalfileinfo.c:2625 +#: gio/glocalfileinfo.c:2798 #, c-format msgid "File name “%s” cannot be converted to UTF-16" msgstr "Imena datoteke »%s« ni mogoče pretvoriti v zapis UTF-16" -#: gio/glocalfileinfo.c:2644 +#: gio/glocalfileinfo.c:2817 #, c-format msgid "File “%s” cannot be opened: Windows Error %lu" msgstr "Datoteke »%s« ni mogoče odpreti: napaka Windows %lu" -#: gio/glocalfileinfo.c:2657 +#: gio/glocalfileinfo.c:2830 #, c-format msgid "Error setting modification or access time for file “%s”: %lu" msgstr "Napaka med določanjem sprememb ali časa dostopa za datoteko »%s«: %lu" -#: gio/glocalfileinfo.c:2798 gio/glocalfileinfo.c:2810 +#: gio/glocalfileinfo.c:2987 #, c-format msgid "Error setting modification or access time: %s" msgstr "Napaka med določanjem sprememb ali časa dostopa: %s" -#: gio/glocalfileinfo.c:2833 +#: gio/glocalfileinfo.c:3010 msgid "SELinux context must be non-NULL" msgstr "Atributa SELinux ni mogoče določiti kot NULL" -#: gio/glocalfileinfo.c:2840 +#: gio/glocalfileinfo.c:3017 msgid "SELinux is not enabled on this system" msgstr "Na tem sistemu SELinux ni omogočen" -#: gio/glocalfileinfo.c:2850 +#: gio/glocalfileinfo.c:3027 #, c-format msgid "Error setting SELinux context: %s" msgstr "Napaka nastavitve vsebine SELinux: %s" -#: gio/glocalfileinfo.c:2947 +#: gio/glocalfileinfo.c:3124 #, c-format msgid "Setting attribute %s not supported" msgstr "Določanje atributa %s ni podprto" @@ -3339,13 +3348,13 @@ msgid "Error renaming temporary file: %s" msgstr "Napaka med preimenovanjem začasne datoteke: %s" -#: gio/glocalfileoutputstream.c:611 gio/glocalfileoutputstream.c:1241 +#: gio/glocalfileoutputstream.c:611 gio/glocalfileoutputstream.c:1242 #, c-format msgid "Error truncating file: %s" msgstr "Napaka med obrezovanjem datoteke: %s" #: gio/glocalfileoutputstream.c:664 gio/glocalfileoutputstream.c:909 -#: gio/glocalfileoutputstream.c:1222 gio/gsubprocess.c:231 +#: gio/glocalfileoutputstream.c:1223 gio/gsubprocess.c:231 #, c-format msgid "Error opening file “%s”: %s" msgstr "Napaka med odpiranjem datoteke »%s«: %s" @@ -3362,7 +3371,7 @@ msgid "The file was externally modified" msgstr "Datoteka je bila zunanje spremenjena" -#: gio/glocalfileoutputstream.c:1204 +#: gio/glocalfileoutputstream.c:1205 #, c-format msgid "Error removing old file: %s" msgstr "Napaka med odstranjevanjem datoteke: %s" @@ -3509,8 +3518,8 @@ #. Translators: the first placeholder is a domain name, the #. * second is an error message #: gio/gresolver.c:403 gio/gthreadedresolver.c:152 gio/gthreadedresolver.c:170 -#: gio/gthreadedresolver.c:782 gio/gthreadedresolver.c:806 -#: gio/gthreadedresolver.c:831 gio/gthreadedresolver.c:846 +#: gio/gthreadedresolver.c:798 gio/gthreadedresolver.c:822 +#: gio/gthreadedresolver.c:847 gio/gthreadedresolver.c:862 #, c-format msgid "Error resolving “%s”: %s" msgstr "Napaka med razreševanjem »%s«: %s" @@ -3912,7 +3921,7 @@ msgid "Socket is already closed" msgstr "Vtič je že zaprt" -#: gio/gsocket.c:449 gio/gsocket.c:3201 gio/gsocket.c:4434 gio/gsocket.c:4492 +#: gio/gsocket.c:449 gio/gsocket.c:3225 gio/gsocket.c:4458 gio/gsocket.c:4516 msgid "Socket I/O timed out" msgstr "Vtič V/I naprave je časovno potekel" @@ -4008,74 +4017,74 @@ msgid "No support for IPv6 source-specific multicast" msgstr "Ni podpore za večsmerno oddajanje v protokolu IPv6" -#: gio/gsocket.c:2900 +#: gio/gsocket.c:2924 #, c-format msgid "Error accepting connection: %s" msgstr "Napaka med sprejemanjem povezave: %s" -#: gio/gsocket.c:3026 +#: gio/gsocket.c:3050 msgid "Connection in progress" msgstr "Povezava v teku" -#: gio/gsocket.c:3077 +#: gio/gsocket.c:3101 msgid "Unable to get pending error: " msgstr "Ni mogoče pridobiti uvrščene napake:" -#: gio/gsocket.c:3266 +#: gio/gsocket.c:3290 #, c-format msgid "Error receiving data: %s" msgstr "Napaka med prejemanjem podatkov: %s" -#: gio/gsocket.c:3463 +#: gio/gsocket.c:3487 #, c-format msgid "Error sending data: %s" msgstr "Napaka med pošiljanjem podatkov: %s" -#: gio/gsocket.c:3650 +#: gio/gsocket.c:3674 #, c-format msgid "Unable to shutdown socket: %s" msgstr "Ni mogoče izklopiti vtiča: %s" -#: gio/gsocket.c:3731 +#: gio/gsocket.c:3755 #, c-format msgid "Error closing socket: %s" msgstr "Napaka med zapiranjem vtiča: %s" -#: gio/gsocket.c:4427 +#: gio/gsocket.c:4451 #, c-format msgid "Waiting for socket condition: %s" msgstr "Čakanje na stanje vtiča: %s" -#: gio/gsocket.c:4817 gio/gsocket.c:4833 gio/gsocket.c:4846 +#: gio/gsocket.c:4841 gio/gsocket.c:4857 gio/gsocket.c:4870 #, c-format msgid "Unable to send message: %s" msgstr "Ni mogoče poslati sporočila: %s" -#: gio/gsocket.c:4818 gio/gsocket.c:4834 gio/gsocket.c:4847 +#: gio/gsocket.c:4842 gio/gsocket.c:4858 gio/gsocket.c:4871 msgid "Message vectors too large" msgstr "Vektorji sporočila so preobsežni." -#: gio/gsocket.c:4863 gio/gsocket.c:4865 gio/gsocket.c:5012 gio/gsocket.c:5097 -#: gio/gsocket.c:5275 gio/gsocket.c:5315 gio/gsocket.c:5317 +#: gio/gsocket.c:4887 gio/gsocket.c:4889 gio/gsocket.c:5036 gio/gsocket.c:5121 +#: gio/gsocket.c:5299 gio/gsocket.c:5339 gio/gsocket.c:5341 #, c-format msgid "Error sending message: %s" msgstr "Napaka med pošiljanjem sporočila: %s" -#: gio/gsocket.c:5039 +#: gio/gsocket.c:5063 msgid "GSocketControlMessage not supported on Windows" msgstr "Predmet GSocketControlMessage na sistemih Windows ni podprt" -#: gio/gsocket.c:5512 gio/gsocket.c:5588 gio/gsocket.c:5814 +#: gio/gsocket.c:5536 gio/gsocket.c:5612 gio/gsocket.c:5838 #, c-format msgid "Error receiving message: %s" msgstr "Napaka med prejemanjem sporočila: %s" -#: gio/gsocket.c:6099 gio/gsocket.c:6110 gio/gsocket.c:6173 +#: gio/gsocket.c:6123 gio/gsocket.c:6134 gio/gsocket.c:6197 #, c-format msgid "Unable to read socket credentials: %s" msgstr "Ni mogoče prebrati poveril vtiča: %s." -#: gio/gsocket.c:6182 +#: gio/gsocket.c:6206 msgid "g_socket_get_credentials not implemented for this OS" msgstr "Operacijski sistem ne podpira možnosti g_socket_get_credentials" @@ -4197,12 +4206,12 @@ msgid "Unknown SOCKSv5 proxy error." msgstr "Neznana napaka posredniškega strežnika SOCKSv5." -#: gio/gtestdbus.c:614 glib/gspawn-win32.c:354 +#: gio/gtestdbus.c:615 glib/gspawn-win32.c:354 #, c-format msgid "Failed to create pipe for communicating with child process (%s)" msgstr "Ni mogoče ustvariti cevi za stik z opravilom podrejenega predmeta (%s)" -#: gio/gtestdbus.c:621 +#: gio/gtestdbus.c:622 #, c-format msgid "Pipes are not supported in this platform" msgstr "Uporaba cevljenja na tem sistemu ni podprta" @@ -4223,35 +4232,35 @@ #. Translators: the placeholder is a DNS record type, such as ‘MX’ or ‘SRV’ #: gio/gthreadedresolver.c:552 gio/gthreadedresolver.c:574 -#: gio/gthreadedresolver.c:612 gio/gthreadedresolver.c:659 -#: gio/gthreadedresolver.c:688 gio/gthreadedresolver.c:700 +#: gio/gthreadedresolver.c:628 gio/gthreadedresolver.c:675 +#: gio/gthreadedresolver.c:704 gio/gthreadedresolver.c:716 #, c-format msgid "Error parsing DNS %s record: malformed DNS packet" msgstr "Napaka razčlenjevanja zapisa DNS %s: nepravilno oblikovan paket DNS" -#: gio/gthreadedresolver.c:758 gio/gthreadedresolver.c:895 -#: gio/gthreadedresolver.c:993 gio/gthreadedresolver.c:1043 +#: gio/gthreadedresolver.c:774 gio/gthreadedresolver.c:911 +#: gio/gthreadedresolver.c:1009 gio/gthreadedresolver.c:1059 #, c-format msgid "No DNS record of the requested type for “%s”" msgstr "Ni zapisa DNS za zahtevano vrsto »%s«" -#: gio/gthreadedresolver.c:763 gio/gthreadedresolver.c:998 +#: gio/gthreadedresolver.c:779 gio/gthreadedresolver.c:1014 #, c-format msgid "Temporarily unable to resolve “%s”" msgstr "Trenutno ni mogoče razrešiti »%s«" -#: gio/gthreadedresolver.c:768 gio/gthreadedresolver.c:1003 -#: gio/gthreadedresolver.c:1113 +#: gio/gthreadedresolver.c:784 gio/gthreadedresolver.c:1019 +#: gio/gthreadedresolver.c:1129 #, c-format msgid "Error resolving “%s”" msgstr "Napaka med razreševanjem »%s«" -#: gio/gthreadedresolver.c:782 gio/gthreadedresolver.c:806 -#: gio/gthreadedresolver.c:831 gio/gthreadedresolver.c:846 +#: gio/gthreadedresolver.c:798 gio/gthreadedresolver.c:822 +#: gio/gthreadedresolver.c:847 gio/gthreadedresolver.c:862 msgid "Malformed DNS packet" msgstr "Nepravilno oblikovan paket DNS" -#: gio/gthreadedresolver.c:888 +#: gio/gthreadedresolver.c:904 #, c-format msgid "Failed to parse DNS response for “%s”: " msgstr "Razčlenjevanje odziva DNS za »%s« je spodletelo: " @@ -4381,7 +4390,7 @@ msgid "Error closing file descriptor: %s" msgstr "Napaka med zapiranjem opisovalnika datoteke: %s" -#: gio/gunixmounts.c:2815 gio/gunixmounts.c:2868 +#: gio/gunixmounts.c:2817 gio/gunixmounts.c:2870 msgid "Filesystem root" msgstr "Koren datotečnega sistema" @@ -4463,77 +4472,77 @@ msgid "Wrong args\n" msgstr "Napačni argumenti\n" -#: glib/gbookmarkfile.c:779 +#: glib/gbookmarkfile.c:861 #, c-format msgid "Unexpected attribute “%s” for element “%s”" msgstr "Nepričakovan atribut »%s« za predmet »%s«" -#: glib/gbookmarkfile.c:790 glib/gbookmarkfile.c:870 glib/gbookmarkfile.c:880 -#: glib/gbookmarkfile.c:993 +#: glib/gbookmarkfile.c:872 glib/gbookmarkfile.c:952 glib/gbookmarkfile.c:962 +#: glib/gbookmarkfile.c:1075 #, c-format msgid "Attribute “%s” of element “%s” not found" msgstr "Atributa »%s« predmeta »%s« ni mogoče najti" -#: glib/gbookmarkfile.c:1202 glib/gbookmarkfile.c:1267 -#: glib/gbookmarkfile.c:1331 glib/gbookmarkfile.c:1341 +#: glib/gbookmarkfile.c:1284 glib/gbookmarkfile.c:1349 +#: glib/gbookmarkfile.c:1413 glib/gbookmarkfile.c:1423 #, c-format msgid "Unexpected tag “%s”, tag “%s” expected" msgstr "Nepričakovana oznaka »%s«, pričakovana je »%s«" -#: glib/gbookmarkfile.c:1227 glib/gbookmarkfile.c:1241 -#: glib/gbookmarkfile.c:1309 glib/gbookmarkfile.c:1355 +#: glib/gbookmarkfile.c:1309 glib/gbookmarkfile.c:1323 +#: glib/gbookmarkfile.c:1391 glib/gbookmarkfile.c:1437 #, c-format msgid "Unexpected tag “%s” inside “%s”" msgstr "Nepričakovana oznaka »%s« znotraj »%s«" -#: glib/gbookmarkfile.c:1635 +#: glib/gbookmarkfile.c:1717 #, c-format msgid "Invalid date/time ‘%s’ in bookmark file" msgstr "Neveljaven zapis datuma/časa »%s« v datoteki zaznamka" -#: glib/gbookmarkfile.c:1838 +#: glib/gbookmarkfile.c:1956 msgid "No valid bookmark file found in data dirs" msgstr "Ni veljavne datoteke zaznamkov v podatkovnih mapah" -#: glib/gbookmarkfile.c:2039 +#: glib/gbookmarkfile.c:2157 #, c-format msgid "A bookmark for URI “%s” already exists" msgstr "Zaznamek za naslov URI »%s« že obstaja" -#: glib/gbookmarkfile.c:2088 glib/gbookmarkfile.c:2246 -#: glib/gbookmarkfile.c:2331 glib/gbookmarkfile.c:2411 -#: glib/gbookmarkfile.c:2496 glib/gbookmarkfile.c:2630 -#: glib/gbookmarkfile.c:2763 glib/gbookmarkfile.c:2898 -#: glib/gbookmarkfile.c:2940 glib/gbookmarkfile.c:3037 -#: glib/gbookmarkfile.c:3158 glib/gbookmarkfile.c:3352 -#: glib/gbookmarkfile.c:3493 glib/gbookmarkfile.c:3712 -#: glib/gbookmarkfile.c:3801 glib/gbookmarkfile.c:3890 -#: glib/gbookmarkfile.c:4009 +#: glib/gbookmarkfile.c:2206 glib/gbookmarkfile.c:2364 +#: glib/gbookmarkfile.c:2449 glib/gbookmarkfile.c:2529 +#: glib/gbookmarkfile.c:2614 glib/gbookmarkfile.c:2748 +#: glib/gbookmarkfile.c:2881 glib/gbookmarkfile.c:3016 +#: glib/gbookmarkfile.c:3058 glib/gbookmarkfile.c:3155 +#: glib/gbookmarkfile.c:3276 glib/gbookmarkfile.c:3470 +#: glib/gbookmarkfile.c:3611 glib/gbookmarkfile.c:3830 +#: glib/gbookmarkfile.c:3919 glib/gbookmarkfile.c:4008 +#: glib/gbookmarkfile.c:4127 #, c-format msgid "No bookmark found for URI “%s”" msgstr "Ni veljavnega zaznamka za naslov URI »%s«" -#: glib/gbookmarkfile.c:2420 +#: glib/gbookmarkfile.c:2538 #, c-format msgid "No MIME type defined in the bookmark for URI “%s”" msgstr "V zaznamku za naslov URI »%s« ni določene vrsta MIME" -#: glib/gbookmarkfile.c:2505 +#: glib/gbookmarkfile.c:2623 #, c-format msgid "No private flag has been defined in bookmark for URI “%s”" msgstr "V zaznamku za naslov URI »%s« ni določene zasebne zastavice" -#: glib/gbookmarkfile.c:3046 +#: glib/gbookmarkfile.c:3164 #, c-format msgid "No groups set in bookmark for URI “%s”" msgstr "V zaznamku za naslov URI »%s« ni nastavljenih skupin" -#: glib/gbookmarkfile.c:3514 glib/gbookmarkfile.c:3722 +#: glib/gbookmarkfile.c:3632 glib/gbookmarkfile.c:3840 #, c-format msgid "No application with name “%s” registered a bookmark for “%s”" msgstr "Program z imenom »%s« ni ustvaril zaznamka za »%s«" -#: glib/gbookmarkfile.c:3745 +#: glib/gbookmarkfile.c:3863 #, c-format msgid "Failed to expand exec line “%s” with URI “%s”" msgstr "Razširjanje ukazne vrstice »%s« z naslovom URI »%s« je spodletelo." @@ -5008,7 +5017,7 @@ msgid "Error opening directory “%s”: %s" msgstr "Napaka med odpiranjem imenika »%s«: %s" -#: glib/gfileutils.c:735 glib/gfileutils.c:827 +#: glib/gfileutils.c:753 glib/gfileutils.c:845 #, c-format msgid "Could not allocate %lu byte to read file “%s”" msgid_plural "Could not allocate %lu bytes to read file “%s”" @@ -5017,78 +5026,78 @@ msgstr2 "Ni mogoče dodeliti %lu bajtov za branje datoteke »%s«" msgstr3 "Ni mogoče dodeliti %lu bajtov za branje datoteke »%s«" -#: glib/gfileutils.c:752 +#: glib/gfileutils.c:770 #, c-format msgid "Error reading file “%s”: %s" msgstr "Napaka med branjem datoteke »%s«: %s" -#: glib/gfileutils.c:788 +#: glib/gfileutils.c:806 #, c-format msgid "File “%s” is too large" msgstr "Datoteka »%s« je prevelika." -#: glib/gfileutils.c:852 +#: glib/gfileutils.c:870 #, c-format msgid "Failed to read from file “%s”: %s" msgstr "Branje datoteke »%s« je spodletelo: %s" -#: glib/gfileutils.c:902 glib/gfileutils.c:977 glib/gfileutils.c:1449 +#: glib/gfileutils.c:920 glib/gfileutils.c:995 glib/gfileutils.c:1472 #, c-format msgid "Failed to open file “%s”: %s" msgstr "Odpiranje datoteke »%s« je spodletelo: %s" -#: glib/gfileutils.c:915 +#: glib/gfileutils.c:933 #, c-format msgid "Failed to get attributes of file “%s”: fstat() failed: %s" msgstr "" "Pridobivanje atributov datoteke »%s« je spodletelo: ukaz fstat() ni uspešno " "izveden: %s" -#: glib/gfileutils.c:946 +#: glib/gfileutils.c:964 #, c-format msgid "Failed to open file “%s”: fdopen() failed: %s" msgstr "Ni mogoče odpreti datoteke »%s«: ukaz fdopen() ni uspešno izveden: %s" -#: glib/gfileutils.c:1047 +#: glib/gfileutils.c:1065 #, c-format msgid "Failed to rename file “%s” to “%s”: g_rename() failed: %s" msgstr "" "Ni mogoče preimenovati datoteke »%s« v »%s«: ukaz g_rename() ni uspešno " "izveden: %s" -#: glib/gfileutils.c:1156 +#: glib/gfileutils.c:1179 #, c-format msgid "Failed to write file “%s”: write() failed: %s" msgstr "Ni mogoče zapisati datoteke »%s«: ukaz write() je spodletel: %s" -#: glib/gfileutils.c:1177 +#: glib/gfileutils.c:1200 #, c-format msgid "Failed to write file “%s”: fsync() failed: %s" msgstr "Ni mogoče zapisati datoteke »%s«: ukaz fsync() ni uspešno izveden: %s" -#: glib/gfileutils.c:1338 glib/gfileutils.c:1753 +#: glib/gfileutils.c:1361 glib/gfileutils.c:1776 #, c-format msgid "Failed to create file “%s”: %s" msgstr "Ni mogoče ustvariti datoteke »%s«: %s" -#: glib/gfileutils.c:1383 +#: glib/gfileutils.c:1406 #, c-format msgid "Existing file “%s” could not be removed: g_unlink() failed: %s" msgstr "" "Obstoječe datoteke »%s« ni mogoče odstraniti: ukaz g_unlink() ni uspešno " "izveden: %s" -#: glib/gfileutils.c:1718 +#: glib/gfileutils.c:1741 #, c-format msgid "Template “%s” invalid, should not contain a “%s”" msgstr "Predloga »%s« je neveljavna, saj ne sme vsebovati »%s«" -#: glib/gfileutils.c:1731 +#: glib/gfileutils.c:1754 #, c-format msgid "Template “%s” doesn’t contain XXXXXX" msgstr "Predloga »%s« ne vsebuje XXXXXX" -#: glib/gfileutils.c:2291 glib/gfileutils.c:2320 +#: glib/gfileutils.c:2348 glib/gfileutils.c:2377 #, c-format msgid "Failed to read the symbolic link “%s”: %s" msgstr "Branje simbolne povezave »%s« je spodletelo: %s" @@ -5114,15 +5123,15 @@ msgid "Can’t do a raw read in g_io_channel_read_to_end" msgstr "Ni mogoče prebrati v g_io_channel_read_to_end" -#: glib/gkeyfile.c:796 +#: glib/gkeyfile.c:800 msgid "Valid key file could not be found in search dirs" msgstr "Veljavnega ključa v iskanih mapah ni mogoče najti" -#: glib/gkeyfile.c:833 +#: glib/gkeyfile.c:837 msgid "Not a regular file" msgstr "Ni običajna datoteka" -#: glib/gkeyfile.c:1291 +#: glib/gkeyfile.c:1295 #, c-format msgid "" "Key file contains line “%s” which is not a key-value pair, group, or comment" @@ -5130,52 +5139,52 @@ "Datoteka ključa vsebuje vrstico »%s«, ki ni par ključ-vrednost, skupina ali " "opomba" -#: glib/gkeyfile.c:1348 +#: glib/gkeyfile.c:1352 #, c-format msgid "Invalid group name: %s" msgstr "Neveljavno ime skupine: %s" -#: glib/gkeyfile.c:1372 +#: glib/gkeyfile.c:1376 msgid "Key file does not start with a group" msgstr "Datoteka s ključem se ne začne s skupino" -#: glib/gkeyfile.c:1396 +#: glib/gkeyfile.c:1400 #, c-format msgid "Invalid key name: %.*s" msgstr "Neveljavno ime ključa: %.*s" -#: glib/gkeyfile.c:1424 +#: glib/gkeyfile.c:1428 #, c-format msgid "Key file contains unsupported encoding “%s”" msgstr "Datoteka ključa vsebuje nepodprto kodiranje »%s«" -#: glib/gkeyfile.c:1679 glib/gkeyfile.c:1852 glib/gkeyfile.c:3299 -#: glib/gkeyfile.c:3363 glib/gkeyfile.c:3493 glib/gkeyfile.c:3625 -#: glib/gkeyfile.c:3771 glib/gkeyfile.c:4006 glib/gkeyfile.c:4073 +#: glib/gkeyfile.c:1683 glib/gkeyfile.c:1856 glib/gkeyfile.c:3303 +#: glib/gkeyfile.c:3367 glib/gkeyfile.c:3497 glib/gkeyfile.c:3626 +#: glib/gkeyfile.c:3772 glib/gkeyfile.c:4007 glib/gkeyfile.c:4074 #, c-format msgid "Key file does not have group “%s”" msgstr "Datoteka s ključem ni del skupine »%s«" -#: glib/gkeyfile.c:1807 +#: glib/gkeyfile.c:1811 #, c-format msgid "Key file does not have key “%s” in group “%s”" msgstr "Datoteka s ključem nima ključa »%s« v skupini »%s«" -#: glib/gkeyfile.c:1969 glib/gkeyfile.c:2085 +#: glib/gkeyfile.c:1973 glib/gkeyfile.c:2089 #, c-format msgid "Key file contains key “%s” with value “%s” which is not UTF-8" msgstr "" "Datoteka ključa vsebuje ključ »%s« z vrednostjo »%s«, ki ni zapisan v naboru " "UTF-8" -#: glib/gkeyfile.c:1989 glib/gkeyfile.c:2105 glib/gkeyfile.c:2544 +#: glib/gkeyfile.c:1993 glib/gkeyfile.c:2109 glib/gkeyfile.c:2548 #, c-format msgid "" "Key file contains key “%s” which has a value that cannot be interpreted." msgstr "" "Datoteka ključa vsebuje ključ »%s« z vrednostjo, ki je ni mogoče tolmačiti." -#: glib/gkeyfile.c:2759 glib/gkeyfile.c:3128 +#: glib/gkeyfile.c:2763 glib/gkeyfile.c:3132 #, c-format msgid "" "Key file contains key “%s” in group “%s” which has a value that cannot be " @@ -5184,85 +5193,85 @@ "Datoteka ključa vsebuje ključ »%s« v skupini »%s« z vrednostjo, ki je ni " "mogoče tolmačiti." -#: glib/gkeyfile.c:2837 glib/gkeyfile.c:2914 +#: glib/gkeyfile.c:2841 glib/gkeyfile.c:2918 #, c-format msgid "Key “%s” in group “%s” has value “%s” where %s was expected" msgstr "" "Ključ »%s« v skupini »%s« ima vrednost »%s«, pričakovana pa je vrednost %s." -#: glib/gkeyfile.c:4326 +#: glib/gkeyfile.c:4327 msgid "Key file contains escape character at end of line" msgstr "Datoteka s ključem vsebuje ubežni znak na koncu vrstice" -#: glib/gkeyfile.c:4348 +#: glib/gkeyfile.c:4349 #, c-format msgid "Key file contains invalid escape sequence “%s”" msgstr "Datoteka ključa vsebuje neveljavno ubežno zaporedje »%s«" -#: glib/gkeyfile.c:4493 +#: glib/gkeyfile.c:4494 #, c-format msgid "Value “%s” cannot be interpreted as a number." msgstr "Vrednosti »%s« ni mogoče obravnavati kot število." -#: glib/gkeyfile.c:4507 +#: glib/gkeyfile.c:4508 #, c-format msgid "Integer value “%s” out of range" msgstr "Celoštevilska vrednost »%s« je izven obsega" -#: glib/gkeyfile.c:4540 +#: glib/gkeyfile.c:4541 #, c-format msgid "Value “%s” cannot be interpreted as a float number." msgstr "Vrednosti »%s« ni mogoče obravnavati kot število s plavajočo vejico." -#: glib/gkeyfile.c:4579 +#: glib/gkeyfile.c:4580 #, c-format msgid "Value “%s” cannot be interpreted as a boolean." msgstr "Vrednosti »%s« ni mogoče obravnavati kot logično Boolovo vrednost." -#: glib/gmappedfile.c:131 +#: glib/gmappedfile.c:135 #, c-format msgid "Failed to get attributes of file “%s%s%s%s”: fstat() failed: %s" msgstr "" "Ni mogoče pridobiti atributov datoteke »%s%s%s%s«: ukaz fstat() je " "spodletel: %s" -#: glib/gmappedfile.c:197 +#: glib/gmappedfile.c:201 #, c-format msgid "Failed to map %s%s%s%s: mmap() failed: %s" msgstr "Ni mogoče preslikati %s%s%s%s: ukaz mmap() nje spodletel: %s" -#: glib/gmappedfile.c:264 +#: glib/gmappedfile.c:268 #, c-format msgid "Failed to open file “%s”: open() failed: %s" msgstr "" "Odpiranje datoteke »%s« je spodletelo: ukaz open() ni uspešno izveden: %s" -#: glib/gmarkup.c:400 glib/gmarkup.c:442 +#: glib/gmarkup.c:393 glib/gmarkup.c:435 #, c-format msgid "Error on line %d char %d: " msgstr "Napaka v vrstici %d, znak %d:" -#: glib/gmarkup.c:464 glib/gmarkup.c:547 +#: glib/gmarkup.c:457 glib/gmarkup.c:540 #, c-format msgid "Invalid UTF-8 encoded text in name — not valid “%s”" msgstr "Neveljavno UTF-8 kodirano besedilo imena – neveljaven »%s«" -#: glib/gmarkup.c:475 +#: glib/gmarkup.c:468 #, c-format msgid "“%s” is not a valid name" msgstr "»%s« ni veljavno ime" -#: glib/gmarkup.c:491 +#: glib/gmarkup.c:484 #, c-format msgid "“%s” is not a valid name: “%c”" msgstr "»%s« ni veljavno ime: »%c«" -#: glib/gmarkup.c:615 +#: glib/gmarkup.c:608 #, c-format msgid "Error on line %d: %s" msgstr "Napaka v vrstici %d: %s" -#: glib/gmarkup.c:692 +#: glib/gmarkup.c:685 #, c-format msgid "" "Failed to parse “%-.*s”, which should have been a digit inside a character " @@ -5271,7 +5280,7 @@ "Razčlenjevanje vrste »%-.*s«, ki bi morala določati številko znotraj sklica " "znaka (na primer ê) je spodletelo – morda je številka prevelika" -#: glib/gmarkup.c:704 +#: glib/gmarkup.c:697 msgid "" "Character reference did not end with a semicolon; most likely you used an " "ampersand character without intending to start an entity — escape ampersand " @@ -5280,24 +5289,24 @@ "Sklic znaka ni končan s podpičjem; najverjetneje je uporabljen znak » & « " "brez povezave s predmetom – znak » & « mora biti zapisan kot »&«." -#: glib/gmarkup.c:730 +#: glib/gmarkup.c:723 #, c-format msgid "Character reference “%-.*s” does not encode a permitted character" msgstr "Sklic znaka »%-.*s« ne kodira dovoljenega znaka" -#: glib/gmarkup.c:768 +#: glib/gmarkup.c:761 msgid "" "Empty entity “&;” seen; valid entities are: & " < > '" msgstr "" "Zaznan je prazen predmet » &; «; veljavne možnosti so: & " < " "> '" -#: glib/gmarkup.c:776 +#: glib/gmarkup.c:769 #, c-format msgid "Entity name “%-.*s” is not known" msgstr "Ime predmeta »%-.*s« ni prepoznano" -#: glib/gmarkup.c:781 +#: glib/gmarkup.c:774 msgid "" "Entity did not end with a semicolon; most likely you used an ampersand " "character without intending to start an entity — escape ampersand as &" @@ -5305,11 +5314,11 @@ "Predmet ni zaključen s podpičjem; najverjetneje je uporabljen znak » & « " "brez povezave s predmetom – znak » & « mora biti zapisan kot »&«." -#: glib/gmarkup.c:1195 +#: glib/gmarkup.c:1188 msgid "Document must begin with an element (e.g. <book>)" msgstr "Dokument se mora začeti z predmetom (na primer <book>)" -#: glib/gmarkup.c:1235 +#: glib/gmarkup.c:1228 #, c-format msgid "" "“%s” is not a valid character following a “<” character; it may not begin an " @@ -5318,7 +5327,7 @@ "»%s« ni veljaven znak, ki lahko sledi znaku » < «;. Morda se ne začne z " "imenom predmeta." -#: glib/gmarkup.c:1278 +#: glib/gmarkup.c:1271 #, c-format msgid "" "Odd character “%s”, expected a “>” character to end the empty-element tag " @@ -5327,12 +5336,12 @@ "Nenavaden znak »%s«; pričakovan znak je » > «, da zaključi oznako predmeta " "»%s«" -#: glib/gmarkup.c:1348 +#: glib/gmarkup.c:1341 #, c-format msgid "Too many attributes in element “%s”" msgstr "Določenih je preveč atributov za predmet »%s«" -#: glib/gmarkup.c:1368 +#: glib/gmarkup.c:1361 #, c-format msgid "" "Odd character “%s”, expected a “=” after attribute name “%s” of element “%s”" @@ -5340,7 +5349,7 @@ "Nenavaden znak »%s«; za imenom atributa »%s« (predmeta »%s«) je pričakovan " "znak » = «." -#: glib/gmarkup.c:1410 +#: glib/gmarkup.c:1403 #, c-format msgid "" "Odd character “%s”, expected a “>” or “/” character to end the start tag of " @@ -5351,7 +5360,7 @@ "predmeta »%s« ali pogojno atribut. Morda je uporabljen neveljaven znak v " "imenu atributa." -#: glib/gmarkup.c:1455 +#: glib/gmarkup.c:1448 #, c-format msgid "" "Odd character “%s”, expected an open quote mark after the equals sign when " @@ -5360,7 +5369,7 @@ "Nenavaden znak »%s«; za enačajem je pričakovan narekovaj, znotraj katerega " "je podana vrednost atributa »%s« predmeta »%s«." -#: glib/gmarkup.c:1589 +#: glib/gmarkup.c:1582 #, c-format msgid "" "“%s” is not a valid character following the characters “</”; “%s” may not " @@ -5369,7 +5378,7 @@ "»%s« ni veljaven znak za znakoma » </ «; imena predmeta ni mogoče začeti z " "»%s«" -#: glib/gmarkup.c:1627 +#: glib/gmarkup.c:1620 #, c-format msgid "" "“%s” is not a valid character following the close element name “%s”; the " @@ -5378,25 +5387,25 @@ "Znak »%s« ni veljaven, kadar sledi zaprtju imena predmeta »%s«; dovoljen " "znak je » > «." -#: glib/gmarkup.c:1639 +#: glib/gmarkup.c:1632 #, c-format msgid "Element “%s” was closed, no element is currently open" msgstr "Predmet »%s« je zaprt, trenutno ni odprtega drugega predmeta" -#: glib/gmarkup.c:1648 +#: glib/gmarkup.c:1641 #, c-format msgid "Element “%s” was closed, but the currently open element is “%s”" msgstr "Predmet »%s« je zaprt, še vedno pa je odprt predmet »%s«" -#: glib/gmarkup.c:1801 +#: glib/gmarkup.c:1794 msgid "Document was empty or contained only whitespace" msgstr "Dokument je prazen ali pa vsebuje le presledne znake" -#: glib/gmarkup.c:1815 +#: glib/gmarkup.c:1808 msgid "Document ended unexpectedly just after an open angle bracket “<”" msgstr "Dokument je nepričakovano zaključen takoj za odprtjem oznake z » < «" -#: glib/gmarkup.c:1823 glib/gmarkup.c:1868 +#: glib/gmarkup.c:1816 glib/gmarkup.c:1861 #, c-format msgid "" "Document ended unexpectedly with elements still open — “%s” was the last " @@ -5405,7 +5414,7 @@ "Dokument je nepričakovano zaključen s še odprtimi predmeti – »%s« je zadnji " "odprt predmet" -#: glib/gmarkup.c:1831 +#: glib/gmarkup.c:1824 #, c-format msgid "" "Document ended unexpectedly, expected to see a close angle bracket ending " @@ -5414,19 +5423,19 @@ "Dokument nepričakovano zaključen, pričakovan je zaključni zaklepaj oznake " "<%s/>" -#: glib/gmarkup.c:1837 +#: glib/gmarkup.c:1830 msgid "Document ended unexpectedly inside an element name" msgstr "Dokument nepričakovano zaključen sredi imena predmeta" -#: glib/gmarkup.c:1843 +#: glib/gmarkup.c:1836 msgid "Document ended unexpectedly inside an attribute name" msgstr "Dokument nepričakovano zaključen sredi imena atributa" -#: glib/gmarkup.c:1848 +#: glib/gmarkup.c:1841 msgid "Document ended unexpectedly inside an element-opening tag." msgstr "Dokument nepričakovano zaključen sredi oznake za odprtje predmeta." -#: glib/gmarkup.c:1854 +#: glib/gmarkup.c:1847 msgid "" "Document ended unexpectedly after the equals sign following an attribute " "name; no attribute value" @@ -5434,23 +5443,23 @@ "Dokument nepričakovano zaključen za enačajem, ki sledil imenu atributa; ni " "določena vrednosti atributa" -#: glib/gmarkup.c:1861 +#: glib/gmarkup.c:1854 msgid "Document ended unexpectedly while inside an attribute value" msgstr "Dokument nepričakovano zaključen sredi vrednosti atributa" -#: glib/gmarkup.c:1878 +#: glib/gmarkup.c:1871 #, c-format msgid "Document ended unexpectedly inside the close tag for element “%s”" msgstr "Dokument je nepričakovano zaključen sredi oznake zaprtja predmeta »%s«" -#: glib/gmarkup.c:1882 +#: glib/gmarkup.c:1875 msgid "" "Document ended unexpectedly inside the close tag for an unopened element" msgstr "" "Dokument je nepričakovano zaključen sredi oznake zaprtja predmeta za neodprt " "predmet" -#: glib/gmarkup.c:1888 +#: glib/gmarkup.c:1881 msgid "Document ended unexpectedly inside a comment or processing instruction" msgstr "Dokument nepričakovano zaključen sredi opombe ali ukaza" @@ -5513,184 +5522,184 @@ msgid "Unknown option %s" msgstr "Neznana možnost %s" -#: glib/gregex.c:436 +#: glib/gregex.c:479 msgid "corrupted object" msgstr "pokvarjen predmet" -#: glib/gregex.c:438 +#: glib/gregex.c:481 msgid "out of memory" msgstr "primanjkuje pomnilnika" -#: glib/gregex.c:443 +#: glib/gregex.c:487 msgid "backtracking limit reached" msgstr "dosežena omejitev sledenja nazaj" -#: glib/gregex.c:454 glib/gregex.c:707 glib/gregex.c:736 +#: glib/gregex.c:498 msgid "internal error" msgstr "notranja napaka" -#: glib/gregex.c:456 +#: glib/gregex.c:500 msgid "the pattern contains items not supported for partial matching" msgstr "vzorec vsebuje predmete, ki niso podprti za delno iskanje zadetkov" -#: glib/gregex.c:458 +#: glib/gregex.c:502 msgid "back references as conditions are not supported for partial matching" msgstr "predhodne povezave, kot pogoji, niso podprti za delno primerjavo" -#: glib/gregex.c:464 +#: glib/gregex.c:508 msgid "recursion limit reached" msgstr "dosežena omejitev globine drevesne ravni" -#: glib/gregex.c:466 +#: glib/gregex.c:510 msgid "bad offset" msgstr "slab odmik" -#: glib/gregex.c:468 +#: glib/gregex.c:512 msgid "recursion loop" msgstr "rekurzivna zanka" #. should not happen in GRegex since we check modes before each match -#: glib/gregex.c:471 +#: glib/gregex.c:515 msgid "matching mode is requested that was not compiled for JIT" msgstr "zahtevan je način skladnje, ki pa ni vključen v izgradnjo JIT" -#: glib/gregex.c:475 +#: glib/gregex.c:536 glib/gregex.c:1838 msgid "unknown error" msgstr "neznana napaka" -#: glib/gregex.c:496 +#: glib/gregex.c:557 msgid "\\ at end of pattern" msgstr "\\ na koncu vzorca" -#: glib/gregex.c:500 +#: glib/gregex.c:561 msgid "\\c at end of pattern" msgstr "\\c na koncu vzorca" -#: glib/gregex.c:505 +#: glib/gregex.c:566 msgid "unrecognized character following \\" msgstr "neprepoznan znak sledi \\" -#: glib/gregex.c:509 +#: glib/gregex.c:570 msgid "numbers out of order in {} quantifier" msgstr "številke niso zapisane pravilno v {} količilniku" -#: glib/gregex.c:513 +#: glib/gregex.c:574 msgid "number too big in {} quantifier" msgstr "številke so prevelike v {} količilniku" -#: glib/gregex.c:517 +#: glib/gregex.c:578 msgid "missing terminating for character class" msgstr "manjkajoč zaključni znak za znakovni razred" -#: glib/gregex.c:521 +#: glib/gregex.c:582 msgid "invalid escape sequence in character class" msgstr "neveljavno ubežno zaporedje v znakovnem razredu" -#: glib/gregex.c:525 +#: glib/gregex.c:586 msgid "range out of order in character class" msgstr "nepravilen obseg v znakovnem razredu" -#: glib/gregex.c:530 +#: glib/gregex.c:591 msgid "nothing to repeat" msgstr "ni mogoče ponoviti" -#: glib/gregex.c:534 +#: glib/gregex.c:595 msgid "unrecognized character after (? or (?-" msgstr "neprepoznan znak za (? ali (?-" -#: glib/gregex.c:538 +#: glib/gregex.c:599 msgid "POSIX named classes are supported only within a class" msgstr "Imenski razredi POSIX so podprti le znotraj razreda" -#: glib/gregex.c:542 +#: glib/gregex.c:603 msgid "POSIX collating elements are not supported" msgstr "Zbirni predmeti POSIX niso podprti" -#: glib/gregex.c:548 +#: glib/gregex.c:609 msgid "missing terminating )" msgstr "manjka zaključujoči )" -#: glib/gregex.c:552 +#: glib/gregex.c:613 msgid "reference to non-existent subpattern" msgstr "povezava na neobstoječ podrejen vzorec" -#: glib/gregex.c:556 +#: glib/gregex.c:617 msgid "missing ) after comment" msgstr "manjka ) po opombi" -#: glib/gregex.c:560 +#: glib/gregex.c:621 msgid "regular expression is too large" msgstr "logični izraz je preobsežen" -#: glib/gregex.c:564 +#: glib/gregex.c:625 msgid "malformed number or name after (?(" msgstr "nepravilno oblikovano ime ali številka za (?(" -#: glib/gregex.c:568 +#: glib/gregex.c:629 msgid "lookbehind assertion is not fixed length" msgstr "povratna trditev ni določene dolžine" -#: glib/gregex.c:572 +#: glib/gregex.c:633 msgid "conditional group contains more than two branches" msgstr "pogojna skupina vsebuje več kot dve veji" -#: glib/gregex.c:576 +#: glib/gregex.c:637 msgid "assertion expected after (?(" msgstr "trditev pričakovana za (?(" -#: glib/gregex.c:580 +#: glib/gregex.c:641 msgid "a numbered reference must not be zero" msgstr "oštevilčen sklic ne sme biti ničeln" -#: glib/gregex.c:584 +#: glib/gregex.c:645 msgid "unknown POSIX class name" msgstr "neznano ime razreda POSIX" -#: glib/gregex.c:589 +#: glib/gregex.c:650 msgid "character value in \\x{...} sequence is too large" msgstr "znakovna vrednost v zaporedju \\x{...} je predolga" -#: glib/gregex.c:593 +#: glib/gregex.c:654 msgid "\\C not allowed in lookbehind assertion" msgstr "\\C ni dovoljen v povratnih trditvah" -#: glib/gregex.c:597 +#: glib/gregex.c:658 msgid "missing terminator in subpattern name" msgstr "manjkajoč zaključni znak v imenu podrejenega vzorca" -#: glib/gregex.c:601 +#: glib/gregex.c:662 msgid "two named subpatterns have the same name" msgstr "dva imenovana podrejena vzorca imata enako ime" -#: glib/gregex.c:605 +#: glib/gregex.c:666 msgid "malformed \\P or \\p sequence" msgstr "nepravilno oblikovano \\P ali \\p zaporedje" -#: glib/gregex.c:609 +#: glib/gregex.c:670 msgid "unknown property name after \\P or \\p" msgstr "neznano ime lastnosti za \\P ali \\p" -#: glib/gregex.c:613 +#: glib/gregex.c:674 msgid "subpattern name is too long (maximum 32 characters)" msgstr "ime podrejenega vzorca je predolgo (največ 32 znakov)" -#: glib/gregex.c:617 +#: glib/gregex.c:678 msgid "too many named subpatterns (maximum 10,000)" msgstr "preveč imenovanih podrejenih vzorcev (največ 10,000)" -#: glib/gregex.c:621 +#: glib/gregex.c:682 msgid "octal value is greater than \\377" msgstr "osmiška vrednost je večja kot \\377" -#: glib/gregex.c:625 +#: glib/gregex.c:686 msgid "DEFINE group contains more than one branch" msgstr "DEFINE skupina vsebuje več kot eno vejo" -#: glib/gregex.c:629 +#: glib/gregex.c:690 msgid "inconsistent NEWLINE options" msgstr "nepopolna NEWLINE možnost" -#: glib/gregex.c:633 +#: glib/gregex.c:694 msgid "" "\\g is not followed by a braced, angle-bracketed, or quoted name or number, " "or by a plain number" @@ -5698,118 +5707,118 @@ "\\g ne sledi ime oziroma število v oklepajih, oglatih oklepajih ali " "narekovajih, niti navadno število" -#: glib/gregex.c:638 +#: glib/gregex.c:699 msgid "an argument is not allowed for (*ACCEPT), (*FAIL), or (*COMMIT)" msgstr "argument ni dovoljen za (*ACCEPT), (*FAIL) ali (*COMMIT)" -#: glib/gregex.c:642 +#: glib/gregex.c:703 msgid "(*VERB) not recognized" msgstr "(*VERB) ni prepoznan" -#: glib/gregex.c:646 +#: glib/gregex.c:707 msgid "number is too big" msgstr "številka je prevelika" -#: glib/gregex.c:650 +#: glib/gregex.c:711 msgid "missing subpattern name after (?&" msgstr "manjkajoče ime podrejenega vzorca po (?&" -#: glib/gregex.c:654 +#: glib/gregex.c:715 msgid "different names for subpatterns of the same number are not allowed" msgstr "različna imena podrejenih vzorcev z isto številko niso dovoljena" -#: glib/gregex.c:658 +#: glib/gregex.c:719 msgid "(*MARK) must have an argument" msgstr "(*MARK) mora obvezno imeti argument" -#: glib/gregex.c:662 +#: glib/gregex.c:723 msgid "\\c must be followed by an ASCII character" msgstr "\\c mora slediti znak ASCII" -#: glib/gregex.c:666 +#: glib/gregex.c:727 msgid "\\k is not followed by a braced, angle-bracketed, or quoted name" msgstr "\\k ne sledi ime v oklepajih, oglatih oklepajih ali narekovajih" -#: glib/gregex.c:670 +#: glib/gregex.c:731 msgid "\\N is not supported in a class" msgstr "\\N ni podprto v razredu" -#: glib/gregex.c:674 +#: glib/gregex.c:735 msgid "name is too long in (*MARK), (*PRUNE), (*SKIP), or (*THEN)" msgstr "ime je predolgo v (*MARK), (*PRUNE), (*SKIP) ali (*THEN)" -#: glib/gregex.c:678 glib/gregex.c:809 +#: glib/gregex.c:739 glib/gregex.c:875 msgid "code overflow" msgstr "prekoračitev kode" -#: glib/gregex.c:682 +#: glib/gregex.c:743 msgid "unrecognized character after (?P" msgstr "neprepoznan znak za (?P" -#: glib/gregex.c:686 +#: glib/gregex.c:747 msgid "overran compiling workspace" msgstr "pretečena delovna površina prevajanja kode" -#: glib/gregex.c:690 +#: glib/gregex.c:751 msgid "previously-checked referenced subpattern not found" msgstr "predhodno preverjene povezave podrejenega vzorca ni mogoče najti" -#: glib/gregex.c:808 glib/gregex.c:1041 glib/gregex.c:2342 +#: glib/gregex.c:874 glib/gregex.c:1121 glib/gregex.c:2444 #, c-format msgid "Error while matching regular expression %s: %s" msgstr "Napaka med primerjanjem logičnega izraza %s: %s" -#: glib/gregex.c:1618 +#: glib/gregex.c:1721 msgid "PCRE library is compiled without UTF8 support" msgstr "Knjižnica PCRE je pretvorjena brez UTF-8 podpore" -#: glib/gregex.c:1626 +#: glib/gregex.c:1729 msgid "PCRE library is compiled with incompatible options" msgstr "Knjižnica PCRE je prevedena brez možnosti nezdružljivosti" -#: glib/gregex.c:1751 +#: glib/gregex.c:1847 #, c-format msgid "Error while compiling regular expression ‘%s’ at char %s: %s" msgstr "" "Prišlo je do napake med rpevajanjem logičnega izraza »%s« pri znaku %s: %s" -#: glib/gregex.c:2786 +#: glib/gregex.c:2887 msgid "hexadecimal digit or “}” expected" msgstr "šestnajstiško število ali pa manjka » } «" -#: glib/gregex.c:2802 +#: glib/gregex.c:2903 msgid "hexadecimal digit expected" msgstr "pričakovano šestnajstiško število" -#: glib/gregex.c:2842 +#: glib/gregex.c:2943 msgid "missing “<” in symbolic reference" msgstr "manjka znak » < « v simbolni povezavi" -#: glib/gregex.c:2851 +#: glib/gregex.c:2952 msgid "unfinished symbolic reference" msgstr "nedokončana simbolna povezava" -#: glib/gregex.c:2858 +#: glib/gregex.c:2959 msgid "zero-length symbolic reference" msgstr "simbolna povezava nične dolžine" -#: glib/gregex.c:2869 +#: glib/gregex.c:2970 msgid "digit expected" msgstr "pričakovano število" -#: glib/gregex.c:2887 +#: glib/gregex.c:2988 msgid "illegal symbolic reference" msgstr "neveljavna simbolna povezava" -#: glib/gregex.c:2950 +#: glib/gregex.c:3051 msgid "stray final “\\”" msgstr "obidi končna » \\ «" -#: glib/gregex.c:2954 +#: glib/gregex.c:3055 msgid "unknown escape sequence" msgstr "neznano ubežno zaporedje" -#: glib/gregex.c:2964 +#: glib/gregex.c:3065 #, c-format msgid "Error while parsing replacement text “%s” at char %lu: %s" msgstr "Napaka med razčlenjevanjem besedila zamenjave »%s« pri znaku %lu: %s" @@ -5837,96 +5846,101 @@ msgid "Text was empty (or contained only whitespace)" msgstr "Besedilo je bilo prazno (ali pa vsebuje le presledne znake)" -#: glib/gspawn.c:314 +#: glib/gspawn.c:319 #, c-format msgid "Failed to read data from child process (%s)" msgstr "Ni mogoče prebrati podatkov podrejenega procesa (%s)" -#: glib/gspawn.c:466 +#: glib/gspawn.c:471 #, c-format msgid "Unexpected error in reading data from a child process (%s)" msgstr "Nepričakovana napaka branja podatkov podrejenega opravila (%s)" -#: glib/gspawn.c:551 +#: glib/gspawn.c:556 #, c-format msgid "Unexpected error in waitpid() (%s)" msgstr "Nepričakovana napaka v waitpid() (%s)" -#: glib/gspawn.c:1170 glib/gspawn-win32.c:1488 +#: glib/gspawn.c:1175 glib/gspawn-win32.c:1503 #, c-format msgid "Child process exited with code %ld" msgstr "Podrejeni proces se je zaključil s kodo %ld" -#: glib/gspawn.c:1178 +#: glib/gspawn.c:1183 #, c-format msgid "Child process killed by signal %ld" msgstr "Podrejeni proces je uničen s signalom %ld" -#: glib/gspawn.c:1185 +#: glib/gspawn.c:1190 #, c-format msgid "Child process stopped by signal %ld" msgstr "Podrejeni proces se je ustavil s signalom %ld" -#: glib/gspawn.c:1192 +#: glib/gspawn.c:1197 #, c-format msgid "Child process exited abnormally" msgstr "Podrejeni proces se je zaključil nenaravno" -#: glib/gspawn.c:1885 glib/gspawn-win32.c:393 glib/gspawn-win32.c:401 +#: glib/gspawn.c:2027 glib/gspawn-win32.c:393 glib/gspawn-win32.c:401 #, c-format msgid "Failed to read from child pipe (%s)" msgstr "Ni mogoče prebrati iz cevi podrejenega procesa (%s)" -#: glib/gspawn.c:2248 +#: glib/gspawn.c:2399 #, c-format msgid "Failed to spawn child process “%s” (%s)" msgstr "Ni mogoče ustvariti podrejenega opravila »%s« (%s)" -#: glib/gspawn.c:2365 +#: glib/gspawn.c:2525 #, c-format msgid "Failed to fork (%s)" msgstr "Ni mogoča razvejitev (%s)" -#: glib/gspawn.c:2525 glib/gspawn-win32.c:424 +#: glib/gspawn.c:2685 glib/gspawn-win32.c:424 #, c-format msgid "Failed to change to directory “%s” (%s)" msgstr "Ni mogoče spremeniti v mapo »%s« (%s)" -#: glib/gspawn.c:2535 +#: glib/gspawn.c:2695 #, c-format msgid "Failed to execute child process “%s” (%s)" msgstr "Ni mogoče izvesti podrejenega opravila »%s« (%s)" -#: glib/gspawn.c:2545 +#: glib/gspawn.c:2705 #, c-format msgid "Failed to open file to remap file descriptor (%s)" msgstr "Ni mogoče odpreti datoteke za preslikavo opisnika datoteke (%s)" -#: glib/gspawn.c:2553 +#: glib/gspawn.c:2713 #, c-format msgid "Failed to duplicate file descriptor for child process (%s)" msgstr "Ni mogoče podvojiti opisnika datoteke podrejenega procesa (%s)" -#: glib/gspawn.c:2562 +#: glib/gspawn.c:2722 #, c-format msgid "Failed to fork child process (%s)" msgstr "Ni mogoče razvejiti podrejenega procesa (%s)" -#: glib/gspawn.c:2570 +#: glib/gspawn.c:2730 #, c-format msgid "Failed to close file descriptor for child process (%s)" msgstr "Ni mogoče zapreti opisnika datoteke podrejenega procesa (%s)" -#: glib/gspawn.c:2578 +#: glib/gspawn.c:2738 #, c-format msgid "Unknown error executing child process “%s”" msgstr "Neznana napaka med izvajanjem podrejenega opravila »%s«" -#: glib/gspawn.c:2602 +#: glib/gspawn.c:2762 #, c-format msgid "Failed to read enough data from child pid pipe (%s)" msgstr "Ni mogoče prebrati dovolj podatkov iz cevi podrejenega procesa (%s)" +#: glib/gspawn-private.h:134 +#, c-format +msgid "Invalid source FDs argument" +msgstr "Neveljaven argument FD vira" + #: glib/gspawn-win32.c:337 msgid "Failed to read data from child process" msgstr "Ni mogoče prebrati podatkov iz opravila podrejenega predmeta" @@ -5946,27 +5960,27 @@ msgid "Invalid program name: %s" msgstr "Neveljavno ime programa: %s" -#: glib/gspawn-win32.c:521 glib/gspawn-win32.c:853 +#: glib/gspawn-win32.c:521 glib/gspawn-win32.c:868 #, c-format msgid "Invalid string in argument vector at %d: %s" msgstr "Neveljaven niz v vektorju argumenta pri %d: %s" -#: glib/gspawn-win32.c:532 glib/gspawn-win32.c:869 +#: glib/gspawn-win32.c:532 glib/gspawn-win32.c:884 #, c-format msgid "Invalid string in environment: %s" msgstr "Neveljaven niz okolja: %s" -#: glib/gspawn-win32.c:849 +#: glib/gspawn-win32.c:864 #, c-format msgid "Invalid working directory: %s" msgstr "Neveljavna delovna mapa: %s" -#: glib/gspawn-win32.c:914 +#: glib/gspawn-win32.c:929 #, c-format msgid "Failed to execute helper program (%s)" msgstr "Napaka med izvajanjem pomožnega programa (%s)" -#: glib/gspawn-win32.c:1143 +#: glib/gspawn-win32.c:1158 msgid "" "Unexpected error in g_io_channel_win32_poll() reading data from a child " "process" @@ -5974,21 +5988,21 @@ "Nepričakovana napaka v g_io_channel_win32_poll() med branjem podatkov " "procesa podrejenega predmeta" -#: glib/gstrfuncs.c:3372 glib/gstrfuncs.c:3474 +#: glib/gstrfuncs.c:3370 glib/gstrfuncs.c:3472 msgid "Empty string is not a number" msgstr "Prazen niz ni številska vrednost" -#: glib/gstrfuncs.c:3396 +#: glib/gstrfuncs.c:3394 #, c-format msgid "“%s” is not a signed number" msgstr "»%s« ni podpisano število" -#: glib/gstrfuncs.c:3406 glib/gstrfuncs.c:3510 +#: glib/gstrfuncs.c:3404 glib/gstrfuncs.c:3508 #, c-format msgid "Number “%s” is out of bounds %s, %s" msgstr "Število »%s« je izven območja %s, %s" -#: glib/gstrfuncs.c:3500 +#: glib/gstrfuncs.c:3498 #, c-format msgid "“%s” is not an unsigned number" msgstr "»%s« ni nepodpisano število" @@ -6067,126 +6081,126 @@ msgstr "Znak izven območja za UTF-16" #. Translators: A unit symbol for size formatting, showing for example: "13.0 kB" -#: glib/gutils.c:2857 +#: glib/gutils.c:2966 msgid "kB" msgstr "kB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 MB" -#: glib/gutils.c:2859 +#: glib/gutils.c:2968 msgid "MB" msgstr "MB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 GB" -#: glib/gutils.c:2861 +#: glib/gutils.c:2970 msgid "GB" msgstr "GB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 TB" -#: glib/gutils.c:2863 +#: glib/gutils.c:2972 msgid "TB" msgstr "TB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 PB" -#: glib/gutils.c:2865 +#: glib/gutils.c:2974 msgid "PB" msgstr "PB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 EB" -#: glib/gutils.c:2867 +#: glib/gutils.c:2976 msgid "EB" msgstr "EB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 KiB" -#: glib/gutils.c:2871 +#: glib/gutils.c:2980 msgid "KiB" msgstr "KiB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 MiB" -#: glib/gutils.c:2873 +#: glib/gutils.c:2982 msgid "MiB" msgstr "MiB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 GiB" -#: glib/gutils.c:2875 +#: glib/gutils.c:2984 msgid "GiB" msgstr "GiB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 TiB" -#: glib/gutils.c:2877 +#: glib/gutils.c:2986 msgid "TiB" msgstr "TiB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 PiB" -#: glib/gutils.c:2879 +#: glib/gutils.c:2988 msgid "PiB" msgstr "PiB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 EiB" -#: glib/gutils.c:2881 +#: glib/gutils.c:2990 msgid "EiB" msgstr "EiB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 kb" -#: glib/gutils.c:2885 +#: glib/gutils.c:2994 msgid "kb" msgstr "kb" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Mb" -#: glib/gutils.c:2887 +#: glib/gutils.c:2996 msgid "Mb" msgstr "Mb" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Gb" -#: glib/gutils.c:2889 +#: glib/gutils.c:2998 msgid "Gb" msgstr "Gb" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Tb" -#: glib/gutils.c:2891 +#: glib/gutils.c:3000 msgid "Tb" msgstr "Tb" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Pb" -#: glib/gutils.c:2893 +#: glib/gutils.c:3002 msgid "Pb" msgstr "Pb" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Eb" -#: glib/gutils.c:2895 +#: glib/gutils.c:3004 msgid "Eb" msgstr "Eb" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Kib" -#: glib/gutils.c:2899 +#: glib/gutils.c:3008 msgid "Kib" msgstr "Kib" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Mib" -#: glib/gutils.c:2901 +#: glib/gutils.c:3010 msgid "Mib" msgstr "Mib" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Gib" -#: glib/gutils.c:2903 +#: glib/gutils.c:3012 msgid "Gib" msgstr "Gib" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Tib" -#: glib/gutils.c:2905 +#: glib/gutils.c:3014 msgid "Tib" msgstr "Tib" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Pib" -#: glib/gutils.c:2907 +#: glib/gutils.c:3016 msgid "Pib" msgstr "Pib" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Eib" -#: glib/gutils.c:2909 +#: glib/gutils.c:3018 msgid "Eib" msgstr "Eib" -#: glib/gutils.c:2947 +#: glib/gutils.c:3056 msgid "byte" msgid_plural "bytes" msgstr0 "bajtov" @@ -6194,7 +6208,7 @@ msgstr2 "bajta" msgstr3 "bajti" -#: glib/gutils.c:2951 +#: glib/gutils.c:3060 msgid "bit" msgid_plural "bits" msgstr0 "bitov" @@ -6204,7 +6218,7 @@ #. Translators: The "%u" is replaced with the size value, like "13"; it could #. * be part of "13 bytes", but only the number is requested this time. -#: glib/gutils.c:2959 +#: glib/gutils.c:3068 #, c-format msgctxt "format-size" msgid "%u" @@ -6212,7 +6226,7 @@ #. Translators: The first "%u" is replaced with the value, the "%s" with a unit of the value. #. * The order can be changed with "%$2s %$1u". An example: "13 bytes" -#: glib/gutils.c:2964 +#: glib/gutils.c:3073 #, c-format msgctxt "format-size" msgid "%u %s" @@ -6220,9 +6234,8 @@ #. Translators: The "%.1f" is replaced with the size value, like "13.0"; it could #. * be part of "13.0 MB", but only the number is requested this time. -#: glib/gutils.c:3000 +#: glib/gutils.c:3109 #, c-format -#| msgid "%.1f KB" msgctxt "format-size" msgid "%.1f" msgstr "%.1f" @@ -6230,15 +6243,14 @@ #. Translators: The first "%.1f" is replaced with the value, the "%s" with a unit of the value. #. * The order can be changed with "%$2s %$1.1f". Keep the no-break space between the value and #. * the unit symbol. An example: "13.0 MB" -#: glib/gutils.c:3006 +#: glib/gutils.c:3115 #, c-format -#| msgid "%.1f kB" msgctxt "format-size" msgid "%.1f %s" msgstr "%.1f %s" #. Translators: the %s in "%s bytes" will always be replaced by a number. -#: glib/gutils.c:3046 +#: glib/gutils.c:3155 #, c-format msgid "%s byte" msgid_plural "%s bytes" @@ -6248,7 +6260,7 @@ msgstr3 "%s bajti" #. Translators: the %s in "%s bits" will always be replaced by a number. -#: glib/gutils.c:3051 +#: glib/gutils.c:3160 #, c-format msgid "%s bit" msgid_plural "%s bits" @@ -6257,7 +6269,7 @@ msgstr2 "%s bita" msgstr3 "%s biti" -#: glib/gutils.c:3092 +#: glib/gutils.c:3201 #, c-format msgid "%u byte" msgid_plural "%u bytes" @@ -6271,32 +6283,32 @@ #. * compatibility. Users will not see this string unless a program is using this deprecated function. #. * Please translate as literally as possible. #. -#: glib/gutils.c:3105 +#: glib/gutils.c:3214 #, c-format msgid "%.1f KB" msgstr "%.1f KB" -#: glib/gutils.c:3110 +#: glib/gutils.c:3219 #, c-format msgid "%.1f MB" msgstr "%.1f MB" -#: glib/gutils.c:3115 +#: glib/gutils.c:3224 #, c-format msgid "%.1f GB" msgstr "%.1f GB" -#: glib/gutils.c:3120 +#: glib/gutils.c:3229 #, c-format msgid "%.1f TB" msgstr "%.1f TB" -#: glib/gutils.c:3125 +#: glib/gutils.c:3234 #, c-format msgid "%.1f PB" msgstr "%.1f PB" -#: glib/gutils.c:3130 +#: glib/gutils.c:3239 #, c-format msgid "%.1f EB" msgstr "%.1f EB"
View file
_service:tar_scm:glib-2.74.4.tar.xz/po/sr.po -> _service:tar_scm:glib-2.76.4.tar.xz/po/sr.po
Changed
@@ -13,38 +13,36 @@ msgstr "" "Project-Id-Version: 2.8\n" "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/glib/issues\n" -"POT-Creation-Date: 2022-10-16 12:25+0000\n" -"PO-Revision-Date: 2022-10-26 11:28+0200\n" -"Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n" +"POT-Creation-Date: 2023-02-16 03:30+0000\n" +"PO-Revision-Date: 2023-02-16 10:59+0100\n" +"Last-Translator: Марко М. Костић <marko.m.kostic@gmail.com>\n" "Language-Team: Serbian <српски <gnome-sr@googlegroups.org>>\n" "Language: sr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 : n" -"%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n" +"%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" "X-Project-Style: gnome\n" -"X-Generator: Gtranslator 3.36.0\n" +"X-Generator: Poedit 3.1.1\n" -#: gio/gappinfo.c:335 +#: gio/gappinfo.c:339 msgid "Setting default applications not supported yet" msgstr "Постављање основних програма још није подржано" -#: gio/gappinfo.c:368 +#: gio/gappinfo.c:372 msgid "Setting application as last used for type not supported yet" msgstr "" "Постављање програма као што је последњи пут коришћен за врсту није још " "подржано" -#: gio/gappinfo.c:810 +#: gio/gappinfo.c:814 #, c-format -#| msgid "No default applications for “%s”\n" msgid "Failed to find default application for content type ‘%s’" msgstr "Нисам успео да нађем основни програм за садржај врсте „%s“" -#: gio/gappinfo.c:870 +#: gio/gappinfo.c:874 #, c-format -#| msgid "No default applications for “%s”\n" msgid "Failed to find default application for URI Scheme ‘%s’" msgstr "Нисам успео да нађем основни програм за шему путање „%s“" @@ -245,11 +243,11 @@ msgid "error sending %s message to application: %s\n" msgstr "грешка слања %s поруке програму: %s\n" -#: gio/gapplication-tool.c:321 +#: gio/gapplication-tool.c:324 msgid "action name must be given after application id\n" msgstr "назив радње мора бити дат након иб-а програма\n" -#: gio/gapplication-tool.c:329 +#: gio/gapplication-tool.c:332 #, c-format msgid "" "invalid action name: “%s”\n" @@ -258,25 +256,25 @@ "неисправан назив радње: „%s“\n" "називи радњи морају да садрже само слова и бројеве, „-“ и „.“\n" -#: gio/gapplication-tool.c:348 +#: gio/gapplication-tool.c:351 #, c-format msgid "error parsing action parameter: %s\n" msgstr "грешка обраде параметра радње: %s\n" -#: gio/gapplication-tool.c:360 +#: gio/gapplication-tool.c:363 msgid "actions accept a maximum of one parameter\n" msgstr "радње прихватају највише један параметар\n" -#: gio/gapplication-tool.c:415 +#: gio/gapplication-tool.c:418 msgid "list-actions command takes only the application id" msgstr "наредба „list-actions“ прихвата само иб програма" -#: gio/gapplication-tool.c:425 +#: gio/gapplication-tool.c:428 #, c-format msgid "unable to find desktop file for application %s\n" msgstr "не могу да нађем датотеку радне површи за програм „%s“\n" -#: gio/gapplication-tool.c:470 +#: gio/gapplication-tool.c:473 #, c-format msgid "" "unrecognised command: %s\n" @@ -311,7 +309,7 @@ msgid "Truncate not supported on base stream" msgstr "Није подржано сасецање основног тока" -#: gio/gcancellable.c:319 gio/gdbusconnection.c:1859 gio/gdbusprivate.c:1420 +#: gio/gcancellable.c:326 gio/gdbusconnection.c:1859 gio/gdbusprivate.c:1420 #: gio/gsimpleasyncresult.c:873 gio/gsimpleasyncresult.c:899 #, c-format msgid "Operation was cancelled" @@ -331,13 +329,13 @@ #: gio/gcharsetconverter.c:344 gio/gdatainputstream.c:850 #: gio/gdatainputstream.c:1268 glib/gconvert.c:451 glib/gconvert.c:883 -#: glib/giochannel.c:1576 glib/giochannel.c:1618 glib/giochannel.c:2473 +#: glib/giochannel.c:1576 glib/giochannel.c:1618 glib/giochannel.c:2478 #: glib/gutf8.c:892 glib/gutf8.c:1346 msgid "Invalid byte sequence in conversion input" msgstr "Неисправан низ бајтова у улазу који претварам" #: gio/gcharsetconverter.c:349 glib/gconvert.c:459 glib/gconvert.c:797 -#: glib/giochannel.c:1583 glib/giochannel.c:2485 +#: glib/giochannel.c:1583 glib/giochannel.c:2493 #, c-format msgid "Error during conversion: %s" msgstr "Грешка приликом претварања: %s" @@ -394,17 +392,17 @@ msgid "Unexpected early end-of-stream" msgstr "Неочекиван, преран крај тока" -#: gio/gdbusaddress.c:164 gio/gdbusaddress.c:238 gio/gdbusaddress.c:327 +#: gio/gdbusaddress.c:162 gio/gdbusaddress.c:234 gio/gdbusaddress.c:321 #, c-format msgid "Unsupported key “%s” in address entry “%s”" msgstr "Кључ „%s“ није подржан унутар адресе „%s“" -#: gio/gdbusaddress.c:177 +#: gio/gdbusaddress.c:175 #, c-format msgid "Meaningless key/value pair combination in address entry “%s”" msgstr "Безначајна комбинација кључ/вредност унутар адресе „%s“" -#: gio/gdbusaddress.c:186 +#: gio/gdbusaddress.c:184 #, c-format msgid "" "Address “%s” is invalid (need exactly one of path, dir, tmpdir, or abstract " @@ -413,28 +411,28 @@ "Адреса „%s“ је неисправна (потребна само једна путања, директоријум, " "привремени директоријум или апстрактни кључ)" -#: gio/gdbusaddress.c:253 gio/gdbusaddress.c:264 gio/gdbusaddress.c:279 -#: gio/gdbusaddress.c:342 gio/gdbusaddress.c:353 +#: gio/gdbusaddress.c:249 gio/gdbusaddress.c:260 gio/gdbusaddress.c:275 +#: gio/gdbusaddress.c:336 gio/gdbusaddress.c:347 #, c-format msgid "Error in address “%s” — the “%s” attribute is malformed" msgstr "Грешка унутар адресе „%s“ — особина „%s“ није исправна" -#: gio/gdbusaddress.c:423 gio/gdbusaddress.c:682 +#: gio/gdbusaddress.c:417 gio/gdbusaddress.c:676 #, c-format msgid "Unknown or unsupported transport “%s” for address “%s”" msgstr "Непознати или неподржани пренос „%s“ за адресе „%s“" -#: gio/gdbusaddress.c:467 +#: gio/gdbusaddress.c:461 #, c-format msgid "Address element “%s” does not contain a colon (:)" msgstr "Елемент адресе „%s“ не садржи две тачке (:)" -#: gio/gdbusaddress.c:476 +#: gio/gdbusaddress.c:470 #, c-format msgid "Transport name in address element “%s” must not be empty" msgstr "Назив транспорта у елементу адресе „%s“ не сме бити празан" -#: gio/gdbusaddress.c:497 +#: gio/gdbusaddress.c:491 #, c-format msgid "" "Key/Value pair %d, “%s”, in address element “%s” does not contain an equal " @@ -442,7 +440,7 @@ msgstr "" "Пар кључ/вредност %d, „%s“, у елементу адресе „%s“ не садржи знак једнакости" -#: gio/gdbusaddress.c:508 +#: gio/gdbusaddress.c:502 #, c-format msgid "" "Key/Value pair %d, “%s”, in address element “%s” must not have an empty key" @@ -450,7 +448,7 @@ "Пар кључ/вредност %d, „%s“, у елементу адресе „%s“ не сме задржати празан " "кључ" -#: gio/gdbusaddress.c:522 +#: gio/gdbusaddress.c:516 #, c-format msgid "" "Error unescaping key or value in Key/Value pair %d, “%s”, in address element " @@ -459,7 +457,7 @@ "Грешка при неизбегавању кључа или вредности у пару Кључ/Вредности %d, „%s“, " "у елементу адресе „%s“" -#: gio/gdbusaddress.c:590 +#: gio/gdbusaddress.c:584 #, c-format msgid "" "Error in address “%s” — the unix transport requires exactly one of the keys " @@ -468,84 +466,84 @@ "Грешка у адреси „%s“ — Јуниксов пренос захтева постављање кључа " "„path“ (путања) или „abstract“ (резиме)" -#: gio/gdbusaddress.c:625 +#: gio/gdbusaddress.c:619 #, c-format msgid "Error in address “%s” — the host attribute is missing or malformed" msgstr "" "Грешка унутар адресе „%s“ — атрибут домаћина недостаје или је неисправан" -#: gio/gdbusaddress.c:639 +#: gio/gdbusaddress.c:633 #, c-format msgid "Error in address “%s” — the port attribute is missing or malformed" msgstr "Грешка унутар адресе „%s“ — порт недостаје или је неисправан" -#: gio/gdbusaddress.c:653 +#: gio/gdbusaddress.c:647 #, c-format msgid "Error in address “%s” — the noncefile attribute is missing or malformed" msgstr "" "Грешка унутар адресе „%s“ — атрибут датотеке једнократних случајних бројева " "недостаје или је неисправан" -#: gio/gdbusaddress.c:674 +#: gio/gdbusaddress.c:668 msgid "Error auto-launching: " msgstr "Грешка у самопокретању: " -#: gio/gdbusaddress.c:727 +#: gio/gdbusaddress.c:721 #, c-format msgid "Error opening nonce file “%s”: %s" msgstr "" "Грешка приликом отварања датотеке једнократних случајних бројева „%s“: %s" -#: gio/gdbusaddress.c:746 +#: gio/gdbusaddress.c:740 #, c-format msgid "Error reading from nonce file “%s”: %s" msgstr "Грешка при читању датотеке једнократних случајних бројева „%s“: %s" -#: gio/gdbusaddress.c:755 +#: gio/gdbusaddress.c:749 #, c-format msgid "Error reading from nonce file “%s”, expected 16 bytes, got %d" msgstr "" "Грешка при читању датотеке једнократних случајних бројева „%s“, очекивано 16 " "бајтова, а добијено %d" -#: gio/gdbusaddress.c:773 +#: gio/gdbusaddress.c:767 #, c-format msgid "Error writing contents of nonce file “%s” to stream:" msgstr "" "Грешка приликом уписа садржаја датотеке једнократних случајних бројева „%s“ " "у ток:" -#: gio/gdbusaddress.c:988 +#: gio/gdbusaddress.c:982 msgid "The given address is empty" msgstr "Дата адреса је празна" -#: gio/gdbusaddress.c:1101 +#: gio/gdbusaddress.c:1095 #, c-format msgid "Cannot spawn a message bus when AT_SECURE is set" msgstr "Не могу да изродим магистралу поруке када је постављено „AT_SECURE“" -#: gio/gdbusaddress.c:1108 +#: gio/gdbusaddress.c:1102 msgid "Cannot spawn a message bus without a machine-id: " msgstr "Не могу да покренем магистралу порука без идентификације машине: " -#: gio/gdbusaddress.c:1115 +#: gio/gdbusaddress.c:1109 #, c-format msgid "Cannot autolaunch D-Bus without X11 $DISPLAY" msgstr "Не могу да самопокренем Д-сабирницу без „X11 $DISPLAY“" -#: gio/gdbusaddress.c:1157 +#: gio/gdbusaddress.c:1151 #, c-format msgid "Error spawning command line “%s”: " msgstr "Грешка при покретању наредбе „%s“: " -#: gio/gdbusaddress.c:1226 +#: gio/gdbusaddress.c:1220 #, c-format msgid "Cannot determine session bus address (not implemented for this OS)" msgstr "" "Не могу да одредим адресу магистрале сесије (није направљено за овај " "оперативни систем)" -#: gio/gdbusaddress.c:1375 gio/gdbusconnection.c:7321 +#: gio/gdbusaddress.c:1374 gio/gdbusconnection.c:7316 #, c-format msgid "" "Cannot determine bus address from DBUS_STARTER_BUS_TYPE environment variable " @@ -554,7 +552,7 @@ "Не могу да одредим адресу магистрале сесије из променљиве окружења " "DBUS_STARTER_BUS_TYPE — непозната вредност „%s“" -#: gio/gdbusaddress.c:1384 gio/gdbusconnection.c:7330 +#: gio/gdbusaddress.c:1383 gio/gdbusconnection.c:7325 msgid "" "Cannot determine bus address because the DBUS_STARTER_BUS_TYPE environment " "variable is not set" @@ -562,7 +560,7 @@ "Не могу да одредим адресу магистрале сесије јер није постављена променљива " "окружења DBUS_STARTER_BUS_TYPE" -#: gio/gdbusaddress.c:1394 +#: gio/gdbusaddress.c:1393 #, c-format msgid "Unknown bus type %d" msgstr "Непознат тип магистрале %d" @@ -583,11 +581,15 @@ "Истрошени су сви доступни механизми пријављивања (покушано: %s) (доступно: " "%s)" -#: gio/gdbusauth.c:1178 +#: gio/gdbusauth.c:1045 +msgid "Unexpected lack of content trying to read a byte" +msgstr "Неочекивани недостатак садржаја при читању бајта" + +#: gio/gdbusauth.c:1195 msgid "User IDs must be the same for peer and server" msgstr "Кориснички ИБ-ови морају бити исти и за парњака и за сервер" -#: gio/gdbusauth.c:1190 +#: gio/gdbusauth.c:1207 msgid "Cancelled via GDBusAuthObserver::authorize-authenticated-peer" msgstr "Поништено преко GDBusAuthObserver::authorize-authenticated-peer" @@ -679,7 +681,7 @@ msgid "(Additionally, releasing the lock for “%s” also failed: %s) " msgstr "(Додатно, отпуштање кључа са „%s“ такође није успело: %s) " -#: gio/gdbusconnection.c:590 gio/gdbusconnection.c:2404 +#: gio/gdbusconnection.c:590 gio/gdbusconnection.c:2405 msgid "The connection is closed" msgstr "Веза је затворена" @@ -687,118 +689,118 @@ msgid "Timeout was reached" msgstr "Време је истекло" -#: gio/gdbusconnection.c:2527 +#: gio/gdbusconnection.c:2528 msgid "" "Unsupported flags encountered when constructing a client-side connection" msgstr "Наишао сам на неподржане ознаке при изградњи клијентског дела везе" -#: gio/gdbusconnection.c:4256 gio/gdbusconnection.c:4610 +#: gio/gdbusconnection.c:4257 gio/gdbusconnection.c:4611 #, c-format msgid "" "No such interface “org.freedesktop.DBus.Properties” on object at path %s" msgstr "" "Нема интерфејса „org.freedesktop.DBus.Properties“ у објекту на путањи %s" -#: gio/gdbusconnection.c:4401 +#: gio/gdbusconnection.c:4402 #, c-format msgid "No such property “%s”" msgstr "Нема особине „%s“" -#: gio/gdbusconnection.c:4413 +#: gio/gdbusconnection.c:4414 #, c-format msgid "Property “%s” is not readable" msgstr "Особина „%s“ није читљива" -#: gio/gdbusconnection.c:4424 +#: gio/gdbusconnection.c:4425 #, c-format msgid "Property “%s” is not writable" msgstr "Није могуће писање особине „%s“" -#: gio/gdbusconnection.c:4444 +#: gio/gdbusconnection.c:4445 #, c-format msgid "Error setting property “%s”: Expected type “%s” but got “%s”" msgstr "" "Грешка при постављању особине „%s“: Очекивани тип је био „%s“, а добијен је " "„%s“" -#: gio/gdbusconnection.c:4549 gio/gdbusconnection.c:4764 -#: gio/gdbusconnection.c:6747 +#: gio/gdbusconnection.c:4550 gio/gdbusconnection.c:4765 +#: gio/gdbusconnection.c:6742 #, c-format msgid "No such interface “%s”" msgstr "Нема таквог интерфејса „%s“" -#: gio/gdbusconnection.c:4986 gio/gdbusconnection.c:7261 +#: gio/gdbusconnection.c:4981 gio/gdbusconnection.c:7256 #, c-format msgid "No such interface “%s” on object at path %s" msgstr "Нема таквог интерфејса „%s“ у објекту на путањи %s" -#: gio/gdbusconnection.c:5087 +#: gio/gdbusconnection.c:5082 #, c-format msgid "No such method “%s”" msgstr "Нема таквог метода „%s“" -#: gio/gdbusconnection.c:5118 +#: gio/gdbusconnection.c:5113 #, c-format msgid "Type of message, “%s”, does not match expected type “%s”" msgstr "Тип поруке, „%s“, не одговара очекиваном типу „%s“" -#: gio/gdbusconnection.c:5321 +#: gio/gdbusconnection.c:5316 #, c-format msgid "An object is already exported for the interface %s at %s" msgstr "Објекат је већ извезен за интерфејс %s на %s" -#: gio/gdbusconnection.c:5548 +#: gio/gdbusconnection.c:5543 #, c-format msgid "Unable to retrieve property %s.%s" msgstr "Не могу да добијем особину %s.%s" -#: gio/gdbusconnection.c:5604 +#: gio/gdbusconnection.c:5599 #, c-format msgid "Unable to set property %s.%s" msgstr "Не могу да поставим особину %s.%s" -#: gio/gdbusconnection.c:5783 +#: gio/gdbusconnection.c:5778 #, c-format msgid "Method “%s” returned type “%s”, but expected “%s”" msgstr "Метод „%s“ је вратио тип „%s“, али је био очекиван „%s“" -#: gio/gdbusconnection.c:6859 +#: gio/gdbusconnection.c:6854 #, c-format msgid "Method “%s” on interface “%s” with signature “%s” does not exist" msgstr "Метод „%s“ на интерфејсу „%s“ са потписом „%s“ не постоји" -#: gio/gdbusconnection.c:6980 +#: gio/gdbusconnection.c:6975 #, c-format msgid "A subtree is already exported for %s" msgstr "Поддрво је већ извезено за %s" -#: gio/gdbusconnection.c:7269 +#: gio/gdbusconnection.c:7264 #, c-format msgid "Object does not exist at path “%s”" msgstr "Објекат не постоји у путањи „%s“" -#: gio/gdbusmessage.c:1303 +#: gio/gdbusmessage.c:1306 msgid "type is INVALID" msgstr "врста је НЕИСПРАВНА" -#: gio/gdbusmessage.c:1314 +#: gio/gdbusmessage.c:1317 msgid "METHOD_CALL message: PATH or MEMBER header field is missing" msgstr "Порука ПОЗИВА_МЕТОДА: недостају поља заглавља ПУТАЊА или ЧЛАН" -#: gio/gdbusmessage.c:1325 +#: gio/gdbusmessage.c:1328 msgid "METHOD_RETURN message: REPLY_SERIAL header field is missing" msgstr "Порука РЕЗУЛТАТ_МЕТОДА: недостаје поље заглавља ОДГОВОРИ_СЕРИЈСКИ" -#: gio/gdbusmessage.c:1337 +#: gio/gdbusmessage.c:1340 msgid "ERROR message: REPLY_SERIAL or ERROR_NAME header field is missing" msgstr "" "Порука ГРЕШКЕ: недостају поља заглавља ОДГОВОРИ_СЕРИЈСКИ или НАЗИВ_ГРЕШКЕ" -#: gio/gdbusmessage.c:1350 +#: gio/gdbusmessage.c:1353 msgid "SIGNAL message: PATH, INTERFACE or MEMBER header field is missing" msgstr "Порука СИГНАЛА: недостају поља заглавља ПУТАЊА, СУЧЕЉЕ или ЧЛАН" -#: gio/gdbusmessage.c:1358 +#: gio/gdbusmessage.c:1361 msgid "" "SIGNAL message: The PATH header field is using the reserved value /org/" "freedesktop/DBus/Local" @@ -806,7 +808,7 @@ "Порука СИГНАЛА: поље заглавља ПУТАЊА користи резервисану вредност „/org/" "freedesktop/DBus/Local“" -#: gio/gdbusmessage.c:1366 +#: gio/gdbusmessage.c:1369 msgid "" "SIGNAL message: The INTERFACE header field is using the reserved value org." "freedesktop.DBus.Local" @@ -814,7 +816,7 @@ "Порука СИГНАЛА: поље заглавља СУЧЕЉЕ користи резервисану вредност „org." "freedesktop.DBus.Local“" -#: gio/gdbusmessage.c:1414 gio/gdbusmessage.c:1474 +#: gio/gdbusmessage.c:1417 gio/gdbusmessage.c:1477 #, c-format msgid "Wanted to read %lu byte but only got %lu" msgid_plural "Wanted to read %lu bytes but only got %lu" @@ -823,12 +825,12 @@ msgstr2 "Покушах да читам %lu бајтова, али добих само %lu" msgstr3 "Покушах да читам један бајт, али добих само %lu" -#: gio/gdbusmessage.c:1428 +#: gio/gdbusmessage.c:1431 #, c-format msgid "Expected NUL byte after the string “%s” but found byte %d" msgstr "Очекивао сам NUL бајт после ниске „%s“, али сам нашао бајт %d" -#: gio/gdbusmessage.c:1447 +#: gio/gdbusmessage.c:1450 #, c-format msgid "" "Expected valid UTF-8 string but found invalid bytes at byte offset %d " @@ -837,21 +839,21 @@ "Очекивах исправну УТФ-8 ниску, али нађох неисправне бајтове на бајт померају " "%d (дужина ниске је %d). Исправна ниска до тог дела је била „%s“" -#: gio/gdbusmessage.c:1511 gio/gdbusmessage.c:1787 gio/gdbusmessage.c:1998 +#: gio/gdbusmessage.c:1514 gio/gdbusmessage.c:1790 gio/gdbusmessage.c:2001 msgid "Value nested too deeply" msgstr "Вредност је угнеждена предубоко" -#: gio/gdbusmessage.c:1679 +#: gio/gdbusmessage.c:1682 #, c-format msgid "Parsed value “%s” is not a valid D-Bus object path" msgstr "Рашчлањена вредност „%s“ није исправна путања објекта Д-магистрале" -#: gio/gdbusmessage.c:1703 +#: gio/gdbusmessage.c:1706 #, c-format msgid "Parsed value “%s” is not a valid D-Bus signature" msgstr "Рашчлањена вредност „%s“ није исправан потпис Д-магистрале" -#: gio/gdbusmessage.c:1754 +#: gio/gdbusmessage.c:1757 #, c-format msgid "" "Encountered array of length %u byte. Maximum length is 2<<26 bytes (64 MiB)." @@ -868,7 +870,7 @@ "Наишао сам на низ дужине једног бајта. Највећа дужина је 2<<26 бајтова (64 " "MiB)." -#: gio/gdbusmessage.c:1774 +#: gio/gdbusmessage.c:1777 #, c-format msgid "" "Encountered array of type “a%c”, expected to have a length a multiple of %u " @@ -877,17 +879,17 @@ "Наиђох на низ врсте „a%c“, очекивах да је дужина умножак од %u бајта, али " "нађох да је дуг %u бајта" -#: gio/gdbusmessage.c:1928 gio/gdbusmessage.c:2647 +#: gio/gdbusmessage.c:1931 gio/gdbusmessage.c:2650 msgid "Empty structures (tuples) are not allowed in D-Bus" msgstr "Празне структуре (н-торке) нису дозвољене у Д-сабирници" -#: gio/gdbusmessage.c:1982 +#: gio/gdbusmessage.c:1985 #, c-format msgid "Parsed value “%s” for variant is not a valid D-Bus signature" msgstr "" "Рашчлањена вредност „%s“ за варијанту није исправан потпис Д-магистрале" -#: gio/gdbusmessage.c:2023 +#: gio/gdbusmessage.c:2026 #, c-format msgid "" "Error deserializing GVariant with type string “%s” from the D-Bus wire format" @@ -895,7 +897,7 @@ "Грешка при десеријализацији Гваријанта са ниском врсте „%s“ из жичаног " "формата Д-магистрале" -#: gio/gdbusmessage.c:2208 +#: gio/gdbusmessage.c:2211 #, c-format msgid "" "Invalid endianness value. Expected 0x6c (“l”) or 0x42 (“B”) but found value " @@ -904,27 +906,27 @@ "Неисправна вредност за крајњост. Очекивао сам 0x6c („l“) или 0x42 („Bд) али " "сам нашао вредност 0x%02x" -#: gio/gdbusmessage.c:2227 +#: gio/gdbusmessage.c:2230 #, c-format msgid "Invalid major protocol version. Expected 1 but found %d" msgstr "Неисправна главно издање протокола. Очекивано 1, али нађено %d" -#: gio/gdbusmessage.c:2285 gio/gdbusmessage.c:2883 +#: gio/gdbusmessage.c:2288 gio/gdbusmessage.c:2886 msgid "Signature header found but is not of type signature" msgstr "Потпис заглавља је пронађен али он није врсте потпис" -#: gio/gdbusmessage.c:2297 +#: gio/gdbusmessage.c:2300 #, c-format msgid "Signature header with signature “%s” found but message body is empty" msgstr "Потпис заглавља са потписом „%s“ је нађен, али је тело поруке празно" -#: gio/gdbusmessage.c:2312 +#: gio/gdbusmessage.c:2315 #, c-format msgid "Parsed value “%s” is not a valid D-Bus signature (for body)" msgstr "" "Рашчлањена вредност „%s“ није исправан потпис Д-магистрале (за тело поруке)" -#: gio/gdbusmessage.c:2344 +#: gio/gdbusmessage.c:2347 #, 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" @@ -933,11 +935,11 @@ msgstr2 "Нема заглавља потписа у поруци, али тело поруке има %u бајтова" msgstr3 "Нема заглавља потписа у поруци, али тело поруке има један бајт" -#: gio/gdbusmessage.c:2354 +#: gio/gdbusmessage.c:2357 msgid "Cannot deserialize message: " msgstr "Не могу да десеријализујем поруку: " -#: gio/gdbusmessage.c:2700 +#: gio/gdbusmessage.c:2703 #, c-format msgid "" "Error serializing GVariant with type string “%s” to the D-Bus wire format" @@ -945,40 +947,40 @@ "Грешка при серијализацији Гваријанта са ниском врсте „%s“ из жичаног формата " "Д-магистрале" -#: gio/gdbusmessage.c:2837 +#: gio/gdbusmessage.c:2840 #, c-format msgid "" "Number of file descriptors in message (%d) differs from header field (%d)" msgstr "" "Број описника датотеке у поруци (%d) се разликује од заглавља поља (%d)" -#: gio/gdbusmessage.c:2845 +#: gio/gdbusmessage.c:2848 msgid "Cannot serialize message: " msgstr "Не могу да серијализујем поруку: " -#: gio/gdbusmessage.c:2898 +#: gio/gdbusmessage.c:2901 #, c-format msgid "Message body has signature “%s” but there is no signature header" msgstr "Тело поруке има потпис „%s“, али недостаје заглавље потписа" -#: gio/gdbusmessage.c:2908 +#: gio/gdbusmessage.c:2911 #, c-format msgid "" "Message body has type signature “%s” but signature in the header field is " "“%s”" msgstr "Тело поруке има тип потписа „%s“, али потпис у пољу заглавља је „%s“" -#: gio/gdbusmessage.c:2924 +#: gio/gdbusmessage.c:2927 #, c-format msgid "Message body is empty but signature in the header field is “(%s)”" msgstr "Тело поруке је празно,,, али је потпис у пољу заглавља „(%s)“" -#: gio/gdbusmessage.c:3479 +#: gio/gdbusmessage.c:3482 #, c-format msgid "Error return with body of type “%s”" msgstr "Добијена је грешка са телом поруке типа „%s“" -#: gio/gdbusmessage.c:3487 +#: gio/gdbusmessage.c:3490 msgid "Error return with empty body" msgstr "Добијена је грешка са празним телом поруке" @@ -1003,17 +1005,17 @@ msgid "Unable to load %s or %s: " msgstr "Не могу да учитам „%s“ или „%s“: " -#: gio/gdbusproxy.c:1575 +#: gio/gdbusproxy.c:1568 #, c-format msgid "Error calling StartServiceByName for %s: " msgstr "Грешка при позиву покрени услугу према називу за %s: " -#: gio/gdbusproxy.c:1598 +#: gio/gdbusproxy.c:1591 #, c-format msgid "Unexpected reply %d from StartServiceByName(\"%s\") method" msgstr "Неочекиван одговор %d од StartServiceByName(„%s“) метода" -#: gio/gdbusproxy.c:2709 gio/gdbusproxy.c:2844 +#: gio/gdbusproxy.c:2702 gio/gdbusproxy.c:2837 #, c-format msgid "" "Cannot invoke method; proxy is for the well-known name %s without an owner, " @@ -1022,28 +1024,28 @@ "Не могу да позовем метод; посредник је за добро знани назив „%s“ без " "власника, а направљен је без G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START заставице" -#: gio/gdbusserver.c:765 +#: gio/gdbusserver.c:758 msgid "Abstract namespace not supported" msgstr "Апстрактни именски простор није подржан" -#: gio/gdbusserver.c:857 +#: gio/gdbusserver.c:850 msgid "Cannot specify nonce file when creating a server" msgstr "" "Не могу да наведем датотеку једнократних случајних бројева при повезивању са " "сервером" -#: gio/gdbusserver.c:939 +#: gio/gdbusserver.c:932 #, c-format msgid "Error writing nonce file at “%s”: %s" msgstr "" "Грешка приликом уписа датотеке једнократних случајних бројева на „%s“: %s" -#: gio/gdbusserver.c:1114 +#: gio/gdbusserver.c:1107 #, c-format msgid "The string “%s” is not a valid D-Bus GUID" msgstr "Ниска „%s“ није исправни ГЈИБ Д-сабирнице" -#: gio/gdbusserver.c:1152 +#: gio/gdbusserver.c:1145 #, c-format msgid "Cannot listen on unsupported transport “%s”" msgstr "Не могу да слушам на неподржаном преносном механизму „%s“" @@ -1071,14 +1073,14 @@ "\n" "Користите „%s НАРЕДБА --help“ да добијете помоћ за појединачне наредбе.\n" -#: gio/gdbus-tool.c:204 gio/gdbus-tool.c:276 gio/gdbus-tool.c:348 -#: gio/gdbus-tool.c:372 gio/gdbus-tool.c:862 gio/gdbus-tool.c:1247 -#: gio/gdbus-tool.c:1734 +#: gio/gdbus-tool.c:204 gio/gdbus-tool.c:276 gio/gdbus-tool.c:347 +#: gio/gdbus-tool.c:371 gio/gdbus-tool.c:861 gio/gdbus-tool.c:1246 +#: gio/gdbus-tool.c:1733 #, c-format msgid "Error: %s\n" msgstr "Грешка: %s\n" -#: gio/gdbus-tool.c:215 gio/gdbus-tool.c:289 gio/gdbus-tool.c:1750 +#: gio/gdbus-tool.c:215 gio/gdbus-tool.c:289 gio/gdbus-tool.c:1749 #, c-format msgid "Error parsing introspection XML: %s\n" msgstr "Грешка при рашчлањивању XML-а добијеног испитивањем: %s\n" @@ -1088,50 +1090,50 @@ msgid "Error: %s is not a valid name\n" msgstr "Грешка: „%s“ није исправан назив\n" -#: gio/gdbus-tool.c:258 gio/gdbus-tool.c:748 gio/gdbus-tool.c:1066 -#: gio/gdbus-tool.c:1900 gio/gdbus-tool.c:2140 +#: gio/gdbus-tool.c:258 gio/gdbus-tool.c:747 gio/gdbus-tool.c:1065 +#: gio/gdbus-tool.c:1899 gio/gdbus-tool.c:2139 #, c-format msgid "Error: %s is not a valid object path\n" msgstr "Грешка: %s није исправна путања до објеката\n" -#: gio/gdbus-tool.c:406 +#: gio/gdbus-tool.c:405 msgid "Connect to the system bus" msgstr "Повезивање на системску магистрали" -#: gio/gdbus-tool.c:407 +#: gio/gdbus-tool.c:406 msgid "Connect to the session bus" msgstr "Повезивање на магистралу сесије" -#: gio/gdbus-tool.c:408 +#: gio/gdbus-tool.c:407 msgid "Connect to given D-Bus address" msgstr "Повезивање на задату Д-бас адресу" -#: gio/gdbus-tool.c:418 +#: gio/gdbus-tool.c:417 msgid "Connection Endpoint Options:" msgstr "Опције крајње тачке везе:" -#: gio/gdbus-tool.c:419 +#: gio/gdbus-tool.c:418 msgid "Options specifying the connection endpoint" msgstr "Опције које одређују крајњу тачку везе" -#: gio/gdbus-tool.c:442 +#: gio/gdbus-tool.c:441 #, c-format msgid "No connection endpoint specified" msgstr "Није наведена крајња тачка везе" -#: gio/gdbus-tool.c:452 +#: gio/gdbus-tool.c:451 #, c-format msgid "Multiple connection endpoints specified" msgstr "Наведено више крајњих тачака везе" -#: gio/gdbus-tool.c:525 +#: gio/gdbus-tool.c:524 #, c-format msgid "" "Warning: According to introspection data, interface “%s” does not exist\n" msgstr "" "Упозорење: Према подацима добијеним испитивањем, интерфејс „%s“ не постоји\n" -#: gio/gdbus-tool.c:534 +#: gio/gdbus-tool.c:533 #, c-format msgid "" "Warning: According to introspection data, method “%s” does not exist on " @@ -1140,164 +1142,164 @@ "Упозорење: Према подацима добијеним испитивањем, метод „%s“ не постоји на " "интерфејсу „%s“\n" -#: gio/gdbus-tool.c:596 +#: gio/gdbus-tool.c:595 msgid "Optional destination for signal (unique name)" msgstr "Опционална дестинација сигнала (јединствено име)" -#: gio/gdbus-tool.c:597 +#: gio/gdbus-tool.c:596 msgid "Object path to emit signal on" msgstr "Путања објекта за емитовање сигнала" -#: gio/gdbus-tool.c:598 +#: gio/gdbus-tool.c:597 msgid "Signal and interface name" msgstr "Назив сигнала и сучеља" -#: gio/gdbus-tool.c:631 +#: gio/gdbus-tool.c:630 msgid "Emit a signal." msgstr "Емитује сигнал." -#: gio/gdbus-tool.c:686 gio/gdbus-tool.c:1003 gio/gdbus-tool.c:1837 -#: gio/gdbus-tool.c:2069 gio/gdbus-tool.c:2289 +#: gio/gdbus-tool.c:685 gio/gdbus-tool.c:1002 gio/gdbus-tool.c:1836 +#: gio/gdbus-tool.c:2068 gio/gdbus-tool.c:2288 #, c-format msgid "Error connecting: %s\n" msgstr "Грешка у повезивању: %s\n" -#: gio/gdbus-tool.c:706 +#: gio/gdbus-tool.c:705 #, c-format msgid "Error: %s is not a valid unique bus name.\n" msgstr "Грешка: „%s“ није исправан назив јединствене магистрале.\n" -#: gio/gdbus-tool.c:725 gio/gdbus-tool.c:1046 gio/gdbus-tool.c:1880 +#: gio/gdbus-tool.c:724 gio/gdbus-tool.c:1045 gio/gdbus-tool.c:1879 msgid "Error: Object path is not specified\n" msgstr "Грешка: Није изабрана путања до објекта\n" -#: gio/gdbus-tool.c:768 +#: gio/gdbus-tool.c:767 msgid "Error: Signal name is not specified\n" msgstr "Грешка: Име сигнала није одређено\n" -#: gio/gdbus-tool.c:782 +#: gio/gdbus-tool.c:781 #, c-format msgid "Error: Signal name “%s” is invalid\n" msgstr "Грешка: Име сигнала „%s“ није одређено\n" -#: gio/gdbus-tool.c:794 +#: gio/gdbus-tool.c:793 #, c-format msgid "Error: %s is not a valid interface name\n" msgstr "Грешка: „%s“ није исправан назив сучеља\n" -#: gio/gdbus-tool.c:800 +#: gio/gdbus-tool.c:799 #, c-format msgid "Error: %s is not a valid member name\n" msgstr "Грешка: „%s“ није исправан назив члана\n" #. Use the original non-"parse-me-harder" error -#: gio/gdbus-tool.c:837 gio/gdbus-tool.c:1178 +#: gio/gdbus-tool.c:836 gio/gdbus-tool.c:1177 #, c-format msgid "Error parsing parameter %d: %s\n" msgstr "Грешка при обради параметра %d: %s\n" -#: gio/gdbus-tool.c:869 +#: gio/gdbus-tool.c:868 #, c-format msgid "Error flushing connection: %s\n" msgstr "Грешка испирања везе: %s\n" -#: gio/gdbus-tool.c:897 +#: gio/gdbus-tool.c:896 msgid "Destination name to invoke method on" msgstr "Назив одредишта на коме треба позвати метод" -#: gio/gdbus-tool.c:898 +#: gio/gdbus-tool.c:897 msgid "Object path to invoke method on" msgstr "Путања објекта на коме треба позвати метод" -#: gio/gdbus-tool.c:899 +#: gio/gdbus-tool.c:898 msgid "Method and interface name" msgstr "Име метода и интерфејса" -#: gio/gdbus-tool.c:900 +#: gio/gdbus-tool.c:899 msgid "Timeout in seconds" msgstr "Време истека у секундама" -#: gio/gdbus-tool.c:901 +#: gio/gdbus-tool.c:900 msgid "Allow interactive authorization" msgstr "Дозвољава међудејствено овлашћивање" -#: gio/gdbus-tool.c:948 +#: gio/gdbus-tool.c:947 msgid "Invoke a method on a remote object." msgstr "Позивање метода на удаљеном објекту." -#: gio/gdbus-tool.c:1020 gio/gdbus-tool.c:1854 gio/gdbus-tool.c:2094 +#: gio/gdbus-tool.c:1019 gio/gdbus-tool.c:1853 gio/gdbus-tool.c:2093 msgid "Error: Destination is not specified\n" msgstr "Грешка: Није изабрано одредиште\n" -#: gio/gdbus-tool.c:1031 gio/gdbus-tool.c:1871 gio/gdbus-tool.c:2105 +#: gio/gdbus-tool.c:1030 gio/gdbus-tool.c:1870 gio/gdbus-tool.c:2104 #, c-format msgid "Error: %s is not a valid bus name\n" msgstr "Грешка: „%s“ није исправан назив магистрале\n" -#: gio/gdbus-tool.c:1081 +#: gio/gdbus-tool.c:1080 msgid "Error: Method name is not specified\n" msgstr "Грешка: Име начина није одређено\n" -#: gio/gdbus-tool.c:1092 +#: gio/gdbus-tool.c:1091 #, c-format msgid "Error: Method name “%s” is invalid\n" msgstr "Грешка: Име начина „%s“ није одређено\n" -#: gio/gdbus-tool.c:1170 +#: gio/gdbus-tool.c:1169 #, c-format msgid "Error parsing parameter %d of type “%s”: %s\n" msgstr "Грешка при обради параметра %d врсте „%s“: %s\n" -#: gio/gdbus-tool.c:1196 +#: gio/gdbus-tool.c:1195 #, c-format msgid "Error adding handle %d: %s\n" msgstr "Грешка додавања ручке %d: %s\n" -#: gio/gdbus-tool.c:1696 +#: gio/gdbus-tool.c:1695 msgid "Destination name to introspect" msgstr "Назив одредишта за испитивање" -#: gio/gdbus-tool.c:1697 +#: gio/gdbus-tool.c:1696 msgid "Object path to introspect" msgstr "Путања објекта за испитивање" -#: gio/gdbus-tool.c:1698 +#: gio/gdbus-tool.c:1697 msgid "Print XML" msgstr "Штампа ИксМЛ" -#: gio/gdbus-tool.c:1699 +#: gio/gdbus-tool.c:1698 msgid "Introspect children" msgstr "Преиспитује чланове" -#: gio/gdbus-tool.c:1700 +#: gio/gdbus-tool.c:1699 msgid "Only print properties" msgstr "Само штампа својства" -#: gio/gdbus-tool.c:1789 +#: gio/gdbus-tool.c:1788 msgid "Introspect a remote object." msgstr "Испитајте удаљени објекат." -#: gio/gdbus-tool.c:1995 +#: gio/gdbus-tool.c:1994 msgid "Destination name to monitor" msgstr "Назив одредишта за надгледање" -#: gio/gdbus-tool.c:1996 +#: gio/gdbus-tool.c:1995 msgid "Object path to monitor" msgstr "Путања објекта за надгледање" -#: gio/gdbus-tool.c:2021 +#: gio/gdbus-tool.c:2020 msgid "Monitor a remote object." msgstr "Надгледање удаљеног објекта." -#: gio/gdbus-tool.c:2079 +#: gio/gdbus-tool.c:2078 msgid "Error: can’t monitor a non-message-bus connection\n" msgstr "Грешка: не могу да надгледам везу на сабирници која није за поруке\n" -#: gio/gdbus-tool.c:2203 +#: gio/gdbus-tool.c:2202 msgid "Service to activate before waiting for the other one (well-known name)" msgstr "Услуга за активирање пре чекања на другу (добро знан назив)" -#: gio/gdbus-tool.c:2206 +#: gio/gdbus-tool.c:2205 msgid "" "Timeout to wait for before exiting with an error (seconds); 0 for no timeout " "(default)" @@ -1305,27 +1307,27 @@ "Време за чекање пре изласка са грешком (секунде); 0 — без временског рока " "(основно)" -#: gio/gdbus-tool.c:2254 +#: gio/gdbus-tool.c:2253 msgid "OPTION… BUS-NAME" msgstr "ОПЦИЈА… НАЗИВ_МАГИСТРАЛЕ" -#: gio/gdbus-tool.c:2255 +#: gio/gdbus-tool.c:2254 msgid "Wait for a bus name to appear." msgstr "Чека да се појави назив магистрале." -#: gio/gdbus-tool.c:2331 +#: gio/gdbus-tool.c:2330 msgid "Error: A service to activate for must be specified.\n" msgstr "Грешка: Услуга за активирање мора бити наведена.\n" -#: gio/gdbus-tool.c:2336 +#: gio/gdbus-tool.c:2335 msgid "Error: A service to wait for must be specified.\n" msgstr "Грешка: Услуга за чекање мора бити наведена.\n" -#: gio/gdbus-tool.c:2341 +#: gio/gdbus-tool.c:2340 msgid "Error: Too many arguments.\n" msgstr "Грешка: Превише аргумената.\n" -#: gio/gdbus-tool.c:2349 gio/gdbus-tool.c:2356 +#: gio/gdbus-tool.c:2348 gio/gdbus-tool.c:2355 #, c-format msgid "Error: %s is not a valid well-known bus name.\n" msgstr "Грешка: „%s“ није исправан назив добро знане магистрале.\n" @@ -1335,38 +1337,43 @@ msgid "Not authorized to change debug settings" msgstr "Нисте овлашћени да измените поставке прочишћавања" -#: gio/gdesktopappinfo.c:2182 gio/gdesktopappinfo.c:5119 +#: gio/gdesktopappinfo.c:2242 gio/gdesktopappinfo.c:5223 msgid "Unnamed" msgstr "Неименовано" -#: gio/gdesktopappinfo.c:2592 +#: gio/gdesktopappinfo.c:2652 msgid "Desktop file didn’t specify Exec field" msgstr "Датотека за радну површ не садржи Exec унос" -#: gio/gdesktopappinfo.c:2891 +#: gio/gdesktopappinfo.c:2942 msgid "Unable to find terminal required for application" msgstr "Не могу да нађем терминал ради покретања овог програма" -#: gio/gdesktopappinfo.c:3637 +#: gio/gdesktopappinfo.c:3002 +#, c-format +msgid "Program ‘%s’ not found in $PATH" +msgstr "Програм „%s“ није пронађен у $PATH" + +#: gio/gdesktopappinfo.c:3735 #, c-format msgid "Can’t create user application configuration folder %s: %s" msgstr "Не могу да направим фасциклу за корисникова подешавања %s: %s" -#: gio/gdesktopappinfo.c:3641 +#: gio/gdesktopappinfo.c:3739 #, c-format msgid "Can’t create user MIME configuration folder %s: %s" msgstr "Не могу да направим фасциклу за корисникова МИМЕ подешавања %s: %s" -#: gio/gdesktopappinfo.c:3883 gio/gdesktopappinfo.c:3907 +#: gio/gdesktopappinfo.c:3981 gio/gdesktopappinfo.c:4005 msgid "Application information lacks an identifier" msgstr "Подацима о програму недостаје идентификатор" -#: gio/gdesktopappinfo.c:4143 +#: gio/gdesktopappinfo.c:4241 #, c-format msgid "Can’t create user desktop file %s" msgstr "Не могу да направим датотеку радне површи %s" -#: gio/gdesktopappinfo.c:4279 +#: gio/gdesktopappinfo.c:4377 #, c-format msgid "Custom definition for %s" msgstr "Произвољне одреднице за %s" @@ -1439,7 +1446,7 @@ msgid "Containing mount does not exist" msgstr "Садржано монтирање не постоји" -#: gio/gfile.c:2641 gio/glocalfile.c:2500 +#: gio/gfile.c:2641 gio/glocalfile.c:2511 msgid "Can’t copy over directory" msgstr "Не могу да умножим преко директоријума" @@ -1484,7 +1491,7 @@ msgid "Invalid symlink value given" msgstr "Дата је неисправна симболичка веза" -#: gio/gfile.c:4163 glib/gfileutils.c:2335 +#: gio/gfile.c:4163 glib/gfileutils.c:2392 msgid "Symbolic links not supported" msgstr "Симболичке везе нису подржане" @@ -1499,7 +1506,6 @@ #: gio/gfile.c:6993 gio/gfile.c:7119 #, c-format -#| msgid "Failed to change to directory “%s” (%s)" msgid "Failed to create a temporary directory for template “%s”: %s" msgstr "Нисам успео да направим привремени директоријум за образац „%s“: %s" @@ -1586,37 +1592,37 @@ msgid "HTTP proxy server closed connection unexpectedly." msgstr "Сервер ХТТП посредника је неочекивано прекинуо везу." -#: gio/gicon.c:300 +#: gio/gicon.c:299 #, c-format msgid "Wrong number of tokens (%d)" msgstr "Није исправан број токена (%d)" -#: gio/gicon.c:320 +#: gio/gicon.c:319 #, c-format msgid "No type for class name %s" msgstr "Не постоји врста за назив класе %s" -#: gio/gicon.c:330 +#: gio/gicon.c:329 #, c-format msgid "Type %s does not implement the GIcon interface" msgstr "Врста %s не подржава сучеље ГИконице" -#: gio/gicon.c:341 +#: gio/gicon.c:340 #, c-format msgid "Type %s is not classed" msgstr "Врста %s не припада ни једној класи" -#: gio/gicon.c:355 +#: gio/gicon.c:354 #, c-format msgid "Malformed version number: %s" msgstr "Број издања је лоше задат: %s" -#: gio/gicon.c:369 +#: gio/gicon.c:368 #, c-format msgid "Type %s does not implement from_tokens() on the GIcon interface" msgstr "%s врста не подржава „from_tokens()“ на сучељу ГИконице" -#: gio/gicon.c:471 +#: gio/gicon.c:470 msgid "Can’t handle the supplied version of the icon encoding" msgstr "Не могу да радим са датим издањем кодирања иконице" @@ -2333,7 +2339,6 @@ msgstr "ВРСТА" #: gio/gio-tool-set.c:38 -#| msgid "Set a file attribute" msgid "Unset given attribute" msgstr "Расподешава дати атрибут" @@ -2418,7 +2423,7 @@ msgid "List contents of directories in a tree-like format." msgstr "Исписује садржај директоријума у запису стабла." -#: gio/glib-compile-resources.c:142 gio/glib-compile-schemas.c:1516 +#: gio/glib-compile-resources.c:142 gio/glib-compile-schemas.c:1513 #, c-format msgid "Element <%s> not allowed inside <%s>" msgstr "Елемент <%s> није дозвољен унутар <%s>" @@ -2475,7 +2480,7 @@ msgid "text may not appear inside <%s>" msgstr "текст не може да се појављује унутар <%s>" -#: gio/glib-compile-resources.c:821 gio/glib-compile-schemas.c:2174 +#: gio/glib-compile-resources.c:821 gio/glib-compile-schemas.c:2171 msgid "Show program version and exit" msgstr "Приказује издање програма и излази" @@ -2491,8 +2496,8 @@ "Директоријуми из којих ће датотеке дефинисане у ДАТОТЕЦИ бити учитане " "(подразумевано: тренутни директоријум)" -#: gio/glib-compile-resources.c:823 gio/glib-compile-schemas.c:2175 -#: gio/glib-compile-schemas.c:2204 +#: gio/glib-compile-resources.c:823 gio/glib-compile-schemas.c:2172 +#: gio/glib-compile-schemas.c:2201 msgid "DIRECTORY" msgstr "ДИРЕКТОРИЈУМ" @@ -2710,16 +2715,16 @@ msgid "<aliases> must contain at least one <alias>" msgstr "<aliases> мора да садржи барем један <alias>" -#: gio/glib-compile-schemas.c:799 +#: gio/glib-compile-schemas.c:796 msgid "Empty names are not permitted" msgstr "Празни називи нису дозвољени" -#: gio/glib-compile-schemas.c:809 +#: gio/glib-compile-schemas.c:806 #, c-format msgid "Invalid name “%s”: names must begin with a lowercase letter" msgstr "Неисправан назив „%s“: називи морају да почињу малим словом" -#: gio/glib-compile-schemas.c:821 +#: gio/glib-compile-schemas.c:818 #, c-format msgid "" "Invalid name “%s”: invalid character “%c”; only lowercase letters, numbers " @@ -2728,36 +2733,36 @@ "Неисправан назив „%s“: неисправан знак „%c“; само мала слова, бројеви и " "цртица („-“) су дозвољени" -#: gio/glib-compile-schemas.c:830 +#: gio/glib-compile-schemas.c:827 #, c-format msgid "Invalid name “%s”: two successive hyphens (“--”) are not permitted" msgstr "Неисправан назив „%s“: две узастопне цртице („--“) нису дозвољене" -#: gio/glib-compile-schemas.c:839 +#: gio/glib-compile-schemas.c:836 #, c-format msgid "Invalid name “%s”: the last character may not be a hyphen (“-”)" msgstr "Неисправан назив „%s“: последњи знак не може да буде цртиица („-“)" -#: gio/glib-compile-schemas.c:847 +#: gio/glib-compile-schemas.c:844 #, c-format msgid "Invalid name “%s”: maximum length is 1024" msgstr "Неисправан назив „%s“: највећа дужина је 1024" -#: gio/glib-compile-schemas.c:919 +#: gio/glib-compile-schemas.c:916 #, c-format msgid "<child name='%s'> already specified" msgstr "<child name='%s'> је већ наведено" -#: gio/glib-compile-schemas.c:945 +#: gio/glib-compile-schemas.c:942 msgid "Cannot add keys to a “list-of” schema" msgstr "Не могу да додам кључеве у шему „list-of“" -#: gio/glib-compile-schemas.c:956 +#: gio/glib-compile-schemas.c:953 #, c-format msgid "<key name='%s'> already specified" msgstr "<key name='%s'> је већ наведено" -#: gio/glib-compile-schemas.c:974 +#: gio/glib-compile-schemas.c:971 #, c-format msgid "" "<key name='%s'> shadows <key name='%s'> in <schema id='%s'>; use <override> " @@ -2766,7 +2771,7 @@ "<key name='%s'> прекрива <key name='%s'> у <schema id='%s'>; користите " "<override> да измените вредност" -#: gio/glib-compile-schemas.c:985 +#: gio/glib-compile-schemas.c:982 #, c-format msgid "" "Exactly one of “type”, “enum” or “flags” must be specified as an attribute " @@ -2775,63 +2780,63 @@ "Тачно једна ствар од „type“, „enum“ или „flags“ мора бити наведена као " "атрибут за <key>" -#: gio/glib-compile-schemas.c:1004 +#: gio/glib-compile-schemas.c:1001 #, c-format msgid "<%s id='%s'> not (yet) defined." msgstr "<%s id='%s'> није (још) дефинисано." -#: gio/glib-compile-schemas.c:1019 +#: gio/glib-compile-schemas.c:1016 #, c-format msgid "Invalid GVariant type string “%s”" msgstr "Неисправна врста ниске ГВаријанта „%s“" -#: gio/glib-compile-schemas.c:1049 +#: gio/glib-compile-schemas.c:1046 msgid "<override> given but schema isn’t extending anything" msgstr "<override> је дато, али шема не проширује ништа" -#: gio/glib-compile-schemas.c:1062 +#: gio/glib-compile-schemas.c:1059 #, c-format msgid "No <key name='%s'> to override" msgstr "Нема <key name='%s'> за преклапање" -#: gio/glib-compile-schemas.c:1070 +#: gio/glib-compile-schemas.c:1067 #, c-format msgid "<override name='%s'> already specified" msgstr "<override name='%s'> је већ наведено" -#: gio/glib-compile-schemas.c:1143 +#: gio/glib-compile-schemas.c:1140 #, c-format msgid "<schema id='%s'> already specified" msgstr "<schema id='%s'> је већ наведено" -#: gio/glib-compile-schemas.c:1155 +#: gio/glib-compile-schemas.c:1152 #, c-format msgid "<schema id='%s'> extends not yet existing schema “%s”" msgstr "<schema id='%s'> проширује још увек непостојећу шему „%s“" -#: gio/glib-compile-schemas.c:1171 +#: gio/glib-compile-schemas.c:1168 #, c-format msgid "<schema id='%s'> is list of not yet existing schema “%s”" msgstr "<schema id='%s'> је списак још увек непостојеће шеме „%s“" -#: gio/glib-compile-schemas.c:1179 +#: gio/glib-compile-schemas.c:1176 #, c-format msgid "Cannot be a list of a schema with a path" msgstr "Не може бити списак шеме са путањом" -#: gio/glib-compile-schemas.c:1189 +#: gio/glib-compile-schemas.c:1186 #, c-format msgid "Cannot extend a schema with a path" msgstr "Не могу да проширим шему са путањом" -#: gio/glib-compile-schemas.c:1199 +#: gio/glib-compile-schemas.c:1196 #, c-format msgid "" "<schema id='%s'> is a list, extending <schema id='%s'> which is not a list" msgstr "" "<schema id='%s'> је списак који проширује <schema id='%s'> која није списак" -#: gio/glib-compile-schemas.c:1209 +#: gio/glib-compile-schemas.c:1206 #, c-format msgid "" "<schema id='%s' list-of='%s'> extends <schema id='%s' list-of='%s'> but “%s” " @@ -2840,17 +2845,17 @@ "<schema id='%s' list-of='%s'> проширује <schema id='%s' list-of='%s'> али " "„%s“ не проширује „%s“" -#: gio/glib-compile-schemas.c:1226 +#: gio/glib-compile-schemas.c:1223 #, c-format msgid "A path, if given, must begin and end with a slash" msgstr "Путања, ако се наводи мора да почиње и завршава са косом цртом" -#: gio/glib-compile-schemas.c:1233 +#: gio/glib-compile-schemas.c:1230 #, c-format msgid "The path of a list must end with “:/”" msgstr "Путања списка мора да се завршава са „:/“" -#: gio/glib-compile-schemas.c:1242 +#: gio/glib-compile-schemas.c:1239 #, c-format msgid "" "Warning: Schema “%s” has path “%s”. Paths starting with “/apps/”, “/" @@ -2859,49 +2864,49 @@ "Упозорење: Шема „%s“ има путању „%s“. Путање које почињу на „/apps/“, „/" "desktop/“ или „/system/“ су застареле." -#: gio/glib-compile-schemas.c:1272 +#: gio/glib-compile-schemas.c:1269 #, c-format msgid "<%s id='%s'> already specified" msgstr "<%s id=„%s“> је већ наведено" -#: gio/glib-compile-schemas.c:1422 gio/glib-compile-schemas.c:1438 +#: gio/glib-compile-schemas.c:1419 gio/glib-compile-schemas.c:1435 #, c-format msgid "Only one <%s> element allowed inside <%s>" msgstr "Само један <%s> елемент је дозвољен унутар <%s>" -#: gio/glib-compile-schemas.c:1520 +#: gio/glib-compile-schemas.c:1517 #, c-format msgid "Element <%s> not allowed at the top level" msgstr "Елемент <%s> није дозвољен на највишем нивоу" -#: gio/glib-compile-schemas.c:1538 +#: gio/glib-compile-schemas.c:1535 msgid "Element <default> is required in <key>" msgstr "Елемент <default> је затражен у <key>" -#: gio/glib-compile-schemas.c:1628 +#: gio/glib-compile-schemas.c:1625 #, c-format msgid "Text may not appear inside <%s>" msgstr "Текст не може да се појављује унутар <%s>" -#: gio/glib-compile-schemas.c:1696 +#: gio/glib-compile-schemas.c:1693 #, c-format msgid "Warning: undefined reference to <schema id='%s'/>" msgstr "Упозорење: неодређена упута ка <schema id='%s'/>" #. Translators: Do not translate "--strict". -#: gio/glib-compile-schemas.c:1835 gio/glib-compile-schemas.c:1914 +#: gio/glib-compile-schemas.c:1832 gio/glib-compile-schemas.c:1911 msgid "--strict was specified; exiting." msgstr "„--strict“ је наведено; излазим." -#: gio/glib-compile-schemas.c:1847 +#: gio/glib-compile-schemas.c:1844 msgid "This entire file has been ignored." msgstr "Ова читава датотека је занемарена." -#: gio/glib-compile-schemas.c:1910 +#: gio/glib-compile-schemas.c:1907 msgid "Ignoring this file." msgstr "Занемарујем ову датотеку." -#: gio/glib-compile-schemas.c:1965 +#: gio/glib-compile-schemas.c:1962 #, c-format msgid "" "No such key “%s” in schema “%s” as specified in override file “%s”; ignoring " @@ -2910,7 +2915,7 @@ "Не постоји кључ „%s“ у шеми „%s“ као што је наведено у датотеци замене „%s“; " "занемарујем премошћење за овај кључ." -#: gio/glib-compile-schemas.c:1973 +#: gio/glib-compile-schemas.c:1970 #, c-format msgid "" "No such key “%s” in schema “%s” as specified in override file “%s” and --" @@ -2919,7 +2924,7 @@ "Не постоји кључ „%s“ у шеми „%s“ као што је наведено у датотеци замене „%s“ " "и „--strict“ заставица је дата; излазим." -#: gio/glib-compile-schemas.c:1995 +#: gio/glib-compile-schemas.c:1992 #, c-format msgid "" "Cannot provide per-desktop overrides for localized key “%s” in schema " @@ -2929,7 +2934,7 @@ "понаособ, у шеми „%s“ (датотека премошћења „%s“); занемарујем премошћење за " "овај кључ." -#: gio/glib-compile-schemas.c:2004 +#: gio/glib-compile-schemas.c:2001 #, c-format msgid "" "Cannot provide per-desktop overrides for localized key “%s” in schema " @@ -2939,7 +2944,7 @@ "понаособ, у шеми „%s“ (датотека премошћења „%s“) и заставица „--strict“ је " "наведена; излазим." -#: gio/glib-compile-schemas.c:2028 +#: gio/glib-compile-schemas.c:2025 #, c-format msgid "" "Error parsing key “%s” in schema “%s” as specified in override file “%s”: " @@ -2948,7 +2953,7 @@ "Грешка у тумачењу кључа „%s“ у шеми „%s“ као што је наведено у датотеци " "премошћења „%s“: %s. Занемарујем премошћење за оај кључ." -#: gio/glib-compile-schemas.c:2040 +#: gio/glib-compile-schemas.c:2037 #, c-format msgid "" "Error parsing key “%s” in schema “%s” as specified in override file “%s”: " @@ -2957,7 +2962,7 @@ "Грешка у тумачењу кључа „%s“ у шеми „%s“ као што је наведено у датотеци " "премошћења „%s“: %s. Заставица „--strict“ је наведена, излазим." -#: gio/glib-compile-schemas.c:2067 +#: gio/glib-compile-schemas.c:2064 #, c-format msgid "" "Override for key “%s” in schema “%s” in override file “%s” is outside the " @@ -2966,7 +2971,7 @@ "Премошћење за кључ „%s“ у шеми „%s“, у датотеци премошћења „%s“ је изван " "опсега датог у шеми; занемарујем премошћење за овај кључ." -#: gio/glib-compile-schemas.c:2077 +#: gio/glib-compile-schemas.c:2074 #, c-format msgid "" "Override for key “%s” in schema “%s” in override file “%s” is outside the " @@ -2975,7 +2980,7 @@ "Премошћење за кључ „%s“, у шеми „%s“, у датотеци премошћења „%s“ је изван " "опсега датог у шеми и заставица „--strict“ је наведена; излазим." -#: gio/glib-compile-schemas.c:2103 +#: gio/glib-compile-schemas.c:2100 #, c-format msgid "" "Override for key “%s” in schema “%s” in override file “%s” is not in the " @@ -2984,7 +2989,7 @@ "Премошћење за кључ „%s“, у шеми „%s“, у датотеци премошћења „%s“ није у " "списку дозвољених избора; занемарујем премошћење на овај кључ." -#: gio/glib-compile-schemas.c:2113 +#: gio/glib-compile-schemas.c:2110 #, c-format msgid "" "Override for key “%s” in schema “%s” in override file “%s” is not in the " @@ -2993,23 +2998,23 @@ "Премошћење за кључ „%s“, у шеми „%s“, у датотеци премошћења „%s“ није у " "списку дозвољених избора и заставица „--strict“ је наведена; излазим." -#: gio/glib-compile-schemas.c:2175 +#: gio/glib-compile-schemas.c:2172 msgid "Where to store the gschemas.compiled file" msgstr "Где да складиштим „gschemas.compiled“ датотеку" -#: gio/glib-compile-schemas.c:2176 +#: gio/glib-compile-schemas.c:2173 msgid "Abort on any errors in schemas" msgstr "Прекини при било којој грешци у шемама" -#: gio/glib-compile-schemas.c:2177 +#: gio/glib-compile-schemas.c:2174 msgid "Do not write the gschema.compiled file" msgstr "Не уписуј „gschemas.compiled“ датотеку" -#: gio/glib-compile-schemas.c:2178 +#: gio/glib-compile-schemas.c:2175 msgid "Do not enforce key name restrictions" msgstr "Не намеће ограничења назива кључа" -#: gio/glib-compile-schemas.c:2207 +#: gio/glib-compile-schemas.c:2204 msgid "" "Compile all GSettings schema files into a schema cache.\n" "Schema files are required to have the extension .gschema.xml,\n" @@ -3019,15 +3024,15 @@ "Датотеке шема морају да се завршавају са „.gschema.xml“,\n" "а датотеке кеша имају назив „gschemas.compiled“." -#: gio/glib-compile-schemas.c:2228 +#: gio/glib-compile-schemas.c:2225 msgid "You should give exactly one directory name" msgstr "Требате навести тачно један назив фасцикле" -#: gio/glib-compile-schemas.c:2271 +#: gio/glib-compile-schemas.c:2268 msgid "No schema files found: doing nothing." msgstr "Ниједна датотека са шемама није нађена: не радим било шта." -#: gio/glib-compile-schemas.c:2273 +#: gio/glib-compile-schemas.c:2270 msgid "No schema files found: removed existing output file." msgstr "" "Ниједна датотека са шемама није нађена: уклањам постојећу излазну датотеку." @@ -3037,7 +3042,7 @@ msgid "Invalid filename %s" msgstr "Неисправан назив датотеке %s" -#: gio/glocalfile.c:996 +#: gio/glocalfile.c:1005 #, c-format msgid "Error getting filesystem info for %s: %s" msgstr "Грешка добављања података о систему датотека за „%s“: %s" @@ -3046,124 +3051,124 @@ #. * the enclosing (user visible) mount of a file, but none #. * exists. #. -#: gio/glocalfile.c:1137 +#: gio/glocalfile.c:1141 #, c-format msgid "Containing mount for file %s not found" msgstr "Нисам нашао садржано качење за датотеку „%s“" -#: gio/glocalfile.c:1160 +#: gio/glocalfile.c:1164 msgid "Can’t rename root directory" msgstr "Не могу да преименујем корени директоријум" -#: gio/glocalfile.c:1178 gio/glocalfile.c:1201 +#: gio/glocalfile.c:1182 gio/glocalfile.c:1205 #, c-format msgid "Error renaming file %s: %s" msgstr "Грешка преименовања датотеке „%s“: %s" -#: gio/glocalfile.c:1185 +#: gio/glocalfile.c:1189 msgid "Can’t rename file, filename already exists" msgstr "Не могу да преименујем датотеку, назив датотеке већ постоји" -#: gio/glocalfile.c:1198 gio/glocalfile.c:2394 gio/glocalfile.c:2422 -#: gio/glocalfile.c:2561 gio/glocalfileoutputstream.c:658 +#: gio/glocalfile.c:1202 gio/glocalfile.c:2405 gio/glocalfile.c:2433 +#: gio/glocalfile.c:2572 gio/glocalfileoutputstream.c:658 msgid "Invalid filename" msgstr "Неисправан назив датотеке" -#: gio/glocalfile.c:1366 gio/glocalfile.c:1377 +#: gio/glocalfile.c:1370 gio/glocalfile.c:1381 #, c-format msgid "Error opening file %s: %s" msgstr "Грешка отварања датотеке „%s“: %s" -#: gio/glocalfile.c:1502 +#: gio/glocalfile.c:1506 #, c-format msgid "Error removing file %s: %s" msgstr "Грешка уклањања датотеке „%s“: %s" -#: gio/glocalfile.c:1996 gio/glocalfile.c:2007 gio/glocalfile.c:2034 +#: gio/glocalfile.c:2000 gio/glocalfile.c:2011 gio/glocalfile.c:2038 #, c-format msgid "Error trashing file %s: %s" msgstr "Грешка премештања датотеке „%s“ у смеће: %s" -#: gio/glocalfile.c:2054 +#: gio/glocalfile.c:2058 #, c-format msgid "Unable to create trash directory %s: %s" msgstr "Не могу да направим директоријум за смеће %s: %s" -#: gio/glocalfile.c:2075 +#: gio/glocalfile.c:2079 #, c-format msgid "Unable to find toplevel directory to trash %s" msgstr "Не могу да нађем корени директоријум да бацим у смеће „%s“" -#: gio/glocalfile.c:2083 +#: gio/glocalfile.c:2087 #, c-format msgid "Trashing on system internal mounts is not supported" msgstr "Није подржано стварање смећа на системским унутрашњим тачкама качења" -#: gio/glocalfile.c:2169 gio/glocalfile.c:2197 +#: gio/glocalfile.c:2173 gio/glocalfile.c:2201 #, c-format msgid "Unable to find or create trash directory %s to trash %s" msgstr "Не могу да нађем или направим директоријум „%s“ за смеће „%s“" -#: gio/glocalfile.c:2243 +#: gio/glocalfile.c:2245 #, c-format msgid "Unable to create trashing info file for %s: %s" msgstr "Не могу да направим датотеку података смећа за „%s“: %s" -#: gio/glocalfile.c:2305 +#: gio/glocalfile.c:2316 #, c-format msgid "Unable to trash file %s across filesystem boundaries" msgstr "Не могу да бацим у смеће датотеку „%s“ преко граница система датотека" -#: gio/glocalfile.c:2309 gio/glocalfile.c:2365 +#: gio/glocalfile.c:2320 gio/glocalfile.c:2376 #, c-format msgid "Unable to trash file %s: %s" msgstr "Не могу да бацим датотеку „%s“ у смеће: %s" -#: gio/glocalfile.c:2371 +#: gio/glocalfile.c:2382 #, c-format msgid "Unable to trash file %s" msgstr "Не могу да бацим датотеку „%s“ у смеће" -#: gio/glocalfile.c:2397 +#: gio/glocalfile.c:2408 #, c-format msgid "Error creating directory %s: %s" msgstr "Грешка стварања директоријума „%s“: %s" -#: gio/glocalfile.c:2426 +#: gio/glocalfile.c:2437 #, c-format msgid "Filesystem does not support symbolic links" msgstr "Систем датотека не подржава симболичке везе" -#: gio/glocalfile.c:2429 +#: gio/glocalfile.c:2440 #, c-format msgid "Error making symbolic link %s: %s" msgstr "Грешка стварања симболичке везе „%s“: %s" -#: gio/glocalfile.c:2472 gio/glocalfile.c:2507 gio/glocalfile.c:2564 +#: gio/glocalfile.c:2483 gio/glocalfile.c:2518 gio/glocalfile.c:2575 #, c-format msgid "Error moving file %s: %s" msgstr "Грешка премештања датотеке „%s“: %s" -#: gio/glocalfile.c:2495 +#: gio/glocalfile.c:2506 msgid "Can’t move directory over directory" msgstr "Не могу да преместим директоријум преко директоријума" -#: gio/glocalfile.c:2521 gio/glocalfileoutputstream.c:1110 +#: gio/glocalfile.c:2532 gio/glocalfileoutputstream.c:1110 #: gio/glocalfileoutputstream.c:1124 gio/glocalfileoutputstream.c:1139 #: gio/glocalfileoutputstream.c:1156 gio/glocalfileoutputstream.c:1170 msgid "Backup file creation failed" msgstr "Није успела израда резервне датотеке" -#: gio/glocalfile.c:2540 +#: gio/glocalfile.c:2551 #, c-format msgid "Error removing target file: %s" msgstr "Грешка уклањања циљне датотеке: %s" -#: gio/glocalfile.c:2554 +#: gio/glocalfile.c:2565 msgid "Move between mounts not supported" msgstr "Није подржано премештање између монтираних уређаја" -#: gio/glocalfile.c:2728 +#: gio/glocalfile.c:2741 #, c-format msgid "Could not determine the disk usage of %s: %s" msgstr "Не могу да одредим искоришћеност диска за „%s“: %s" @@ -3173,7 +3178,6 @@ msgstr "Вредност особине мора бити различита од NULL" #: gio/glocalfileinfo.c:782 -#| msgid "Invalid attribute type (string expected)" msgid "Invalid attribute type (string or invalid expected)" msgstr "Није исправна врста атрибута (очекивана је ниска или неисправност)" @@ -3186,116 +3190,116 @@ msgid "Error setting extended attribute “%s”: %s" msgstr "Грешка приликом постављања проширене особине „%s“: %s" -#: gio/glocalfileinfo.c:1732 gio/win32/gwinhttpfile.c:191 +#: gio/glocalfileinfo.c:1819 gio/win32/gwinhttpfile.c:191 msgid " (invalid encoding)" msgstr " (неисправно кодирање)" -#: gio/glocalfileinfo.c:1891 gio/glocalfileoutputstream.c:945 +#: gio/glocalfileinfo.c:1978 gio/glocalfileoutputstream.c:945 #: gio/glocalfileoutputstream.c:997 #, c-format msgid "Error when getting information for file “%s”: %s" msgstr "Грешка приликом добављања података за датотеку „%s“: %s" -#: gio/glocalfileinfo.c:2157 +#: gio/glocalfileinfo.c:2281 #, c-format msgid "Error when getting information for file descriptor: %s" msgstr "Грешка приликом добављања података за описника датотеке: %s" -#: gio/glocalfileinfo.c:2202 +#: gio/glocalfileinfo.c:2326 msgid "Invalid attribute type (uint32 expected)" msgstr "Није исправна врста особине („uint32“ је очекивано)" -#: gio/glocalfileinfo.c:2220 +#: gio/glocalfileinfo.c:2344 msgid "Invalid attribute type (uint64 expected)" msgstr "Није исправна врста особине („uint64“ је очекивано)" -#: gio/glocalfileinfo.c:2239 gio/glocalfileinfo.c:2258 +#: gio/glocalfileinfo.c:2363 gio/glocalfileinfo.c:2382 msgid "Invalid attribute type (byte string expected)" msgstr "Није исправна врста особине (очекивана је ниска битова)" -#: gio/glocalfileinfo.c:2305 +#: gio/glocalfileinfo.c:2429 msgid "Cannot set permissions on symlinks" msgstr "Не могу да поставим овлашћења за симболичке везе" -#: gio/glocalfileinfo.c:2321 +#: gio/glocalfileinfo.c:2445 #, c-format msgid "Error setting permissions: %s" msgstr "Грешка приликом постављања овлашћења: %s" -#: gio/glocalfileinfo.c:2372 +#: gio/glocalfileinfo.c:2496 #, c-format msgid "Error setting owner: %s" msgstr "Грешка приликом постављања власника: %s" -#: gio/glocalfileinfo.c:2395 +#: gio/glocalfileinfo.c:2519 msgid "symlink must be non-NULL" msgstr "симболичке везе морају бити различите од NULL" -#: gio/glocalfileinfo.c:2405 gio/glocalfileinfo.c:2424 -#: gio/glocalfileinfo.c:2435 +#: gio/glocalfileinfo.c:2529 gio/glocalfileinfo.c:2548 +#: gio/glocalfileinfo.c:2559 #, c-format msgid "Error setting symlink: %s" msgstr "Грешка приликом постављања симболичке везе: %s" -#: gio/glocalfileinfo.c:2414 +#: gio/glocalfileinfo.c:2538 msgid "Error setting symlink: file is not a symlink" msgstr "Грешка при постављању симболичке везе: датотека није симболичка веза" -#: gio/glocalfileinfo.c:2486 +#: gio/glocalfileinfo.c:2630 #, c-format msgid "Extra nanoseconds %d for UNIX timestamp %lld are negative" msgstr "Додатне наносекунде %d за ЈУНИКС временски жиг %lld су негативне" -#: gio/glocalfileinfo.c:2495 +#: gio/glocalfileinfo.c:2639 #, c-format msgid "Extra nanoseconds %d for UNIX timestamp %lld reach 1 second" msgstr "" "Додатне наносекунде %d за ЈУНИКС временски жиг %lld су досегле једну секунду" -#: gio/glocalfileinfo.c:2505 +#: gio/glocalfileinfo.c:2649 #, c-format msgid "UNIX timestamp %lld does not fit into 64 bits" msgstr "ЈУНИКС временски жиг %lld не може стати у 64 бита" -#: gio/glocalfileinfo.c:2516 +#: gio/glocalfileinfo.c:2660 #, c-format msgid "UNIX timestamp %lld is outside of the range supported by Windows" msgstr "ЈУНИКС временски жиг %lld је ван опсега којег подржава Виндоус" -#: gio/glocalfileinfo.c:2619 +#: gio/glocalfileinfo.c:2792 #, c-format msgid "File name “%s” cannot be converted to UTF-16" msgstr "Назив датотеке „%s“ се не може претворити у УТФ-16" -#: gio/glocalfileinfo.c:2638 +#: gio/glocalfileinfo.c:2811 #, c-format msgid "File “%s” cannot be opened: Windows Error %lu" msgstr "Датотека „%s“ се не може отворити: Виндоус грешка %lu" -#: gio/glocalfileinfo.c:2651 +#: gio/glocalfileinfo.c:2824 #, c-format msgid "Error setting modification or access time for file “%s”: %lu" msgstr "Грешка при постављању датума измене или приступа за датотеку „%s“: %lu" -#: gio/glocalfileinfo.c:2825 +#: gio/glocalfileinfo.c:2981 #, c-format msgid "Error setting modification or access time: %s" msgstr "Грешка при постављању датума измене или приступа: %s" -#: gio/glocalfileinfo.c:2848 +#: gio/glocalfileinfo.c:3004 msgid "SELinux context must be non-NULL" msgstr "СЕЛинукс контекст не сме бити NULL" -#: gio/glocalfileinfo.c:2855 +#: gio/glocalfileinfo.c:3011 msgid "SELinux is not enabled on this system" msgstr "СЕЛинукс није укључен на вашем систему" -#: gio/glocalfileinfo.c:2865 +#: gio/glocalfileinfo.c:3021 #, c-format msgid "Error setting SELinux context: %s" msgstr "Грешка приликом постављања СЕЛинукс контекста: %s" -#: gio/glocalfileinfo.c:2962 +#: gio/glocalfileinfo.c:3118 #, c-format msgid "Setting attribute %s not supported" msgstr "Није подржано постављање особине %s" @@ -3510,8 +3514,8 @@ #. Translators: the first placeholder is a domain name, the #. * second is an error message #: gio/gresolver.c:403 gio/gthreadedresolver.c:152 gio/gthreadedresolver.c:170 -#: gio/gthreadedresolver.c:782 gio/gthreadedresolver.c:806 -#: gio/gthreadedresolver.c:831 gio/gthreadedresolver.c:846 +#: gio/gthreadedresolver.c:798 gio/gthreadedresolver.c:822 +#: gio/gthreadedresolver.c:847 gio/gthreadedresolver.c:862 #, c-format msgid "Error resolving “%s”: %s" msgstr "Грешка у разрешавању „%s“: %s" @@ -4223,35 +4227,35 @@ #. Translators: the placeholder is a DNS record type, such as ‘MX’ or ‘SRV’ #: gio/gthreadedresolver.c:552 gio/gthreadedresolver.c:574 -#: gio/gthreadedresolver.c:612 gio/gthreadedresolver.c:659 -#: gio/gthreadedresolver.c:688 gio/gthreadedresolver.c:700 +#: gio/gthreadedresolver.c:628 gio/gthreadedresolver.c:675 +#: gio/gthreadedresolver.c:704 gio/gthreadedresolver.c:716 #, c-format msgid "Error parsing DNS %s record: malformed DNS packet" msgstr "Грешка обраде ДНС „%s“ записа: лош ДНС пакет" -#: gio/gthreadedresolver.c:758 gio/gthreadedresolver.c:895 -#: gio/gthreadedresolver.c:993 gio/gthreadedresolver.c:1043 +#: gio/gthreadedresolver.c:774 gio/gthreadedresolver.c:911 +#: gio/gthreadedresolver.c:1009 gio/gthreadedresolver.c:1059 #, c-format msgid "No DNS record of the requested type for “%s”" msgstr "Нема ДНС записа затражене врсте за „%s“" -#: gio/gthreadedresolver.c:763 gio/gthreadedresolver.c:998 +#: gio/gthreadedresolver.c:779 gio/gthreadedresolver.c:1014 #, c-format msgid "Temporarily unable to resolve “%s”" msgstr "Привремено не могу да разрешим „%s“" -#: gio/gthreadedresolver.c:768 gio/gthreadedresolver.c:1003 -#: gio/gthreadedresolver.c:1113 +#: gio/gthreadedresolver.c:784 gio/gthreadedresolver.c:1019 +#: gio/gthreadedresolver.c:1129 #, c-format msgid "Error resolving “%s”" msgstr "Грешка у разрешивању „%s“" -#: gio/gthreadedresolver.c:782 gio/gthreadedresolver.c:806 -#: gio/gthreadedresolver.c:831 gio/gthreadedresolver.c:846 +#: gio/gthreadedresolver.c:798 gio/gthreadedresolver.c:822 +#: gio/gthreadedresolver.c:847 gio/gthreadedresolver.c:862 msgid "Malformed DNS packet" msgstr "Лош ДНС пакет" -#: gio/gthreadedresolver.c:888 +#: gio/gthreadedresolver.c:904 #, c-format msgid "Failed to parse DNS response for “%s”: " msgstr "Нисам успео да обрадим ДНС одговор за „%s“: " @@ -4383,7 +4387,7 @@ msgid "Error closing file descriptor: %s" msgstr "Грешка приликом затварања описника датотеке: %s" -#: gio/gunixmounts.c:2815 gio/gunixmounts.c:2868 +#: gio/gunixmounts.c:2817 gio/gunixmounts.c:2870 msgid "Filesystem root" msgstr "Корени систем датотека" @@ -4465,79 +4469,79 @@ msgid "Wrong args\n" msgstr "Погрешни аргументи\n" -#: glib/gbookmarkfile.c:779 +#: glib/gbookmarkfile.c:861 #, c-format msgid "Unexpected attribute “%s” for element “%s”" msgstr "Неочекивано својство „%s“ елемента „%s“" -#: glib/gbookmarkfile.c:790 glib/gbookmarkfile.c:870 glib/gbookmarkfile.c:880 -#: glib/gbookmarkfile.c:993 +#: glib/gbookmarkfile.c:872 glib/gbookmarkfile.c:952 glib/gbookmarkfile.c:962 +#: glib/gbookmarkfile.c:1075 #, c-format msgid "Attribute “%s” of element “%s” not found" msgstr "Својство „%s“ елемента „%s“ није пронађено" -#: glib/gbookmarkfile.c:1202 glib/gbookmarkfile.c:1267 -#: glib/gbookmarkfile.c:1331 glib/gbookmarkfile.c:1341 +#: glib/gbookmarkfile.c:1284 glib/gbookmarkfile.c:1349 +#: glib/gbookmarkfile.c:1413 glib/gbookmarkfile.c:1423 #, c-format msgid "Unexpected tag “%s”, tag “%s” expected" msgstr "Неочекивана ознака „%s“, очекивана је „%s“" -#: glib/gbookmarkfile.c:1227 glib/gbookmarkfile.c:1241 -#: glib/gbookmarkfile.c:1309 glib/gbookmarkfile.c:1355 +#: glib/gbookmarkfile.c:1309 glib/gbookmarkfile.c:1323 +#: glib/gbookmarkfile.c:1391 glib/gbookmarkfile.c:1437 #, c-format msgid "Unexpected tag “%s” inside “%s”" msgstr "Неочекивана ознака „%s“ унутар „%s“" -#: glib/gbookmarkfile.c:1635 +#: glib/gbookmarkfile.c:1717 #, c-format msgid "Invalid date/time ‘%s’ in bookmark file" msgstr "Несправно време и датум „%s“ у датотеци обележивача" -#: glib/gbookmarkfile.c:1838 +#: glib/gbookmarkfile.c:1956 msgid "No valid bookmark file found in data dirs" msgstr "" "Не могу да нађем исправну датотеку са обележивачима међу фасциклама са " "подацима" -#: glib/gbookmarkfile.c:2039 +#: glib/gbookmarkfile.c:2157 #, c-format msgid "A bookmark for URI “%s” already exists" msgstr "Обележивач за путању „%s“ већ постоји" -#: glib/gbookmarkfile.c:2088 glib/gbookmarkfile.c:2246 -#: glib/gbookmarkfile.c:2331 glib/gbookmarkfile.c:2411 -#: glib/gbookmarkfile.c:2496 glib/gbookmarkfile.c:2630 -#: glib/gbookmarkfile.c:2763 glib/gbookmarkfile.c:2898 -#: glib/gbookmarkfile.c:2940 glib/gbookmarkfile.c:3037 -#: glib/gbookmarkfile.c:3158 glib/gbookmarkfile.c:3352 -#: glib/gbookmarkfile.c:3493 glib/gbookmarkfile.c:3712 -#: glib/gbookmarkfile.c:3801 glib/gbookmarkfile.c:3890 -#: glib/gbookmarkfile.c:4009 +#: glib/gbookmarkfile.c:2206 glib/gbookmarkfile.c:2364 +#: glib/gbookmarkfile.c:2449 glib/gbookmarkfile.c:2529 +#: glib/gbookmarkfile.c:2614 glib/gbookmarkfile.c:2748 +#: glib/gbookmarkfile.c:2881 glib/gbookmarkfile.c:3016 +#: glib/gbookmarkfile.c:3058 glib/gbookmarkfile.c:3155 +#: glib/gbookmarkfile.c:3276 glib/gbookmarkfile.c:3470 +#: glib/gbookmarkfile.c:3611 glib/gbookmarkfile.c:3830 +#: glib/gbookmarkfile.c:3919 glib/gbookmarkfile.c:4008 +#: glib/gbookmarkfile.c:4127 #, c-format msgid "No bookmark found for URI “%s”" msgstr "Није пронађен обележивач за путању „%s“" -#: glib/gbookmarkfile.c:2420 +#: glib/gbookmarkfile.c:2538 #, c-format msgid "No MIME type defined in the bookmark for URI “%s”" msgstr "У обележивачу за путању „%s“ није одређена МИМЕ врста" -#: glib/gbookmarkfile.c:2505 +#: glib/gbookmarkfile.c:2623 #, c-format msgid "No private flag has been defined in bookmark for URI “%s”" msgstr "У обележивачу за путању „%s“ није одређена приватна заставица" -#: glib/gbookmarkfile.c:3046 +#: glib/gbookmarkfile.c:3164 #, c-format msgid "No groups set in bookmark for URI “%s”" msgstr "У обележивачу за путању „%s“ нису одређене групе" -#: glib/gbookmarkfile.c:3514 glib/gbookmarkfile.c:3722 +#: glib/gbookmarkfile.c:3632 glib/gbookmarkfile.c:3840 #, c-format msgid "No application with name “%s” registered a bookmark for “%s”" msgstr "Програм „%s“ није регистровао обележивач за „%s“" -#: glib/gbookmarkfile.c:3745 +#: glib/gbookmarkfile.c:3863 #, c-format msgid "Failed to expand exec line “%s” with URI “%s”" msgstr "Нисам успеода проширим комадну линију „%s“ са путањом „%s“" @@ -5014,7 +5018,7 @@ msgstr "Грешка при отварању директоријума „%s“: %s" # bug: plural-forms -#: glib/gfileutils.c:735 glib/gfileutils.c:827 +#: glib/gfileutils.c:753 glib/gfileutils.c:845 #, c-format msgid "Could not allocate %lu byte to read file “%s”" msgid_plural "Could not allocate %lu bytes to read file “%s”" @@ -5023,81 +5027,81 @@ msgstr2 "Не могу да доделим %lu бајтова за читање датотеке „%s“" msgstr3 "Не могу да доделим %lu бајт за читање датотеке „%s“" -#: glib/gfileutils.c:752 +#: glib/gfileutils.c:770 #, c-format msgid "Error reading file “%s”: %s" msgstr "Грешка при читању датотеке „%s“: %s" -#: glib/gfileutils.c:788 +#: glib/gfileutils.c:806 #, c-format msgid "File “%s” is too large" msgstr "Датотека „%s“ је превелика" -#: glib/gfileutils.c:852 +#: glib/gfileutils.c:870 #, c-format msgid "Failed to read from file “%s”: %s" msgstr "Нисам успеода прочитам из датотеке „%s“: %s" -#: glib/gfileutils.c:902 glib/gfileutils.c:977 glib/gfileutils.c:1449 +#: glib/gfileutils.c:920 glib/gfileutils.c:995 glib/gfileutils.c:1472 #, c-format msgid "Failed to open file “%s”: %s" msgstr "Нисам успео да отворим датотеку „%s“: %s" -#: glib/gfileutils.c:915 +#: glib/gfileutils.c:933 #, c-format msgid "Failed to get attributes of file “%s”: fstat() failed: %s" msgstr "" "Нисам успео да сазнам особине датотеке „%s“: није успела функција „fstat()“: " "%s" -#: glib/gfileutils.c:946 +#: glib/gfileutils.c:964 #, c-format msgid "Failed to open file “%s”: fdopen() failed: %s" msgstr "" "Нисам успео да отворим датотеку „%s“: није успела функција „fdopen()“: %s" -#: glib/gfileutils.c:1047 +#: glib/gfileutils.c:1065 #, c-format msgid "Failed to rename file “%s” to “%s”: g_rename() failed: %s" msgstr "" "Нисам успео да преименујем датотеку „%s“ у „%s“: није успела функција " "„g_rename()“: %s" -#: glib/gfileutils.c:1156 +#: glib/gfileutils.c:1179 #, c-format msgid "Failed to write file “%s”: write() failed: %s" msgstr "" "Нисам успео да запишем датотеку „%s“: није успела функција „write()“: %s" -#: glib/gfileutils.c:1177 +#: glib/gfileutils.c:1200 #, c-format msgid "Failed to write file “%s”: fsync() failed: %s" msgstr "" "Нисам успео да упишем у датотеку „%s“: није успела функција „fsync()“: %s" -#: glib/gfileutils.c:1338 glib/gfileutils.c:1753 +#: glib/gfileutils.c:1361 glib/gfileutils.c:1776 #, c-format msgid "Failed to create file “%s”: %s" msgstr "Нисам успео да направим датотеку „%s“: %s" -#: glib/gfileutils.c:1383 +#: glib/gfileutils.c:1406 #, c-format msgid "Existing file “%s” could not be removed: g_unlink() failed: %s" msgstr "" "Постојећа датотека „%s“ се не може уклонити: није успела функција " "„g_unlink()“: %s" -#: glib/gfileutils.c:1718 +#: glib/gfileutils.c:1741 #, c-format msgid "Template “%s” invalid, should not contain a “%s”" msgstr "Неисправан шаблон „%s“, не сме садржати „%s“" -#: glib/gfileutils.c:1731 +#: glib/gfileutils.c:1754 #, c-format msgid "Template “%s” doesn’t contain XXXXXX" msgstr "Шаблон „%s“ не садржи XXXXXX" -#: glib/gfileutils.c:2291 glib/gfileutils.c:2320 +#: glib/gfileutils.c:2348 glib/gfileutils.c:2377 #, c-format msgid "Failed to read the symbolic link “%s”: %s" msgstr "Нисам успео да прочитам симболичку везу „%s“: %s" @@ -5160,8 +5164,8 @@ msgstr "Датотека са кључевима садржи неподржано кодирање „%s“" #: glib/gkeyfile.c:1679 glib/gkeyfile.c:1852 glib/gkeyfile.c:3299 -#: glib/gkeyfile.c:3363 glib/gkeyfile.c:3493 glib/gkeyfile.c:3625 -#: glib/gkeyfile.c:3771 glib/gkeyfile.c:4006 glib/gkeyfile.c:4073 +#: glib/gkeyfile.c:3363 glib/gkeyfile.c:3493 glib/gkeyfile.c:3622 +#: glib/gkeyfile.c:3768 glib/gkeyfile.c:4003 glib/gkeyfile.c:4070 #, c-format msgid "Key file does not have group “%s”" msgstr "Датотека са кључевима нема групу „%s“" @@ -5195,31 +5199,31 @@ msgid "Key “%s” in group “%s” has value “%s” where %s was expected" msgstr "Кључ „%s“ у групи „%s“ има вредност „%s“ где је очекивано %s" -#: glib/gkeyfile.c:4326 +#: glib/gkeyfile.c:4323 msgid "Key file contains escape character at end of line" msgstr "Датотека са кључевима садржи знак истицања на крају реда" -#: glib/gkeyfile.c:4348 +#: glib/gkeyfile.c:4345 #, c-format msgid "Key file contains invalid escape sequence “%s”" msgstr "Датотека са кључевима садржи недозвољен низ истицања „%s“" -#: glib/gkeyfile.c:4493 +#: glib/gkeyfile.c:4490 #, c-format msgid "Value “%s” cannot be interpreted as a number." msgstr "Вредност „%s“ се не може сматрати бројем." -#: glib/gkeyfile.c:4507 +#: glib/gkeyfile.c:4504 #, c-format msgid "Integer value “%s” out of range" msgstr "Целобројна вредност „%s“ је изван опсега" -#: glib/gkeyfile.c:4540 +#: glib/gkeyfile.c:4537 #, c-format msgid "Value “%s” cannot be interpreted as a float number." msgstr "Вредност „%s“ се не може сматрати реалним бројем једноструке тачности." -#: glib/gkeyfile.c:4579 +#: glib/gkeyfile.c:4576 #, c-format msgid "Value “%s” cannot be interpreted as a boolean." msgstr "Вредност „%s“ се не може сматрати истинитосном." @@ -5243,32 +5247,32 @@ msgstr "" "Нисам успео да отворим датотеку „%s“: није успела функција „open()“: %s" -#: glib/gmarkup.c:400 glib/gmarkup.c:442 +#: glib/gmarkup.c:393 glib/gmarkup.c:435 #, c-format msgid "Error on line %d char %d: " msgstr "Грешка у %d. реду, %d. знак: " -#: glib/gmarkup.c:464 glib/gmarkup.c:547 +#: glib/gmarkup.c:457 glib/gmarkup.c:540 #, c-format msgid "Invalid UTF-8 encoded text in name — not valid “%s”" msgstr "Неисправан УТФ-8 текст у имену — „%s“ није исправно" -#: glib/gmarkup.c:475 +#: glib/gmarkup.c:468 #, c-format msgid "“%s” is not a valid name" msgstr "„%s“ није исправан назив" -#: glib/gmarkup.c:491 +#: glib/gmarkup.c:484 #, c-format msgid "“%s” is not a valid name: “%c”" msgstr "„%s“ није исправан назив: „%c“" -#: glib/gmarkup.c:615 +#: glib/gmarkup.c:608 #, c-format msgid "Error on line %d: %s" msgstr "Грешка у %d. реду: %s" -#: glib/gmarkup.c:692 +#: glib/gmarkup.c:685 #, c-format msgid "" "Failed to parse “%-.*s”, which should have been a digit inside a character " @@ -5277,7 +5281,7 @@ "Нисам успео да рашчланим „%-.*s“, што је требало да представља цифру унутар " "знаковне референце (на пример ê) — можда је цифра превелика" -#: glib/gmarkup.c:704 +#: glib/gmarkup.c:697 msgid "" "Character reference did not end with a semicolon; most likely you used an " "ampersand character without intending to start an entity — escape ampersand " @@ -5287,24 +5291,24 @@ "користили амперсанд без намере да започнете ентитет — назначите амперсанд са " "&" -#: glib/gmarkup.c:730 +#: glib/gmarkup.c:723 #, c-format msgid "Character reference “%-.*s” does not encode a permitted character" msgstr "Знаковна референца „%-.*s“ не представља дозвољени знак" -#: glib/gmarkup.c:768 +#: glib/gmarkup.c:761 msgid "" "Empty entity “&;” seen; valid entities are: & " < > '" msgstr "" "Уочен празан ентитет „&;“; прихватљиви ентитети су & " < > " "'" -#: glib/gmarkup.c:776 +#: glib/gmarkup.c:769 #, c-format msgid "Entity name “%-.*s” is not known" msgstr "Име ентитета „%-.*s“ није познато" -#: glib/gmarkup.c:781 +#: glib/gmarkup.c:774 msgid "" "Entity did not end with a semicolon; most likely you used an ampersand " "character without intending to start an entity — escape ampersand as &" @@ -5312,11 +5316,11 @@ "Ентитет се не завршава тачка-запетом; највероватније сте користили амперсанд " "без намере да започнете ентитет — назначите амперсанд са &" -#: glib/gmarkup.c:1195 +#: glib/gmarkup.c:1188 msgid "Document must begin with an element (e.g. <book>)" msgstr "Документ мора почети елементом (нпр. <књига>)" -#: glib/gmarkup.c:1235 +#: glib/gmarkup.c:1228 #, c-format msgid "" "“%s” is not a valid character following a “<” character; it may not begin an " @@ -5325,7 +5329,7 @@ "„%s“ не представља исправан знак након знака „<“; назив елемента не може " "њиме почети" -#: glib/gmarkup.c:1278 +#: glib/gmarkup.c:1271 #, c-format msgid "" "Odd character “%s”, expected a “>” character to end the empty-element tag " @@ -5334,19 +5338,19 @@ "Чудан знак „%s“, а очекиван је „>“ знак ради окончања ознаке празног " "елемента „%s“" -#: glib/gmarkup.c:1348 +#: glib/gmarkup.c:1341 #, c-format msgid "Too many attributes in element “%s”" msgstr "Превише особина у елементу „%s“" -#: glib/gmarkup.c:1368 +#: glib/gmarkup.c:1361 #, c-format msgid "" "Odd character “%s”, expected a “=” after attribute name “%s” of element “%s”" msgstr "" "Чудан знак „%s“, очекиван је „=“ после имена атрибута „%s“ елемента „%s“" -#: glib/gmarkup.c:1410 +#: glib/gmarkup.c:1403 #, c-format msgid "" "Odd character “%s”, expected a “>” or “/” character to end the start tag of " @@ -5357,7 +5361,7 @@ "елемента „%s“, или можда атрибут; можда сте користили неисправан знак у " "имену атрибута" -#: glib/gmarkup.c:1455 +#: glib/gmarkup.c:1448 #, c-format msgid "" "Odd character “%s”, expected an open quote mark after the equals sign when " @@ -5366,7 +5370,7 @@ "Чудан знак „%s“, очекиван је почетни наводник након знака једнакости при " "додели вредности атрибута „%s“ елемента „%s“" -#: glib/gmarkup.c:1589 +#: glib/gmarkup.c:1582 #, c-format msgid "" "“%s” is not a valid character following the characters “</”; “%s” may not " @@ -5374,7 +5378,7 @@ msgstr "" "„%s“ није исправан знак након низа „</“; „%s“ не може започети назив елемента" -#: glib/gmarkup.c:1627 +#: glib/gmarkup.c:1620 #, c-format msgid "" "“%s” is not a valid character following the close element name “%s”; the " @@ -5383,27 +5387,27 @@ "„%s“ није исправан знак након имена затвореног елемента „%s“; дозвољени знак " "је „>“" -#: glib/gmarkup.c:1639 +#: glib/gmarkup.c:1632 #, c-format msgid "Element “%s” was closed, no element is currently open" msgstr "Елемент „%s“ је затворен, нема тренутно отворених елемената" -#: glib/gmarkup.c:1648 +#: glib/gmarkup.c:1641 #, c-format msgid "Element “%s” was closed, but the currently open element is “%s”" msgstr "Елемент „%s“ је затворен, а тренутно отворен елемент је „%s“" -#: glib/gmarkup.c:1801 +#: glib/gmarkup.c:1794 msgid "Document was empty or contained only whitespace" msgstr "Документ је празан или садржи само белине" -#: glib/gmarkup.c:1815 +#: glib/gmarkup.c:1808 msgid "Document ended unexpectedly just after an open angle bracket “<”" msgstr "" "Документ je завршен неочекивано непосредно након отворене косоугле заграде " "„<“" -#: glib/gmarkup.c:1823 glib/gmarkup.c:1868 +#: glib/gmarkup.c:1816 glib/gmarkup.c:1861 #, c-format msgid "" "Document ended unexpectedly with elements still open — “%s” was the last " @@ -5412,7 +5416,7 @@ "Документ je завршен неочекивано са отвореним елементима — „%s“ је последње " "отворен елемент" -#: glib/gmarkup.c:1831 +#: glib/gmarkup.c:1824 #, c-format msgid "" "Document ended unexpectedly, expected to see a close angle bracket ending " @@ -5421,19 +5425,19 @@ "Документ је завршен неочекивано, а очекивана је затворена косоугла заграда " "која затвара ознаку <%s/>" -#: glib/gmarkup.c:1837 +#: glib/gmarkup.c:1830 msgid "Document ended unexpectedly inside an element name" msgstr "Документ je завршен неочекивано усред имена елемента" -#: glib/gmarkup.c:1843 +#: glib/gmarkup.c:1836 msgid "Document ended unexpectedly inside an attribute name" msgstr "Документ je завршен неочекивано усред имена атрибута" -#: glib/gmarkup.c:1848 +#: glib/gmarkup.c:1841 msgid "Document ended unexpectedly inside an element-opening tag." msgstr "Документ je завршен неочекивано усред почетне ознаке елемента." -#: glib/gmarkup.c:1854 +#: glib/gmarkup.c:1847 msgid "" "Document ended unexpectedly after the equals sign following an attribute " "name; no attribute value" @@ -5441,22 +5445,22 @@ "Документ je завршен неочекивано након знака једнакости после имена атрибута; " "вредност атрибута није наведена" -#: glib/gmarkup.c:1861 +#: glib/gmarkup.c:1854 msgid "Document ended unexpectedly while inside an attribute value" msgstr "Документ je завршен неочекивано усред вредности атрибута" -#: glib/gmarkup.c:1878 +#: glib/gmarkup.c:1871 #, c-format msgid "Document ended unexpectedly inside the close tag for element “%s”" msgstr "Документ je завршен неочекивано усред завршне ознаке елемента „%s“" -#: glib/gmarkup.c:1882 +#: glib/gmarkup.c:1875 msgid "" "Document ended unexpectedly inside the close tag for an unopened element" msgstr "" "Документ je завршен неочекивано унутар завршне ознаке неотвореног елемента" -#: glib/gmarkup.c:1888 +#: glib/gmarkup.c:1881 msgid "Document ended unexpectedly inside a comment or processing instruction" msgstr "Документ je завршен неочекивано усред примедбе или упута за обраду" @@ -5777,7 +5781,6 @@ #: glib/gregex.c:1847 #, c-format -#| msgid "Error while compiling regular expression %s at char %d: %s" msgid "Error while compiling regular expression ‘%s’ at char %s: %s" msgstr "Грешка при превођењу регуларног израза „%s“ код знака „%s“: %s" @@ -5846,98 +5849,103 @@ msgid "Text was empty (or contained only whitespace)" msgstr "Садржај празан (или садржи само белине)" -#: glib/gspawn.c:314 +#: glib/gspawn.c:319 #, c-format msgid "Failed to read data from child process (%s)" msgstr "Неуспело читање података од потпроцеса (%s)" -#: glib/gspawn.c:466 +#: glib/gspawn.c:471 #, c-format msgid "Unexpected error in reading data from a child process (%s)" msgstr "Неочекивана грешка приликом читања података из дете процеса (%s)" -#: glib/gspawn.c:551 +#: glib/gspawn.c:556 #, c-format msgid "Unexpected error in waitpid() (%s)" msgstr "Неочекивана грешка у функцији „waitpid()“ (%s)" -#: glib/gspawn.c:1170 glib/gspawn-win32.c:1488 +#: glib/gspawn.c:1175 glib/gspawn-win32.c:1503 #, c-format msgid "Child process exited with code %ld" msgstr "Потпроцес је изашао са шифром %ld" -#: glib/gspawn.c:1178 +#: glib/gspawn.c:1183 #, c-format msgid "Child process killed by signal %ld" msgstr "Потпроцес је убијен сигналом %ld" -#: glib/gspawn.c:1185 +#: glib/gspawn.c:1190 #, c-format msgid "Child process stopped by signal %ld" msgstr "Потпроцес је заустављен сигналом %ld" -#: glib/gspawn.c:1192 +#: glib/gspawn.c:1197 #, c-format msgid "Child process exited abnormally" msgstr "Потпроцес је неочекивано прекинут" -#: glib/gspawn.c:1885 glib/gspawn-win32.c:393 glib/gspawn-win32.c:401 +#: glib/gspawn.c:2027 glib/gspawn-win32.c:393 glib/gspawn-win32.c:401 #, c-format msgid "Failed to read from child pipe (%s)" msgstr "Нисам успео да читам из спојке порода (%s)" -#: glib/gspawn.c:2248 +#: glib/gspawn.c:2399 #, c-format msgid "Failed to spawn child process “%s” (%s)" msgstr "Нисам успео да извршим потпроцес „%s“ (%s)" # за сада овако, можда гранање, умножавање? виљушкање ;-) -#: glib/gspawn.c:2365 +#: glib/gspawn.c:2525 #, c-format msgid "Failed to fork (%s)" msgstr "Нисам успео да исцепим (%s)" -#: glib/gspawn.c:2525 glib/gspawn-win32.c:424 +#: glib/gspawn.c:2685 glib/gspawn-win32.c:424 #, c-format msgid "Failed to change to directory “%s” (%s)" msgstr "Нисам успео да пређем у директоријум „%s“ (%s)" -#: glib/gspawn.c:2535 +#: glib/gspawn.c:2695 #, c-format msgid "Failed to execute child process “%s” (%s)" msgstr "Нисам успео да извршим потпроцес „%s“ (%s)" -#: glib/gspawn.c:2545 +#: glib/gspawn.c:2705 #, c-format msgid "Failed to open file to remap file descriptor (%s)" msgstr "" "Нисам успео да отворим датотеку да поново мапирам описника датотеке (%s)" -#: glib/gspawn.c:2553 +#: glib/gspawn.c:2713 #, c-format msgid "Failed to duplicate file descriptor for child process (%s)" msgstr "Нисам успео да удвостручим описника датотеке за изрођени процес (%s)" -#: glib/gspawn.c:2562 +#: glib/gspawn.c:2722 #, c-format msgid "Failed to fork child process (%s)" msgstr "Нисам успео да исцепим потпроцес (%s)" -#: glib/gspawn.c:2570 +#: glib/gspawn.c:2730 #, c-format msgid "Failed to close file descriptor for child process (%s)" msgstr "Нисам успео да затворим описника датотеке за изрођени процес (%s)" -#: glib/gspawn.c:2578 +#: glib/gspawn.c:2738 #, c-format msgid "Unknown error executing child process “%s”" msgstr "Непозната грешка при извршавању потпроцеса „%s“" -#: glib/gspawn.c:2602 +#: glib/gspawn.c:2762 #, c-format msgid "Failed to read enough data from child pid pipe (%s)" msgstr "Није успео да прочита довољно података из цевке ка потпроцесу (%s)" +#: glib/gspawn-private.h:134 +#, c-format +msgid "Invalid source FDs argument" +msgstr "Неисправан изворни ФД аргумент" + #: glib/gspawn-win32.c:337 msgid "Failed to read data from child process" msgstr "Нисам успео да читам податке из потпроцеса" @@ -5957,27 +5965,27 @@ msgid "Invalid program name: %s" msgstr "Није исправан назив програма: %s" -#: glib/gspawn-win32.c:521 glib/gspawn-win32.c:853 +#: glib/gspawn-win32.c:521 glib/gspawn-win32.c:868 #, c-format msgid "Invalid string in argument vector at %d: %s" msgstr "Није исправна ниска — члан вектора у %d: %s" -#: glib/gspawn-win32.c:532 glib/gspawn-win32.c:869 +#: glib/gspawn-win32.c:532 glib/gspawn-win32.c:884 #, c-format msgid "Invalid string in environment: %s" msgstr "Није исправна ниска у окружењу: %s" -#: glib/gspawn-win32.c:849 +#: glib/gspawn-win32.c:864 #, c-format msgid "Invalid working directory: %s" msgstr "Није исправна радна фасцикла: %s" -#: glib/gspawn-win32.c:914 +#: glib/gspawn-win32.c:929 #, c-format msgid "Failed to execute helper program (%s)" msgstr "Нисам успео да извршим помоћнички програм (%s)" -#: glib/gspawn-win32.c:1143 +#: glib/gspawn-win32.c:1158 msgid "" "Unexpected error in g_io_channel_win32_poll() reading data from a child " "process" @@ -5985,21 +5993,21 @@ "Неочекивана грешка док су у „g_io_channel_win32_poll()“ читани подаци из " "потпроцеса" -#: glib/gstrfuncs.c:3372 glib/gstrfuncs.c:3474 +#: glib/gstrfuncs.c:3370 glib/gstrfuncs.c:3472 msgid "Empty string is not a number" msgstr "Празна ниска није број" -#: glib/gstrfuncs.c:3396 +#: glib/gstrfuncs.c:3394 #, c-format msgid "“%s” is not a signed number" msgstr "„%s“ није потписан број" -#: glib/gstrfuncs.c:3406 glib/gstrfuncs.c:3510 +#: glib/gstrfuncs.c:3404 glib/gstrfuncs.c:3508 #, c-format msgid "Number “%s” is out of bounds %s, %s" msgstr "Број „%s“ је ван граница %s, %s" -#: glib/gstrfuncs.c:3500 +#: glib/gstrfuncs.c:3498 #, c-format msgid "“%s” is not an unsigned number" msgstr "„%s“ није непотписан број" @@ -6078,128 +6086,126 @@ msgstr "Знак ван опсега за УТФ-16" #. Translators: A unit symbol for size formatting, showing for example: "13.0 kB" -#: glib/gutils.c:2857 +#: glib/gutils.c:2966 msgid "kB" msgstr "kB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 MB" -#: glib/gutils.c:2859 +#: glib/gutils.c:2968 msgid "MB" msgstr "MB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 GB" -#: glib/gutils.c:2861 +#: glib/gutils.c:2970 msgid "GB" msgstr "GB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 TB" -#: glib/gutils.c:2863 +#: glib/gutils.c:2972 msgid "TB" msgstr "TB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 PB" -#: glib/gutils.c:2865 +#: glib/gutils.c:2974 msgid "PB" msgstr "PB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 EB" -#: glib/gutils.c:2867 +#: glib/gutils.c:2976 msgid "EB" msgstr "EB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 KiB" -#: glib/gutils.c:2871 +#: glib/gutils.c:2980 msgid "KiB" msgstr "KiB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 MiB" -#: glib/gutils.c:2873 +#: glib/gutils.c:2982 msgid "MiB" msgstr "MiB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 GiB" -#: glib/gutils.c:2875 +#: glib/gutils.c:2984 msgid "GiB" msgstr "GiB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 TiB" -#: glib/gutils.c:2877 +#: glib/gutils.c:2986 msgid "TiB" msgstr "TiB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 PiB" -#: glib/gutils.c:2879 +#: glib/gutils.c:2988 msgid "PiB" msgstr "PiB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 EiB" -#: glib/gutils.c:2881 +#: glib/gutils.c:2990 msgid "EiB" msgstr "EiB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 kb" -#: glib/gutils.c:2885 +#: glib/gutils.c:2994 msgid "kb" msgstr "kb" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Mb" -#: glib/gutils.c:2887 +#: glib/gutils.c:2996 msgid "Mb" msgstr "Mb" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Gb" -#: glib/gutils.c:2889 +#: glib/gutils.c:2998 msgid "Gb" msgstr "Gb" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Tb" -#: glib/gutils.c:2891 +#: glib/gutils.c:3000 msgid "Tb" msgstr "Tb" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Pb" -#: glib/gutils.c:2893 +#: glib/gutils.c:3002 msgid "Pb" msgstr "Pb" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Eb" -#: glib/gutils.c:2895 +#: glib/gutils.c:3004 msgid "Eb" msgstr "Eb" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Kib" -#: glib/gutils.c:2899 +#: glib/gutils.c:3008 msgid "Kib" msgstr "Kib" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Mib" -#: glib/gutils.c:2901 +#: glib/gutils.c:3010 msgid "Mib" msgstr "Mib" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Gib" -#: glib/gutils.c:2903 +#: glib/gutils.c:3012 msgid "Gib" msgstr "Gib" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Tib" -#: glib/gutils.c:2905 +#: glib/gutils.c:3014 msgid "Tib" msgstr "Tib" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Pib" -#: glib/gutils.c:2907 +#: glib/gutils.c:3016 msgid "Pib" msgstr "Pib" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Eib" -#: glib/gutils.c:2909 +#: glib/gutils.c:3018 msgid "Eib" msgstr "Eib" -#: glib/gutils.c:2947 -#| msgid "%u byte" -#| msgid_plural "%u bytes" +#: glib/gutils.c:3056 msgid "byte" msgid_plural "bytes" msgstr0 "бајт" @@ -6207,9 +6213,7 @@ msgstr2 "бајтова" msgstr3 "бајт" -#: glib/gutils.c:2951 -#| msgid "%u bit" -#| msgid_plural "%u bits" +#: glib/gutils.c:3060 msgid "bit" msgid_plural "bits" msgstr0 "%u бит" @@ -6219,7 +6223,7 @@ #. Translators: The "%u" is replaced with the size value, like "13"; it could #. * be part of "13 bytes", but only the number is requested this time. -#: glib/gutils.c:2959 +#: glib/gutils.c:3068 #, c-format msgctxt "format-size" msgid "%u" @@ -6227,7 +6231,7 @@ #. Translators: The first "%u" is replaced with the value, the "%s" with a unit of the value. #. * The order can be changed with "%$2s %$1u". An example: "13 bytes" -#: glib/gutils.c:2964 +#: glib/gutils.c:3073 #, c-format msgctxt "format-size" msgid "%u %s" @@ -6235,9 +6239,8 @@ #. Translators: The "%.1f" is replaced with the size value, like "13.0"; it could #. * be part of "13.0 MB", but only the number is requested this time. -#: glib/gutils.c:3000 +#: glib/gutils.c:3109 #, c-format -#| msgid "%.1f KB" msgctxt "format-size" msgid "%.1f" msgstr "%.1f" @@ -6245,15 +6248,14 @@ #. Translators: The first "%.1f" is replaced with the value, the "%s" with a unit of the value. #. * The order can be changed with "%$2s %$1.1f". Keep the no-break space between the value and #. * the unit symbol. An example: "13.0 MB" -#: glib/gutils.c:3006 +#: glib/gutils.c:3115 #, c-format -#| msgid "%.1f kB" msgctxt "format-size" msgid "%.1f %s" msgstr "%.1f %s" #. Translators: the %s in "%s bytes" will always be replaced by a number. -#: glib/gutils.c:3046 +#: glib/gutils.c:3155 #, c-format msgid "%s byte" msgid_plural "%s bytes" @@ -6263,7 +6265,7 @@ msgstr3 "Један бајт" #. Translators: the %s in "%s bits" will always be replaced by a number. -#: glib/gutils.c:3051 +#: glib/gutils.c:3160 #, c-format msgid "%s bit" msgid_plural "%s bits" @@ -6272,7 +6274,7 @@ msgstr2 "%s битова" msgstr3 "Један бит" -#: glib/gutils.c:3092 +#: glib/gutils.c:3201 #, c-format msgid "%u byte" msgid_plural "%u bytes" @@ -6286,32 +6288,32 @@ #. * compatibility. Users will not see this string unless a program is using this deprecated function. #. * Please translate as literally as possible. #. -#: glib/gutils.c:3105 +#: glib/gutils.c:3214 #, c-format msgid "%.1f KB" msgstr "%.1f KB" -#: glib/gutils.c:3110 +#: glib/gutils.c:3219 #, c-format msgid "%.1f MB" msgstr "%.1f MB" -#: glib/gutils.c:3115 +#: glib/gutils.c:3224 #, c-format msgid "%.1f GB" msgstr "%.1f GB" -#: glib/gutils.c:3120 +#: glib/gutils.c:3229 #, c-format msgid "%.1f TB" msgstr "%.1f TB" -#: glib/gutils.c:3125 +#: glib/gutils.c:3234 #, c-format msgid "%.1f PB" msgstr "%.1f PB" -#: glib/gutils.c:3130 +#: glib/gutils.c:3239 #, c-format msgid "%.1f EB" msgstr "%.1f EB"
View file
_service:tar_scm:glib-2.74.4.tar.xz/po/sv.po -> _service:tar_scm:glib-2.76.4.tar.xz/po/sv.po
Changed
@@ -1,17 +1,17 @@ # Swedish messages for glib. -# Copyright © 2001-2022 Free Software Foundation, Inc. +# Copyright © 2001-2023 Free Software Foundation, Inc. # Christian Rose <menthos@menthos.com>, 2001-2005. # Daniel Nylander <po@danielnylander.se>, 2006-2012. # Sebastian Rasmussen <sebras@gmail.com>, 2014, 2015. -# Anders Jonsson <anders.jonsson@norsjovallen.se>, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022. +# Anders Jonsson <anders.jonsson@norsjovallen.se>, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023. # Luna Jernberg <droidbittin@gmail.com>, 2021, 2022. # msgid "" msgstr "" "Project-Id-Version: glib\n" "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/glib/issues\n" -"POT-Creation-Date: 2022-09-06 17:22+0000\n" -"PO-Revision-Date: 2022-09-10 11:00+0200\n" +"POT-Creation-Date: 2023-02-15 16:30+0000\n" +"PO-Revision-Date: 2023-02-15 18:07+0100\n" "Last-Translator: Anders Jonsson <anders.jonsson@norsjovallen.se>\n" "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n" "Language: sv\n" @@ -19,22 +19,22 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 3.1.1\n" +"X-Generator: Poedit 3.2.2\n" -#: gio/gappinfo.c:335 +#: gio/gappinfo.c:339 msgid "Setting default applications not supported yet" msgstr "Inställning av standardprogram stöds inte ännu" -#: gio/gappinfo.c:368 +#: gio/gappinfo.c:372 msgid "Setting application as last used for type not supported yet" msgstr "Inställning av program som senast använt för typ stöds inte ännu" -#: gio/gappinfo.c:810 +#: gio/gappinfo.c:814 #, c-format msgid "Failed to find default application for content type ‘%s’" msgstr "Misslyckades med att hitta standardprogram för innehållstypen ”%s”" -#: gio/gappinfo.c:870 +#: gio/gappinfo.c:874 #, c-format msgid "Failed to find default application for URI Scheme ‘%s’" msgstr "Misslyckades med att hitta standardprogram för URI-schemat ”%s”" @@ -232,11 +232,11 @@ msgid "error sending %s message to application: %s\n" msgstr "fel vid sändning av meddelande %s till program: %s\n" -#: gio/gapplication-tool.c:321 +#: gio/gapplication-tool.c:324 msgid "action name must be given after application id\n" msgstr "åtgärdsnamn måste ges efter program-ID\n" -#: gio/gapplication-tool.c:329 +#: gio/gapplication-tool.c:332 #, c-format msgid "" "invalid action name: “%s”\n" @@ -245,25 +245,25 @@ "ogiltigt åtgärdsnamn: ”%s”\n" "åtgärdsnamn måste bestå av enbart alfanumeriska, ”-” och ”.”\n" -#: gio/gapplication-tool.c:348 +#: gio/gapplication-tool.c:351 #, c-format msgid "error parsing action parameter: %s\n" msgstr "fel vid tolkning av åtgärdsparameter: %s\n" -#: gio/gapplication-tool.c:360 +#: gio/gapplication-tool.c:363 msgid "actions accept a maximum of one parameter\n" msgstr "åtgärder accepterar maximalt en parameter\n" -#: gio/gapplication-tool.c:415 +#: gio/gapplication-tool.c:418 msgid "list-actions command takes only the application id" msgstr "list-actions-kommandot tar enbart program-ID:t" -#: gio/gapplication-tool.c:425 +#: gio/gapplication-tool.c:428 #, c-format msgid "unable to find desktop file for application %s\n" msgstr "kunde inte hitta desktopfil för programmet %s\n" -#: gio/gapplication-tool.c:470 +#: gio/gapplication-tool.c:473 #, c-format msgid "" "unrecognised command: %s\n" @@ -298,7 +298,7 @@ msgid "Truncate not supported on base stream" msgstr "Kapning stöds inte på basströmmen" -#: gio/gcancellable.c:319 gio/gdbusconnection.c:1859 gio/gdbusprivate.c:1420 +#: gio/gcancellable.c:326 gio/gdbusconnection.c:1859 gio/gdbusprivate.c:1420 #: gio/gsimpleasyncresult.c:873 gio/gsimpleasyncresult.c:899 #, c-format msgid "Operation was cancelled" @@ -318,13 +318,13 @@ #: gio/gcharsetconverter.c:344 gio/gdatainputstream.c:850 #: gio/gdatainputstream.c:1268 glib/gconvert.c:451 glib/gconvert.c:883 -#: glib/giochannel.c:1576 glib/giochannel.c:1618 glib/giochannel.c:2473 +#: glib/giochannel.c:1576 glib/giochannel.c:1618 glib/giochannel.c:2478 #: glib/gutf8.c:892 glib/gutf8.c:1346 msgid "Invalid byte sequence in conversion input" msgstr "Ogiltig bytesekvens i konverteringsindata" #: gio/gcharsetconverter.c:349 glib/gconvert.c:459 glib/gconvert.c:797 -#: glib/giochannel.c:1583 glib/giochannel.c:2485 +#: glib/giochannel.c:1583 glib/giochannel.c:2493 #, c-format msgid "Error during conversion: %s" msgstr "Fel vid konvertering: %s" @@ -381,17 +381,17 @@ msgid "Unexpected early end-of-stream" msgstr "Oväntat tidig end-of-stream" -#: gio/gdbusaddress.c:164 gio/gdbusaddress.c:238 gio/gdbusaddress.c:327 +#: gio/gdbusaddress.c:162 gio/gdbusaddress.c:234 gio/gdbusaddress.c:321 #, c-format msgid "Unsupported key “%s” in address entry “%s”" msgstr "Nyckeln ”%s” stöds inte i adressposten ”%s”" -#: gio/gdbusaddress.c:177 +#: gio/gdbusaddress.c:175 #, c-format msgid "Meaningless key/value pair combination in address entry “%s”" msgstr "Betydelselös kombination av nyckel/värde-par i adressposten ”%s”" -#: gio/gdbusaddress.c:186 +#: gio/gdbusaddress.c:184 #, c-format msgid "" "Address “%s” is invalid (need exactly one of path, dir, tmpdir, or abstract " @@ -400,28 +400,28 @@ "Adressen ”%s” är ogiltig (behöver exakt en av sökväg, katalog, " "temporärkatalog eller abstrakta nycklar)" -#: gio/gdbusaddress.c:253 gio/gdbusaddress.c:264 gio/gdbusaddress.c:279 -#: gio/gdbusaddress.c:342 gio/gdbusaddress.c:353 +#: gio/gdbusaddress.c:249 gio/gdbusaddress.c:260 gio/gdbusaddress.c:275 +#: gio/gdbusaddress.c:336 gio/gdbusaddress.c:347 #, c-format msgid "Error in address “%s” — the “%s” attribute is malformed" msgstr "Fel i adressen ”%s” — attributet ”%s” är felformulerat" -#: gio/gdbusaddress.c:423 gio/gdbusaddress.c:682 +#: gio/gdbusaddress.c:417 gio/gdbusaddress.c:676 #, c-format msgid "Unknown or unsupported transport “%s” for address “%s”" msgstr "Transport ”%s” är okänd eller saknar stöd för adressen ”%s”" -#: gio/gdbusaddress.c:467 +#: gio/gdbusaddress.c:461 #, c-format msgid "Address element “%s” does not contain a colon (:)" msgstr "Adresselementet ”%s” innehåller inte ett kolontecken (:)" -#: gio/gdbusaddress.c:476 +#: gio/gdbusaddress.c:470 #, c-format msgid "Transport name in address element “%s” must not be empty" msgstr "Transportnamn i adresselementet ”%s” får inte vara tomt" -#: gio/gdbusaddress.c:497 +#: gio/gdbusaddress.c:491 #, c-format msgid "" "Key/Value pair %d, “%s”, in address element “%s” does not contain an equal " @@ -430,14 +430,14 @@ "Nyckel/Värde-par %d, ”%s”, i adresselementet ”%s” innehåller inte ett " "likhetstecken" -#: gio/gdbusaddress.c:508 +#: gio/gdbusaddress.c:502 #, c-format msgid "" "Key/Value pair %d, “%s”, in address element “%s” must not have an empty key" msgstr "" "Nyckel/Värde-par %d, ”%s”, i adresselementet ”%s” får inte ha en tom nyckel" -#: gio/gdbusaddress.c:522 +#: gio/gdbusaddress.c:516 #, c-format msgid "" "Error unescaping key or value in Key/Value pair %d, “%s”, in address element " @@ -446,7 +446,7 @@ "Fel vid borttagning av escape i nyckel eller värde i Nyckel/Värde-par %d, " "”%s”, i adresselementet ”%s”" -#: gio/gdbusaddress.c:590 +#: gio/gdbusaddress.c:584 #, c-format msgid "" "Error in address “%s” — the unix transport requires exactly one of the keys " @@ -455,77 +455,77 @@ "Fel i adressen ”%s” — unix-transporten kräver att exakt en av nycklarna " "”path” eller ”abstract” har ställts in" -#: gio/gdbusaddress.c:625 +#: gio/gdbusaddress.c:619 #, c-format msgid "Error in address “%s” — the host attribute is missing or malformed" msgstr "Fel i adressen ”%s” — värdattributet saknas eller är felformulerat" -#: gio/gdbusaddress.c:639 +#: gio/gdbusaddress.c:633 #, c-format msgid "Error in address “%s” — the port attribute is missing or malformed" msgstr "Fel i adressen ”%s” — portattributet saknas eller är felformulerat" -#: gio/gdbusaddress.c:653 +#: gio/gdbusaddress.c:647 #, c-format msgid "Error in address “%s” — the noncefile attribute is missing or malformed" msgstr "" "Fel i adressen ”%s” — attributet noncefile saknas eller är felformulerat" -#: gio/gdbusaddress.c:674 +#: gio/gdbusaddress.c:668 msgid "Error auto-launching: " msgstr "Fel vid automatisk körning: " -#: gio/gdbusaddress.c:727 +#: gio/gdbusaddress.c:721 #, c-format msgid "Error opening nonce file “%s”: %s" msgstr "Fel vid öppning av nonce-filen ”%s”: %s" -#: gio/gdbusaddress.c:746 +#: gio/gdbusaddress.c:740 #, c-format msgid "Error reading from nonce file “%s”: %s" msgstr "Fel vid läsning från nonce-filen ”%s”: %s" -#: gio/gdbusaddress.c:755 +#: gio/gdbusaddress.c:749 #, c-format msgid "Error reading from nonce file “%s”, expected 16 bytes, got %d" msgstr "Fel vid läsning från nonce-filen ”%s”, förväntade 16 byte, fick %d" -#: gio/gdbusaddress.c:773 +#: gio/gdbusaddress.c:767 #, c-format msgid "Error writing contents of nonce file “%s” to stream:" msgstr "Fel vid skrivning av innehåll i nonce-filen ”%s” till ström:" -#: gio/gdbusaddress.c:988 +#: gio/gdbusaddress.c:982 msgid "The given address is empty" msgstr "Angivna adressen är tom" -#: gio/gdbusaddress.c:1101 +#: gio/gdbusaddress.c:1095 #, c-format msgid "Cannot spawn a message bus when AT_SECURE is set" msgstr "Kan inte starta en meddelandebuss när AT_SECURE har ställts in" -#: gio/gdbusaddress.c:1108 +#: gio/gdbusaddress.c:1102 msgid "Cannot spawn a message bus without a machine-id: " msgstr "Kan inte starta en meddelandebuss utan ett maskin-id: " -#: gio/gdbusaddress.c:1115 +#: gio/gdbusaddress.c:1109 #, c-format msgid "Cannot autolaunch D-Bus without X11 $DISPLAY" msgstr "Kan inte starta D-Bus automatiskt utan X11-miljövariabeln $DISPLAY" -#: gio/gdbusaddress.c:1157 +#: gio/gdbusaddress.c:1151 #, c-format msgid "Error spawning command line “%s”: " msgstr "Fel vid körning av kommandoraden ”%s”: " -#: gio/gdbusaddress.c:1226 +#: gio/gdbusaddress.c:1220 #, c-format msgid "Cannot determine session bus address (not implemented for this OS)" msgstr "" "Kan inte fastställa adress för sessionsbuss (inte implementerat för detta " "operativsystem)" -#: gio/gdbusaddress.c:1375 gio/gdbusconnection.c:7321 +#: gio/gdbusaddress.c:1374 gio/gdbusconnection.c:7316 #, c-format msgid "" "Cannot determine bus address from DBUS_STARTER_BUS_TYPE environment variable " @@ -534,7 +534,7 @@ "Kan inte fastställa bussadressen från miljövariabeln DBUS_STARTER_BUS_TYPE — " "okänt värde ”%s”" -#: gio/gdbusaddress.c:1384 gio/gdbusconnection.c:7330 +#: gio/gdbusaddress.c:1383 gio/gdbusconnection.c:7325 msgid "" "Cannot determine bus address because the DBUS_STARTER_BUS_TYPE environment " "variable is not set" @@ -542,7 +542,7 @@ "Kan inte fastställa bussadress därför att miljövariabeln " "DBUS_STARTER_BUS_TYPE inte är inställd" -#: gio/gdbusaddress.c:1394 +#: gio/gdbusaddress.c:1393 #, c-format msgid "Unknown bus type %d" msgstr "Okänd busstyp %d" @@ -563,11 +563,15 @@ "Alla tillgängliga autentiseringsmekanismer har testats (försök: %s) " "(tillgängliga: %s)" -#: gio/gdbusauth.c:1178 +#: gio/gdbusauth.c:1045 +msgid "Unexpected lack of content trying to read a byte" +msgstr "Oväntad avsaknad av innehåll vid försök att läsa en byte" + +#: gio/gdbusauth.c:1195 msgid "User IDs must be the same for peer and server" msgstr "Användar-ID:n måste vara samma för motpart och server" -#: gio/gdbusauth.c:1190 +#: gio/gdbusauth.c:1207 msgid "Cancelled via GDBusAuthObserver::authorize-authenticated-peer" msgstr "Avbröts via GDBusAuthObserver::authorize-authenticated-peer" @@ -660,7 +664,7 @@ msgid "(Additionally, releasing the lock for “%s” also failed: %s) " msgstr "(I tillägg misslyckades även upplåsningen för ”%s”: %s) " -#: gio/gdbusconnection.c:590 gio/gdbusconnection.c:2404 +#: gio/gdbusconnection.c:590 gio/gdbusconnection.c:2405 msgid "The connection is closed" msgstr "Anslutningen är stängd" @@ -668,14 +672,14 @@ msgid "Timeout was reached" msgstr "Tidsgränsen uppnåddes" -#: gio/gdbusconnection.c:2527 +#: gio/gdbusconnection.c:2528 msgid "" "Unsupported flags encountered when constructing a client-side connection" msgstr "" "Flaggor som inte stöds påträffades vid konstruktion av en anslutning på " "klientsidan" -#: gio/gdbusconnection.c:4256 gio/gdbusconnection.c:4610 +#: gio/gdbusconnection.c:4257 gio/gdbusconnection.c:4611 #, c-format msgid "" "No such interface “org.freedesktop.DBus.Properties” on object at path %s" @@ -683,104 +687,104 @@ "Inget sådant gränssnitt ”org.freedesktop.DBus.Properties” på objekt med " "sökvägen %s" -#: gio/gdbusconnection.c:4401 +#: gio/gdbusconnection.c:4402 #, c-format msgid "No such property “%s”" msgstr "Ingen sådan egenskap ”%s”" -#: gio/gdbusconnection.c:4413 +#: gio/gdbusconnection.c:4414 #, c-format msgid "Property “%s” is not readable" msgstr "Egenskapen ”%s” är inte läsbar" -#: gio/gdbusconnection.c:4424 +#: gio/gdbusconnection.c:4425 #, c-format msgid "Property “%s” is not writable" msgstr "Egenskapen ”%s” är inte skrivbar" -#: gio/gdbusconnection.c:4444 +#: gio/gdbusconnection.c:4445 #, c-format msgid "Error setting property “%s”: Expected type “%s” but got “%s”" msgstr "" "Fel vid inställning av egenskapen ”%s”: Förväntade typen ”%s” men fick ”%s”" -#: gio/gdbusconnection.c:4549 gio/gdbusconnection.c:4764 -#: gio/gdbusconnection.c:6747 +#: gio/gdbusconnection.c:4550 gio/gdbusconnection.c:4765 +#: gio/gdbusconnection.c:6742 #, c-format msgid "No such interface “%s”" msgstr "Inget sådan gränssnitt ”%s”" -#: gio/gdbusconnection.c:4986 gio/gdbusconnection.c:7261 +#: gio/gdbusconnection.c:4981 gio/gdbusconnection.c:7256 #, c-format msgid "No such interface “%s” on object at path %s" msgstr "Inget sådant gränssnitt ”%s” på objekt med sökvägen %s" -#: gio/gdbusconnection.c:5087 +#: gio/gdbusconnection.c:5082 #, c-format msgid "No such method “%s”" msgstr "Ingen sådan metod ”%s”" -#: gio/gdbusconnection.c:5118 +#: gio/gdbusconnection.c:5113 #, c-format msgid "Type of message, “%s”, does not match expected type “%s”" msgstr "Typ av meddelande, ”%s”, matchar inte förväntade typen ”%s”" -#: gio/gdbusconnection.c:5321 +#: gio/gdbusconnection.c:5316 #, c-format msgid "An object is already exported for the interface %s at %s" msgstr "Ett objekt är redan exporterat för gränssnittet %s vid %s" -#: gio/gdbusconnection.c:5548 +#: gio/gdbusconnection.c:5543 #, c-format msgid "Unable to retrieve property %s.%s" msgstr "Kunde inte hämta egenskap %s.%s" -#: gio/gdbusconnection.c:5604 +#: gio/gdbusconnection.c:5599 #, c-format msgid "Unable to set property %s.%s" msgstr "Kunde inte sätta egenskap %s.%s" -#: gio/gdbusconnection.c:5783 +#: gio/gdbusconnection.c:5778 #, c-format msgid "Method “%s” returned type “%s”, but expected “%s”" msgstr "Metoden ”%s” returnerade typen ”%s”, men förväntade ”%s”" -#: gio/gdbusconnection.c:6859 +#: gio/gdbusconnection.c:6854 #, c-format msgid "Method “%s” on interface “%s” with signature “%s” does not exist" msgstr "Metoden ”%s” på gränssnittet ”%s” med signaturen ”%s” finns inte" -#: gio/gdbusconnection.c:6980 +#: gio/gdbusconnection.c:6975 #, c-format msgid "A subtree is already exported for %s" msgstr "Ett underträd har redan exporterats för %s" -#: gio/gdbusconnection.c:7269 +#: gio/gdbusconnection.c:7264 #, c-format msgid "Object does not exist at path “%s”" msgstr "Objektet finns inte på sökvägen ”%s”" -#: gio/gdbusmessage.c:1303 +#: gio/gdbusmessage.c:1306 msgid "type is INVALID" msgstr "typ är OGILTIG" -#: gio/gdbusmessage.c:1314 +#: gio/gdbusmessage.c:1317 msgid "METHOD_CALL message: PATH or MEMBER header field is missing" msgstr "METHOD_CALL-meddelande: rubrikfältet PATH eller MEMBER saknas" -#: gio/gdbusmessage.c:1325 +#: gio/gdbusmessage.c:1328 msgid "METHOD_RETURN message: REPLY_SERIAL header field is missing" msgstr "METHOD_RETURN-meddelande: rubrikfältet REPLY_SERIAL saknas" -#: gio/gdbusmessage.c:1337 +#: gio/gdbusmessage.c:1340 msgid "ERROR message: REPLY_SERIAL or ERROR_NAME header field is missing" msgstr "FELmeddelande: rubrikfältet REPLY_SERIAL eller ERROR_NAME saknas" -#: gio/gdbusmessage.c:1350 +#: gio/gdbusmessage.c:1353 msgid "SIGNAL message: PATH, INTERFACE or MEMBER header field is missing" msgstr "SIGNAL-meddelande: rubrikfältet PATH, INTERFACE eller MEMBER saknas" -#: gio/gdbusmessage.c:1358 +#: gio/gdbusmessage.c:1361 msgid "" "SIGNAL message: The PATH header field is using the reserved value /org/" "freedesktop/DBus/Local" @@ -788,7 +792,7 @@ "SIGNAL-meddelande: Rubrikfältet PATH använder det reserverade värdet /org/" "freedesktop/DBus/Local" -#: gio/gdbusmessage.c:1366 +#: gio/gdbusmessage.c:1369 msgid "" "SIGNAL message: The INTERFACE header field is using the reserved value org." "freedesktop.DBus.Local" @@ -796,19 +800,19 @@ "SIGNAL-meddelande: Rubrikfältet INTERFACE använder det reserverade värdet " "org.freedesktop.DBus.Local" -#: gio/gdbusmessage.c:1414 gio/gdbusmessage.c:1474 +#: gio/gdbusmessage.c:1417 gio/gdbusmessage.c:1477 #, c-format msgid "Wanted to read %lu byte but only got %lu" msgid_plural "Wanted to read %lu bytes but only got %lu" msgstr0 "Ville läsa %lu byte men fick bara %lu" msgstr1 "Ville läsa %lu byte men fick bara %lu" -#: gio/gdbusmessage.c:1428 +#: gio/gdbusmessage.c:1431 #, c-format msgid "Expected NUL byte after the string “%s” but found byte %d" msgstr "Förväntade NUL-byte efter strängen ”%s” men hittade byte %d" -#: gio/gdbusmessage.c:1447 +#: gio/gdbusmessage.c:1450 #, c-format msgid "" "Expected valid UTF-8 string but found invalid bytes at byte offset %d " @@ -818,21 +822,21 @@ "(längd av strängen är %d). Den giltiga UTF-8-strängen fram till den punkten " "var ”%s”" -#: gio/gdbusmessage.c:1511 gio/gdbusmessage.c:1787 gio/gdbusmessage.c:1998 +#: gio/gdbusmessage.c:1514 gio/gdbusmessage.c:1790 gio/gdbusmessage.c:2001 msgid "Value nested too deeply" msgstr "Värde nästlat för djupt" -#: gio/gdbusmessage.c:1679 +#: gio/gdbusmessage.c:1682 #, c-format msgid "Parsed value “%s” is not a valid D-Bus object path" msgstr "Tolkat värde ”%s” är inte en giltig D-Bus-objektsökväg" -#: gio/gdbusmessage.c:1703 +#: gio/gdbusmessage.c:1706 #, c-format msgid "Parsed value “%s” is not a valid D-Bus signature" msgstr "Tolkat värde ”%s” är inte en giltig D-Bus-signatur" -#: gio/gdbusmessage.c:1754 +#: gio/gdbusmessage.c:1757 #, c-format msgid "" "Encountered array of length %u byte. Maximum length is 2<<26 bytes (64 MiB)." @@ -843,7 +847,7 @@ msgstr1 "" "Påträffade array med längden %u byte. Maximal längd är 2<<26 byte (64 MiB)." -#: gio/gdbusmessage.c:1774 +#: gio/gdbusmessage.c:1777 #, c-format msgid "" "Encountered array of type “a%c”, expected to have a length a multiple of %u " @@ -852,16 +856,16 @@ "Påträffade array av typ ”a%c”, förväntad att ha en längd som är en multipel " "av %u byte, men visade sig vara %u byte lång" -#: gio/gdbusmessage.c:1928 gio/gdbusmessage.c:2647 +#: gio/gdbusmessage.c:1931 gio/gdbusmessage.c:2650 msgid "Empty structures (tuples) are not allowed in D-Bus" msgstr "Tomma strukturer (tupler) tillåts inte i D-Bus" -#: gio/gdbusmessage.c:1982 +#: gio/gdbusmessage.c:1985 #, c-format msgid "Parsed value “%s” for variant is not a valid D-Bus signature" msgstr "Tolkat värde ”%s” för variant är inte en giltig D-Bus-signatur" -#: gio/gdbusmessage.c:2023 +#: gio/gdbusmessage.c:2026 #, c-format msgid "" "Error deserializing GVariant with type string “%s” from the D-Bus wire format" @@ -869,7 +873,7 @@ "Fel vid deserialisering av GVariant med typsträngen ”%s” från D-Bus-" "transportformatet" -#: gio/gdbusmessage.c:2208 +#: gio/gdbusmessage.c:2211 #, c-format msgid "" "Invalid endianness value. Expected 0x6c (“l”) or 0x42 (“B”) but found value " @@ -878,38 +882,38 @@ "Ogiltigt värde för byteordning. Förväntade 0x6c (”l”) eller 0x42 (”B”) men " "hittade värdet 0x%02x" -#: gio/gdbusmessage.c:2227 +#: gio/gdbusmessage.c:2230 #, c-format msgid "Invalid major protocol version. Expected 1 but found %d" msgstr "Ogiltig större protokollversion. Förväntade 1 men hittade %d" -#: gio/gdbusmessage.c:2285 gio/gdbusmessage.c:2883 +#: gio/gdbusmessage.c:2288 gio/gdbusmessage.c:2886 msgid "Signature header found but is not of type signature" msgstr "Signaturrubrik hittades men är inte av typen signatur" -#: gio/gdbusmessage.c:2297 +#: gio/gdbusmessage.c:2300 #, c-format msgid "Signature header with signature “%s” found but message body is empty" msgstr "" "Signaturrubrik med signaturen ”%s” hittades men meddelandekroppen är tom" -#: gio/gdbusmessage.c:2312 +#: gio/gdbusmessage.c:2315 #, c-format msgid "Parsed value “%s” is not a valid D-Bus signature (for body)" msgstr "Tolkat värde ”%s” är inte en giltig D-Bus-signatur (för kropp)" -#: gio/gdbusmessage.c:2344 +#: gio/gdbusmessage.c:2347 #, 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" msgstr0 "Ingen signaturrubrik i meddelande men meddelandekroppen är %u byte" msgstr1 "Ingen signaturrubrik i meddelande men meddelandekroppen är %u byte" -#: gio/gdbusmessage.c:2354 +#: gio/gdbusmessage.c:2357 msgid "Cannot deserialize message: " msgstr "Kan inte deserialisera meddelande: " -#: gio/gdbusmessage.c:2700 +#: gio/gdbusmessage.c:2703 #, c-format msgid "" "Error serializing GVariant with type string “%s” to the D-Bus wire format" @@ -917,23 +921,23 @@ "Fel vid serialisering av GVariant med typsträngen ”%s” till D-Bus-" "transportformatet" -#: gio/gdbusmessage.c:2837 +#: gio/gdbusmessage.c:2840 #, c-format msgid "" "Number of file descriptors in message (%d) differs from header field (%d)" msgstr "Antal filhandtag i meddelande (%d) skiljer sig från rubrikfältet (%d)" -#: gio/gdbusmessage.c:2845 +#: gio/gdbusmessage.c:2848 msgid "Cannot serialize message: " msgstr "Kan inte serialisera meddelandet: " -#: gio/gdbusmessage.c:2898 +#: gio/gdbusmessage.c:2901 #, c-format msgid "Message body has signature “%s” but there is no signature header" msgstr "" "Meddelandekroppen har signaturen ”%s” men det finns ingen signaturrubrik" -#: gio/gdbusmessage.c:2908 +#: gio/gdbusmessage.c:2911 #, c-format msgid "" "Message body has type signature “%s” but signature in the header field is " @@ -942,17 +946,17 @@ "Meddelandekroppen har typsignaturen ”%s” men signaturen i rubrikfältet är " "”%s”" -#: gio/gdbusmessage.c:2924 +#: gio/gdbusmessage.c:2927 #, c-format msgid "Message body is empty but signature in the header field is “(%s)”" msgstr "Meddelandekroppen är tom men signaturen i rubrikfältet är ”(%s)”" -#: gio/gdbusmessage.c:3479 +#: gio/gdbusmessage.c:3482 #, c-format msgid "Error return with body of type “%s”" msgstr "Fel returnerades med kropp av typen ”%s”" -#: gio/gdbusmessage.c:3487 +#: gio/gdbusmessage.c:3490 msgid "Error return with empty body" msgstr "Fel returnerade med tom kropp" @@ -977,17 +981,17 @@ msgid "Unable to load %s or %s: " msgstr "Kunde inte läsa in %s eller %s: " -#: gio/gdbusproxy.c:1575 +#: gio/gdbusproxy.c:1568 #, c-format msgid "Error calling StartServiceByName for %s: " msgstr "Fel vid anrop av StartServiceByName för %s: " -#: gio/gdbusproxy.c:1598 +#: gio/gdbusproxy.c:1591 #, c-format msgid "Unexpected reply %d from StartServiceByName(\"%s\") method" msgstr "Oväntat svar %d från StartServiceByName(”%s”)-metod" -#: gio/gdbusproxy.c:2709 gio/gdbusproxy.c:2844 +#: gio/gdbusproxy.c:2702 gio/gdbusproxy.c:2837 #, c-format msgid "" "Cannot invoke method; proxy is for the well-known name %s without an owner, " @@ -996,25 +1000,25 @@ "Kan inte anropa metod; proxy är för det välkända namnet %s utan en ägare och " "proxy konstruerades med flaggan G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START" -#: gio/gdbusserver.c:765 +#: gio/gdbusserver.c:758 msgid "Abstract namespace not supported" msgstr "Abstrakt namnrymd stöds inte" -#: gio/gdbusserver.c:857 +#: gio/gdbusserver.c:850 msgid "Cannot specify nonce file when creating a server" msgstr "Kan inte ange nonce-filen när en server skapas" -#: gio/gdbusserver.c:939 +#: gio/gdbusserver.c:932 #, c-format msgid "Error writing nonce file at “%s”: %s" msgstr "Fel vid skrivning av nonce-fil i ”%s”: %s" -#: gio/gdbusserver.c:1114 +#: gio/gdbusserver.c:1107 #, c-format msgid "The string “%s” is not a valid D-Bus GUID" msgstr "Strängen ”%s” är inte ett giltigt D-Bus GUID" -#: gio/gdbusserver.c:1152 +#: gio/gdbusserver.c:1145 #, c-format msgid "Cannot listen on unsupported transport “%s”" msgstr "Kan inte lyssna på transport ”%s” som inte stöds" @@ -1042,14 +1046,14 @@ "\n" "Använd ”%s KOMMANDO --help” för hjälp med varje kommando.\n" -#: gio/gdbus-tool.c:204 gio/gdbus-tool.c:276 gio/gdbus-tool.c:348 -#: gio/gdbus-tool.c:372 gio/gdbus-tool.c:862 gio/gdbus-tool.c:1247 -#: gio/gdbus-tool.c:1734 +#: gio/gdbus-tool.c:204 gio/gdbus-tool.c:276 gio/gdbus-tool.c:347 +#: gio/gdbus-tool.c:371 gio/gdbus-tool.c:861 gio/gdbus-tool.c:1246 +#: gio/gdbus-tool.c:1733 #, c-format msgid "Error: %s\n" msgstr "Fel: %s\n" -#: gio/gdbus-tool.c:215 gio/gdbus-tool.c:289 gio/gdbus-tool.c:1750 +#: gio/gdbus-tool.c:215 gio/gdbus-tool.c:289 gio/gdbus-tool.c:1749 #, c-format msgid "Error parsing introspection XML: %s\n" msgstr "Fel vid tolkning av introspektions-XML: %s\n" @@ -1059,49 +1063,49 @@ msgid "Error: %s is not a valid name\n" msgstr "Fel: %s är inte ett giltigt namn\n" -#: gio/gdbus-tool.c:258 gio/gdbus-tool.c:748 gio/gdbus-tool.c:1066 -#: gio/gdbus-tool.c:1900 gio/gdbus-tool.c:2140 +#: gio/gdbus-tool.c:258 gio/gdbus-tool.c:747 gio/gdbus-tool.c:1065 +#: gio/gdbus-tool.c:1899 gio/gdbus-tool.c:2139 #, c-format msgid "Error: %s is not a valid object path\n" msgstr "Fel: %s är inte en giltig objektsökväg\n" -#: gio/gdbus-tool.c:406 +#: gio/gdbus-tool.c:405 msgid "Connect to the system bus" msgstr "Anslut till systembussen" -#: gio/gdbus-tool.c:407 +#: gio/gdbus-tool.c:406 msgid "Connect to the session bus" msgstr "Anslut till sessionsbussen" -#: gio/gdbus-tool.c:408 +#: gio/gdbus-tool.c:407 msgid "Connect to given D-Bus address" msgstr "Anslut till angiven D-Bus-adress" -#: gio/gdbus-tool.c:418 +#: gio/gdbus-tool.c:417 msgid "Connection Endpoint Options:" msgstr "Flaggor för anslutningspunkt:" -#: gio/gdbus-tool.c:419 +#: gio/gdbus-tool.c:418 msgid "Options specifying the connection endpoint" msgstr "Flaggor som anger anslutningens ändpunkt" -#: gio/gdbus-tool.c:442 +#: gio/gdbus-tool.c:441 #, c-format msgid "No connection endpoint specified" msgstr "Ingen anslutningsändpunkt har angivits" -#: gio/gdbus-tool.c:452 +#: gio/gdbus-tool.c:451 #, c-format msgid "Multiple connection endpoints specified" msgstr "Flera anslutningsändpunkter har angivits" -#: gio/gdbus-tool.c:525 +#: gio/gdbus-tool.c:524 #, c-format msgid "" "Warning: According to introspection data, interface “%s” does not exist\n" msgstr "Varning: Enligt introspektionsdata finns inte gränssnittet ”%s”\n" -#: gio/gdbus-tool.c:534 +#: gio/gdbus-tool.c:533 #, c-format msgid "" "Warning: According to introspection data, method “%s” does not exist on " @@ -1110,164 +1114,164 @@ "Varning: Enligt introspektionsdata finns inte metoden ”%s” på gränssnittet " "”%s”\n" -#: gio/gdbus-tool.c:596 +#: gio/gdbus-tool.c:595 msgid "Optional destination for signal (unique name)" msgstr "Frivilligt mål för signal (unikt namn)" -#: gio/gdbus-tool.c:597 +#: gio/gdbus-tool.c:596 msgid "Object path to emit signal on" msgstr "Objektsökväg att sända signalen på" -#: gio/gdbus-tool.c:598 +#: gio/gdbus-tool.c:597 msgid "Signal and interface name" msgstr "Signal- och gränssnittsnamn" -#: gio/gdbus-tool.c:631 +#: gio/gdbus-tool.c:630 msgid "Emit a signal." msgstr "Sänd en signal." -#: gio/gdbus-tool.c:686 gio/gdbus-tool.c:1003 gio/gdbus-tool.c:1837 -#: gio/gdbus-tool.c:2069 gio/gdbus-tool.c:2289 +#: gio/gdbus-tool.c:685 gio/gdbus-tool.c:1002 gio/gdbus-tool.c:1836 +#: gio/gdbus-tool.c:2068 gio/gdbus-tool.c:2288 #, c-format msgid "Error connecting: %s\n" msgstr "Fel vid anslutning: %s\n" -#: gio/gdbus-tool.c:706 +#: gio/gdbus-tool.c:705 #, c-format msgid "Error: %s is not a valid unique bus name.\n" msgstr "Fel: %s är inte ett giltigt unikt bussnamn.\n" -#: gio/gdbus-tool.c:725 gio/gdbus-tool.c:1046 gio/gdbus-tool.c:1880 +#: gio/gdbus-tool.c:724 gio/gdbus-tool.c:1045 gio/gdbus-tool.c:1879 msgid "Error: Object path is not specified\n" msgstr "Fel: Objektsökväg har inte angivits\n" -#: gio/gdbus-tool.c:768 +#: gio/gdbus-tool.c:767 msgid "Error: Signal name is not specified\n" msgstr "Fel: Signalnamnet är inte angivet\n" -#: gio/gdbus-tool.c:782 +#: gio/gdbus-tool.c:781 #, c-format msgid "Error: Signal name “%s” is invalid\n" msgstr "Fel: Signalnamnet ”%s” är ogiltigt\n" -#: gio/gdbus-tool.c:794 +#: gio/gdbus-tool.c:793 #, c-format msgid "Error: %s is not a valid interface name\n" msgstr "Fel: %s är inte ett giltigt gränssnittsnamn\n" -#: gio/gdbus-tool.c:800 +#: gio/gdbus-tool.c:799 #, c-format msgid "Error: %s is not a valid member name\n" msgstr "Fel: %s är inte ett giltigt medlemsnamn\n" #. Use the original non-"parse-me-harder" error -#: gio/gdbus-tool.c:837 gio/gdbus-tool.c:1178 +#: gio/gdbus-tool.c:836 gio/gdbus-tool.c:1177 #, c-format msgid "Error parsing parameter %d: %s\n" msgstr "Fel vid tolkning av parameter %d: %s\n" -#: gio/gdbus-tool.c:869 +#: gio/gdbus-tool.c:868 #, c-format msgid "Error flushing connection: %s\n" msgstr "Fel vid tömning av anslutning: %s\n" -#: gio/gdbus-tool.c:897 +#: gio/gdbus-tool.c:896 msgid "Destination name to invoke method on" msgstr "Målnamn att anropa metod på" -#: gio/gdbus-tool.c:898 +#: gio/gdbus-tool.c:897 msgid "Object path to invoke method on" msgstr "Objektsökväg att anropa metod på" -#: gio/gdbus-tool.c:899 +#: gio/gdbus-tool.c:898 msgid "Method and interface name" msgstr "Metod- och gränssnittsnamn" -#: gio/gdbus-tool.c:900 +#: gio/gdbus-tool.c:899 msgid "Timeout in seconds" msgstr "Tidsgräns i sekunder" -#: gio/gdbus-tool.c:901 +#: gio/gdbus-tool.c:900 msgid "Allow interactive authorization" msgstr "Tillåt interaktiv auktorisering" -#: gio/gdbus-tool.c:948 +#: gio/gdbus-tool.c:947 msgid "Invoke a method on a remote object." msgstr "Anropa en metod på ett fjärrobjekt." -#: gio/gdbus-tool.c:1020 gio/gdbus-tool.c:1854 gio/gdbus-tool.c:2094 +#: gio/gdbus-tool.c:1019 gio/gdbus-tool.c:1853 gio/gdbus-tool.c:2093 msgid "Error: Destination is not specified\n" msgstr "Fel: Mål har inte angivits\n" -#: gio/gdbus-tool.c:1031 gio/gdbus-tool.c:1871 gio/gdbus-tool.c:2105 +#: gio/gdbus-tool.c:1030 gio/gdbus-tool.c:1870 gio/gdbus-tool.c:2104 #, c-format msgid "Error: %s is not a valid bus name\n" msgstr "Fel: %s är inte ett giltigt bussnamn\n" -#: gio/gdbus-tool.c:1081 +#: gio/gdbus-tool.c:1080 msgid "Error: Method name is not specified\n" msgstr "Fel: Metodnamnet är inte angivet\n" -#: gio/gdbus-tool.c:1092 +#: gio/gdbus-tool.c:1091 #, c-format msgid "Error: Method name “%s” is invalid\n" msgstr "Fel: Metodnamnet ”%s” är ogiltigt\n" -#: gio/gdbus-tool.c:1170 +#: gio/gdbus-tool.c:1169 #, c-format msgid "Error parsing parameter %d of type “%s”: %s\n" msgstr "Fel vid tolkning av parameter %d av typen ”%s”: %s\n" -#: gio/gdbus-tool.c:1196 +#: gio/gdbus-tool.c:1195 #, c-format msgid "Error adding handle %d: %s\n" msgstr "Fel vid tillägg av handtag %d: %s\n" -#: gio/gdbus-tool.c:1696 +#: gio/gdbus-tool.c:1695 msgid "Destination name to introspect" msgstr "Målnamn att introspektera" -#: gio/gdbus-tool.c:1697 +#: gio/gdbus-tool.c:1696 msgid "Object path to introspect" msgstr "Objektsökväg att introspektera" -#: gio/gdbus-tool.c:1698 +#: gio/gdbus-tool.c:1697 msgid "Print XML" msgstr "Skriv ut XML" -#: gio/gdbus-tool.c:1699 +#: gio/gdbus-tool.c:1698 msgid "Introspect children" msgstr "Introspektera barn" -#: gio/gdbus-tool.c:1700 +#: gio/gdbus-tool.c:1699 msgid "Only print properties" msgstr "Skriv endast ut egenskaper" -#: gio/gdbus-tool.c:1789 +#: gio/gdbus-tool.c:1788 msgid "Introspect a remote object." msgstr "Introspektera ett fjärrobjekt." -#: gio/gdbus-tool.c:1995 +#: gio/gdbus-tool.c:1994 msgid "Destination name to monitor" msgstr "Målnamn att övervaka" -#: gio/gdbus-tool.c:1996 +#: gio/gdbus-tool.c:1995 msgid "Object path to monitor" msgstr "Objektsökväg att övervaka" -#: gio/gdbus-tool.c:2021 +#: gio/gdbus-tool.c:2020 msgid "Monitor a remote object." msgstr "Övervaka ett fjärrobjekt." -#: gio/gdbus-tool.c:2079 +#: gio/gdbus-tool.c:2078 msgid "Error: can’t monitor a non-message-bus connection\n" msgstr "Fel: kan inte övervaka en anslutning som ej är på meddelandebuss\n" -#: gio/gdbus-tool.c:2203 +#: gio/gdbus-tool.c:2202 msgid "Service to activate before waiting for the other one (well-known name)" msgstr "Tjänst att aktivera innan den andra väntas på (välkänt namn)" -#: gio/gdbus-tool.c:2206 +#: gio/gdbus-tool.c:2205 msgid "" "Timeout to wait for before exiting with an error (seconds); 0 for no timeout " "(default)" @@ -1275,27 +1279,27 @@ "Tidsgräns att vänta på innan vi avslutar med ett fel (sekunder); 0 för ingen " "tidsgräns (standard)" -#: gio/gdbus-tool.c:2254 +#: gio/gdbus-tool.c:2253 msgid "OPTION… BUS-NAME" msgstr "FLAGGA… BUSSNAMN" -#: gio/gdbus-tool.c:2255 +#: gio/gdbus-tool.c:2254 msgid "Wait for a bus name to appear." msgstr "Vänta på att ett bussnamn ska dyka upp." -#: gio/gdbus-tool.c:2331 +#: gio/gdbus-tool.c:2330 msgid "Error: A service to activate for must be specified.\n" msgstr "Fel: En tjänst att aktivera för måste anges.\n" -#: gio/gdbus-tool.c:2336 +#: gio/gdbus-tool.c:2335 msgid "Error: A service to wait for must be specified.\n" msgstr "Fel: En tjänst att vänta på måste anges.\n" -#: gio/gdbus-tool.c:2341 +#: gio/gdbus-tool.c:2340 msgid "Error: Too many arguments.\n" msgstr "Fel: För många argument.\n" -#: gio/gdbus-tool.c:2349 gio/gdbus-tool.c:2356 +#: gio/gdbus-tool.c:2348 gio/gdbus-tool.c:2355 #, c-format msgid "Error: %s is not a valid well-known bus name.\n" msgstr "Fel: %s är inte ett giltigt välkänt bussnamn.\n" @@ -1305,38 +1309,43 @@ msgid "Not authorized to change debug settings" msgstr "Inte behörig att ändra felsökningsinställningar" -#: gio/gdesktopappinfo.c:2182 gio/gdesktopappinfo.c:5119 +#: gio/gdesktopappinfo.c:2242 gio/gdesktopappinfo.c:5223 msgid "Unnamed" msgstr "Namnlös" -#: gio/gdesktopappinfo.c:2592 +#: gio/gdesktopappinfo.c:2652 msgid "Desktop file didn’t specify Exec field" msgstr "Desktop-filen angav inget Exec-fält" -#: gio/gdesktopappinfo.c:2891 +#: gio/gdesktopappinfo.c:2942 msgid "Unable to find terminal required for application" msgstr "Kunde inte hitta terminal som krävs för programmet" -#: gio/gdesktopappinfo.c:3637 +#: gio/gdesktopappinfo.c:3002 +#, c-format +msgid "Program ‘%s’ not found in $PATH" +msgstr "Programmet ”%s” hittades inte i $PATH" + +#: gio/gdesktopappinfo.c:3735 #, c-format msgid "Can’t create user application configuration folder %s: %s" msgstr "Kan inte skapa programkonfigurationsmapp för användare %s: %s" -#: gio/gdesktopappinfo.c:3641 +#: gio/gdesktopappinfo.c:3739 #, c-format msgid "Can’t create user MIME configuration folder %s: %s" msgstr "Kan inte skapa MIME-konfigurationsmapp för användare %s: %s" -#: gio/gdesktopappinfo.c:3883 gio/gdesktopappinfo.c:3907 +#: gio/gdesktopappinfo.c:3981 gio/gdesktopappinfo.c:4005 msgid "Application information lacks an identifier" msgstr "Programinformation saknar en identifierare" -#: gio/gdesktopappinfo.c:4143 +#: gio/gdesktopappinfo.c:4241 #, c-format msgid "Can’t create user desktop file %s" msgstr "Kan inte skapa desktop-fil %s för användare" -#: gio/gdesktopappinfo.c:4279 +#: gio/gdesktopappinfo.c:4377 #, c-format msgid "Custom definition for %s" msgstr "Anpassad definition för %s" @@ -1409,7 +1418,7 @@ msgid "Containing mount does not exist" msgstr "Innefattande montering finns inte" -#: gio/gfile.c:2641 gio/glocalfile.c:2500 +#: gio/gfile.c:2641 gio/glocalfile.c:2511 msgid "Can’t copy over directory" msgstr "Kan inte kopiera över katalog" @@ -1454,7 +1463,7 @@ msgid "Invalid symlink value given" msgstr "Ogiltigt värde för symbolisk länk angivet" -#: gio/gfile.c:4163 glib/gfileutils.c:2335 +#: gio/gfile.c:4163 glib/gfileutils.c:2392 msgid "Symbolic links not supported" msgstr "Symboliska länkar stöds inte" @@ -1555,37 +1564,37 @@ msgid "HTTP proxy server closed connection unexpectedly." msgstr "HTTP-proxyservern stängde oväntat anslutningen." -#: gio/gicon.c:300 +#: gio/gicon.c:299 #, c-format msgid "Wrong number of tokens (%d)" msgstr "Fel antal token (%d)" -#: gio/gicon.c:320 +#: gio/gicon.c:319 #, c-format msgid "No type for class name %s" msgstr "Ingen typ för klassnamnet %s" -#: gio/gicon.c:330 +#: gio/gicon.c:329 #, c-format msgid "Type %s does not implement the GIcon interface" msgstr "Typen %s implementerar inte GIcon-gränssnittet" -#: gio/gicon.c:341 +#: gio/gicon.c:340 #, c-format msgid "Type %s is not classed" msgstr "Typen %s är inte klassad" -#: gio/gicon.c:355 +#: gio/gicon.c:354 #, c-format msgid "Malformed version number: %s" msgstr "Felformaterat versionsnummer: %s" -#: gio/gicon.c:369 +#: gio/gicon.c:368 #, c-format msgid "Type %s does not implement from_tokens() on the GIcon interface" msgstr "Typen %s implementerar inte from_tokens() på GIcon-gränssnittet" -#: gio/gicon.c:471 +#: gio/gicon.c:470 msgid "Can’t handle the supplied version of the icon encoding" msgstr "Kan inte hantera angiven version av ikonkodningen" @@ -2386,7 +2395,7 @@ msgid "List contents of directories in a tree-like format." msgstr "Lista innehållet i kataloger i ett trädliknande format." -#: gio/glib-compile-resources.c:142 gio/glib-compile-schemas.c:1516 +#: gio/glib-compile-resources.c:142 gio/glib-compile-schemas.c:1513 #, c-format msgid "Element <%s> not allowed inside <%s>" msgstr "Elementet <%s> tillåts inte inuti <%s>" @@ -2442,7 +2451,7 @@ msgid "text may not appear inside <%s>" msgstr "text får inte vara inuti <%s>" -#: gio/glib-compile-resources.c:821 gio/glib-compile-schemas.c:2174 +#: gio/glib-compile-resources.c:821 gio/glib-compile-schemas.c:2171 msgid "Show program version and exit" msgstr "Visa programversion och avsluta" @@ -2458,8 +2467,8 @@ "Katalogerna där filer som hänvisas till i FIL ska läsas från (standard: " "aktuell katalog)" -#: gio/glib-compile-resources.c:823 gio/glib-compile-schemas.c:2175 -#: gio/glib-compile-schemas.c:2204 +#: gio/glib-compile-resources.c:823 gio/glib-compile-schemas.c:2172 +#: gio/glib-compile-schemas.c:2201 msgid "DIRECTORY" msgstr "KATALOG" @@ -2679,16 +2688,16 @@ msgid "<aliases> must contain at least one <alias>" msgstr "<aliases> måste innehålla minst ett <alias>" -#: gio/glib-compile-schemas.c:799 +#: gio/glib-compile-schemas.c:796 msgid "Empty names are not permitted" msgstr "Tomma namn tillåts inte" -#: gio/glib-compile-schemas.c:809 +#: gio/glib-compile-schemas.c:806 #, c-format msgid "Invalid name “%s”: names must begin with a lowercase letter" msgstr "Ogiltigt namn ”%s”: namn måste börja med en liten bokstav" -#: gio/glib-compile-schemas.c:821 +#: gio/glib-compile-schemas.c:818 #, c-format msgid "" "Invalid name “%s”: invalid character “%c”; only lowercase letters, numbers " @@ -2697,36 +2706,36 @@ "Ogiltigt namn ”%s”: ogiltigt tecken ”%c”; endast gemena bokstäver, siffror " "och bindestreck (”-”) tillåts" -#: gio/glib-compile-schemas.c:830 +#: gio/glib-compile-schemas.c:827 #, c-format msgid "Invalid name “%s”: two successive hyphens (“--”) are not permitted" msgstr "Ogiltigt namn ”%s”: två efterföljande bindestreck (”--”) tillåts inte" -#: gio/glib-compile-schemas.c:839 +#: gio/glib-compile-schemas.c:836 #, c-format msgid "Invalid name “%s”: the last character may not be a hyphen (“-”)" msgstr "Ogiltigt namn ”%s”: sista tecknet får inte vara ett bindestreck (”-”)" -#: gio/glib-compile-schemas.c:847 +#: gio/glib-compile-schemas.c:844 #, c-format msgid "Invalid name “%s”: maximum length is 1024" msgstr "Ogiltigt namn ”%s”: maximal längd är 1024" -#: gio/glib-compile-schemas.c:919 +#: gio/glib-compile-schemas.c:916 #, c-format msgid "<child name='%s'> already specified" msgstr "<child name='%s'> redan angiven" -#: gio/glib-compile-schemas.c:945 +#: gio/glib-compile-schemas.c:942 msgid "Cannot add keys to a “list-of” schema" msgstr "Kan inte lägga till nycklar till ett ”list-of”-schema" -#: gio/glib-compile-schemas.c:956 +#: gio/glib-compile-schemas.c:953 #, c-format msgid "<key name='%s'> already specified" msgstr "<key name='%s'> redan angiven" -#: gio/glib-compile-schemas.c:974 +#: gio/glib-compile-schemas.c:971 #, c-format msgid "" "<key name='%s'> shadows <key name='%s'> in <schema id='%s'>; use <override> " @@ -2735,7 +2744,7 @@ "<key name='%s'> skuggar <key name='%s'> i <schema id='%s'>; använd " "<override> för att ändra värdet" -#: gio/glib-compile-schemas.c:985 +#: gio/glib-compile-schemas.c:982 #, c-format msgid "" "Exactly one of “type”, “enum” or “flags” must be specified as an attribute " @@ -2744,56 +2753,56 @@ "Exakt en av ”type”, ”enum” eller ”flags” måste anges som ett attribut till " "<key>" -#: gio/glib-compile-schemas.c:1004 +#: gio/glib-compile-schemas.c:1001 #, c-format msgid "<%s id='%s'> not (yet) defined." msgstr "<%s id='%s'> inte (ännu) angiven." -#: gio/glib-compile-schemas.c:1019 +#: gio/glib-compile-schemas.c:1016 #, c-format msgid "Invalid GVariant type string “%s”" msgstr "Ogiltig GVariant-typsträng ”%s”" -#: gio/glib-compile-schemas.c:1049 +#: gio/glib-compile-schemas.c:1046 msgid "<override> given but schema isn’t extending anything" msgstr "<override> angavs men schemat utökar inte någonting" -#: gio/glib-compile-schemas.c:1062 +#: gio/glib-compile-schemas.c:1059 #, c-format msgid "No <key name='%s'> to override" msgstr "Ingen <key name='%s'> att åsidosätta" -#: gio/glib-compile-schemas.c:1070 +#: gio/glib-compile-schemas.c:1067 #, c-format msgid "<override name='%s'> already specified" msgstr "<override name='%s'> redan angiven" -#: gio/glib-compile-schemas.c:1143 +#: gio/glib-compile-schemas.c:1140 #, c-format msgid "<schema id='%s'> already specified" msgstr "<schema id='%s'> redan angiven" -#: gio/glib-compile-schemas.c:1155 +#: gio/glib-compile-schemas.c:1152 #, c-format msgid "<schema id='%s'> extends not yet existing schema “%s”" msgstr "<schema id='%s'> utökar ännu inte befintliga schemat ”%s”" -#: gio/glib-compile-schemas.c:1171 +#: gio/glib-compile-schemas.c:1168 #, c-format msgid "<schema id='%s'> is list of not yet existing schema “%s”" msgstr "<schema id='%s'> är lista av ännu inte befintliga schemat ”%s”" -#: gio/glib-compile-schemas.c:1179 +#: gio/glib-compile-schemas.c:1176 #, c-format msgid "Cannot be a list of a schema with a path" msgstr "Kan inte vara en lista för ett schema med en sökväg" -#: gio/glib-compile-schemas.c:1189 +#: gio/glib-compile-schemas.c:1186 #, c-format msgid "Cannot extend a schema with a path" msgstr "Kan inte utöka ett schema med en sökväg" -#: gio/glib-compile-schemas.c:1199 +#: gio/glib-compile-schemas.c:1196 #, c-format msgid "" "<schema id='%s'> is a list, extending <schema id='%s'> which is not a list" @@ -2801,7 +2810,7 @@ "<schema id='%s'> är en lista, som utökar <schema id='%s'> vilket inte är en " "lista" -#: gio/glib-compile-schemas.c:1209 +#: gio/glib-compile-schemas.c:1206 #, c-format msgid "" "<schema id='%s' list-of='%s'> extends <schema id='%s' list-of='%s'> but “%s” " @@ -2810,17 +2819,17 @@ "<schema id='%s' list-of='%s'> utökar <schema id='%s' list-of='%s'> men ”%s” " "utökar inte ”%s”" -#: gio/glib-compile-schemas.c:1226 +#: gio/glib-compile-schemas.c:1223 #, c-format msgid "A path, if given, must begin and end with a slash" msgstr "En sökväg, om angiven, måste börja och sluta med ett snedstreck" -#: gio/glib-compile-schemas.c:1233 +#: gio/glib-compile-schemas.c:1230 #, c-format msgid "The path of a list must end with “:/”" msgstr "Sökvägen för en lista måste sluta med ”:/”" -#: gio/glib-compile-schemas.c:1242 +#: gio/glib-compile-schemas.c:1239 #, c-format msgid "" "Warning: Schema “%s” has path “%s”. Paths starting with “/apps/”, “/" @@ -2829,49 +2838,49 @@ "Varning: Schemat ”%s” har sökvägen ”%s”. Sökvägar som startar med ”/apps/”, " "”/desktop/” eller ”/system/” är föråldrade." -#: gio/glib-compile-schemas.c:1272 +#: gio/glib-compile-schemas.c:1269 #, c-format msgid "<%s id='%s'> already specified" msgstr "<%s id='%s'> redan angiven" -#: gio/glib-compile-schemas.c:1422 gio/glib-compile-schemas.c:1438 +#: gio/glib-compile-schemas.c:1419 gio/glib-compile-schemas.c:1435 #, c-format msgid "Only one <%s> element allowed inside <%s>" msgstr "Endast ett <%s>-element tillåts inuti <%s>" -#: gio/glib-compile-schemas.c:1520 +#: gio/glib-compile-schemas.c:1517 #, c-format msgid "Element <%s> not allowed at the top level" msgstr "Elementet <%s> tillåts inte på toppnivån" -#: gio/glib-compile-schemas.c:1538 +#: gio/glib-compile-schemas.c:1535 msgid "Element <default> is required in <key>" msgstr "Elementet <default> krävs i <key>" -#: gio/glib-compile-schemas.c:1628 +#: gio/glib-compile-schemas.c:1625 #, c-format msgid "Text may not appear inside <%s>" msgstr "Text får inte vara inuti <%s>" -#: gio/glib-compile-schemas.c:1696 +#: gio/glib-compile-schemas.c:1693 #, c-format msgid "Warning: undefined reference to <schema id='%s'/>" msgstr "Varning: odefinierad referens till <schema id='%s'/>" #. Translators: Do not translate "--strict". -#: gio/glib-compile-schemas.c:1835 gio/glib-compile-schemas.c:1914 +#: gio/glib-compile-schemas.c:1832 gio/glib-compile-schemas.c:1911 msgid "--strict was specified; exiting." msgstr "--strict angavs; avslutar." -#: gio/glib-compile-schemas.c:1847 +#: gio/glib-compile-schemas.c:1844 msgid "This entire file has been ignored." msgstr "Hela denna fil har ignorerats." -#: gio/glib-compile-schemas.c:1910 +#: gio/glib-compile-schemas.c:1907 msgid "Ignoring this file." msgstr "Ignorerar denna fil." -#: gio/glib-compile-schemas.c:1965 +#: gio/glib-compile-schemas.c:1962 #, c-format msgid "" "No such key “%s” in schema “%s” as specified in override file “%s”; ignoring " @@ -2880,7 +2889,7 @@ "Ingen sådan nyckel ”%s” i schemat ”%s” som angetts i åsidosättningsfilen " "”%s”; ignorerar åsidosättning för denna nyckel." -#: gio/glib-compile-schemas.c:1973 +#: gio/glib-compile-schemas.c:1970 #, c-format msgid "" "No such key “%s” in schema “%s” as specified in override file “%s” and --" @@ -2889,7 +2898,7 @@ "Ingen sådan nyckel ”%s” i schemat ”%s” som angetts i åsidosättningsfilen " "”%s” och --strict angavs; avslutar." -#: gio/glib-compile-schemas.c:1995 +#: gio/glib-compile-schemas.c:1992 #, c-format msgid "" "Cannot provide per-desktop overrides for localized key “%s” in schema " @@ -2899,7 +2908,7 @@ "lokaliserade nyckeln ”%s” i schemat ”%s” (åsidosättningsfil ”%s”); ignorerar " "åsidosättning för denna nyckel." -#: gio/glib-compile-schemas.c:2004 +#: gio/glib-compile-schemas.c:2001 #, c-format msgid "" "Cannot provide per-desktop overrides for localized key “%s” in schema " @@ -2909,7 +2918,7 @@ "lokaliserade nyckeln ”%s” i schemat ”%s” (åsidosättningsfil ”%s”) och --" "strict angavs; avslutar." -#: gio/glib-compile-schemas.c:2028 +#: gio/glib-compile-schemas.c:2025 #, c-format msgid "" "Error parsing key “%s” in schema “%s” as specified in override file “%s”: " @@ -2918,7 +2927,7 @@ "Fel vid tolkning av nyckeln ”%s” i schemat ”%s” som angetts i " "åsidosättningsfilen ”%s”: %s. Ignorerar åsidosättning för denna nyckel." -#: gio/glib-compile-schemas.c:2040 +#: gio/glib-compile-schemas.c:2037 #, c-format msgid "" "Error parsing key “%s” in schema “%s” as specified in override file “%s”: " @@ -2927,7 +2936,7 @@ "Fel vid tolkning av nyckeln ”%s” i schemat ”%s” som angetts i " "åsidosättningsfilen ”%s”: %s. --strict angavs; avslutar." -#: gio/glib-compile-schemas.c:2067 +#: gio/glib-compile-schemas.c:2064 #, c-format msgid "" "Override for key “%s” in schema “%s” in override file “%s” is outside the " @@ -2937,7 +2946,7 @@ "utanför intervallet som anges i schemat; ignorerar åsidosättning för denna " "nyckel." -#: gio/glib-compile-schemas.c:2077 +#: gio/glib-compile-schemas.c:2074 #, c-format msgid "" "Override for key “%s” in schema “%s” in override file “%s” is outside the " @@ -2946,7 +2955,7 @@ "Åsidosättning för nyckeln ”%s” i schemat ”%s” i åsidosättningsfilen ”%s” är " "utanför intervallet som anges i schemat och --strict angavs; avslutar." -#: gio/glib-compile-schemas.c:2103 +#: gio/glib-compile-schemas.c:2100 #, c-format msgid "" "Override for key “%s” in schema “%s” in override file “%s” is not in the " @@ -2956,7 +2965,7 @@ "finns inte i listan över giltiga val; ignorerar åsidosättning för denna " "nyckel." -#: gio/glib-compile-schemas.c:2113 +#: gio/glib-compile-schemas.c:2110 #, c-format msgid "" "Override for key “%s” in schema “%s” in override file “%s” is not in the " @@ -2965,23 +2974,23 @@ "Åsidosättning för nyckeln ”%s” i schemat ”%s” i åsidosättningsfilen ”%s” " "finns inte i listan över giltiga val och --strict angavs; avslutar." -#: gio/glib-compile-schemas.c:2175 +#: gio/glib-compile-schemas.c:2172 msgid "Where to store the gschemas.compiled file" msgstr "Var filen gschemas.compiled ska lagras" -#: gio/glib-compile-schemas.c:2176 +#: gio/glib-compile-schemas.c:2173 msgid "Abort on any errors in schemas" msgstr "Avbryt vid alla fel i scheman" -#: gio/glib-compile-schemas.c:2177 +#: gio/glib-compile-schemas.c:2174 msgid "Do not write the gschema.compiled file" msgstr "Skriv inte filen gschema.compiled" -#: gio/glib-compile-schemas.c:2178 +#: gio/glib-compile-schemas.c:2175 msgid "Do not enforce key name restrictions" msgstr "Tvinga inte igenom begränsningar för nyckelnamn" -#: gio/glib-compile-schemas.c:2207 +#: gio/glib-compile-schemas.c:2204 msgid "" "Compile all GSettings schema files into a schema cache.\n" "Schema files are required to have the extension .gschema.xml,\n" @@ -2991,15 +3000,15 @@ "Schemafiler måste ha filändelsen .gschema.xml,\n" "och cachefilen kallas för gschemas.compiled." -#: gio/glib-compile-schemas.c:2228 +#: gio/glib-compile-schemas.c:2225 msgid "You should give exactly one directory name" msgstr "Du bör ange exakt ett katalognamn" -#: gio/glib-compile-schemas.c:2271 +#: gio/glib-compile-schemas.c:2268 msgid "No schema files found: doing nothing." msgstr "Inga schemafiler hittades: gör ingenting." -#: gio/glib-compile-schemas.c:2273 +#: gio/glib-compile-schemas.c:2270 msgid "No schema files found: removed existing output file." msgstr "Inga schemafiler hittades: tog bort befintlig utmatningsfil." @@ -3008,7 +3017,7 @@ msgid "Invalid filename %s" msgstr "Ogiltigt filnamn %s" -#: gio/glocalfile.c:996 +#: gio/glocalfile.c:1005 #, c-format msgid "Error getting filesystem info for %s: %s" msgstr "Fel vid hämtning av filsystemsinformation för %s: %s" @@ -3017,124 +3026,124 @@ #. * the enclosing (user visible) mount of a file, but none #. * exists. #. -#: gio/glocalfile.c:1137 +#: gio/glocalfile.c:1141 #, c-format msgid "Containing mount for file %s not found" msgstr "Innefattande montering för filen %s hittades inte" -#: gio/glocalfile.c:1160 +#: gio/glocalfile.c:1164 msgid "Can’t rename root directory" msgstr "Kan inte byta namn på rotkatalog" -#: gio/glocalfile.c:1178 gio/glocalfile.c:1201 +#: gio/glocalfile.c:1182 gio/glocalfile.c:1205 #, c-format msgid "Error renaming file %s: %s" msgstr "Fel vid namnbyte av filen %s: %s" -#: gio/glocalfile.c:1185 +#: gio/glocalfile.c:1189 msgid "Can’t rename file, filename already exists" msgstr "Kan inte byta namn på filen, filnamnet finns redan" -#: gio/glocalfile.c:1198 gio/glocalfile.c:2394 gio/glocalfile.c:2422 -#: gio/glocalfile.c:2561 gio/glocalfileoutputstream.c:658 +#: gio/glocalfile.c:1202 gio/glocalfile.c:2405 gio/glocalfile.c:2433 +#: gio/glocalfile.c:2572 gio/glocalfileoutputstream.c:658 msgid "Invalid filename" msgstr "Ogiltigt filnamn" -#: gio/glocalfile.c:1366 gio/glocalfile.c:1377 +#: gio/glocalfile.c:1370 gio/glocalfile.c:1381 #, c-format msgid "Error opening file %s: %s" msgstr "Fel vid öppning av filen %s: %s" -#: gio/glocalfile.c:1502 +#: gio/glocalfile.c:1506 #, c-format msgid "Error removing file %s: %s" msgstr "Fel vid borttagning av filen %s: %s" -#: gio/glocalfile.c:1996 gio/glocalfile.c:2007 gio/glocalfile.c:2034 +#: gio/glocalfile.c:2000 gio/glocalfile.c:2011 gio/glocalfile.c:2038 #, c-format msgid "Error trashing file %s: %s" msgstr "Fel vid kastande av filen %s: %s" -#: gio/glocalfile.c:2054 +#: gio/glocalfile.c:2058 #, c-format msgid "Unable to create trash directory %s: %s" msgstr "Kunde inte skapa papperskorgskatalogen %s: %s" -#: gio/glocalfile.c:2075 +#: gio/glocalfile.c:2079 #, c-format msgid "Unable to find toplevel directory to trash %s" msgstr "Kunde inte hitta toppnivåkatalog för att kasta %s" -#: gio/glocalfile.c:2083 +#: gio/glocalfile.c:2087 #, c-format msgid "Trashing on system internal mounts is not supported" msgstr "Att kasta i papperskorg på systeminterna monteringar stöds inte" -#: gio/glocalfile.c:2169 gio/glocalfile.c:2197 +#: gio/glocalfile.c:2173 gio/glocalfile.c:2201 #, c-format msgid "Unable to find or create trash directory %s to trash %s" msgstr "Kunde inte hitta eller skapa papperskorgskatalog %s att slänga %s i" -#: gio/glocalfile.c:2243 +#: gio/glocalfile.c:2245 #, c-format msgid "Unable to create trashing info file for %s: %s" msgstr "Kunde inte skapa fil med information om vad som kastats för %s: %s" -#: gio/glocalfile.c:2305 +#: gio/glocalfile.c:2316 #, c-format msgid "Unable to trash file %s across filesystem boundaries" msgstr "Kunde inte kasta filen %s över filsystemsgränser" -#: gio/glocalfile.c:2309 gio/glocalfile.c:2365 +#: gio/glocalfile.c:2320 gio/glocalfile.c:2376 #, c-format msgid "Unable to trash file %s: %s" msgstr "Kunde inte kasta filen %s: %s" -#: gio/glocalfile.c:2371 +#: gio/glocalfile.c:2382 #, c-format msgid "Unable to trash file %s" msgstr "Kunde inte kasta filen %s" -#: gio/glocalfile.c:2397 +#: gio/glocalfile.c:2408 #, c-format msgid "Error creating directory %s: %s" msgstr "Fel vid skapandet av katalogen %s: %s" -#: gio/glocalfile.c:2426 +#: gio/glocalfile.c:2437 #, c-format msgid "Filesystem does not support symbolic links" msgstr "Filsystemet saknar stöd för symboliska länkar" -#: gio/glocalfile.c:2429 +#: gio/glocalfile.c:2440 #, c-format msgid "Error making symbolic link %s: %s" msgstr "Fel vid skapande av symboliska länken %s: %s" -#: gio/glocalfile.c:2472 gio/glocalfile.c:2507 gio/glocalfile.c:2564 +#: gio/glocalfile.c:2483 gio/glocalfile.c:2518 gio/glocalfile.c:2575 #, c-format msgid "Error moving file %s: %s" msgstr "Fel vid flyttning av filen %s: %s" -#: gio/glocalfile.c:2495 +#: gio/glocalfile.c:2506 msgid "Can’t move directory over directory" msgstr "Kan inte flytta katalog över katalog" -#: gio/glocalfile.c:2521 gio/glocalfileoutputstream.c:1110 +#: gio/glocalfile.c:2532 gio/glocalfileoutputstream.c:1110 #: gio/glocalfileoutputstream.c:1124 gio/glocalfileoutputstream.c:1139 #: gio/glocalfileoutputstream.c:1156 gio/glocalfileoutputstream.c:1170 msgid "Backup file creation failed" msgstr "Misslyckades med att skapa säkerhetskopiefil" -#: gio/glocalfile.c:2540 +#: gio/glocalfile.c:2551 #, c-format msgid "Error removing target file: %s" msgstr "Fel vid borttagning av målfil: %s" -#: gio/glocalfile.c:2554 +#: gio/glocalfile.c:2565 msgid "Move between mounts not supported" msgstr "Flyttning mellan monteringar stöds inte" -#: gio/glocalfile.c:2728 +#: gio/glocalfile.c:2741 #, c-format msgid "Could not determine the disk usage of %s: %s" msgstr "Kunde inte bestämma diskanvändningen för %s: %s" @@ -3156,115 +3165,115 @@ msgid "Error setting extended attribute “%s”: %s" msgstr "Fel vid inställning av utökat attribut ”%s”: %s" -#: gio/glocalfileinfo.c:1738 gio/win32/gwinhttpfile.c:191 +#: gio/glocalfileinfo.c:1819 gio/win32/gwinhttpfile.c:191 msgid " (invalid encoding)" msgstr " (ogiltig kodning)" -#: gio/glocalfileinfo.c:1897 gio/glocalfileoutputstream.c:945 +#: gio/glocalfileinfo.c:1978 gio/glocalfileoutputstream.c:945 #: gio/glocalfileoutputstream.c:997 #, c-format msgid "Error when getting information for file “%s”: %s" msgstr "Fel vid hämtning av information om filen ”%s”: %s" -#: gio/glocalfileinfo.c:2163 +#: gio/glocalfileinfo.c:2281 #, c-format msgid "Error when getting information for file descriptor: %s" msgstr "Fel vid hämtning av information om filhandtag: %s" -#: gio/glocalfileinfo.c:2208 +#: gio/glocalfileinfo.c:2326 msgid "Invalid attribute type (uint32 expected)" msgstr "Ogiltig attributtyp (uint32 förväntades)" -#: gio/glocalfileinfo.c:2226 +#: gio/glocalfileinfo.c:2344 msgid "Invalid attribute type (uint64 expected)" msgstr "Ogiltig attributtyp (uint64 förväntades)" -#: gio/glocalfileinfo.c:2245 gio/glocalfileinfo.c:2264 +#: gio/glocalfileinfo.c:2363 gio/glocalfileinfo.c:2382 msgid "Invalid attribute type (byte string expected)" msgstr "Ogiltig attributtyp (bytesträng förväntades)" -#: gio/glocalfileinfo.c:2311 +#: gio/glocalfileinfo.c:2429 msgid "Cannot set permissions on symlinks" msgstr "Kan inte ställa in rättigheter på symboliska länkar" -#: gio/glocalfileinfo.c:2327 +#: gio/glocalfileinfo.c:2445 #, c-format msgid "Error setting permissions: %s" msgstr "Fel vid inställning av rättigheter: %s" -#: gio/glocalfileinfo.c:2378 +#: gio/glocalfileinfo.c:2496 #, c-format msgid "Error setting owner: %s" msgstr "Fel vid inställning av ägare: %s" -#: gio/glocalfileinfo.c:2401 +#: gio/glocalfileinfo.c:2519 msgid "symlink must be non-NULL" msgstr "symbolisk länk måste vara icke-NULL" -#: gio/glocalfileinfo.c:2411 gio/glocalfileinfo.c:2430 -#: gio/glocalfileinfo.c:2441 +#: gio/glocalfileinfo.c:2529 gio/glocalfileinfo.c:2548 +#: gio/glocalfileinfo.c:2559 #, c-format msgid "Error setting symlink: %s" msgstr "Fel vid inställning av symbolisk länk: %s" -#: gio/glocalfileinfo.c:2420 +#: gio/glocalfileinfo.c:2538 msgid "Error setting symlink: file is not a symlink" msgstr "Fel vid inställning av symbolisk länk: filen är inte en symbolisk länk" -#: gio/glocalfileinfo.c:2492 +#: gio/glocalfileinfo.c:2630 #, c-format msgid "Extra nanoseconds %d for UNIX timestamp %lld are negative" msgstr "Extra nanosekunder %d för UNIX-tidsstämpeln %lld är negativa" -#: gio/glocalfileinfo.c:2501 +#: gio/glocalfileinfo.c:2639 #, c-format msgid "Extra nanoseconds %d for UNIX timestamp %lld reach 1 second" msgstr "Extra nanosekunder %d för UNIX-tidsstämpeln %lld överstiger 1 sekund" -#: gio/glocalfileinfo.c:2511 +#: gio/glocalfileinfo.c:2649 #, c-format msgid "UNIX timestamp %lld does not fit into 64 bits" msgstr "UNIX-tidstämpeln %lld ryms inte i 64 bitar" -#: gio/glocalfileinfo.c:2522 +#: gio/glocalfileinfo.c:2660 #, c-format msgid "UNIX timestamp %lld is outside of the range supported by Windows" msgstr "UNIX-tidstämpeln %lld är utanför intervallet som stöds av Windows" -#: gio/glocalfileinfo.c:2625 +#: gio/glocalfileinfo.c:2792 #, c-format msgid "File name “%s” cannot be converted to UTF-16" msgstr "Filnamnet ”%s” kan inte konverteras till UTF-16" -#: gio/glocalfileinfo.c:2644 +#: gio/glocalfileinfo.c:2811 #, c-format msgid "File “%s” cannot be opened: Windows Error %lu" msgstr "Filen ”%s” kan inte öppnas: Windows-fel %lu" -#: gio/glocalfileinfo.c:2657 +#: gio/glocalfileinfo.c:2824 #, c-format msgid "Error setting modification or access time for file “%s”: %lu" msgstr "Fel vid inställning av ändrings- eller åtkomsttid för filen ”%s”: %lu" -#: gio/glocalfileinfo.c:2798 gio/glocalfileinfo.c:2810 +#: gio/glocalfileinfo.c:2981 #, c-format msgid "Error setting modification or access time: %s" msgstr "Fel vid inställning av ändrings- eller åtkomsttid: %s" -#: gio/glocalfileinfo.c:2833 +#: gio/glocalfileinfo.c:3004 msgid "SELinux context must be non-NULL" msgstr "SELinux-kontext måste vara icke-NULL" -#: gio/glocalfileinfo.c:2840 +#: gio/glocalfileinfo.c:3011 msgid "SELinux is not enabled on this system" msgstr "SELinux är inte aktiverat på detta system" -#: gio/glocalfileinfo.c:2850 +#: gio/glocalfileinfo.c:3021 #, c-format msgid "Error setting SELinux context: %s" msgstr "Fel vid inställning av SELinux-kontext: %s" -#: gio/glocalfileinfo.c:2947 +#: gio/glocalfileinfo.c:3118 #, c-format msgid "Setting attribute %s not supported" msgstr "Inställning av attributet %s stöds inte" @@ -3311,13 +3320,13 @@ msgid "Error renaming temporary file: %s" msgstr "Fel vid namnbyte på temporärfil: %s" -#: gio/glocalfileoutputstream.c:611 gio/glocalfileoutputstream.c:1241 +#: gio/glocalfileoutputstream.c:611 gio/glocalfileoutputstream.c:1242 #, c-format msgid "Error truncating file: %s" msgstr "Fel vid kapning av fil: %s" #: gio/glocalfileoutputstream.c:664 gio/glocalfileoutputstream.c:909 -#: gio/glocalfileoutputstream.c:1222 gio/gsubprocess.c:231 +#: gio/glocalfileoutputstream.c:1223 gio/gsubprocess.c:231 #, c-format msgid "Error opening file “%s”: %s" msgstr "Fel vid öppning av filen ”%s”: %s" @@ -3334,7 +3343,7 @@ msgid "The file was externally modified" msgstr "Filen blev externt ändrad" -#: gio/glocalfileoutputstream.c:1204 +#: gio/glocalfileoutputstream.c:1205 #, c-format msgid "Error removing old file: %s" msgstr "Fel vid borttagning av gammal fil: %s" @@ -3481,8 +3490,8 @@ #. Translators: the first placeholder is a domain name, the #. * second is an error message #: gio/gresolver.c:403 gio/gthreadedresolver.c:152 gio/gthreadedresolver.c:170 -#: gio/gthreadedresolver.c:782 gio/gthreadedresolver.c:806 -#: gio/gthreadedresolver.c:831 gio/gthreadedresolver.c:846 +#: gio/gthreadedresolver.c:798 gio/gthreadedresolver.c:822 +#: gio/gthreadedresolver.c:847 gio/gthreadedresolver.c:862 #, c-format msgid "Error resolving “%s”: %s" msgstr "Fel vid uppslag av ”%s”: %s" @@ -4194,35 +4203,35 @@ #. Translators: the placeholder is a DNS record type, such as ‘MX’ or ‘SRV’ #: gio/gthreadedresolver.c:552 gio/gthreadedresolver.c:574 -#: gio/gthreadedresolver.c:612 gio/gthreadedresolver.c:659 -#: gio/gthreadedresolver.c:688 gio/gthreadedresolver.c:700 +#: gio/gthreadedresolver.c:628 gio/gthreadedresolver.c:675 +#: gio/gthreadedresolver.c:704 gio/gthreadedresolver.c:716 #, c-format msgid "Error parsing DNS %s record: malformed DNS packet" msgstr "Fel vid tolkning av DNS %s-post: felformulerat DNS-paket" -#: gio/gthreadedresolver.c:758 gio/gthreadedresolver.c:895 -#: gio/gthreadedresolver.c:993 gio/gthreadedresolver.c:1043 +#: gio/gthreadedresolver.c:774 gio/gthreadedresolver.c:911 +#: gio/gthreadedresolver.c:1009 gio/gthreadedresolver.c:1059 #, c-format msgid "No DNS record of the requested type for “%s”" msgstr "Inga DNS-poster av den begärda typen för ”%s”" -#: gio/gthreadedresolver.c:763 gio/gthreadedresolver.c:998 +#: gio/gthreadedresolver.c:779 gio/gthreadedresolver.c:1014 #, c-format msgid "Temporarily unable to resolve “%s”" msgstr "Kan för tillfället inte slå upp ”%s”" -#: gio/gthreadedresolver.c:768 gio/gthreadedresolver.c:1003 -#: gio/gthreadedresolver.c:1113 +#: gio/gthreadedresolver.c:784 gio/gthreadedresolver.c:1019 +#: gio/gthreadedresolver.c:1129 #, c-format msgid "Error resolving “%s”" msgstr "Fel vid uppslag av ”%s”" -#: gio/gthreadedresolver.c:782 gio/gthreadedresolver.c:806 -#: gio/gthreadedresolver.c:831 gio/gthreadedresolver.c:846 +#: gio/gthreadedresolver.c:798 gio/gthreadedresolver.c:822 +#: gio/gthreadedresolver.c:847 gio/gthreadedresolver.c:862 msgid "Malformed DNS packet" msgstr "Felformulerat DNS-paket" -#: gio/gthreadedresolver.c:888 +#: gio/gthreadedresolver.c:904 #, c-format msgid "Failed to parse DNS response for “%s”: " msgstr "Misslyckades med att tolka DNS-svar för ”%s”: " @@ -4349,7 +4358,7 @@ msgid "Error closing file descriptor: %s" msgstr "Fel vid stängning av filhandtag: %s" -#: gio/gunixmounts.c:2815 gio/gunixmounts.c:2868 +#: gio/gunixmounts.c:2817 gio/gunixmounts.c:2870 msgid "Filesystem root" msgstr "Filsystemsrot" @@ -4431,77 +4440,77 @@ msgid "Wrong args\n" msgstr "Fel argument\n" -#: glib/gbookmarkfile.c:779 +#: glib/gbookmarkfile.c:861 #, c-format msgid "Unexpected attribute “%s” for element “%s”" msgstr "Oväntat attribut ”%s” för elementet ”%s”" -#: glib/gbookmarkfile.c:790 glib/gbookmarkfile.c:870 glib/gbookmarkfile.c:880 -#: glib/gbookmarkfile.c:993 +#: glib/gbookmarkfile.c:872 glib/gbookmarkfile.c:952 glib/gbookmarkfile.c:962 +#: glib/gbookmarkfile.c:1075 #, c-format msgid "Attribute “%s” of element “%s” not found" msgstr "Attributet ”%s” för elementet ”%s” hittades inte" -#: glib/gbookmarkfile.c:1202 glib/gbookmarkfile.c:1267 -#: glib/gbookmarkfile.c:1331 glib/gbookmarkfile.c:1341 +#: glib/gbookmarkfile.c:1284 glib/gbookmarkfile.c:1349 +#: glib/gbookmarkfile.c:1413 glib/gbookmarkfile.c:1423 #, c-format msgid "Unexpected tag “%s”, tag “%s” expected" msgstr "Oväntad tagg ”%s”, taggen ”%s” förväntades" -#: glib/gbookmarkfile.c:1227 glib/gbookmarkfile.c:1241 -#: glib/gbookmarkfile.c:1309 glib/gbookmarkfile.c:1355 +#: glib/gbookmarkfile.c:1309 glib/gbookmarkfile.c:1323 +#: glib/gbookmarkfile.c:1391 glib/gbookmarkfile.c:1437 #, c-format msgid "Unexpected tag “%s” inside “%s”" msgstr "Oväntad tagg ”%s” inom ”%s”" -#: glib/gbookmarkfile.c:1635 +#: glib/gbookmarkfile.c:1717 #, c-format msgid "Invalid date/time ‘%s’ in bookmark file" msgstr "Ogiltigt datum/tid ”%s” i bokmärkesfil" -#: glib/gbookmarkfile.c:1838 +#: glib/gbookmarkfile.c:1956 msgid "No valid bookmark file found in data dirs" msgstr "Ingen giltig bokmärkesfil hittades i datakataloger" -#: glib/gbookmarkfile.c:2039 +#: glib/gbookmarkfile.c:2157 #, c-format msgid "A bookmark for URI “%s” already exists" msgstr "Ett bokmärke för URI ”%s” finns redan" -#: glib/gbookmarkfile.c:2088 glib/gbookmarkfile.c:2246 -#: glib/gbookmarkfile.c:2331 glib/gbookmarkfile.c:2411 -#: glib/gbookmarkfile.c:2496 glib/gbookmarkfile.c:2630 -#: glib/gbookmarkfile.c:2763 glib/gbookmarkfile.c:2898 -#: glib/gbookmarkfile.c:2940 glib/gbookmarkfile.c:3037 -#: glib/gbookmarkfile.c:3158 glib/gbookmarkfile.c:3352 -#: glib/gbookmarkfile.c:3493 glib/gbookmarkfile.c:3712 -#: glib/gbookmarkfile.c:3801 glib/gbookmarkfile.c:3890 -#: glib/gbookmarkfile.c:4009 +#: glib/gbookmarkfile.c:2206 glib/gbookmarkfile.c:2364 +#: glib/gbookmarkfile.c:2449 glib/gbookmarkfile.c:2529 +#: glib/gbookmarkfile.c:2614 glib/gbookmarkfile.c:2748 +#: glib/gbookmarkfile.c:2881 glib/gbookmarkfile.c:3016 +#: glib/gbookmarkfile.c:3058 glib/gbookmarkfile.c:3155 +#: glib/gbookmarkfile.c:3276 glib/gbookmarkfile.c:3470 +#: glib/gbookmarkfile.c:3611 glib/gbookmarkfile.c:3830 +#: glib/gbookmarkfile.c:3919 glib/gbookmarkfile.c:4008 +#: glib/gbookmarkfile.c:4127 #, c-format msgid "No bookmark found for URI “%s”" msgstr "Inget bokmärke hittades för URI ”%s”" -#: glib/gbookmarkfile.c:2420 +#: glib/gbookmarkfile.c:2538 #, c-format msgid "No MIME type defined in the bookmark for URI “%s”" msgstr "Ingen Mime-typ definierad i bokmärket för URI ”%s”" -#: glib/gbookmarkfile.c:2505 +#: glib/gbookmarkfile.c:2623 #, c-format msgid "No private flag has been defined in bookmark for URI “%s”" msgstr "Ingen privat flagga har definierats i bokmärket för URI ”%s”" -#: glib/gbookmarkfile.c:3046 +#: glib/gbookmarkfile.c:3164 #, c-format msgid "No groups set in bookmark for URI “%s”" msgstr "Inga grupper inställda i bokmärket för URI ”%s”" -#: glib/gbookmarkfile.c:3514 glib/gbookmarkfile.c:3722 +#: glib/gbookmarkfile.c:3632 glib/gbookmarkfile.c:3840 #, c-format msgid "No application with name “%s” registered a bookmark for “%s”" msgstr "Inget program med namnet ”%s” registrerade ett bokmärke för ”%s”" -#: glib/gbookmarkfile.c:3745 +#: glib/gbookmarkfile.c:3863 #, c-format msgid "Failed to expand exec line “%s” with URI “%s”" msgstr "Misslyckades med att expandera exec-raden ”%s” med URI ”%s”" @@ -4981,83 +4990,83 @@ msgid "Error opening directory “%s”: %s" msgstr "Fel vid öppning av katalogen ”%s”: %s" -#: glib/gfileutils.c:735 glib/gfileutils.c:827 +#: glib/gfileutils.c:753 glib/gfileutils.c:845 #, c-format msgid "Could not allocate %lu byte to read file “%s”" msgid_plural "Could not allocate %lu bytes to read file “%s”" msgstr0 "Kunde inte allokera %lu byte för att läsa filen ”%s”" msgstr1 "Kunde inte allokera %lu byte för att läsa filen ”%s”" -#: glib/gfileutils.c:752 +#: glib/gfileutils.c:770 #, c-format msgid "Error reading file “%s”: %s" msgstr "Fel vid läsning av filen ”%s”: %s" -#: glib/gfileutils.c:788 +#: glib/gfileutils.c:806 #, c-format msgid "File “%s” is too large" msgstr "Filen ”%s” är för stor" -#: glib/gfileutils.c:852 +#: glib/gfileutils.c:870 #, c-format msgid "Failed to read from file “%s”: %s" msgstr "Misslyckades med att läsa från filen ”%s”: %s" -#: glib/gfileutils.c:902 glib/gfileutils.c:977 glib/gfileutils.c:1449 +#: glib/gfileutils.c:920 glib/gfileutils.c:995 glib/gfileutils.c:1472 #, c-format msgid "Failed to open file “%s”: %s" msgstr "Misslyckades med att öppna filen ”%s”: %s" -#: glib/gfileutils.c:915 +#: glib/gfileutils.c:933 #, c-format msgid "Failed to get attributes of file “%s”: fstat() failed: %s" msgstr "" "Misslyckades med att få tag på attributen på filen ”%s”: fstat() " "misslyckades: %s" -#: glib/gfileutils.c:946 +#: glib/gfileutils.c:964 #, c-format msgid "Failed to open file “%s”: fdopen() failed: %s" msgstr "Misslyckades med att öppna filen ”%s”: fdopen() misslyckades: %s" -#: glib/gfileutils.c:1047 +#: glib/gfileutils.c:1065 #, c-format msgid "Failed to rename file “%s” to “%s”: g_rename() failed: %s" msgstr "" "Misslyckades med att byta namn på filen ”%s” till ”%s”: g_rename() " "misslyckades: %s" -#: glib/gfileutils.c:1156 +#: glib/gfileutils.c:1179 #, c-format msgid "Failed to write file “%s”: write() failed: %s" msgstr "Misslyckades med att skriva filen ”%s”: write() misslyckades: %s" -#: glib/gfileutils.c:1177 +#: glib/gfileutils.c:1200 #, c-format msgid "Failed to write file “%s”: fsync() failed: %s" msgstr "Misslyckades med att skriva filen ”%s”: fsync() misslyckades: %s" -#: glib/gfileutils.c:1338 glib/gfileutils.c:1753 +#: glib/gfileutils.c:1361 glib/gfileutils.c:1776 #, c-format msgid "Failed to create file “%s”: %s" msgstr "Misslyckades med att skapa filen ”%s”: %s" -#: glib/gfileutils.c:1383 +#: glib/gfileutils.c:1406 #, c-format msgid "Existing file “%s” could not be removed: g_unlink() failed: %s" msgstr "Befintliga filen ”%s” kunde inte tas bort: g_unlink() misslyckades: %s" -#: glib/gfileutils.c:1718 +#: glib/gfileutils.c:1741 #, c-format msgid "Template “%s” invalid, should not contain a “%s”" msgstr "Mallen ”%s” är ogiltig, den får inte innehålla ett ”%s”" -#: glib/gfileutils.c:1731 +#: glib/gfileutils.c:1754 #, c-format msgid "Template “%s” doesn’t contain XXXXXX" msgstr "Mallen ”%s” innehåller inte XXXXXX" -#: glib/gfileutils.c:2291 glib/gfileutils.c:2320 +#: glib/gfileutils.c:2348 glib/gfileutils.c:2377 #, c-format msgid "Failed to read the symbolic link “%s”: %s" msgstr "Misslyckades med att läsa den symboliska länken ”%s”: %s" @@ -5119,8 +5128,8 @@ msgstr "Nyckelfilen innehåller kodningen ”%s” som inte stöds" #: glib/gkeyfile.c:1679 glib/gkeyfile.c:1852 glib/gkeyfile.c:3299 -#: glib/gkeyfile.c:3363 glib/gkeyfile.c:3493 glib/gkeyfile.c:3625 -#: glib/gkeyfile.c:3771 glib/gkeyfile.c:4006 glib/gkeyfile.c:4073 +#: glib/gkeyfile.c:3363 glib/gkeyfile.c:3493 glib/gkeyfile.c:3622 +#: glib/gkeyfile.c:3768 glib/gkeyfile.c:4003 glib/gkeyfile.c:4070 #, c-format msgid "Key file does not have group “%s”" msgstr "Nyckelfilen har inte gruppen ”%s”" @@ -5157,31 +5166,31 @@ msgid "Key “%s” in group “%s” has value “%s” where %s was expected" msgstr "Nyckeln ”%s” i gruppen ”%s” innehåller värdet ”%s” där %s förväntades" -#: glib/gkeyfile.c:4326 +#: glib/gkeyfile.c:4323 msgid "Key file contains escape character at end of line" msgstr "Nyckelfilen innehåller kontrolltecken i slutet på en rad" -#: glib/gkeyfile.c:4348 +#: glib/gkeyfile.c:4345 #, c-format msgid "Key file contains invalid escape sequence “%s”" msgstr "Nyckelfilen innehåller ogiltiga kontrollsekvensen ”%s”" -#: glib/gkeyfile.c:4493 +#: glib/gkeyfile.c:4490 #, c-format msgid "Value “%s” cannot be interpreted as a number." msgstr "Värdet ”%s” kan inte tolkas som ett tal." -#: glib/gkeyfile.c:4507 +#: glib/gkeyfile.c:4504 #, c-format msgid "Integer value “%s” out of range" msgstr "Heltalsvärdet ”%s” är utanför intervallet" -#: glib/gkeyfile.c:4540 +#: glib/gkeyfile.c:4537 #, c-format msgid "Value “%s” cannot be interpreted as a float number." msgstr "Värdet ”%s” kan inte tolkas som ett flyttal." -#: glib/gkeyfile.c:4579 +#: glib/gkeyfile.c:4576 #, c-format msgid "Value “%s” cannot be interpreted as a boolean." msgstr "Värdet ”%s” kan inte tolkas som ett booleskt värde." @@ -5203,32 +5212,32 @@ msgid "Failed to open file “%s”: open() failed: %s" msgstr "Misslyckades med att öppna filen ”%s”: open() misslyckades: %s" -#: glib/gmarkup.c:400 glib/gmarkup.c:442 +#: glib/gmarkup.c:393 glib/gmarkup.c:435 #, c-format msgid "Error on line %d char %d: " msgstr "Fel på rad %d tecken %d: " -#: glib/gmarkup.c:464 glib/gmarkup.c:547 +#: glib/gmarkup.c:457 glib/gmarkup.c:540 #, c-format msgid "Invalid UTF-8 encoded text in name — not valid “%s”" msgstr "Ogiltig UTF-8-kodad text i namnet — inte giltig ”%s”" -#: glib/gmarkup.c:475 +#: glib/gmarkup.c:468 #, c-format msgid "“%s” is not a valid name" msgstr "”%s” är inte ett giltigt namn" -#: glib/gmarkup.c:491 +#: glib/gmarkup.c:484 #, c-format msgid "“%s” is not a valid name: “%c”" msgstr "”%s” är inte ett giltigt namn: ”%c”" -#: glib/gmarkup.c:615 +#: glib/gmarkup.c:608 #, c-format msgid "Error on line %d: %s" msgstr "Fel på rad %d: %s" -#: glib/gmarkup.c:692 +#: glib/gmarkup.c:685 #, c-format msgid "" "Failed to parse “%-.*s”, which should have been a digit inside a character " @@ -5237,7 +5246,7 @@ "Misslyckades med att tolka ”%-.*s”, som skulle ha varit en siffra inuti en " "teckenreferens (ê till exempel) — siffran är kanske för stor" -#: glib/gmarkup.c:704 +#: glib/gmarkup.c:697 msgid "" "Character reference did not end with a semicolon; most likely you used an " "ampersand character without intending to start an entity — escape ampersand " @@ -5246,24 +5255,24 @@ "Teckenreferensen slutade inte med ett semikolon. Troligtvis använde du ett &-" "tecken utan att avse att starta en entitet. Skriv om &-tecknet som &" -#: glib/gmarkup.c:730 +#: glib/gmarkup.c:723 #, c-format msgid "Character reference “%-.*s” does not encode a permitted character" msgstr "Teckenreferensen ”%-.*s” kodar inte ett tillåtet tecken" -#: glib/gmarkup.c:768 +#: glib/gmarkup.c:761 msgid "" "Empty entity “&;” seen; valid entities are: & " < > '" msgstr "" "Tom entitet ”&;” hittades, giltiga entiteter är: & " < > " "'" -#: glib/gmarkup.c:776 +#: glib/gmarkup.c:769 #, c-format msgid "Entity name “%-.*s” is not known" msgstr "Entitetsnamnet ”%-.*s” är okänt" -#: glib/gmarkup.c:781 +#: glib/gmarkup.c:774 msgid "" "Entity did not end with a semicolon; most likely you used an ampersand " "character without intending to start an entity — escape ampersand as &" @@ -5271,11 +5280,11 @@ "Entiteten slutade inte med ett semikolon. Troligtvis använde du ett &-tecken " "utan att avse att starta en entitet. Skriv om &-tecknet som &" -#: glib/gmarkup.c:1195 +#: glib/gmarkup.c:1188 msgid "Document must begin with an element (e.g. <book>)" msgstr "Dokumentet måste börja med ett element (exempelvis <book>)" -#: glib/gmarkup.c:1235 +#: glib/gmarkup.c:1228 #, c-format msgid "" "“%s” is not a valid character following a “<” character; it may not begin an " @@ -5284,7 +5293,7 @@ "”%s” är inte ett giltigt tecken efter ett ”<”-tecken. Det får inte inleda " "ett elementnamn" -#: glib/gmarkup.c:1278 +#: glib/gmarkup.c:1271 #, c-format msgid "" "Odd character “%s”, expected a “>” character to end the empty-element tag " @@ -5293,12 +5302,12 @@ "Konstigt tecken ”%s”, ett ”>”-tecken förväntades för att avsluta tomma " "elementtaggen ”%s”" -#: glib/gmarkup.c:1348 +#: glib/gmarkup.c:1341 #, c-format msgid "Too many attributes in element “%s”" msgstr "För många attribut i elementet ”%s”" -#: glib/gmarkup.c:1368 +#: glib/gmarkup.c:1361 #, c-format msgid "" "Odd character “%s”, expected a “=” after attribute name “%s” of element “%s”" @@ -5306,7 +5315,7 @@ "Konstigt tecken ”%s”, ett ”=” förväntades efter attributnamnet ”%s” till " "elementet ”%s”" -#: glib/gmarkup.c:1410 +#: glib/gmarkup.c:1403 #, c-format msgid "" "Odd character “%s”, expected a “>” or “/” character to end the start tag of " @@ -5317,16 +5326,16 @@ "starttaggen för elementet ”%s”, eller möjligtvis ett attribut. Du kanske " "använde ett ogiltigt tecken i ett attributnamn" -#: glib/gmarkup.c:1455 +#: glib/gmarkup.c:1448 #, c-format msgid "" "Odd character “%s”, expected an open quote mark after the equals sign when " "giving value for attribute “%s” of element “%s”" msgstr "" -"Konstigt tecken ”%s”, ett startcitationstecken förväntades efter " -"likhetstecknet när värdet av attributet ”%s” till elementet ”%s” tilldelades" +"Konstigt tecken ”%s”, ett startcitattecken förväntades efter likhetstecknet " +"när värdet av attributet ”%s” till elementet ”%s” tilldelades" -#: glib/gmarkup.c:1589 +#: glib/gmarkup.c:1582 #, c-format msgid "" "“%s” is not a valid character following the characters “</”; “%s” may not " @@ -5335,7 +5344,7 @@ "”%s” är inte ett giltigt tecken efter tecknen ”</”. ”%s” får inte inleda ett " "elementnamn" -#: glib/gmarkup.c:1627 +#: glib/gmarkup.c:1620 #, c-format msgid "" "“%s” is not a valid character following the close element name “%s”; the " @@ -5344,26 +5353,26 @@ "”%s” är inte ett giltigt tecken efter stängelementnamnet ”%s”. Det tillåtna " "tecknet är ”>”" -#: glib/gmarkup.c:1639 +#: glib/gmarkup.c:1632 #, c-format msgid "Element “%s” was closed, no element is currently open" msgstr "Elementet ”%s” stängdes, inget element är öppet för tillfället" -#: glib/gmarkup.c:1648 +#: glib/gmarkup.c:1641 #, c-format msgid "Element “%s” was closed, but the currently open element is “%s”" msgstr "" "Elementet ”%s” stängdes, men det element som är öppet för tillfället är ”%s”" -#: glib/gmarkup.c:1801 +#: glib/gmarkup.c:1794 msgid "Document was empty or contained only whitespace" msgstr "Dokumentet var tomt eller innehöll endast tomrum" -#: glib/gmarkup.c:1815 +#: glib/gmarkup.c:1808 msgid "Document ended unexpectedly just after an open angle bracket “<”" msgstr "Dokumentet tog oväntat slut efter ett öppningsklammer ”<”" -#: glib/gmarkup.c:1823 glib/gmarkup.c:1868 +#: glib/gmarkup.c:1816 glib/gmarkup.c:1861 #, c-format msgid "" "Document ended unexpectedly with elements still open — “%s” was the last " @@ -5372,7 +5381,7 @@ "Dokumentet tog oväntat slut då element fortfarande var öppna. ”%s” var det " "senast öppnade elementet" -#: glib/gmarkup.c:1831 +#: glib/gmarkup.c:1824 #, c-format msgid "" "Document ended unexpectedly, expected to see a close angle bracket ending " @@ -5381,19 +5390,19 @@ "Dokumentet tog oväntat slut, en stängningsklammer förväntades för att " "avsluta taggen <%s/>" -#: glib/gmarkup.c:1837 +#: glib/gmarkup.c:1830 msgid "Document ended unexpectedly inside an element name" msgstr "Dokumentet tog oväntat slut inuti ett elementnamn" -#: glib/gmarkup.c:1843 +#: glib/gmarkup.c:1836 msgid "Document ended unexpectedly inside an attribute name" msgstr "Dokumentet tog oväntat slut inuti ett attributnamn" -#: glib/gmarkup.c:1848 +#: glib/gmarkup.c:1841 msgid "Document ended unexpectedly inside an element-opening tag." msgstr "Dokumentet tog oväntat slut inuti en elementöppnande tagg." -#: glib/gmarkup.c:1854 +#: glib/gmarkup.c:1847 msgid "" "Document ended unexpectedly after the equals sign following an attribute " "name; no attribute value" @@ -5401,22 +5410,22 @@ "Dokumentet tog oväntat slut efter likhetstecknet som följde ett " "attributnamn. Inget attributvärde" -#: glib/gmarkup.c:1861 +#: glib/gmarkup.c:1854 msgid "Document ended unexpectedly while inside an attribute value" msgstr "Dokumentet tog oväntat slut inuti ett attributvärde" -#: glib/gmarkup.c:1878 +#: glib/gmarkup.c:1871 #, c-format msgid "Document ended unexpectedly inside the close tag for element “%s”" msgstr "Dokumentet tog oväntat slut inuti stängningstaggen för elementet ”%s”" -#: glib/gmarkup.c:1882 +#: glib/gmarkup.c:1875 msgid "" "Document ended unexpectedly inside the close tag for an unopened element" msgstr "" "Dokumentet tog oväntat slut inuti stängningstaggen för ett oöppnat element" -#: glib/gmarkup.c:1888 +#: glib/gmarkup.c:1881 msgid "Document ended unexpectedly inside a comment or processing instruction" msgstr "" "Dokumentet tog oväntat slut inuti en kommentar eller behandlingsinstruktion" @@ -5480,184 +5489,184 @@ msgid "Unknown option %s" msgstr "Okänd flagga %s" -#: glib/gregex.c:436 +#: glib/gregex.c:479 msgid "corrupted object" msgstr "skadat objekt" -#: glib/gregex.c:438 +#: glib/gregex.c:481 msgid "out of memory" msgstr "slut på minne" -#: glib/gregex.c:443 +#: glib/gregex.c:487 msgid "backtracking limit reached" msgstr "bakåtspårningsgräns nådd" -#: glib/gregex.c:454 glib/gregex.c:707 glib/gregex.c:736 +#: glib/gregex.c:498 msgid "internal error" msgstr "internt fel" -#: glib/gregex.c:456 +#: glib/gregex.c:500 msgid "the pattern contains items not supported for partial matching" msgstr "mönstret innehåller objekt som inte stöds för delvis matchning" -#: glib/gregex.c:458 +#: glib/gregex.c:502 msgid "back references as conditions are not supported for partial matching" msgstr "bakreferenser som villkor stöds inte för delvis matchning" -#: glib/gregex.c:464 +#: glib/gregex.c:508 msgid "recursion limit reached" msgstr "rekursionsgräns nådd" -#: glib/gregex.c:466 +#: glib/gregex.c:510 msgid "bad offset" msgstr "felaktig offset" -#: glib/gregex.c:468 +#: glib/gregex.c:512 msgid "recursion loop" msgstr "rekursionsloop" #. should not happen in GRegex since we check modes before each match -#: glib/gregex.c:471 +#: glib/gregex.c:515 msgid "matching mode is requested that was not compiled for JIT" msgstr "matchningsläge som inte kompilerats för JIT efterfrågas" -#: glib/gregex.c:475 +#: glib/gregex.c:536 glib/gregex.c:1838 msgid "unknown error" msgstr "okänt fel" -#: glib/gregex.c:496 +#: glib/gregex.c:557 msgid "\\ at end of pattern" msgstr "\\ på slutet av mönster" -#: glib/gregex.c:500 +#: glib/gregex.c:561 msgid "\\c at end of pattern" msgstr "\\c på slutet av mönster" -#: glib/gregex.c:505 +#: glib/gregex.c:566 msgid "unrecognized character following \\" msgstr "okänt tecken efter \\" -#: glib/gregex.c:509 +#: glib/gregex.c:570 msgid "numbers out of order in {} quantifier" msgstr "tal är inte i ordning i {}-kvantifierare" -#: glib/gregex.c:513 +#: glib/gregex.c:574 msgid "number too big in {} quantifier" msgstr "tal för stort i {}-kvantifierare" -#: glib/gregex.c:517 +#: glib/gregex.c:578 msgid "missing terminating for character class" msgstr "saknar avslutande för teckenklass" -#: glib/gregex.c:521 +#: glib/gregex.c:582 msgid "invalid escape sequence in character class" msgstr "ogiltig escape-sekvens i teckenklass" -#: glib/gregex.c:525 +#: glib/gregex.c:586 msgid "range out of order in character class" msgstr "intervall är inte i ordning i teckenklass" -#: glib/gregex.c:530 +#: glib/gregex.c:591 msgid "nothing to repeat" msgstr "ingenting att upprepa" -#: glib/gregex.c:534 +#: glib/gregex.c:595 msgid "unrecognized character after (? or (?-" msgstr "okänt tecken efter (? eller (?-" -#: glib/gregex.c:538 +#: glib/gregex.c:599 msgid "POSIX named classes are supported only within a class" msgstr "POSIX-namngivna klasser stöds endast inom en klass" -#: glib/gregex.c:542 +#: glib/gregex.c:603 msgid "POSIX collating elements are not supported" msgstr "POSIX-sorteringselement stöds inte" -#: glib/gregex.c:548 +#: glib/gregex.c:609 msgid "missing terminating )" msgstr "saknar avslutande )" -#: glib/gregex.c:552 +#: glib/gregex.c:613 msgid "reference to non-existent subpattern" msgstr "referens till icke-existerande undermönster" -#: glib/gregex.c:556 +#: glib/gregex.c:617 msgid "missing ) after comment" msgstr "saknar ) efter kommentar" -#: glib/gregex.c:560 +#: glib/gregex.c:621 msgid "regular expression is too large" msgstr "reguljärt uttryck är för stort" -#: glib/gregex.c:564 +#: glib/gregex.c:625 msgid "malformed number or name after (?(" msgstr "felformulerat tal eller namn efter (?(" -#: glib/gregex.c:568 +#: glib/gregex.c:629 msgid "lookbehind assertion is not fixed length" msgstr "lookbehind-assertion är inte av fast längd" -#: glib/gregex.c:572 +#: glib/gregex.c:633 msgid "conditional group contains more than two branches" msgstr "villkorsgrupp innehåller fler än två grenar" -#: glib/gregex.c:576 +#: glib/gregex.c:637 msgid "assertion expected after (?(" msgstr "assertion förväntades efter (?(" -#: glib/gregex.c:580 +#: glib/gregex.c:641 msgid "a numbered reference must not be zero" msgstr "en numrerad referens får inte vara noll" -#: glib/gregex.c:584 +#: glib/gregex.c:645 msgid "unknown POSIX class name" msgstr "okänt POSIX-klassnamn" -#: glib/gregex.c:589 +#: glib/gregex.c:650 msgid "character value in \\x{...} sequence is too large" msgstr "teckenvärde i \\x{…}-sekvens är för stort" -#: glib/gregex.c:593 +#: glib/gregex.c:654 msgid "\\C not allowed in lookbehind assertion" msgstr "\\C tillåts inte i lookbehind-assertion" -#: glib/gregex.c:597 +#: glib/gregex.c:658 msgid "missing terminator in subpattern name" msgstr "saknar avslutstecken i undermönstrets namn" -#: glib/gregex.c:601 +#: glib/gregex.c:662 msgid "two named subpatterns have the same name" msgstr "två namngivna undermönster har samma namn" -#: glib/gregex.c:605 +#: glib/gregex.c:666 msgid "malformed \\P or \\p sequence" msgstr "felformulerad \\P eller \\p-sekvens" -#: glib/gregex.c:609 +#: glib/gregex.c:670 msgid "unknown property name after \\P or \\p" msgstr "okänt egenskapsnamn efter \\P eller \\p" -#: glib/gregex.c:613 +#: glib/gregex.c:674 msgid "subpattern name is too long (maximum 32 characters)" msgstr "undermönstrets namn är för långt (maximalt 32 tecken)" -#: glib/gregex.c:617 +#: glib/gregex.c:678 msgid "too many named subpatterns (maximum 10,000)" msgstr "för många namngivna undermönster (maximalt 10 000)" -#: glib/gregex.c:621 +#: glib/gregex.c:682 msgid "octal value is greater than \\377" msgstr "oktalt värde är större än \\377" -#: glib/gregex.c:625 +#: glib/gregex.c:686 msgid "DEFINE group contains more than one branch" msgstr "DEFINE-grupp innehåller fler än en gren" -#: glib/gregex.c:629 +#: glib/gregex.c:690 msgid "inconsistent NEWLINE options" msgstr "inkonsistenta NEWLINE-flaggor" -#: glib/gregex.c:633 +#: glib/gregex.c:694 msgid "" "\\g is not followed by a braced, angle-bracketed, or quoted name or number, " "or by a plain number" @@ -5665,130 +5674,130 @@ "\\g följs inte av ett namn inom klammerparentes, vinkelparentes eller " "citattecken eller siffra, eller en enkel siffra" -#: glib/gregex.c:638 +#: glib/gregex.c:699 msgid "an argument is not allowed for (*ACCEPT), (*FAIL), or (*COMMIT)" msgstr "ett argument tillåts inte för (*ACCEPT), (*FAIL) eller (*COMMIT)" -#: glib/gregex.c:642 +#: glib/gregex.c:703 msgid "(*VERB) not recognized" msgstr "(*VERB) kändes inte igen" -#: glib/gregex.c:646 +#: glib/gregex.c:707 msgid "number is too big" msgstr "tal är för stort" -#: glib/gregex.c:650 +#: glib/gregex.c:711 msgid "missing subpattern name after (?&" msgstr "saknar undermönsternamn efter (?&" -#: glib/gregex.c:654 +#: glib/gregex.c:715 msgid "different names for subpatterns of the same number are not allowed" msgstr "olika namn för undermönster för samma siffra är inte tillåtet" -#: glib/gregex.c:658 +#: glib/gregex.c:719 msgid "(*MARK) must have an argument" msgstr "(*MARK) måste ha ett argument" -#: glib/gregex.c:662 +#: glib/gregex.c:723 msgid "\\c must be followed by an ASCII character" msgstr "\\c måste följas av ett ASCII-tecken" -#: glib/gregex.c:666 +#: glib/gregex.c:727 msgid "\\k is not followed by a braced, angle-bracketed, or quoted name" msgstr "" "\\k följs inte av ett namn inom klammerparentes, vinkelparentes eller " "citattecken" -#: glib/gregex.c:670 +#: glib/gregex.c:731 msgid "\\N is not supported in a class" msgstr "\\N är saknar stöd i en klass" -#: glib/gregex.c:674 +#: glib/gregex.c:735 msgid "name is too long in (*MARK), (*PRUNE), (*SKIP), or (*THEN)" msgstr "namn är alltför långt i (*MARK), (*PRUNE), (*SKIP) eller (*THEN)" -#: glib/gregex.c:678 glib/gregex.c:809 +#: glib/gregex.c:739 glib/gregex.c:875 msgid "code overflow" msgstr "överflöde i kod" -#: glib/gregex.c:682 +#: glib/gregex.c:743 msgid "unrecognized character after (?P" msgstr "okänt tecken efter (?P" -#: glib/gregex.c:686 +#: glib/gregex.c:747 msgid "overran compiling workspace" msgstr "fyllde över kompileringsutrymme" -#: glib/gregex.c:690 +#: glib/gregex.c:751 msgid "previously-checked referenced subpattern not found" msgstr "tidigare kontrollerad refererande undermönster hittades inte" -#: glib/gregex.c:808 glib/gregex.c:1041 glib/gregex.c:2342 +#: glib/gregex.c:874 glib/gregex.c:1121 glib/gregex.c:2444 #, c-format msgid "Error while matching regular expression %s: %s" msgstr "Fel vid matchning av reguljära uttrycket %s: %s" -#: glib/gregex.c:1618 +#: glib/gregex.c:1721 msgid "PCRE library is compiled without UTF8 support" msgstr "PCRE-biblioteket är byggt utan stöd för UTF8" -#: glib/gregex.c:1626 +#: glib/gregex.c:1729 msgid "PCRE library is compiled with incompatible options" msgstr "PCRE-biblioteket är byggt med inkompatibla alternativ" -#: glib/gregex.c:1751 +#: glib/gregex.c:1847 #, c-format msgid "Error while compiling regular expression ‘%s’ at char %s: %s" msgstr "Fel vid kompilering av reguljära uttrycket ”%s” vid tecknet %s: %s" -#: glib/gregex.c:2786 +#: glib/gregex.c:2887 msgid "hexadecimal digit or “}” expected" msgstr "hexadecimal siffra eller ”}” förväntades" -#: glib/gregex.c:2802 +#: glib/gregex.c:2903 msgid "hexadecimal digit expected" msgstr "hexadecimal siffra förväntades" -#: glib/gregex.c:2842 +#: glib/gregex.c:2943 msgid "missing “<” in symbolic reference" msgstr "saknar ”<” i symbolisk referens" -#: glib/gregex.c:2851 +#: glib/gregex.c:2952 msgid "unfinished symbolic reference" msgstr "oavslutad symbolisk referens" -#: glib/gregex.c:2858 +#: glib/gregex.c:2959 msgid "zero-length symbolic reference" msgstr "symbolisk referens med noll-längd" -#: glib/gregex.c:2869 +#: glib/gregex.c:2970 msgid "digit expected" msgstr "siffra förväntades" -#: glib/gregex.c:2887 +#: glib/gregex.c:2988 msgid "illegal symbolic reference" msgstr "otillåten symbolisk referens" -#: glib/gregex.c:2950 +#: glib/gregex.c:3051 msgid "stray final “\\”" msgstr "felplacerad avslutande ”\\”" -#: glib/gregex.c:2954 +#: glib/gregex.c:3055 msgid "unknown escape sequence" msgstr "okänd escape-sekvens" -#: glib/gregex.c:2964 +#: glib/gregex.c:3065 #, c-format msgid "Error while parsing replacement text “%s” at char %lu: %s" msgstr "Fel vid tolkning av ersättningstexten ”%s” vid tecknet %lu: %s" #: glib/gshell.c:98 msgid "Quoted text doesn’t begin with a quotation mark" -msgstr "Citerad text börjar inte med citationstecken" +msgstr "Citerad text börjar inte med citattecken" #: glib/gshell.c:188 msgid "Unmatched quotation mark in command line or other shell-quoted text" -msgstr "Ensamt citationstecken på kommandoraden eller annan skalciterad text" +msgstr "Ensamt citattecken på kommandoraden eller annan skalciterad text" #: glib/gshell.c:594 #, c-format @@ -5799,105 +5808,109 @@ #, c-format msgid "Text ended before matching quote was found for %c. (The text was “%s”)" msgstr "" -"Texten slutade innan matchande citationstecken hittades för %c (texten var " -"”%s”)." +"Texten slutade innan matchande citattecken hittades för %c (texten var ”%s”)." #: glib/gshell.c:613 msgid "Text was empty (or contained only whitespace)" msgstr "Texten var tom (eller innehöll bara tomrum)" -#: glib/gspawn.c:314 +#: glib/gspawn.c:319 #, c-format msgid "Failed to read data from child process (%s)" msgstr "Misslyckades med att läsa data från barnprocess (%s)" -#: glib/gspawn.c:466 +#: glib/gspawn.c:471 #, c-format msgid "Unexpected error in reading data from a child process (%s)" msgstr "Oväntat fel vid läsning av data från en barnprocess (%s)" -#: glib/gspawn.c:551 +#: glib/gspawn.c:556 #, c-format msgid "Unexpected error in waitpid() (%s)" msgstr "Oväntat fel i waitpid() (%s)" -#: glib/gspawn.c:1170 glib/gspawn-win32.c:1488 +#: glib/gspawn.c:1175 glib/gspawn-win32.c:1503 #, c-format msgid "Child process exited with code %ld" msgstr "Barnprocess avslutades med kod %ld" -#: glib/gspawn.c:1178 +#: glib/gspawn.c:1183 #, c-format msgid "Child process killed by signal %ld" msgstr "Barnprocess dödat av signal %ld" -#: glib/gspawn.c:1185 +#: glib/gspawn.c:1190 #, c-format msgid "Child process stopped by signal %ld" msgstr "Barnprocess stoppad av signal %ld" -#: glib/gspawn.c:1192 +#: glib/gspawn.c:1197 #, c-format msgid "Child process exited abnormally" msgstr "Barnprocess avslutades onormalt" -#: glib/gspawn.c:1885 glib/gspawn-win32.c:393 glib/gspawn-win32.c:401 +#: glib/gspawn.c:2027 glib/gspawn-win32.c:393 glib/gspawn-win32.c:401 #, c-format msgid "Failed to read from child pipe (%s)" msgstr "Misslyckades med att läsa från rör till barn (%s)" -#: glib/gspawn.c:2248 +#: glib/gspawn.c:2399 #, c-format msgid "Failed to spawn child process “%s” (%s)" msgstr "Misslyckades med att starta barnprocessen ”%s” (%s)" -#: glib/gspawn.c:2365 +#: glib/gspawn.c:2525 #, c-format msgid "Failed to fork (%s)" msgstr "Misslyckades med att grena (%s)" -#: glib/gspawn.c:2525 glib/gspawn-win32.c:424 +#: glib/gspawn.c:2685 glib/gspawn-win32.c:424 #, c-format msgid "Failed to change to directory “%s” (%s)" msgstr "Misslyckades med att byta till katalogen ”%s” (%s)" -#: glib/gspawn.c:2535 +#: glib/gspawn.c:2695 #, c-format msgid "Failed to execute child process “%s” (%s)" msgstr "Misslyckades med att köra barnprocessen ”%s” (%s)" -#: glib/gspawn.c:2545 +#: glib/gspawn.c:2705 #, c-format msgid "Failed to open file to remap file descriptor (%s)" msgstr "Misslyckades med att öppna fil för att mappa om filhandtag (%s)" -#: glib/gspawn.c:2553 +#: glib/gspawn.c:2713 #, c-format msgid "Failed to duplicate file descriptor for child process (%s)" msgstr "Misslyckades med att duplicera filhandtag för barnprocess (%s)" -#: glib/gspawn.c:2562 +#: glib/gspawn.c:2722 #, c-format msgid "Failed to fork child process (%s)" msgstr "Misslyckades med att skapa barnprocess (%s)" -#: glib/gspawn.c:2570 +#: glib/gspawn.c:2730 #, c-format msgid "Failed to close file descriptor for child process (%s)" msgstr "Misslyckades med att stänga filhandtag för barnprocess (%s)" -#: glib/gspawn.c:2578 +#: glib/gspawn.c:2738 #, c-format msgid "Unknown error executing child process “%s”" msgstr "Okänt fel vid körning av barnprocessen ”%s”" -#: glib/gspawn.c:2602 +#: glib/gspawn.c:2762 #, c-format msgid "Failed to read enough data from child pid pipe (%s)" msgstr "" "Misslyckades med att läsa tillräckligt med data från röret till barnets pid " "(%s)" +#: glib/gspawn-private.h:134 +#, c-format +msgid "Invalid source FDs argument" +msgstr "Ogiltigt argument för käll-FD" + #: glib/gspawn-win32.c:337 msgid "Failed to read data from child process" msgstr "Misslyckades med att läsa data från barnprocessen" @@ -5917,27 +5930,27 @@ msgid "Invalid program name: %s" msgstr "Ogiltigt programnamn: %s" -#: glib/gspawn-win32.c:521 glib/gspawn-win32.c:853 +#: glib/gspawn-win32.c:521 glib/gspawn-win32.c:868 #, c-format msgid "Invalid string in argument vector at %d: %s" msgstr "Ogiltig sträng i argumentvektorn vid %d: %s" -#: glib/gspawn-win32.c:532 glib/gspawn-win32.c:869 +#: glib/gspawn-win32.c:532 glib/gspawn-win32.c:884 #, c-format msgid "Invalid string in environment: %s" msgstr "Ogiltig sträng i miljön: %s" -#: glib/gspawn-win32.c:849 +#: glib/gspawn-win32.c:864 #, c-format msgid "Invalid working directory: %s" msgstr "Ogiltig arbetskatalog: %s" -#: glib/gspawn-win32.c:914 +#: glib/gspawn-win32.c:929 #, c-format msgid "Failed to execute helper program (%s)" msgstr "Misslyckades med att köra hjälparprogram (%s)" -#: glib/gspawn-win32.c:1143 +#: glib/gspawn-win32.c:1158 msgid "" "Unexpected error in g_io_channel_win32_poll() reading data from a child " "process" @@ -5945,21 +5958,21 @@ "Oväntat fel i g_io_channel_win32_poll() vid inläsning av data från en " "barnprocess" -#: glib/gstrfuncs.c:3372 glib/gstrfuncs.c:3474 +#: glib/gstrfuncs.c:3370 glib/gstrfuncs.c:3472 msgid "Empty string is not a number" msgstr "Tom sträng är inte ett tal" -#: glib/gstrfuncs.c:3396 +#: glib/gstrfuncs.c:3394 #, c-format msgid "“%s” is not a signed number" msgstr "”%s” är inte ett tal med tecken" -#: glib/gstrfuncs.c:3406 glib/gstrfuncs.c:3510 +#: glib/gstrfuncs.c:3404 glib/gstrfuncs.c:3508 #, c-format msgid "Number “%s” is out of bounds %s, %s" msgstr "Talet ”%s” är utanför gränserna %s, %s" -#: glib/gstrfuncs.c:3500 +#: glib/gstrfuncs.c:3498 #, c-format msgid "“%s” is not an unsigned number" msgstr "”%s” är inte ett teckenlöst tal" @@ -6038,132 +6051,132 @@ msgstr "Tecknet är utanför intervallet för UTF-16" #. Translators: A unit symbol for size formatting, showing for example: "13.0 kB" -#: glib/gutils.c:2857 +#: glib/gutils.c:2966 msgid "kB" msgstr "kB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 MB" -#: glib/gutils.c:2859 +#: glib/gutils.c:2968 msgid "MB" msgstr "MB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 GB" -#: glib/gutils.c:2861 +#: glib/gutils.c:2970 msgid "GB" msgstr "GB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 TB" -#: glib/gutils.c:2863 +#: glib/gutils.c:2972 msgid "TB" msgstr "TB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 PB" -#: glib/gutils.c:2865 +#: glib/gutils.c:2974 msgid "PB" msgstr "PB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 EB" -#: glib/gutils.c:2867 +#: glib/gutils.c:2976 msgid "EB" msgstr "EB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 KiB" -#: glib/gutils.c:2871 +#: glib/gutils.c:2980 msgid "KiB" msgstr "KiB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 MiB" -#: glib/gutils.c:2873 +#: glib/gutils.c:2982 msgid "MiB" msgstr "MiB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 GiB" -#: glib/gutils.c:2875 +#: glib/gutils.c:2984 msgid "GiB" msgstr "GiB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 TiB" -#: glib/gutils.c:2877 +#: glib/gutils.c:2986 msgid "TiB" msgstr "TiB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 PiB" -#: glib/gutils.c:2879 +#: glib/gutils.c:2988 msgid "PiB" msgstr "PiB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 EiB" -#: glib/gutils.c:2881 +#: glib/gutils.c:2990 msgid "EiB" msgstr "EiB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 kb" -#: glib/gutils.c:2885 +#: glib/gutils.c:2994 msgid "kb" msgstr "kb" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Mb" -#: glib/gutils.c:2887 +#: glib/gutils.c:2996 msgid "Mb" msgstr "Mb" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Gb" -#: glib/gutils.c:2889 +#: glib/gutils.c:2998 msgid "Gb" msgstr "Gb" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Tb" -#: glib/gutils.c:2891 +#: glib/gutils.c:3000 msgid "Tb" msgstr "Tb" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Pb" -#: glib/gutils.c:2893 +#: glib/gutils.c:3002 msgid "Pb" msgstr "Pb" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Eb" -#: glib/gutils.c:2895 +#: glib/gutils.c:3004 msgid "Eb" msgstr "Eb" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Kib" -#: glib/gutils.c:2899 +#: glib/gutils.c:3008 msgid "Kib" msgstr "Kib" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Mib" -#: glib/gutils.c:2901 +#: glib/gutils.c:3010 msgid "Mib" msgstr "Mib" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Gib" -#: glib/gutils.c:2903 +#: glib/gutils.c:3012 msgid "Gib" msgstr "Gib" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Tib" -#: glib/gutils.c:2905 +#: glib/gutils.c:3014 msgid "Tib" msgstr "Tib" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Pib" -#: glib/gutils.c:2907 +#: glib/gutils.c:3016 msgid "Pib" msgstr "Pib" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Eib" -#: glib/gutils.c:2909 +#: glib/gutils.c:3018 msgid "Eib" msgstr "Eib" -#: glib/gutils.c:2947 +#: glib/gutils.c:3056 msgid "byte" msgid_plural "bytes" msgstr0 "byte" msgstr1 "byte" -#: glib/gutils.c:2951 +#: glib/gutils.c:3060 msgid "bit" msgid_plural "bits" msgstr0 "bit" @@ -6171,7 +6184,7 @@ #. Translators: The "%u" is replaced with the size value, like "13"; it could #. * be part of "13 bytes", but only the number is requested this time. -#: glib/gutils.c:2959 +#: glib/gutils.c:3068 #, c-format msgctxt "format-size" msgid "%u" @@ -6179,7 +6192,7 @@ #. Translators: The first "%u" is replaced with the value, the "%s" with a unit of the value. #. * The order can be changed with "%$2s %$1u". An example: "13 bytes" -#: glib/gutils.c:2964 +#: glib/gutils.c:3073 #, c-format msgctxt "format-size" msgid "%u %s" @@ -6187,7 +6200,7 @@ #. Translators: The "%.1f" is replaced with the size value, like "13.0"; it could #. * be part of "13.0 MB", but only the number is requested this time. -#: glib/gutils.c:3000 +#: glib/gutils.c:3109 #, c-format msgctxt "format-size" msgid "%.1f" @@ -6196,14 +6209,14 @@ #. Translators: The first "%.1f" is replaced with the value, the "%s" with a unit of the value. #. * The order can be changed with "%$2s %$1.1f". Keep the no-break space between the value and #. * the unit symbol. An example: "13.0 MB" -#: glib/gutils.c:3006 +#: glib/gutils.c:3115 #, c-format msgctxt "format-size" msgid "%.1f %s" msgstr "%.1f %s" #. Translators: the %s in "%s bytes" will always be replaced by a number. -#: glib/gutils.c:3046 +#: glib/gutils.c:3155 #, c-format msgid "%s byte" msgid_plural "%s bytes" @@ -6211,14 +6224,14 @@ msgstr1 "%s byte" #. Translators: the %s in "%s bits" will always be replaced by a number. -#: glib/gutils.c:3051 +#: glib/gutils.c:3160 #, c-format msgid "%s bit" msgid_plural "%s bits" msgstr0 "%s bit" msgstr1 "%s bitar" -#: glib/gutils.c:3092 +#: glib/gutils.c:3201 #, c-format msgid "%u byte" msgid_plural "%u bytes" @@ -6230,32 +6243,32 @@ #. * compatibility. Users will not see this string unless a program is using this deprecated function. #. * Please translate as literally as possible. #. -#: glib/gutils.c:3105 +#: glib/gutils.c:3214 #, c-format msgid "%.1f KB" msgstr "%.1f KB" -#: glib/gutils.c:3110 +#: glib/gutils.c:3219 #, c-format msgid "%.1f MB" msgstr "%.1f MB" -#: glib/gutils.c:3115 +#: glib/gutils.c:3224 #, c-format msgid "%.1f GB" msgstr "%.1f GB" -#: glib/gutils.c:3120 +#: glib/gutils.c:3229 #, c-format msgid "%.1f TB" msgstr "%.1f TB" -#: glib/gutils.c:3125 +#: glib/gutils.c:3234 #, c-format msgid "%.1f PB" msgstr "%.1f PB" -#: glib/gutils.c:3130 +#: glib/gutils.c:3239 #, c-format msgid "%.1f EB" msgstr "%.1f EB"
View file
_service:tar_scm:glib-2.74.4.tar.xz/po/tr.po -> _service:tar_scm:glib-2.76.4.tar.xz/po/tr.po
Changed
@@ -1,6 +1,6 @@ # Turkish translation of Glib. # Copyright (C) 2001-2003, 2005, 2007, 2008 Free Software Foundation, Inc. -# Copyright (C) 2009-2022 glib's COPYRIGHT HOLDER +# Copyright (C) 2009-2023 glib's COPYRIGHT HOLDER # This file is distributed under the same license as the glib package. # # KEMAL YILMAZ <kyilmaz@uekae.tubitak.gov.tr>, 2001. @@ -11,39 +11,40 @@ # Kaan Özdinçer <kaanozdincer@gmail.com>, 2015. # Muhammet Kara <muhammetk@gmail.com>, 2011, 2014, 2015, 2016. # Serdar Sağlam <teknomobil@yandex.com>, 2019. -# Emin Tufan Çetin <etcetin@gmail.com>, 2017, 2018, 2019, 2020, 2021, 2022. +# Sabri Ünal <libreajans@gmail.com>, 2023. +# Emin Tufan Çetin <etcetin@gmail.com>, 2017-2023. # msgid "" msgstr "" "Project-Id-Version: glib\n" "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/glib/issues\n" -"POT-Creation-Date: 2022-09-12 05:47+0000\n" -"PO-Revision-Date: 2022-09-01 21:35+0300\n" -"Last-Translator: Emin Tufan Çetin <etcetin@gmail.com>\n" -"Language-Team: Türkçe <gnome-turk@gnome.org>\n" +"POT-Creation-Date: 2023-03-07 15:34+0000\n" +"PO-Revision-Date: 2023-03-10 21:37+0300\n" +"Last-Translator: Sabri Ünal <libreajans@gmail.com>\n" +"Language-Team: Turkish <gnome-turk@gnome.org>\n" "Language: tr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Poedit 3.0.1\n" +"X-Generator: Poedit 3.1.1\n" "X-POOTLE-MTIME: 1433280446.000000\n" -#: gio/gappinfo.c:335 +#: gio/gappinfo.c:339 msgid "Setting default applications not supported yet" msgstr "Öntanımlı uygulama belirleme henüz desteklenmiyor" -#: gio/gappinfo.c:368 +#: gio/gappinfo.c:372 msgid "Setting application as last used for type not supported yet" msgstr "" "Uygulamayı tür için son kullanılan olarak belirleme henüz desteklenmiyor" -#: gio/gappinfo.c:810 +#: gio/gappinfo.c:814 #, c-format msgid "Failed to find default application for content type ‘%s’" msgstr "‘%s’ içerik türü için öntanımlı uygulama bulunamadı" -#: gio/gappinfo.c:870 +#: gio/gappinfo.c:874 #, c-format msgid "Failed to find default application for URI Scheme ‘%s’" msgstr "‘%s’ URI Şeması için öntanımlı uygulama bulunamadı" @@ -241,11 +242,11 @@ msgid "error sending %s message to application: %s\n" msgstr "uygulamaya %s iletisi gönderilirken hata: %s\n" -#: gio/gapplication-tool.c:321 +#: gio/gapplication-tool.c:324 msgid "action name must be given after application id\n" msgstr "uygulama kimliğinden sonra eylem adı verilmelidir\n" -#: gio/gapplication-tool.c:329 +#: gio/gapplication-tool.c:332 #, c-format msgid "" "invalid action name: “%s”\n" @@ -254,25 +255,25 @@ "geçersiz eylem adı: “%s”\n" "eylem adları yalnızca “-”, “.”, harfler ve sayılardan oluşmalıdır\n" -#: gio/gapplication-tool.c:348 +#: gio/gapplication-tool.c:351 #, c-format msgid "error parsing action parameter: %s\n" msgstr "eylem parametresi ayrıştırılırken hata: %s\n" -#: gio/gapplication-tool.c:360 +#: gio/gapplication-tool.c:363 msgid "actions accept a maximum of one parameter\n" msgstr "eylemler maksimum bir parametre kabul eder\n" -#: gio/gapplication-tool.c:415 +#: gio/gapplication-tool.c:418 msgid "list-actions command takes only the application id" msgstr "list-actions komutu yalnızca uygulama kimliği değişkenini alır" -#: gio/gapplication-tool.c:425 +#: gio/gapplication-tool.c:428 #, c-format msgid "unable to find desktop file for application %s\n" msgstr "%s uygulaması için masaüstü dosyası bulunamıyor\n" -#: gio/gapplication-tool.c:470 +#: gio/gapplication-tool.c:473 #, c-format msgid "" "unrecognised command: %s\n" @@ -307,7 +308,7 @@ msgid "Truncate not supported on base stream" msgstr "Taban akış üzerinde sonunun kesilmesi desteklenmiyor" -#: gio/gcancellable.c:319 gio/gdbusconnection.c:1859 gio/gdbusprivate.c:1420 +#: gio/gcancellable.c:326 gio/gdbusconnection.c:1865 gio/gdbusprivate.c:1420 #: gio/gsimpleasyncresult.c:873 gio/gsimpleasyncresult.c:899 #, c-format msgid "Operation was cancelled" @@ -327,13 +328,13 @@ #: gio/gcharsetconverter.c:344 gio/gdatainputstream.c:850 #: gio/gdatainputstream.c:1268 glib/gconvert.c:451 glib/gconvert.c:883 -#: glib/giochannel.c:1576 glib/giochannel.c:1618 glib/giochannel.c:2473 +#: glib/giochannel.c:1576 glib/giochannel.c:1618 glib/giochannel.c:2478 #: glib/gutf8.c:892 glib/gutf8.c:1346 msgid "Invalid byte sequence in conversion input" msgstr "Dönüşüm girdisinde geçersiz bayt dizisi" #: gio/gcharsetconverter.c:349 glib/gconvert.c:459 glib/gconvert.c:797 -#: glib/giochannel.c:1583 glib/giochannel.c:2485 +#: glib/giochannel.c:1583 glib/giochannel.c:2493 #, c-format msgid "Error during conversion: %s" msgstr "Dönüşüm sırasında hata oluştu: %s" @@ -390,17 +391,17 @@ msgid "Unexpected early end-of-stream" msgstr "Beklenmeyen erken akış-sonu" -#: gio/gdbusaddress.c:164 gio/gdbusaddress.c:238 gio/gdbusaddress.c:327 +#: gio/gdbusaddress.c:168 gio/gdbusaddress.c:240 gio/gdbusaddress.c:327 #, c-format msgid "Unsupported key “%s” in address entry “%s”" msgstr "“%2$s” adres girdisinde desteklenmeyen anahtar “%1$s”" -#: gio/gdbusaddress.c:177 +#: gio/gdbusaddress.c:181 #, c-format msgid "Meaningless key/value pair combination in address entry “%s”" msgstr "“%s” adres girdisinde anlamsız anahtar/değer çifti birleşimi" -#: gio/gdbusaddress.c:186 +#: gio/gdbusaddress.c:190 #, c-format msgid "" "Address “%s” is invalid (need exactly one of path, dir, tmpdir, or abstract " @@ -408,7 +409,7 @@ msgstr "" "“%s” adresi geçersiz (tam bir yol, dir, tmpdir veya soyut anahtarlar gerekir)" -#: gio/gdbusaddress.c:253 gio/gdbusaddress.c:264 gio/gdbusaddress.c:279 +#: gio/gdbusaddress.c:255 gio/gdbusaddress.c:266 gio/gdbusaddress.c:281 #: gio/gdbusaddress.c:342 gio/gdbusaddress.c:353 #, c-format msgid "Error in address “%s” — the “%s” attribute is malformed" @@ -535,7 +536,7 @@ msgstr "" "Oturum veri yolu adresi saptanamıyor (bu işletim sistemi için uygulanmadı)" -#: gio/gdbusaddress.c:1375 gio/gdbusconnection.c:7321 +#: gio/gdbusaddress.c:1380 gio/gdbusconnection.c:7324 #, c-format msgid "" "Cannot determine bus address from DBUS_STARTER_BUS_TYPE environment variable " @@ -544,7 +545,7 @@ "DBUS_STARTER_BUS_TYPE ortam değişkeninden veri yolu adresi saptanamıyor — " "bilinmeyen değer “%s”" -#: gio/gdbusaddress.c:1384 gio/gdbusconnection.c:7330 +#: gio/gdbusaddress.c:1389 gio/gdbusconnection.c:7333 msgid "" "Cannot determine bus address because the DBUS_STARTER_BUS_TYPE environment " "variable is not set" @@ -552,7 +553,7 @@ "DBUS_STARTER_BUS_TYPE ortam değişkenine değer atanmadığından dolayı veri " "yolu adresi belirlenemiyor" -#: gio/gdbusaddress.c:1394 +#: gio/gdbusaddress.c:1399 #, c-format msgid "Unknown bus type %d" msgstr "Bilinmeyen veriyolu türü %d" @@ -573,20 +574,24 @@ "Tüm olası kimlik doğrulama yöntemleri tükendi (denenen: %s) (kullanılabilir: " "%s)" -#: gio/gdbusauth.c:1178 +#: gio/gdbusauth.c:1045 +msgid "Unexpected lack of content trying to read a byte" +msgstr "Bayt okunmaya çalışılırken beklenmeyen içerik eksikliği" + +#: gio/gdbusauth.c:1195 msgid "User IDs must be the same for peer and server" msgstr "Kullanıcı kimlikleri eş ve sunucu için aynı olmalıdır" -#: gio/gdbusauth.c:1190 +#: gio/gdbusauth.c:1207 msgid "Cancelled via GDBusAuthObserver::authorize-authenticated-peer" msgstr "GDBusAuthObserver::authorize-authenticated-peer yolu ile iptal edildi" -#: gio/gdbusauthmechanismsha1.c:303 +#: gio/gdbusauthmechanismsha1.c:307 #, c-format msgid "Error when getting information for directory “%s”: %s" msgstr "“%s” dizini için bilgi alınırken hata: %s" -#: gio/gdbusauthmechanismsha1.c:318 +#: gio/gdbusauthmechanismsha1.c:322 #, c-format msgid "" "Permissions on directory “%s” are malformed. Expected mode 0700, got 0%o" @@ -594,200 +599,200 @@ "“%s” dizini üzerindeki izinler bozulmuştur. 0700 kipi beklenmiştir, ama 0%o " "alınmıştır" -#: gio/gdbusauthmechanismsha1.c:351 gio/gdbusauthmechanismsha1.c:362 +#: gio/gdbusauthmechanismsha1.c:355 gio/gdbusauthmechanismsha1.c:366 #, c-format msgid "Error creating directory “%s”: %s" msgstr "“%s” dizini oluşturulurken hata: %s" -#: gio/gdbusauthmechanismsha1.c:364 gio/gfile.c:1095 gio/gfile.c:1333 +#: gio/gdbusauthmechanismsha1.c:368 gio/gfile.c:1095 gio/gfile.c:1333 #: gio/gfile.c:1471 gio/gfile.c:1709 gio/gfile.c:1764 gio/gfile.c:1822 #: gio/gfile.c:1906 gio/gfile.c:1963 gio/gfile.c:2027 gio/gfile.c:2082 -#: gio/gfile.c:3787 gio/gfile.c:3927 gio/gfile.c:4339 gio/gfile.c:4809 -#: gio/gfile.c:5220 gio/gfile.c:5305 gio/gfile.c:5395 gio/gfile.c:5492 -#: gio/gfile.c:5579 gio/gfile.c:5680 gio/gfile.c:8809 gio/gfile.c:8899 -#: gio/gfile.c:8983 gio/win32/gwinhttpfile.c:453 +#: gio/gfile.c:3797 gio/gfile.c:3937 gio/gfile.c:4349 gio/gfile.c:4819 +#: gio/gfile.c:5230 gio/gfile.c:5315 gio/gfile.c:5405 gio/gfile.c:5502 +#: gio/gfile.c:5589 gio/gfile.c:5690 gio/gfile.c:8819 gio/gfile.c:8909 +#: gio/gfile.c:8993 gio/win32/gwinhttpfile.c:453 msgid "Operation not supported" msgstr "İşlem desteklenmiyor" -#: gio/gdbusauthmechanismsha1.c:407 +#: gio/gdbusauthmechanismsha1.c:411 #, c-format msgid "Error opening keyring “%s” for reading: " msgstr "Okumak için “%s” anahtarlığı açılırken hata: " -#: gio/gdbusauthmechanismsha1.c:430 gio/gdbusauthmechanismsha1.c:771 +#: gio/gdbusauthmechanismsha1.c:434 gio/gdbusauthmechanismsha1.c:775 #, c-format msgid "Line %d of the keyring at “%s” with content “%s” is malformed" msgstr "“%3$s” içerikli “%2$s” konumundaki anahtarlığın %1$d. satırı bozulmuş" -#: gio/gdbusauthmechanismsha1.c:444 gio/gdbusauthmechanismsha1.c:785 +#: gio/gdbusauthmechanismsha1.c:448 gio/gdbusauthmechanismsha1.c:789 #, c-format msgid "" "First token of line %d of the keyring at “%s” with content “%s” is malformed" msgstr "" -"“%3$s” içerikli “%2$s” konumundaki anahtarlığın %1$d. satırının ilk " -"belirteci bozulmuş" +"“%3$s” içerikli “%2$s” konumundaki anahtarlığın %1$d. satırının ilk jetonu " +"bozulmuş" -#: gio/gdbusauthmechanismsha1.c:458 gio/gdbusauthmechanismsha1.c:799 +#: gio/gdbusauthmechanismsha1.c:462 gio/gdbusauthmechanismsha1.c:803 #, c-format msgid "" "Second token of line %d of the keyring at “%s” with content “%s” is malformed" msgstr "" "“%3$s” içerikli “%2$s” konumundaki anahtarlığın %1$d. satırının ikinci " -"belirteci bozulmuş" +"jetonu bozulmuş" -#: gio/gdbusauthmechanismsha1.c:482 +#: gio/gdbusauthmechanismsha1.c:486 #, c-format msgid "Didn’t find cookie with id %d in the keyring at “%s”" msgstr "“%2$s” konumundaki anahtarlıkta %1$d kimlikli çerez bulunamadı" -#: gio/gdbusauthmechanismsha1.c:539 +#: gio/gdbusauthmechanismsha1.c:543 #, c-format msgid "Error creating lock file “%s”: %s" msgstr "Kilit dosyası “%s” oluşturulurken hata: %s" -#: gio/gdbusauthmechanismsha1.c:612 +#: gio/gdbusauthmechanismsha1.c:616 #, c-format msgid "Error deleting stale lock file “%s”: %s" msgstr "Eski kilit dosyası “%s” silinirken hata: %s" -#: gio/gdbusauthmechanismsha1.c:651 +#: gio/gdbusauthmechanismsha1.c:655 #, c-format msgid "Error closing (unlinked) lock file “%s”: %s" msgstr "(Bağlantısı olmayan) kilit dosyası “%s” kapatılırken hata: %s" -#: gio/gdbusauthmechanismsha1.c:662 +#: gio/gdbusauthmechanismsha1.c:666 #, c-format msgid "Error unlinking lock file “%s”: %s" msgstr "“%s” kilit dosyasının bağlantısı kaldırılırken hata: %s" -#: gio/gdbusauthmechanismsha1.c:738 +#: gio/gdbusauthmechanismsha1.c:742 #, c-format msgid "Error opening keyring “%s” for writing: " msgstr "“%s” anahtarlığını yazma için açarken hata: " -#: gio/gdbusauthmechanismsha1.c:932 +#: gio/gdbusauthmechanismsha1.c:936 #, c-format msgid "(Additionally, releasing the lock for “%s” also failed: %s) " -msgstr "(Ayrıca, “%s” için kilidi açma başarısız oldu: %s) " +msgstr "(Ayrıca, “%s” için kilit açılamadı: %s) " -#: gio/gdbusconnection.c:590 gio/gdbusconnection.c:2404 +#: gio/gdbusconnection.c:590 gio/gdbusconnection.c:2413 msgid "The connection is closed" msgstr "Bağlantı kapalı" -#: gio/gdbusconnection.c:1889 +#: gio/gdbusconnection.c:1897 msgid "Timeout was reached" msgstr "Zaman aşımı gerçekleşti" -#: gio/gdbusconnection.c:2527 +#: gio/gdbusconnection.c:2536 msgid "" "Unsupported flags encountered when constructing a client-side connection" msgstr "" "İstemci taraflı bağlantı kurulurken desteklenmeyen etiketlerle karşılaşıldı" -#: gio/gdbusconnection.c:4256 gio/gdbusconnection.c:4610 +#: gio/gdbusconnection.c:4265 gio/gdbusconnection.c:4619 #, c-format msgid "" "No such interface “org.freedesktop.DBus.Properties” on object at path %s" msgstr "" "%s yolundaki nesnede “org.freedesktop.DBus.Properties” gibi bir arayüz yok" -#: gio/gdbusconnection.c:4401 +#: gio/gdbusconnection.c:4410 #, c-format msgid "No such property “%s”" msgstr "“%s” gibi bir özellik yok" -#: gio/gdbusconnection.c:4413 +#: gio/gdbusconnection.c:4422 #, c-format msgid "Property “%s” is not readable" msgstr "“%s” özelliği okunabilir değil" -#: gio/gdbusconnection.c:4424 +#: gio/gdbusconnection.c:4433 #, c-format msgid "Property “%s” is not writable" msgstr "“%s” özelliği yazılabilir değil" -#: gio/gdbusconnection.c:4444 +#: gio/gdbusconnection.c:4453 #, c-format msgid "Error setting property “%s”: Expected type “%s” but got “%s”" msgstr "“%s” özelliği ayarlanırken hata: “%s” türü beklendi, “%s” elde edildi" -#: gio/gdbusconnection.c:4549 gio/gdbusconnection.c:4764 -#: gio/gdbusconnection.c:6747 +#: gio/gdbusconnection.c:4558 gio/gdbusconnection.c:4773 +#: gio/gdbusconnection.c:6750 #, c-format msgid "No such interface “%s”" msgstr "“%s” gibi bir arabirim yok" -#: gio/gdbusconnection.c:4986 gio/gdbusconnection.c:7261 +#: gio/gdbusconnection.c:4989 gio/gdbusconnection.c:7264 #, c-format msgid "No such interface “%s” on object at path %s" msgstr "%2$s yolundaki nesnede “%1$s” gibi bir arayüz yok" -#: gio/gdbusconnection.c:5087 +#: gio/gdbusconnection.c:5090 #, c-format msgid "No such method “%s”" msgstr "“%s” gibi bir anahtar yok" -#: gio/gdbusconnection.c:5118 +#: gio/gdbusconnection.c:5121 #, c-format msgid "Type of message, “%s”, does not match expected type “%s”" msgstr "“%s” iletisinin türü, beklenen “%s” türü ile örtüşmüyor" -#: gio/gdbusconnection.c:5321 +#: gio/gdbusconnection.c:5324 #, c-format msgid "An object is already exported for the interface %s at %s" msgstr "%2$s konumundaki %1$s arayüzü için bir nesne zaten dışa aktarıldı" -#: gio/gdbusconnection.c:5548 +#: gio/gdbusconnection.c:5551 #, c-format msgid "Unable to retrieve property %s.%s" msgstr "%s.%s özelliği alınamadı" -#: gio/gdbusconnection.c:5604 +#: gio/gdbusconnection.c:5607 #, c-format msgid "Unable to set property %s.%s" msgstr "%s.%s özelliği ayarlanamadı" -#: gio/gdbusconnection.c:5783 +#: gio/gdbusconnection.c:5786 #, c-format msgid "Method “%s” returned type “%s”, but expected “%s”" msgstr "“%s” yöntemi “%s” türü döndürdü, ancak “%s” bekleniyordu" -#: gio/gdbusconnection.c:6859 +#: gio/gdbusconnection.c:6862 #, c-format msgid "Method “%s” on interface “%s” with signature “%s” does not exist" msgstr "“%3$s” imzalı “%2$s” arayüzü üzerinde “%1$s” yöntemi yok" -#: gio/gdbusconnection.c:6980 +#: gio/gdbusconnection.c:6983 #, c-format msgid "A subtree is already exported for %s" msgstr "%s için bir alt ağaç zaten dışa aktarılmış" -#: gio/gdbusconnection.c:7269 +#: gio/gdbusconnection.c:7272 #, c-format msgid "Object does not exist at path “%s”" msgstr "Nesne, “%s” yolunda yok" -#: gio/gdbusmessage.c:1303 +#: gio/gdbusmessage.c:1306 msgid "type is INVALID" msgstr "tür GEÇERSİZ" -#: gio/gdbusmessage.c:1314 +#: gio/gdbusmessage.c:1317 msgid "METHOD_CALL message: PATH or MEMBER header field is missing" msgstr "METHOD_CALL iletisi: PATH ya da MEMBER başlık alanı eksik" -#: gio/gdbusmessage.c:1325 +#: gio/gdbusmessage.c:1328 msgid "METHOD_RETURN message: REPLY_SERIAL header field is missing" msgstr "METHOD_RETURN iletisi: REPLY_SERIAL başlık alanı eksik" -#: gio/gdbusmessage.c:1337 +#: gio/gdbusmessage.c:1340 msgid "ERROR message: REPLY_SERIAL or ERROR_NAME header field is missing" msgstr "ERROR iletisi: REPLY_SERIAL ya da ERROR_NAME başlık alanı eksik" -#: gio/gdbusmessage.c:1350 +#: gio/gdbusmessage.c:1353 msgid "SIGNAL message: PATH, INTERFACE or MEMBER header field is missing" msgstr "SIGNAL iletisi: PATH, INTERFACE ya da MEMBER başlık alanı eksik" -#: gio/gdbusmessage.c:1358 +#: gio/gdbusmessage.c:1361 msgid "" "SIGNAL message: The PATH header field is using the reserved value /org/" "freedesktop/DBus/Local" @@ -795,7 +800,7 @@ "SIGNAL iletisi: PATH başlık alanı, ayrılmış olan /org/freedesktop/DBus/Local " "değerini kullanıyor" -#: gio/gdbusmessage.c:1366 +#: gio/gdbusmessage.c:1369 msgid "" "SIGNAL message: The INTERFACE header field is using the reserved value org." "freedesktop.DBus.Local" @@ -803,18 +808,18 @@ "SIGNAL iletisi: INTERFACE başlık alanı, ayrılmış olan org.freedesktop.DBus." "Local değerini kullanıyor" -#: gio/gdbusmessage.c:1414 gio/gdbusmessage.c:1474 +#: gio/gdbusmessage.c:1417 gio/gdbusmessage.c:1477 #, c-format msgid "Wanted to read %lu byte but only got %lu" msgid_plural "Wanted to read %lu bytes but only got %lu" msgstr0 "%lu bayt okumak istendi ancak yalnızca %lu var" -#: gio/gdbusmessage.c:1428 +#: gio/gdbusmessage.c:1431 #, c-format msgid "Expected NUL byte after the string “%s” but found byte %d" msgstr "“%s” dizgesinden sonra NUL baytı beklendi, ama %d baytı bulundu" -#: gio/gdbusmessage.c:1447 +#: gio/gdbusmessage.c:1450 #, c-format msgid "" "Expected valid UTF-8 string but found invalid bytes at byte offset %d " @@ -823,21 +828,21 @@ "Geçerli bir UTF-8 dizgesi beklendi ama %d bayt konumunda geçersiz baytlar " "bulundu (dizge uzunluğu %d). Bu noktaya kadar geçerli olan dizge şudur: “%s”" -#: gio/gdbusmessage.c:1511 gio/gdbusmessage.c:1787 gio/gdbusmessage.c:1998 +#: gio/gdbusmessage.c:1514 gio/gdbusmessage.c:1790 gio/gdbusmessage.c:2001 msgid "Value nested too deeply" msgstr "Değer çok derine yuvalanmış" -#: gio/gdbusmessage.c:1679 +#: gio/gdbusmessage.c:1682 #, c-format msgid "Parsed value “%s” is not a valid D-Bus object path" msgstr "Ayrıştırılan değer “%s”, geçerli bir D-Bus nesne yolu değil" -#: gio/gdbusmessage.c:1703 +#: gio/gdbusmessage.c:1706 #, c-format msgid "Parsed value “%s” is not a valid D-Bus signature" msgstr "Ayrıştırılan değer “%s”, geçerli bir D-Bus imzası değil" -#: gio/gdbusmessage.c:1754 +#: gio/gdbusmessage.c:1757 #, c-format msgid "" "Encountered array of length %u byte. Maximum length is 2<<26 bytes (64 MiB)." @@ -847,7 +852,7 @@ "%u bayt uzunluğunda dizi ile karşılaşıldı. Olabilecek en çok uzunluk 2<<26 " "bayt (64 MiB)." -#: gio/gdbusmessage.c:1774 +#: gio/gdbusmessage.c:1777 #, c-format msgid "" "Encountered array of type “a%c”, expected to have a length a multiple of %u " @@ -856,23 +861,23 @@ "“a%c” türünde dizi ile karşılaşıldı, birden çok %u bayt uzunluğu " "beklenmektedir ancak %u bayt uzunluk bulundu" -#: gio/gdbusmessage.c:1928 gio/gdbusmessage.c:2647 +#: gio/gdbusmessage.c:1931 gio/gdbusmessage.c:2650 msgid "Empty structures (tuples) are not allowed in D-Bus" msgstr "D-Bus’ta boş yapılara (demetler) izin verilmez" -#: gio/gdbusmessage.c:1982 +#: gio/gdbusmessage.c:1985 #, c-format msgid "Parsed value “%s” for variant is not a valid D-Bus signature" msgstr "Varyant için ayrıştırılmış “%s” değeri geçeriz bir D-Bus imzasıdır" -#: gio/gdbusmessage.c:2023 +#: gio/gdbusmessage.c:2026 #, c-format msgid "" "Error deserializing GVariant with type string “%s” from the D-Bus wire format" msgstr "" "GVariant, D-Bus tel biçiminden “%s” dizge türüyle geri dönüştürülürken hata" -#: gio/gdbusmessage.c:2208 +#: gio/gdbusmessage.c:2211 #, c-format msgid "" "Invalid endianness value. Expected 0x6c (“l”) or 0x42 (“B”) but found value " @@ -881,57 +886,57 @@ "Geçersiz endian değeri. 0x6c (“l”) veya 0x42 (“B”) bekleniyordu ancak 0x%02x " "değeri bulundu" -#: gio/gdbusmessage.c:2227 +#: gio/gdbusmessage.c:2230 #, c-format msgid "Invalid major protocol version. Expected 1 but found %d" msgstr "Geçersiz önemli iletişim kuralı sürümü. 1 beklendi, %d bulundu" -#: gio/gdbusmessage.c:2285 gio/gdbusmessage.c:2883 +#: gio/gdbusmessage.c:2288 gio/gdbusmessage.c:2886 msgid "Signature header found but is not of type signature" msgstr "İmza başlığı bulundu, ancak tür imzası değil" -#: gio/gdbusmessage.c:2297 +#: gio/gdbusmessage.c:2300 #, c-format msgid "Signature header with signature “%s” found but message body is empty" msgstr "“%s” imzalı bir imza başlığı bulundu ama ileti gövdesi boş" -#: gio/gdbusmessage.c:2312 +#: gio/gdbusmessage.c:2315 #, c-format msgid "Parsed value “%s” is not a valid D-Bus signature (for body)" msgstr "Ayrıştırılan değer “%s” geçerli bir D-Bus imzası değil (gövde için)" -#: gio/gdbusmessage.c:2344 +#: gio/gdbusmessage.c:2347 #, 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" msgstr0 "İletide imza başlığı yok ancak ileti gövdesi %u bayt" -#: gio/gdbusmessage.c:2354 +#: gio/gdbusmessage.c:2357 msgid "Cannot deserialize message: " msgstr "İleti geri dönüştürülemiyor: " -#: gio/gdbusmessage.c:2700 +#: gio/gdbusmessage.c:2703 #, c-format msgid "" "Error serializing GVariant with type string “%s” to the D-Bus wire format" msgstr "GVariant, D-Bus tel biçimine “%s” dizge türüyle dönüştürülürken hata" -#: gio/gdbusmessage.c:2837 +#: gio/gdbusmessage.c:2840 #, c-format msgid "" "Number of file descriptors in message (%d) differs from header field (%d)" msgstr "İletideki dosya açıklayıcı sayısı (%d) başlık alanından (%d) farklı" -#: gio/gdbusmessage.c:2845 +#: gio/gdbusmessage.c:2848 msgid "Cannot serialize message: " msgstr "İleti dönüştürülemiyor: " -#: gio/gdbusmessage.c:2898 +#: gio/gdbusmessage.c:2901 #, c-format msgid "Message body has signature “%s” but there is no signature header" msgstr "İleti gövdesi “%s” imzasına sahip ancak imza başlığı yok" -#: gio/gdbusmessage.c:2908 +#: gio/gdbusmessage.c:2911 #, c-format msgid "" "Message body has type signature “%s” but signature in the header field is " @@ -939,17 +944,17 @@ msgstr "" "İleti gövdesi “%s” tür imzasına sahip ancak başlık alanındaki imza “%s”" -#: gio/gdbusmessage.c:2924 +#: gio/gdbusmessage.c:2927 #, c-format msgid "Message body is empty but signature in the header field is “(%s)”" msgstr "İleti gövdesi boş, ancak başlık alanındaki imza “(%s)”" -#: gio/gdbusmessage.c:3479 +#: gio/gdbusmessage.c:3482 #, c-format msgid "Error return with body of type “%s”" msgstr "“%s” türünden bir gövdeyle dönüş hatası" -#: gio/gdbusmessage.c:3487 +#: gio/gdbusmessage.c:3490 msgid "Error return with empty body" msgstr "Boş gövdeyle dönüş hatası" @@ -961,7 +966,7 @@ #: gio/gdbusprivate.c:2373 #, c-format msgid "Session dbus not running, and autolaunch failed" -msgstr "Dbus oturumu çalışmıyor ve kendiliğinden başlatma başarısız oldu" +msgstr "Dbus oturumu çalışmıyor ve kendiliğinden başlatılamadı" #: gio/gdbusprivate.c:2396 #, c-format @@ -974,17 +979,17 @@ msgid "Unable to load %s or %s: " msgstr "%s ya da %s yüklenemedi: " -#: gio/gdbusproxy.c:1575 +#: gio/gdbusproxy.c:1568 #, c-format msgid "Error calling StartServiceByName for %s: " msgstr "%s için StartServiceByName çağrısında hata: " -#: gio/gdbusproxy.c:1598 +#: gio/gdbusproxy.c:1591 #, c-format msgid "Unexpected reply %d from StartServiceByName(\"%s\") method" msgstr "StartServiceByName %d yönteminden beklenmeyen yanıt (\"%s\")" -#: gio/gdbusproxy.c:2709 gio/gdbusproxy.c:2844 +#: gio/gdbusproxy.c:2702 gio/gdbusproxy.c:2837 #, c-format msgid "" "Cannot invoke method; proxy is for the well-known name %s without an owner, " @@ -993,25 +998,25 @@ "Yöntem çağrılamıyor; vekil sunucu, sahibi olmayan bilindik %s adı için ve " "G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START bayrağı ile oluşturuldu" -#: gio/gdbusserver.c:765 +#: gio/gdbusserver.c:758 msgid "Abstract namespace not supported" msgstr "Soyut ad alanı desteklenmiyor" -#: gio/gdbusserver.c:857 +#: gio/gdbusserver.c:850 msgid "Cannot specify nonce file when creating a server" msgstr "Bir sunucu oluşturulurken nonce dosyası belirtilemez" -#: gio/gdbusserver.c:939 +#: gio/gdbusserver.c:932 #, c-format msgid "Error writing nonce file at “%s”: %s" msgstr "“%s” konumundaki tek seferlik dosyaya yazma hatası: %s" -#: gio/gdbusserver.c:1114 +#: gio/gdbusserver.c:1107 #, c-format msgid "The string “%s” is not a valid D-Bus GUID" msgstr "“%s” dizgesi, geçerli bir D-Bus GUID değil" -#: gio/gdbusserver.c:1152 +#: gio/gdbusserver.c:1145 #, c-format msgid "Cannot listen on unsupported transport “%s”" msgstr "Desteklenmeyen aktarım “%s” üzerinde dinlenemiyor" @@ -1039,14 +1044,14 @@ "\n" "Her komutla ilgili yardım almak için “%s KOMUT --help” kullan.\n" -#: gio/gdbus-tool.c:204 gio/gdbus-tool.c:276 gio/gdbus-tool.c:348 -#: gio/gdbus-tool.c:372 gio/gdbus-tool.c:862 gio/gdbus-tool.c:1247 -#: gio/gdbus-tool.c:1734 +#: gio/gdbus-tool.c:204 gio/gdbus-tool.c:276 gio/gdbus-tool.c:347 +#: gio/gdbus-tool.c:371 gio/gdbus-tool.c:861 gio/gdbus-tool.c:1246 +#: gio/gdbus-tool.c:1733 #, c-format msgid "Error: %s\n" msgstr "Hata: %s\n" -#: gio/gdbus-tool.c:215 gio/gdbus-tool.c:289 gio/gdbus-tool.c:1750 +#: gio/gdbus-tool.c:215 gio/gdbus-tool.c:289 gio/gdbus-tool.c:1749 #, c-format msgid "Error parsing introspection XML: %s\n" msgstr "İç gözlem XML’ini ayrıştırmada hata: %s\n" @@ -1056,213 +1061,213 @@ msgid "Error: %s is not a valid name\n" msgstr "Hata: %s geçerli bir ad değil\n" -#: gio/gdbus-tool.c:258 gio/gdbus-tool.c:748 gio/gdbus-tool.c:1066 -#: gio/gdbus-tool.c:1900 gio/gdbus-tool.c:2140 +#: gio/gdbus-tool.c:258 gio/gdbus-tool.c:747 gio/gdbus-tool.c:1065 +#: gio/gdbus-tool.c:1899 gio/gdbus-tool.c:2139 #, c-format msgid "Error: %s is not a valid object path\n" msgstr "Hata: %s geçerli bir nesne yolu değil\n" -#: gio/gdbus-tool.c:406 +#: gio/gdbus-tool.c:405 msgid "Connect to the system bus" msgstr "Sistem veriyoluna bağlan" -#: gio/gdbus-tool.c:407 +#: gio/gdbus-tool.c:406 msgid "Connect to the session bus" msgstr "Oturum veriyoluna bağlan" -#: gio/gdbus-tool.c:408 +#: gio/gdbus-tool.c:407 msgid "Connect to given D-Bus address" msgstr "Verilen D-Bus adresine bağlan" -#: gio/gdbus-tool.c:418 +#: gio/gdbus-tool.c:417 msgid "Connection Endpoint Options:" msgstr "Bağlantı Uç Noktası Seçenekleri:" -#: gio/gdbus-tool.c:419 +#: gio/gdbus-tool.c:418 msgid "Options specifying the connection endpoint" msgstr "Bağlantı uç noktasını belirleyen seçenekler" -#: gio/gdbus-tool.c:442 +#: gio/gdbus-tool.c:441 #, c-format msgid "No connection endpoint specified" msgstr "Bağlantı uç noktası belirtilmedi" -#: gio/gdbus-tool.c:452 +#: gio/gdbus-tool.c:451 #, c-format msgid "Multiple connection endpoints specified" msgstr "Birden çok bağlantı uç noktası belirtildi" -#: gio/gdbus-tool.c:525 +#: gio/gdbus-tool.c:524 #, c-format msgid "" "Warning: According to introspection data, interface “%s” does not exist\n" msgstr "Uyarı: İç gözlem verilerine göre, “%s” arayüzü yok\n" -#: gio/gdbus-tool.c:534 +#: gio/gdbus-tool.c:533 #, c-format msgid "" "Warning: According to introspection data, method “%s” does not exist on " "interface “%s”\n" msgstr "Uyarı: İç gözlem verilerine göre, “%s” yöntemi “%s” arayüzünde yok\n" -#: gio/gdbus-tool.c:596 +#: gio/gdbus-tool.c:595 msgid "Optional destination for signal (unique name)" msgstr "Sinyal için isteğe bağlı hedef nokta (eşsiz ad)" -#: gio/gdbus-tool.c:597 +#: gio/gdbus-tool.c:596 msgid "Object path to emit signal on" msgstr "Üzerinde sinyal yaymak için nesne yolu" -#: gio/gdbus-tool.c:598 +#: gio/gdbus-tool.c:597 msgid "Signal and interface name" msgstr "Sinyal ve arayüz adı" -#: gio/gdbus-tool.c:631 +#: gio/gdbus-tool.c:630 msgid "Emit a signal." msgstr "Bir sinyal yayınla." -#: gio/gdbus-tool.c:686 gio/gdbus-tool.c:1003 gio/gdbus-tool.c:1837 -#: gio/gdbus-tool.c:2069 gio/gdbus-tool.c:2289 +#: gio/gdbus-tool.c:685 gio/gdbus-tool.c:1002 gio/gdbus-tool.c:1836 +#: gio/gdbus-tool.c:2068 gio/gdbus-tool.c:2288 #, c-format msgid "Error connecting: %s\n" msgstr "Bağlanırken hata: %s\n" -#: gio/gdbus-tool.c:706 +#: gio/gdbus-tool.c:705 #, c-format msgid "Error: %s is not a valid unique bus name.\n" msgstr "Hata: %s geçerli bir özgün veriyolu adı değil\n" -#: gio/gdbus-tool.c:725 gio/gdbus-tool.c:1046 gio/gdbus-tool.c:1880 +#: gio/gdbus-tool.c:724 gio/gdbus-tool.c:1045 gio/gdbus-tool.c:1879 msgid "Error: Object path is not specified\n" msgstr "Hata: Nesne yolu belirtilmedi\n" -#: gio/gdbus-tool.c:768 +#: gio/gdbus-tool.c:767 msgid "Error: Signal name is not specified\n" msgstr "Hata: Sinyal adı belirtilmedi\n" -#: gio/gdbus-tool.c:782 +#: gio/gdbus-tool.c:781 #, c-format msgid "Error: Signal name “%s” is invalid\n" msgstr "Hata: Sinyal adı “%s” geçersiz\n" -#: gio/gdbus-tool.c:794 +#: gio/gdbus-tool.c:793 #, c-format msgid "Error: %s is not a valid interface name\n" msgstr "Hata: %s geçerli bir arayüz adı değil\n" -#: gio/gdbus-tool.c:800 +#: gio/gdbus-tool.c:799 #, c-format msgid "Error: %s is not a valid member name\n" msgstr "Hata: %s geçerli bir üye adı değil\n" #. Use the original non-"parse-me-harder" error -#: gio/gdbus-tool.c:837 gio/gdbus-tool.c:1178 +#: gio/gdbus-tool.c:836 gio/gdbus-tool.c:1177 #, c-format msgid "Error parsing parameter %d: %s\n" msgstr "%d parametresini ayrıştırırken hata oluştu: %s\n" -#: gio/gdbus-tool.c:869 +#: gio/gdbus-tool.c:868 #, c-format msgid "Error flushing connection: %s\n" msgstr "Bağlantı boşaltılırken hata: %s\n" -#: gio/gdbus-tool.c:897 +#: gio/gdbus-tool.c:896 msgid "Destination name to invoke method on" msgstr "Üzerinde yöntem çalıştırılacak hedef nokta adı" -#: gio/gdbus-tool.c:898 +#: gio/gdbus-tool.c:897 msgid "Object path to invoke method on" msgstr "Yöntemin üzerinde çalıştırılacağı nesne yolu" -#: gio/gdbus-tool.c:899 +#: gio/gdbus-tool.c:898 msgid "Method and interface name" msgstr "Yöntem ve arayüz adı" -#: gio/gdbus-tool.c:900 +#: gio/gdbus-tool.c:899 msgid "Timeout in seconds" msgstr "Saniye cinsinden zaman aşımı" -#: gio/gdbus-tool.c:901 +#: gio/gdbus-tool.c:900 msgid "Allow interactive authorization" msgstr "Etkileşimli yetkilendirmeye izin ver" -#: gio/gdbus-tool.c:948 +#: gio/gdbus-tool.c:947 msgid "Invoke a method on a remote object." msgstr "Uzak bir nesne üzerinde yöntem çalıştır." -#: gio/gdbus-tool.c:1020 gio/gdbus-tool.c:1854 gio/gdbus-tool.c:2094 +#: gio/gdbus-tool.c:1019 gio/gdbus-tool.c:1853 gio/gdbus-tool.c:2093 msgid "Error: Destination is not specified\n" msgstr "Hata: Hedef belirtilmedi\n" -#: gio/gdbus-tool.c:1031 gio/gdbus-tool.c:1871 gio/gdbus-tool.c:2105 +#: gio/gdbus-tool.c:1030 gio/gdbus-tool.c:1870 gio/gdbus-tool.c:2104 #, c-format msgid "Error: %s is not a valid bus name\n" msgstr "Hata: %s geçerli bir veri yolu adı değil\n" -#: gio/gdbus-tool.c:1081 +#: gio/gdbus-tool.c:1080 msgid "Error: Method name is not specified\n" msgstr "Hata: Yöntem adı belirtilmedi\n" -#: gio/gdbus-tool.c:1092 +#: gio/gdbus-tool.c:1091 #, c-format msgid "Error: Method name “%s” is invalid\n" msgstr "Hata: Yöntem adı “%s” geçersiz\n" -#: gio/gdbus-tool.c:1170 +#: gio/gdbus-tool.c:1169 #, c-format msgid "Error parsing parameter %d of type “%s”: %s\n" msgstr "“%2$s” türünün %1$d parametresi ayrıştırılırken hata: %3$s\n" -#: gio/gdbus-tool.c:1196 +#: gio/gdbus-tool.c:1195 #, c-format msgid "Error adding handle %d: %s\n" msgstr "%d işleyici eklenemedi: %s\n" -#: gio/gdbus-tool.c:1696 +#: gio/gdbus-tool.c:1695 msgid "Destination name to introspect" msgstr "İç gözlem için hedef nokta adı" -#: gio/gdbus-tool.c:1697 +#: gio/gdbus-tool.c:1696 msgid "Object path to introspect" msgstr "İç gözlem yapılacak nesne yolu" -#: gio/gdbus-tool.c:1698 +#: gio/gdbus-tool.c:1697 msgid "Print XML" msgstr "XML yazdır" -#: gio/gdbus-tool.c:1699 +#: gio/gdbus-tool.c:1698 msgid "Introspect children" msgstr "Alt iç gözlemi" -#: gio/gdbus-tool.c:1700 +#: gio/gdbus-tool.c:1699 msgid "Only print properties" msgstr "Yalnızca özellikleri yazdır" -#: gio/gdbus-tool.c:1789 +#: gio/gdbus-tool.c:1788 msgid "Introspect a remote object." msgstr "Uzak nesneye iç gözlem yap." -#: gio/gdbus-tool.c:1995 +#: gio/gdbus-tool.c:1994 msgid "Destination name to monitor" msgstr "Gözlemlenecek hedefin adı" -#: gio/gdbus-tool.c:1996 +#: gio/gdbus-tool.c:1995 msgid "Object path to monitor" msgstr "Gözlemlenecek nesne yolu" -#: gio/gdbus-tool.c:2021 +#: gio/gdbus-tool.c:2020 msgid "Monitor a remote object." msgstr "Uzak nesneyi gözlemle." -#: gio/gdbus-tool.c:2079 +#: gio/gdbus-tool.c:2078 msgid "Error: can’t monitor a non-message-bus connection\n" msgstr "Hata: non-message-bus gözlemlenemiyor\n" -#: gio/gdbus-tool.c:2203 +#: gio/gdbus-tool.c:2202 msgid "Service to activate before waiting for the other one (well-known name)" msgstr "Bir diğeri (tanınmış ad) için beklemeden önce aktifleştirilecek hizmet" -#: gio/gdbus-tool.c:2206 +#: gio/gdbus-tool.c:2205 msgid "" "Timeout to wait for before exiting with an error (seconds); 0 for no timeout " "(default)" @@ -1270,27 +1275,27 @@ "Bir hatayla çıkılmadan önce beklenecek zaman aşımı süresi (saniye); zaman " "aşımı olmaması için 0 (öntanımlı)" -#: gio/gdbus-tool.c:2254 +#: gio/gdbus-tool.c:2253 msgid "OPTION… BUS-NAME" msgstr "SEÇENEK… VERİYOLU-ADI" -#: gio/gdbus-tool.c:2255 +#: gio/gdbus-tool.c:2254 msgid "Wait for a bus name to appear." msgstr "Veri yolu adının belirmesini bekle." -#: gio/gdbus-tool.c:2331 +#: gio/gdbus-tool.c:2330 msgid "Error: A service to activate for must be specified.\n" msgstr "Hata: Aktifleştirilecek hizmet belirtilmelidir.\n" -#: gio/gdbus-tool.c:2336 +#: gio/gdbus-tool.c:2335 msgid "Error: A service to wait for must be specified.\n" msgstr "Hata: Beklenecek hizmet belirtilmelidir.\n" -#: gio/gdbus-tool.c:2341 +#: gio/gdbus-tool.c:2340 msgid "Error: Too many arguments.\n" msgstr "Hata: Çok fazla argüman.\n" -#: gio/gdbus-tool.c:2349 gio/gdbus-tool.c:2356 +#: gio/gdbus-tool.c:2348 gio/gdbus-tool.c:2355 #, c-format msgid "Error: %s is not a valid well-known bus name.\n" msgstr "Hata: %s geçerli bilinen bir veri yolu adı değil.\n" @@ -1300,38 +1305,43 @@ msgid "Not authorized to change debug settings" msgstr "Hata ayıklama ayarlarını değiştirmeye yetkili değil" -#: gio/gdesktopappinfo.c:2182 gio/gdesktopappinfo.c:5119 +#: gio/gdesktopappinfo.c:2242 gio/gdesktopappinfo.c:5223 msgid "Unnamed" msgstr "Adlandırılmamış" -#: gio/gdesktopappinfo.c:2592 +#: gio/gdesktopappinfo.c:2652 msgid "Desktop file didn’t specify Exec field" msgstr "Desktop dosyası Exec alanı belirtmemiş" -#: gio/gdesktopappinfo.c:2891 +#: gio/gdesktopappinfo.c:2942 msgid "Unable to find terminal required for application" msgstr "Uygulama için gerekli uçbirim bulunamadı" -#: gio/gdesktopappinfo.c:3637 +#: gio/gdesktopappinfo.c:3002 +#, c-format +msgid "Program ‘%s’ not found in $PATH" +msgstr "‘%s’ programı $PATH içinde bulunamadı" + +#: gio/gdesktopappinfo.c:3735 #, c-format msgid "Can’t create user application configuration folder %s: %s" msgstr "Kullanıcı uygulaması yapılandırma klasörü %s oluşturulamıyor: %s" -#: gio/gdesktopappinfo.c:3641 +#: gio/gdesktopappinfo.c:3739 #, c-format msgid "Can’t create user MIME configuration folder %s: %s" msgstr "Kullanıcı MIME yapılandırma klasörü %s oluşturulamıyor: %s" -#: gio/gdesktopappinfo.c:3883 gio/gdesktopappinfo.c:3907 +#: gio/gdesktopappinfo.c:3981 gio/gdesktopappinfo.c:4005 msgid "Application information lacks an identifier" msgstr "Uygulama bilgisinde tanımlayıcı eksik" -#: gio/gdesktopappinfo.c:4143 +#: gio/gdesktopappinfo.c:4241 #, c-format msgid "Can’t create user desktop file %s" msgstr "Kullanıcı masaüstü dosyası %s oluşturulamıyor" -#: gio/gdesktopappinfo.c:4279 +#: gio/gdesktopappinfo.c:4377 #, c-format msgid "Custom definition for %s" msgstr "%s için özel tanım" @@ -1380,7 +1390,7 @@ #: gio/gemblem.c:335 #, c-format msgid "Malformed number of tokens (%d) in GEmblem encoding" -msgstr "GEmblem kodlaması içerisinde bozuk belirteç sayısı (%d)" +msgstr "GEmblem kodlaması içerisinde bozuk jeton sayısı (%d)" #: gio/gemblemedicon.c:364 #, c-format @@ -1390,7 +1400,7 @@ #: gio/gemblemedicon.c:374 #, c-format msgid "Malformed number of tokens (%d) in GEmblemedIcon encoding" -msgstr "GEmblemedIcon kodlaması içerisinde bozuk belirteç sayısı (%d)" +msgstr "GEmblemedIcon kodlaması içerisinde bozuk jeton sayısı (%d)" #: gio/gemblemedicon.c:397 msgid "Expected a GEmblem for GEmblemedIcon" @@ -1404,7 +1414,7 @@ msgid "Containing mount does not exist" msgstr "Bağlama yok" -#: gio/gfile.c:2641 gio/glocalfile.c:2500 +#: gio/gfile.c:2641 gio/glocalfile.c:2515 msgid "Can’t copy over directory" msgstr "Dizin üzerine kopyalanamıyor" @@ -1429,51 +1439,51 @@ msgid "Error splicing file: %s" msgstr "Dosya uç uca eklenirken hata: %s" -#: gio/gfile.c:3185 +#: gio/gfile.c:3195 msgid "Copy (reflink/clone) between mounts is not supported" msgstr "" "Bağlı sistemler arasında kopyalama (referans bağlantı/çoğaltmak) " "desteklenmiyor" -#: gio/gfile.c:3189 +#: gio/gfile.c:3199 msgid "Copy (reflink/clone) is not supported or invalid" msgstr "Kopyalama desteklenmiyor ya da geçersiz" -#: gio/gfile.c:3194 +#: gio/gfile.c:3204 msgid "Copy (reflink/clone) is not supported or didn’t work" msgstr "Kopyalama (bağlama/klonlama) destenlenmiyor ya da çalışmadı" -#: gio/gfile.c:3259 +#: gio/gfile.c:3269 msgid "Can’t copy special file" msgstr "Özel dosya kopyalanamıyor" -#: gio/gfile.c:4153 +#: gio/gfile.c:4163 msgid "Invalid symlink value given" msgstr "Geçersiz simgesel bağ değeri verildi" -#: gio/gfile.c:4163 glib/gfileutils.c:2335 +#: gio/gfile.c:4173 glib/gfileutils.c:2392 msgid "Symbolic links not supported" msgstr "Simgesel bağlar desteklenmiyor" -#: gio/gfile.c:4450 +#: gio/gfile.c:4460 msgid "Trash not supported" msgstr "Çöp desteklenmiyor" -#: gio/gfile.c:4562 +#: gio/gfile.c:4572 #, c-format msgid "File names cannot contain “%c”" msgstr "Dosya adları “%c” içeremez" -#: gio/gfile.c:6993 gio/gfile.c:7119 +#: gio/gfile.c:7003 gio/gfile.c:7129 #, c-format msgid "Failed to create a temporary directory for template “%s”: %s" msgstr "“%s” şablonu için geçici dizin oluşturulamadı: %s" -#: gio/gfile.c:7408 gio/gvolume.c:366 +#: gio/gfile.c:7418 gio/gvolume.c:366 msgid "volume doesn’t implement mount" msgstr "bölüm, bağlamayı yerine getirmiyor" -#: gio/gfile.c:7522 gio/gfile.c:7599 +#: gio/gfile.c:7532 gio/gfile.c:7609 msgid "No application is registered as handling this file" msgstr "Bu dosyayı işleme amacıyla kayıtlı uygulama yok" @@ -1552,37 +1562,37 @@ msgid "HTTP proxy server closed connection unexpectedly." msgstr "HTTP vekil sunucusu bağlantıyı beklenmedik biçimde kesti." -#: gio/gicon.c:300 +#: gio/gicon.c:299 #, c-format msgid "Wrong number of tokens (%d)" -msgstr "Yanlış belirteç sayısı (%d)" +msgstr "Yanlış jeton sayısı (%d)" -#: gio/gicon.c:320 +#: gio/gicon.c:319 #, c-format msgid "No type for class name %s" msgstr "Sınıf adı %s için tür yok" -#: gio/gicon.c:330 +#: gio/gicon.c:329 #, c-format msgid "Type %s does not implement the GIcon interface" msgstr "%s türü GIcon arayüzü uygulamıyor" -#: gio/gicon.c:341 +#: gio/gicon.c:340 #, c-format msgid "Type %s is not classed" msgstr "%s türü sınıflandırılmış değil" -#: gio/gicon.c:355 +#: gio/gicon.c:354 #, c-format msgid "Malformed version number: %s" msgstr "Bozuk sürüm numarası: %s" -#: gio/gicon.c:369 +#: gio/gicon.c:368 #, c-format msgid "Type %s does not implement from_tokens() on the GIcon interface" msgstr "%s türü GIcon arayüzü üzerinde from_tokens() uygulamıyor" -#: gio/gicon.c:471 +#: gio/gicon.c:470 msgid "Can’t handle the supplied version of the icon encoding" msgstr "Simge kodlamasının verilen sürümü işlenemiyor" @@ -1729,7 +1739,7 @@ msgstr "stdout’a yazılırken hata" #. Translators: commandline placeholder -#: gio/gio-tool-cat.c:135 gio/gio-tool-info.c:379 gio/gio-tool-list.c:173 +#: gio/gio-tool-cat.c:135 gio/gio-tool-info.c:380 gio/gio-tool-list.c:173 #: gio/gio-tool-mkdir.c:50 gio/gio-tool-monitor.c:39 gio/gio-tool-monitor.c:41 #: gio/gio-tool-monitor.c:43 gio/gio-tool-monitor.c:45 #: gio/gio-tool-monitor.c:206 gio/gio-tool-mount.c:1210 gio/gio-tool-open.c:72 @@ -1752,7 +1762,7 @@ "yerine GIO konumlarını kullanır: örneğin, smb://sunucu/kaynak/dosya.txt\n" "gibi bir şeyi konum olarak kullanabilirsiniz." -#: gio/gio-tool-cat.c:164 gio/gio-tool-info.c:410 gio/gio-tool-mkdir.c:78 +#: gio/gio-tool-cat.c:164 gio/gio-tool-info.c:411 gio/gio-tool-mkdir.c:78 #: gio/gio-tool-monitor.c:231 gio/gio-tool-mount.c:1261 gio/gio-tool-open.c:98 #: gio/gio-tool-remove.c:74 gio/gio-tool-trash.c:303 msgid "No locations given" @@ -1868,38 +1878,38 @@ msgid "size: " msgstr "boyut: " -#: gio/gio-tool-info.c:200 +#: gio/gio-tool-info.c:201 msgid "hidden\n" msgstr "gizli\n" -#: gio/gio-tool-info.c:203 +#: gio/gio-tool-info.c:204 #, c-format msgid "uri: %s\n" msgstr "uri: %s\n" -#: gio/gio-tool-info.c:210 +#: gio/gio-tool-info.c:211 #, c-format msgid "local path: %s\n" msgstr "yerel yol: %s\n" -#: gio/gio-tool-info.c:244 +#: gio/gio-tool-info.c:245 #, c-format msgid "unix mount: %s%s %s %s %s\n" msgstr "unix bağlaması: %s%s %s %s %s\n" -#: gio/gio-tool-info.c:325 +#: gio/gio-tool-info.c:326 msgid "Settable attributes:\n" msgstr "Belirlenebilir öznitelikler:\n" -#: gio/gio-tool-info.c:349 +#: gio/gio-tool-info.c:350 msgid "Writable attribute namespaces:\n" msgstr "Yazılabilir öznitelik ad boşlukları:\n" -#: gio/gio-tool-info.c:384 +#: gio/gio-tool-info.c:385 msgid "Show information about locations." msgstr "Konumlar hakkında bilgi göster." -#: gio/gio-tool-info.c:386 +#: gio/gio-tool-info.c:387 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" @@ -2137,7 +2147,7 @@ #: gio/gio-tool-mount.c:72 msgid "Use an anonymous user when authenticating" -msgstr "Yetkilendirirken anonim bir kullanıcı kullan" +msgstr "Kimlik doğrularken anonim kullanıcı kullan" #. Translator: List here is a verb as in 'List all mounts' #: gio/gio-tool-mount.c:74 @@ -2346,7 +2356,7 @@ "directory)" msgstr "" "Bir dosyayı çöpten kendi özgün konumuna geri yükle (büyük olasılıkla dizini " -"yeniden yaratacak)" +"yeniden oluşturacak)" #: gio/gio-tool-trash.c:108 msgid "Unable to find original path" @@ -2354,7 +2364,7 @@ #: gio/gio-tool-trash.c:125 msgid "Unable to recreate original location: " -msgstr "Özgün konum yeniden yaratılamadı: " +msgstr "Özgün konum yeniden oluşturulamadı: " #: gio/gio-tool-trash.c:138 msgid "Unable to move file to its original location: " @@ -2384,7 +2394,7 @@ msgid "List contents of directories in a tree-like format." msgstr "Dizinlerin içeriklerini ağaç benzeri biçimde listele." -#: gio/glib-compile-resources.c:142 gio/glib-compile-schemas.c:1516 +#: gio/glib-compile-resources.c:142 gio/glib-compile-schemas.c:1513 #, c-format msgid "Element <%s> not allowed inside <%s>" msgstr "<%2$s> içinde <%1$s> ögesine izin verilmiyor" @@ -2439,7 +2449,7 @@ msgid "text may not appear inside <%s>" msgstr "<%s> içinde metin bulunamaz" -#: gio/glib-compile-resources.c:821 gio/glib-compile-schemas.c:2174 +#: gio/glib-compile-resources.c:821 gio/glib-compile-schemas.c:2171 msgid "Show program version and exit" msgstr "Programın sürümünü göster ve çık" @@ -2455,8 +2465,8 @@ "DOSYAʼda belirtilen dosyaların yükleneceği dizinler (öntanımlı: geçerli " "dizin)" -#: gio/glib-compile-resources.c:823 gio/glib-compile-schemas.c:2175 -#: gio/glib-compile-schemas.c:2204 +#: gio/glib-compile-resources.c:823 gio/glib-compile-schemas.c:2172 +#: gio/glib-compile-schemas.c:2201 msgid "DIRECTORY" msgstr "DİZİN" @@ -2680,16 +2690,16 @@ msgid "<aliases> must contain at least one <alias>" msgstr "<aliases> en az bir <alias> içermelidir" -#: gio/glib-compile-schemas.c:799 +#: gio/glib-compile-schemas.c:796 msgid "Empty names are not permitted" msgstr "Boş adlara izin verilmiyor" -#: gio/glib-compile-schemas.c:809 +#: gio/glib-compile-schemas.c:806 #, c-format msgid "Invalid name “%s”: names must begin with a lowercase letter" msgstr "Geçersiz ad “%s”: adlar küçük harf ile başlamalıdır" -#: gio/glib-compile-schemas.c:821 +#: gio/glib-compile-schemas.c:818 #, c-format msgid "" "Invalid name “%s”: invalid character “%c”; only lowercase letters, numbers " @@ -2698,36 +2708,36 @@ "Geçesiz ad “%s”: geçersiz karakter “%c”; yalnızca küçük harfler, sayılar ve " "tire (“-”) imi kullanılabilir" -#: gio/glib-compile-schemas.c:830 +#: gio/glib-compile-schemas.c:827 #, c-format msgid "Invalid name “%s”: two successive hyphens (“--”) are not permitted" msgstr "Geçesiz ad “%s”: birbirini izleyen iki tire (“--”) kullanılamaz" -#: gio/glib-compile-schemas.c:839 +#: gio/glib-compile-schemas.c:836 #, c-format msgid "Invalid name “%s”: the last character may not be a hyphen (“-”)" msgstr "Geçesiz ad “%s”: son karakter tire (“-”) olamaz." -#: gio/glib-compile-schemas.c:847 +#: gio/glib-compile-schemas.c:844 #, c-format msgid "Invalid name “%s”: maximum length is 1024" msgstr "Geçesiz ad “%s”: olabilecek azami uzunluk 1024" -#: gio/glib-compile-schemas.c:919 +#: gio/glib-compile-schemas.c:916 #, c-format msgid "<child name='%s'> already specified" msgstr "<child name='%s'> zaten belirtilmiş" -#: gio/glib-compile-schemas.c:945 +#: gio/glib-compile-schemas.c:942 msgid "Cannot add keys to a “list-of” schema" msgstr "“list-of” şemasına anahtarlar eklenemiyor" -#: gio/glib-compile-schemas.c:956 +#: gio/glib-compile-schemas.c:953 #, c-format msgid "<key name='%s'> already specified" msgstr "<key name='%s'> zaten belirtilmiş" -#: gio/glib-compile-schemas.c:974 +#: gio/glib-compile-schemas.c:971 #, c-format msgid "" "<key name='%s'> shadows <key name='%s'> in <schema id='%s'>; use <override> " @@ -2736,7 +2746,7 @@ "<key name='%1$s'> dizgesi <schema id='%3$s'> içindeki <key name='%2$s'> " "dizgesini gölgeler; değerleri değiştirmek için <override> kullanın" -#: gio/glib-compile-schemas.c:985 +#: gio/glib-compile-schemas.c:982 #, c-format msgid "" "Exactly one of “type”, “enum” or “flags” must be specified as an attribute " @@ -2745,63 +2755,63 @@ "<key>’e “type”, “enum”, ya da “flags” özniteliklerinden bir tanesi " "kesinlikle belirtilmelidir" -#: gio/glib-compile-schemas.c:1004 +#: gio/glib-compile-schemas.c:1001 #, c-format msgid "<%s id='%s'> not (yet) defined." msgstr "<%s id='%s'> (henüz) tanımlanmamış." -#: gio/glib-compile-schemas.c:1019 +#: gio/glib-compile-schemas.c:1016 #, c-format msgid "Invalid GVariant type string “%s”" msgstr "Geçersiz GVariant tür dizgesi “%s”" -#: gio/glib-compile-schemas.c:1049 +#: gio/glib-compile-schemas.c:1046 msgid "<override> given but schema isn’t extending anything" msgstr "<override> verildi, ancak şema hiçbir şeyi genişletmiyor" -#: gio/glib-compile-schemas.c:1062 +#: gio/glib-compile-schemas.c:1059 #, c-format msgid "No <key name='%s'> to override" msgstr "Üzerine yazılacak hiçbir <key name='%s'> yok" -#: gio/glib-compile-schemas.c:1070 +#: gio/glib-compile-schemas.c:1067 #, c-format msgid "<override name='%s'> already specified" msgstr "<override name='%s'> zaten belirtilmiş" -#: gio/glib-compile-schemas.c:1143 +#: gio/glib-compile-schemas.c:1140 #, c-format msgid "<schema id='%s'> already specified" msgstr "<schema id='%s'> zaten belirtilmiş" -#: gio/glib-compile-schemas.c:1155 +#: gio/glib-compile-schemas.c:1152 #, c-format msgid "<schema id='%s'> extends not yet existing schema “%s”" msgstr "<schema id='%s'> henüz var olmayan “%s” şemasını genişletir" -#: gio/glib-compile-schemas.c:1171 +#: gio/glib-compile-schemas.c:1168 #, c-format msgid "<schema id='%s'> is list of not yet existing schema “%s”" msgstr "<schema id='%s'> henüz var olmayan “%s” şemasının bir listesidir" -#: gio/glib-compile-schemas.c:1179 +#: gio/glib-compile-schemas.c:1176 #, c-format msgid "Cannot be a list of a schema with a path" msgstr "Yolu olan bir şemanın listesi olamaz" -#: gio/glib-compile-schemas.c:1189 +#: gio/glib-compile-schemas.c:1186 #, c-format msgid "Cannot extend a schema with a path" msgstr "Şema bir yol ile genişletilemez" -#: gio/glib-compile-schemas.c:1199 +#: gio/glib-compile-schemas.c:1196 #, c-format msgid "" "<schema id='%s'> is a list, extending <schema id='%s'> which is not a list" msgstr "" "<schema id='%s'>, liste olmayan <schema id='%s'> 'i genişleten bir listedir" -#: gio/glib-compile-schemas.c:1209 +#: gio/glib-compile-schemas.c:1206 #, c-format msgid "" "<schema id='%s' list-of='%s'> extends <schema id='%s' list-of='%s'> but “%s” " @@ -2810,17 +2820,17 @@ "<schema id='%s' list-of='%s'>, <schema id='%s' list-of='%s'> ’i genişletir; " "ancak “%s”, “%s”i genişletemez" -#: gio/glib-compile-schemas.c:1226 +#: gio/glib-compile-schemas.c:1223 #, c-format msgid "A path, if given, must begin and end with a slash" msgstr "Eğer verilmişse, yol, mutlaka bir taksim ile başlayıp bitmeli" -#: gio/glib-compile-schemas.c:1233 +#: gio/glib-compile-schemas.c:1230 #, c-format msgid "The path of a list must end with “:/”" msgstr "Listenin yolu mutlaka “:/” ile bitmelidir" -#: gio/glib-compile-schemas.c:1242 +#: gio/glib-compile-schemas.c:1239 #, c-format msgid "" "Warning: Schema “%s” has path “%s”. Paths starting with “/apps/”, “/" @@ -2829,49 +2839,49 @@ "Uyarı: “%s” şeması “%s” yoluna sahip. “/apps/”, “/desktop/” veya “/system/” " "ile başlayan yollar artık kullanılmamaktadır." -#: gio/glib-compile-schemas.c:1272 +#: gio/glib-compile-schemas.c:1269 #, c-format msgid "<%s id='%s'> already specified" msgstr "<%s id='%s'> zaten belirtilmiş" -#: gio/glib-compile-schemas.c:1422 gio/glib-compile-schemas.c:1438 +#: gio/glib-compile-schemas.c:1419 gio/glib-compile-schemas.c:1435 #, c-format msgid "Only one <%s> element allowed inside <%s>" msgstr "<%s> içinde yalnızca bir <%s> ögesi bulunabilir" -#: gio/glib-compile-schemas.c:1520 +#: gio/glib-compile-schemas.c:1517 #, c-format msgid "Element <%s> not allowed at the top level" msgstr "<%s> ögesine en üst düzeyde izin verilmez" -#: gio/glib-compile-schemas.c:1538 +#: gio/glib-compile-schemas.c:1535 msgid "Element <default> is required in <key>" msgstr "<default> ögesi <key> içinde zorunludur" -#: gio/glib-compile-schemas.c:1628 +#: gio/glib-compile-schemas.c:1625 #, c-format msgid "Text may not appear inside <%s>" msgstr "<%s> içinde metin bulunamayabilir" -#: gio/glib-compile-schemas.c:1696 +#: gio/glib-compile-schemas.c:1693 #, c-format msgid "Warning: undefined reference to <schema id='%s'/>" msgstr "Uyarı: <schema id='%s'/> ’e tanımlanmamış referans" #. Translators: Do not translate "--strict". -#: gio/glib-compile-schemas.c:1835 gio/glib-compile-schemas.c:1914 +#: gio/glib-compile-schemas.c:1832 gio/glib-compile-schemas.c:1911 msgid "--strict was specified; exiting." msgstr "--strict belirtildi; çıkılıyor." -#: gio/glib-compile-schemas.c:1847 +#: gio/glib-compile-schemas.c:1844 msgid "This entire file has been ignored." msgstr "Bu dosyanın tümü görmezden gelindi." -#: gio/glib-compile-schemas.c:1910 +#: gio/glib-compile-schemas.c:1907 msgid "Ignoring this file." msgstr "Bu dosya görmezden geliniyor." -#: gio/glib-compile-schemas.c:1965 +#: gio/glib-compile-schemas.c:1962 #, c-format msgid "" "No such key “%s” in schema “%s” as specified in override file “%s”; ignoring " @@ -2880,7 +2890,7 @@ "“%3$s” dosyasında üzerine yazılacağı belirtilen “%2$s” şemasında “%1$s” gibi " "bir anahtar yok; bu anahtar için üstüne yazma görmezden geliniyor." -#: gio/glib-compile-schemas.c:1973 +#: gio/glib-compile-schemas.c:1970 #, c-format msgid "" "No such key “%s” in schema “%s” as specified in override file “%s” and --" @@ -2889,7 +2899,7 @@ "“%3$s” dosyasında üzerine yazılacağı belirtilen “%2$s” şemasında “%1$s” gibi " "bir anahtar yok ve --strict belirtildi; çıkılıyor." -#: gio/glib-compile-schemas.c:1995 +#: gio/glib-compile-schemas.c:1992 #, c-format msgid "" "Cannot provide per-desktop overrides for localized key “%s” in schema " @@ -2899,7 +2909,7 @@ "sağlanamıyor (üstüne yazma dosyası “%s”); bu anahtar için üstüne yazma göz " "ardı ediliyor." -#: gio/glib-compile-schemas.c:2004 +#: gio/glib-compile-schemas.c:2001 #, c-format msgid "" "Cannot provide per-desktop overrides for localized key “%s” in schema " @@ -2908,7 +2918,7 @@ "“%s” şemasında “%s” yerleşik anahtarı için masaüstü başına üstüne yazma " "sağlanamıyor (üstüne yazma dosyası “%s”) ve --strict belirtildi; çıkılıyor." -#: gio/glib-compile-schemas.c:2028 +#: gio/glib-compile-schemas.c:2025 #, c-format msgid "" "Error parsing key “%s” in schema “%s” as specified in override file “%s”: " @@ -2918,7 +2928,7 @@ "anahtarı ayrıştırmada hata: %4$s. Bu anahtar için üzerine yazma görmezden " "geliniyor." -#: gio/glib-compile-schemas.c:2040 +#: gio/glib-compile-schemas.c:2037 #, c-format msgid "" "Error parsing key “%s” in schema “%s” as specified in override file “%s”: " @@ -2927,7 +2937,7 @@ "“%3$s” dosyasında üzerine yazılacağı belirtilen “%2$s” şemasında “%1$s” " "anahtarı ayrıştırmada hata: %4$s. --strict belirtildi; çıkılıyor." -#: gio/glib-compile-schemas.c:2067 +#: gio/glib-compile-schemas.c:2064 #, c-format msgid "" "Override for key “%s” in schema “%s” in override file “%s” is outside the " @@ -2937,7 +2947,7 @@ "üzerine yazma, şemada verilen aralığın dışındadır; bu anahtar için üstüne " "yazma görmezden geliniyor." -#: gio/glib-compile-schemas.c:2077 +#: gio/glib-compile-schemas.c:2074 #, c-format msgid "" "Override for key “%s” in schema “%s” in override file “%s” is outside the " @@ -2947,7 +2957,7 @@ "üzerine yazma, şemada verilen aralığın dışındadır ve --strict belirtildi; " "çıkılıyor." -#: gio/glib-compile-schemas.c:2103 +#: gio/glib-compile-schemas.c:2100 #, c-format msgid "" "Override for key “%s” in schema “%s” in override file “%s” is not in the " @@ -2957,7 +2967,7 @@ "geçerli seçenekler listesinde değildir; bu anahtar için üstüne yazma göz " "ardı ediliyor." -#: gio/glib-compile-schemas.c:2113 +#: gio/glib-compile-schemas.c:2110 #, c-format msgid "" "Override for key “%s” in schema “%s” in override file “%s” is not in the " @@ -2966,23 +2976,23 @@ "“%3$s” dosyasındaki “%2$s” şemasının “%1$s” anahtarının üzerine yazma, " "geçerli seçenekler listesinde değildir ve --strict belirtildi; çıkılıyor." -#: gio/glib-compile-schemas.c:2175 +#: gio/glib-compile-schemas.c:2172 msgid "Where to store the gschemas.compiled file" msgstr "gschemas.compiled dosyasının saklanacağı yer" -#: gio/glib-compile-schemas.c:2176 +#: gio/glib-compile-schemas.c:2173 msgid "Abort on any errors in schemas" msgstr "Şemalardaki herhangi bir hatada iptal et" -#: gio/glib-compile-schemas.c:2177 +#: gio/glib-compile-schemas.c:2174 msgid "Do not write the gschema.compiled file" msgstr "gschema.compiled dosyasını yazma" -#: gio/glib-compile-schemas.c:2178 +#: gio/glib-compile-schemas.c:2175 msgid "Do not enforce key name restrictions" msgstr "Anahtar adı kısıtlamalarını zorlama" -#: gio/glib-compile-schemas.c:2207 +#: gio/glib-compile-schemas.c:2204 msgid "" "Compile all GSettings schema files into a schema cache.\n" "Schema files are required to have the extension .gschema.xml,\n" @@ -2992,24 +3002,24 @@ "Şema dosyalarının .gschema.xml uzantısına sahip olmaları gerekir,\n" "ve önbellek dosyası gschemas.compiled olarak anılır." -#: gio/glib-compile-schemas.c:2228 +#: gio/glib-compile-schemas.c:2225 msgid "You should give exactly one directory name" msgstr "Tam olarak bir adet dizin adı vermelisiniz" -#: gio/glib-compile-schemas.c:2271 +#: gio/glib-compile-schemas.c:2268 msgid "No schema files found: doing nothing." msgstr "Hiç şema dosyası bulunamadı: hiçbir şey yapılmıyor." -#: gio/glib-compile-schemas.c:2273 +#: gio/glib-compile-schemas.c:2270 msgid "No schema files found: removed existing output file." msgstr "Hiç şema dosyası bulunamadı: var olan çıktı dosyası kaldırıldı." -#: gio/glocalfile.c:563 gio/win32/gwinhttpfile.c:436 +#: gio/glocalfile.c:567 gio/win32/gwinhttpfile.c:436 #, c-format msgid "Invalid filename %s" msgstr "Geçersiz dosya adı %s" -#: gio/glocalfile.c:996 +#: gio/glocalfile.c:1009 #, c-format msgid "Error getting filesystem info for %s: %s" msgstr "%s için dosya sistemi bilgisi alınırken hata: %s" @@ -3018,255 +3028,255 @@ #. * the enclosing (user visible) mount of a file, but none #. * exists. #. -#: gio/glocalfile.c:1137 +#: gio/glocalfile.c:1145 #, c-format msgid "Containing mount for file %s not found" msgstr "%s dosyası için bağlama bulunamadı" -#: gio/glocalfile.c:1160 +#: gio/glocalfile.c:1168 msgid "Can’t rename root directory" msgstr "Kök dizini yeniden adlandırılamaz" -#: gio/glocalfile.c:1178 gio/glocalfile.c:1201 +#: gio/glocalfile.c:1186 gio/glocalfile.c:1209 #, c-format msgid "Error renaming file %s: %s" msgstr "%s dosyası yeniden adlandırılırken hata: %s" -#: gio/glocalfile.c:1185 +#: gio/glocalfile.c:1193 msgid "Can’t rename file, filename already exists" msgstr "Dosya yeniden adlandırılamıyor, dosya adı zaten var" -#: gio/glocalfile.c:1198 gio/glocalfile.c:2394 gio/glocalfile.c:2422 -#: gio/glocalfile.c:2561 gio/glocalfileoutputstream.c:658 +#: gio/glocalfile.c:1206 gio/glocalfile.c:2409 gio/glocalfile.c:2437 +#: gio/glocalfile.c:2576 gio/glocalfileoutputstream.c:658 msgid "Invalid filename" msgstr "Geçersiz dosya adı" -#: gio/glocalfile.c:1366 gio/glocalfile.c:1377 +#: gio/glocalfile.c:1374 gio/glocalfile.c:1385 #, c-format msgid "Error opening file %s: %s" msgstr "%s dosyası açılırken hata: %s" -#: gio/glocalfile.c:1502 +#: gio/glocalfile.c:1510 #, c-format msgid "Error removing file %s: %s" msgstr "%s dosyası silinirken hata: %s" -#: gio/glocalfile.c:1996 gio/glocalfile.c:2007 gio/glocalfile.c:2034 +#: gio/glocalfile.c:2004 gio/glocalfile.c:2015 gio/glocalfile.c:2042 #, c-format msgid "Error trashing file %s: %s" msgstr "%s dosyası çöpe atılırken hata: %s" -#: gio/glocalfile.c:2054 +#: gio/glocalfile.c:2062 #, c-format msgid "Unable to create trash directory %s: %s" msgstr "Çöp dizini %s oluşturulamadı: %s" -#: gio/glocalfile.c:2075 +#: gio/glocalfile.c:2083 #, c-format msgid "Unable to find toplevel directory to trash %s" msgstr "%s çöpe atmak için en üst seviye dizin bulunamıyor" -#: gio/glocalfile.c:2083 +#: gio/glocalfile.c:2091 #, c-format msgid "Trashing on system internal mounts is not supported" msgstr "Sistem iç bağlarına çöpleme desteklenmiyor" -#: gio/glocalfile.c:2169 gio/glocalfile.c:2197 +#: gio/glocalfile.c:2177 gio/glocalfile.c:2205 #, c-format msgid "Unable to find or create trash directory %s to trash %s" msgstr "%2$s çöpe atılırken %1$s çöp dizini bulunamıyor ya da oluşturulamıyor" -#: gio/glocalfile.c:2243 +#: gio/glocalfile.c:2249 #, c-format msgid "Unable to create trashing info file for %s: %s" msgstr "%s için çöp bilgi dosyası oluşturulamıyor: %s" -#: gio/glocalfile.c:2305 +#: gio/glocalfile.c:2320 #, c-format msgid "Unable to trash file %s across filesystem boundaries" msgstr "%s dosyası, dosya sistemi sınırları dışına, çöpe atılamıyor" -#: gio/glocalfile.c:2309 gio/glocalfile.c:2365 +#: gio/glocalfile.c:2324 gio/glocalfile.c:2380 #, c-format msgid "Unable to trash file %s: %s" msgstr "%s dosyası çöpe atılamıyor: %s" -#: gio/glocalfile.c:2371 +#: gio/glocalfile.c:2386 #, c-format msgid "Unable to trash file %s" msgstr "%s dosyası çöpe atılamıyor" -#: gio/glocalfile.c:2397 +#: gio/glocalfile.c:2412 #, c-format msgid "Error creating directory %s: %s" msgstr "%s dizini oluşturulurken hata: %s" -#: gio/glocalfile.c:2426 +#: gio/glocalfile.c:2441 #, c-format msgid "Filesystem does not support symbolic links" msgstr "Dosya sistemi simgesel bağları desteklemiyor" -#: gio/glocalfile.c:2429 +#: gio/glocalfile.c:2444 #, c-format msgid "Error making symbolic link %s: %s" msgstr "%s simgesel bağlantısı yapılırken hata: %s" -#: gio/glocalfile.c:2472 gio/glocalfile.c:2507 gio/glocalfile.c:2564 +#: gio/glocalfile.c:2487 gio/glocalfile.c:2522 gio/glocalfile.c:2579 #, c-format msgid "Error moving file %s: %s" msgstr "%s dosyası taşınırken hata: %s" -#: gio/glocalfile.c:2495 +#: gio/glocalfile.c:2510 msgid "Can’t move directory over directory" msgstr "Dizin dizin üzerine taşınamıyor" -#: gio/glocalfile.c:2521 gio/glocalfileoutputstream.c:1110 +#: gio/glocalfile.c:2536 gio/glocalfileoutputstream.c:1110 #: gio/glocalfileoutputstream.c:1124 gio/glocalfileoutputstream.c:1139 #: gio/glocalfileoutputstream.c:1156 gio/glocalfileoutputstream.c:1170 msgid "Backup file creation failed" -msgstr "Yedek dosyası oluşturma başarısız oldu" +msgstr "Yedek dosyası oluşturulamadı" -#: gio/glocalfile.c:2540 +#: gio/glocalfile.c:2555 #, c-format msgid "Error removing target file: %s" msgstr "Hedef dosya silerken hata: %s" -#: gio/glocalfile.c:2554 +#: gio/glocalfile.c:2569 msgid "Move between mounts not supported" msgstr "Bağlı sistemler arasında taşıma desteklenmiyor" -#: gio/glocalfile.c:2728 +#: gio/glocalfile.c:2745 #, c-format msgid "Could not determine the disk usage of %s: %s" msgstr "%s’in disk kullanımı saptanamadı: %s" -#: gio/glocalfileinfo.c:775 +#: gio/glocalfileinfo.c:779 msgid "Attribute value must be non-NULL" msgstr "Öznitelik değeri NULL olmamalı" -#: gio/glocalfileinfo.c:782 +#: gio/glocalfileinfo.c:786 msgid "Invalid attribute type (string or invalid expected)" msgstr "Geçersiz öznitelik türü (dizge veya geçersiz beklendi)" -#: gio/glocalfileinfo.c:789 +#: gio/glocalfileinfo.c:793 msgid "Invalid extended attribute name" msgstr "Geçersiz genişletilmiş öznitelik adı" -#: gio/glocalfileinfo.c:840 +#: gio/glocalfileinfo.c:844 #, c-format msgid "Error setting extended attribute “%s”: %s" msgstr "“%s” genişletilmiş özniteliği atanırken hata: %s" -#: gio/glocalfileinfo.c:1738 gio/win32/gwinhttpfile.c:191 +#: gio/glocalfileinfo.c:1823 gio/win32/gwinhttpfile.c:191 msgid " (invalid encoding)" msgstr " (geçersiz kodlama)" -#: gio/glocalfileinfo.c:1897 gio/glocalfileoutputstream.c:945 +#: gio/glocalfileinfo.c:1982 gio/glocalfileoutputstream.c:945 #: gio/glocalfileoutputstream.c:997 #, c-format msgid "Error when getting information for file “%s”: %s" msgstr "“%s” dosyası için bilgi alınırken hata: %s" -#: gio/glocalfileinfo.c:2163 +#: gio/glocalfileinfo.c:2288 #, c-format msgid "Error when getting information for file descriptor: %s" msgstr "Dosya tanımlayıcı için bilgi alındığında hata: %s" -#: gio/glocalfileinfo.c:2208 +#: gio/glocalfileinfo.c:2333 msgid "Invalid attribute type (uint32 expected)" msgstr "Geçersiz öznitelik türü (uint32 beklendi)" -#: gio/glocalfileinfo.c:2226 +#: gio/glocalfileinfo.c:2351 msgid "Invalid attribute type (uint64 expected)" msgstr "Geçersiz öznitelik türü (uint64 beklendi)" -#: gio/glocalfileinfo.c:2245 gio/glocalfileinfo.c:2264 +#: gio/glocalfileinfo.c:2370 gio/glocalfileinfo.c:2389 msgid "Invalid attribute type (byte string expected)" msgstr "Geçersiz öznitelik türü (byte dizisi beklendi)" -#: gio/glocalfileinfo.c:2311 +#: gio/glocalfileinfo.c:2436 msgid "Cannot set permissions on symlinks" msgstr "Simgesel bağlar üzerindeki yetkiler ayarlanamıyor" -#: gio/glocalfileinfo.c:2327 +#: gio/glocalfileinfo.c:2452 #, c-format msgid "Error setting permissions: %s" msgstr "İzinler atanırken hata: %s" -#: gio/glocalfileinfo.c:2378 +#: gio/glocalfileinfo.c:2503 #, c-format msgid "Error setting owner: %s" msgstr "Sahip atanırken hata: %s" -#: gio/glocalfileinfo.c:2401 +#: gio/glocalfileinfo.c:2526 msgid "symlink must be non-NULL" msgstr "simgesel bağ NULL olmamalı" -#: gio/glocalfileinfo.c:2411 gio/glocalfileinfo.c:2430 -#: gio/glocalfileinfo.c:2441 +#: gio/glocalfileinfo.c:2536 gio/glocalfileinfo.c:2555 +#: gio/glocalfileinfo.c:2566 #, c-format msgid "Error setting symlink: %s" msgstr "Simgesel bağ atanırken hata: %s" -#: gio/glocalfileinfo.c:2420 +#: gio/glocalfileinfo.c:2545 msgid "Error setting symlink: file is not a symlink" msgstr "Simgesel bağ atanırken hata: dosya bir simgesel bağ değil" -#: gio/glocalfileinfo.c:2492 +#: gio/glocalfileinfo.c:2637 #, c-format msgid "Extra nanoseconds %d for UNIX timestamp %lld are negative" msgstr "UNIX zaman damgası %2$lld için %1$d ek nanosaniye negatif" -#: gio/glocalfileinfo.c:2501 +#: gio/glocalfileinfo.c:2646 #, c-format msgid "Extra nanoseconds %d for UNIX timestamp %lld reach 1 second" msgstr "UNIX zaman damgası %2$lld için %1$d ek nano saniye 1 saniyeye ulaştı" -#: gio/glocalfileinfo.c:2511 +#: gio/glocalfileinfo.c:2656 #, c-format msgid "UNIX timestamp %lld does not fit into 64 bits" msgstr "UNIX zaman damgası %lld 64 bit’e sığmıyor" -#: gio/glocalfileinfo.c:2522 +#: gio/glocalfileinfo.c:2667 #, c-format msgid "UNIX timestamp %lld is outside of the range supported by Windows" msgstr "" "UNIX zaman damgası %lld Windows tarafından desteklenen aralığın dışında" -#: gio/glocalfileinfo.c:2625 +#: gio/glocalfileinfo.c:2799 #, c-format msgid "File name “%s” cannot be converted to UTF-16" msgstr "“%s” dosya adı UTF-16’ya dönüştürülemedi" -#: gio/glocalfileinfo.c:2644 +#: gio/glocalfileinfo.c:2818 #, c-format msgid "File “%s” cannot be opened: Windows Error %lu" msgstr "“%s” dosyası açılamadı: Windows Hatası %lu" -#: gio/glocalfileinfo.c:2657 +#: gio/glocalfileinfo.c:2831 #, c-format msgid "Error setting modification or access time for file “%s”: %lu" msgstr "“%s” dosyasına değiştirme veya erişim süresi atanırken hata: %lu" -#: gio/glocalfileinfo.c:2798 gio/glocalfileinfo.c:2810 +#: gio/glocalfileinfo.c:2988 #, c-format msgid "Error setting modification or access time: %s" msgstr "Değiştirme veya erişim süresi atanırken hata: %s" -#: gio/glocalfileinfo.c:2833 +#: gio/glocalfileinfo.c:3011 msgid "SELinux context must be non-NULL" msgstr "SELinux bağlamı NULL olmamalı" -#: gio/glocalfileinfo.c:2840 +#: gio/glocalfileinfo.c:3018 msgid "SELinux is not enabled on this system" msgstr "SELinux bu sistede etkin değil" -#: gio/glocalfileinfo.c:2850 +#: gio/glocalfileinfo.c:3028 #, c-format msgid "Error setting SELinux context: %s" msgstr "SELinux bağlamı atanırken hata: %s" -#: gio/glocalfileinfo.c:2947 +#: gio/glocalfileinfo.c:3125 #, c-format msgid "Setting attribute %s not supported" msgstr "Öznitelik %s ataması desteklenmiyor" @@ -3313,13 +3323,13 @@ msgid "Error renaming temporary file: %s" msgstr "Geçici dosya yeniden adlandırılırken hata: %s" -#: gio/glocalfileoutputstream.c:611 gio/glocalfileoutputstream.c:1241 +#: gio/glocalfileoutputstream.c:611 gio/glocalfileoutputstream.c:1242 #, c-format msgid "Error truncating file: %s" msgstr "Dosyanın sonu kesilirken hata: %s" #: gio/glocalfileoutputstream.c:664 gio/glocalfileoutputstream.c:909 -#: gio/glocalfileoutputstream.c:1222 gio/gsubprocess.c:231 +#: gio/glocalfileoutputstream.c:1223 gio/gsubprocess.c:231 #, c-format msgid "Error opening file “%s”: %s" msgstr "“%s” dosyası açılırken hata: %s" @@ -3336,7 +3346,7 @@ msgid "The file was externally modified" msgstr "Dosya dışarıdan değiştirilmiş" -#: gio/glocalfileoutputstream.c:1204 +#: gio/glocalfileoutputstream.c:1205 #, c-format msgid "Error removing old file: %s" msgstr "Eski dosya silinirken hata: %s" @@ -3359,7 +3369,7 @@ #: gio/gmemoryoutputstream.c:586 msgid "Failed to resize memory output stream" -msgstr "Hafız çıktı açışı yeniden boyutlandırma başarısız oldu" +msgstr "Bellek çıktı akışı yeniden boyutlandırılamadı" #: gio/gmemoryoutputstream.c:665 msgid "" @@ -3485,8 +3495,8 @@ #. Translators: the first placeholder is a domain name, the #. * second is an error message #: gio/gresolver.c:403 gio/gthreadedresolver.c:152 gio/gthreadedresolver.c:170 -#: gio/gthreadedresolver.c:782 gio/gthreadedresolver.c:806 -#: gio/gthreadedresolver.c:831 gio/gthreadedresolver.c:846 +#: gio/gthreadedresolver.c:798 gio/gthreadedresolver.c:822 +#: gio/gthreadedresolver.c:847 gio/gthreadedresolver.c:862 #, c-format msgid "Error resolving “%s”: %s" msgstr "“%s” çözülürken hata: %s" @@ -3503,8 +3513,8 @@ #: gio/gresource.c:683 gio/gresource.c:945 gio/gresource.c:985 #: gio/gresource.c:1109 gio/gresource.c:1181 gio/gresource.c:1255 -#: gio/gresource.c:1336 gio/gresourcefile.c:478 gio/gresourcefile.c:601 -#: gio/gresourcefile.c:752 +#: gio/gresource.c:1336 gio/gresourcefile.c:478 gio/gresourcefile.c:602 +#: gio/gresourcefile.c:753 #, c-format msgid "The resource at “%s” does not exist" msgstr "“%s” konumundaki kaynak yok" @@ -3514,16 +3524,16 @@ msgid "The resource at “%s” failed to decompress" msgstr "“%s” konumundaki kaynak açılamadı" -#: gio/gresourcefile.c:658 +#: gio/gresourcefile.c:659 msgid "Resource files cannot be renamed" msgstr "Kaynak dosyalar yeniden adlandırılamaz" -#: gio/gresourcefile.c:748 +#: gio/gresourcefile.c:749 #, c-format msgid "The resource at “%s” is not a directory" msgstr "“%s” konumundaki kaynak bir dizin değildir" -#: gio/gresourcefile.c:956 +#: gio/gresourcefile.c:957 msgid "Input stream doesn’t implement seek" msgstr "Girdi akışı aramayı yerine getirmiyor" @@ -3884,13 +3894,13 @@ #: gio/gsocket.c:426 #, c-format msgid "Invalid socket, initialization failed due to: %s" -msgstr "Geçersiz yuva, başlatma başarısız oldu: %s" +msgstr "Geçersiz yuva, başlatılamadı: %s" #: gio/gsocket.c:434 msgid "Socket is already closed" msgstr "Yuva zaten kapalı" -#: gio/gsocket.c:449 gio/gsocket.c:3201 gio/gsocket.c:4434 gio/gsocket.c:4492 +#: gio/gsocket.c:449 gio/gsocket.c:3225 gio/gsocket.c:4458 gio/gsocket.c:4516 msgid "Socket I/O timed out" msgstr "Yuva G/Ç zaman aşımı" @@ -3985,74 +3995,74 @@ msgid "No support for IPv6 source-specific multicast" msgstr "IPv6 kaynağa-özgü çok yöne yayın desteklenmiyor" -#: gio/gsocket.c:2900 +#: gio/gsocket.c:2924 #, c-format msgid "Error accepting connection: %s" msgstr "Bağlantı kabul edilirken hata: %s" -#: gio/gsocket.c:3026 +#: gio/gsocket.c:3050 msgid "Connection in progress" -msgstr "Bağlantı devam ediyor" +msgstr "Bağlantı sürüyor" -#: gio/gsocket.c:3077 +#: gio/gsocket.c:3101 msgid "Unable to get pending error: " msgstr "Bekleyen hata alınamadı: " -#: gio/gsocket.c:3266 +#: gio/gsocket.c:3290 #, c-format msgid "Error receiving data: %s" msgstr "Veri alırken hata: %s" -#: gio/gsocket.c:3463 +#: gio/gsocket.c:3487 #, c-format msgid "Error sending data: %s" msgstr "Veri gönderirken hata: %s" -#: gio/gsocket.c:3650 +#: gio/gsocket.c:3674 #, c-format msgid "Unable to shutdown socket: %s" msgstr "Yuva kapatılamadı: %s" -#: gio/gsocket.c:3731 +#: gio/gsocket.c:3755 #, c-format msgid "Error closing socket: %s" msgstr "Yuva kapatılırken hata: %s" -#: gio/gsocket.c:4427 +#: gio/gsocket.c:4451 #, c-format msgid "Waiting for socket condition: %s" msgstr "Yuva durumu bekleniyor: %s" -#: gio/gsocket.c:4817 gio/gsocket.c:4833 gio/gsocket.c:4846 +#: gio/gsocket.c:4841 gio/gsocket.c:4857 gio/gsocket.c:4870 #, c-format msgid "Unable to send message: %s" msgstr "İleti gönderilemedi: %s" -#: gio/gsocket.c:4818 gio/gsocket.c:4834 gio/gsocket.c:4847 +#: gio/gsocket.c:4842 gio/gsocket.c:4858 gio/gsocket.c:4871 msgid "Message vectors too large" msgstr "İleti vektörleri çok geniş" -#: gio/gsocket.c:4863 gio/gsocket.c:4865 gio/gsocket.c:5012 gio/gsocket.c:5097 -#: gio/gsocket.c:5275 gio/gsocket.c:5315 gio/gsocket.c:5317 +#: gio/gsocket.c:4887 gio/gsocket.c:4889 gio/gsocket.c:5036 gio/gsocket.c:5121 +#: gio/gsocket.c:5299 gio/gsocket.c:5339 gio/gsocket.c:5341 #, c-format msgid "Error sending message: %s" msgstr "İleti gönderme hatası: %s" -#: gio/gsocket.c:5039 +#: gio/gsocket.c:5063 msgid "GSocketControlMessage not supported on Windows" msgstr "GSocketControlMessage Windows işletim sisteminde desteklenmiyor" -#: gio/gsocket.c:5512 gio/gsocket.c:5588 gio/gsocket.c:5814 +#: gio/gsocket.c:5536 gio/gsocket.c:5612 gio/gsocket.c:5838 #, c-format msgid "Error receiving message: %s" msgstr "İleti alma hatası: %s" -#: gio/gsocket.c:6099 gio/gsocket.c:6110 gio/gsocket.c:6173 +#: gio/gsocket.c:6123 gio/gsocket.c:6134 gio/gsocket.c:6197 #, c-format msgid "Unable to read socket credentials: %s" msgstr "Yuva kimliği okunamadı : %s" -#: gio/gsocket.c:6182 +#: gio/gsocket.c:6206 msgid "g_socket_get_credentials not implemented for this OS" msgstr "bu işletim sistemi için g_socket_get_credentials uygulanmadı" @@ -4132,8 +4142,7 @@ #: gio/gsocks5proxy.c:252 msgid "SOCKSv5 authentication failed due to wrong username or password." msgstr "" -"Yanlış kullanıcı adı ya da paroladan dolayı SOCKSv5 kimlik doğrulaması " -"başarısız oldu." +"Yanlış kullanıcı adı ya da paroladan dolayı SOCKSv5 kimlik doğrulanamadı." #: gio/gsocks5proxy.c:302 #, c-format @@ -4176,12 +4185,12 @@ msgid "Unknown SOCKSv5 proxy error." msgstr "Bilinmeyen SOCKSv5 vekil hatası." -#: gio/gtestdbus.c:614 glib/gspawn-win32.c:354 +#: gio/gtestdbus.c:615 glib/gspawn-win32.c:354 #, c-format msgid "Failed to create pipe for communicating with child process (%s)" -msgstr "Alt süreçle haberleşme için boru yaratılamadı (%s)" +msgstr "Alt süreçle haberleşme için boru oluşturulamadı (%s)" -#: gio/gtestdbus.c:621 +#: gio/gtestdbus.c:622 #, c-format msgid "Pipes are not supported in this platform" msgstr "Borular bu platformda desteklenmiyor" @@ -4202,35 +4211,35 @@ #. Translators: the placeholder is a DNS record type, such as ‘MX’ or ‘SRV’ #: gio/gthreadedresolver.c:552 gio/gthreadedresolver.c:574 -#: gio/gthreadedresolver.c:612 gio/gthreadedresolver.c:659 -#: gio/gthreadedresolver.c:688 gio/gthreadedresolver.c:700 +#: gio/gthreadedresolver.c:628 gio/gthreadedresolver.c:675 +#: gio/gthreadedresolver.c:704 gio/gthreadedresolver.c:716 #, c-format msgid "Error parsing DNS %s record: malformed DNS packet" msgstr "DNS %s kaydı ayrıştırılamadı: kusurlu DNS paketi" -#: gio/gthreadedresolver.c:758 gio/gthreadedresolver.c:895 -#: gio/gthreadedresolver.c:993 gio/gthreadedresolver.c:1043 +#: gio/gthreadedresolver.c:774 gio/gthreadedresolver.c:911 +#: gio/gthreadedresolver.c:1009 gio/gthreadedresolver.c:1059 #, c-format msgid "No DNS record of the requested type for “%s”" msgstr "“%s” için istenen türün DNS kaydı yok" -#: gio/gthreadedresolver.c:763 gio/gthreadedresolver.c:998 +#: gio/gthreadedresolver.c:779 gio/gthreadedresolver.c:1014 #, c-format msgid "Temporarily unable to resolve “%s”" msgstr "Geçici olarak “%s” çözülemiyor" -#: gio/gthreadedresolver.c:768 gio/gthreadedresolver.c:1003 -#: gio/gthreadedresolver.c:1113 +#: gio/gthreadedresolver.c:784 gio/gthreadedresolver.c:1019 +#: gio/gthreadedresolver.c:1129 #, c-format msgid "Error resolving “%s”" msgstr "“%s” çözerken hata" -#: gio/gthreadedresolver.c:782 gio/gthreadedresolver.c:806 -#: gio/gthreadedresolver.c:831 gio/gthreadedresolver.c:846 +#: gio/gthreadedresolver.c:798 gio/gthreadedresolver.c:822 +#: gio/gthreadedresolver.c:847 gio/gthreadedresolver.c:862 msgid "Malformed DNS packet" msgstr "Kusurlu DNS paketi" -#: gio/gthreadedresolver.c:888 +#: gio/gthreadedresolver.c:904 #, c-format msgid "Failed to parse DNS response for “%s”: " msgstr "“%s” için DNS yanıtı ayrıştırılamadı: " @@ -4261,7 +4270,7 @@ #: gio/gtlscertificate.c:1017 msgid "This GTlsBackend does not support creating PKCS #11 certificates" -msgstr "GTlsBackend, PKCS #11 sertifikası yaratmayı desteklemiyor" +msgstr "GTlsBackend, PKCS #11 sertifikası oluşturmayı desteklemiyor" #: gio/gtlspassword.c:113 msgid "" @@ -4353,7 +4362,7 @@ msgid "Error closing file descriptor: %s" msgstr "Dosya tanımlayıcı kapatılırken hata: %s" -#: gio/gunixmounts.c:2815 gio/gunixmounts.c:2868 +#: gio/gunixmounts.c:2817 gio/gunixmounts.c:2870 msgid "Filesystem root" msgstr "Dosya sistemi kök dizini" @@ -4435,80 +4444,80 @@ msgid "Wrong args\n" msgstr "Yanlış değişkenler\n" -#: glib/gbookmarkfile.c:779 +#: glib/gbookmarkfile.c:861 #, c-format msgid "Unexpected attribute “%s” for element “%s”" msgstr "“%2$s” ögesi için beklenmeyen “%1$s” özniteliği" -#: glib/gbookmarkfile.c:790 glib/gbookmarkfile.c:870 glib/gbookmarkfile.c:880 -#: glib/gbookmarkfile.c:993 +#: glib/gbookmarkfile.c:872 glib/gbookmarkfile.c:952 glib/gbookmarkfile.c:962 +#: glib/gbookmarkfile.c:1075 #, c-format msgid "Attribute “%s” of element “%s” not found" msgstr "“%2$s” ögesinde “%1$s” özniteliği bulunamadı" -#: glib/gbookmarkfile.c:1202 glib/gbookmarkfile.c:1267 -#: glib/gbookmarkfile.c:1331 glib/gbookmarkfile.c:1341 +#: glib/gbookmarkfile.c:1284 glib/gbookmarkfile.c:1349 +#: glib/gbookmarkfile.c:1413 glib/gbookmarkfile.c:1423 #, c-format msgid "Unexpected tag “%s”, tag “%s” expected" msgstr "Beklenmeyen etiket “%s”, “%s” bekleniyordu" -#: glib/gbookmarkfile.c:1227 glib/gbookmarkfile.c:1241 -#: glib/gbookmarkfile.c:1309 glib/gbookmarkfile.c:1355 +#: glib/gbookmarkfile.c:1309 glib/gbookmarkfile.c:1323 +#: glib/gbookmarkfile.c:1391 glib/gbookmarkfile.c:1437 #, c-format msgid "Unexpected tag “%s” inside “%s”" msgstr "“%2$s” içinde beklenmeyen etiket “%1$s”" -#: glib/gbookmarkfile.c:1635 +#: glib/gbookmarkfile.c:1717 #, c-format msgid "Invalid date/time ‘%s’ in bookmark file" msgstr "Yer imi dosyasında geçersiz tarih/saat ‘%s’" -#: glib/gbookmarkfile.c:1838 +#: glib/gbookmarkfile.c:1956 msgid "No valid bookmark file found in data dirs" msgstr "Veri dizinlerinde geçerli bir yer imi dosyası bulunamadı" -#: glib/gbookmarkfile.c:2039 +#: glib/gbookmarkfile.c:2157 #, c-format msgid "A bookmark for URI “%s” already exists" msgstr "“%s” URI’si için bir yer imi zaten var" -#: glib/gbookmarkfile.c:2088 glib/gbookmarkfile.c:2246 -#: glib/gbookmarkfile.c:2331 glib/gbookmarkfile.c:2411 -#: glib/gbookmarkfile.c:2496 glib/gbookmarkfile.c:2630 -#: glib/gbookmarkfile.c:2763 glib/gbookmarkfile.c:2898 -#: glib/gbookmarkfile.c:2940 glib/gbookmarkfile.c:3037 -#: glib/gbookmarkfile.c:3158 glib/gbookmarkfile.c:3352 -#: glib/gbookmarkfile.c:3493 glib/gbookmarkfile.c:3712 -#: glib/gbookmarkfile.c:3801 glib/gbookmarkfile.c:3890 -#: glib/gbookmarkfile.c:4009 +#: glib/gbookmarkfile.c:2206 glib/gbookmarkfile.c:2364 +#: glib/gbookmarkfile.c:2449 glib/gbookmarkfile.c:2529 +#: glib/gbookmarkfile.c:2614 glib/gbookmarkfile.c:2748 +#: glib/gbookmarkfile.c:2881 glib/gbookmarkfile.c:3016 +#: glib/gbookmarkfile.c:3058 glib/gbookmarkfile.c:3155 +#: glib/gbookmarkfile.c:3276 glib/gbookmarkfile.c:3470 +#: glib/gbookmarkfile.c:3611 glib/gbookmarkfile.c:3830 +#: glib/gbookmarkfile.c:3919 glib/gbookmarkfile.c:4008 +#: glib/gbookmarkfile.c:4127 #, c-format msgid "No bookmark found for URI “%s”" msgstr "“%s” URI’si için bir yer imi bulunamadı" -#: glib/gbookmarkfile.c:2420 +#: glib/gbookmarkfile.c:2538 #, c-format msgid "No MIME type defined in the bookmark for URI “%s”" msgstr "“%s” URI’si için yer iminde hiçbir MIME türü belirtilmedi" -#: glib/gbookmarkfile.c:2505 +#: glib/gbookmarkfile.c:2623 #, c-format msgid "No private flag has been defined in bookmark for URI “%s”" msgstr "“%s” URI’si için yer iminde özel bayrak tanımlanmadı" -#: glib/gbookmarkfile.c:3046 +#: glib/gbookmarkfile.c:3164 #, c-format msgid "No groups set in bookmark for URI “%s”" msgstr "“%s” URI’si için yer iminde küme tanımlanmadı" -#: glib/gbookmarkfile.c:3514 glib/gbookmarkfile.c:3722 +#: glib/gbookmarkfile.c:3632 glib/gbookmarkfile.c:3840 #, c-format msgid "No application with name “%s” registered a bookmark for “%s”" msgstr "“%s” adında hiçbir uygulama “%s” için yer imi kaydetmedi" -#: glib/gbookmarkfile.c:3745 +#: glib/gbookmarkfile.c:3863 #, c-format msgid "Failed to expand exec line “%s” with URI “%s”" -msgstr "Exec satırı “%s”, “%s” URI’si ile genişletilirken başarısız olundu" +msgstr "Exec satırı “%s”, “%s” URI’si ile genişletilemedi" #: glib/gconvert.c:470 msgid "Unrepresentable character in conversion input" @@ -4981,84 +4990,82 @@ msgid "Error opening directory “%s”: %s" msgstr "“%s” dizini açılamadı: %s" -#: glib/gfileutils.c:735 glib/gfileutils.c:827 +#: glib/gfileutils.c:753 glib/gfileutils.c:845 #, c-format msgid "Could not allocate %lu byte to read file “%s”" msgid_plural "Could not allocate %lu bytes to read file “%s”" msgstr0 "%lu bayt “%s” dosyasını okumak için ayrılamadı" -#: glib/gfileutils.c:752 +#: glib/gfileutils.c:770 #, c-format msgid "Error reading file “%s”: %s" msgstr "“%s” dosyası okuma hatası: %s" -#: glib/gfileutils.c:788 +#: glib/gfileutils.c:806 #, c-format msgid "File “%s” is too large" msgstr "“%s” dosyası çok büyük" -#: glib/gfileutils.c:852 +#: glib/gfileutils.c:870 #, c-format msgid "Failed to read from file “%s”: %s" -msgstr "“%s” dosyasından okuma başarısız: %s" +msgstr "“%s” dosyasından okunamadı: %s" -#: glib/gfileutils.c:902 glib/gfileutils.c:977 glib/gfileutils.c:1449 +#: glib/gfileutils.c:920 glib/gfileutils.c:995 glib/gfileutils.c:1472 #, c-format msgid "Failed to open file “%s”: %s" -msgstr "“%s” dosyasını açma başarısız: %s" +msgstr "“%s” dosyası açılamadı: %s" -#: glib/gfileutils.c:915 +#: glib/gfileutils.c:933 #, c-format msgid "Failed to get attributes of file “%s”: fstat() failed: %s" -msgstr "" -"“%s” dosyasının özniteliklerini alma başarısız: fstat() başarısızlığı: %s" +msgstr "“%s” dosyasının öznitelikleri alınamadı: fstat() başarısız: %s" -#: glib/gfileutils.c:946 +#: glib/gfileutils.c:964 #, c-format msgid "Failed to open file “%s”: fdopen() failed: %s" -msgstr "“%s” dosyasını açma başarısız: fdopen() başarısızlığı: %s" +msgstr "“%s” dosyası açılamadı: fdopen() başarısız: %s" -#: glib/gfileutils.c:1047 +#: glib/gfileutils.c:1065 #, c-format msgid "Failed to rename file “%s” to “%s”: g_rename() failed: %s" msgstr "" -"“%s” dosyasının adı “%s” olarak değiştirilirken hata: g_rename() " -"başarısızlığı: %s" +"“%s” dosyasının adı “%s” olarak değiştirilemedi: g_rename() başarısız: %s" -#: glib/gfileutils.c:1156 +#: glib/gfileutils.c:1179 #, c-format msgid "Failed to write file “%s”: write() failed: %s" msgstr "“%s” dosyasına yazılamadı: write() başarısız: %s" -#: glib/gfileutils.c:1177 +#: glib/gfileutils.c:1200 #, c-format msgid "Failed to write file “%s”: fsync() failed: %s" msgstr "“%s” dosyasına yazılamadı: fsync() başarısız: %s" -#: glib/gfileutils.c:1338 glib/gfileutils.c:1753 +#: glib/gfileutils.c:1361 glib/gfileutils.c:1776 #, c-format msgid "Failed to create file “%s”: %s" -msgstr "“%s” dosyasını oluşturma başarısız: %s" +msgstr "“%s” dosyası oluşturulamadı: %s" -#: glib/gfileutils.c:1383 +#: glib/gfileutils.c:1406 #, c-format msgid "Existing file “%s” could not be removed: g_unlink() failed: %s" msgstr "Var olan dosya “%s” kaldırılamadı: g_unlink() başarısızlığı: %s" -#: glib/gfileutils.c:1718 +#: glib/gfileutils.c:1741 #, c-format msgid "Template “%s” invalid, should not contain a “%s”" msgstr "“%s” şablonu geçersiz, “%s” içermemeli" -#: glib/gfileutils.c:1731 +#: glib/gfileutils.c:1754 #, c-format msgid "Template “%s” doesn’t contain XXXXXX" msgstr "“%s” şablonu XXXXXX içermiyor" -#: glib/gfileutils.c:2291 glib/gfileutils.c:2320 +#: glib/gfileutils.c:2348 glib/gfileutils.c:2377 #, c-format msgid "Failed to read the symbolic link “%s”: %s" -msgstr "“%s” simgesel bağını okuma başarısız: %s" +msgstr "“%s” simgesel bağı okunamadı: %s" #: glib/giochannel.c:1408 #, c-format @@ -5081,15 +5088,15 @@ msgid "Can’t do a raw read in g_io_channel_read_to_end" msgstr "g_io_channel_read_to_end içinde ham okuma başarısız" -#: glib/gkeyfile.c:796 +#: glib/gkeyfile.c:800 msgid "Valid key file could not be found in search dirs" msgstr "Arama dizinlerinde geçerli anahtar dosyası bulunamadı" -#: glib/gkeyfile.c:833 +#: glib/gkeyfile.c:837 msgid "Not a regular file" msgstr "Normal dosya değil" -#: glib/gkeyfile.c:1291 +#: glib/gkeyfile.c:1295 #, c-format msgid "" "Key file contains line “%s” which is not a key-value pair, group, or comment" @@ -5097,50 +5104,50 @@ "Anahtar dosyası; anahtar-değer çifti, küme veya yorum olmayan “%s” satırını " "içeriyor" -#: glib/gkeyfile.c:1348 +#: glib/gkeyfile.c:1352 #, c-format msgid "Invalid group name: %s" msgstr "Geçersiz küme adı: %s" -#: glib/gkeyfile.c:1372 +#: glib/gkeyfile.c:1376 msgid "Key file does not start with a group" msgstr "Anahtar dosyası kümeyle başlamıyor" -#: glib/gkeyfile.c:1396 +#: glib/gkeyfile.c:1400 #, c-format msgid "Invalid key name: %.*s" msgstr "Geçersiz anahtar adı: %.*s" -#: glib/gkeyfile.c:1424 +#: glib/gkeyfile.c:1428 #, c-format msgid "Key file contains unsupported encoding “%s”" msgstr "Anahtar dosya desteklenmeyen “%s” kodlamasını içeriyor" -#: glib/gkeyfile.c:1679 glib/gkeyfile.c:1852 glib/gkeyfile.c:3299 -#: glib/gkeyfile.c:3363 glib/gkeyfile.c:3493 glib/gkeyfile.c:3625 -#: glib/gkeyfile.c:3771 glib/gkeyfile.c:4006 glib/gkeyfile.c:4073 +#: glib/gkeyfile.c:1683 glib/gkeyfile.c:1856 glib/gkeyfile.c:3303 +#: glib/gkeyfile.c:3367 glib/gkeyfile.c:3497 glib/gkeyfile.c:3626 +#: glib/gkeyfile.c:3772 glib/gkeyfile.c:4007 glib/gkeyfile.c:4074 #, c-format msgid "Key file does not have group “%s”" msgstr "Anahtar dosyasında “%s” kümesi yok" -#: glib/gkeyfile.c:1807 +#: glib/gkeyfile.c:1811 #, c-format msgid "Key file does not have key “%s” in group “%s”" msgstr "Anahtar dosyası, “%2$s” kümesinde “%1$s” anahtarı içermiyor" -#: glib/gkeyfile.c:1969 glib/gkeyfile.c:2085 +#: glib/gkeyfile.c:1973 glib/gkeyfile.c:2089 #, c-format msgid "Key file contains key “%s” with value “%s” which is not UTF-8" msgstr "Anahtar dosyası, UTF-8 olmayan “%s” anahtarını “%s” değeriyle içeriyor" -#: glib/gkeyfile.c:1989 glib/gkeyfile.c:2105 glib/gkeyfile.c:2544 +#: glib/gkeyfile.c:1993 glib/gkeyfile.c:2109 glib/gkeyfile.c:2548 #, c-format msgid "" "Key file contains key “%s” which has a value that cannot be interpreted." msgstr "" "Anahtar dosyası yorumlanamayan bir değere sahip olan “%s” anahtarını içerir." -#: glib/gkeyfile.c:2759 glib/gkeyfile.c:3128 +#: glib/gkeyfile.c:2763 glib/gkeyfile.c:3132 #, c-format msgid "" "Key file contains key “%s” in group “%s” which has a value that cannot be " @@ -5149,84 +5156,84 @@ "“%2$s” kümesindeki anahtar dosyası, yorumlanamayan “%1$s” anahtarını " "içeriyor." -#: glib/gkeyfile.c:2837 glib/gkeyfile.c:2914 +#: glib/gkeyfile.c:2841 glib/gkeyfile.c:2918 #, c-format msgid "Key “%s” in group “%s” has value “%s” where %s was expected" msgstr "" "“%2$s” kümesindeki “%1$s” anahtarı “%4$s” değerine sahip olması beklenirken " "“%3$s” değerine sahip" -#: glib/gkeyfile.c:4326 +#: glib/gkeyfile.c:4327 msgid "Key file contains escape character at end of line" msgstr "Anahtar dosyası satır sonunda çıkış karakteri içeriyor" -#: glib/gkeyfile.c:4348 +#: glib/gkeyfile.c:4349 #, c-format msgid "Key file contains invalid escape sequence “%s”" msgstr "“%s” anahtar dosyası geçersiz çıkış dizisi içeriyor" -#: glib/gkeyfile.c:4493 +#: glib/gkeyfile.c:4494 #, c-format msgid "Value “%s” cannot be interpreted as a number." msgstr "“%s” değeri bir sayı olarak yorumlanamıyor." -#: glib/gkeyfile.c:4507 +#: glib/gkeyfile.c:4508 #, c-format msgid "Integer value “%s” out of range" msgstr "“%s”, tamsayı değeri aralık dışında" -#: glib/gkeyfile.c:4540 +#: glib/gkeyfile.c:4541 #, c-format msgid "Value “%s” cannot be interpreted as a float number." msgstr "“%s” değeri bir gerçel sayı olarak yorumlanamıyor." -#: glib/gkeyfile.c:4579 +#: glib/gkeyfile.c:4580 #, c-format msgid "Value “%s” cannot be interpreted as a boolean." msgstr "“%s” değeri mantıksal değer olarak yorumlanamıyor." -#: glib/gmappedfile.c:131 +#: glib/gmappedfile.c:135 #, c-format msgid "Failed to get attributes of file “%s%s%s%s”: fstat() failed: %s" msgstr "" -"“%s%s%s%s” dosyasının özniteliklerini alma başarısız: fstat() hatası: %s" +"“%s%s%s%s” dosyasının özniteliklerini alma başarısız: fstat() başarısız: %s" -#: glib/gmappedfile.c:197 +#: glib/gmappedfile.c:201 #, c-format msgid "Failed to map %s%s%s%s: mmap() failed: %s" -msgstr "%s%s%s%s için eşleme oluşturulamadı: mmap() hatası: %s" +msgstr "%s%s%s%s için eşleme oluşturulamadı: mmap() başarısız: %s" -#: glib/gmappedfile.c:264 +#: glib/gmappedfile.c:268 #, c-format msgid "Failed to open file “%s”: open() failed: %s" -msgstr "“%s” dosyası açılamadı: open() başarısızlığı: %s" +msgstr "“%s” dosyası açılamadı: open() başarısız: %s" -#: glib/gmarkup.c:400 glib/gmarkup.c:442 +#: glib/gmarkup.c:393 glib/gmarkup.c:435 #, c-format msgid "Error on line %d char %d: " msgstr "Satır %d karakter %d hatalı: " -#: glib/gmarkup.c:464 glib/gmarkup.c:547 +#: glib/gmarkup.c:457 glib/gmarkup.c:540 #, c-format msgid "Invalid UTF-8 encoded text in name — not valid “%s”" msgstr "Adda geçersiz UTF-8 kodlu metin — geçerli olmayan “%s”" -#: glib/gmarkup.c:475 +#: glib/gmarkup.c:468 #, c-format msgid "“%s” is not a valid name" msgstr "“%s” geçerli bir ad değil" -#: glib/gmarkup.c:491 +#: glib/gmarkup.c:484 #, c-format msgid "“%s” is not a valid name: “%c”" msgstr "“%s” geçerli bir ad değil: “%c”" -#: glib/gmarkup.c:615 +#: glib/gmarkup.c:608 #, c-format msgid "Error on line %d: %s" msgstr "Satır %d hata içeriyor: %s" -#: glib/gmarkup.c:692 +#: glib/gmarkup.c:685 #, c-format msgid "" "Failed to parse “%-.*s”, which should have been a digit inside a character " @@ -5235,7 +5242,7 @@ "Karakter referansı içinde bir rakam olması gereken “%-.*s” ayrıştırılamadı, " "(örneğin; ê) — rakam çok büyük olabilir" -#: glib/gmarkup.c:704 +#: glib/gmarkup.c:697 msgid "" "Character reference did not end with a semicolon; most likely you used an " "ampersand character without intending to start an entity — escape ampersand " @@ -5245,23 +5252,23 @@ "özvarlık başlatmak istemeksizin “ve” imi kullandınız — “ve” imini & " "olarak kullanabilirsiniz" -#: glib/gmarkup.c:730 +#: glib/gmarkup.c:723 #, c-format msgid "Character reference “%-.*s” does not encode a permitted character" msgstr "Karakter referansı “%-.*s” izin verilen karakteri kodlamıyor" -#: glib/gmarkup.c:768 +#: glib/gmarkup.c:761 msgid "" "Empty entity “&;” seen; valid entities are: & " < > '" msgstr "" "Boş özvarlık “&;” görüldü; geçerli ögeler: & " < > '" -#: glib/gmarkup.c:776 +#: glib/gmarkup.c:769 #, c-format msgid "Entity name “%-.*s” is not known" msgstr "Varlık adı “%-.*s” bilinmiyor" -#: glib/gmarkup.c:781 +#: glib/gmarkup.c:774 msgid "" "Entity did not end with a semicolon; most likely you used an ampersand " "character without intending to start an entity — escape ampersand as &" @@ -5270,11 +5277,11 @@ "başlatmak istemeksizin “ve” imi kullandınız — “ve” imini & olarak " "kullanabilirsiniz" -#: glib/gmarkup.c:1195 +#: glib/gmarkup.c:1188 msgid "Document must begin with an element (e.g. <book>)" msgstr "Belge bir öge ile başlamalıdır (örneğin <kitap>)" -#: glib/gmarkup.c:1235 +#: glib/gmarkup.c:1228 #, c-format msgid "" "“%s” is not a valid character following a “<” character; it may not begin an " @@ -5283,7 +5290,7 @@ "“<” karakterinden sonra gelen “%s” geçerli bir karakter değil; bir öge adı " "başlatmamalı" -#: glib/gmarkup.c:1278 +#: glib/gmarkup.c:1271 #, c-format msgid "" "Odd character “%s”, expected a “>” character to end the empty-element tag " @@ -5291,12 +5298,12 @@ msgstr "" "Tuhaf karakter “%s”, “%s” boş öge etiketinin sonunda “>” karakteri bekledi" -#: glib/gmarkup.c:1348 +#: glib/gmarkup.c:1341 #, c-format msgid "Too many attributes in element “%s”" msgstr "“%s” ögesinde çok fazla öznitelik var" -#: glib/gmarkup.c:1368 +#: glib/gmarkup.c:1361 #, c-format msgid "" "Odd character “%s”, expected a “=” after attribute name “%s” of element “%s”" @@ -5304,7 +5311,7 @@ "Tuhaf karakter “%1$s”, “%3$s” ögesinin “%2$s” özniteliğinin sonunda “=” " "karakteri bekledi" -#: glib/gmarkup.c:1410 +#: glib/gmarkup.c:1403 #, c-format msgid "" "Odd character “%s”, expected a “>” or “/” character to end the start tag of " @@ -5315,7 +5322,7 @@ "“>”, “/” karakteri veya bir öznitelik bekledi; öznitelik adında geçersiz bir " "karakter kullanmış olabilirsiniz" -#: glib/gmarkup.c:1455 +#: glib/gmarkup.c:1448 #, c-format msgid "" "Odd character “%s”, expected an open quote mark after the equals sign when " @@ -5324,7 +5331,7 @@ "Tuhaf karakter “%1$s”, “%3$s” ögesindeki “%2$s” özniteliği için değer " "verildiğinde eşittir iminden sonra tırnak imi beklendi" -#: glib/gmarkup.c:1589 +#: glib/gmarkup.c:1582 #, c-format msgid "" "“%s” is not a valid character following the characters “</”; “%s” may not " @@ -5333,7 +5340,7 @@ "“</” karakterlerini takip eden “%s” geçerli bir karakter değildir; “%s”, öge " "adı ile başlamamalı" -#: glib/gmarkup.c:1627 +#: glib/gmarkup.c:1620 #, c-format msgid "" "“%s” is not a valid character following the close element name “%s”; the " @@ -5342,27 +5349,27 @@ "“%s”, kapalı öge adı “%s” ardından gelebilecek bir karakter değil; izin " "verilen karakter ise “>”" -#: glib/gmarkup.c:1639 +#: glib/gmarkup.c:1632 #, c-format msgid "Element “%s” was closed, no element is currently open" msgstr "“%s” ögesi kapatılmış, hiçbir öge şu anda açık değil" -#: glib/gmarkup.c:1648 +#: glib/gmarkup.c:1641 #, c-format msgid "Element “%s” was closed, but the currently open element is “%s”" msgstr "“%s” ögesi kapatılmış, ancak “%s” şu an açık olan ögedir" -#: glib/gmarkup.c:1801 +#: glib/gmarkup.c:1794 msgid "Document was empty or contained only whitespace" msgstr "Belge boş veya yalnızca boşluk karakteri içeriyor" -#: glib/gmarkup.c:1815 +#: glib/gmarkup.c:1808 msgid "Document ended unexpectedly just after an open angle bracket “<”" msgstr "" "Belge, açık açı parantezi “<” iminden hemen sonra beklenmedik biçimde " "sonlandı" -#: glib/gmarkup.c:1823 glib/gmarkup.c:1868 +#: glib/gmarkup.c:1816 glib/gmarkup.c:1861 #, c-format msgid "" "Document ended unexpectedly with elements still open — “%s” was the last " @@ -5371,7 +5378,7 @@ "Belge, ögeleri hala açıkken beklenmedik biçimde sonlandı - son açılan öge: " "“%s”" -#: glib/gmarkup.c:1831 +#: glib/gmarkup.c:1824 #, c-format msgid "" "Document ended unexpectedly, expected to see a close angle bracket ending " @@ -5380,19 +5387,19 @@ "Belge beklenmedik biçimde sonlandı, etiketi bitiren kapalı açı parantezi ile " "biten <%s/> beklendi" -#: glib/gmarkup.c:1837 +#: glib/gmarkup.c:1830 msgid "Document ended unexpectedly inside an element name" msgstr "Belge bir öge adının içinde beklenmedik biçimde sonlandı" -#: glib/gmarkup.c:1843 +#: glib/gmarkup.c:1836 msgid "Document ended unexpectedly inside an attribute name" msgstr "Belge bir öznitelik adı içinde beklenmedik biçimde sonlandı" -#: glib/gmarkup.c:1848 +#: glib/gmarkup.c:1841 msgid "Document ended unexpectedly inside an element-opening tag." msgstr "Belge bir öge-açma etiketi içinde beklenmedik biçimde sonlandı." -#: glib/gmarkup.c:1854 +#: glib/gmarkup.c:1847 msgid "" "Document ended unexpectedly after the equals sign following an attribute " "name; no attribute value" @@ -5400,24 +5407,24 @@ "Belge öznitelik adını takip eden eşittir iminden sonra beklenmedik biçimde " "sonlandı; öznitelik değeri yok" -#: glib/gmarkup.c:1861 +#: glib/gmarkup.c:1854 msgid "Document ended unexpectedly while inside an attribute value" msgstr "Belge bir öznitelik değeri içinde iken beklenmedik biçimde sonlandı" -#: glib/gmarkup.c:1878 +#: glib/gmarkup.c:1871 #, c-format msgid "Document ended unexpectedly inside the close tag for element “%s”" msgstr "" "Belge, “%s” ögesinin kapatma etiketi içinde beklenmedik biçimde sonlandı" -#: glib/gmarkup.c:1882 +#: glib/gmarkup.c:1875 msgid "" "Document ended unexpectedly inside the close tag for an unopened element" msgstr "" "Belge, açık olmayan bir öge için kapatma etiketi içinde beklenmedik biçimde " "sonlandı" -#: glib/gmarkup.c:1888 +#: glib/gmarkup.c:1881 msgid "Document ended unexpectedly inside a comment or processing instruction" msgstr "" "Belge bir yorum veya işlem talimatı içindeyken beklenmedik biçimde sonlandı" @@ -5481,184 +5488,184 @@ msgid "Unknown option %s" msgstr "Bilinmeyen seçenek %s" -#: glib/gregex.c:436 +#: glib/gregex.c:479 msgid "corrupted object" msgstr "bozuk nesne" -#: glib/gregex.c:438 +#: glib/gregex.c:481 msgid "out of memory" msgstr "yetersiz bellek" -#: glib/gregex.c:443 +#: glib/gregex.c:487 msgid "backtracking limit reached" msgstr "geri takip sınırına ulaşıldı" -#: glib/gregex.c:454 glib/gregex.c:707 glib/gregex.c:736 +#: glib/gregex.c:498 msgid "internal error" msgstr "iç hata" -#: glib/gregex.c:456 +#: glib/gregex.c:500 msgid "the pattern contains items not supported for partial matching" msgstr "doku (pattern), kısmi eşleme için desteklenmeyen ögeler içeriyor" -#: glib/gregex.c:458 +#: glib/gregex.c:502 msgid "back references as conditions are not supported for partial matching" msgstr "koşul olarak geri referanslar kısmi eşleme için desteklenmiyor" -#: glib/gregex.c:464 +#: glib/gregex.c:508 msgid "recursion limit reached" msgstr "iç içe yineleme sınırına ulaşıldı" -#: glib/gregex.c:466 +#: glib/gregex.c:510 msgid "bad offset" msgstr "geçersiz ofset" -#: glib/gregex.c:468 +#: glib/gregex.c:512 msgid "recursion loop" msgstr "yineleme döngüsü" #. should not happen in GRegex since we check modes before each match -#: glib/gregex.c:471 +#: glib/gregex.c:515 msgid "matching mode is requested that was not compiled for JIT" msgstr "JIT için derlenmemiş eşleşme kipi istendi" -#: glib/gregex.c:475 +#: glib/gregex.c:536 glib/gregex.c:1838 msgid "unknown error" msgstr "bilinmeyen hata" -#: glib/gregex.c:496 +#: glib/gregex.c:557 msgid "\\ at end of pattern" msgstr "\\ desenin sonunda" -#: glib/gregex.c:500 +#: glib/gregex.c:561 msgid "\\c at end of pattern" msgstr "\\c desenin sonunda" -#: glib/gregex.c:505 +#: glib/gregex.c:566 msgid "unrecognized character following \\" msgstr "\\ imini takiben anlaşılamayan karakter" -#: glib/gregex.c:509 +#: glib/gregex.c:570 msgid "numbers out of order in {} quantifier" msgstr "sayılar {} niceliği içerisinde sıra dışı" -#: glib/gregex.c:513 +#: glib/gregex.c:574 msgid "number too big in {} quantifier" msgstr "sayılar {} niceliği içerisinde çok büyük" -#: glib/gregex.c:517 +#: glib/gregex.c:578 msgid "missing terminating for character class" msgstr "karakter sınıfı için eksik sonlanan " -#: glib/gregex.c:521 +#: glib/gregex.c:582 msgid "invalid escape sequence in character class" msgstr "karakter sınıfında geçersiz dizi" -#: glib/gregex.c:525 +#: glib/gregex.c:586 msgid "range out of order in character class" msgstr "karakter sınıfında sıra dışı kapsam" -#: glib/gregex.c:530 +#: glib/gregex.c:591 msgid "nothing to repeat" msgstr "yinelenecek bir şey yok" -#: glib/gregex.c:534 +#: glib/gregex.c:595 msgid "unrecognized character after (? or (?-" msgstr "(? ya da (?- sonrası tanınmayan karakter" -#: glib/gregex.c:538 +#: glib/gregex.c:599 msgid "POSIX named classes are supported only within a class" msgstr "POSIX adlandırılmış sınıflar yalnızca bir sınıf içinde desteklenir" -#: glib/gregex.c:542 +#: glib/gregex.c:603 msgid "POSIX collating elements are not supported" msgstr "POSIX karşılaştırma ögeleri desteklenmiyor" -#: glib/gregex.c:548 +#: glib/gregex.c:609 msgid "missing terminating )" msgstr "eksik sonlandıran )" -#: glib/gregex.c:552 +#: glib/gregex.c:613 msgid "reference to non-existent subpattern" msgstr "var olmayan alt desene referans" -#: glib/gregex.c:556 +#: glib/gregex.c:617 msgid "missing ) after comment" msgstr "açıklama sonrası eksik )" -#: glib/gregex.c:560 +#: glib/gregex.c:621 msgid "regular expression is too large" msgstr "düzenli ifade çok uzun" -#: glib/gregex.c:564 +#: glib/gregex.c:625 msgid "malformed number or name after (?(" msgstr "(?( sonrası bozuk rakam ya da ad" -#: glib/gregex.c:568 +#: glib/gregex.c:629 msgid "lookbehind assertion is not fixed length" msgstr "geribakma iddiası sabit uzunlukta değil" -#: glib/gregex.c:572 +#: glib/gregex.c:633 msgid "conditional group contains more than two branches" msgstr "koşul kümesi ikiden daha çok dal içeriyor" -#: glib/gregex.c:576 +#: glib/gregex.c:637 msgid "assertion expected after (?(" msgstr "(?( sonrası ifade beklendi" -#: glib/gregex.c:580 +#: glib/gregex.c:641 msgid "a numbered reference must not be zero" msgstr "numaralandırılmış kaynak sıfır olmamalıdır" -#: glib/gregex.c:584 +#: glib/gregex.c:645 msgid "unknown POSIX class name" msgstr "bilinmeyen POSIX sınıf adı" -#: glib/gregex.c:589 +#: glib/gregex.c:650 msgid "character value in \\x{...} sequence is too large" msgstr "\\x{...} dizisi içerisinde karakter değeri çok büyük" -#: glib/gregex.c:593 +#: glib/gregex.c:654 msgid "\\C not allowed in lookbehind assertion" msgstr "\\C geriye bakma iddiası içerisinde izin verilmiyor" -#: glib/gregex.c:597 +#: glib/gregex.c:658 msgid "missing terminator in subpattern name" msgstr "alt desen adı içerisinde eksik sonlandırıcı" -#: glib/gregex.c:601 +#: glib/gregex.c:662 msgid "two named subpatterns have the same name" msgstr "iki adlı alt desenler aynı ada sahip" -#: glib/gregex.c:605 +#: glib/gregex.c:666 msgid "malformed \\P or \\p sequence" msgstr "bozulmuş \\P ya da \\p dizisi" -#: glib/gregex.c:609 +#: glib/gregex.c:670 msgid "unknown property name after \\P or \\p" msgstr "\\P ya da \\p sonrası bilinmeyen özellik adı" -#: glib/gregex.c:613 +#: glib/gregex.c:674 msgid "subpattern name is too long (maximum 32 characters)" msgstr "alt desen adı çok uzun (en çok 32 karakter)" -#: glib/gregex.c:617 +#: glib/gregex.c:678 msgid "too many named subpatterns (maximum 10,000)" msgstr "çok fazla adlandırılmış alt desen (en çok 10.000)" -#: glib/gregex.c:621 +#: glib/gregex.c:682 msgid "octal value is greater than \\377" msgstr "sekizlik değer \\377’den daha büyük" -#: glib/gregex.c:625 +#: glib/gregex.c:686 msgid "DEFINE group contains more than one branch" msgstr "DEFINE kümesi birden çok dal içeriyor" -#: glib/gregex.c:629 +#: glib/gregex.c:690 msgid "inconsistent NEWLINE options" msgstr "kararsız NEWLINE seçenekleri" -#: glib/gregex.c:633 +#: glib/gregex.c:694 msgid "" "\\g is not followed by a braced, angle-bracketed, or quoted name or number, " "or by a plain number" @@ -5666,119 +5673,119 @@ "\\g bir parantezli ad ya da tercihten parentezli sıfır olmayan sayı " "tarafından takip edilmiyor" -#: glib/gregex.c:638 +#: glib/gregex.c:699 msgid "an argument is not allowed for (*ACCEPT), (*FAIL), or (*COMMIT)" msgstr "(*ACCEPT), (*FAIL) ya da (*COMMIT) için bir argümana izin verilmez" -#: glib/gregex.c:642 +#: glib/gregex.c:703 msgid "(*VERB) not recognized" msgstr "(*VERB) tanınamadı" -#: glib/gregex.c:646 +#: glib/gregex.c:707 msgid "number is too big" msgstr "sayı çok büyük" -#: glib/gregex.c:650 +#: glib/gregex.c:711 msgid "missing subpattern name after (?&" msgstr "(?& den sonra eksik alt desen adı" -#: glib/gregex.c:654 +#: glib/gregex.c:715 msgid "different names for subpatterns of the same number are not allowed" msgstr "aynı sayıya izin verilmeyen alt desenler için farklı adlar" -#: glib/gregex.c:658 +#: glib/gregex.c:719 msgid "(*MARK) must have an argument" msgstr "(*MARK) bir argüman almalı" -#: glib/gregex.c:662 +#: glib/gregex.c:723 msgid "\\c must be followed by an ASCII character" msgstr "\\c karakteri ASCII karakterleri tarafından takip edilmelidir" -#: glib/gregex.c:666 +#: glib/gregex.c:727 msgid "\\k is not followed by a braced, angle-bracketed, or quoted name" msgstr "" "\\k bir parantezli ad ya da tercihten parentezli sıfır olmayan sayı " "tarafından takip edilmiyor" -#: glib/gregex.c:670 +#: glib/gregex.c:731 msgid "\\N is not supported in a class" msgstr "\\N bir sınıfta desteklenmez" -#: glib/gregex.c:674 +#: glib/gregex.c:735 msgid "name is too long in (*MARK), (*PRUNE), (*SKIP), or (*THEN)" msgstr "(*MARK), (*PRUNE), (*SKIP) ya da (*THEN) içinde ad çok uzun" -#: glib/gregex.c:678 glib/gregex.c:809 +#: glib/gregex.c:739 glib/gregex.c:875 msgid "code overflow" msgstr "kod akış taşması" -#: glib/gregex.c:682 +#: glib/gregex.c:743 msgid "unrecognized character after (?P" msgstr "(?P sonrası tanımlanmayan karakter" -#: glib/gregex.c:686 +#: glib/gregex.c:747 msgid "overran compiling workspace" msgstr "derleme çalışma alanı kaplandı" -#: glib/gregex.c:690 +#: glib/gregex.c:751 msgid "previously-checked referenced subpattern not found" msgstr "önceden denetlenmiş referanslı alt desen bulunamadı" -#: glib/gregex.c:808 glib/gregex.c:1041 glib/gregex.c:2342 +#: glib/gregex.c:874 glib/gregex.c:1121 glib/gregex.c:2444 #, c-format msgid "Error while matching regular expression %s: %s" msgstr "Düzenli ifade %s eşleşirken hata: %s" -#: glib/gregex.c:1618 +#: glib/gregex.c:1721 msgid "PCRE library is compiled without UTF8 support" msgstr "PCRE kütüphanesi UTF8 desteği olmadan derlenmiş" -#: glib/gregex.c:1626 +#: glib/gregex.c:1729 msgid "PCRE library is compiled with incompatible options" msgstr "PCRE kütüphanesi uyuşmayan seçenekler ile derlenmiş" -#: glib/gregex.c:1751 +#: glib/gregex.c:1847 #, c-format msgid "Error while compiling regular expression ‘%s’ at char %s: %s" msgstr "Düzenli ifade ‘%s’ derlenirken karakter %s hatalı: %s" -#: glib/gregex.c:2786 +#: glib/gregex.c:2887 msgid "hexadecimal digit or “}” expected" msgstr "onaltılı rakam ya da “}” beklendi" -#: glib/gregex.c:2802 +#: glib/gregex.c:2903 msgid "hexadecimal digit expected" msgstr "onaltılı rakam beklendi" -#: glib/gregex.c:2842 +#: glib/gregex.c:2943 msgid "missing “<” in symbolic reference" msgstr "simgesel referansda eksik “<”" -#: glib/gregex.c:2851 +#: glib/gregex.c:2952 msgid "unfinished symbolic reference" msgstr "tamamlanmamış simgesel referans" -#: glib/gregex.c:2858 +#: glib/gregex.c:2959 msgid "zero-length symbolic reference" msgstr "sıfır-uzunlukta simgesel referans" -#: glib/gregex.c:2869 +#: glib/gregex.c:2970 msgid "digit expected" msgstr "rakam beklendi" -#: glib/gregex.c:2887 +#: glib/gregex.c:2988 msgid "illegal symbolic reference" msgstr "geçersiz simgesel referans" -#: glib/gregex.c:2950 +#: glib/gregex.c:3051 msgid "stray final “\\”" msgstr "son “\\” kayıp" -#: glib/gregex.c:2954 +#: glib/gregex.c:3055 msgid "unknown escape sequence" msgstr "geçersiz çıkış dizisi" -#: glib/gregex.c:2964 +#: glib/gregex.c:3065 #, c-format msgid "Error while parsing replacement text “%s” at char %lu: %s" msgstr "Yerine koyma metni “%s” işlenirken karakter %lu hatalı: %s" @@ -5806,104 +5813,109 @@ msgid "Text was empty (or contained only whitespace)" msgstr "Metin boştu (veya yalnızca boşluk içeriyordu)" -#: glib/gspawn.c:314 +#: glib/gspawn.c:319 #, c-format msgid "Failed to read data from child process (%s)" -msgstr "Alt süreçten bilgi okuma başarısızlığı (%s)" +msgstr "Alt süreçten bilgi okunamadı (%s)" -#: glib/gspawn.c:466 +#: glib/gspawn.c:471 #, c-format msgid "Unexpected error in reading data from a child process (%s)" msgstr "Alt süreçten bilgi okurken beklenmeyen hata oluştu (%s)" -#: glib/gspawn.c:551 +#: glib/gspawn.c:556 #, c-format msgid "Unexpected error in waitpid() (%s)" msgstr "waitpid() (%s) içinde beklenmeyen hata" -#: glib/gspawn.c:1170 glib/gspawn-win32.c:1488 +#: glib/gspawn.c:1175 glib/gspawn-win32.c:1503 #, c-format msgid "Child process exited with code %ld" msgstr "Alt işlem %ld kodu ile sonlandı" -#: glib/gspawn.c:1178 +#: glib/gspawn.c:1183 #, c-format msgid "Child process killed by signal %ld" msgstr "Alt işlem, %ld sinyali ile sonlandı" -#: glib/gspawn.c:1185 +#: glib/gspawn.c:1190 #, c-format msgid "Child process stopped by signal %ld" msgstr "Alt işlem %ld sinyali ile durduruldu" -#: glib/gspawn.c:1192 +#: glib/gspawn.c:1197 #, c-format msgid "Child process exited abnormally" msgstr "Alt işlem anormal bir biçimde sonlandı" -#: glib/gspawn.c:1885 glib/gspawn-win32.c:393 glib/gspawn-win32.c:401 +#: glib/gspawn.c:2027 glib/gspawn-win32.c:393 glib/gspawn-win32.c:401 #, c-format msgid "Failed to read from child pipe (%s)" -msgstr "Alt süreç borusundan okuma başarısızlığı (%s)" +msgstr "Alt süreç borusundan okunamadı (%s)" -#: glib/gspawn.c:2248 +#: glib/gspawn.c:2399 #, c-format msgid "Failed to spawn child process “%s” (%s)" -msgstr "“%s” alt süreci üretme başarısız (%s)" +msgstr "“%s” alt süreci üretilemedi (%s)" -#: glib/gspawn.c:2365 +#: glib/gspawn.c:2525 #, c-format msgid "Failed to fork (%s)" -msgstr "Çatallama başarısızlığı (%s)" +msgstr "Çatallamadı (%s)" -#: glib/gspawn.c:2525 glib/gspawn-win32.c:424 +#: glib/gspawn.c:2685 glib/gspawn-win32.c:424 #, c-format msgid "Failed to change to directory “%s” (%s)" -msgstr "“%s” dizinine değiştirme başarısızlığı (%s)" +msgstr "“%s” dizinine değiştirilemedi (%s)" -#: glib/gspawn.c:2535 +#: glib/gspawn.c:2695 #, c-format msgid "Failed to execute child process “%s” (%s)" -msgstr "“%s” alt süreci çalıştırılırken hata oluştu (%s)" +msgstr "“%s” alt süreç çalıştırılamadı (%s)" -#: glib/gspawn.c:2545 +#: glib/gspawn.c:2705 #, c-format msgid "Failed to open file to remap file descriptor (%s)" msgstr "Dosya tanımlayıcıyı yeniden eşlemek için dosya açılamadı (%s)" -#: glib/gspawn.c:2553 +#: glib/gspawn.c:2713 #, c-format msgid "Failed to duplicate file descriptor for child process (%s)" msgstr "Alt süreç için dosya tanımlayıcı çoğaltılamadı (%s)" -#: glib/gspawn.c:2562 +#: glib/gspawn.c:2722 #, c-format msgid "Failed to fork child process (%s)" msgstr "Alt süreç çatallanamadı (%s)" -#: glib/gspawn.c:2570 +#: glib/gspawn.c:2730 #, c-format msgid "Failed to close file descriptor for child process (%s)" -msgstr "Alt süreç için dosya tanımlayıcının kapatılması başarısız (%s)" +msgstr "Alt süreç için dosya tanımlayıcı kapatılamadı (%s)" -#: glib/gspawn.c:2578 +#: glib/gspawn.c:2738 #, c-format msgid "Unknown error executing child process “%s”" msgstr "Alt süreç “%s” çalıştırılırken bilinmeyen hata oluştu" -#: glib/gspawn.c:2602 +#: glib/gspawn.c:2762 #, c-format msgid "Failed to read enough data from child pid pipe (%s)" msgstr "Alt süreç borusundan yeterli bilgi okunamadı (%s)" +#: glib/gspawn-private.h:134 +#, c-format +msgid "Invalid source FDs argument" +msgstr "Geçersiz kaynak FD argümanı" + #: glib/gspawn-win32.c:337 msgid "Failed to read data from child process" -msgstr "Alt süreçten bilgi okuma başarısızlığı" +msgstr "Alt süreçten bilgi okunamadı" #: glib/gspawn-win32.c:430 glib/gspawn-win32.c:435 glib/gspawn-win32.c:561 #, c-format msgid "Failed to execute child process (%s)" -msgstr "Alt süreç yürütme başarısızlığı (%s)" +msgstr "Alt süreç çalıştırılamadı (%s)" #: glib/gspawn-win32.c:440 #, c-format @@ -5915,27 +5927,27 @@ msgid "Invalid program name: %s" msgstr "Geçersiz program adı: %s" -#: glib/gspawn-win32.c:521 glib/gspawn-win32.c:853 +#: glib/gspawn-win32.c:521 glib/gspawn-win32.c:868 #, c-format msgid "Invalid string in argument vector at %d: %s" msgstr "%d konumunda argüman vektörü içinde geçersiz dizgi: %s" -#: glib/gspawn-win32.c:532 glib/gspawn-win32.c:869 +#: glib/gspawn-win32.c:532 glib/gspawn-win32.c:884 #, c-format msgid "Invalid string in environment: %s" msgstr "Çevre içinde geçersiz dizgi: %s" -#: glib/gspawn-win32.c:849 +#: glib/gspawn-win32.c:864 #, c-format msgid "Invalid working directory: %s" msgstr "Geçersiz çalışma dizini: %s" -#: glib/gspawn-win32.c:914 +#: glib/gspawn-win32.c:929 #, c-format msgid "Failed to execute helper program (%s)" msgstr "Yardımcı program (%s) çalıştırılamadı" -#: glib/gspawn-win32.c:1143 +#: glib/gspawn-win32.c:1158 msgid "" "Unexpected error in g_io_channel_win32_poll() reading data from a child " "process" @@ -5943,21 +5955,21 @@ "Alt süreçten bilgi okurken g_io_channel_win32_poll() işleminde beklenmeyen " "hata" -#: glib/gstrfuncs.c:3372 glib/gstrfuncs.c:3474 +#: glib/gstrfuncs.c:3373 glib/gstrfuncs.c:3475 msgid "Empty string is not a number" msgstr "Boş dizge bir sayı değildir" -#: glib/gstrfuncs.c:3396 +#: glib/gstrfuncs.c:3397 #, c-format msgid "“%s” is not a signed number" msgstr "“%s” işaretli bir sayı değil" -#: glib/gstrfuncs.c:3406 glib/gstrfuncs.c:3510 +#: glib/gstrfuncs.c:3407 glib/gstrfuncs.c:3511 #, c-format msgid "Number “%s” is out of bounds %s, %s" msgstr "“%s” sayısı sınırların dışındadır %s, %s" -#: glib/gstrfuncs.c:3500 +#: glib/gstrfuncs.c:3501 #, c-format msgid "“%s” is not an unsigned number" msgstr "“%s” işaretsiz bir sayı değil" @@ -6036,138 +6048,138 @@ msgstr "Karakter UTF-16 sınırlarının dışında" #. Translators: A unit symbol for size formatting, showing for example: "13.0 kB" -#: glib/gutils.c:2857 +#: glib/gutils.c:2966 msgid "kB" msgstr "kB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 MB" -#: glib/gutils.c:2859 +#: glib/gutils.c:2968 msgid "MB" msgstr "MB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 GB" -#: glib/gutils.c:2861 +#: glib/gutils.c:2970 msgid "GB" msgstr "GB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 TB" -#: glib/gutils.c:2863 +#: glib/gutils.c:2972 msgid "TB" msgstr "TB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 PB" -#: glib/gutils.c:2865 +#: glib/gutils.c:2974 msgid "PB" msgstr "PB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 EB" -#: glib/gutils.c:2867 +#: glib/gutils.c:2976 msgid "EB" msgstr "EB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 KiB" -#: glib/gutils.c:2871 +#: glib/gutils.c:2980 msgid "KiB" msgstr "KiB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 MiB" -#: glib/gutils.c:2873 +#: glib/gutils.c:2982 msgid "MiB" msgstr "MiB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 GiB" -#: glib/gutils.c:2875 +#: glib/gutils.c:2984 msgid "GiB" msgstr "GiB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 TiB" -#: glib/gutils.c:2877 +#: glib/gutils.c:2986 msgid "TiB" msgstr "TiB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 PiB" -#: glib/gutils.c:2879 +#: glib/gutils.c:2988 msgid "PiB" msgstr "PiB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 EiB" -#: glib/gutils.c:2881 +#: glib/gutils.c:2990 msgid "EiB" msgstr "EiB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 kb" -#: glib/gutils.c:2885 +#: glib/gutils.c:2994 msgid "kb" msgstr "kb" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Mb" -#: glib/gutils.c:2887 +#: glib/gutils.c:2996 msgid "Mb" msgstr "Mb" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Gb" -#: glib/gutils.c:2889 +#: glib/gutils.c:2998 msgid "Gb" msgstr "Gb" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Tb" -#: glib/gutils.c:2891 +#: glib/gutils.c:3000 msgid "Tb" msgstr "Tb" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Pb" -#: glib/gutils.c:2893 +#: glib/gutils.c:3002 msgid "Pb" msgstr "Pb" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Eb" -#: glib/gutils.c:2895 +#: glib/gutils.c:3004 msgid "Eb" msgstr "Eb" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Kib" -#: glib/gutils.c:2899 +#: glib/gutils.c:3008 msgid "Kib" msgstr "Kib" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Mib" -#: glib/gutils.c:2901 +#: glib/gutils.c:3010 msgid "Mib" msgstr "Mib" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Gib" -#: glib/gutils.c:2903 +#: glib/gutils.c:3012 msgid "Gib" msgstr "Gib" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Tib" -#: glib/gutils.c:2905 +#: glib/gutils.c:3014 msgid "Tib" msgstr "Tib" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Pib" -#: glib/gutils.c:2907 +#: glib/gutils.c:3016 msgid "Pib" msgstr "Pib" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Eib" -#: glib/gutils.c:2909 +#: glib/gutils.c:3018 msgid "Eib" msgstr "Eib" -#: glib/gutils.c:2947 +#: glib/gutils.c:3056 msgid "byte" msgid_plural "bytes" msgstr0 "bayt" -#: glib/gutils.c:2951 +#: glib/gutils.c:3060 msgid "bit" msgid_plural "bits" msgstr0 "bit" #. Translators: The "%u" is replaced with the size value, like "13"; it could #. * be part of "13 bytes", but only the number is requested this time. -#: glib/gutils.c:2959 +#: glib/gutils.c:3068 #, c-format msgctxt "format-size" msgid "%u" @@ -6175,7 +6187,7 @@ #. Translators: The first "%u" is replaced with the value, the "%s" with a unit of the value. #. * The order can be changed with "%$2s %$1u". An example: "13 bytes" -#: glib/gutils.c:2964 +#: glib/gutils.c:3073 #, c-format msgctxt "format-size" msgid "%u %s" @@ -6183,7 +6195,7 @@ #. Translators: The "%.1f" is replaced with the size value, like "13.0"; it could #. * be part of "13.0 MB", but only the number is requested this time. -#: glib/gutils.c:3000 +#: glib/gutils.c:3109 #, c-format msgctxt "format-size" msgid "%.1f" @@ -6192,27 +6204,27 @@ #. Translators: The first "%.1f" is replaced with the value, the "%s" with a unit of the value. #. * The order can be changed with "%$2s %$1.1f". Keep the no-break space between the value and #. * the unit symbol. An example: "13.0 MB" -#: glib/gutils.c:3006 +#: glib/gutils.c:3115 #, c-format msgctxt "format-size" msgid "%.1f %s" msgstr "%.1f %s" #. Translators: the %s in "%s bytes" will always be replaced by a number. -#: glib/gutils.c:3046 +#: glib/gutils.c:3155 #, c-format msgid "%s byte" msgid_plural "%s bytes" msgstr0 "%s bayt" #. Translators: the %s in "%s bits" will always be replaced by a number. -#: glib/gutils.c:3051 +#: glib/gutils.c:3160 #, c-format msgid "%s bit" msgid_plural "%s bits" msgstr0 "%s bit" -#: glib/gutils.c:3092 +#: glib/gutils.c:3201 #, c-format msgid "%u byte" msgid_plural "%u bytes" @@ -6223,32 +6235,32 @@ #. * compatibility. Users will not see this string unless a program is using this deprecated function. #. * Please translate as literally as possible. #. -#: glib/gutils.c:3105 +#: glib/gutils.c:3214 #, c-format msgid "%.1f KB" msgstr "%.1f KB" -#: glib/gutils.c:3110 +#: glib/gutils.c:3219 #, c-format msgid "%.1f MB" msgstr "%.1f MB" -#: glib/gutils.c:3115 +#: glib/gutils.c:3224 #, c-format msgid "%.1f GB" msgstr "%.1f GB" -#: glib/gutils.c:3120 +#: glib/gutils.c:3229 #, c-format msgid "%.1f TB" msgstr "%.1f TB" -#: glib/gutils.c:3125 +#: glib/gutils.c:3234 #, c-format msgid "%.1f PB" msgstr "%.1f PB" -#: glib/gutils.c:3130 +#: glib/gutils.c:3239 #, c-format msgid "%.1f EB" msgstr "%.1f EB"
View file
_service:tar_scm:glib-2.74.4.tar.xz/po/uk.po -> _service:tar_scm:glib-2.76.4.tar.xz/po/uk.po
Changed
@@ -5,13 +5,13 @@ # Maxim Dziumanenko <dziumanenko@gmail.com>, 2004-2009. # wanderlust <wanderlust@ukr.net>, 2009. # Mykola Tkach <Stuartlittle1970@gmail.com>, 2014. -# Yuri Chornoivan <yurchor@ukr.net>, 2020, 2021, 2022. +# Yuri Chornoivan <yurchor@ukr.net>, 2020, 2021, 2022, 2023. msgid "" msgstr "" "Project-Id-Version: glib\n" "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/glib/issues\n" -"POT-Creation-Date: 2022-08-05 19:22+0000\n" -"PO-Revision-Date: 2022-08-07 19:07+0300\n" +"POT-Creation-Date: 2023-02-15 16:30+0000\n" +"PO-Revision-Date: 2023-02-15 19:37+0200\n" "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n" "Language-Team: Ukrainian <trans-uk@lists.fedoraproject.org>\n" "Language: uk\n" @@ -22,22 +22,22 @@ "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Lokalize 20.12.0\n" -#: gio/gappinfo.c:335 +#: gio/gappinfo.c:339 msgid "Setting default applications not supported yet" msgstr "Підтримки встановлення типової програми ще не передбачено" -#: gio/gappinfo.c:368 +#: gio/gappinfo.c:372 msgid "Setting application as last used for type not supported yet" msgstr "" "Підтримки встановлення програми, як останньої використаної для типу, ще не " "передбачено" -#: gio/gappinfo.c:808 +#: gio/gappinfo.c:814 #, c-format msgid "Failed to find default application for content type ‘%s’" msgstr "Не вдалося знайти типову програму для типу даних «%s»" -#: gio/gappinfo.c:868 +#: gio/gappinfo.c:874 #, c-format msgid "Failed to find default application for URI Scheme ‘%s’" msgstr "Не вдалося знайти типову програму для схеми адреси «%s»" @@ -240,11 +240,11 @@ msgid "error sending %s message to application: %s\n" msgstr "помилка надсилання повідомлення %s до програми %s\n" -#: gio/gapplication-tool.c:321 +#: gio/gapplication-tool.c:324 msgid "action name must be given after application id\n" msgstr "назву дії слід вказувати після ідентифікатора програми\n" -#: gio/gapplication-tool.c:329 +#: gio/gapplication-tool.c:332 #, c-format msgid "" "invalid action name: “%s”\n" @@ -253,25 +253,25 @@ "некоректна назва дії: «%s»\n" "Назва дії може складатися лише з літер, цифр і символів «-» і «.»\n" -#: gio/gapplication-tool.c:348 +#: gio/gapplication-tool.c:351 #, c-format msgid "error parsing action parameter: %s\n" msgstr "помилка розбору параметра дії: %s\n" -#: gio/gapplication-tool.c:360 +#: gio/gapplication-tool.c:363 msgid "actions accept a maximum of one parameter\n" msgstr "дії приймають максимум один параметр\n" -#: gio/gapplication-tool.c:415 +#: gio/gapplication-tool.c:418 msgid "list-actions command takes only the application id" msgstr "команда list-actions приймає лише ідентифікатор програми" -#: gio/gapplication-tool.c:425 +#: gio/gapplication-tool.c:428 #, c-format msgid "unable to find desktop file for application %s\n" msgstr "не вдалося знайти desktop-файл для програми %s\n" -#: gio/gapplication-tool.c:470 +#: gio/gapplication-tool.c:473 #, c-format msgid "" "unrecognised command: %s\n" @@ -306,7 +306,7 @@ msgid "Truncate not supported on base stream" msgstr "Урізання не підтримується у базовому потоці" -#: gio/gcancellable.c:319 gio/gdbusconnection.c:1859 gio/gdbusprivate.c:1420 +#: gio/gcancellable.c:326 gio/gdbusconnection.c:1859 gio/gdbusprivate.c:1420 #: gio/gsimpleasyncresult.c:873 gio/gsimpleasyncresult.c:899 #, c-format msgid "Operation was cancelled" @@ -327,13 +327,13 @@ #: gio/gcharsetconverter.c:344 gio/gdatainputstream.c:850 #: gio/gdatainputstream.c:1268 glib/gconvert.c:451 glib/gconvert.c:883 -#: glib/giochannel.c:1576 glib/giochannel.c:1618 glib/giochannel.c:2473 +#: glib/giochannel.c:1576 glib/giochannel.c:1618 glib/giochannel.c:2478 #: glib/gutf8.c:892 glib/gutf8.c:1346 msgid "Invalid byte sequence in conversion input" msgstr "Неправильна послідовність байтів у перетворюваних вхідних даних" #: gio/gcharsetconverter.c:349 glib/gconvert.c:459 glib/gconvert.c:797 -#: glib/giochannel.c:1583 glib/giochannel.c:2485 +#: glib/giochannel.c:1583 glib/giochannel.c:2493 #, c-format msgid "Error during conversion: %s" msgstr "Помилка під час перетворення: %s" @@ -390,17 +390,17 @@ msgid "Unexpected early end-of-stream" msgstr "Неочікуваний передчасний кінець потоку" -#: gio/gdbusaddress.c:164 gio/gdbusaddress.c:238 gio/gdbusaddress.c:327 +#: gio/gdbusaddress.c:162 gio/gdbusaddress.c:234 gio/gdbusaddress.c:321 #, c-format msgid "Unsupported key “%s” in address entry “%s”" msgstr "Непідтримуваний ключ «%s» у елементі адреси «%s»" -#: gio/gdbusaddress.c:177 +#: gio/gdbusaddress.c:175 #, c-format msgid "Meaningless key/value pair combination in address entry “%s”" msgstr "Беззмістовна комбінація ключ/значення у елементі адреси «%s»" -#: gio/gdbusaddress.c:186 +#: gio/gdbusaddress.c:184 #, c-format msgid "" "Address “%s” is invalid (need exactly one of path, dir, tmpdir, or abstract " @@ -409,28 +409,28 @@ "Неправильна адреса «%s» (потрібен шлях, каталог, тимчасовий каталог або один " "з абстрактних ключів)" -#: gio/gdbusaddress.c:253 gio/gdbusaddress.c:264 gio/gdbusaddress.c:279 -#: gio/gdbusaddress.c:342 gio/gdbusaddress.c:353 +#: gio/gdbusaddress.c:249 gio/gdbusaddress.c:260 gio/gdbusaddress.c:275 +#: gio/gdbusaddress.c:336 gio/gdbusaddress.c:347 #, c-format msgid "Error in address “%s” — the “%s” attribute is malformed" msgstr "Помилка в адресі «%s» — неправильне форматування атрибута «%s»" -#: gio/gdbusaddress.c:423 gio/gdbusaddress.c:682 +#: gio/gdbusaddress.c:417 gio/gdbusaddress.c:676 #, c-format msgid "Unknown or unsupported transport “%s” for address “%s”" msgstr "Невідомий або непідтримуваний канал передавання «%s» для адреси «%s»" -#: gio/gdbusaddress.c:467 +#: gio/gdbusaddress.c:461 #, c-format msgid "Address element “%s” does not contain a colon (:)" msgstr "У елементі адреси «%s» немає двокрапки (:)" -#: gio/gdbusaddress.c:476 +#: gio/gdbusaddress.c:470 #, c-format msgid "Transport name in address element “%s” must not be empty" msgstr "Назва каналу передавання у елементі адреси «%s» має бути непорожньою" -#: gio/gdbusaddress.c:497 +#: gio/gdbusaddress.c:491 #, c-format msgid "" "Key/Value pair %d, “%s”, in address element “%s” does not contain an equal " @@ -438,7 +438,7 @@ msgstr "" "Пара ключ/значення %d, «%s», у елементі адреси «%s» не містить знака рівності" -#: gio/gdbusaddress.c:508 +#: gio/gdbusaddress.c:502 #, c-format msgid "" "Key/Value pair %d, “%s”, in address element “%s” must not have an empty key" @@ -446,7 +446,7 @@ "Пара ключ/значення %d, «%s», у елементі адреси «%s» має містити непорожній " "ключ" -#: gio/gdbusaddress.c:522 +#: gio/gdbusaddress.c:516 #, c-format msgid "" "Error unescaping key or value in Key/Value pair %d, “%s”, in address element " @@ -455,7 +455,7 @@ "Помилка зняття екранування ключа або значення у парі ключ/значення %d, «%s», " "у елементі адреси «%s»" -#: gio/gdbusaddress.c:590 +#: gio/gdbusaddress.c:584 #, c-format msgid "" "Error in address “%s” — the unix transport requires exactly one of the keys " @@ -464,21 +464,21 @@ "Помилка у адресі «%s» — для транспорту unix потрібен лише один встановлений " "ключ «path» або «abstract»" -#: gio/gdbusaddress.c:625 +#: gio/gdbusaddress.c:619 #, c-format msgid "Error in address “%s” — the host attribute is missing or malformed" msgstr "" "Помилка у адресі «%s» — немає атрибута вузла або вказано значення у " "помилковому форматі" -#: gio/gdbusaddress.c:639 +#: gio/gdbusaddress.c:633 #, c-format msgid "Error in address “%s” — the port attribute is missing or malformed" msgstr "" "Помилка в адресі «%s» — атрибут не вказано атрибут порту або помилкове " "форматування атрибута" -#: gio/gdbusaddress.c:653 +#: gio/gdbusaddress.c:647 #, c-format msgid "" "Error in address “%s” — the noncefile attribute is missing or malformed" @@ -486,63 +486,63 @@ "Помилка в адресі «%s» — атрибут не вказано атрибут noncefile або помилкове " "форматування атрибута" -#: gio/gdbusaddress.c:674 +#: gio/gdbusaddress.c:668 msgid "Error auto-launching: " msgstr "Помилка автоматичного запуску: " -#: gio/gdbusaddress.c:727 +#: gio/gdbusaddress.c:721 #, c-format msgid "Error opening nonce file “%s”: %s" msgstr "Сталася помилка при відкриванні nonce-файла «%s»: %s" -#: gio/gdbusaddress.c:746 +#: gio/gdbusaddress.c:740 #, c-format msgid "Error reading from nonce file “%s”: %s" msgstr "Сталася помилка при читанні nonce-файла «%s»: %s" -#: gio/gdbusaddress.c:755 +#: gio/gdbusaddress.c:749 #, c-format msgid "Error reading from nonce file “%s”, expected 16 bytes, got %d" msgstr "" "Сталася помилка при читанні nonce-файла «%s», очікувалося 16 байтів, " "отримано %d" -#: gio/gdbusaddress.c:773 +#: gio/gdbusaddress.c:767 #, c-format msgid "Error writing contents of nonce file “%s” to stream:" msgstr "Сталася помилка запису вмісту nonce-файла «%s» до потоку:" -#: gio/gdbusaddress.c:988 +#: gio/gdbusaddress.c:982 msgid "The given address is empty" msgstr "Вказана адреса порожня" -#: gio/gdbusaddress.c:1101 +#: gio/gdbusaddress.c:1095 #, c-format msgid "Cannot spawn a message bus when AT_SECURE is set" msgstr "" "Неможливо породити процес шини повідомлень, якщо встановлено AT_SECURE" -#: gio/gdbusaddress.c:1108 +#: gio/gdbusaddress.c:1102 msgid "Cannot spawn a message bus without a machine-id: " msgstr "Неможливо породити процес шини повідомлень без ідентифікатора машини:" -#: gio/gdbusaddress.c:1115 +#: gio/gdbusaddress.c:1109 #, c-format msgid "Cannot autolaunch D-Bus without X11 $DISPLAY" msgstr "Неможливо автоматично запускати D-Bus без $DISPLAY у X11" -#: gio/gdbusaddress.c:1157 +#: gio/gdbusaddress.c:1151 #, c-format msgid "Error spawning command line “%s”: " msgstr "Помилка запуску рядка команди «%s»: " -#: gio/gdbusaddress.c:1226 +#: gio/gdbusaddress.c:1220 #, c-format msgid "Cannot determine session bus address (not implemented for this OS)" msgstr "" "Не вдалося визначити адресу сеансової шини (не реалізовано для цієї ОС)" -#: gio/gdbusaddress.c:1375 gio/gdbusconnection.c:7321 +#: gio/gdbusaddress.c:1374 gio/gdbusconnection.c:7316 #, c-format msgid "" "Cannot determine bus address from DBUS_STARTER_BUS_TYPE environment variable " @@ -551,7 +551,7 @@ "Не вдалося визначити адресу шини зі значення змінної середовища " "DBUS_STARTER_BUS_TYPE — невідоме значення «%s»" -#: gio/gdbusaddress.c:1384 gio/gdbusconnection.c:7330 +#: gio/gdbusaddress.c:1383 gio/gdbusconnection.c:7325 msgid "" "Cannot determine bus address because the DBUS_STARTER_BUS_TYPE environment " "variable is not set" @@ -559,7 +559,7 @@ "Не вдалося визначити адресу шини, оскільки значення змінної середовища " "DBUS_STARTER_BUS_TYPE не встановлено" -#: gio/gdbusaddress.c:1394 +#: gio/gdbusaddress.c:1393 #, c-format msgid "Unknown bus type %d" msgstr "Невідомий тип шини %d" @@ -580,11 +580,16 @@ "Перепробувані усі доступні механізми автентифікації (проведено: %s) " "(доступно: %s)" -#: gio/gdbusauth.c:1178 +#: gio/gdbusauth.c:1045 +#| msgid "Unexpected lack of content trying to read a line" +msgid "Unexpected lack of content trying to read a byte" +msgstr "Неочікувана відсутність вмісту при читанні байта" + +#: gio/gdbusauth.c:1195 msgid "User IDs must be the same for peer and server" msgstr "Ідентифікатори користувача для вузла і сервера мають бути однаковими" -#: gio/gdbusauth.c:1190 +#: gio/gdbusauth.c:1207 msgid "Cancelled via GDBusAuthObserver::authorize-authenticated-peer" msgstr "Скасовано через GDBusAuthObserver::authorize-authenticated-peer" @@ -678,7 +683,7 @@ msgid "(Additionally, releasing the lock for “%s” also failed: %s) " msgstr "(Також, не вдалося вивільнити блокування «%s»: %s) " -#: gio/gdbusconnection.c:590 gio/gdbusconnection.c:2404 +#: gio/gdbusconnection.c:590 gio/gdbusconnection.c:2405 msgid "The connection is closed" msgstr "З'єднання закрито" @@ -686,117 +691,117 @@ msgid "Timeout was reached" msgstr "Час очікування вичерпано" -#: gio/gdbusconnection.c:2527 +#: gio/gdbusconnection.c:2528 msgid "" "Unsupported flags encountered when constructing a client-side connection" msgstr "При створенні клієнтського з'єднання виявлено непідтримувані прапорці" -#: gio/gdbusconnection.c:4256 gio/gdbusconnection.c:4610 +#: gio/gdbusconnection.c:4257 gio/gdbusconnection.c:4611 #, c-format msgid "" "No such interface “org.freedesktop.DBus.Properties” on object at path %s" msgstr "" "Інтерфейс «org.freedesktop.DBus.Properties» для шляху об'єкта %s не знайдено" -#: gio/gdbusconnection.c:4401 +#: gio/gdbusconnection.c:4402 #, c-format msgid "No such property “%s”" msgstr "Немає властивості «%s»" -#: gio/gdbusconnection.c:4413 +#: gio/gdbusconnection.c:4414 #, c-format msgid "Property “%s” is not readable" msgstr "Властивість «%s» недоступна для читання" -#: gio/gdbusconnection.c:4424 +#: gio/gdbusconnection.c:4425 #, c-format msgid "Property “%s” is not writable" msgstr "Властивість «%s» недоступна для запису" -#: gio/gdbusconnection.c:4444 +#: gio/gdbusconnection.c:4445 #, c-format msgid "Error setting property “%s”: Expected type “%s” but got “%s”" msgstr "" "Помилка встановлення властивості «%s». Мало бути використано тип «%s», але " "отримано «%s»" -#: gio/gdbusconnection.c:4549 gio/gdbusconnection.c:4764 -#: gio/gdbusconnection.c:6747 +#: gio/gdbusconnection.c:4550 gio/gdbusconnection.c:4765 +#: gio/gdbusconnection.c:6742 #, c-format msgid "No such interface “%s”" msgstr "Немає інтерфейсу «%s»" -#: gio/gdbusconnection.c:4986 gio/gdbusconnection.c:7261 +#: gio/gdbusconnection.c:4981 gio/gdbusconnection.c:7256 #, c-format msgid "No such interface “%s” on object at path %s" msgstr "Немає інтерфейсу «%s» на об'єкті зі шляхом %s" -#: gio/gdbusconnection.c:5087 +#: gio/gdbusconnection.c:5082 #, c-format msgid "No such method “%s”" msgstr "Немає методу «%s»" -#: gio/gdbusconnection.c:5118 +#: gio/gdbusconnection.c:5113 #, c-format msgid "Type of message, “%s”, does not match expected type “%s”" msgstr "Тип повідомлення «%s» не збігається з очікуваним типом «%s»" -#: gio/gdbusconnection.c:5321 +#: gio/gdbusconnection.c:5316 #, c-format msgid "An object is already exported for the interface %s at %s" msgstr "Об'єкт інтерфейсу %s вже експортовано як %s" -#: gio/gdbusconnection.c:5548 +#: gio/gdbusconnection.c:5543 #, c-format msgid "Unable to retrieve property %s.%s" msgstr "Не вдалося отримати властивість %s.%s" -#: gio/gdbusconnection.c:5604 +#: gio/gdbusconnection.c:5599 #, c-format msgid "Unable to set property %s.%s" msgstr "Не вдалося встановити значення властивості %s.%s" -#: gio/gdbusconnection.c:5783 +#: gio/gdbusconnection.c:5778 #, c-format msgid "Method “%s” returned type “%s”, but expected “%s”" msgstr "Метод «%s» повернув тип «%s», але очікувалося «%s»" -#: gio/gdbusconnection.c:6859 +#: gio/gdbusconnection.c:6854 #, c-format msgid "Method “%s” on interface “%s” with signature “%s” does not exist" msgstr "Методу «%s» інтерфейсу «%s» з підписом «%s» не існує" -#: gio/gdbusconnection.c:6980 +#: gio/gdbusconnection.c:6975 #, c-format msgid "A subtree is already exported for %s" msgstr "Піддерево вже експортовано для %s" -#: gio/gdbusconnection.c:7269 +#: gio/gdbusconnection.c:7264 #, c-format msgid "Object does not exist at path “%s”" msgstr "Об'єкта зі шляхом «%s» не існує" -#: gio/gdbusmessage.c:1303 +#: gio/gdbusmessage.c:1306 msgid "type is INVALID" msgstr "НЕПРАВИЛЬНИЙ тип" -#: gio/gdbusmessage.c:1314 +#: gio/gdbusmessage.c:1317 msgid "METHOD_CALL message: PATH or MEMBER header field is missing" msgstr "Повідомлення METHOD_CALL: немає поля заголовка PATH або MEMBER" -#: gio/gdbusmessage.c:1325 +#: gio/gdbusmessage.c:1328 msgid "METHOD_RETURN message: REPLY_SERIAL header field is missing" msgstr "Повідомлення METHOD_RETURN: немає поля заголовка REPLY_SERIAL" -#: gio/gdbusmessage.c:1337 +#: gio/gdbusmessage.c:1340 msgid "ERROR message: REPLY_SERIAL or ERROR_NAME header field is missing" msgstr "Повідомлення ERROR: немає поля заголовка REPLY_SERIAL або ERROR_NAME" -#: gio/gdbusmessage.c:1350 +#: gio/gdbusmessage.c:1353 msgid "SIGNAL message: PATH, INTERFACE or MEMBER header field is missing" msgstr "Повідомлення SIGNAL: немає поля заголовка PATH, INTERFACE або MEMBER" -#: gio/gdbusmessage.c:1358 +#: gio/gdbusmessage.c:1361 msgid "" "SIGNAL message: The PATH header field is using the reserved value /org/" "freedesktop/DBus/Local" @@ -804,7 +809,7 @@ "Повідомлення SIGNAL: поле заголовка PATH використовує зарезервоване " "значення /org/freedesktop/DBus/Local" -#: gio/gdbusmessage.c:1366 +#: gio/gdbusmessage.c:1369 msgid "" "SIGNAL message: The INTERFACE header field is using the reserved value org." "freedesktop.DBus.Local" @@ -812,7 +817,7 @@ "Повідомлення SIGNAL: поле заголовка INTERFACE використовує зарезервоване " "значення org.freedesktop.DBus.Local" -#: gio/gdbusmessage.c:1414 gio/gdbusmessage.c:1474 +#: gio/gdbusmessage.c:1417 gio/gdbusmessage.c:1477 #, c-format msgid "Wanted to read %lu byte but only got %lu" msgid_plural "Wanted to read %lu bytes but only got %lu" @@ -820,12 +825,12 @@ msgstr1 "Потрібно було прочитати %lu байти, але прочитано лише %lu" msgstr2 "Потрібно було прочитати %lu байтів, але прочитано лише %lu" -#: gio/gdbusmessage.c:1428 +#: gio/gdbusmessage.c:1431 #, c-format msgid "Expected NUL byte after the string “%s” but found byte %d" msgstr "Мало бути використано байт NUL після рядка «%s», але знайдено байт %d" -#: gio/gdbusmessage.c:1447 +#: gio/gdbusmessage.c:1450 #, c-format msgid "" "Expected valid UTF-8 string but found invalid bytes at byte offset %d " @@ -835,21 +840,21 @@ "(зміщення %d, довжина рядка %d). Коректний рядок UTF-8 аж до цієї миті був " "таким: «%s»" -#: gio/gdbusmessage.c:1511 gio/gdbusmessage.c:1787 gio/gdbusmessage.c:1998 +#: gio/gdbusmessage.c:1514 gio/gdbusmessage.c:1790 gio/gdbusmessage.c:2001 msgid "Value nested too deeply" msgstr "Рівень вкладеності значення є надто високим" -#: gio/gdbusmessage.c:1679 +#: gio/gdbusmessage.c:1682 #, c-format msgid "Parsed value “%s” is not a valid D-Bus object path" msgstr "Оброблене значення «%s» не є припустимим шляхом до об'єкта D-Bus" -#: gio/gdbusmessage.c:1703 +#: gio/gdbusmessage.c:1706 #, c-format msgid "Parsed value “%s” is not a valid D-Bus signature" msgstr "Оброблене значення «%s» не є припустимим підписом D-Bus" -#: gio/gdbusmessage.c:1754 +#: gio/gdbusmessage.c:1757 #, c-format msgid "" "Encountered array of length %u byte. Maximum length is 2<<26 bytes (64 MiB)." @@ -865,7 +870,7 @@ "Виявлено масив довжиною %u байтів. Максимальна довжина дорівнює 2<<26 байт " "(64 МіБ)." -#: gio/gdbusmessage.c:1774 +#: gio/gdbusmessage.c:1777 #, c-format msgid "" "Encountered array of type “a%c”, expected to have a length a multiple of %u " @@ -874,23 +879,23 @@ "Виявлено масив типу «a%c». Очікувалося, що довжина буде кратною до %u " "байтів, втім, виявлено довжину %u байтів" -#: gio/gdbusmessage.c:1928 gio/gdbusmessage.c:2647 +#: gio/gdbusmessage.c:1931 gio/gdbusmessage.c:2650 msgid "Empty structures (tuples) are not allowed in D-Bus" msgstr "Не можна використовувати порожні структури (кортежі) у D-Bus" -#: gio/gdbusmessage.c:1982 +#: gio/gdbusmessage.c:1985 #, c-format msgid "Parsed value “%s” for variant is not a valid D-Bus signature" msgstr "Оброблене значення «%s» для варіанта не є припустимим підписом D-Bus" -#: gio/gdbusmessage.c:2023 +#: gio/gdbusmessage.c:2026 #, c-format msgid "" "Error deserializing GVariant with type string “%s” from the D-Bus wire format" msgstr "" "Помилка десеріалізації GVariant з типом рядка «%s» з формату D-Bus wire" -#: gio/gdbusmessage.c:2208 +#: gio/gdbusmessage.c:2211 #, c-format msgid "" "Invalid endianness value. Expected 0x6c (“l”) or 0x42 (“B”) but found value " @@ -899,29 +904,29 @@ "Неправильний порядок байтів у значенні. Мало бути 0x6c («l») або 0x42 («B»), " "але знайдено значення 0x%02x" -#: gio/gdbusmessage.c:2227 +#: gio/gdbusmessage.c:2230 #, c-format msgid "Invalid major protocol version. Expected 1 but found %d" msgstr "" "Неправильний старший номер версії протоколу. Очікувався 1, але знайдено %d" -#: gio/gdbusmessage.c:2285 gio/gdbusmessage.c:2883 +#: gio/gdbusmessage.c:2288 gio/gdbusmessage.c:2886 msgid "Signature header found but is not of type signature" msgstr "" "Виявлено заголовок підпису, але цей заголовок не належить до типу підписів" -#: gio/gdbusmessage.c:2297 +#: gio/gdbusmessage.c:2300 #, c-format msgid "Signature header with signature “%s” found but message body is empty" msgstr "" "Знайдено заголовок підпису з підписом «%s», але вміст повідомлення є порожнім" -#: gio/gdbusmessage.c:2312 +#: gio/gdbusmessage.c:2315 #, c-format msgid "Parsed value “%s” is not a valid D-Bus signature (for body)" msgstr "Оброблене значення «%s» не є припустимим підписом D-Bus (для вмісту)" -#: gio/gdbusmessage.c:2344 +#: gio/gdbusmessage.c:2347 #, 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" @@ -935,17 +940,17 @@ "Відсутній заголовок підпису у повідомленні, але тіло повідомлення займає %u " "байтів" -#: gio/gdbusmessage.c:2354 +#: gio/gdbusmessage.c:2357 msgid "Cannot deserialize message: " msgstr "Не вдалося виконати десеріалізацію повідомлення:" -#: gio/gdbusmessage.c:2700 +#: gio/gdbusmessage.c:2703 #, c-format msgid "" "Error serializing GVariant with type string “%s” to the D-Bus wire format" msgstr "Помилка серіалізації GVariant з типом рядка «%s» у формат D-Bus wire" -#: gio/gdbusmessage.c:2837 +#: gio/gdbusmessage.c:2840 #, c-format msgid "" "Number of file descriptors in message (%d) differs from header field (%d)" @@ -953,16 +958,16 @@ "Кількість дескрипторів файлів у повідомленні (%d) відрізняється від значення " "у полі заголовка (%d)" -#: gio/gdbusmessage.c:2845 +#: gio/gdbusmessage.c:2848 msgid "Cannot serialize message: " msgstr "Не вдалося серіалізувати повідомлення: " -#: gio/gdbusmessage.c:2898 +#: gio/gdbusmessage.c:2901 #, c-format msgid "Message body has signature “%s” but there is no signature header" msgstr "Вміст повідомлення має підпис «%s», але немає заголовка підпису" -#: gio/gdbusmessage.c:2908 +#: gio/gdbusmessage.c:2911 #, c-format msgid "" "Message body has type signature “%s” but signature in the header field is " @@ -971,19 +976,19 @@ "Вміст повідомлення має тип підпису «%s», але значення підпису у полі " "заголовка дорівнює «%s»" -#: gio/gdbusmessage.c:2924 +#: gio/gdbusmessage.c:2927 #, c-format msgid "Message body is empty but signature in the header field is “(%s)”" msgstr "" "Вміст повідомлення порожній, але значення підпису у полі заголовка дорівнює " "«(%s)»" -#: gio/gdbusmessage.c:3479 +#: gio/gdbusmessage.c:3482 #, c-format msgid "Error return with body of type “%s”" msgstr "Повернуто помилку для вмісту типу «%s»" -#: gio/gdbusmessage.c:3487 +#: gio/gdbusmessage.c:3490 msgid "Error return with empty body" msgstr "Повернена помилка з порожнім тілом" @@ -1008,17 +1013,17 @@ msgid "Unable to load %s or %s: " msgstr "Не вдалося завантажити %s або %s: " -#: gio/gdbusproxy.c:1575 +#: gio/gdbusproxy.c:1568 #, c-format msgid "Error calling StartServiceByName for %s: " msgstr "Помилка виклику StartServiceByName для %s: " -#: gio/gdbusproxy.c:1598 +#: gio/gdbusproxy.c:1591 #, c-format msgid "Unexpected reply %d from StartServiceByName(\"%s\") method" msgstr "Неочікувана відповідь %d з методу StartServiceByName(«%s»)" -#: gio/gdbusproxy.c:2709 gio/gdbusproxy.c:2844 +#: gio/gdbusproxy.c:2702 gio/gdbusproxy.c:2837 #, c-format msgid "" "Cannot invoke method; proxy is for the well-known name %s without an owner, " @@ -1028,25 +1033,25 @@ "власника і проксі було побудовано із прапорцем " "G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START" -#: gio/gdbusserver.c:765 +#: gio/gdbusserver.c:758 msgid "Abstract namespace not supported" msgstr "Підтримки абстрактних просторів назв не передбачено" -#: gio/gdbusserver.c:857 +#: gio/gdbusserver.c:850 msgid "Cannot specify nonce file when creating a server" msgstr "Не вдалося вказати nonce-файл при створенні сервера" -#: gio/gdbusserver.c:939 +#: gio/gdbusserver.c:932 #, c-format msgid "Error writing nonce file at “%s”: %s" msgstr "Сталася помилка при запису до nonce-файла у «%s»: %s" -#: gio/gdbusserver.c:1114 +#: gio/gdbusserver.c:1107 #, c-format msgid "The string “%s” is not a valid D-Bus GUID" msgstr "Рядок «%s» не є припустимим GUID D-Bus" -#: gio/gdbusserver.c:1152 +#: gio/gdbusserver.c:1145 #, c-format msgid "Cannot listen on unsupported transport “%s”" msgstr "" @@ -1075,14 +1080,14 @@ "\n" "Для отримання довідки за командою використовуйте «%s КОМАНДА --help».\n" -#: gio/gdbus-tool.c:204 gio/gdbus-tool.c:276 gio/gdbus-tool.c:348 -#: gio/gdbus-tool.c:372 gio/gdbus-tool.c:862 gio/gdbus-tool.c:1247 -#: gio/gdbus-tool.c:1734 +#: gio/gdbus-tool.c:204 gio/gdbus-tool.c:276 gio/gdbus-tool.c:347 +#: gio/gdbus-tool.c:371 gio/gdbus-tool.c:861 gio/gdbus-tool.c:1246 +#: gio/gdbus-tool.c:1733 #, c-format msgid "Error: %s\n" msgstr "Помилка: %s\n" -#: gio/gdbus-tool.c:215 gio/gdbus-tool.c:289 gio/gdbus-tool.c:1750 +#: gio/gdbus-tool.c:215 gio/gdbus-tool.c:289 gio/gdbus-tool.c:1749 #, c-format msgid "Error parsing introspection XML: %s\n" msgstr "Сталася помилка під час обробки інтроспекції XML: %s\n" @@ -1092,50 +1097,50 @@ msgid "Error: %s is not a valid name\n" msgstr "Помилка: %s не є припустимою назвою\n" -#: gio/gdbus-tool.c:258 gio/gdbus-tool.c:748 gio/gdbus-tool.c:1066 -#: gio/gdbus-tool.c:1900 gio/gdbus-tool.c:2140 +#: gio/gdbus-tool.c:258 gio/gdbus-tool.c:747 gio/gdbus-tool.c:1065 +#: gio/gdbus-tool.c:1899 gio/gdbus-tool.c:2139 #, c-format msgid "Error: %s is not a valid object path\n" msgstr "Помилка: %s не є припустимим об'єктним шляхом\n" -#: gio/gdbus-tool.c:406 +#: gio/gdbus-tool.c:405 msgid "Connect to the system bus" msgstr "Під'єднатися до системної шини" -#: gio/gdbus-tool.c:407 +#: gio/gdbus-tool.c:406 msgid "Connect to the session bus" msgstr "Під'єднатися до користувацької шини" -#: gio/gdbus-tool.c:408 +#: gio/gdbus-tool.c:407 msgid "Connect to given D-Bus address" msgstr "Під'єднатися до вказаної адреси D-Bus" -#: gio/gdbus-tool.c:418 +#: gio/gdbus-tool.c:417 msgid "Connection Endpoint Options:" msgstr "Параметри кінцевої точки з'єднання:" -#: gio/gdbus-tool.c:419 +#: gio/gdbus-tool.c:418 msgid "Options specifying the connection endpoint" msgstr "Параметри, що визначають кінцеву точку з'єднання" -#: gio/gdbus-tool.c:442 +#: gio/gdbus-tool.c:441 #, c-format msgid "No connection endpoint specified" msgstr "Кінцева точка з'єднання не вказана" -#: gio/gdbus-tool.c:452 +#: gio/gdbus-tool.c:451 #, c-format msgid "Multiple connection endpoints specified" msgstr "Вказано декілька кінцевих точок з'єднання" -#: gio/gdbus-tool.c:525 +#: gio/gdbus-tool.c:524 #, c-format msgid "" "Warning: According to introspection data, interface “%s” does not exist\n" msgstr "" "Попередження: згідно з даними інтроспекції, інтерфейсу «%s» не існує\n" -#: gio/gdbus-tool.c:534 +#: gio/gdbus-tool.c:533 #, c-format msgid "" "Warning: According to introspection data, method “%s” does not exist on " @@ -1144,167 +1149,167 @@ "Попередження: згідно з даними інтроспекції, методу «%s» в інтерфейсі «%s» не " "існує\n" -#: gio/gdbus-tool.c:596 +#: gio/gdbus-tool.c:595 msgid "Optional destination for signal (unique name)" msgstr "Необов'язковий отримувач сигналу (унікальна назва)" -#: gio/gdbus-tool.c:597 +#: gio/gdbus-tool.c:596 msgid "Object path to emit signal on" msgstr "Об'єктний шлях, для випуску сигналу" -#: gio/gdbus-tool.c:598 +#: gio/gdbus-tool.c:597 msgid "Signal and interface name" msgstr "Назва сигналу і інтерфейсу" -#: gio/gdbus-tool.c:631 +#: gio/gdbus-tool.c:630 msgid "Emit a signal." msgstr "Послати сигнал." -#: gio/gdbus-tool.c:686 gio/gdbus-tool.c:1003 gio/gdbus-tool.c:1837 -#: gio/gdbus-tool.c:2069 gio/gdbus-tool.c:2289 +#: gio/gdbus-tool.c:685 gio/gdbus-tool.c:1002 gio/gdbus-tool.c:1836 +#: gio/gdbus-tool.c:2068 gio/gdbus-tool.c:2288 #, c-format msgid "Error connecting: %s\n" msgstr "Сталася помилка при з'єднанні: %s\n" -#: gio/gdbus-tool.c:706 +#: gio/gdbus-tool.c:705 #, c-format msgid "Error: %s is not a valid unique bus name.\n" msgstr "Помилка: %s не є припустимою унікальною назвою шини.\n" -#: gio/gdbus-tool.c:725 gio/gdbus-tool.c:1046 gio/gdbus-tool.c:1880 +#: gio/gdbus-tool.c:724 gio/gdbus-tool.c:1045 gio/gdbus-tool.c:1879 msgid "Error: Object path is not specified\n" msgstr "Помилка: не вказано об'єктний шлях\n" -#: gio/gdbus-tool.c:768 +#: gio/gdbus-tool.c:767 msgid "Error: Signal name is not specified\n" msgstr "Помилка: не вказано назви сигналу\n" -#: gio/gdbus-tool.c:782 +#: gio/gdbus-tool.c:781 #, c-format msgid "Error: Signal name “%s” is invalid\n" msgstr "Помилка: некоректна назва сигналу «%s»\n" -#: gio/gdbus-tool.c:794 +#: gio/gdbus-tool.c:793 #, c-format msgid "Error: %s is not a valid interface name\n" msgstr "Помилка: %s не є припустимою назвою інтерфейсу\n" -#: gio/gdbus-tool.c:800 +#: gio/gdbus-tool.c:799 #, c-format msgid "Error: %s is not a valid member name\n" msgstr "Помилка: %s не є припустимою назвою члену\n" #. Use the original non-"parse-me-harder" error -#: gio/gdbus-tool.c:837 gio/gdbus-tool.c:1178 +#: gio/gdbus-tool.c:836 gio/gdbus-tool.c:1177 #, c-format msgid "Error parsing parameter %d: %s\n" msgstr "Сталася помилка під час обробки параметра %d: %s\n" -#: gio/gdbus-tool.c:869 +#: gio/gdbus-tool.c:868 #, c-format msgid "Error flushing connection: %s\n" msgstr "Сталася помилка при скиданні під'єднання: %s\n" -#: gio/gdbus-tool.c:897 +#: gio/gdbus-tool.c:896 msgid "Destination name to invoke method on" msgstr "Назва призначення, для якого викликається метод" -#: gio/gdbus-tool.c:898 +#: gio/gdbus-tool.c:897 msgid "Object path to invoke method on" msgstr "Об'єктний шлях, для якого викликається метод" -#: gio/gdbus-tool.c:899 +#: gio/gdbus-tool.c:898 msgid "Method and interface name" msgstr "Назва методу або інтерфейсу" -#: gio/gdbus-tool.c:900 +#: gio/gdbus-tool.c:899 msgid "Timeout in seconds" msgstr "Час очікування у секундах" -#: gio/gdbus-tool.c:901 +#: gio/gdbus-tool.c:900 msgid "Allow interactive authorization" msgstr "Дозволити інтерактивне уповноваження" -#: gio/gdbus-tool.c:948 +#: gio/gdbus-tool.c:947 msgid "Invoke a method on a remote object." msgstr "Викликає метод на віддаленому об'єкті." -#: gio/gdbus-tool.c:1020 gio/gdbus-tool.c:1854 gio/gdbus-tool.c:2094 +#: gio/gdbus-tool.c:1019 gio/gdbus-tool.c:1853 gio/gdbus-tool.c:2093 msgid "Error: Destination is not specified\n" msgstr "Помилка: не вказано призначення\n" -#: gio/gdbus-tool.c:1031 gio/gdbus-tool.c:1871 gio/gdbus-tool.c:2105 +#: gio/gdbus-tool.c:1030 gio/gdbus-tool.c:1870 gio/gdbus-tool.c:2104 #, c-format msgid "Error: %s is not a valid bus name\n" msgstr "Помилка: %s не є припустимою назвою шини\n" -#: gio/gdbus-tool.c:1081 +#: gio/gdbus-tool.c:1080 msgid "Error: Method name is not specified\n" msgstr "Помилка: не вказано назви методу\n" -#: gio/gdbus-tool.c:1092 +#: gio/gdbus-tool.c:1091 #, c-format msgid "Error: Method name “%s” is invalid\n" msgstr "Помилка: некоректна назва методу «%s»\n" -#: gio/gdbus-tool.c:1170 +#: gio/gdbus-tool.c:1169 #, c-format msgid "Error parsing parameter %d of type “%s”: %s\n" msgstr "Сталася помилка під час обробки параметра %d типу «%s»: %s\n" -#: gio/gdbus-tool.c:1196 +#: gio/gdbus-tool.c:1195 #, c-format msgid "Error adding handle %d: %s\n" msgstr "Помилка під час додавання елемента керування %d: %s\n" -#: gio/gdbus-tool.c:1696 +#: gio/gdbus-tool.c:1695 msgid "Destination name to introspect" msgstr "Назва призначення для інтроспекції" -#: gio/gdbus-tool.c:1697 +#: gio/gdbus-tool.c:1696 msgid "Object path to introspect" msgstr "Об'єктний шлях для інтроспекції" -#: gio/gdbus-tool.c:1698 +#: gio/gdbus-tool.c:1697 msgid "Print XML" msgstr "Надрукувати XML" -#: gio/gdbus-tool.c:1699 +#: gio/gdbus-tool.c:1698 msgid "Introspect children" msgstr "Інтроспекція нащадка" -#: gio/gdbus-tool.c:1700 +#: gio/gdbus-tool.c:1699 msgid "Only print properties" msgstr "Лише властивості друку" -#: gio/gdbus-tool.c:1789 +#: gio/gdbus-tool.c:1788 msgid "Introspect a remote object." msgstr "Виконати інтроспекцію віддаленого об'єкту." -#: gio/gdbus-tool.c:1995 +#: gio/gdbus-tool.c:1994 msgid "Destination name to monitor" msgstr "Назва призначення для спостерігання" -#: gio/gdbus-tool.c:1996 +#: gio/gdbus-tool.c:1995 msgid "Object path to monitor" msgstr "Об'єктний шлях для спостерігання" -#: gio/gdbus-tool.c:2021 +#: gio/gdbus-tool.c:2020 msgid "Monitor a remote object." msgstr "Спостерігати за віддаленим об'єктом." -#: gio/gdbus-tool.c:2079 +#: gio/gdbus-tool.c:2078 msgid "Error: can’t monitor a non-message-bus connection\n" msgstr "" "Помилка: спостереження за з'єднанням, яке не належить до типу message-bus, є " "неможливим\n" -#: gio/gdbus-tool.c:2203 +#: gio/gdbus-tool.c:2202 msgid "Service to activate before waiting for the other one (well-known name)" msgstr "" "Служба, яку слід активувати, перш ніж очікувати на іншу (добре відома назва)" -#: gio/gdbus-tool.c:2206 +#: gio/gdbus-tool.c:2205 msgid "" "Timeout to wait for before exiting with an error (seconds); 0 for no timeout " "(default)" @@ -1312,27 +1317,27 @@ "Час очікування до виходу із станом помилки (у секундах); 0 — не очікувати " "(типова поведінка)" -#: gio/gdbus-tool.c:2254 +#: gio/gdbus-tool.c:2253 msgid "OPTION… BUS-NAME" msgstr "ПАРАМЕТР… НАЗВА-ШИНИ" -#: gio/gdbus-tool.c:2255 +#: gio/gdbus-tool.c:2254 msgid "Wait for a bus name to appear." msgstr "Очікувати на появу назви шини." -#: gio/gdbus-tool.c:2331 +#: gio/gdbus-tool.c:2330 msgid "Error: A service to activate for must be specified.\n" msgstr "Помилка: має бути вказано службу для активації.\n" -#: gio/gdbus-tool.c:2336 +#: gio/gdbus-tool.c:2335 msgid "Error: A service to wait for must be specified.\n" msgstr "Помилка: має бути вказано службу для очікування.\n" -#: gio/gdbus-tool.c:2341 +#: gio/gdbus-tool.c:2340 msgid "Error: Too many arguments.\n" msgstr "Помилка: забагато аргументів.\n" -#: gio/gdbus-tool.c:2349 gio/gdbus-tool.c:2356 +#: gio/gdbus-tool.c:2348 gio/gdbus-tool.c:2355 #, c-format msgid "Error: %s is not a valid well-known bus name.\n" msgstr "Помилка: %s не є припустимим добре відомою назвою шини.\n" @@ -1342,38 +1347,43 @@ msgid "Not authorized to change debug settings" msgstr "Не уповноважено змінювати параметри діагностики" -#: gio/gdesktopappinfo.c:2182 gio/gdesktopappinfo.c:5113 +#: gio/gdesktopappinfo.c:2242 gio/gdesktopappinfo.c:5223 msgid "Unnamed" msgstr "Без назви" -#: gio/gdesktopappinfo.c:2592 +#: gio/gdesktopappinfo.c:2652 msgid "Desktop file didn’t specify Exec field" msgstr "У desktop-файлі не визначено поля Exec" -#: gio/gdesktopappinfo.c:2891 +#: gio/gdesktopappinfo.c:2942 msgid "Unable to find terminal required for application" msgstr "Неможливо знайти термінал, що потрібен програмі" -#: gio/gdesktopappinfo.c:3631 +#: gio/gdesktopappinfo.c:3002 +#, c-format +msgid "Program ‘%s’ not found in $PATH" +msgstr "Програми «%s» не знайдено у каталогах $PATH" + +#: gio/gdesktopappinfo.c:3735 #, c-format msgid "Can’t create user application configuration folder %s: %s" msgstr "Не вдалося створити теку параметрів програми %s: %s" -#: gio/gdesktopappinfo.c:3635 +#: gio/gdesktopappinfo.c:3739 #, c-format msgid "Can’t create user MIME configuration folder %s: %s" msgstr "Не вдалося створити теку параметрів MIME %s: %s" -#: gio/gdesktopappinfo.c:3877 gio/gdesktopappinfo.c:3901 +#: gio/gdesktopappinfo.c:3981 gio/gdesktopappinfo.c:4005 msgid "Application information lacks an identifier" msgstr "У інформації про програму не вказано ідентифікатор" -#: gio/gdesktopappinfo.c:4137 +#: gio/gdesktopappinfo.c:4241 #, c-format msgid "Can’t create user desktop file %s" msgstr "Не вдалося створити для користувача desktop-файл %s" -#: gio/gdesktopappinfo.c:4273 +#: gio/gdesktopappinfo.c:4377 #, c-format msgid "Custom definition for %s" msgstr "Власне визначення %s" @@ -1446,7 +1456,7 @@ msgid "Containing mount does not exist" msgstr "Вкладена точка монтування не існує" -#: gio/gfile.c:2641 gio/glocalfile.c:2500 +#: gio/gfile.c:2641 gio/glocalfile.c:2511 msgid "Can’t copy over directory" msgstr "Не можна копіювати із заміною каталогу" @@ -1492,7 +1502,7 @@ msgid "Invalid symlink value given" msgstr "Неправильне значення символьного посилання" -#: gio/gfile.c:4163 glib/gfileutils.c:2335 +#: gio/gfile.c:4163 glib/gfileutils.c:2392 msgid "Symbolic links not supported" msgstr "Символічні посилання не підтримуються" @@ -1593,37 +1603,37 @@ msgid "HTTP proxy server closed connection unexpectedly." msgstr "Проксі-сервер HTTP несподівано розірвав з'єднання." -#: gio/gicon.c:300 +#: gio/gicon.c:299 #, c-format msgid "Wrong number of tokens (%d)" msgstr "Неправильна кількість лексем (%d)" -#: gio/gicon.c:320 +#: gio/gicon.c:319 #, c-format msgid "No type for class name %s" msgstr "Відсутній тип назви класу %s" -#: gio/gicon.c:330 +#: gio/gicon.c:329 #, c-format msgid "Type %s does not implement the GIcon interface" msgstr "Для типу %s не реалізовано інтерфейс GIcon" -#: gio/gicon.c:341 +#: gio/gicon.c:340 #, c-format msgid "Type %s is not classed" msgstr "Тип %s не класифікований" -#: gio/gicon.c:355 +#: gio/gicon.c:354 #, c-format msgid "Malformed version number: %s" msgstr "Неправильний номер версії: %s" -#: gio/gicon.c:369 +#: gio/gicon.c:368 #, c-format msgid "Type %s does not implement from_tokens() on the GIcon interface" msgstr "Для типу %s не реалізовано from_tokens() у інтерфейсі GIcon" -#: gio/gicon.c:471 +#: gio/gicon.c:470 msgid "Can’t handle the supplied version of the icon encoding" msgstr "Не вдалося обробити вказану версію кодування піктограми" @@ -1773,7 +1783,7 @@ #: gio/gio-tool-cat.c:135 gio/gio-tool-info.c:379 gio/gio-tool-list.c:173 #: gio/gio-tool-mkdir.c:50 gio/gio-tool-monitor.c:39 gio/gio-tool-monitor.c:41 #: gio/gio-tool-monitor.c:43 gio/gio-tool-monitor.c:45 -#: gio/gio-tool-monitor.c:206 gio/gio-tool-mount.c:1202 gio/gio-tool-open.c:72 +#: gio/gio-tool-monitor.c:206 gio/gio-tool-mount.c:1210 gio/gio-tool-open.c:72 #: gio/gio-tool-remove.c:50 gio/gio-tool-rename.c:47 gio/gio-tool-set.c:95 #: gio/gio-tool-trash.c:222 gio/gio-tool-tree.c:241 msgid "LOCATION" @@ -1794,7 +1804,7 @@ "щось таке: smb://сервер/ресурс/файл.txt." #: gio/gio-tool-cat.c:164 gio/gio-tool-info.c:410 gio/gio-tool-mkdir.c:78 -#: gio/gio-tool-monitor.c:231 gio/gio-tool-mount.c:1253 gio/gio-tool-open.c:98 +#: gio/gio-tool-monitor.c:231 gio/gio-tool-mount.c:1261 gio/gio-tool-open.c:98 #: gio/gio-tool-remove.c:74 gio/gio-tool-trash.c:303 msgid "No locations given" msgstr "Не вказано місць" @@ -2212,19 +2222,19 @@ msgid "Mount a TCRYPT system volume" msgstr "Змонтувати системний том TCRYPT" -#: gio/gio-tool-mount.c:268 gio/gio-tool-mount.c:300 +#: gio/gio-tool-mount.c:276 gio/gio-tool-mount.c:308 msgid "Anonymous access denied" msgstr "Анонімний доступ заборонено" -#: gio/gio-tool-mount.c:525 +#: gio/gio-tool-mount.c:533 msgid "No drive for device file" msgstr "Немає диска для файла диска" -#: gio/gio-tool-mount.c:1017 +#: gio/gio-tool-mount.c:1025 msgid "No volume for given ID" msgstr "Немає тому із вказаним ідентифікатором" -#: gio/gio-tool-mount.c:1206 +#: gio/gio-tool-mount.c:1214 msgid "Mount or unmount the locations." msgstr "Змонтувати або демонтувати місця." @@ -2345,7 +2355,6 @@ msgstr "ТИП" #: gio/gio-tool-set.c:38 -#| msgid "Set a file attribute" msgid "Unset given attribute" msgstr "Скасувати встановлення вказаного атрибуту" @@ -2433,7 +2442,7 @@ msgid "List contents of directories in a tree-like format." msgstr "Вивести вміст каталогів у форматі ієрархії." -#: gio/glib-compile-resources.c:142 gio/glib-compile-schemas.c:1516 +#: gio/glib-compile-resources.c:142 gio/glib-compile-schemas.c:1513 #, c-format msgid "Element <%s> not allowed inside <%s>" msgstr "Елемент <%s> не може бути всередині <%s>" @@ -2490,7 +2499,7 @@ msgid "text may not appear inside <%s>" msgstr "текст не може бути всередині <%s>" -#: gio/glib-compile-resources.c:821 gio/glib-compile-schemas.c:2174 +#: gio/glib-compile-resources.c:821 gio/glib-compile-schemas.c:2171 msgid "Show program version and exit" msgstr "Вивести дані щодо версії програми і завершити роботу" @@ -2506,8 +2515,8 @@ "Каталоги для завантаження файлів, на які посилається ФАЙЛ (типово поточний " "каталог)" -#: gio/glib-compile-resources.c:823 gio/glib-compile-schemas.c:2175 -#: gio/glib-compile-schemas.c:2204 +#: gio/glib-compile-resources.c:823 gio/glib-compile-schemas.c:2172 +#: gio/glib-compile-schemas.c:2201 msgid "DIRECTORY" msgstr "КАТАЛОГ" @@ -2734,16 +2743,16 @@ msgid "<aliases> must contain at least one <alias>" msgstr "<aliases> має містити принаймні один елемент <alias>" -#: gio/glib-compile-schemas.c:799 +#: gio/glib-compile-schemas.c:796 msgid "Empty names are not permitted" msgstr "Не можна використовувати порожні назви" -#: gio/glib-compile-schemas.c:809 +#: gio/glib-compile-schemas.c:806 #, c-format msgid "Invalid name “%s”: names must begin with a lowercase letter" msgstr "Некоректна назва «%s»: назви мають починатися з малої літери" -#: gio/glib-compile-schemas.c:821 +#: gio/glib-compile-schemas.c:818 #, c-format msgid "" "Invalid name “%s”: invalid character “%c”; only lowercase letters, numbers " @@ -2752,37 +2761,37 @@ "Некоректна назва «%s»: некоректний символ «%c». Можна використовувати лише " "малі літери, числа і дефіс («-»)." -#: gio/glib-compile-schemas.c:830 +#: gio/glib-compile-schemas.c:827 #, c-format msgid "Invalid name “%s”: two successive hyphens (“--”) are not permitted" msgstr "" "Некоректна назва «%s»: не можна вказувати два дефіси одночасно («--»)." -#: gio/glib-compile-schemas.c:839 +#: gio/glib-compile-schemas.c:836 #, c-format msgid "Invalid name “%s”: the last character may not be a hyphen (“-”)" msgstr "Некоректна назва «%s»: останній символ не може бути дефісом («-»)." -#: gio/glib-compile-schemas.c:847 +#: gio/glib-compile-schemas.c:844 #, c-format msgid "Invalid name “%s”: maximum length is 1024" msgstr "Некоректна назва «%s»: довжина має бути не більшою за 1024" -#: gio/glib-compile-schemas.c:919 +#: gio/glib-compile-schemas.c:916 #, c-format msgid "<child name='%s'> already specified" msgstr "<child name='%s'> вже вказано" -#: gio/glib-compile-schemas.c:945 +#: gio/glib-compile-schemas.c:942 msgid "Cannot add keys to a “list-of” schema" msgstr "Не вдалося додати ключі до схеми «list-of»" -#: gio/glib-compile-schemas.c:956 +#: gio/glib-compile-schemas.c:953 #, c-format msgid "<key name='%s'> already specified" msgstr "<key name='%s'> вже вказано" -#: gio/glib-compile-schemas.c:974 +#: gio/glib-compile-schemas.c:971 #, c-format msgid "" "<key name='%s'> shadows <key name='%s'> in <schema id='%s'>; use <override> " @@ -2791,63 +2800,63 @@ "<key name='%s'> відтінює <key name='%s'> у <schema id='%s'>; для змінювання " "значення використовуйте <override>" -#: gio/glib-compile-schemas.c:985 +#: gio/glib-compile-schemas.c:982 #, c-format msgid "" "Exactly one of “type”, “enum” or “flags” must be specified as an attribute " "to <key>" msgstr "Як атрибут <key> можна вказати лише «type», «enum» або «flags»" -#: gio/glib-compile-schemas.c:1004 +#: gio/glib-compile-schemas.c:1001 #, c-format msgid "<%s id='%s'> not (yet) defined." msgstr "<%s id='%s'> не визначено (поки)." -#: gio/glib-compile-schemas.c:1019 +#: gio/glib-compile-schemas.c:1016 #, c-format msgid "Invalid GVariant type string “%s”" msgstr "Некоректний рядок типу GVariant «%s»" -#: gio/glib-compile-schemas.c:1049 +#: gio/glib-compile-schemas.c:1046 msgid "<override> given but schema isn’t extending anything" msgstr "Вказано <override>, але схема нічого не розширює" -#: gio/glib-compile-schemas.c:1062 +#: gio/glib-compile-schemas.c:1059 #, c-format msgid "No <key name='%s'> to override" msgstr "Немає <key name='%s'> для перевизначення" -#: gio/glib-compile-schemas.c:1070 +#: gio/glib-compile-schemas.c:1067 #, c-format msgid "<override name='%s'> already specified" msgstr "<override name='%s'> вже вказано" -#: gio/glib-compile-schemas.c:1143 +#: gio/glib-compile-schemas.c:1140 #, c-format msgid "<schema id='%s'> already specified" msgstr "<schema id='%s'> вже вказано" -#: gio/glib-compile-schemas.c:1155 +#: gio/glib-compile-schemas.c:1152 #, c-format msgid "<schema id='%s'> extends not yet existing schema “%s”" msgstr "<schema id='%s'> розширює схему, якої ще не існує — «%s»" -#: gio/glib-compile-schemas.c:1171 +#: gio/glib-compile-schemas.c:1168 #, c-format msgid "<schema id='%s'> is list of not yet existing schema “%s”" msgstr "<schema id='%s'> є списком схеми, якої ще не існує — «%s»" -#: gio/glib-compile-schemas.c:1179 +#: gio/glib-compile-schemas.c:1176 #, c-format msgid "Cannot be a list of a schema with a path" msgstr "Не може бути списком схеми зі шляхом" -#: gio/glib-compile-schemas.c:1189 +#: gio/glib-compile-schemas.c:1186 #, c-format msgid "Cannot extend a schema with a path" msgstr "Не вдалося розширити схему шляхом" -#: gio/glib-compile-schemas.c:1199 +#: gio/glib-compile-schemas.c:1196 #, c-format msgid "" "<schema id='%s'> is a list, extending <schema id='%s'> which is not a list" @@ -2855,7 +2864,7 @@ "<schema id='%s'> є переліком, що розширює <schema id='%s'>, який не є " "переліком" -#: gio/glib-compile-schemas.c:1209 +#: gio/glib-compile-schemas.c:1206 #, c-format msgid "" "<schema id='%s' list-of='%s'> extends <schema id='%s' list-of='%s'> but “%s” " @@ -2864,19 +2873,19 @@ "<schema id='%s' list-of='%s'> розширює <schema id='%s' list-of='%s'>, але " "«%s» не розширює «%s»" -#: gio/glib-compile-schemas.c:1226 +#: gio/glib-compile-schemas.c:1223 #, c-format msgid "A path, if given, must begin and end with a slash" msgstr "" "Якщо вказано шлях, його запис має починатися і закінчуватися символом " "похилої риски" -#: gio/glib-compile-schemas.c:1233 +#: gio/glib-compile-schemas.c:1230 #, c-format msgid "The path of a list must end with “:/”" msgstr "Шлях у переліку має завершуватися на «:/»" -#: gio/glib-compile-schemas.c:1242 +#: gio/glib-compile-schemas.c:1239 #, c-format msgid "" "Warning: Schema “%s” has path “%s”. Paths starting with “/apps/”, “/" @@ -2885,49 +2894,49 @@ "Попередження: схема «%s» має шлях «%s». Шляхи, що починаються з «/apps/», «/" "desktop/» та «/system/» вважаються застарілими." -#: gio/glib-compile-schemas.c:1272 +#: gio/glib-compile-schemas.c:1269 #, c-format msgid "<%s id='%s'> already specified" msgstr "<%s id='%s'> вже вказано" -#: gio/glib-compile-schemas.c:1422 gio/glib-compile-schemas.c:1438 +#: gio/glib-compile-schemas.c:1419 gio/glib-compile-schemas.c:1435 #, c-format msgid "Only one <%s> element allowed inside <%s>" msgstr "Можна використовувати лише один елемент <%s> всередині <%s>" -#: gio/glib-compile-schemas.c:1520 +#: gio/glib-compile-schemas.c:1517 #, c-format msgid "Element <%s> not allowed at the top level" msgstr "Елемент <%s> не може бути самим горішнім" -#: gio/glib-compile-schemas.c:1538 +#: gio/glib-compile-schemas.c:1535 msgid "Element <default> is required in <key>" msgstr "Потрібен елемент <default> у <key>" -#: gio/glib-compile-schemas.c:1628 +#: gio/glib-compile-schemas.c:1625 #, c-format msgid "Text may not appear inside <%s>" msgstr "Текст може не показуватись усередині «%s»" -#: gio/glib-compile-schemas.c:1696 +#: gio/glib-compile-schemas.c:1693 #, c-format msgid "Warning: undefined reference to <schema id='%s'/>" msgstr "Попередження: невизначене посилання на <schema id='%s'/>" #. Translators: Do not translate "--strict". -#: gio/glib-compile-schemas.c:1835 gio/glib-compile-schemas.c:1914 +#: gio/glib-compile-schemas.c:1832 gio/glib-compile-schemas.c:1911 msgid "--strict was specified; exiting." msgstr "Було вказано параметр --strict; перериваємо обробку." -#: gio/glib-compile-schemas.c:1847 +#: gio/glib-compile-schemas.c:1844 msgid "This entire file has been ignored." msgstr "Увесь вміст файла було проігноровано." -#: gio/glib-compile-schemas.c:1910 +#: gio/glib-compile-schemas.c:1907 msgid "Ignoring this file." msgstr "Ігноруємо цей файл." -#: gio/glib-compile-schemas.c:1965 +#: gio/glib-compile-schemas.c:1962 #, c-format msgid "" "No such key “%s” in schema “%s” as specified in override file “%s”; ignoring " @@ -2936,7 +2945,7 @@ "Ключа «%s» у схемі «%s» немає, хоч вказаний у файлі замін «%s»; ігноруємо " "перевизначення для цього ключа." -#: gio/glib-compile-schemas.c:1973 +#: gio/glib-compile-schemas.c:1970 #, c-format msgid "" "No such key “%s” in schema “%s” as specified in override file “%s” and --" @@ -2945,7 +2954,7 @@ "Немає ключа «%s» у схемі «%s», яку вказано у файлі замін «%s», а вказано " "параметр --strict — перериваємо обробку." -#: gio/glib-compile-schemas.c:1995 +#: gio/glib-compile-schemas.c:1992 #, c-format msgid "" "Cannot provide per-desktop overrides for localized key “%s” in schema " @@ -2955,7 +2964,7 @@ "локалізованого ключа «%s» у схемі «%s» (файл замін «%s»); ігноруємо заміну " "для цього ключа." -#: gio/glib-compile-schemas.c:2004 +#: gio/glib-compile-schemas.c:2001 #, c-format msgid "" "Cannot provide per-desktop overrides for localized key “%s” in schema " @@ -2964,7 +2973,7 @@ "Не вдалося надати заміни для локалізованого ключа «%s» у схемі «%s» (файл " "заміни «%s»), а було задано --strict — перериваємо обробку." -#: gio/glib-compile-schemas.c:2028 +#: gio/glib-compile-schemas.c:2025 #, c-format msgid "" "Error parsing key “%s” in schema “%s” as specified in override file “%s”: " @@ -2973,7 +2982,7 @@ "Помилка під час обробки ключа «%s» у схемі «%s», яку визначено у файлі замін " "«%s»: %s. Ігноруємо заміну для цього ключа." -#: gio/glib-compile-schemas.c:2040 +#: gio/glib-compile-schemas.c:2037 #, c-format msgid "" "Error parsing key “%s” in schema “%s” as specified in override file “%s”: " @@ -2982,7 +2991,7 @@ "Помилка обробки ключа «%s» у схемі «%s», яку визначено у файлі замін «%s»: " "%s. Було задано --strict — перериваємо обробку." -#: gio/glib-compile-schemas.c:2067 +#: gio/glib-compile-schemas.c:2064 #, c-format msgid "" "Override for key “%s” in schema “%s” in override file “%s” is outside the " @@ -2991,7 +3000,7 @@ "Заміна ключа «%s» у схемі «%s» відповідно до файла замін «%s» не належить до " "вказаного у схемі діапазону — ігноруємо перевизначення цього ключа." -#: gio/glib-compile-schemas.c:2077 +#: gio/glib-compile-schemas.c:2074 #, c-format msgid "" "Override for key “%s” in schema “%s” in override file “%s” is outside the " @@ -3000,7 +3009,7 @@ "Заміна ключа «%s» у схемі «%s» відповідно до файла замін «%s» не належить до " "вказаного у схемі діапазону, а було задано --strict — перериваємо обробку." -#: gio/glib-compile-schemas.c:2103 +#: gio/glib-compile-schemas.c:2100 #, c-format msgid "" "Override for key “%s” in schema “%s” in override file “%s” is not in the " @@ -3009,7 +3018,7 @@ "Заміна ключа «%s» у схемі «%s» відповідно до файла замін «%s» не належить " "до списку припустимих значень; ігноруємо перевизначення для цього ключа." -#: gio/glib-compile-schemas.c:2113 +#: gio/glib-compile-schemas.c:2110 #, c-format msgid "" "Override for key “%s” in schema “%s” in override file “%s” is not in the " @@ -3018,23 +3027,23 @@ "Заміна ключа «%s» у схемі «%s» відповідно до файла замін «%s» не належить до " "списку коректних варіантів, а задано параметр --strict — перериваємо обробку." -#: gio/glib-compile-schemas.c:2175 +#: gio/glib-compile-schemas.c:2172 msgid "Where to store the gschemas.compiled file" msgstr "Місце зберігання файла gschemas.compiled" -#: gio/glib-compile-schemas.c:2176 +#: gio/glib-compile-schemas.c:2173 msgid "Abort on any errors in schemas" msgstr "Зупиняти роботу при виникненні помилок у схемах" -#: gio/glib-compile-schemas.c:2177 +#: gio/glib-compile-schemas.c:2174 msgid "Do not write the gschema.compiled file" msgstr "Не записувати файл gschema.compiled" -#: gio/glib-compile-schemas.c:2178 +#: gio/glib-compile-schemas.c:2175 msgid "Do not enforce key name restrictions" msgstr "Не встановлювати обмеження на назву ключа" -#: gio/glib-compile-schemas.c:2207 +#: gio/glib-compile-schemas.c:2204 msgid "" "Compile all GSettings schema files into a schema cache.\n" "Schema files are required to have the extension .gschema.xml,\n" @@ -3044,15 +3053,15 @@ "Файли схеми потрібні для розширення .gschema.xml,\n" "а файл кешу зветься gschemas.compiled." -#: gio/glib-compile-schemas.c:2228 +#: gio/glib-compile-schemas.c:2225 msgid "You should give exactly one directory name" msgstr "Вам слід вказати точно одну назву каталогу" -#: gio/glib-compile-schemas.c:2271 +#: gio/glib-compile-schemas.c:2268 msgid "No schema files found: doing nothing." msgstr "Не знайдено файлів схем: нічого не робимо." -#: gio/glib-compile-schemas.c:2273 +#: gio/glib-compile-schemas.c:2270 msgid "No schema files found: removed existing output file." msgstr "Не знайдено файлів схеми: вилучено наявний файл виведених даних." @@ -3061,7 +3070,7 @@ msgid "Invalid filename %s" msgstr "Некоректна назва файла %s" -#: gio/glocalfile.c:996 +#: gio/glocalfile.c:1005 #, c-format msgid "Error getting filesystem info for %s: %s" msgstr "Помилка при отриманні відомостей щодо файлової системи для %s: %s" @@ -3070,127 +3079,127 @@ #. * the enclosing (user visible) mount of a file, but none #. * exists. #. -#: gio/glocalfile.c:1137 +#: gio/glocalfile.c:1141 #, c-format msgid "Containing mount for file %s not found" msgstr "Вкладена точка монтування для файла %s не існує" -#: gio/glocalfile.c:1160 +#: gio/glocalfile.c:1164 msgid "Can’t rename root directory" msgstr "Не можна перейменовувати кореневий каталог" -#: gio/glocalfile.c:1178 gio/glocalfile.c:1201 +#: gio/glocalfile.c:1182 gio/glocalfile.c:1205 #, c-format msgid "Error renaming file %s: %s" msgstr "Помилка при перейменуванні файла %s: %s" -#: gio/glocalfile.c:1185 +#: gio/glocalfile.c:1189 msgid "Can’t rename file, filename already exists" msgstr "Не вдалося перейменувати файл, файл із також назвою вже існує" -#: gio/glocalfile.c:1198 gio/glocalfile.c:2394 gio/glocalfile.c:2422 -#: gio/glocalfile.c:2561 gio/glocalfileoutputstream.c:658 +#: gio/glocalfile.c:1202 gio/glocalfile.c:2405 gio/glocalfile.c:2433 +#: gio/glocalfile.c:2572 gio/glocalfileoutputstream.c:658 msgid "Invalid filename" msgstr "Некоректна назва файла" -#: gio/glocalfile.c:1366 gio/glocalfile.c:1377 +#: gio/glocalfile.c:1370 gio/glocalfile.c:1381 #, c-format msgid "Error opening file %s: %s" msgstr "Помилка при відкритті файла «%s»: %s" -#: gio/glocalfile.c:1502 +#: gio/glocalfile.c:1506 #, c-format msgid "Error removing file %s: %s" msgstr "Помилка під час спроби вилучити файл %s: %s" -#: gio/glocalfile.c:1996 gio/glocalfile.c:2007 gio/glocalfile.c:2034 +#: gio/glocalfile.c:2000 gio/glocalfile.c:2011 gio/glocalfile.c:2038 #, c-format msgid "Error trashing file %s: %s" msgstr "Помилка під час спроби надіслати файл %s до смітника: %s" -#: gio/glocalfile.c:2054 +#: gio/glocalfile.c:2058 #, c-format msgid "Unable to create trash directory %s: %s" msgstr "Помилка при створенні каталогу смітника %s: %s" -#: gio/glocalfile.c:2075 +#: gio/glocalfile.c:2079 #, c-format msgid "Unable to find toplevel directory to trash %s" msgstr "Не вдалося знайти каталог верхнього рівня для смітника %s" -#: gio/glocalfile.c:2083 +#: gio/glocalfile.c:2087 #, c-format msgid "Trashing on system internal mounts is not supported" msgstr "" "Підтримки надсилання до смітника на внутрішніх точках монтування системи не " "передбачено" -#: gio/glocalfile.c:2169 gio/glocalfile.c:2197 +#: gio/glocalfile.c:2173 gio/glocalfile.c:2201 #, c-format msgid "Unable to find or create trash directory %s to trash %s" msgstr "Не вдалося знайти або створити каталог смітника %s для викидання %s" -#: gio/glocalfile.c:2243 +#: gio/glocalfile.c:2245 #, c-format msgid "Unable to create trashing info file for %s: %s" msgstr "" "Не вдалося створити файл відомостей щодо надсилання до смітника для %s: %s" -#: gio/glocalfile.c:2305 +#: gio/glocalfile.c:2316 #, c-format msgid "Unable to trash file %s across filesystem boundaries" msgstr "Не вдалося надіслати файл %s до смітника за межами файлової системи" -#: gio/glocalfile.c:2309 gio/glocalfile.c:2365 +#: gio/glocalfile.c:2320 gio/glocalfile.c:2376 #, c-format msgid "Unable to trash file %s: %s" msgstr "Не вдалося перемістити файл до смітника %s: %s" -#: gio/glocalfile.c:2371 +#: gio/glocalfile.c:2382 #, c-format msgid "Unable to trash file %s" msgstr "Не вдалося перемістити файл до смітника %s" -#: gio/glocalfile.c:2397 +#: gio/glocalfile.c:2408 #, c-format msgid "Error creating directory %s: %s" msgstr "Сталася помилка при створенні каталогу «%s»: %s" -#: gio/glocalfile.c:2426 +#: gio/glocalfile.c:2437 #, c-format msgid "Filesystem does not support symbolic links" msgstr "Файлова система не підтримує символічні посилання" -#: gio/glocalfile.c:2429 +#: gio/glocalfile.c:2440 #, c-format msgid "Error making symbolic link %s: %s" msgstr "Помилка при створенні символічного посилання %s: %s" -#: gio/glocalfile.c:2472 gio/glocalfile.c:2507 gio/glocalfile.c:2564 +#: gio/glocalfile.c:2483 gio/glocalfile.c:2518 gio/glocalfile.c:2575 #, c-format msgid "Error moving file %s: %s" msgstr "Помилка при переміщенні файла %s: %s" -#: gio/glocalfile.c:2495 +#: gio/glocalfile.c:2506 msgid "Can’t move directory over directory" msgstr "Не вдалося перемістити каталог поверх каталогу" -#: gio/glocalfile.c:2521 gio/glocalfileoutputstream.c:1110 +#: gio/glocalfile.c:2532 gio/glocalfileoutputstream.c:1110 #: gio/glocalfileoutputstream.c:1124 gio/glocalfileoutputstream.c:1139 #: gio/glocalfileoutputstream.c:1156 gio/glocalfileoutputstream.c:1170 msgid "Backup file creation failed" msgstr "Помилка при створенні файла резервної копії" -#: gio/glocalfile.c:2540 +#: gio/glocalfile.c:2551 #, c-format msgid "Error removing target file: %s" msgstr "Помилка при зчитуванні файла призначення: %s" -#: gio/glocalfile.c:2554 +#: gio/glocalfile.c:2565 msgid "Move between mounts not supported" msgstr "Переміщення між різними точками монтування не підтримується" -#: gio/glocalfile.c:2728 +#: gio/glocalfile.c:2741 #, c-format msgid "Could not determine the disk usage of %s: %s" msgstr "Не вдалося визначити використання диска %s: %s" @@ -3212,121 +3221,121 @@ msgid "Error setting extended attribute “%s”: %s" msgstr "Помилка при встановленні розширеного атрибута «%s»: %s" -#: gio/glocalfileinfo.c:1738 gio/win32/gwinhttpfile.c:191 +#: gio/glocalfileinfo.c:1819 gio/win32/gwinhttpfile.c:191 msgid " (invalid encoding)" msgstr " (неправильне кодування)" -#: gio/glocalfileinfo.c:1897 gio/glocalfileoutputstream.c:945 +#: gio/glocalfileinfo.c:1978 gio/glocalfileoutputstream.c:945 #: gio/glocalfileoutputstream.c:997 #, c-format msgid "Error when getting information for file “%s”: %s" msgstr "Помилка при отриманні інформації про файл «%s»: %s" -#: gio/glocalfileinfo.c:2163 +#: gio/glocalfileinfo.c:2281 #, c-format msgid "Error when getting information for file descriptor: %s" msgstr "Помилка при отриманні інформації про файловий дескриптор: %s" -#: gio/glocalfileinfo.c:2208 +#: gio/glocalfileinfo.c:2326 msgid "Invalid attribute type (uint32 expected)" msgstr "Неправильний тип атрибута (очікувався uint32)" -#: gio/glocalfileinfo.c:2226 +#: gio/glocalfileinfo.c:2344 msgid "Invalid attribute type (uint64 expected)" msgstr "Неправильний тип атрибута (очікувався uint64)" -#: gio/glocalfileinfo.c:2245 gio/glocalfileinfo.c:2264 +#: gio/glocalfileinfo.c:2363 gio/glocalfileinfo.c:2382 msgid "Invalid attribute type (byte string expected)" msgstr "Неправильний тип атрибута (очікувався рядок байтів)" -#: gio/glocalfileinfo.c:2311 +#: gio/glocalfileinfo.c:2429 msgid "Cannot set permissions on symlinks" msgstr "Помилка при встановленні прав доступу на символічне посилання" -#: gio/glocalfileinfo.c:2327 +#: gio/glocalfileinfo.c:2445 #, c-format msgid "Error setting permissions: %s" msgstr "Помилка встановлення прав доступу: %s" -#: gio/glocalfileinfo.c:2378 +#: gio/glocalfileinfo.c:2496 #, c-format msgid "Error setting owner: %s" msgstr "Помилка встановлення власник: %s" -#: gio/glocalfileinfo.c:2401 +#: gio/glocalfileinfo.c:2519 msgid "symlink must be non-NULL" msgstr "символьне посилання не може мати значення NULL" -#: gio/glocalfileinfo.c:2411 gio/glocalfileinfo.c:2430 -#: gio/glocalfileinfo.c:2441 +#: gio/glocalfileinfo.c:2529 gio/glocalfileinfo.c:2548 +#: gio/glocalfileinfo.c:2559 #, c-format msgid "Error setting symlink: %s" msgstr "Помилка при встановленні символічного посилання: %s" -#: gio/glocalfileinfo.c:2420 +#: gio/glocalfileinfo.c:2538 msgid "Error setting symlink: file is not a symlink" msgstr "" "помилка при встановленні символічного посилання: файл не є символічним " "посиланням" -#: gio/glocalfileinfo.c:2492 +#: gio/glocalfileinfo.c:2630 #, c-format msgid "Extra nanoseconds %d for UNIX timestamp %lld are negative" msgstr "Зайві наносекунди %d у часовій позначці UNIX %lld є від'ємними" -#: gio/glocalfileinfo.c:2501 +#: gio/glocalfileinfo.c:2639 #, c-format msgid "Extra nanoseconds %d for UNIX timestamp %lld reach 1 second" msgstr "" "Зайві наносекунди %d у часовій позначці UNIX %lld досягли значення у одну " "секунду" -#: gio/glocalfileinfo.c:2511 +#: gio/glocalfileinfo.c:2649 #, c-format msgid "UNIX timestamp %lld does not fit into 64 bits" msgstr "Часова позначка UNIX %lld не вкладається у 64 біти" -#: gio/glocalfileinfo.c:2522 +#: gio/glocalfileinfo.c:2660 #, c-format msgid "UNIX timestamp %lld is outside of the range supported by Windows" msgstr "" "Часова позначка UNIX %lld лежить поза діапазоном, підтримку якого " "передбачено у Windows" -#: gio/glocalfileinfo.c:2625 +#: gio/glocalfileinfo.c:2792 #, c-format msgid "File name “%s” cannot be converted to UTF-16" msgstr "Назву файла «%s» неможливо перетворити на назву у кодуванні UTF-16" -#: gio/glocalfileinfo.c:2644 +#: gio/glocalfileinfo.c:2811 #, c-format msgid "File “%s” cannot be opened: Windows Error %lu" msgstr "Не вдалося відкрити файл «%s»: помилка Windows %lu" -#: gio/glocalfileinfo.c:2657 +#: gio/glocalfileinfo.c:2824 #, c-format msgid "Error setting modification or access time for file “%s”: %lu" msgstr "Помилка при встановленні часу зміни або доступу для файла «%s»: %lu" -#: gio/glocalfileinfo.c:2798 gio/glocalfileinfo.c:2810 +#: gio/glocalfileinfo.c:2981 #, c-format msgid "Error setting modification or access time: %s" msgstr "Помилка при встановленні часу зміни або доступу: %s" -#: gio/glocalfileinfo.c:2833 +#: gio/glocalfileinfo.c:3004 msgid "SELinux context must be non-NULL" msgstr "Контекст SELinux не може значення NULL" -#: gio/glocalfileinfo.c:2840 +#: gio/glocalfileinfo.c:3011 msgid "SELinux is not enabled on this system" msgstr "SELinux не увімкнено у цій системі" -#: gio/glocalfileinfo.c:2850 +#: gio/glocalfileinfo.c:3021 #, c-format msgid "Error setting SELinux context: %s" msgstr "Помилка при встановленні контексту SELinux: %s" -#: gio/glocalfileinfo.c:2947 +#: gio/glocalfileinfo.c:3118 #, c-format msgid "Setting attribute %s not supported" msgstr "Підтримки встановлення атрибута %s не передбачено" @@ -3373,13 +3382,13 @@ msgid "Error renaming temporary file: %s" msgstr "Помилка при перейменуванні тимчасового файла: %s" -#: gio/glocalfileoutputstream.c:611 gio/glocalfileoutputstream.c:1241 +#: gio/glocalfileoutputstream.c:611 gio/glocalfileoutputstream.c:1242 #, c-format msgid "Error truncating file: %s" msgstr "Помилка при обрізанні файла: %s" #: gio/glocalfileoutputstream.c:664 gio/glocalfileoutputstream.c:909 -#: gio/glocalfileoutputstream.c:1222 gio/gsubprocess.c:231 +#: gio/glocalfileoutputstream.c:1223 gio/gsubprocess.c:231 #, c-format msgid "Error opening file “%s”: %s" msgstr "Помилка при відкритті файла «%s»: %s" @@ -3396,7 +3405,7 @@ msgid "The file was externally modified" msgstr "Файл був змінений іншою програмою" -#: gio/glocalfileoutputstream.c:1204 +#: gio/glocalfileoutputstream.c:1205 #, c-format msgid "Error removing old file: %s" msgstr "Помилка при видаленні старого файла: %s" @@ -3548,8 +3557,8 @@ #. Translators: the first placeholder is a domain name, the #. * second is an error message #: gio/gresolver.c:403 gio/gthreadedresolver.c:152 gio/gthreadedresolver.c:170 -#: gio/gthreadedresolver.c:782 gio/gthreadedresolver.c:806 -#: gio/gthreadedresolver.c:831 gio/gthreadedresolver.c:846 +#: gio/gthreadedresolver.c:798 gio/gthreadedresolver.c:822 +#: gio/gthreadedresolver.c:847 gio/gthreadedresolver.c:862 #, c-format msgid "Error resolving “%s”: %s" msgstr "Помилка перетворення назви на адресу «%s»: %s" @@ -4273,37 +4282,37 @@ #. Translators: the placeholder is a DNS record type, such as ‘MX’ or ‘SRV’ #: gio/gthreadedresolver.c:552 gio/gthreadedresolver.c:574 -#: gio/gthreadedresolver.c:612 gio/gthreadedresolver.c:659 -#: gio/gthreadedresolver.c:688 gio/gthreadedresolver.c:700 +#: gio/gthreadedresolver.c:628 gio/gthreadedresolver.c:675 +#: gio/gthreadedresolver.c:704 gio/gthreadedresolver.c:716 #, c-format msgid "Error parsing DNS %s record: malformed DNS packet" msgstr "" "Помилка під час спроби обробити запис DNS %s: помилкове форматування пакета " "DNS" -#: gio/gthreadedresolver.c:758 gio/gthreadedresolver.c:895 -#: gio/gthreadedresolver.c:993 gio/gthreadedresolver.c:1043 +#: gio/gthreadedresolver.c:774 gio/gthreadedresolver.c:911 +#: gio/gthreadedresolver.c:1009 gio/gthreadedresolver.c:1059 #, c-format msgid "No DNS record of the requested type for “%s”" msgstr "Немає запису DNS з запитуваним типом «%s»" -#: gio/gthreadedresolver.c:763 gio/gthreadedresolver.c:998 +#: gio/gthreadedresolver.c:779 gio/gthreadedresolver.c:1014 #, c-format msgid "Temporarily unable to resolve “%s”" msgstr "Тимчасово неможливо розв'язати «%s»" -#: gio/gthreadedresolver.c:768 gio/gthreadedresolver.c:1003 -#: gio/gthreadedresolver.c:1113 +#: gio/gthreadedresolver.c:784 gio/gthreadedresolver.c:1019 +#: gio/gthreadedresolver.c:1129 #, c-format msgid "Error resolving “%s”" msgstr "Помилка при розв'язанні імені «%s»" -#: gio/gthreadedresolver.c:782 gio/gthreadedresolver.c:806 -#: gio/gthreadedresolver.c:831 gio/gthreadedresolver.c:846 +#: gio/gthreadedresolver.c:798 gio/gthreadedresolver.c:822 +#: gio/gthreadedresolver.c:847 gio/gthreadedresolver.c:862 msgid "Malformed DNS packet" msgstr "Помилкове форматування пакета DNS" -#: gio/gthreadedresolver.c:888 +#: gio/gthreadedresolver.c:904 #, c-format msgid "Failed to parse DNS response for “%s”: " msgstr "Не вдалося обробити відповідь DNS для «%s»: " @@ -4434,7 +4443,7 @@ msgid "Error closing file descriptor: %s" msgstr "Помилка при закритті файлового дескриптора: %s" -#: gio/gunixmounts.c:2815 gio/gunixmounts.c:2868 +#: gio/gunixmounts.c:2817 gio/gunixmounts.c:2870 msgid "Filesystem root" msgstr "Корінь файлової системи" @@ -4519,77 +4528,77 @@ msgid "Wrong args\n" msgstr "Неправильні параметри\n" -#: glib/gbookmarkfile.c:779 +#: glib/gbookmarkfile.c:861 #, c-format msgid "Unexpected attribute “%s” for element “%s”" msgstr "Неочікуваний атрибут «%s» для елемента «%s»" -#: glib/gbookmarkfile.c:790 glib/gbookmarkfile.c:870 glib/gbookmarkfile.c:880 -#: glib/gbookmarkfile.c:993 +#: glib/gbookmarkfile.c:872 glib/gbookmarkfile.c:952 glib/gbookmarkfile.c:962 +#: glib/gbookmarkfile.c:1075 #, c-format msgid "Attribute “%s” of element “%s” not found" msgstr "Атрибута «%s» для елемента «%s» не існує" -#: glib/gbookmarkfile.c:1202 glib/gbookmarkfile.c:1267 -#: glib/gbookmarkfile.c:1331 glib/gbookmarkfile.c:1341 +#: glib/gbookmarkfile.c:1284 glib/gbookmarkfile.c:1349 +#: glib/gbookmarkfile.c:1413 glib/gbookmarkfile.c:1423 #, c-format msgid "Unexpected tag “%s”, tag “%s” expected" msgstr "Неочікуваний теґ «%s», мало бути використано теґ «%s»" -#: glib/gbookmarkfile.c:1227 glib/gbookmarkfile.c:1241 -#: glib/gbookmarkfile.c:1309 glib/gbookmarkfile.c:1355 +#: glib/gbookmarkfile.c:1309 glib/gbookmarkfile.c:1323 +#: glib/gbookmarkfile.c:1391 glib/gbookmarkfile.c:1437 #, c-format msgid "Unexpected tag “%s” inside “%s”" msgstr "Неочікуваний теґ «%s» у «%s»" -#: glib/gbookmarkfile.c:1635 +#: glib/gbookmarkfile.c:1717 #, c-format msgid "Invalid date/time ‘%s’ in bookmark file" msgstr "Некоректний запис дати і часу «%s» у файлі закладок" -#: glib/gbookmarkfile.c:1838 +#: glib/gbookmarkfile.c:1956 msgid "No valid bookmark file found in data dirs" msgstr "Не вдалося знайти правильний файл закладок у каталогах даних" -#: glib/gbookmarkfile.c:2039 +#: glib/gbookmarkfile.c:2157 #, c-format msgid "A bookmark for URI “%s” already exists" msgstr "Файл закладок для адреси «%s» вже існує" -#: glib/gbookmarkfile.c:2088 glib/gbookmarkfile.c:2246 -#: glib/gbookmarkfile.c:2331 glib/gbookmarkfile.c:2411 -#: glib/gbookmarkfile.c:2496 glib/gbookmarkfile.c:2630 -#: glib/gbookmarkfile.c:2763 glib/gbookmarkfile.c:2898 -#: glib/gbookmarkfile.c:2940 glib/gbookmarkfile.c:3037 -#: glib/gbookmarkfile.c:3158 glib/gbookmarkfile.c:3352 -#: glib/gbookmarkfile.c:3493 glib/gbookmarkfile.c:3712 -#: glib/gbookmarkfile.c:3801 glib/gbookmarkfile.c:3890 -#: glib/gbookmarkfile.c:4009 +#: glib/gbookmarkfile.c:2206 glib/gbookmarkfile.c:2364 +#: glib/gbookmarkfile.c:2449 glib/gbookmarkfile.c:2529 +#: glib/gbookmarkfile.c:2614 glib/gbookmarkfile.c:2748 +#: glib/gbookmarkfile.c:2881 glib/gbookmarkfile.c:3016 +#: glib/gbookmarkfile.c:3058 glib/gbookmarkfile.c:3155 +#: glib/gbookmarkfile.c:3276 glib/gbookmarkfile.c:3470 +#: glib/gbookmarkfile.c:3611 glib/gbookmarkfile.c:3830 +#: glib/gbookmarkfile.c:3919 glib/gbookmarkfile.c:4008 +#: glib/gbookmarkfile.c:4127 #, c-format msgid "No bookmark found for URI “%s”" msgstr "Не знайдено закладки для адреси «%s»" -#: glib/gbookmarkfile.c:2420 +#: glib/gbookmarkfile.c:2538 #, c-format msgid "No MIME type defined in the bookmark for URI “%s”" msgstr "Не визначено тип MIME у закладці для адреси «%s»" -#: glib/gbookmarkfile.c:2505 +#: glib/gbookmarkfile.c:2623 #, c-format msgid "No private flag has been defined in bookmark for URI “%s”" msgstr "Не вказано приватну ознаку у закладці для адреси «%s»" -#: glib/gbookmarkfile.c:3046 +#: glib/gbookmarkfile.c:3164 #, c-format msgid "No groups set in bookmark for URI “%s”" msgstr "Не встановлено групи у закладці для адреси «%s»" -#: glib/gbookmarkfile.c:3514 glib/gbookmarkfile.c:3722 +#: glib/gbookmarkfile.c:3632 glib/gbookmarkfile.c:3840 #, c-format msgid "No application with name “%s” registered a bookmark for “%s”" msgstr "Не зареєстровано програму з назвою «%s» для закладки «%s»" -#: glib/gbookmarkfile.c:3745 +#: glib/gbookmarkfile.c:3863 #, c-format msgid "Failed to expand exec line “%s” with URI “%s”" msgstr "Помилка розгортання рядка виконуваного файла «%s» для адреси «%s»" @@ -5064,7 +5073,7 @@ msgid "Error opening directory “%s”: %s" msgstr "Помилка відкривання каталогу «%s»: %s" -#: glib/gfileutils.c:735 glib/gfileutils.c:827 +#: glib/gfileutils.c:753 glib/gfileutils.c:845 #, c-format msgid "Could not allocate %lu byte to read file “%s”" msgid_plural "Could not allocate %lu bytes to read file “%s”" @@ -5072,72 +5081,72 @@ msgstr1 "Не вдалося виділити %lu байтів для зчитування файла «%s»" msgstr2 "Не вдалося виділити %lu байтів для зчитування файла «%s»" -#: glib/gfileutils.c:752 +#: glib/gfileutils.c:770 #, c-format msgid "Error reading file “%s”: %s" msgstr "Помилка при читанні файла «%s»: %s" -#: glib/gfileutils.c:788 +#: glib/gfileutils.c:806 #, c-format msgid "File “%s” is too large" msgstr "Файл «%s» занадто великий" -#: glib/gfileutils.c:852 +#: glib/gfileutils.c:870 #, c-format msgid "Failed to read from file “%s”: %s" msgstr "Помилка зчитування з файла «%s»: %s" -#: glib/gfileutils.c:902 glib/gfileutils.c:977 glib/gfileutils.c:1449 +#: glib/gfileutils.c:920 glib/gfileutils.c:995 glib/gfileutils.c:1472 #, c-format msgid "Failed to open file “%s”: %s" msgstr "Не вдалося відкрити файл «%s»: %s" -#: glib/gfileutils.c:915 +#: glib/gfileutils.c:933 #, c-format msgid "Failed to get attributes of file “%s”: fstat() failed: %s" msgstr "Помилка отримання атрибутів файла «%s»: помилка fstat(): %s" -#: glib/gfileutils.c:946 +#: glib/gfileutils.c:964 #, c-format msgid "Failed to open file “%s”: fdopen() failed: %s" msgstr "Помилка відкривання файла «%s»: помилка fdopen(): %s" -#: glib/gfileutils.c:1047 +#: glib/gfileutils.c:1065 #, c-format msgid "Failed to rename file “%s” to “%s”: g_rename() failed: %s" msgstr "Помилка перейменування файла «%s» на «%s»: помилка g_rename(): %s" -#: glib/gfileutils.c:1156 +#: glib/gfileutils.c:1179 #, c-format msgid "Failed to write file “%s”: write() failed: %s" msgstr "Не вдалося записати файл «%s»: збій у функції write(): %s" -#: glib/gfileutils.c:1177 +#: glib/gfileutils.c:1200 #, c-format msgid "Failed to write file “%s”: fsync() failed: %s" msgstr "Помилка запису у файл «%s»: помилка fsync(): %s" -#: glib/gfileutils.c:1338 glib/gfileutils.c:1753 +#: glib/gfileutils.c:1361 glib/gfileutils.c:1776 #, c-format msgid "Failed to create file “%s”: %s" msgstr "Помилка створення файла «%s»: %s" -#: glib/gfileutils.c:1383 +#: glib/gfileutils.c:1406 #, c-format msgid "Existing file “%s” could not be removed: g_unlink() failed: %s" msgstr "Не вдалося вилучити наявний файл «%s»: помилка g_unlink(): %s" -#: glib/gfileutils.c:1718 +#: glib/gfileutils.c:1741 #, c-format msgid "Template “%s” invalid, should not contain a “%s”" msgstr "Шаблон «%s» неправильний, бо не може містити «%s»" -#: glib/gfileutils.c:1731 +#: glib/gfileutils.c:1754 #, c-format msgid "Template “%s” doesn’t contain XXXXXX" msgstr "Шаблон «%s» не містить XXXXXX" -#: glib/gfileutils.c:2291 glib/gfileutils.c:2320 +#: glib/gfileutils.c:2348 glib/gfileutils.c:2377 #, c-format msgid "Failed to read the symbolic link “%s”: %s" msgstr "Помилка читання символічного посилання «%s»: %s" @@ -5203,8 +5212,8 @@ msgstr "Файл ключа містить кодування, підтримки якого не передбачено — «%s»" #: glib/gkeyfile.c:1679 glib/gkeyfile.c:1852 glib/gkeyfile.c:3299 -#: glib/gkeyfile.c:3363 glib/gkeyfile.c:3493 glib/gkeyfile.c:3625 -#: glib/gkeyfile.c:3771 glib/gkeyfile.c:4006 glib/gkeyfile.c:4073 +#: glib/gkeyfile.c:3363 glib/gkeyfile.c:3493 glib/gkeyfile.c:3622 +#: glib/gkeyfile.c:3768 glib/gkeyfile.c:4003 glib/gkeyfile.c:4070 #, c-format msgid "Key file does not have group “%s”" msgstr "Файл ключа не містить групи «%s»" @@ -5242,31 +5251,31 @@ msgid "Key “%s” in group “%s” has value “%s” where %s was expected" msgstr "Значення ключа «%s» у групі «%s» дорівнює «%s», але очікувалося «%s»" -#: glib/gkeyfile.c:4326 +#: glib/gkeyfile.c:4323 msgid "Key file contains escape character at end of line" msgstr "Ключовий файл містить escape-символ наприкінці рядка" -#: glib/gkeyfile.c:4348 +#: glib/gkeyfile.c:4345 #, c-format msgid "Key file contains invalid escape sequence “%s”" msgstr "Файл ключа містить неправильну послідовність екранування «%s»" -#: glib/gkeyfile.c:4493 +#: glib/gkeyfile.c:4490 #, c-format msgid "Value “%s” cannot be interpreted as a number." msgstr "Не вдалося розібрати значення «%s» як число." -#: glib/gkeyfile.c:4507 +#: glib/gkeyfile.c:4504 #, c-format msgid "Integer value “%s” out of range" msgstr "Числове ціле значення «%s» поза межами діапазону" -#: glib/gkeyfile.c:4540 +#: glib/gkeyfile.c:4537 #, c-format msgid "Value “%s” cannot be interpreted as a float number." msgstr "Значення «%s» не вдалося перетворити на число з рухомою комою." -#: glib/gkeyfile.c:4579 +#: glib/gkeyfile.c:4576 #, c-format msgid "Value “%s” cannot be interpreted as a boolean." msgstr "Не вдалося обробити значення «%s» як логічне значення." @@ -5287,32 +5296,32 @@ msgid "Failed to open file “%s”: open() failed: %s" msgstr "Помилка відкривання файла «%s»: помилка open(): %s" -#: glib/gmarkup.c:400 glib/gmarkup.c:442 +#: glib/gmarkup.c:393 glib/gmarkup.c:435 #, c-format msgid "Error on line %d char %d: " msgstr "Помилка в рядку %d на символі %d: " -#: glib/gmarkup.c:464 glib/gmarkup.c:547 +#: glib/gmarkup.c:457 glib/gmarkup.c:540 #, c-format msgid "Invalid UTF-8 encoded text in name — not valid “%s”" msgstr "Некоректний текст у кодуванні UTF-8 у назві — не є коректним «%s»" -#: glib/gmarkup.c:475 +#: glib/gmarkup.c:468 #, c-format msgid "“%s” is not a valid name" msgstr "«%s» не є коректною назвою" -#: glib/gmarkup.c:491 +#: glib/gmarkup.c:484 #, c-format msgid "“%s” is not a valid name: “%c”" msgstr "«%s» не є коректною назвою: «%c»" -#: glib/gmarkup.c:615 +#: glib/gmarkup.c:608 #, c-format msgid "Error on line %d: %s" msgstr "Помилка в рядку %d: %s" -#: glib/gmarkup.c:692 +#: glib/gmarkup.c:685 #, c-format msgid "" "Failed to parse “%-.*s”, which should have been a digit inside a character " @@ -5321,7 +5330,7 @@ "Помилка аналізу виразу «%-.*s», де має бути число у символічному посиланні " "(наприклад, ê). Можливо, число є надто великим." -#: glib/gmarkup.c:704 +#: glib/gmarkup.c:697 msgid "" "Character reference did not end with a semicolon; most likely you used an " "ampersand character without intending to start an entity — escape ampersand " @@ -5330,24 +5339,24 @@ "Посилання на символ не закінчується крапкою з комою, схоже символ \"&\" було " "використано не для позначення початку предиката – екрануйте його як &." -#: glib/gmarkup.c:730 +#: glib/gmarkup.c:723 #, c-format msgid "Character reference “%-.*s” does not encode a permitted character" msgstr "Посилання на символ «%-.*s» не визначає жоден дозволений символ" -#: glib/gmarkup.c:768 +#: glib/gmarkup.c:761 msgid "" "Empty entity “&;” seen; valid entities are: & " < > '" msgstr "" "Виявлено порожній предикат «&;»; допустимими предикатами є: & " " "< > '" -#: glib/gmarkup.c:776 +#: glib/gmarkup.c:769 #, c-format msgid "Entity name “%-.*s” is not known" msgstr "Назва предиката «%-.*s» є невідомою програмі" -#: glib/gmarkup.c:781 +#: glib/gmarkup.c:774 msgid "" "Entity did not end with a semicolon; most likely you used an ampersand " "character without intending to start an entity — escape ampersand as &" @@ -5355,11 +5364,11 @@ "Предикат не закінчується крапкою з комою; очевидно, що символ & було " "використано не для позначення початку предиката – екрануйте його як &" -#: glib/gmarkup.c:1195 +#: glib/gmarkup.c:1188 msgid "Document must begin with an element (e.g. <book>)" msgstr "Документ має починатися з елемента (наприклад, <book>)" -#: glib/gmarkup.c:1235 +#: glib/gmarkup.c:1228 #, c-format msgid "" "“%s” is not a valid character following a “<” character; it may not begin an " @@ -5368,7 +5377,7 @@ "Символ «%s» не можна вживати після символу «<», він не може починати назву " "елемента" -#: glib/gmarkup.c:1278 +#: glib/gmarkup.c:1271 #, c-format msgid "" "Odd character “%s”, expected a “>” character to end the empty-element tag " @@ -5377,12 +5386,12 @@ "Зайвий символ «%s», очікувався символ «>» для закриття теґу порожнього " "елементу «%s»" -#: glib/gmarkup.c:1348 +#: glib/gmarkup.c:1341 #, c-format msgid "Too many attributes in element “%s”" msgstr "Забагато атрибутів у елементі «%s»" -#: glib/gmarkup.c:1368 +#: glib/gmarkup.c:1361 #, c-format msgid "" "Odd character “%s”, expected a “=” after attribute name “%s” of element “%s”" @@ -5390,7 +5399,7 @@ "Зайвий символ «%s», очікувався символ «=» після назви ознаки «%s» елемента " "«%s»" -#: glib/gmarkup.c:1410 +#: glib/gmarkup.c:1403 #, c-format msgid "" "Odd character “%s”, expected a “>” or “/” character to end the start tag of " @@ -5401,7 +5410,7 @@ "теґу елемента «%s», чи додаткова ознака; можливо, було використано " "неприпустимий символ в назві ознаки" -#: glib/gmarkup.c:1455 +#: glib/gmarkup.c:1448 #, c-format msgid "" "Odd character “%s”, expected an open quote mark after the equals sign when " @@ -5410,7 +5419,7 @@ "Зайвий символ «%s», мало бути вказано початкові лапки після знаку рівності " "на присвоєнні значення ознаці «%s» елемента «%s»" -#: glib/gmarkup.c:1589 +#: glib/gmarkup.c:1582 #, c-format msgid "" "“%s” is not a valid character following the characters “</”; “%s” may not " @@ -5419,7 +5428,7 @@ "Символ «%s» неприпустимий після символів «</»; символ «%s» не може починати " "назву елемента" -#: glib/gmarkup.c:1627 +#: glib/gmarkup.c:1620 #, c-format msgid "" "“%s” is not a valid character following the close element name “%s”; the " @@ -5428,26 +5437,26 @@ "Символ «%s» неприпустимий на закритті назви елемента «%s»; припустимим " "символом є «>»" -#: glib/gmarkup.c:1639 +#: glib/gmarkup.c:1632 #, c-format msgid "Element “%s” was closed, no element is currently open" msgstr "Було закрито не відкритий елемент «%s»" -#: glib/gmarkup.c:1648 +#: glib/gmarkup.c:1641 #, c-format msgid "Element “%s” was closed, but the currently open element is “%s”" msgstr "Було закрито елемент «%s», але зараз відрито елемент «%s»" -#: glib/gmarkup.c:1801 +#: glib/gmarkup.c:1794 msgid "Document was empty or contained only whitespace" msgstr "Документ порожній чи містить лише пропуски" -#: glib/gmarkup.c:1815 +#: glib/gmarkup.c:1808 msgid "Document ended unexpectedly just after an open angle bracket “<”" msgstr "" "Документ раптово закінчився відразу після початкової кутової дужки «<»" -#: glib/gmarkup.c:1823 glib/gmarkup.c:1868 +#: glib/gmarkup.c:1816 glib/gmarkup.c:1861 #, c-format msgid "" "Document ended unexpectedly with elements still open — “%s” was the last " @@ -5456,7 +5465,7 @@ "Документ раптово закінчився, коли деякі елементи ще були відкритими – «%s» " "був останнім відкритим елементом" -#: glib/gmarkup.c:1831 +#: glib/gmarkup.c:1824 #, c-format msgid "" "Document ended unexpectedly, expected to see a close angle bracket ending " @@ -5465,19 +5474,19 @@ "Документ раптово закінчився, очікувалась кінцева кутова дужка для закриття " "теґу <%s/>" -#: glib/gmarkup.c:1837 +#: glib/gmarkup.c:1830 msgid "Document ended unexpectedly inside an element name" msgstr "Документ раптово закінчився посеред назви елемента" -#: glib/gmarkup.c:1843 +#: glib/gmarkup.c:1836 msgid "Document ended unexpectedly inside an attribute name" msgstr "Документ раптово закінчився посеред назви ознаки" -#: glib/gmarkup.c:1848 +#: glib/gmarkup.c:1841 msgid "Document ended unexpectedly inside an element-opening tag." msgstr "Документ раптово закінчився у середині теґу, що відкривав елемент" -#: glib/gmarkup.c:1854 +#: glib/gmarkup.c:1847 msgid "" "Document ended unexpectedly after the equals sign following an attribute " "name; no attribute value" @@ -5485,21 +5494,21 @@ "Документ раптово закінчився після знака рівності, що йшов за назвою ознаки; " "значення ознаки не вказано" -#: glib/gmarkup.c:1861 +#: glib/gmarkup.c:1854 msgid "Document ended unexpectedly while inside an attribute value" msgstr "Документ раптово закінчився посеред значення ознаки" -#: glib/gmarkup.c:1878 +#: glib/gmarkup.c:1871 #, c-format msgid "Document ended unexpectedly inside the close tag for element “%s”" msgstr "Документ раптово закінчився у середині теґу, що закривав елемент «%s»" -#: glib/gmarkup.c:1882 +#: glib/gmarkup.c:1875 msgid "" "Document ended unexpectedly inside the close tag for an unopened element" msgstr "Документ раптово закінчився у середині теґу для невідкритого елемента" -#: glib/gmarkup.c:1888 +#: glib/gmarkup.c:1881 msgid "Document ended unexpectedly inside a comment or processing instruction" msgstr "" "Документ раптово закінчився у середині коментарю чи інструкції обробки" @@ -5563,189 +5572,189 @@ msgid "Unknown option %s" msgstr "Невідомий параметр %s" -#: glib/gregex.c:436 +#: glib/gregex.c:479 msgid "corrupted object" msgstr "пошкоджений об'єкт" -#: glib/gregex.c:438 +#: glib/gregex.c:481 msgid "out of memory" msgstr "недостатньо пам'яті" -#: glib/gregex.c:443 +#: glib/gregex.c:487 msgid "backtracking limit reached" msgstr "закінчилося обмеження зворотного ходу" -#: glib/gregex.c:454 glib/gregex.c:707 glib/gregex.c:736 +#: glib/gregex.c:498 msgid "internal error" msgstr "внутрішня помилка" -#: glib/gregex.c:456 +#: glib/gregex.c:500 msgid "the pattern contains items not supported for partial matching" msgstr "" "шаблон містить елементи, які не підтримуються при пошуку часткової " "відповідності" -#: glib/gregex.c:458 +#: glib/gregex.c:502 msgid "back references as conditions are not supported for partial matching" msgstr "" "умови у вигляді зворотних посилань при пошуку часткової відповідності не " "підтримуються" -#: glib/gregex.c:464 +#: glib/gregex.c:508 msgid "recursion limit reached" msgstr "досягнуто межу рекурсії" -#: glib/gregex.c:466 +#: glib/gregex.c:510 msgid "bad offset" msgstr "неправильне зміщення" -#: glib/gregex.c:468 +#: glib/gregex.c:512 msgid "recursion loop" msgstr "зациклювання рекурсії" #. should not happen in GRegex since we check modes before each match -#: glib/gregex.c:471 +#: glib/gregex.c:515 msgid "matching mode is requested that was not compiled for JIT" msgstr "" "надійшов запит щодо режиму відповідності, який не було зібрано для JIT" -#: glib/gregex.c:475 +#: glib/gregex.c:536 glib/gregex.c:1838 msgid "unknown error" msgstr "невідома помилка" -#: glib/gregex.c:496 +#: glib/gregex.c:557 msgid "\\ at end of pattern" msgstr "\\ наприкінці шаблону" -#: glib/gregex.c:500 +#: glib/gregex.c:561 msgid "\\c at end of pattern" msgstr "\\c наприкінці шаблону" -#: glib/gregex.c:505 +#: glib/gregex.c:566 msgid "unrecognized character following \\" msgstr "нерозпізнаний символ слідує за \\" -#: glib/gregex.c:509 +#: glib/gregex.c:570 msgid "numbers out of order in {} quantifier" msgstr "неправильний порядок чисел у специфікаторі {}" -#: glib/gregex.c:513 +#: glib/gregex.c:574 msgid "number too big in {} quantifier" msgstr "надто велике число у специфікаторі {}" -#: glib/gregex.c:517 +#: glib/gregex.c:578 msgid "missing terminating for character class" msgstr "відсутній завершальний символ для класу символів" -#: glib/gregex.c:521 +#: glib/gregex.c:582 msgid "invalid escape sequence in character class" msgstr "Неправильна escape-послідовність у класі символів" -#: glib/gregex.c:525 +#: glib/gregex.c:586 msgid "range out of order in character class" msgstr "неправильний порядок у діапазоні у класі символів" -#: glib/gregex.c:530 +#: glib/gregex.c:591 msgid "nothing to repeat" msgstr "немає що повторювати" -#: glib/gregex.c:534 +#: glib/gregex.c:595 msgid "unrecognized character after (? or (?-" msgstr "нерозпізнаний символ після (? або (?-" -#: glib/gregex.c:538 +#: glib/gregex.c:599 msgid "POSIX named classes are supported only within a class" msgstr "назви класів у стилі POSIX підтримуються лише у межах класі" -#: glib/gregex.c:542 +#: glib/gregex.c:603 msgid "POSIX collating elements are not supported" msgstr "елементи порівняння у стилі POSIX не підтримуються" -#: glib/gregex.c:548 +#: glib/gregex.c:609 msgid "missing terminating )" msgstr "відсутній завершальний символ )" -#: glib/gregex.c:552 +#: glib/gregex.c:613 msgid "reference to non-existent subpattern" msgstr "посилання на вкладений шаблон, якого не існує" -#: glib/gregex.c:556 +#: glib/gregex.c:617 msgid "missing ) after comment" msgstr "відсутня дужка ) після коментаря" -#: glib/gregex.c:560 +#: glib/gregex.c:621 msgid "regular expression is too large" msgstr "задовгий регулярний вираз" -#: glib/gregex.c:564 +#: glib/gregex.c:625 msgid "malformed number or name after (?(" msgstr "неправильне число або назва після (?(" -#: glib/gregex.c:568 +#: glib/gregex.c:629 msgid "lookbehind assertion is not fixed length" msgstr "твердження lookbehind має не фіксовану довжину" -#: glib/gregex.c:572 +#: glib/gregex.c:633 msgid "conditional group contains more than two branches" msgstr "група умови містить більше ніж дві гілки" -#: glib/gregex.c:576 +#: glib/gregex.c:637 msgid "assertion expected after (?(" msgstr "після (?( очікується твердження" -#: glib/gregex.c:580 +#: glib/gregex.c:641 msgid "a numbered reference must not be zero" msgstr "номерне посилання не може бути нулем" -#: glib/gregex.c:584 +#: glib/gregex.c:645 msgid "unknown POSIX class name" msgstr "невідома POSIX-назва класу" -#: glib/gregex.c:589 +#: glib/gregex.c:650 msgid "character value in \\x{...} sequence is too large" msgstr "значення символу у послідовності \\x{...} надто велике" -#: glib/gregex.c:593 +#: glib/gregex.c:654 msgid "\\C not allowed in lookbehind assertion" msgstr "\\C неприпустимий у твердженні lookbehind" -#: glib/gregex.c:597 +#: glib/gregex.c:658 msgid "missing terminator in subpattern name" msgstr "відсутній завершальний символ у назві вкладеного шаблону" -#: glib/gregex.c:601 +#: glib/gregex.c:662 msgid "two named subpatterns have the same name" msgstr "два іменовані вкладені шаблони мають однакову назву" -#: glib/gregex.c:605 +#: glib/gregex.c:666 msgid "malformed \\P or \\p sequence" msgstr "неправильна послідовність \\P чи \\p" -#: glib/gregex.c:609 +#: glib/gregex.c:670 msgid "unknown property name after \\P or \\p" msgstr "невідома назва властивості після \\P чи \\p" -#: glib/gregex.c:613 +#: glib/gregex.c:674 msgid "subpattern name is too long (maximum 32 characters)" msgstr "вкладена назва шаблону надто довга (максимум 32 символів)" -#: glib/gregex.c:617 +#: glib/gregex.c:678 msgid "too many named subpatterns (maximum 10,000)" msgstr "надто багато іменованих вкладених шаблонів (максимум 10,000)" -#: glib/gregex.c:621 +#: glib/gregex.c:682 msgid "octal value is greater than \\377" msgstr "вісімкове значення більше ніж \\377" -#: glib/gregex.c:625 +#: glib/gregex.c:686 msgid "DEFINE group contains more than one branch" msgstr "група DEFINE містить більш ніж одну гілку" -#: glib/gregex.c:629 +#: glib/gregex.c:690 msgid "inconsistent NEWLINE options" msgstr "неузгоджені параметри NEWLINE" -#: glib/gregex.c:633 +#: glib/gregex.c:694 msgid "" "\\g is not followed by a braced, angle-bracketed, or quoted name or number, " "or by a plain number" @@ -5753,120 +5762,120 @@ "\\g не супроводжується назвою або числом у дужках, кутових дужках або " "лапках, або просто числом" -#: glib/gregex.c:638 +#: glib/gregex.c:699 msgid "an argument is not allowed for (*ACCEPT), (*FAIL), or (*COMMIT)" msgstr "не можна вказувати параметр для (*ACCEPT), (*FAIL) або (*COMMIT)" -#: glib/gregex.c:642 +#: glib/gregex.c:703 msgid "(*VERB) not recognized" msgstr "значення (*VERB) не розпізнано" -#: glib/gregex.c:646 +#: glib/gregex.c:707 msgid "number is too big" msgstr "завелике число" -#: glib/gregex.c:650 +#: glib/gregex.c:711 msgid "missing subpattern name after (?&" msgstr "немає назви підшаблону після (?&" -#: glib/gregex.c:654 +#: glib/gregex.c:715 msgid "different names for subpatterns of the same number are not allowed" msgstr "" "не припускається використовувати різні імена для підшаблонів з однаковим " "номером" -#: glib/gregex.c:658 +#: glib/gregex.c:719 msgid "(*MARK) must have an argument" msgstr "для (*MARK) потрібен параметр" -#: glib/gregex.c:662 +#: glib/gregex.c:723 msgid "\\c must be followed by an ASCII character" msgstr "за \\з повинен бути символ ASCII" -#: glib/gregex.c:666 +#: glib/gregex.c:727 msgid "\\k is not followed by a braced, angle-bracketed, or quoted name" msgstr "за \\k не слідує назва у дужках, кутових дужках або лапках" -#: glib/gregex.c:670 +#: glib/gregex.c:731 msgid "\\N is not supported in a class" msgstr "\\N у класі не підтримується" -#: glib/gregex.c:674 +#: glib/gregex.c:735 msgid "name is too long in (*MARK), (*PRUNE), (*SKIP), or (*THEN)" msgstr "задовга назва у (*MARK), (*PRUNE), (*SKIP) або (*THEN)" -#: glib/gregex.c:678 glib/gregex.c:809 +#: glib/gregex.c:739 glib/gregex.c:875 msgid "code overflow" msgstr "переповнення коду" -#: glib/gregex.c:682 +#: glib/gregex.c:743 msgid "unrecognized character after (?P" msgstr "нерозпізнаний символ після (?P" -#: glib/gregex.c:686 +#: glib/gregex.c:747 msgid "overran compiling workspace" msgstr "переповнення при компіляції робочого простору" -#: glib/gregex.c:690 +#: glib/gregex.c:751 msgid "previously-checked referenced subpattern not found" msgstr "" "раніше перевірений вкладений шаблон, на який йде посилання не знайдений" -#: glib/gregex.c:808 glib/gregex.c:1041 glib/gregex.c:2342 +#: glib/gregex.c:874 glib/gregex.c:1121 glib/gregex.c:2444 #, c-format msgid "Error while matching regular expression %s: %s" msgstr "Помилка під час пошуку відповідності регулярному виразу %s: %s" -#: glib/gregex.c:1618 +#: glib/gregex.c:1721 msgid "PCRE library is compiled without UTF8 support" msgstr "Бібліотека PCRE не підтримує UTF8" -#: glib/gregex.c:1626 +#: glib/gregex.c:1729 msgid "PCRE library is compiled with incompatible options" msgstr "Бібліотека PCRE зібрана з несумісними параметрами" -#: glib/gregex.c:1751 +#: glib/gregex.c:1847 #, c-format msgid "Error while compiling regular expression ‘%s’ at char %s: %s" msgstr "Помилка при компіляції регулярного виразу «%s» на символі %s: %s" -#: glib/gregex.c:2786 +#: glib/gregex.c:2887 msgid "hexadecimal digit or “}” expected" msgstr "мало бути використано шістнадцяткову цифру або символ «}»" -#: glib/gregex.c:2802 +#: glib/gregex.c:2903 msgid "hexadecimal digit expected" msgstr "очікується шістнадцяткова цифра" -#: glib/gregex.c:2842 +#: glib/gregex.c:2943 msgid "missing “<” in symbolic reference" msgstr "у символічному посиланні пропущено «<»" -#: glib/gregex.c:2851 +#: glib/gregex.c:2952 msgid "unfinished symbolic reference" msgstr "незакінчене символьне посилання" -#: glib/gregex.c:2858 +#: glib/gregex.c:2959 msgid "zero-length symbolic reference" msgstr "символьне посилання нульової довжини" -#: glib/gregex.c:2869 +#: glib/gregex.c:2970 msgid "digit expected" msgstr "очікується цифра" -#: glib/gregex.c:2887 +#: glib/gregex.c:2988 msgid "illegal symbolic reference" msgstr "некоректне символьне посилання" -#: glib/gregex.c:2950 +#: glib/gregex.c:3051 msgid "stray final “\\”" msgstr "відкидати кінцеві «\\»" -#: glib/gregex.c:2954 +#: glib/gregex.c:3055 msgid "unknown escape sequence" msgstr "невідома escape-послідовність" -#: glib/gregex.c:2964 +#: glib/gregex.c:3065 #, c-format msgid "Error while parsing replacement text “%s” at char %lu: %s" msgstr "" @@ -5896,96 +5905,101 @@ msgid "Text was empty (or contained only whitespace)" msgstr "Текст порожній (чи містить лише пропуски)" -#: glib/gspawn.c:314 +#: glib/gspawn.c:319 #, c-format msgid "Failed to read data from child process (%s)" msgstr "Помилка зчитування даних з дочірнього процесу (%s)" -#: glib/gspawn.c:466 +#: glib/gspawn.c:471 #, c-format msgid "Unexpected error in reading data from a child process (%s)" msgstr "Неочікувана помилка під час читання даних з дочірнього процесу (%s)" -#: glib/gspawn.c:551 +#: glib/gspawn.c:556 #, c-format msgid "Unexpected error in waitpid() (%s)" msgstr "Неочікувана помилка у waitpid() (%s)" -#: glib/gspawn.c:1170 glib/gspawn-win32.c:1488 +#: glib/gspawn.c:1175 glib/gspawn-win32.c:1503 #, c-format msgid "Child process exited with code %ld" msgstr "Дочірній процес закінчився з кодом %ld" -#: glib/gspawn.c:1178 +#: glib/gspawn.c:1183 #, c-format msgid "Child process killed by signal %ld" msgstr "Дочірній процес вбитий за сигналом %ld" -#: glib/gspawn.c:1185 +#: glib/gspawn.c:1190 #, c-format msgid "Child process stopped by signal %ld" msgstr "Дочірній процес зупинений за сигналом %ld" -#: glib/gspawn.c:1192 +#: glib/gspawn.c:1197 #, c-format msgid "Child process exited abnormally" msgstr "Дочірній процес аварійно закінчив роботу" -#: glib/gspawn.c:1885 glib/gspawn-win32.c:393 glib/gspawn-win32.c:401 +#: glib/gspawn.c:2027 glib/gspawn-win32.c:393 glib/gspawn-win32.c:401 #, c-format msgid "Failed to read from child pipe (%s)" msgstr "Помилка зчитування з дочірнього каналу (%s)" -#: glib/gspawn.c:2248 +#: glib/gspawn.c:2399 #, c-format msgid "Failed to spawn child process “%s” (%s)" msgstr "Не вдалося запустити дочірній процес «%s» (%s)" -#: glib/gspawn.c:2365 +#: glib/gspawn.c:2525 #, c-format msgid "Failed to fork (%s)" msgstr "Помилка створення процесу (%s)" -#: glib/gspawn.c:2525 glib/gspawn-win32.c:424 +#: glib/gspawn.c:2685 glib/gspawn-win32.c:424 #, c-format msgid "Failed to change to directory “%s” (%s)" msgstr "Не вдалося змінити каталог на «%s» (%s)" -#: glib/gspawn.c:2535 +#: glib/gspawn.c:2695 #, c-format msgid "Failed to execute child process “%s” (%s)" msgstr "Не вдалося виконати дочірній процес «%s» (%s)" -#: glib/gspawn.c:2545 +#: glib/gspawn.c:2705 #, c-format msgid "Failed to open file to remap file descriptor (%s)" msgstr "Не вдалося відкрити файл для зміни прив'язки дескриптора файла (%s)" -#: glib/gspawn.c:2553 +#: glib/gspawn.c:2713 #, c-format msgid "Failed to duplicate file descriptor for child process (%s)" msgstr "Не вдалося здублювати дескриптор файла для дочірнього процесу (%s)" -#: glib/gspawn.c:2562 +#: glib/gspawn.c:2722 #, c-format msgid "Failed to fork child process (%s)" msgstr "Помилка запуску дочірнього процесу (%s)" -#: glib/gspawn.c:2570 +#: glib/gspawn.c:2730 #, c-format msgid "Failed to close file descriptor for child process (%s)" msgstr "Не вдалося закрити дескриптор файла для дочірнього процесу (%s)" -#: glib/gspawn.c:2578 +#: glib/gspawn.c:2738 #, c-format msgid "Unknown error executing child process “%s”" msgstr "Невідома помилка виконання дочірнього процесу «%s»" -#: glib/gspawn.c:2602 +#: glib/gspawn.c:2762 #, c-format msgid "Failed to read enough data from child pid pipe (%s)" msgstr "Не вдалося зчитати достатню кількість даних з дочірнього каналу (%s)" +#: glib/gspawn-private.h:134 +#, c-format +msgid "Invalid source FDs argument" +msgstr "Неправильний аргумент дескрипторів файлів джерела" + #: glib/gspawn-win32.c:337 msgid "Failed to read data from child process" msgstr "Помилка зчитування даних з дочірнього процесу" @@ -6005,27 +6019,27 @@ msgid "Invalid program name: %s" msgstr "Неправильна назва програми: %s" -#: glib/gspawn-win32.c:521 glib/gspawn-win32.c:853 +#: glib/gspawn-win32.c:521 glib/gspawn-win32.c:868 #, c-format msgid "Invalid string in argument vector at %d: %s" msgstr "Неправильний рядок у векторі аргументів %d: %s" -#: glib/gspawn-win32.c:532 glib/gspawn-win32.c:869 +#: glib/gspawn-win32.c:532 glib/gspawn-win32.c:884 #, c-format msgid "Invalid string in environment: %s" msgstr "Неправильний рядок у середовищі: %s" -#: glib/gspawn-win32.c:849 +#: glib/gspawn-win32.c:864 #, c-format msgid "Invalid working directory: %s" msgstr "Неправильний робочий каталог: %s" -#: glib/gspawn-win32.c:914 +#: glib/gspawn-win32.c:929 #, c-format msgid "Failed to execute helper program (%s)" msgstr "Не вдалося виконати допоміжну програму (%s)" -#: glib/gspawn-win32.c:1143 +#: glib/gspawn-win32.c:1158 msgid "" "Unexpected error in g_io_channel_win32_poll() reading data from a child " "process" @@ -6033,21 +6047,21 @@ "Неочікувана помилка в зчитуванні даних з дочірнього процесу через " "g_io_channel_win32_poll() " -#: glib/gstrfuncs.c:3366 glib/gstrfuncs.c:3468 +#: glib/gstrfuncs.c:3370 glib/gstrfuncs.c:3472 msgid "Empty string is not a number" msgstr "Порожній рядок не є числом" -#: glib/gstrfuncs.c:3390 +#: glib/gstrfuncs.c:3394 #, c-format msgid "“%s” is not a signed number" msgstr "«%s» не є числом зі знаком" -#: glib/gstrfuncs.c:3400 glib/gstrfuncs.c:3504 +#: glib/gstrfuncs.c:3404 glib/gstrfuncs.c:3508 #, c-format msgid "Number “%s” is out of bounds %s, %s" msgstr "Число «%s» не належить до діапазону %s, %s" -#: glib/gstrfuncs.c:3494 +#: glib/gstrfuncs.c:3498 #, c-format msgid "“%s” is not an unsigned number" msgstr "«%s» не є числом без знаку" @@ -6126,133 +6140,133 @@ msgstr "Символ не входить в набір UTF-16" #. Translators: A unit symbol for size formatting, showing for example: "13.0 kB" -#: glib/gutils.c:2857 +#: glib/gutils.c:2966 msgid "kB" msgstr "kB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 MB" -#: glib/gutils.c:2859 +#: glib/gutils.c:2968 msgid "MB" msgstr "МБ" #. Translators: A unit symbol for size formatting, showing for example: "13.0 GB" -#: glib/gutils.c:2861 +#: glib/gutils.c:2970 msgid "GB" msgstr "ГБ" #. Translators: A unit symbol for size formatting, showing for example: "13.0 TB" -#: glib/gutils.c:2863 +#: glib/gutils.c:2972 msgid "TB" msgstr "ТБ" #. Translators: A unit symbol for size formatting, showing for example: "13.0 PB" -#: glib/gutils.c:2865 +#: glib/gutils.c:2974 msgid "PB" msgstr "ПБ" #. Translators: A unit symbol for size formatting, showing for example: "13.0 EB" -#: glib/gutils.c:2867 +#: glib/gutils.c:2976 msgid "EB" msgstr "ЕБ" #. Translators: A unit symbol for size formatting, showing for example: "13.0 KiB" -#: glib/gutils.c:2871 +#: glib/gutils.c:2980 msgid "KiB" msgstr "КіБ" #. Translators: A unit symbol for size formatting, showing for example: "13.0 MiB" -#: glib/gutils.c:2873 +#: glib/gutils.c:2982 msgid "MiB" msgstr "МіБ" #. Translators: A unit symbol for size formatting, showing for example: "13.0 GiB" -#: glib/gutils.c:2875 +#: glib/gutils.c:2984 msgid "GiB" msgstr "ГіБ" #. Translators: A unit symbol for size formatting, showing for example: "13.0 TiB" -#: glib/gutils.c:2877 +#: glib/gutils.c:2986 msgid "TiB" msgstr "ТіБ" #. Translators: A unit symbol for size formatting, showing for example: "13.0 PiB" -#: glib/gutils.c:2879 +#: glib/gutils.c:2988 msgid "PiB" msgstr "ПіБ" #. Translators: A unit symbol for size formatting, showing for example: "13.0 EiB" -#: glib/gutils.c:2881 +#: glib/gutils.c:2990 msgid "EiB" msgstr "ЕіБ" #. Translators: A unit symbol for size formatting, showing for example: "13.0 kb" -#: glib/gutils.c:2885 +#: glib/gutils.c:2994 msgid "kb" msgstr "кб" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Mb" -#: glib/gutils.c:2887 +#: glib/gutils.c:2996 msgid "Mb" msgstr "Мб" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Gb" -#: glib/gutils.c:2889 +#: glib/gutils.c:2998 msgid "Gb" msgstr "Gb" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Tb" -#: glib/gutils.c:2891 +#: glib/gutils.c:3000 msgid "Tb" msgstr "Тб" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Pb" -#: glib/gutils.c:2893 +#: glib/gutils.c:3002 msgid "Pb" msgstr "Пб" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Eb" -#: glib/gutils.c:2895 +#: glib/gutils.c:3004 msgid "Eb" msgstr "Еб" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Kib" -#: glib/gutils.c:2899 +#: glib/gutils.c:3008 msgid "Kib" msgstr "Кіб" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Mib" -#: glib/gutils.c:2901 +#: glib/gutils.c:3010 msgid "Mib" msgstr "Міб" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Gib" -#: glib/gutils.c:2903 +#: glib/gutils.c:3012 msgid "Gib" msgstr "Гіб" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Tib" -#: glib/gutils.c:2905 +#: glib/gutils.c:3014 msgid "Tib" msgstr "Тіб" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Pib" -#: glib/gutils.c:2907 +#: glib/gutils.c:3016 msgid "Pib" msgstr "Піб" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Eib" -#: glib/gutils.c:2909 +#: glib/gutils.c:3018 msgid "Eib" msgstr "Еіб" -#: glib/gutils.c:2947 +#: glib/gutils.c:3056 msgid "byte" msgid_plural "bytes" msgstr0 "байт" msgstr1 "байти" msgstr2 "байтів" -#: glib/gutils.c:2951 +#: glib/gutils.c:3060 msgid "bit" msgid_plural "bits" msgstr0 "біт" @@ -6261,7 +6275,7 @@ #. Translators: The "%u" is replaced with the size value, like "13"; it could #. * be part of "13 bytes", but only the number is requested this time. -#: glib/gutils.c:2959 +#: glib/gutils.c:3068 #, c-format msgctxt "format-size" msgid "%u" @@ -6269,7 +6283,7 @@ #. Translators: The first "%u" is replaced with the value, the "%s" with a unit of the value. #. * The order can be changed with "%$2s %$1u". An example: "13 bytes" -#: glib/gutils.c:2964 +#: glib/gutils.c:3073 #, c-format msgctxt "format-size" msgid "%u %s" @@ -6277,7 +6291,7 @@ #. Translators: The "%.1f" is replaced with the size value, like "13.0"; it could #. * be part of "13.0 MB", but only the number is requested this time. -#: glib/gutils.c:3000 +#: glib/gutils.c:3109 #, c-format msgctxt "format-size" msgid "%.1f" @@ -6286,14 +6300,14 @@ #. Translators: The first "%.1f" is replaced with the value, the "%s" with a unit of the value. #. * The order can be changed with "%$2s %$1.1f". Keep the no-break space between the value and #. * the unit symbol. An example: "13.0 MB" -#: glib/gutils.c:3006 +#: glib/gutils.c:3115 #, c-format msgctxt "format-size" msgid "%.1f %s" msgstr "%.1f %s" #. Translators: the %s in "%s bytes" will always be replaced by a number. -#: glib/gutils.c:3046 +#: glib/gutils.c:3155 #, c-format msgid "%s byte" msgid_plural "%s bytes" @@ -6302,7 +6316,7 @@ msgstr2 "%s байтів" #. Translators: the %s in "%s bits" will always be replaced by a number. -#: glib/gutils.c:3051 +#: glib/gutils.c:3160 #, c-format msgid "%s bit" msgid_plural "%s bits" @@ -6310,7 +6324,7 @@ msgstr1 "%s біти" msgstr2 "%s бітів" -#: glib/gutils.c:3092 +#: glib/gutils.c:3201 #, c-format msgid "%u byte" msgid_plural "%u bytes" @@ -6323,32 +6337,32 @@ #. * compatibility. Users will not see this string unless a program is using this deprecated function. #. * Please translate as literally as possible. #. -#: glib/gutils.c:3105 +#: glib/gutils.c:3214 #, c-format msgid "%.1f KB" msgstr "%.1f КБ" -#: glib/gutils.c:3110 +#: glib/gutils.c:3219 #, c-format msgid "%.1f MB" msgstr "%.1f МБ" -#: glib/gutils.c:3115 +#: glib/gutils.c:3224 #, c-format msgid "%.1f GB" msgstr "%.1f ГБ" -#: glib/gutils.c:3120 +#: glib/gutils.c:3229 #, c-format msgid "%.1f TB" msgstr "%.1f ТБ" -#: glib/gutils.c:3125 +#: glib/gutils.c:3234 #, c-format msgid "%.1f PB" msgstr "%.1f ПБ" -#: glib/gutils.c:3130 +#: glib/gutils.c:3239 #, c-format msgid "%.1f EB" msgstr "%.1f ЕБ"
View file
_service:tar_scm:glib-2.74.4.tar.xz/po/zh_CN.po -> _service:tar_scm:glib-2.76.4.tar.xz/po/zh_CN.po
Changed
@@ -18,14 +18,15 @@ # Mingcong Bai <jeffbai@aosc.xyz>, 2015, 2016, 2018. # Dingzhong Chen <wsxy162@gmail.com>, 2018-2021. # lumingzh <lumingzh@qq.com>, 2022. +# Nanling <neithern@outlook.com>, 2023. # msgid "" msgstr "" "Project-Id-Version: glib master\n" "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/glib/issues\n" -"POT-Creation-Date: 2022-08-31 23:44+0000\n" -"PO-Revision-Date: 2022-09-11 07:57+0800\n" -"Last-Translator: lumingzh <lumingzh@qq.com>\n" +"POT-Creation-Date: 2023-02-15 16:30+0000\n" +"PO-Revision-Date: 2023-03-26 11:52+0800\n" +"Last-Translator: Nanling <neithern@outlook.com>\n" "Language-Team: Chinese - China <i18n-zh@googlegroups.com>\n" "Language: zh_CN\n" "MIME-Version: 1.0\n" @@ -34,20 +35,20 @@ "Plural-Forms: nplurals=1; plural=0\n" "X-Generator: Gtranslator 42.0\n" -#: gio/gappinfo.c:335 +#: gio/gappinfo.c:339 msgid "Setting default applications not supported yet" msgstr "暂不支持设置默认应用程序" -#: gio/gappinfo.c:368 +#: gio/gappinfo.c:372 msgid "Setting application as last used for type not supported yet" msgstr "暂不支持设置上次用来打开文件类型的应用程序" -#: gio/gappinfo.c:810 +#: gio/gappinfo.c:814 #, c-format msgid "Failed to find default application for content type ‘%s’" msgstr "无法找到处理内容类型“%s”的默认应用程序" -#: gio/gappinfo.c:870 +#: gio/gappinfo.c:874 #, c-format msgid "Failed to find default application for URI Scheme ‘%s’" msgstr "无法找到处理 URI Scheme“%s”的默认应用程序" @@ -244,11 +245,11 @@ msgid "error sending %s message to application: %s\n" msgstr "给应用程序发送 %s 消息时出错：%s\n" -#: gio/gapplication-tool.c:321 +#: gio/gapplication-tool.c:324 msgid "action name must be given after application id\n" msgstr "操作名必须在应用程序 ID 后给出\n" -#: gio/gapplication-tool.c:329 +#: gio/gapplication-tool.c:332 #, c-format msgid "" "invalid action name: “%s”\n" @@ -257,25 +258,25 @@ "无效的操作名：“%s”\n" "操作名只能由字母数字、“-”和“.”组成\n" -#: gio/gapplication-tool.c:348 +#: gio/gapplication-tool.c:351 #, c-format msgid "error parsing action parameter: %s\n" msgstr "解析操作参数时出错：%s\n" -#: gio/gapplication-tool.c:360 +#: gio/gapplication-tool.c:363 msgid "actions accept a maximum of one parameter\n" msgstr "操作最多接受一个参数\n" -#: gio/gapplication-tool.c:415 +#: gio/gapplication-tool.c:418 msgid "list-actions command takes only the application id" msgstr "list-actions 命令只能接受应用程序的 ID" -#: gio/gapplication-tool.c:425 +#: gio/gapplication-tool.c:428 #, c-format msgid "unable to find desktop file for application %s\n" msgstr "找不到与应用程序 %s 对应的桌面文件\n" -#: gio/gapplication-tool.c:470 +#: gio/gapplication-tool.c:473 #, c-format msgid "" "unrecognised command: %s\n" @@ -310,7 +311,7 @@ msgid "Truncate not supported on base stream" msgstr "基流不支持截断" -#: gio/gcancellable.c:319 gio/gdbusconnection.c:1859 gio/gdbusprivate.c:1420 +#: gio/gcancellable.c:326 gio/gdbusconnection.c:1859 gio/gdbusprivate.c:1420 #: gio/gsimpleasyncresult.c:873 gio/gsimpleasyncresult.c:899 #, c-format msgid "Operation was cancelled" @@ -330,13 +331,13 @@ #: gio/gcharsetconverter.c:344 gio/gdatainputstream.c:850 #: gio/gdatainputstream.c:1268 glib/gconvert.c:451 glib/gconvert.c:883 -#: glib/giochannel.c:1576 glib/giochannel.c:1618 glib/giochannel.c:2473 +#: glib/giochannel.c:1576 glib/giochannel.c:1618 glib/giochannel.c:2478 #: glib/gutf8.c:892 glib/gutf8.c:1346 msgid "Invalid byte sequence in conversion input" msgstr "转换输入中有无效的字符序列" #: gio/gcharsetconverter.c:349 glib/gconvert.c:459 glib/gconvert.c:797 -#: glib/giochannel.c:1583 glib/giochannel.c:2485 +#: glib/giochannel.c:1583 glib/giochannel.c:2493 #, c-format msgid "Error during conversion: %s" msgstr "转换过程中出错：%s" @@ -393,153 +394,153 @@ msgid "Unexpected early end-of-stream" msgstr "非预期的过早的流结束符" -#: gio/gdbusaddress.c:164 gio/gdbusaddress.c:238 gio/gdbusaddress.c:327 +#: gio/gdbusaddress.c:162 gio/gdbusaddress.c:234 gio/gdbusaddress.c:321 #, c-format msgid "Unsupported key “%s” in address entry “%s”" msgstr "地址条目“%2$s”中有未支持的键“%1$s”" -#: gio/gdbusaddress.c:177 +#: gio/gdbusaddress.c:175 #, c-format msgid "Meaningless key/value pair combination in address entry “%s”" msgstr "地址条目“%s”中有无意义的键/值对组合" -#: gio/gdbusaddress.c:186 +#: gio/gdbusaddress.c:184 #, c-format msgid "" "Address “%s” is invalid (need exactly one of path, dir, tmpdir, or abstract " "keys)" msgstr "地址“%s”无效（需要指定一个且仅一个的路径、目录、临时目录或抽象键）" -#: gio/gdbusaddress.c:253 gio/gdbusaddress.c:264 gio/gdbusaddress.c:279 -#: gio/gdbusaddress.c:342 gio/gdbusaddress.c:353 +#: gio/gdbusaddress.c:249 gio/gdbusaddress.c:260 gio/gdbusaddress.c:275 +#: gio/gdbusaddress.c:336 gio/gdbusaddress.c:347 #, c-format msgid "Error in address “%s” — the “%s” attribute is malformed" msgstr "地址“%s”中有错误——\"%s\"属性格式错误" -#: gio/gdbusaddress.c:423 gio/gdbusaddress.c:682 +#: gio/gdbusaddress.c:417 gio/gdbusaddress.c:676 #, c-format msgid "Unknown or unsupported transport “%s” for address “%s”" msgstr "传输“%s”对于地址“%s”未知或不支持" -#: gio/gdbusaddress.c:467 +#: gio/gdbusaddress.c:461 #, c-format msgid "Address element “%s” does not contain a colon (:)" msgstr "地址元素“%s”未包含冒号（:）" -#: gio/gdbusaddress.c:476 +#: gio/gdbusaddress.c:470 #, c-format msgid "Transport name in address element “%s” must not be empty" msgstr "地址元素“%s”中的传输名称不能为空" -#: gio/gdbusaddress.c:497 +#: gio/gdbusaddress.c:491 #, c-format msgid "" "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:508 +#: gio/gdbusaddress.c:502 #, 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:522 +#: gio/gdbusaddress.c:516 #, c-format msgid "" "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:590 +#: gio/gdbusaddress.c:584 #, c-format msgid "" "Error in address “%s” — the unix transport requires exactly one of the keys " "“path” or “abstract” to be set" msgstr "地址“%s”中有错误——UNIX 传输需要“path”或“abstract”之一的键被设置" -#: gio/gdbusaddress.c:625 +#: gio/gdbusaddress.c:619 #, c-format msgid "Error in address “%s” — the host attribute is missing or malformed" msgstr "地址“%s”中有错误——主机属性丢失或格式错误" -#: gio/gdbusaddress.c:639 +#: gio/gdbusaddress.c:633 #, c-format msgid "Error in address “%s” — the port attribute is missing or malformed" msgstr "地址“%s”中有错误——端口属性丢失或格式错误" -#: gio/gdbusaddress.c:653 +#: gio/gdbusaddress.c:647 #, c-format msgid "Error in address “%s” — the noncefile attribute is missing or malformed" msgstr "地址“%s”中有错误——临时文件属性丢失或格式错误" -#: gio/gdbusaddress.c:674 +#: gio/gdbusaddress.c:668 msgid "Error auto-launching: " msgstr "自动启动出错：" -#: gio/gdbusaddress.c:727 +#: gio/gdbusaddress.c:721 #, c-format msgid "Error opening nonce file “%s”: %s" msgstr "打开临时文件“%s”时出错：%s" -#: gio/gdbusaddress.c:746 +#: gio/gdbusaddress.c:740 #, c-format msgid "Error reading from nonce file “%s”: %s" msgstr "读取临时文件“%s”时出错：%s" -#: gio/gdbusaddress.c:755 +#: gio/gdbusaddress.c:749 #, c-format msgid "Error reading from nonce file “%s”, expected 16 bytes, got %d" msgstr "读取临时文件“%s”时出错，预计 16 个字节，得到 %d 个" -#: gio/gdbusaddress.c:773 +#: gio/gdbusaddress.c:767 #, c-format msgid "Error writing contents of nonce file “%s” to stream:" msgstr "写入临时文件“%s”的内容到流时出错：" -#: gio/gdbusaddress.c:988 +#: gio/gdbusaddress.c:982 msgid "The given address is empty" msgstr "给定的地址为空" -#: gio/gdbusaddress.c:1101 +#: gio/gdbusaddress.c:1095 #, c-format msgid "Cannot spawn a message bus when AT_SECURE is set" msgstr "无法在已设置 AT_SECURE 时启动一条消息总线" -#: gio/gdbusaddress.c:1108 +#: gio/gdbusaddress.c:1102 msgid "Cannot spawn a message bus without a machine-id: " msgstr "无法在无机器 ID 时生成一条消息总线：" -#: gio/gdbusaddress.c:1115 +#: gio/gdbusaddress.c:1109 #, c-format msgid "Cannot autolaunch D-Bus without X11 $DISPLAY" msgstr "无法在没有 X11 $DISPLAY 的情况下自动启动 D-Bus" -#: gio/gdbusaddress.c:1157 +#: gio/gdbusaddress.c:1151 #, c-format msgid "Error spawning command line “%s”: " msgstr "生成并运行命令行“%s”时出错：" -#: gio/gdbusaddress.c:1226 +#: gio/gdbusaddress.c:1220 #, c-format msgid "Cannot determine session bus address (not implemented for this OS)" msgstr "无法确定会话总线地址（尚未在此操作系统上实现）" -#: gio/gdbusaddress.c:1375 gio/gdbusconnection.c:7321 +#: gio/gdbusaddress.c:1374 gio/gdbusconnection.c:7316 #, c-format msgid "" "Cannot determine bus address from DBUS_STARTER_BUS_TYPE environment variable " "— unknown value “%s”" msgstr "无法从 DBUS_STARTER_BUS_TYPE 环境变量确定总线地址——未知的值“%s”" -#: gio/gdbusaddress.c:1384 gio/gdbusconnection.c:7330 +#: gio/gdbusaddress.c:1383 gio/gdbusconnection.c:7325 msgid "" "Cannot determine bus address because the DBUS_STARTER_BUS_TYPE environment " "variable is not set" msgstr "无法确定总线地址，因为环境变量 DBUS_STARTER_BUS_TYPE 未设置" -#: gio/gdbusaddress.c:1394 +#: gio/gdbusaddress.c:1393 #, c-format msgid "Unknown bus type %d" msgstr "未知的总线类型 %d" @@ -558,11 +559,15 @@ "Exhausted all available authentication mechanisms (tried: %s) (available: %s)" msgstr "用尽了所有可用的认证机制（已尝试：%s）（可用的：%s）" -#: gio/gdbusauth.c:1178 +#: gio/gdbusauth.c:1045 +msgid "Unexpected lack of content trying to read a byte" +msgstr "试图读取一个字节时异常地缺少内容" + +#: gio/gdbusauth.c:1195 msgid "User IDs must be the same for peer and server" msgstr "对等端和服务器端的用户 ID 必须相同" -#: gio/gdbusauth.c:1190 +#: gio/gdbusauth.c:1207 msgid "Cancelled via GDBusAuthObserver::authorize-authenticated-peer" msgstr "通过 GDBusAuthObserver::authorize-authenticated-peer 取消" @@ -649,7 +654,7 @@ msgid "(Additionally, releasing the lock for “%s” also failed: %s) " msgstr "（此外，解除“%s”的锁定也失败了：%s） " -#: gio/gdbusconnection.c:590 gio/gdbusconnection.c:2404 +#: gio/gdbusconnection.c:590 gio/gdbusconnection.c:2405 msgid "The connection is closed" msgstr "连接已关闭" @@ -657,137 +662,137 @@ msgid "Timeout was reached" msgstr "已到超时限制" -#: gio/gdbusconnection.c:2527 +#: gio/gdbusconnection.c:2528 msgid "" "Unsupported flags encountered when constructing a client-side connection" msgstr "构建客户端连接时遇到不支持的标志" -#: gio/gdbusconnection.c:4256 gio/gdbusconnection.c:4610 +#: gio/gdbusconnection.c:4257 gio/gdbusconnection.c:4611 #, c-format msgid "" "No such interface “org.freedesktop.DBus.Properties” on object at path %s" msgstr "路径 %s 的对象上没有“org.freedesktop.DBus.Properties”接口" -#: gio/gdbusconnection.c:4401 +#: gio/gdbusconnection.c:4402 #, c-format msgid "No such property “%s”" msgstr "无此属性“%s”" -#: gio/gdbusconnection.c:4413 +#: gio/gdbusconnection.c:4414 #, c-format msgid "Property “%s” is not readable" msgstr "属性“%s”不可读" -#: gio/gdbusconnection.c:4424 +#: gio/gdbusconnection.c:4425 #, c-format msgid "Property “%s” is not writable" msgstr "属性“%s”不可写" -#: gio/gdbusconnection.c:4444 +#: gio/gdbusconnection.c:4445 #, c-format msgid "Error setting property “%s”: Expected type “%s” but got “%s”" msgstr "设置属性“%s”时出错：期望“%s”类型但得到了“%s”类型" -#: gio/gdbusconnection.c:4549 gio/gdbusconnection.c:4764 -#: gio/gdbusconnection.c:6747 +#: gio/gdbusconnection.c:4550 gio/gdbusconnection.c:4765 +#: gio/gdbusconnection.c:6742 #, c-format msgid "No such interface “%s”" msgstr "无此接口“%s”" -#: gio/gdbusconnection.c:4986 gio/gdbusconnection.c:7261 +#: gio/gdbusconnection.c:4981 gio/gdbusconnection.c:7256 #, c-format msgid "No such interface “%s” on object at path %s" msgstr "在路径 %s 的对象上没有“%s”接口" -#: gio/gdbusconnection.c:5087 +#: gio/gdbusconnection.c:5082 #, c-format msgid "No such method “%s”" msgstr "没有“%s”这个方法" -#: gio/gdbusconnection.c:5118 +#: gio/gdbusconnection.c:5113 #, c-format msgid "Type of message, “%s”, does not match expected type “%s”" msgstr "消息的类型“%s”，与预期的类型“%s”不匹配" -#: gio/gdbusconnection.c:5321 +#: gio/gdbusconnection.c:5316 #, c-format msgid "An object is already exported for the interface %s at %s" msgstr "已为 %2$s 处的接口 %1$s 导出了一个对象" -#: gio/gdbusconnection.c:5548 +#: gio/gdbusconnection.c:5543 #, c-format msgid "Unable to retrieve property %s.%s" msgstr "无法检索属性 %s.%s" -#: gio/gdbusconnection.c:5604 +#: gio/gdbusconnection.c:5599 #, c-format msgid "Unable to set property %s.%s" msgstr "无法设置属性 %s.%s" -#: gio/gdbusconnection.c:5783 +#: gio/gdbusconnection.c:5778 #, c-format msgid "Method “%s” returned type “%s”, but expected “%s”" msgstr "方法“%s”返回类型“%s”，但预期的是“%s”" -#: gio/gdbusconnection.c:6859 +#: gio/gdbusconnection.c:6854 #, c-format msgid "Method “%s” on interface “%s” with signature “%s” does not exist" msgstr "带有“%3$s”签名的接口“%2$s”上不存在“%1$s”方法" -#: gio/gdbusconnection.c:6980 +#: gio/gdbusconnection.c:6975 #, c-format msgid "A subtree is already exported for %s" msgstr "已经为 %s 导出一个子树" -#: gio/gdbusconnection.c:7269 +#: gio/gdbusconnection.c:7264 #, c-format msgid "Object does not exist at path “%s”" msgstr "对象在路径“%s”处不存在" -#: gio/gdbusmessage.c:1303 +#: gio/gdbusmessage.c:1306 msgid "type is INVALID" msgstr "类型无效" -#: gio/gdbusmessage.c:1314 +#: gio/gdbusmessage.c:1317 msgid "METHOD_CALL message: PATH or MEMBER header field is missing" msgstr "METHOD_CALL 消息：PATH 或 MEMBER 首部字段缺失" -#: gio/gdbusmessage.c:1325 +#: gio/gdbusmessage.c:1328 msgid "METHOD_RETURN message: REPLY_SERIAL header field is missing" msgstr "METHOD_RETURN 消息：REPLY_SERIAL 首部字段缺失" -#: gio/gdbusmessage.c:1337 +#: gio/gdbusmessage.c:1340 msgid "ERROR message: REPLY_SERIAL or ERROR_NAME header field is missing" msgstr "错误消息：REPLY_SERIAL 或 ERROR_NAME 首部字段缺失" -#: gio/gdbusmessage.c:1350 +#: gio/gdbusmessage.c:1353 msgid "SIGNAL message: PATH, INTERFACE or MEMBER header field is missing" msgstr "信号消息：PATH、INTERFACE 或 MEMBER METHOD_RETURN缺失" -#: gio/gdbusmessage.c:1358 +#: gio/gdbusmessage.c:1361 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:1366 +#: gio/gdbusmessage.c:1369 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:1414 gio/gdbusmessage.c:1474 +#: gio/gdbusmessage.c:1417 gio/gdbusmessage.c:1477 #, c-format msgid "Wanted to read %lu byte but only got %lu" msgid_plural "Wanted to read %lu bytes but only got %lu" msgstr0 "期望读取 %lu 个字节但只得到 %lu 个" -#: gio/gdbusmessage.c:1428 +#: gio/gdbusmessage.c:1431 #, c-format msgid "Expected NUL byte after the string “%s” but found byte %d" msgstr "期望“%s”后为 NUL 字节但找到了字节 %d" -#: gio/gdbusmessage.c:1447 +#: gio/gdbusmessage.c:1450 #, c-format msgid "" "Expected valid UTF-8 string but found invalid bytes at byte offset %d " @@ -796,21 +801,21 @@ "期望得到有效的 UTF-8 字符串，但在字节偏移 %d 处（字符串长度为 %d）找到了无效" "的字节。该点的有效 UTF-8 字符串曾是“%s”" -#: gio/gdbusmessage.c:1511 gio/gdbusmessage.c:1787 gio/gdbusmessage.c:1998 +#: gio/gdbusmessage.c:1514 gio/gdbusmessage.c:1790 gio/gdbusmessage.c:2001 msgid "Value nested too deeply" msgstr "值嵌套过深" -#: gio/gdbusmessage.c:1679 +#: gio/gdbusmessage.c:1682 #, c-format msgid "Parsed value “%s” is not a valid D-Bus object path" msgstr "已解析的值“%s”不是有效的 D-Bus 对象路径" -#: gio/gdbusmessage.c:1703 +#: gio/gdbusmessage.c:1706 #, c-format msgid "Parsed value “%s” is not a valid D-Bus signature" msgstr "已解析的值“%s”不是有效的 D-Bus 签名" -#: gio/gdbusmessage.c:1754 +#: gio/gdbusmessage.c:1757 #, c-format msgid "" "Encountered array of length %u byte. Maximum length is 2<<26 bytes (64 MiB)." @@ -818,7 +823,7 @@ "Encountered array of length %u bytes. Maximum length is 2<<26 bytes (64 MiB)." msgstr0 "遇到长度为 %u 字节的数组。最大长度应为 2<<26 字节（64 MiB）。" -#: gio/gdbusmessage.c:1774 +#: gio/gdbusmessage.c:1777 #, c-format msgid "" "Encountered array of type “a%c”, expected to have a length a multiple of %u " @@ -826,96 +831,96 @@ msgstr "" "遇到类型为“a%c”的数组，需要长度为 %u 字节的倍数，但是找到的长度为 %u 字节" -#: gio/gdbusmessage.c:1928 gio/gdbusmessage.c:2647 +#: gio/gdbusmessage.c:1931 gio/gdbusmessage.c:2650 msgid "Empty structures (tuples) are not allowed in D-Bus" msgstr "D-Bus 中不允许空结构（tuples）" -#: gio/gdbusmessage.c:1982 +#: gio/gdbusmessage.c:1985 #, c-format msgid "Parsed value “%s” for variant is not a valid D-Bus signature" msgstr "变量的已解析值“%s”不是有效的 D-Bus 签名" -#: gio/gdbusmessage.c:2023 +#: gio/gdbusmessage.c:2026 #, c-format msgid "" "Error deserializing GVariant with type string “%s” from the D-Bus wire format" msgstr "从 D-Bus 线格式以类型字符串“%s”反序列化 GVariant 时发生错误" -#: gio/gdbusmessage.c:2208 +#: gio/gdbusmessage.c:2211 #, c-format msgid "" "Invalid endianness value. Expected 0x6c (“l”) or 0x42 (“B”) but found value " "0x%02x" msgstr "无效的字节序值。期望为 0x6c（“l”）或 0x42（“B”）但找到值 0x%02x" -#: gio/gdbusmessage.c:2227 +#: gio/gdbusmessage.c:2230 #, c-format msgid "Invalid major protocol version. Expected 1 but found %d" msgstr "无效的主协议版本。期望 1，但是找到了 %d" -#: gio/gdbusmessage.c:2285 gio/gdbusmessage.c:2883 +#: gio/gdbusmessage.c:2288 gio/gdbusmessage.c:2886 msgid "Signature header found but is not of type signature" msgstr "找到了签名首部但不属于类型签名" -#: gio/gdbusmessage.c:2297 +#: gio/gdbusmessage.c:2300 #, c-format msgid "Signature header with signature “%s” found but message body is empty" msgstr "发现签名“%s”的签名首部，但消息主体为空" -#: gio/gdbusmessage.c:2312 +#: gio/gdbusmessage.c:2315 #, c-format msgid "Parsed value “%s” is not a valid D-Bus signature (for body)" msgstr "已解析的值“%s”不是有效的 D-Bus 签名（针对消息主体）" -#: gio/gdbusmessage.c:2344 +#: gio/gdbusmessage.c:2347 #, 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" msgstr0 "消息中没有签名首部，但消息主体为 %u 字节" -#: gio/gdbusmessage.c:2354 +#: gio/gdbusmessage.c:2357 msgid "Cannot deserialize message: " msgstr "无法反序列化消息：" -#: gio/gdbusmessage.c:2700 +#: gio/gdbusmessage.c:2703 #, c-format msgid "" "Error serializing GVariant with type string “%s” to the D-Bus wire format" msgstr "以类型字符串“%s”序列化 GVariant 到 D-Bus 线格式时发生错误" -#: gio/gdbusmessage.c:2837 +#: gio/gdbusmessage.c:2840 #, c-format msgid "" "Number of file descriptors in message (%d) differs from header field (%d)" msgstr "消息中的文件描述符数量（%d）与首部字段中的（%d）不同" -#: gio/gdbusmessage.c:2845 +#: gio/gdbusmessage.c:2848 msgid "Cannot serialize message: " msgstr "无法序列化消息：" -#: gio/gdbusmessage.c:2898 +#: gio/gdbusmessage.c:2901 #, c-format msgid "Message body has signature “%s” but there is no signature header" msgstr "消息主体有签名“%s”但是没有签名首部" -#: gio/gdbusmessage.c:2908 +#: gio/gdbusmessage.c:2911 #, c-format msgid "" "Message body has type signature “%s” but signature in the header field is " "“%s”" msgstr "消息主体有类型签名“%s”但首部字段的签名为“%s”" -#: gio/gdbusmessage.c:2924 +#: gio/gdbusmessage.c:2927 #, c-format msgid "Message body is empty but signature in the header field is “(%s)”" msgstr "消息主体为空，但首部字段的签名为“(%s)”" -#: gio/gdbusmessage.c:3479 +#: gio/gdbusmessage.c:3482 #, c-format msgid "Error return with body of type “%s”" msgstr "出错，返回了“%s”类型的主体" -#: gio/gdbusmessage.c:3487 +#: gio/gdbusmessage.c:3490 msgid "Error return with empty body" msgstr "出错，返回了空的主体" @@ -940,17 +945,17 @@ msgid "Unable to load %s or %s: " msgstr "无法载入 %s 或 %s：" -#: gio/gdbusproxy.c:1575 +#: gio/gdbusproxy.c:1568 #, c-format msgid "Error calling StartServiceByName for %s: " msgstr "为 %s 调用 StartServiceByName 时出错：" -#: gio/gdbusproxy.c:1598 +#: gio/gdbusproxy.c:1591 #, c-format msgid "Unexpected reply %d from StartServiceByName(\"%s\") method" msgstr "从 StartServiceByName(\"%2$s\") 方法获得意外回复 %1$d" -#: gio/gdbusproxy.c:2709 gio/gdbusproxy.c:2844 +#: gio/gdbusproxy.c:2702 gio/gdbusproxy.c:2837 #, c-format msgid "" "Cannot invoke method; proxy is for the well-known name %s without an owner, " @@ -959,25 +964,25 @@ "无法调用方法；代理名称为常见的无所有者的名称 %s，且代理使用 " "G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START 标记构建" -#: gio/gdbusserver.c:765 +#: gio/gdbusserver.c:758 msgid "Abstract namespace not supported" msgstr "不支持抽象命名空间" -#: gio/gdbusserver.c:857 +#: gio/gdbusserver.c:850 msgid "Cannot specify nonce file when creating a server" msgstr "创建服务器时无法指定临时文件" -#: gio/gdbusserver.c:939 +#: gio/gdbusserver.c:932 #, c-format msgid "Error writing nonce file at “%s”: %s" msgstr "写入“%s”处的临时文件时出错：%s" -#: gio/gdbusserver.c:1114 +#: gio/gdbusserver.c:1107 #, c-format msgid "The string “%s” is not a valid D-Bus GUID" msgstr "字符串“%s”不是有效 D-Bus GUID" -#: gio/gdbusserver.c:1152 +#: gio/gdbusserver.c:1145 #, c-format msgid "Cannot listen on unsupported transport “%s”" msgstr "无法监听不支持的传输“%s”" @@ -1006,14 +1011,14 @@ "\n" "使用“%s 命令 --help”以获得每一个命令的帮助。\n" -#: gio/gdbus-tool.c:204 gio/gdbus-tool.c:276 gio/gdbus-tool.c:348 -#: gio/gdbus-tool.c:372 gio/gdbus-tool.c:862 gio/gdbus-tool.c:1247 -#: gio/gdbus-tool.c:1734 +#: gio/gdbus-tool.c:204 gio/gdbus-tool.c:276 gio/gdbus-tool.c:347 +#: gio/gdbus-tool.c:371 gio/gdbus-tool.c:861 gio/gdbus-tool.c:1246 +#: gio/gdbus-tool.c:1733 #, c-format msgid "Error: %s\n" msgstr "错误：%s\n" -#: gio/gdbus-tool.c:215 gio/gdbus-tool.c:289 gio/gdbus-tool.c:1750 +#: gio/gdbus-tool.c:215 gio/gdbus-tool.c:289 gio/gdbus-tool.c:1749 #, c-format msgid "Error parsing introspection XML: %s\n" msgstr "解析 Introspection XML 时出错：%s\n" @@ -1023,241 +1028,241 @@ msgid "Error: %s is not a valid name\n" msgstr "错误：%s 不是有效的名称\n" -#: gio/gdbus-tool.c:258 gio/gdbus-tool.c:748 gio/gdbus-tool.c:1066 -#: gio/gdbus-tool.c:1900 gio/gdbus-tool.c:2140 +#: gio/gdbus-tool.c:258 gio/gdbus-tool.c:747 gio/gdbus-tool.c:1065 +#: gio/gdbus-tool.c:1899 gio/gdbus-tool.c:2139 #, c-format msgid "Error: %s is not a valid object path\n" msgstr "错误：%s 不是有效的对象路径\n" -#: gio/gdbus-tool.c:406 +#: gio/gdbus-tool.c:405 msgid "Connect to the system bus" msgstr "连接到系统总线" -#: gio/gdbus-tool.c:407 +#: gio/gdbus-tool.c:406 msgid "Connect to the session bus" msgstr "连接到会话总线" -#: gio/gdbus-tool.c:408 +#: gio/gdbus-tool.c:407 msgid "Connect to given D-Bus address" msgstr "连接到给定的 D-Bus 地址" -#: gio/gdbus-tool.c:418 +#: gio/gdbus-tool.c:417 msgid "Connection Endpoint Options:" msgstr "连接端点选项：" -#: gio/gdbus-tool.c:419 +#: gio/gdbus-tool.c:418 msgid "Options specifying the connection endpoint" msgstr "指定连接端点的选项" # 没有>未，消歧义 -#: gio/gdbus-tool.c:442 +#: gio/gdbus-tool.c:441 #, c-format msgid "No connection endpoint specified" msgstr "未指定连接的端点" -#: gio/gdbus-tool.c:452 +#: gio/gdbus-tool.c:451 #, c-format msgid "Multiple connection endpoints specified" msgstr "指定了多个连接端点" -#: gio/gdbus-tool.c:525 +#: gio/gdbus-tool.c:524 #, c-format msgid "" "Warning: According to introspection data, interface “%s” does not exist\n" msgstr "警告：根据 Introspection 数据，接口“%s”不存在\n" -#: gio/gdbus-tool.c:534 +#: gio/gdbus-tool.c:533 #, c-format msgid "" "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:596 +#: gio/gdbus-tool.c:595 msgid "Optional destination for signal (unique name)" msgstr "信号的可选目标位置（唯一名称）" -#: gio/gdbus-tool.c:597 +#: gio/gdbus-tool.c:596 msgid "Object path to emit signal on" msgstr "要触发信号的对象路径" -#: gio/gdbus-tool.c:598 +#: gio/gdbus-tool.c:597 msgid "Signal and interface name" msgstr "信号和接口名称" -#: gio/gdbus-tool.c:631 +#: gio/gdbus-tool.c:630 msgid "Emit a signal." msgstr "发射信号。" -#: gio/gdbus-tool.c:686 gio/gdbus-tool.c:1003 gio/gdbus-tool.c:1837 -#: gio/gdbus-tool.c:2069 gio/gdbus-tool.c:2289 +#: gio/gdbus-tool.c:685 gio/gdbus-tool.c:1002 gio/gdbus-tool.c:1836 +#: gio/gdbus-tool.c:2068 gio/gdbus-tool.c:2288 #, c-format msgid "Error connecting: %s\n" msgstr "连接时出错：%s\n" -#: gio/gdbus-tool.c:706 +#: gio/gdbus-tool.c:705 #, c-format msgid "Error: %s is not a valid unique bus name.\n" msgstr "错误：%s 不是有效的唯一总线名。\n" -#: gio/gdbus-tool.c:725 gio/gdbus-tool.c:1046 gio/gdbus-tool.c:1880 +#: gio/gdbus-tool.c:724 gio/gdbus-tool.c:1045 gio/gdbus-tool.c:1879 msgid "Error: Object path is not specified\n" msgstr "错误：未指定对象路径\n" -#: gio/gdbus-tool.c:768 +#: gio/gdbus-tool.c:767 msgid "Error: Signal name is not specified\n" msgstr "错误：未指定信号名\n" -#: gio/gdbus-tool.c:782 +#: gio/gdbus-tool.c:781 #, c-format msgid "Error: Signal name “%s” is invalid\n" msgstr "错误：信号名“%s”无效\n" -#: gio/gdbus-tool.c:794 +#: gio/gdbus-tool.c:793 #, c-format msgid "Error: %s is not a valid interface name\n" msgstr "错误：%s 不是有效的接口名称。\n" -#: gio/gdbus-tool.c:800 +#: gio/gdbus-tool.c:799 #, c-format msgid "Error: %s is not a valid member name\n" msgstr "错误：%s 不是有效的成员名称。\n" #. Use the original non-"parse-me-harder" error -#: gio/gdbus-tool.c:837 gio/gdbus-tool.c:1178 +#: gio/gdbus-tool.c:836 gio/gdbus-tool.c:1177 #, c-format msgid "Error parsing parameter %d: %s\n" msgstr "解析第 %d 个选项时出错：%s\n" -#: gio/gdbus-tool.c:869 +#: gio/gdbus-tool.c:868 #, c-format msgid "Error flushing connection: %s\n" msgstr "刷新连接时出错：%s\n" -#: gio/gdbus-tool.c:897 +#: gio/gdbus-tool.c:896 msgid "Destination name to invoke method on" msgstr "调用方法的目标位置名称" -#: gio/gdbus-tool.c:898 +#: gio/gdbus-tool.c:897 msgid "Object path to invoke method on" msgstr "调用方法的对象路径" -#: gio/gdbus-tool.c:899 +#: gio/gdbus-tool.c:898 msgid "Method and interface name" msgstr "方法和接口名称" -#: gio/gdbus-tool.c:900 +#: gio/gdbus-tool.c:899 msgid "Timeout in seconds" msgstr "超时（以秒计）" -#: gio/gdbus-tool.c:901 +#: gio/gdbus-tool.c:900 msgid "Allow interactive authorization" msgstr "允许交互式授权" -#: gio/gdbus-tool.c:948 +#: gio/gdbus-tool.c:947 msgid "Invoke a method on a remote object." msgstr "在远程对象上调用一个方法。" -#: gio/gdbus-tool.c:1020 gio/gdbus-tool.c:1854 gio/gdbus-tool.c:2094 +#: gio/gdbus-tool.c:1019 gio/gdbus-tool.c:1853 gio/gdbus-tool.c:2093 msgid "Error: Destination is not specified\n" msgstr "错误：未指定目标位置名称\n" -#: gio/gdbus-tool.c:1031 gio/gdbus-tool.c:1871 gio/gdbus-tool.c:2105 +#: gio/gdbus-tool.c:1030 gio/gdbus-tool.c:1870 gio/gdbus-tool.c:2104 #, c-format msgid "Error: %s is not a valid bus name\n" msgstr "错误：%s 不是有效的总线名称\n" -#: gio/gdbus-tool.c:1081 +#: gio/gdbus-tool.c:1080 msgid "Error: Method name is not specified\n" msgstr "错误：方法名没有指定\n" -#: gio/gdbus-tool.c:1092 +#: gio/gdbus-tool.c:1091 #, c-format msgid "Error: Method name “%s” is invalid\n" msgstr "错误：方法名“%s”无效\n" -#: gio/gdbus-tool.c:1170 +#: gio/gdbus-tool.c:1169 #, c-format msgid "Error parsing parameter %d of type “%s”: %s\n" msgstr "解析\"%2$s\"类型的第 %1$d 个参数时发生错误：%3$s\n" -#: gio/gdbus-tool.c:1196 +#: gio/gdbus-tool.c:1195 #, c-format msgid "Error adding handle %d: %s\n" msgstr "添加句柄 %d 时出错：%s\n" -#: gio/gdbus-tool.c:1696 +#: gio/gdbus-tool.c:1695 msgid "Destination name to introspect" msgstr "要 Introspect 的目标位置名称" -#: gio/gdbus-tool.c:1697 +#: gio/gdbus-tool.c:1696 msgid "Object path to introspect" msgstr "要 Introspect 的对象路径" -#: gio/gdbus-tool.c:1698 +#: gio/gdbus-tool.c:1697 msgid "Print XML" msgstr "输出 XML" -#: gio/gdbus-tool.c:1699 +#: gio/gdbus-tool.c:1698 msgid "Introspect children" msgstr "Introspect 子对象" -#: gio/gdbus-tool.c:1700 +#: gio/gdbus-tool.c:1699 msgid "Only print properties" msgstr "只打印属性" # 跟命令行里的统一翻译 -#: gio/gdbus-tool.c:1789 +#: gio/gdbus-tool.c:1788 msgid "Introspect a remote object." msgstr "Introspect 一个远程对象。" -#: gio/gdbus-tool.c:1995 +#: gio/gdbus-tool.c:1994 msgid "Destination name to monitor" msgstr "要监视的目标位置名称" -#: gio/gdbus-tool.c:1996 +#: gio/gdbus-tool.c:1995 msgid "Object path to monitor" msgstr "要监视的对象路径" -#: gio/gdbus-tool.c:2021 +#: gio/gdbus-tool.c:2020 msgid "Monitor a remote object." msgstr "监视一个远程对象。" -#: gio/gdbus-tool.c:2079 +#: gio/gdbus-tool.c:2078 msgid "Error: can’t monitor a non-message-bus connection\n" msgstr "错误：无法监视 non-message-bus 连接\n" -#: gio/gdbus-tool.c:2203 +#: gio/gdbus-tool.c:2202 msgid "Service to activate before waiting for the other one (well-known name)" msgstr "在等待另一服务前要激活的服务（常见名称）" -#: gio/gdbus-tool.c:2206 +#: gio/gdbus-tool.c:2205 msgid "" "Timeout to wait for before exiting with an error (seconds); 0 for no timeout " "(default)" msgstr "出现错误退出前的超时（秒）; 0 为无超时（默认）" -#: gio/gdbus-tool.c:2254 +#: gio/gdbus-tool.c:2253 msgid "OPTION… BUS-NAME" msgstr "选项… 总线名称" -#: gio/gdbus-tool.c:2255 +#: gio/gdbus-tool.c:2254 msgid "Wait for a bus name to appear." msgstr "等待总线名称出现。" -#: gio/gdbus-tool.c:2331 +#: gio/gdbus-tool.c:2330 msgid "Error: A service to activate for must be specified.\n" msgstr "错误：未指定需要激活的服务名称。\n" -#: gio/gdbus-tool.c:2336 +#: gio/gdbus-tool.c:2335 msgid "Error: A service to wait for must be specified.\n" msgstr "错误：未指定需要等待的服务名称。\n" -#: gio/gdbus-tool.c:2341 +#: gio/gdbus-tool.c:2340 msgid "Error: Too many arguments.\n" msgstr "错误：参数过多。\n" -#: gio/gdbus-tool.c:2349 gio/gdbus-tool.c:2356 +#: gio/gdbus-tool.c:2348 gio/gdbus-tool.c:2355 #, c-format msgid "Error: %s is not a valid well-known bus name.\n" msgstr "错误：%s 不是有效的总线名称。\n" @@ -1267,38 +1272,43 @@ msgid "Not authorized to change debug settings" msgstr "未获认证以更改调试设置" -#: gio/gdesktopappinfo.c:2182 gio/gdesktopappinfo.c:5112 +#: gio/gdesktopappinfo.c:2242 gio/gdesktopappinfo.c:5223 msgid "Unnamed" msgstr "未命名" -#: gio/gdesktopappinfo.c:2592 +#: gio/gdesktopappinfo.c:2652 msgid "Desktop file didn’t specify Exec field" msgstr "桌面文件未指定 Exec 字段" -#: gio/gdesktopappinfo.c:2891 +#: gio/gdesktopappinfo.c:2942 msgid "Unable to find terminal required for application" msgstr "无法找到应用程序需要的终端" -#: gio/gdesktopappinfo.c:3630 +#: gio/gdesktopappinfo.c:3002 +#, c-format +msgid "Program ‘%s’ not found in $PATH" +msgstr "程序 ‘%s’ 未在 $PATH 路径中找到" + +#: gio/gdesktopappinfo.c:3735 #, c-format msgid "Can’t create user application configuration folder %s: %s" msgstr "无法创建用户应用程序配置文件夹 %s：%s" -#: gio/gdesktopappinfo.c:3634 +#: gio/gdesktopappinfo.c:3739 #, c-format msgid "Can’t create user MIME configuration folder %s: %s" msgstr "无法创建用户 MIME 配置文件夹 %s：%s" -#: gio/gdesktopappinfo.c:3876 gio/gdesktopappinfo.c:3900 +#: gio/gdesktopappinfo.c:3981 gio/gdesktopappinfo.c:4005 msgid "Application information lacks an identifier" msgstr "应用程序信息缺少标志符" -#: gio/gdesktopappinfo.c:4136 +#: gio/gdesktopappinfo.c:4241 #, c-format msgid "Can’t create user desktop file %s" msgstr "无法创建用户桌面文件 %s" -#: gio/gdesktopappinfo.c:4272 +#: gio/gdesktopappinfo.c:4377 #, c-format msgid "Custom definition for %s" msgstr "%s 的自定义" @@ -1371,7 +1381,7 @@ msgid "Containing mount does not exist" msgstr "包含的挂载不存在" -#: gio/gfile.c:2641 gio/glocalfile.c:2500 +#: gio/gfile.c:2641 gio/glocalfile.c:2511 msgid "Can’t copy over directory" msgstr "无法跨目录复制" @@ -1416,7 +1426,7 @@ msgid "Invalid symlink value given" msgstr "给定的符号链接值无效" -#: gio/gfile.c:4163 glib/gfileutils.c:2335 +#: gio/gfile.c:4163 glib/gfileutils.c:2392 msgid "Symbolic links not supported" msgstr "不支持符号链接" @@ -1517,37 +1527,37 @@ msgid "HTTP proxy server closed connection unexpectedly." msgstr "HTTP 代理服务器意外关闭连接。" -#: gio/gicon.c:300 +#: gio/gicon.c:299 #, c-format msgid "Wrong number of tokens (%d)" msgstr "错误的符号数量（%d）" -#: gio/gicon.c:320 +#: gio/gicon.c:319 #, c-format msgid "No type for class name %s" msgstr "类名 %s 没有类型" -#: gio/gicon.c:330 +#: gio/gicon.c:329 #, c-format msgid "Type %s does not implement the GIcon interface" msgstr "类型 %s 没有实现 GIcon 接口" -#: gio/gicon.c:341 +#: gio/gicon.c:340 #, c-format msgid "Type %s is not classed" msgstr "类型 %s 不是类" -#: gio/gicon.c:355 +#: gio/gicon.c:354 #, c-format msgid "Malformed version number: %s" msgstr "不正确的版本号：%s" -#: gio/gicon.c:369 +#: gio/gicon.c:368 #, c-format msgid "Type %s does not implement from_tokens() on the GIcon interface" msgstr "类型 %s 没有实现 GIcon 接口的 from_tokens() 方法" -#: gio/gicon.c:471 +#: gio/gicon.c:470 msgid "Can’t handle the supplied version of the icon encoding" msgstr "无法处理提供版本的图标编码" @@ -1697,7 +1707,7 @@ #: gio/gio-tool-cat.c:135 gio/gio-tool-info.c:379 gio/gio-tool-list.c:173 #: gio/gio-tool-mkdir.c:50 gio/gio-tool-monitor.c:39 gio/gio-tool-monitor.c:41 #: gio/gio-tool-monitor.c:43 gio/gio-tool-monitor.c:45 -#: gio/gio-tool-monitor.c:206 gio/gio-tool-mount.c:1202 gio/gio-tool-open.c:72 +#: gio/gio-tool-monitor.c:206 gio/gio-tool-mount.c:1210 gio/gio-tool-open.c:72 #: gio/gio-tool-remove.c:50 gio/gio-tool-rename.c:47 gio/gio-tool-set.c:95 #: gio/gio-tool-trash.c:222 gio/gio-tool-tree.c:241 msgid "LOCATION" @@ -1717,7 +1727,7 @@ "例如，你可以指定 smb://server/resource/file.txt 之类的位置。" #: gio/gio-tool-cat.c:164 gio/gio-tool-info.c:410 gio/gio-tool-mkdir.c:78 -#: gio/gio-tool-monitor.c:231 gio/gio-tool-mount.c:1253 gio/gio-tool-open.c:98 +#: gio/gio-tool-monitor.c:231 gio/gio-tool-mount.c:1261 gio/gio-tool-open.c:98 #: gio/gio-tool-remove.c:74 gio/gio-tool-trash.c:303 msgid "No locations given" msgstr "未给定位置" @@ -2121,19 +2131,19 @@ msgid "Mount a TCRYPT system volume" msgstr "挂载 TCRYPT 系统卷" -#: gio/gio-tool-mount.c:268 gio/gio-tool-mount.c:300 +#: gio/gio-tool-mount.c:276 gio/gio-tool-mount.c:308 msgid "Anonymous access denied" msgstr "匿名访问被拒绝" -#: gio/gio-tool-mount.c:525 +#: gio/gio-tool-mount.c:533 msgid "No drive for device file" msgstr "没有对应设备文件的驱动器" -#: gio/gio-tool-mount.c:1017 +#: gio/gio-tool-mount.c:1025 msgid "No volume for given ID" msgstr "没有对应ID的卷" -#: gio/gio-tool-mount.c:1206 +#: gio/gio-tool-mount.c:1214 msgid "Mount or unmount the locations." msgstr "挂载或卸载位置。" @@ -2334,7 +2344,7 @@ msgid "List contents of directories in a tree-like format." msgstr "使用树状格式列出目录内容。" -#: gio/glib-compile-resources.c:142 gio/glib-compile-schemas.c:1516 +#: gio/glib-compile-resources.c:142 gio/glib-compile-schemas.c:1513 #, c-format msgid "Element <%s> not allowed inside <%s>" msgstr "在 <%2$s> 中不允许元素 <%1$s>" @@ -2389,7 +2399,7 @@ msgid "text may not appear inside <%s>" msgstr "<%s> 内不应出现文本" -#: gio/glib-compile-resources.c:821 gio/glib-compile-schemas.c:2174 +#: gio/glib-compile-resources.c:821 gio/glib-compile-schemas.c:2171 msgid "Show program version and exit" msgstr "显示程序版本并退出" @@ -2403,8 +2413,8 @@ "directory)" msgstr "FILE 中引用的要从其中载入文件的目录（默认为当前目录）" -#: gio/glib-compile-resources.c:823 gio/glib-compile-schemas.c:2175 -#: gio/glib-compile-schemas.c:2204 +#: gio/glib-compile-resources.c:823 gio/glib-compile-schemas.c:2172 +#: gio/glib-compile-schemas.c:2201 msgid "DIRECTORY" msgstr "目录" @@ -2617,52 +2627,52 @@ msgid "<aliases> must contain at least one <alias>" msgstr "<aliases> 必须包含至少一个 <alias>" -#: gio/glib-compile-schemas.c:799 +#: gio/glib-compile-schemas.c:796 msgid "Empty names are not permitted" msgstr "不允许空名称" -#: gio/glib-compile-schemas.c:809 +#: gio/glib-compile-schemas.c:806 #, c-format msgid "Invalid name “%s”: names must begin with a lowercase letter" msgstr "无效名称“%s”：名称必须以小写字母开始" -#: gio/glib-compile-schemas.c:821 +#: gio/glib-compile-schemas.c:818 #, 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:830 +#: gio/glib-compile-schemas.c:827 #, c-format msgid "Invalid name “%s”: two successive hyphens (“--”) are not permitted" msgstr "无效名称“%s”：不允许使用连续的连字符（“--”）" -#: gio/glib-compile-schemas.c:839 +#: gio/glib-compile-schemas.c:836 #, c-format msgid "Invalid name “%s”: the last character may not be a hyphen (“-”)" msgstr "无效名称“%s”：最后一个字符串不应为连字符（“-”）。" -#: gio/glib-compile-schemas.c:847 +#: gio/glib-compile-schemas.c:844 #, c-format msgid "Invalid name “%s”: maximum length is 1024" msgstr "无效名称“%s”：最大长度为 1024" -#: gio/glib-compile-schemas.c:919 +#: gio/glib-compile-schemas.c:916 #, c-format msgid "<child name='%s'> already specified" msgstr "<child name='%s'> 已指定" -#: gio/glib-compile-schemas.c:945 +#: gio/glib-compile-schemas.c:942 msgid "Cannot add keys to a “list-of” schema" msgstr "无法添加键到一个“list-of”架构" -#: gio/glib-compile-schemas.c:956 +#: gio/glib-compile-schemas.c:953 #, c-format msgid "<key name='%s'> already specified" msgstr "<key name='%s'> 已指定" -#: gio/glib-compile-schemas.c:974 +#: gio/glib-compile-schemas.c:971 #, c-format msgid "" "<key name='%s'> shadows <key name='%s'> in <schema id='%s'>; use <override> " @@ -2671,69 +2681,69 @@ "<key name='%s'> 与 <key name='%s'> 在 <schema id='%s'> 重合; 请使用 " "<override> 修改其值" -#: gio/glib-compile-schemas.c:985 +#: gio/glib-compile-schemas.c:982 #, c-format msgid "" "Exactly one of “type”, “enum” or “flags” must be specified as an attribute " "to <key>" msgstr "“type”、“enum”或“flags”中必须有一个被指定为 <key> 的属性" -#: gio/glib-compile-schemas.c:1004 +#: gio/glib-compile-schemas.c:1001 #, c-format msgid "<%s id='%s'> not (yet) defined." msgstr "<%s id='%s'> 尚未定义。" -#: gio/glib-compile-schemas.c:1019 +#: gio/glib-compile-schemas.c:1016 #, c-format msgid "Invalid GVariant type string “%s”" msgstr "无效的 GVariant 类型字符串“%s”" -#: gio/glib-compile-schemas.c:1049 +#: gio/glib-compile-schemas.c:1046 msgid "<override> given but schema isn’t extending anything" msgstr "已给定 <override> 但架构并未扩展" -#: gio/glib-compile-schemas.c:1062 +#: gio/glib-compile-schemas.c:1059 #, c-format msgid "No <key name='%s'> to override" msgstr "无 <key name='%s'> 可覆盖" -#: gio/glib-compile-schemas.c:1070 +#: gio/glib-compile-schemas.c:1067 #, c-format msgid "<override name='%s'> already specified" msgstr "<override name='%s'> 已指定" -#: gio/glib-compile-schemas.c:1143 +#: gio/glib-compile-schemas.c:1140 #, c-format msgid "<schema id='%s'> already specified" msgstr "<schema id='%s'> 已指定" -#: gio/glib-compile-schemas.c:1155 +#: gio/glib-compile-schemas.c:1152 #, c-format msgid "<schema id='%s'> extends not yet existing schema “%s”" msgstr "<schema id='%s'> 扩展了尚不存在的架构“%s”" -#: gio/glib-compile-schemas.c:1171 +#: gio/glib-compile-schemas.c:1168 #, c-format msgid "<schema id='%s'> is list of not yet existing schema “%s”" msgstr "<schema id='%s'> 是尚不存在的架构“%s”的列表" -#: gio/glib-compile-schemas.c:1179 +#: gio/glib-compile-schemas.c:1176 #, c-format msgid "Cannot be a list of a schema with a path" msgstr "不能是带有路径架构的列表" -#: gio/glib-compile-schemas.c:1189 +#: gio/glib-compile-schemas.c:1186 #, c-format msgid "Cannot extend a schema with a path" msgstr "无法扩展带有路径的架构" -#: gio/glib-compile-schemas.c:1199 +#: gio/glib-compile-schemas.c:1196 #, c-format msgid "" "<schema id='%s'> is a list, extending <schema id='%s'> which is not a list" msgstr "<schema id='%s'> 是一个列表，扩展的 <schema id='%s'> 不是列表" -#: gio/glib-compile-schemas.c:1209 +#: gio/glib-compile-schemas.c:1206 #, c-format msgid "" "<schema id='%s' list-of='%s'> extends <schema id='%s' list-of='%s'> but “%s” " @@ -2742,17 +2752,17 @@ "<schema id='%s' list-of='%s'> 扩展 <schema id='%s' list-of='%s'>，但“%s”不扩" "展“%s”" -#: gio/glib-compile-schemas.c:1226 +#: gio/glib-compile-schemas.c:1223 #, c-format msgid "A path, if given, must begin and end with a slash" msgstr "一个路径，如果给定则必须以斜线（/）开始和结束" -#: gio/glib-compile-schemas.c:1233 +#: gio/glib-compile-schemas.c:1230 #, c-format msgid "The path of a list must end with “:/”" msgstr "一个列表的路径必须以“:/”结束" -#: gio/glib-compile-schemas.c:1242 +#: gio/glib-compile-schemas.c:1239 #, c-format msgid "" "Warning: Schema “%s” has path “%s”. Paths starting with “/apps/”, “/" @@ -2761,56 +2771,56 @@ "警告：架构“%s”带有路径“%s”。以“/apps/”、“/desktop/”或“/system/”开头的路径已弃" "用。" -#: gio/glib-compile-schemas.c:1272 +#: gio/glib-compile-schemas.c:1269 #, c-format msgid "<%s id='%s'> already specified" msgstr "<%s id='%s'> 已指定" -#: gio/glib-compile-schemas.c:1422 gio/glib-compile-schemas.c:1438 +#: gio/glib-compile-schemas.c:1419 gio/glib-compile-schemas.c:1435 #, c-format msgid "Only one <%s> element allowed inside <%s>" msgstr "在 <%2$s> 中仅允许一个成员 <%1$s>" -#: gio/glib-compile-schemas.c:1520 +#: gio/glib-compile-schemas.c:1517 #, c-format msgid "Element <%s> not allowed at the top level" msgstr "顶层中不允许元素 <%s>" -#: gio/glib-compile-schemas.c:1538 +#: gio/glib-compile-schemas.c:1535 msgid "Element <default> is required in <key>" msgstr "<key> 里不需要元素 <default>" -#: gio/glib-compile-schemas.c:1628 +#: gio/glib-compile-schemas.c:1625 #, c-format msgid "Text may not appear inside <%s>" msgstr "<%s> 内不应出现文本" -#: gio/glib-compile-schemas.c:1696 +#: gio/glib-compile-schemas.c:1693 #, c-format msgid "Warning: undefined reference to <schema id='%s'/>" msgstr "警告：到 <schema id='%s'/> 的引用未定义" #. Translators: Do not translate "--strict". -#: gio/glib-compile-schemas.c:1835 gio/glib-compile-schemas.c:1914 +#: gio/glib-compile-schemas.c:1832 gio/glib-compile-schemas.c:1911 msgid "--strict was specified; exiting." msgstr "指定了 --strict；正在退出。" -#: gio/glib-compile-schemas.c:1847 +#: gio/glib-compile-schemas.c:1844 msgid "This entire file has been ignored." msgstr "整个文件被忽略。" -#: gio/glib-compile-schemas.c:1910 +#: gio/glib-compile-schemas.c:1907 msgid "Ignoring this file." msgstr "正在忽略此文件。" -#: gio/glib-compile-schemas.c:1965 +#: gio/glib-compile-schemas.c:1962 #, 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:1973 +#: gio/glib-compile-schemas.c:1970 #, c-format msgid "" "No such key “%s” in schema “%s” as specified in override file “%s” and --" @@ -2818,7 +2828,7 @@ msgstr "" "覆盖文件“%3$s”中指定的架构“%2$s”中没有键“%1$s”并且已指定 --strict；正在退出。" -#: gio/glib-compile-schemas.c:1995 +#: gio/glib-compile-schemas.c:1992 #, c-format msgid "" "Cannot provide per-desktop overrides for localized key “%s” in schema " @@ -2827,7 +2837,7 @@ "无法为架构“%2$s”中的局部键“%1$s”提供每个桌面的覆盖（覆盖文件“%3$s”）；正在忽" "略对此键的覆盖。" -#: gio/glib-compile-schemas.c:2004 +#: gio/glib-compile-schemas.c:2001 #, c-format msgid "" "Cannot provide per-desktop overrides for localized key “%s” in schema " @@ -2836,7 +2846,7 @@ "无法为架构“%2$s”中的局部键“%1$s”提供每个桌面的覆盖（覆盖文件“%3$s”）并且已指" "定 --strict；正在退出。" -#: gio/glib-compile-schemas.c:2028 +#: gio/glib-compile-schemas.c:2025 #, c-format msgid "" "Error parsing key “%s” in schema “%s” as specified in override file “%s”: " @@ -2845,7 +2855,7 @@ "解析覆盖文件“%3$s”所指定架构“%2$s”中的键“%1$s”时出错：%4$s。正在忽略对此键的" "覆盖。" -#: gio/glib-compile-schemas.c:2040 +#: gio/glib-compile-schemas.c:2037 #, c-format msgid "" "Error parsing key “%s” in schema “%s” as specified in override file “%s”: " @@ -2854,7 +2864,7 @@ "解析覆盖文件“%3$s”所指定架构“%2$s”中的键“%1$s”时出错：%4$s。已指定 --strict；" "正在退出。" -#: gio/glib-compile-schemas.c:2067 +#: gio/glib-compile-schemas.c:2064 #, c-format msgid "" "Override for key “%s” in schema “%s” in override file “%s” is outside the " @@ -2863,7 +2873,7 @@ "覆盖文件“%3$s”中架构“%2$s”的键“%1$s”的覆盖超出了架构给出的范围；正在忽略对此" "键的覆盖。" -#: gio/glib-compile-schemas.c:2077 +#: gio/glib-compile-schemas.c:2074 #, c-format msgid "" "Override for key “%s” in schema “%s” in override file “%s” is outside the " @@ -2872,7 +2882,7 @@ "覆盖文件“%3$s”中架构“%2$s”的键“%1$s”的覆盖超出了架构给出的范围并且已指定 --" "strict；正在退出。" -#: gio/glib-compile-schemas.c:2103 +#: gio/glib-compile-schemas.c:2100 #, c-format msgid "" "Override for key “%s” in schema “%s” in override file “%s” is not in the " @@ -2881,7 +2891,7 @@ "覆盖文件“%3$s”中架构“%2$s”的键“%1$s”的覆盖的值不在有效值列表内；正在忽略对此" "键的覆盖。" -#: gio/glib-compile-schemas.c:2113 +#: gio/glib-compile-schemas.c:2110 #, c-format msgid "" "Override for key “%s” in schema “%s” in override file “%s” is not in the " @@ -2890,23 +2900,23 @@ "覆盖文件“%3$s”中架构“%2$s”的键“%1$s”的覆盖的值不在有效值列表内并且已指定 --" "strict；正在退出。" -#: gio/glib-compile-schemas.c:2175 +#: gio/glib-compile-schemas.c:2172 msgid "Where to store the gschemas.compiled file" msgstr "gschemas.compiled 文件存储于何处" -#: gio/glib-compile-schemas.c:2176 +#: gio/glib-compile-schemas.c:2173 msgid "Abort on any errors in schemas" msgstr "在架构里出现任何错误时中止" -#: gio/glib-compile-schemas.c:2177 +#: gio/glib-compile-schemas.c:2174 msgid "Do not write the gschema.compiled file" msgstr "不要对 gschema.compiled 进行写操作" -#: gio/glib-compile-schemas.c:2178 +#: gio/glib-compile-schemas.c:2175 msgid "Do not enforce key name restrictions" msgstr "不要强制键名的限制" -#: gio/glib-compile-schemas.c:2207 +#: gio/glib-compile-schemas.c:2204 msgid "" "Compile all GSettings schema files into a schema cache.\n" "Schema files are required to have the extension .gschema.xml,\n" @@ -2916,15 +2926,15 @@ "要使用扩展 .gschema.xml，需要有架构文件，\n" "缓存文件被称为 gschemas.compiled。" -#: gio/glib-compile-schemas.c:2228 +#: gio/glib-compile-schemas.c:2225 msgid "You should give exactly one directory name" msgstr "您应该给出一个且仅一个的目录名" -#: gio/glib-compile-schemas.c:2271 +#: gio/glib-compile-schemas.c:2268 msgid "No schema files found: doing nothing." msgstr "未找到架构文件：无事可做。" -#: gio/glib-compile-schemas.c:2273 +#: gio/glib-compile-schemas.c:2270 msgid "No schema files found: removed existing output file." msgstr "未找到架构文件：已删除存在的输出文件。" @@ -2933,7 +2943,7 @@ msgid "Invalid filename %s" msgstr "无效的文件名 %s" -#: gio/glocalfile.c:996 +#: gio/glocalfile.c:1005 #, c-format msgid "Error getting filesystem info for %s: %s" msgstr "读取 %s 文件系统信息时出错：%s" @@ -2942,124 +2952,124 @@ #. * the enclosing (user visible) mount of a file, but none #. * exists. #. -#: gio/glocalfile.c:1137 +#: gio/glocalfile.c:1141 #, c-format msgid "Containing mount for file %s not found" msgstr "找不到文件 %s 包含的挂载" -#: gio/glocalfile.c:1160 +#: gio/glocalfile.c:1164 msgid "Can’t rename root directory" msgstr "无法重命名根目录" -#: gio/glocalfile.c:1178 gio/glocalfile.c:1201 +#: gio/glocalfile.c:1182 gio/glocalfile.c:1205 #, c-format msgid "Error renaming file %s: %s" msgstr "重命名文件 %s 时出错：%s" -#: gio/glocalfile.c:1185 +#: gio/glocalfile.c:1189 msgid "Can’t rename file, filename already exists" msgstr "无法重命名文件，该文件名已存在" -#: gio/glocalfile.c:1198 gio/glocalfile.c:2394 gio/glocalfile.c:2422 -#: gio/glocalfile.c:2561 gio/glocalfileoutputstream.c:658 +#: gio/glocalfile.c:1202 gio/glocalfile.c:2405 gio/glocalfile.c:2433 +#: gio/glocalfile.c:2572 gio/glocalfileoutputstream.c:658 msgid "Invalid filename" msgstr "无效的文件名" -#: gio/glocalfile.c:1366 gio/glocalfile.c:1377 +#: gio/glocalfile.c:1370 gio/glocalfile.c:1381 #, c-format msgid "Error opening file %s: %s" msgstr "打开文件 %s 时出错：%s" -#: gio/glocalfile.c:1502 +#: gio/glocalfile.c:1506 #, c-format msgid "Error removing file %s: %s" msgstr "删除文件 %s 时出错：%s" -#: gio/glocalfile.c:1996 gio/glocalfile.c:2007 gio/glocalfile.c:2034 +#: gio/glocalfile.c:2000 gio/glocalfile.c:2011 gio/glocalfile.c:2038 #, c-format msgid "Error trashing file %s: %s" msgstr "将文件 %s 丢到回收站时出错：%s" -#: gio/glocalfile.c:2054 +#: gio/glocalfile.c:2058 #, c-format msgid "Unable to create trash directory %s: %s" msgstr "无法创建回收站目录 %s：%s" -#: gio/glocalfile.c:2075 +#: gio/glocalfile.c:2079 #, c-format msgid "Unable to find toplevel directory to trash %s" msgstr "找不到回收站 %s 的顶级目录" -#: gio/glocalfile.c:2083 +#: gio/glocalfile.c:2087 #, c-format msgid "Trashing on system internal mounts is not supported" msgstr "不支持在系统内部挂载上的丢弃到回收站操作" -#: gio/glocalfile.c:2169 gio/glocalfile.c:2197 +#: gio/glocalfile.c:2173 gio/glocalfile.c:2201 #, c-format msgid "Unable to find or create trash directory %s to trash %s" msgstr "无法找到或创建回收站目录 %s 来丢弃 %s" -#: gio/glocalfile.c:2243 +#: gio/glocalfile.c:2245 #, c-format msgid "Unable to create trashing info file for %s: %s" msgstr "为 %s 创建回收站信息文件失败：%s" -#: gio/glocalfile.c:2305 +#: gio/glocalfile.c:2316 #, c-format msgid "Unable to trash file %s across filesystem boundaries" msgstr "无法跨越文件系统边界将文件 %s 丢到回收站" -#: gio/glocalfile.c:2309 gio/glocalfile.c:2365 +#: gio/glocalfile.c:2320 gio/glocalfile.c:2376 #, c-format msgid "Unable to trash file %s: %s" msgstr "无法将文件 %s 丢到回收站：%s" -#: gio/glocalfile.c:2371 +#: gio/glocalfile.c:2382 #, c-format msgid "Unable to trash file %s" msgstr "无法将文件 %s 丢到回收站" -#: gio/glocalfile.c:2397 +#: gio/glocalfile.c:2408 #, c-format msgid "Error creating directory %s: %s" msgstr "创建目录 %s 时出错：%s" -#: gio/glocalfile.c:2426 +#: gio/glocalfile.c:2437 #, c-format msgid "Filesystem does not support symbolic links" msgstr "文件系统不支持符号链接" -#: gio/glocalfile.c:2429 +#: gio/glocalfile.c:2440 #, c-format msgid "Error making symbolic link %s: %s" msgstr "创建符号链接 %s 时出错：%s" -#: gio/glocalfile.c:2472 gio/glocalfile.c:2507 gio/glocalfile.c:2564 +#: gio/glocalfile.c:2483 gio/glocalfile.c:2518 gio/glocalfile.c:2575 #, c-format msgid "Error moving file %s: %s" msgstr "移动文件 %s 时出错：%s" -#: gio/glocalfile.c:2495 +#: gio/glocalfile.c:2506 msgid "Can’t move directory over directory" msgstr "无法将目录移动到目录" -#: gio/glocalfile.c:2521 gio/glocalfileoutputstream.c:1110 +#: gio/glocalfile.c:2532 gio/glocalfileoutputstream.c:1110 #: gio/glocalfileoutputstream.c:1124 gio/glocalfileoutputstream.c:1139 #: gio/glocalfileoutputstream.c:1156 gio/glocalfileoutputstream.c:1170 msgid "Backup file creation failed" msgstr "备份文件创建失败" -#: gio/glocalfile.c:2540 +#: gio/glocalfile.c:2551 #, c-format msgid "Error removing target file: %s" msgstr "移除目标文件出错：%s" -#: gio/glocalfile.c:2554 +#: gio/glocalfile.c:2565 msgid "Move between mounts not supported" msgstr "不支持在挂载之间移动" -#: gio/glocalfile.c:2728 +#: gio/glocalfile.c:2741 #, c-format msgid "Could not determine the disk usage of %s: %s" msgstr "无法确定 %s 的磁盘使用情况：%s" @@ -3081,115 +3091,115 @@ msgid "Error setting extended attribute “%s”: %s" msgstr "设置扩展属性“%s”时出错：%s" -#: gio/glocalfileinfo.c:1738 gio/win32/gwinhttpfile.c:191 +#: gio/glocalfileinfo.c:1819 gio/win32/gwinhttpfile.c:191 msgid " (invalid encoding)" msgstr " （无效的编码）" -#: gio/glocalfileinfo.c:1897 gio/glocalfileoutputstream.c:945 +#: gio/glocalfileinfo.c:1978 gio/glocalfileoutputstream.c:945 #: gio/glocalfileoutputstream.c:997 #, c-format msgid "Error when getting information for file “%s”: %s" msgstr "获取文件“%s”的信息时出错：%s" -#: gio/glocalfileinfo.c:2163 +#: gio/glocalfileinfo.c:2281 #, c-format msgid "Error when getting information for file descriptor: %s" msgstr "获取文件描述符的信息时出错：%s" -#: gio/glocalfileinfo.c:2208 +#: gio/glocalfileinfo.c:2326 msgid "Invalid attribute type (uint32 expected)" msgstr "无效的属性类型（应为 uint32）" -#: gio/glocalfileinfo.c:2226 +#: gio/glocalfileinfo.c:2344 msgid "Invalid attribute type (uint64 expected)" msgstr "无效的属性类型（应为 uint64）" -#: gio/glocalfileinfo.c:2245 gio/glocalfileinfo.c:2264 +#: gio/glocalfileinfo.c:2363 gio/glocalfileinfo.c:2382 msgid "Invalid attribute type (byte string expected)" msgstr "无效的属性类型（应为字节字符串）" -#: gio/glocalfileinfo.c:2311 +#: gio/glocalfileinfo.c:2429 msgid "Cannot set permissions on symlinks" msgstr "无法为符号链接设置权限" -#: gio/glocalfileinfo.c:2327 +#: gio/glocalfileinfo.c:2445 #, c-format msgid "Error setting permissions: %s" msgstr "设置访问权限出错：%s" -#: gio/glocalfileinfo.c:2378 +#: gio/glocalfileinfo.c:2496 #, c-format msgid "Error setting owner: %s" msgstr "设置所有者出错：%s" -#: gio/glocalfileinfo.c:2401 +#: gio/glocalfileinfo.c:2519 msgid "symlink must be non-NULL" msgstr "符号链接必须是非空" -#: gio/glocalfileinfo.c:2411 gio/glocalfileinfo.c:2430 -#: gio/glocalfileinfo.c:2441 +#: gio/glocalfileinfo.c:2529 gio/glocalfileinfo.c:2548 +#: gio/glocalfileinfo.c:2559 #, c-format msgid "Error setting symlink: %s" msgstr "设置符号链接出错：%s" -#: gio/glocalfileinfo.c:2420 +#: gio/glocalfileinfo.c:2538 msgid "Error setting symlink: file is not a symlink" msgstr "设定符号链接出错：文件不是符号链接" -#: gio/glocalfileinfo.c:2492 +#: gio/glocalfileinfo.c:2630 #, c-format msgid "Extra nanoseconds %d for UNIX timestamp %lld are negative" msgstr "额外的纳秒数字 %d 在 UNIX 时间戳 %lld 中是负值" -#: gio/glocalfileinfo.c:2501 +#: gio/glocalfileinfo.c:2639 #, c-format msgid "Extra nanoseconds %d for UNIX timestamp %lld reach 1 second" msgstr "额外的纳秒数字 %d 在 UNIX 时间戳 %lld 中长度已达到一秒钟" -#: gio/glocalfileinfo.c:2511 +#: gio/glocalfileinfo.c:2649 #, c-format msgid "UNIX timestamp %lld does not fit into 64 bits" msgstr "UNIX 时间戳 %lld 无法作为 64 比特数据存储" -#: gio/glocalfileinfo.c:2522 +#: gio/glocalfileinfo.c:2660 #, c-format msgid "UNIX timestamp %lld is outside of the range supported by Windows" msgstr "UNIX 时间戳 %lld 位于 Windows 所支持的范围之外" -#: gio/glocalfileinfo.c:2625 +#: gio/glocalfileinfo.c:2792 #, c-format msgid "File name “%s” cannot be converted to UTF-16" msgstr "文件名“%s”不能转换为 UTF-16" -#: gio/glocalfileinfo.c:2644 +#: gio/glocalfileinfo.c:2811 #, c-format msgid "File “%s” cannot be opened: Windows Error %lu" msgstr "无法打开文件“%s”：Windows 错误 %lu" -#: gio/glocalfileinfo.c:2657 +#: gio/glocalfileinfo.c:2824 #, c-format msgid "Error setting modification or access time for file “%s”: %lu" msgstr "设置文件“%s”的修改或访问时间时出错：%lu" -#: gio/glocalfileinfo.c:2798 gio/glocalfileinfo.c:2810 +#: gio/glocalfileinfo.c:2981 #, c-format msgid "Error setting modification or access time: %s" msgstr "设置修改或访问时间时出错：%s" -#: gio/glocalfileinfo.c:2833 +#: gio/glocalfileinfo.c:3004 msgid "SELinux context must be non-NULL" msgstr "SELinux 上下文必须是非空" -#: gio/glocalfileinfo.c:2840 +#: gio/glocalfileinfo.c:3011 msgid "SELinux is not enabled on this system" msgstr "此系统尚未启用 SELinux" -#: gio/glocalfileinfo.c:2850 +#: gio/glocalfileinfo.c:3021 #, c-format msgid "Error setting SELinux context: %s" msgstr "设置 SELinux 上下文出错：%s" -#: gio/glocalfileinfo.c:2947 +#: gio/glocalfileinfo.c:3118 #, c-format msgid "Setting attribute %s not supported" msgstr "不支持设置属性 %s" @@ -3236,13 +3246,13 @@ msgid "Error renaming temporary file: %s" msgstr "重命名临时文件出错：%s" -#: gio/glocalfileoutputstream.c:611 gio/glocalfileoutputstream.c:1241 +#: gio/glocalfileoutputstream.c:611 gio/glocalfileoutputstream.c:1242 #, c-format msgid "Error truncating file: %s" msgstr "截断文件出错：%s" #: gio/glocalfileoutputstream.c:664 gio/glocalfileoutputstream.c:909 -#: gio/glocalfileoutputstream.c:1222 gio/gsubprocess.c:231 +#: gio/glocalfileoutputstream.c:1223 gio/gsubprocess.c:231 #, c-format msgid "Error opening file “%s”: %s" msgstr "打开文件“%s”出错：%s" @@ -3259,7 +3269,7 @@ msgid "The file was externally modified" msgstr "文件已经被其他程序修改" -#: gio/glocalfileoutputstream.c:1204 +#: gio/glocalfileoutputstream.c:1205 #, c-format msgid "Error removing old file: %s" msgstr "移除旧文件出错：%s" @@ -3404,8 +3414,8 @@ #. Translators: the first placeholder is a domain name, the #. * second is an error message #: gio/gresolver.c:403 gio/gthreadedresolver.c:152 gio/gthreadedresolver.c:170 -#: gio/gthreadedresolver.c:782 gio/gthreadedresolver.c:806 -#: gio/gthreadedresolver.c:831 gio/gthreadedresolver.c:846 +#: gio/gthreadedresolver.c:798 gio/gthreadedresolver.c:822 +#: gio/gthreadedresolver.c:847 gio/gthreadedresolver.c:862 #, c-format msgid "Error resolving “%s”: %s" msgstr "解析“%s”时出错：%s" @@ -4115,35 +4125,35 @@ #. Translators: the placeholder is a DNS record type, such as ‘MX’ or ‘SRV’ #: gio/gthreadedresolver.c:552 gio/gthreadedresolver.c:574 -#: gio/gthreadedresolver.c:612 gio/gthreadedresolver.c:659 -#: gio/gthreadedresolver.c:688 gio/gthreadedresolver.c:700 +#: gio/gthreadedresolver.c:628 gio/gthreadedresolver.c:675 +#: gio/gthreadedresolver.c:704 gio/gthreadedresolver.c:716 #, c-format msgid "Error parsing DNS %s record: malformed DNS packet" msgstr "解析 DNS %s 记录时出错：畸形的 DNS 数据包" -#: gio/gthreadedresolver.c:758 gio/gthreadedresolver.c:895 -#: gio/gthreadedresolver.c:993 gio/gthreadedresolver.c:1043 +#: gio/gthreadedresolver.c:774 gio/gthreadedresolver.c:911 +#: gio/gthreadedresolver.c:1009 gio/gthreadedresolver.c:1059 #, c-format msgid "No DNS record of the requested type for “%s”" msgstr "没有“%s”所请求类型的 DNS 记录" -#: gio/gthreadedresolver.c:763 gio/gthreadedresolver.c:998 +#: gio/gthreadedresolver.c:779 gio/gthreadedresolver.c:1014 #, c-format msgid "Temporarily unable to resolve “%s”" msgstr "暂时无法解析“%s”" -#: gio/gthreadedresolver.c:768 gio/gthreadedresolver.c:1003 -#: gio/gthreadedresolver.c:1113 +#: gio/gthreadedresolver.c:784 gio/gthreadedresolver.c:1019 +#: gio/gthreadedresolver.c:1129 #, c-format msgid "Error resolving “%s”" msgstr "解析“%s”时出错" -#: gio/gthreadedresolver.c:782 gio/gthreadedresolver.c:806 -#: gio/gthreadedresolver.c:831 gio/gthreadedresolver.c:846 +#: gio/gthreadedresolver.c:798 gio/gthreadedresolver.c:822 +#: gio/gthreadedresolver.c:847 gio/gthreadedresolver.c:862 msgid "Malformed DNS packet" msgstr "畸形的 DNS 数据包" -#: gio/gthreadedresolver.c:888 +#: gio/gthreadedresolver.c:904 #, c-format msgid "Failed to parse DNS response for “%s”: " msgstr "解析响应“%s”的 DNS 失败：" @@ -4262,7 +4272,7 @@ msgid "Error closing file descriptor: %s" msgstr "关闭文件描述符时出错：%s" -#: gio/gunixmounts.c:2815 gio/gunixmounts.c:2868 +#: gio/gunixmounts.c:2817 gio/gunixmounts.c:2870 msgid "Filesystem root" msgstr "文件系统根目录" @@ -4344,77 +4354,77 @@ msgid "Wrong args\n" msgstr "参数错误\n" -#: glib/gbookmarkfile.c:779 +#: glib/gbookmarkfile.c:861 #, c-format msgid "Unexpected attribute “%s” for element “%s”" msgstr "元素“%2$s”的意外属性“%1$s”" -#: glib/gbookmarkfile.c:790 glib/gbookmarkfile.c:870 glib/gbookmarkfile.c:880 -#: glib/gbookmarkfile.c:993 +#: glib/gbookmarkfile.c:872 glib/gbookmarkfile.c:952 glib/gbookmarkfile.c:962 +#: glib/gbookmarkfile.c:1075 #, c-format msgid "Attribute “%s” of element “%s” not found" msgstr "元素“%2$s”的属性“%1$s”未找到" -#: glib/gbookmarkfile.c:1202 glib/gbookmarkfile.c:1267 -#: glib/gbookmarkfile.c:1331 glib/gbookmarkfile.c:1341 +#: glib/gbookmarkfile.c:1284 glib/gbookmarkfile.c:1349 +#: glib/gbookmarkfile.c:1413 glib/gbookmarkfile.c:1423 #, c-format msgid "Unexpected tag “%s”, tag “%s” expected" msgstr "意外标签“%s”，需要标签“%s”" -#: glib/gbookmarkfile.c:1227 glib/gbookmarkfile.c:1241 -#: glib/gbookmarkfile.c:1309 glib/gbookmarkfile.c:1355 +#: glib/gbookmarkfile.c:1309 glib/gbookmarkfile.c:1323 +#: glib/gbookmarkfile.c:1391 glib/gbookmarkfile.c:1437 #, c-format msgid "Unexpected tag “%s” inside “%s”" msgstr "“%2$s”中有意外标签“%1$s”" -#: glib/gbookmarkfile.c:1635 +#: glib/gbookmarkfile.c:1717 #, c-format msgid "Invalid date/time ‘%s’ in bookmark file" msgstr "书签文件中有无效的日期/时间“%s”" -#: glib/gbookmarkfile.c:1838 +#: glib/gbookmarkfile.c:1956 msgid "No valid bookmark file found in data dirs" msgstr "数据目录中没有找到有效的书签文件" -#: glib/gbookmarkfile.c:2039 +#: glib/gbookmarkfile.c:2157 #, c-format msgid "A bookmark for URI “%s” already exists" msgstr "URI“%s”的书签已经存在" -#: glib/gbookmarkfile.c:2088 glib/gbookmarkfile.c:2246 -#: glib/gbookmarkfile.c:2331 glib/gbookmarkfile.c:2411 -#: glib/gbookmarkfile.c:2496 glib/gbookmarkfile.c:2630 -#: glib/gbookmarkfile.c:2763 glib/gbookmarkfile.c:2898 -#: glib/gbookmarkfile.c:2940 glib/gbookmarkfile.c:3037 -#: glib/gbookmarkfile.c:3158 glib/gbookmarkfile.c:3352 -#: glib/gbookmarkfile.c:3493 glib/gbookmarkfile.c:3712 -#: glib/gbookmarkfile.c:3801 glib/gbookmarkfile.c:3890 -#: glib/gbookmarkfile.c:4009 +#: glib/gbookmarkfile.c:2206 glib/gbookmarkfile.c:2364 +#: glib/gbookmarkfile.c:2449 glib/gbookmarkfile.c:2529 +#: glib/gbookmarkfile.c:2614 glib/gbookmarkfile.c:2748 +#: glib/gbookmarkfile.c:2881 glib/gbookmarkfile.c:3016 +#: glib/gbookmarkfile.c:3058 glib/gbookmarkfile.c:3155 +#: glib/gbookmarkfile.c:3276 glib/gbookmarkfile.c:3470 +#: glib/gbookmarkfile.c:3611 glib/gbookmarkfile.c:3830 +#: glib/gbookmarkfile.c:3919 glib/gbookmarkfile.c:4008 +#: glib/gbookmarkfile.c:4127 #, c-format msgid "No bookmark found for URI “%s”" msgstr "未找到 URI“%s”的书签" -#: glib/gbookmarkfile.c:2420 +#: glib/gbookmarkfile.c:2538 #, c-format msgid "No MIME type defined in the bookmark for URI “%s”" msgstr "URI“%s”的书签未定义 MIME 类型" -#: glib/gbookmarkfile.c:2505 +#: glib/gbookmarkfile.c:2623 #, c-format msgid "No private flag has been defined in bookmark for URI “%s”" msgstr "URI“%s”的书签未定义私有标志" -#: glib/gbookmarkfile.c:3046 +#: glib/gbookmarkfile.c:3164 #, c-format msgid "No groups set in bookmark for URI “%s”" msgstr "URI“%s”的书签未设定组" -#: glib/gbookmarkfile.c:3514 glib/gbookmarkfile.c:3722 +#: glib/gbookmarkfile.c:3632 glib/gbookmarkfile.c:3840 #, c-format msgid "No application with name “%s” registered a bookmark for “%s”" msgstr "没有名为“%s”的应用程序为“%s”注册了书签" -#: glib/gbookmarkfile.c:3745 +#: glib/gbookmarkfile.c:3863 #, c-format msgid "Failed to expand exec line “%s” with URI “%s”" msgstr "用 URI“%2$s”展开 exec 行“%1$s”失败" @@ -4893,78 +4903,78 @@ msgid "Error opening directory “%s”: %s" msgstr "打开目录“%s”时出错：%s" -#: glib/gfileutils.c:735 glib/gfileutils.c:827 +#: glib/gfileutils.c:753 glib/gfileutils.c:845 #, c-format msgid "Could not allocate %lu byte to read file “%s”" msgid_plural "Could not allocate %lu bytes to read file “%s”" msgstr0 "无法分配 %lu 字节以读取文件“%s”" -#: glib/gfileutils.c:752 +#: glib/gfileutils.c:770 #, c-format msgid "Error reading file “%s”: %s" msgstr "读取文件“%s”时出错：%s" -#: glib/gfileutils.c:788 +#: glib/gfileutils.c:806 #, c-format msgid "File “%s” is too large" msgstr "文件“%s”过大" -#: glib/gfileutils.c:852 +#: glib/gfileutils.c:870 #, c-format msgid "Failed to read from file “%s”: %s" msgstr "读取文件“%s”失败：%s" -#: glib/gfileutils.c:902 glib/gfileutils.c:977 glib/gfileutils.c:1449 +#: glib/gfileutils.c:920 glib/gfileutils.c:995 glib/gfileutils.c:1472 #, c-format msgid "Failed to open file “%s”: %s" msgstr "打开文件“%s”失败：%s" -#: glib/gfileutils.c:915 +#: glib/gfileutils.c:933 #, c-format msgid "Failed to get attributes of file “%s”: fstat() failed: %s" msgstr "获得文件“%s”的属性失败：fstat() 失败：%s" -#: glib/gfileutils.c:946 +#: glib/gfileutils.c:964 #, c-format msgid "Failed to open file “%s”: fdopen() failed: %s" msgstr "打开文件“%s”失败：fdopen() 失败：%s" -#: glib/gfileutils.c:1047 +#: glib/gfileutils.c:1065 #, c-format msgid "Failed to rename file “%s” to “%s”: g_rename() failed: %s" msgstr "将文件“%s”重命名为“%s”失败：g_rename() 失败：%s" -#: glib/gfileutils.c:1156 +#: glib/gfileutils.c:1179 #, c-format msgid "Failed to write file “%s”: write() failed: %s" msgstr "写入文件“%s”失败：write() 失败：%s" -#: glib/gfileutils.c:1177 +#: glib/gfileutils.c:1200 #, c-format msgid "Failed to write file “%s”: fsync() failed: %s" msgstr "写入文件“%s”失败：fsync() 失败：%s" -#: glib/gfileutils.c:1338 glib/gfileutils.c:1753 +#: glib/gfileutils.c:1361 glib/gfileutils.c:1776 #, c-format msgid "Failed to create file “%s”: %s" msgstr "创建文件“%s”失败：%s" -#: glib/gfileutils.c:1383 +#: glib/gfileutils.c:1406 #, c-format msgid "Existing file “%s” could not be removed: g_unlink() failed: %s" msgstr "无法删除已有文件“%s”：g_unlink() 失败：%s" -#: glib/gfileutils.c:1718 +#: glib/gfileutils.c:1741 #, c-format msgid "Template “%s” invalid, should not contain a “%s”" msgstr "模板“%s”无效，不应该包含“%s”" -#: glib/gfileutils.c:1731 +#: glib/gfileutils.c:1754 #, c-format msgid "Template “%s” doesn’t contain XXXXXX" msgstr "模板“%s”不包含 XXXXXX" -#: glib/gfileutils.c:2291 glib/gfileutils.c:2320 +#: glib/gfileutils.c:2348 glib/gfileutils.c:2377 #, c-format msgid "Failed to read the symbolic link “%s”: %s" msgstr "读取符号链接“%s”失败：%s" @@ -5024,8 +5034,8 @@ msgstr "键文件包含不支持的编码“%s”" #: glib/gkeyfile.c:1679 glib/gkeyfile.c:1852 glib/gkeyfile.c:3299 -#: glib/gkeyfile.c:3363 glib/gkeyfile.c:3493 glib/gkeyfile.c:3625 -#: glib/gkeyfile.c:3771 glib/gkeyfile.c:4006 glib/gkeyfile.c:4073 +#: glib/gkeyfile.c:3363 glib/gkeyfile.c:3493 glib/gkeyfile.c:3622 +#: glib/gkeyfile.c:3768 glib/gkeyfile.c:4003 glib/gkeyfile.c:4070 #, c-format msgid "Key file does not have group “%s”" msgstr "键文件没有组“%s”" @@ -5058,31 +5068,31 @@ 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:4326 +#: glib/gkeyfile.c:4323 msgid "Key file contains escape character at end of line" msgstr "键文件在行尾含有转义字符" -#: glib/gkeyfile.c:4348 +#: glib/gkeyfile.c:4345 #, c-format msgid "Key file contains invalid escape sequence “%s”" msgstr "键文件中包含无效的转义序列“%s”" -#: glib/gkeyfile.c:4493 +#: glib/gkeyfile.c:4490 #, c-format msgid "Value “%s” cannot be interpreted as a number." msgstr "无法将值“%s”解释为数值。" -#: glib/gkeyfile.c:4507 +#: glib/gkeyfile.c:4504 #, c-format msgid "Integer value “%s” out of range" msgstr "整数值“%s”超出范围" -#: glib/gkeyfile.c:4540 +#: glib/gkeyfile.c:4537 #, c-format msgid "Value “%s” cannot be interpreted as a float number." msgstr "无法将值“%s”解释为浮点数。" -#: glib/gkeyfile.c:4579 +#: glib/gkeyfile.c:4576 #, c-format msgid "Value “%s” cannot be interpreted as a boolean." msgstr "无法将值“%s”解释为布尔值。" @@ -5102,32 +5112,32 @@ msgid "Failed to open file “%s”: open() failed: %s" msgstr "打开文件“%s”失败：open() 失败：%s" -#: glib/gmarkup.c:400 glib/gmarkup.c:442 +#: glib/gmarkup.c:393 glib/gmarkup.c:435 #, c-format msgid "Error on line %d char %d: " msgstr "第 %d 行第 %d 个字符出错： " -#: glib/gmarkup.c:464 glib/gmarkup.c:547 +#: glib/gmarkup.c:457 glib/gmarkup.c:540 #, c-format msgid "Invalid UTF-8 encoded text in name — not valid “%s”" msgstr "名称包含无效的 UTF-8 编码文本——无效的“%s”" -#: glib/gmarkup.c:475 +#: glib/gmarkup.c:468 #, c-format msgid "“%s” is not a valid name" msgstr "“%s”不是有效的名称" -#: glib/gmarkup.c:491 +#: glib/gmarkup.c:484 #, c-format msgid "“%s” is not a valid name: “%c”" msgstr "“%s”不是有效的名称：“%c”" -#: glib/gmarkup.c:615 +#: glib/gmarkup.c:608 #, c-format msgid "Error on line %d: %s" msgstr "第 %d 行出错：%s" -#: glib/gmarkup.c:692 +#: glib/gmarkup.c:685 #, c-format msgid "" "Failed to parse “%-.*s”, which should have been a digit inside a character " @@ -5135,7 +5145,7 @@ msgstr "" "解析“%-.*s”失败。它应该是字符引用中的数字（如 ê）——可能该数字太大了" -#: glib/gmarkup.c:704 +#: glib/gmarkup.c:697 msgid "" "Character reference did not end with a semicolon; most likely you used an " "ampersand character without intending to start an entity — escape ampersand " @@ -5144,22 +5154,22 @@ "字符引用没有以分号结束。很可能您使用了与号（&）字符而又不是一个实体——将这个与" "号变为 &" -#: glib/gmarkup.c:730 +#: glib/gmarkup.c:723 #, c-format msgid "Character reference “%-.*s” does not encode a permitted character" msgstr "字符引用“%-.*s”没有编码一个允许的字符" -#: glib/gmarkup.c:768 +#: glib/gmarkup.c:761 msgid "" "Empty entity “&;” seen; valid entities are: & " < > '" msgstr "发现空的实体“&;”。有效的实体为：& " < > '" -#: glib/gmarkup.c:776 +#: glib/gmarkup.c:769 #, c-format msgid "Entity name “%-.*s” is not known" msgstr "未知的实体名“%-.*s”" -#: glib/gmarkup.c:781 +#: glib/gmarkup.c:774 msgid "" "Entity did not end with a semicolon; most likely you used an ampersand " "character without intending to start an entity — escape ampersand as &" @@ -5167,36 +5177,36 @@ "实体没有以分号结束。很可能您使用了与号（&）字符而又不是一个实体——将这个与号变" "为 &" -#: glib/gmarkup.c:1195 +#: glib/gmarkup.c:1188 msgid "Document must begin with an element (e.g. <book>)" msgstr "文档必须以一个元素开始（例如 <book>）" -#: glib/gmarkup.c:1235 +#: glib/gmarkup.c:1228 #, c-format msgid "" "“%s” is not a valid character following a “<” character; it may not begin an " "element name" msgstr "“%s”出现在字符“<”后是无效字符；它不能作为元素名的开头" -#: glib/gmarkup.c:1278 +#: glib/gmarkup.c:1271 #, c-format msgid "" "Odd character “%s”, expected a “>” character to end the empty-element tag " "“%s”" msgstr "字符“%s”无效，应该以字符“>”来结束空元素标记“%s”" -#: glib/gmarkup.c:1348 +#: glib/gmarkup.c:1341 #, c-format msgid "Too many attributes in element “%s”" msgstr "元素“%s”中有过多参数" -#: glib/gmarkup.c:1368 +#: glib/gmarkup.c:1361 #, c-format msgid "" "Odd character “%s”, expected a “=” after attribute name “%s” of element “%s”" msgstr "字符“%s”无效，在属性名“%s”（元素“%s”）的后应该是字符“=”" -#: glib/gmarkup.c:1410 +#: glib/gmarkup.c:1403 #, c-format msgid "" "Odd character “%s”, expected a “>” or “/” character to end the start tag of " @@ -5206,92 +5216,92 @@ "字符“%s”无效，应该以“>”或“/”结束元素“%s”的起始标记，或紧跟该元素的属性；可能" "您在属性名中使用了无效字符" -#: glib/gmarkup.c:1455 +#: glib/gmarkup.c:1448 #, c-format msgid "" "Odd character “%s”, expected an open quote mark after the equals sign when " "giving value for attribute “%s” of element “%s”" msgstr "字符“%1$s”无效，在给元素“%3$s”的属性“%2$s”赋值时，等号后应该是前引号" -#: glib/gmarkup.c:1589 +#: glib/gmarkup.c:1582 #, c-format msgid "" "“%s” is not a valid character following the characters “</”; “%s” may not " "begin an element name" msgstr "“%s”出现在字符“</”后无效；“%s”不能作为元素名的开头" -#: glib/gmarkup.c:1627 +#: glib/gmarkup.c:1620 #, c-format msgid "" "“%s” is not a valid character following the close element name “%s”; the " "allowed character is “>”" msgstr "“%s”字符出现在闭合元素名“%s”后无效；允许的字符是“>”" -#: glib/gmarkup.c:1639 +#: glib/gmarkup.c:1632 #, c-format msgid "Element “%s” was closed, no element is currently open" msgstr "元素“%s”已经闭合，当前没有开放的元素" -#: glib/gmarkup.c:1648 +#: glib/gmarkup.c:1641 #, c-format msgid "Element “%s” was closed, but the currently open element is “%s”" msgstr "元素“%s”已经闭合，当前仍开放的元素是“%s”" -#: glib/gmarkup.c:1801 +#: glib/gmarkup.c:1794 msgid "Document was empty or contained only whitespace" msgstr "文档为空或仅含空白字符" -#: glib/gmarkup.c:1815 +#: glib/gmarkup.c:1808 msgid "Document ended unexpectedly just after an open angle bracket “<”" msgstr "文档在一个左尖括号“<”后意外结束" -#: glib/gmarkup.c:1823 glib/gmarkup.c:1868 +#: glib/gmarkup.c:1816 glib/gmarkup.c:1861 #, c-format msgid "" "Document ended unexpectedly with elements still open — “%s” was the last " "element opened" msgstr "文档在元素仍开放处意外结束——最后未结束的元素是“%s”" -#: glib/gmarkup.c:1831 +#: glib/gmarkup.c:1824 #, c-format msgid "" "Document ended unexpectedly, expected to see a close angle bracket ending " "the tag <%s/>" msgstr "文档意外结束，应该以右尖括号“>”来结束标记 <%s/>" -#: glib/gmarkup.c:1837 +#: glib/gmarkup.c:1830 msgid "Document ended unexpectedly inside an element name" msgstr "文档在元素名中意外结束" -#: glib/gmarkup.c:1843 +#: glib/gmarkup.c:1836 msgid "Document ended unexpectedly inside an attribute name" msgstr "文档在属性名中意外结束" -#: glib/gmarkup.c:1848 +#: glib/gmarkup.c:1841 msgid "Document ended unexpectedly inside an element-opening tag." msgstr "文档在元素仍开放的标记中意外结束。" -#: glib/gmarkup.c:1854 +#: glib/gmarkup.c:1847 msgid "" "Document ended unexpectedly after the equals sign following an attribute " "name; no attribute value" msgstr "文档在跟在属性名后的等号后意外结束；没有属性值" -#: glib/gmarkup.c:1861 +#: glib/gmarkup.c:1854 msgid "Document ended unexpectedly while inside an attribute value" msgstr "文档在属性值中意外结束" -#: glib/gmarkup.c:1878 +#: glib/gmarkup.c:1871 #, c-format msgid "Document ended unexpectedly inside the close tag for element “%s”" msgstr "文档在元素“%s”的闭合标记中意外结束" -#: glib/gmarkup.c:1882 +#: glib/gmarkup.c:1875 msgid "" "Document ended unexpectedly inside the close tag for an unopened element" msgstr "文档在无起始元素的闭合标记中意外结束" -#: glib/gmarkup.c:1888 +#: glib/gmarkup.c:1881 msgid "Document ended unexpectedly inside a comment or processing instruction" msgstr "文档在注释或处理指令中意外结束" @@ -5354,300 +5364,300 @@ msgid "Unknown option %s" msgstr "未知选项 %s" -#: glib/gregex.c:436 +#: glib/gregex.c:479 msgid "corrupted object" msgstr "无效对象" -#: glib/gregex.c:438 +#: glib/gregex.c:481 msgid "out of memory" msgstr "内存不足" -#: glib/gregex.c:443 +#: glib/gregex.c:487 msgid "backtracking limit reached" msgstr "达到回溯上限" -#: glib/gregex.c:454 glib/gregex.c:707 glib/gregex.c:736 +#: glib/gregex.c:498 msgid "internal error" msgstr "内部错误" -#: glib/gregex.c:456 +#: glib/gregex.c:500 msgid "the pattern contains items not supported for partial matching" msgstr "表达式包含不被部分匹配支持的项" -#: glib/gregex.c:458 +#: glib/gregex.c:502 msgid "back references as conditions are not supported for partial matching" msgstr "不完全匹配时作为条件的后向引用不被支持" -#: glib/gregex.c:464 +#: glib/gregex.c:508 msgid "recursion limit reached" msgstr "达到递归上限" -#: glib/gregex.c:466 +#: glib/gregex.c:510 msgid "bad offset" msgstr "错误的偏移值" -#: glib/gregex.c:468 +#: glib/gregex.c:512 msgid "recursion loop" msgstr "递归循环" #. should not happen in GRegex since we check modes before each match -#: glib/gregex.c:471 +#: glib/gregex.c:515 msgid "matching mode is requested that was not compiled for JIT" msgstr "请求了匹配模式，但它未为 JIT 编译" -#: glib/gregex.c:475 +#: glib/gregex.c:536 glib/gregex.c:1838 msgid "unknown error" msgstr "未知错误" -#: glib/gregex.c:496 +#: glib/gregex.c:557 msgid "\\ at end of pattern" msgstr "\\ 在表达式末尾" -#: glib/gregex.c:500 +#: glib/gregex.c:561 msgid "\\c at end of pattern" msgstr "表达式末尾的 \\c" -#: glib/gregex.c:505 +#: glib/gregex.c:566 msgid "unrecognized character following \\" msgstr "\\ 后有无法识别的字符" -#: glib/gregex.c:509 +#: glib/gregex.c:570 msgid "numbers out of order in {} quantifier" msgstr "{} 量词里的数字次序颠倒了" -#: glib/gregex.c:513 +#: glib/gregex.c:574 msgid "number too big in {} quantifier" msgstr "{} 量词里的数字太大了" -#: glib/gregex.c:517 +#: glib/gregex.c:578 msgid "missing terminating for character class" msgstr "字符类缺少终结的 " -#: glib/gregex.c:521 +#: glib/gregex.c:582 msgid "invalid escape sequence in character class" msgstr "字符类包含无效的转义序列" -#: glib/gregex.c:525 +#: glib/gregex.c:586 msgid "range out of order in character class" msgstr "字符类的范围次序颠倒" -#: glib/gregex.c:530 +#: glib/gregex.c:591 msgid "nothing to repeat" msgstr "没有可以重复的内容" -#: glib/gregex.c:534 +#: glib/gregex.c:595 msgid "unrecognized character after (? or (?-" msgstr "(? 或 (?- 后有无法识别的字符" -#: glib/gregex.c:538 +#: glib/gregex.c:599 msgid "POSIX named classes are supported only within a class" msgstr "只有类里支持 POSIX 命名的类" -#: glib/gregex.c:542 +#: glib/gregex.c:603 msgid "POSIX collating elements are not supported" msgstr "不支持 POSIX 整理元素" -#: glib/gregex.c:548 +#: glib/gregex.c:609 msgid "missing terminating )" msgstr "缺少结束的 )" -#: glib/gregex.c:552 +#: glib/gregex.c:613 msgid "reference to non-existent subpattern" msgstr "引用了不存在的子表达式" -#: glib/gregex.c:556 +#: glib/gregex.c:617 msgid "missing ) after comment" msgstr "注释后缺少 )" -#: glib/gregex.c:560 +#: glib/gregex.c:621 msgid "regular expression is too large" msgstr "正则表达式过长" -#: glib/gregex.c:564 +#: glib/gregex.c:625 msgid "malformed number or name after (?(" msgstr "(?( 后有形式不正确的数字或名称" -#: glib/gregex.c:568 +#: glib/gregex.c:629 msgid "lookbehind assertion is not fixed length" msgstr "lookbehind 断言不是定长的" -#: glib/gregex.c:572 +#: glib/gregex.c:633 msgid "conditional group contains more than two branches" msgstr "条件组包含了超过两个分支" -#: glib/gregex.c:576 +#: glib/gregex.c:637 msgid "assertion expected after (?(" msgstr "(?( 后应该有断言" -#: glib/gregex.c:580 +#: glib/gregex.c:641 msgid "a numbered reference must not be zero" msgstr "编号引用不能为 0" -#: glib/gregex.c:584 +#: glib/gregex.c:645 msgid "unknown POSIX class name" msgstr "未知的 POSIX 类名" -#: glib/gregex.c:589 +#: glib/gregex.c:650 msgid "character value in \\x{...} sequence is too large" msgstr "\\x{...} 序列里的字符值太大了" -#: glib/gregex.c:593 +#: glib/gregex.c:654 msgid "\\C not allowed in lookbehind assertion" msgstr "lookbehind 断言里不允许使用 \\C" -#: glib/gregex.c:597 +#: glib/gregex.c:658 msgid "missing terminator in subpattern name" msgstr "子表达式名里缺少终结符" -#: glib/gregex.c:601 +#: glib/gregex.c:662 msgid "two named subpatterns have the same name" msgstr "两个有名子表达式有相同的名称" -#: glib/gregex.c:605 +#: glib/gregex.c:666 msgid "malformed \\P or \\p sequence" msgstr "形式不正确的 \\P 或 \\p 序列" -#: glib/gregex.c:609 +#: glib/gregex.c:670 msgid "unknown property name after \\P or \\p" msgstr "\\P 或 \\p 后有未知的属性名" -#: glib/gregex.c:613 +#: glib/gregex.c:674 msgid "subpattern name is too long (maximum 32 characters)" msgstr "子表达式名太长了（最多 32 个字符）" -#: glib/gregex.c:617 +#: glib/gregex.c:678 msgid "too many named subpatterns (maximum 10,000)" msgstr "有名子表达式太多了（最多 10,000 个）" -#: glib/gregex.c:621 +#: glib/gregex.c:682 msgid "octal value is greater than \\377" msgstr "八进制值大于 \\377" -#: glib/gregex.c:625 +#: glib/gregex.c:686 msgid "DEFINE group contains more than one branch" msgstr "定义组包含多于一个的分支" -#: glib/gregex.c:629 +#: glib/gregex.c:690 msgid "inconsistent NEWLINE options" msgstr "不一致的换行选项" -#: glib/gregex.c:633 +#: glib/gregex.c:694 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:638 +#: glib/gregex.c:699 msgid "an argument is not allowed for (*ACCEPT), (*FAIL), or (*COMMIT)" msgstr "(*ACCEPT)、(*FAIL) 和 (*COMMIT) 不允许带参数" -#: glib/gregex.c:642 +#: glib/gregex.c:703 msgid "(*VERB) not recognized" msgstr "无法识别 (*VERB)" -#: glib/gregex.c:646 +#: glib/gregex.c:707 msgid "number is too big" msgstr "数字太大" -#: glib/gregex.c:650 +#: glib/gregex.c:711 msgid "missing subpattern name after (?&" msgstr "(?& 后缺少子表达式名" -#: glib/gregex.c:654 +#: glib/gregex.c:715 msgid "different names for subpatterns of the same number are not allowed" msgstr "不允许两个号码相同的子表达式有不同的名称" -#: glib/gregex.c:658 +#: glib/gregex.c:719 msgid "(*MARK) must have an argument" msgstr "(*MARK) 必须有一个参数" -#: glib/gregex.c:662 +#: glib/gregex.c:723 msgid "\\c must be followed by an ASCII character" msgstr "\\c 后面必须跟一个 ASCII 字符" -#: glib/gregex.c:666 +#: glib/gregex.c:727 msgid "\\k is not followed by a braced, angle-bracketed, or quoted name" msgstr "\\k 后没有用花括号、尖括号或引号括起来的名称" -#: glib/gregex.c:670 +#: glib/gregex.c:731 msgid "\\N is not supported in a class" msgstr "类中不支持 \\N" -#: glib/gregex.c:674 +#: glib/gregex.c:735 msgid "name is too long in (*MARK), (*PRUNE), (*SKIP), or (*THEN)" msgstr "在 (*MARK)、(*PRUNE)、(*SKIP) 或者 (*THEN) 中的名称太长" -#: glib/gregex.c:678 glib/gregex.c:809 +#: glib/gregex.c:739 glib/gregex.c:875 msgid "code overflow" msgstr "代码溢出" -#: glib/gregex.c:682 +#: glib/gregex.c:743 msgid "unrecognized character after (?P" msgstr "(?P 有无法识别的字符" -#: glib/gregex.c:686 +#: glib/gregex.c:747 msgid "overran compiling workspace" msgstr "编译工作区超出正常范围" -#: glib/gregex.c:690 +#: glib/gregex.c:751 msgid "previously-checked referenced subpattern not found" msgstr "未找到之前检查过的引用过的子表达式" -#: glib/gregex.c:808 glib/gregex.c:1041 glib/gregex.c:2342 +#: glib/gregex.c:874 glib/gregex.c:1121 glib/gregex.c:2444 #, c-format msgid "Error while matching regular expression %s: %s" msgstr "匹配正则表达式 %s 时出错：%s" -#: glib/gregex.c:1618 +#: glib/gregex.c:1721 msgid "PCRE library is compiled without UTF8 support" msgstr "PCRE 库编译时未包含 UTF8 支持" -#: glib/gregex.c:1626 +#: glib/gregex.c:1729 msgid "PCRE library is compiled with incompatible options" msgstr "PCRE 库编译时使用了不兼容的选项" -#: glib/gregex.c:1751 +#: glib/gregex.c:1847 #, c-format msgid "Error while compiling regular expression ‘%s’ at char %s: %s" msgstr "编译正则表达式“%s”到字符 %s 处时出错：%s" -#: glib/gregex.c:2786 +#: glib/gregex.c:2887 msgid "hexadecimal digit or “}” expected" msgstr "期望十六进制数或“}”" -#: glib/gregex.c:2802 +#: glib/gregex.c:2903 msgid "hexadecimal digit expected" msgstr "期望十六进制数" -#: glib/gregex.c:2842 +#: glib/gregex.c:2943 msgid "missing “<” in symbolic reference" msgstr "在符号引用中缺少“<”" -#: glib/gregex.c:2851 +#: glib/gregex.c:2952 msgid "unfinished symbolic reference" msgstr "未完成的符号引用" -#: glib/gregex.c:2858 +#: glib/gregex.c:2959 msgid "zero-length symbolic reference" msgstr "零长符号引用" -#: glib/gregex.c:2869 +#: glib/gregex.c:2970 msgid "digit expected" msgstr "期望数字" -#: glib/gregex.c:2887 +#: glib/gregex.c:2988 msgid "illegal symbolic reference" msgstr "非法的符号引用" -#: glib/gregex.c:2950 +#: glib/gregex.c:3051 msgid "stray final “\\”" msgstr "丢失了最后的“\\”" -#: glib/gregex.c:2954 +#: glib/gregex.c:3055 msgid "unknown escape sequence" msgstr "未知的转义序列" -#: glib/gregex.c:2964 +#: glib/gregex.c:3065 #, c-format msgid "Error while parsing replacement text “%s” at char %lu: %s" msgstr "解析替换文本“%s”到字符 %lu 处时出错：%s" @@ -5674,96 +5684,101 @@ msgid "Text was empty (or contained only whitespace)" msgstr "文本为空（或仅含空白字符）" -#: glib/gspawn.c:314 +#: glib/gspawn.c:319 #, c-format msgid "Failed to read data from child process (%s)" msgstr "从子进程中读取数据失败（%s）" -#: glib/gspawn.c:466 +#: glib/gspawn.c:471 #, c-format msgid "Unexpected error in reading data from a child process (%s)" msgstr "在从子进程中读取数据时出现异常错误（%s）" -#: glib/gspawn.c:551 +#: glib/gspawn.c:556 #, c-format msgid "Unexpected error in waitpid() (%s)" msgstr "waitpid() 出现异常错误（%s）" -#: glib/gspawn.c:1170 glib/gspawn-win32.c:1488 +#: glib/gspawn.c:1175 glib/gspawn-win32.c:1503 #, c-format msgid "Child process exited with code %ld" msgstr "子进程已退出，代码 %ld" -#: glib/gspawn.c:1178 +#: glib/gspawn.c:1183 #, c-format msgid "Child process killed by signal %ld" msgstr "子进程已由信号 %ld 杀死" -#: glib/gspawn.c:1185 +#: glib/gspawn.c:1190 #, c-format msgid "Child process stopped by signal %ld" msgstr "子进程已由信号 %ld 停止" -#: glib/gspawn.c:1192 +#: glib/gspawn.c:1197 #, c-format msgid "Child process exited abnormally" msgstr "子进程异常中止" -#: glib/gspawn.c:1885 glib/gspawn-win32.c:393 glib/gspawn-win32.c:401 +#: glib/gspawn.c:2027 glib/gspawn-win32.c:393 glib/gspawn-win32.c:401 #, c-format msgid "Failed to read from child pipe (%s)" msgstr "从子管道中读取失败（%s）" -#: glib/gspawn.c:2248 +#: glib/gspawn.c:2399 #, c-format msgid "Failed to spawn child process “%s” (%s)" msgstr "生成子进程“%s”失败（%s）" -#: glib/gspawn.c:2365 +#: glib/gspawn.c:2525 #, c-format msgid "Failed to fork (%s)" msgstr "fork 失败（%s）" -#: glib/gspawn.c:2525 glib/gspawn-win32.c:424 +#: glib/gspawn.c:2685 glib/gspawn-win32.c:424 #, c-format msgid "Failed to change to directory “%s” (%s)" msgstr "切换到目录“%s”失败（%s）" -#: glib/gspawn.c:2535 +#: glib/gspawn.c:2695 #, c-format msgid "Failed to execute child process “%s” (%s)" msgstr "执行子进程“%s”失败（%s）" -#: glib/gspawn.c:2545 +#: glib/gspawn.c:2705 #, c-format msgid "Failed to open file to remap file descriptor (%s)" msgstr "打开文件以重新映射文件描述符失败（%s）" -#: glib/gspawn.c:2553 +#: glib/gspawn.c:2713 #, c-format msgid "Failed to duplicate file descriptor for child process (%s)" msgstr "为子进程复制文件描述符失败（%s）" -#: glib/gspawn.c:2562 +#: glib/gspawn.c:2722 #, c-format msgid "Failed to fork child process (%s)" msgstr "fork 子进程失败（%s）" -#: glib/gspawn.c:2570 +#: glib/gspawn.c:2730 #, c-format msgid "Failed to close file descriptor for child process (%s)" msgstr "为子进程关闭文件描述符失败（%s）" -#: glib/gspawn.c:2578 +#: glib/gspawn.c:2738 #, c-format msgid "Unknown error executing child process “%s”" msgstr "执行子进程“%s”时出现未知错误" -#: glib/gspawn.c:2602 +#: glib/gspawn.c:2762 #, c-format msgid "Failed to read enough data from child pid pipe (%s)" msgstr "从子进程管道中读取足够的数据失败（%s）" +#: glib/gspawn-private.h:134 +#, c-format +msgid "Invalid source FDs argument" +msgstr "无效的源文件描述符参数" + #: glib/gspawn-win32.c:337 msgid "Failed to read data from child process" msgstr "从子进程中读取数据失败" @@ -5783,47 +5798,47 @@ msgid "Invalid program name: %s" msgstr "无效的程序名：%s" -#: glib/gspawn-win32.c:521 glib/gspawn-win32.c:853 +#: glib/gspawn-win32.c:521 glib/gspawn-win32.c:868 #, c-format msgid "Invalid string in argument vector at %d: %s" msgstr "%d 处的参数向量中有无效的字符串：%s" -#: glib/gspawn-win32.c:532 glib/gspawn-win32.c:869 +#: glib/gspawn-win32.c:532 glib/gspawn-win32.c:884 #, c-format msgid "Invalid string in environment: %s" msgstr "环境中有无效的字符串：%s" -#: glib/gspawn-win32.c:849 +#: glib/gspawn-win32.c:864 #, c-format msgid "Invalid working directory: %s" msgstr "无效的工作目录：%s" -#: glib/gspawn-win32.c:914 +#: glib/gspawn-win32.c:929 #, c-format msgid "Failed to execute helper program (%s)" msgstr "执行助手程序（%s）失败" -#: glib/gspawn-win32.c:1143 +#: glib/gspawn-win32.c:1158 msgid "" "Unexpected error in g_io_channel_win32_poll() reading data from a child " "process" msgstr "g_io_channel_win32_poll() 从子进程中读取数据时出现异常错误" -#: glib/gstrfuncs.c:3366 glib/gstrfuncs.c:3468 +#: glib/gstrfuncs.c:3370 glib/gstrfuncs.c:3472 msgid "Empty string is not a number" msgstr "空字符串不是数字" -#: glib/gstrfuncs.c:3390 +#: glib/gstrfuncs.c:3394 #, c-format msgid "“%s” is not a signed number" msgstr "“%s”不是有效的有符号数值" -#: glib/gstrfuncs.c:3400 glib/gstrfuncs.c:3504 +#: glib/gstrfuncs.c:3404 glib/gstrfuncs.c:3508 #, c-format msgid "Number “%s” is out of bounds %s, %s" msgstr "数字“%s”越界 %s, %s" -#: glib/gstrfuncs.c:3494 +#: glib/gstrfuncs.c:3498 #, c-format msgid "“%s” is not an unsigned number" msgstr "“%s”不是有效的无符号数值" @@ -5902,138 +5917,138 @@ msgstr "字符超出 UTF-16 范围" #. Translators: A unit symbol for size formatting, showing for example: "13.0 kB" -#: glib/gutils.c:2857 +#: glib/gutils.c:2966 msgid "kB" msgstr "kB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 MB" -#: glib/gutils.c:2859 +#: glib/gutils.c:2968 msgid "MB" msgstr "MB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 GB" -#: glib/gutils.c:2861 +#: glib/gutils.c:2970 msgid "GB" msgstr "GB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 TB" -#: glib/gutils.c:2863 +#: glib/gutils.c:2972 msgid "TB" msgstr "TB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 PB" -#: glib/gutils.c:2865 +#: glib/gutils.c:2974 msgid "PB" msgstr "PB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 EB" -#: glib/gutils.c:2867 +#: glib/gutils.c:2976 msgid "EB" msgstr "EB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 KiB" -#: glib/gutils.c:2871 +#: glib/gutils.c:2980 msgid "KiB" msgstr "KiB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 MiB" -#: glib/gutils.c:2873 +#: glib/gutils.c:2982 msgid "MiB" msgstr "MiB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 GiB" -#: glib/gutils.c:2875 +#: glib/gutils.c:2984 msgid "GiB" msgstr "GiB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 TiB" -#: glib/gutils.c:2877 +#: glib/gutils.c:2986 msgid "TiB" msgstr "TiB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 PiB" -#: glib/gutils.c:2879 +#: glib/gutils.c:2988 msgid "PiB" msgstr "PiB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 EiB" -#: glib/gutils.c:2881 +#: glib/gutils.c:2990 msgid "EiB" msgstr "EiB" #. Translators: A unit symbol for size formatting, showing for example: "13.0 kb" -#: glib/gutils.c:2885 +#: glib/gutils.c:2994 msgid "kb" msgstr "kb" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Mb" -#: glib/gutils.c:2887 +#: glib/gutils.c:2996 msgid "Mb" msgstr "Mb" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Gb" -#: glib/gutils.c:2889 +#: glib/gutils.c:2998 msgid "Gb" msgstr "Gb" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Tb" -#: glib/gutils.c:2891 +#: glib/gutils.c:3000 msgid "Tb" msgstr "Tb" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Pb" -#: glib/gutils.c:2893 +#: glib/gutils.c:3002 msgid "Pb" msgstr "Pb" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Eb" -#: glib/gutils.c:2895 +#: glib/gutils.c:3004 msgid "Eb" msgstr "Eb" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Kib" -#: glib/gutils.c:2899 +#: glib/gutils.c:3008 msgid "Kib" msgstr "Kib" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Mib" -#: glib/gutils.c:2901 +#: glib/gutils.c:3010 msgid "Mib" msgstr "Mib" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Gib" -#: glib/gutils.c:2903 +#: glib/gutils.c:3012 msgid "Gib" msgstr "Gib" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Tib" -#: glib/gutils.c:2905 +#: glib/gutils.c:3014 msgid "Tib" msgstr "Tib" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Pib" -#: glib/gutils.c:2907 +#: glib/gutils.c:3016 msgid "Pib" msgstr "Pib" #. Translators: A unit symbol for size formatting, showing for example: "13.0 Eib" -#: glib/gutils.c:2909 +#: glib/gutils.c:3018 msgid "Eib" msgstr "Eib" -#: glib/gutils.c:2947 +#: glib/gutils.c:3056 msgid "byte" msgid_plural "bytes" msgstr0 "字节" -#: glib/gutils.c:2951 +#: glib/gutils.c:3060 msgid "bit" msgid_plural "bits" msgstr0 "位" #. Translators: The "%u" is replaced with the size value, like "13"; it could #. * be part of "13 bytes", but only the number is requested this time. -#: glib/gutils.c:2959 +#: glib/gutils.c:3068 #, c-format msgctxt "format-size" msgid "%u" @@ -6041,7 +6056,7 @@ #. Translators: The first "%u" is replaced with the value, the "%s" with a unit of the value. #. * The order can be changed with "%$2s %$1u". An example: "13 bytes" -#: glib/gutils.c:2964 +#: glib/gutils.c:3073 #, c-format msgctxt "format-size" msgid "%u %s" @@ -6049,7 +6064,7 @@ #. Translators: The "%.1f" is replaced with the size value, like "13.0"; it could #. * be part of "13.0 MB", but only the number is requested this time. -#: glib/gutils.c:3000 +#: glib/gutils.c:3109 #, c-format msgctxt "format-size" msgid "%.1f" @@ -6058,27 +6073,27 @@ #. Translators: The first "%.1f" is replaced with the value, the "%s" with a unit of the value. #. * The order can be changed with "%$2s %$1.1f". Keep the no-break space between the value and #. * the unit symbol. An example: "13.0 MB" -#: glib/gutils.c:3006 +#: glib/gutils.c:3115 #, c-format msgctxt "format-size" msgid "%.1f %s" msgstr "%.1f %s" #. Translators: the %s in "%s bytes" will always be replaced by a number. -#: glib/gutils.c:3046 +#: glib/gutils.c:3155 #, c-format msgid "%s byte" msgid_plural "%s bytes" msgstr0 "%s 字节" #. Translators: the %s in "%s bits" will always be replaced by a number. -#: glib/gutils.c:3051 +#: glib/gutils.c:3160 #, c-format msgid "%s bit" msgid_plural "%s bits" msgstr0 "%s 位" -#: glib/gutils.c:3092 +#: glib/gutils.c:3201 #, c-format msgid "%u byte" msgid_plural "%u bytes" @@ -6089,32 +6104,32 @@ #. * compatibility. Users will not see this string unless a program is using this deprecated function. #. * Please translate as literally as possible. #. -#: glib/gutils.c:3105 +#: glib/gutils.c:3214 #, c-format msgid "%.1f KB" msgstr "%.1f KB" -#: glib/gutils.c:3110 +#: glib/gutils.c:3219 #, c-format msgid "%.1f MB" msgstr "%.1f MB" -#: glib/gutils.c:3115 +#: glib/gutils.c:3224 #, c-format msgid "%.1f GB" msgstr "%.1f GB" -#: glib/gutils.c:3120 +#: glib/gutils.c:3229 #, c-format msgid "%.1f TB" msgstr "%.1f TB" -#: glib/gutils.c:3125 +#: glib/gutils.c:3234 #, c-format msgid "%.1f PB" msgstr "%.1f PB" -#: glib/gutils.c:3130 +#: glib/gutils.c:3239 #, c-format msgid "%.1f EB" msgstr "%.1f EB"
View file
_service:tar_scm:glib-2.74.4.tar.xz/subprojects/libffi.wrap -> _service:tar_scm:glib-2.76.4.tar.xz/subprojects/libffi.wrap
Changed
@@ -3,3 +3,6 @@ url=https://gitlab.freedesktop.org/gstreamer/meson-ports/libffi.git revision=meson depth=1 + +provide +libffi = ffi_dep
View file
_service:tar_scm:glib-2.74.4.tar.xz/subprojects/pcre2.wrap -> _service:tar_scm:glib-2.76.4.tar.xz/subprojects/pcre2.wrap
Changed
@@ -1,15 +1,15 @@ wrap-file -directory = pcre2-10.40 -source_url = https://github.com/PhilipHazel/pcre2/releases/download/pcre2-10.40/pcre2-10.40.tar.bz2 -source_filename = pcre2-10.40.tar.bz2 -source_hash = 14e4b83c4783933dc17e964318e6324f7cae1bc75d8f3c79bc6969f00c159d68 -patch_filename = pcre2_10.40-3_patch.zip -patch_url = https://wrapdb.mesonbuild.com/v2/pcre2_10.40-3/get_patch -patch_hash = 95391923529b4c1647a2cf88cd3b59cceb4f92393775e011f530e7865de0c7fb -wrapdb_version = 10.40-3 +directory = pcre2-10.42 +source_url = https://github.com/PhilipHazel/pcre2/releases/download/pcre2-10.42/pcre2-10.42.tar.bz2 +source_filename = pcre2-10.42.tar.bz2 +source_hash = 8d36cd8cb6ea2a4c2bb358ff6411b0c788633a2a45dabbf1aeb4b701d1b5e840 +patch_filename = pcre2_10.42-2_patch.zip +patch_url = https://wrapdb.mesonbuild.com/v2/pcre2_10.42-2/get_patch +patch_hash = 350dc342b81a1611af43e5cc23f1b10453c7df51d5bb60ab9ee247daf03802bc +wrapdb_version = 10.42-2 provide -libpcre2-8 = -libpcre2_8 -libpcre2-16 = -libpcre2_16 -libpcre2-32 = -libpcre2_32 -libpcre2-posix = -libpcre2_posix +libpcre2-8 = libpcre2_8 +libpcre2-16 = libpcre2_16 +libpcre2-32 = libpcre2_32 +libpcre2-posix = libpcre2_posix
View file
_service:tar_scm:glib-2.74.4.tar.xz/subprojects/proxy-libintl.wrap -> _service:tar_scm:glib-2.76.4.tar.xz/subprojects/proxy-libintl.wrap
Changed
@@ -1,5 +1,8 @@ wrap-git -directory=proxy-libintl -url=https://github.com/frida/proxy-libintl.git -revision=c03e1a74b17fa7ec467e110130775409e4828a4c +directory = proxy-libintl +url = https://github.com/frida/proxy-libintl.git +revision = 0.4 depth=1 + +provide +intl = intl_dep
View file
_service:tar_scm:glib-2.76.4.tar.xz/tools/gen-visibility-macros.py
Added
@@ -0,0 +1,204 @@ +#!/usr/bin/env python3 +# +# Copyright © 2022 Collabora Inc. +# +# SPDX-License-Identifier: LGPL-2.1-or-later +# +# Original author: Xavier Claessens <xclaesse@gmail.com> + +import argparse +import textwrap +from pathlib import Path + + +# Disable line length warnings as wrapping the C code templates would be hard +# flake8: noqa: E501 + + +def gen_versions_macros(args, current_minor_version): + with args.out_path.open("w", encoding="utf-8") as ofile, args.in_path.open( + "r", encoding="utf-8" + ) as ifile: + for line in ifile.readlines(): + if "@GLIB_VERSIONS@" in line: + for minor in range(2, current_minor_version + 2, 2): + ofile.write( + textwrap.dedent( + f"""\ + /** + * GLIB_VERSION_2_{minor}: + * + * A macro that evaluates to the 2.{minor} version of GLib, in a format + * that can be used by the C pre-processor. + * + * Since: 2.{max(minor, 32)} + */ + #define GLIB_VERSION_2_{minor} (G_ENCODE_VERSION (2, {minor})) + """ + ) + ) + else: + ofile.write(line) + + +def gen_doc_sections(args, current_minor_version): + with args.out_path.open("w", encoding="utf-8") as ofile, args.in_path.open( + "r", encoding="utf-8" + ) as ifile: + for line in ifile.readlines(): + if "@GLIB_VERSIONS@" in line: + for minor in range(2, current_minor_version + 2, 2): + ofile.write( + textwrap.dedent( + f"""\ + GLIB_VERSION_2_{minor} + """ + ) + ) + else: + ofile.write(line) + + +def gen_visibility_macros(args, current_minor_version): + """ + Generates a set of macros for each minor stable version of GLib + + - GLIB_VAR + + - GLIB_DEPRECATED + - GLIB_DEPRECATED_IN_… + - GLIB_DEPRECATED_MACRO_IN_… + - GLIB_DEPRECATED_ENUMERATOR_IN_… + - GLIB_DEPRECATED_TYPE_IN_… + + - GLIB_AVAILABLE_IN_ALL + - GLIB_AVAILABLE_IN_… + - GLIB_AVAILABLE_STATIC_INLINE_IN_… + - GLIB_AVAILABLE_MACRO_IN_… + - GLIB_AVAILABLE_ENUMERATOR_IN_… + - GLIB_AVAILABLE_TYPE_IN_… + + - GLIB_UNAVAILABLE(maj,min) + - GLIB_UNAVAILABLE_STATIC_INLINE(maj,min) + + The GLIB namespace can be replaced with one of GOBJECT, GIO, GMODULE. + """ + + ns = args.namespace + with args.out_path.open("w", encoding="utf-8") as f: + f.write( + textwrap.dedent( + f"""\ + #pragma once + + #if (defined(_WIN32) || defined(__CYGWIN__)) && !defined({ns}_STATIC_COMPILATION) + # define _{ns}_EXPORT __declspec(dllexport) + # define _{ns}_IMPORT __declspec(dllimport) + #elif __GNUC__ >= 4 + # define _{ns}_EXPORT __attribute__((visibility("default"))) + # define _{ns}_IMPORT + #else + # define _{ns}_EXPORT + # define _{ns}_IMPORT + #endif + #ifdef {ns}_COMPILATION + # define _{ns}_API _{ns}_EXPORT + #else + # define _{ns}_API _{ns}_IMPORT + #endif + + #define _{ns}_EXTERN _{ns}_API extern + + #define {ns}_VAR _{ns}_EXTERN + #define {ns}_AVAILABLE_IN_ALL _{ns}_EXTERN + + #ifdef GLIB_DISABLE_DEPRECATION_WARNINGS + #define {ns}_DEPRECATED _{ns}_EXTERN + #define {ns}_DEPRECATED_FOR(f) _{ns}_EXTERN + #define {ns}_UNAVAILABLE(maj,min) _{ns}_EXTERN + #define {ns}_UNAVAILABLE_STATIC_INLINE(maj,min) + #else + #define {ns}_DEPRECATED G_DEPRECATED _{ns}_EXTERN + #define {ns}_DEPRECATED_FOR(f) G_DEPRECATED_FOR(f) _{ns}_EXTERN + #define {ns}_UNAVAILABLE(maj,min) G_UNAVAILABLE(maj,min) _{ns}_EXTERN + #define {ns}_UNAVAILABLE_STATIC_INLINE(maj,min) G_UNAVAILABLE(maj,min) + #endif + """ + ) + ) + for minor in range(26, current_minor_version + 2, 2): + f.write( + textwrap.dedent( + f""" + #if GLIB_VERSION_MIN_REQUIRED >= GLIB_VERSION_2_{minor} + #define {ns}_DEPRECATED_IN_2_{minor} {ns}_DEPRECATED + #define {ns}_DEPRECATED_IN_2_{minor}_FOR(f) {ns}_DEPRECATED_FOR (f) + #define {ns}_DEPRECATED_MACRO_IN_2_{minor} GLIB_DEPRECATED_MACRO + #define {ns}_DEPRECATED_MACRO_IN_2_{minor}_FOR(f) GLIB_DEPRECATED_MACRO_FOR (f) + #define {ns}_DEPRECATED_ENUMERATOR_IN_2_{minor} GLIB_DEPRECATED_ENUMERATOR + #define {ns}_DEPRECATED_ENUMERATOR_IN_2_{minor}_FOR(f) GLIB_DEPRECATED_ENUMERATOR_FOR (f) + #define {ns}_DEPRECATED_TYPE_IN_2_{minor} GLIB_DEPRECATED_TYPE + #define {ns}_DEPRECATED_TYPE_IN_2_{minor}_FOR(f) GLIB_DEPRECATED_TYPE_FOR (f) + #else + #define {ns}_DEPRECATED_IN_2_{minor} _{ns}_EXTERN + #define {ns}_DEPRECATED_IN_2_{minor}_FOR(f) _{ns}_EXTERN + #define {ns}_DEPRECATED_MACRO_IN_2_{minor} + #define {ns}_DEPRECATED_MACRO_IN_2_{minor}_FOR(f) + #define {ns}_DEPRECATED_ENUMERATOR_IN_2_{minor} + #define {ns}_DEPRECATED_ENUMERATOR_IN_2_{minor}_FOR(f) + #define {ns}_DEPRECATED_TYPE_IN_2_{minor} + #define {ns}_DEPRECATED_TYPE_IN_2_{minor}_FOR(f) + #endif + + #if GLIB_VERSION_MAX_ALLOWED < GLIB_VERSION_2_{minor} + #define {ns}_AVAILABLE_IN_2_{minor} {ns}_UNAVAILABLE (2, {minor}) + #define {ns}_AVAILABLE_STATIC_INLINE_IN_2_{minor} GLIB_UNAVAILABLE_STATIC_INLINE (2, {minor}) + #define {ns}_AVAILABLE_MACRO_IN_2_{minor} GLIB_UNAVAILABLE_MACRO (2, {minor}) + #define {ns}_AVAILABLE_ENUMERATOR_IN_2_{minor} GLIB_UNAVAILABLE_ENUMERATOR (2, {minor}) + #define {ns}_AVAILABLE_TYPE_IN_2_{minor} GLIB_UNAVAILABLE_TYPE (2, {minor}) + #else + #define {ns}_AVAILABLE_IN_2_{minor} _{ns}_EXTERN + #define {ns}_AVAILABLE_STATIC_INLINE_IN_2_{minor} + #define {ns}_AVAILABLE_MACRO_IN_2_{minor} + #define {ns}_AVAILABLE_ENUMERATOR_IN_2_{minor} + #define {ns}_AVAILABLE_TYPE_IN_2_{minor} + #endif + """ + ) + ) + + +def main(): + parser = argparse.ArgumentParser() + parser.add_argument("glib_version", help="Current GLib version") + subparsers = parser.add_subparsers() + + versions_parser = subparsers.add_parser( + "versions-macros", help="Generate versions macros" + ) + versions_parser.add_argument("in_path", help="input file", type=Path) + versions_parser.add_argument("out_path", help="output file", type=Path) + versions_parser.set_defaults(func=gen_versions_macros) + + doc_parser = subparsers.add_parser( + "doc-sections", help="Generate glib-sections.txt" + ) + doc_parser.add_argument("in_path", help="input file", type=Path) + doc_parser.add_argument("out_path", help="output file", type=Path) + doc_parser.set_defaults(func=gen_doc_sections) + + visibility_parser = subparsers.add_parser( + "visibility-macros", help="Generate visibility macros" + ) + visibility_parser.add_argument("namespace", help="Macro namespace") + visibility_parser.add_argument("out_path", help="output file", type=Path) + visibility_parser.set_defaults(func=gen_visibility_macros) + + args = parser.parse_args() + version = int(i) for i in args.glib_version.split(".") + assert version0 == 2 + args.func(args, version1) + + +if __name__ == "__main__": + main()
View file
_service:tar_scm:glib-2.74.4.tar.xz/tools/glib.supp -> _service:tar_scm:glib-2.76.4.tar.xz/tools/glib.supp
Changed
@@ -505,7 +505,7 @@ { g-system-thread-init-malloc Memcheck:Leak - match-leak-kinds:possible,reachable + match-leak-kinds:possible,reachable,definite fun:malloc ... fun:g_system_thread_new @@ -840,6 +840,29 @@ fun:g_set_user_dirs } +# _g_unset_cached_tmp_dir() deliberately leaks the previous cached g_get_tmp_dir() values. +# These will not all be reachable on exit. +{ + g_get_tmp_dir_test_init + Memcheck:Leak + match-leak-kinds:definite,reachable + fun:malloc + ... + fun:g_get_tmp_dir + ... + fun:g_test_init +} + +# g_get_tmp_dir() caches a one-time allocation +{ + g_get_tmp_dir + Memcheck:Leak + match-leak-kinds:definite,reachable + fun:malloc + ... + fun:g_get_tmp_dir +} + # g_get_system_data_dirs() caches a one-time allocation { g_get_system_data_dirs
View file
_service:tar_scm:glib-2.74.4.tar.xz/tools/meson.build -> _service:tar_scm:glib-2.76.4.tar.xz/tools/meson.build
Changed
@@ -22,3 +22,5 @@ install_tag : 'devel', ) endif + +gen_visibility_macros = find_program('gen-visibility-macros.py')
Locations
Projects
Search
Status Monitor
Help
Open Build Service
OBS Manuals
API Documentation
OBS Portal
Reporting a Bug
Contact
Mailing List
Forums
Chat (IRC)
Twitter
Open Build Service (OBS)
is an
openSUSE project
.
浙ICP备2022010568号-2