From 3f89703a41b407d282a9f4dc46c8c9798ecfd20d Mon Sep 17 00:00:00 2001 From: DongHun Kwak Date: Tue, 17 Oct 2017 16:50:43 +0900 Subject: [PATCH] Imported Upstream version 2.54.1 Change-Id: I4a93aff027ce3f995d04804f20e9f81eb5290c1c Signed-off-by: DongHun Kwak --- ChangeLog | 275 ++++++ INSTALL | 4 +- Makefile.am | 4 +- Makefile.in | 14 +- NEWS | 14 + README | 2 +- config.h.win32 | 91 +- config.h.win32.in | 81 +- configure | 38 +- configure.ac | 4 +- docs/reference/gio/gapplication.1 | 2 +- docs/reference/gio/gdbus-codegen.1 | 2 +- docs/reference/gio/gdbus.1 | 2 +- docs/reference/gio/gio-querymodules.1 | 2 +- docs/reference/gio/gio.1 | 2 +- docs/reference/gio/glib-compile-resources.1 | 2 +- docs/reference/gio/glib-compile-schemas.1 | 2 +- docs/reference/gio/gresource.1 | 2 +- docs/reference/gio/gsettings.1 | 2 +- docs/reference/gio/html/index.html | 2 +- docs/reference/gio/version.xml | 2 +- docs/reference/glib/glib-gettextize.1 | 2 +- docs/reference/glib/gtester-report.1 | 2 +- docs/reference/glib/gtester.1 | 2 +- docs/reference/glib/gvariant-varargs.xml | 80 +- .../glib/html/glib-Commandline-option-parser.html | 4 +- docs/reference/glib/html/glib-Error-Reporting.html | 2 +- docs/reference/glib/html/glib-GVariant.html | 4 +- .../reference/glib/html/glib-Keyed-Data-Lists.html | 6 +- .../glib/html/glib-Memory-Allocation.html | 4 +- .../html/glib-Miscellaneous-Utility-Functions.html | 8 +- .../glib/html/glib-Spawning-Processes.html | 2 +- docs/reference/glib/html/glib-Testing.html | 8 +- .../glib/html/glib-The-Main-Event-Loop.html | 8 +- docs/reference/glib/html/glib-Threads.html | 8 +- ...ib-UNIX-specific-utilities-and-integration.html | 2 +- .../glib/html/glib-Version-Information.html | 2 +- .../html/glib-Windows-Compatibility-Functions.html | 2 +- .../glib/html/gvariant-format-strings.html | 133 ++- docs/reference/glib/html/index.html | 2 +- docs/reference/glib/version.xml | 2 +- docs/reference/gobject/glib-genmarshal.1 | 2 +- docs/reference/gobject/glib-mkenums.1 | 2 +- docs/reference/gobject/gobject-query.1 | 2 +- docs/reference/gobject/html/index.html | 2 +- docs/reference/gobject/version.xml | 2 +- gio/gdbus-2.0/codegen/config.py | 2 +- gio/gdbus-daemon-generated.c | 2 +- gio/gdbus-daemon-generated.h | 2 +- gio/gio.rc | 8 +- gio/gsocket.c | 94 +- gio/gunixmounts.c | 2 +- gio/meson.build | 16 +- gio/xdp-dbus.c | 2 +- gio/xdp-dbus.h | 2 +- glib/glib.rc | 8 +- glib/glibconfig.h.in | 207 ++++ glib/glibconfig.h.win32 | 19 +- glib/glibconfig.h.win32.in | 17 +- glib/gnulib/meson.build | 4 + glib/meson.build | 3 +- gmodule/gmodule.rc | 8 +- gobject/gobject.c | 136 +-- gobject/gobject.rc | 8 +- gobject/meson.build | 2 +- gthread/gthread.rc | 8 +- meson.build | 37 +- po/glib20.pot | 66 +- po/sl.gmo | Bin 90805 -> 112317 bytes po/sl.po | 1018 ++++++++------------ tests/gobject/meson.build | 77 ++ tests/meson.build | 14 + tests/refcount/meson.build | 29 + win32/vs10/glib-version-paths.props | 2 +- win32/vs11/glib-version-paths.props | 2 +- win32/vs12/glib-version-paths.props | 2 +- win32/vs14/glib-version-paths.props | 2 +- win32/vs15/glib-version-paths.props | 2 +- win32/vs9/glib-version-paths.vsprops | 2 +- 79 files changed, 1604 insertions(+), 1041 deletions(-) create mode 100644 glib/glibconfig.h.in create mode 100644 glib/gnulib/meson.build create mode 100644 tests/gobject/meson.build create mode 100644 tests/meson.build create mode 100644 tests/refcount/meson.build diff --git a/ChangeLog b/ChangeLog index 1fbb040..a5357c3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,278 @@ +commit 5fc5a3eaa6fc2ab23a3585cf22799adae642afa7 +Author: Matthias Clasen +Date: Mon Oct 2 11:01:27 2017 -0400 + + 2.54.1 + + NEWS | 14 ++++++++++++++ + configure.ac | 4 ++-- + 2 files changed, 16 insertions(+), 2 deletions(-) + +commit f480caf760d094040987edb5d492111a5f350f95 +Author: Ondrej Holy +Date: Mon Oct 2 11:24:34 2017 +0200 + + gunixmounts: Fix mount points generation + + Commit 53ed180 improved mtab processing, however, also introduced bug + in code obtaining mount points. mtab was used by mistake also for + g_unix_mount_points_get implementation, which is obviously wrong and + fstab has to be used instead... + + https://bugzilla.gnome.org/show_bug.cgi?id=781867 + + gio/gunixmounts.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit ab3a0e6176127a106896ac8d85cf20c6512a7d4f +Author: Matej Urbančič +Date: Fri Sep 29 08:41:21 2017 +0200 + + Updated Slovenian translation + + po/sl.po | 1018 + ++++++++++++++++++++++++-------------------------------------- + 1 file changed, 391 insertions(+), 627 deletions(-) + +commit 20364bbdf55a7662b657ad50e16c6b121463809b +Author: Chun-wei Fan +Date: Fri Sep 15 13:10:34 2017 +0800 + + Build: Fix glib/glibconfig.h.win32.in for x64 builds + + Fix the [GSIZE|GSSIZE]_TO_[BE|LE] macros on x64 builds. + + glib/glibconfig.h.win32.in | 17 +++++++++++++---- + 1 file changed, 13 insertions(+), 4 deletions(-) + +commit 90e86f8a2a7efdc4908d8b5b0849ebaefd104750 +Author: Chun-wei Fan +Date: Fri Sep 15 12:02:49 2017 +0800 + + config.h.win32.in: Fix and update entries + + Make config.h.win32.in reflect on the entries that are in the + autotools/Meson builds more closely. + + Also declare that we have fd_set, declare SIZEOF_[SIZE|SSIZE]_T and + SIZEOF_LONG_LONG for 32-bit and x64 builds properly. + + Note that since the Visual Studio 2015/2017 CRT's vsnprintf() and + snprintf() are not compliant enough (though they are much closer than + before) for GLib's purporses, we still use the gnulib's + implementations + of them, as with the pre-Visual Studio 2015 builds. + + config.h.win32.in | 81 + +++++++++++++++++++++++++++++++++++++++++-------------- + 1 file changed, 61 insertions(+), 20 deletions(-) + +commit 915ab35e96897e1d04cc5205c46e5256e14bd73b +Author: Chun-wei Fan +Date: Thu Jul 27 16:48:11 2017 +0800 + + meson: Install items according to their relevance + + The m4 and bash completion items are usable and relevant + depending on the host system's configuration. So, we check for the + presence of the programs that these items depend on, and only install + them when those programs are found. + + For the Valgrind suppression files, we don't install them on + Windows as + Valgrind is currently not supported on Windows. + + Als fix the path where the GDB helpers are installed, as the path is + incorrectly constructed. + + This will fix the "install" stage when building on Visual Studio at + least as there are some post-install steps that are related to them, + which will make use of these programs. + + https://bugzilla.gnome.org/show_bug.cgi?id=783270 + + gio/meson.build | 16 +++++++++------- + glib/meson.build | 3 ++- + gobject/meson.build | 2 +- + meson.build | 37 +++++++++++++++++++++++++------------ + 4 files changed, 37 insertions(+), 21 deletions(-) + +commit fcf26cbf054a5220b0492f3ff230e042a1060bde +Author: Chun-wei Fan +Date: Wed Sep 13 19:57:53 2017 +0800 + + build: Dist the other required Meson build files + + Some of the Meson build files are not dist'ed by 'make dist', + which are + reqired for things to work, and there was a missing '\' that + cause some + of the meson.build files under tests/ not to be disted. + + https://bugzilla.gnome.org/show_bug.cgi?id=783210 + + Makefile.am | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit 4ba41dbd201c483e5eb37352d080f6b527515f0e +Author: Chun-wei Fan +Date: Wed Aug 23 17:01:13 2017 +0800 + + build: Define G_HAVE_GNUC_[VARARGS|VISIBILITY] conditionally + + They are not supported by Visual Studio, so only define them in + glibconfig.h.in when not on Visual Studio. Fixes builds of GTK+-2.x + against Meson/MSVC builds of GLib. + + https://bugzilla.gnome.org/show_bug.cgi?id=783270 + + glib/glibconfig.h.in | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +commit f9d95de490847808bcdea2096840e30bb97bbfa1 +Author: Ignacio Casal Quinteiro +Date: Thu May 11 17:51:56 2017 +0200 + + Revert "GSocket: Fix race conditions on Win32 if multiple threads + are waiting on conditions for the same socket" + + This reverts commit 799f8dcd46fb40ea206d9f1b5468db62cc00a72e. + This patch seems to break applications that use GTask specific + operations with GSocket. We will need to investigate a bit more + on this issue but for now we revert it and leave it for the + next major release. + + gio/gsocket.c | 94 + +++++++++++++++++------------------------------------------ + 1 file changed, 26 insertions(+), 68 deletions(-) + +commit 51e852e5d040381f123d6df6e9d7a3293afe4965 +Author: Federico Mena Quintero +Date: Mon Sep 11 09:41:28 2017 -0500 + + validate_pspec_to_install(): Factor out function to validate a + GParamSpec + + This was duplicated also in g_object_interface_install_property(). + + Now, validations specific to classes happen in + validate_and_install_class_property() - specifically, the checks for + the presence of the get_property() and set_property() methods. + + https://bugzilla.gnome.org/show_bug.cgi?id=787551 + + gobject/gobject.c | 32 +++++++++++++++++++------------- + 1 file changed, 19 insertions(+), 13 deletions(-) + +commit 20720eaf1e258e8b2189da1d6e84eccf1426a889 +Author: Federico Mena Quintero +Date: Mon Sep 11 09:37:07 2017 -0500 + + validate_and_install_property(): Check pspec-specific fields in the + same order as g_object_interface_install_property() + + https://bugzilla.gnome.org/show_bug.cgi?id=787551 + + gobject/gobject.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 95f44b280fc5e36c23e5e67d50e86de1098bd39c +Author: Federico Mena Quintero +Date: Mon Sep 11 09:35:53 2017 -0500 + + validate_and_install_property(): Validate presence of get/set_property + methods last + + https://bugzilla.gnome.org/show_bug.cgi?id=787551 + + gobject/gobject.c | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +commit 1b08414f061ce217fec473b519dd1ba71c31bc3b +Author: Federico Mena Quintero +Date: Mon Sep 11 09:34:52 2017 -0500 + + g_object_interface_install_property(): Do interface-specific + validations first + + https://bugzilla.gnome.org/show_bug.cgi?id=787551 + + gobject/gobject.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit e667d0d4c0ae16b01b0f72093a6b448889b2f621 +Author: Federico Mena Quintero +Date: Mon Sep 11 09:30:08 2017 -0500 + + install_property_internal(): Propagate failure when installing + duplicated properties + + https://bugzilla.gnome.org/show_bug.cgi?id=787551 + + gobject/gobject.c | 32 ++++++++++++++++++-------------- + 1 file changed, 18 insertions(+), 14 deletions(-) + +commit 9dd9fe4febc424d72fa48aec801097501469ed15 +Author: Federico Mena Quintero +Date: Mon Sep 11 09:20:18 2017 -0500 + + validate_and_install_class_property(): Factor out function to add + a new property to a class + + This was duplicated between g_object_class_install_property() and + g_object_class_install_properties(). + + https://bugzilla.gnome.org/show_bug.cgi?id=787551 + + gobject/gobject.c | 96 + +++++++++++++++++++++++++++---------------------------- + 1 file changed, 48 insertions(+), 48 deletions(-) + +commit 85ef14433485046624175ac99c7e381f6aef8aba +Author: Federico Mena Quintero +Date: Mon Sep 11 09:02:23 2017 -0500 + + GObjectClass: extract class type and parent type at the beginning + + https://bugzilla.gnome.org/show_bug.cgi?id=787551 + + gobject/gobject.c | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +commit 7d9a6c86872257c6f32a44e2c792794e0447540b +Author: Federico Mena Quintero +Date: Mon Sep 11 08:54:19 2017 -0500 + + GObjectClass: Validate installing property/properties in the same way + + Then we'll be able to factor out duplicated code. + + https://bugzilla.gnome.org/show_bug.cgi?id=787551 + + gobject/gobject.c | 11 +++++------ + 1 file changed, 5 insertions(+), 6 deletions(-) + +commit 6503352be1a3d08efdb81a4b016a57740eaa3b1d +Author: Carlo Caione +Date: Thu Aug 24 17:13:20 2017 +0200 + + gvariant: Add g_variant_get() example for dicts + + In the Dictionary section of the gvariant-format-strings documentation + only how to construct a dictionary is shown. + + Add a small example showing how to extract data from a nested + dictionary + and specifically from a GVariant of type "(oa{sa{sv})". Move also the + Dictionary section after the GVariant * section for the sake of + clarity. + + https://bugzilla.gnome.org/show_bug.cgi?id=786737 + + docs/reference/glib/gvariant-varargs.xml | 80 + ++++++++++++++++++++++---------- + 1 file changed, 55 insertions(+), 25 deletions(-) + commit 738eff5decf0e354e692c36a0b9d466fc5775e3c Author: Matthias Clasen Date: Sun Sep 10 20:18:10 2017 -0400 diff --git a/INSTALL b/INSTALL index 65c6512..aaba184 100644 --- a/INSTALL +++ b/INSTALL @@ -1,8 +1,8 @@ Simple install procedure ======================== - % tar xf glib-2.54.0.tar.gz # unpack the sources - % cd glib-2.54.0 # change to the toplevel directory + % tar xf glib-2.54.1.tar.gz # unpack the sources + % cd glib-2.54.1 # change to the toplevel directory % ./configure # run the `configure' script % make # build GLIB diff --git a/Makefile.am b/Makefile.am index 4ea6515..b9accad 100644 --- a/Makefile.am +++ b/Makefile.am @@ -89,6 +89,8 @@ meson_build_files = \ gio/tests/de/LC_MESSAGES/meson.build \ gio/win32/meson.build \ gio/xdgmime/meson.build \ + glib/glibconfig.h.in \ + glib/gnulib/meson.build \ glib/libcharset/meson.build \ glib/meson.build \ glib/pcre/meson.build \ @@ -97,7 +99,7 @@ meson_build_files = \ gobject/meson.build \ gobject/tests/meson.build \ gthread/meson.build \ - po/meson.build + po/meson.build \ tests/refcount/meson.build \ tests/meson.build \ tests/gobject/meson.build \ diff --git a/Makefile.in b/Makefile.in index 0500cc1..7421c11 100644 --- a/Makefile.in +++ b/Makefile.in @@ -439,7 +439,7 @@ am__DIST_COMMON = $(srcdir)/INSTALL.in $(srcdir)/Makefile.in \ $(srcdir)/gobject-2.0.pc.in $(srcdir)/gthread-2.0.pc.in \ $(top_srcdir)/glib.mk AUTHORS COPYING ChangeLog INSTALL NEWS \ README compile config.guess config.sub install-sh ltmain.sh \ - missing py-compile test-driver + missing test-driver DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) @@ -868,6 +868,8 @@ meson_build_files = \ gio/tests/de/LC_MESSAGES/meson.build \ gio/win32/meson.build \ gio/xdgmime/meson.build \ + glib/glibconfig.h.in \ + glib/gnulib/meson.build \ glib/libcharset/meson.build \ glib/meson.build \ glib/pcre/meson.build \ @@ -876,7 +878,11 @@ meson_build_files = \ gobject/meson.build \ gobject/tests/meson.build \ gthread/meson.build \ - po/meson.build + po/meson.build \ + tests/refcount/meson.build \ + tests/meson.build \ + tests/gobject/meson.build \ + $() CONFIGURE_DEPENDENCIES = acglib.m4 pkgconfigdir = $(libdir)/pkgconfig @@ -1931,10 +1937,6 @@ check-local: test-nonrecursive # http://people.gnome.org/~walters/docs/build-api.txt .buildapi-allow-builddir: - tests/refcount/meson.build \ - tests/meson.build \ - tests/gobject/meson.build \ - $() ChangeLog: $(AM_V_GEN) if test -d "$(srcdir)/.git"; then \ diff --git a/NEWS b/NEWS index d6d9744..d7f492a 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,17 @@ +Overview of changes in GLib 2.54.1 +================================== + +* Bugs fixed: + 786737 No g_variant_get() example for dicts + 787551 Factor out some duplicated code in GParamSpec validation + 783270 Improve Visual Studio support for Meson builds + 783210 build: Switch to sassc for generating style + 781867 various gvfsd-* wants to look in /boot/efi, causes unnecessary/inappro... + +* Translation updates: + Slovenian + + Overview of changes in GLib 2.54.0 ================================== diff --git a/README b/README index 2ebbc50..79a3edd 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ General Information =================== -This is GLib version 2.54.0. GLib is the low-level core +This is GLib version 2.54.1. GLib is the low-level core library that forms the basis for projects such as GTK+ and GNOME. It provides data structure handling for C, portability wrappers, and interfaces for such runtime functionality as an event loop, threads, diff --git a/config.h.win32 b/config.h.win32 index c92e107..f3bf262 100644 --- a/config.h.win32 +++ b/config.h.win32 @@ -38,10 +38,10 @@ #define GETTEXT_PACKAGE "glib20" /* Define to the GLIB binary age */ -#define GLIB_BINARY_AGE 5400 +#define GLIB_BINARY_AGE 5401 /* Define to the GLIB interface age */ -#define GLIB_INTERFACE_AGE 0 +#define GLIB_INTERFACE_AGE 1 /* Define the location where the catalogs will be installed */ #define GLIB_LOCALE_DIR "NONE/share/locale" @@ -50,7 +50,7 @@ #define GLIB_MAJOR_VERSION 2 /* Define to the GLIB micro version */ -#define GLIB_MICRO_VERSION 0 +#define GLIB_MICRO_VERSION 1 /* Define to the GLIB minor version */ #define GLIB_MINOR_VERSION 54 @@ -78,15 +78,13 @@ /* Define to 1 if you have the `bind_textdomain_codeset' function. */ #define HAVE_BIND_TEXTDOMAIN_CODESET 1 -#if (_MSC_VER >= 1900) /* Define if you have a version of the snprintf function with semantics as specified by the ISO C99 standard. */ -#define HAVE_C99_SNPRINTF 1 +/* #undef HAVE_C99_SNPRINTF */ /* Define if you have a version of the vsnprintf function with semantics as specified by the ISO C99 standard. */ -#define HAVE_C99_VSNPRINTF 1 -#endif +/* #undef HAVE_C99_VSNPRINTF */ /* define to 1 if Carbon is available */ /* #undef HAVE_CARBON */ @@ -168,12 +166,18 @@ /* Define to 1 if you have the `getfsstat' function. */ /* #undef HAVE_GETFSSTAT */ +/* Define to 1 if you have the `getgrgid_r' function. */ +/* #undef HAVE_GETGRGID_R */ + /* Define to 1 if you have the `getmntent_r' function. */ /* #undef HAVE_GETMNTENT_R */ /* Define to 1 if you have the `getprotobyname_r' function. */ /* #undef HAVE_GETPROTOBYNAME_R */ +/* Define to 1 if you have the `getpwuid_r' function. */ +/* #undef HAVE_GETPWUID_R */ + /* Define to 1 if you have the `getresuid' function. */ /* #undef HAVE_GETRESUID */ @@ -302,6 +306,9 @@ /* Define to 1 if you have the header file. */ #define HAVE_MALLOC_H 1 +/* Define to 1 if you have the `mbrtowc' function. */ +#define HAVE_MBRTOWC 1 + /* Define to 1 if you have the `memalign' function. */ /* #undef HAVE_MEMALIGN */ @@ -502,6 +509,18 @@ /* Define to 1 if `st_atim.tv_nsec' is a member of `struct stat'. */ /* #undef HAVE_STRUCT_STAT_ST_ATIM_TV_NSEC */ +/* Define to 1 if `st_birthtim' is a member of `struct stat'. */ +/* #undef HAVE_STRUCT_STAT_ST_BIRTHTIM */ + +/* Define to 1 if `st_birthtime' is a member of `struct stat'. */ +/* #undef HAVE_STRUCT_STAT_ST_BIRTHTIME */ + +/* Define to 1 if `st_birthtimensec' is a member of `struct stat'. */ +/* #undef HAVE_STRUCT_STAT_ST_BIRTHTIMENSEC */ + +/* Define to 1 if `st_birthtim.tv_nsec' is a member of `struct stat'. */ +/* #undef HAVE_STRUCT_STAT_ST_BIRTHTIM_TV_NSEC */ + /* Define to 1 if `st_blksize' is a member of `struct stat'. */ /* #undef HAVE_STRUCT_STAT_ST_BLKSIZE */ @@ -545,6 +564,9 @@ /* Define to 1 if you have the header file. */ /* #undef HAVE_SYS_INOTIFY_H */ +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SYS_MKDEV_H */ + /* Define to 1 if you have the header file. */ /* #undef HAVE_SYS_MNTCTL_H */ @@ -586,6 +608,9 @@ /* Define to 1 if you have the header file. */ /* #undef HAVE_SYS_SYSCTL_H */ +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SYS_TIMES_H */ + /* Define to 1 if you have the header file. */ #ifndef _MSC_VER #define HAVE_SYS_TIME_H 1 @@ -593,6 +618,12 @@ /* #undef HAVE_SYS_TIME_H */ #endif /* _MSC_VER */ +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SYS_UIO_H */ + /* Define to 1 if you have the header file. */ /* #undef HAVE_SYS_VFSTAB_H */ @@ -602,12 +633,20 @@ /* Define to 1 if you have the header file. */ /* #undef HAVE_SYS_VMOUNT_H */ +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SYS_WAIT_H */ + /* Define to 1 if you have the header file. */ /* #undef HAVE_SYS_XATTR_H */ /* Define to 1 if you have the `timegm' function. */ /* #undef HAVE_TIMEGM */ +/* Define to 1 if you have the header file. */ +#ifndef _MSC_VER +# define HAVE_UNISTD_H 1 +#endif + /* Define if your printf function family supports positional parameters as specified by Unix98. */ /* #undef HAVE_UNIX98_PRINTF */ @@ -653,6 +692,9 @@ /* Define if you have the 'wint_t' type. */ #define HAVE_WINT_T 1 +/* Have a working bcopy */ +/* #undef HAVE_WORKING_BCOPY */ + /* Define to 1 if xattr is available */ /* #undef HAVE_XATTR */ @@ -669,19 +711,11 @@ */ #define LT_OBJDIR ".libs/" -/* Define to 1 if `major', `minor', and `makedev' are declared in . - */ -/* #undef MAJOR_IN_MKDEV */ - -/* Define to 1 if `major', `minor', and `makedev' are declared in - . */ -/* #undef MAJOR_IN_SYSMACROS */ +/* Do we cache iconv descriptors */ +/* #undef NEED_ICONV_CACHE */ /* didn't find fd_set */ -#define NO_FD_SET 1 - -/* Define to 1 if your C compiler doesn't accept -c and -o together. */ -/* #undef NO_MINUS_C_MINUS_O */ +/* #undef NO_FD_SET */ /* Define to the address where bug reports for this package should be sent. */ #define PACKAGE_BUGREPORT "http://bugzilla.gnome.org/enter_bug.cgi?product=glib" @@ -690,7 +724,7 @@ #define PACKAGE_NAME "glib" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "glib 2.54.0" +#define PACKAGE_STRING "glib 2.54.1" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "glib" @@ -699,7 +733,7 @@ #define PACKAGE_URL "" /* Define to the version of this package. */ -#define PACKAGE_VERSION "2.54.0" +#define PACKAGE_VERSION "2.54.1" /* define if posix_memalign() can allocate any size */ /* #undef POSIX_MEMALIGN_WITH_COMPLIANT_ALLOCS */ @@ -714,17 +748,24 @@ #define SIZEOF_LONG 4 /* The size of `long long', as computed by sizeof. */ -#ifndef _MSC_VER #define SIZEOF_LONG_LONG 8 -#else /* _MSC_VER */ -#define SIZEOF_LONG_LONG 0 -#endif /* _MSC_VER */ /* The size of `short', as computed by sizeof. */ #define SIZEOF_SHORT 2 /* The size of `size_t', as computed by sizeof. */ -#define SIZEOF_SIZE_T 4 +#if (defined(_M_X64) || defined(_M_AMD64)) +# define SIZEOF_SIZE_T 8 +#else +# define SIZEOF_SIZE_T 4 +#endif + +/* The size of `ssize_t', as computed by sizeof. */ +#if (defined(_M_X64) || defined(_M_AMD64)) +# define SIZEOF_SSIZE_T 8 +#else +# define SIZEOF_SSIZE_T 4 +#endif /* The size of `void *', as computed by sizeof. */ #ifdef _MSC_VER diff --git a/config.h.win32.in b/config.h.win32.in index eaf7e28..7bb9a13 100644 --- a/config.h.win32.in +++ b/config.h.win32.in @@ -78,15 +78,13 @@ /* Define to 1 if you have the `bind_textdomain_codeset' function. */ #define HAVE_BIND_TEXTDOMAIN_CODESET 1 -#if (_MSC_VER >= 1900) /* Define if you have a version of the snprintf function with semantics as specified by the ISO C99 standard. */ -#define HAVE_C99_SNPRINTF 1 +/* #undef HAVE_C99_SNPRINTF */ /* Define if you have a version of the vsnprintf function with semantics as specified by the ISO C99 standard. */ -#define HAVE_C99_VSNPRINTF 1 -#endif +/* #undef HAVE_C99_VSNPRINTF */ /* define to 1 if Carbon is available */ /* #undef HAVE_CARBON */ @@ -168,12 +166,18 @@ /* Define to 1 if you have the `getfsstat' function. */ /* #undef HAVE_GETFSSTAT */ +/* Define to 1 if you have the `getgrgid_r' function. */ +/* #undef HAVE_GETGRGID_R */ + /* Define to 1 if you have the `getmntent_r' function. */ /* #undef HAVE_GETMNTENT_R */ /* Define to 1 if you have the `getprotobyname_r' function. */ /* #undef HAVE_GETPROTOBYNAME_R */ +/* Define to 1 if you have the `getpwuid_r' function. */ +/* #undef HAVE_GETPWUID_R */ + /* Define to 1 if you have the `getresuid' function. */ /* #undef HAVE_GETRESUID */ @@ -302,6 +306,9 @@ /* Define to 1 if you have the header file. */ #define HAVE_MALLOC_H 1 +/* Define to 1 if you have the `mbrtowc' function. */ +#define HAVE_MBRTOWC 1 + /* Define to 1 if you have the `memalign' function. */ /* #undef HAVE_MEMALIGN */ @@ -502,6 +509,18 @@ /* Define to 1 if `st_atim.tv_nsec' is a member of `struct stat'. */ /* #undef HAVE_STRUCT_STAT_ST_ATIM_TV_NSEC */ +/* Define to 1 if `st_birthtim' is a member of `struct stat'. */ +/* #undef HAVE_STRUCT_STAT_ST_BIRTHTIM */ + +/* Define to 1 if `st_birthtime' is a member of `struct stat'. */ +/* #undef HAVE_STRUCT_STAT_ST_BIRTHTIME */ + +/* Define to 1 if `st_birthtimensec' is a member of `struct stat'. */ +/* #undef HAVE_STRUCT_STAT_ST_BIRTHTIMENSEC */ + +/* Define to 1 if `st_birthtim.tv_nsec' is a member of `struct stat'. */ +/* #undef HAVE_STRUCT_STAT_ST_BIRTHTIM_TV_NSEC */ + /* Define to 1 if `st_blksize' is a member of `struct stat'. */ /* #undef HAVE_STRUCT_STAT_ST_BLKSIZE */ @@ -545,6 +564,9 @@ /* Define to 1 if you have the header file. */ /* #undef HAVE_SYS_INOTIFY_H */ +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SYS_MKDEV_H */ + /* Define to 1 if you have the header file. */ /* #undef HAVE_SYS_MNTCTL_H */ @@ -586,6 +608,9 @@ /* Define to 1 if you have the header file. */ /* #undef HAVE_SYS_SYSCTL_H */ +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SYS_TIMES_H */ + /* Define to 1 if you have the header file. */ #ifndef _MSC_VER #define HAVE_SYS_TIME_H 1 @@ -593,6 +618,12 @@ /* #undef HAVE_SYS_TIME_H */ #endif /* _MSC_VER */ +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SYS_UIO_H */ + /* Define to 1 if you have the header file. */ /* #undef HAVE_SYS_VFSTAB_H */ @@ -602,12 +633,20 @@ /* Define to 1 if you have the header file. */ /* #undef HAVE_SYS_VMOUNT_H */ +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SYS_WAIT_H */ + /* Define to 1 if you have the header file. */ /* #undef HAVE_SYS_XATTR_H */ /* Define to 1 if you have the `timegm' function. */ /* #undef HAVE_TIMEGM */ +/* Define to 1 if you have the header file. */ +#ifndef _MSC_VER +# define HAVE_UNISTD_H 1 +#endif + /* Define if your printf function family supports positional parameters as specified by Unix98. */ /* #undef HAVE_UNIX98_PRINTF */ @@ -653,6 +692,9 @@ /* Define if you have the 'wint_t' type. */ #define HAVE_WINT_T 1 +/* Have a working bcopy */ +/* #undef HAVE_WORKING_BCOPY */ + /* Define to 1 if xattr is available */ /* #undef HAVE_XATTR */ @@ -669,19 +711,11 @@ */ #define LT_OBJDIR ".libs/" -/* Define to 1 if `major', `minor', and `makedev' are declared in . - */ -/* #undef MAJOR_IN_MKDEV */ - -/* Define to 1 if `major', `minor', and `makedev' are declared in - . */ -/* #undef MAJOR_IN_SYSMACROS */ +/* Do we cache iconv descriptors */ +/* #undef NEED_ICONV_CACHE */ /* didn't find fd_set */ -#define NO_FD_SET 1 - -/* Define to 1 if your C compiler doesn't accept -c and -o together. */ -/* #undef NO_MINUS_C_MINUS_O */ +/* #undef NO_FD_SET */ /* Define to the address where bug reports for this package should be sent. */ #define PACKAGE_BUGREPORT "http://bugzilla.gnome.org/enter_bug.cgi?product=glib" @@ -714,17 +748,24 @@ #define SIZEOF_LONG 4 /* The size of `long long', as computed by sizeof. */ -#ifndef _MSC_VER #define SIZEOF_LONG_LONG 8 -#else /* _MSC_VER */ -#define SIZEOF_LONG_LONG 0 -#endif /* _MSC_VER */ /* The size of `short', as computed by sizeof. */ #define SIZEOF_SHORT 2 /* The size of `size_t', as computed by sizeof. */ -#define SIZEOF_SIZE_T 4 +#if (defined(_M_X64) || defined(_M_AMD64)) +# define SIZEOF_SIZE_T 8 +#else +# define SIZEOF_SIZE_T 4 +#endif + +/* The size of `ssize_t', as computed by sizeof. */ +#if (defined(_M_X64) || defined(_M_AMD64)) +# define SIZEOF_SSIZE_T 8 +#else +# define SIZEOF_SSIZE_T 4 +#endif /* The size of `void *', as computed by sizeof. */ #ifdef _MSC_VER diff --git a/configure b/configure index f220fd8..08b7af4 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for glib 2.54.0. +# Generated by GNU Autoconf 2.69 for glib 2.54.1. # # Report bugs to . # @@ -591,8 +591,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='glib' PACKAGE_TARNAME='glib' -PACKAGE_VERSION='2.54.0' -PACKAGE_STRING='glib 2.54.0' +PACKAGE_VERSION='2.54.1' +PACKAGE_STRING='glib 2.54.1' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=glib' PACKAGE_URL='' @@ -1589,7 +1589,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures glib 2.54.0 to adapt to many kinds of systems. +\`configure' configures glib 2.54.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1659,7 +1659,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of glib 2.54.0:";; + short | recursive ) echo "Configuration of glib 2.54.1:";; esac cat <<\_ACEOF @@ -1850,7 +1850,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -glib configure 2.54.0 +glib configure 2.54.1 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2680,7 +2680,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by glib $as_me 2.54.0, which was +It was created by glib $as_me 2.54.1, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3552,7 +3552,7 @@ fi # Define the identity of the package. PACKAGE='glib' - VERSION='2.54.0' + VERSION='2.54.1' # Some tools Automake needs. @@ -3821,10 +3821,10 @@ AM_BACKSLASH='\' GLIB_MAJOR_VERSION=2 GLIB_MINOR_VERSION=54 -GLIB_MICRO_VERSION=0 -GLIB_INTERFACE_AGE=0 -GLIB_BINARY_AGE=5400 -GLIB_VERSION=2.54.0 +GLIB_MICRO_VERSION=1 +GLIB_INTERFACE_AGE=1 +GLIB_BINARY_AGE=5401 +GLIB_VERSION=2.54.1 @@ -3840,19 +3840,19 @@ $as_echo "#define GLIB_MAJOR_VERSION 2" >>confdefs.h $as_echo "#define GLIB_MINOR_VERSION 54" >>confdefs.h -$as_echo "#define GLIB_MICRO_VERSION 0" >>confdefs.h +$as_echo "#define GLIB_MICRO_VERSION 1" >>confdefs.h -$as_echo "#define GLIB_INTERFACE_AGE 0" >>confdefs.h +$as_echo "#define GLIB_INTERFACE_AGE 1" >>confdefs.h -$as_echo "#define GLIB_BINARY_AGE 5400" >>confdefs.h +$as_echo "#define GLIB_BINARY_AGE 5401" >>confdefs.h # libtool versioning LT_RELEASE=2.54 LT_CURRENT=5400 -LT_REVISION=0 +LT_REVISION=1 LT_AGE=5400 LT_CURRENT_MINUS_AGE=0 @@ -20463,7 +20463,7 @@ Usage: $0 [OPTIONS] Report bugs to ." lt_cl_version="\ -glib config.lt 2.54.0 +glib config.lt 2.54.1 configured by $0, generated by GNU Autoconf 2.69. Copyright (C) 2011 Free Software Foundation, Inc. @@ -30278,7 +30278,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by glib $as_me 2.54.0, which was +This file was extended by glib $as_me 2.54.1, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -30344,7 +30344,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -glib config.status 2.54.0 +glib config.status 2.54.1 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index f322edf..6fa6eb0 100644 --- a/configure.ac +++ b/configure.ac @@ -31,8 +31,8 @@ m4_define(glib_configure_ac) m4_define([glib_major_version], [2]) m4_define([glib_minor_version], [54]) -m4_define([glib_micro_version], [0]) -m4_define([glib_interface_age], [0]) +m4_define([glib_micro_version], [1]) +m4_define([glib_interface_age], [1]) m4_define([glib_binary_age], [m4_eval(100 * glib_minor_version + glib_micro_version)]) m4_define([glib_version], diff --git a/docs/reference/gio/gapplication.1 b/docs/reference/gio/gapplication.1 index 9cd5f60..6b16f76 100644 --- a/docs/reference/gio/gapplication.1 +++ b/docs/reference/gio/gapplication.1 @@ -2,7 +2,7 @@ .\" Title: gapplication .\" Author: Ryan Lortie .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 09/04/2017 +.\" Date: 10/02/2017 .\" Manual: User Commands .\" Source: GIO .\" Language: English diff --git a/docs/reference/gio/gdbus-codegen.1 b/docs/reference/gio/gdbus-codegen.1 index 809466e..6cd64ae 100644 --- a/docs/reference/gio/gdbus-codegen.1 +++ b/docs/reference/gio/gdbus-codegen.1 @@ -2,7 +2,7 @@ .\" Title: gdbus-codegen .\" Author: David Zeuthen .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 09/04/2017 +.\" Date: 10/02/2017 .\" Manual: User Commands .\" Source: GIO .\" Language: English diff --git a/docs/reference/gio/gdbus.1 b/docs/reference/gio/gdbus.1 index 2213b82..0de488f 100644 --- a/docs/reference/gio/gdbus.1 +++ b/docs/reference/gio/gdbus.1 @@ -2,7 +2,7 @@ .\" Title: gdbus .\" Author: David Zeuthen .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 09/04/2017 +.\" Date: 10/02/2017 .\" Manual: User Commands .\" Source: GIO .\" Language: English diff --git a/docs/reference/gio/gio-querymodules.1 b/docs/reference/gio/gio-querymodules.1 index 319a708..dd76de6 100644 --- a/docs/reference/gio/gio-querymodules.1 +++ b/docs/reference/gio/gio-querymodules.1 @@ -2,7 +2,7 @@ .\" Title: gio-querymodules .\" Author: Alexander Larsson .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 09/04/2017 +.\" Date: 10/02/2017 .\" Manual: User Commands .\" Source: GIO .\" Language: English diff --git a/docs/reference/gio/gio.1 b/docs/reference/gio/gio.1 index e880151..d1b9464 100644 --- a/docs/reference/gio/gio.1 +++ b/docs/reference/gio/gio.1 @@ -2,7 +2,7 @@ .\" Title: gio .\" Author: Matthias Clasen .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 09/04/2017 +.\" Date: 10/02/2017 .\" Manual: User Commands .\" Source: GIO .\" Language: English diff --git a/docs/reference/gio/glib-compile-resources.1 b/docs/reference/gio/glib-compile-resources.1 index b7ff0e6..3fc8e7c 100644 --- a/docs/reference/gio/glib-compile-resources.1 +++ b/docs/reference/gio/glib-compile-resources.1 @@ -2,7 +2,7 @@ .\" Title: glib-compile-resources .\" Author: Alexander Larsson .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 09/04/2017 +.\" Date: 10/02/2017 .\" Manual: User Commands .\" Source: GIO .\" Language: English diff --git a/docs/reference/gio/glib-compile-schemas.1 b/docs/reference/gio/glib-compile-schemas.1 index 4a3ce89..069bfad 100644 --- a/docs/reference/gio/glib-compile-schemas.1 +++ b/docs/reference/gio/glib-compile-schemas.1 @@ -2,7 +2,7 @@ .\" Title: glib-compile-schemas .\" Author: Ryan Lortie .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 09/04/2017 +.\" Date: 10/02/2017 .\" Manual: User Commands .\" Source: GIO .\" Language: English diff --git a/docs/reference/gio/gresource.1 b/docs/reference/gio/gresource.1 index 1c1a4ee..213ce62 100644 --- a/docs/reference/gio/gresource.1 +++ b/docs/reference/gio/gresource.1 @@ -2,7 +2,7 @@ .\" Title: gresource .\" Author: Matthias Clasen .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 09/04/2017 +.\" Date: 10/02/2017 .\" Manual: User Commands .\" Source: GIO .\" Language: English diff --git a/docs/reference/gio/gsettings.1 b/docs/reference/gio/gsettings.1 index 56c51fe..b26e857 100644 --- a/docs/reference/gio/gsettings.1 +++ b/docs/reference/gio/gsettings.1 @@ -2,7 +2,7 @@ .\" Title: gsettings .\" Author: Ryan Lortie .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 09/04/2017 +.\" Date: 10/02/2017 .\" Manual: User Commands .\" Source: GIO .\" Language: English diff --git a/docs/reference/gio/html/index.html b/docs/reference/gio/html/index.html index 71ced8d..86610a9 100644 --- a/docs/reference/gio/html/index.html +++ b/docs/reference/gio/html/index.html @@ -15,7 +15,7 @@

- for GIO 2.54.0 + for GIO 2.54.1 The latest version of this documentation can be found on-line at https://developer.gnome.org/gio/unstable/. diff --git a/docs/reference/gio/version.xml b/docs/reference/gio/version.xml index 99aed79..3a40665 100644 --- a/docs/reference/gio/version.xml +++ b/docs/reference/gio/version.xml @@ -1 +1 @@ -2.54.0 +2.54.1 diff --git a/docs/reference/glib/glib-gettextize.1 b/docs/reference/glib/glib-gettextize.1 index 0e81f77..b673a76 100644 --- a/docs/reference/glib/glib-gettextize.1 +++ b/docs/reference/glib/glib-gettextize.1 @@ -2,7 +2,7 @@ .\" Title: glib-gettextize .\" Author: Owen Taylor .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 09/04/2017 +.\" Date: 10/02/2017 .\" Manual: User Commands .\" Source: GLib .\" Language: English diff --git a/docs/reference/glib/gtester-report.1 b/docs/reference/glib/gtester-report.1 index 3341ad5..c1b6b48 100644 --- a/docs/reference/glib/gtester-report.1 +++ b/docs/reference/glib/gtester-report.1 @@ -2,7 +2,7 @@ .\" Title: gtester-report .\" Author: Tim Janik .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 09/04/2017 +.\" Date: 10/02/2017 .\" Manual: User Commands .\" Source: GLib .\" Language: English diff --git a/docs/reference/glib/gtester.1 b/docs/reference/glib/gtester.1 index c8e5a24..92bf5a9 100644 --- a/docs/reference/glib/gtester.1 +++ b/docs/reference/glib/gtester.1 @@ -2,7 +2,7 @@ .\" Title: gtester .\" Author: Tim Janik .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 09/04/2017 +.\" Date: 10/02/2017 .\" Manual: User Commands .\" Source: GLib .\" Language: English diff --git a/docs/reference/glib/gvariant-varargs.xml b/docs/reference/glib/gvariant-varargs.xml index d4b68f0..fbbbfcb 100644 --- a/docs/reference/glib/gvariant-varargs.xml +++ b/docs/reference/glib/gvariant-varargs.xml @@ -817,31 +817,6 @@ value2 = g_variant_new ("()"); - - Dictionaries - - - Characters: {} - - - - - Dictionary entries are handled by handling first the key, then the value. Each is handled in the usual way. - - - - Examples - - - - - GVariant * @@ -907,6 +882,61 @@ value2 = g_variant_new ("(@(iii)*)", value1, g_variant_new_string ("foo")); + + Dictionaries + + + Characters: {} + + + + + Dictionary entries are handled by handling first the key, then the value. Each is handled in the usual way. + + + + Examples + + + + + + To extract data from nested dictionaries you can go through a vardict. + + + + Examples + +, 'max': <%i>}})", + "/object/path", value, max); +{ + GVariant *params; + GVariant *p_brightness; + gchar *obj + gint p_max; + + g_variant_get (data, "(o@a{?*})", &obj, ¶ms); + g_print ("object_path: %s\n", obj); + + p_brightness = g_variant_lookup_value (params, "brightness", G_VARIANT_TYPE_VARDICT); + g_variant_lookup (p_brightness, "max", "i", &p_max); + g_print ("max: %d\n", p_max); +}]]> + + + + Pointers diff --git a/docs/reference/glib/html/glib-Commandline-option-parser.html b/docs/reference/glib/html/glib-Commandline-option-parser.html index 221d81e..50c6cf3 100644 --- a/docs/reference/glib/html/glib-Commandline-option-parser.html +++ b/docs/reference/glib/html/glib-Commandline-option-parser.html @@ -531,7 +531,7 @@ deal with filenames containing Unicode characters that fall outside of the codepage.

A solution to this is to use g_win32_get_command_line() and g_option_context_parse_strv() which will properly handle full Unicode -filenames. If you are using GApplication, this is done +filenames. If you are using GApplication, this is done automatically for you.

The following example shows how you can use GOptionContext directly in order to correctly deal with Unicode filenames on Windows:

@@ -1067,7 +1067,7 @@ system codepage, which is how they are passed as arg to main(). See g_win32_get_command_line() for a solution.

This function is useful if you are trying to use GOptionContext with -GApplication.

+GApplication.

Parameters

diff --git a/docs/reference/glib/html/glib-Error-Reporting.html b/docs/reference/glib/html/glib-Error-Reporting.html index 7a6a94a..72a0f8d 100644 --- a/docs/reference/glib/html/glib-Error-Reporting.html +++ b/docs/reference/glib/html/glib-Error-Reporting.html @@ -615,7 +615,7 @@ misinterpretation of error codes.

GError has disadvantages though: it requires a memory allocation, and formatting the error message string has a performance overhead. This makes it unsuitable for use in retry loops where errors are a common case, rather than -being unusual. For example, using G_IO_ERROR_WOULD_BLOCK means hitting these +being unusual. For example, using G_IO_ERROR_WOULD_BLOCK means hitting these overheads in the normal control flow. String formatting overhead can be eliminated by using g_set_error_literal() in some cases.

These performance issues can be compounded if a function wraps the GErrors diff --git a/docs/reference/glib/html/glib-GVariant.html b/docs/reference/glib/html/glib-GVariant.html index 0891349..ea3c85e 100644 --- a/docs/reference/glib/html/glib-GVariant.html +++ b/docs/reference/glib/html/glib-GVariant.html @@ -1087,7 +1087,7 @@ Serialised <

GVariant is largely compatible with D-Bus. Almost all types of GVariant instances can be sent over D-Bus. See GVariantType for exceptions. (However, GVariant's serialisation format is not the same -as the serialisation format of a D-Bus message body: use GDBusMessage, +as the serialisation format of a D-Bus message body: use GDBusMessage, in the gio library, for those.)

For space-efficiency, the GVariant serialisation format does not automatically include the variant's length, type or endianness, @@ -1680,7 +1680,7 @@ the data inside of the soon-to-be-freed g_critical() is printed and FALSE is returned.

This function is meant to be used by functions that wish to provide varargs accessors to GVariant values of uncertain values (eg: -g_variant_lookup() or g_menu_model_get_item_attribute()).

+g_variant_lookup() or g_menu_model_get_item_attribute()).

Parameters

diff --git a/docs/reference/glib/html/glib-Keyed-Data-Lists.html b/docs/reference/glib/html/glib-Keyed-Data-Lists.html index 670358b..035e340 100644 --- a/docs/reference/glib/html/glib-Keyed-Data-Lists.html +++ b/docs/reference/glib/html/glib-Keyed-Data-Lists.html @@ -214,8 +214,8 @@ be accessed either with a string or with a GQuark methods are quicker, since the strings have to be converted to GQuarks anyway.

-

Data lists are used for associating arbitrary data with GObjects, -using g_object_set_data() and related functions.

+

Data lists are used for associating arbitrary data with GObjects, +using g_object_set_data() and related functions.

To create a datalist, use g_datalist_init().

To add data elements to a datalist use g_datalist_id_set_data(), g_datalist_id_set_data_full(), g_datalist_set_data() and @@ -877,7 +877,7 @@ g_datalist_set_flags (GObject type, for +is very tight. (It is used in the base GObject type, for example.)

Parameters

diff --git a/docs/reference/glib/html/glib-Memory-Allocation.html b/docs/reference/glib/html/glib-Memory-Allocation.html index ceae130..43790f2 100644 --- a/docs/reference/glib/html/glib-Memory-Allocation.html +++ b/docs/reference/glib/html/glib-Memory-Allocation.html @@ -1084,7 +1084,7 @@ the following example (which only works on GCC and clang):

GObject *
 create_object (void)
 {
-  g_autoptr(GObject) obj = g_object_new (G_TYPE_OBJECT, NULL);
+  g_autoptr(GObject) obj = g_object_new (G_TYPE_OBJECT, NULL);
 
   if (early_error_case)
     return NULL;
@@ -1119,7 +1119,7 @@ particularly useful for dealing with optional out parameters:

         
gboolean
 get_object (GObject **obj_out)
 {
-  g_autoptr(GObject) obj = g_object_new (G_TYPE_OBJECT, NULL);
+  g_autoptr(GObject) obj = g_object_new (G_TYPE_OBJECT, NULL);
 
   if (early_error_case)
     return FALSE;
diff --git a/docs/reference/glib/html/glib-Miscellaneous-Utility-Functions.html b/docs/reference/glib/html/glib-Miscellaneous-Utility-Functions.html
index b54a36e..325da53 100644
--- a/docs/reference/glib/html/glib-Miscellaneous-Utility-Functions.html
+++ b/docs/reference/glib/html/glib-Miscellaneous-Utility-Functions.html
@@ -503,8 +503,8 @@ or when displaying an application's name in the task list.

 g_get_prgname (void);

Gets the name of the program. This name should not be localized, in contrast to g_get_application_name().

-

If you are using GApplication the program name is set in -g_application_run(). In case of GDK or GTK+ it is set in +

If you are using GApplication the program name is set in +g_application_run(). In case of GDK or GTK+ it is set in gdk_init(), which is called by gtk_init() and the “startup” handler. The program name is found by taking the last component of argv @@ -522,8 +522,8 @@ to GLib and must not be modified or freed.

g_set_prgname (const gchar *prgname);

Sets the name of the program. This name should not be localized, in contrast to g_set_application_name().

-

If you are using GApplication the program name is set in -g_application_run(). In case of GDK or GTK+ it is set in +

If you are using GApplication the program name is set in +g_application_run(). In case of GDK or GTK+ it is set in gdk_init(), which is called by gtk_init() and the “startup” handler. The program name is found by taking the last component of argv diff --git a/docs/reference/glib/html/glib-Spawning-Processes.html b/docs/reference/glib/html/glib-Spawning-Processes.html index 1e68d1b..3ee8706 100644 --- a/docs/reference/glib/html/glib-Spawning-Processes.html +++ b/docs/reference/glib/html/glib-Spawning-Processes.html @@ -146,7 +146,7 @@ convenient than the bare UNIX fork() and g_spawn_async(), g_spawn_async_with_pipes()), as well as convenience variants that take a complete shell-like commandline (g_spawn_command_line_sync(), g_spawn_command_line_async()).

-

See GSubprocess in GIO for a higher-level API that provides +

See GSubprocess in GIO for a higher-level API that provides stream interfaces for communication with child processes.

An example of using g_spawn_async_with_pipes():

diff --git a/docs/reference/glib/html/glib-Testing.html b/docs/reference/glib/html/glib-Testing.html index 13f38f4..138dd04 100644 --- a/docs/reference/glib/html/glib-Testing.html +++ b/docs/reference/glib/html/glib-Testing.html @@ -725,8 +725,8 @@ nicely formatted test reports.

my_object_fixture_tear_down (MyObjectFixture *fixture, gconstpointer user_data) { - g_clear_object (&fixture->helper); - g_clear_object (&fixture->obj); + g_clear_object (&fixture->helper); + g_clear_object (&fixture->obj); } static void @@ -1807,9 +1807,9 @@ callback A before callback B will cause B() to be

g_test_queue_unref()

#define             g_test_queue_unref(gobject)
-

Enqueue an object to be released with g_object_unref() during +

Enqueue an object to be released with g_object_unref() during the next teardown phase. This is equivalent to calling -g_test_queue_destroy() with a destroy callback of g_object_unref().

+g_test_queue_destroy() with a destroy callback of g_object_unref().

Parameters

diff --git a/docs/reference/glib/html/glib-The-Main-Event-Loop.html b/docs/reference/glib/html/glib-The-Main-Event-Loop.html index 47a05e9..05149ec 100644 --- a/docs/reference/glib/html/glib-The-Main-Event-Loop.html +++ b/docs/reference/glib/html/glib-The-Main-Event-Loop.html @@ -2607,7 +2607,7 @@ ensure that no other asynchronous operations accidentally get started while the non-default context is active.

Beware that libraries that predate this function may not correctly handle being used from a thread with a thread-default context. Eg, -see g_file_supports_thread_contexts().

+see g_file_supports_thread_contexts().

Parameters

@@ -3442,7 +3442,7 @@ if the call was interrupted.

GSourceDummyMarshal ()

void
 (*GSourceDummyMarshal) (void);
-

This is just a placeholder for GClosureMarshal, +

This is just a placeholder for GClosureMarshal, which cannot be used here for dependency reasons.

@@ -3701,7 +3701,7 @@ before the dispatch of your idle handler.

if(self->idle_id)g_source_remove(self->idle_id); - G_OBJECT_CLASS(parent_class)->finalize(object); + G_OBJECT_CLASS(parent_class)->finalize(object);} @@ -4564,7 +4564,7 @@ callback), and when source its own prepare/check functions indicate that it is ready.)

If you don't need child_source to do anything on its own when it -triggers, you can call g_source_set_dummy_callback() on it to set a +triggers, you can call g_source_set_dummy_callback() on it to set a callback that does nothing (except return TRUE if appropriate).

source will hold a reference on child_source diff --git a/docs/reference/glib/html/glib-Threads.html b/docs/reference/glib/html/glib-Threads.html index 009c480..f3cc774 100644 --- a/docs/reference/glib/html/glib-Threads.html +++ b/docs/reference/glib/html/glib-Threads.html @@ -607,18 +607,18 @@ you must coordinate accesses to the same GMainLoop and GAsyncQueue, which are thread-safe and need no further application-level locking to be accessed from multiple threads. -Most refcounting functions such as g_object_ref() are also thread-safe.

+Most refcounting functions such as g_object_ref() are also thread-safe.

A common use for GThreads is to move a long-running blocking operation out of the main thread and into a worker thread. For GLib functions, such as single GIO operations, this is not necessary, and complicates the code. Instead, the …_async() version of the function should be used from the main thread, eliminating the need for locking and synchronisation between multiple threads. If an operation does need to be moved to a worker thread, consider -using g_task_run_in_thread(), or a GThreadPool. GThreadPool is often a +using g_task_run_in_thread(), or a GThreadPool. GThreadPool is often a better choice than GThread, as it handles thread reuse and task queueing; -GTask uses this internally.

+GTask uses this internally.

However, if multiple blocking operations need to be performed in sequence, -and it is not possible to use GTask for them, moving them to a worker thread +and it is not possible to use GTask for them, moving them to a worker thread can clarify the code.

diff --git a/docs/reference/glib/html/glib-UNIX-specific-utilities-and-integration.html b/docs/reference/glib/html/glib-UNIX-specific-utilities-and-integration.html index 403b85d..e889178 100644 --- a/docs/reference/glib/html/glib-UNIX-specific-utilities-and-integration.html +++ b/docs/reference/glib/html/glib-UNIX-specific-utilities-and-integration.html @@ -605,7 +605,7 @@ exported enumeration mapping errno. Instead, all fu error message is always generated via g_strerror().

It is expected that most code will not look at errno from these APIs. Important cases where one would want to differentiate between errors are -already covered by existing cross-platform GLib API, such as e.g. GFile +already covered by existing cross-platform GLib API, such as e.g. GFile wrapping ENOENT. However, it is provided for completeness, at least.

diff --git a/docs/reference/glib/html/glib-Version-Information.html b/docs/reference/glib/html/glib-Version-Information.html index 4ddfd1b..9d6205c 100644 --- a/docs/reference/glib/html/glib-Version-Information.html +++ b/docs/reference/glib/html/glib-Version-Information.html @@ -355,7 +355,7 @@ linked against at application run time.

GLIB_MICRO_VERSION

-
#define GLIB_MICRO_VERSION 0
+
#define GLIB_MICRO_VERSION 1
 

 
The micro version number of the GLib library.

 
Like gtk_micro_version, but from the headers used at
diff --git a/docs/reference/glib/html/glib-Windows-Compatibility-Functions.html b/docs/reference/glib/html/glib-Windows-Compatibility-Functions.html
index 4253fe8..c9009e5 100644
--- a/docs/reference/glib/html/glib-Windows-Compatibility-Functions.html
+++ b/docs/reference/glib/html/glib-Windows-Compatibility-Functions.html
@@ -239,7 +239,7 @@ This will get the "full Unicode" commandline arguments using
 GetCommandLineW() and convert it to the GLib filename encoding (which
 is UTF-8 on Windows).

 
The strings returned by this function are suitable for use with
-functions such as g_open() and g_file_new_for_commandline_arg() but
+functions such as g_open() and g_file_new_for_commandline_arg() but
 are not suitable for use with g_option_context_parse(), which assumes
 that its input will be in the system codepage.  The return value is
 suitable for use with g_option_context_parse_strv(), however, which
diff --git a/docs/reference/glib/html/gvariant-format-strings.html b/docs/reference/glib/html/gvariant-format-strings.html
index e72c8a1..9d6d0d0 100644
--- a/docs/reference/glib/html/gvariant-format-strings.html
+++ b/docs/reference/glib/html/gvariant-format-strings.html
@@ -966,44 +966,6 @@ value2 = 
-
Dictionaries

-

-    
-     Characters: {}
-    
-   

-

-    Dictionary entries are handled by handling first the key, then the value.  Each is handled in the usual way.
-   

-

-
Examples

-

-
- - - - - - - 
1
-2
-3
-4
-5
-6
-7
GVariantBuilder *b;
-GVariant *dict;
-
-b = g_variant_builder_new (G_VARIANT_TYPE ("a{sv}"));
-g_variant_builder_add (b, "{sv}", "name", g_variant_new_string ("foo"));
-g_variant_builder_add (b, "{sv}", "timeout", g_variant_new_int32 (10));
-dict = g_variant_builder_end (b);
-
- -
-
-
-

GVariant *

@@ -1039,7 +1001,7 @@ dict = -

Examples

+

Examples

@@ -1099,6 +1061,99 @@ value2 = +

Dictionaries

+

+ + Characters: {} + +

+

+ Dictionary entries are handled by handling first the key, then the value. Each is handled in the usual way. +

+
+

Examples

+
+
+ + + + + + + 
1
+2
+3
+4
+5
+6
+7
GVariantBuilder *b;
+GVariant *dict;
+
+b = g_variant_builder_new (G_VARIANT_TYPE ("a{sv}"));
+g_variant_builder_add (b, "{sv}", "name", g_variant_new_string ("foo"));
+g_variant_builder_add (b, "{sv}", "timeout", g_variant_new_int32 (10));
+dict = g_variant_builder_end (b);
+
+ +
+

+ To extract data from nested dictionaries you can go through a vardict. +

+
+

Examples

+
+ + + + + + + + 
1
+2
+3
+4
+5
+6
+7
+8
+9
+10
+11
+12
+13
+14
+15
+16
+17
+18
+19
+20
GVariant *data;
+gint value = 1;
+gint max = 3;
+
+/* type (oa{sa{sv}) */
+data = g_variant_new_parsed ("(%o, {'brightness': {'value': <%i>, 'max': <%i>}})",
+                             "/object/path", value, max);
+{
+  GVariant *params;
+  GVariant *p_brightness;
+  gchar *obj
+  gint p_max;
+
+  g_variant_get (data, "(o@a{?*})", &obj, &params);
+  g_print ("object_path: %s\n", obj);
+
+  p_brightness = g_variant_lookup_value (params, "brightness", G_VARIANT_TYPE_VARDICT);
+  g_variant_lookup (p_brightness, "max", "i", &p_max);
+  g_print ("max: %d\n", p_max);
+}
+
+ +
+
+
+

Pointers

diff --git a/docs/reference/glib/html/index.html b/docs/reference/glib/html/index.html index b05ed16..b7f5842 100644 --- a/docs/reference/glib/html/index.html +++ b/docs/reference/glib/html/index.html @@ -15,7 +15,7 @@

- for GLib 2.54.0 + for GLib 2.54.1 The latest version of this documentation can be found on-line at https://developer.gnome.org/glib/unstable/. diff --git a/docs/reference/glib/version.xml b/docs/reference/glib/version.xml index 99aed79..3a40665 100644 --- a/docs/reference/glib/version.xml +++ b/docs/reference/glib/version.xml @@ -1 +1 @@ -2.54.0 +2.54.1 diff --git a/docs/reference/gobject/glib-genmarshal.1 b/docs/reference/gobject/glib-genmarshal.1 index 9513bec..4de75ed 100644 --- a/docs/reference/gobject/glib-genmarshal.1 +++ b/docs/reference/gobject/glib-genmarshal.1 @@ -2,7 +2,7 @@ .\" Title: glib-genmarshal .\" Author: Emmanuele Bassi .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 09/04/2017 +.\" Date: 10/02/2017 .\" Manual: User Commands .\" Source: GObject .\" Language: English diff --git a/docs/reference/gobject/glib-mkenums.1 b/docs/reference/gobject/glib-mkenums.1 index b557275..4711130 100644 --- a/docs/reference/gobject/glib-mkenums.1 +++ b/docs/reference/gobject/glib-mkenums.1 @@ -2,7 +2,7 @@ .\" Title: glib-mkenums .\" Author: Owen Taylor .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 09/04/2017 +.\" Date: 10/02/2017 .\" Manual: User Commands .\" Source: GObject .\" Language: English diff --git a/docs/reference/gobject/gobject-query.1 b/docs/reference/gobject/gobject-query.1 index 06bec97..aed5748 100644 --- a/docs/reference/gobject/gobject-query.1 +++ b/docs/reference/gobject/gobject-query.1 @@ -2,7 +2,7 @@ .\" Title: gobject-query .\" Author: Tim Janik .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 09/04/2017 +.\" Date: 10/02/2017 .\" Manual: User Commands .\" Source: GObject .\" Language: English diff --git a/docs/reference/gobject/html/index.html b/docs/reference/gobject/html/index.html index cd09a8f..52fe9b4 100644 --- a/docs/reference/gobject/html/index.html +++ b/docs/reference/gobject/html/index.html @@ -15,7 +15,7 @@

- for GObject 2.54.0 + for GObject 2.54.1 The latest version of this documentation can be found on-line at https://developer.gnome.org/gobject/unstable/. diff --git a/docs/reference/gobject/version.xml b/docs/reference/gobject/version.xml index 99aed79..3a40665 100644 --- a/docs/reference/gobject/version.xml +++ b/docs/reference/gobject/version.xml @@ -1 +1 @@ -2.54.0 +2.54.1 diff --git a/gio/gdbus-2.0/codegen/config.py b/gio/gdbus-2.0/codegen/config.py index c57be85..6ce91f5 100644 --- a/gio/gdbus-2.0/codegen/config.py +++ b/gio/gdbus-2.0/codegen/config.py @@ -19,4 +19,4 @@ # # Author: David Zeuthen -VERSION = "2.54.0" +VERSION = "2.54.1" diff --git a/gio/gdbus-daemon-generated.c b/gio/gdbus-daemon-generated.c index 89671dd..72d8b24 100644 --- a/gio/gdbus-daemon-generated.c +++ b/gio/gdbus-daemon-generated.c @@ -1,5 +1,5 @@ /* - * Generated by gdbus-codegen 2.53.7. DO NOT EDIT. + * Generated by gdbus-codegen 2.54.1. DO NOT EDIT. * * The license of this code is the same as for the source it was derived from. */ diff --git a/gio/gdbus-daemon-generated.h b/gio/gdbus-daemon-generated.h index b495a5b..a2ecbca 100644 --- a/gio/gdbus-daemon-generated.h +++ b/gio/gdbus-daemon-generated.h @@ -1,5 +1,5 @@ /* - * Generated by gdbus-codegen 2.53.7. DO NOT EDIT. + * Generated by gdbus-codegen 2.54.1. DO NOT EDIT. * * The license of this code is the same as for the source it was derived from. */ diff --git a/gio/gio.rc b/gio/gio.rc index 8f28d9c..90ff813 100644 --- a/gio/gio.rc +++ b/gio/gio.rc @@ -1,8 +1,8 @@ #include VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,54,0,0 - PRODUCTVERSION 2,54,0,0 + FILEVERSION 2,54,1,0 + PRODUCTVERSION 2,54,1,0 FILEFLAGSMASK 0 FILEFLAGS 0 FILEOS VOS__WINDOWS32 @@ -15,12 +15,12 @@ VS_VERSION_INFO VERSIONINFO BEGIN VALUE "CompanyName", "The GLib developer community" VALUE "FileDescription", "Gio" - VALUE "FileVersion", "2.54.0.0" + VALUE "FileVersion", "2.54.1.0" VALUE "InternalName", "libgio-2.0-0" VALUE "LegalCopyright", "Copyright © 2006-2011 Red Hat, Inc. and others." VALUE "OriginalFilename", "libgio-2.0-0.dll" VALUE "ProductName", "GLib" - VALUE "ProductVersion", "2.54.0" + VALUE "ProductVersion", "2.54.1" END END BLOCK "VarFileInfo" diff --git a/gio/gsocket.c b/gio/gsocket.c index eea502c..ba90be5 100644 --- a/gio/gsocket.c +++ b/gio/gsocket.c @@ -252,14 +252,11 @@ struct _GSocketPrivate guint connect_pending : 1; #ifdef G_OS_WIN32 WSAEVENT event; - gboolean waiting; - DWORD waiting_result; int current_events; int current_errors; int selected_events; GList *requested_conditions; /* list of requested GIOCondition * */ GMutex win32_source_lock; - GCond win32_source_cond; #endif struct { @@ -346,10 +343,8 @@ socket_strerror (int err) static void _win32_unset_event_mask (GSocket *socket, int mask) { - g_mutex_lock (&socket->priv->win32_source_lock); socket->priv->current_events &= ~mask; socket->priv->current_errors &= ~mask; - g_mutex_unlock (&socket->priv->win32_source_lock); } #else #define win32_unset_event_mask(_socket, _mask) @@ -847,7 +842,6 @@ g_socket_finalize (GObject *object) g_assert (socket->priv->requested_conditions == NULL); g_mutex_clear (&socket->priv->win32_source_lock); - g_cond_clear (&socket->priv->win32_source_cond); #endif for (i = 0; i < RECV_ADDR_CACHE_SIZE; i++) @@ -1075,7 +1069,6 @@ g_socket_init (GSocket *socket) #ifdef G_OS_WIN32 socket->priv->event = WSA_INVALID_EVENT; g_mutex_init (&socket->priv->win32_source_lock); - g_cond_init (&socket->priv->win32_source_cond); #endif } @@ -2459,8 +2452,6 @@ g_socket_accept (GSocket *socket, while (TRUE) { - win32_unset_event_mask (socket, FD_ACCEPT); - if ((ret = accept (socket->priv->fd, NULL, 0)) < 0) { int errsv = get_socket_errno (); @@ -2475,6 +2466,8 @@ g_socket_accept (GSocket *socket, errsv == EAGAIN) #endif { + win32_unset_event_mask (socket, FD_ACCEPT); + if (socket->priv->blocking) { if (!g_socket_condition_wait (socket, @@ -2491,6 +2484,8 @@ g_socket_accept (GSocket *socket, break; } + win32_unset_event_mask (socket, FD_ACCEPT); + #ifdef G_OS_WIN32 { /* The socket inherits the accepting sockets event mask and even object, @@ -2579,8 +2574,6 @@ g_socket_connect (GSocket *socket, while (1) { - win32_unset_event_mask (socket, FD_CONNECT); - if (connect (socket->priv->fd, (struct sockaddr *) &buffer, g_socket_address_get_native_size (address)) < 0) { @@ -2595,6 +2588,8 @@ g_socket_connect (GSocket *socket, if (errsv == WSAEWOULDBLOCK) #endif { + win32_unset_event_mask (socket, FD_CONNECT); + if (socket->priv->blocking) { if (g_socket_condition_wait (socket, G_IO_OUT, cancellable, error)) @@ -2620,6 +2615,8 @@ g_socket_connect (GSocket *socket, break; } + win32_unset_event_mask (socket, FD_CONNECT); + socket->priv->connected_read = TRUE; socket->priv->connected_write = TRUE; @@ -2799,8 +2796,6 @@ g_socket_receive_with_timeout (GSocket *socket, while (1) { - win32_unset_event_mask (socket, FD_READ); - if ((ret = recv (socket->priv->fd, buffer, size, 0)) < 0) { int errsv = get_socket_errno (); @@ -2815,6 +2810,8 @@ g_socket_receive_with_timeout (GSocket *socket, errsv == EAGAIN) #endif { + win32_unset_event_mask (socket, FD_READ); + if (timeout != 0) { if (!block_on_timeout (socket, G_IO_IN, timeout, start_time, @@ -2825,10 +2822,14 @@ g_socket_receive_with_timeout (GSocket *socket, } } + win32_unset_event_mask (socket, FD_READ); + socket_set_error_lazy (error, errsv, _("Error receiving data: %s")); return -1; } + win32_unset_event_mask (socket, FD_READ); + break; } @@ -2994,8 +2995,6 @@ g_socket_send_with_timeout (GSocket *socket, while (1) { - win32_unset_event_mask (socket, FD_WRITE); - if ((ret = send (socket->priv->fd, buffer, size, G_SOCKET_DEFAULT_SEND_FLAGS)) < 0) { int errsv = get_socket_errno (); @@ -3010,6 +3009,8 @@ g_socket_send_with_timeout (GSocket *socket, errsv == EAGAIN) #endif { + win32_unset_event_mask (socket, FD_WRITE); + if (timeout != 0) { if (!block_on_timeout (socket, G_IO_OUT, timeout, start_time, @@ -3424,7 +3425,7 @@ remove_condition_watch (GSocket *socket, } static GIOCondition -update_condition_unlocked (GSocket *socket) +update_condition (GSocket *socket) { WSANETWORKEVENTS events; GIOCondition condition; @@ -3491,16 +3492,6 @@ update_condition_unlocked (GSocket *socket) return condition; } - -static GIOCondition -update_condition (GSocket *socket) -{ - GIOCondition res; - g_mutex_lock (&socket->priv->win32_source_lock); - res = update_condition_unlocked (socket); - g_mutex_unlock (&socket->priv->win32_source_lock); - return res; -} #endif typedef struct { @@ -3896,44 +3887,11 @@ g_socket_condition_timed_wait (GSocket *socket, if (timeout == -1) timeout = WSA_INFINITE; - g_mutex_lock (&socket->priv->win32_source_lock); - current_condition = update_condition_unlocked (socket); + current_condition = update_condition (socket); while ((condition & current_condition) == 0) { - if (!socket->priv->waiting) - { - socket->priv->waiting = TRUE; - socket->priv->waiting_result = 0; - g_mutex_unlock (&socket->priv->win32_source_lock); - - res = WSAWaitForMultipleEvents (num_events, events, FALSE, timeout, FALSE); - - g_mutex_lock (&socket->priv->win32_source_lock); - socket->priv->waiting = FALSE; - socket->priv->waiting_result = res; - g_cond_broadcast (&socket->priv->win32_source_cond); - } - else - { - if (timeout != WSA_INFINITE) - { - if (!g_cond_wait_until (&socket->priv->win32_source_cond, &socket->priv->win32_source_lock, timeout)) - { - res = WSA_WAIT_TIMEOUT; - break; - } - else - { - res = socket->priv->waiting_result; - } - } - else - { - g_cond_wait (&socket->priv->win32_source_cond, &socket->priv->win32_source_lock); - res = socket->priv->waiting_result; - } - } - + res = WSAWaitForMultipleEvents (num_events, events, + FALSE, timeout, FALSE); if (res == WSA_WAIT_FAILED) { int errsv = get_socket_errno (); @@ -3954,7 +3912,7 @@ g_socket_condition_timed_wait (GSocket *socket, if (g_cancellable_set_error_if_cancelled (cancellable, error)) break; - current_condition = update_condition_unlocked (socket); + current_condition = update_condition (socket); if (timeout != WSA_INFINITE) { @@ -3963,7 +3921,6 @@ g_socket_condition_timed_wait (GSocket *socket, timeout = 0; } } - g_mutex_unlock (&socket->priv->win32_source_lock); remove_condition_watch (socket, &condition); if (num_events > 1) g_cancellable_release_fd (cancellable); @@ -4461,8 +4418,6 @@ g_socket_send_message_with_timeout (GSocket *socket, while (1) { - win32_unset_event_mask (socket, FD_WRITE); - if (address) result = WSASendTo (socket->priv->fd, bufs, num_vectors, @@ -4484,6 +4439,8 @@ g_socket_send_message_with_timeout (GSocket *socket, if (errsv == WSAEWOULDBLOCK) { + win32_unset_event_mask (socket, FD_WRITE); + if (timeout != 0) { if (!block_on_timeout (socket, G_IO_OUT, timeout, @@ -4931,8 +4888,6 @@ g_socket_receive_message_with_timeout (GSocket *socket, /* do it */ while (1) { - win32_unset_event_mask (socket, FD_READ); - addrlen = sizeof addr; if (address) result = WSARecvFrom (socket->priv->fd, @@ -4954,6 +4909,8 @@ g_socket_receive_message_with_timeout (GSocket *socket, if (errsv == WSAEWOULDBLOCK) { + win32_unset_event_mask (socket, FD_READ); + if (timeout != 0) { if (!block_on_timeout (socket, G_IO_IN, timeout, @@ -4967,6 +4924,7 @@ g_socket_receive_message_with_timeout (GSocket *socket, socket_set_error_lazy (error, errsv, _("Error receiving message: %s")); return -1; } + win32_unset_event_mask (socket, FD_READ); break; } diff --git a/gio/gunixmounts.c b/gio/gunixmounts.c index ce6a2fc..8e32b4f 100644 --- a/gio/gunixmounts.c +++ b/gio/gunixmounts.c @@ -884,7 +884,7 @@ _g_get_unix_mount_points (void) GList *return_list = NULL; table = mnt_new_table (); - if (mnt_table_parse_mtab (table, NULL) < 0) + if (mnt_table_parse_fstab (table, NULL) < 0) goto out; iter = mnt_new_iter (MNT_ITER_FORWARD); diff --git a/gio/meson.build b/gio/meson.build index eae9bad..3252636 100644 --- a/gio/meson.build +++ b/gio/meson.build @@ -693,13 +693,15 @@ endif # subdir('fam') #endif -install_data([ - 'completion/gapplication', - 'completion/gdbus', - 'completion/gsettings', - 'completion/gresource' -], -install_dir: join_paths(get_option('datadir'), 'bash-completion/completions')) +if have_bash + install_data([ + 'completion/gapplication', + 'completion/gdbus', + 'completion/gsettings', + 'completion/gresource' + ], + install_dir: join_paths(get_option('datadir'), 'bash-completion/completions')) +endif if enable_dtrace gio_dtrace_obj = dtrace_obj_gen.process('gio_probes.d') diff --git a/gio/xdp-dbus.c b/gio/xdp-dbus.c index 00b9a5a..1b5d873 100644 --- a/gio/xdp-dbus.c +++ b/gio/xdp-dbus.c @@ -1,5 +1,5 @@ /* - * Generated by gdbus-codegen 2.53.7. DO NOT EDIT. + * Generated by gdbus-codegen 2.54.1. DO NOT EDIT. * * The license of this code is the same as for the source it was derived from. */ diff --git a/gio/xdp-dbus.h b/gio/xdp-dbus.h index 4c119f5..b989616 100644 --- a/gio/xdp-dbus.h +++ b/gio/xdp-dbus.h @@ -1,5 +1,5 @@ /* - * Generated by gdbus-codegen 2.53.7. DO NOT EDIT. + * Generated by gdbus-codegen 2.54.1. DO NOT EDIT. * * The license of this code is the same as for the source it was derived from. */ diff --git a/glib/glib.rc b/glib/glib.rc index 490af44..7321fca 100644 --- a/glib/glib.rc +++ b/glib/glib.rc @@ -1,8 +1,8 @@ #include VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,54,0,0 - PRODUCTVERSION 2,54,0,0 + FILEVERSION 2,54,1,0 + PRODUCTVERSION 2,54,1,0 FILEFLAGSMASK 0 FILEFLAGS 0 FILEOS VOS__WINDOWS32 @@ -15,12 +15,12 @@ VS_VERSION_INFO VERSIONINFO BEGIN VALUE "CompanyName", "The GLib developer community" VALUE "FileDescription", "GLib" - VALUE "FileVersion", "2.54.0.0" + VALUE "FileVersion", "2.54.1.0" VALUE "InternalName", "libglib-2.0-0" VALUE "LegalCopyright", "Copyright © 1995-2011 Peter Mattis, Spencer Kimball, Josh MacDonald and others." VALUE "OriginalFilename", "libglib-2.0-0.dll" VALUE "ProductName", "GLib" - VALUE "ProductVersion", "2.54.0" + VALUE "ProductVersion", "2.54.1" END END BLOCK "VarFileInfo" diff --git a/glib/glibconfig.h.in b/glib/glibconfig.h.in new file mode 100644 index 0000000..43e1ba1 --- /dev/null +++ b/glib/glibconfig.h.in @@ -0,0 +1,207 @@ +/* glibconfig.h + * + * This is a generated file. Please modify 'glibconfig.h.in' + */ + +#ifndef __GLIBCONFIG_H__ +#define __GLIBCONFIG_H__ + +#include + +#include +#include +#mesondefine GLIB_HAVE_ALLOCA_H + +/* 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 + +G_BEGIN_DECLS + +#define G_MINFLOAT FLT_MIN +#define G_MAXFLOAT FLT_MAX +#define G_MINDOUBLE DBL_MIN +#define G_MAXDOUBLE DBL_MAX +#define G_MINSHORT SHRT_MIN +#define G_MAXSHORT SHRT_MAX +#define G_MAXUSHORT USHRT_MAX +#define G_MININT INT_MIN +#define G_MAXINT INT_MAX +#define G_MAXUINT UINT_MAX +#define G_MINLONG LONG_MIN +#define G_MAXLONG LONG_MAX +#define G_MAXULONG ULONG_MAX + +typedef signed char gint8; +typedef unsigned char guint8; + +typedef signed @gint16@ gint16; +typedef unsigned @gint16@ guint16; + +#define G_GINT16_MODIFIER @gint16_modifier@ +#define G_GINT16_FORMAT @gint16_format@ +#define G_GUINT16_FORMAT @guint16_format@ + + +typedef signed @gint32@ gint32; +typedef unsigned @gint32@ guint32; + +#define G_GINT32_MODIFIER @gint32_modifier@ +#define G_GINT32_FORMAT @gint32_format@ +#define G_GUINT32_FORMAT @guint32_format@ + + +#define G_HAVE_GINT64 1 /* deprecated, always true */ + +@glib_extension@typedef signed @gint64@ gint64; +@glib_extension@typedef unsigned @gint64@ guint64; + +#define G_GINT64_CONSTANT(val) @gint64_constant@ +#define G_GUINT64_CONSTANT(val) @guint64_constant@ + +#define G_GINT64_MODIFIER @gint64_modifier@ +#define G_GINT64_FORMAT @gint64_format@ +#define G_GUINT64_FORMAT @guint64_format@ + + +#define GLIB_SIZEOF_VOID_P @glib_void_p@ +#define GLIB_SIZEOF_LONG @glib_long@ +#define GLIB_SIZEOF_SIZE_T @glib_size_t@ +#define GLIB_SIZEOF_SSIZE_T @glib_ssize_t@ + +typedef signed @glib_size_type_define@ gssize; +typedef unsigned @glib_size_type_define@ gsize; +#define G_GSIZE_MODIFIER @gsize_modifier@ +#define G_GSSIZE_MODIFIER @gssize_modifier@ +#define G_GSIZE_FORMAT @gsize_format@ +#define G_GSSIZE_FORMAT @gssize_format@ + +#define G_MAXSIZE G_MAXU@glib_msize_type@ +#define G_MINSSIZE G_MIN@glib_msize_type@ +#define G_MAXSSIZE G_MAX@glib_msize_type@ + +typedef gint64 goffset; +#define G_MINOFFSET G_MININT64 +#define G_MAXOFFSET G_MAXINT64 + +#define G_GOFFSET_MODIFIER G_GINT64_MODIFIER +#define G_GOFFSET_FORMAT G_GINT64_FORMAT +#define G_GOFFSET_CONSTANT(val) G_GINT64_CONSTANT(val) + +#define G_POLLFD_FORMAT @g_pollfd_format@ + +#define GPOINTER_TO_INT(p) ((gint) @glib_gpi_cast@ (p)) +#define GPOINTER_TO_UINT(p) ((guint) @glib_gpui_cast@ (p)) + +#define GINT_TO_POINTER(i) ((gpointer) @glib_gpi_cast@ (i)) +#define GUINT_TO_POINTER(u) ((gpointer) @glib_gpui_cast@ (u)) + +typedef signed @glib_intptr_type_define@ gintptr; +typedef unsigned @glib_intptr_type_define@ guintptr; + +#define G_GINTPTR_MODIFIER @gintptr_modifier@ +#define G_GINTPTR_FORMAT @gintptr_format@ +#define G_GUINTPTR_FORMAT @guintptr_format@ + +#ifndef G_DISABLE_DEPRECATED +#define g_ATEXIT(proc) (atexit (proc)) +#define g_memmove(dest,src,len) G_STMT_START { memmove ((dest), (src), (len)); } G_STMT_END +#endif + +#define GLIB_MAJOR_VERSION @GLIB_MAJOR_VERSION@ +#define GLIB_MINOR_VERSION @GLIB_MINOR_VERSION@ +#define GLIB_MICRO_VERSION @GLIB_MICRO_VERSION@ + +@glib_os@ +@glib_static_compilation@ + +@glib_vacopy@ + +@g_have_iso_c_varargs@ +@g_have_iso_cxx_varargs@ + +/* gcc-2.95.x supports both gnu style and ISO varargs, but if -ansi + * is passed ISO vararg support is turned off, and there is no work + * around to turn it on, so we unconditionally turn it off. + */ +#if __GNUC__ == 2 && __GNUC_MINOR__ == 95 +# undef G_HAVE_ISO_VARARGS +#endif + +#mesondefine G_HAVE_GROWING_STACK + +#ifndef _MSC_VER +# define G_HAVE_GNUC_VARARGS 1 +# define G_HAVE_GNUC_VISIBILITY 1 +#endif + +#if defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590) +#define G_GNUC_INTERNAL __attribute__((visibility("hidden"))) +#elif defined(__SUNPRO_C) && (__SUNPRO_C >= 0x550) +#define G_GNUC_INTERNAL __hidden +#elif defined (__GNUC__) && defined (G_HAVE_GNUC_VISIBILITY) +#define G_GNUC_INTERNAL __attribute__((visibility("hidden"))) +#else +#define G_GNUC_INTERNAL +#endif + +#define G_THREADS_ENABLED +#define G_THREADS_IMPL_@g_threads_impl_def@ + +#mesondefine G_ATOMIC_OP_MEMORY_BARRIER_NEEDED +#mesondefine G_ATOMIC_LOCK_FREE + +#define GINT16_TO_@g_bs_native@(val) ((gint16) (val)) +#define GUINT16_TO_@g_bs_native@(val) ((guint16) (val)) +#define GINT16_TO_@g_bs_alien@(val) ((gint16) GUINT16_SWAP_LE_BE (val)) +#define GUINT16_TO_@g_bs_alien@(val) (GUINT16_SWAP_LE_BE (val)) + +#define GINT32_TO_@g_bs_native@(val) ((gint32) (val)) +#define GUINT32_TO_@g_bs_native@(val) ((guint32) (val)) +#define GINT32_TO_@g_bs_alien@(val) ((gint32) GUINT32_SWAP_LE_BE (val)) +#define GUINT32_TO_@g_bs_alien@(val) (GUINT32_SWAP_LE_BE (val)) + +#define GINT64_TO_@g_bs_native@(val) ((gint64) (val)) +#define GUINT64_TO_@g_bs_native@(val) ((guint64) (val)) +#define GINT64_TO_@g_bs_alien@(val) ((gint64) GUINT64_SWAP_LE_BE (val)) +#define GUINT64_TO_@g_bs_alien@(val) (GUINT64_SWAP_LE_BE (val)) + +#define GLONG_TO_LE(val) ((glong) GINT@glongbits@_TO_LE (val)) +#define GULONG_TO_LE(val) ((gulong) GUINT@glongbits@_TO_LE (val)) +#define GLONG_TO_BE(val) ((glong) GINT@glongbits@_TO_BE (val)) +#define GULONG_TO_BE(val) ((gulong) GUINT@glongbits@_TO_BE (val)) +#define GINT_TO_LE(val) ((gint) GINT@gintbits@_TO_LE (val)) +#define GUINT_TO_LE(val) ((guint) GUINT@gintbits@_TO_LE (val)) +#define GINT_TO_BE(val) ((gint) GINT@gintbits@_TO_BE (val)) +#define GUINT_TO_BE(val) ((guint) GUINT@gintbits@_TO_BE (val)) +#define GSIZE_TO_LE(val) ((gsize) GUINT@gsizebits@_TO_LE (val)) +#define GSSIZE_TO_LE(val) ((gssize) GINT@gsizebits@_TO_LE (val)) +#define GSIZE_TO_BE(val) ((gsize) GUINT@gsizebits@_TO_BE (val)) +#define GSSIZE_TO_BE(val) ((gssize) GINT@gsizebits@_TO_BE (val)) +#define G_BYTE_ORDER @g_byte_order@ + +#define GLIB_SYSDEF_POLLIN =@g_pollin@ +#define GLIB_SYSDEF_POLLOUT =@g_pollout@ +#define GLIB_SYSDEF_POLLPRI =@g_pollpri@ +#define GLIB_SYSDEF_POLLHUP =@g_pollhup@ +#define GLIB_SYSDEF_POLLERR =@g_pollerr@ +#define GLIB_SYSDEF_POLLNVAL =@g_pollnval@ + +#define G_MODULE_SUFFIX "@g_module_suffix@" + +typedef @g_pid_type@ GPid; +#define G_PID_FORMAT @g_pid_format@ + +#define GLIB_SYSDEF_AF_UNIX @g_af_unix@ +#define GLIB_SYSDEF_AF_INET @g_af_inet@ +#define GLIB_SYSDEF_AF_INET6 @g_af_inet6@ + +#define GLIB_SYSDEF_MSG_OOB @g_msg_oob@ +#define GLIB_SYSDEF_MSG_PEEK @g_msg_peek@ +#define GLIB_SYSDEF_MSG_DONTROUTE @g_msg_dontroute@ + +G_END_DECLS + +#endif /* __GLIBCONFIG_H__ */ diff --git a/glib/glibconfig.h.win32 b/glib/glibconfig.h.win32 index 7e3aaa3..df96480 100644 --- a/glib/glibconfig.h.win32 +++ b/glib/glibconfig.h.win32 @@ -162,7 +162,7 @@ typedef unsigned __int64 guintptr; #define GLIB_MAJOR_VERSION 2 #define GLIB_MINOR_VERSION 54 -#define GLIB_MICRO_VERSION 0 +#define GLIB_MICRO_VERSION 1 #define G_OS_WIN32 #define G_PLATFORM_WIN32 @@ -219,10 +219,19 @@ typedef unsigned __int64 guintptr; #define GUINT_TO_LE(val) ((guint) GUINT32_TO_LE (val)) #define GINT_TO_BE(val) ((gint) GINT32_TO_BE (val)) #define GUINT_TO_BE(val) ((guint) GUINT32_TO_BE (val)) -#define GSIZE_TO_LE(val) ((gsize) GUINT32_TO_LE (val)) -#define GSSIZE_TO_LE(val) ((gssize) GINT32_TO_LE (val)) -#define GSIZE_TO_BE(val) ((gsize) GUINT32_TO_BE (val)) -#define GSSIZE_TO_BE(val) ((gssize) GINT32_TO_BE (val)) + +#ifdef _WIN64 +# define GSIZE_TO_LE(val) ((gsize) GUINT64_TO_LE (val)) +# define GSSIZE_TO_LE(val) ((gssize) GINT64_TO_LE (val)) +# define GSIZE_TO_BE(val) ((gsize) GUINT64_TO_BE (val)) +# define GSSIZE_TO_BE(val) ((gssize) GINT64_TO_BE (val)) +#else +# define GSIZE_TO_LE(val) ((gsize) GUINT32_TO_LE (val)) +# define GSSIZE_TO_LE(val) ((gssize) GINT32_TO_LE (val)) +# define GSIZE_TO_BE(val) ((gsize) GUINT32_TO_BE (val)) +# define GSSIZE_TO_BE(val) ((gssize) GINT32_TO_BE (val)) +#endif + #define G_BYTE_ORDER G_LITTLE_ENDIAN #define GLIB_SYSDEF_POLLIN =1 diff --git a/glib/glibconfig.h.win32.in b/glib/glibconfig.h.win32.in index 9a91c5e..a8d8c0c 100644 --- a/glib/glibconfig.h.win32.in +++ b/glib/glibconfig.h.win32.in @@ -219,10 +219,19 @@ typedef unsigned __int64 guintptr; #define GUINT_TO_LE(val) ((guint) GUINT32_TO_LE (val)) #define GINT_TO_BE(val) ((gint) GINT32_TO_BE (val)) #define GUINT_TO_BE(val) ((guint) GUINT32_TO_BE (val)) -#define GSIZE_TO_LE(val) ((gsize) GUINT32_TO_LE (val)) -#define GSSIZE_TO_LE(val) ((gssize) GINT32_TO_LE (val)) -#define GSIZE_TO_BE(val) ((gsize) GUINT32_TO_BE (val)) -#define GSSIZE_TO_BE(val) ((gssize) GINT32_TO_BE (val)) + +#ifdef _WIN64 +# define GSIZE_TO_LE(val) ((gsize) GUINT64_TO_LE (val)) +# define GSSIZE_TO_LE(val) ((gssize) GINT64_TO_LE (val)) +# define GSIZE_TO_BE(val) ((gsize) GUINT64_TO_BE (val)) +# define GSSIZE_TO_BE(val) ((gssize) GINT64_TO_BE (val)) +#else +# define GSIZE_TO_LE(val) ((gsize) GUINT32_TO_LE (val)) +# define GSSIZE_TO_LE(val) ((gssize) GINT32_TO_LE (val)) +# define GSIZE_TO_BE(val) ((gsize) GUINT32_TO_BE (val)) +# define GSSIZE_TO_BE(val) ((gssize) GINT32_TO_BE (val)) +#endif + #define G_BYTE_ORDER G_LITTLE_ENDIAN #define GLIB_SYSDEF_POLLIN =1 diff --git a/glib/gnulib/meson.build b/glib/gnulib/meson.build new file mode 100644 index 0000000..6746631 --- /dev/null +++ b/glib/gnulib/meson.build @@ -0,0 +1,4 @@ +gnulib_lib = static_library('gnulib', 'asnprintf.c', 'printf.c', 'printf-args.c', 'printf-parse.c', 'vasnprintf.c', + include_directories : configinc, + pic : true, + c_args : [ '-DLIBDIR="@0@"'.format(get_option('libdir')), '-DGLIB_COMPILATION', '-DG_LOG_DOMAIN="GLib"' ] + glib_hidden_visibility_args) diff --git a/glib/meson.build b/glib/meson.build index a99201a..1da0bcd 100644 --- a/glib/meson.build +++ b/glib/meson.build @@ -274,6 +274,7 @@ else endif install_data('gtester-report', install_dir : get_option('bindir')) + install_data('glib_gdb.py', install_dir : join_paths(glib_pkgdatadir, 'gdb')) gdb_conf = configuration_data() @@ -283,7 +284,7 @@ configure_file( output: 'libglib-2.0.so.@0@-gdb.py'.format(library_version), configuration: gdb_conf, install: true, - install_dir: join_paths(get_option('datadir'), 'gdb/auto-load' + glib_libdir) + install_dir: join_paths(get_option('datadir'), 'gdb/auto-load' + get_option('libdir')) ) if enable_systemtap diff --git a/gmodule/gmodule.rc b/gmodule/gmodule.rc index ddcad38..5af3f70 100644 --- a/gmodule/gmodule.rc +++ b/gmodule/gmodule.rc @@ -1,8 +1,8 @@ #include VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,54,0,0 - PRODUCTVERSION 2,54,0,0 + FILEVERSION 2,54,1,0 + PRODUCTVERSION 2,54,1,0 FILEFLAGSMASK 0 FILEFLAGS 0 FILEOS VOS__WINDOWS32 @@ -15,12 +15,12 @@ VS_VERSION_INFO VERSIONINFO BEGIN VALUE "CompanyName", "The GLib developer community" VALUE "FileDescription", "GModule" - VALUE "FileVersion", "2.54.0.0" + VALUE "FileVersion", "2.54.1.0" VALUE "InternalName", "libgmodule-2.0-0" VALUE "LegalCopyright", "Copyright © 1998-2011 Tim Janik and others." VALUE "OriginalFilename", "libgmodule-2.0-0.dll" VALUE "ProductName", "GLib" - VALUE "ProductVersion", "2.54.0" + VALUE "ProductVersion", "2.54.1" END END BLOCK "VarFileInfo" diff --git a/gobject/gobject.c b/gobject/gobject.c index b59cf8b..e79c5e5 100644 --- a/gobject/gobject.c +++ b/gobject/gobject.c @@ -511,7 +511,7 @@ g_object_do_class_init (GObjectClass *class) g_type_add_interface_check (NULL, object_interface_check_properties); } -static inline void +static inline gboolean install_property_internal (GType g_type, guint property_id, GParamSpec *pspec) @@ -521,12 +521,64 @@ install_property_internal (GType g_type, g_warning ("When installing property: type '%s' already has a property named '%s'", g_type_name (g_type), pspec->name); - return; + return FALSE; } g_param_spec_ref_sink (pspec); PARAM_SPEC_SET_PARAM_ID (pspec, property_id); g_param_spec_pool_insert (pspec_pool, pspec, g_type); + return TRUE; +} + +static gboolean +validate_pspec_to_install (GParamSpec *pspec) +{ + g_return_val_if_fail (G_IS_PARAM_SPEC (pspec), FALSE); + g_return_val_if_fail (PARAM_SPEC_PARAM_ID (pspec) == 0, FALSE); /* paranoid */ + + g_return_val_if_fail (pspec->flags & (G_PARAM_READABLE | G_PARAM_WRITABLE), FALSE); + + if (pspec->flags & G_PARAM_CONSTRUCT) + g_return_val_if_fail ((pspec->flags & G_PARAM_CONSTRUCT_ONLY) == 0, FALSE); + + if (pspec->flags & (G_PARAM_CONSTRUCT | G_PARAM_CONSTRUCT_ONLY)) + g_return_val_if_fail (pspec->flags & G_PARAM_WRITABLE, FALSE); + + return TRUE; +} + +static gboolean +validate_and_install_class_property (GObjectClass *class, + GType oclass_type, + GType parent_type, + guint property_id, + GParamSpec *pspec) +{ + if (!validate_pspec_to_install (pspec)) + return FALSE; + + if (pspec->flags & G_PARAM_WRITABLE) + g_return_val_if_fail (class->set_property != NULL, FALSE); + if (pspec->flags & G_PARAM_READABLE) + g_return_val_if_fail (class->get_property != NULL, FALSE); + + class->flags |= CLASS_HAS_PROPS_FLAG; + if (install_property_internal (oclass_type, property_id, pspec)) + { + if (pspec->flags & (G_PARAM_CONSTRUCT | G_PARAM_CONSTRUCT_ONLY)) + class->construct_properties = g_slist_append (class->construct_properties, pspec); + + /* for property overrides of construct properties, we have to get rid + * of the overidden inherited construct property + */ + pspec = g_param_spec_pool_lookup (pspec_pool, pspec->name, parent_type, TRUE); + if (pspec && pspec->flags & (G_PARAM_CONSTRUCT | G_PARAM_CONSTRUCT_ONLY)) + class->construct_properties = g_slist_remove (class->construct_properties, pspec); + + return TRUE; + } + else + return FALSE; } /** @@ -551,37 +603,22 @@ g_object_class_install_property (GObjectClass *class, guint property_id, GParamSpec *pspec) { - g_return_if_fail (G_IS_OBJECT_CLASS (class)); - g_return_if_fail (G_IS_PARAM_SPEC (pspec)); - - if (CLASS_HAS_DERIVED_CLASS (class)) - g_error ("Attempt to add property %s::%s to class after it was derived", G_OBJECT_CLASS_NAME (class), pspec->name); - - class->flags |= CLASS_HAS_PROPS_FLAG; + GType oclass_type, parent_type; - g_return_if_fail (pspec->flags & (G_PARAM_READABLE | G_PARAM_WRITABLE)); - if (pspec->flags & G_PARAM_WRITABLE) - g_return_if_fail (class->set_property != NULL); - if (pspec->flags & G_PARAM_READABLE) - g_return_if_fail (class->get_property != NULL); + g_return_if_fail (G_IS_OBJECT_CLASS (class)); g_return_if_fail (property_id > 0); - g_return_if_fail (PARAM_SPEC_PARAM_ID (pspec) == 0); /* paranoid */ - if (pspec->flags & G_PARAM_CONSTRUCT) - g_return_if_fail ((pspec->flags & G_PARAM_CONSTRUCT_ONLY) == 0); - if (pspec->flags & (G_PARAM_CONSTRUCT | G_PARAM_CONSTRUCT_ONLY)) - g_return_if_fail (pspec->flags & G_PARAM_WRITABLE); - install_property_internal (G_OBJECT_CLASS_TYPE (class), property_id, pspec); + oclass_type = G_OBJECT_CLASS_TYPE (class); + parent_type = g_type_parent (oclass_type); - if (pspec->flags & (G_PARAM_CONSTRUCT | G_PARAM_CONSTRUCT_ONLY)) - class->construct_properties = g_slist_append (class->construct_properties, pspec); + if (CLASS_HAS_DERIVED_CLASS (class)) + g_error ("Attempt to add property %s::%s to class after it was derived", G_OBJECT_CLASS_NAME (class), pspec->name); - /* for property overrides of construct properties, we have to get rid - * of the overidden inherited construct property - */ - pspec = g_param_spec_pool_lookup (pspec_pool, pspec->name, g_type_parent (G_OBJECT_CLASS_TYPE (class)), TRUE); - if (pspec && pspec->flags & (G_PARAM_CONSTRUCT | G_PARAM_CONSTRUCT_ONLY)) - class->construct_properties = g_slist_remove (class->construct_properties, pspec); + (void) validate_and_install_class_property (class, + oclass_type, + parent_type, + property_id, + pspec); } /** @@ -679,30 +716,14 @@ g_object_class_install_properties (GObjectClass *oclass, { GParamSpec *pspec = pspecs[i]; - g_return_if_fail (pspec != NULL); - - if (pspec->flags & G_PARAM_WRITABLE) - g_return_if_fail (oclass->set_property != NULL); - if (pspec->flags & G_PARAM_READABLE) - g_return_if_fail (oclass->get_property != NULL); - g_return_if_fail (PARAM_SPEC_PARAM_ID (pspec) == 0); /* paranoid */ - if (pspec->flags & G_PARAM_CONSTRUCT) - g_return_if_fail ((pspec->flags & G_PARAM_CONSTRUCT_ONLY) == 0); - if (pspec->flags & (G_PARAM_CONSTRUCT | G_PARAM_CONSTRUCT_ONLY)) - g_return_if_fail (pspec->flags & G_PARAM_WRITABLE); - - oclass->flags |= CLASS_HAS_PROPS_FLAG; - install_property_internal (oclass_type, i, pspec); - - if (pspec->flags & (G_PARAM_CONSTRUCT | G_PARAM_CONSTRUCT_ONLY)) - oclass->construct_properties = g_slist_append (oclass->construct_properties, pspec); - - /* for property overrides of construct properties, we have to get rid - * of the overidden inherited construct property - */ - pspec = g_param_spec_pool_lookup (pspec_pool, pspec->name, parent_type, TRUE); - if (pspec && pspec->flags & (G_PARAM_CONSTRUCT | G_PARAM_CONSTRUCT_ONLY)) - oclass->construct_properties = g_slist_remove (oclass->construct_properties, pspec); + if (!validate_and_install_class_property (oclass, + oclass_type, + parent_type, + i, + pspec)) + { + break; + } } } @@ -737,17 +758,12 @@ g_object_interface_install_property (gpointer g_iface, GTypeInterface *iface_class = g_iface; g_return_if_fail (G_TYPE_IS_INTERFACE (iface_class->g_type)); - g_return_if_fail (G_IS_PARAM_SPEC (pspec)); g_return_if_fail (!G_IS_PARAM_SPEC_OVERRIDE (pspec)); /* paranoid */ - g_return_if_fail (PARAM_SPEC_PARAM_ID (pspec) == 0); /* paranoid */ - g_return_if_fail (pspec->flags & (G_PARAM_READABLE | G_PARAM_WRITABLE)); - if (pspec->flags & G_PARAM_CONSTRUCT) - g_return_if_fail ((pspec->flags & G_PARAM_CONSTRUCT_ONLY) == 0); - if (pspec->flags & (G_PARAM_CONSTRUCT | G_PARAM_CONSTRUCT_ONLY)) - g_return_if_fail (pspec->flags & G_PARAM_WRITABLE); + if (!validate_pspec_to_install (pspec)) + return; - install_property_internal (iface_class->g_type, 0, pspec); + (void) install_property_internal (iface_class->g_type, 0, pspec); } /** diff --git a/gobject/gobject.rc b/gobject/gobject.rc index 3d44805..0510c4c 100644 --- a/gobject/gobject.rc +++ b/gobject/gobject.rc @@ -1,8 +1,8 @@ #include VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,54,0,0 - PRODUCTVERSION 2,54,0,0 + FILEVERSION 2,54,1,0 + PRODUCTVERSION 2,54,1,0 FILEFLAGSMASK 0 FILEFLAGS 0 FILEOS VOS__WINDOWS32 @@ -15,12 +15,12 @@ VS_VERSION_INFO VERSIONINFO BEGIN VALUE "CompanyName", "The GLib developer community" VALUE "FileDescription", "GObject" - VALUE "FileVersion", "2.54.0.0" + VALUE "FileVersion", "2.54.1.0" VALUE "InternalName", "libgobject-2.0-0" VALUE "LegalCopyright", "Copyright © 1998-2011 Tim Janik, Red Hat, Inc. and others" VALUE "OriginalFilename", "libgobject-2.0-0.dll" VALUE "ProductName", "GLib" - VALUE "ProductVersion", "2.54.0" + VALUE "ProductVersion", "2.54.1" END END BLOCK "VarFileInfo" diff --git a/gobject/meson.build b/gobject/meson.build index 0d39f2b..aecca57 100644 --- a/gobject/meson.build +++ b/gobject/meson.build @@ -102,7 +102,7 @@ configure_file( output: 'libgobject-2.0.so.@0@-gdb.py'.format(library_version), configuration: gdb_conf, install: true, - install_dir: join_paths(get_option('datadir'), 'gdb/auto-load/' + glib_libdir) + install_dir: join_paths(get_option('datadir'), 'gdb/auto-load/' + get_option('libdir')) ) if enable_systemtap diff --git a/gthread/gthread.rc b/gthread/gthread.rc index bb8e460..854bed3 100644 --- a/gthread/gthread.rc +++ b/gthread/gthread.rc @@ -1,8 +1,8 @@ #include VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,54,0,0 - PRODUCTVERSION 2,54,0,0 + FILEVERSION 2,54,1,0 + PRODUCTVERSION 2,54,1,0 FILEFLAGSMASK 0 FILEFLAGS 0 FILEOS VOS__WINDOWS32 @@ -15,12 +15,12 @@ VS_VERSION_INFO VERSIONINFO BEGIN VALUE "CompanyName", "The GLib developer community" VALUE "FileDescription", "GThread" - VALUE "FileVersion", "2.54.0.0" + VALUE "FileVersion", "2.54.1.0" VALUE "InternalName", "libgthread-2.0-0" VALUE "LegalCopyright", "Copyright © 1995-2011 Peter Mattis, Spencer Kimball, Josh MacDonald, Sebastian Wilhelmi and others." VALUE "OriginalFilename", "libgthread-2.0-0.dll" VALUE "ProductName", "GLib" - VALUE "ProductVersion", "2.54.0" + VALUE "ProductVersion", "2.54.1" END END BLOCK "VarFileInfo" diff --git a/meson.build b/meson.build index 0c8507d..0f3f791 100644 --- a/meson.build +++ b/meson.build @@ -1499,6 +1499,11 @@ endif python = import('python3').find_python() +# Determine which user environment-dependent files that we want to install +have_bash = find_program('bash', required : false).found() # For completion scripts +have_m4 = find_program('m4', required : false).found() # For m4 macros +have_sh = find_program('sh', required : false).found() # For glib-gettextize + # FIXME: defines in config.h that are not actually used anywhere # (we add them for now to minimise the diff) glib_conf.set('HAVE_DLFCN_H', 1) @@ -1608,19 +1613,27 @@ endforeach # NOTE: We skip glib-zip.in because the filenames it assumes don't match ours -# Install glib-gettextize executable -configure_file(input : 'glib-gettextize.in', - install : true, - install_dir : 'bin', - output : 'glib-gettextize', - configuration : glib_conf) +# Install glib-gettextize executable, if a UNIX-style shell is found +if have_sh + configure_file(input : 'glib-gettextize.in', + install : true, + install_dir : 'bin', + output : 'glib-gettextize', + configuration : glib_conf) +endif + +if have_m4 + # Install m4 macros that other projects use + install_data('m4macros/glib-2.0.m4', 'm4macros/glib-gettext.m4', 'm4macros/gsettings.m4', + install_dir : join_paths(get_option('datadir'), 'aclocal')) +endif -# Install m4 macros that other projects use -install_data('m4macros/glib-2.0.m4', 'm4macros/glib-gettext.m4', 'm4macros/gsettings.m4', - install_dir : join_paths(get_option('datadir'), 'aclocal')) -# Install Valgrind suppression file -install_data('glib.supp', - install_dir : join_paths(get_option('datadir'), 'glib-2.0', 'valgrind')) +if host_system != 'windows' + # Install Valgrind suppression file (except on Windows, + # as Valgrind is currently not supported on Windows) + install_data('glib.supp', + install_dir : join_paths(get_option('datadir'), 'glib-2.0', 'valgrind')) +endif configure_file(input : 'config.h.meson', output : 'config.h', diff --git a/po/glib20.pot b/po/glib20.pot index 18627af..19894f0 100644 --- a/po/glib20.pot +++ b/po/glib20.pot @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=glib&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2017-09-10 20:35-0400\n" +"POT-Creation-Date: 2017-10-02 11:24-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -299,7 +299,7 @@ msgstr "" msgid "Error during conversion: %s" msgstr "" -#: ../gio/gcharsetconverter.c:445 ../gio/gsocket.c:1096 +#: ../gio/gcharsetconverter.c:445 ../gio/gsocket.c:1089 msgid "Cancellable initialization not supported" msgstr "" @@ -3406,144 +3406,144 @@ msgstr "" msgid "No such key “%s”\n" msgstr "" -#: ../gio/gsocket.c:379 +#: ../gio/gsocket.c:374 msgid "Invalid socket, not initialized" msgstr "" -#: ../gio/gsocket.c:386 +#: ../gio/gsocket.c:381 #, c-format msgid "Invalid socket, initialization failed due to: %s" msgstr "" -#: ../gio/gsocket.c:394 +#: ../gio/gsocket.c:389 msgid "Socket is already closed" msgstr "" -#: ../gio/gsocket.c:409 ../gio/gsocket.c:2765 ../gio/gsocket.c:3950 -#: ../gio/gsocket.c:4008 +#: ../gio/gsocket.c:404 ../gio/gsocket.c:2762 ../gio/gsocket.c:3908 +#: ../gio/gsocket.c:3965 msgid "Socket I/O timed out" msgstr "" -#: ../gio/gsocket.c:541 +#: ../gio/gsocket.c:536 #, c-format msgid "creating GSocket from fd: %s" msgstr "" -#: ../gio/gsocket.c:570 ../gio/gsocket.c:624 ../gio/gsocket.c:631 +#: ../gio/gsocket.c:565 ../gio/gsocket.c:619 ../gio/gsocket.c:626 #, c-format msgid "Unable to create socket: %s" msgstr "" -#: ../gio/gsocket.c:624 +#: ../gio/gsocket.c:619 msgid "Unknown family was specified" msgstr "" -#: ../gio/gsocket.c:631 +#: ../gio/gsocket.c:626 msgid "Unknown protocol was specified" msgstr "" -#: ../gio/gsocket.c:1122 +#: ../gio/gsocket.c:1115 #, c-format msgid "Cannot use datagram operations on a non-datagram socket." msgstr "" -#: ../gio/gsocket.c:1139 +#: ../gio/gsocket.c:1132 #, c-format msgid "Cannot use datagram operations on a socket with a timeout set." msgstr "" -#: ../gio/gsocket.c:1943 +#: ../gio/gsocket.c:1936 #, c-format msgid "could not get local address: %s" msgstr "" -#: ../gio/gsocket.c:1986 +#: ../gio/gsocket.c:1979 #, c-format msgid "could not get remote address: %s" msgstr "" -#: ../gio/gsocket.c:2052 +#: ../gio/gsocket.c:2045 #, c-format msgid "could not listen: %s" msgstr "" -#: ../gio/gsocket.c:2151 +#: ../gio/gsocket.c:2144 #, c-format msgid "Error binding to address: %s" msgstr "" -#: ../gio/gsocket.c:2266 ../gio/gsocket.c:2303 +#: ../gio/gsocket.c:2259 ../gio/gsocket.c:2296 #, c-format msgid "Error joining multicast group: %s" msgstr "" -#: ../gio/gsocket.c:2267 ../gio/gsocket.c:2304 +#: ../gio/gsocket.c:2260 ../gio/gsocket.c:2297 #, c-format msgid "Error leaving multicast group: %s" msgstr "" -#: ../gio/gsocket.c:2268 +#: ../gio/gsocket.c:2261 msgid "No support for source-specific multicast" msgstr "" -#: ../gio/gsocket.c:2488 +#: ../gio/gsocket.c:2481 #, c-format msgid "Error accepting connection: %s" msgstr "" -#: ../gio/gsocket.c:2609 +#: ../gio/gsocket.c:2604 msgid "Connection in progress" msgstr "" -#: ../gio/gsocket.c:2658 +#: ../gio/gsocket.c:2655 msgid "Unable to get pending error: " msgstr "" -#: ../gio/gsocket.c:2828 +#: ../gio/gsocket.c:2827 #, c-format msgid "Error receiving data: %s" msgstr "" -#: ../gio/gsocket.c:3023 +#: ../gio/gsocket.c:3024 #, c-format msgid "Error sending data: %s" msgstr "" -#: ../gio/gsocket.c:3210 +#: ../gio/gsocket.c:3211 #, c-format msgid "Unable to shutdown socket: %s" msgstr "" -#: ../gio/gsocket.c:3291 +#: ../gio/gsocket.c:3292 #, c-format msgid "Error closing socket: %s" msgstr "" -#: ../gio/gsocket.c:3943 +#: ../gio/gsocket.c:3901 #, c-format msgid "Waiting for socket condition: %s" msgstr "" -#: ../gio/gsocket.c:4417 ../gio/gsocket.c:4497 ../gio/gsocket.c:4675 +#: ../gio/gsocket.c:4374 ../gio/gsocket.c:4454 ../gio/gsocket.c:4632 #, c-format msgid "Error sending message: %s" msgstr "" -#: ../gio/gsocket.c:4441 +#: ../gio/gsocket.c:4398 msgid "GSocketControlMessage not supported on Windows" msgstr "" -#: ../gio/gsocket.c:4894 ../gio/gsocket.c:4967 ../gio/gsocket.c:5193 +#: ../gio/gsocket.c:4851 ../gio/gsocket.c:4924 ../gio/gsocket.c:5151 #, c-format msgid "Error receiving message: %s" msgstr "" -#: ../gio/gsocket.c:5465 +#: ../gio/gsocket.c:5423 #, c-format msgid "Unable to read socket credentials: %s" msgstr "" -#: ../gio/gsocket.c:5474 +#: ../gio/gsocket.c:5432 msgid "g_socket_get_credentials not implemented for this OS" msgstr "" diff --git a/po/sl.gmo b/po/sl.gmo index bc4da4c24bee650532c8ca00464302d872b73edc..e525ff768285beb938d3a3393b072ad0884b1212 100644 GIT binary patch delta 39400 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 J-*&qT{tr#pfD-@! diff --git a/po/sl.po b/po/sl.po index d7b6412..8934906 100644 --- a/po/sl.po +++ b/po/sl.po @@ -10,8 +10,8 @@ msgstr "" "Project-Id-Version: glib master\n" "Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?" "product=glib&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2017-08-06 19:26+0200\n" -"PO-Revision-Date: 2017-08-06 20:01+0200\n" +"POT-Creation-Date: 2017-09-28 19:20+0200\n" +"PO-Revision-Date: 2017-09-28 19:20+0200\n" "Last-Translator: Matej Urbančič \n" "Language-Team: Slovenian GNOME Translation Team \n" "Language: sl_SI\n" @@ -36,8 +36,6 @@ msgid "Enter GApplication service mode (use from D-Bus service files)" msgstr "Vstopi v način storitev (uporabi iz storitvenih datotek D-Bus)" #: ../gio/gapplication.c:547 -#, fuzzy -#| msgid "Override the application's ID" msgid "Override the application’s ID" msgstr "PrepiÅ¡i ID programa" @@ -79,8 +77,6 @@ msgid "Launch the application (with optional files to open)" msgstr "Zagon programa (z možnostjo določitve datoteke za odpiranje)" #: ../gio/gapplication-tool.c:57 -#, fuzzy -#| msgid "APPID [FILE...]" msgid "APPID [FILE…]" msgstr "APPID [DATOTEKA ...]" @@ -169,8 +165,6 @@ msgid "Arguments:\n" msgstr "Argumenti:\n" #: ../gio/gapplication-tool.c:133 -#, fuzzy -#| msgid "[ARGS...]" msgid "[ARGS…]" msgstr "[ARGUMENTI ...]" @@ -181,15 +175,12 @@ msgstr "Ukazi:\n" #. Translators: do not translate 'help', but please translate 'COMMAND'. #: ../gio/gapplication-tool.c:146 -#, fuzzy, c-format -#| msgid "" -#| "Use '%s help COMMAND' to get detailed help.\n" -#| "\n" +#, c-format msgid "" "Use “%s help COMMAND” to get detailed help.\n" "\n" msgstr "" -"Z ukazom '%s help UKAZ' se izpiÅ¡e podrobna pomoč.\n" +"Z ukazom »%s help UKAZ« se izpiÅ¡e podrobna pomoč.\n" "\n" #: ../gio/gapplication-tool.c:165 @@ -202,22 +193,18 @@ msgstr "" "\n" #: ../gio/gapplication-tool.c:171 -#, fuzzy, c-format -#| msgid "invalid application id: '%s'\n" +#, c-format msgid "invalid application id: “%s”\n" -msgstr "Neveljaven ID programa: '%s'\n" +msgstr "neveljaven ID programa: »%s«\n" #. Translators: %s is replaced with a command name like 'list-actions' #: ../gio/gapplication-tool.c:182 -#, fuzzy, c-format -#| msgid "" -#| "'%s' takes no arguments\n" -#| "\n" +#, c-format msgid "" "“%s” takes no arguments\n" "\n" msgstr "" -"'%s' ne prevzema argumentov\n" +"»%s« ne prevzema argumentov\n" "\n" #: ../gio/gapplication-tool.c:266 @@ -236,16 +223,14 @@ 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:325 -#, fuzzy, c-format -#| msgid "" -#| "invalid action name: '%s'\n" -#| "action names must consist of only alphanumerics, '-' and '.'\n" +#, c-format msgid "" "invalid action name: “%s”\n" "action names must consist of only alphanumerics, “-” and “.”\n" msgstr "" -"neveljavno ime dejanja: '%s'\n" -"imena dejanj lahko tvorijo le alfanumerični znaki, vezaj in pika\n" +"neveljavno ime dejanja: »%s«\n" +"imena dejanj lahko tvorijo le alfanumerični znaki, vezaj » - « in pika » . " +"«.\n" #: ../gio/gapplication-tool.c:344 #, c-format @@ -324,33 +309,31 @@ msgstr "Ni dovolj prostora za cilju" #: ../gio/gcharsetconverter.c:342 ../gio/gdatainputstream.c:848 #: ../gio/gdatainputstream.c:1257 ../glib/gconvert.c:438 ../glib/gconvert.c:845 -#: ../glib/giochannel.c:1556 ../glib/giochannel.c:1598 -#: ../glib/giochannel.c:2442 ../glib/gutf8.c:866 ../glib/gutf8.c:1319 +#: ../glib/giochannel.c:1557 ../glib/giochannel.c:1599 +#: ../glib/giochannel.c:2443 ../glib/gutf8.c:866 ../glib/gutf8.c:1319 msgid "Invalid byte sequence in conversion input" msgstr "Neveljavno zaporedje bajtov na vhodu pretvorbe" #: ../gio/gcharsetconverter.c:347 ../glib/gconvert.c:446 ../glib/gconvert.c:770 -#: ../glib/giochannel.c:1563 ../glib/giochannel.c:2454 +#: ../glib/giochannel.c:1564 ../glib/giochannel.c:2455 #, c-format msgid "Error during conversion: %s" msgstr "Napaka med pretvorbo: %s" -#: ../gio/gcharsetconverter.c:445 ../gio/gsocket.c:1096 +#: ../gio/gcharsetconverter.c:445 ../gio/gsocket.c:1089 msgid "Cancellable initialization not supported" msgstr "Dejanje prekinitve zagona ni podprto" #: ../gio/gcharsetconverter.c:456 ../glib/gconvert.c:321 -#: ../glib/giochannel.c:1384 -#, fuzzy, c-format -#| msgid "Conversion from character set '%s' to '%s' is not supported" +#: ../glib/giochannel.c:1385 +#, c-format msgid "Conversion from character set “%s” to “%s” is not supported" -msgstr "Pretvorba iz nabora znakov '%s' v '%s' ni podprta" +msgstr "Pretvorba iz nabora znakov »%s« v »%s« ni podprta" #: ../gio/gcharsetconverter.c:460 ../glib/gconvert.c:325 -#, fuzzy, c-format -#| msgid "Could not open converter from '%s' to '%s'" +#, c-format msgid "Could not open converter from “%s” to “%s”" -msgstr "Ni mogoče odpreti pretvornika iz '%s' v '%s'" +msgstr "Ni mogoče odpreti pretvornika iz »%s« v »%s«" #: ../gio/gcontenttype.c:358 #, c-format @@ -388,140 +371,114 @@ msgstr "Nepričakovan prezgodnji konec pretoka" #: ../gio/gdbusaddress.c:155 ../gio/gdbusaddress.c:243 #: ../gio/gdbusaddress.c:324 -#, fuzzy, c-format -#| msgid "Unsupported key '%s' in address entry '%s'" +#, c-format msgid "Unsupported key “%s” in address entry “%s”" -msgstr "Nepodprt ključ '%s' v vnosu naslova '%s'" +msgstr "Nepodprt ključ »%s« v vnosu naslova »%s«" #: ../gio/gdbusaddress.c:182 -#, fuzzy, c-format -#| msgid "" -#| "Address '%s' is invalid (need exactly one of path, tmpdir or abstract " -#| "keys)" +#, c-format msgid "" "Address “%s” is invalid (need exactly one of path, tmpdir or abstract keys)" msgstr "" -"Naslov '%s' je nepravilen (zahtevana je pot, začasna mapa ali abstraktni " +"Naslov »%s« je nepravilen (zahtevana je pot, začasna mapa ali abstraktni " "ključ)" #: ../gio/gdbusaddress.c:195 -#, fuzzy, c-format -#| msgid "Meaningless key/value pair combination in address entry '%s'" +#, c-format msgid "Meaningless key/value pair combination in address entry “%s”" -msgstr "Nesmiselna kombinacija za par ključ/vrednost v vnosu naslova '%s'" +msgstr "Nesmiselna kombinacija za par ključ/vrednost v vnosu naslova »%s«" #: ../gio/gdbusaddress.c:258 ../gio/gdbusaddress.c:339 -#, fuzzy, c-format -#| msgid "Error in address '%s' - the port attribute is malformed" +#, c-format msgid "Error in address “%s” — the port attribute is malformed" -msgstr "Napaka v naslovu '%s' - atribut vrat je nepravilno oblikovan" +msgstr "Napaka v naslovu »%s« – atribut vrat je nepravilno oblikovan" #: ../gio/gdbusaddress.c:269 ../gio/gdbusaddress.c:350 -#, fuzzy, c-format -#| msgid "Error in address '%s' - the family attribute is malformed" +#, c-format msgid "Error in address “%s” — the family attribute is malformed" -msgstr "Napaka v naslovu '%s' - atribut družine je nepravilno oblikovan" +msgstr "Napaka v naslovu »%s« – atribut družine je nepravilno oblikovan" #: ../gio/gdbusaddress.c:460 -#, fuzzy, c-format -#| msgid "Address element '%s' does not contain a colon (:)" +#, c-format msgid "Address element “%s” does not contain a colon (:)" -msgstr "Predmet naslova '%s' ne vsebuje dvopičja (:)" +msgstr "Predmet naslova »%s« ne vsebuje dvopičja ( : )" #: ../gio/gdbusaddress.c:481 -#, fuzzy, c-format -#| msgid "" -#| "Key/Value pair %d, '%s', in address element '%s' does not contain an " -#| "equal sign" +#, c-format msgid "" "Key/Value pair %d, “%s”, in address element “%s” does not contain an equal " "sign" -msgstr "" -"Par ključ/vrednost %d, '%s', v predmetu naslova '%s', ne vsebuje enačaja" +msgstr "Par ključ/vrednost %d, »%s« v predmetu naslova »%s« ne vsebuje enačaja" #: ../gio/gdbusaddress.c:495 -#, fuzzy, c-format -#| msgid "" -#| "Error unescaping key or value in Key/Value pair %d, '%s', in address " -#| "element '%s'" +#, c-format msgid "" "Error unescaping key or value in Key/Value pair %d, “%s”, in address element " "“%s”" msgstr "" -"Napaka, neubežni ključ ali vrednost v paru ključ/vrednost %d, '%s', v " -"predmetu naslova '%s'" +"Napaka neubežnega ključa ali vrednosti v paru ključ/vrednost %d, »%s«, v " +"predmetu naslova »%s«" #: ../gio/gdbusaddress.c:573 -#, fuzzy, c-format -#| msgid "" -#| "Error in address '%s' - the unix transport requires exactly one of the " -#| "keys 'path' or 'abstract' to be set" +#, c-format msgid "" "Error in address “%s” — the unix transport requires exactly one of the keys " "“path” or “abstract” to be set" msgstr "" -"Napaka v naslovu '%s' - unix prenos zahteva enega izmed ključev 'path' ali " -"'abstract' nastavljen" +"Napaka v naslovu »%s« – prenos unix zahteva enega izmed ključev »path« ali " +"»abstract«" #: ../gio/gdbusaddress.c:609 -#, fuzzy, c-format -#| msgid "Error in address '%s' - the host attribute is missing or malformed" +#, c-format msgid "Error in address “%s” — the host attribute is missing or malformed" msgstr "" -"Napaka v naslovu '%s' - atribut host manjka ali pa je nepravilno oblikovan" +"Napaka v naslovu »%s« – atribut gostitelja manjka ali pa je nepravilno " +"oblikovan" #: ../gio/gdbusaddress.c:623 -#, fuzzy, c-format -#| msgid "Error in address '%s' - the port attribute is missing or malformed" +#, c-format msgid "Error in address “%s” — the port attribute is missing or malformed" msgstr "" -"Napaka v naslovu '%s' - manjka atribut vrat ali pa ali je nepravilno " +"Napaka v naslovu »%s« – manjka atribut vrat ali pa ali je nepravilno " "oblikovan" #: ../gio/gdbusaddress.c:637 -#, fuzzy, c-format -#| msgid "" -#| "Error in address '%s' - the noncefile attribute is missing or malformed" +#, c-format msgid "Error in address “%s” — the noncefile attribute is missing or malformed" msgstr "" -"Napaka v naslovu '%s' - atribut noncefile manjka ali pa je nepravilno " -"oblikovan" +"Napaka v naslovu »%s« – atribut enkratne datoteke manjka ali pa je " +"nepravilno oblikovan" #: ../gio/gdbusaddress.c:658 msgid "Error auto-launching: " msgstr "Napaka samodejnega zaganjanja:" #: ../gio/gdbusaddress.c:666 -#, fuzzy, c-format -#| msgid "Unknown or unsupported transport '%s' for address '%s'" +#, c-format msgid "Unknown or unsupported transport “%s” for address “%s”" -msgstr "Neznan ali nepodprt prenos '%s' za naslov '%s' " +msgstr "Neznan ali nepodprt prenos »%s« za naslov »%s«" #: ../gio/gdbusaddress.c:704 -#, fuzzy, c-format -#| msgid "Error opening nonce file '%s': %s" +#, c-format msgid "Error opening nonce file “%s”: %s" -msgstr "Napaka med odpiranjem enkratne datoteke '%s': %s" +msgstr "Napaka med odpiranjem enkratne datoteke »%s«: %s" #: ../gio/gdbusaddress.c:723 -#, fuzzy, c-format -#| msgid "Error reading from nonce file '%s': %s" +#, c-format msgid "Error reading from nonce file “%s”: %s" -msgstr "Napaka med branjem iz enkratne datoteke '%s': %s" +msgstr "Napaka med branjem iz enkratne datoteke »%s«: %s" #: ../gio/gdbusaddress.c:732 -#, fuzzy, c-format -#| msgid "Error reading from nonce file '%s', expected 16 bytes, got %d" +#, c-format msgid "Error reading from nonce file “%s”, expected 16 bytes, got %d" msgstr "" -"Napaka med branjem iz datoteke nonce '%s'; pričakovanih 16 bajtov, dobljenih " -"pa %d" +"Napaka med branjem iz enkratne datoteke »%s«; pričakovanih 16 bajtov, " +"pridobljenih pa %d" #: ../gio/gdbusaddress.c:750 -#, fuzzy, c-format -#| msgid "Error writing contents of nonce file '%s' to stream:" +#, c-format msgid "Error writing contents of nonce file “%s” to stream:" -msgstr "Napaka med pisanjem vsebine datoteke nonce '%s' v pretok:" +msgstr "Napaka med pisanjem vsebine enkratne datoteke »%s« v pretok:" #: ../gio/gdbusaddress.c:959 msgid "The given address is empty" @@ -542,10 +499,9 @@ msgid "Cannot autolaunch D-Bus without X11 $DISPLAY" msgstr "Ni mogoče samodejno zagnati vodila D-Bus brez nastaviteve X11 $DISPLAY" #: ../gio/gdbusaddress.c:1128 -#, fuzzy, c-format -#| msgid "Error spawning command line '%s': " +#, c-format msgid "Error spawning command line “%s”: " -msgstr "Napaka med oživljanjem ukazne vrstice '%s': " +msgstr "Napaka med oživljanjem ukazne vrstice »%s«: " #: ../gio/gdbusaddress.c:1345 #, c-format @@ -563,16 +519,13 @@ 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:1648 -#, fuzzy, c-format -#| msgid "" -#| "Cannot determine bus address from DBUS_STARTER_BUS_TYPE environment " -#| "variable - unknown value '%s'" +#, c-format msgid "" "Cannot determine bus address from DBUS_STARTER_BUS_TYPE environment variable " "— unknown value “%s”" msgstr "" "Ni mogoče določiti naslova vodila iz okoljske spremenljivke " -"DBUS_STARTER_BUS_TYPE - neznana vrednost '%s'" +"DBUS_STARTER_BUS_TYPE – neznana vrednost »%s«" #: ../gio/gdbusaddress.c:1657 ../gio/gdbusconnection.c:7155 msgid "" @@ -608,101 +561,83 @@ msgid "Cancelled via GDBusAuthObserver::authorize-authenticated-peer" msgstr "Prekinjeno s strani GDBusAuthObserver::authorize-authenticated-peer" #: ../gio/gdbusauthmechanismsha1.c:262 -#, fuzzy, c-format -#| msgid "Error when getting information for directory '%s': %s" +#, c-format msgid "Error when getting information for directory “%s”: %s" -msgstr "Napaka med pridobivanjem mape '%s': %s" +msgstr "Napaka med pridobivanjem podrobnosti mape »%s«: %s" #: ../gio/gdbusauthmechanismsha1.c:274 -#, fuzzy, c-format -#| msgid "" -#| "Permissions on directory '%s' are malformed. Expected mode 0700, got 0%o" +#, c-format msgid "" "Permissions on directory “%s” are malformed. Expected mode 0700, got 0%o" msgstr "" -"Dovoljenja na mapi '%s' so nepravilna. Pričakovana 0700, dobljena pa 0%o" +"Dovoljenja na mapi »%s« so napalno oblikovana. Pričakovano je dovoljenje " +"0700, pridobljeno pa 0%o" #: ../gio/gdbusauthmechanismsha1.c:296 -#, fuzzy, c-format -#| msgid "Error creating directory %s: %s" +#, c-format msgid "Error creating directory “%s”: %s" -msgstr "Napaka med ustvarjanjem mape %s: %s" +msgstr "Napaka med ustvarjanjem mape »%s«: %s" #: ../gio/gdbusauthmechanismsha1.c:379 -#, fuzzy, c-format -#| msgid "Error opening keyring '%s' for reading: " +#, c-format msgid "Error opening keyring “%s” for reading: " -msgstr "Napaka med odpiranjem zbirke ključev '%s' za branje:" +msgstr "Napaka med odpiranjem zbirke ključev »%s« za branje:" #: ../gio/gdbusauthmechanismsha1.c:403 ../gio/gdbusauthmechanismsha1.c:721 -#, fuzzy, c-format -#| msgid "Line %d of the keyring at '%s' with content '%s' is malformed" +#, 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" +msgstr "Vrstica %d zbirke ključev »%s« z vsebino »%s« je neustrezno oblikovana" #: ../gio/gdbusauthmechanismsha1.c:417 ../gio/gdbusauthmechanismsha1.c:735 -#, fuzzy, c-format -#| msgid "" -#| "First token of line %d of the keyring at '%s' with content '%s' is " -#| "malformed" +#, c-format msgid "" "First token of line %d of the keyring at “%s” with content “%s” is malformed" msgstr "" -"Prvi žeton vrstice %d zbirke ključev pri '%s' z vsebino '%s' je neustrezno " +"Prvi žeton vrstice %d zbirke ključev pri »%s« z vsebino »%s« je neustrezno " "oblikovan" #: ../gio/gdbusauthmechanismsha1.c:432 ../gio/gdbusauthmechanismsha1.c:749 -#, fuzzy, c-format -#| msgid "" -#| "Second token of line %d of the keyring at '%s' with content '%s' is " -#| "malformed" +#, c-format msgid "" "Second token of line %d of the keyring at “%s” with content “%s” is malformed" msgstr "" -"Drugi žeton vrstice %d zbirke ključev pri '%s' z vsebino '%s' je neustrezno " +"Drugi žeton vrstice %d zbirke ključev pri »%s« z vsebino »%s« je neustrezno " "oblikovana" #: ../gio/gdbusauthmechanismsha1.c:456 -#, fuzzy, c-format -#| msgid "Didn't find cookie with id %d in the keyring at '%s'" +#, c-format msgid "Didn’t find cookie with id %d in the keyring at “%s”" -msgstr "PiÅ¡kota z id %d v zbirki ključev '%s' ni mogoče najti" +msgstr "PiÅ¡kotka z ID %d v zbirki ključev »%s« ni mogoče najti" #: ../gio/gdbusauthmechanismsha1.c:536 -#, fuzzy, c-format -#| msgid "Error deleting stale lock file '%s': %s" +#, c-format msgid "Error deleting stale lock file “%s”: %s" -msgstr "Napaka brisanja stare datoteke zaklepa '%s': %s" +msgstr "Napaka brisanja stare datoteke zaklepa »%s«: %s" #: ../gio/gdbusauthmechanismsha1.c:569 -#, fuzzy, c-format -#| msgid "Error creating lock file '%s': %s" +#, c-format msgid "Error creating lock file “%s”: %s" -msgstr "Napaka med ustvarjanjem datoteke '%s': %s" +msgstr "Napaka med ustvarjanjem datoteke zaklepa »%s«: %s" #: ../gio/gdbusauthmechanismsha1.c:600 -#, fuzzy, c-format -#| msgid "Error closing (unlinked) lock file '%s': %s" +#, c-format msgid "Error closing (unlinked) lock file “%s”: %s" -msgstr "Napaka med zapiranjem (nepovezane) zaklepne datoteke '%s': %s" +msgstr "Napaka med zapiranjem (nepovezane) datoteke zaklepa »%s«: %s" #: ../gio/gdbusauthmechanismsha1.c:611 -#, fuzzy, c-format -#| msgid "Error unlinking lock file '%s': %s" +#, c-format msgid "Error unlinking lock file “%s”: %s" -msgstr "Napaka med razvezovanjem datoteke zaklepa '%s': %s" +msgstr "Napaka med razvezovanjem datoteke zaklepa »%s«: %s" #: ../gio/gdbusauthmechanismsha1.c:688 -#, fuzzy, c-format -#| msgid "Error opening keyring '%s' for writing: " +#, c-format msgid "Error opening keyring “%s” for writing: " -msgstr "Napaka med odpiranjem zbirke ključev '%s' za branje: " +msgstr "Napaka med odpiranjem zbirke ključev »%s« za branje: " #: ../gio/gdbusauthmechanismsha1.c:885 -#, fuzzy, c-format -#| msgid "(Additionally, releasing the lock for '%s' also failed: %s) " +#, c-format msgid "(Additionally, releasing the lock for “%s” also failed: %s) " -msgstr "(V nadaljevanju je spodletelo tudi sproščanje zaklepa '%s': %s)" +msgstr "(V nadaljevanju je spodletelo tudi sproščanje zaklepa »%s«: %s)" #: ../gio/gdbusconnection.c:612 ../gio/gdbusconnection.c:2378 msgid "The connection is closed" @@ -729,45 +664,45 @@ msgstr "" #: ../gio/gdbusconnection.c:4266 #, c-format msgid "No such property '%s'" -msgstr "Lastnost '%s' ne obstaja" +msgstr "Lastnost »%s« ne obstaja" #: ../gio/gdbusconnection.c:4278 #, c-format msgid "Property '%s' is not readable" -msgstr "Lastnosti '%s' ni berljiva" +msgstr "Lastnosti »%s« ni berljiva" #: ../gio/gdbusconnection.c:4289 #, c-format msgid "Property '%s' is not writable" -msgstr "Lastnost '%s' ni zapisljiva" +msgstr "Lastnost »%s« ni zapisljiva" #: ../gio/gdbusconnection.c:4309 #, c-format msgid "Error setting property '%s': Expected type '%s' but got '%s'" msgstr "" -"Napaka med nastavljanjem lastnosti '%s': pričakovana je vrsta '%s', dobljena " -"pa '%s'" +"Napaka med nastavljanjem lastnosti »%s«: pričakovana je vrsta »%s«, dobljena " +"pa »%s«" #: ../gio/gdbusconnection.c:4414 ../gio/gdbusconnection.c:4622 #: ../gio/gdbusconnection.c:6586 #, c-format msgid "No such interface '%s'" -msgstr "Vmesnik '%s' ne obstaja" +msgstr "Vmesnik »%s« ne obstaja" #: ../gio/gdbusconnection.c:4840 ../gio/gdbusconnection.c:7095 #, c-format msgid "No such interface '%s' on object at path %s" -msgstr "Vmesnik '%s' na predmetu na poti %s ne obstaja" +msgstr "Vmesnik »%s« na predmetu na poti %s ne obstaja" #: ../gio/gdbusconnection.c:4938 #, c-format msgid "No such method '%s'" -msgstr "Način '%s' ne obstaja" +msgstr "Način »%s« ne obstaja" #: ../gio/gdbusconnection.c:4969 #, 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'" +msgstr "Vrsta sporočila »%s« se ne sklada s pričakovano vrsto »%s«" #: ../gio/gdbusconnection.c:5167 #, c-format @@ -787,12 +722,12 @@ msgstr "Ni mogoče določiti lastnosti %s.%s" #: ../gio/gdbusconnection.c:5625 #, 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'" +msgstr "Način »%s« je vrnil vrsto »%s«, pričakovana pa je vrsta »%s«" #: ../gio/gdbusconnection.c:6697 #, 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" +msgstr "Način »%s« na vmesniku »%s« s podpisom »%s« ne obstaja" #: ../gio/gdbusconnection.c:6818 #, c-format @@ -806,7 +741,7 @@ msgid "" "- unknown value '%s'" msgstr "" "Ni mogoče določiti naslova vodila iz okoljske spremenljivke " -"DBUS_STARTER_BUS_TYPE - neznana vrednost '%s'" +"DBUS_STARTER_BUS_TYPE - neznana vrednost »%s«" #: ../gio/gdbusmessage.c:1246 msgid "type is INVALID" @@ -855,35 +790,29 @@ msgstr[2] "Med poskusom branja %lu bajtov sta bila prejeta le %lu." msgstr[3] "Med poskusom branja %lu bajtov so bili prejeti le %lu." #: ../gio/gdbusmessage.c:1371 -#, fuzzy, c-format -#| msgid "Expected NUL byte after the string '%s' but found byte %d" +#, 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" +msgstr "Po nizu »%s« je pričakovan bajt NUL, vendar je bil zaznan %d" #: ../gio/gdbusmessage.c:1390 -#, fuzzy, c-format -#| msgid "" -#| "Expected valid UTF-8 string but found invalid bytes at byte offset %d " -#| "(length of string is %d). The valid UTF-8 string up until that point was " -#| "'%s'" +#, 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 "" -"Pričakovan veljaven UTF-8 niz, vendar je najdenih nepravilno Å¡tevilo bajtov " -"na bajtnem odmiku %d (dolžina niza %d). Do takrat veljaven UTF-8 niz je '%s'" +"Pričakovan je veljaven UTF-8 niz, vendar je najdenih nepravilno Å¡tevilo " +"bajtov na bajtnem odmiku %d (dolžina niza %d). Do takrat veljaven UTF-8 niz " +"je »%s«" #: ../gio/gdbusmessage.c:1589 -#, fuzzy, c-format -#| msgid "Parsed value '%s' is not a valid D-Bus object path" +#, 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" +msgstr "Razčlenjena vrednost »%s« ni veljavna pot predmeta vodila D-Bus" #: ../gio/gdbusmessage.c:1611 -#, fuzzy, c-format -#| msgid "Parsed value '%s' is not a valid D-Bus signature" +#, c-format msgid "Parsed value “%s” is not a valid D-Bus signature" -msgstr "Razčlenjena vrednost '%s' ni veljaven podpis vodila D-Bus" +msgstr "Razčlenjena vrednost »%s« ni veljaven podpis vodila D-Bus" #: ../gio/gdbusmessage.c:1658 #, c-format @@ -905,45 +834,35 @@ msgstr[3] "" "(64 MiB)." #: ../gio/gdbusmessage.c:1678 -#, fuzzy, 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" +#, 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 "" -"Zaznano je polje vrste 'a%c', pričakovana pa je vrednost večkratnika %u " +"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:1845 -#, fuzzy, c-format -#| msgid "Parsed value '%s' for variant is not a valid D-Bus signature" +#, 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" +msgstr "Razčlenjena vrednost »%s« ni veljaven podpis vodila D-Bus" #: ../gio/gdbusmessage.c:1869 -#, fuzzy, c-format -#| msgid "" -#| "Error deserializing GVariant with type string '%s' from the D-Bus wire " -#| "format" +#, c-format msgid "" "Error deserializing GVariant with type string “%s” from the D-Bus wire format" msgstr "" -"Napaka med ločevanjem GVariant iz zaporedja z vrsto niza '%s' iz D-Bus žične " -"oblike " +"Napaka med ločevanjem GVariant iz zaporedja z vrsto niza »%s« iz D-Bus žične " +"oblike" #: ../gio/gdbusmessage.c:2053 -#, fuzzy, c-format -#| msgid "" -#| "Invalid endianness value. Expected 0x6c ('l') or 0x42 ('B') but found " -#| "value 0x%02x" +#, c-format msgid "" "Invalid endianness value. Expected 0x6c (“l”) or 0x42 (“B”) but found value " "0x%02x" msgstr "" -"Neveljavna vrednost vrstnega reda zlogov. Pričakovana je vrednost 0x6c ('l') " -"ali 0x42 ('B'), najdena pa je vrednost 0x%02x" +"Neveljavna vrednost vrstnega reda zlogov. Pričakovana je ali vrednost 0x6c " +"(» l «) ali 0x42 (» B «), najdena pa je vrednost 0x%02x" #: ../gio/gdbusmessage.c:2066 #, c-format @@ -953,17 +872,15 @@ msgstr "" "več (%d)" #: ../gio/gdbusmessage.c:2122 -#, fuzzy, c-format -#| msgid "Signature header with signature '%s' found but message body is empty" +#, 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" +"Glava podpisa s podpisom »%s« je najdena, vendar je telo sporočila prazno" #: ../gio/gdbusmessage.c:2136 -#, fuzzy, c-format -#| msgid "Parsed value '%s' is not a valid D-Bus signature (for body)" +#, 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)" +msgstr "Razčlenjena vrednost »%s« ni veljaven podpis vodila D-Bus (za telo)" #: ../gio/gdbusmessage.c:2166 #, c-format @@ -983,13 +900,11 @@ msgid "Cannot deserialize message: " msgstr "Sporočila ni mogoče ločiti iz zaporedja:" #: ../gio/gdbusmessage.c:2517 -#, fuzzy, c-format -#| msgid "" -#| "Error serializing GVariant with type string '%s' to the D-Bus wire format" +#, c-format msgid "" "Error serializing GVariant with type string “%s” to the D-Bus wire format" msgstr "" -"Napaka pri združevanju GVariant v zaporedje z vrsto niza '%s' v D-Bus žično " +"Napaka pri združevanju GVariant v zaporedje z vrsto niza »%s« v D-Bus žično " "obliko" #: ../gio/gdbusmessage.c:2654 @@ -1004,33 +919,27 @@ msgid "Cannot serialize message: " msgstr "Sporočila ni bilo mogoče združiti v zaporedje:" #: ../gio/gdbusmessage.c:2706 -#, fuzzy, c-format -#| msgid "Message body has signature '%s' but there is no signature header" +#, 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" +msgstr "Telo sporočila ima podpis »%s«, vendar v glavi ni podpisa" #: ../gio/gdbusmessage.c:2716 -#, fuzzy, c-format -#| msgid "" -#| "Message body has type signature '%s' but signature in the header field is " -#| "'%s'" +#, c-format msgid "" "Message body has type signature “%s” but signature in the header field is " "“%s”" msgstr "" -"Telo sporočila ima podpis vrste '%s', vendar je podpis v polju glave '%s' " +"Telo sporočila ima podpis vrste »%s«, vendar je podpis v polju glave »%s«" #: ../gio/gdbusmessage.c:2732 -#, fuzzy, c-format -#| msgid "Message body is empty but signature in the header field is '(%s)'" +#, 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)'" +msgstr "Telo sporočila je prazno, vendar je v polju glave podpis »(%s)«" #: ../gio/gdbusmessage.c:3285 -#, fuzzy, c-format -#| msgid "Error return with body of type '%s'" +#, c-format msgid "Error return with body of type “%s”" -msgstr "Napaka vrnjena s telesom vrste '%s'" +msgstr "Napaka vrnjena s telesom vrste »%s«" #: ../gio/gdbusmessage.c:3293 msgid "Error return with empty body" @@ -1053,7 +962,7 @@ msgstr "Napaka med klicanjem predmeta StartServiceByName za %s: " #: ../gio/gdbusproxy.c:1634 #, c-format msgid "Unexpected reply %d from StartServiceByName(\"%s\") method" -msgstr "Nepričakovan odgovor %d iz načina StartServiceByName(\"%s\")" +msgstr "Nepričakovan odgovor %d iz načina StartServiceByName(»%s«)" #: ../gio/gdbusproxy.c:2719 ../gio/gdbusproxy.c:2853 msgid "" @@ -1072,22 +981,19 @@ msgid "Cannot specify nonce file when creating a server" msgstr "Med ustvarjanjem strežnika ni mogoče določiti enkratne datoteke" #: ../gio/gdbusserver.c:876 -#, fuzzy, c-format -#| msgid "Error writing nonce file at '%s': %s" +#, c-format msgid "Error writing nonce file at “%s”: %s" -msgstr "Napaka med zapisovanjem enkratne datoteke na '%s': %s" +msgstr "Napaka med zapisovanjem enkratne datoteke na »%s«: %s" #: ../gio/gdbusserver.c:1047 -#, fuzzy, c-format -#| msgid "The string '%s' is not a valid D-Bus GUID" +#, c-format msgid "The string “%s” is not a valid D-Bus GUID" -msgstr "Niz '%s' ni veljaven D-Bus GUID" +msgstr "Niz »%s« ni veljaven D-Bus GUID" #: ../gio/gdbusserver.c:1087 -#, fuzzy, c-format -#| msgid "Cannot listen on unsupported transport '%s'" +#, c-format msgid "Cannot listen on unsupported transport “%s”" -msgstr "Na nepodprtem načinu prenosa '%s' ni mogoče posluÅ¡ati" +msgstr "Na nepodprtem načinu prenosa »%s« ni mogoče posluÅ¡ati" #: ../gio/gdbus-tool.c:95 #, fuzzy, c-format @@ -1099,7 +1005,7 @@ msgstr "Na nepodprtem načinu prenosa '%s' ni mogoče posluÅ¡ati" #| " call Invoke a method on a remote object\n" #| " emit Emit a signal\n" #| "\n" -#| "Use \"%s COMMAND --help\" to get help on each command.\n" +#| "Use “%s COMMAND --help” to get help on each command.\n" msgid "" "Commands:\n" " help Shows this information\n" @@ -1118,7 +1024,7 @@ msgstr "" " call Pokliči metodo nad oddaljenim predmetom\n" " emit Oddaj signal\n" "\n" -"Uporabite \"%s COMMAND --help\" za pomoč o posameznem ukazu.\n" +"Uporabite »%s COMMAND --help« za pomoč o posameznem ukazu.\n" #: ../gio/gdbus-tool.c:165 ../gio/gdbus-tool.c:227 ../gio/gdbus-tool.c:299 #: ../gio/gdbus-tool.c:323 ../gio/gdbus-tool.c:725 ../gio/gdbus-tool.c:1068 @@ -1168,24 +1074,19 @@ msgid "Multiple connection endpoints specified" msgstr "Določenih je več povezav končne točke" #: ../gio/gdbus-tool.c:472 -#, fuzzy, c-format -#| msgid "" -#| "Warning: According to introspection data, interface '%s' does not exist\n" +#, 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" +msgstr "Opozorilo: na osnovi podatkov samopregleda, vmesnik »%s« ne obstaja\n" #: ../gio/gdbus-tool.c:481 -#, fuzzy, c-format -#| msgid "" -#| "Warning: According to introspection data, method '%s' does not exist on " -#| "interface '%s'\n" +#, c-format msgid "" "Warning: According to introspection data, method “%s” does not exist on " "interface “%s”\n" msgstr "" -"Opozorilo: na osnovi podatkov samopregleda, način '%s' ne obstaja na " -"vmesniku '%s'\n" +"Opozorilo: na osnovi podatkov samopregleda, način »%s« ne obstaja na " +"vmesniku »%s«\n" #: ../gio/gdbus-tool.c:543 msgid "Optional destination for signal (unique name)" @@ -1297,16 +1198,14 @@ msgid "Error: Method name is not specified\n" msgstr "Napaka: ime načina ni določeno\n" #: ../gio/gdbus-tool.c:951 -#, fuzzy, c-format -#| msgid "Error: Method name '%s' is invalid\n" +#, c-format msgid "Error: Method name “%s” is invalid\n" -msgstr "Napaka: ime načina '%s' ni veljavno\n" +msgstr "Napaka: ime načina »%s« ni veljavno\n" #: ../gio/gdbus-tool.c:1029 -#, fuzzy, c-format -#| msgid "Error parsing parameter %d of type '%s': %s\n" +#, c-format msgid "Error parsing parameter %d of type “%s”: %s\n" -msgstr "Napaka med razčlenjevanjem parametra %d vrste '%s': %s\n" +msgstr "Napaka med razčlenjevanjem parametra %d vrste »%s«: %s\n" #: ../gio/gdbus-tool.c:1473 msgid "Destination name to introspect" @@ -1360,7 +1259,7 @@ msgstr "[MOŽNOST …] IME-VODILA" #: ../gio/gdbus-tool.c:2033 msgid "Wait for a bus name to appear." -msgstr "" +msgstr "Počakaj na izpis imena vodila." #: ../gio/gdbus-tool.c:2109 #, fuzzy, c-format @@ -1386,50 +1285,43 @@ msgstr "Navedenih je preveč argumentov" msgid "Error: %s is not a valid well-known bus name.\n" msgstr "Napaka: %s ni veljavno ime vodila\n" -#: ../gio/gdesktopappinfo.c:2001 ../gio/gdesktopappinfo.c:4533 +#: ../gio/gdesktopappinfo.c:2001 ../gio/gdesktopappinfo.c:4531 msgid "Unnamed" msgstr "Neimenovano" #: ../gio/gdesktopappinfo.c:2411 -#, fuzzy -#| msgid "Desktop file didn't specify Exec field" msgid "Desktop file didn’t specify Exec field" msgstr "Namizna datoteka ne vsebuje določenega polja Exec" -#: ../gio/gdesktopappinfo.c:2696 +#: ../gio/gdesktopappinfo.c:2694 msgid "Unable to find terminal required for application" msgstr "Ni mogoče najti terminala, ki ga zahteva program" -#: ../gio/gdesktopappinfo.c:3129 -#, fuzzy, c-format -#| msgid "Can't create user application configuration folder %s: %s" +#: ../gio/gdesktopappinfo.c:3127 +#, 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:3133 -#, fuzzy, c-format -#| msgid "Can't create user MIME configuration folder %s: %s" +#: ../gio/gdesktopappinfo.c:3131 +#, c-format msgid "Can’t create user MIME configuration folder %s: %s" -msgstr "Ni mogoče ustvariti uporabnikove nastavitvene MIME mape %s: %s" +msgstr "Ni mogoče ustvariti uporabnikove nastavitvene mape MIME %s: %s" -#: ../gio/gdesktopappinfo.c:3373 ../gio/gdesktopappinfo.c:3397 +#: ../gio/gdesktopappinfo.c:3371 ../gio/gdesktopappinfo.c:3395 msgid "Application information lacks an identifier" msgstr "Podatki programa so brez določila" -#: ../gio/gdesktopappinfo.c:3631 -#, fuzzy, c-format -#| msgid "Can't create user desktop file %s" +#: ../gio/gdesktopappinfo.c:3629 +#, c-format msgid "Can’t create user desktop file %s" msgstr "Ni mogoče ustvariti uporabnikove datoteke namizja %s" -#: ../gio/gdesktopappinfo.c:3765 +#: ../gio/gdesktopappinfo.c:3763 #, c-format msgid "Custom definition for %s" msgstr "Določilo po meri za %s" #: ../gio/gdrive.c:417 -#, fuzzy -#| msgid "drive doesn't implement eject" msgid "drive doesn’t implement eject" msgstr "pogona ni mogoče izvreči" @@ -1437,26 +1329,18 @@ msgstr "pogona ni mogoče izvreči" #. * message for drive objects that #. * don't implement any of eject or eject_with_operation. #: ../gio/gdrive.c:495 -#, fuzzy -#| msgid "drive doesn't implement eject or eject_with_operation" msgid "drive doesn’t implement eject or eject_with_operation" msgstr "pogon ne vključuje ukaza izvrzi ali izvrzi_z_dejanjem" #: ../gio/gdrive.c:571 -#, fuzzy -#| msgid "drive doesn't implement polling for media" msgid "drive doesn’t implement polling for media" msgstr "pogon ne podpira preverjanja enote" #: ../gio/gdrive.c:776 -#, fuzzy -#| msgid "drive doesn't implement start" msgid "drive doesn’t implement start" msgstr "pogon ne vključuje možnosti zagona" #: ../gio/gdrive.c:878 -#, fuzzy -#| msgid "drive doesn't implement stop" msgid "drive doesn’t implement stop" msgstr "pogon ne vključuje možnosti zaustavitve" @@ -1470,8 +1354,7 @@ msgid "DTLS support is not available" msgstr "Podpora za DTLS ni na voljo" #: ../gio/gemblem.c:323 -#, fuzzy, c-format -#| msgid "Can't handle version %d of GEmblem encoding" +#, c-format msgid "Can’t handle version %d of GEmblem encoding" msgstr "Ni mogoče upravljati z različico %d kodiranja GEmblem" @@ -1481,8 +1364,7 @@ msgid "Malformed number of tokens (%d) in GEmblem encoding" msgstr "Nepravilno oblikovana znakov (%d) v kodiranju GEmblem" #: ../gio/gemblemedicon.c:362 -#, fuzzy, c-format -#| msgid "Can't handle version %d of GEmblemedIcon encoding" +#, c-format msgid "Can’t handle version %d of GEmblemedIcon encoding" msgstr "Ni mogoče upravljati z različico %d kodiranja GEmblemedIcon" @@ -1498,11 +1380,11 @@ msgstr "Pričakovan GEmblem za GEmblemedIcon" #: ../gio/gfile.c:969 ../gio/gfile.c:1207 ../gio/gfile.c:1345 #: ../gio/gfile.c:1583 ../gio/gfile.c:1638 ../gio/gfile.c:1696 #: ../gio/gfile.c:1780 ../gio/gfile.c:1837 ../gio/gfile.c:1901 -#: ../gio/gfile.c:1956 ../gio/gfile.c:3614 ../gio/gfile.c:3669 -#: ../gio/gfile.c:3905 ../gio/gfile.c:3947 ../gio/gfile.c:4415 -#: ../gio/gfile.c:4826 ../gio/gfile.c:4911 ../gio/gfile.c:5001 -#: ../gio/gfile.c:5098 ../gio/gfile.c:5185 ../gio/gfile.c:5286 -#: ../gio/gfile.c:7827 ../gio/gfile.c:7917 ../gio/gfile.c:8001 +#: ../gio/gfile.c:1956 ../gio/gfile.c:3602 ../gio/gfile.c:3657 +#: ../gio/gfile.c:3893 ../gio/gfile.c:3935 ../gio/gfile.c:4403 +#: ../gio/gfile.c:4814 ../gio/gfile.c:4899 ../gio/gfile.c:4989 +#: ../gio/gfile.c:5086 ../gio/gfile.c:5173 ../gio/gfile.c:5274 +#: ../gio/gfile.c:7815 ../gio/gfile.c:7905 ../gio/gfile.c:7989 #: ../gio/win32/gwinhttpfile.c:437 msgid "Operation not supported" msgstr "Opravilo ni podprto" @@ -1516,78 +1398,65 @@ msgid "Containing mount does not exist" msgstr "Obstoječa enota ne obstaja" #: ../gio/gfile.c:2515 ../gio/glocalfile.c:2377 -#, fuzzy -#| msgid "Can't copy over directory" msgid "Can’t copy over directory" -msgstr "Ni mogoče kopirati preko mape" +msgstr "Ni mogoče kopirati prek mape" #: ../gio/gfile.c:2575 -#, fuzzy -#| msgid "Can't copy directory over directory" msgid "Can’t copy directory over directory" -msgstr "Ni mogoče kopirati mape preko mape" +msgstr "Ni mogoče kopirati mape prek mape" #: ../gio/gfile.c:2583 msgid "Target file exists" msgstr "Ciljna datoteka obstaja" #: ../gio/gfile.c:2602 -#, fuzzy -#| msgid "Can't recursively copy directory" msgid "Can’t recursively copy directory" msgstr "Ni mogoče kopirati drevesne zgradbe map" -#: ../gio/gfile.c:2889 +#: ../gio/gfile.c:2877 msgid "Splice not supported" msgstr "Splice ni podprt" -#: ../gio/gfile.c:2893 +#: ../gio/gfile.c:2881 #, c-format msgid "Error splicing file: %s" msgstr "Napaka med prepletanjem datoteke: %s" -#: ../gio/gfile.c:3025 +#: ../gio/gfile.c:3013 msgid "Copy (reflink/clone) between mounts is not supported" msgstr "" "Kopiranje (sklic povezave/kloniranje) med različnimi priklopi ni podprto" -#: ../gio/gfile.c:3029 +#: ../gio/gfile.c:3017 msgid "Copy (reflink/clone) is not supported or invalid" msgstr "Kopiranje (sklic povezave/kloniranje) ni podprto ali pa ni veljavno" -#: ../gio/gfile.c:3034 -#, fuzzy -#| msgid "Copy (reflink/clone) is not supported or didn't work" +#: ../gio/gfile.c:3022 msgid "Copy (reflink/clone) is not supported or didn’t work" -msgstr "Kopiranje (sklic povezave/kloniranje) ni podprto ali pa ni delovalo" +msgstr "Kopiranje (sklic povezave/kloniranje) ni podprto, ali pa ni delovalo" -#: ../gio/gfile.c:3097 -#, fuzzy -#| msgid "Can't copy special file" +#: ../gio/gfile.c:3085 msgid "Can’t copy special file" msgstr "Ni mogoče kopirati posebne datoteke" -#: ../gio/gfile.c:3895 +#: ../gio/gfile.c:3883 msgid "Invalid symlink value given" msgstr "Neveljavna vrednost simbolne povezave" -#: ../gio/gfile.c:4056 +#: ../gio/gfile.c:4044 msgid "Trash not supported" msgstr "Smeti niso podprte" -#: ../gio/gfile.c:4168 -#, fuzzy, c-format -#| msgid "File names cannot contain '%c'" +#: ../gio/gfile.c:4156 +#, c-format msgid "File names cannot contain “%c”" -msgstr "Ni mogoče uporabiti '%c' v imenu datoteke" +msgstr "Ni mogoče uporabiti »%c« v imenu datoteke" -#: ../gio/gfile.c:6614 ../gio/gvolume.c:363 -#, fuzzy -#| msgid "volume doesn't implement mount" +#: ../gio/gfile.c:6602 ../gio/gvolume.c:363 msgid "volume doesn’t implement mount" msgstr "enota ne podpira priklopa" -#: ../gio/gfile.c:6723 +#: ../gio/gfile.c:6711 msgid "No application is registered as handling this file" msgstr "Na voljo ni programa z a upravljanje s to datoteko" @@ -1605,10 +1474,9 @@ msgid "File enumerator is already closed" msgstr "Å tevilčnik datotek je že zaprt" #: ../gio/gfileicon.c:236 -#, fuzzy, c-format -#| msgid "Can't handle version %d of GFileIcon encoding" +#, c-format msgid "Can’t handle version %d of GFileIcon encoding" -msgstr "Ni mogoče upravljati z različico %d kodiranja GFileIcon " +msgstr "Ni mogoče upravljati z različico %d kodiranja GFileIcon" #: ../gio/gfileicon.c:246 msgid "Malformed input data for GFileIcon" @@ -1617,8 +1485,6 @@ msgstr "Nepravilno oblikovani podatki za GFileIcon" #: ../gio/gfileinputstream.c:149 ../gio/gfileinputstream.c:394 #: ../gio/gfileiostream.c:167 ../gio/gfileoutputstream.c:164 #: ../gio/gfileoutputstream.c:497 -#, fuzzy -#| msgid "Stream doesn't support query_info" msgid "Stream doesn’t support query_info" msgstr "Pretok ne podpira query_info" @@ -1696,8 +1562,6 @@ msgid "Type %s does not implement from_tokens() on the GIcon interface" msgstr "Vrsta %s ne vstavlja from_tokens() vmesnika GIcon" #: ../gio/gicon.c:461 -#, fuzzy -#| msgid "Can't handle the supplied version of the icon encoding" msgid "Can’t handle the supplied version of the icon encoding" msgstr "Ni mogoče ravnati z navedeno različico kodiranja ikone" @@ -1715,10 +1579,9 @@ msgid "Address has bits set beyond prefix length" msgstr "Naslov ima določene bite prek dolžine predpone" #: ../gio/ginetaddressmask.c:300 -#, fuzzy, c-format -#| msgid "Could not parse '%s' as IP address mask" +#, c-format msgid "Could not parse “%s” as IP address mask" -msgstr "Ni mogoče razčleniti '%s' kot maske naslova IP" +msgstr "Ni mogoče razčleniti »%s« kot maske naslova IP" #: ../gio/ginetsocketaddress.c:203 ../gio/ginetsocketaddress.c:220 #: ../gio/gnativesocketaddress.c:106 ../gio/gunixsocketaddress.c:218 @@ -1730,8 +1593,6 @@ msgid "Unsupported socket address" msgstr "Nepodprti naslov vtiča" #: ../gio/ginputstream.c:188 -#, fuzzy -#| msgid "Input stream doesn't implement read" msgid "Input stream doesn’t implement read" msgstr "Vhodni pretok ne podpira branja" @@ -1755,8 +1616,6 @@ msgid "Keep with file when moved" msgstr "Ohrani z datoteko ob premikanju" #: ../gio/gio-tool.c:205 -#, fuzzy -#| msgid "'version' takes no arguments" msgid "“version” takes no arguments" msgstr "»različica« ne prevzema argumentov" @@ -1845,14 +1704,14 @@ msgstr "IzpiÅ¡i vsebino v drevesni obliki" msgid "Use %s to get detailed help.\n" msgstr "Z ukazom %s se izpiÅ¡e podrobna pomoč.\n" -#: ../gio/gio-tool-cat.c:83 +#: ../gio/gio-tool-cat.c:87 #, fuzzy #| msgid "Error writing to file: %s" msgid "Error writing to stdout" msgstr "Napaka med pisanjem v datoteko: %s" #. Translators: commandline placeholder -#: ../gio/gio-tool-cat.c:127 ../gio/gio-tool-info.c:282 +#: ../gio/gio-tool-cat.c:133 ../gio/gio-tool-info.c:282 #: ../gio/gio-tool-list.c:165 ../gio/gio-tool-mkdir.c:48 #: ../gio/gio-tool-monitor.c:37 ../gio/gio-tool-monitor.c:39 #: ../gio/gio-tool-monitor.c:41 ../gio/gio-tool-monitor.c:43 @@ -1863,11 +1722,11 @@ msgstr "Napaka med pisanjem v datoteko: %s" msgid "LOCATION" msgstr "MESTO" -#: ../gio/gio-tool-cat.c:132 +#: ../gio/gio-tool-cat.c:138 msgid "Concatenate files and print to standard output." msgstr "Spoji datoteke in jih izpiÅ¡i na standardni izhod." -#: ../gio/gio-tool-cat.c:134 +#: ../gio/gio-tool-cat.c:140 msgid "" "gio cat works just like the traditional cat utility, but using GIO\n" "locations instead of local files: for example, you can use something\n" @@ -1877,7 +1736,7 @@ msgstr "" "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:156 ../gio/gio-tool-info.c:313 +#: ../gio/gio-tool-cat.c:162 ../gio/gio-tool-info.c:313 #: ../gio/gio-tool-mkdir.c:76 ../gio/gio-tool-monitor.c:228 #: ../gio/gio-tool-open.c:71 ../gio/gio-tool-remove.c:72 msgid "No locations given" @@ -1920,7 +1779,7 @@ msgstr "VIR" #. Translators: commandline placeholder #: ../gio/gio-tool-copy.c:98 ../gio/gio-tool-move.c:94 -#: ../gio/gio-tool-save.c:165 +#: ../gio/gio-tool-save.c:160 msgid "DESTINATION" msgstr "CILJ" @@ -1944,10 +1803,9 @@ msgid "Destination %s is not a directory" msgstr "CIljni predmet %s ni mapa" #: ../gio/gio-tool-copy.c:192 ../gio/gio-tool-move.c:185 -#, fuzzy, c-format -#| msgid "%s: overwrite '%s'? " +#, c-format msgid "%s: overwrite “%s”? " -msgstr "%s: Ali želite prepisati ‘%s’? " +msgstr "%s: Ali želite prepisati »%s«? " #: ../gio/gio-tool-info.c:34 msgid "List writable attributes" @@ -1966,8 +1824,6 @@ msgid "ATTRIBUTES" msgstr "ATRIBUTI" #: ../gio/gio-tool-info.c:37 ../gio/gio-tool-list.c:38 ../gio/gio-tool-set.c:34 -#, fuzzy -#| msgid "Don't follow symbolic links" msgid "Don’t follow symbolic links" msgstr "Ne sledi simbolnim povezavam" @@ -2028,13 +1884,6 @@ msgid "Show information about locations." msgstr "Pokaže podatke o mestih." #: ../gio/gio-tool-info.c:289 -#, fuzzy -#| msgid "" -#| "gio info is similar to the traditional ls utility, but using GIO\n" -#| "locations instead of local files: for example, you can use something\n" -#| "like smb://server/resource/file.txt as location. File attributes can\n" -#| "be specified with their GIO name, e.g. standard::icon, or just by\n" -#| "namespace, e.g. unix, or by '*', which matches all attributes" 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" @@ -2046,7 +1895,7 @@ msgstr "" "oddaljen GIO namesto krajevnih poti do datotek. Primer: kot pot je\n" "mogoče uporabiti smb://strežnik/vir/datoteka.txt. Atributi datoteke\n" "so lahko navedeni z imeni GIO, na primer standard::ikona, ali pa le z\n" -"imenskim prostorom, na primer: unix ali z »*«, ki ustreza vsem." +"imenskim prostorom, na primer: unix ali z » * «, ki ustreza vsem." #: ../gio/gio-tool-list.c:36 ../gio/gio-tool-tree.c:32 msgid "Show hidden files" @@ -2104,14 +1953,12 @@ msgid "Must specify a single mimetype, and maybe a handler" msgstr "Določiti je treba eno vrsto MIME in pogojno ročnik" #: ../gio/gio-tool-mime.c:116 -#, fuzzy, c-format -#| msgid "No default applications for '%s'\n" +#, c-format msgid "No default applications for “%s”\n" msgstr "Ni privzetega programa za »%s«\n" #: ../gio/gio-tool-mime.c:122 -#, fuzzy, c-format -#| msgid "Default application for '%s': %s\n" +#, c-format msgid "Default application for “%s”: %s\n" msgstr "Privzet program za »%s«: %s\n" @@ -2137,13 +1984,12 @@ msgstr "Ni priporočenih programov.\n" #: ../gio/gio-tool-mime.c:162 #, fuzzy, c-format -#| msgid "Failed to load info for handler '%s'\n" +#| msgid "Failed to load info for handler “%s”\n" msgid "Failed to load info for handler “%s”" msgstr "Nalaganje podrobnosti ročnika »%s« je spodletelo.\n" #: ../gio/gio-tool-mime.c:168 -#, fuzzy, c-format -#| msgid "Failed to set '%s' as the default handler for '%s': %s\n" +#, c-format msgid "Failed to set “%s” as the default handler for “%s”: %s\n" msgstr "Določanje »%s« kot privzet ročnik za »%s« je spodletelo: %s\n" @@ -2178,8 +2024,6 @@ msgid "Monitor a file directly (notices changes made via hardlinks)" msgstr "Nadzira spremembe datotek (prek trdih povezav)" #: ../gio/gio-tool-monitor.c:43 -#, fuzzy -#| msgid "Monitors a file directly, but doesn't report changes" msgid "Monitors a file directly, but doesn’t report changes" msgstr "Nadzira datoteko, vendar ne shranjuje poročil sprememb" @@ -2269,8 +2113,6 @@ msgid "Mount or unmount the locations." msgstr "Priklop oziroma odklop različnih nosilcev" #: ../gio/gio-tool-move.c:42 -#, fuzzy -#| msgid "Don't use copy and delete fallback" msgid "Don’t use copy and delete fallback" msgstr "Ne ustvari kopije in izbriÅ¡i povrnitvene datoteke" @@ -2321,7 +2163,7 @@ msgstr "Preimenovanje datoteke" msgid "Missing argument" msgstr "Manjka argument" -#: ../gio/gio-tool-rename.c:76 ../gio/gio-tool-save.c:195 +#: ../gio/gio-tool-rename.c:76 ../gio/gio-tool-save.c:190 #: ../gio/gio-tool-set.c:137 msgid "Too many arguments" msgstr "Navedenih je preveč argumentov" @@ -2361,23 +2203,23 @@ msgstr "Oznaka Etag datoteke, ki bo prepisana" msgid "ETAG" msgstr "ETAG" -#: ../gio/gio-tool-save.c:119 +#: ../gio/gio-tool-save.c:113 #, fuzzy #| msgid "Error reading from handle: %s" msgid "Error reading from standard input" msgstr "Napaka branja iz ročnika: %s" #. Translators: The "etag" is a token allowing to verify whether a file has been modified -#: ../gio/gio-tool-save.c:145 +#: ../gio/gio-tool-save.c:139 #, c-format msgid "Etag not available\n" msgstr "Oznaka Etag ni na voljo\n" -#: ../gio/gio-tool-save.c:168 +#: ../gio/gio-tool-save.c:163 msgid "Read from standard input and save to DEST." msgstr "Preberi preko standardnega vhoda in shrani na CILJ." -#: ../gio/gio-tool-save.c:188 +#: ../gio/gio-tool-save.c:183 msgid "No destination given" msgstr "Ni podanega cilja" @@ -2451,22 +2293,19 @@ msgid "File %s appears multiple times in the resource" msgstr "Datoteka %s se v viru pojavi večkrat" #: ../gio/glib-compile-resources.c:248 -#, fuzzy, c-format -#| msgid "Failed to locate '%s' in any source directory" +#, c-format msgid "Failed to locate “%s” in any source directory" -msgstr "'%s' ni mogoče najti v nobeni mapi virov" +msgstr "Datoteke »%s« ni mogoče najti v nobeni mapi virov" #: ../gio/glib-compile-resources.c:259 -#, fuzzy, c-format -#| msgid "Failed to locate '%s' in current directory" +#, c-format msgid "Failed to locate “%s” in current directory" -msgstr "'%s' ni mogoče najti v trenutni mapi" +msgstr "Datoteke »%s« ni mogoče najti v trenutni mapi" #: ../gio/glib-compile-resources.c:290 -#, fuzzy, c-format -#| msgid "Unknown processing option \"%s\"" +#, c-format msgid "Unknown processing option “%s”" -msgstr "Neznana možnost obdelovanja \"%s\"" +msgstr "Neznana možnost obdelovanja »%s«" #: ../gio/glib-compile-resources.c:308 ../gio/glib-compile-resources.c:354 #, c-format @@ -2531,17 +2370,13 @@ msgstr "ime datoteke odvisnosti za ustvarjanje" #: ../gio/glib-compile-resources.c:672 msgid "Include phony targets in the generated dependency file" -msgstr "" +msgstr "Vključi lažne cilje v ustvarjeni datoteki odvisnosti" #: ../gio/glib-compile-resources.c:673 -#, fuzzy -#| msgid "Don't automatically create and register resource" msgid "Don’t automatically create and register resource" msgstr "Vira ne ustvari in ne vpiÅ¡i samodejno" #: ../gio/glib-compile-resources.c:674 -#, fuzzy -#| msgid "Don't export functions; declare them G_GNUC_INTERNAL" msgid "Don’t export functions; declare them G_GNUC_INTERNAL" msgstr "Ne izvozi funkcij; te je treba deklarirati v G_GNUC_INTERNAL" @@ -2604,14 +2439,16 @@ msgid "<%s> is not contained in the specified range" msgstr "Ni določene končne točke povezave" #: ../gio/glib-compile-schemas.c:327 -#, c-format +#, fuzzy, c-format +#| msgid "No connection endpoint specified" msgid "<%s> is not a valid member of the specified enumerated type" -msgstr "" +msgstr "Ni določene končne točke povezave" #: ../gio/glib-compile-schemas.c:333 -#, c-format +#, fuzzy, c-format +#| msgid "No connection endpoint specified" msgid "<%s> contains string not in the specified flags type" -msgstr "" +msgstr "Ni določene končne točke povezave" #: ../gio/glib-compile-schemas.c:339 #, c-format @@ -2700,9 +2537,10 @@ msgid "" msgstr "" #: ../gio/glib-compile-schemas.c:587 -#, c-format +#, fuzzy, c-format +#| msgid " already specified" msgid " given when was already given" -msgstr "" +msgstr " je že določeno" #: ../gio/glib-compile-schemas.c:595 #, fuzzy, c-format @@ -2711,9 +2549,10 @@ msgid " already specified" msgstr "<%s id='%s'> je že določeno" #: ../gio/glib-compile-schemas.c:605 -#, c-format +#, fuzzy, c-format +#| msgid "“%s” is not a signed number" msgid "alias target “%s” is not in enumerated type" -msgstr "" +msgstr "»%s« ni podpisano Å¡tevilo" #: ../gio/glib-compile-schemas.c:606 #, c-format @@ -2735,7 +2574,7 @@ msgstr "prazna imena niso dovoljena" #, fuzzy, c-format #| msgid "invalid name '%s': names must begin with a lowercase letter" msgid "Invalid name “%s”: names must begin with a lowercase letter" -msgstr "neveljavno ime '%s': imena se morajo začeti z malo črko" +msgstr "neveljavno ime »%s«: imena se morajo začeti z malo črko" #: ../gio/glib-compile-schemas.c:808 #, fuzzy, c-format @@ -2746,42 +2585,42 @@ msgid "" "Invalid name “%s”: invalid character “%c”; only lowercase letters, numbers " "and hyphen (“-”) are permitted" msgstr "" -"Neveljavno ime '%s': neveljaven znak '%c'; dovoljene so samo male črke, " -"Å¡tevilke in vezaj ('-')." +"Neveljavno ime »%s«: neveljaven znak »%c«; dovoljene so samo male črke, " +"Å¡tevilke in vezaj (» - «)." #: ../gio/glib-compile-schemas.c:817 #, fuzzy, c-format #| msgid "invalid name '%s': two successive hyphens ('--') are not permitted." msgid "Invalid name “%s”: two successive hyphens (“--”) are not permitted" -msgstr "Neveljavno ime '%s': zaporedna vezaja ('--') nista dovoljena." +msgstr "Neveljavno ime »%s«: zaporedna vezaja (» -- «) nista dovoljena." #: ../gio/glib-compile-schemas.c:826 #, fuzzy, c-format #| msgid "invalid name '%s': the last character may not be a hyphen ('-')." msgid "Invalid name “%s”: the last character may not be a hyphen (“-”)" -msgstr "Neveljavno ime '%s': zadnji znak ne sme biti vezaj ('-')." +msgstr "Neveljavno ime »%s«: zadnji znak ne sme biti vezaj (» - «)." #: ../gio/glib-compile-schemas.c:834 #, fuzzy, c-format #| msgid "invalid name '%s': maximum length is 1024" msgid "Invalid name “%s”: maximum length is 1024" -msgstr "neveljavno ime '%s': največja dolžina je 1024" +msgstr "neveljavno ime »%s«: največja dolžina je 1024" #: ../gio/glib-compile-schemas.c:904 #, c-format msgid " already specified" -msgstr " je že določeno" +msgstr " je že določeno" #: ../gio/glib-compile-schemas.c:930 #, fuzzy #| msgid "cannot add keys to a 'list-of' schema" msgid "Cannot add keys to a “list-of” schema" -msgstr "ključev ni mogoče dodati shemi 'list-of'" +msgstr "ključev ni mogoče dodati shemi »list-of«" #: ../gio/glib-compile-schemas.c:941 #, c-format msgid " already specified" -msgstr " je že določeno" +msgstr " je že določeno" #: ../gio/glib-compile-schemas.c:959 #, c-format @@ -2789,7 +2628,7 @@ msgid "" " shadows in ; use " "to modify value" msgstr "" -" sence v ; za spreminjanje " +" sence v ; za spreminjanje " "vrednosti uporabite " #: ../gio/glib-compile-schemas.c:970 @@ -2801,19 +2640,19 @@ msgid "" "Exactly one of “type”, “enum” or “flags” must be specified as an attribute " "to " msgstr "" -"natančno eden izmed 'type', 'enum' ali 'flags' mora biti določen kot " -"lastnost " +"natančno ena izmed možnosti »vrste«, »enum« ali »zastavice« mora biti " +"določena kot lastnost ključa " #: ../gio/glib-compile-schemas.c:989 #, c-format msgid "<%s id='%s'> not (yet) defined." -msgstr "<%s id='%s'> (Å¡e) ni določen." +msgstr "<%s id=»%s«> (Å¡e) ni določen." #: ../gio/glib-compile-schemas.c:1004 #, fuzzy, c-format #| msgid "invalid GVariant type string '%s'" msgid "Invalid GVariant type string “%s”" -msgstr "Neveljavena vrsta niza GVariant '%s'" +msgstr "neveljavna vrsta niza GVariant »%s«" #: ../gio/glib-compile-schemas.c:1034 #, fuzzy @@ -2822,31 +2661,32 @@ msgid " given but schema isn’t extending anything" msgstr " je podan, vendar shema ne razÅ¡irja ničesar" #: ../gio/glib-compile-schemas.c:1047 -#, c-format +#, fuzzy, c-format +#| msgid "no to override" msgid "No to override" msgstr " za prepis ni na voljo" #: ../gio/glib-compile-schemas.c:1055 #, c-format msgid " already specified" -msgstr " je že določeno" +msgstr " je že določeno" #: ../gio/glib-compile-schemas.c:1128 #, c-format msgid " already specified" -msgstr " je že določeno" +msgstr " je že določeno" #: ../gio/glib-compile-schemas.c:1140 #, fuzzy, c-format #| msgid " extends not yet existing schema '%s'" msgid " extends not yet existing schema “%s”" -msgstr " razÅ¡irja Å¡e neobstoječo shemo '%s'" +msgstr " razÅ¡irja Å¡e neobstoječo shemo »%s«" #: ../gio/glib-compile-schemas.c:1156 #, fuzzy, c-format #| msgid " is list of not yet existing schema '%s'" msgid " is list of not yet existing schema “%s”" -msgstr " je seznam Å¡e neobstoječe sheme '%s'" +msgstr " je seznam Å¡e neobstoječe sheme »%s«" #: ../gio/glib-compile-schemas.c:1164 #, fuzzy, c-format @@ -2864,7 +2704,7 @@ msgstr "Sheme ni mogoče razÅ¡iriti s potjo" #, c-format msgid "" " is a list, extending which is not a list" -msgstr " je seznam, ki razÅ¡irja , ki ni seznam" +msgstr " je seznam, ki razÅ¡irja , ki ni seznam" #: ../gio/glib-compile-schemas.c:1194 #, fuzzy, c-format @@ -2876,7 +2716,7 @@ msgid "" "does not extend “%s”" msgstr "" " razÅ¡irja vendar " -"'%s' ne razÅ¡irja '%s'" +"»%s« ne razÅ¡irja »%s«" #: ../gio/glib-compile-schemas.c:1211 #, fuzzy, c-format @@ -2888,7 +2728,7 @@ msgstr "pot, če je podana, se mora začeti in končati s poÅ¡evnico" #, fuzzy, c-format #| msgid "the path of a list must end with ':/'" msgid "The path of a list must end with “:/”" -msgstr "pot seznama se mora končati z ':/'" +msgstr "pot seznama se mora končati z » :/ «" #: ../gio/glib-compile-schemas.c:1227 #, c-format @@ -2900,7 +2740,7 @@ msgstr "" #: ../gio/glib-compile-schemas.c:1257 #, c-format msgid "<%s id='%s'> already specified" -msgstr "<%s id='%s'> je že določeno" +msgstr "<%s id=»%s«> je že določeno" #: ../gio/glib-compile-schemas.c:1407 ../gio/glib-compile-schemas.c:1423 #, c-format @@ -2914,7 +2754,7 @@ msgstr "Predmet <%s> na vrhnji ravni ni dovoljen" #: ../gio/glib-compile-schemas.c:1523 msgid "Element is required in " -msgstr "" +msgstr "Prednet mora biti zapisan v ključu " #: ../gio/glib-compile-schemas.c:1613 #, c-format @@ -2924,7 +2764,7 @@ msgstr "Besedilo se ne sme pojaviti znotraj <%s>" #: ../gio/glib-compile-schemas.c:1681 #, c-format msgid "Warning: undefined reference to " -msgstr "" +msgstr "Opozorilo: neveljaven sklic na " #. Translators: Do not translate "--strict". #: ../gio/glib-compile-schemas.c:1820 ../gio/glib-compile-schemas.c:1894 @@ -2947,7 +2787,7 @@ msgstr "Datoteka je prezrta.\n" #, c-format msgid "No such key '%s' in schema '%s' as specified in override file '%s'" msgstr "" -"Ključ '%s' v shemi '%s' kot je določen v datoteki prepisa '%s' ne obstaja" +"Ključ »%s« v shemi »%s« kot je določen v datoteki prepisa »%s« ne obstaja" #: ../gio/glib-compile-schemas.c:1936 ../gio/glib-compile-schemas.c:1994 #: ../gio/glib-compile-schemas.c:2022 @@ -2966,8 +2806,8 @@ msgstr " in --strict sta določena, končanje.\n" msgid "" "error parsing key '%s' in schema '%s' as specified in override file '%s': %s." msgstr "" -"napaka razčlenjevanja ključa '%s' v shemi '%s' kot je določen v datoteki " -"prepisa '%s': %s. " +"napaka razčlenjevanja ključa »%s« v shemi »%s« kot je določen v datoteki " +"prepisa »%s«: %s. " #: ../gio/glib-compile-schemas.c:1966 #, c-format @@ -2980,7 +2820,7 @@ msgid "" "override for key '%s' in schema '%s' in override file '%s' is outside the " "range given in the schema" msgstr "" -"prepis za ključ '%s' v shemi '%s' v datoteki prepisa '%s' ni v obsegu, " +"prepis za ključ »%s« v shemi »%s« v datoteki prepisa »%s« ni v obsegu, " "podanem v shemi" #: ../gio/glib-compile-schemas.c:2012 @@ -2989,7 +2829,7 @@ msgid "" "override for key '%s' in schema '%s' in override file '%s' is not in the " "list of valid choices" msgstr "" -"prepis za ključ '%s' v shemi '%s' v datoteki prepisa '%s' ni v seznamu " +"prepis za ključ »%s« v shemi »%s« v datoteki prepisa »%s« ni v seznamu " "veljavnih možnosti" #: ../gio/glib-compile-schemas.c:2068 @@ -3187,10 +3027,9 @@ msgid "Invalid extended attribute name" msgstr "Neveljavno razÅ¡irjeno ime atributa" #: ../gio/glocalfileinfo.c:785 -#, fuzzy, c-format -#| msgid "Error setting extended attribute '%s': %s" +#, c-format msgid "Error setting extended attribute “%s”: %s" -msgstr "Napaka med določanjem razÅ¡irjenega atributa '%s': %s" +msgstr "Napaka med določanjem razÅ¡irjenega atributa »%s«: %s" #: ../gio/glocalfileinfo.c:1586 msgid " (invalid encoding)" @@ -3381,53 +3220,41 @@ msgstr "Zahtevano iskanje za koncem pretoka" #. * message for mount objects that #. * don't implement unmount. #: ../gio/gmount.c:393 -#, fuzzy -#| msgid "mount doesn't implement \"unmount\"" msgid "mount doesn’t implement “unmount”" -msgstr "enota ne podpira možnosti \"odklopi\"" +msgstr "enota ne podpira možnosti »odklopi«" #. Translators: This is an error #. * message for mount objects that #. * don't implement eject. #: ../gio/gmount.c:469 -#, fuzzy -#| msgid "mount doesn't implement \"eject\"" msgid "mount doesn’t implement “eject”" -msgstr "enota ne podpira možnosti \"izvrzi\"" +msgstr "enota ne podpira možnosti »izvrzi«" #. Translators: This is an error #. * message for mount objects that #. * don't implement any of unmount or unmount_with_operation. #: ../gio/gmount.c:547 -#, fuzzy -#| msgid "mount doesn't implement \"unmount\" or \"unmount_with_operation\"" msgid "mount doesn’t implement “unmount” or “unmount_with_operation”" -msgstr "enota ne podpira možnosti \"odklopi\" ali \"odklopi_z_dejanjem\"" +msgstr "enota ne podpira možnosti »odklopi« ali »odklopi z dejanjem«" #. Translators: This is an error #. * message for mount objects that #. * don't implement any of eject or eject_with_operation. #: ../gio/gmount.c:632 -#, fuzzy -#| msgid "mount doesn't implement \"eject\" or \"eject_with_operation\"" msgid "mount doesn’t implement “eject” or “eject_with_operation”" -msgstr "enota ne podpira možnosti \"izvrzi\" ali \"izvrzi_z_dejanjem\"" +msgstr "enota ne podpira možnosti »izvrzi« ali »izvrzi z dejanjem«" #. Translators: This is an error #. * message for mount objects that #. * don't implement remount. #: ../gio/gmount.c:720 -#, fuzzy -#| msgid "mount doesn't implement \"remount\"" msgid "mount doesn’t implement “remount”" -msgstr "enota ne podpira možnosti \"ponovnega priklopa\"" +msgstr "enota ne podpira možnosti »ponovnega priklopa«" #. Translators: This is an error #. * message for mount objects that #. * don't implement content type guessing. #: ../gio/gmount.c:802 -#, fuzzy -#| msgid "mount doesn't implement content type guessing" msgid "mount doesn’t implement content type guessing" msgstr "priklop ne podpira ugibanja vsebine vrste" @@ -3435,16 +3262,13 @@ msgstr "priklop ne podpira ugibanja vsebine vrste" #. * message for mount objects that #. * don't implement content type guessing. #: ../gio/gmount.c:889 -#, fuzzy -#| msgid "mount doesn't implement synchronous content type guessing" msgid "mount doesn’t implement synchronous content type guessing" msgstr "priklop ne podpira usklajevanja ugibanja vsebine vrste" #: ../gio/gnetworkaddress.c:378 -#, fuzzy, c-format -#| msgid "Hostname '%s' contains '[' but not ']'" +#, c-format msgid "Hostname “%s” contains “[” but not “]”" -msgstr "Ime gostitelja '%s' vsebuje '[' vendar ne tudi ']'" +msgstr "Ime gostitelja »%s« vsebuje » [ «, ne pa tudi » ] «" #: ../gio/gnetworkmonitorbase.c:206 ../gio/gnetworkmonitorbase.c:310 msgid "Network unreachable" @@ -3506,8 +3330,6 @@ msgid "The resource at “%s” is not a directory" msgstr "VIr »%s« ni mapa." #: ../gio/gresourcefile.c:917 -#, fuzzy -#| msgid "Input stream doesn't implement seek" msgid "Input stream doesn’t implement seek" msgstr "Vhodni pretok ne podpira iskanja" @@ -3555,20 +3377,6 @@ msgid "FILE PATH" msgstr "DATOTEKA POT" #: ../gio/gresource-tool.c:534 -#, fuzzy -#| msgid "" -#| "Usage:\n" -#| " gresource [--section SECTION] COMMAND [ARGS...]\n" -#| "\n" -#| "Commands:\n" -#| " help Show this information\n" -#| " sections List resource sections\n" -#| " list List resources\n" -#| " details List resources with details\n" -#| " extract Extract a resource\n" -#| "\n" -#| "Use 'gresource help COMMAND' to get detailed help.\n" -#| "\n" msgid "" "Usage:\n" " gresource [--section SECTION] COMMAND [ARGS…]\n" @@ -3593,7 +3401,7 @@ msgstr "" " details IzpiÅ¡i vire s podrobnostmi\n" " extract Izlušči vir\n" "\n" -"Z ukazom 'gresource help UKAZ' pridobite podrobno pomoč.\n" +"Z ukazom »gresource help UKAZ« pridobite podrobno pomoč.\n" "\n" #: ../gio/gresource-tool.c:548 @@ -3779,30 +3587,6 @@ msgid "SCHEMA[:PATH] [KEY]" msgstr "SHEMA[:POT] [KLJUČ]" #: ../gio/gsettings-tool.c:622 -#, fuzzy -#| msgid "" -#| "Usage:\n" -#| " gsettings --version\n" -#| " gsettings [--schemadir SCHEMADIR] COMMAND [ARGS...]\n" -#| "\n" -#| "Commands:\n" -#| " help Show this information\n" -#| " list-schemas List installed schemas\n" -#| " list-relocatable-schemas List relocatable schemas\n" -#| " list-keys List keys in a schema\n" -#| " list-children List children of a schema\n" -#| " list-recursively List keys and values, recursively\n" -#| " range Queries the range of a key\n" -#| " describe Queries the description of a key\n" -#| " get Get the value of a key\n" -#| " set Set the value of a key\n" -#| " reset Reset the value of a key\n" -#| " reset-recursively Reset all values in a given schema\n" -#| " writable Check if a key is writable\n" -#| " monitor Watch for changes\n" -#| "\n" -#| "Use 'gsettings help COMMAND' to get detailed help.\n" -#| "\n" msgid "" "Usage:\n" " gsettings --version\n" @@ -3847,7 +3631,7 @@ msgstr "" " writable Preveri ali je ključ zapisljiv\n" " monitor Nadzira spremembe\n" "\n" -"Z ukazom 'gsettings help UKAZ' se izpiÅ¡e podrobna pomoč.\n" +"Z ukazom »gsettings help UKAZ« se izpiÅ¡e podrobna pomoč.\n" "\n" #: ../gio/gsettings-tool.c:646 @@ -3909,146 +3693,146 @@ msgstr "Ni podanega imena sheme.\n" msgid "No such key “%s”\n" msgstr "Ključ »%s« ne obstaja.\n" -#: ../gio/gsocket.c:379 +#: ../gio/gsocket.c:374 msgid "Invalid socket, not initialized" msgstr "Neveljaven vtič, ni zagnano" -#: ../gio/gsocket.c:386 +#: ../gio/gsocket.c:381 #, c-format msgid "Invalid socket, initialization failed due to: %s" msgstr "Neveljaven vtič, zaganjanje je spodletelo: %s" -#: ../gio/gsocket.c:394 +#: ../gio/gsocket.c:389 msgid "Socket is already closed" msgstr "Vtič je že zaprt" -#: ../gio/gsocket.c:409 ../gio/gsocket.c:2765 ../gio/gsocket.c:3950 -#: ../gio/gsocket.c:4008 +#: ../gio/gsocket.c:404 ../gio/gsocket.c:2762 ../gio/gsocket.c:3908 +#: ../gio/gsocket.c:3965 msgid "Socket I/O timed out" msgstr "Vtič V/I naprave je časovno potekel" -#: ../gio/gsocket.c:541 +#: ../gio/gsocket.c:536 #, c-format msgid "creating GSocket from fd: %s" msgstr "ustvarjanje GSocet preko fd: %s" -#: ../gio/gsocket.c:570 ../gio/gsocket.c:624 ../gio/gsocket.c:631 +#: ../gio/gsocket.c:565 ../gio/gsocket.c:619 ../gio/gsocket.c:626 #, c-format msgid "Unable to create socket: %s" msgstr "Ni mogoče ustvariti vtiča: %s" -#: ../gio/gsocket.c:624 +#: ../gio/gsocket.c:619 msgid "Unknown family was specified" msgstr "Določena je neznana družina" -#: ../gio/gsocket.c:631 +#: ../gio/gsocket.c:626 msgid "Unknown protocol was specified" msgstr "Določen je neznan protokol" -#: ../gio/gsocket.c:1122 +#: ../gio/gsocket.c:1115 #, c-format msgid "Cannot use datagram operations on a non-datagram socket." msgstr "Ni mogoče uporabiti opravil datagrama na vtiču, ki jih ne podpira." -#: ../gio/gsocket.c:1139 +#: ../gio/gsocket.c:1132 #, c-format msgid "Cannot use datagram operations on a socket with a timeout set." msgstr "" "Ni mogoče uporabiti opravil datagrama na vtiču z nastavljenim časovnim " "pretekom" -#: ../gio/gsocket.c:1943 +#: ../gio/gsocket.c:1936 #, c-format msgid "could not get local address: %s" msgstr "ni mogoče pridobiti krajevnega naslova: %s" -#: ../gio/gsocket.c:1986 +#: ../gio/gsocket.c:1979 #, c-format msgid "could not get remote address: %s" msgstr "ni mogoče pridobiti oddaljenega naslova: %s" -#: ../gio/gsocket.c:2052 +#: ../gio/gsocket.c:2045 #, c-format msgid "could not listen: %s" msgstr "ni mogoče slediti: %s" -#: ../gio/gsocket.c:2151 +#: ../gio/gsocket.c:2144 #, c-format msgid "Error binding to address: %s" msgstr "Napaka vezanjem na naslov: %s" -#: ../gio/gsocket.c:2266 ../gio/gsocket.c:2303 +#: ../gio/gsocket.c:2259 ../gio/gsocket.c:2296 #, c-format msgid "Error joining multicast group: %s" msgstr "Napaka povezovanja v skupino za večsmerno oddajanje: %s" -#: ../gio/gsocket.c:2267 ../gio/gsocket.c:2304 +#: ../gio/gsocket.c:2260 ../gio/gsocket.c:2297 #, c-format msgid "Error leaving multicast group: %s" msgstr "Napaka zapuščanja skupine za večsmerno oddajanje: %s" -#: ../gio/gsocket.c:2268 +#: ../gio/gsocket.c:2261 msgid "No support for source-specific multicast" msgstr "Ni podpore za večsmerno oddajanje lastno viru" -#: ../gio/gsocket.c:2488 +#: ../gio/gsocket.c:2481 #, c-format msgid "Error accepting connection: %s" msgstr "Napaka med sprejemanjem povezave: %s" -#: ../gio/gsocket.c:2609 +#: ../gio/gsocket.c:2604 msgid "Connection in progress" msgstr "Povezava v teku" -#: ../gio/gsocket.c:2658 +#: ../gio/gsocket.c:2655 msgid "Unable to get pending error: " msgstr "Ni mogoče pridobiti uvrščene napake:" -#: ../gio/gsocket.c:2828 +#: ../gio/gsocket.c:2827 #, c-format msgid "Error receiving data: %s" msgstr "Napaka med prejemanjem podatkov: %s" -#: ../gio/gsocket.c:3023 +#: ../gio/gsocket.c:3024 #, c-format msgid "Error sending data: %s" msgstr "Napaka med poÅ¡iljanjem podatkov: %s" -#: ../gio/gsocket.c:3210 +#: ../gio/gsocket.c:3211 #, c-format msgid "Unable to shutdown socket: %s" msgstr "Ni mogoče izklopiti vtiča: %s" -#: ../gio/gsocket.c:3291 +#: ../gio/gsocket.c:3292 #, c-format msgid "Error closing socket: %s" msgstr "Napaka med zapiranjem vtiča: %s" -#: ../gio/gsocket.c:3943 +#: ../gio/gsocket.c:3901 #, c-format msgid "Waiting for socket condition: %s" msgstr "Čakanje na stanje vtiča: %s" -#: ../gio/gsocket.c:4417 ../gio/gsocket.c:4497 ../gio/gsocket.c:4675 +#: ../gio/gsocket.c:4374 ../gio/gsocket.c:4454 ../gio/gsocket.c:4632 #, c-format msgid "Error sending message: %s" msgstr "Napaka med poÅ¡iljanjem sporočila: %s" -#: ../gio/gsocket.c:4441 +#: ../gio/gsocket.c:4398 msgid "GSocketControlMessage not supported on Windows" msgstr "Predmet GSocketControlMessage na sistemih Windows ni podprt" -#: ../gio/gsocket.c:4894 ../gio/gsocket.c:4967 ../gio/gsocket.c:5193 +#: ../gio/gsocket.c:4851 ../gio/gsocket.c:4924 ../gio/gsocket.c:5151 #, c-format msgid "Error receiving message: %s" msgstr "Napaka med prejemanjem sporočila: %s" -#: ../gio/gsocket.c:5465 +#: ../gio/gsocket.c:5423 #, c-format msgid "Unable to read socket credentials: %s" msgstr "Ni mogoče prebrati poveril vtiča: %s." -#: ../gio/gsocket.c:5474 +#: ../gio/gsocket.c:5432 msgid "g_socket_get_credentials not implemented for this OS" msgstr "Operacijski sistem ne podpira možnosti g_socket_get_credentials" @@ -4088,10 +3872,9 @@ msgid "Added socket is closed" msgstr "Dodan vtič je zaprt" #: ../gio/gsocks4aproxy.c:118 -#, fuzzy, c-format -#| msgid "SOCKSv4 does not support IPv6 address '%s'" +#, c-format msgid "SOCKSv4 does not support IPv6 address “%s”" -msgstr "SOCKSv4 nima podpore za naslove IPv6 '%s'" +msgstr "PosredniÅ¡ki strežnik SOCKSv4 nima podpore za naslov IPv6 »%s«" #: ../gio/gsocks4aproxy.c:136 msgid "Username is too long for SOCKSv4 protocol" @@ -4165,10 +3948,8 @@ msgid "Connection refused through SOCKSv5 proxy." msgstr "Povezava skozi posredniÅ¡ki strežnik SOCKSv5 je zavrnjena." #: ../gio/gsocks5proxy.c:386 -#, fuzzy -#| msgid "SOCKSv5 proxy does not support 'connect' command." msgid "SOCKSv5 proxy does not support “connect” command." -msgstr "SOCKSv5 posredniÅ¡ki strežnik ne podpira ukaza 'connect'." +msgstr "PosredniÅ¡ki strežnik SOCKSv5 ne podpira ukaza »connect«." #: ../gio/gsocks5proxy.c:392 msgid "SOCKSv5 proxy does not support provided address type." @@ -4179,8 +3960,7 @@ msgid "Unknown SOCKSv5 proxy error." msgstr "Neznana napaka posredniÅ¡kega strežnika SOCKSv5." #: ../gio/gthemedicon.c:518 -#, fuzzy, c-format -#| msgid "Can't handle version %d of GThemedIcon encoding" +#, c-format msgid "Can’t handle version %d of GThemedIcon encoding" msgstr "Ni mogoče upravljati z različico %d kodiranja GThemedIcon" @@ -4195,10 +3975,9 @@ msgstr "Napaka med obratnim razreÅ¡evanjem »%s«: %s" #: ../gio/gthreadedresolver.c:550 ../gio/gthreadedresolver.c:630 #: ../gio/gthreadedresolver.c:728 ../gio/gthreadedresolver.c:778 -#, fuzzy, c-format -#| msgid "No DNS record of the requested type for '%s'" +#, c-format msgid "No DNS record of the requested type for “%s”" -msgstr "Ni zapisa DNS za zahtevano vrsto '%s'" +msgstr "Ni zapisa DNS za zahtevano vrsto »%s«" #: ../gio/gthreadedresolver.c:555 ../gio/gthreadedresolver.c:733 #, c-format @@ -4337,17 +4116,13 @@ msgid "Abstract UNIX domain socket addresses not supported on this system" msgstr "Abstraktni naslovi vtiča domene UNIX na tem sistemu niso podprti" #: ../gio/gvolume.c:437 -#, fuzzy -#| msgid "volume doesn't implement eject" msgid "volume doesn’t implement eject" -msgstr "nosilca ni mogoče izvreči" +msgstr "nosilec ne podpira možnosti izmetavanja" #. Translators: This is an error #. * message for volume objects that #. * don't implement any of eject or eject_with_operation. #: ../gio/gvolume.c:514 -#, fuzzy -#| msgid "volume doesn't implement eject or eject_with_operation" msgid "volume doesn’t implement eject or eject_with_operation" msgstr "nosilec ne prepozna ukaza izvrzi ali izvrzi_z_dejanjem" @@ -4409,41 +4184,36 @@ msgid "Wrong args\n" msgstr "Napačni argumenti\n" #: ../glib/gbookmarkfile.c:754 -#, fuzzy, c-format -#| msgid "Unexpected attribute '%s' for element '%s'" +#, c-format msgid "Unexpected attribute “%s” for element “%s”" -msgstr "Nepričakovan atribut '%s' za predmet '%s'" +msgstr "Nepričakovan atribut »%s« za predmet »%s«" #: ../glib/gbookmarkfile.c:765 ../glib/gbookmarkfile.c:836 #: ../glib/gbookmarkfile.c:846 ../glib/gbookmarkfile.c:953 -#, fuzzy, c-format -#| msgid "Attribute '%s' of element '%s' not found" +#, c-format msgid "Attribute “%s” of element “%s” not found" -msgstr "Atributa '%s' predmeta '%s' ni mogoče najti" +msgstr "Atributa »%s« predmeta »%s« ni mogoče najti" #: ../glib/gbookmarkfile.c:1123 ../glib/gbookmarkfile.c:1188 #: ../glib/gbookmarkfile.c:1252 ../glib/gbookmarkfile.c:1262 -#, fuzzy, c-format -#| msgid "Unexpected tag '%s', tag '%s' expected" +#, c-format msgid "Unexpected tag “%s”, tag “%s” expected" -msgstr "Nepričakovana oznaka '%s'. Pričakovana je '%s'" +msgstr "Nepričakovana oznaka »%s«, pričakovana je »%s«" #: ../glib/gbookmarkfile.c:1148 ../glib/gbookmarkfile.c:1162 #: ../glib/gbookmarkfile.c:1230 -#, fuzzy, c-format -#| msgid "Unexpected tag '%s' inside '%s'" +#, c-format msgid "Unexpected tag “%s” inside “%s”" -msgstr "Nepričakovana oznaka '%s' znotraj '%s'" +msgstr "Nepričakovana oznaka »%s« znotraj »%s«" #: ../glib/gbookmarkfile.c:1756 msgid "No valid bookmark file found in data dirs" msgstr "Ni veljavne datoteke zaznamkov v podatkovnih mapah" #: ../glib/gbookmarkfile.c:1957 -#, fuzzy, c-format -#| msgid "A bookmark for URI '%s' already exists" +#, c-format msgid "A bookmark for URI “%s” already exists" -msgstr "Zaznamek za URI '%s' že obstaja" +msgstr "Zaznamek za naslov URI »%s« že obstaja" #: ../glib/gbookmarkfile.c:2003 ../glib/gbookmarkfile.c:2161 #: ../glib/gbookmarkfile.c:2246 ../glib/gbookmarkfile.c:2326 @@ -4454,40 +4224,34 @@ msgstr "Zaznamek za URI '%s' že obstaja" #: ../glib/gbookmarkfile.c:3176 ../glib/gbookmarkfile.c:3344 #: ../glib/gbookmarkfile.c:3433 ../glib/gbookmarkfile.c:3522 #: ../glib/gbookmarkfile.c:3638 -#, fuzzy, c-format -#| msgid "No bookmark found for URI '%s'" +#, c-format msgid "No bookmark found for URI “%s”" -msgstr "Ni veljavnega zaznamka za URI '%s'" +msgstr "Ni veljavnega zaznamka za naslov URI »%s«" #: ../glib/gbookmarkfile.c:2335 -#, fuzzy, c-format -#| msgid "No MIME type defined in the bookmark for URI '%s'" +#, c-format msgid "No MIME type defined in the bookmark for URI “%s”" -msgstr "V zaznamku za URI '%s' ni določene vrsta MIME" +msgstr "V zaznamku za naslov URI »%s« ni določene vrsta MIME" #: ../glib/gbookmarkfile.c:2420 -#, fuzzy, c-format -#| msgid "No private flag has been defined in bookmark for URI '%s'" +#, c-format msgid "No private flag has been defined in bookmark for URI “%s”" -msgstr "V zaznamku za URI '%s' ni določene zasebne zastavice" +msgstr "V zaznamku za naslov URI »%s« ni določene zasebne zastavice" #: ../glib/gbookmarkfile.c:2799 -#, fuzzy, c-format -#| msgid "No groups set in bookmark for URI '%s'" +#, c-format msgid "No groups set in bookmark for URI “%s”" -msgstr "V zaznamku za URI '%s' ni nastavljenih skupin" +msgstr "V zaznamku za naslov URI »%s« ni nastavljenih skupin" #: ../glib/gbookmarkfile.c:3197 ../glib/gbookmarkfile.c:3354 -#, fuzzy, c-format -#| msgid "No application with name '%s' registered a bookmark for '%s'" +#, c-format msgid "No application with name “%s” registered a bookmark for “%s”" -msgstr "Program z imenom '%s' ni ustvaril zaznamka za '%s'" +msgstr "Program z imenom »%s« ni ustvaril zaznamka za »%s«" #: ../glib/gbookmarkfile.c:3377 -#, fuzzy, c-format -#| msgid "Failed to expand exec line '%s' with URI '%s'" +#, c-format msgid "Failed to expand exec line “%s” with URI “%s”" -msgstr "RazÅ¡irjanje ukazne vrstice '%s' z URI '%s' je spodletelo." +msgstr "RazÅ¡irjanje ukazne vrstice »%s« z naslovom URI »%s« je spodletelo." #: ../glib/gconvert.c:477 ../glib/gutf8.c:862 ../glib/gutf8.c:1074 #: ../glib/gutf8.c:1211 ../glib/gutf8.c:1315 @@ -4495,10 +4259,9 @@ msgid "Partial character sequence at end of input" msgstr "Nedokončano zaporedje znakov na koncu vhoda" #: ../glib/gconvert.c:742 -#, fuzzy, c-format -#| msgid "Cannot convert fallback '%s' to codeset '%s'" +#, c-format msgid "Cannot convert fallback “%s” to codeset “%s”" -msgstr "Ni mogoče pretvoriti '%s' v nabor znakov '%s'" +msgstr "Ni mogoče pretvoriti »%s« v nabor znakov »%s«" #: ../glib/gconvert.c:1513 #, c-format @@ -4762,15 +4525,13 @@ msgid "Error opening directory “%s”: %s" msgstr "Napaka med odpiranjem imenika »%s«: %s" #: ../glib/gfileutils.c:706 ../glib/gfileutils.c:798 -#, fuzzy, c-format -#| msgid "Could not allocate %lu byte to read file \"%s\"" -#| msgid_plural "Could not allocate %lu bytes to read file \"%s\"" +#, c-format msgid "Could not allocate %lu byte to read file “%s”" msgid_plural "Could not allocate %lu bytes to read file “%s”" -msgstr[0] "Ni mogoče dodeliti %lu bajtov za branje datoteke \"%s\"" -msgstr[1] "Ni mogoče dodeliti %lu bajta za branje datoteke \"%s\"" -msgstr[2] "Ni mogoče dodeliti %lu bajtov za branje datoteke \"%s\"" -msgstr[3] "Ni mogoče dodeliti %lu bajtov za branje datoteke \"%s\"" +msgstr[0] "Ni mogoče dodeliti %lu bajtov za branje datoteke »%s«" +msgstr[1] "Ni mogoče dodeliti %lu bajta za branje datoteke »%s«" +msgstr[2] "Ni mogoče dodeliti %lu bajtov za branje datoteke »%s«" +msgstr[3] "Ni mogoče dodeliti %lu bajtov za branje datoteke »%s«" #: ../glib/gfileutils.c:723 #, c-format @@ -4848,25 +4609,25 @@ msgstr "Predloga »%s« ne vsebuje XXXXXX" msgid "Failed to read the symbolic link “%s”: %s" msgstr "Branje simbolne povezave »%s« je spodletelo: %s" -#: ../glib/giochannel.c:1388 +#: ../glib/giochannel.c:1389 #, c-format msgid "Could not open converter from “%s” to “%s”: %s" msgstr "Ni mogoče odpreti pretvornika iz »%s« v »%s«: %s" -#: ../glib/giochannel.c:1733 +#: ../glib/giochannel.c:1734 msgid "Can’t do a raw read in g_io_channel_read_line_string" msgstr "Ni mogoče prebrati g_io_channel_read_line_string" -#: ../glib/giochannel.c:1780 ../glib/giochannel.c:2038 -#: ../glib/giochannel.c:2125 +#: ../glib/giochannel.c:1781 ../glib/giochannel.c:2039 +#: ../glib/giochannel.c:2126 msgid "Leftover unconverted data in read buffer" msgstr "Preostanek nepretvorjenih podatkov v bralnem medpomnilniku" -#: ../glib/giochannel.c:1861 ../glib/giochannel.c:1938 +#: ../glib/giochannel.c:1862 ../glib/giochannel.c:1939 msgid "Channel terminates in a partial character" msgstr "Kanal je prekinjen v delnem znaku" -#: ../glib/giochannel.c:1924 +#: ../glib/giochannel.c:1925 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" @@ -5001,17 +4762,17 @@ msgstr "Napaka v vrstici %d, znak %d:" #: ../glib/gmarkup.c:461 ../glib/gmarkup.c:544 #, c-format msgid "Invalid UTF-8 encoded text in name - not valid '%s'" -msgstr "Neveljavno UTF-8 kodirano besedilo imena - neveljaven '%s'" +msgstr "Neveljavno UTF-8 kodirano besedilo imena - neveljaven »%s«" #: ../glib/gmarkup.c:472 #, c-format msgid "'%s' is not a valid name" -msgstr "'%s' ni veljavno ime" +msgstr "»%s« ni veljavno ime" #: ../glib/gmarkup.c:488 #, c-format msgid "'%s' is not a valid name: '%c'" -msgstr "'%s' ni veljavno ime: '%c'" +msgstr "»%s« ni veljavno ime: '%c'" #: ../glib/gmarkup.c:598 #, c-format @@ -5071,7 +4832,7 @@ msgid "" "'%s' is not a valid character following a '<' character; it may not begin an " "element name" msgstr "" -"'%s' ni veljaven znak, kadar sledi znaku '<'; morda se ne začne z imenom " +"»%s« ni veljaven znak, kadar sledi znaku '<'; morda se ne začne z imenom " "predmeta" #: ../glib/gmarkup.c:1252 @@ -5080,15 +4841,15 @@ msgid "" "Odd character '%s', expected a '>' character to end the empty-element tag " "'%s'" msgstr "" -"Nenavaden znak '%s'. Pričakovan znak je '>', da se zaključi oznako predmeta " -"'%s'" +"Nenavaden znak »%s«. Pričakovan znak je '>', da se zaključi oznako predmeta " +"»%s«" #: ../glib/gmarkup.c:1333 #, c-format msgid "" "Odd character '%s', expected a '=' after attribute name '%s' of element '%s'" msgstr "" -"Nenavaden znak '%s'. Za imenom atributa '%s' (predmeta '%s') je pričakovan " +"Nenavaden znak »%s«. Za imenom atributa »%s« (predmeta »%s«) je pričakovan " "znak '='." #: ../glib/gmarkup.c:1374 @@ -5098,8 +4859,8 @@ msgid "" "element '%s', or optionally an attribute; perhaps you used an invalid " "character in an attribute name" msgstr "" -"Nenavaden znak '%s'. Pričakovan znak '>' ali '/', ki bi zaključil oznako " -"predmeta '%s' ali atribut; morda je uporabljen neveljaven znak v imenu " +"Nenavaden znak »%s«. Pričakovan znak '>' ali '/', ki bi zaključil oznako " +"predmeta »%s« ali atribut; morda je uporabljen neveljaven znak v imenu " "atributa" #: ../glib/gmarkup.c:1418 @@ -5108,8 +4869,8 @@ msgid "" "Odd character '%s', expected an open quote mark after the equals sign when " "giving value for attribute '%s' of element '%s'" msgstr "" -"Nenavaden znak '%s'. Za enačajem je pričakovan narekovaj, znotraj katerega " -"je podana vrednost atributa '%s' predmeta '%s'." +"Nenavaden znak »%s«. Za enačajem je pričakovan narekovaj, znotraj katerega " +"je podana vrednost atributa »%s« predmeta »%s«." #: ../glib/gmarkup.c:1551 #, c-format @@ -5117,7 +4878,7 @@ msgid "" "'%s' is not a valid character following the characters ''" msgstr "" -"Znak '%s' ni veljaven, kadar sledi zaprtju imena predmeta '%s'; dovoljen " +"Znak »%s« ni veljaven, kadar sledi zaprtju imena predmeta »%s«; dovoljen " "znak je '>'" #: ../glib/gmarkup.c:1598 #, c-format msgid "Element '%s' was closed, no element is currently open" -msgstr "Predmet '%s' je zaprt, trenutno ni odprtega predmeta" +msgstr "Predmet »%s« je zaprt, trenutno ni odprtega predmeta" #: ../glib/gmarkup.c:1607 #, 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'" +msgstr "Predmet »%s« je zaprt, Å¡e vedno pa je odprt predmet »%s«" #: ../glib/gmarkup.c:1760 msgid "Document was empty or contained only whitespace" @@ -5152,7 +4913,7 @@ msgid "" "Document ended unexpectedly with elements still open - '%s' was the last " "element opened" msgstr "" -"Dokument nepričakovano zaključen s Å¡e odprtimi predmeti - '%s' je zadnji " +"Dokument nepričakovano zaključen s Å¡e odprtimi predmeti - »%s« je zadnji " "odprt predmet" #: ../glib/gmarkup.c:1790 @@ -5191,7 +4952,7 @@ msgstr "Dokument nepričakovano zaključen sredi vrednosti atributa" #: ../glib/gmarkup.c:1836 #, c-format msgid "Document ended unexpectedly inside the close tag for element '%s'" -msgstr "Dokument nepričakovano zaključen sredi oznake zaprtja predmeta '%s'" +msgstr "Dokument nepričakovano zaključen sredi oznake zaprtja predmeta »%s«" #: ../glib/gmarkup.c:1842 msgid "Document ended unexpectedly inside a comment or processing instruction" @@ -5772,7 +5533,7 @@ msgstr "" #: ../glib/gstrfuncs.c:3247 ../glib/gstrfuncs.c:3348 msgid "Empty string is not a number" -msgstr "" +msgstr "Prazen niz ni Å¡tevilska vrednost" #: ../glib/gstrfuncs.c:3271 #, c-format @@ -5782,7 +5543,7 @@ msgstr "»%s« ni podpisano Å¡tevilo" #: ../glib/gstrfuncs.c:3281 ../glib/gstrfuncs.c:3384 #, c-format msgid "Number “%s” is out of bounds [%s, %s]" -msgstr "" +msgstr "Å tevilo »%s« je izven območja [%s, %s]" #: ../glib/gstrfuncs.c:3374 #, c-format @@ -5806,7 +5567,7 @@ msgstr "Neveljavno zaporedje na vhodu pretvorbe" msgid "Character out of range for UTF-16" msgstr "Znak izven območja za UTF-16" -#: ../glib/gutils.c:2149 ../glib/gutils.c:2176 ../glib/gutils.c:2282 +#: ../glib/gutils.c:2209 ../glib/gutils.c:2236 ../glib/gutils.c:2342 #, c-format msgid "%u byte" msgid_plural "%u bytes" @@ -5815,68 +5576,68 @@ msgstr[1] "%u bajt" msgstr[2] "%u bajta" msgstr[3] "%u bajti" -#: ../glib/gutils.c:2155 +#: ../glib/gutils.c:2215 #, c-format msgid "%.1f KiB" msgstr "%.1f KiB" -#: ../glib/gutils.c:2157 +#: ../glib/gutils.c:2217 #, c-format msgid "%.1f MiB" msgstr "%.1f MiB" -#: ../glib/gutils.c:2160 +#: ../glib/gutils.c:2220 #, c-format msgid "%.1f GiB" msgstr "%.1f GiB" -#: ../glib/gutils.c:2163 +#: ../glib/gutils.c:2223 #, c-format msgid "%.1f TiB" msgstr "%.1f TiB" -#: ../glib/gutils.c:2166 +#: ../glib/gutils.c:2226 #, c-format msgid "%.1f PiB" msgstr "%.1f PiB" -#: ../glib/gutils.c:2169 +#: ../glib/gutils.c:2229 #, c-format msgid "%.1f EiB" msgstr "%.1f EiB" -#: ../glib/gutils.c:2182 +#: ../glib/gutils.c:2242 #, c-format msgid "%.1f kB" msgstr "%.1f kB" -#: ../glib/gutils.c:2185 ../glib/gutils.c:2300 +#: ../glib/gutils.c:2245 ../glib/gutils.c:2360 #, c-format msgid "%.1f MB" msgstr "%.1f MB" -#: ../glib/gutils.c:2188 ../glib/gutils.c:2305 +#: ../glib/gutils.c:2248 ../glib/gutils.c:2365 #, c-format msgid "%.1f GB" msgstr "%.1f GB" -#: ../glib/gutils.c:2190 ../glib/gutils.c:2310 +#: ../glib/gutils.c:2250 ../glib/gutils.c:2370 #, c-format msgid "%.1f TB" msgstr "%.1f TB" -#: ../glib/gutils.c:2193 ../glib/gutils.c:2315 +#: ../glib/gutils.c:2253 ../glib/gutils.c:2375 #, c-format msgid "%.1f PB" msgstr "%.1f PB" -#: ../glib/gutils.c:2196 ../glib/gutils.c:2320 +#: ../glib/gutils.c:2256 ../glib/gutils.c:2380 #, c-format msgid "%.1f EB" msgstr "%.1f EB" #. Translators: the %s in "%s bytes" will always be replaced by a number. -#: ../glib/gutils.c:2233 +#: ../glib/gutils.c:2293 #, c-format msgid "%s byte" msgid_plural "%s bytes" @@ -5890,23 +5651,20 @@ msgstr[3] "%s bajti" #. * compatibility. Users will not see this string unless a program is using this deprecated function. #. * Please translate as literally as possible. #. -#: ../glib/gutils.c:2295 +#: ../glib/gutils.c:2355 #, c-format msgid "%.1f KB" msgstr "%.1f KB" -#~ msgid "Error creating directory '%s': %s" -#~ msgstr "Napaka med ustvarjanjem mape '%s': %s" - -#~ msgid "No such interface" -#~ msgstr "Vmesnik ne obstaja" - #~ msgid "No files given" #~ msgstr "Ni nobene podane datoteke" #~ msgid "Error getting writable attributes: %s\n" #~ msgstr "Napaka med pridobivanjem zapisljivih atributov: %s\n" +#~ msgid "Error mounting location: Anonymous access denied\n" +#~ msgstr "Napaka med priklapljanjem mesta: brezimen dostop ni dovoljen\n" + #~ msgid "Error mounting location: %s\n" #~ msgstr "Napaka med priklapljanjem mesta: %s\n" @@ -5931,6 +5689,12 @@ msgstr "%.1f KB" #~ msgid "Error setting attribute: %s\n" #~ msgstr "Napaka med določevanjem atributa: %s\n" +#~ msgid "Error creating directory '%s': %s" +#~ msgstr "Napaka med ustvarjanjem mape '%s': %s" + +#~ msgid "No such interface" +#~ msgstr "Vmesnik ne obstaja" + #~ msgid "Error opening file '%s': %s" #~ msgstr "Napaka med odpiranjem datoteke '%s': %s" diff --git a/tests/gobject/meson.build b/tests/gobject/meson.build new file mode 100644 index 0000000..ba72d7a --- /dev/null +++ b/tests/gobject/meson.build @@ -0,0 +1,77 @@ +gobject_tests = [ + ['gvalue-test'], + ['paramspec-test'], + ['deftype'], + ['defaultiface', ['defaultiface.c', 'testmodule.c']], + ['dynamictype', ['dynamictype.c', 'testmodule.c']], + ['override'], + ['signals'], + ['singleton'], + ['references'], +] + +# We cannot use gnome.genmarshal() here +testmarshal_h = custom_target('testmarshal_h', + output : 'testmarshal.h', + input : 'testmarshal.list', + command : [ + python, glib_genmarshal, + '--prefix=test_marshal', + '--output=@OUTPUT@', + '--quiet', + '--header', + '@INPUT@', + ], +) + +testmarshal_c = custom_target('testmarshal_c', + output : 'testmarshal.c', + input : 'testmarshal.list', + command : [ + python, glib_genmarshal, + '--prefix=test_marshal', + '--include-header=testmarshal.h', + '--output=@OUTPUT@', + '--quiet', + '--body', + '@INPUT@', + ], +) + +gobject_tests += [ + ['accumulator', ['accumulator.c', testmarshal_c, testmarshal_h]], +] + +foreach t : gobject_tests + test_name = t.get(0) + test_src = t.get(1, test_name + '.c') + test_extra_cargs = t.get(2, []) + test_timeout = t.get(3, 30) + + # FIXME? $(GLIB_DEBUG_FLAGS) + exe = executable(test_name + '-gobject', test_src, + c_args : test_cargs + test_extra_cargs + ['-DGLIB_DISABLE_DEPRECATION_WARNINGS'], + dependencies : [libm, thread_dep, libglib_dep, libgobject_dep], + install : false, + ) + # FIXME? TESTS_ENVIRONMENT = LIBCHARSET_ALIAS_DIR=$(top_builddir)/glib/libcharset + test(test_name, exe, env : test_env, timeout : test_timeout) +endforeach + +# Don't install these ones, and keep them out of 'make check' because they take too long... +executable('performance', 'performance.c', + c_args : test_cargs + test_extra_cargs + ['-DGLIB_DISABLE_DEPRECATION_WARNINGS'], + dependencies : [libm, thread_dep, libglib_dep, libgobject_dep], + install : false) + +executable('performance-threaded', 'performance-threaded.c', + c_args : test_cargs + test_extra_cargs + ['-DGLIB_DISABLE_DEPRECATION_WARNINGS'], + dependencies : [libm, thread_dep, libglib_dep, libgobject_dep], + install : false) + +if host_system != 'windows' and host_system != 'minix' + executable('timeloop-closure', 'timeloop-closure.c', + c_args : test_cargs + test_extra_cargs + ['-DGLIB_DISABLE_DEPRECATION_WARNINGS'], + dependencies : [libm, thread_dep, libglib_dep, libgobject_dep], + install : false) +endif diff --git a/tests/meson.build b/tests/meson.build new file mode 100644 index 0000000..694e179 --- /dev/null +++ b/tests/meson.build @@ -0,0 +1,14 @@ +# tests + +test_env = [ + 'G_TEST_SRCDIR=' + meson.current_source_dir(), + 'G_TEST_BUILDDIR=' + meson.current_build_dir(), + 'G_DEBUG=gc-friendly', + 'MALLOC_CHECK_=2', + 'MALLOC_PERTURB_=@0@'.format(random_number % 256), +] + +test_cargs = ['-DHAVE_CONFIG_H=1', '-DG_LOG_DOMAIN="GLib"'] + +subdir('gobject') +subdir('refcount') diff --git a/tests/refcount/meson.build b/tests/refcount/meson.build new file mode 100644 index 0000000..64c0cfb --- /dev/null +++ b/tests/refcount/meson.build @@ -0,0 +1,29 @@ +refcount_tests = [ + ['closures', 'closures.c', []], + ['objects', 'objects.c', []], + ['objects2', 'objects2.c', []], + ['properties', 'properties.c', []], + ['properties2', 'properties2.c', []], + ['properties3', 'properties3.c', [], 90], # extra long timeout + ['properties4', 'properties4.c', []], + ['signal1', 'signals.c', ['-DTESTNUM=1']], + ['signal2', 'signals.c', ['-DTESTNUM=2']], + ['signal3', 'signals.c', ['-DTESTNUM=3']], + ['signal4', 'signals.c', ['-DTESTNUM=4']], +] + +foreach t : refcount_tests + test_name = t.get(0) + test_src = t.get(1) + test_extra_cargs = t.get(2) + test_timeout = t.get(3, 30) + + # FIXME? $(GLIB_DEBUG_FLAGS) + exe = executable(test_name + '-test', test_src, + c_args : test_cargs + test_extra_cargs + ['-DGLIB_DISABLE_DEPRECATION_WARNINGS'], + dependencies : [libm, thread_dep, libglib_dep, libgobject_dep], + install : false, + ) + # FIXME? TESTS_ENVIRONMENT = LIBCHARSET_ALIAS_DIR=$(top_builddir)/glib/libcharset + test(test_name, exe, env : test_env, timeout : test_timeout) +endforeach diff --git a/win32/vs10/glib-version-paths.props b/win32/vs10/glib-version-paths.props index 3304bc5..606b1c9 100644 --- a/win32/vs10/glib-version-paths.props +++ b/win32/vs10/glib-version-paths.props @@ -2,7 +2,7 @@ 10 - 2.54.0 + 2.54.1 2.0 ..\..\..\vs$(VSVer)\$(Platform) $(GlibEtcInstallRoot) diff --git a/win32/vs11/glib-version-paths.props b/win32/vs11/glib-version-paths.props index 33ebc53..b4cba48 100644 --- a/win32/vs11/glib-version-paths.props +++ b/win32/vs11/glib-version-paths.props @@ -2,7 +2,7 @@ 11 - 2.54.0 + 2.54.1 2.0 ..\..\..\vs$(VSVer)\$(Platform) $(GlibEtcInstallRoot) diff --git a/win32/vs12/glib-version-paths.props b/win32/vs12/glib-version-paths.props index 2f6d7d9..61a845d 100644 --- a/win32/vs12/glib-version-paths.props +++ b/win32/vs12/glib-version-paths.props @@ -2,7 +2,7 @@ 12 - 2.54.0 + 2.54.1 2.0 ..\..\..\vs$(VSVer)\$(Platform) $(GlibEtcInstallRoot) diff --git a/win32/vs14/glib-version-paths.props b/win32/vs14/glib-version-paths.props index 3bdaa2e..c384c00 100644 --- a/win32/vs14/glib-version-paths.props +++ b/win32/vs14/glib-version-paths.props @@ -2,7 +2,7 @@ 14 - 2.54.0 + 2.54.1 2.0 ..\..\..\vs$(VSVer)\$(Platform) $(GlibEtcInstallRoot) diff --git a/win32/vs15/glib-version-paths.props b/win32/vs15/glib-version-paths.props index 5139db6..5ffed82 100644 --- a/win32/vs15/glib-version-paths.props +++ b/win32/vs15/glib-version-paths.props @@ -2,7 +2,7 @@ 15 - 2.54.0 + 2.54.1 2.0 ..\..\..\vs$(VSVer)\$(Platform) $(GlibEtcInstallRoot) diff --git a/win32/vs9/glib-version-paths.vsprops b/win32/vs9/glib-version-paths.vsprops index b26b940..ff823ad 100644 --- a/win32/vs9/glib-version-paths.vsprops +++ b/win32/vs9/glib-version-paths.vsprops @@ -10,7 +10,7 @@ />